The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Add widget layout settings flow (#24446)
Thomas des Francse211040a6bab
diff --git a/packages/twenty-front/src/modules/side-panel/components/hooks/__tests__/usePageLayoutHeaderInfo.test.tsx b/packages/twenty-front/src/modules/side-panel/components/hooks/__tests__/usePageLayoutHeaderInfo.test.tsxnew file mode 100644index 00000000000..13f5b1dca31--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/components/hooks/__tests__/usePageLayoutHeaderInfo.test.tsx@@ -0,0 +1,39 @@+import {+ makeTab,+ makeWidget,+} from '@/page-layout/testing/pageLayoutDraftFixtures';+import { usePageLayoutHeaderInfo } from '@/side-panel/components/hooks/usePageLayoutHeaderInfo';+import { renderHook } from '@testing-library/react';+import { SidePanelPages } from 'twenty-shared/types';+import { WidgetType } from '~/generated-metadata/graphql';++describe('usePageLayoutHeaderInfo', () => {+ const getWidgetSettingsHeaderInfo = (widgetType: WidgetType) => {+ const widget = {+ ...makeWidget('widget-id', 0),+ type: widgetType,+ };++ return renderHook(() =>+ usePageLayoutHeaderInfo({+ sidePanelPage: SidePanelPages.PageLayoutWidgetSettings,+ draftPageLayout: { tabs: [makeTab('tab-id', [widget])] },+ pageLayoutEditingWidgetId: widget.id,+ openTabId: null,+ editedTitle: null,+ }),+ ).result.current;+ };++ it('identifies a viewport-filling widget in the side-panel header', () => {+ expect(getWidgetSettingsHeaderInfo(WidgetType.EMAILS)?.headerType).toBe(+ 'Full-height Widget',+ );+ });++ it('keeps the generic label for a fit-content widget', () => {+ expect(+ getWidgetSettingsHeaderInfo(WidgetType.FRONT_COMPONENT)?.headerType,+ ).toBe('Widget');+ });+});diff --git a/packages/twenty-front/src/modules/side-panel/components/hooks/usePageLayoutHeaderInfo.ts b/packages/twenty-front/src/modules/side-panel/components/hooks/usePageLayoutHeaderInfo.tsindex 446d9741305..022b86eed4b 100644--- a/packages/twenty-front/src/modules/side-panel/components/hooks/usePageLayoutHeaderInfo.ts+++ b/packages/twenty-front/src/modules/side-panel/components/hooks/usePageLayoutHeaderInfo.ts@@ -1,16 +1,18 @@import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';-import { getTabPresentation } from '@/page-layout/utils/getTabPresentation';+import { isViewportFillingWidgetType } from '@/page-layout/widgets/utils/isViewportFillingWidgetType';import { GRAPH_TYPE_INFORMATION } from '@/side-panel/pages/page-layout/constants/GraphTypeInformation';import { getCurrentGraphTypeFromConfig } from '@/side-panel/pages/page-layout/utils/getCurrentGraphTypeFromConfig';import { isWidgetConfigurationOfTypeGraph } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfTypeGraph';import { t } from '@lingui/core/macro';+import { isNonEmptyString } from '@sniptt/guards';import { useContext } from 'react';import { SidePanelPages } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import {IconAppWindow,IconFrame,+ IconLayoutDashboard,IconList,IconPlus,IconTable,@@ -18,7 +20,6 @@ import {useIcons,} from 'twenty-ui/icon';import { ThemeContext } from 'twenty-ui/theme-constants';-import { PageLayoutTabLayoutMode } from '~/generated-metadata/graphql';type PageLayoutHeaderInfo = {headerIcon: IconComponent | undefined;@@ -42,6 +43,36 @@ type UsePageLayoutHeaderInfoParams = {editedTitle: string | null | undefined;};+type GetPageLayoutWidgetHeaderInfoParams = {+ editedTitle: string | null | undefined;+ headerIcon: IconComponent | undefined;+ headerIconColor: string;+ headerType: string;+ widgetInEditMode: PageLayoutWidget;+};++const getPageLayoutWidgetHeaderInfo = ({+ editedTitle,+ headerIcon,+ headerIconColor,+ headerType,+ widgetInEditMode,+}: GetPageLayoutWidgetHeaderInfoParams): PageLayoutHeaderInfo => ({+ headerIcon,+ headerIconColor,+ headerType,+ title: isDefined(editedTitle)+ ? editedTitle+ : isNonEmptyString(widgetInEditMode.title)+ ? widgetInEditMode.title+ : '',+ isReadonly: false,+ tab: undefined,+ widgetInEditMode,+ isIconEditable: false,+ selectedIconKey: null,+});+export const usePageLayoutHeaderInfo = ({sidePanelPage,draftPageLayout,@@ -53,6 +84,12 @@ export const usePageLayoutHeaderInfo = ({const { getIcon } = useIcons();const iconColor = theme.font.color.tertiary;+ const widgetInEditMode = isDefined(pageLayoutEditingWidgetId)+ ? draftPageLayout.tabs+ .flatMap((tab) => tab.widgets)+ .find((widget) => widget.id === pageLayoutEditingWidgetId)+ : undefined;+switch (sidePanelPage) {case SidePanelPages.PageLayoutTabSettings: {if (!isDefined(openTabId)) {@@ -71,12 +108,6 @@ export const usePageLayoutHeaderInfo = ({? tab.title: '';- const isSoloTab =- getTabPresentation({- widgets: tab.widgets.filter((widget) => widget.isActive),- layoutMode: tab.layoutMode ?? PageLayoutTabLayoutMode.VERTICAL_LIST,- }) === 'solo';-const resolvedTabIcon = isDefined(tab.icon)? getIcon(tab.icon): IconAppWindow;@@ -84,7 +115,7 @@ export const usePageLayoutHeaderInfo = ({return {headerIcon: resolvedTabIcon ?? IconAppWindow,headerIconColor: iconColor,- headerType: isSoloTab ? t`Full tab widget` : t`Tab`,+ headerType: t`Tab`,title,isReadonly: false,tab,@@ -94,47 +125,37 @@ export const usePageLayoutHeaderInfo = ({};}- case SidePanelPages.DashboardIframeSettings: {- if (!isDefined(pageLayoutEditingWidgetId)) {+ case SidePanelPages.PageLayoutWidgetSettings: {+ if (!isDefined(widgetInEditMode)) {return null;}- const widgetInEditMode = draftPageLayout.tabs- .flatMap((tab) => tab.widgets)- .find((widget) => widget.id === pageLayoutEditingWidgetId);+ return getPageLayoutWidgetHeaderInfo({+ editedTitle,+ headerIcon: IconLayoutDashboard,+ headerIconColor: iconColor,+ headerType: isViewportFillingWidgetType(widgetInEditMode.type)+ ? t`Full-height Widget`+ : t`Widget`,+ widgetInEditMode,+ });+ }+ case SidePanelPages.DashboardIframeSettings: {if (!isDefined(widgetInEditMode)) {return null;}- const title = isDefined(editedTitle)- ? editedTitle- : isDefined(widgetInEditMode.title) && widgetInEditMode.title !== ''- ? widgetInEditMode.title- : '';-- return {+ return getPageLayoutWidgetHeaderInfo({+ editedTitle,headerIcon: IconFrame,headerIconColor: iconColor,headerType: t`iFrame Widget`,- title,- isReadonly: false,- tab: undefined,widgetInEditMode,- isIconEditable: false,- selectedIconKey: null,- };+ });}case SidePanelPages.DashboardChartSettings: {- if (!isDefined(pageLayoutEditingWidgetId)) {- return null;- }-- const widgetInEditMode = draftPageLayout.tabs- .flatMap((tab) => tab.widgets)- .find((widget) => widget.id === pageLayoutEditingWidgetId);-if (!isDefined(widgetInEditMode)) {return null;}@@ -148,119 +169,55 @@ export const usePageLayoutHeaderInfo = ({);const graphTypeInfo = GRAPH_TYPE_INFORMATION[currentGraphType];- const title = isDefined(editedTitle)- ? editedTitle- : isDefined(widgetInEditMode.title) && widgetInEditMode.title !== ''- ? widgetInEditMode.title- : '';-- return {+ return getPageLayoutWidgetHeaderInfo({+ editedTitle,headerIcon: graphTypeInfo.icon,headerIconColor: iconColor,headerType: t`Chart`,- title,- isReadonly: false,- tab: undefined,widgetInEditMode,- isIconEditable: false,- selectedIconKey: null,- };+ });}case SidePanelPages.RecordPageFieldsSettings: {- if (!isDefined(pageLayoutEditingWidgetId)) {- return null;- }-- const widgetInEditMode = draftPageLayout.tabs- .flatMap((tab) => tab.widgets)- .find((widget) => widget.id === pageLayoutEditingWidgetId);-if (!isDefined(widgetInEditMode)) {return null;}- const title = isDefined(editedTitle)- ? editedTitle- : isDefined(widgetInEditMode.title) && widgetInEditMode.title !== ''- ? widgetInEditMode.title- : '';-- return {+ return getPageLayoutWidgetHeaderInfo({+ editedTitle,headerIcon: IconList,headerIconColor: iconColor,headerType: t`Fields Widget`,- title,- isReadonly: false,- tab: undefined,widgetInEditMode,- isIconEditable: false,- selectedIconKey: null,- };+ });}case SidePanelPages.RecordPageFieldSettings: {- if (!isDefined(pageLayoutEditingWidgetId)) {- return null;- }-- const widgetInEditMode = draftPageLayout.tabs- .flatMap((tab) => tab.widgets)- .find((widget) => widget.id === pageLayoutEditingWidgetId);-if (!isDefined(widgetInEditMode)) {return null;}- const title = isDefined(editedTitle)- ? editedTitle- : isDefined(widgetInEditMode.title) && widgetInEditMode.title !== ''- ? widgetInEditMode.title- : '';-- return {+ return getPageLayoutWidgetHeaderInfo({+ editedTitle,headerIcon: IconList,headerIconColor: iconColor,headerType: t`Field Widget`,- title,- isReadonly: false,- tab: undefined,widgetInEditMode,- isIconEditable: false,- selectedIconKey: null,- };+ });}case SidePanelPages.DashboardRecordTableSettings: {- if (!isDefined(pageLayoutEditingWidgetId)) {- return null;- }-- const widgetInEditMode = draftPageLayout.tabs- .flatMap((tab) => tab.widgets)- .find((widget) => widget.id === pageLayoutEditingWidgetId);-if (!isDefined(widgetInEditMode)) {return null;}- const title = isDefined(editedTitle)- ? editedTitle- : isDefined(widgetInEditMode.title) && widgetInEditMode.title !== ''- ? widgetInEditMode.title- : '';-- return {+ return getPageLayoutWidgetHeaderInfo({+ editedTitle,headerIcon: IconTable,headerIconColor: iconColor,headerType: t`View`,- title,- isReadonly: false,- tab: undefined,widgetInEditMode,- isIconEditable: false,- selectedIconKey: null,- };+ });}case SidePanelPages.PageLayoutDashboardWidgetTypeSelect: {diff --git a/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx b/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsxindex 25e8d36be63..54269ae411b 100644--- a/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx+++ b/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx@@ -18,6 +18,7 @@ import { SidePanelRecordPageFieldsSettings } from '@/side-panel/pages/page-layouimport { SidePanelPageLayoutDashboardWidgetTypeSelect } from '@/side-panel/pages/page-layout/components/SidePanelPageLayoutDashboardWidgetTypeSelect';import { SidePanelPageLayoutRecordPageWidgetTypeSelect } from '@/side-panel/pages/page-layout/components/SidePanelPageLayoutRecordPageWidgetTypeSelect';import { SidePanelPageLayoutTabSettings } from '@/side-panel/pages/page-layout/components/SidePanelPageLayoutTabSettings';+import { SidePanelPageLayoutWidgetSettings } from '@/side-panel/pages/page-layout/components/SidePanelPageLayoutWidgetSettings';import { SidePanelMergeRecordPage } from '@/side-panel/pages/record-page/components/SidePanelMergeRecordPage';import { SidePanelRecordsPage } from '@/side-panel/pages/records-page/components/SidePanelRecordsPage';import { SidePanelRecordPage } from '@/side-panel/pages/record-page/components/SidePanelRecordPage';@@ -67,6 +68,10 @@ export const SIDE_PANEL_PAGES_CONFIG = new Map<SidePanelPages, React.ReactNode>(<SidePanelDashboardIframeSettings />,],[SidePanelPages.PageLayoutTabSettings, <SidePanelPageLayoutTabSettings />],+ [+ SidePanelPages.PageLayoutWidgetSettings,+ <SidePanelPageLayoutWidgetSettings />,+ ],[SidePanelPages.DashboardRecordTableSettings,<SidePanelDashboardRecordTableSettings />,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.tsxnew file mode 100644index 00000000000..81c666a5192--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenWidgetSettingsInSidePanel.test.tsx@@ -0,0 +1,201 @@+import {+ PAGE_LAYOUT_TEST_INSTANCE_ID,+ PageLayoutTestWrapper,+} from '@/page-layout/hooks/__tests__/PageLayoutTestWrapper';+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';+import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';+import {+ makeDraft,+ makeTab,+ makeWidget,+} 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';+import { type ReactNode } from 'react';+import { SidePanelPages } from 'twenty-shared/types';+import {+ PageLayoutTabLayoutMode,+ 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',+);++describe('useOpenWidgetSettingsInSidePanel', () => {+ const mockCloseSidePanelMenu = jest.fn();+ const mockNavigatePageLayoutSidePanel = jest.fn();++ const getDraftAtom = () =>+ pageLayoutDraftComponentState.atomFamily({+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,+ });++ const getEditingWidgetIdAtom = () =>+ pageLayoutEditingWidgetIdComponentState.atomFamily({+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,+ });++ beforeEach(() => {+ jest.clearAllMocks();++ (useSidePanelMenu as jest.Mock).mockReturnValue({+ closeSidePanelMenu: mockCloseSidePanelMenu,+ });+ (useIsDashboardPageLayout as jest.Mock).mockReturnValue(false);+ (useNavigatePageLayoutSidePanel as jest.Mock).mockReturnValue({+ navigatePageLayoutSidePanel: mockNavigatePageLayoutSidePanel,+ });+ });++ const renderOpenWidgetSettingsHook = (+ store: ReturnType<typeof createStore>,+ ) =>+ renderHook(+ () => useOpenWidgetSettingsInSidePanel(PAGE_LAYOUT_TEST_INSTANCE_ID),+ {+ wrapper: ({ children }: { children: ReactNode }) => (+ <PageLayoutTestWrapper store={store}>+ {children}+ </PageLayoutTestWrapper>+ ),+ },+ );++ it('opens widget settings for a FILL_VIEWPORT widget in a vertical-list tab', () => {+ const store = createStore();+ const timelineWidget = {+ ...makeWidget('timeline-widget', 1),+ type: WidgetType.TIMELINE,+ };++ store.set(+ getDraftAtom(),+ makeDraft([+ makeTab('tab-1', [makeWidget('fields-widget', 0), timelineWidget]),+ ]),+ );++ const { result } = renderOpenWidgetSettingsHook(store);++ act(() => {+ result.current.openWidgetSettingsInSidePanel({+ widgetId: timelineWidget.id,+ widgetType: timelineWidget.type,+ });+ });++ expect(store.get(getEditingWidgetIdAtom())).toBe(timelineWidget.id);+ expect(mockNavigatePageLayoutSidePanel).toHaveBeenCalledWith({+ sidePanelPage: SidePanelPages.PageLayoutWidgetSettings,+ resetNavigationStack: true,+ });+ expect(mockCloseSidePanelMenu).not.toHaveBeenCalled();+ });++ it('opens widget settings for a FILL_VIEWPORT widget in a grid tab', () => {+ const store = createStore();+ const timelineWidget = {+ ...makeWidget('timeline-widget', 1),+ type: WidgetType.TIMELINE,+ };++ store.set(+ getDraftAtom(),+ makeDraft([+ makeTab(+ 'tab-1',+ [makeWidget('fields-widget', 0), timelineWidget],+ 0,+ PageLayoutTabLayoutMode.GRID,+ ),+ ]),+ );+ const { result } = renderOpenWidgetSettingsHook(store);++ act(() => {+ result.current.openWidgetSettingsInSidePanel({+ widgetId: timelineWidget.id,+ widgetType: timelineWidget.type,+ });+ });++ expect(store.get(getEditingWidgetIdAtom())).toBe(timelineWidget.id);+ expect(mockNavigatePageLayoutSidePanel).toHaveBeenCalledWith({+ sidePanelPage: SidePanelPages.PageLayoutWidgetSettings,+ resetNavigationStack: true,+ });+ expect(mockCloseSidePanelMenu).not.toHaveBeenCalled();+ });++ it('opens widget settings for a fit-content widget in a multi-widget tab', () => {+ const store = createStore();+ const frontComponentWidget = {+ ...makeWidget('front-component-widget', 1),+ type: WidgetType.FRONT_COMPONENT,+ };++ store.set(+ getDraftAtom(),+ makeDraft([+ makeTab('tab-1', [+ makeWidget('fields-widget', 0),+ frontComponentWidget,+ ]),+ ]),+ );++ const { result } = renderOpenWidgetSettingsHook(store);++ act(() => {+ result.current.openWidgetSettingsInSidePanel({+ widgetId: frontComponentWidget.id,+ widgetType: frontComponentWidget.type,+ });+ });++ expect(store.get(getEditingWidgetIdAtom())).toBe(frontComponentWidget.id);+ expect(mockNavigatePageLayoutSidePanel).toHaveBeenCalledWith({+ sidePanelPage: SidePanelPages.PageLayoutWidgetSettings,+ resetNavigationStack: true,+ });+ expect(mockCloseSidePanelMenu).not.toHaveBeenCalled();+ });++ it.each([WidgetType.IFRAME, WidgetType.GRAPH, WidgetType.RECORD_TABLE])(+ 'opens generic widget settings for a %s widget on a record page',+ (widgetType) => {+ const store = createStore();+ const widget = {+ ...makeWidget('widget', 1),+ type: widgetType,+ };++ store.set(+ getDraftAtom(),+ makeDraft([makeTab('tab-1', [makeWidget('fields-widget', 0), widget])]),+ );++ const { result } = renderOpenWidgetSettingsHook(store);++ act(() => {+ result.current.openWidgetSettingsInSidePanel({+ widgetId: widget.id,+ widgetType: widget.type,+ });+ });++ expect(store.get(getEditingWidgetIdAtom())).toBe(widget.id);+ expect(mockNavigatePageLayoutSidePanel).toHaveBeenCalledWith({+ sidePanelPage: SidePanelPages.PageLayoutWidgetSettings,+ resetNavigationStack: true,+ });+ },+ );+});diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenWidgetSettingsInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenWidgetSettingsInSidePanel.tsindex 352c099a5a4..55ec362728c 100644--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenWidgetSettingsInSidePanel.ts+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenWidgetSettingsInSidePanel.ts@@ -4,15 +4,14 @@ import { PageLayoutComponentInstanceContext } from '@/page-layout/states/contextimport { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';import { pageLayoutTabSettingsOpenTabIdComponentState } from '@/page-layout/states/pageLayoutTabSettingsOpenTabIdComponentState';-import { getTabPresentation } from '@/page-layout/utils/getTabPresentation';+import { getIsSingleWidgetTab } from '@/page-layout/utils/getIsSingleWidgetTab';+import { isViewportFillingWidgetType } from '@/page-layout/widgets/utils/isViewportFillingWidgetType';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 { sidePanelPageState } from '@/side-panel/states/sidePanelPageState';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';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { t } from '@lingui/core/macro';import { SidePanelPages } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';@@ -38,7 +37,6 @@ export const useOpenWidgetSettingsInSidePanel = (const { navigatePageLayoutSidePanel } = useNavigatePageLayoutSidePanel();const { closeSidePanelMenu } = useSidePanelMenu();- const setSidePanelPage = useSetAtomState(sidePanelPageState);const pageLayoutDraft = useAtomComponentStateValue(pageLayoutDraftComponentState,@@ -58,11 +56,7 @@ export const useOpenWidgetSettingsInSidePanel = (widgetId: string;widgetType: WidgetType;}) => {- if (widgetType === WidgetType.IFRAME) {- if (!isDashboardPageLayout) {- return;- }-+ if (widgetType === WidgetType.IFRAME && isDashboardPageLayout) {navigatePageLayoutSidePanel({sidePanelPage: SidePanelPages.DashboardIframeSettings,pageTitle: t`Edit iFrame`,@@ -72,11 +66,7 @@ export const useOpenWidgetSettingsInSidePanel = (return;}- if (widgetType === WidgetType.GRAPH) {- if (!isDashboardPageLayout) {- return;- }-+ if (widgetType === WidgetType.GRAPH && isDashboardPageLayout) {navigatePageLayoutSidePanel({sidePanelPage: SidePanelPages.DashboardChartSettings,pageTitle: t`Edit Graph`,@@ -110,11 +100,7 @@ export const useOpenWidgetSettingsInSidePanel = (return;}- if (widgetType === WidgetType.RECORD_TABLE) {- if (!isDashboardPageLayout) {- return;- }-+ if (widgetType === WidgetType.RECORD_TABLE && isDashboardPageLayout) {navigatePageLayoutSidePanel({sidePanelPage: SidePanelPages.DashboardRecordTableSettings,pageTitle: t`Edit Record Table`,@@ -134,15 +120,19 @@ export const useOpenWidgetSettingsInSidePanel = (tab.widgets.some((w) => w.id === widgetId),);- const isContainingTabSolo =+ const isContainingTabSingleWidget =+ isDefined(containingTab) &&+ getIsSingleWidgetTab({ tab: containingTab });++ const isViewportFillingWidgetInVerticalList =isDefined(containingTab) &&- getTabPresentation({- widgets: containingTab.widgets.filter((w) => w.isActive),- layoutMode:- containingTab.layoutMode ?? PageLayoutTabLayoutMode.VERTICAL_LIST,- }) === 'solo';+ containingTab.layoutMode === PageLayoutTabLayoutMode.VERTICAL_LIST &&+ isViewportFillingWidgetType(widgetType);- if (isContainingTabSolo) {+ if (+ isContainingTabSingleWidget &&+ !isViewportFillingWidgetInVerticalList+ ) {setPageLayoutTabSettingsOpenTabId(containingTab.id);navigatePageLayoutSidePanel({sidePanelPage: SidePanelPages.PageLayoutTabSettings,@@ -151,8 +141,11 @@ export const useOpenWidgetSettingsInSidePanel = (return;}- setSidePanelPage(SidePanelPages.CommandMenuDisplay);- closeSidePanelMenu();+ setPageLayoutEditingWidgetId(widgetId);+ navigatePageLayoutSidePanel({+ sidePanelPage: SidePanelPages.PageLayoutWidgetSettings,+ resetNavigationStack: true,+ });},[isDashboardPageLayout,@@ -161,7 +154,6 @@ export const useOpenWidgetSettingsInSidePanel = (setPageLayoutTabSettingsOpenTabId,navigatePageLayoutSidePanel,closeSidePanelMenu,- setSidePanelPage,],);diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutTabSettingsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutTabSettingsContent.tsxindex 563c07c720e..84d8c8fa6a1 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutTabSettingsContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutTabSettingsContent.tsx@@ -6,22 +6,19 @@ import { useResetPageLayoutTabToDefault } from '@/page-layout/hooks/useResetPageimport { useSetAsPinnedTab } from '@/page-layout/hooks/useSetAsPinnedTab';import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';import { pageLayoutTabSettingsOpenTabIdComponentState } from '@/page-layout/states/pageLayoutTabSettingsOpenTabIdComponentState';+import { getIsSingleWidgetTab } from '@/page-layout/utils/getIsSingleWidgetTab';import { getTabListInstanceIdFromPageLayoutAndRecord } from '@/page-layout/utils/getTabListInstanceIdFromPageLayoutAndRecord';-import { getTabPresentation } from '@/page-layout/utils/getTabPresentation';import { sortTabsByPosition } from '@/page-layout/utils/sortTabsByPosition';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';import { RegularTabSettingsContent } from '@/side-panel/pages/page-layout/components/RegularTabSettingsContent';-import { SoloTabSettingsContent } from '@/side-panel/pages/page-layout/components/SoloTabSettingsContent';+import { SingleWidgetTabSettingsContent } from '@/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent';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 { isNonEmptyString } from '@sniptt/guards';import { useNavigate } from 'react-router-dom';import { isDefined } from 'twenty-shared/utils';-import {- PageLayoutTabLayoutMode,- PageLayoutType,-} from '~/generated-metadata/graphql';+import { PageLayoutType } from '~/generated-metadata/graphql';type SidePanelPageLayoutTabSettingsContentProps = {pageLayoutId: string;@@ -103,17 +100,13 @@ export const SidePanelPageLayoutTabSettingsContent = ({const activeWidgets = tab.widgets.filter((widget) => widget.isActive);- const isSoloTab =- getTabPresentation({- widgets: activeWidgets,- layoutMode: tab.layoutMode ?? PageLayoutTabLayoutMode.VERTICAL_LIST,- }) === 'solo';+ const isSingleWidgetTab = getIsSingleWidgetTab({ tab });- if (isSoloTab) {+ if (isSingleWidgetTab) {return (- <SoloTabSettingsContent+ <SingleWidgetTabSettingsContentpageLayoutId={pageLayoutId}- soloWidget={activeWidgets.at(0)}+ singleWidget={activeWidgets.at(0)!}canSetAsPinned={canSetAsPinned}canMoveLeft={canMoveLeft}canMoveRight={canMoveRight}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.tsxnew file mode 100644index 00000000000..3350efead6e--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutWidgetSettings.tsx@@ -0,0 +1,46 @@+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 { 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 { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);+ const { placementSelectableItemIds, widgetSettingsPlacement } =+ useWidgetSettingsPlacementSelectableItemIds(pageLayoutId);++ if (!isDefined(widgetInEditMode)) {+ return null;+ }++ const selectableItemIds = [+ WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION,+ WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.RESET_TO_DEFAULT,+ WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.REPLACE_WIDGET,+ WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.DELETE_WIDGET,+ ...placementSelectableItemIds,+ ];++ return (+ <SidePanelList selectableItemIds={selectableItemIds}>+ <WidgetSettingsManageSection pageLayoutId={pageLayoutId} />+ <WidgetSettingsPlacementSection+ pageLayoutId={pageLayoutId}+ isPlacementSectionVisible={+ widgetSettingsPlacement.isPlacementSectionVisible+ }+ pageLayoutEditingWidgetId={+ widgetSettingsPlacement.pageLayoutEditingWidgetId+ }+ showAddWidgetBelow={widgetSettingsPlacement.showAddWidgetBelow}+ showMoveDown={widgetSettingsPlacement.showMoveDown}+ showMoveUp={widgetSettingsPlacement.showMoveUp}+ />+ </SidePanelList>+ );+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SoloTabSettingsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent.tsxsimilarity index 75%rename from packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SoloTabSettingsContent.tsxrename to packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent.tsxindex 7fc5ac924df..696a137e954 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SoloTabSettingsContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent.tsx@@ -3,7 +3,7 @@ import { CommandMenuItemDropdown } from '@/command-menu/components/CommandMenuItimport { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelList } from '@/side-panel/components/SidePanelList';-import { SoloTabWidgetVisibilityDropdownContent } from '@/side-panel/pages/page-layout/components/dropdown-content/SoloTabWidgetVisibilityDropdownContent';+import { SingleWidgetTabVisibilityDropdownContent } from '@/side-panel/pages/page-layout/components/dropdown-content/SingleWidgetTabVisibilityDropdownContent';import { TAB_SETTINGS_SELECTABLE_ITEM_IDS } from '@/side-panel/pages/page-layout/constants/settings/TabSettingsSelectableItemIds';import { useTranslatedVisibilityLabel } from '@/side-panel/pages/page-layout/hooks/useTranslatedVisibilityLabel';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';@@ -11,7 +11,6 @@ import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModaimport { useModal } from '@/ui/layout/modal/hooks/useModal';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { useLingui } from '@lingui/react/macro';-import { isDefined } from 'twenty-shared/utils';import {IconChevronLeft,IconChevronRight,@@ -22,12 +21,14 @@ import {} from 'twenty-ui/icon';import { AppTooltip } from 'twenty-ui/surfaces';-const RESET_TAB_TO_DEFAULT_MODAL_ID = 'reset-solo-tab-to-default-modal';-const RESET_TAB_TO_DEFAULT_MENU_ITEM_ID = 'reset-solo-tab-to-default-menu-item';+const RESET_TAB_TO_DEFAULT_MODAL_ID =+ 'reset-single-widget-tab-to-default-modal';+const RESET_TAB_TO_DEFAULT_MENU_ITEM_ID =+ 'reset-single-widget-tab-to-default-menu-item';-type SoloTabSettingsContentProps = {+type SingleWidgetTabSettingsContentProps = {pageLayoutId: string;- soloWidget: PageLayoutWidget | undefined;+ singleWidget: PageLayoutWidget;canSetAsPinned: boolean;canMoveLeft: boolean;canMoveRight: boolean;@@ -40,9 +41,9 @@ type SoloTabSettingsContentProps = {onDelete: () => void;};-export const SoloTabSettingsContent = ({+export const SingleWidgetTabSettingsContent = ({pageLayoutId,- soloWidget,+ singleWidget,canSetAsPinned,canMoveLeft,canMoveRight,@@ -53,12 +54,12 @@ export const SoloTabSettingsContent = ({onSetAsPinned,onResetToDefault,onDelete,-}: SoloTabSettingsContentProps) => {+}: SingleWidgetTabSettingsContentProps) => {const { t } = useLingui();const { openModal } = useModal();const visibilityLabel = useTranslatedVisibilityLabel(- soloWidget?.conditionalAvailabilityExpression,+ singleWidget.conditionalAvailabilityExpression,);const handleResetToDefault = () => {@@ -72,9 +73,7 @@ export const SoloTabSettingsContent = ({...(canSetAsPinned ? [TAB_SETTINGS_SELECTABLE_ITEM_IDS.SET_AS_PINNED] : []),...(canMoveLeft ? [TAB_SETTINGS_SELECTABLE_ITEM_IDS.MOVE_LEFT] : []),...(canMoveRight ? [TAB_SETTINGS_SELECTABLE_ITEM_IDS.MOVE_RIGHT] : []),- ...(isDefined(soloWidget)- ? [TAB_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION]- : []),+ TAB_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION,TAB_SETTINGS_SELECTABLE_ITEM_IDS.RESET_TO_DEFAULT,...(canDelete ? [TAB_SETTINGS_SELECTABLE_ITEM_IDS.DELETE] : []),];@@ -124,34 +123,32 @@ export const SoloTabSettingsContent = ({)}</SidePanelGroup><SidePanelGroup heading={t`Manage`}>- {isDefined(soloWidget) && (- <SelectableListItem- itemId={TAB_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION}- >- <CommandMenuItemDropdown- id={TAB_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION}- label={t`Visibility restriction`}- Icon={IconEyeX}- dropdownId={- TAB_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION- }- dropdownComponents={- <DropdownContent>- <SoloTabWidgetVisibilityDropdownContent- widgetId={soloWidget.id}- currentExpression={- soloWidget.conditionalAvailabilityExpression- }- pageLayoutId={pageLayoutId}- />- </DropdownContent>- }- dropdownPlacement="bottom-end"- description={visibilityLabel}- contextualTextPosition="right"- />- </SelectableListItem>- )}+ <SelectableListItem+ itemId={TAB_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION}+ >+ <CommandMenuItemDropdown+ id={TAB_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION}+ label={t`Visibility restriction`}+ Icon={IconEyeX}+ dropdownId={+ TAB_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION+ }+ dropdownComponents={+ <DropdownContent>+ <SingleWidgetTabVisibilityDropdownContent+ widgetId={singleWidget.id}+ currentExpression={+ singleWidget.conditionalAvailabilityExpression+ }+ pageLayoutId={pageLayoutId}+ />+ </DropdownContent>+ }+ dropdownPlacement="bottom-end"+ description={visibilityLabel}+ contextualTextPosition="right"+ />+ </SelectableListItem><div id={RESET_TAB_TO_DEFAULT_MENU_ITEM_ID}><SelectableListItemitemId={TAB_SETTINGS_SELECTABLE_ITEM_IDS.RESET_TO_DEFAULT}diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsxindex bd69fd4e0ff..82b28a19543 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx@@ -7,7 +7,7 @@ import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/paimport { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { WidgetVisibilityDropdownContent } from '@/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityDropdownContent';import { WIDGET_SETTINGS_SELECTABLE_ITEM_IDS } from '@/side-panel/pages/page-layout/constants/settings/WidgetSettingsSelectableItemIds';-import { useNavigatePageLayoutSidePanel } from '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel';+import { useOpenReplaceWidgetPicker } from '@/side-panel/pages/page-layout/hooks/useOpenReplaceWidgetPicker';import { useTranslatedVisibilityLabel } from '@/side-panel/pages/page-layout/hooks/useTranslatedVisibilityLabel';import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';@@ -18,7 +18,6 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useimport { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useLingui } from '@lingui/react/macro';import { isNonEmptyString } from '@sniptt/guards';-import { SidePanelPages } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import {IconEyeX,@@ -55,7 +54,7 @@ export const WidgetSettingsManageSection = ({const { resetPageLayoutWidgetToDefault } =useResetPageLayoutWidgetToDefault(pageLayoutId);- const { navigatePageLayoutSidePanel } = useNavigatePageLayoutSidePanel();+ const { openReplaceWidgetPicker } = useOpenReplaceWidgetPicker(pageLayoutId);const { openModal } = useModal();@@ -83,12 +82,6 @@ export const WidgetSettingsManageSection = ({resetPageLayoutWidgetToDefault(pageLayoutEditingWidgetId);};- const handleReplaceWidget = () => {- navigatePageLayoutSidePanel({- sidePanelPage: SidePanelPages.PageLayoutRecordPageWidgetTypeSelect,- });- };-const handleDeleteWidget = () => {deletePageLayoutWidget(pageLayoutEditingWidgetId);};@@ -140,14 +133,14 @@ export const WidgetSettingsManageSection = ({)}<SelectableListItemitemId={WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.REPLACE_WIDGET}- onEnter={handleReplaceWidget}+ onEnter={openReplaceWidgetPicker}><CommandMenuItemid={WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.REPLACE_WIDGET}Icon={IconSwitchHorizontal}label={t`Replace widget`}hasSubMenu- onClick={handleReplaceWidget}+ onClick={openReplaceWidgetPicker}/></SelectableListItem><SelectableListItemdiff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.tsxindex cdc8852c18c..e83d92baf8c 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.tsx@@ -1,20 +1,16 @@import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';import { CommandMenuItemDropdown } from '@/command-menu/components/CommandMenuItemDropdown';-import { useCanMovePageLayoutWidgetDown } from '@/page-layout/hooks/useCanMovePageLayoutWidgetDown';-import { useCanMovePageLayoutWidgetUp } from '@/page-layout/hooks/useCanMovePageLayoutWidgetUp';import { useMovePageLayoutWidgetDown } from '@/page-layout/hooks/useMovePageLayoutWidgetDown';import { useMovePageLayoutWidgetUp } from '@/page-layout/hooks/useMovePageLayoutWidgetUp';-import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';-import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';import { widgetInsertionContextComponentState } from '@/page-layout/states/widgetInsertionContextComponentState';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { MoveToTabDropdownContent } from '@/side-panel/pages/page-layout/components/dropdown-content/MoveToTabDropdownContent';import { WIDGET_SETTINGS_SELECTABLE_ITEM_IDS } from '@/side-panel/pages/page-layout/constants/settings/WidgetSettingsSelectableItemIds';import { useNavigatePageLayoutSidePanel } from '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel';+import { type WidgetSettingsPlacement } from '@/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacement';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useLingui } from '@lingui/react/macro';import { useStore } from 'jotai';import { SidePanelPages } from 'twenty-shared/types';@@ -26,27 +22,21 @@ import {IconRowInsertBottom,IconRowInsertTop,} from 'twenty-ui/icon';-import { PageLayoutTabLayoutMode } from '~/generated-metadata/graphql';-type WidgetSettingsPlacementSectionProps = {+type WidgetSettingsPlacementSectionProps = WidgetSettingsPlacement & {pageLayoutId: string;};export const WidgetSettingsPlacementSection = ({pageLayoutId,+ isPlacementSectionVisible,+ pageLayoutEditingWidgetId,+ showAddWidgetBelow,+ showMoveDown,+ showMoveUp,}: WidgetSettingsPlacementSectionProps) => {const { t } = useLingui();- const pageLayoutEditingWidgetId = useAtomComponentStateValue(- pageLayoutEditingWidgetIdComponentState,- pageLayoutId,- );-- const pageLayoutDraft = useAtomComponentStateValue(- pageLayoutDraftComponentState,- pageLayoutId,- );-const widgetInsertionContextState = useAtomComponentStateCallbackState(widgetInsertionContextComponentState,pageLayoutId,@@ -57,31 +47,12 @@ export const WidgetSettingsPlacementSection = ({const { movePageLayoutWidgetUp } = useMovePageLayoutWidgetUp(pageLayoutId);const { movePageLayoutWidgetDown } =useMovePageLayoutWidgetDown(pageLayoutId);- const { canMovePageLayoutWidgetUp } =- useCanMovePageLayoutWidgetUp(pageLayoutId);- const { canMovePageLayoutWidgetDown } =- useCanMovePageLayoutWidgetDown(pageLayoutId);-const { navigatePageLayoutSidePanel } = useNavigatePageLayoutSidePanel();- if (!isDefined(pageLayoutEditingWidgetId)) {- return null;- }-- const currentTab = pageLayoutDraft.tabs.find((tab) =>- tab.widgets.some((widget) => widget.id === pageLayoutEditingWidgetId),- );-- if (- !isDefined(currentTab) ||- currentTab.layoutMode !== PageLayoutTabLayoutMode.VERTICAL_LIST- ) {+ if (!isPlacementSectionVisible || !isDefined(pageLayoutEditingWidgetId)) {return null;}- const showMoveUp = canMovePageLayoutWidgetUp(pageLayoutEditingWidgetId);- const showMoveDown = canMovePageLayoutWidgetDown(pageLayoutEditingWidgetId);-const handleMoveUp = () => {movePageLayoutWidgetUp(pageLayoutEditingWidgetId);};@@ -167,17 +138,19 @@ export const WidgetSettingsPlacementSection = ({onClick={handleAddWidgetAbove}/></SelectableListItem>- <SelectableListItem- itemId={WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.ADD_WIDGET_BELOW}- onEnter={handleAddWidgetBelow}- >- <CommandMenuItem- id={WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.ADD_WIDGET_BELOW}- Icon={IconRowInsertBottom}- label={t`Add widget below`}- onClick={handleAddWidgetBelow}- />- </SelectableListItem>+ {showAddWidgetBelow && (+ <SelectableListItem+ itemId={WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.ADD_WIDGET_BELOW}+ onEnter={handleAddWidgetBelow}+ >+ <CommandMenuItem+ id={WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.ADD_WIDGET_BELOW}+ Icon={IconRowInsertBottom}+ label={t`Add widget below`}+ onClick={handleAddWidgetBelow}+ />+ </SelectableListItem>+ )}</SidePanelGroup>);};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.tsxindex 4eed4304795..0d31884639e 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@@ -1,6 +1,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 { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';@@ -33,10 +34,19 @@ export const MoveToTabDropdownContent = () => {): undefined;+ const currentWidget = currentTab?.widgets.find(+ (widget) => widget.id === pageLayoutEditingWidgetId,+ );+const eligibleTabs = pageLayoutDraft.tabs.filter((tab) =>tab.layoutMode === PageLayoutTabLayoutMode.VERTICAL_LIST &&- tab.id !== currentTab?.id,+ tab.id !== currentTab?.id &&+ isDefined(currentWidget) &&+ canVerticalListAcceptWidget({+ destinationWidgets: tab.widgets,+ widget: currentWidget,+ }),);if (!isDefined(pageLayoutEditingWidgetId)) {diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/SingleWidgetTabVisibilityDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/SingleWidgetTabVisibilityDropdownContent.tsxnew file mode 100644index 00000000000..147155c30f6--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/SingleWidgetTabVisibilityDropdownContent.tsx@@ -0,0 +1,35 @@+import { useUpdatePageLayoutWidget } from '@/page-layout/hooks/useUpdatePageLayoutWidget';+import { WidgetVisibilityOptionsList } from '@/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityOptionsList';+import { expressionToOptionId } from '@/side-panel/pages/page-layout/utils/expressionToOptionId';+import { optionIdToExpression } from '@/side-panel/pages/page-layout/utils/optionIdToExpression';+import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';++type SingleWidgetTabVisibilityDropdownContentProps = {+ widgetId: string;+ currentExpression: string | null | undefined;+ pageLayoutId: string;+};++export const SingleWidgetTabVisibilityDropdownContent = ({+ widgetId,+ currentExpression,+ pageLayoutId,+}: SingleWidgetTabVisibilityDropdownContentProps) => {+ const { updatePageLayoutWidget } = useUpdatePageLayoutWidget(pageLayoutId);++ const { closeDropdown } = useCloseDropdown();++ const handleSelectVisibility = (optionId: string) => {+ updatePageLayoutWidget(widgetId, {+ conditionalAvailabilityExpression: optionIdToExpression(optionId),+ });+ closeDropdown();+ };++ return (+ <WidgetVisibilityOptionsList+ currentOptionId={expressionToOptionId(currentExpression)}+ onSelectVisibility={handleSelectVisibility}+ />+ );+};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.tsxindex 32ee0fca80f..255329546ba 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,38 +1,16 @@-import { VISIBILITY_OPTIONS } from '@/side-panel/pages/page-layout/constants/VisibilityOptions';+import { WidgetVisibilityOptionsList } from '@/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityOptionsList';import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';-import { useVisibilityLabels } from '@/side-panel/pages/page-layout/hooks/useVisibilityLabels';import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';import { expressionToOptionId } from '@/side-panel/pages/page-layout/utils/expressionToOptionId';import { optionIdToExpression } from '@/side-panel/pages/page-layout/utils/optionIdToExpression';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { MenuItemSelect } from 'twenty-ui/navigation';export const WidgetVisibilityDropdownContent = () => {const { pageLayoutId } = usePageLayoutIdFromContextStore();const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);- const currentOptionId = expressionToOptionId(- widgetInEditMode?.conditionalAvailabilityExpression,- );-- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-const { updateCurrentWidgetConfig } =useUpdateCurrentWidgetConfig(pageLayoutId);@@ -45,34 +23,12 @@ export const WidgetVisibilityDropdownContent = () => {closeDropdown();};- const visibilityLabels = useVisibilityLabels();-return (- <DropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={VISIBILITY_OPTIONS.map((option) => option.id)}- >- {VISIBILITY_OPTIONS.map((option) => (- <SelectableListItem- key={option.id}- itemId={option.id}- onEnter={() => {- handleSelectVisibility(option.id);- }}- >- <MenuItemSelect- text={visibilityLabels[option.id]}- selected={currentOptionId === option.id}- focused={selectedItemId === option.id}- onClick={() => {- handleSelectVisibility(option.id);- }}- />- </SelectableListItem>- ))}- </SelectableList>- </DropdownMenuItemsContainer>+ <WidgetVisibilityOptionsList+ currentOptionId={expressionToOptionId(+ widgetInEditMode?.conditionalAvailabilityExpression,+ )}+ onSelectVisibility={handleSelectVisibility}+ />);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/SoloTabWidgetVisibilityDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityOptionsList.tsxsimilarity index 60%rename from packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/SoloTabWidgetVisibilityDropdownContent.tsxrename to packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityOptionsList.tsxindex 6277bdd8629..2f1b9b9438f 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/SoloTabWidgetVisibilityDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityOptionsList.tsx@@ -1,11 +1,7 @@-import { useUpdatePageLayoutWidget } from '@/page-layout/hooks/useUpdatePageLayoutWidget';import { VISIBILITY_OPTIONS } from '@/side-panel/pages/page-layout/constants/VisibilityOptions';import { useVisibilityLabels } from '@/side-panel/pages/page-layout/hooks/useVisibilityLabels';-import { expressionToOptionId } from '@/side-panel/pages/page-layout/utils/expressionToOptionId';-import { optionIdToExpression } from '@/side-panel/pages/page-layout/utils/optionIdToExpression';import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';@@ -13,19 +9,15 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/comimport { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { MenuItemSelect } from 'twenty-ui/navigation';-type SoloTabWidgetVisibilityDropdownContentProps = {- widgetId: string;- currentExpression: string | null | undefined;- pageLayoutId: string;+type WidgetVisibilityOptionsListProps = {+ currentOptionId: string;+ onSelectVisibility: (optionId: string) => void;};-export const SoloTabWidgetVisibilityDropdownContent = ({- widgetId,- currentExpression,- pageLayoutId,-}: SoloTabWidgetVisibilityDropdownContentProps) => {- const currentOptionId = expressionToOptionId(currentExpression);-+export const WidgetVisibilityOptionsList = ({+ currentOptionId,+ onSelectVisibility,+}: WidgetVisibilityOptionsListProps) => {const dropdownId = useAvailableComponentInstanceIdOrThrow(DropdownComponentInstanceContext,);@@ -35,17 +27,6 @@ export const SoloTabWidgetVisibilityDropdownContent = ({dropdownId,);- const { updatePageLayoutWidget } = useUpdatePageLayoutWidget(pageLayoutId);-- const { closeDropdown } = useCloseDropdown();-- const handleSelectVisibility = (optionId: string) => {- updatePageLayoutWidget(widgetId, {- conditionalAvailabilityExpression: optionIdToExpression(optionId),- });- closeDropdown();- };-const visibilityLabels = useVisibilityLabels();return (@@ -59,13 +40,17 @@ export const SoloTabWidgetVisibilityDropdownContent = ({<SelectableListItemkey={option.id}itemId={option.id}- onEnter={() => handleSelectVisibility(option.id)}+ onEnter={() => {+ onSelectVisibility(option.id);+ }}><MenuItemSelect- text={visibilityLabels[option.id] ?? option.id}+ text={visibilityLabels[option.id]}selected={currentOptionId === option.id}focused={selectedItemId === option.id}- onClick={() => handleSelectVisibility(option.id)}+ onClick={() => {+ onSelectVisibility(option.id);+ }}/></SelectableListItem>))}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.tsxindex 9f2d2dfdbeb..810ccead666 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@@ -60,7 +60,7 @@ export const SidePanelRecordPageFieldSettings = () => {const { t } = useLingui();const { pageLayoutId } = usePageLayoutIdFromContextStore();- const { placementSelectableItemIds } =+ const { placementSelectableItemIds, widgetSettingsPlacement } =useWidgetSettingsPlacementSelectableItemIds(pageLayoutId);const { navigateToSidePanelSubPage } = useSidePanelSubPageHistory();@@ -260,7 +260,18 @@ export const SidePanelRecordPageFieldSettings = () => {)}</SidePanelGroup><WidgetSettingsManageSection pageLayoutId={pageLayoutId} />- <WidgetSettingsPlacementSection pageLayoutId={pageLayoutId} />+ <WidgetSettingsPlacementSection+ pageLayoutId={pageLayoutId}+ isPlacementSectionVisible={+ widgetSettingsPlacement.isPlacementSectionVisible+ }+ pageLayoutEditingWidgetId={+ widgetSettingsPlacement.pageLayoutEditingWidgetId+ }+ showAddWidgetBelow={widgetSettingsPlacement.showAddWidgetBelow}+ showMoveDown={widgetSettingsPlacement.showMoveDown}+ showMoveUp={widgetSettingsPlacement.showMoveUp}+ /></SidePanelList></StyledSidePanelContainer></StyledContainer>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.tsxindex 80bb221ced8..1a3116dc797 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@@ -39,7 +39,7 @@ export const SidePanelRecordPageFieldsSettings = () => {const { pageLayoutId, objectNameSingular } =usePageLayoutIdFromContextStore();- const { placementSelectableItemIds } =+ const { placementSelectableItemIds, widgetSettingsPlacement } =useWidgetSettingsPlacementSelectableItemIds(pageLayoutId);const { updateCurrentWidgetConfig } =@@ -130,7 +130,18 @@ export const SidePanelRecordPageFieldsSettings = () => {/></SidePanelGroup><WidgetSettingsManageSection pageLayoutId={pageLayoutId} />- <WidgetSettingsPlacementSection pageLayoutId={pageLayoutId} />+ <WidgetSettingsPlacementSection+ pageLayoutId={pageLayoutId}+ isPlacementSectionVisible={+ widgetSettingsPlacement.isPlacementSectionVisible+ }+ pageLayoutEditingWidgetId={+ widgetSettingsPlacement.pageLayoutEditingWidgetId+ }+ showAddWidgetBelow={widgetSettingsPlacement.showAddWidgetBelow}+ showMoveDown={widgetSettingsPlacement.showMoveDown}+ showMoveUp={widgetSettingsPlacement.showMoveUp}+ /></SidePanelList></StyledSidePanelContainer></StyledContainer>diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/__tests__/useOpenReplaceWidgetPicker.test.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/__tests__/useOpenReplaceWidgetPicker.test.tsxnew file mode 100644index 00000000000..099129b2fb7--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/__tests__/useOpenReplaceWidgetPicker.test.tsx@@ -0,0 +1,70 @@+import {+ PAGE_LAYOUT_TEST_INSTANCE_ID,+ PageLayoutTestWrapper,+} from '@/page-layout/hooks/__tests__/PageLayoutTestWrapper';+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';+import { widgetInsertionContextComponentState } from '@/page-layout/states/widgetInsertionContextComponentState';+import {+ makeDraft,+ makeTab,+ makeWidget,+} from '@/page-layout/testing/pageLayoutDraftFixtures';+import { useNavigatePageLayoutSidePanel } from '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel';+import { useOpenReplaceWidgetPicker } from '@/side-panel/pages/page-layout/hooks/useOpenReplaceWidgetPicker';+import { act, renderHook } from '@testing-library/react';+import { createStore } from 'jotai';+import { type ReactNode } from 'react';+import { SidePanelPages } from 'twenty-shared/types';++jest.mock(+ '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel',+);++describe('useOpenReplaceWidgetPicker', () => {+ it('clears an insertion context before opening the replacement picker', () => {+ const store = createStore();+ const widget = makeWidget('widget', 0);+ const mockNavigatePageLayoutSidePanel = jest.fn();+ const insertionContextAtom =+ widgetInsertionContextComponentState.atomFamily({+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,+ });++ (+ useNavigatePageLayoutSidePanel as jest.MockedFunction<+ typeof useNavigatePageLayoutSidePanel+ >+ ).mockReturnValue({+ navigatePageLayoutSidePanel: mockNavigatePageLayoutSidePanel,+ });++ store.set(+ pageLayoutDraftComponentState.atomFamily({+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,+ }),+ makeDraft([makeTab('tab-1', [widget])]),+ );+ store.set(insertionContextAtom, {+ targetWidgetId: widget.id,+ direction: 'below',+ });++ const { result } = renderHook(+ () => useOpenReplaceWidgetPicker(PAGE_LAYOUT_TEST_INSTANCE_ID),+ {+ wrapper: ({ children }: { children: ReactNode }) => (+ <PageLayoutTestWrapper store={store}>+ {children}+ </PageLayoutTestWrapper>+ ),+ },+ );++ act(() => result.current.openReplaceWidgetPicker());++ expect(store.get(insertionContextAtom)).toBeNull();+ expect(mockNavigatePageLayoutSidePanel).toHaveBeenCalledWith({+ sidePanelPage: SidePanelPages.PageLayoutRecordPageWidgetTypeSelect,+ });+ });+});diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/__tests__/useWidgetSettingsPlacementSelectableItemIds.test.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/__tests__/useWidgetSettingsPlacementSelectableItemIds.test.tsxnew file mode 100644index 00000000000..53a28cb6627--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/__tests__/useWidgetSettingsPlacementSelectableItemIds.test.tsx@@ -0,0 +1,105 @@+import {+ PAGE_LAYOUT_TEST_INSTANCE_ID,+ PageLayoutTestWrapper,+} from '@/page-layout/hooks/__tests__/PageLayoutTestWrapper';+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';+import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';+import {+ makeDraft,+ makeTab,+ makeWidget,+} from '@/page-layout/testing/pageLayoutDraftFixtures';+import { WIDGET_SETTINGS_SELECTABLE_ITEM_IDS } from '@/side-panel/pages/page-layout/constants/settings/WidgetSettingsSelectableItemIds';+import { useWidgetSettingsPlacementSelectableItemIds } from '@/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacementSelectableItemIds';+import { renderHook } from '@testing-library/react';+import { createStore } from 'jotai';+import { type ReactNode } from 'react';+import {+ PageLayoutTabLayoutMode,+ WidgetType,+} from '~/generated-metadata/graphql';++describe('useWidgetSettingsPlacementSelectableItemIds', () => {+ const getDraftAtom = () =>+ pageLayoutDraftComponentState.atomFamily({+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,+ });++ const getEditingWidgetIdAtom = () =>+ pageLayoutEditingWidgetIdComponentState.atomFamily({+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,+ });++ const renderPlacementSelectableItemIdsHook = ({+ editingWidgetId,+ layoutMode = PageLayoutTabLayoutMode.VERTICAL_LIST,+ widgetType,+ }: {+ editingWidgetId: string;+ layoutMode?: PageLayoutTabLayoutMode;+ widgetType: WidgetType;+ }) => {+ const store = createStore();+ const widget = {+ ...makeWidget(editingWidgetId, 0),+ type: widgetType,+ };++ store.set(+ getDraftAtom(),+ makeDraft([makeTab('tab-1', [widget], 0, layoutMode)]),+ );+ store.set(getEditingWidgetIdAtom(), editingWidgetId);++ return renderHook(+ () =>+ useWidgetSettingsPlacementSelectableItemIds(+ PAGE_LAYOUT_TEST_INSTANCE_ID,+ ),+ {+ wrapper: ({ children }: { children: ReactNode }) => (+ <PageLayoutTestWrapper store={store}>+ {children}+ </PageLayoutTestWrapper>+ ),+ },+ );+ };++ it('should omit add below while retaining add above for a viewport-filling widget', () => {+ const { result } = renderPlacementSelectableItemIdsHook({+ editingWidgetId: 'timeline-widget',+ widgetType: WidgetType.TIMELINE,+ });++ expect(result.current.placementSelectableItemIds).toContain(+ WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.ADD_WIDGET_ABOVE,+ );+ expect(result.current.placementSelectableItemIds).not.toContain(+ WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.ADD_WIDGET_BELOW,+ );+ });++ it('should include add above and add below for a fit-content widget', () => {+ const { result } = renderPlacementSelectableItemIdsHook({+ editingWidgetId: 'fields-widget',+ widgetType: WidgetType.FIELDS,+ });++ expect(result.current.placementSelectableItemIds).toEqual([+ WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.MOVE_TO_TAB,+ WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.ADD_WIDGET_ABOVE,+ WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.ADD_WIDGET_BELOW,+ ]);+ });++ it('should omit placement item IDs when the placement section is not rendered', () => {+ const { result } = renderPlacementSelectableItemIdsHook({+ editingWidgetId: 'fields-widget',+ layoutMode: PageLayoutTabLayoutMode.GRID,+ widgetType: WidgetType.FIELDS,+ });++ expect(result.current.placementSelectableItemIds).toEqual([]);+ });+});diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useOpenReplaceWidgetPicker.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useOpenReplaceWidgetPicker.tsnew file mode 100644index 00000000000..39942be6048--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useOpenReplaceWidgetPicker.ts@@ -0,0 +1,34 @@+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';+import { widgetInsertionContextComponentState } from '@/page-layout/states/widgetInsertionContextComponentState';+import { useNavigatePageLayoutSidePanel } from '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel';+import { getReplaceWidgetSidePanelPage } from '@/side-panel/pages/page-layout/utils/getReplaceWidgetSidePanelPage';+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';+import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';+import { useCallback } from 'react';++export const useOpenReplaceWidgetPicker = (pageLayoutId: string) => {+ const pageLayoutDraft = useAtomComponentStateValue(+ pageLayoutDraftComponentState,+ pageLayoutId,+ );++ const setWidgetInsertionContext = useSetAtomComponentState(+ widgetInsertionContextComponentState,+ pageLayoutId,+ );++ const { navigatePageLayoutSidePanel } = useNavigatePageLayoutSidePanel();++ const openReplaceWidgetPicker = useCallback(() => {+ setWidgetInsertionContext(null);+ navigatePageLayoutSidePanel({+ sidePanelPage: getReplaceWidgetSidePanelPage(pageLayoutDraft.type),+ });+ }, [+ navigatePageLayoutSidePanel,+ pageLayoutDraft.type,+ setWidgetInsertionContext,+ ]);++ return { openReplaceWidgetPicker };+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacement.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacement.tsnew file mode 100644index 00000000000..1fa96f2d864--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacement.ts@@ -0,0 +1,71 @@+import { useCanMovePageLayoutWidgetDown } from '@/page-layout/hooks/useCanMovePageLayoutWidgetDown';+import { useCanMovePageLayoutWidgetUp } from '@/page-layout/hooks/useCanMovePageLayoutWidgetUp';+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';+import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';+import { shouldShowAddWidgetBelow } from '@/side-panel/pages/page-layout/utils/shouldShowAddWidgetBelow';+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';+import { isDefined } from 'twenty-shared/utils';+import { PageLayoutTabLayoutMode } from '~/generated-metadata/graphql';++export type WidgetSettingsPlacement = {+ isPlacementSectionVisible: boolean;+ pageLayoutEditingWidgetId: string | null;+ showAddWidgetBelow: boolean;+ showMoveDown: boolean;+ showMoveUp: boolean;+};++export const useWidgetSettingsPlacement = (+ pageLayoutId: string,+): WidgetSettingsPlacement => {+ const pageLayoutEditingWidgetId = useAtomComponentStateValue(+ pageLayoutEditingWidgetIdComponentState,+ pageLayoutId,+ );++ const pageLayoutDraft = useAtomComponentStateValue(+ pageLayoutDraftComponentState,+ pageLayoutId,+ );++ const { canMovePageLayoutWidgetUp } =+ useCanMovePageLayoutWidgetUp(pageLayoutId);+ const { canMovePageLayoutWidgetDown } =+ useCanMovePageLayoutWidgetDown(pageLayoutId);++ const currentTabAndWidget = pageLayoutDraft.tabs+ .map((tab) => ({+ tab,+ widget: tab.widgets.find(+ (widget) => widget.id === pageLayoutEditingWidgetId,+ ),+ }))+ .find(({ widget }) => isDefined(widget));++ const currentTab = currentTabAndWidget?.tab;+ const currentWidget = currentTabAndWidget?.widget;++ const isPlacementSectionVisible =+ isDefined(pageLayoutEditingWidgetId) &&+ isDefined(currentTab) &&+ isDefined(currentWidget) &&+ currentTab.layoutMode === PageLayoutTabLayoutMode.VERTICAL_LIST;++ if (!isPlacementSectionVisible) {+ return {+ isPlacementSectionVisible: false,+ pageLayoutEditingWidgetId,+ showAddWidgetBelow: false,+ showMoveDown: false,+ showMoveUp: false,+ };+ }++ return {+ isPlacementSectionVisible: true,+ pageLayoutEditingWidgetId,+ showAddWidgetBelow: shouldShowAddWidgetBelow(currentWidget),+ showMoveDown: canMovePageLayoutWidgetDown(pageLayoutEditingWidgetId),+ showMoveUp: canMovePageLayoutWidgetUp(pageLayoutEditingWidgetId),+ };+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacementSelectableItemIds.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacementSelectableItemIds.tsindex 9753fdeb49d..63dac13c317 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacementSelectableItemIds.ts+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacementSelectableItemIds.ts@@ -1,38 +1,34 @@-import { useCanMovePageLayoutWidgetDown } from '@/page-layout/hooks/useCanMovePageLayoutWidgetDown';-import { useCanMovePageLayoutWidgetUp } from '@/page-layout/hooks/useCanMovePageLayoutWidgetUp';-import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';import { WIDGET_SETTINGS_SELECTABLE_ITEM_IDS } from '@/side-panel/pages/page-layout/constants/settings/WidgetSettingsSelectableItemIds';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { isDefined } from 'twenty-shared/utils';+import { useWidgetSettingsPlacement } from '@/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacement';export const useWidgetSettingsPlacementSelectableItemIds = (pageLayoutId: string,) => {- const pageLayoutEditingWidgetId = useAtomComponentStateValue(- pageLayoutEditingWidgetIdComponentState,- pageLayoutId,- );+ const widgetSettingsPlacement = useWidgetSettingsPlacement(pageLayoutId);- const { canMovePageLayoutWidgetUp } =- useCanMovePageLayoutWidgetUp(pageLayoutId);- const { canMovePageLayoutWidgetDown } =- useCanMovePageLayoutWidgetDown(pageLayoutId);+ const {+ isPlacementSectionVisible,+ showAddWidgetBelow,+ showMoveDown,+ showMoveUp,+ } = widgetSettingsPlacement;- const showMoveUp =- isDefined(pageLayoutEditingWidgetId) &&- canMovePageLayoutWidgetUp(pageLayoutEditingWidgetId);-- const showMoveDown =- isDefined(pageLayoutEditingWidgetId) &&- canMovePageLayoutWidgetDown(pageLayoutEditingWidgetId);+ if (!isPlacementSectionVisible) {+ return {+ placementSelectableItemIds: [],+ widgetSettingsPlacement,+ };+ }const placementSelectableItemIds = [...(showMoveUp ? [WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.MOVE_UP] : []),...(showMoveDown ? [WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.MOVE_DOWN] : []),WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.MOVE_TO_TAB,WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.ADD_WIDGET_ABOVE,- WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.ADD_WIDGET_BELOW,+ ...(showAddWidgetBelow+ ? [WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.ADD_WIDGET_BELOW]+ : []),];- return { placementSelectableItemIds };+ return { placementSelectableItemIds, widgetSettingsPlacement };};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/types/PageLayoutSidePanelPage.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/types/PageLayoutSidePanelPage.tsindex b6054207535..706592412d9 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/types/PageLayoutSidePanelPage.ts+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/types/PageLayoutSidePanelPage.ts@@ -3,6 +3,7 @@ import { type SidePanelPages } from 'twenty-shared/types';export type PageLayoutSidePanelPage =| SidePanelPages.PageLayoutDashboardWidgetTypeSelect| SidePanelPages.PageLayoutTabSettings+ | SidePanelPages.PageLayoutWidgetSettings| SidePanelPages.DashboardChartSettings| SidePanelPages.DashboardIframeSettings| SidePanelPages.DashboardRecordTableSettingsdiff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/getReplaceWidgetSidePanelPage.test.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/getReplaceWidgetSidePanelPage.test.tsnew file mode 100644index 00000000000..0790b415594--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/getReplaceWidgetSidePanelPage.test.ts@@ -0,0 +1,17 @@+import { getReplaceWidgetSidePanelPage } from '@/side-panel/pages/page-layout/utils/getReplaceWidgetSidePanelPage';+import { SidePanelPages } from 'twenty-shared/types';+import { PageLayoutType } from '~/generated-metadata/graphql';++describe('getReplaceWidgetSidePanelPage', () => {+ it('routes dashboards to the dashboard widget picker', () => {+ expect(getReplaceWidgetSidePanelPage(PageLayoutType.DASHBOARD)).toBe(+ SidePanelPages.PageLayoutDashboardWidgetTypeSelect,+ );+ });++ it('routes record pages to the record-page widget picker', () => {+ expect(getReplaceWidgetSidePanelPage(PageLayoutType.RECORD_PAGE)).toBe(+ SidePanelPages.PageLayoutRecordPageWidgetTypeSelect,+ );+ });+});diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/isPageLayoutSidePanelPage.test.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/isPageLayoutSidePanelPage.test.tsindex 08a56389cf8..b0bbc0ce78a 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/isPageLayoutSidePanelPage.test.ts+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/isPageLayoutSidePanelPage.test.ts@@ -5,6 +5,7 @@ describe('isPageLayoutSidePanelPage', () => {const pageLayoutPages: SidePanelPages[] = [SidePanelPages.PageLayoutDashboardWidgetTypeSelect,SidePanelPages.PageLayoutTabSettings,+ SidePanelPages.PageLayoutWidgetSettings,SidePanelPages.DashboardChartSettings,SidePanelPages.DashboardIframeSettings,SidePanelPages.DashboardRecordTableSettings,diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getPageLayoutIcon.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getPageLayoutIcon.tsindex 726115f67ed..dfb3a5a162d 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getPageLayoutIcon.ts+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getPageLayoutIcon.ts@@ -6,6 +6,7 @@ import {IconChartPie,IconFrame,IconList,+ IconLayoutDashboard,IconPlus,IconTable,} from 'twenty-ui/icon';@@ -20,6 +21,8 @@ export const getPageLayoutIcon = (page: PageLayoutSidePanelPage) => {return IconFrame;case SidePanelPages.PageLayoutTabSettings:return IconAppWindow;+ case SidePanelPages.PageLayoutWidgetSettings:+ return IconLayoutDashboard;case SidePanelPages.RecordPageFieldsSettings:return IconList;case SidePanelPages.RecordPageFieldSettings:diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getPageLayoutPageTitle.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getPageLayoutPageTitle.tsindex e674b18d5ad..3c77774a29e 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getPageLayoutPageTitle.ts+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getPageLayoutPageTitle.ts@@ -13,6 +13,8 @@ export const getPageLayoutPageTitle = (page: PageLayoutSidePanelPage) => {return t`iFrame Settings`;case SidePanelPages.PageLayoutTabSettings:return t`Tab Settings`;+ case SidePanelPages.PageLayoutWidgetSettings:+ return t`Widget Settings`;case SidePanelPages.RecordPageFieldsSettings:return t`Fields Settings`;case SidePanelPages.RecordPageFieldSettings:diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getReplaceWidgetSidePanelPage.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getReplaceWidgetSidePanelPage.tsnew file mode 100644index 00000000000..e1cc099d3d2--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getReplaceWidgetSidePanelPage.ts@@ -0,0 +1,11 @@+import { SidePanelPages } from 'twenty-shared/types';+import { PageLayoutType } from '~/generated-metadata/graphql';++export const getReplaceWidgetSidePanelPage = (+ pageLayoutType: PageLayoutType,+):+ | SidePanelPages.PageLayoutDashboardWidgetTypeSelect+ | SidePanelPages.PageLayoutRecordPageWidgetTypeSelect =>+ pageLayoutType === PageLayoutType.DASHBOARD+ ? SidePanelPages.PageLayoutDashboardWidgetTypeSelect+ : SidePanelPages.PageLayoutRecordPageWidgetTypeSelect;diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/isPageLayoutSidePanelPage.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/isPageLayoutSidePanelPage.tsindex 23ecc731a8a..597e9c892e8 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/isPageLayoutSidePanelPage.ts+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/isPageLayoutSidePanelPage.ts@@ -5,6 +5,7 @@ import { type PageLayoutSidePanelPage } from '@/side-panel/pages/page-layout/typconst PAGE_LAYOUT_SIDE_PANEL_PAGES: PageLayoutSidePanelPage[] = [SidePanelPages.PageLayoutDashboardWidgetTypeSelect,SidePanelPages.PageLayoutTabSettings,+ SidePanelPages.PageLayoutWidgetSettings,SidePanelPages.DashboardChartSettings,SidePanelPages.DashboardIframeSettings,SidePanelPages.DashboardRecordTableSettings,diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/shouldShowAddWidgetBelow.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/shouldShowAddWidgetBelow.tsnew file mode 100644index 00000000000..cdda7211c3c--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/shouldShowAddWidgetBelow.ts@@ -0,0 +1,5 @@+import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';+import { isViewportFillingWidgetType } from '@/page-layout/widgets/utils/isViewportFillingWidgetType';++export const shouldShowAddWidgetBelow = (widget: PageLayoutWidget): boolean =>+ !isViewportFillingWidgetType(widget.type);diff --git a/packages/twenty-shared/src/types/SidePanelPages.ts b/packages/twenty-shared/src/types/SidePanelPages.tsindex d8bbc98f7a4..1d22e537851 100644--- a/packages/twenty-shared/src/types/SidePanelPages.ts+++ b/packages/twenty-shared/src/types/SidePanelPages.ts@@ -16,6 +16,7 @@ export enum SidePanelPages {AskAI = 'ask-ai',PageLayoutDashboardWidgetTypeSelect = 'page-layout-dashboard-widget-type-select',PageLayoutTabSettings = 'page-layout-tab-settings',+ PageLayoutWidgetSettings = 'page-layout-widget-settings',DashboardChartSettings = 'dashboard-chart-settings',DashboardIframeSettings = 'dashboard-iframe-settings',DashboardRecordTableSettings = 'dashboard-record-table-settings',