diff --git a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.spec.ts b/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.spec.ts index 7afb5fc1c..4dcbceb13 100644 --- a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.spec.ts +++ b/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.spec.ts @@ -113,6 +113,9 @@ describe('CustomFieldsQueryDropdownComponent', () => { ...CUSTOM_FIELD_QUERY_OPERATORS_BY_GROUP[ CustomFieldQueryOperatorGroups.Basic ], + ...CUSTOM_FIELD_QUERY_OPERATORS_BY_GROUP[ + CustomFieldQueryOperatorGroups.Exact + ], ...CUSTOM_FIELD_QUERY_OPERATORS_BY_GROUP[ CustomFieldQueryOperatorGroups.String ], diff --git a/src-ui/src/app/data/custom-field-query.ts b/src-ui/src/app/data/custom-field-query.ts index 226a10605..084b7a330 100644 --- a/src-ui/src/app/data/custom-field-query.ts +++ b/src-ui/src/app/data/custom-field-query.ts @@ -36,6 +36,7 @@ export const CUSTOM_FIELD_QUERY_OPERATOR_LABELS = { export enum CustomFieldQueryOperatorGroups { Basic = 'basic', + Exact = 'exact', String = 'string', Arithmetic = 'arithmetic', Containment = 'containment', @@ -48,8 +49,8 @@ export const CUSTOM_FIELD_QUERY_OPERATORS_BY_GROUP = { [CustomFieldQueryOperatorGroups.Basic]: [ CustomFieldQueryOperator.Exists, CustomFieldQueryOperator.IsNull, - CustomFieldQueryOperator.Exact, ], + [CustomFieldQueryOperatorGroups.Exact]: [CustomFieldQueryOperator.Exact], [CustomFieldQueryOperatorGroups.String]: [CustomFieldQueryOperator.IContains], [CustomFieldQueryOperatorGroups.Arithmetic]: [ CustomFieldQueryOperator.GreaterThan, @@ -71,27 +72,33 @@ export const CUSTOM_FIELD_QUERY_OPERATORS_BY_GROUP = { export const CUSTOM_FIELD_QUERY_OPERATOR_GROUPS_BY_TYPE = { [CustomFieldDataType.String]: [ CustomFieldQueryOperatorGroups.Basic, + CustomFieldQueryOperatorGroups.Exact, CustomFieldQueryOperatorGroups.String, ], [CustomFieldDataType.Url]: [ CustomFieldQueryOperatorGroups.Basic, + CustomFieldQueryOperatorGroups.Exact, CustomFieldQueryOperatorGroups.String, ], [CustomFieldDataType.Date]: [ CustomFieldQueryOperatorGroups.Basic, + CustomFieldQueryOperatorGroups.Exact, CustomFieldQueryOperatorGroups.Date, ], [CustomFieldDataType.Boolean]: [CustomFieldQueryOperatorGroups.Basic], [CustomFieldDataType.Integer]: [ CustomFieldQueryOperatorGroups.Basic, + CustomFieldQueryOperatorGroups.Exact, CustomFieldQueryOperatorGroups.Arithmetic, ], [CustomFieldDataType.Float]: [ CustomFieldQueryOperatorGroups.Basic, + CustomFieldQueryOperatorGroups.Exact, CustomFieldQueryOperatorGroups.Arithmetic, ], [CustomFieldDataType.Monetary]: [ CustomFieldQueryOperatorGroups.Basic, + CustomFieldQueryOperatorGroups.Exact, CustomFieldQueryOperatorGroups.String, CustomFieldQueryOperatorGroups.Arithmetic, ], @@ -101,6 +108,7 @@ export const CUSTOM_FIELD_QUERY_OPERATOR_GROUPS_BY_TYPE = { ], [CustomFieldDataType.Select]: [ CustomFieldQueryOperatorGroups.Basic, + CustomFieldQueryOperatorGroups.Exact, CustomFieldQueryOperatorGroups.Subset, ], }