diff --git a/portal-ui/src/screens/Console/Logs/ErrorLogs/ErrorLogs.tsx b/portal-ui/src/screens/Console/Logs/ErrorLogs/ErrorLogs.tsx index 852261a26..f3b4070e9 100644 --- a/portal-ui/src/screens/Console/Logs/ErrorLogs/ErrorLogs.tsx +++ b/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); diff --git a/portal-ui/src/screens/Console/Logs/ErrorLogs/LogLine.tsx b/portal-ui/src/screens/Console/Logs/ErrorLogs/LogLine.tsx index a0fe243d6..db2a1e400 100644 --- a/portal-ui/src/screens/Console/Logs/ErrorLogs/LogLine.tsx +++ b/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 (
@@ -85,7 +93,7 @@ const messageForError = (log: LogMessage) => {
Time:  - {getLogEntryKey("time").toString()} + {logTime.toFormat(timestampDisplayFmt)}
DeploymentID:  @@ -157,18 +165,23 @@ const LogLine = (props: { log: LogMessage }) => { titleLogMessage = (titleLogMessage || "").replace(tColorRegex, ""); - const logTime = DateTime.fromJSDate(log.time); - - let dateStr = ( - {logTime.toFormat("yyyy/MM/dd HH:mm:ss (ZZZZ)")} + const logTime = DateTime.fromFormat( + log.time.toString(), + "HH:mm:ss z MM/dd/yyyy", + { + zone: "UTC", + } ); + const dateOfLine = logTime.toJSDate(); //DateTime.fromJSDate(log.time); - if (log.time.getFullYear() === 1) { + let dateStr = {logTime.toFormat(timestampDisplayFmt)}; + + if (dateOfLine.getFullYear() === 1) { dateStr = n/a; } return ( - + *": { borderBottom: "unset" }, @@ -180,17 +193,21 @@ const LogLine = (props: { log: LogMessage }) => { > setOpen(!open)} - style={{ width: 200, color: "#989898", fontSize: 12 }} + style={{ width: 280, color: "#989898", fontSize: 12 }} > - {dateStr} +
{dateStr}
) => { 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) {