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

* Ignore undefined in array filter values (#5506)

Browse Source 
* Ignore non 2-length value for between-filters

Ref #4471
This commit is contained in:
Ilya Belousov
2021-05-06 20:10:26 +05:00
committed by GitHub
parent 76e44cfb24
commit 4217ace3b4
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/src/utils/apply-query.ts
View File

@@ -221,11 +221,12 @@ export function applyFilter(
if (compareValue === undefined) return;
if (Array.isArray(compareValue)) {
// When using a `[Type]` type in GraphQL, but don't provide the variable, it'll be
// reported as [undefined]. Seeing that SQL queries will fail when one or more of the
// bindings is undefined, we'll make sure here that invalid array values are ignored as
// well
if (compareValue.some((val) => val === undefined)) return;
// Tip: when using a `[Type]` type in GraphQL, but don't provide the variable, it'll be
// reported as [undefined].
// We need to remove any undefined values, as they are useless
compareValue = compareValue.filter((val) => val !== undefined);
// And ignore the result filter if there are no values in it
if (compareValue.length === 0) return;
}
if (operator === '_eq') {
@@ -275,6 +276,8 @@ export function applyFilter(
}
if (operator === '_between') {
if (compareValue.length !== 2) return;
let value = compareValue;
if (typeof value === 'string') value = value.split(',');
@@ -282,6 +285,8 @@ export function applyFilter(
}
if (operator === '_nbetween') {
if (compareValue.length !== 2) return;
let value = compareValue;
if (typeof value === 'string') value = value.split(',');