refactor: enhance routing consistency by updating bucket navigation p…

…aths and internal route matching for account-related routes
scality · Jan 20, 2025 · 457a2a4 · 457a2a4
1 parent 77e97e3
commit 457a2a4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/react/Routes.tsx b/src/react/Routes.tsx
@@ -304,7 +304,8 @@ function InternalRoutes() {
           doesRouteMatch('/buckets') ||
           doesRouteMatch('/accounts/:accountName/buckets') ||
           doesRouteMatch('/accounts/:accountName/data/buckets') ||
-          doesRouteMatch('/accounts/:accountName/data/buckets/:bucketName'),
+          doesRouteMatch('/accounts/:accountName/data/buckets/:bucketName') ||
+          doesRouteMatch('/accounts/:accountName/buckets/:bucketName'),
       },
       {
         label: 'Workflows',

diff --git a/src/react/account/AccountRoleSelectButtonAndModal.tsx b/src/react/account/AccountRoleSelectButtonAndModal.tsx
@@ -199,9 +199,9 @@ const ModalFooter = ({
     const replacePath = location.pathname.replace(accountName, assumedAccount);
 
     if (replacePath.includes('/buckets')) {
-      navigateWithBasename(`/accounts/${assumedAccount}/data/buckets`);
+      navigateWithBasename(`/accounts/${assumedAccount}/buckets`);
     } else if (replacePath.includes('/workflows')) {
-      navigateWithBasename(`/accounts/${assumedAccount}/data/workflows`);
+      navigateWithBasename(`/accounts/${assumedAccount}/workflows`);
     } else {
       navigate(replacePath);
     }

diff --git a/src/react/databrowser/buckets/Buckets.tsx b/src/react/databrowser/buckets/Buckets.tsx
@@ -81,7 +81,12 @@ export default function Buckets() {
 
   // Redirect to the first bucket if no bucket name is provided
   if (!bucketNameParam) {
-    return <Navigate to={`${pathname}/${buckets.value[0].name}`} replace />;
+    return (
+      <Navigate
+        to={`${basePath}/accounts/${account?.Name}/buckets/${buckets.value[0].name}`}
+        replace
+      />
+    );
   }
 
   // Replace the old bucket name with the new one when switching accounts