CEC-5672 - UI for adding SUMS versions

This commit is contained in:
padamsen_fisker
2024-01-30 16:57:19 -05:00
parent c72ea839b4
commit 6bd5bd1c39
21 changed files with 1366 additions and 60 deletions

View File

@@ -30,9 +30,17 @@ const MainForm = () => {
useEffect(() => {
setTitle(`Add RXSWIN to SUMS Version ${sums_version}`);
setSitePath([
{
label: "Tools",
link: "/tools/sumsversions",
},
{
label: "SUMS Versions",
link: "/tools/sumsversions",
},
{
label: `SUMS Version ${sums_version}`,
link: `/sums/${sums_version}`,
link: `/tools/sums/${sums_version}`,
},
{
label: `Add RXSWIN`,
@@ -62,7 +70,7 @@ const MainForm = () => {
if (!result || result.error) return;
setMessage(`Added ${rxswin}`);
setRedirect(`/sums/${sums_version}`);
setRedirect(`/tools/sums/${sums_version}`);
} catch (e) {
setMessage(e.message);
logger.warn(e.stack);

View File

@@ -18,8 +18,8 @@ const renderSUMSAdd = async () => {
<CarUpdatesProvider>
<StatusProvider>
<UserProvider>
<MemoryRouter initialEntries={["/sums/add-rxswin/2023.03.00.00.E"]}>
<Route path="/sums/add-rxswin/:sums_version">
<MemoryRouter initialEntries={["/tools/sums-rxswin-add/2023.03.00.00.E"]}>
<Route path="/tools/sums-rxswin-add/:sums_version">
<MainForm sums_version="2023.03.00.00.E" />
</Route>
</MemoryRouter>

View File

@@ -0,0 +1,175 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`SUMSList Render 1`] = `
<div>
<div
data-testid="mocked-carupdatesprovider"
>
<div
data-testid="mocked-statusprovider"
>
<div
data-testid="mocked-userprovider"
>
<div
data-testid="mocked-carupdatesprovider"
>
<div>
<div
class="MuiGrid-root makeStyles-root-0 MuiGrid-container MuiGrid-spacing-xs-2"
>
<div
class="MuiGrid-root makeStyles-textJustifyAlign-0 makeStyles-actionsBar-0 MuiGrid-item MuiGrid-grid-md-4"
>
<a
class="makeStyles-labelInline-0"
href="/tools/sums/new"
>
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiSvgIcon-fontSizeLarge"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm5 11h-4v4h-2v-4H7v-2h4V7h2v4h4v2z"
/>
</svg>
</a>
</div>
</div>
<table
class="MuiTable-root"
>
<thead
class="MuiTableHead-root"
>
<tr
class="MuiTableRow-root MuiTableRow-head"
>
<th
class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignCenter"
scope="col"
>
<span
aria-disabled="false"
class="MuiButtonBase-root MuiTableSortLabel-root"
role="button"
tabindex="0"
>
SUMS Version
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiTableSortLabel-icon MuiTableSortLabel-iconDirectionAsc"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z"
/>
</svg>
</span>
</th>
<th
class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignCenter"
scope="col"
>
<span
aria-disabled="false"
class="MuiButtonBase-root MuiTableSortLabel-root"
role="button"
tabindex="0"
>
OS Version
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiTableSortLabel-icon MuiTableSortLabel-iconDirectionAsc"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z"
/>
</svg>
</span>
</th>
<th
aria-sort="descending"
class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignCenter"
scope="col"
>
<span
aria-disabled="false"
class="MuiButtonBase-root MuiTableSortLabel-root MuiTableSortLabel-active"
role="button"
tabindex="0"
>
Created
<span
class="makeStyles-hiddenSortSpan-0"
>
sorted descending
</span>
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiTableSortLabel-icon MuiTableSortLabel-iconDirectionDesc"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z"
/>
</svg>
</span>
</th>
<th
class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignCenter"
scope="col"
>
<span
aria-disabled="false"
class="MuiButtonBase-root MuiTableSortLabel-root"
role="button"
tabindex="0"
>
Delete
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiTableSortLabel-icon MuiTableSortLabel-iconDirectionAsc"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z"
/>
</svg>
</span>
</th>
</tr>
</thead>
<tbody
class="MuiTableBody-root"
/>
<tfoot
class="MuiTableFooter-root"
>
<tr
class="MuiTableRow-root MuiTableRow-footer"
>
<td
class="MuiTableCell-root MuiTableCell-footer MuiTableCell-alignCenter"
colspan="8"
>
No SUMS Versions
</td>
</tr>
</tfoot>
</table>
<div />
</div>
</div>
</div>
</div>
</div>
</div>
`;

View File

@@ -0,0 +1,243 @@
import {
Grid,
IconButton,
Table,
TableBody,
TableCell,
TableFooter,
TablePagination,
TableRow,
} from "@material-ui/core";
import AddCircleIcon from "@material-ui/icons/AddCircle";
import DeleteIcon from "@material-ui/icons/Delete";
import { LocalDateTimeString } from "../../../utils/dates";
import clsx from "clsx";
import { Link } from "react-router-dom";
import { logger } from "../../../services/monitoring";
import React, { useEffect, useState } from "react";
import { useCarUpdatesContext, CarUpdatesProvider } from "../../Contexts/CarUpdatesContext";
import { useStatusContext } from "../../Contexts/StatusContext";
import { useUserContext } from "../../Contexts/UserContext";
import TableHeaderSortable from "../../Table/HeaderSortable";
import { useLocalStorage } from "../../useLocalStorage";
import DeleteConfirmation from "../../DeleteConfirmation";
import useStyles from "../../useStyles";
import { Permissions } from "../../../utils/roles";
import { RoleWrap } from "../../Controls/RoleWrap";
const tableColumns = [
{
id: "version",
label: "SUMS Version",
},
{
id: "os_version",
label: "OS Version",
},
{
id: "created_at",
label: "Created",
},
{
id: "delete",
label: "Delete",
},
];
const PAGE_SIZE = "SUMS_VERSIONS_TABLE_PAGE_SIZE";
const MainForm = () => {
const classes = useStyles();
const { setMessage, setTitle, setSitePath } = useStatusContext();
const [orderBy, setOrderBy] = useState("created_at");
const [order, setOrder] = useState("desc");
const [showDeleteModal, setShowDeleteModal] = useState(false);
const [rowToDelete, setRowToDelete] = useState({});
const [pageSize, setPageSize] = useLocalStorage(PAGE_SIZE, 10);
const [pageIndex, setPageIndex] = useState(0);
const {
getSUMSVersionsList,
deleteSUMSVersion,
versions,
totalVersions,
stopMonitor,
} = useCarUpdatesContext();
const {
token: {
idToken: { jwtToken: token },
},
groups,
providers,
} = useUserContext();
useEffect(() => {
setTitle("SUMS Versions");
setSitePath([
{
label: "Tools",
link: "/tools/sumsversions",
},
{
label: "SUMS Versions",
},
]);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
useEffect(() => {
loadSUMSVersions();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [token, pageIndex, pageSize, orderBy, order]);
const loadSUMSVersions = async () => {
try {
if (!token) return;
stopMonitor();
await getSUMSVersionsList(
{
limit: pageSize,
offset: pageSize * pageIndex,
order: `${orderBy} ${order}`,
},
token
);
} catch (e) {
setMessage(e.message);
logger.warn(e.stack);
}
};
const handleChangePageIndex = (event, newIndex) => {
setPageIndex(newIndex);
};
const handleChangePageSize = (event) => {
setPageSize(parseInt(event.target.value, 10));
setPageIndex(0);
};
const handleSort = (event, property) => {
try {
if (property === orderBy) {
if (order === "asc") {
setOrder("desc");
} else {
setOrder("asc");
}
} else {
setOrderBy(property);
setOrder("asc");
}
} catch (e) {
logger.warn(e.stack);
}
};
const onDeleteClick = (row) => {
setRowToDelete(row);
setShowDeleteModal(true);
}
const sendDelete = async () => {
if (rowToDelete) {
try {
const result = await deleteSUMSVersion(rowToDelete.version, token);
if (!result || result.error) return;
setMessage(`Deleted ${rowToDelete.version}`);
loadSUMSVersions();
} catch (e) {
setMessage(e.message);
logger.warn(e.stack);
}
}
};
return (
<div>
<Grid container className={classes.root} spacing={2}>
<Grid item md={4} className={clsx(classes.textJustifyAlign, classes.actionsBar)}>
<Link to={`/tools/sums/new`} className={classes.labelInline}>
<AddCircleIcon fontSize="large" />
</Link>
</Grid>
</Grid>
<Table>
<TableHeaderSortable
classes={classes}
orderBy={orderBy}
order={order}
columnData={tableColumns}
onSortRequest={handleSort}
/>
<TableBody>
{versions && versions.map((row, index) => (
<TableRow key={row.version + row.os_version}>
<TableCell align="center">
<Link to={`/tools/sums/${row.version}`}>
{row.version}
</Link>
</TableCell>
<TableCell align="center">
{row.os_version}
</TableCell>
<TableCell align="center">
{LocalDateTimeString(row.created)}
</TableCell>
<TableCell>
<RoleWrap
groups={groups}
providers={providers}
rolesPerProvider={Permissions.FiskerMagnaDelete}
>
<IconButton
onClick={() => onDeleteClick(row)}
aria-label={`Send delete for ${row.version}`}
size="small"
color="primary"
>
<DeleteIcon aria-label={`Delete ${row.version}`} />
</IconButton>
</RoleWrap>
</TableCell>
</TableRow>
))}
</TableBody>
<TableFooter>
<TableRow>
{!versions || versions.length === 0 ? (
<TableCell colSpan={8} align="center">No SUMS Versions</TableCell>
) : (
<TablePagination
rowsPerPageOptions={[5, 10, 25, 100]}
colSpan={4}
count={totalVersions}
rowsPerPage={pageSize}
page={pageIndex}
SelectProps={{
inputProps: { "aria-label": "rows per page" },
native: true,
}}
onPageChange={handleChangePageIndex}
onRowsPerPageChange={handleChangePageSize}
/>)}
</TableRow>
</TableFooter>
</Table>
<DeleteConfirmation
message={rowToDelete && rowToDelete.version ? rowToDelete.version : ""}
open={showDeleteModal}
close={() => setShowDeleteModal(false)}
deleteFunction={sendDelete}
/>
</div>
);
};
const SUMS = () => (
<CarUpdatesProvider>
<MainForm />
</CarUpdatesProvider>
);
export default SUMS;

View File

@@ -0,0 +1,46 @@
jest.mock("../../Contexts/CarUpdatesContext");
jest.mock("../../Contexts/StatusContext");
jest.mock("../../Contexts/UserContext");
jest.mock("@material-ui/core/utils/unstable_useId", () =>
jest.fn().mockReturnValue("mui-test-id")
);
import { render, waitFor } from "@testing-library/react";
import { MemoryRouter, Route } from "react-router-dom";
import { CarUpdatesProvider } from "../../Contexts/CarUpdatesContext";
import { StatusProvider } from "../../Contexts/StatusContext";
import { UserProvider, setToken } from "../../Contexts/UserContext";
import { TEST_AUTH_OBJECT_FISKER } from "../../../utils/testing";
import MainForm from "./index";
import addSnapshotSerializer from "../../../utils/snapshot";
const renderSUMSList = async () => {
const { container } = render(
<CarUpdatesProvider>
<StatusProvider>
<UserProvider>
<MemoryRouter initialEntries={["/tools/sums"]}>
<Route path="/tools/sums">
<MainForm />
</Route>
</MemoryRouter>
</UserProvider>
</StatusProvider>
</CarUpdatesProvider>
);
await waitFor(() => {
/* render */
});
return container;
};
describe("SUMSList", () => {
beforeAll(() => {
addSnapshotSerializer(expect);
});
it("Render", async () => {
setToken(TEST_AUTH_OBJECT_FISKER);
const container = await renderSUMSList();
expect(container).toMatchSnapshot();
});
});

View File

@@ -0,0 +1,138 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`SUMSNew Render 1`] = `
<div>
<div
data-testid="mocked-carupdatesprovider"
>
<div
data-testid="mocked-statusprovider"
>
<div
data-testid="mocked-userprovider"
>
<div
data-testid="mocked-carupdatesprovider"
>
<div
class="makeStyles-paper-0"
>
<form
action="{onSubmit}"
class="makeStyles-form-0"
novalidate=""
>
<div
class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined Mui-required Mui-required"
data-shrink="false"
for="sums_version"
id="sums_version-label"
>
SUMS Version
<span
aria-hidden="true"
class="MuiFormLabel-asterisk MuiInputLabel-asterisk"
>
*
</span>
</label>
<div
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl"
>
<input
aria-invalid="false"
class="MuiInputBase-input MuiOutlinedInput-input"
id="sums_version"
maxlength="255"
name="sums_version"
required=""
type="text"
value=""
/>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-0 MuiOutlinedInput-notchedOutline"
>
<legend
class="PrivateNotchedOutline-legendLabelled-0"
>
<span>
SUMS Version
 *
</span>
</legend>
</fieldset>
</div>
</div>
<div
class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined Mui-required Mui-required"
data-shrink="false"
for="os_version"
id="os_version-label"
>
OS Version
<span
aria-hidden="true"
class="MuiFormLabel-asterisk MuiInputLabel-asterisk"
>
*
</span>
</label>
<div
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl"
>
<input
aria-invalid="false"
class="MuiInputBase-input MuiOutlinedInput-input"
id="os_version"
maxlength="255"
name="os_version"
required=""
type="text"
value=""
/>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-0 MuiOutlinedInput-notchedOutline"
>
<legend
class="PrivateNotchedOutline-legendLabelled-0"
>
<span>
OS Version
 *
</span>
</legend>
</fieldset>
</div>
</div>
<button
class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-0 MuiButton-containedPrimary MuiButton-fullWidth"
tabindex="0"
type="submit"
>
<span
class="MuiButton-label"
>
Submit
</span>
<span
class="MuiTouchRipple-root"
/>
</button>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
`;

View File

@@ -0,0 +1,129 @@
import {
Button,
TextField
} from "@material-ui/core";
import React, { useEffect, useState } from "react";
import { Redirect } from "react-router";
import { logger } from "../../../services/monitoring";
import { useStatusContext } from "../../Contexts/StatusContext";
import {
CarUpdatesProvider,
useCarUpdatesContext
} from "../../Contexts/CarUpdatesContext";
import { useUserContext } from "../../Contexts/UserContext";
import useStyles from "../../useStyles";
const MainForm = () => {
const { addSUMSVersion, busy } = useCarUpdatesContext();
const {
token: {
idToken: { jwtToken: token },
},
} = useUserContext();
const classes = useStyles();
const [redirect, setRedirect] = useState(null);
const { setMessage, setTitle, setSitePath } = useStatusContext();
const [sumsVersion, setSumsVersion] = useState("");
const [osVersion, setOsVersion] = useState("");
useEffect(() => {
setTitle(`New SUMS Version`);
setSitePath([
{
label: "Tools",
link: "/tools/sumsversions",
},
{
label: "SUMS Versions",
link: "/tools/sumsversions",
},
{
label: `New SUMS Version`,
},
]);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
const onSUMSVersionChange = (event) => {
setSumsVersion(event.target.value);
}
const onOSVersionChange = (event) => {
setOsVersion(event.target.value);
}
const onSubmit = async (event) => {
try {
event.preventDefault();
const result = await addSUMSVersion(sumsVersion, osVersion, token);
if (!result || result.error) return;
setMessage(`Added ${sumsVersion}`);
setRedirect(`/tools/sumsversions`);
} catch (e) {
setMessage(e.message);
logger.warn(e.stack);
}
};
if (redirect && redirect.length > 0) {
return <Redirect to={redirect} />;
}
return (
<div className={classes.paper}>
<form className={classes.form} noValidate action="{onSubmit}">
<TextField
id="sums_version"
name="sums_version"
label="SUMS Version"
variant="outlined"
margin="normal"
inputProps={{
maxLength: "255",
}}
required
fullWidth
value={sumsVersion}
onChange={onSUMSVersionChange}
type="text"
/>
<TextField
id="os_version"
name="os_version"
label="OS Version"
variant="outlined"
margin="normal"
inputProps={{
maxLength: "255",
}}
required
fullWidth
value={osVersion}
onChange={onOSVersionChange}
type="text"
/>
<Button
type="submit"
disabled={busy}
fullWidth
variant="contained"
color="primary"
className={classes.submit}
onClick={onSubmit}
>
{busy ? "Submitting..." : "Submit"}
</Button>
</form>
</div>
);
};
const SumsNew = () => (
<CarUpdatesProvider>
<MainForm />
</CarUpdatesProvider>
);
export default SumsNew;

View File

@@ -0,0 +1,46 @@
jest.mock("../../Contexts/CarUpdatesContext");
jest.mock("../../Contexts/StatusContext");
jest.mock("../../Contexts/UserContext");
jest.mock("@material-ui/core/utils/unstable_useId", () =>
jest.fn().mockReturnValue("mui-test-id")
);
import { render, waitFor } from "@testing-library/react";
import { MemoryRouter, Route } from "react-router-dom";
import { CarUpdatesProvider } from "../../Contexts/CarUpdatesContext";
import { StatusProvider } from "../../Contexts/StatusContext";
import { UserProvider, setToken } from "../../Contexts/UserContext";
import { TEST_AUTH_OBJECT_FISKER } from "../../../utils/testing";
import MainForm from "./index";
import addSnapshotSerializer from "../../../utils/snapshot";
const renderSUMSNew = async () => {
const { container } = render(
<CarUpdatesProvider>
<StatusProvider>
<UserProvider>
<MemoryRouter initialEntries={["/tools/sums/new"]}>
<Route path="/tools/sums/new">
<MainForm />
</Route>
</MemoryRouter>
</UserProvider>
</StatusProvider>
</CarUpdatesProvider>
);
await waitFor(() => {
/* render */
});
return container;
};
describe("SUMSNew", () => {
beforeAll(() => {
addSnapshotSerializer(expect);
});
it("Render", async () => {
setToken(TEST_AUTH_OBJECT_FISKER);
const container = await renderSUMSNew();
expect(container).toMatchSnapshot();
});
});

View File

@@ -23,7 +23,7 @@ exports[`SUMS Render 1`] = `
>
<a
class="makeStyles-labelInline-0"
href="/sums-rxswin-add/2023.03.00.00.E"
href="/tools/sums-rxswin-add/2023.03.00.00.E"
>
<svg
aria-hidden="true"
@@ -99,6 +99,29 @@ exports[`SUMS Render 1`] = `
</svg>
</span>
</th>
<th
class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignCenter"
scope="col"
>
<span
aria-disabled="false"
class="MuiButtonBase-root MuiTableSortLabel-root"
role="button"
tabindex="0"
>
Delete
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiTableSortLabel-icon MuiTableSortLabel-iconDirectionAsc"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z"
/>
</svg>
</span>
</th>
</tr>
</thead>
<tbody

View File

@@ -38,6 +38,10 @@ const tableColumns = [
id: "created_at",
label: "Created",
},
{
id: "delete",
label: "Delete",
},
];
const PAGE_SIZE = "SUMS_RXSWIN_TABLE_PAGE_SIZE";
@@ -70,9 +74,16 @@ const MainForm = () => {
useEffect(() => {
setTitle(`SUMS Version ${sums_version}`);
setSitePath([
{
label: "Tools",
link: "/tools/sumsversions",
},
{
label: "SUMS Versions",
link: "/tools/sumsversions",
},
{
label: `SUMS Version ${sums_version}`,
link: `/sums/${sums_version}`,
},
]);
// eslint-disable-next-line react-hooks/exhaustive-deps
@@ -152,7 +163,7 @@ const MainForm = () => {
<div>
<Grid container className={classes.root} spacing={2}>
<Grid item md={4} className={clsx(classes.textJustifyAlign, classes.actionsBar)}>
<Link to={`/sums-rxswin-add/${sums_version}`} className={classes.labelInline}>
<Link to={`/tools/sums-rxswin-add/${sums_version}`} className={classes.labelInline}>
<AddCircleIcon fontSize="large" />
</Link>
</Grid>

View File

@@ -18,8 +18,8 @@ const renderSUMS = async () => {
<CarUpdatesProvider>
<StatusProvider>
<UserProvider>
<MemoryRouter initialEntries={["/sums/2023.03.00.00.E"]}>
<Route path="/sums/:sums_version">
<MemoryRouter initialEntries={["/tools/sums/2023.03.00.00.E"]}>
<Route path="/tools/sums/:sums_version">
<MainForm sums_version="2023.03.00.00.E" />
</Route>
</MemoryRouter>