From 9ad68ffe848297c6873cdeca94c6deb93b6823f2 Mon Sep 17 00:00:00 2001 From: gitstart-twenty <140154534+gitstart-twenty@users.noreply.github.com> Date: Tue, 30 Apr 2024 22:42:44 +0800 Subject: [PATCH] Favorites should be user-level not workspace-level (#5186) ### Description Favorites should be user-level not workspace-level ### Refs #3374 ### Demo https://github.com/twentyhq/twenty/assets/140154534/38a34cc7-ac58-494f-92d5-e15c43ae542e Fixes #3374 --------- Co-authored-by: gitstart-twenty Co-authored-by: Lucas Bordeau --- .../twenty-front/src/modules/favorites/hooks/useFavorites.ts | 5 +++++ .../src/modules/prefetch/hooks/usePrefetchedData.ts | 3 +++ 2 files changed, 8 insertions(+) diff --git a/packages/twenty-front/src/modules/favorites/hooks/useFavorites.ts b/packages/twenty-front/src/modules/favorites/hooks/useFavorites.ts index f01cdd1d4..802aa3a3d 100644 --- a/packages/twenty-front/src/modules/favorites/hooks/useFavorites.ts +++ b/packages/twenty-front/src/modules/favorites/hooks/useFavorites.ts @@ -37,6 +37,11 @@ export const useFavorites = () => { const { records: favorites } = usePrefetchedData( PrefetchKey.AllFavorites, + { + workspaceMemberId: { + eq: currentWorkspaceMember?.id ?? '', + }, + }, ); const favoriteRelationFieldMetadataItems = useMemo( diff --git a/packages/twenty-front/src/modules/prefetch/hooks/usePrefetchedData.ts b/packages/twenty-front/src/modules/prefetch/hooks/usePrefetchedData.ts index eafac6366..5db8f0d07 100644 --- a/packages/twenty-front/src/modules/prefetch/hooks/usePrefetchedData.ts +++ b/packages/twenty-front/src/modules/prefetch/hooks/usePrefetchedData.ts @@ -1,6 +1,7 @@ import { useRecoilValue } from 'recoil'; import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem'; +import { RecordGqlOperationFilter } from '@/object-record/graphql/types/RecordGqlOperationFilter'; import { generateDepthOneRecordGqlFields } from '@/object-record/graphql/utils/generateDepthOneRecordGqlFields'; import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords'; import { ObjectRecord } from '@/object-record/types/ObjectRecord'; @@ -10,6 +11,7 @@ import { PrefetchKey } from '@/prefetch/types/PrefetchKey'; export const usePrefetchedData = ( prefetchKey: PrefetchKey, + filter?: RecordGqlOperationFilter, ) => { const isDataPrefetched = useRecoilValue( prefetchIsLoadedFamilyState(prefetchKey), @@ -29,6 +31,7 @@ export const usePrefetchedData = ( generateDepthOneRecordGqlFields({ objectMetadataItem, }), + filter, }); return {