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

Flatten arrays after parsing filters (#9697)

Browse Source 
Co-authored-by: rijkvanzanten <rijkvanzanten@me.com>
This commit is contained in:
ian
2021-11-12 03:35:34 +08:00
committed by GitHub
parent 68b73d7e68
commit 23534c8662
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/shared/src/utils/flatten-arrays.ts Normal file
View File

@@ -0,0 +1,12 @@
import { isObjectLike, flattenDeep } from 'lodash';
export function flattenArrays(obj: any) {
for (const key in obj) {
if (Array.isArray(obj[key])) {
obj[key] = flattenDeep(obj[key]);
} else if (isObjectLike(obj[key])) {
obj[key] = flattenArrays(obj[key]);
}
}
return obj;
}

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

@@ -4,6 +4,7 @@ import { toArray } from './to-array';
import { adjustDate } from './adjust-date';
import { deepMap } from './deep-map';
import { isDynamicVariable } from './is-dynamic-variable';
import { flattenArrays } from './flatten-arrays';
type ParseFilterContext = {
// The user can add any custom fields to user
@@ -18,7 +19,7 @@ export function parseFilter(
): any {
if (!filter) return filter;
return deepMap(filter, applyFilter);
return flattenArrays(deepMap(filter, applyFilter));
function applyFilter(val: any, key: string | number) {
if (val === 'true') return true;