[frontend] feat(multi-tenant): strip detail segments on tenant switch (#4864) (#5589)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

Author: corinnekrych

openaev-front/src/__tests__/utils/hooks/UseTenant.test.tsx

@@ -232,8 +232,6 @@ describe('useTenant', () => {
         expect(mockBuildTenantUrl).toHaveBeenCalledWith(
           TENANT_ALPHA.tenant_id,
           expect.any(String),
-          expect.any(String),
-          expect.any(String),
         );
       });
       expect(window.location.href).toContain(TENANT_ALPHA.tenant_id);
@@ -253,8 +251,6 @@ describe('useTenant', () => {
         expect(mockBuildTenantUrl).toHaveBeenCalledWith(
           TENANT_ALPHA.tenant_id,
           expect.any(String),
-          expect.any(String),
-          expect.any(String),
         );
       });
       expect(window.location.href).toContain(TENANT_ALPHA.tenant_id);
@@ -311,8 +307,6 @@ describe('useTenant', () => {
       expect(mockBuildTenantUrl).toHaveBeenCalledWith(
         TENANT_BETA.tenant_id,
         expect.any(String),
-        expect.any(String),
-        expect.any(String),
       );
       expect(window.location.href).toContain(TENANT_BETA.tenant_id);
     });
@@ -418,8 +412,6 @@ describe('useTenant', () => {
       expect(mockBuildTenantUrl).toHaveBeenCalledWith(
         TENANT_GAMMA.tenant_id,
         expect.any(String),
-        expect.any(String),
-        expect.any(String),
       );
       expect(window.location.href).toContain(TENANT_GAMMA.tenant_id);
     });

openaev-front/src/__tests__/utils/url-helper.test.ts

@@ -425,6 +425,28 @@ describe('url-helper', () => {
     });
   });
 
+  // -- stripDetailSegments --
+
+  describe('stripDetailSegments', () => {
+    it.each([
+      ['/admin/scenarios/123e4567-e89b-12d3-a456-426614174000', '/admin/scenarios'],
+      ['/admin/scenarios/123e4567-e89b-12d3-a456-426614174000/injects', '/admin/scenarios'],
+      ['/admin/scenarios/123e4567-e89b-12d3-a456-426614174000/injects/ABCDEF12-0000-1111-2222-333344445555', '/admin/scenarios'],
+      ['/admin/scenarios', '/admin/scenarios'],
+      ['/admin', '/admin'],
+      ['/', '/'],
+    ])('given_%s_should_return_%s', async (input, expected) => {
+      // Arrange
+      const { stripDetailSegments } = await importHelper();
+
+      // Act
+      const result = stripDetailSegments(input);
+
+      // Assert
+      expect(result).toBe(expected);
+    });
+  });
+
   // -- buildTenantApiPath --
 
   describe('buildTenantApiPath', () => {

openaev-front/src/utils/hooks/useTenant.ts

@@ -5,7 +5,7 @@ import { fetchUserTenants } from '../../actions/user/user-tenant-actions';
 import { TENANT_SWITCH_SUCCESS } from '../../constants/ActionTypes';
 import { type TenantOutput, type User } from '../api-types';
 import { useAppDispatch } from '../hooks';
-import { buildTenantUrl, extractTenantFromUrl } from '../url-helper';
+import { buildTenantUrl, extractTenantFromUrl, stripDetailSegments } from '../url-helper';
 
 /**
  * Internal hook that encapsulates the current-tenant state and
@@ -57,9 +57,12 @@ const useTenant = (me: User | undefined, logged: unknown, isPlatformRoute: boole
     const target = tenants.find(t => t.tenant_id === tenantId);
     if (!target) return false;
     if (extractTenantFromUrl() !== target.tenant_id) {
+      // Switching to a different tenant — strip detail segments so we land on
+      // the list page instead of a detail page for a resource that may not exist.
+      const safePath = stripDetailSegments(location.pathname);
       // Full page navigation — the reload will re-initialise tenant state,
       // so we intentionally skip setTenant to avoid a broken intermediate render.
-      window.location.href = buildTenantUrl(target.tenant_id, location.pathname, location.search, location.hash);
+      window.location.href = buildTenantUrl(target.tenant_id, safePath);
     } else {
       setTenant(target);
     }

openaev-front/src/utils/url-helper.ts

@@ -27,7 +27,25 @@ export const TENANT_URI = '/api/tenants';
  */
 export const DEFAULT_TENANT_UUID = '2cffad3a-0001-4078-b0e2-ef74274022c3';
 
-const UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+export const UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
+/**
+ * Strips entity-specific detail segments from a path so that a tenant switch
+ * lands on the parent list page rather than a detail page for a resource
+ * that may not exist in the target tenant.
+ *
+ * e.g. "/admin/scenarios/123e4567-e89b-12d3-a456-426614174000"
+ *        → "/admin/scenarios"
+ *      "/admin/scenarios/123e4567-e89b-12d3-a456-426614174000/injects"
+ *        → "/admin/scenarios"
+ *      "/admin/scenarios" → "/admin/scenarios" (unchanged)
+ */
+export const stripDetailSegments = (pathname: string): string => {
+  const segments = pathname.split('/').filter(Boolean);
+  const uuidIndex = segments.findIndex(s => UUID_REGEX.test(s));
+  if (uuidIndex === -1) return pathname;
+  return '/' + segments.slice(0, uuidIndex).join('/');
+};
 
 // ---------------------------------------------------------------------------
 // URL helpers