diff --git a/portal-ui/package.json b/portal-ui/package.json index 424e2e1833..8011b06718 100644 --- a/portal-ui/package.json +++ b/portal-ui/package.json @@ -17,7 +17,7 @@ "local-storage-fallback": "^4.1.1", "lodash": "^4.17.21", "luxon": "^3.4.3", - "mds": "https://github.com/minio/mds.git#v0.11.0", + "mds": "https://github.com/minio/mds.git#v0.11.1", "react": "^18.1.0", "react-component-export-image": "^1.0.6", "react-copy-to-clipboard": "^5.0.2", diff --git a/portal-ui/src/screens/Console/Logs/ErrorLogs/ErrorLogs.tsx b/portal-ui/src/screens/Console/Logs/ErrorLogs/ErrorLogs.tsx index 39f680b652..87df7c9c82 100644 --- a/portal-ui/src/screens/Console/Logs/ErrorLogs/ErrorLogs.tsx +++ b/portal-ui/src/screens/Console/Logs/ErrorLogs/ErrorLogs.tsx @@ -16,7 +16,7 @@ import React, { Fragment, useEffect, useState } from "react"; import { IMessageEvent, w3cwebsocket as W3CWebSocket } from "websocket"; -import { Box, Button, Grid, PageLayout, Select } from "mds"; +import { Box, Button, Grid, PageLayout, Select, Table, TableBody } from "mds"; import { useSelector } from "react-redux"; import { ErrorResponseHandler } from "../../../../common/types"; import { AppState, useAppDispatch } from "../../../../store"; @@ -29,10 +29,6 @@ import { import { setHelpName } from "../../../../systemSlice"; import SearchBox from "../../Common/SearchBox"; import api from "../../../../../src/common/api"; -import Paper from "@mui/material/Paper"; -import Table from "@mui/material/Table"; -import TableBody from "@mui/material/TableBody"; -import TableContainer from "@mui/material/TableContainer"; import LogLine from "./LogLine"; import PageHeaderWrapper from "../../Common/PageHeaderWrapper/PageHeaderWrapper"; import HelpMenu from "../../HelpMenu"; @@ -304,7 +300,7 @@ const ErrorLogs = () => { borderRadius: 4, }} > - + {filteredMessages.map((m) => { @@ -313,11 +309,11 @@ const ErrorLogs = () => {
{filteredMessages.length === 0 && ( -
+ No logs to display -
+
)} -
+ diff --git a/portal-ui/src/screens/Console/Logs/ErrorLogs/LogLine.tsx b/portal-ui/src/screens/Console/Logs/ErrorLogs/LogLine.tsx index a5037de0a4..a09d48796d 100644 --- a/portal-ui/src/screens/Console/Logs/ErrorLogs/LogLine.tsx +++ b/portal-ui/src/screens/Console/Logs/ErrorLogs/LogLine.tsx @@ -15,12 +15,15 @@ // along with this program. If not, see . import React, { Fragment, useState } from "react"; import { DateTime } from "luxon"; -import TableRow from "@mui/material/TableRow"; -import TableCell from "@mui/material/TableCell"; -import Collapse from "@mui/material/Collapse"; -import Typography from "@mui/material/Typography"; import { LogMessage } from "../types"; -import { Box, BoxArrowDown, BoxArrowUp, WarnFilledIcon } from "mds"; +import { + Box, + BoxArrowDown, + BoxArrowUp, + TableCell, + TableRow, + WarnFilledIcon, +} from "mds"; import getByKey from "lodash/get"; @@ -183,16 +186,14 @@ const LogLine = (props: { log: LogMessage }) => { *": { borderBottom: "unset" }, cursor: "pointer", borderLeft: "0", borderRight: "0", }} - style={{ backgroundColor: "#FDFDFD" }} > setOpen(!open)} - style={{ width: 280, color: "#989898", fontSize: 12 }} + sx={{ width: 280, color: "#989898", fontSize: 12 }} > { setOpen(!open)} - style={{ width: 200, color: "#989898", fontSize: 12 }} + sx={{ width: 200, color: "#989898", fontSize: 12 }} > { setOpen(!open)}> -
{ paddingRight: 10, }} > -
{ }} > {titleLogMessage} -
-
+ +
- setOpen(!open)} style={{ width: 40 }}> + setOpen(!open)} sx={{ width: 40 }}> { {open ? ( { fontWeight: "bold", }} > - -
Log Details
-
+ Log Details
- - - - - {fullMessage} - - - + + + {fullMessage} + - +
) : null}
diff --git a/portal-ui/yarn.lock b/portal-ui/yarn.lock index 4c4659987c..d419b25d4e 100644 --- a/portal-ui/yarn.lock +++ b/portal-ui/yarn.lock @@ -8412,9 +8412,9 @@ mdn-data@2.0.4: resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA== -"mds@https://github.com/minio/mds.git#v0.11.0": - version "0.11.0" - resolved "https://github.com/minio/mds.git#f8f53f26977ee21d6de5c11915f34fb12a2a01ab" +"mds@https://github.com/minio/mds.git#v0.11.1": + version "0.11.1" + resolved "https://github.com/minio/mds.git#63d4712c8e23aea76f93fec86d332f80ccba8207" dependencies: "@types/styled-components" "^5.1.28" "@uiw/react-textarea-code-editor" "^2.1.9"