Merge branch 'release/0.9.0'

This commit is contained in:
jwu-fisker
2023-05-04 16:30:00 -07:00
36 changed files with 1378 additions and 613 deletions

View File

@@ -4,7 +4,8 @@ import {
TableCell,
TableFooter,
TablePagination,
TableRow
TableRow,
Tooltip
} from "@material-ui/core";
import clsx from "clsx";
import React, { useEffect, useState } from "react";
@@ -136,7 +137,13 @@ const CarECUsTable = ({ vin, token, classes }) => {
{tableColumns.map((column, j) => {
const key = `${row.ecu + i}${column.id}`
if (column.id === "updated_at") return (<TableCell key={key} align="center">{LocalDateTimeString(row.updated)}</TableCell>);
return (<TableCell key={key} align="center">{row[column.id]}</TableCell>);
return (
<TableCell key={key} align="center" className={classes.limitWidthTableCell}>
<Tooltip title={`${row[column.id] || 'none'}`}>
<span>{row[column.id]}</span>
</Tooltip>
</TableCell>
);
})}
</TableRow>
))}

View File

@@ -1,5 +1,6 @@
const Statuses = {
Pending: "pending",
Sent: "sent",
ManifestReceived: "manifest_received",
ManifestAccepted: "manifest_accepted",
ManifestRejected: "manifest_rejected",

View File

@@ -1,7 +1,7 @@
import React, { useState, useEffect } from "react";
import { CheckCircle, RadioButtonUnchecked, Error } from "@material-ui/icons";
import Typography from "@material-ui/core/Typography";
import { CheckCircle, Error, RadioButtonUnchecked } from "@material-ui/icons";
import clsx from "clsx";
import React, { useEffect, useState } from "react";
import CircularProgress from "../CircularProgress";
import s from "./Statuses";
@@ -13,7 +13,7 @@ const CompleteStatus = 100;
const PHASES = [
{
label: "Pending",
events: [s.Pending],
events: [s.Pending, s.Sent],
progress: () => CompleteStatus,
},
{

View File

@@ -213,11 +213,11 @@ const MainForm = ({ vin, token }) => {
<TableFooter>
<TableRow>
{totalCarUpdates === 0 ? (
<TableCell colSpan={7} align="center">No Car Updates</TableCell>
<TableCell colSpan={8} align="center">No Car Updates</TableCell>
) : (
<TablePagination
rowsPerPageOptions={[5, 10, 25, 100]}
colSpan={7}
colSpan={8}
count={totalCarUpdates}
rowsPerPage={pageSize}
page={pageIndex}