CEC-3577 Style tweak (#284)
This commit is contained in:
@@ -19,7 +19,7 @@ const MainForm = () => {
|
||||
|
||||
return (
|
||||
<div className={clsx(classes.paper, classes.tableSize)}>
|
||||
<Typography variant="h6" className={classes.labelInline}>
|
||||
<Typography variant="h6">
|
||||
T.Rex Logs
|
||||
</Typography>
|
||||
<TRexLogsTable vin={vin} token={token} classes={classes} />
|
||||
|
||||
@@ -1,47 +1,23 @@
|
||||
import React, { useEffect, useState } from "react";
|
||||
|
||||
import api from "../../../services/vehiclesAPI";
|
||||
import {
|
||||
Table,
|
||||
TableBody,
|
||||
TableCell,
|
||||
TableFooter,
|
||||
TablePagination,
|
||||
TableRow,
|
||||
TableRow
|
||||
} from "@material-ui/core";
|
||||
import {
|
||||
MuiPickersUtilsProvider,
|
||||
KeyboardDatePicker,
|
||||
KeyboardDatePicker, MuiPickersUtilsProvider
|
||||
} from '@material-ui/pickers';
|
||||
import clsx from "clsx";
|
||||
import api from "../../../services/vehiclesAPI";
|
||||
|
||||
import { useStatusContext } from "../../Contexts/StatusContext";
|
||||
import { logger } from "../../../services/monitoring";
|
||||
import { TableHead } from "@mui/material";
|
||||
import DateFnsUtils from '@date-io/date-fns';
|
||||
|
||||
const transformLogs = (logs) =>
|
||||
logs.map((log) => {
|
||||
const { level, timestamp, received_timestamp, line_number, filename, msg } = log;
|
||||
//const trex_time = new Date(timestamp)
|
||||
//const cloud_time = new Date(received_timestamp)
|
||||
return {
|
||||
level: level,
|
||||
trex_timestamp: timestamp,
|
||||
cloud_timestamp: received_timestamp,
|
||||
line_number: line_number,
|
||||
filename: filename,
|
||||
msg: msg
|
||||
};
|
||||
})
|
||||
.flat()
|
||||
|
||||
const fromatDateForRequest = (date) => {
|
||||
const getYear = date.toLocaleString("default", { year: "numeric" });
|
||||
const getMonth = date.toLocaleString("default", { month: "2-digit" });
|
||||
const getDay = date.toLocaleString("default", { day: "2-digit" });
|
||||
return getYear + "-" + getMonth + "-" + getDay
|
||||
};
|
||||
import { TableHead } from "@mui/material";
|
||||
import { logger } from "../../../services/monitoring";
|
||||
import { useStatusContext } from "../../Contexts/StatusContext";
|
||||
|
||||
const tableColumns = [
|
||||
{
|
||||
@@ -75,9 +51,34 @@ const tableColumns = [
|
||||
width: "60%",
|
||||
},
|
||||
];
|
||||
|
||||
const transformLogs = (logs) =>
|
||||
logs.map((log) => {
|
||||
const { level, timestamp, received_timestamp, line_number, filename, msg } = log;
|
||||
//const trex_time = new Date(timestamp)
|
||||
//const cloud_time = new Date(received_timestamp)
|
||||
return {
|
||||
level: level,
|
||||
trex_timestamp: timestamp,
|
||||
cloud_timestamp: received_timestamp,
|
||||
line_number: line_number,
|
||||
filename: filename,
|
||||
msg: msg
|
||||
};
|
||||
})
|
||||
.flat()
|
||||
|
||||
const fromatDateForRequest = (date) => {
|
||||
const getYear = date.toLocaleString("default", { year: "numeric" });
|
||||
const getMonth = date.toLocaleString("default", { month: "2-digit" });
|
||||
const getDay = date.toLocaleString("default", { day: "2-digit" });
|
||||
return getYear + "-" + getMonth + "-" + getDay
|
||||
};
|
||||
|
||||
//read at least 30000 bytes per one API request
|
||||
const ONE_READ_SIZE = 30000
|
||||
const DEFAULT_PAGE_SIZE = 25
|
||||
|
||||
const TRexLogsTable = ({ vin, token, classes }) => {
|
||||
const [allLogsFetched, setAllLogsFetched] = useState(false)
|
||||
const [blobSize, setBlobSize] = useState(0)
|
||||
@@ -134,7 +135,7 @@ const TRexLogsTable = ({ vin, token, classes }) => {
|
||||
return
|
||||
}
|
||||
setTotal(0)
|
||||
const msg = `Can not fetch logs for ${fromatDateForRequest(selectedDate)}`
|
||||
const msg = `Cannot fetch logs for ${fromatDateForRequest(selectedDate)}`
|
||||
setMessage(msg)
|
||||
console.log(`${msg}, Cloud error:\n${fetched.error}`);
|
||||
return
|
||||
@@ -188,7 +189,7 @@ const TRexLogsTable = ({ vin, token, classes }) => {
|
||||
style={{ tableLayout: "fixed", minWidth: "1400px" }}
|
||||
>
|
||||
<TableRow>
|
||||
<TableCell>
|
||||
<TableCell align="center">
|
||||
<MuiPickersUtilsProvider utils={DateFnsUtils}>
|
||||
<KeyboardDatePicker
|
||||
disableToolbar
|
||||
@@ -205,7 +206,7 @@ const TRexLogsTable = ({ vin, token, classes }) => {
|
||||
/>
|
||||
</MuiPickersUtilsProvider>
|
||||
</TableCell>
|
||||
<TableCell align="left">
|
||||
<TableCell align="center">
|
||||
{getReadPercentage()}
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
@@ -213,13 +214,12 @@ const TRexLogsTable = ({ vin, token, classes }) => {
|
||||
<Table
|
||||
style={{ tableLayout: "fixed", minWidth: "1400px" }}
|
||||
>
|
||||
<TableHead
|
||||
classes={classes}>
|
||||
|
||||
<TableHead classes={classes}>
|
||||
<TableRow>
|
||||
{tableColumns.map((column) => (
|
||||
<TableCell style={{ width: column.width }} align="center" key={column.label || "none"}>{column.label}</TableCell>
|
||||
))} </TableRow>
|
||||
<TableCell style={{ width: column.width }} align="center" key={column.label || "none"} className={classes.tableHeader} >{column.label}</TableCell>
|
||||
))}
|
||||
</TableRow>
|
||||
</TableHead >
|
||||
<TableBody>
|
||||
{logs.slice(-getDesiredSize(), (pageIndex === 0 ? undefined : -(pageSize * pageIndex))).map((log, i) => (
|
||||
|
||||
@@ -285,6 +285,10 @@ const useStyles = makeStyles((theme) => ({
|
||||
color: "blue",
|
||||
textDecoration: "underline",
|
||||
},
|
||||
tableHeader: {
|
||||
textDecorationStyle: "solid",
|
||||
fontWeight:500,
|
||||
}
|
||||
}));
|
||||
|
||||
export default useStyles;
|
||||
|
||||
Reference in New Issue
Block a user