Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 `<b>${property}:</b>${valueText || '...'}`;
};
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down