Fix latest visited view (#10158)
Fixes https://github.com/twentyhq/twenty/issues/9772 In this PR: - the root cause of the issue that the ContextStoreViewIdEffect was not filtering the views on objectMetadata properly - I'm also deleting some over complex in the latestVisited view logic - Duplicated logic between ContextStoreViewIdEffect and ViewBarViewIdEffect, see my comment
This commit is contained in:
@ -0,0 +1,90 @@
|
||||
import { MainContextStoreProviderEffect } from '@/context-store/components/MainContextStoreProviderEffect';
|
||||
import { useLastVisitedView } from '@/navigation/hooks/useLastVisitedView';
|
||||
import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
|
||||
import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData';
|
||||
import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
|
||||
import { AppPath } from '@/types/AppPath';
|
||||
import { View } from '@/views/types/View';
|
||||
import { useParams, useSearchParams } from 'react-router-dom';
|
||||
import { useRecoilValue } from 'recoil';
|
||||
import { isDefined } from 'twenty-shared';
|
||||
import { undefined } from 'zod';
|
||||
import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
|
||||
|
||||
const getViewId = (
|
||||
viewIdFromQueryParams: string | null,
|
||||
indexView?: View,
|
||||
lastVisitedViewId?: string,
|
||||
) => {
|
||||
if (isDefined(viewIdFromQueryParams)) {
|
||||
return viewIdFromQueryParams;
|
||||
}
|
||||
|
||||
if (isDefined(lastVisitedViewId)) {
|
||||
return lastVisitedViewId;
|
||||
}
|
||||
|
||||
if (isDefined(indexView)) {
|
||||
return indexView.id;
|
||||
}
|
||||
|
||||
throw new Error('No view id found');
|
||||
};
|
||||
|
||||
export const MainContextStoreProvider = () => {
|
||||
const { isMatchingLocation } = useIsMatchingLocation();
|
||||
const isRecordIndexPage = isMatchingLocation(AppPath.RecordIndexPage);
|
||||
const isRecordShowPage = isMatchingLocation(AppPath.RecordShowPage);
|
||||
|
||||
const pageName = isRecordIndexPage
|
||||
? 'record-index'
|
||||
: isRecordShowPage
|
||||
? 'record-show'
|
||||
: undefined;
|
||||
|
||||
const objectNamePlural = useParams().objectNamePlural ?? '';
|
||||
|
||||
const [searchParams] = useSearchParams();
|
||||
const viewIdQueryParam = searchParams.get('viewId');
|
||||
|
||||
const { records: views } = usePrefetchedData<View>(PrefetchKey.AllViews);
|
||||
|
||||
const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
|
||||
|
||||
const objectMetadataItem = objectMetadataItems.find(
|
||||
(objectMetadataItem) => objectMetadataItem.namePlural === objectNamePlural,
|
||||
);
|
||||
|
||||
const { getLastVisitedViewIdFromObjectNamePlural } = useLastVisitedView();
|
||||
|
||||
const lastVisitedViewId = getLastVisitedViewIdFromObjectNamePlural(
|
||||
objectMetadataItem?.namePlural ?? '',
|
||||
);
|
||||
|
||||
const viewsOnCurrentObject = views.filter(
|
||||
(view) => view.objectMetadataId === objectMetadataItem?.id,
|
||||
);
|
||||
const indexView = viewsOnCurrentObject.find((view) => view.key === 'INDEX');
|
||||
|
||||
const viewId = getViewId(viewIdQueryParam, indexView, lastVisitedViewId);
|
||||
|
||||
const mainContextStoreComponentInstanceId = `${pageName}-${objectMetadataItem?.namePlural}-${viewId}`;
|
||||
|
||||
if (
|
||||
!isDefined(pageName) ||
|
||||
!isDefined(objectMetadataItem) ||
|
||||
!isDefined(viewId)
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
<MainContextStoreProviderEffect
|
||||
mainContextStoreComponentInstanceIdToSet={
|
||||
mainContextStoreComponentInstanceId
|
||||
}
|
||||
viewId={viewId}
|
||||
objectMetadataItem={objectMetadataItem}
|
||||
/>
|
||||
);
|
||||
};
|
||||
Reference in New Issue
Block a user