HPCC-32857 ECL Watch v9 Logs grid timestamp formatter

fixes an issue with the ECL Watch v9 Logs viewer potentially having an uncaught JS exception if the logging engine is misconfigured and the value provided as the "timestamp" for a log message cannot be converted to a valid date Signed-off-by: Jeremy Clements <[email protected]>
hpcc-systems · Oct 23, 2024 · 45afe23 · 45afe23
1 parent 4a7afe3
commit 45afe23
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/esp/src/src-react/components/Logs.tsx b/esp/src/src-react/components/Logs.tsx
@@ -137,7 +137,11 @@ export const Logs: React.FunctionComponent<LogsProps> = ({
                 formatter: ts => {
                     if (ts) {
                         if (ts.indexOf(":") < 0) {
-                            return timestampToDate(ts).toISOString();
+                            const date = timestampToDate(ts);
+                            if (date.toString() !== "Invalid Date") {
+                                return date.toISOString();
+                            }
+                            return ts;
                         }
                         return formatDateString(ts);
                     }