From 6ca17a3f9c578808cecc9242a88d838f5b2efab8 Mon Sep 17 00:00:00 2001
From: Prakash Senthil Vel <23444145+prakashsvmx@users.noreply.github.com>
Date: Fri, 18 Mar 2022 05:19:45 +0000
Subject: [PATCH] Log text color styles and empty state (#1733)

Log text color styles and empty state
---
 .../Console/Logs/ErrorLogs/ErrorLogs.tsx      |  49 ++++---
 .../Console/Logs/ErrorLogs/LogLine.tsx        | 126 +++++++++++-------
 portal-ui/tests/utils/elements.ts             |   2 +-
 3 files changed, 113 insertions(+), 64 deletions(-)

diff --git a/portal-ui/src/screens/Console/Logs/ErrorLogs/ErrorLogs.tsx b/portal-ui/src/screens/Console/Logs/ErrorLogs/ErrorLogs.tsx
index 1a8400feb..c0e31a6b9 100644
--- a/portal-ui/src/screens/Console/Logs/ErrorLogs/ErrorLogs.tsx
+++ b/portal-ui/src/screens/Console/Logs/ErrorLogs/ErrorLogs.tsx
@@ -19,7 +19,7 @@ import { Theme } from "@mui/material/styles";
 import createStyles from "@mui/styles/createStyles";
 import withStyles from "@mui/styles/withStyles";
 import { connect } from "react-redux";
-import { Grid } from "@mui/material";
+import { Box, Grid } from "@mui/material";
 import moment from "moment/moment";
 import { AppState } from "../../../../store";
 import { logMessageReceived, logResetMessages } from "../actions";
@@ -45,10 +45,9 @@ const styles = (theme: Theme) =>
     logList: {
       background: "#fff",
       minHeight: 400,
-      height: "calc(100vh - 280px)",
+      height: "calc(100vh - 200px)",
       overflow: "auto",
       fontSize: 13,
-      border: "1px solid #EAEDEE",
       borderRadius: 4,
     },
     tab: {
@@ -171,18 +170,38 @@ const ErrorLogs = ({
               value={filter}
             />
           </Grid>
-          <Grid item xs={12}>
-            <div id="logs-container" className={classes.logList}>
-              <TableContainer component={Paper}>
-                <Table aria-label="collapsible table">
-                  <TableBody>
-                    {filteredMessages.map((m) => {
-                      return <LogLine log={m} />;
-                    })}
-                  </TableBody>
-                </Table>
-              </TableContainer>
-            </div>
+          <Grid item xs={12} data-test-id={"logs-list-container"}>
+            {filteredMessages.length ? (
+              <div id="logs-container" className={classes.logList}>
+                <TableContainer
+                  component={Paper}
+                  sx={{
+                    borderBottom: "0px",
+                  }}
+                >
+                  <Table aria-label="collapsible table">
+                    <TableBody>
+                      {filteredMessages.map((m) => {
+                        return <LogLine key={m.key} log={m} />;
+                      })}
+                    </TableBody>
+                  </Table>
+                </TableContainer>
+              </div>
+            ) : (
+              <Box
+                sx={{
+                  padding: "15px",
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center",
+                }}
+              >
+                {filter.trim().length
+                  ? `No matching logs for "${filter.trim()}".`
+                  : "No logs to display."}
+              </Box>
+            )}
           </Grid>
         </Grid>
       </PageLayout>
diff --git a/portal-ui/src/screens/Console/Logs/ErrorLogs/LogLine.tsx b/portal-ui/src/screens/Console/Logs/ErrorLogs/LogLine.tsx
index 0168e5b9d..266f9d2f7 100644
--- a/portal-ui/src/screens/Console/Logs/ErrorLogs/LogLine.tsx
+++ b/portal-ui/src/screens/Console/Logs/ErrorLogs/LogLine.tsx
@@ -62,46 +62,55 @@ const messageForConsoleMsg = (log: LogMessage) => {
   );
 };
 const messageForError = (log: LogMessage) => {
-  const dataStyle = { color: "green" };
+  const dataStyle = {
+    color: "#C83B51",
+    fontWeight: 400,
+    fontFamily: "monospace",
+    fontSize: "12px",
+  };
+  const labelStyle = {
+    fontFamily: "monospace",
+    fontSize: "12px",
+  };
   return (
     <Fragment>
       <div>
-        <b>API:&nbsp;</b>
+        <b style={labelStyle}>API:&nbsp;</b>
         <span style={dataStyle}>{log.api.name}</span>
       </div>
       <div>
-        <b>Time:&nbsp;</b>
+        <b style={labelStyle}>Time:&nbsp;</b>
         <span style={dataStyle}>{log.time.toString()}</span>
       </div>
       <div>
-        <b>DeploymentID:&nbsp;</b>
+        <b style={labelStyle}>DeploymentID:&nbsp;</b>
         <span style={dataStyle}>{log.deploymentid}</span>
       </div>
       <div>
-        <b>RequestID:&nbsp;</b>
+        <b style={labelStyle}>RequestID:&nbsp;</b>
         <span style={dataStyle}>{log.requestID}</span>
       </div>
       <div>
-        <b>RemoteHost:&nbsp;</b>
+        <b style={labelStyle}>RemoteHost:&nbsp;</b>
         <span style={dataStyle}>{log.remotehost}</span>
       </div>
       <div>
-        <b>UserAgent:&nbsp;</b>
+        <b style={labelStyle}>UserAgent:&nbsp;</b>
         <span style={dataStyle}>{log.userAgent}</span>
       </div>
       <div>
-        <b>Error:&nbsp;</b>
+        <b style={labelStyle}>Error:&nbsp;</b>
         <span style={dataStyle}>{log.error && log.error.message}</span>
       </div>
       <br />
       <div>
-        <b>Backtrace:&nbsp;</b>
+        <b style={labelStyle}>Backtrace:&nbsp;</b>
       </div>
       {log.error &&
         log.error.source.map((e, i) => {
           return (
             <div>
-              <b>{i}:&nbsp;</b>
+              <b style={labelStyle}>{i}:&nbsp;</b>
               <span style={dataStyle}>{e}</span>
             </div>
           );
@@ -145,7 +154,12 @@ const LogLine = (props: { log: LogMessage }) => {
   return (
     <React.Fragment key={log.time.toString()}>
       <TableRow
-        sx={{ "& > *": { borderBottom: "unset" }, cursor: "pointer" }}
+        sx={{
+          "& > *": { borderBottom: "unset" },
+          cursor: "pointer",
+          borderLeft: "0",
+          borderRight: "0",
+        }}
         style={{ backgroundColor: "#FDFDFD" }}
       >
         <TableCell
@@ -186,45 +200,61 @@ const LogLine = (props: { log: LogMessage }) => {
           </div>
         </TableCell>
         <TableCell onClick={() => setOpen(!open)} style={{ width: 40 }}>
-          {open ? <BoxArrowUp /> : <BoxArrowDown />}
+          <Box
+            sx={{
+              "& .min-icon": {
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+                borderRadius: "2px",
+              },
+              "&:hover .min-icon": {
+                fill: "#eaeaea",
+              },
+            }}
+          >
+            {open ? <BoxArrowUp /> : <BoxArrowDown />}
+          </Box>
         </TableCell>
       </TableRow>
-      <TableRow>
-        <TableCell
-          style={{
-            paddingBottom: 0,
-            paddingTop: 0,
-            width: 200,
-            textTransform: "uppercase",
-            verticalAlign: "top",
-            textAlign: "right",
-            color: "#8399AB",
-            fontWeight: "bold",
-          }}
-        >
-          <Collapse in={open} timeout="auto" unmountOnExit>
-            <div style={{ marginTop: 10 }}>Log Details</div>
-          </Collapse>
-        </TableCell>
-        <TableCell style={{ paddingBottom: 0, paddingTop: 0 }}>
-          <Collapse in={open} timeout="auto" unmountOnExit>
-            <Box sx={{ margin: 1 }}>
-              <Typography
-                style={{
-                  background: "#efefef",
-                  border: "1px solid #dedede",
-                  padding: 4,
-                  fontSize: 14,
-                  color: "#666666",
-                }}
-              >
-                {fullMessage}
-              </Typography>
-            </Box>
-          </Collapse>
-        </TableCell>
-        <TableCell style={{ paddingBottom: 0, paddingTop: 0, width: 40 }} />
-      </TableRow>
+      {open ? (
+        <TableRow>
+          <TableCell
+            style={{
+              paddingBottom: 0,
+              paddingTop: 0,
+              width: 200,
+              textTransform: "uppercase",
+              verticalAlign: "top",
+              textAlign: "right",
+              color: "#8399AB",
+              fontWeight: "bold",
+            }}
+          >
+            <Collapse in={open} timeout="auto" unmountOnExit>
+              <div style={{ marginTop: 10 }}>Log Details</div>
+            </Collapse>
+          </TableCell>
+          <TableCell style={{ paddingBottom: 0, paddingTop: 0 }}>
+            <Collapse in={open} timeout="auto" unmountOnExit>
+              <Box sx={{ margin: 1 }}>
+                <Typography
+                  style={{
+                    background: "#efefef",
+                    border: "1px solid #dedede",
+                    padding: 4,
+                    fontSize: 14,
+                    color: "#666666",
+                  }}
+                >
+                  {fullMessage}
+                </Typography>
+              </Box>
+            </Collapse>
+          </TableCell>
+          <TableCell style={{ paddingBottom: 0, paddingTop: 0, width: 40 }} />
+        </TableRow>
+      ) : null}
     </React.Fragment>
   );
 };
diff --git a/portal-ui/tests/utils/elements.ts b/portal-ui/tests/utils/elements.ts
index 4bc012a1b..5e6c3a1c2 100644
--- a/portal-ui/tests/utils/elements.ts
+++ b/portal-ui/tests/utils/elements.ts
@@ -206,4 +206,4 @@ export const settingsAuditWebhookTab = Selector(".MuiTab-root").withAttribute(
 //----------------------------------------------------
 // Log window
 //----------------------------------------------------
-export const logWindow = Selector("#logs-container");
+export const logWindow = Selector('[data-test-id="logs-list-container"]');