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

Fix undefined values in filters for GraphQL (#14080)

Browse Source 
* fix undefined values in filters for GraphQL

* add test for not passing variable in filter
This commit is contained in:
Azri Kahar
2022-06-24 21:36:05 +08:00
committed by GitHub
parent 4e85233060
commit ea3bf3a597
2 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -436,6 +436,18 @@ export function applyFilter(
});
}
// The following fields however, require a value to be run. If no value is passed, we
// ignore them. This allows easier use in GraphQL, where you wouldn't be able to
// conditionally build out your filter structure (#4471)
if (compareValue === undefined) return;
if (Array.isArray(compareValue)) {
// 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);
}
// Cast filter value (compareValue) based on function used
if (column.includes('(') && column.includes(')')) {
const functionName = column.split('(')[0] as FieldFunction;
@@ -470,18 +482,6 @@ export function applyFilter(
}
}
// The following fields however, require a value to be run. If no value is passed, we
// ignore them. This allows easier use in GraphQL, where you wouldn't be able to
// conditionally build out your filter structure (#4471)
if (compareValue === undefined) return;
if (Array.isArray(compareValue)) {
// 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);
}
if (operator === '_eq') {
dbQuery[logical].where(selectionRaw, '=', compareValue);
}