HPCC-32586 ECL Watch v9 fix WU filter incorrect dates

Fixes an issue with formatting dates submitted in filter query, where a datetime is reencoded to UTC even if that had already happened. Also corrects a problem on the Files list filter, where the EndDate was being assigned the StartDate's value. Signed-off-by: Jeremy Clements <[email protected]>
hpcc-systems · Sep 4, 2024 · bb6eafb · bb6eafb
1 parent e8c2224
commit bb6eafb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/esp/src/src-react/components/Files.tsx b/esp/src/src-react/components/Files.tsx
@@ -70,10 +70,12 @@ function formatQuery(_filter): { [id: string]: any } {
     delete filter.NotInSuperFiles;
     delete filter.Indexes;
     if (filter.StartDate) {
+        if (filter.StartDate.indexOf("Z") < 0) { filter.StartDate += ":00.000Z"; }
         filter.StartDate = new Date(filter.StartDate).toISOString();
     }
     if (filter.EndDate) {
-        filter.EndDate = new Date(filter.StartDate).toISOString();
+        if (filter.EndDate.indexOf("Z") < 0) { filter.EndDate += ":00.000Z"; }
+        filter.EndDate = new Date(filter.EndDate).toISOString();
     }
     return filter;
 }

diff --git a/esp/src/src/ESPWorkunit.ts b/esp/src/src/ESPWorkunit.ts
@@ -124,9 +124,11 @@ export function formatQuery(_filter): { [id: string]: any } {
         delete filter.LastNDays;
     } else {
         if (filter.StartDate) {
+            if (filter.StartDate.indexOf("Z") < 0) { filter.StartDate += ":00.000Z"; }
             filter.StartDate = new Date(filter.StartDate).toISOString();
         }
         if (filter.EndDate) {
+            if (filter.EndDate.indexOf("Z") < 0) { filter.EndDate += ":00.000Z"; }
             filter.EndDate = new Date(filter.EndDate).toISOString();
         }
     }