admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Complete labelIdentifer, relationPicker first implementation (#2618)

Browse Source 
* Fix first column main identifier

* Fixes
This commit is contained in:
Charles Bochet
2023-11-21 18:32:36 +01:00
committed by GitHub
parent dd125ddfcc
commit 726e375616
27 changed files with 165 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
front/src/modules/settings/data-model/hooks/useFieldPreview.ts
View File

@ -26,7 +26,10 @@ export const useFieldPreview = ({
const fieldName = fieldMetadata.id
? objectMetadataItem?.fields.find(({ id }) => id === fieldMetadata.id)?.name
: undefined;
const value = fieldName ? firstRecord?.[fieldName] : undefined;
const value =
fieldMetadata.type !== 'RELATION' && fieldName
? firstRecord?.[fieldName]
: undefined;
return {
entityId: firstRecord?.id || `${objectMetadataId}-no-records`,

6
front/src/modules/settings/data-model/hooks/useRelationFieldPreview.ts
View File

@ -1,5 +1,6 @@
import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
import { useFindManyObjectRecords } from '@/object-record/hooks/useFindManyObjectRecords';
import { capitalize } from '~/utils/string/capitalize';
export const useRelationFieldPreview = ({
relationObjectMetadataId,
@ -20,6 +21,9 @@ export const useRelationFieldPreview = ({
});
return {
defaultValue: relationObjects?.[0],
relationObjectMetadataItem,
defaultValue: relationObjects?.[0] ?? {
name: capitalize(relationObjectMetadataItem?.nameSingular ?? ''),
},
};
};