diff --git a/packages/twenty-front/src/modules/favorites/utils/getObjectMetadataLabelPluralFromViewId.ts b/packages/twenty-front/src/modules/favorites/utils/getObjectMetadataNamePluralFromViewId.ts similarity index 82% rename from packages/twenty-front/src/modules/favorites/utils/getObjectMetadataLabelPluralFromViewId.ts rename to packages/twenty-front/src/modules/favorites/utils/getObjectMetadataNamePluralFromViewId.ts index 87879995e..847249b27 100644 --- a/packages/twenty-front/src/modules/favorites/utils/getObjectMetadataLabelPluralFromViewId.ts +++ b/packages/twenty-front/src/modules/favorites/utils/getObjectMetadataNamePluralFromViewId.ts @@ -3,11 +3,11 @@ import { View } from '@/views/types/View'; import { isDefined } from 'twenty-shared/utils'; type ReturnType = { - labelPlural: string; + namePlural: string; view: Pick; }; -export const getObjectMetadataLabelPluralFromViewId = ( +export const getObjectMetadataNamePluralFromViewId = ( view: Pick, objectMetadataItems: ObjectMetadataItem[], ): ReturnType => { @@ -21,10 +21,10 @@ export const getObjectMetadataLabelPluralFromViewId = ( ); } - const { labelPlural } = objectMetadataItem; + const { namePlural } = objectMetadataItem; return { - labelPlural, + namePlural, view, }; }; diff --git a/packages/twenty-front/src/modules/favorites/utils/sortFavorites.ts b/packages/twenty-front/src/modules/favorites/utils/sortFavorites.ts index d54ea26e9..be2cfb1e5 100644 --- a/packages/twenty-front/src/modules/favorites/utils/sortFavorites.ts +++ b/packages/twenty-front/src/modules/favorites/utils/sortFavorites.ts @@ -1,13 +1,13 @@ import { Favorite } from '@/favorites/types/Favorite'; +import { getObjectMetadataNamePluralFromViewId } from '@/favorites/utils/getObjectMetadataNamePluralFromViewId'; import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem'; import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem'; import { ObjectRecord } from '@/object-record/types/ObjectRecord'; import { ObjectRecordIdentifier } from '@/object-record/types/ObjectRecordIdentifier'; import { AppPath } from '@/types/AppPath'; import { View } from '@/views/types/View'; -import { getAppPath } from '~/utils/navigation/getAppPath'; -import { getObjectMetadataLabelPluralFromViewId } from './getObjectMetadataLabelPluralFromViewId'; import { isDefined } from 'twenty-shared/utils'; +import { getAppPath } from '~/utils/navigation/getAppPath'; export type ProcessedFavorite = Favorite & { Icon?: string; @@ -39,7 +39,7 @@ export const sortFavorites = ( } as ProcessedFavorite; } - const { labelPlural } = getObjectMetadataLabelPluralFromViewId( + const { namePlural } = getObjectMetadataNamePluralFromViewId( view, objectMetadataItems, ); @@ -54,7 +54,7 @@ export const sortFavorites = ( labelIdentifier: view?.name, link: getAppPath( AppPath.RecordIndexPage, - { objectNamePlural: labelPlural.toLowerCase() }, + { objectNamePlural: namePlural }, favorite.viewId ? { viewId: favorite.viewId } : undefined, ), forWorkspaceMemberId: favorite.forWorkspaceMemberId,