Merge remote-tracking branch 'origin/main' into dependabot/npm_and_yarn/npm-dependencies-4797f0f966

Author: svcAPLBot

public/i18n/en/common.json

@@ -2,6 +2,8 @@
   "App": "App",
   "Apps": "Apps",
   "BUTTON_NEW_RESOURCE": "Create {{model}}",
+  "Catalog": "Catalog",
+  "Catalog_plural": "Catalogs",
   "CREATE_MODEL": "Create a {{model}}",
   "CREATE_MODEL_FOR_TEAM": "Create a {{model}} for team {{teamName}}",
   "DELETE_RESOURCE": "Delete {{resourceName}} {{resourceType}}?",
@@ -57,6 +59,8 @@
   "TITLE_SEALEDSECRETS": "Sealed Secrets",
   "TITLE_SERVICE": "Service details",
   "TITLE_SERVICES": "Services - {{scope}}",
+  "TITLE_CATALOG": "Catalog details",
+  "TITLE_CATALOGS": "Catalogs",
   "TITLE_SETTINGS": "Settings - {{settingId}}",
   "TITLE_SHORTCUTS": "Shortcuts - {{role}}",
   "TITLE_TEAM": "Team {{teamId}}",

src/App.tsx

@@ -34,6 +34,7 @@ import PrivateRoute from 'components/AuthzRoute'
 import Logout from 'pages/Logout'
 import BuildsCreateEditPage from 'pages/builds/create-edit/BuildsCreateEditPage'
 import BuildsOverviewPage from 'pages/builds/overview/BuildsOverviewPage'
+
 import CodeRepositoriesCreateEditPage from 'pages/code-repositories/create-edit/CodeRepositoriesCreateEditPage'
 import CodeRepositoriesOverviewPage from 'pages/code-repositories/overview/CodeRepositoriesOverviewPage'
 import NetworkPoliciesOverviewPage from 'pages/network-policies/overview/NetworkPoliciesOverviewPage'
@@ -47,8 +48,10 @@ import TeamsCreateEditPage from 'pages/teams/create-edit/TeamsCreateEditPage'
 import TeamsOverviewPage from 'pages/teams/overview/TeamsOverviewPage'
 import WorkloadsCreateEditPage from 'pages/workloads/create-edit/WorkloadsCreateEditPage'
 import WorkloadsOverviewPage from 'pages/workloads/overview/WorkloadsOverviewPage'
-import WorkloadCatalogsPage from 'pages/workloads/catalog/WorkloadCatalogsPage'
+import WorkloadCatalogsPage from 'pages/catalogs/team-overview/WorkloadCatalogsOverviewPage'
 import ThemeViewInitializer from 'components/ThemeViewInitializer'
+import PlatformCatalogsOverviewPage from 'pages/catalogs/platform/overview/PlatformCatalogsOverviewPage'
+import CatalogsCreateEditPage from 'pages/catalogs/platform/create-edit/CatalogsCreateEditPage'
 import { HttpErrorBadRequest } from './utils/error'
 import { NotistackProvider, SnackbarUtilsConfigurator } from './utils/snack'
 
@@ -114,6 +117,24 @@ function App() {
                                   platformAdminRoute
                                   exact
                                 />
+                                <PrivateRoute
+                                  path='/catalogs'
+                                  component={PlatformCatalogsOverviewPage}
+                                  platformAdminRoute
+                                  exact
+                                />
+                                <PrivateRoute
+                                  path='/catalogs/create'
+                                  component={CatalogsCreateEditPage}
+                                  platformAdminRoute
+                                  exact
+                                />
+                                <PrivateRoute
+                                  path='/catalogs/:catalogId'
+                                  component={CatalogsCreateEditPage}
+                                  platformAdminRoute
+                                  exact
+                                />
                                 <PrivateRoute
                                   path='/network-policies'
                                   component={NetworkPoliciesOverviewPage}
@@ -127,14 +148,14 @@ function App() {
                                   platformAdminRoute
                                   exact
                                 />
-                                <PrivateRoute path='/catalogs/:teamId' component={WorkloadCatalogsPage} exact />
+                                <PrivateRoute path='/teams/:teamId/catalogs/' component={WorkloadCatalogsPage} exact />
                                 <PrivateRoute
-                                  path='/catalogs/:teamId/:catalogName'
+                                  path='/teams/:teamId/catalogs/:catalogName'
                                   component={WorkloadsCreateEditPage}
                                   exact
                                 />
                                 <PrivateRoute
-                                  path='/catalogs/:teamId/:catalogName/:workloadName'
+                                  path='/teams/:teamId/catalogs/:catalogName/:workloadName'
                                   component={WorkloadsCreateEditPage}
                                   exact
                                 />

src/components/CatalogCard.tsx

@@ -87,7 +87,7 @@ export default function ({ img, teamId, name, isBeta }: Props): React.ReactEleme
   return (
     <Box className={classes.root}>
       <Tooltip title='Click to create a workload'>
-        <Link className={classes.link} to={`/catalogs/${teamId}/${name}`} style={{ textDecoration: 'none' }}>
+        <Link className={classes.link} to={`/teams/${teamId}/catalogs/${name}`} style={{ textDecoration: 'none' }}>
           {image}
           <Typography className={classes.title} variant='h6'>
             {name}

src/components/Catalogs.tsx

@@ -30,6 +30,7 @@ export default function NavConfig() {
       items: [
         { title: 'Dashboard', path: '/', icon: getIcon('dashboard_icon.svg') },
         { title: 'Apps', path: '/apps/admin', icon: getIcon('apps_icon.svg') },
+        { title: 'Catalogs', path: '/catalogs', icon: getIcon('developer_guide_icon.svg') },
         { title: 'Teams', path: '/teams', icon: getIcon('teams_icon.svg') },
         { title: 'User Management', path: '/users', icon: getIcon('users_icon.svg'), hidden: hasExternalIDP },
         { title: 'Maintenance', path: '/maintenance', icon: getIcon('maintenance_icon.svg') }, // replace .svg
@@ -47,7 +48,7 @@ export default function NavConfig() {
         { title: 'Apps', path: `/apps/${oboTeamId}`, icon: getIcon('apps_icon.svg'), hidden: oboTeamId === 'admin' },
         {
           title: 'Catalog',
-          path: `/catalogs/${oboTeamId}`,
+          path: `/teams/${oboTeamId}/catalogs`,
           icon: getIcon('developer_guide_icon.svg'),
         },
         {

src/components/NavConfig.tsx

@@ -18,7 +18,7 @@ interface Row {
 }
 
 const getWorkloadLink = (row: Row) => {
-  const path = `/catalogs/${row.teamId}/${row.name}/${encodeURIComponent(row.name)}`
+  const path = `/teams/${row.teamId}/catalogs/${row.name}/${encodeURIComponent(row.name)}`
   return (
     <RLink to={path} label={row.name}>
       {row.name}
@@ -106,7 +106,7 @@ export default function ({ workloads, teamId }: Props): React.ReactElement {
       headCells={headCells}
       rows={workloads}
       resourceType='Workload'
-      to={`/catalogs/${teamId || oboTeamId}`}
+      to={`/teams/${teamId || oboTeamId}/catalogs/`}
     />
   )
 }