The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Unselect widget when exiting layout customization mode (#19411)
Baptiste Devessiere2bd3e8ef442
diff --git a/packages/twenty-front/src/modules/app/hooks/useExecuteTasksOnAnyLocationChange.ts b/packages/twenty-front/src/modules/app/hooks/useExecuteTasksOnAnyLocationChange.tsindex 851ded549f9..2ddb570cf27 100644--- a/packages/twenty-front/src/modules/app/hooks/useExecuteTasksOnAnyLocationChange.ts+++ b/packages/twenty-front/src/modules/app/hooks/useExecuteTasksOnAnyLocationChange.ts@@ -1,6 +1,6 @@-import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';import { contextStoreIsPageInEditModeComponentState } from '@/context-store/states/contextStoreIsPageInEditModeComponentState';+import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';import { currentPageLayoutIdState } from '@/page-layout/states/currentPageLayoutIdState';import { fieldsWidgetEditorModeDraftComponentState } from '@/page-layout/states/fieldsWidgetEditorModeDraftComponentState';import { fieldsWidgetEditorModePersistedComponentState } from '@/page-layout/states/fieldsWidgetEditorModePersistedComponentState';@@ -12,6 +12,7 @@ import { hasInitializedFieldsWidgetGroupsDraftComponentState } from '@/page-layoimport { isDashboardInEditModeComponentState } from '@/page-layout/states/isDashboardInEditModeComponentState';import { pageLayoutCurrentLayoutsComponentState } from '@/page-layout/states/pageLayoutCurrentLayoutsComponentState';import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';+import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';import { pageLayoutIsInitializedComponentState } from '@/page-layout/states/pageLayoutIsInitializedComponentState';import { pageLayoutPersistedComponentState } from '@/page-layout/states/pageLayoutPersistedComponentState';import { convertPageLayoutToTabLayouts } from '@/page-layout/utils/convertPageLayoutToTabLayouts';@@ -120,6 +121,13 @@ export const useExecuteTasksOnAnyLocationChange = () => {{},);+ store.set(+ pageLayoutEditingWidgetIdComponentState.atomFamily({+ instanceId: pageLayoutId,+ }),+ null,+ );+store.set(currentPageLayoutIdState.atom, null);}diff --git a/packages/twenty-front/src/modules/layout-customization/hooks/useExitLayoutCustomizationMode.ts b/packages/twenty-front/src/modules/layout-customization/hooks/useExitLayoutCustomizationMode.tsindex adc969dddab..c8c0a3c03dc 100644--- a/packages/twenty-front/src/modules/layout-customization/hooks/useExitLayoutCustomizationMode.ts+++ b/packages/twenty-front/src/modules/layout-customization/hooks/useExitLayoutCustomizationMode.ts@@ -1,9 +1,11 @@import { commandMenuItemsDraftState } from '@/command-menu-item/server-items/edit/states/commandMenuItemsDraftState';import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';+import { activeCustomizationPageLayoutIdsState } from '@/layout-customization/states/activeCustomizationPageLayoutIdsState';import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';-import { useResetRecordIndexSelection } from '@/object-record/record-index/hooks/useResetRecordIndexSelection';import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';+import { useResetRecordIndexSelection } from '@/object-record/record-index/hooks/useResetRecordIndexSelection';+import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { useStore } from 'jotai';@@ -28,6 +30,19 @@ export const useExitLayoutCustomizationMode = () => {);const exitLayoutCustomizationMode = useCallback(() => {+ const activePageLayoutIds = store.get(+ activeCustomizationPageLayoutIdsState.atom,+ );++ for (const pageLayoutId of activePageLayoutIds) {+ store.set(+ pageLayoutEditingWidgetIdComponentState.atomFamily({+ instanceId: pageLayoutId,+ }),+ null,+ );+ }+resetRecordIndexSelection();setNavigationMenuItemsDraft(null);setSelectedNavigationMenuItemIdInEditMode(null);diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useSetIsPageLayoutInEditMode.ts b/packages/twenty-front/src/modules/page-layout/hooks/useSetIsPageLayoutInEditMode.tsindex 83fe077c5c7..ea524697b9d 100644--- a/packages/twenty-front/src/modules/page-layout/hooks/useSetIsPageLayoutInEditMode.ts+++ b/packages/twenty-front/src/modules/page-layout/hooks/useSetIsPageLayoutInEditMode.ts@@ -1,6 +1,6 @@-import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';import { contextStoreIsPageInEditModeComponentState } from '@/context-store/states/contextStoreIsPageInEditModeComponentState';+import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';import { PageLayoutComponentInstanceContext } from '@/page-layout/states/contexts/PageLayoutComponentInstanceContext';import { currentPageLayoutIdState } from '@/page-layout/states/currentPageLayoutIdState';import { fieldsWidgetEditorModeDraftComponentState } from '@/page-layout/states/fieldsWidgetEditorModeDraftComponentState';@@ -8,8 +8,8 @@ import { fieldsWidgetGroupsDraftComponentState } from '@/page-layout/states/fielimport { fieldsWidgetUngroupedFieldsDraftComponentState } from '@/page-layout/states/fieldsWidgetUngroupedFieldsDraftComponentState';import { hasInitializedFieldsWidgetGroupsDraftComponentState } from '@/page-layout/states/hasInitializedFieldsWidgetGroupsDraftComponentState';import { isDashboardInEditModeComponentState } from '@/page-layout/states/isDashboardInEditModeComponentState';-import { pageLayoutPersistedComponentState } from '@/page-layout/states/pageLayoutPersistedComponentState';import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';+import { pageLayoutPersistedComponentState } from '@/page-layout/states/pageLayoutPersistedComponentState';import { SIDE_PANEL_COMPONENT_INSTANCE_ID } from '@/side-panel/constants/SidePanelComponentInstanceId';import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';@@ -84,6 +84,7 @@ export const useSetIsPageLayoutInEditMode = (pageLayoutIdFromProps: string) => {}if (value) {+ store.set(pageLayoutEditingWidgetIdState, null);store.set(fieldsWidgetGroupsDraftState, {});store.set(fieldsWidgetUngroupedFieldsDraftState, {});store.set(fieldsWidgetEditorModeDraftState, {});