From dd12bc31cab1c769e709432ba43fa53e786abcb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Bosi?= <71827178+bosiraphael@users.noreply.github.com> Date: Wed, 26 Feb 2025 16:05:22 +0100 Subject: [PATCH] Fix record page context store instance id (#10508) Fixes bug introduced by https://github.com/twentyhq/twenty/pull/10272 - Replace show page context store instance id by 'main-context-store' --- .../components/CommandMenuContainer.tsx | 11 +++--- .../__stories__/CommandMenu.stories.tsx | 11 +++--- .../CommandMenuComponentInstanceId.ts | 1 + .../CommandMenuPreviousComponentInstanceId.ts | 2 ++ .../command-menu/hooks/useCommandMenu.ts | 36 ++++++++----------- .../hooks/useCommandMenuHotKeys.ts | 3 +- .../useResetPreviousCommandMenuContext.ts | 8 +++-- .../components/MainContextStoreProvider.tsx | 1 - .../MainContextStoreProviderEffect.tsx | 29 +++------------ .../constants/MainContextStoreInstanceId.tsx | 1 + .../mainContextStoreComponentInstanceId.ts | 7 ---- ...igationDrawerItemForObjectMetadataItem.tsx | 8 ++--- .../record-group/hooks/useSetRecordGroup.ts | 3 +- .../components/RecordIndexContainerGater.tsx | 10 ++---- .../SignInBackgroundMockContainer.tsx | 5 +-- .../SignInBackgroundMockContainerEffect.tsx | 3 +- .../pages/object-record/RecordIndexPage.tsx | 7 ++-- .../pages/object-record/RecordShowPage.tsx | 3 +- .../decorators/ContextStoreDecorator.tsx | 3 +- 19 files changed, 63 insertions(+), 89 deletions(-) create mode 100644 packages/twenty-front/src/modules/command-menu/constants/CommandMenuComponentInstanceId.ts create mode 100644 packages/twenty-front/src/modules/command-menu/constants/CommandMenuPreviousComponentInstanceId.ts create mode 100644 packages/twenty-front/src/modules/context-store/constants/MainContextStoreInstanceId.tsx delete mode 100644 packages/twenty-front/src/modules/context-store/states/mainContextStoreComponentInstanceId.ts diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuContainer.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuContainer.tsx index c23911f64..142b8f4e0 100644 --- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuContainer.tsx +++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuContainer.tsx @@ -7,6 +7,7 @@ import { ActionMenuConfirmationModals } from '@/action-menu/components/ActionMen import { ActionMenuContext } from '@/action-menu/contexts/ActionMenuContext'; import { ActionMenuComponentInstanceContext } from '@/action-menu/states/contexts/ActionMenuComponentInstanceContext'; import { COMMAND_MENU_ANIMATION_VARIANTS } from '@/command-menu/constants/CommandMenuAnimationVariants'; +import { COMMAND_MENU_COMPONENT_INSTANCE_ID } from '@/command-menu/constants/CommandMenuComponentInstanceId'; import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu'; import { useCommandMenuHotKeys } from '@/command-menu/hooks/useCommandMenuHotKeys'; import { commandMenuSearchState } from '@/command-menu/states/commandMenuSearchState'; @@ -90,19 +91,19 @@ export const CommandMenuContainer = ({ return ( { return ( diff --git a/packages/twenty-front/src/modules/command-menu/constants/CommandMenuComponentInstanceId.ts b/packages/twenty-front/src/modules/command-menu/constants/CommandMenuComponentInstanceId.ts new file mode 100644 index 000000000..3a756e6e8 --- /dev/null +++ b/packages/twenty-front/src/modules/command-menu/constants/CommandMenuComponentInstanceId.ts @@ -0,0 +1 @@ +export const COMMAND_MENU_COMPONENT_INSTANCE_ID = 'command-menu'; diff --git a/packages/twenty-front/src/modules/command-menu/constants/CommandMenuPreviousComponentInstanceId.ts b/packages/twenty-front/src/modules/command-menu/constants/CommandMenuPreviousComponentInstanceId.ts new file mode 100644 index 000000000..fe73880f6 --- /dev/null +++ b/packages/twenty-front/src/modules/command-menu/constants/CommandMenuPreviousComponentInstanceId.ts @@ -0,0 +1,2 @@ +export const COMMAND_MENU_PREVIOUS_COMPONENT_INSTANCE_ID = + 'command-menu-previous'; diff --git a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts index 44d3f7de9..a67bd6020 100644 --- a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts +++ b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts @@ -1,4 +1,4 @@ -import { useRecoilCallback, useRecoilValue } from 'recoil'; +import { useRecoilCallback } from 'recoil'; import { commandMenuSearchState } from '@/command-menu/states/commandMenuSearchState'; import { objectMetadataItemFamilySelector } from '@/object-metadata/states/objectMetadataItemFamilySelector'; @@ -7,7 +7,9 @@ import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousH import { AppHotkeyScope } from '@/ui/utilities/hotkey/types/AppHotkeyScope'; import { IconDotsVertical, IconSearch, useIcons } from 'twenty-ui'; +import { COMMAND_MENU_COMPONENT_INSTANCE_ID } from '@/command-menu/constants/CommandMenuComponentInstanceId'; import { COMMAND_MENU_CONTEXT_CHIP_GROUPS_DROPDOWN_ID } from '@/command-menu/constants/CommandMenuContextChipGroupsDropdownId'; +import { COMMAND_MENU_PREVIOUS_COMPONENT_INSTANCE_ID } from '@/command-menu/constants/CommandMenuPreviousComponentInstanceId'; import { useCopyContextStoreStates } from '@/command-menu/hooks/useCopyContextStoreAndActionMenuStates'; import { useResetContextStoreStates } from '@/command-menu/hooks/useResetContextStoreStates'; import { @@ -18,11 +20,11 @@ import { commandMenuPageState } from '@/command-menu/states/commandMenuPageState import { commandMenuPageInfoState } from '@/command-menu/states/commandMenuPageTitle'; import { hasUserSelectedCommandState } from '@/command-menu/states/hasUserSelectedCommandState'; import { CommandMenuPages } from '@/command-menu/types/CommandMenuPages'; +import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId'; import { contextStoreCurrentViewTypeComponentState } from '@/context-store/states/contextStoreCurrentViewTypeComponentState'; import { contextStoreFiltersComponentState } from '@/context-store/states/contextStoreFiltersComponentState'; import { contextStoreNumberOfSelectedRecordsComponentState } from '@/context-store/states/contextStoreNumberOfSelectedRecordsComponentState'; import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState'; -import { mainContextStoreComponentInstanceIdState } from '@/context-store/states/mainContextStoreComponentInstanceId'; import { ContextStoreViewType } from '@/context-store/types/ContextStoreViewType'; import { viewableRecordIdState } from '@/object-record/record-right-drawer/states/viewableRecordIdState'; import { viewableRecordNameSingularState } from '@/object-record/record-right-drawer/states/viewableRecordNameSingularState'; @@ -41,10 +43,6 @@ export const useCommandMenu = () => { } = usePreviousHotkeyScope(); const { getIcon } = useIcons(); - const mainContextStoreComponentInstanceId = useRecoilValue( - mainContextStoreComponentInstanceIdState, - ); - const { copyContextStoreStates } = useCopyContextStoreStates(); const { resetContextStoreStates } = useResetContextStoreStates(); @@ -64,18 +62,14 @@ export const useCommandMenu = () => { } copyContextStoreStates({ - instanceIdToCopyFrom: mainContextStoreComponentInstanceId, - instanceIdToCopyTo: 'command-menu', + instanceIdToCopyFrom: MAIN_CONTEXT_STORE_INSTANCE_ID, + instanceIdToCopyTo: COMMAND_MENU_COMPONENT_INSTANCE_ID, }); set(isCommandMenuOpenedState, true); set(hasUserSelectedCommandState, false); }, - [ - copyContextStoreStates, - mainContextStoreComponentInstanceId, - setHotkeyScopeAndMemorizePreviousScope, - ], + [copyContextStoreStates, setHotkeyScopeAndMemorizePreviousScope], ); const closeCommandMenu = useRecoilCallback( @@ -90,8 +84,8 @@ export const useCommandMenu = () => { const onCommandMenuCloseAnimationComplete = useRecoilCallback( ({ set }) => () => { - resetContextStoreStates('command-menu'); - resetContextStoreStates('command-menu-previous'); + resetContextStoreStates(COMMAND_MENU_COMPONENT_INSTANCE_ID); + resetContextStoreStates(COMMAND_MENU_PREVIOUS_COMPONENT_INSTANCE_ID); set(viewableRecordIdState, null); set(commandMenuPageState, CommandMenuPages.Root); @@ -284,13 +278,13 @@ export const useCommandMenu = () => { ({ set }) => { return () => { copyContextStoreStates({ - instanceIdToCopyFrom: 'command-menu', - instanceIdToCopyTo: 'command-menu-previous', + instanceIdToCopyFrom: COMMAND_MENU_COMPONENT_INSTANCE_ID, + instanceIdToCopyTo: COMMAND_MENU_PREVIOUS_COMPONENT_INSTANCE_ID, }); set( contextStoreTargetedRecordsRuleComponentState.atomFamily({ - instanceId: 'command-menu', + instanceId: COMMAND_MENU_COMPONENT_INSTANCE_ID, }), { mode: 'selection', @@ -300,21 +294,21 @@ export const useCommandMenu = () => { set( contextStoreNumberOfSelectedRecordsComponentState.atomFamily({ - instanceId: 'command-menu', + instanceId: COMMAND_MENU_COMPONENT_INSTANCE_ID, }), 0, ); set( contextStoreFiltersComponentState.atomFamily({ - instanceId: 'command-menu', + instanceId: COMMAND_MENU_COMPONENT_INSTANCE_ID, }), [], ); set( contextStoreCurrentViewTypeComponentState.atomFamily({ - instanceId: 'command-menu', + instanceId: COMMAND_MENU_COMPONENT_INSTANCE_ID, }), ContextStoreViewType.Table, ); diff --git a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts index a58245998..012b804a7 100644 --- a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts +++ b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts @@ -1,3 +1,4 @@ +import { COMMAND_MENU_COMPONENT_INSTANCE_ID } from '@/command-menu/constants/CommandMenuComponentInstanceId'; import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu'; import { commandMenuPageState } from '@/command-menu/states/commandMenuPageState'; import { commandMenuSearchState } from '@/command-menu/states/commandMenuSearchState'; @@ -27,7 +28,7 @@ export const useCommandMenuHotKeys = () => { const contextStoreTargetedRecordsRuleComponent = useRecoilComponentValueV2( contextStoreTargetedRecordsRuleComponentState, - 'command-menu', + COMMAND_MENU_COMPONENT_INSTANCE_ID, ); useScopedHotkeys( diff --git a/packages/twenty-front/src/modules/command-menu/hooks/useResetPreviousCommandMenuContext.ts b/packages/twenty-front/src/modules/command-menu/hooks/useResetPreviousCommandMenuContext.ts index 197209eeb..eb32ac8d9 100644 --- a/packages/twenty-front/src/modules/command-menu/hooks/useResetPreviousCommandMenuContext.ts +++ b/packages/twenty-front/src/modules/command-menu/hooks/useResetPreviousCommandMenuContext.ts @@ -1,3 +1,5 @@ +import { COMMAND_MENU_COMPONENT_INSTANCE_ID } from '@/command-menu/constants/CommandMenuComponentInstanceId'; +import { COMMAND_MENU_PREVIOUS_COMPONENT_INSTANCE_ID } from '@/command-menu/constants/CommandMenuPreviousComponentInstanceId'; import { useCopyContextStoreStates } from '@/command-menu/hooks/useCopyContextStoreAndActionMenuStates'; import { useResetContextStoreStates } from '@/command-menu/hooks/useResetContextStoreStates'; @@ -7,10 +9,10 @@ export const useResetPreviousCommandMenuContext = () => { const resetPreviousCommandMenuContext = () => { copyContextStoreStates({ - instanceIdToCopyFrom: 'command-menu-previous', - instanceIdToCopyTo: 'command-menu', + instanceIdToCopyFrom: COMMAND_MENU_PREVIOUS_COMPONENT_INSTANCE_ID, + instanceIdToCopyTo: COMMAND_MENU_COMPONENT_INSTANCE_ID, }); - resetContextStoreStates('command-menu-previous'); + resetContextStoreStates(COMMAND_MENU_PREVIOUS_COMPONENT_INSTANCE_ID); }; return { diff --git a/packages/twenty-front/src/modules/context-store/components/MainContextStoreProvider.tsx b/packages/twenty-front/src/modules/context-store/components/MainContextStoreProvider.tsx index 73bc03463..f02bb4c96 100644 --- a/packages/twenty-front/src/modules/context-store/components/MainContextStoreProvider.tsx +++ b/packages/twenty-front/src/modules/context-store/components/MainContextStoreProvider.tsx @@ -73,7 +73,6 @@ export const MainContextStoreProvider = () => { return ( { - const [ - mainContextStoreComponentInstanceId, - setMainContextStoreComponentInstanceId, - ] = useRecoilState(mainContextStoreComponentInstanceIdState); - const { setLastVisitedViewForObjectMetadataNamePlural } = useSetLastVisitedViewForObjectMetadataNamePlural(); @@ -37,13 +30,13 @@ export const MainContextStoreProviderEffect = ({ const [contextStoreCurrentViewId, setContextStoreCurrentViewId] = useRecoilComponentStateV2( contextStoreCurrentViewIdComponentState, - mainContextStoreComponentInstanceId, + MAIN_CONTEXT_STORE_INSTANCE_ID, ); const [contextStoreCurrentViewType, setContextStoreCurrentViewType] = useRecoilComponentStateV2( contextStoreCurrentViewTypeComponentState, - mainContextStoreComponentInstanceId, + MAIN_CONTEXT_STORE_INSTANCE_ID, ); const [ @@ -51,7 +44,7 @@ export const MainContextStoreProviderEffect = ({ setContextStoreCurrentObjectMetadataItem, ] = useRecoilComponentStateV2( contextStoreCurrentObjectMetadataItemComponentState, - mainContextStoreComponentInstanceId, + MAIN_CONTEXT_STORE_INSTANCE_ID, ); const view = useRecoilValue( @@ -65,15 +58,6 @@ export const MainContextStoreProviderEffect = ({ setContextStoreCurrentObjectMetadataItem(objectMetadataItem); } - if ( - mainContextStoreComponentInstanceIdToSet !== - mainContextStoreComponentInstanceId - ) { - setMainContextStoreComponentInstanceId( - mainContextStoreComponentInstanceIdToSet, - ); - } - setLastVisitedViewForObjectMetadataNamePlural({ objectNamePlural: objectMetadataItem.namePlural, viewId: viewId ?? '', @@ -89,15 +73,12 @@ export const MainContextStoreProviderEffect = ({ }, [ contextStoreCurrentObjectMetadataItem, contextStoreCurrentViewId, - mainContextStoreComponentInstanceId, - mainContextStoreComponentInstanceIdToSet, objectMetadataItem, objectMetadataItem.namePlural, setContextStoreCurrentObjectMetadataItem, setContextStoreCurrentViewId, setLastVisitedObjectMetadataId, setLastVisitedViewForObjectMetadataNamePlural, - setMainContextStoreComponentInstanceId, viewId, ]); diff --git a/packages/twenty-front/src/modules/context-store/constants/MainContextStoreInstanceId.tsx b/packages/twenty-front/src/modules/context-store/constants/MainContextStoreInstanceId.tsx new file mode 100644 index 000000000..818b5406a --- /dev/null +++ b/packages/twenty-front/src/modules/context-store/constants/MainContextStoreInstanceId.tsx @@ -0,0 +1 @@ +export const MAIN_CONTEXT_STORE_INSTANCE_ID = 'main-context-store'; diff --git a/packages/twenty-front/src/modules/context-store/states/mainContextStoreComponentInstanceId.ts b/packages/twenty-front/src/modules/context-store/states/mainContextStoreComponentInstanceId.ts deleted file mode 100644 index 2a1fffbb2..000000000 --- a/packages/twenty-front/src/modules/context-store/states/mainContextStoreComponentInstanceId.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { CONTEXT_STORE_INSTANCE_ID_DEFAULT_VALUE } from '@/context-store/constants/ContextStoreInstanceIdDefaultValue'; -import { createState } from '@ui/utilities/state/utils/createState'; - -export const mainContextStoreComponentInstanceIdState = createState({ - key: 'mainContextStoreComponentInstanceIdState', - defaultValue: CONTEXT_STORE_INSTANCE_ID_DEFAULT_VALUE, -}); diff --git a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerItemForObjectMetadataItem.tsx b/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerItemForObjectMetadataItem.tsx index 12ac9a208..7143d50a3 100644 --- a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerItemForObjectMetadataItem.tsx +++ b/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerItemForObjectMetadataItem.tsx @@ -1,5 +1,5 @@ +import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId'; import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState'; -import { mainContextStoreComponentInstanceIdState } from '@/context-store/states/mainContextStoreComponentInstanceId'; import { lastVisitedViewPerObjectMetadataItemState } from '@/navigation/states/lastVisitedViewPerObjectMetadataItemState'; import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem'; import { prefetchViewsFromObjectMetadataItemFamilySelector } from '@/prefetch/states/selector/prefetchViewsFromObjectMetadataItemFamilySelector'; @@ -27,13 +27,9 @@ export const NavigationDrawerItemForObjectMetadataItem = ({ }), ); - const mainContextStoreComponentInstanceId = useRecoilValue( - mainContextStoreComponentInstanceIdState, - ); - const contextStoreCurrentViewId = useRecoilComponentValueV2( contextStoreCurrentViewIdComponentState, - mainContextStoreComponentInstanceId, + MAIN_CONTEXT_STORE_INSTANCE_ID, ); const lastVisitedViewPerObjectMetadataItem = useRecoilValue( diff --git a/packages/twenty-front/src/modules/object-record/record-group/hooks/useSetRecordGroup.ts b/packages/twenty-front/src/modules/object-record/record-group/hooks/useSetRecordGroup.ts index fe4c12d09..435bccf42 100644 --- a/packages/twenty-front/src/modules/object-record/record-group/hooks/useSetRecordGroup.ts +++ b/packages/twenty-front/src/modules/object-record/record-group/hooks/useSetRecordGroup.ts @@ -1,3 +1,4 @@ +import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId'; import { contextStoreCurrentObjectMetadataItemComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemComponentState'; import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/states/recordGroupDefinitionFamilyState'; import { recordGroupFieldMetadataComponentState } from '@/object-record/record-group/states/recordGroupFieldMetadataComponentState'; @@ -14,7 +15,7 @@ export const useSetRecordGroup = () => { const objectMetadataItem = snapshot .getLoadable( contextStoreCurrentObjectMetadataItemComponentState.atomFamily({ - instanceId: 'main-context-store', + instanceId: MAIN_CONTEXT_STORE_INSTANCE_ID, }), ) .getValue(); diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsx index 5215dd7ab..942a6af5e 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsx +++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsx @@ -2,9 +2,9 @@ import { RecordIndexContextProvider } from '@/object-record/record-index/context import { ActionMenuComponentInstanceContext } from '@/action-menu/states/contexts/ActionMenuComponentInstanceContext'; import { getActionMenuIdFromRecordIndexId } from '@/action-menu/utils/getActionMenuIdFromRecordIndexId'; +import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId'; import { useContextStoreObjectMetadataItemOrThrow } from '@/context-store/hooks/useContextStoreObjectMetadataItemOrThrow'; import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState'; -import { mainContextStoreComponentInstanceIdState } from '@/context-store/states/mainContextStoreComponentInstanceId'; import { lastShowPageRecordIdState } from '@/object-record/record-field/states/lastShowPageRecordId'; import { RecordFilterGroupsComponentInstanceContext } from '@/object-record/record-filter-group/states/context/RecordFilterGroupsComponentInstanceContext'; import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext'; @@ -19,7 +19,7 @@ import { PageTitle } from '@/ui/utilities/page-title/components/PageTitle'; import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext'; import styled from '@emotion/styled'; -import { useRecoilCallback, useRecoilValue } from 'recoil'; +import { useRecoilCallback } from 'recoil'; import { capitalize } from 'twenty-shared'; const StyledIndexContainer = styled.div` @@ -29,13 +29,9 @@ const StyledIndexContainer = styled.div` `; export const RecordIndexContainerGater = () => { - const mainContextStoreComponentInstanceId = useRecoilValue( - mainContextStoreComponentInstanceIdState, - ); - const contextStoreCurrentViewId = useRecoilComponentValueV2( contextStoreCurrentViewIdComponentState, - mainContextStoreComponentInstanceId, + MAIN_CONTEXT_STORE_INSTANCE_ID, ); const { objectMetadataItem } = useContextStoreObjectMetadataItemOrThrow(); diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsx b/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsx index dde4918d4..0aebb6f2b 100644 --- a/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsx +++ b/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsx @@ -1,6 +1,7 @@ import styled from '@emotion/styled'; import { ActionMenuComponentInstanceContext } from '@/action-menu/states/contexts/ActionMenuComponentInstanceContext'; +import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId'; import { contextStoreCurrentObjectMetadataItemComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemComponentState'; import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext'; import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState'; @@ -33,7 +34,7 @@ export const SignInBackgroundMockContainer = () => { const objectMetadataItem = useRecoilComponentValueV2( contextStoreCurrentObjectMetadataItemComponentState, - 'main-context-store', + MAIN_CONTEXT_STORE_INSTANCE_ID, ); return ( @@ -62,7 +63,7 @@ export const SignInBackgroundMockContainer = () => { > { const setContextStoreCurrentObjectMetadataItem = useSetRecoilComponentStateV2( contextStoreCurrentObjectMetadataItemComponentState, - 'main-context-store', + MAIN_CONTEXT_STORE_INSTANCE_ID, ); const { setAvailableTableColumns, setOnEntityCountChange } = useRecordTable({ diff --git a/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx b/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx index 46719d9ea..6585b7fbc 100644 --- a/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx +++ b/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx @@ -1,3 +1,4 @@ +import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId'; import { contextStoreCurrentObjectMetadataItemComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemComponentState'; import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState'; import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext'; @@ -9,12 +10,12 @@ import { isNonEmptyString, isUndefined } from '@sniptt/guards'; export const RecordIndexPage = () => { const contextStoreCurrentViewId = useRecoilComponentValueV2( contextStoreCurrentViewIdComponentState, - 'main-context-store', + MAIN_CONTEXT_STORE_INSTANCE_ID, ); const objectMetadataItem = useRecoilComponentValueV2( contextStoreCurrentObjectMetadataItemComponentState, - 'main-context-store', + MAIN_CONTEXT_STORE_INSTANCE_ID, ); if ( @@ -28,7 +29,7 @@ export const RecordIndexPage = () => { diff --git a/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx b/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx index cd549e81b..172a82a93 100644 --- a/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx +++ b/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx @@ -3,6 +3,7 @@ import { useParams } from 'react-router-dom'; import { RecordShowActionMenu } from '@/action-menu/components/RecordShowActionMenu'; import { ActionMenuComponentInstanceContext } from '@/action-menu/states/contexts/ActionMenuComponentInstanceContext'; import { TimelineActivityContext } from '@/activities/timeline-activities/contexts/TimelineActivityContext'; +import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId'; import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext'; import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular'; import { RecordFilterGroupsComponentInstanceContext } from '@/object-record/record-filter-group/states/context/RecordFilterGroupsComponentInstanceContext'; @@ -59,7 +60,7 @@ export const RecordShowPage = () => { value={{ instanceId: `record-show-${objectRecordId}` }} > { let componentInstanceId = contextStore?.componentInstanceId; if (isUndefined(componentInstanceId)) { - componentInstanceId = 'main-context-store'; + componentInstanceId = MAIN_CONTEXT_STORE_INSTANCE_ID; } const setCurrentObjectMetadataItem = useSetRecoilComponentStateV2(