twentyhq/twenty
1
1
Fork 0
mirror of https://github.com/twentyhq/twenty.git synced 2024-12-29 15:25:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Favorites should be user-level not workspace-level (#5186)

Browse Source 
### 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 <gitstart-twenty@users.noreply.github.com>
Co-authored-by: Lucas Bordeau <bordeau.lucas@gmail.com>
This commit is contained in:
gitstart-twenty 2024-04-30 22:42:44 +08:00 committed by GitHub
parent bc0d30f28b
commit 9ad68ffe84
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/twenty-front/src/modules/favorites/hooks/useFavorites.ts
View File

@ -37,6 +37,11 @@ export const useFavorites = () => {
const { records: favorites } = usePrefetchedData<Favorite>( const { records: favorites } = usePrefetchedData<Favorite>(
PrefetchKey.AllFavorites, PrefetchKey.AllFavorites,
{
workspaceMemberId: {
eq: currentWorkspaceMember?.id ?? '',
},
},
); );
const favoriteRelationFieldMetadataItems = useMemo( const favoriteRelationFieldMetadataItems = useMemo(

3
packages/twenty-front/src/modules/prefetch/hooks/usePrefetchedData.ts
View File

@ -1,6 +1,7 @@
import { useRecoilValue } from 'recoil'; import { useRecoilValue } from 'recoil';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem'; import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { RecordGqlOperationFilter } from '@/object-record/graphql/types/RecordGqlOperationFilter';
import { generateDepthOneRecordGqlFields } from '@/object-record/graphql/utils/generateDepthOneRecordGqlFields'; import { generateDepthOneRecordGqlFields } from '@/object-record/graphql/utils/generateDepthOneRecordGqlFields';
import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords'; import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
import { ObjectRecord } from '@/object-record/types/ObjectRecord'; import { ObjectRecord } from '@/object-record/types/ObjectRecord';
@ -10,6 +11,7 @@ import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
export const usePrefetchedData = <T extends ObjectRecord>( export const usePrefetchedData = <T extends ObjectRecord>(
prefetchKey: PrefetchKey, prefetchKey: PrefetchKey,
filter?: RecordGqlOperationFilter,
) => { ) => {
const isDataPrefetched = useRecoilValue( const isDataPrefetched = useRecoilValue(
prefetchIsLoadedFamilyState(prefetchKey), prefetchIsLoadedFamilyState(prefetchKey),
@ -29,6 +31,7 @@ export const usePrefetchedData = <T extends ObjectRecord>(
generateDepthOneRecordGqlFields({ generateDepthOneRecordGqlFields({
objectMetadataItem, objectMetadataItem,
}), }),
filter,
}); });
return { return {