diff --git a/packages/twenty-front/src/modules/metadata-store/utils/splitViewWithRelated.ts b/packages/twenty-front/src/modules/metadata-store/utils/splitViewWithRelated.ts index b062d2615c..5129e56acc 100644 --- a/packages/twenty-front/src/modules/metadata-store/utils/splitViewWithRelated.ts +++ b/packages/twenty-front/src/modules/metadata-store/utils/splitViewWithRelated.ts @@ -6,6 +6,7 @@ import { type FlatViewFilterGroup } from '@/metadata-store/types/FlatViewFilterG import { type FlatViewGroup } from '@/metadata-store/types/FlatViewGroup'; import { type FlatViewSort } from '@/metadata-store/types/FlatViewSort'; import { type ViewWithRelations } from '@/views/types/ViewWithRelations'; +import { convertViewFilterValueToString } from 'twenty-shared/utils'; type SplitResult = { flatViews: FlatView[]; @@ -51,6 +52,7 @@ export const splitViewWithRelated = ( for (const viewFilter of viewFilters) { flatViewFilters.push({ ...viewFilter, + value: convertViewFilterValueToString(viewFilter.value), viewId: viewWithRelated.id, }); } diff --git a/packages/twenty-front/src/modules/views/utils/mapViewFiltersToFilters.ts b/packages/twenty-front/src/modules/views/utils/mapViewFiltersToFilters.ts index 24c18775f6..8cf6545e56 100644 --- a/packages/twenty-front/src/modules/views/utils/mapViewFiltersToFilters.ts +++ b/packages/twenty-front/src/modules/views/utils/mapViewFiltersToFilters.ts @@ -4,7 +4,11 @@ import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataIte import { isSystemSearchVectorField } from '@/object-record/utils/isSystemSearchVectorField'; import { type CompositeFieldSubFieldName } from '@/settings/data-model/types/CompositeFieldSubFieldName'; -import { getFilterTypeFromFieldType, isDefined } from 'twenty-shared/utils'; +import { + convertViewFilterValueToString, + getFilterTypeFromFieldType, + isDefined, +} from 'twenty-shared/utils'; import { type ViewFilter as GqlViewFilter } from '~/generated-metadata/graphql'; import { type ViewFilter } from '@/views/types/ViewFilter'; @@ -34,14 +38,16 @@ export const mapViewFiltersToFilters = ( const operand = viewFilter.operand; + const stringValue = convertViewFilterValueToString(viewFilter.value); + return { id: viewFilter.id, fieldMetadataId: viewFilter.fieldMetadataId, - value: viewFilter.value, + value: stringValue, displayValue: - 'displayValue' in viewFilter + 'displayValue' in viewFilter && isDefined(viewFilter.displayValue) ? viewFilter.displayValue - : viewFilter.value, + : stringValue, operand, recordFilterGroupId: viewFilter.viewFilterGroupId ?? undefined, positionInRecordFilterGroup: viewFilter.positionInViewFilterGroup,