fix luxon time parsing format to fix the invalid time in the logs screen (#2691)

portal-ui/src/screens/Console/Logs/ErrorLogs/ErrorLogs.tsx

@@ -21,7 +21,6 @@ import createStyles from "@mui/styles/createStyles";
 import withStyles from "@mui/styles/withStyles";
 import { useSelector } from "react-redux";
 import { FormControl, Grid, InputBase, MenuItem, Select } from "@mui/material";
-import { DateTime } from "luxon";
 
 import { ErrorResponseHandler } from "../../../../../src/common/types";
 import api from "../../../../../src/common/api";
@@ -155,12 +154,6 @@ const ErrorLogs = () => {
           isValidEntry = false;
         }
 
-        const logTime = DateTime.fromFormat(
-          m.time,
-          "HH:mm:ss UTC MM/dd/yyyy"
-        ).toJSDate();
-
-        m.time = logTime;
         m.key = Math.random();
         if (userAgents.indexOf(m.userAgent) < 0 && m.userAgent !== undefined) {
           userAgents.push(m.userAgent);

portal-ui/src/screens/Console/Logs/ErrorLogs/LogLine.tsx

@@ -25,6 +25,7 @@ import { BoxArrowDown, BoxArrowUp, WarnFilledIcon } from "mds";
 
 import getByKey from "lodash/get";
 
+const timestampDisplayFmt = "HH:mm:ss ZZZZ MM/dd/yyyy"; //make this same as server logs format.
 const messageForConsoleMsg = (log: LogMessage) => {
   // regex for terminal colors like e.g. `[31;4m `
   const tColorRegex = /((\[[0-9;]+m))/g;
@@ -77,6 +78,13 @@ const messageForError = (log: LogMessage) => {
     return getByKey(log, keyPath, "");
   };
 
+  const logTime = DateTime.fromFormat(
+    log.time.toString(),
+    "HH:mm:ss z MM/dd/yyyy",
+    {
+      zone: "UTC",
+    }
+  );
   return (
     <Fragment>
       <div>
@@ -85,7 +93,7 @@ const messageForError = (log: LogMessage) => {
       </div>
       <div>
         <b style={labelStyle}>Time:&nbsp;</b>
-        <span style={dataStyle}>{getLogEntryKey("time").toString()}</span>
+        <span style={dataStyle}>{logTime.toFormat(timestampDisplayFmt)}</span>
       </div>
       <div>
         <b style={labelStyle}>DeploymentID:&nbsp;</b>
@@ -157,18 +165,23 @@ const LogLine = (props: { log: LogMessage }) => {
 
   titleLogMessage = (titleLogMessage || "").replace(tColorRegex, "");
 
-  const logTime = DateTime.fromJSDate(log.time);
+  const logTime = DateTime.fromFormat(
-
+    log.time.toString(),
-  let dateStr = (
+    "HH:mm:ss z MM/dd/yyyy",
-    <Fragment>{logTime.toFormat("yyyy/MM/dd HH:mm:ss (ZZZZ)")}</Fragment>
+    {
+      zone: "UTC",
+    }
   );
+  const dateOfLine = logTime.toJSDate(); //DateTime.fromJSDate(log.time);
 
-  if (log.time.getFullYear() === 1) {
+  let dateStr = <Fragment>{logTime.toFormat(timestampDisplayFmt)}</Fragment>;
+
+  if (dateOfLine.getFullYear() === 1) {
     dateStr = <Fragment>n/a</Fragment>;
   }
 
   return (
-    <React.Fragment key={log.time.toString()}>
+    <React.Fragment key={logTime.toString()}>
       <TableRow
         sx={{
           "& > *": { borderBottom: "unset" },
@@ -180,17 +193,21 @@ const LogLine = (props: { log: LogMessage }) => {
       >
         <TableCell
           onClick={() => setOpen(!open)}
-          style={{ width: 200, color: "#989898", fontSize: 12 }}
+          style={{ width: 280, color: "#989898", fontSize: 12 }}
         >
           <Box
             sx={{
+              display: "flex",
+              gap: 1,
+              alignItems: "center",
+
               "& .min-icon": { width: 12, marginRight: 1 },
               fontWeight: "bold",
               lineHeight: 1,
             }}
           >
             <WarnFilledIcon />
-            {dateStr}
+            <div>{dateStr}</div>
           </Box>
         </TableCell>
         <TableCell

portal-ui/src/screens/Console/Logs/logsSlice.ts

@@ -16,6 +16,7 @@
 
 import { createSlice, PayloadAction } from "@reduxjs/toolkit";
 import { LogMessage } from "./types";
+import { DateTime } from "luxon";
 
 export interface LogState {
   logMessages: LogMessage[];
@@ -33,10 +34,17 @@ export const logsSlice = createSlice({
   reducers: {
     logMessageReceived: (state, action: PayloadAction<LogMessage>) => {
       let msgs = state.logMessages;
+      const logTime = DateTime.fromFormat(
+        action.payload.time.toString(),
+        "HH:mm:ss z MM/dd/yyyy",
+        {
+          zone: "UTC",
+        }
+      ).toJSDate();
 
       if (
         msgs.length > 0 &&
-        action.payload.time.getFullYear() === 1 &&
+        logTime.getFullYear() === 1 &&
         action.payload.ConsoleMsg !== ""
       ) {
         for (let m in msgs) {