From bb6eafba1b6900104331f564b90dac406fd33ceb Mon Sep 17 00:00:00 2001
From: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com>
Date: Wed, 4 Sep 2024 11:33:57 -0400
Subject: [PATCH] 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 <79224539+jeclrsg@users.noreply.github.com>
---
 esp/src/src-react/components/Files.tsx | 4 +++-
 esp/src/src/ESPWorkunit.ts             | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/esp/src/src-react/components/Files.tsx b/esp/src/src-react/components/Files.tsx
index 6cc33214cbb..95cf41ee7b6 100644
--- 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
index 0b7713df67f..1efadc5afc1 100644
--- 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();
         }
     }