Skip to content

The open alternative to Salesforce, designed for AI.

Store the page layout target in the side panel navigation item (#27645)

Félix Malfait2045d18fdbf0
diff --git a/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx b/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx
index 72d5a4f8206..6bc644c4c23 100644
--- a/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx
+++ b/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx
@@ -4,10 +4,12 @@ import { isAppEffectRedirectEnabledState } from '@/auth/states/isAppEffectRedire
import { useReturnToPath } from '@/auth/hooks/useReturnToPath';
import { useIsOnAuthOrOnboardingPage } from '@/auth/hooks/useIsOnAuthOrOnboardingPage';
import { isLogConsoleFullScreenState } from '@/log-console/states/isLogConsoleFullScreenState';
+import { useSidePanelHistory } from '@/side-panel/hooks/useSidePanelHistory';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
import { SIDE_PANEL_PATH_SEARCH_PARAM } from '@/side-panel/routing/constants/SidePanelPathSearchParam';
import { isWorkspaceLocationAvailableOnSurface } from '@/app/routing/utils/isWorkspaceLocationAvailableOnSurface';
import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';
+import { sidePanelNavigationStackState } from '@/side-panel/states/sidePanelNavigationStackState';
import { sidePanelPageInfoSelector } from '@/side-panel/states/sidePanelPageInfoSelector';
import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';
import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState';
@@ -100,6 +102,7 @@ export const PageChangeEffect = () => {
);
const { closeSidePanelMenu } = useSidePanelMenu();
+ const { removePageFromSidePanelHistory } = useSidePanelHistory();
const { saveReturnToPath, getReturnToPath, clearReturnToPath } =
useReturnToPath();
@@ -122,6 +125,15 @@ export const PageChangeEffect = () => {
if (!shouldKeepSidePanelOpen) {
closeSidePanelMenu();
+ } else {
+ // Leaving a page ends the layout edit it hosted, so its page layout
+ // pages must not be reachable again through the panel history
+ store
+ .get(sidePanelNavigationStackState.atom)
+ .filter((navigationItem) =>
+ isDefined(navigationItem.pageLayoutSidePanelTarget),
+ )
+ .forEach(({ pageId }) => removePageFromSidePanelHistory(pageId));
}
}
@@ -143,6 +155,7 @@ export const PageChangeEffect = () => {
store,
hasRoutedSidePanelTarget,
closeSidePanelMenu,
+ removePageFromSidePanelHistory,
]);
useEffect(() => {
diff --git a/packages/twenty-front/src/modules/app/effect-components/__tests__/PageChangeEffect.test.tsx b/packages/twenty-front/src/modules/app/effect-components/__tests__/PageChangeEffect.test.tsx
new file mode 100644
index 00000000000..e6290cc256e
--- /dev/null
+++ b/packages/twenty-front/src/modules/app/effect-components/__tests__/PageChangeEffect.test.tsx
@@ -0,0 +1,119 @@
+import { i18n } from '@lingui/core';
+import { I18nProvider } from '@lingui/react';
+import { act, render, waitFor } from '@testing-library/react';
+import { type ReactNode } from 'react';
+import { MemoryRouter, useNavigate } from 'react-router-dom';
+import { SidePanelPages } from 'twenty-shared/types';
+import { IconSettings } from 'twenty-ui/icon';
+
+import { PageChangeEffect } from '@/app/effect-components/PageChangeEffect';
+import { WorkspaceRouteObjectsContext } from '@/app/routing/components/WorkspaceRouteObjectsProvider';
+import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';
+import {
+ type SidePanelNavigationStackItem,
+ sidePanelNavigationStackState,
+} from '@/side-panel/states/sidePanelNavigationStackState';
+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
+import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';
+
+jest.mock('@/app/hooks/usePageChangeEffectNavigateLocation', () => ({
+ usePageChangeEffectNavigateLocation: () => undefined,
+}));
+
+const WIDGET_SETTINGS_PAGE: SidePanelNavigationStackItem = {
+ page: SidePanelPages.PageLayoutWidgetSettings,
+ pageTitle: 'Widget',
+ pageIcon: IconSettings,
+ pageId: 'widget-settings-page-id',
+ pageLayoutSidePanelTarget: {
+ pageLayoutId: 'company-page-layout-id',
+ targetRecordIdentifier: {
+ id: 'company-record-id',
+ targetObjectNameSingular: 'company',
+ },
+ },
+};
+
+const RECORD_PAGE: SidePanelNavigationStackItem = {
+ page: SidePanelPages.RoutedPage,
+ pageTitle: 'Person',
+ pageIcon: IconSettings,
+ pageId: 'record-page-id',
+ routedLocation: {
+ pathname: '/object/person/person-record-id',
+ search: '',
+ hash: '',
+ state: null,
+ key: 'record-page',
+ },
+};
+
+let navigateMainPage: ((path: string) => void) | undefined;
+
+const MainPageNavigatorEffect = () => {
+ const navigate = useNavigate();
+
+ navigateMainPage = navigate;
+
+ return null;
+};
+
+const renderPageChangeEffect = () => {
+ const BaseWrapper = getJestMetadataAndApolloMocksWrapper({
+ apolloMocks: [],
+ });
+
+ const wrapper = ({ children }: { children: ReactNode }) => (
+ <BaseWrapper>
+ <I18nProvider i18n={i18n}>
+ <MemoryRouter initialEntries={['/object/company/company-record-id']}>
+ <WorkspaceRouteObjectsContext.Provider value={[]}>
+ {children}
+ <MainPageNavigatorEffect />
+ </WorkspaceRouteObjectsContext.Provider>
+ </MemoryRouter>
+ </I18nProvider>
+ </BaseWrapper>
+ );
+
+ render(<PageChangeEffect />, { wrapper });
+};
+
+const openSidePanelWith = (
+ sidePanelNavigationStack: SidePanelNavigationStackItem[],
+) => {
+ act(() => {
+ jotaiStore.set(isSidePanelOpenedState.atom, true);
+ jotaiStore.set(
+ sidePanelNavigationStackState.atom,
+ sidePanelNavigationStack,
+ );
+ });
+};
+
+describe('PageChangeEffect', () => {
+ it('should close a page layout page when leaving the page it edits', async () => {
+ renderPageChangeEffect();
+ openSidePanelWith([WIDGET_SETTINGS_PAGE]);
+
+ act(() => navigateMainPage?.('/objects/people'));
+
+ await waitFor(() => {
+ expect(jotaiStore.get(isSidePanelOpenedState.atom)).toBe(false);
+ });
+ });
+
+ it('should drop page layout pages from a panel that stays open when leaving the page they edit', async () => {
+ renderPageChangeEffect();
+ openSidePanelWith([WIDGET_SETTINGS_PAGE, RECORD_PAGE]);
+
+ act(() => navigateMainPage?.('/objects/people'));
+
+ await waitFor(() => {
+ expect(jotaiStore.get(sidePanelNavigationStackState.atom)).toEqual([
+ RECORD_PAGE,
+ ]);
+ });
+ expect(jotaiStore.get(isSidePanelOpenedState.atom)).toBe(true);
+ });
+});
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessOpenSidePanelPageEngineCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessOpenSidePanelPageEngineCommand.tsx
index aaeeb4d0a23..ba810364112 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessOpenSidePanelPageEngineCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessOpenSidePanelPageEngineCommand.tsx
@@ -1,7 +1,7 @@
import { HeadlessEngineCommandWrapperEffect } from '@/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect';
import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';
import { sidePanelSearchState } from '@/side-panel/states/sidePanelSearchState';
-import { type PurposeBuiltSidePanelPage } from '@/side-panel/types/SidePanelPage';
+import { type NonPageLayoutPurposeBuiltSidePanelPage } from '@/side-panel/types/SidePanelPage';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { type MessageDescriptor } from '@lingui/core';
import { t } from '@lingui/core/macro';
@@ -13,7 +13,7 @@ export const HeadlessOpenSidePanelPageEngineCommand = ({
pageIcon,
shouldResetSearchState = false,
}: {
- page: PurposeBuiltSidePanelPage;
+ page: NonPageLayoutPurposeBuiltSidePanelPage;
pageTitle: MessageDescriptor;
pageIcon: IconComponent;
shouldResetSearchState?: boolean;
diff --git a/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx b/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx
index 20414a28b85..f10052b468b 100644
--- a/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx
+++ b/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx
@@ -612,6 +612,24 @@ describe('useFrontComponentExecutionContext', () => {
expect(mockNavigateSidePanel).not.toHaveBeenCalled();
});
+ it('rejects page layout pages because they need the layout they edit', async () => {
+ const { result } = renderUseFrontComponentExecutionContext({
+ frontComponentId: FRONT_COMPONENT_ID,
+ });
+
+ await expect(
+ result.current.frontComponentHostCommunicationApi.openSidePanelPage({
+ page: SidePanelPages.DashboardChartSettings,
+ pageTitle: 'Chart',
+ pageIcon: 'IconChartPie',
+ }),
+ ).rejects.toThrow(
+ 'dashboard-chart-settings edits the page layout it was opened from and cannot be opened by a front component',
+ );
+
+ expect(mockNavigateSidePanel).not.toHaveBeenCalled();
+ });
+
it('maps legacy Copilot calls to AskAI', async () => {
const { result } = renderUseFrontComponentExecutionContext({
frontComponentId: FRONT_COMPONENT_ID,
diff --git a/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts b/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts
index e1a319fab02..33e66ba29e9 100644
--- a/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts
+++ b/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts
@@ -44,6 +44,7 @@ import { useOpenFrontComponentInSidePanel } from '@/side-panel/hooks/useOpenFron
import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSidePanel';
import { useOpenRichTextInSidePanel } from '@/side-panel/hooks/useOpenRichTextInSidePanel';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
+import { isPageLayoutSidePanelPage } from '@/side-panel/pages/page-layout/utils/isPageLayoutSidePanelPage';
import { useOpenRoutedPageInSidePanel } from '@/side-panel/routing/hooks/useOpenRoutedPageInSidePanel';
import { sidePanelSearchState } from '@/side-panel/states/sidePanelSearchState';
import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
@@ -390,6 +391,13 @@ export const useFrontComponentExecutionContext = ({
return;
}
+ if (isPageLayoutSidePanelPage(params.page)) {
+ throw new CustomError(
+ `${params.page} edits the page layout it was opened from and cannot be opened by a front component`,
+ 'FRONT_COMPONENT_PAGE_LAYOUT_SIDE_PANEL_PAGE_UNSUPPORTED',
+ );
+ }
+
navigateSidePanel({
page: params.page,
pageTitle: params.pageTitle,
diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutRenderer.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutRenderer.tsx
index 60b0d7efeed..9b522409ad8 100644
--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutRenderer.tsx
+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutRenderer.tsx
@@ -5,6 +5,7 @@ import { PageLayoutRendererContent } from '@/page-layout/components/PageLayoutRe
import { PageLayoutComponentInstanceContext } from '@/page-layout/states/contexts/PageLayoutComponentInstanceContext';
import { RecordTableWidgetViewDraftsInitializationEffect } from '@/page-layout/widgets/record-table/components/RecordTableWidgetViewDraftsInitializationEffect';
import { getTabListInstanceIdFromPageLayoutAndRecord } from '@/page-layout/utils/getTabListInstanceIdFromPageLayoutAndRecord';
+import { PageLayoutSidePanelTargetProvider } from '@/side-panel/pages/page-layout/components/PageLayoutSidePanelTargetProvider';
import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';
import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';
import { TabListComponentInstanceContext } from '@/ui/layout/tab-list/states/contexts/TabListComponentInstanceContext';
@@ -42,15 +43,20 @@ export const PageLayoutRenderer = ({
instanceId: tabListInstanceId,
}}
>
- <PageLayoutEditModeProvider
- layoutType={layoutType}
- pageLayoutId={pageLayoutId}
+ <PageLayoutSidePanelTargetProvider
+ pageLayoutId={pageLayoutComponentInstanceId}
+ targetRecordIdentifier={targetRecordIdentifier}
>
- <PageLayoutInitializationQueryEffect pageLayoutId={pageLayoutId} />
- <PageLayoutRecordPageCustomizationSessionRegistrationEffect />
- <RecordTableWidgetViewDraftsInitializationEffect />
- <PageLayoutRendererContent />
- </PageLayoutEditModeProvider>
+ <PageLayoutEditModeProvider
+ layoutType={layoutType}
+ pageLayoutId={pageLayoutId}
+ >
+ <PageLayoutInitializationQueryEffect pageLayoutId={pageLayoutId} />
+ <PageLayoutRecordPageCustomizationSessionRegistrationEffect />
+ <RecordTableWidgetViewDraftsInitializationEffect />
+ <PageLayoutRendererContent />
+ </PageLayoutEditModeProvider>
+ </PageLayoutSidePanelTargetProvider>
</TabListComponentInstanceContext.Provider>
</PageLayoutComponentInstanceContext.Provider>
);
diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutSingleTabRenderer.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutSingleTabRenderer.tsx
index 8ae1550b496..0fa4b72f2fa 100644
--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutSingleTabRenderer.tsx
+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutSingleTabRenderer.tsx
@@ -17,6 +17,7 @@ import { getTabLayoutMode } from '@/page-layout/utils/getTabLayoutMode';
import { getTabListInstanceIdFromPageLayoutAndRecord } from '@/page-layout/utils/getTabListInstanceIdFromPageLayoutAndRecord';
import { getTabPresentation } from '@/page-layout/utils/getTabPresentation';
import { sortTabsByPosition } from '@/page-layout/utils/sortTabsByPosition';
+import { PageLayoutSidePanelTargetProvider } from '@/side-panel/pages/page-layout/components/PageLayoutSidePanelTargetProvider';
import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';
import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';
import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
@@ -149,15 +150,20 @@ export const PageLayoutSingleTabRenderer = ({
instanceId: tabListInstanceId,
}}
>
- <PageLayoutEditModeProvider
- layoutType={layoutType}
- pageLayoutId={pageLayoutId}
+ <PageLayoutSidePanelTargetProvider
+ pageLayoutId={pageLayoutComponentInstanceId}
+ targetRecordIdentifier={targetRecordIdentifier}
>
- <PageLayoutInitializationQueryEffect pageLayoutId={pageLayoutId} />
- <PageLayoutRecordPageCustomizationSessionRegistrationEffect />
- <RecordTableWidgetViewDraftsInitializationEffect />
- <PageLayoutSingleTabRendererContent />
- </PageLayoutEditModeProvider>
+ <PageLayoutEditModeProvider
+ layoutType={layoutType}
+ pageLayoutId={pageLayoutId}
+ >
+ <PageLayoutInitializationQueryEffect pageLayoutId={pageLayoutId} />
+ <PageLayoutRecordPageCustomizationSessionRegistrationEffect />
+ <RecordTableWidgetViewDraftsInitializationEffect />
+ <PageLayoutSingleTabRendererContent />
+ </PageLayoutEditModeProvider>
+ </PageLayoutSidePanelTargetProvider>
</TabListComponentInstanceContext.Provider>
</PageLayoutComponentInstanceContext.Provider>
);
diff --git a/packages/twenty-front/src/modules/page-layout/components/__stories__/PageLayoutTabList.stories.tsx b/packages/twenty-front/src/modules/page-layout/components/__stories__/PageLayoutTabList.stories.tsx
index 4d7f99d47f3..08e89a15d3e 100644
--- a/packages/twenty-front/src/modules/page-layout/components/__stories__/PageLayoutTabList.stories.tsx
+++ b/packages/twenty-front/src/modules/page-layout/components/__stories__/PageLayoutTabList.stories.tsx
@@ -12,7 +12,8 @@ import { pageLayoutTabSettingsOpenTabIdComponentState } from '@/page-layout/stat
import { sidePanelNavigationStackState } from '@/side-panel/states/sidePanelNavigationStackState';
import { sidePanelPageInfoSelector } from '@/side-panel/states/sidePanelPageInfoSelector';
import { SidePanelPageComponentInstanceContext } from '@/side-panel/states/contexts/SidePanelPageComponentInstanceContext';
-import { SidePanelPageLayoutInfoContent } from '@/side-panel/components/SidePanelPageLayoutInfoContent';
+import { SidePanelPageLayoutInfo } from '@/side-panel/components/SidePanelPageLayoutInfo';
+import { PageLayoutSidePanelTargetProvider } from '@/side-panel/pages/page-layout/components/PageLayoutSidePanelTargetProvider';
import { TabListComponentInstanceContext } from '@/ui/layout/tab-list/states/contexts/TabListComponentInstanceContext';
import { SidePanelPages } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
@@ -210,7 +211,7 @@ const PageLayoutTabListPlayground = ({
<SidePanelPageComponentInstanceContext.Provider
value={{ instanceId: sidePanelPageInfo.instanceId }}
>
- <SidePanelPageLayoutInfoContent pageLayoutId="instance-id" />
+ <SidePanelPageLayoutInfo pageLayoutId="instance-id" />
</SidePanelPageComponentInstanceContext.Provider>
)}
</StyledContainer>
@@ -292,11 +293,22 @@ const meta: Meta<typeof PageLayoutTabListPlayground> = {
targetRecordIdentifier: undefined,
}}
>
- <TabListComponentInstanceContext.Provider
- value={{ instanceId: 'page-layout-tab-list-story' }}
+ <PageLayoutSidePanelTargetProvider
+ pageLayoutId="instance-id"
+ targetRecordIdentifier={{
+ id: 'record-id',
+ targetObjectNameSingular:
+ args.presentation === 'identifier-bar'
+ ? 'company'
+ : 'dashboard',
+ }}
>
- <Story />
- </TabListComponentInstanceContext.Provider>
+ <TabListComponentInstanceContext.Provider
+ value={{ instanceId: 'page-layout-tab-list-story' }}
+ >
+ <Story />
+ </TabListComponentInstanceContext.Provider>
+ </PageLayoutSidePanelTargetProvider>
</LayoutRenderingProvider>
</PageLayoutComponentInstanceContext.Provider>
</PageLayoutEditModeProviderContext>
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/__stories__/RecordPageNoteWidget.stories.tsx b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/__stories__/RecordPageNoteWidget.stories.tsx
index c6a4fedba79..e1f792bd3ee 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/__stories__/RecordPageNoteWidget.stories.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/__stories__/RecordPageNoteWidget.stories.tsx
@@ -1,7 +1,3 @@
-import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';
-import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState';
-import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
-import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';
import { metadataStoreState } from '@/metadata-store/states/metadataStoreState';
import { PageLayoutContentProvider } from '@/page-layout/contexts/PageLayoutContentContext';
@@ -23,6 +19,7 @@ import { createDefaultStandaloneRichTextWidget } from '@/page-layout/utils/creat
import { RecordPageAddWidgetSection } from '@/page-layout/widgets/components/RecordPageAddWidgetSection';
import { WidgetCardShell } from '@/page-layout/widgets/components/WidgetCardShell';
import { useOpenWidgetSettingsInSidePanel } from '@/side-panel/hooks/useOpenWidgetSettingsInSidePanel';
+import { PageLayoutSidePanelTargetProvider } from '@/side-panel/pages/page-layout/components/PageLayoutSidePanelTargetProvider';
import { SidePanelPageLayoutRecordPageWidgetTypeSelect } from '@/side-panel/pages/page-layout/components/SidePanelPageLayoutRecordPageWidgetTypeSelect';
import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';
import { sidePanelPageInfoSelector } from '@/side-panel/states/sidePanelPageInfoSelector';
@@ -59,6 +56,10 @@ const NOTE_WIDGET = createDefaultStandaloneRichTextWidget({
const DRAFT_ATOM = pageLayoutDraftComponentState.atomFamily({
instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
});
+const TARGET_RECORD_IDENTIFIER = {
+ id: 'company-record',
+ targetObjectNameSingular: 'company',
+};
const EDITING_WIDGET_ATOM = pageLayoutEditingWidgetIdComponentState.atomFamily({
instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
});
@@ -186,18 +187,6 @@ const meta: Meta<typeof RecordPageNoteWidgetStory> = {
}),
'tab-1',
);
- jotaiStore.set(
- contextStoreCurrentObjectMetadataItemIdComponentState.atomFamily({
- instanceId: MAIN_CONTEXT_STORE_INSTANCE_ID,
- }),
- company.id,
- );
- jotaiStore.set(
- contextStoreTargetedRecordsRuleComponentState.atomFamily({
- instanceId: MAIN_CONTEXT_STORE_INSTANCE_ID,
- }),
- { mode: 'selection', selectedRecordIds: ['company-record'] },
- );
},
decorators: [
ToastDecorator,
@@ -207,14 +196,12 @@ const meta: Meta<typeof RecordPageNoteWidgetStory> = {
<LayoutRenderingProvider
value={{
layoutType: args.layoutType,
- targetRecordIdentifier: {
- id: 'company-record',
- targetObjectNameSingular: 'company',
- },
+ targetRecordIdentifier: TARGET_RECORD_IDENTIFIER,
}}
>
- <ContextStoreComponentInstanceContext.Provider
- value={{ instanceId: MAIN_CONTEXT_STORE_INSTANCE_ID }}
+ <PageLayoutSidePanelTargetProvider
+ pageLayoutId={PAGE_LAYOUT_TEST_INSTANCE_ID}
+ targetRecordIdentifier={TARGET_RECORD_IDENTIFIER}
>
<PageLayoutContentProvider
value={{
@@ -227,7 +214,7 @@ const meta: Meta<typeof RecordPageNoteWidgetStory> = {
<Story />
</div>
</PageLayoutContentProvider>
- </ContextStoreComponentInstanceContext.Provider>
+ </PageLayoutSidePanelTargetProvider>
</LayoutRenderingProvider>
</PageLayoutTestWrapper>
</MemoryRouter>
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx
index 3c16714bcc0..24766cff675 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx
@@ -5,7 +5,6 @@ import { SidePanelMultipleRecordsInfo } from '@/side-panel/components/SidePanelM
import { HeaderIdentifier } from '@/ui/layout/page/components/HeaderIdentifier';
import { SidePanelPageLayoutInfo } from '@/side-panel/components/SidePanelPageLayoutInfo';
import { SidePanelWorkflowStepInfo } from '@/side-panel/components/SidePanelWorkflowStepInfo';
-import { isPageLayoutSidePanelPage } from '@/side-panel/pages/page-layout/utils/isPageLayoutSidePanelPage';
import { SidePanelPages } from 'twenty-shared/types';
import { type SidePanelContextChipProps } from '@/side-panel/components/SidePanelContextChip';
@@ -36,12 +35,14 @@ export const SidePanelPageInfo = ({ pageChip }: SidePanelPageInfoProps) => {
);
}
- const isPageLayoutPage = pageChip.page?.page
- ? isPageLayoutSidePanelPage(pageChip.page.page)
- : false;
+ const pageLayoutSidePanelTarget = pageChip.page?.pageLayoutSidePanelTarget;
- if (isPageLayoutPage) {
- return <SidePanelPageLayoutInfo />;
+ if (isDefined(pageLayoutSidePanelTarget)) {
+ return (
+ <SidePanelPageLayoutInfo
+ pageLayoutId={pageLayoutSidePanelTarget.pageLayoutId}
+ />
+ );
}
const isMultipleRecordsPage =
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelPageLayoutInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelPageLayoutInfo.tsx
index 6ea20fa9461..eb245be303c 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelPageLayoutInfo.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelPageLayoutInfo.tsx
@@ -1,13 +1,187 @@
-import { SidePanelPageLayoutInfoContent } from '@/side-panel/components/SidePanelPageLayoutInfoContent';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { t } from '@lingui/core/macro';
+import { useUpdatePageLayoutTab } from '@/page-layout/hooks/useUpdatePageLayoutTab';
+import { useUpdatePageLayoutWidget } from '@/page-layout/hooks/useUpdatePageLayoutWidget';
+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
+import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';
+import { pageLayoutTabSettingsOpenTabIdComponentState } from '@/page-layout/states/pageLayoutTabSettingsOpenTabIdComponentState';
+import { usePageLayoutHeaderInfo } from '@/side-panel/components/hooks/usePageLayoutHeaderInfo';
+import { useUpdateSidePanelPageInfo } from '@/side-panel/hooks/useUpdateSidePanelPageInfo';
+import { sidePanelPageInfoSelector } from '@/side-panel/states/sidePanelPageInfoSelector';
+import { sidePanelShouldFocusTitleInputComponentState } from '@/side-panel/states/sidePanelShouldFocusTitleInputComponentState';
+import { IconPicker } from '@/ui/input/components/IconPicker';
+import { TitleInput } from '@/ui/input/components/TitleInput';
+import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { css } from '@linaria/core';
+import { styled } from '@linaria/react';
+import { isNonEmptyString } from '@sniptt/guards';
+import { useState } from 'react';
+import { SidePanelPages } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { useIcons } from 'twenty-ui/icon';
+import { useTheme } from 'twenty-ui/theme';
+import { HeaderIdentifier } from '@/ui/layout/page/components/HeaderIdentifier';
-export const SidePanelPageLayoutInfo = () => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+const StyledClickableIconWrapper = styled.div`
+ cursor: pointer;
+ display: flex;
+ line-height: 0;
+`;
- if (!isDefined(pageLayoutId)) {
+const iconPickerContainerStyles = css`
+ display: flex;
+ line-height: 0;
+`;
+
+export const SidePanelPageLayoutInfo = ({
+ pageLayoutId,
+}: {
+ pageLayoutId: string;
+}) => {
+ const theme = useTheme();
+ const { getIcon } = useIcons();
+ const sidePanelPageInfo = useAtomStateValue(sidePanelPageInfoSelector);
+ const sidePanelPage = sidePanelPageInfo.page;
+
+ const [sidePanelShouldFocusTitleInput, setSidePanelShouldFocusTitleInput] =
+ useAtomComponentState(
+ sidePanelShouldFocusTitleInputComponentState,
+ sidePanelPageInfo.instanceId,
+ );
+
+ const handleTitleInputOpen = () => {
+ setSidePanelShouldFocusTitleInput(false);
+ };
+
+ const pageLayoutDraft = useAtomComponentStateValue(
+ pageLayoutDraftComponentState,
+ pageLayoutId,
+ );
+
+ const pageLayoutEditingWidgetId = useAtomComponentStateValue(
+ pageLayoutEditingWidgetIdComponentState,
+ pageLayoutId,
+ );
+
+ const [pageLayoutTabSettingsOpenTabId] = useAtomComponentState(
+ pageLayoutTabSettingsOpenTabIdComponentState,
+ pageLayoutId,
+ );
+
+ const { updateSidePanelPageInfo } = useUpdateSidePanelPageInfo();
+ const { updatePageLayoutWidget } = useUpdatePageLayoutWidget(pageLayoutId);
+ const { updatePageLayoutTab } = useUpdatePageLayoutTab(pageLayoutId);
+
+ const [editedTitle, setEditedTitle] = useState<string | null>(null);
+
+ const headerInfo = usePageLayoutHeaderInfo({
+ sidePanelPage,
+ draftPageLayout: pageLayoutDraft,
+ pageLayoutEditingWidgetId,
+ openTabId: pageLayoutTabSettingsOpenTabId,
+ editedTitle,
+ });
+
+ if (!headerInfo) {
return null;
}
- return <SidePanelPageLayoutInfoContent pageLayoutId={pageLayoutId} />;
+ const {
+ headerIcon,
+ headerIconColor,
+ headerType,
+ title,
+ isReadonly,
+ tab,
+ widgetInEditMode,
+ isIconEditable,
+ selectedIconKey,
+ } = headerInfo;
+
+ const Icon = headerIcon ?? getIcon('IconDefault');
+
+ const handleTitleChange = (newTitle: string) => {
+ setEditedTitle(newTitle);
+ };
+
+ const saveTitle = async () => {
+ const finalTitle = editedTitle ?? title;
+
+ if (!isNonEmptyString(finalTitle)) {
+ return;
+ }
+
+ updateSidePanelPageInfo({
+ pageTitle: finalTitle,
+ pageIcon: Icon,
+ });
+
+ if (
+ sidePanelPage === SidePanelPages.PageLayoutTabSettings &&
+ isDefined(tab)
+ ) {
+ updatePageLayoutTab(tab.id, { title: finalTitle });
+ } else if (isDefined(widgetInEditMode)) {
+ updatePageLayoutWidget(widgetInEditMode.id, {
+ title: finalTitle,
+ });
+ }
+
+ setEditedTitle(null);
+ };
+
+ const renderedIcon = isDefined(headerIcon) ? (
+ <Icon size={theme.icon.size.md} stroke={theme.icon.stroke.sm} />
+ ) : undefined;
+
+ const handleIconChange = ({ iconKey }: { iconKey: string }) => {
+ if (!isDefined(tab)) {
+ return;
+ }
+
+ updatePageLayoutTab(tab.id, { icon: iconKey });
+ };
+
+ const iconElement =
+ isIconEditable && isDefined(tab) ? (
+ <IconPicker
+ dropdownId={`page-layout-tab-icon-picker-${tab.id}`}
+ selectedIconKey={selectedIconKey ?? undefined}
+ onChange={handleIconChange}
+ className={iconPickerContainerStyles}
+ clickableComponent={
+ <StyledClickableIconWrapper aria-label={t`Choose icon`}>
+ {renderedIcon}
+ </StyledClickableIconWrapper>
+ }
+ />
+ ) : (
+ renderedIcon
+ );
+
+ return (
+ <HeaderIdentifier
+ icon={iconElement}
+ iconColor={headerIconColor}
+ title={
+ <TitleInput
+ instanceId={`page-layout-title-${sidePanelPage}-${pageLayoutId}`}
+ disabled={isReadonly}
+ sizeVariant="sm"
+ value={title}
+ onChange={handleTitleChange}
+ placeholder={headerType}
+ onEnter={saveTitle}
+ onEscape={() => setEditedTitle(null)}
+ onClickOutside={saveTitle}
+ onTab={saveTitle}
+ onShiftTab={saveTitle}
+ shouldFocus={sidePanelShouldFocusTitleInput}
+ onFocus={handleTitleInputOpen}
+ />
+ }
+ label={headerType}
+ />
+ );
};
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelPageLayoutInfoContent.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelPageLayoutInfoContent.tsx
deleted file mode 100644
index 17b242deed3..00000000000
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelPageLayoutInfoContent.tsx
+++ /dev/null
@@ -1,187 +0,0 @@
-import { t } from '@lingui/core/macro';
-import { useUpdatePageLayoutTab } from '@/page-layout/hooks/useUpdatePageLayoutTab';
-import { useUpdatePageLayoutWidget } from '@/page-layout/hooks/useUpdatePageLayoutWidget';
-import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
-import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';
-import { pageLayoutTabSettingsOpenTabIdComponentState } from '@/page-layout/states/pageLayoutTabSettingsOpenTabIdComponentState';
-import { usePageLayoutHeaderInfo } from '@/side-panel/components/hooks/usePageLayoutHeaderInfo';
-import { useUpdateSidePanelPageInfo } from '@/side-panel/hooks/useUpdateSidePanelPageInfo';
-import { sidePanelPageInfoSelector } from '@/side-panel/states/sidePanelPageInfoSelector';
-import { sidePanelShouldFocusTitleInputComponentState } from '@/side-panel/states/sidePanelShouldFocusTitleInputComponentState';
-import { IconPicker } from '@/ui/input/components/IconPicker';
-import { TitleInput } from '@/ui/input/components/TitleInput';
-import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { css } from '@linaria/core';
-import { styled } from '@linaria/react';
-import { isNonEmptyString } from '@sniptt/guards';
-import { useState } from 'react';
-import { SidePanelPages } from 'twenty-shared/types';
-import { isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/icon';
-import { useTheme } from 'twenty-ui/theme';
-import { HeaderIdentifier } from '@/ui/layout/page/components/HeaderIdentifier';
-
-const StyledClickableIconWrapper = styled.div`
- cursor: pointer;
- display: flex;
- line-height: 0;
-`;
-
-const iconPickerContainerStyles = css`
- display: flex;
- line-height: 0;
-`;
-
-export const SidePanelPageLayoutInfoContent = ({
- pageLayoutId,
-}: {
- pageLayoutId: string;
-}) => {
- const theme = useTheme();
- const { getIcon } = useIcons();
- const sidePanelPageInfo = useAtomStateValue(sidePanelPageInfoSelector);
- const sidePanelPage = sidePanelPageInfo.page;
-
- const [sidePanelShouldFocusTitleInput, setSidePanelShouldFocusTitleInput] =
- useAtomComponentState(
- sidePanelShouldFocusTitleInputComponentState,
- sidePanelPageInfo.instanceId,
- );
-
- const handleTitleInputOpen = () => {
- setSidePanelShouldFocusTitleInput(false);
- };
-
- const pageLayoutDraft = useAtomComponentStateValue(
- pageLayoutDraftComponentState,
- pageLayoutId,
- );
-
- const pageLayoutEditingWidgetId = useAtomComponentStateValue(
- pageLayoutEditingWidgetIdComponentState,
- pageLayoutId,
- );
-
- const [pageLayoutTabSettingsOpenTabId] = useAtomComponentState(
- pageLayoutTabSettingsOpenTabIdComponentState,
- pageLayoutId,
- );
-
- const { updateSidePanelPageInfo } = useUpdateSidePanelPageInfo();
- const { updatePageLayoutWidget } = useUpdatePageLayoutWidget(pageLayoutId);
- const { updatePageLayoutTab } = useUpdatePageLayoutTab(pageLayoutId);
-
- const [editedTitle, setEditedTitle] = useState<string | null>(null);
-
- const headerInfo = usePageLayoutHeaderInfo({
- sidePanelPage,
- draftPageLayout: pageLayoutDraft,
- pageLayoutEditingWidgetId,
- openTabId: pageLayoutTabSettingsOpenTabId,
- editedTitle,
- });
-
- if (!headerInfo) {
- return null;
- }
-
- const {
- headerIcon,
- headerIconColor,
- headerType,
- title,
- isReadonly,
- tab,
- widgetInEditMode,
- isIconEditable,
- selectedIconKey,
- } = headerInfo;
-
- const Icon = headerIcon ?? getIcon('IconDefault');
-
- const handleTitleChange = (newTitle: string) => {
- setEditedTitle(newTitle);
- };
-
- const saveTitle = async () => {
- const finalTitle = editedTitle ?? title;
-
- if (!isNonEmptyString(finalTitle)) {
- return;
- }
-
- updateSidePanelPageInfo({
- pageTitle: finalTitle,
- pageIcon: Icon,
- });
-
- if (
- sidePanelPage === SidePanelPages.PageLayoutTabSettings &&
- isDefined(tab)
- ) {
- updatePageLayoutTab(tab.id, { title: finalTitle });
- } else if (isDefined(widgetInEditMode)) {
- updatePageLayoutWidget(widgetInEditMode.id, {
- title: finalTitle,
- });
- }
-
- setEditedTitle(null);
- };
-
- const renderedIcon = isDefined(headerIcon) ? (
- <Icon size={theme.icon.size.md} stroke={theme.icon.stroke.sm} />
- ) : undefined;
-
- const handleIconChange = ({ iconKey }: { iconKey: string }) => {
- if (!isDefined(tab)) {
- return;
- }
-
- updatePageLayoutTab(tab.id, { icon: iconKey });
- };
-
- const iconElement =
- isIconEditable && isDefined(tab) ? (
- <IconPicker
- dropdownId={`page-layout-tab-icon-picker-${tab.id}`}
- selectedIconKey={selectedIconKey ?? undefined}
- onChange={handleIconChange}
- className={iconPickerContainerStyles}
- clickableComponent={
- <StyledClickableIconWrapper aria-label={t`Choose icon`}>
- {renderedIcon}
- </StyledClickableIconWrapper>
- }
- />
- ) : (
- renderedIcon
- );
-
- return (
- <HeaderIdentifier
- icon={iconElement}
- iconColor={headerIconColor}
- title={
- <TitleInput
- instanceId={`page-layout-title-${sidePanelPage}-${pageLayoutId}`}
- disabled={isReadonly}
- sizeVariant="sm"
- value={title}
- onChange={handleTitleChange}
- placeholder={headerType}
- onEnter={saveTitle}
- onEscape={() => setEditedTitle(null)}
- onClickOutside={saveTitle}
- onTab={saveTitle}
- onShiftTab={saveTitle}
- shouldFocus={sidePanelShouldFocusTitleInput}
- onFocus={handleTitleInputOpen}
- />
- }
- label={headerType}
- />
- );
-};
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelRouter.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelRouter.tsx
index b77de005eb0..343c48e67db 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelRouter.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelRouter.tsx
@@ -1,18 +1,14 @@
import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
import { CommandMenuContextProvider } from '@/command-menu-item/contexts/CommandMenuContextProvider';
-import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';
-import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState';
-import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
import { SidePanelContainer } from '@/side-panel/components/SidePanelContainer';
import { SidePanelSubPageRouter } from '@/side-panel/components/SidePanelSubPageRouter';
import { SidePanelTopBar } from '@/side-panel/components/SidePanelTopBar';
import { SIDE_PANEL_PAGES_CONFIG } from '@/side-panel/constants/SidePanelPagesConfig';
-import { isPageLayoutSidePanelPage } from '@/side-panel/pages/page-layout/utils/isPageLayoutSidePanelPage';
+import { PageLayoutSidePanelTargetContext } from '@/side-panel/pages/page-layout/contexts/PageLayoutSidePanelTargetContext';
import { SidePanelPageComponentInstanceContext } from '@/side-panel/states/contexts/SidePanelPageComponentInstanceContext';
import { sidePanelNavigationStackState } from '@/side-panel/states/sidePanelNavigationStackState';
import { WorkspaceSurfaceContext } from '@/ui/layout/contexts/WorkspaceSurfaceContext';
import { WorkspaceSurfaceHeaderPortalContext } from '@/ui/layout/contexts/WorkspaceSurfaceHeaderPortalContext';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { styled } from '@linaria/react';
import { motion } from 'framer-motion';
@@ -37,29 +33,10 @@ export const SidePanelRouter = () => {
currentNavigationItem?.page ?? SidePanelPages.CommandMenuDisplay;
const sidePanelPageInstanceId = currentNavigationItem?.pageId ?? '';
- const contextStoreTargetedRecordsRule = useAtomComponentStateValue(
- contextStoreTargetedRecordsRuleComponentState,
- MAIN_CONTEXT_STORE_INSTANCE_ID,
- );
- const contextStoreCurrentObjectMetadataItemId = useAtomComponentStateValue(
- contextStoreCurrentObjectMetadataItemIdComponentState,
- MAIN_CONTEXT_STORE_INSTANCE_ID,
- );
-
- const hasSingleTargetedRecord =
- contextStoreTargetedRecordsRule.mode === 'selection' &&
- contextStoreTargetedRecordsRule.selectedRecordIds.length === 1;
-
- const shouldSkipPageLayoutPage =
- isDefined(sidePanelPage) &&
- isPageLayoutSidePanelPage(sidePanelPage) &&
- (!isDefined(contextStoreCurrentObjectMetadataItemId) ||
- !hasSingleTargetedRecord);
+ const pageLayoutSidePanelTarget =
+ currentNavigationItem?.pageLayoutSidePanelTarget ?? null;
- const rawPageComponent =
- isDefined(sidePanelPage) && !shouldSkipPageLayoutPage
- ? SIDE_PANEL_PAGES_CONFIG.get(sidePanelPage)
- : null;
+ const rawPageComponent = SIDE_PANEL_PAGES_CONFIG.get(sidePanelPage);
const sidePanelPageComponent =
isDefined(rawPageComponent) && React.isValidElement(rawPageComponent)
@@ -103,34 +80,38 @@ export const SidePanelRouter = () => {
<SidePanelPageComponentInstanceContext.Provider
value={{ instanceId: sidePanelPageInstanceId }}
>
- <WorkspaceSurfaceContext.Provider value={workspaceSurface}>
- <WorkspaceSurfaceHeaderPortalContext.Provider value={headerPortal}>
- <motion.div
- initial={{ opacity: 0 }}
- animate={{ opacity: 1 }}
- exit={{ opacity: 0 }}
- transition={{
- duration: theme.animation.duration.instant,
- delay: 0.1,
- }}
- >
- <SidePanelTopBar
- setHeaderTitlePortal={setHeaderTitlePortal}
- setHeaderActionsPortal={setHeaderActionsPortal}
- />
- </motion.div>
- <StyledSidePanelContent>
- <CommandMenuContextProvider
- displayType="listItem"
- containerType={CommandMenuItemContainerType.CommandMenuList}
+ <PageLayoutSidePanelTargetContext.Provider
+ value={pageLayoutSidePanelTarget}
+ >
+ <WorkspaceSurfaceContext.Provider value={workspaceSurface}>
+ <WorkspaceSurfaceHeaderPortalContext.Provider value={headerPortal}>
+ <motion.div
+ initial={{ opacity: 0 }}
+ animate={{ opacity: 1 }}
+ exit={{ opacity: 0 }}
+ transition={{
+ duration: theme.animation.duration.instant,
+ delay: 0.1,
+ }}
>
- <SidePanelSubPageRouter>
- {sidePanelPageComponent}
- </SidePanelSubPageRouter>
- </CommandMenuContextProvider>
- </StyledSidePanelContent>
- </WorkspaceSurfaceHeaderPortalContext.Provider>
- </WorkspaceSurfaceContext.Provider>
+ <SidePanelTopBar
+ setHeaderTitlePortal={setHeaderTitlePortal}
+ setHeaderActionsPortal={setHeaderActionsPortal}
+ />
+ </motion.div>
+ <StyledSidePanelContent>
+ <CommandMenuContextProvider
+ displayType="listItem"
+ containerType={CommandMenuItemContainerType.CommandMenuList}
+ >
+ <SidePanelSubPageRouter>
+ {sidePanelPageComponent}
+ </SidePanelSubPageRouter>
+ </CommandMenuContextProvider>
+ </StyledSidePanelContent>
+ </WorkspaceSurfaceHeaderPortalContext.Provider>
+ </WorkspaceSurfaceContext.Provider>
+ </PageLayoutSidePanelTargetContext.Provider>
</SidePanelPageComponentInstanceContext.Provider>
</SidePanelContainer>
);
diff --git a/packages/twenty-front/src/modules/side-panel/components/__tests__/SidePanelRouter.test.tsx b/packages/twenty-front/src/modules/side-panel/components/__tests__/SidePanelRouter.test.tsx
new file mode 100644
index 00000000000..ba770d7173d
--- /dev/null
+++ b/packages/twenty-front/src/modules/side-panel/components/__tests__/SidePanelRouter.test.tsx
@@ -0,0 +1,165 @@
+import { i18n } from '@lingui/core';
+import { I18nProvider } from '@lingui/react';
+import { render, screen } from '@testing-library/react';
+import { type getDefaultStore } from 'jotai';
+import { MemoryRouter } from 'react-router-dom';
+import { SidePanelPages } from 'twenty-shared/types';
+import { IconTable } from 'twenty-ui/icon';
+
+import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';
+import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState';
+import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
+import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';
+import {
+ makeDraft,
+ makeTab,
+ makeWidget,
+} from '@/page-layout/testing/pageLayoutDraftFixtures';
+import { SidePanelRouter } from '@/side-panel/components/SidePanelRouter';
+import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';
+import { sidePanelNavigationStackState } from '@/side-panel/states/sidePanelNavigationStackState';
+import { sidePanelSubPageStackComponentState } from '@/side-panel/states/sidePanelSubPageStackComponentState';
+import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';
+import {
+ PageLayoutType,
+ WidgetConfigurationType,
+ WidgetType,
+} from '~/generated-metadata/graphql';
+import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';
+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';
+
+// The full page configs pull in the BlockNote editor, which jest cannot parse
+jest.mock('@/side-panel/constants/SidePanelPagesConfig', () => {
+ const { SidePanelPages: Pages } = jest.requireActual('twenty-shared/types');
+ const { SidePanelDashboardRecordTableSettings } = jest.requireActual(
+ '@/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings',
+ );
+
+ return {
+ SIDE_PANEL_PAGES_CONFIG: new Map([
+ [
+ Pages.DashboardRecordTableSettings,
+ <SidePanelDashboardRecordTableSettings />,
+ ],
+ ]),
+ };
+});
+
+jest.mock(
+ '@/object-record/record-field/ui/form-types/components/FormRecordRichTextFieldInput',
+ () => ({ FormRecordRichTextFieldInput: () => null }),
+);
+
+const DASHBOARD_PAGE_LAYOUT_ID = 'dashboard-page-layout-id';
+const SIDE_PANEL_PAGE_ID = 'record-table-settings-page-id';
+
+const recordTableWidget = {
+ ...makeWidget('record-table-widget', 0),
+ title: 'Open deals',
+ type: WidgetType.RECORD_TABLE,
+ configuration: {
+ __typename: 'RecordTableConfiguration' as const,
+ configurationType: WidgetConfigurationType.RECORD_TABLE,
+ },
+};
+
+// Leaving the dashboard resets the main context store selection while the
+// side panel is still animating closed with its navigation stack intact
+const initializeStoreAfterLeavingDashboard = (
+ store: ReturnType<typeof getDefaultStore>,
+) => {
+ store.set(
+ pageLayoutDraftComponentState.atomFamily({
+ instanceId: DASHBOARD_PAGE_LAYOUT_ID,
+ }),
+ {
+ ...makeDraft([makeTab('tab-1', [recordTableWidget])]),
+ id: DASHBOARD_PAGE_LAYOUT_ID,
+ type: PageLayoutType.DASHBOARD,
+ },
+ );
+ store.set(
+ pageLayoutEditingWidgetIdComponentState.atomFamily({
+ instanceId: DASHBOARD_PAGE_LAYOUT_ID,
+ }),
+ recordTableWidget.id,
+ );
+ store.set(
+ contextStoreCurrentObjectMetadataItemIdComponentState.atomFamily({
+ instanceId: MAIN_CONTEXT_STORE_INSTANCE_ID,
+ }),
+ getMockObjectMetadataItemOrThrow('company').id,
+ );
+ store.set(
+ contextStoreTargetedRecordsRuleComponentState.atomFamily({
+ instanceId: MAIN_CONTEXT_STORE_INSTANCE_ID,
+ }),
+ { mode: 'selection', selectedRecordIds: [] },
+ );
+ store.set(isSidePanelOpenedState.atom, false);
+ store.set(sidePanelNavigationStackState.atom, [
+ {
+ page: SidePanelPages.DashboardRecordTableSettings,
+ pageTitle: 'Edit Record Table',
+ pageIcon: IconTable,
+ pageId: SIDE_PANEL_PAGE_ID,
+ pageLayoutSidePanelTarget: {
+ pageLayoutId: DASHBOARD_PAGE_LAYOUT_ID,
+ targetRecordIdentifier: {
+ id: 'dashboard-record-id',
+ targetObjectNameSingular: 'dashboard',
+ },
+ },
+ },
+ ]);
+};
+
+const renderSidePanelRouter = (
+ onInitializeJotaiStore: (store: ReturnType<typeof getDefaultStore>) => void,
+) => {
+ const Wrapper = getJestMetadataAndApolloMocksWrapper({
+ apolloMocks: [],
+ onInitializeJotaiStore,
+ });
+
+ render(
+ <Wrapper>
+ <I18nProvider i18n={i18n}>
+ <MemoryRouter>
+ <SidePanelRouter />
+ </MemoryRouter>
+ </I18nProvider>
+ </Wrapper>,
+ );
+};
+
+describe('SidePanelRouter', () => {
+ it('should keep showing a page layout page once the page behind it no longer targets its record', () => {
+ renderSidePanelRouter(initializeStoreAfterLeavingDashboard);
+
+ expect(screen.getByText('Open deals')).toBeInTheDocument();
+ expect(screen.getByText('Source')).toBeInTheDocument();
+ });
+
+ it('should keep showing a page layout sub page once the page behind it no longer targets its record', () => {
+ renderSidePanelRouter((store) => {
+ initializeStoreAfterLeavingDashboard(store);
+ store.set(
+ sidePanelSubPageStackComponentState.atomFamily({
+ instanceId: SIDE_PANEL_PAGE_ID,
+ }),
+ [
+ {
+ id: 'filter-sub-page-id',
+ subPage: SidePanelSubPages.PageLayoutRecordTableFilter,
+ title: 'Filters',
+ },
+ ],
+ );
+ });
+
+ expect(screen.getByText('Open deals')).toBeInTheDocument();
+ expect(screen.getByText('Filters')).toBeInTheDocument();
+ });
+});
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenWidgetSettingsInSidePanel.test.tsx b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenWidgetSettingsInSidePanel.test.tsx
index 0c629fbb308..d6d8266e38d 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenWidgetSettingsInSidePanel.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenWidgetSettingsInSidePanel.test.tsx
@@ -12,7 +12,6 @@ import {
} from '@/page-layout/testing/pageLayoutDraftFixtures';
import { useOpenWidgetSettingsInSidePanel } from '@/side-panel/hooks/useOpenWidgetSettingsInSidePanel';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
-import { useIsDashboardPageLayout } from '@/side-panel/pages/page-layout/hooks/useIsDashboardPageLayout';
import { useNavigatePageLayoutSidePanel } from '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel';
import { act, renderHook } from '@testing-library/react';
import { createStore } from 'jotai';
@@ -20,12 +19,12 @@ import { type ReactNode } from 'react';
import { SidePanelPages } from 'twenty-shared/types';
import {
PageLayoutTabLayoutMode,
+ PageLayoutType,
PageLayoutWidgetVerticalListHeightBehavior,
WidgetType,
} from '~/generated-metadata/graphql';
jest.mock('@/side-panel/hooks/useSidePanelMenu');
-jest.mock('@/side-panel/pages/page-layout/hooks/useIsDashboardPageLayout');
jest.mock(
'@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel',
);
@@ -50,7 +49,6 @@ describe('useOpenWidgetSettingsInSidePanel', () => {
(useSidePanelMenu as jest.Mock).mockReturnValue({
closeSidePanelMenu: mockCloseSidePanelMenu,
});
- (useIsDashboardPageLayout as jest.Mock).mockReturnValue(false);
(useNavigatePageLayoutSidePanel as jest.Mock).mockReturnValue({
navigatePageLayoutSidePanel: mockNavigatePageLayoutSidePanel,
});
@@ -58,12 +56,13 @@ describe('useOpenWidgetSettingsInSidePanel', () => {
const renderOpenWidgetSettingsHook = (
store: ReturnType<typeof createStore>,
+ layoutType: PageLayoutType = PageLayoutType.RECORD_PAGE,
) =>
renderHook(
() => useOpenWidgetSettingsInSidePanel(PAGE_LAYOUT_TEST_INSTANCE_ID),
{
wrapper: ({ children }: { children: ReactNode }) => (
- <PageLayoutTestWrapper store={store}>
+ <PageLayoutTestWrapper store={store} layoutType={layoutType}>
{children}
</PageLayoutTestWrapper>
),
@@ -207,14 +206,16 @@ describe('useOpenWidgetSettingsInSidePanel', () => {
it.each([false, true])(
'opens Note settings on record pages and keeps dashboard inline editing (dashboard: %s)',
(isDashboard) => {
- (useIsDashboardPageLayout as jest.Mock).mockReturnValue(isDashboard);
const store = createStore();
const widget = {
...makeWidget('note', 0),
type: WidgetType.STANDALONE_RICH_TEXT,
};
store.set(getDraftAtom(), makeDraft([makeTab('tab-1', [widget])]));
- const { result } = renderOpenWidgetSettingsHook(store);
+ const { result } = renderOpenWidgetSettingsHook(
+ store,
+ isDashboard ? PageLayoutType.DASHBOARD : PageLayoutType.RECORD_PAGE,
+ );
act(() =>
result.current.openWidgetSettingsInSidePanel({
widgetId: widget.id,
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelCloseAnimationCompleteCleanup.test.tsx b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelCloseAnimationCompleteCleanup.test.tsx
index 25c84a4e3ea..749ec3b7b6f 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelCloseAnimationCompleteCleanup.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelCloseAnimationCompleteCleanup.test.tsx
@@ -10,7 +10,8 @@ import { hasUserSelectedSidePanelListItemState } from '@/side-panel/states/hasUs
import { isSidePanelClosingState } from '@/side-panel/states/isSidePanelClosingState';
import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
-import { SidePanelPages } from 'twenty-shared/types';
+import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';
+import { CoreObjectNameSingular, SidePanelPages } from 'twenty-shared/types';
import { IconList } from 'twenty-ui/icon';
const mockCloseDropdown = jest.fn();
@@ -124,4 +125,50 @@ describe('useSidePanelCloseAnimationCompleteCleanup', () => {
SIDE_PANEL_CONTEXT_CHIP_GROUPS_DROPDOWN_ID,
);
});
+
+ it.each([
+ {
+ targetObjectNameSingular: CoreObjectNameSingular.Dashboard,
+ expectedEditingWidgetId: null,
+ },
+ {
+ targetObjectNameSingular: CoreObjectNameSingular.Company,
+ expectedEditingWidgetId: 'widget-id',
+ },
+ ])(
+ 'should clear the edited widget from the target of a closing $targetObjectNameSingular page layout page only for dashboards',
+ ({ targetObjectNameSingular, expectedEditingWidgetId }) => {
+ const editingWidgetIdAtom =
+ pageLayoutEditingWidgetIdComponentState.atomFamily({
+ instanceId: 'page-layout-id',
+ });
+
+ const { result } = renderHooks();
+
+ act(() => {
+ jotaiStore.set(editingWidgetIdAtom, 'widget-id');
+ jotaiStore.set(sidePanelNavigationStackState.atom, [
+ {
+ page: SidePanelPages.PageLayoutWidgetSettings,
+ pageTitle: 'Widget',
+ pageIcon: IconList,
+ pageId: 'widget-settings-page-id',
+ pageLayoutSidePanelTarget: {
+ pageLayoutId: 'page-layout-id',
+ targetRecordIdentifier: {
+ id: 'record-id',
+ targetObjectNameSingular,
+ },
+ },
+ },
+ ]);
+ });
+
+ act(() => {
+ result.current.sidePanelCloseAnimationCompleteCleanup();
+ });
+
+ expect(jotaiStore.get(editingWidgetIdAtom)).toBe(expectedEditingWidgetId);
+ },
+ );
});
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelExpandTarget.test.tsx b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelExpandTarget.test.tsx
index dbdb60c9930..6ff37b3044a 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelExpandTarget.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelExpandTarget.test.tsx
@@ -8,7 +8,7 @@ import {
type SidePanelNavigationStackItem,
sidePanelNavigationStackState,
} from '@/side-panel/states/sidePanelNavigationStackState';
-import { type ActiveSidePanelPage } from '@/side-panel/types/SidePanelPage';
+import { type NonPageLayoutPurposeBuiltSidePanelPage } from '@/side-panel/types/SidePanelPage';
import { type SidePanelExpandTarget } from '@/side-panel/types/SidePanelExpandTarget';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
import { IconDotsVertical } from 'twenty-ui/icon';
@@ -79,7 +79,11 @@ const wrapper = ({ children }: { children: ReactNode }) => (
<JotaiProvider store={jotaiStore}>{children}</JotaiProvider>
);
-const renderExpandTarget = (sidePanelPage: ActiveSidePanelPage) => {
+const renderExpandTarget = (
+ sidePanelPage:
+ | NonPageLayoutPurposeBuiltSidePanelPage
+ | SidePanelPages.RoutedPage,
+) => {
const navigationItem: SidePanelNavigationStackItem =
sidePanelPage === SidePanelPages.RoutedPage
? {
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenCampaignSidePanelPage.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenCampaignSidePanelPage.ts
index 3f16fb0aaa0..69a8faff7ca 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenCampaignSidePanelPage.ts
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenCampaignSidePanelPage.ts
@@ -4,7 +4,7 @@ import { type IconComponent } from 'twenty-ui/icon';
import { v4 } from 'uuid';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
-import { type PurposeBuiltSidePanelPage } from '@/side-panel/types/SidePanelPage';
+import { type NonPageLayoutPurposeBuiltSidePanelPage } from '@/side-panel/types/SidePanelPage';
import { type sendCampaignCampaignIdComponentState } from '@/side-panel/pages/send-campaign/states/sendCampaignCampaignIdComponentState';
type CampaignIdComponentState = typeof sendCampaignCampaignIdComponentState;
@@ -19,7 +19,7 @@ export const useOpenCampaignSidePanelPage = ({
pageIcon,
}: {
campaignIdComponentState: CampaignIdComponentState;
- page: PurposeBuiltSidePanelPage;
+ page: NonPageLayoutPurposeBuiltSidePanelPage;
pageTitle: string;
pageIcon: IconComponent;
}) => {
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenWidgetSettingsInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenWidgetSettingsInSidePanel.ts
index 220021cfee6..398ac4b1139 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenWidgetSettingsInSidePanel.ts
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenWidgetSettingsInSidePanel.ts
@@ -7,8 +7,8 @@ import { pageLayoutTabSettingsOpenTabIdComponentState } from '@/page-layout/stat
import { getIsSingleWidgetTab } from '@/page-layout/utils/getIsSingleWidgetTab';
import { isViewportFillingWidget } from '@/page-layout/widgets/utils/isViewportFillingWidget';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
-import { useIsDashboardPageLayout } from '@/side-panel/pages/page-layout/hooks/useIsDashboardPageLayout';
import { useNavigatePageLayoutSidePanel } from '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel';
+import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
@@ -17,6 +17,7 @@ import { SidePanelPages } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import {
PageLayoutTabLayoutMode,
+ PageLayoutType,
WidgetType,
} from '~/generated-metadata/graphql';
@@ -28,7 +29,8 @@ export const useOpenWidgetSettingsInSidePanel = (
pageLayoutIdFromProps,
);
- const isDashboardPageLayout = useIsDashboardPageLayout();
+ const { layoutType } = useLayoutRenderingContext();
+ const isDashboardPageLayout = layoutType === PageLayoutType.DASHBOARD;
const setPageLayoutEditingWidgetId = useSetAtomComponentState(
pageLayoutEditingWidgetIdComponentState,
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelCloseAnimationCompleteCleanup.ts b/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelCloseAnimationCompleteCleanup.ts
index de7424558f1..e688923515f 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelCloseAnimationCompleteCleanup.ts
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelCloseAnimationCompleteCleanup.ts
@@ -1,13 +1,9 @@
-import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';
-import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
-import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
import { pageLayoutDraggedAreaComponentState } from '@/page-layout/states/pageLayoutDraggedAreaComponentState';
import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';
import { pageLayoutTabSettingsOpenTabIdComponentState } from '@/page-layout/states/pageLayoutTabSettingsOpenTabIdComponentState';
import { widgetInsertionContextComponentState } from '@/page-layout/states/widgetInsertionContextComponentState';
import { SIDE_PANEL_CONTEXT_CHIP_GROUPS_DROPDOWN_ID } from '@/side-panel/constants/SidePanelContextChipGroupsDropdownId';
import { SIDE_PANEL_SELECTABLE_LIST_ID } from '@/side-panel/constants/SidePanelSelectableListId';
-import { isPageLayoutSidePanelPage } from '@/side-panel/pages/page-layout/utils/isPageLayoutSidePanelPage';
import { hasUserSelectedSidePanelListItemState } from '@/side-panel/states/hasUserSelectedSidePanelListItemState';
import { isSidePanelClosingState } from '@/side-panel/states/isSidePanelClosingState';
import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';
@@ -25,6 +21,7 @@ import { WORKFLOW_LOGIC_FUNCTION_TAB_LIST_COMPONENT_ID } from '@/workflow/workfl
import { WorkflowLogicFunctionTabId } from '@/workflow/workflow-steps/workflow-actions/code-action/types/WorkflowLogicFunctionTabId';
import { useStore } from 'jotai';
import { useCallback } from 'react';
+import { CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { releaseRemovedRoutedFlowStateScopes } from '@/side-panel/routing/utils/releaseRemovedRoutedFlowStateScopes';
@@ -44,51 +41,45 @@ export const useSidePanelCloseAnimationCompleteCleanup = () => {
const currentNavigationStack = store.get(
sidePanelNavigationStackState.atom,
);
- const currentPage = currentNavigationStack.at(-1)?.page;
+ const pageLayoutSidePanelTarget =
+ currentNavigationStack.at(-1)?.pageLayoutSidePanelTarget;
const morphItemsByPage = store.get(
sidePanelNavigationMorphItemsByPageState.atom,
);
- if (isDefined(currentPage) && isPageLayoutSidePanelPage(currentPage)) {
- const targetedRecordsRule = store.get(
- contextStoreTargetedRecordsRuleComponentState.atomFamily({
- instanceId: MAIN_CONTEXT_STORE_INSTANCE_ID,
+ // Record pages keep the edited widget selected once the panel closes,
+ // e.g. a widget just added from the widget picker
+ if (
+ isDefined(pageLayoutSidePanelTarget) &&
+ pageLayoutSidePanelTarget.targetRecordIdentifier
+ .targetObjectNameSingular === CoreObjectNameSingular.Dashboard
+ ) {
+ const { pageLayoutId } = pageLayoutSidePanelTarget;
+
+ store.set(
+ pageLayoutEditingWidgetIdComponentState.atomFamily({
+ instanceId: pageLayoutId,
}),
+ null,
+ );
+ store.set(
+ pageLayoutTabSettingsOpenTabIdComponentState.atomFamily({
+ instanceId: pageLayoutId,
+ }),
+ null,
+ );
+ store.set(
+ pageLayoutDraggedAreaComponentState.atomFamily({
+ instanceId: pageLayoutId,
+ }),
+ null,
+ );
+ store.set(
+ widgetInsertionContextComponentState.atomFamily({
+ instanceId: pageLayoutId,
+ }),
+ null,
);
- if (
- targetedRecordsRule.mode === 'selection' &&
- targetedRecordsRule.selectedRecordIds.length === 1
- ) {
- const recordId = targetedRecordsRule.selectedRecordIds[0];
- const record = store.get(recordStoreFamilyState.atomFamily(recordId));
-
- if (isDefined(record) && isDefined(record.pageLayoutId)) {
- store.set(
- pageLayoutEditingWidgetIdComponentState.atomFamily({
- instanceId: record.pageLayoutId,
- }),
- null,
- );
- store.set(
- pageLayoutTabSettingsOpenTabIdComponentState.atomFamily({
- instanceId: record.pageLayoutId,
- }),
- null,
- );
- store.set(
- pageLayoutDraggedAreaComponentState.atomFamily({
- instanceId: record.pageLayoutId,
- }),
- null,
- );
- store.set(
- widgetInsertionContextComponentState.atomFamily({
- instanceId: record.pageLayoutId,
- }),
- null,
- );
- }
- }
}
store.set(isSidePanelOpenedState.atom, false);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersSettings.tsx
index c5ecf32c18c..cd682872f80 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersSettings.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersSettings.tsx
@@ -1,6 +1,6 @@
import { ChartFiltersDeletedFieldsWarning } from '@/side-panel/pages/page-layout/components/ChartFiltersDeletedFieldsWarning';
import { ChartFiltersSettingsInitializeStateEffect } from '@/side-panel/pages/page-layout/components/ChartFiltersSettingsInitializeStateEffect';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { type ChartWidget } from '@/side-panel/pages/page-layout/types/ChartWidget';
import { type ChartWidgetConfiguration } from '@/side-panel/pages/page-layout/types/ChartWidgetConfiguration';
@@ -44,7 +44,7 @@ export const ChartFiltersSettings = ({
objectMetadataItemId: objectMetadataItem.id,
});
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { updateCurrentWidgetConfig } =
useUpdateCurrentWidgetConfig(pageLayoutId);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartSettings.tsx
index df4d2daecfb..93897a54971 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartSettings.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartSettings.tsx
@@ -7,7 +7,7 @@ import { ChartTypeSelectionSection } from '@/side-panel/pages/page-layout/compon
import { CHART_SETTINGS_HEADINGS } from '@/side-panel/pages/page-layout/constants/ChartSettingsHeadings';
import { GRAPH_TYPE_INFORMATION } from '@/side-panel/pages/page-layout/constants/GraphTypeInformation';
import { useChartSettingsValues } from '@/side-panel/pages/page-layout/hooks/useChartSettingsValues';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useGetConfigToUpdateAfterGraphTypeChange } from '@/side-panel/pages/page-layout/hooks/useUpdateGraphTypeConfig';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
@@ -34,7 +34,7 @@ const StyledSidePanelContainer = styled.div`
export const ChartSettings = ({ widget }: { widget: PageLayoutWidget }) => {
const { updateSidePanelPageInfo } = useUpdateSidePanelPageInfo();
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { updateCurrentWidgetConfig } =
useUpdateCurrentWidgetConfig(pageLayoutId);
const { objectMetadataItems } = useObjectMetadataItems();
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/PageLayoutSidePanelTargetProvider.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/PageLayoutSidePanelTargetProvider.tsx
new file mode 100644
index 00000000000..356087636a5
--- /dev/null
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/PageLayoutSidePanelTargetProvider.tsx
@@ -0,0 +1,42 @@
+import { PageLayoutSidePanelTargetContext } from '@/side-panel/pages/page-layout/contexts/PageLayoutSidePanelTargetContext';
+import { type TargetRecordIdentifier } from '@/ui/layout/contexts/TargetRecordIdentifier';
+import { type ReactNode, useMemo } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+
+type PageLayoutSidePanelTargetProviderProps = {
+ pageLayoutId: string;
+ targetRecordIdentifier: TargetRecordIdentifier | undefined;
+ children: ReactNode;
+};
+
+export const PageLayoutSidePanelTargetProvider = ({
+ pageLayoutId,
+ targetRecordIdentifier,
+ children,
+}: PageLayoutSidePanelTargetProviderProps) => {
+ const targetRecordId = targetRecordIdentifier?.id;
+ const targetObjectNameSingular =
+ targetRecordIdentifier?.targetObjectNameSingular;
+
+ const pageLayoutSidePanelTarget = useMemo(
+ () =>
+ isDefined(targetRecordId) && isDefined(targetObjectNameSingular)
+ ? {
+ pageLayoutId,
+ targetRecordIdentifier: {
+ id: targetRecordId,
+ targetObjectNameSingular,
+ },
+ }
+ : null,
+ [pageLayoutId, targetRecordId, targetObjectNameSingular],
+ );
+
+ return (
+ <PageLayoutSidePanelTargetContext.Provider
+ value={pageLayoutSidePanelTarget}
+ >
+ {children}
+ </PageLayoutSidePanelTargetContext.Provider>
+ );
+};
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelChartFilterSubPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelChartFilterSubPage.tsx
index 942ea42f668..498f3b81fb5 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelChartFilterSubPage.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelChartFilterSubPage.tsx
@@ -2,14 +2,14 @@ import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMeta
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';
import { ChartFiltersSettings } from '@/side-panel/pages/page-layout/components/ChartFiltersSettings';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { isChartWidget } from '@/side-panel/pages/page-layout/utils/isChartWidget';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { isDefined } from 'twenty-shared/utils';
export const SidePanelChartFilterSubPage = () => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const pageLayoutDraft = useAtomComponentStateValue(
pageLayoutDraftComponentState,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelFieldRelationTableFieldsSubPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelFieldRelationTableFieldsSubPage.tsx
index 00b7bbd2b6c..bb68efb43ed 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelFieldRelationTableFieldsSubPage.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelFieldRelationTableFieldsSubPage.tsx
@@ -1,6 +1,6 @@
import { getWidgetConfigurationViewId } from '@/page-layout/utils/getWidgetConfigurationViewId';
import { RecordTableSettingsFieldVisibility } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsFieldVisibility';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { styled } from '@linaria/react';
import { isDefined } from 'twenty-shared/utils';
@@ -15,7 +15,7 @@ const StyledContainer = styled.div`
`;
export const SidePanelFieldRelationTableFieldsSubPage = () => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
if (!isDefined(widgetInEditMode)) {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelFieldsLayoutSubPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelFieldsLayoutSubPage.tsx
index 1211725c53c..4bb3ce6107f 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelFieldsLayoutSubPage.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelFieldsLayoutSubPage.tsx
@@ -1,7 +1,7 @@
import { useTemporaryFieldsConfiguration } from '@/page-layout/hooks/useTemporaryFieldsConfiguration';
import { FieldsConfigurationEditor } from '@/page-layout/widgets/fields/components/FieldsConfigurationEditor';
import { FieldsWidgetGroupsDraftInitializationEffect } from '@/page-layout/widgets/fields/components/FieldsWidgetGroupsDraftInitializationEffect';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { styled } from '@linaria/react';
import { isDefined } from 'twenty-shared/utils';
@@ -21,7 +21,7 @@ const StyledFieldsLayoutContainer = styled.div`
`;
export const SidePanelFieldsLayoutSubPage = () => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
const temporaryFieldsConfiguration = useTemporaryFieldsConfiguration();
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutDashboardWidgetTypeSelect.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutDashboardWidgetTypeSelect.tsx
index 8d1f000309d..28ad7583ebe 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutDashboardWidgetTypeSelect.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutDashboardWidgetTypeSelect.tsx
@@ -13,7 +13,7 @@ import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';
import { SidePanelList } from '@/side-panel/components/SidePanelList';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
import { useNavigatePageLayoutSidePanel } from '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { getFrontComponentWidgetTypeSelectItemId } from '@/side-panel/pages/page-layout/utils/getFrontComponentWidgetTypeSelectItemId';
import { isExistingWidgetMissingOrDifferentType } from '@/side-panel/pages/page-layout/utils/isExistingWidgetMissingOrDifferentType';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
@@ -38,7 +38,8 @@ import {
} from '~/generated-metadata/graphql';
export const SidePanelPageLayoutDashboardWidgetTypeSelect = () => {
- const { pageLayoutId, recordId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId, targetRecordIdentifier } =
+ usePageLayoutSidePanelTarget();
const { closeSidePanelMenu } = useSidePanelMenu();
@@ -54,7 +55,7 @@ export const SidePanelPageLayoutDashboardWidgetTypeSelect = () => {
const tabListInstanceId = getTabListInstanceIdFromPageLayoutAndRecord({
pageLayoutId,
layoutType: pageLayoutDraft.type,
- targetRecordIdentifier: { id: recordId, targetObjectNameSingular: '' },
+ targetRecordIdentifier,
});
const { createPageLayoutGraphWidget } = useCreatePageLayoutGraphWidget({
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutRecordPageWidgetTypeSelect.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutRecordPageWidgetTypeSelect.tsx
index ec5d0c11f22..8a9ad7588a3 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutRecordPageWidgetTypeSelect.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutRecordPageWidgetTypeSelect.tsx
@@ -19,7 +19,7 @@ import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';
import { SidePanelList } from '@/side-panel/components/SidePanelList';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
import { useNavigatePageLayoutSidePanel } from '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { getFrontComponentWidgetTypeSelectItemId } from '@/side-panel/pages/page-layout/utils/getFrontComponentWidgetTypeSelectItemId';
import { resolveWidgetTypeSelectTargetTabId } from '@/side-panel/pages/page-layout/utils/resolveWidgetTypeSelectTargetTabId';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
@@ -47,8 +47,10 @@ import {
} from '~/generated-metadata/graphql';
export const SidePanelPageLayoutRecordPageWidgetTypeSelect = () => {
- const { pageLayoutId, objectNameSingular: targetObjectNameSingular } =
- usePageLayoutIdFromContextStore();
+ const {
+ pageLayoutId,
+ targetRecordIdentifier: { targetObjectNameSingular },
+ } = usePageLayoutSidePanelTarget();
const { closeSidePanelMenu } = useSidePanelMenu();
const { createRecordPageNoteWidget } =
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutTabSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutTabSettings.tsx
index e6b300226f7..1f956b568f3 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutTabSettings.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutTabSettings.tsx
@@ -1,18 +1,14 @@
import { SidePanelPageLayoutTabSettingsContent } from '@/side-panel/pages/page-layout/components/SidePanelPageLayoutTabSettingsContent';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
-import { isDefined } from 'twenty-shared/utils';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
export const SidePanelPageLayoutTabSettings = () => {
- const { pageLayoutId, recordId } = usePageLayoutIdFromContextStore();
-
- if (!isDefined(pageLayoutId)) {
- return null;
- }
+ const { pageLayoutId, targetRecordIdentifier } =
+ usePageLayoutSidePanelTarget();
return (
<SidePanelPageLayoutTabSettingsContent
pageLayoutId={pageLayoutId}
- recordId={recordId}
+ recordId={targetRecordIdentifier.id}
/>
);
};
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutWidgetSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutWidgetSettings.tsx
index 3350efead6e..5b265da4733 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutWidgetSettings.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutWidgetSettings.tsx
@@ -2,13 +2,13 @@ import { SidePanelList } from '@/side-panel/components/SidePanelList';
import { WidgetSettingsManageSection } from '@/side-panel/pages/page-layout/components/WidgetSettingsManageSection';
import { WidgetSettingsPlacementSection } from '@/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection';
import { WIDGET_SETTINGS_SELECTABLE_ITEM_IDS } from '@/side-panel/pages/page-layout/constants/settings/WidgetSettingsSelectableItemIds';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { useWidgetSettingsPlacementSelectableItemIds } from '@/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacementSelectableItemIds';
import { isDefined } from 'twenty-shared/utils';
export const SidePanelPageLayoutWidgetSettings = () => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
const { placementSelectableItemIds, widgetSettingsPlacement } =
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__tests__/SidePanelPageLayoutRecordPageWidgetTypeSelect.test.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__tests__/SidePanelPageLayoutRecordPageWidgetTypeSelect.test.tsx
index 0cd218c9965..4d3c7fb5ed7 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__tests__/SidePanelPageLayoutRecordPageWidgetTypeSelect.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__tests__/SidePanelPageLayoutRecordPageWidgetTypeSelect.test.tsx
@@ -9,6 +9,7 @@ import {
makeTab,
} from '@/page-layout/testing/pageLayoutDraftFixtures';
import { SidePanelPageLayoutRecordPageWidgetTypeSelect } from '@/side-panel/pages/page-layout/components/SidePanelPageLayoutRecordPageWidgetTypeSelect';
+import { PageLayoutSidePanelTargetContext } from '@/side-panel/pages/page-layout/contexts/PageLayoutSidePanelTargetContext';
import { render, screen } from '@testing-library/react';
import { createStore } from 'jotai';
import { type ReactNode } from 'react';
@@ -51,16 +52,6 @@ jest.mock(
}),
);
-jest.mock(
- '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore',
- () => ({
- usePageLayoutIdFromContextStore: () => ({
- pageLayoutId: PAGE_LAYOUT_TEST_INSTANCE_ID,
- objectNameSingular: 'company',
- }),
- }),
-);
-
jest.mock('@/side-panel/components/SidePanelList', () => ({
SidePanelList: ({ children }: { children: ReactNode }) => <>{children}</>,
}));
@@ -123,7 +114,17 @@ describe('SidePanelPageLayoutRecordPageWidgetTypeSelect', () => {
render(
<PageLayoutTestWrapper store={store}>
- <SidePanelPageLayoutRecordPageWidgetTypeSelect />
+ <PageLayoutSidePanelTargetContext.Provider
+ value={{
+ pageLayoutId: PAGE_LAYOUT_TEST_INSTANCE_ID,
+ targetRecordIdentifier: {
+ id: 'company-record-id',
+ targetObjectNameSingular: 'company',
+ },
+ }}
+ >
+ <SidePanelPageLayoutRecordPageWidgetTypeSelect />
+ </PageLayoutSidePanelTargetContext.Provider>
</PageLayoutTestWrapper>,
);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/chart-settings/ChartSettingItem.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/chart-settings/ChartSettingItem.tsx
index 14df0436950..d715e1f647f 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/chart-settings/ChartSettingItem.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/chart-settings/ChartSettingItem.tsx
@@ -6,7 +6,7 @@ import { CommandMenuItemSwitch } from '@/command-menu/components/CommandMenuItem
import { SIDE_PANEL_SELECTABLE_LIST_ID } from '@/side-panel/constants/SidePanelSelectableListId';
import { useSidePanelSubPageHistory } from '@/side-panel/hooks/useSidePanelSubPageHistory';
import { useChartSettingsValues } from '@/side-panel/pages/page-layout/hooks/useChartSettingsValues';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateChartSettingInput } from '@/side-panel/pages/page-layout/hooks/useUpdateChartSettingInput';
import { useUpdateChartSettingTextInput } from '@/side-panel/pages/page-layout/hooks/useUpdateChartSettingTextInput';
import { useUpdateChartSettingToggle } from '@/side-panel/pages/page-layout/hooks/useUpdateChartSettingToggle';
@@ -35,7 +35,7 @@ export const ChartSettingItem = ({
objectMetadataId,
configuration,
}: ChartSettingItemProps) => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { closeAnyOpenDropdown } = useCloseAnyOpenDropdown();
const { openDropdown } = useOpenDropdown();
const { setSelectedItemId } = useSelectableList(
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardChartSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardChartSettings.tsx
index 64450a2ee4b..3b54daab1c9 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardChartSettings.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardChartSettings.tsx
@@ -3,7 +3,7 @@ import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pa
import { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/contexts/WidgetComponentInstanceContext';
import { ChartSettings } from '@/side-panel/pages/page-layout/components/ChartSettings';
import { WidgetSettingsFooter } from '@/side-panel/pages/page-layout/components/WidgetSettingsFooter';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { isChartWidget } from '@/side-panel/pages/page-layout/utils/isChartWidget';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { styled } from '@linaria/react';
@@ -16,7 +16,7 @@ const StyledContainer = styled.div`
`;
export const SidePanelDashboardChartSettings = () => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const pageLayoutDraft = useAtomComponentStateValue(
pageLayoutDraftComponentState,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardIframeSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardIframeSettings.tsx
index e538b80fa1c..c4e64948f72 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardIframeSettings.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardIframeSettings.tsx
@@ -4,7 +4,7 @@ import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';
import { SidePanelGroupFormContainer } from '@/side-panel/components/SidePanelGroupFormContainer';
import { SidePanelList } from '@/side-panel/components/SidePanelList';
import { WidgetSettingsFooter } from '@/side-panel/pages/page-layout/components/WidgetSettingsFooter';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
@@ -27,7 +27,7 @@ const StyledSidePanelContainer = styled.div`
`;
export const SidePanelDashboardIframeSettings = () => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx
index e349d5c0312..7f30ebc4e4d 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx
@@ -24,7 +24,7 @@ import { RecordTableCalendarFieldDropdownContent } from '@/side-panel/pages/page
import { RecordTableCalendarLayoutDropdownContent } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarLayoutDropdownContent';
import { RecordTableLayoutDropdownContent } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent';
import { WidgetSettingsFooter } from '@/side-panel/pages/page-layout/components/WidgetSettingsFooter';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useRecordTableSettingsDescriptions } from '@/side-panel/pages/page-layout/hooks/useRecordTableSettingsDescriptions';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
@@ -69,7 +69,7 @@ const StyledSettingsContainer = styled.div`
export const SidePanelDashboardRecordTableSettings = () => {
const { t } = useLingui();
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const pageLayoutDraft = useAtomComponentStateValue(
pageLayoutDraftComponentState,
pageLayoutId,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/__tests__/SidePanelDashboardRecordTableSettings.test.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/__tests__/SidePanelDashboardRecordTableSettings.test.tsx
index d0f87ae8851..33689692425 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/__tests__/SidePanelDashboardRecordTableSettings.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/__tests__/SidePanelDashboardRecordTableSettings.test.tsx
@@ -1,5 +1,6 @@
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
import { SidePanelDashboardRecordTableSettings } from '@/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings';
+import { PageLayoutSidePanelTargetContext } from '@/side-panel/pages/page-layout/contexts/PageLayoutSidePanelTargetContext';
import { i18n } from '@lingui/core';
import { I18nProvider } from '@lingui/react';
import { render } from '@testing-library/react';
@@ -44,13 +45,6 @@ jest.mock('@/side-panel/hooks/useSidePanelSubPageHistory', () => ({
}),
}));
-jest.mock(
- '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore',
- () => ({
- usePageLayoutIdFromContextStore: () => ({ pageLayoutId: PAGE_LAYOUT_ID }),
- }),
-);
-
jest.mock(
'@/side-panel/pages/page-layout/hooks/useRecordTableSettingsDescriptions',
() => ({
@@ -96,7 +90,17 @@ describe('SidePanelDashboardRecordTableSettings', () => {
const { container } = render(
<JotaiProvider store={store}>
<I18nProvider i18n={i18n}>
- <SidePanelDashboardRecordTableSettings />
+ <PageLayoutSidePanelTargetContext.Provider
+ value={{
+ pageLayoutId: PAGE_LAYOUT_ID,
+ targetRecordIdentifier: {
+ id: 'dashboard-record-id',
+ targetObjectNameSingular: 'dashboard',
+ },
+ }}
+ >
+ <SidePanelDashboardRecordTableSettings />
+ </PageLayoutSidePanelTargetContext.Provider>
</I18nProvider>
</JotaiProvider>,
);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectableListItem.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectableListItem.tsx
index fb281091b19..1412b216f07 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectableListItem.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectableListItem.tsx
@@ -1,4 +1,4 @@
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';
@@ -30,7 +30,7 @@ export const ChartAggregateOperationSelectableListItem = ({
label: string;
currentFieldMetadataId: string;
}) => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
const { updateCurrentWidgetConfig } =
useUpdateCurrentWidgetConfig(pageLayoutId);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectionDropdownContent.tsx
index 8f1cd620d94..8ea47702a21 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectionDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectionDropdownContent.tsx
@@ -1,7 +1,7 @@
import { ChartAggregateOperationSelectableListItem } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectableListItem';
import { ChartRatioAggregateOperationSelectableListItem } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartRatioAggregateOperationSelectableListItem';
import { ChartRatioOptionValueSelectionDropdownContent } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionValueSelectionDropdownContent';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
@@ -35,7 +35,7 @@ export const ChartAggregateOperationSelectionDropdownContent = ({
const [searchQuery, setSearchQuery] = useState('');
const [isOptionValueMenuOpen, setIsOptionValueMenuOpen] = useState(false);
const { objectMetadataItems } = useObjectMetadataItems();
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
const configuration = widgetInEditMode?.configuration;
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAxisNameSelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAxisNameSelectionDropdownContent.tsx
index 77527695120..0c29b994b3a 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAxisNameSelectionDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAxisNameSelectionDropdownContent.tsx
@@ -1,4 +1,4 @@
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { getChartAxisNameDisplayOptions } from '@/side-panel/pages/page-layout/utils/getChartAxisNameDisplayOptions';
@@ -15,7 +15,7 @@ import { ListItem } from 'twenty-ui/primitives/navigation';
import { AxisNameDisplay } from '~/generated-metadata/graphql';
export const ChartAxisNameSelectionDropdownContent = () => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
const configuration = widgetInEditMode?.configuration;
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorSelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorSelectionDropdownContent.tsx
index a7a3afa3713..e078570d56e 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorSelectionDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorSelectionDropdownContent.tsx
@@ -1,6 +1,6 @@
import { ChartColorGradientOption } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartColorGradientOption';
import { ChartColorPaletteOption } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartColorPaletteOption';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { type ChartConfiguration } from '@/side-panel/pages/page-layout/types/ChartConfiguration';
@@ -28,7 +28,7 @@ type ColorOption = {
export const ChartColorSelectionDropdownContent = () => {
const [searchQuery, setSearchQuery] = useState('');
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
const dropdownId = useAvailableComponentInstanceIdOrThrow(
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsx
index 5be848943b0..0faff142d3f 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsx
@@ -3,7 +3,7 @@ import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataI
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { filterReadableActiveObjectMetadataItems } from '@/object-metadata/utils/filterReadableActiveObjectMetadataItems';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useResetChartDraftFiltersSettings } from '@/side-panel/pages/page-layout/hooks/useResetChartDraftFiltersSettings';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
@@ -30,7 +30,7 @@ export const ChartDataSourceDropdownContent = () => {
const [searchQuery, setSearchQuery] = useState('');
const { objectMetadataItems } = useObjectMetadataItems();
const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDateGranularitySelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDateGranularitySelectionDropdownContent.tsx
index b37b647d698..e6ca818ace7 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDateGranularitySelectionDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDateGranularitySelectionDropdownContent.tsx
@@ -1,4 +1,4 @@
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { type ChartConfiguration } from '@/side-panel/pages/page-layout/types/ChartConfiguration';
@@ -74,7 +74,7 @@ const isChartConfiguration = (
export const ChartDateGranularitySelectionDropdownContent = ({
axis,
}: ChartDateGranularitySelectionDropdownContentProps) => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
const configuration = widgetInEditMode?.configuration;
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartFieldSelectionForAggregateOperationDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartFieldSelectionForAggregateOperationDropdownContent.tsx
index 75be4da035b..1940a74faae 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartFieldSelectionForAggregateOperationDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartFieldSelectionForAggregateOperationDropdownContent.tsx
@@ -1,6 +1,6 @@
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { ChartAggregateOperationSelectionDropdownContent } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectionDropdownContent';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
@@ -26,7 +26,7 @@ export const ChartFieldSelectionForAggregateOperationDropdownContent = () => {
const [searchQuery, setSearchQuery] = useState('');
const { objectMetadataItems } = useObjectMetadataItems();
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
const configuration = widgetInEditMode?.configuration;
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContentBase.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContentBase.tsx
index 1fba3e51fb6..3fbd25c87e6 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContentBase.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContentBase.tsx
@@ -8,7 +8,7 @@ import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/is
import { ChartGroupByFieldSelectionCompositeFieldView } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionCompositeFieldView';
import { ChartGroupByFieldSelectionMorphRelationFieldView } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionMorphRelationFieldView';
import { ChartGroupByFieldSelectionRelationFieldView } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionRelationFieldView';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { type ChartConfiguration } from '@/side-panel/pages/page-layout/types/ChartConfiguration';
@@ -60,7 +60,7 @@ export const ChartGroupByFieldSelectionDropdownContentBase = <
const { objectMetadataItems } = useObjectMetadataItems();
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent.tsx
index 33ae39e0862..669c2c01627 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent.tsx
@@ -1,6 +1,6 @@
import { type DraggableListDropResult } from '@/ui/layout/draggable-list/types/DraggableListDropResult';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
@@ -32,7 +32,7 @@ export const ChartManualSortSubMenuContent = ({
axis,
onBack,
}: ChartManualSortSubMenuContentProps) => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
const { updateCurrentWidgetConfig } =
useUpdateCurrentWidgetConfig(pageLayoutId);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartNumberFormatSelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartNumberFormatSelectionDropdownContent.tsx
index ea9d2ab74e8..f49f99de413 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartNumberFormatSelectionDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartNumberFormatSelectionDropdownContent.tsx
@@ -1,5 +1,5 @@
import { CHART_NUMBER_FORMAT_DEFAULT } from '@/page-layout/widgets/graph/constants/ChartNumberFormatDefault';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { getChartNumberFormatLabel } from '@/side-panel/pages/page-layout/utils/getChartNumberFormatLabel';
@@ -16,7 +16,7 @@ import { ListItem } from 'twenty-ui/primitives/navigation';
import { ChartNumberFormat } from '~/generated-metadata/graphql';
export const ChartNumberFormatSelectionDropdownContent = () => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
const configuration = widgetInEditMode?.configuration;
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioAggregateOperationSelectableListItem.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioAggregateOperationSelectableListItem.tsx
index 524d516f385..aba775d807b 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioAggregateOperationSelectableListItem.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioAggregateOperationSelectableListItem.tsx
@@ -1,4 +1,4 @@
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';
import { DASHBOARD_AGGREGATE_OPERATION_RATIO } from '@/page-layout/widgets/graph/constants/DashboardAggregateOperationRatio';
@@ -17,7 +17,7 @@ export const ChartRatioAggregateOperationSelectableListItem = ({
label: string;
onSelect: () => void;
}) => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
const dropdownId = useAvailableComponentInstanceIdOrThrow(
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionBooleanSelectableListItem.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionBooleanSelectableListItem.tsx
index aed9cbf26b7..e5552e5c4ed 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionBooleanSelectableListItem.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionBooleanSelectableListItem.tsx
@@ -1,5 +1,5 @@
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';
@@ -22,7 +22,7 @@ export const ChartRatioOptionBooleanSelectableListItem = ({
label: string;
currentFieldMetadataId: string;
}) => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
const { updateCurrentWidgetConfig } =
useUpdateCurrentWidgetConfig(pageLayoutId);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionSelectSelectableListItem.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionSelectSelectableListItem.tsx
index f1e1bec28ac..d48dbfc2855 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionSelectSelectableListItem.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionSelectSelectableListItem.tsx
@@ -1,4 +1,4 @@
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';
@@ -24,7 +24,7 @@ export const ChartRatioOptionSelectSelectableListItem = ({
color: ThemeColor | undefined;
currentFieldMetadataId: string;
}) => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
const { updateCurrentWidgetConfig } =
useUpdateCurrentWidgetConfig(pageLayoutId);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionValueSelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionValueSelectionDropdownContent.tsx
index 1bd54c97ea3..0814d19b659 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionValueSelectionDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionValueSelectionDropdownContent.tsx
@@ -1,6 +1,6 @@
import { ChartRatioOptionBooleanSelectableListItem } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionBooleanSelectableListItem';
import { ChartRatioOptionSelectSelectableListItem } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionSelectSelectableListItem';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
@@ -35,7 +35,7 @@ export const ChartRatioOptionValueSelectionDropdownContent = ({
}) => {
const [searchQuery, setSearchQuery] = useState('');
const { objectMetadataItems } = useObjectMetadataItems();
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
const dropdownId = useAvailableComponentInstanceIdOrThrow(
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortByGroupByFieldDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortByGroupByFieldDropdownContent.tsx
index a89067c2f74..6a9cb93d2a2 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortByGroupByFieldDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortByGroupByFieldDropdownContent.tsx
@@ -6,7 +6,7 @@ import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadat
import { ChartManualSortSubMenuContent } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent';
import { AGGREGATE_SORT_BY_OPTIONS } from '@/side-panel/pages/page-layout/constants/AggregateSortByOptions';
import { useGraphGroupBySortOptionLabels } from '@/side-panel/pages/page-layout/hooks/useGraphGroupBySortOptionLabels';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { filterSortOptionsByFieldType } from '@/side-panel/pages/page-layout/utils/filterSortOptionsByFieldType';
@@ -30,7 +30,7 @@ import {
export const ChartSortByGroupByFieldDropdownContent = () => {
const [isSubMenuOpen, setIsSubMenuOpen] = useState(false);
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
const { objectMetadataItems } = useObjectMetadataItems();
const { updateCurrentWidgetConfig } =
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortBySelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortBySelectionDropdownContent.tsx
index fb527c08052..45512a8ae86 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortBySelectionDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortBySelectionDropdownContent.tsx
@@ -6,7 +6,7 @@ import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadat
import { ChartManualSortSubMenuContent } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent';
import { X_SORT_BY_OPTIONS } from '@/side-panel/pages/page-layout/constants/XSortByOptions';
import { useGraphXSortOptionLabels } from '@/side-panel/pages/page-layout/hooks/useGraphXSortOptionLabels';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { filterSortOptionsByFieldType } from '@/side-panel/pages/page-layout/utils/filterSortOptionsByFieldType';
@@ -32,7 +32,7 @@ import {
export const ChartSortBySelectionDropdownContent = () => {
const [isSubMenuOpen, setIsSubMenuOpen] = useState(false);
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
const { objectMetadataItems } = useObjectMetadataItems();
const { updateCurrentWidgetConfig } =
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsx
index 092cb7429ab..73bd6839fbf 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsx
@@ -13,7 +13,7 @@ import {
getFieldWidgetDefaultDisplayMode,
isDisplayModeValidForFieldType,
} from '@/page-layout/widgets/field/utils/getFieldWidgetDisplayModeConfig';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { FieldWidgetNestedFieldDropdownContent } from '@/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetNestedFieldDropdownContent';
@@ -44,8 +44,8 @@ export const FieldWidgetFieldDropdownContent = () => {
const [drillInFieldMetadataItem, setDrillInFieldMetadataItem] =
useState<FieldMetadataItem | null>(null);
- const { pageLayoutId, objectNameSingular } =
- usePageLayoutIdFromContextStore();
+ const { pageLayoutId, targetRecordIdentifier } =
+ usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
@@ -57,8 +57,9 @@ export const FieldWidgetFieldDropdownContent = () => {
const currentNestedRelationFieldMetadataId =
fieldConfiguration?.nestedRelationFieldMetadataId;
- const allFieldWidgetFieldMetadataItems =
- useFieldWidgetEligibleFields(objectNameSingular);
+ const allFieldWidgetFieldMetadataItems = useFieldWidgetEligibleFields(
+ targetRecordIdentifier.targetObjectNameSingular,
+ );
const { objectMetadataItems } = useObjectMetadataItems();
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx
index 3e7a5519fb7..e2cbe3c6ba1 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx
@@ -20,7 +20,7 @@ import {
isSelectableLayout,
} from '@/page-layout/widgets/record-table/utils/getRecordTableWidgetLayoutPickerOptions';
import { RecordTableWidgetLayoutMenuItems } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableWidgetLayoutMenuItems';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -55,7 +55,7 @@ const DISPLAY_MODE_ICONS: Record<FieldDisplayMode, IconComponent> = {
export const FieldWidgetLayoutDropdownContent = () => {
const { t } = useLingui();
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/MoveToTabDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/MoveToTabDropdownContent.tsx
index b51c9f44978..6ba4648bf85 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/MoveToTabDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/MoveToTabDropdownContent.tsx
@@ -3,7 +3,7 @@ import { useMoveWidgetToTab } from '@/page-layout/hooks/useMoveWidgetToTab';
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';
import { canVerticalListAcceptWidget } from '@/page-layout/utils/canVerticalListAcceptWidget';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
@@ -12,7 +12,7 @@ import { isDefined } from 'twenty-shared/utils';
import { PageLayoutTabLayoutMode } from '~/generated-metadata/graphql';
export const MoveToTabDropdownContent = () => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const pageLayoutDraft = useAtomComponentStateValue(
pageLayoutDraftComponentState,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityDropdownContent.tsx
index 255329546ba..ac4bd335d20 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityDropdownContent.tsx
@@ -1,5 +1,5 @@
import { WidgetVisibilityOptionsList } from '@/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityOptionsList';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { expressionToOptionId } from '@/side-panel/pages/page-layout/utils/expressionToOptionId';
@@ -7,7 +7,7 @@ import { optionIdToExpression } from '@/side-panel/pages/page-layout/utils/optio
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
export const WidgetVisibilityDropdownContent = () => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx
index 8fb01344770..9640386721a 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx
@@ -23,7 +23,7 @@ import { WidgetViewLayoutSettingsRows } from '@/side-panel/pages/page-layout/com
import { WidgetSettingsManageSection } from '@/side-panel/pages/page-layout/components/WidgetSettingsManageSection';
import { WidgetSettingsPlacementSection } from '@/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection';
import { WIDGET_SETTINGS_SELECTABLE_ITEM_IDS } from '@/side-panel/pages/page-layout/constants/settings/WidgetSettingsSelectableItemIds';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { useWidgetSettingsPlacementSelectableItemIds } from '@/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacementSelectableItemIds';
@@ -56,7 +56,7 @@ const StyledSidePanelContainer = styled.div`
export const SidePanelRecordPageFieldSettings = () => {
const { t } = useLingui();
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { placementSelectableItemIds, widgetSettingsPlacement } =
useWidgetSettingsPlacementSelectableItemIds(pageLayoutId);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldsSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldsSettings.tsx
index bf6fdd5214a..d47d8ca4122 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldsSettings.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldsSettings.tsx
@@ -8,7 +8,7 @@ import { NewFieldDefaultVisibilitySwitch } from '@/side-panel/pages/page-layout/
import { WidgetSettingsManageSection } from '@/side-panel/pages/page-layout/components/WidgetSettingsManageSection';
import { WidgetSettingsPlacementSection } from '@/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection';
import { WIDGET_SETTINGS_SELECTABLE_ITEM_IDS } from '@/side-panel/pages/page-layout/constants/settings/WidgetSettingsSelectableItemIds';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { useWidgetSettingsPlacementSelectableItemIds } from '@/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacementSelectableItemIds';
@@ -36,8 +36,8 @@ const StyledSidePanelContainer = styled.div`
export const SidePanelRecordPageFieldsSettings = () => {
const { t } = useLingui();
const { navigateToSidePanelSubPage } = useSidePanelSubPageHistory();
- const { pageLayoutId, objectNameSingular } =
- usePageLayoutIdFromContextStore();
+ const { pageLayoutId, targetRecordIdentifier } =
+ usePageLayoutSidePanelTarget();
const { placementSelectableItemIds, widgetSettingsPlacement } =
useWidgetSettingsPlacementSelectableItemIds(pageLayoutId);
@@ -53,7 +53,7 @@ export const SidePanelRecordPageFieldsSettings = () => {
const { groups } = useFieldsWidgetGroups({
viewId: fieldsConfiguration?.viewId ?? null,
- objectNameSingular,
+ objectNameSingular: targetRecordIdentifier.targetObjectNameSingular,
});
if (!isDefined(widgetInEditMode)) {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsx
index 488fc2a0622..7b007576ce9 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsx
@@ -6,7 +6,7 @@ import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions
import { useUpdatePageLayoutWidget } from '@/page-layout/hooks/useUpdatePageLayoutWidget';
import { useAddDraftViewForRecordTableWidget } from '@/page-layout/widgets/record-table/hooks/useAddDraftViewForRecordTableWidget';
import { useRemoveDraftViewForRecordTableWidget } from '@/page-layout/widgets/record-table/hooks/useRemoveDraftViewForRecordTableWidget';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -29,7 +29,7 @@ export const RecordTableDataSourceDropdownContent = () => {
const [searchQuery, setSearchQuery] = useState('');
const { objectMetadataItems } = useObjectMetadataItems();
const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
const currentObjectMetadataItemId = widgetInEditMode?.objectMetadataId as
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/SidePanelRecordTableFilterSubPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/SidePanelRecordTableFilterSubPage.tsx
index 5e492e81d5e..c1e0e1227cf 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/SidePanelRecordTableFilterSubPage.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/SidePanelRecordTableFilterSubPage.tsx
@@ -1,11 +1,11 @@
import { RecordTableSettingsFilters } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsFilters';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { isDefined } from 'twenty-shared/utils';
import { WidgetConfigurationType } from '~/generated-metadata/graphql';
export const SidePanelRecordTableFilterSubPage = () => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
if (!isDefined(widgetInEditMode)) {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/SidePanelRecordTableSortSubPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/SidePanelRecordTableSortSubPage.tsx
index adbdcc3a34f..8ca4ef03c46 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/SidePanelRecordTableSortSubPage.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/SidePanelRecordTableSortSubPage.tsx
@@ -1,12 +1,12 @@
import { RecordTableSettingsSorts } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsSorts';
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { isDefined } from 'twenty-shared/utils';
import { WidgetConfigurationType } from '~/generated-metadata/graphql';
export const SidePanelRecordTableSortSubPage = () => {
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
if (!isDefined(widgetInEditMode)) {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/contexts/PageLayoutSidePanelTargetContext.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/contexts/PageLayoutSidePanelTargetContext.ts
new file mode 100644
index 00000000000..5f2768c0746
--- /dev/null
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/contexts/PageLayoutSidePanelTargetContext.ts
@@ -0,0 +1,6 @@
+import { createContext } from 'react';
+
+import { type PageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/types/PageLayoutSidePanelTarget';
+
+export const PageLayoutSidePanelTargetContext =
+ createContext<PageLayoutSidePanelTarget | null>(null);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/__tests__/useNavigatePageLayoutSidePanel.test.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/__tests__/useNavigatePageLayoutSidePanel.test.tsx
new file mode 100644
index 00000000000..9e61d6b4382
--- /dev/null
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/__tests__/useNavigatePageLayoutSidePanel.test.tsx
@@ -0,0 +1,94 @@
+import { renderHook } from '@testing-library/react';
+import { act, type ReactNode } from 'react';
+import { SidePanelPages } from 'twenty-shared/types';
+
+import { SIDE_PANEL_COMPONENT_INSTANCE_ID } from '@/side-panel/constants/SidePanelComponentInstanceId';
+import { PageLayoutSidePanelTargetProvider } from '@/side-panel/pages/page-layout/components/PageLayoutSidePanelTargetProvider';
+import { useNavigatePageLayoutSidePanel } from '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
+import { sidePanelNavigationStackState } from '@/side-panel/states/sidePanelNavigationStackState';
+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
+import { getJestMetadataAndApolloMocksAndCommandMenuWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksAndCommandMenuWrapper';
+
+const DASHBOARD_TARGET_RECORD_IDENTIFIER = {
+ id: 'dashboard-record-id',
+ targetObjectNameSingular: 'dashboard',
+};
+
+// The main context store targets another record than the page layout opening
+// the side panel, so only the opener can say what the panel edits
+const MetadataWrapper = getJestMetadataAndApolloMocksAndCommandMenuWrapper({
+ apolloMocks: [],
+ componentInstanceId: SIDE_PANEL_COMPONENT_INSTANCE_ID,
+ contextStoreCurrentObjectMetadataNameSingular: 'company',
+ contextStoreTargetedRecordsRule: {
+ mode: 'selection',
+ selectedRecordIds: ['company-record-id'],
+ },
+});
+
+const PageLayoutWrapper = ({ children }: { children: ReactNode }) => (
+ <MetadataWrapper>
+ <PageLayoutSidePanelTargetProvider
+ pageLayoutId="dashboard-page-layout-id"
+ targetRecordIdentifier={DASHBOARD_TARGET_RECORD_IDENTIFIER}
+ >
+ {children}
+ </PageLayoutSidePanelTargetProvider>
+ </MetadataWrapper>
+);
+
+describe('useNavigatePageLayoutSidePanel', () => {
+ beforeEach(() => {
+ jotaiStore.set(sidePanelNavigationStackState.atom, []);
+ });
+
+ it('should store the page layout it is opened from on the navigation item', () => {
+ const { result } = renderHook(() => useNavigatePageLayoutSidePanel(), {
+ wrapper: PageLayoutWrapper,
+ });
+
+ act(() => {
+ result.current.navigatePageLayoutSidePanel({
+ sidePanelPage: SidePanelPages.DashboardChartSettings,
+ resetNavigationStack: true,
+ });
+ });
+
+ expect(jotaiStore.get(sidePanelNavigationStackState.atom)).toEqual([
+ expect.objectContaining({
+ page: SidePanelPages.DashboardChartSettings,
+ pageLayoutSidePanelTarget: {
+ pageLayoutId: 'dashboard-page-layout-id',
+ targetRecordIdentifier: DASHBOARD_TARGET_RECORD_IDENTIFIER,
+ },
+ }),
+ ]);
+ });
+
+ it('should refuse to open a page layout page outside of a page layout', () => {
+ const { result } = renderHook(() => useNavigatePageLayoutSidePanel(), {
+ wrapper: MetadataWrapper,
+ });
+
+ expect(() =>
+ result.current.navigatePageLayoutSidePanel({
+ sidePanelPage: SidePanelPages.DashboardChartSettings,
+ }),
+ ).toThrow();
+ expect(jotaiStore.get(sidePanelNavigationStackState.atom)).toEqual([]);
+ });
+});
+
+describe('usePageLayoutSidePanelTarget', () => {
+ it('should read the page layout target provided around it', () => {
+ const { result } = renderHook(() => usePageLayoutSidePanelTarget(), {
+ wrapper: PageLayoutWrapper,
+ });
+
+ expect(result.current).toEqual({
+ pageLayoutId: 'dashboard-page-layout-id',
+ targetRecordIdentifier: DASHBOARD_TARGET_RECORD_IDENTIFIER,
+ });
+ });
+});
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useIsDashboardPageLayout.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useIsDashboardPageLayout.ts
deleted file mode 100644
index 2fbb560aced..00000000000
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useIsDashboardPageLayout.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState';
-import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { isDefined } from 'twenty-shared/utils';
-
-export const useIsDashboardPageLayout = (): boolean => {
- const contextStoreCurrentObjectMetadataItemId = useAtomComponentStateValue(
- contextStoreCurrentObjectMetadataItemIdComponentState,
- );
-
- const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);
-
- if (!isDefined(contextStoreCurrentObjectMetadataItemId)) {
- return false;
- }
-
- const objectMetadataItem = objectMetadataItems.find(
- (item) => item.id === contextStoreCurrentObjectMetadataItemId,
- );
-
- return objectMetadataItem?.nameSingular === CoreObjectNameSingular.Dashboard;
-};
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel.ts
index 41fe943c868..b44878c261a 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel.ts
@@ -1,8 +1,9 @@
import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';
+import { PageLayoutSidePanelTargetContext } from '@/side-panel/pages/page-layout/contexts/PageLayoutSidePanelTargetContext';
import { type PageLayoutSidePanelPage } from '@/side-panel/pages/page-layout/types/PageLayoutSidePanelPage';
import { getPageLayoutIcon } from '@/side-panel/pages/page-layout/utils/getPageLayoutIcon';
import { getPageLayoutPageTitle } from '@/side-panel/pages/page-layout/utils/getPageLayoutPageTitle';
-import { useCallback } from 'react';
+import { useCallback, useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { type IconComponent } from 'twenty-ui/icon';
@@ -17,6 +18,12 @@ type NavigatePageLayoutSidePanelProps = {
export const useNavigatePageLayoutSidePanel = () => {
const { navigateSidePanel } = useNavigateSidePanel();
+ // Provided by the rendered page layout, or by the side panel page this is
+ // navigating from
+ const pageLayoutSidePanelTarget = useContext(
+ PageLayoutSidePanelTargetContext,
+ );
+
const navigatePageLayoutSidePanel = useCallback(
({
sidePanelPage,
@@ -25,6 +32,12 @@ export const useNavigatePageLayoutSidePanel = () => {
focusTitleInput = false,
resetNavigationStack = false,
}: NavigatePageLayoutSidePanelProps) => {
+ if (!isDefined(pageLayoutSidePanelTarget)) {
+ throw new Error(
+ 'Cannot open a page layout side panel page outside of a page layout with a target record',
+ );
+ }
+
navigateSidePanel({
page: sidePanelPage,
pageTitle: isDefined(pageTitle)
@@ -33,11 +46,12 @@ export const useNavigatePageLayoutSidePanel = () => {
pageIcon: isDefined(pageIcon)
? pageIcon
: getPageLayoutIcon(sidePanelPage),
+ pageLayoutSidePanelTarget,
focusTitleInput,
resetNavigationStack,
});
},
- [navigateSidePanel],
+ [navigateSidePanel, pageLayoutSidePanelTarget],
);
return {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore.ts
deleted file mode 100644
index 891351afce1..00000000000
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState';
-import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
-import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById';
-import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
-import { currentPageLayoutIdState } from '@/page-layout/states/currentPageLayoutIdState';
-import { recordPageLayoutByObjectMetadataIdFamilySelector } from '@/page-layout/states/selectors/recordPageLayoutByObjectMetadataIdFamilySelector';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
-import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { isDefined } from 'twenty-shared/utils';
-
-export const usePageLayoutIdFromContextStore = () => {
- const contextStoreTargetedRecordsRule = useAtomComponentStateValue(
- contextStoreTargetedRecordsRuleComponentState,
- );
-
- const contextStoreCurrentObjectMetadataItemId = useAtomComponentStateValue(
- contextStoreCurrentObjectMetadataItemIdComponentState,
- );
-
- if (!isDefined(contextStoreCurrentObjectMetadataItemId)) {
- throw new Error('Object metadata ID is not defined');
- }
-
- const { objectMetadataItem } = useObjectMetadataItemById({
- objectId: contextStoreCurrentObjectMetadataItemId,
- });
-
- if (
- !(
- contextStoreTargetedRecordsRule.mode === 'selection' &&
- contextStoreTargetedRecordsRule.selectedRecordIds.length === 1
- )
- ) {
- throw new Error('Only one record should be selected');
- }
-
- const recordId: string = contextStoreTargetedRecordsRule.selectedRecordIds[0];
-
- const isDashboardContext =
- objectMetadataItem.nameSingular === CoreObjectNameSingular.Dashboard;
-
- const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);
- const currentPageLayoutId = useAtomStateValue(currentPageLayoutIdState);
-
- const recordPageLayout = useAtomFamilySelectorValue(
- recordPageLayoutByObjectMetadataIdFamilySelector,
- { objectMetadataId: objectMetadataItem.id },
- );
-
- const pageLayoutId = isDashboardContext
- ? (recordStore?.pageLayoutId ?? currentPageLayoutId)
- : isDefined(recordPageLayout)
- ? recordPageLayout.id
- : null;
-
- return {
- pageLayoutId,
- recordId,
- objectNameSingular: objectMetadataItem.nameSingular,
- };
-};
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget.ts
new file mode 100644
index 00000000000..668eca827fc
--- /dev/null
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget.ts
@@ -0,0 +1,18 @@
+import { useContext } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+
+import { PageLayoutSidePanelTargetContext } from '@/side-panel/pages/page-layout/contexts/PageLayoutSidePanelTargetContext';
+
+export const usePageLayoutSidePanelTarget = () => {
+ const pageLayoutSidePanelTarget = useContext(
+ PageLayoutSidePanelTargetContext,
+ );
+
+ if (!isDefined(pageLayoutSidePanelTarget)) {
+ throw new Error(
+ 'usePageLayoutSidePanelTarget must be used within a page layout side panel page',
+ );
+ }
+
+ return pageLayoutSidePanelTarget;
+};
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useResetChartDraftFiltersSettings.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useResetChartDraftFiltersSettings.ts
index be1e83c594e..7d141ac4845 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useResetChartDraftFiltersSettings.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useResetChartDraftFiltersSettings.ts
@@ -1,4 +1,4 @@
-import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { getChartFiltersSettingsInstanceId } from '@/side-panel/pages/page-layout/utils/getChartFiltersSettingsInstanceId';
import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState';
@@ -11,7 +11,7 @@ import { useStore } from 'jotai';
export const useResetChartDraftFiltersSettings = () => {
const store = useStore();
- const { pageLayoutId } = usePageLayoutIdFromContextStore();
+ const { pageLayoutId } = usePageLayoutSidePanelTarget();
const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/types/PageLayoutSidePanelTarget.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/types/PageLayoutSidePanelTarget.ts
new file mode 100644
index 00000000000..ab8d59de47b
--- /dev/null
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/types/PageLayoutSidePanelTarget.ts
@@ -0,0 +1,6 @@
+import { type TargetRecordIdentifier } from '@/ui/layout/contexts/TargetRecordIdentifier';
+
+export type PageLayoutSidePanelTarget = {
+ pageLayoutId: string;
+ targetRecordIdentifier: TargetRecordIdentifier;
+};
diff --git a/packages/twenty-front/src/modules/side-panel/states/sidePanelNavigationStackState.ts b/packages/twenty-front/src/modules/side-panel/states/sidePanelNavigationStackState.ts
index 08489202262..371c4255507 100644
--- a/packages/twenty-front/src/modules/side-panel/states/sidePanelNavigationStackState.ts
+++ b/packages/twenty-front/src/modules/side-panel/states/sidePanelNavigationStackState.ts
@@ -1,5 +1,7 @@
import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';
-import { type PurposeBuiltSidePanelPage } from '@/side-panel/types/SidePanelPage';
+import { type PageLayoutSidePanelPage } from '@/side-panel/pages/page-layout/types/PageLayoutSidePanelPage';
+import { type PageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/types/PageLayoutSidePanelTarget';
+import { type NonPageLayoutPurposeBuiltSidePanelPage } from '@/side-panel/types/SidePanelPage';
import { type Location } from 'react-router-dom';
import type { SidePanelPages } from 'twenty-shared/types';
import { type IconComponent } from 'twenty-ui/icon';
@@ -18,14 +20,26 @@ export type SidePanelRoutedLocation = Pick<
'pathname' | 'search' | 'hash' | 'state' | 'key'
>;
+export type PageLayoutSidePanelNavigationStackItem =
+ SidePanelNavigationStackItemBase & {
+ page: PageLayoutSidePanelPage;
+ // The page behind the panel can change while this page is still mounted
+ // (closing animation, history), so the edited layout is captured on open
+ pageLayoutSidePanelTarget: PageLayoutSidePanelTarget;
+ routedLocation?: never;
+ };
+
export type SidePanelNavigationStackItem =
| (SidePanelNavigationStackItemBase & {
page: SidePanelPages.RoutedPage;
routedLocation: SidePanelRoutedLocation;
+ pageLayoutSidePanelTarget?: never;
})
+ | PageLayoutSidePanelNavigationStackItem
| (SidePanelNavigationStackItemBase & {
- page: PurposeBuiltSidePanelPage;
+ page: NonPageLayoutPurposeBuiltSidePanelPage;
routedLocation?: never;
+ pageLayoutSidePanelTarget?: never;
});
type ToNavigationTarget<NavigationStackItem> =
diff --git a/packages/twenty-front/src/modules/side-panel/types/SidePanelPage.ts b/packages/twenty-front/src/modules/side-panel/types/SidePanelPage.ts
index 2d969112cbe..942df9fac6f 100644
--- a/packages/twenty-front/src/modules/side-panel/types/SidePanelPage.ts
+++ b/packages/twenty-front/src/modules/side-panel/types/SidePanelPage.ts
@@ -1,3 +1,4 @@
+import { type PageLayoutSidePanelPage } from '@/side-panel/pages/page-layout/types/PageLayoutSidePanelPage';
import { type SidePanelPages } from 'twenty-shared/types';
type LegacySidePanelPage =
@@ -10,6 +11,12 @@ export type PurposeBuiltSidePanelPage = Exclude<
LegacySidePanelPage | SidePanelPages.RoutedPage
>;
+// Page layout pages can only be opened along with the layout they edit
+export type NonPageLayoutPurposeBuiltSidePanelPage = Exclude<
+ PurposeBuiltSidePanelPage,
+ PageLayoutSidePanelPage
+>;
+
export type ActiveSidePanelPage =
| PurposeBuiltSidePanelPage
| SidePanelPages.RoutedPage;