fix(settings routing): handle trailing slashes in base paths (#10055)

Adjusted URL construction to properly handle trailing slashes in base
paths, ensuring consistent matching logic. Added logic for setting the
hotkey scope when navigating to the domain settings path.

packages/twenty-front/src/hooks/__tests__/useIsMatchingLocation.test.tsx

@@ -1,39 +1,74 @@
-import { MemoryRouter } from 'react-router-dom';
 import { renderHook } from '@testing-library/react';
+import { useIsMatchingLocation } from '../useIsMatchingLocation';
+import { MemoryRouter } from 'react-router-dom';
+import { AppBasePath } from '@/types/AppBasePath';
 
-import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
+const Wrapper =
-
+  (initialIndex = 0) =>
-const Wrapper = ({ children }: { children: React.ReactNode }) => (
+  ({ children }: { children: React.ReactNode }) => (
-  <MemoryRouter
+    <MemoryRouter
-    initialEntries={['/one', '/two', { pathname: '/three' }]}
+      initialEntries={['/example', '/other', `${AppBasePath.Settings}/example`]}
-    initialIndex={1}
+      initialIndex={initialIndex}
-  >
+    >
-    {children}
+      {children}
-  </MemoryRouter>
+    </MemoryRouter>
-);
+  );
 
 describe('useIsMatchingLocation', () => {
-  it('should return true for a matching location', () => {
+  it('returns true when paths match with no basePath', () => {
-    const { result } = renderHook(
+    const { result } = renderHook(() => useIsMatchingLocation(), {
-      () => {
+      wrapper: Wrapper(),
-        const checkMatchingLocation = useIsMatchingLocation();
+    });
-        return checkMatchingLocation('/two');
-      },
-      { wrapper: Wrapper },
-    );
 
-    expect(result.current).toBe(true);
+    expect(result.current.isMatchingLocation('/example')).toBe(true);
   });
 
-  it('should return false for a non-matching location', () => {
+  it('returns false when paths do not match with no basePath', () => {
-    const { result } = renderHook(
+    const { result } = renderHook(() => useIsMatchingLocation(), {
-      () => {
+      wrapper: Wrapper(),
-        const checkMatchingLocation = useIsMatchingLocation();
+    });
-        return checkMatchingLocation('/four');
-      },
-      { wrapper: Wrapper },
-    );
 
-    expect(result.current).toBe(false);
+    expect(result.current.isMatchingLocation('/non-match')).toBe(false);
+  });
+
+  it('returns true when paths match with basePath', () => {
+    const { result } = renderHook(() => useIsMatchingLocation(), {
+      wrapper: Wrapper(2),
+    });
+
+    expect(
+      result.current.isMatchingLocation('example', AppBasePath.Settings),
+    ).toBe(true);
+  });
+
+  it('returns false when paths do not match with basePath', () => {
+    const { result } = renderHook(() => useIsMatchingLocation(), {
+      wrapper: Wrapper(),
+    });
+
+    expect(
+      result.current.isMatchingLocation('non-match', AppBasePath.Settings),
+    ).toBe(false);
+  });
+
+  it('handles trailing slashes in basePath correctly', () => {
+    const { result } = renderHook(() => useIsMatchingLocation(), {
+      wrapper: Wrapper(2),
+    });
+
+    expect(
+      result.current.isMatchingLocation(
+        'example',
+        (AppBasePath.Settings + '/') as AppBasePath,
+      ),
+    ).toBe(true);
+  });
+
+  it('handles without basePath correctly', () => {
+    const { result } = renderHook(() => useIsMatchingLocation(), {
+      wrapper: Wrapper(),
+    });
+
+    expect(result.current.isMatchingLocation('example')).toBe(true);
   });
 });

packages/twenty-front/src/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts

@@ -30,9 +30,9 @@ jest.mock('~/hooks/useIsMatchingLocation');
 const mockUseIsMatchingLocation = jest.mocked(useIsMatchingLocation);
 
 const setupMockIsMatchingLocation = (pathname: string) => {
-  mockUseIsMatchingLocation.mockReturnValueOnce(
+  mockUseIsMatchingLocation.mockReturnValueOnce({
-    (path: string) => path === pathname,
+    isMatchingLocation: (path: string) => path === pathname,
-  );
+  });
 };
 
 jest.mock('@/auth/hooks/useIsLogged');

packages/twenty-front/src/hooks/useIsMatchingLocation.ts

@@ -1,19 +1,32 @@
-import { useCallback } from 'react';
 import { matchPath, useLocation } from 'react-router-dom';
 
 import { AppBasePath } from '@/types/AppBasePath';
+import { isNonEmptyString } from '@sniptt/guards';
+import { isDefined } from 'twenty-shared';
 
 export const useIsMatchingLocation = () => {
   const location = useLocation();
 
-  return useCallback(
+  const addTrailingSlash = (path: string) =>
-    (path: string, basePath?: AppBasePath) => {
+    path.endsWith('/') ? path : path + '/';
-      const constructedPath = basePath
-        ? (new URL(basePath + path, document.location.origin).pathname ?? '')
-        : path;
 
-      return !!matchPath(constructedPath, location.pathname);
+  const getConstructedPath = (path: string, basePath?: AppBasePath) => {
-    },
+    if (!isNonEmptyString(basePath)) return path;
-    [location.pathname],
+
-  );
+    return addTrailingSlash(basePath) + path;
+  };
+
+  const isMatchingLocation = (path: string, basePath?: AppBasePath) => {
+    const match = matchPath(
+      getConstructedPath(path, basePath),
+      location.pathname,
+    );
+    const isMatching = isDefined(match);
+
+    return isMatching;
+  };
+
+  return {
+    isMatchingLocation,
+  };
 };

packages/twenty-front/src/hooks/usePageChangeEffectNavigateLocation.ts

@@ -8,7 +8,7 @@ import { OnboardingStatus } from '~/generated/graphql';
 import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
 
 export const usePageChangeEffectNavigateLocation = () => {
-  const isMatchingLocation = useIsMatchingLocation();
+  const { isMatchingLocation } = useIsMatchingLocation();
   const isLoggedIn = useIsLogged();
   const onboardingStatus = useOnboardingStatus();
   const isWorkspaceSuspended = useIsWorkspaceActivationStatusSuspended();

packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts

@@ -24,7 +24,7 @@ export const useApolloFactory = (options: Partial<Options<any>> = {}) => {
   const [isDebugMode] = useRecoilState(isDebugModeState);
 
   const navigate = useNavigate();
-  const isMatchingLocation = useIsMatchingLocation();
+  const { isMatchingLocation } = useIsMatchingLocation();
   const [tokenPair, setTokenPair] = useRecoilState(tokenPairState);
   const [currentWorkspace, setCurrentWorkspace] = useRecoilState(
     currentWorkspaceState,

packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx

@@ -29,7 +29,7 @@ import { usePageChangeEffectNavigateLocation } from '~/hooks/usePageChangeEffect
 //  - moved usePageChangeEffectNavigateLocation into dedicated hook
 export const PageChangeEffect = () => {
   const navigate = useNavigate();
-  const isMatchingLocation = useIsMatchingLocation();
+  const { isMatchingLocation } = useIsMatchingLocation();
 
   const [previousLocation, setPreviousLocation] = useState('');
 
@@ -140,6 +140,13 @@ export const PageChangeEffect = () => {
         });
         break;
       }
+      case isMatchingLocation(SettingsPath.Domain, AppBasePath.Settings): {
+        setHotkeyScope(PageHotkeyScope.Settings, {
+          goto: false,
+          keyboardShortcutMenu: true,
+        });
+        break;
+      }
       case isMatchingLocation(
         SettingsPath.WorkspaceMembersPage,
         AppBasePath.Settings,

packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts

@@ -24,7 +24,7 @@ export const useSignInUp = (form: UseFormReturn<Form>) => {
   const [signInUpStep, setSignInUpStep] = useRecoilState(signInUpStepState);
   const [signInUpMode, setSignInUpMode] = useRecoilState(signInUpModeState);
 
-  const isMatchingLocation = useIsMatchingLocation();
+  const { isMatchingLocation } = useIsMatchingLocation();
 
   const workspaceInviteHash = useParams().workspaceInviteHash;
   const [searchParams] = useSearchParams();

packages/twenty-front/src/modules/ui/layout/hooks/__tests__/useShowAuthModal.test.tsx

@@ -34,9 +34,9 @@ jest.mock('~/hooks/useIsMatchingLocation');
 const mockUseIsMatchingLocation = jest.mocked(useIsMatchingLocation);
 
 const setupMockIsMatchingLocation = (pathname: string) => {
-  mockUseIsMatchingLocation.mockReturnValueOnce(
+  mockUseIsMatchingLocation.mockReturnValueOnce({
-    (path: string) => path === pathname,
+    isMatchingLocation: (path: string) => path === pathname,
-  );
+  });
 };
 
 const getResult = (isDefaultLayoutAuthModalVisible = true) =>

packages/twenty-front/src/modules/ui/layout/hooks/useShowAuthModal.ts

@@ -11,7 +11,7 @@ import { OnboardingStatus, SubscriptionStatus } from '~/generated/graphql';
 import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
 
 export const useShowAuthModal = () => {
-  const isMatchingLocation = useIsMatchingLocation();
+  const { isMatchingLocation } = useIsMatchingLocation();
   const isLoggedIn = useIsLogged();
   const onboardingStatus = useOnboardingStatus();
   const subscriptionStatus = useSubscriptionStatus();

packages/twenty-front/src/modules/users/components/UserProvider.tsx

@@ -10,7 +10,7 @@ import { UserOrMetadataLoader } from '~/loading/components/UserOrMetadataLoader'
 
 export const UserProvider = ({ children }: React.PropsWithChildren) => {
   const isCurrentUserLoaded = useRecoilValue(isCurrentUserLoadedState);
-  const isMatchingLocation = useIsMatchingLocation();
+  const { isMatchingLocation } = useIsMatchingLocation();
 
   const dateTimeFormat = useRecoilValue(dateTimeFormatState);