github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-03 03:00:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

parse created arrays in parseFilter (#7883)

Browse Source
This commit is contained in:
Nitwel
2021-09-07 17:15:15 +02:00
committed by GitHub
parent 4d7d942b00
commit 909d7f922d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/shared/src/utils/parse-filter.ts
View File

@@ -4,14 +4,16 @@ import { adjustDate } from './adjust-date';
import { deepMap } from './deep-map';
export function parseFilter(filter: Filter, accountability: Accountability | null): any {
return deepMap(filter, (val, key) => {
return deepMap(filter, applyFilter);
function applyFilter(val: any, key: string | number) {
if (val === 'true') return true;
if (val === 'false') return false;
if (val === 'null' || val === 'NULL') return null;
if (['_in', '_nin', '_between', '_nbetween'].includes(String(key))) {
if (typeof val === 'string' && val.includes(',')) return val.split(',');
else return toArray(val);
if (typeof val === 'string' && val.includes(',')) return deepMap(val.split(','), applyFilter);
else return deepMap(toArray(val), applyFilter);
}
if (val && typeof val === 'string' && val.startsWith('$NOW')) {
@@ -28,5 +30,5 @@ export function parseFilter(filter: Filter, accountability: Accountability | nul
if (val === '$CURRENT_ROLE') return accountability?.role || null;
return val;
});
}
}