Ability to filter by composite's subfields (#6832)
# This PR - Fix #6425 See https://github.com/twentyhq/twenty/issues/7188 because there's some more work to do. --------- Co-authored-by: Lucas Bordeau <bordeau.lucas@gmail.com>
This commit is contained in:
committed by
GitHub
parent
af4f3cebb0
commit
4156d7821c
@ -1,8 +1,11 @@
|
||||
import { useGetRelationMetadata } from '@/object-metadata/hooks/useGetRelationMetadata';
|
||||
import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
|
||||
import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
|
||||
import { FieldType } from '@/settings/data-model/types/FieldType';
|
||||
import { SettingsFieldType } from '@/settings/data-model/types/SettingsFieldType';
|
||||
import { getFieldIdentifierType } from '@/settings/data-model/utils/getFieldIdentifierType';
|
||||
import { getSettingsFieldTypeConfig } from '@/settings/data-model/utils/getSettingsFieldTypeConfig';
|
||||
import { isFieldTypeSupportedInSettings } from '@/settings/data-model/utils/isFieldTypeSupportedInSettings';
|
||||
import { SettingsObjectDetailTableItem } from '~/pages/settings/data-model/types/SettingsObjectDetailTableItem';
|
||||
import { getSettingsObjectFieldType } from '~/pages/settings/data-model/utils/getSettingsObjectFieldType';
|
||||
|
||||
@ -29,13 +32,17 @@ export const useMapFieldMetadataItemToSettingsObjectDetailTableItem = (
|
||||
objectMetadataItem,
|
||||
);
|
||||
|
||||
const fieldMetadataType = fieldMetadataItem.type as FieldType;
|
||||
|
||||
return {
|
||||
fieldMetadataItem,
|
||||
fieldType: fieldType ?? '',
|
||||
dataType:
|
||||
relationObjectMetadataItem?.labelPlural ??
|
||||
getSettingsFieldTypeConfig(fieldMetadataItem.type)?.label ??
|
||||
'',
|
||||
(relationObjectMetadataItem?.labelPlural ??
|
||||
isFieldTypeSupportedInSettings(fieldMetadataType))
|
||||
? getSettingsFieldTypeConfig(fieldMetadataType as SettingsFieldType)
|
||||
?.label
|
||||
: '',
|
||||
label: fieldMetadataItem.label,
|
||||
identifierType: identifierType,
|
||||
objectMetadataItem,
|
||||
|
||||
Reference in New Issue
Block a user