Merge branch 'main' into aggregation

This commit is contained in:
rijkvanzanten
2021-06-11 21:19:07 -04:00

View File

@@ -14,9 +14,10 @@ export function parseFilter(filter: Filter, accountability: Accountability | nul
else return toArray(val);
}
if (val && val.startsWith('$NOW')) {
if (val && typeof val === 'string' && val.startsWith('$NOW')) {
if (val.includes('(') && val.includes(')')) {
const adjustment = val.match(/\(([^)]+)\)/)?.[1];
if (!adjustment) return new Date();
return adjustDate(new Date(), adjustment);
}