mirror of
https://github.com/gristlabs/grist-core.git
synced 2024-10-19 16:02:01 +00:00
815c9e1462
Summary: Shows the range filter next to the filter by values on filter menu. When users set min and/or max, it takes precendence over the filter by values. If users set: - `[] < [max]` behaves as `less than max`. - `[min] < []` behaves as `more than min`. - `[min] < [max]` behaves as `between min and max` - bounds are always inclusives. - when users change min or max the values of the by values filter gets checked/unchecked depending on whether they are included by the range filter. - when users clicks any btn/checkbox of the by values filter both min and max input gets cleared, and the filter convert to a filter by values. Test Plan: Adds both projets and nbrowser tests. Reviewers: jarek Reviewed By: jarek Differential Revision: https://phab.getgrist.com/D3435
49 lines
2.0 KiB
TypeScript
49 lines
2.0 KiB
TypeScript
import {CellValue} from "app/common/DocActions";
|
|
import {FilterState, isRangeFilter, makeFilterState} from "app/common/FilterState";
|
|
import {decodeObject} from "app/plugin/objtypes";
|
|
import {isList, isListType, isNumberType} from "./gristTypes";
|
|
|
|
export type ColumnFilterFunc = (value: CellValue) => boolean;
|
|
|
|
// Returns a filter function for a particular column: the function takes a cell value and returns
|
|
// whether it's accepted according to the given FilterState.
|
|
export function makeFilterFunc(state: FilterState,
|
|
columnType?: string): ColumnFilterFunc {
|
|
|
|
if (isRangeFilter(state)) {
|
|
const {min, max} = state;
|
|
if (isNumberType(columnType)) {
|
|
return (val) => {
|
|
if (typeof val !== 'number') { return false; }
|
|
return (
|
|
(max === undefined ? true : val <= max) &&
|
|
(min === undefined ? true : min <= val)
|
|
);
|
|
};
|
|
} else {
|
|
// Although it is not possible to set a range filter for non numeric columns, this still can
|
|
// happen as a result of a column type conversion. In this case, let's include all values.
|
|
return () => true;
|
|
}
|
|
}
|
|
|
|
const {include, values} = state;
|
|
|
|
// NOTE: This logic results in complex values and their stringified JSON representations as equivalent.
|
|
// For example, a TypeError in the formula column and the string '["E","TypeError"]' would be seen as the same.
|
|
// TODO: This narrow corner case seems acceptable for now, but may be worth revisiting.
|
|
return (val: CellValue) => {
|
|
if (isList(val) && columnType && isListType(columnType)) {
|
|
const list = decodeObject(val) as unknown[];
|
|
return list.some(item => values.has(item as any) === include);
|
|
}
|
|
return (values.has(Array.isArray(val) ? JSON.stringify(val) : val) === include);
|
|
};
|
|
}
|
|
|
|
// Given a JSON string, returns a ColumnFilterFunc
|
|
export function buildColFilter(filterJson: string | undefined,
|
|
columnType?: string): ColumnFilterFunc | null {
|
|
return filterJson ? makeFilterFunc(makeFilterState(filterJson), columnType) : null;
|
|
}
|