Merge pull request #19216 from jeclrsg/hpcc-32835-zap-report-default-…

…relative-time HPCC-32835 ECL Watch v9 ZAP dialog default relative time
hpcc-systems · Oct 24, 2024 · b7e5c4f · b7e5c4f
2 parents 4a7afe3 + b8a7e92
commit b7e5c4f
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/esp/src/src-react/components/forms/ZAPDialog.tsx b/esp/src/src-react/components/forms/ZAPDialog.tsx
@@ -103,7 +103,7 @@ const defaultValues: ZAPDialogValues = {
             StartDate: "",
             EndDate: "",
         },
-        RelativeTimeRangeBuffer: "",
+        RelativeTimeRangeBuffer: "43200",
         LineLimit: "10000",
         LineStartFrom: "0",
         SelectColumnMode: ColumnMode.DEFAULT,
@@ -196,8 +196,11 @@ export const ZAPDialog: React.FunctionComponent<ZAPDialogProps> = ({
                     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() : "";
-                        formData.append("LogFilter_AbsoluteTimeRange_StartDate", startDate);
-                        formData.append("LogFilter_AbsoluteTimeRange_EndDate", endDate);
+                        if (startDate && endDate) {
+                            formData.append("LogFilter_AbsoluteTimeRange_StartDate", startDate);
+                            formData.append("LogFilter_AbsoluteTimeRange_EndDate", endDate);
+                            delete logFilter.RelativeTimeRangeBuffer;
+                        }
                     } else {
                         formData.append(`LogFilter_${key}`, logFilter[key]);
                     }