Skip to content

The open alternative to Salesforce, designed for AI.

Stop side panel URL changes from re-rendering the record index (#27438)

Charles Bochet8be960d5386e
diff --git a/packages/twenty-front/src/hooks/__tests__/useNavigateApp.test.tsx b/packages/twenty-front/src/hooks/__tests__/useNavigateApp.test.tsx
deleted file mode 100644
index dbf47630f26..00000000000
--- a/packages/twenty-front/src/hooks/__tests__/useNavigateApp.test.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import { MemoryRouter, useNavigate } from 'react-router-dom';
-
-import { CoreObjectNameSingular, AppPath } from 'twenty-shared/types';
-import { useNavigateApp } from '~/hooks/useNavigateApp';
-
-jest.mock('react-router-dom', () => ({
- ...jest.requireActual('react-router-dom'),
- useNavigate: jest.fn(),
-}));
-
-const Wrapper = ({ children }: { children: React.ReactNode }) => (
- <MemoryRouter>{children}</MemoryRouter>
-);
-
-describe('useNavigateApp', () => {
- const mockNavigate = jest.fn();
-
- beforeEach(() => {
- jest.clearAllMocks();
- (useNavigate as jest.Mock).mockReturnValue(mockNavigate);
- });
-
- it('should navigate to the correct path without params', () => {
- const { result } = renderHook(() => useNavigateApp(), {
- wrapper: Wrapper,
- });
-
- result.current(AppPath.Index);
-
- expect(mockNavigate).toHaveBeenCalledWith('/', undefined);
- });
-
- it('should navigate to the correct path with params', () => {
- const { result } = renderHook(() => useNavigateApp(), {
- wrapper: Wrapper,
- });
-
- result.current(AppPath.RecordShowPage, {
- objectNameSingular: CoreObjectNameSingular.Company,
- objectRecordId: '123',
- });
-
- expect(mockNavigate).toHaveBeenCalledWith('/object/company/123', undefined);
- });
-
- it('should navigate with query params', () => {
- const { result } = renderHook(() => useNavigateApp(), {
- wrapper: Wrapper,
- });
-
- const queryParams = { viewId: '123', filter: 'test' };
- result.current(AppPath.Index, undefined, queryParams);
-
- expect(mockNavigate).toHaveBeenCalledWith(
- '/?viewId=123&filter=test',
- undefined,
- );
- });
-
- it('should navigate with options', () => {
- const { result } = renderHook(() => useNavigateApp(), {
- wrapper: Wrapper,
- });
-
- const options = { replace: true, state: { test: true } };
- result.current(AppPath.Index, undefined, undefined, options);
-
- expect(mockNavigate).toHaveBeenCalledWith('/', options);
- });
-});
diff --git a/packages/twenty-front/src/hooks/useNavigateApp.ts b/packages/twenty-front/src/hooks/useNavigateApp.ts
index e0f37af96c5..933a7ce5bfb 100644
--- a/packages/twenty-front/src/hooks/useNavigateApp.ts
+++ b/packages/twenty-front/src/hooks/useNavigateApp.ts
@@ -1,13 +1,14 @@
-import { useCallback } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useCallback, useContext } from 'react';
import { type AppPath, type NavigateOptions } from 'twenty-shared/types';
-import { getAppPath } from 'twenty-shared/utils';
+import { assertIsDefinedOrThrow, getAppPath } from 'twenty-shared/utils';
+
+import { AppNavigatorContext } from '@/app/contexts/AppNavigatorContext';
type NavigateAppOptions = NavigateOptions;
// Stable across renders so effects can depend on it.
export const useNavigateApp = () => {
- const navigate = useNavigate();
+ const appNavigator = useContext(AppNavigatorContext);
return useCallback(
<T extends AppPath>(
@@ -16,10 +17,18 @@ export const useNavigateApp = () => {
queryParams?: Record<string, any>,
options?: NavigateAppOptions,
) => {
+ assertIsDefinedOrThrow(appNavigator);
+
const path = getAppPath(to, params, queryParams);
- return navigate(path, options);
+ if (options?.replace === true) {
+ appNavigator.replace(path, options.state, options);
+
+ return;
+ }
+
+ appNavigator.push(path, options?.state, options);
},
- [navigate],
+ [appNavigator],
);
};
diff --git a/packages/twenty-front/src/modules/ai/hooks/__tests__/useNavigateToAiChatPage.test.tsx b/packages/twenty-front/src/modules/ai/hooks/__tests__/useNavigateToAiChatPage.test.tsx
index 42ede01a9bb..df9ecd511f1 100644
--- a/packages/twenty-front/src/modules/ai/hooks/__tests__/useNavigateToAiChatPage.test.tsx
+++ b/packages/twenty-front/src/modules/ai/hooks/__tests__/useNavigateToAiChatPage.test.tsx
@@ -5,6 +5,10 @@ import { i18n } from '@lingui/core';
import { I18nProvider } from '@lingui/react';
import { useNavigateToAiChatPage } from '@/ai/hooks/useNavigateToAiChatPage';
+import {
+ type AppNavigator,
+ AppNavigatorContext,
+} from '@/app/contexts/AppNavigatorContext';
import { useExpandAskAiSidePanelPage } from '@/side-panel/pages/ask-ai/hooks/useExpandAskAiSidePanelPage';
import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
@@ -12,10 +16,10 @@ import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
const navigateMock = jest.fn();
const closeSidePanelMenuMock = jest.fn();
-jest.mock('react-router-dom', () => ({
- ...jest.requireActual('react-router-dom'),
- useNavigate: () => navigateMock,
-}));
+const appNavigator: AppNavigator = {
+ push: navigateMock,
+ replace: navigateMock,
+};
jest.mock('@/side-panel/hooks/useSidePanelMenu', () => ({
useSidePanelMenu: () => ({ closeSidePanelMenu: closeSidePanelMenuMock }),
@@ -23,7 +27,9 @@ jest.mock('@/side-panel/hooks/useSidePanelMenu', () => ({
const Wrapper = ({ children }: { children: ReactNode }) => (
<I18nProvider i18n={i18n}>
- <JotaiProvider store={jotaiStore}>{children}</JotaiProvider>
+ <AppNavigatorContext.Provider value={appNavigator}>
+ <JotaiProvider store={jotaiStore}>{children}</JotaiProvider>
+ </AppNavigatorContext.Provider>
</I18nProvider>
);
@@ -82,9 +88,11 @@ describe('useNavigateToAiChatPage', () => {
});
expect(closeSidePanelMenuMock).toHaveBeenCalled();
- expect(navigateMock).toHaveBeenCalledWith('/chat', {
- state: { returnLocation: '/objects/people' },
- });
+ expect(navigateMock).toHaveBeenCalledWith(
+ '/chat',
+ { returnLocation: '/objects/people' },
+ { state: { returnLocation: '/objects/people' } },
+ );
});
it('should keep the current view and query in the return location', () => {
@@ -98,9 +106,11 @@ describe('useNavigateToAiChatPage', () => {
result.current.navigateToAiChatPage();
});
- expect(navigateMock).toHaveBeenCalledWith('/chat', {
- state: { returnLocation: '/objects/people?viewId=42' },
- });
+ expect(navigateMock).toHaveBeenCalledWith(
+ '/chat',
+ { returnLocation: '/objects/people?viewId=42' },
+ { state: { returnLocation: '/objects/people?viewId=42' } },
+ );
});
it('should open an existing thread', () => {
@@ -117,6 +127,7 @@ describe('useNavigateToAiChatPage', () => {
expect(navigateMock).toHaveBeenCalledWith(
'/chat/20202020-0000-4000-8000-000000000001',
expect.anything(),
+ expect.anything(),
);
});
@@ -129,7 +140,11 @@ describe('useNavigateToAiChatPage', () => {
result.current.navigateToAiChatPage({ threadId: 'new-thread-draft' });
});
- expect(navigateMock).toHaveBeenCalledWith('/chat', expect.anything());
+ expect(navigateMock).toHaveBeenCalledWith(
+ '/chat',
+ expect.anything(),
+ expect.anything(),
+ );
});
it('should not navigate while already on the AI chat page', () => {
diff --git a/packages/twenty-front/src/modules/app/components/AppNavigatorProvider.tsx b/packages/twenty-front/src/modules/app/components/AppNavigatorProvider.tsx
new file mode 100644
index 00000000000..7e6c27272b2
--- /dev/null
+++ b/packages/twenty-front/src/modules/app/components/AppNavigatorProvider.tsx
@@ -0,0 +1,31 @@
+import { type ReactNode, useMemo } from 'react';
+import { type DataRouter } from 'react-router-dom';
+
+import {
+ type AppNavigator,
+ AppNavigatorContext,
+} from '@/app/contexts/AppNavigatorContext';
+
+type AppNavigatorProviderProps = {
+ router: DataRouter;
+ children: ReactNode;
+};
+
+export const AppNavigatorProvider = ({
+ router,
+ children,
+}: AppNavigatorProviderProps) => {
+ const appNavigator = useMemo<AppNavigator>(
+ () => ({
+ push: (to, state) => router.navigate(to, { state }),
+ replace: (to, state) => router.navigate(to, { replace: true, state }),
+ }),
+ [router],
+ );
+
+ return (
+ <AppNavigatorContext.Provider value={appNavigator}>
+ {children}
+ </AppNavigatorContext.Provider>
+ );
+};
diff --git a/packages/twenty-front/src/modules/app/components/RootApp.tsx b/packages/twenty-front/src/modules/app/components/RootApp.tsx
index 0450ded6fd8..af893e9a66d 100644
--- a/packages/twenty-front/src/modules/app/components/RootApp.tsx
+++ b/packages/twenty-front/src/modules/app/components/RootApp.tsx
@@ -1,9 +1,14 @@
import { RouterProvider } from 'react-router-dom';
+import { AppNavigatorProvider } from '@/app/components/AppNavigatorProvider';
import { useCreateRootAppRouter } from '@/app/hooks/useCreateRootAppRouter';
export const RootApp = () => {
+ const router = useCreateRootAppRouter();
+
return (
- <RouterProvider router={useCreateRootAppRouter()} useTransitions={false} />
+ <AppNavigatorProvider router={router}>
+ <RouterProvider router={router} useTransitions={false} />
+ </AppNavigatorProvider>
);
};
diff --git a/packages/twenty-front/src/modules/app/components/WorkspaceApp.tsx b/packages/twenty-front/src/modules/app/components/WorkspaceApp.tsx
index dcf9c4f6160..c1b53d8126d 100644
--- a/packages/twenty-front/src/modules/app/components/WorkspaceApp.tsx
+++ b/packages/twenty-front/src/modules/app/components/WorkspaceApp.tsx
@@ -1,5 +1,6 @@
import { RouterProvider } from 'react-router-dom';
+import { AppNavigatorProvider } from '@/app/components/AppNavigatorProvider';
import { useCreateWorkspaceAppRouter } from '@/app/hooks/useCreateWorkspaceAppRouter';
import { currentUserState } from '@/auth/states/currentUserState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
@@ -11,10 +12,11 @@ export const WorkspaceApp = () => {
(currentUser?.canImpersonate || currentUser?.canAccessFullAdminPanel) ??
false;
+ const router = useCreateWorkspaceAppRouter({ isAdminPageEnabled });
+
return (
- <RouterProvider
- useTransitions={false}
- router={useCreateWorkspaceAppRouter({ isAdminPageEnabled })}
- />
+ <AppNavigatorProvider router={router}>
+ <RouterProvider useTransitions={false} router={router} />
+ </AppNavigatorProvider>
);
};
diff --git a/packages/twenty-front/src/modules/app/components/WorkspaceAppPageTitle.tsx b/packages/twenty-front/src/modules/app/components/WorkspaceAppPageTitle.tsx
new file mode 100644
index 00000000000..3c52980ca4f
--- /dev/null
+++ b/packages/twenty-front/src/modules/app/components/WorkspaceAppPageTitle.tsx
@@ -0,0 +1,10 @@
+import { useLocation } from 'react-router-dom';
+
+import { PageTitle } from '@/ui/utilities/page-title/components/PageTitle';
+import { getPageTitleFromPath } from '~/utils/title-utils';
+
+export const WorkspaceAppPageTitle = () => {
+ const { pathname } = useLocation();
+
+ return <PageTitle title={getPageTitleFromPath(pathname)} />;
+};
diff --git a/packages/twenty-front/src/modules/app/components/WorkspaceAppProviders.tsx b/packages/twenty-front/src/modules/app/components/WorkspaceAppProviders.tsx
index 5163b8ebf32..3282c2d41b1 100644
--- a/packages/twenty-front/src/modules/app/components/WorkspaceAppProviders.tsx
+++ b/packages/twenty-front/src/modules/app/components/WorkspaceAppProviders.tsx
@@ -1,9 +1,10 @@
import { StrictMode } from 'react';
-import { Outlet, useLocation } from 'react-router-dom';
+import { Outlet } from 'react-router-dom';
import { AgentChatProvider } from '@/ai/components/AgentChatProvider';
import { TrackPageViewEffect } from '@/analytics/components/TrackPageViewEffect';
import { SharedAppProviders } from '@/app/components/SharedAppProviders';
+import { WorkspaceAppPageTitle } from '@/app/components/WorkspaceAppPageTitle';
import { GotoHotkeysEffectsProvider } from '@/app/effect-components/GotoHotkeysEffectsProvider';
import { InitializeQueryParamStateEffect } from '@/app/effect-components/InitializeQueryParamStateEffect';
import { PageChangeEffect } from '@/app/effect-components/PageChangeEffect';
@@ -36,15 +37,10 @@ import { GlobalFilePreviewModal } from '@/ui/field/display/components/GlobalFile
import { UserThemeProviderEffect } from '@/ui/theme/components/UserThemeProviderEffect';
import { UserUiScaleProviderEffect } from '@/ui/theme/components/UserUiScaleProviderEffect';
import { PageFavicon } from '@/ui/utilities/page-favicon/components/PageFavicon';
-import { PageTitle } from '@/ui/utilities/page-title/components/PageTitle';
import { UserContextProvider } from '@/users/components/UserContextProvider';
import { WorkspaceProviderEffect } from '@/workspace/components/WorkspaceProviderEffect';
-import { getPageTitleFromPath } from '~/utils/title-utils';
export const WorkspaceAppProviders = () => {
- const { pathname } = useLocation();
- const pageTitle = getPageTitleFromPath(pathname);
-
return (
<SharedAppProviders>
<UserMetadataProviderInitialEffect />
@@ -74,7 +70,7 @@ export const WorkspaceAppProviders = () => {
<PromiseRejectionEffect />
<EndTrialAfterPaymentMethodGater />
<GotoHotkeysEffectsProvider />
- <PageTitle title={pageTitle} />
+ <WorkspaceAppPageTitle />
<PageFavicon />
<RecordCreationFormProvider>
<Outlet />
diff --git a/packages/twenty-front/src/modules/app/contexts/AppNavigatorContext.ts b/packages/twenty-front/src/modules/app/contexts/AppNavigatorContext.ts
new file mode 100644
index 00000000000..d6c759dbf7a
--- /dev/null
+++ b/packages/twenty-front/src/modules/app/contexts/AppNavigatorContext.ts
@@ -0,0 +1,6 @@
+import { createContext } from 'react';
+import { type Navigator } from 'react-router-dom';
+
+export type AppNavigator = Pick<Navigator, 'push' | 'replace'>;
+
+export const AppNavigatorContext = createContext<AppNavigator | null>(null);
diff --git a/packages/twenty-front/src/modules/navigation/hooks/__tests__/useSwitchNavigationDrawerMode.test.tsx b/packages/twenty-front/src/modules/navigation/hooks/__tests__/useSwitchNavigationDrawerMode.test.tsx
index 91d58657501..46b74bbfa49 100644
--- a/packages/twenty-front/src/modules/navigation/hooks/__tests__/useSwitchNavigationDrawerMode.test.tsx
+++ b/packages/twenty-front/src/modules/navigation/hooks/__tests__/useSwitchNavigationDrawerMode.test.tsx
@@ -1,3 +1,4 @@
+import { MemoryRouterAppNavigatorProvider } from '~/testing/components/MemoryRouterAppNavigatorProvider';
import { useReturnFromExpandedAiChat } from '@/ai/hooks/useReturnFromExpandedAiChat';
import { useSwitchToNewAiChat } from '@/ai/hooks/useSwitchToNewAiChat';
import { useDefaultHomePagePath } from '@/navigation/hooks/useDefaultHomePagePath';
@@ -64,7 +65,11 @@ const renderSwitchNavigationDrawerMode = ({
{
wrapper: ({ children }: { children: ReactNode }) => (
<Provider store={store}>
- <MemoryRouter initialEntries={[pathname]}>{children}</MemoryRouter>
+ <MemoryRouter initialEntries={[pathname]}>
+ <MemoryRouterAppNavigatorProvider>
+ {children}
+ </MemoryRouterAppNavigatorProvider>
+ </MemoryRouter>
</Provider>
),
},
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsx
index 1b77140dd2a..dd2d61fca27 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsx
@@ -21,7 +21,7 @@ import { PageCardLayout } from '@/ui/layout/page/components/PageCardLayout';
import { PageTitle } from '@/ui/utilities/page-title/components/PageTitle';
import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext';
import { styled } from '@linaria/react';
-import { useCallback } from 'react';
+import { memo, useCallback } from 'react';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
const StyledIndexContainer = styled.div`
@@ -31,7 +31,7 @@ const StyledIndexContainer = styled.div`
width: 100%;
`;
-export const RecordIndexContainerGater = () => {
+export const RecordIndexContainerGater = memo(() => {
const setLastShowPageRecordId = useSetAtomComponentState(
lastShowPageRecordIdState,
);
@@ -121,4 +121,4 @@ export const RecordIndexContainerGater = () => {
</ViewComponentInstanceContext.Provider>
</RecordIndexContextProvider>
);
-};
+});
diff --git a/packages/twenty-front/src/modules/side-panel/routing/components/SidePanelRouteNavigatorProvider.tsx b/packages/twenty-front/src/modules/side-panel/routing/components/SidePanelRouteNavigatorProvider.tsx
index 2b5f28e7f88..f08e65852b1 100644
--- a/packages/twenty-front/src/modules/side-panel/routing/components/SidePanelRouteNavigatorProvider.tsx
+++ b/packages/twenty-front/src/modules/side-panel/routing/components/SidePanelRouteNavigatorProvider.tsx
@@ -1,3 +1,4 @@
+import { AppNavigatorContext } from '@/app/contexts/AppNavigatorContext';
import { useWorkspaceRouteObjects } from '@/app/routing/components/WorkspaceRouteObjectsProvider';
import { useSidePanelHistory } from '@/side-panel/hooks/useSidePanelHistory';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
@@ -114,7 +115,9 @@ export const SidePanelRouteNavigatorProvider = ({
return (
<UNSAFE_NavigationContext.Provider value={navigationContextValue}>
- {children}
+ <AppNavigatorContext.Provider value={navigator}>
+ {children}
+ </AppNavigatorContext.Provider>
</UNSAFE_NavigationContext.Provider>
);
};
diff --git a/packages/twenty-front/src/pages/ai-chat/__tests__/AiChatInboxPage.test.tsx b/packages/twenty-front/src/pages/ai-chat/__tests__/AiChatInboxPage.test.tsx
index d12073389e6..54a197d0a4f 100644
--- a/packages/twenty-front/src/pages/ai-chat/__tests__/AiChatInboxPage.test.tsx
+++ b/packages/twenty-front/src/pages/ai-chat/__tests__/AiChatInboxPage.test.tsx
@@ -1,3 +1,4 @@
+import { MemoryRouterAppNavigatorProvider } from '~/testing/components/MemoryRouterAppNavigatorProvider';
import { i18n } from '@lingui/core';
import { I18nProvider } from '@lingui/react';
import { fireEvent, render, screen } from '@testing-library/react';
@@ -174,9 +175,11 @@ const renderInbox = (path = `/inbox/${firstThread.id}`) =>
<JotaiProvider store={jotaiStore}>
<I18nProvider i18n={i18n}>
<MemoryRouter initialEntries={[path]}>
- <Routes>
- <Route path={AppPath.AiChatInbox} element={<AiChatInboxPage />} />
- </Routes>
+ <MemoryRouterAppNavigatorProvider>
+ <Routes>
+ <Route path={AppPath.AiChatInbox} element={<AiChatInboxPage />} />
+ </Routes>
+ </MemoryRouterAppNavigatorProvider>
</MemoryRouter>
</I18nProvider>
</JotaiProvider>,
diff --git a/packages/twenty-front/src/testing/components/MemoryRouterAppNavigatorProvider.tsx b/packages/twenty-front/src/testing/components/MemoryRouterAppNavigatorProvider.tsx
new file mode 100644
index 00000000000..891b00e4846
--- /dev/null
+++ b/packages/twenty-front/src/testing/components/MemoryRouterAppNavigatorProvider.tsx
@@ -0,0 +1,29 @@
+import { type ReactNode, useMemo } from 'react';
+import { useNavigate } from 'react-router-dom';
+
+import {
+ type AppNavigator,
+ AppNavigatorContext,
+} from '@/app/contexts/AppNavigatorContext';
+
+export const MemoryRouterAppNavigatorProvider = ({
+ children,
+}: {
+ children: ReactNode;
+}) => {
+ const navigate = useNavigate();
+
+ const appNavigator = useMemo<AppNavigator>(
+ () => ({
+ push: (to, state) => navigate(to, { state }),
+ replace: (to, state) => navigate(to, { replace: true, state }),
+ }),
+ [navigate],
+ );
+
+ return (
+ <AppNavigatorContext.Provider value={appNavigator}>
+ {children}
+ </AppNavigatorContext.Provider>
+ );
+};
diff --git a/packages/twenty-front/src/testing/decorators/ComponentWithRouterDecorator.tsx b/packages/twenty-front/src/testing/decorators/ComponentWithRouterDecorator.tsx
index cb5d498f1cb..d27ebae3760 100644
--- a/packages/twenty-front/src/testing/decorators/ComponentWithRouterDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/ComponentWithRouterDecorator.tsx
@@ -1,3 +1,4 @@
+import { AppNavigatorProvider } from '@/app/components/AppNavigatorProvider';
import { type JSX } from 'react';
import { type Decorator } from '@storybook/react-vite';
import {
@@ -48,19 +49,20 @@ const createRouter = ({
);
export const ComponentWithRouterDecorator: Decorator = (Story, { args }) => {
+ const router = createRouter({
+ Story,
+ args,
+ initialEntries:
+ args.routePath &&
+ typeof args.routePath === 'string' &&
+ (args.routeParams === undefined || isRouteParams(args.routeParams))
+ ? [computeLocation(args.routePath, args.routeParams)]
+ : [{ pathname: '/' }],
+ });
+
return (
- <RouterProvider
- useTransitions={false}
- router={createRouter({
- Story,
- args,
- initialEntries:
- args.routePath &&
- typeof args.routePath === 'string' &&
- (args.routeParams === undefined || isRouteParams(args.routeParams))
- ? [computeLocation(args.routePath, args.routeParams)]
- : [{ pathname: '/' }],
- })}
- />
+ <AppNavigatorProvider router={router}>
+ <RouterProvider useTransitions={false} router={router} />
+ </AppNavigatorProvider>
);
};
diff --git a/packages/twenty-front/src/testing/decorators/MemoryRouterDecorator.tsx b/packages/twenty-front/src/testing/decorators/MemoryRouterDecorator.tsx
index 2ef126518c7..e08c68d3cd6 100644
--- a/packages/twenty-front/src/testing/decorators/MemoryRouterDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/MemoryRouterDecorator.tsx
@@ -1,8 +1,11 @@
+import { MemoryRouterAppNavigatorProvider } from '~/testing/components/MemoryRouterAppNavigatorProvider';
import { type Decorator } from '@storybook/react-vite';
import { MemoryRouter } from 'react-router-dom';
export const MemoryRouterDecorator: Decorator = (Story) => (
<MemoryRouter>
- <Story />
+ <MemoryRouterAppNavigatorProvider>
+ <Story />
+ </MemoryRouterAppNavigatorProvider>
</MemoryRouter>
);
diff --git a/packages/twenty-front/src/testing/decorators/PageDecorator.tsx b/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
index 2dc5ecdf734..efd643b3deb 100644
--- a/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
@@ -1,3 +1,4 @@
+import { AppNavigatorProvider } from '@/app/components/AppNavigatorProvider';
import { WorkspaceRouteObjectsProvider } from '@/app/routing/components/WorkspaceRouteObjectsProvider';
import { type WorkspaceRouteObject } from '@/app/routing/types/WorkspaceRouteObject';
import { ClientConfigProviderEffect } from '@/client-config/components/ClientConfigProviderEffect';
@@ -170,16 +171,17 @@ export const PageDecorator: Decorator<{
additionalRoutes?: string[];
searchParams?: RouteParams;
}> = (Story, { args }) => {
+ const router = createRouter({
+ Story,
+ args,
+ initialEntries: [
+ computeLocation(args.routePath, args.routeParams, args.searchParams),
+ ],
+ });
+
return (
- <RouterProvider
- useTransitions={false}
- router={createRouter({
- Story,
- args,
- initialEntries: [
- computeLocation(args.routePath, args.routeParams, args.searchParams),
- ],
- })}
- />
+ <AppNavigatorProvider router={router}>
+ <RouterProvider useTransitions={false} router={router} />
+ </AppNavigatorProvider>
);
};