admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix record page context store instance id (#10508)

Browse Source 
Fixes bug introduced by https://github.com/twentyhq/twenty/pull/10272
- Replace show page context store instance id by 'main-context-store'
This commit is contained in:
Raphaël Bosi
2025-02-26 16:05:22 +01:00
committed by GitHub
parent fe46ede1ac
commit dd12bc31ca
19 changed files with 63 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
packages/twenty-front/src/modules/context-store/components/MainContextStoreProviderEffect.tsx
View File

@ -1,7 +1,7 @@
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 { contextStoreCurrentViewTypeComponentState } from '@/context-store/states/contextStoreCurrentViewTypeComponentState';
import { mainContextStoreComponentInstanceIdState } from '@/context-store/states/mainContextStoreComponentInstanceId';
import { ContextStoreViewType } from '@/context-store/types/ContextStoreViewType';
import { useSetLastVisitedObjectMetadataId } from '@/navigation/hooks/useSetLastVisitedObjectMetadataId';
import { useSetLastVisitedViewForObjectMetadataNamePlural } from '@/navigation/hooks/useSetLastVisitedViewForObjectMetadataNamePlural';
@ -10,24 +10,17 @@ import { prefetchViewFromViewIdFamilySelector } from '@/prefetch/states/selector
import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2';
import { ViewType } from '@/views/types/ViewType';
import { useEffect } from 'react';
import { useRecoilState, useRecoilValue } from 'recoil';
import { useRecoilValue } from 'recoil';
export const MainContextStoreProviderEffect = ({
mainContextStoreComponentInstanceIdToSet,
viewId,
objectMetadataItem,
pageName,
}: {
mainContextStoreComponentInstanceIdToSet: string;
viewId?: string;
objectMetadataItem: ObjectMetadataItem;
pageName: string;
}) => {
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,
]);