diff --git a/frontend/src/shared/modules/filters/config/itemLabelRenderer/number.label.renderer.ts b/frontend/src/shared/modules/filters/config/itemLabelRenderer/number.label.renderer.ts index 4868602894..9361fd4151 100644 --- a/frontend/src/shared/modules/filters/config/itemLabelRenderer/number.label.renderer.ts +++ b/frontend/src/shared/modules/filters/config/itemLabelRenderer/number.label.renderer.ts @@ -9,10 +9,10 @@ export const numberItemLabelRenderer = (property: string, { }: NumberFilterValue): string => { const operatorObject = numberFilterOperators.find((o) => o.value === operator); let operandText = (operatorObject?.subLabel ? `${operatorObject.subLabel} ` : `${operatorObject?.label} ` || ''); - if (operator === FilterNumberOperator.EQ) { + if ([FilterNumberOperator.EQ, FilterNumberOperator.BETWEEN].includes(operator)) { operandText = ''; } const isBetween = [FilterNumberOperator.BETWEEN, FilterNumberOperator.NOT_BETWEEN].includes(operator); - const valueText = isBetween ? `${value} - ${valueTo}` : `${operandText}${value}`; + const valueText = isBetween ? `${operandText}${value} - ${valueTo}` : `${operandText}${value}`; return `${property}:${valueText || '...'}`; }; diff --git a/frontend/src/shared/modules/filters/config/queryUrlParser/date.parser.ts b/frontend/src/shared/modules/filters/config/queryUrlParser/date.parser.ts index 9b66369cfa..d26c2ca695 100644 --- a/frontend/src/shared/modules/filters/config/queryUrlParser/date.parser.ts +++ b/frontend/src/shared/modules/filters/config/queryUrlParser/date.parser.ts @@ -10,5 +10,7 @@ interface QueryUrlDateValue { export const dateQueryUrlParser = (query: QueryUrlDateValue): DateFilterValue => ({ ...query, operator: query.operator as FilterDateOperator, - value: query.operator === FilterDateOperator.BETWEEN ? query.value.split(',') : query.value, + value: [FilterDateOperator.BETWEEN, FilterDateOperator.NOT_BETWEEN].includes(query.operator as FilterDateOperator) + ? query.value.split(',') + : query.value, }); diff --git a/frontend/src/shared/modules/filters/config/queryUrlParser/number.parser.ts b/frontend/src/shared/modules/filters/config/queryUrlParser/number.parser.ts index 275cb254da..3c7b797961 100644 --- a/frontend/src/shared/modules/filters/config/queryUrlParser/number.parser.ts +++ b/frontend/src/shared/modules/filters/config/queryUrlParser/number.parser.ts @@ -13,7 +13,7 @@ export const numberQueryUrlParser = (query: QueryUrlNumberValue): NumberFilterVa value: +query.value, valueTo: +query.valueTo || '', }; - if (obj.operator !== FilterNumberOperator.BETWEEN) { + if (![FilterNumberOperator.BETWEEN, FilterNumberOperator.NOT_BETWEEN].includes(obj.operator)) { delete obj.valueTo; } return obj;