From dd9cd01681908c6d9a84c403cfd5089789402dba Mon Sep 17 00:00:00 2001 From: Zaid Abdulla Date: Tue, 8 Sep 2020 00:11:14 -0700 Subject: [PATCH] Fix querying faults in UI showing no results --- lib/ui/api.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/ui/api.ts b/lib/ui/api.ts index 22f6f19..42ff33d 100644 --- a/lib/ui/api.ts +++ b/lib/ui/api.ts @@ -147,8 +147,9 @@ for (const [resource, flags] of Object.entries(resources)) { // Exclude temporary tasks and faults if (resource === "tasks" || resource === "faults") { filter = and(filter, [ - "NOT", - ["<", ["PARAM", "expiry"], Date.now() + 60000], + "OR", + [">=", ["PARAM", "expiry"], Date.now() + 60000], + ["IS NULL", ["PARAM", "expiry"]], ]); } @@ -195,8 +196,9 @@ for (const [resource, flags] of Object.entries(resources)) { // Exclude temporary tasks and faults if (resource === "tasks" || resource === "faults") { filter = and(filter, [ - "NOT", - ["<", ["PARAM", "expiry"], Date.now() + 60000], + "OR", + [">=", ["PARAM", "expiry"], Date.now() + 60000], + ["IS NULL", ["PARAM", "expiry"]], ]); } @@ -254,8 +256,9 @@ for (const [resource, flags] of Object.entries(resources)) { // Exclude temporary tasks and faults if (resource === "tasks" || resource === "faults") { filter = and(filter, [ - "NOT", - ["<", ["PARAM", "expiry"], Date.now() + 60000], + "OR", + [">=", ["PARAM", "expiry"], Date.now() + 60000], + ["IS NULL", ["PARAM", "expiry"]], ]); }