feat(pci.private-registry): fix routing

ref: TAPC-584 Signed-off-by: Pierre-Philippe <[email protected]>
ovh · Dec 12, 2024 · 8bda40a · 8bda40a
1 parent fbd47a9
commit 8bda40a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 19 deletions.
diff --git a/packages/manager/apps/pci-private-registry/src/components/CIDR/Breadcrumb.tsx b/packages/manager/apps/pci-private-registry/src/components/CIDR/Breadcrumb.tsx
@@ -6,7 +6,7 @@ import { useProjectUrl } from '@ovh-ux/manager-react-components';
 
 const BreadcrumbCIDR = () => {
   const { data: project } = useProject();
-  const hrefBack = useHref('../..');
+  const hrefBack = useHref('..');
   const hrefProject = useProjectUrl('public-cloud');
   const { t } = useTranslation(['ip-restrictions', 'common']);
   return (

diff --git a/packages/manager/apps/pci-private-registry/src/routes.tsx b/packages/manager/apps/pci-private-registry/src/routes.tsx
@@ -1,4 +1,4 @@
-export const lazyRouteConfig = (importFn: CallableFunction) => ({
+const lazyRouteConfig = (importFn: CallableFunction) => ({
   lazy: async () => {
     const { default: moduleDefault, ...moduleExports } = await importFn();
 
@@ -8,22 +8,19 @@ export const lazyRouteConfig = (importFn: CallableFunction) => ({
     };
   },
 });
+
 export interface RouteHandle {
   tracking?: string;
 }
 
-const ROUTE_PATHS = {
-  root: '/pci/projects/:projectId/private-registry',
-};
-
 export default [
   {
     path: '/',
     ...lazyRouteConfig(() => import('@/pages/Layout')),
   },
   {
     id: 'root',
-    path: ROUTE_PATHS.root,
+    path: '/pci/projects/:projectId/private-registry',
     ...lazyRouteConfig(() => import('@/pages/Layout')),
     children: [
       {
@@ -32,33 +29,25 @@ export default [
           tracking: 'registries',
         },
         ...lazyRouteConfig(() => import('@/pages/list/List.page')),
-      },
-      {
-        path: ':registryId',
         children: [
           {
-            path: 'api-url',
+            path: ':registryId/api-url',
             handle: {
               tracking: 'api-url',
             },
             ...lazyRouteConfig(() => import('@/pages/api-url/APIUrl.page')),
           },
+
           {
-            path: 'manage-cidr',
-            handle: {
-              tracking: 'CIDR',
-            },
-            ...lazyRouteConfig(() => import('@/pages/CIDR/ManageCIDR.page')),
-          },
-          {
-            path: 'credentials',
+            path: ':registryId/credentials',
             handle: {
               tracking: 'credentials',
             },
             ...lazyRouteConfig(() =>
               import('@/pages/credentials/Credentials.page'),
             ),
           },
+
           {
             id: 'delete',
             path: 'delete',
@@ -78,6 +67,10 @@ export default [
         },
         ...lazyRouteConfig(() => import('@/pages/create/Create.page')),
       },
+      {
+        path: ':registryId/manage-cidr',
+        ...lazyRouteConfig(() => import('@/pages/CIDR/ManageCIDR.page')),
+      },
       {
         id: 'onboarding',
         path: 'onboarding',