diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata.ts index d7155f3d7..2d610368a 100644 --- a/packages/twenty-front/src/modules/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata.ts +++ b/packages/twenty-front/src/modules/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata.ts @@ -24,13 +24,11 @@ export const useColumnDefinitionsFromFieldMetadata = ( [objectMetadataItem], ); - const isArrayAndJsonFilterEnabled = useIsFeatureEnabled( - 'IS_ARRAY_AND_JSON_FILTER_ENABLED', - ); + const isJsonFilterEnabled = useIsFeatureEnabled('IS_JSON_FILTER_ENABLED'); const filterDefinitions = formatFieldMetadataItemsAsFilterDefinitions({ fields: activeFieldMetadataItems, - isArrayAndJsonFilterEnabled, + isJsonFilterEnabled, }); const sortDefinitions = formatFieldMetadataItemsAsSortDefinitions({ diff --git a/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts b/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts index 94a1b2746..33726b908 100644 --- a/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts +++ b/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts @@ -8,10 +8,10 @@ import { ObjectMetadataItem } from '../types/ObjectMetadataItem'; export const formatFieldMetadataItemsAsFilterDefinitions = ({ fields, - isArrayAndJsonFilterEnabled, + isJsonFilterEnabled, }: { fields: Array; - isArrayAndJsonFilterEnabled: boolean; + isJsonFilterEnabled: boolean; }): FilterDefinition[] => { return fields.reduce((acc, field) => { if ( @@ -40,9 +40,8 @@ export const formatFieldMetadataItemsAsFilterDefinitions = ({ FieldMetadataType.Rating, FieldMetadataType.Actor, FieldMetadataType.Phones, - ...(isArrayAndJsonFilterEnabled - ? [FieldMetadataType.Array, FieldMetadataType.RawJson] - : []), + FieldMetadataType.Array, + ...(isJsonFilterEnabled ? [FieldMetadataType.RawJson] : []), ].includes(field.type) ) { return acc; diff --git a/packages/twenty-front/src/modules/views/hooks/useQueryVariablesFromActiveFieldsOfViewOrDefaultView.ts b/packages/twenty-front/src/modules/views/hooks/useQueryVariablesFromActiveFieldsOfViewOrDefaultView.ts index d40afd106..4b28e5e78 100644 --- a/packages/twenty-front/src/modules/views/hooks/useQueryVariablesFromActiveFieldsOfViewOrDefaultView.ts +++ b/packages/twenty-front/src/modules/views/hooks/useQueryVariablesFromActiveFieldsOfViewOrDefaultView.ts @@ -20,15 +20,13 @@ export const useQueryVariablesFromActiveFieldsOfViewOrDefaultView = ({ objectMetadataItem, }); - const isArrayAndJsonFilterEnabled = useIsFeatureEnabled( - 'IS_ARRAY_AND_JSON_FILTER_ENABLED', - ); + const isJsonFilterEnabled = useIsFeatureEnabled('IS_JSON_FILTER_ENABLED'); const { filter, orderBy } = getQueryVariablesFromView({ fieldMetadataItems: activeFieldMetadataItems, objectMetadataItem, view, - isArrayAndJsonFilterEnabled, + isJsonFilterEnabled, }); return { diff --git a/packages/twenty-front/src/modules/views/utils/getQueryVariablesFromView.ts b/packages/twenty-front/src/modules/views/utils/getQueryVariablesFromView.ts index 229929252..7768035b6 100644 --- a/packages/twenty-front/src/modules/views/utils/getQueryVariablesFromView.ts +++ b/packages/twenty-front/src/modules/views/utils/getQueryVariablesFromView.ts @@ -13,12 +13,12 @@ export const getQueryVariablesFromView = ({ view, fieldMetadataItems, objectMetadataItem, - isArrayAndJsonFilterEnabled, + isJsonFilterEnabled, }: { view: View | null | undefined; fieldMetadataItems: FieldMetadataItem[]; objectMetadataItem: ObjectMetadataItem; - isArrayAndJsonFilterEnabled: boolean; + isJsonFilterEnabled: boolean; }) => { if (!isDefined(view)) { return { @@ -31,7 +31,7 @@ export const getQueryVariablesFromView = ({ const filterDefinitions = formatFieldMetadataItemsAsFilterDefinitions({ fields: fieldMetadataItems, - isArrayAndJsonFilterEnabled, + isJsonFilterEnabled, }); const sortDefinitions = formatFieldMetadataItemsAsSortDefinitions({ diff --git a/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts b/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts index 337f252be..666ea100c 100644 --- a/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts +++ b/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts @@ -13,7 +13,7 @@ export type FeatureFlagKey = | 'IS_ANALYTICS_V2_ENABLED' | 'IS_SSO_ENABLED' | 'IS_UNIQUE_INDEXES_ENABLED' - | 'IS_ARRAY_AND_JSON_FILTER_ENABLED' + | 'IS_JSON_FILTER_ENABLED' | 'IS_MICROSOFT_SYNC_ENABLED' | 'IS_ADVANCED_FILTERS_ENABLED' | 'IS_AGGREGATE_QUERY_ENABLED';