diff --git a/packages/twenty-front/src/modules/navigation/hooks/useLastVisitedView.ts b/packages/twenty-front/src/modules/navigation/hooks/useLastVisitedView.ts index 080fbc9d7..09f4190de 100644 --- a/packages/twenty-front/src/modules/navigation/hooks/useLastVisitedView.ts +++ b/packages/twenty-front/src/modules/navigation/hooks/useLastVisitedView.ts @@ -29,7 +29,7 @@ export const useLastVisitedView = () => { setLastVisitedViewPerObjectMetadataItem, ] = useRecoilState(lastVisitedViewPerObjectMetadataItemState); - const { findActiveObjectMetadataItemBySlug } = + const { findActiveObjectMetadataItemByNamePlural } = useFilteredObjectMetadataItems(); const setFallbackForLastVisitedView = (objectMetadataItemId: string) => { @@ -49,7 +49,7 @@ export const useLastVisitedView = () => { viewId: string; }) => { const fallbackObjectMetadataItem = - findActiveObjectMetadataItemBySlug(objectNamePlural); + findActiveObjectMetadataItemByNamePlural(objectNamePlural); if (isDefined(fallbackObjectMetadataItem)) { /* when both are equal meaning there was change in view else @@ -72,7 +72,7 @@ export const useLastVisitedView = () => { objectNamePlural: string, ) => { const objectMetadataItemId: string | undefined = - findActiveObjectMetadataItemBySlug(objectNamePlural)?.id; + findActiveObjectMetadataItemByNamePlural(objectNamePlural)?.id; return objectMetadataItemId ? lastVisitedViewPerObjectMetadataItem?.[objectMetadataItemId] : undefined; diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useFilteredObjectMetadataItems.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useFilteredObjectMetadataItems.ts index 61922bf55..ac86e59b5 100644 --- a/packages/twenty-front/src/modules/object-metadata/hooks/useFilteredObjectMetadataItems.ts +++ b/packages/twenty-front/src/modules/object-metadata/hooks/useFilteredObjectMetadataItems.ts @@ -38,6 +38,12 @@ export const useFilteredObjectMetadataItems = () => { getObjectSlug(activeObjectMetadataItem) === slug, ); + const findActiveObjectMetadataItemByNamePlural = (namePlural: string) => + activeObjectMetadataItems.find( + (activeObjectMetadataItem) => + activeObjectMetadataItem.namePlural === namePlural, + ); + const findObjectMetadataItemById = (id: string) => objectMetadataItems.find( (objectMetadataItem) => objectMetadataItem.id === id, @@ -53,6 +59,7 @@ export const useFilteredObjectMetadataItems = () => { findActiveObjectMetadataItemBySlug, findObjectMetadataItemById, findObjectMetadataItemByNamePlural, + findActiveObjectMetadataItemByNamePlural, inactiveObjectMetadataItems, objectMetadataItems, findObjectMetadataItemBySlug,