refactor: set default page to start instead of summary page

lablup · Aug 30, 2024 · dbe62aa · dbe62aa
1 parent 0de6318
commit dbe62aa
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 24 deletions.
diff --git a/react/src/App.tsx b/react/src/App.tsx
@@ -62,9 +62,9 @@ const InteractiveLoginPage = React.lazy(
 );
 const ImportAndRunPage = React.lazy(() => import('./pages/ImportAndRunPage'));
 
-const RedirectToSummary = () => {
+const RedirectToStart = () => {
   useSuspendedBackendaiClient();
-  const pathName = '/summary';
+  const pathName = '/start';
   document.dispatchEvent(
     new CustomEvent('move-to-from-react', {
       detail: {
@@ -73,7 +73,7 @@ const RedirectToSummary = () => {
       },
     }),
   );
-  return <Navigate to="/summary" replace />;
+  return <Navigate to="/start" replace />;
 };
 
 const router = createBrowserRouter([
@@ -110,17 +110,17 @@ const router = createBrowserRouter([
     children: [
       {
         path: '/',
-        element: <RedirectToSummary />,
+        element: <RedirectToStart />,
       },
       {
         //for electron dev mode
         path: '/build/electron-app/app/index.html',
-        element: <RedirectToSummary />,
+        element: <RedirectToStart />,
       },
       {
         //for electron prod mode
         path: '/app/index.html',
-        element: <RedirectToSummary />,
+        element: <RedirectToStart />,
       },
       {
         path: '/start',
@@ -140,7 +140,7 @@ const router = createBrowserRouter([
             </>
           );
         },
-        handle: { labelKey: 'webui.menu.Summary' },
+        handle: { labelKey: 'start' },
       },
       {
         path: '/job',

diff --git a/react/src/components/MainLayout/WebUISider.tsx b/react/src/components/MainLayout/WebUISider.tsx
@@ -384,7 +384,7 @@ const WebUISider: React.FC<WebUISiderProps> = (props) => {
     >
       <BAIMenu
         selectedKeys={[
-          location.pathname.split('/')[1] || 'summary',
+          location.pathname.split('/')[1] || 'start',
           // TODO: After matching first path of 'storage-settings' and 'agent', remove this code
           location.pathname.split('/')[1] === 'storage-settings' ? 'agent' : '',
           // TODO: After 'SessionListPage' is completed and used as the main page, remove this code

diff --git a/react/src/pages/StartPage.tsx b/react/src/pages/StartPage.tsx
@@ -107,10 +107,7 @@ const StartPage: React.FC<StartPageProps> = (props) => {
           secondary
           icon={
             // FIXME: workaround for displaying proper icon
-            <img
-              src="react/src/components/icons/URLStart.svg"
-              alt="URL start"
-            ></img>
+            <img src="/resources/icons/URLStart.svg" alt="URL start"></img>
             // <URLStartIcon />
           }
           title={

diff --git a/resources/icons/URLStart.svg b/resources/icons/URLStart.svg
diff --git a/src/backend-ai-app.ts b/src/backend-ai-app.ts
@@ -50,7 +50,7 @@ export const navigate =
     }
     let page;
     if (['/', 'build', '/build', 'app', '/app'].includes(path)) {
-      page = 'summary';
+      page = 'start';
     } else if (path[0] === '/') {
       page = path.slice(1);
     } else {
@@ -85,7 +85,7 @@ const loadPage =
   (page, params: Record<string, unknown> = {}) =>
   (dispatch) => {
     switch (page) {
-      case 'summary':
+      case 'start':
         import('./components/backend-ai-summary-view.js').then((module) => {
           // TODO: after page changing?
         });

diff --git a/src/components/backend-ai-error-view.ts b/src/components/backend-ai-error-view.ts
@@ -70,8 +70,8 @@ export default class BackendAIErrorView extends BackendAIPage {
    * @param {string} url - page to redirect from the current page.
    */
   _moveTo(url = '') {
-    const page = url !== '' ? url : 'summary';
-    globalThis.history.pushState({}, '', '/summary');
+    const page = url !== '' ? url : 'start';
+    globalThis.history.pushState({}, '', '/start');
     store.dispatch(navigate(decodeURIComponent('/' + page), {}));
     document.dispatchEvent(
       new CustomEvent('react-navigate', {
@@ -98,7 +98,7 @@ export default class BackendAIErrorView extends BackendAIPage {
               fullwidth
               id="go-to-summary"
               label="${_t('button.GoBackToSummaryPage')}"
-              @click="${() => this._moveTo('summary')}"
+              @click="${() => this._moveTo('start')}"
             ></mwc-button>
           </div>
         </div>

diff --git a/src/components/backend-ai-permission-denied-view.ts b/src/components/backend-ai-permission-denied-view.ts
@@ -113,7 +113,7 @@ export default class BackendAIPermissionDeniedView extends BackendAIPage {
    * @param {string} url - page to redirect from the current page.
    */
   _moveTo(url = '') {
-    const page = url !== '' ? url : 'summary';
+    const page = url !== '' ? url : 'start';
     globalThis.history.pushState({}, '', '/summary');
     store.dispatch(navigate(decodeURIComponent('/' + page), {}));
   }
@@ -135,7 +135,7 @@ export default class BackendAIPermissionDeniedView extends BackendAIPage {
               fullwidth
               id="go-to-summary"
               label="${_t('button.GoBackToSummaryPage')}"
-              @click="${() => this._moveTo('summary')}"
+              @click="${() => this._moveTo('start')}"
             ></mwc-button>
           </div>
         </div>

diff --git a/src/components/backend-ai-storage-list.ts b/src/components/backend-ai-storage-list.ts
@@ -1080,7 +1080,7 @@ export default class BackendAiStorageList extends BackendAIPage {
    * @param {string} url - page to redirect from the current page.
    */
   _moveTo(url = '') {
-    const page = url !== '' ? url : 'summary';
+    const page = url !== '' ? url : 'start';
     // globalThis.history.pushState({}, '', page);
     store.dispatch(navigate(decodeURIComponent(page), {}));
 

diff --git a/src/components/backend-ai-storage-proxy-list.ts b/src/components/backend-ai-storage-proxy-list.ts
@@ -249,7 +249,7 @@ export default class BackendAIStorageProxyList extends BackendAIPage {
    * @param {string} url - page to redirect from the current page.
    */
   _moveTo(url = '') {
-    const page = url !== '' ? url : 'summary';
+    const page = url !== '' ? url : 'start';
     // globalThis.history.pushState({}, '', page);
     store.dispatch(navigate(decodeURIComponent(page), {}));
 

diff --git a/src/components/backend-ai-summary-view.ts b/src/components/backend-ai-summary-view.ts
@@ -477,7 +477,7 @@ export default class BackendAISummary extends BackendAIPage {
    * @param {string} search
    */
   _moveTo(url = '', search: string | undefined = undefined) {
-    const page = url !== '' ? url : 'summary';
+    const page = url !== '' ? url : 'start';
     // globalThis.history.pushState({}, '', page);
     store.dispatch(navigate(decodeURIComponent(page), {}));
 

diff --git a/src/components/backend-ai-webui.ts b/src/components/backend-ai-webui.ts
@@ -145,7 +145,8 @@ export default class BackendAIWebUI extends connect(store)(LitElement) {
   @property({ type: Number }) sidepanelWidth = 250;
   @property({ type: Object }) supports = Object();
   @property({ type: Array }) availablePages = [
-    'summary',
+    // 'summary',
+    'start',
     'verify-email',
     'change-password',
     'job',
@@ -719,7 +720,7 @@ export default class BackendAIWebUI extends connect(store)(LitElement) {
    */
   _loadPageElement() {
     if (this._page === 'index.html' || this._page === '') {
-      this._page = 'summary';
+      this._page = 'start';
       navigate(decodeURIComponent('/'));
     }
   }