Skip to content

The open alternative to Salesforce, designed for AI.

Simplify settings-shell opening in `useNavigateSettings` and add routed side-panel test (#25187)

Félix Malfait1b800899d1d4
diff --git a/packages/twenty-front/src/hooks/__tests__/useNavigateSettings.test.tsx b/packages/twenty-front/src/hooks/__tests__/useNavigateSettings.test.tsx
index 1b53151e8ae..ecd3c8cf756 100644
--- a/packages/twenty-front/src/hooks/__tests__/useNavigateSettings.test.tsx
+++ b/packages/twenty-front/src/hooks/__tests__/useNavigateSettings.test.tsx
@@ -36,6 +36,26 @@ const SidePanelWrapper = ({ children }: { children: React.ReactNode }) => (
</MemoryRouter>
);
+const RoutedSidePanelWrapper = ({
+ children,
+}: {
+ children: React.ReactNode;
+}) => (
+ <MemoryRouter>
+ <WorkspaceSurfaceContext.Provider
+ value={{
+ type: 'side-panel',
+ instanceId: 'side-panel-page',
+ ownsRouteLocation: true,
+ headerTitlePortal: null,
+ headerActionsPortal: null,
+ }}
+ >
+ {children}
+ </WorkspaceSurfaceContext.Provider>
+ </MemoryRouter>
+);
+
describe('useNavigateSettings', () => {
const mockNavigate = jest.fn();
@@ -95,18 +115,31 @@ describe('useNavigateSettings', () => {
expect(mockNavigate).toHaveBeenCalledWith('/settings/accounts', options);
});
- it('opens settings when a legacy side-panel page escapes to main', () => {
+ it('opens settings when a legacy side-panel page navigates to settings', () => {
const { result } = renderHook(() => useNavigateSettings(), {
wrapper: SidePanelWrapper,
});
- result.current(SettingsPath.NewAccount, undefined, undefined, {
- surface: 'main',
- });
+ result.current(SettingsPath.NewAccount);
expect(openSettingsMenuMock).toHaveBeenCalledTimes(1);
- expect(mockNavigate).toHaveBeenCalledWith('/settings/accounts/new', {
- surface: 'main',
+ expect(mockNavigate).toHaveBeenCalledWith(
+ '/settings/accounts/new',
+ undefined,
+ );
+ });
+
+ it('leaves settings shell handling to a routed side-panel navigator', () => {
+ const { result } = renderHook(() => useNavigateSettings(), {
+ wrapper: RoutedSidePanelWrapper,
});
+
+ result.current(SettingsPath.NewAccount);
+
+ expect(openSettingsMenuMock).not.toHaveBeenCalled();
+ expect(mockNavigate).toHaveBeenCalledWith(
+ '/settings/accounts/new',
+ undefined,
+ );
});
});
diff --git a/packages/twenty-front/src/hooks/useNavigateSettings.ts b/packages/twenty-front/src/hooks/useNavigateSettings.ts
index 008fb22e044..3f05b927a3b 100644
--- a/packages/twenty-front/src/hooks/useNavigateSettings.ts
+++ b/packages/twenty-front/src/hooks/useNavigateSettings.ts
@@ -26,7 +26,7 @@ export const useNavigateSettings = () => {
if (
workspaceSurface.type === 'main' ||
- (options?.surface === 'main' && !workspaceSurface.ownsRouteLocation)
+ !workspaceSurface.ownsRouteLocation
) {
openSettingsMenu();
}