From 35517aa35a719c1e3c3856e6ee9764328b5787e4 Mon Sep 17 00:00:00 2001
From: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com>
Date: Wed, 6 Nov 2024 11:11:06 -0500
Subject: [PATCH] HPCC-32957 ECL Watch ZAP dialog invalid date formats

fixes an issue in both the v5 and v9 ECL Watch UIs, where in attemping
to download a ZAP report the formatting of the date fields could be
incorrect

Signed-off-by: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com>
---
 esp/src/eclwatch/WUDetailsWidget.js              |  4 +++-
 esp/src/eclwatch/templates/WUDetailsWidget.html  |  2 +-
 esp/src/src-react/components/forms/ZAPDialog.tsx | 11 ++++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/esp/src/eclwatch/WUDetailsWidget.js b/esp/src/eclwatch/WUDetailsWidget.js
index a6d214c7697..24aa5eb0550 100644
--- a/esp/src/eclwatch/WUDetailsWidget.js
+++ b/esp/src/eclwatch/WUDetailsWidget.js
@@ -161,7 +161,9 @@ define([
         formatLogFilterDateTime: function (dateField, timeField, dateTimeField) {
             if (dateField.value.toString() !== "Invalid Date") {
                 const d = new Date(dateField.value);
-                const date = `${d.getFullYear()}-${(d.getMonth() < 9 ? "0" : "") + parseInt(d.getMonth() + 1, 10)}-${d.getDate()}`;
+                const month = d.getMonth() + 1;
+                const day = d.getDate();
+                const date = `${d.getFullYear()}-${(month < 9 ? "0" : "") + month}-${(day < 9 ? "0" : "") + day}`;
                 const time = timeField.value.toString().replace(/.*1970\s(\S+).*/, "$1");
                 dateTimeField.value = `${date}T${time}.000Z`;
             }
diff --git a/esp/src/eclwatch/templates/WUDetailsWidget.html b/esp/src/eclwatch/templates/WUDetailsWidget.html
index ef58752e1a6..cbc3ade4d7b 100644
--- a/esp/src/eclwatch/templates/WUDetailsWidget.html
+++ b/esp/src/eclwatch/templates/WUDetailsWidget.html
@@ -205,7 +205,7 @@ <h2>
                     <input id="${id}EndDateTime" name="LogFilter_AbsoluteTimeRange_EndDate" type="hidden" />
                     <input id="${id}EndDate" title="${i18n.ToDate}:" name="EndDate" data-dojo-props="trim: true" required="required" data-dojo-type="dijit.form.DateTextBox" />
                     <input id="${id}EndTime" title="" name="EndTime" data-dojo-props="trim: true" value="T19:30:00" data-dojo-type="dijit.form.TimeTextBox" />
-                    <input id="${id}RelativeTimeRangeBuffer" title="${i18n.RelativeTimeRange}" name="LogFilter_RelativeTimeRangeBuffer" colspan="2" data-dojo-type="dijit.form.TextBox" />
+                    <input id="${id}RelativeTimeRangeBuffer" title="${i18n.RelativeTimeRange}" name="LogFilter_RelativeTimeRangeBuffer" value="43200" colspan="2" data-dojo-type="dijit.form.TextBox" />
                     <input id="${id}LineLimit" title="${i18n.LogLineLimit}" name="LogFilter_LineLimit" colspan="2" value="10000" data-dojo-type="dijit.form.TextBox" />
                     <input id="${id}LineStartFrom" title="${i18n.LogLineStartFrom}" name="LogFilter_LineStartFrom" value="0" colspan="2" data-dojo-type="dijit.form.TextBox" />
                     <select id="${id}SelectColumnMode" title="${i18n.ColumnMode}" name="LogFilter_SelectColumnMode" colspan="2" data-dojo-type="dijit.form.Select">
diff --git a/esp/src/src-react/components/forms/ZAPDialog.tsx b/esp/src/src-react/components/forms/ZAPDialog.tsx
index 934e794a439..679c0b8a3a7 100644
--- a/esp/src/src-react/components/forms/ZAPDialog.tsx
+++ b/esp/src/src-react/components/forms/ZAPDialog.tsx
@@ -194,11 +194,12 @@ export const ZAPDialog: React.FunctionComponent<ZAPDialogProps> = ({
                 }
                 for (const key in logFilter) {
                     if (key === "AbsoluteTimeRange") {
-                        const startDate = logFilter.AbsoluteTimeRange.StartDate ? new Date(logFilter.AbsoluteTimeRange.StartDate).toISOString() : "";
-                        const endDate = logFilter.AbsoluteTimeRange.EndDate ? new Date(logFilter.AbsoluteTimeRange.EndDate).toISOString() : "";
-                        if (startDate && endDate) {
-                            formData.append("LogFilter_AbsoluteTimeRange_StartDate", startDate);
-                            formData.append("LogFilter_AbsoluteTimeRange_EndDate", endDate);
+                        const startDate = logFilter.AbsoluteTimeRange.StartDate ? new Date(logFilter.AbsoluteTimeRange.StartDate) : null;
+                        let endDate = logFilter.AbsoluteTimeRange.EndDate ? new Date(logFilter.AbsoluteTimeRange.EndDate) : null;
+                        if (startDate) {
+                            endDate = endDate === null ? new Date(startDate.getTime() + (8 * 3600 * 1000)) : endDate;
+                            formData.append("LogFilter_AbsoluteTimeRange_StartDate", startDate.toISOString());
+                            formData.append("LogFilter_AbsoluteTimeRange_EndDate", endDate.toISOString());
                             delete logFilter.RelativeTimeRangeBuffer;
                         }
                     } else {