nav tweaks

opendatahub-io · Feb 4, 2025 · 076e13c · 076e13c
1 parent 010e9cb
commit 076e13c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/frontend/src/pages/modelCatalog/ModelCatalogCoreLoader.tsx b/frontend/src/pages/modelCatalog/ModelCatalogCoreLoader.tsx
@@ -1,15 +1,10 @@
 import * as React from 'react';
-import { conditionalArea, SupportedArea } from '~/concepts/areas';
 import ApplicationsPage from '~/pages/ApplicationsPage';
 import TitleWithIcon from '~/concepts/design/TitleWithIcon';
 import { ProjectObjectType, typedEmptyImage } from '~/concepts/design/utils';
 import EmptyModelCatalogState from './EmptyModelCatalogState';
 
-const ModelCatalogCoreLoader: React.FC = conditionalArea(
-  SupportedArea.MODEL_CATALOG,
-  true,
-)(() => {
-  console.log(`========== ModelCatalogCoreLoader ==========`);
+const ModelCatalogCoreLoader: React.FC = () => {
   const renderStateProps = {
     empty: true,
     emptyStatePage: (
@@ -34,6 +29,6 @@ const ModelCatalogCoreLoader: React.FC = conditionalArea(
       provideChildrenPadding
     />
   );
-});
+};
 
 export default ModelCatalogCoreLoader;
diff --git a/frontend/src/utilities/NavData.tsx b/frontend/src/utilities/NavData.tsx
@@ -13,6 +13,7 @@ import {
   artifactsRootPath,
   executionsRootPath,
   experimentsRootPath,
+  pipelineRunsRootPath,
   pipelinesRootPath,
 } from '~/routes';
 import { useUser } from '~/redux/selectors';
@@ -61,13 +62,11 @@ const useDistributedWorkloadsNav = (): NavDataHref[] =>
 const useDevelopAndTrainNav = (): NavDataItem[] => [
   {
     id: 'developAndTrain',
-    group: { id: 'developAndTrain', label: 'Develop and Train', icon: <ProcessAutomationIcon /> },
+    group: { id: 'developAndTrain', label: 'Develop and train', icon: <ProcessAutomationIcon /> },
     children: [
       { id: 'notebooks', label: 'Workbenches', href: '/workbenches' },
-      { id: 'experimentsAndRuns', label: 'Experiments and runs', href: experimentsRootPath },
-      { id: 'executions', label: 'Executions', href: executionsRootPath },
+      { id: 'experiments', label: 'Experiments', href: experimentsRootPath },
       { id: 'artifacts', label: 'Artifacts', href: artifactsRootPath },
-      ...useDistributedWorkloadsNav(),
     ],
   },
 ];
@@ -79,7 +78,7 @@ const useManageModelsNav = (): NavDataItem[] =>
           id: 'manageModels',
           group: { id: 'manageModels', label: 'Models', icon: <ModelIcon /> },
           children: [
-            { id: 'modelCatalog', label: 'Model Catalog', href: '/modelCatalog' },
+            { id: 'modelCatalog', label: 'Model catalog', href: '/modelCatalog' },
             { id: 'modelRegistry', label: 'Model registry', href: '/modelRegistry' },
             { id: 'modelDeployments', label: 'Model deployments', href: '/modelServing' },
           ],
@@ -90,7 +89,7 @@ const useManageModelsNav = (): NavDataItem[] =>
           id: 'manageModels',
           group: { id: 'manageModels', label: 'Models', icon: <ModelIcon /> },
           children: [
-            { id: 'modelOverview', label: 'Model overview', href: '/modelOverview' },
+            { id: 'modelOverview', label: 'Model catalog', href: '/modelCatalog' },
             { id: 'modelDeployments', label: 'Model deployments', href: '/modelServing' },
           ],
         },
@@ -100,7 +99,15 @@ const useAutomateNav = (): NavDataItem[] => [
   {
     id: 'automate',
     group: { id: 'automate', label: 'Automate', icon: <AutomationIcon /> },
-    children: [{ id: 'pipelines', label: 'Pipelines', href: pipelinesRootPath }],
+    children: [
+      { id: 'pipelines', label: 'Pipelines', href: pipelinesRootPath },
+      {
+        id: 'runs',
+        label: 'Runs',
+        href: pipelineRunsRootPath,
+      },
+      { id: 'executions', label: 'Executions', href: executionsRootPath },
+    ],
   },
 ];
 
@@ -111,6 +118,7 @@ const useConfigureNav = (): NavDataItem[] => [
     children: [
       { id: 'connections', label: 'Connections', href: '/connections' },
       { id: 'clusterStorage', label: 'Cluster storage', href: '/clusterStorage' },
+      ...useDistributedWorkloadsNav(),
       { id: 'applications', label: 'Applications', href: '/applications' },
     ],
   },