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

Picker and MultiSelect fixes (#2883)

Browse Source 
* Fixed orderBy bug

* Fixed gitch select multiple record filter

* Fixed RelationPicker search

* Fixed OrderBy type
This commit is contained in:
Lucas Bordeau
2023-12-08 17:42:40 +01:00
committed by GitHub
parent 9b7d7b29ed
commit 52859e18ed
16 changed files with 103 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
front/src/modules/object-metadata/hooks/useMapToObjectRecordIdentifier.ts
View File

@ -1,6 +1,7 @@
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
import { ObjectRecordIdentifier } from '@/object-record/types/ObjectRecordIdentifier';
import { FieldMetadataType } from '~/generated-metadata/graphql';
import { getLogoUrlFromDomainName } from '~/utils';
export const useMapToObjectRecordIdentifier = ({
@ -10,17 +11,6 @@ export const useMapToObjectRecordIdentifier = ({
}) => {
return (record: any): ObjectRecordIdentifier => {
switch (objectMetadataItem.nameSingular) {
case CoreObjectNameSingular.WorkspaceMember:
case CoreObjectNameSingular.Person:
return {
id: record.id,
name:
(record.name?.firstName ?? '') +
' ' +
(record.name?.lastName ?? ''),
avatarUrl: record.avatarUrl,
avatarType: 'rounded',
};
case CoreObjectNameSingular.Opportunity:
return {
id: record.id,
@ -36,9 +26,20 @@ export const useMapToObjectRecordIdentifier = ({
field.name === 'name',
);
const labelIdentifierFieldValue = labelIdentifierFieldMetadata
? record[labelIdentifierFieldMetadata.name]
: null;
let labelIdentifierFieldValue = '';
switch (labelIdentifierFieldMetadata?.type) {
case FieldMetadataType.FullName: {
labelIdentifierFieldValue = `${record.name?.firstName ?? ''} ${
record.name?.lastName ?? ''
}`;
break;
}
default:
labelIdentifierFieldValue = labelIdentifierFieldMetadata
? record[labelIdentifierFieldMetadata.name]
: '';
}
const imageIdentifierFieldMetadata = objectMetadataItem.fields.find(
(field) => field.id === objectMetadataItem.imageIdentifierFieldMetadataId,