rodrigo/genieacs
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix querying faults in UI showing no results

Browse Source
This commit is contained in:
Zaid Abdulla committed 2020-09-08 00:11:14 -07:00
1 parent c17d2eae2f
commit dd9cd01681
1 file changed
+9 -6
Download Patch File Download Diff File Expand all files Collapse all files
lib/ui/api.ts
+9 -6
View File
@@ -147,8 +147,9 @@ for (const [resource, flags] of Object.entries(resources)) {
// Exclude temporary tasks and faults // Exclude temporary tasks and faults
if (resource === "tasks" || resource === "faults") { if (resource === "tasks" || resource === "faults") {
filter = and(filter, [ filter = and(filter, [
"NOT", "OR",
["<", ["PARAM", "expiry"], Date.now() + 60000], [">=", ["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 // Exclude temporary tasks and faults
if (resource === "tasks" || resource === "faults") { if (resource === "tasks" || resource === "faults") {
filter = and(filter, [ filter = and(filter, [
"NOT", "OR",
["<", ["PARAM", "expiry"], Date.now() + 60000], [">=", ["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 // Exclude temporary tasks and faults
if (resource === "tasks" || resource === "faults") { if (resource === "tasks" || resource === "faults") {
filter = and(filter, [ filter = and(filter, [
"NOT", "OR",
["<", ["PARAM", "expiry"], Date.now() + 60000], [">=", ["PARAM", "expiry"], Date.now() + 60000],
["IS NULL", ["PARAM", "expiry"]],
]); ]);
} }