admin/ota-admin-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "CEC-2977 Filter portal access based on auth provider (#231)"

Browse Source 
This reverts commit f2f046968e.
This commit is contained in:
jwu-fisker
2022-11-08 16:49:10 -08:00
parent f2f046968e
commit 33bfc4fb13
76 changed files with 912 additions and 1316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Fleets/Add/index.test.jsx
View File

@@ -8,7 +8,7 @@ import { BrowserRouter } from "react-router-dom";
import { FleetProvider } from "../../Contexts/FleetContext";
import { StatusProvider } from "../../Contexts/StatusContext";
import { UserProvider, setToken } from "../../Contexts/UserContext";
import { TEST_AUTH_OBJECT_FISKER } from "../../../utils/testing";
import { TEST_AUTH_OBJECT } from "../../../utils/testing";
import MainForm from "./index";
import addSnapshotSerializer from "../../../utils/snapshot";
@@ -36,7 +36,7 @@ describe("FleetAddForm", () => {
});
it("Render", async () => {
setToken(TEST_AUTH_OBJECT_FISKER);
setToken(TEST_AUTH_OBJECT);
const container = await renderFleetAdd();
expect(container).toMatchSnapshot();
});

4
src/components/Fleets/Status/CANFilters/Add/index.test.jsx
View File

@@ -8,7 +8,7 @@ import { BrowserRouter } from "react-router-dom";
import { FleetProvider } from "../../../../Contexts/FleetContext";
import { StatusProvider } from "../../../../Contexts/StatusContext";
import { UserProvider, setToken } from "../../../../Contexts/UserContext";
import { TEST_AUTH_OBJECT_FISKER }from "../../../../../utils/testing";
import { TEST_AUTH_OBJECT } from "../../../../../utils/testing";
import MainForm from "./index";
import addSnapshotSerializer from "../../../../../utils/snapshot";
@@ -34,7 +34,7 @@ describe("FleetCANFilterAdd", () => {
});
it("Render", async () => {
setToken(TEST_AUTH_OBJECT_FISKER);
setToken(TEST_AUTH_OBJECT);
const container = await renderFleetCANFilterAdd();
expect(container).toMatchSnapshot();
});

51
src/components/Fleets/Status/CANFilters/Table/__snapshots__/index.test.jsx.snap
View File

@@ -221,6 +221,23 @@ exports[`FleetCANFiltersTable Render 1`] = `
/>
</svg>
</a>
<a
class=""
href="/"
title="Delete \\"123-456\\""
>
<svg
aria-hidden="true"
aria-label="Delete 123-456"
class="MuiSvgIcon-root"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
/>
</svg>
</a>
</td>
</tr>
<tr
@@ -260,6 +277,23 @@ exports[`FleetCANFiltersTable Render 1`] = `
/>
</svg>
</a>
<a
class=""
href="/"
title="Delete \\"1\\""
>
<svg
aria-hidden="true"
aria-label="Delete 1"
class="MuiSvgIcon-root"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
/>
</svg>
</a>
</td>
</tr>
<tr
@@ -299,6 +333,23 @@ exports[`FleetCANFiltersTable Render 1`] = `
/>
</svg>
</a>
<a
class=""
href="/"
title="Delete \\"1000\\""
>
<svg
aria-hidden="true"
aria-label="Delete 1000"
class="MuiSvgIcon-root"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
/>
</svg>
</a>
</td>
</tr>
</tbody>

75
src/components/Fleets/Status/CANFilters/Table/index.jsx
View File

@@ -1,3 +1,5 @@
import React, { useEffect, useState } from "react";
import { Link } from 'react-router-dom';
import {
Grid,
Table,
@@ -10,42 +12,37 @@ import {
} from "@material-ui/core";
import AddCircleIcon from "@material-ui/icons/AddCircle";
import DeleteIcon from "@material-ui/icons/Delete";
import EditIcon from "@material-ui/icons/Edit";
import EditIcon from '@material-ui/icons/Edit';
import clsx from "clsx";
import React, { useEffect, useState } from "react";
import { Link } from "react-router-dom";
import { logger } from "../../../../../services/monitoring";
import { hasRole, Permissions } from "../../../../../utils/roles";
import { trimIfMoreThan } from "../../../../../utils/strings";
import {
FleetProvider,
useFleetContext,
} from "../../../../Contexts/FleetContext";
import { useStatusContext } from "../../../../Contexts/StatusContext";
import { useUserContext } from "../../../../Contexts/UserContext";
import SearchField from "../../../../Controls/SearchField";
import TableHeaderSortable from "../../../../Table/HeaderSortable";
import { useLocalStorage } from "../../../../useLocalStorage";
import { useUserContext } from "../../../../Contexts/UserContext"
import { useStatusContext } from "../../../../Contexts/StatusContext";
import { FleetProvider, useFleetContext } from "../../../../Contexts/FleetContext"
import useStyles from "../../../../useStyles";
import SearchField from "../../../../Controls/SearchField";
import { logger } from "../../../../../services/monitoring";
import { Roles, hasRole } from "../../../../../utils/roles";
import {useLocalStorage} from "../../../../useLocalStorage";
import {trimIfMoreThan} from "../../../../../utils/strings"
const tableColumns = [
{
id: "can_id",
label: "CAN ID",
label: "CAN ID"
},
{
id: "interval",
label: "Interval (ms)",
label: "Interval (ms)"
},
{
id: "edge_mask",
label: "Edge mask",
label: "Edge mask"
},
{
id: "",
label: "Actions",
},
label: "Actions"
}
];
const PAGE_SIZE = "FLEET_STATUS_CAN_FILTER_TABLE_PAGE_SIZE";
@@ -57,19 +54,8 @@ const MainForm = ({ name }) => {
const [order, setOrder] = useState("desc");
const classes = useStyles();
const { setMessage } = useStatusContext();
const {
fleetCANFilters,
totalFleetCANFilters,
getFleetCANFilters,
deleteFleetCANFilter,
} = useFleetContext();
const {
token: {
idToken: { jwtToken: token },
},
groups,
providers,
} = useUserContext();
const { fleetCANFilters, totalFleetCANFilters, getFleetCANFilters, deleteFleetCANFilter } = useFleetContext();
const { token: { idToken: { jwtToken: token } }, groups } = useUserContext();
useEffect(() => {
(async () => {
@@ -121,7 +107,7 @@ const MainForm = ({ name }) => {
const onDelete = async (can_id) => {
try {
await deleteFleetCANFilter(name, can_id, token);
setMessage(`Deleted ${can_id}`);
setMessage(`Deleted ${can_id}`)
} catch (e) {
setMessage(e.message);
logger.warn(e.stack);
@@ -130,19 +116,19 @@ const MainForm = ({ name }) => {
const Actions = (row) => {
let actions = [];
if (hasRole(groups, Permissions.FiskerCreate, providers)) {
if (hasRole([Roles.CREATE], groups)) {
actions.push({
tip: `Update "${row.can_id}"`,
link: `/fleet/${name}/filter-update?name=${name}&can_id=${row.can_id}&interval=${row.interval}`,
icon: <EditIcon aria-label={`Update ${row.can_id}`} />,
icon: <EditIcon aria-label={`Update ${row.can_id}`} />
});
}
if (hasRole(groups, Permissions.FiskerDelete, providers)) {
if (hasRole([Roles.DELETE], groups)) {
actions.push({
tip: `Delete "${row.can_id}"`,
id: row.can_id,
icon: <DeleteIcon aria-label={`Delete ${row.can_id}`} />,
});
icon: <DeleteIcon aria-label={`Delete ${row.can_id}`} />
})
}
if (actions.length === 0) return ["No actions"];
@@ -171,10 +157,7 @@ const MainForm = ({ name }) => {
<div className={clsx(classes.paper, classes.tableSize)}>
<Grid container className={classes.root} spacing={2}>
<Grid item md={4} className={classes.textJustifyAlign}>
<Link
to={`/fleet/${name}/filter-add`}
className={classes.labelInline}
>
<Link to={`/fleet/${name}/filter-add`} className={classes.labelInline}>
<AddCircleIcon fontSize="large" />
</Link>
</Grid>
@@ -191,13 +174,11 @@ const MainForm = ({ name }) => {
onSortRequest={handleSort}
/>
<TableBody>
{fleetCANFilters.map((row) => (
{fleetCANFilters.map(row => (
<TableRow key={row.can_id}>
<TableCell align="center">{row.can_id}</TableCell>
<TableCell align="center">{row.interval}</TableCell>
<TableCell align="center">
{trimIfMoreThan(row.edge_mask, 15, "...")}
</TableCell>
<TableCell align="center">{trimIfMoreThan(row.edge_mask, 15, "...")}</TableCell>
<TableCell align="center">{Actions(row)}</TableCell>
</TableRow>
))}
@@ -220,7 +201,7 @@ const MainForm = ({ name }) => {
</TableRow>
</TableFooter>
</Table>
</div>
</div >
);
};

4
src/components/Fleets/Status/CANFilters/Table/index.test.jsx
View File

@@ -11,7 +11,7 @@ import { BrowserRouter } from "react-router-dom";
import { FleetProvider } from "../../../../Contexts/FleetContext";
import { StatusProvider } from "../../../../Contexts/StatusContext";
import { UserProvider, setToken } from "../../../../Contexts/UserContext";
import { TEST_AUTH_OBJECT_FISKER }from "../../../../../utils/testing";
import { TEST_AUTH_OBJECT } from "../../../../../utils/testing";
import MainForm from "./index";
import addSnapshotSerializer from "../../../../../utils/snapshot";
@@ -37,7 +37,7 @@ describe("FleetCANFiltersTable", () => {
});
it("Render", async () => {
setToken(TEST_AUTH_OBJECT_FISKER);
setToken(TEST_AUTH_OBJECT);
const container = await renderFleetCANFiltersTable();
expect(container).toMatchSnapshot();
});

4
src/components/Fleets/Status/CANFilters/Update/index.test.jsx
View File

@@ -8,7 +8,7 @@ import { BrowserRouter } from "react-router-dom";
import { FleetProvider } from "../../../../Contexts/FleetContext";
import { StatusProvider } from "../../../../Contexts/StatusContext";
import { UserProvider, setToken } from "../../../../Contexts/UserContext";
import { TEST_AUTH_OBJECT_FISKER } from "../../../../../utils/testing";
import { TEST_AUTH_OBJECT } from "../../../../../utils/testing";
import MainForm from "./index";
import addSnapshotSerializer from "../../../../../utils/snapshot";
@@ -34,7 +34,7 @@ describe("FleetCANFilterUpdate", () => {
});
it("Render", async () => {
setToken(TEST_AUTH_OBJECT_FISKER);
setToken(TEST_AUTH_OBJECT);
const container = await renderFleetCANFilterUpdate();
expect(container).toMatchSnapshot();
});

4
src/components/Fleets/Status/CANFiltersTab.test.jsx
View File

@@ -9,7 +9,7 @@ import { render, waitFor } from "@testing-library/react";
import { BrowserRouter } from "react-router-dom";
import { setToken } from "../../Contexts/UserContext";
import { TEST_AUTH_OBJECT_FISKER } from "../../../utils/testing";
import { TEST_AUTH_OBJECT } from "../../../utils/testing";
import CANFiltersTab from "./CANFiltersTab";
import addSnapshotSerializer from "../../../utils/snapshot";
@@ -31,7 +31,7 @@ describe("CANFiltersTab", () => {
});
it("Render", async () => {
setToken(TEST_AUTH_OBJECT_FISKER);
setToken(TEST_AUTH_OBJECT);
const container = await renderCANFitlersTab();
expect(container).toMatchSnapshot();
});

4
src/components/Fleets/Status/Details/index.test.jsx
View File

@@ -9,7 +9,7 @@ import routeData from "react-router";
import { FleetProvider } from "../../../Contexts/FleetContext";
import { StatusProvider } from "../../../Contexts/StatusContext";
import { UserProvider, setToken } from "../../../Contexts/UserContext";
import { TEST_AUTH_OBJECT_FISKER }from "../../../../utils/testing";
import { TEST_AUTH_OBJECT } from "../../../../utils/testing";
import MainForm from "./index";
import addSnapshotSerializer from "../../../../utils/snapshot";
@@ -42,7 +42,7 @@ describe("FleetDetailsTab", () => {
})
it("Render", async () => {
setToken(TEST_AUTH_OBJECT_FISKER);
setToken(TEST_AUTH_OBJECT);
const container = await renderFleetDetailsTab();
expect(container).toMatchSnapshot();
});

4
src/components/Fleets/Status/DetailsTab.test.jsx
View File

@@ -11,7 +11,7 @@ import { MemoryRouter, Route } from "react-router-dom";
import { FleetProvider } from "../../Contexts/FleetContext";
import { StatusProvider } from "../../Contexts/StatusContext";
import { UserProvider, setToken } from "../../Contexts/UserContext";
import { TEST_AUTH_OBJECT_FISKER } from "../../../utils/testing";
import { TEST_AUTH_OBJECT } from "../../../utils/testing";
import MainForm from "./DetailsTab";
import addSnapshotSerializer from "../../../utils/snapshot";
@@ -41,7 +41,7 @@ describe("DetailsTab", () => {
});
it("Render", async () => {
setToken(TEST_AUTH_OBJECT_FISKER);
setToken(TEST_AUTH_OBJECT);
const container = await renderDetailsTab();
expect(container).toMatchSnapshot();
});

4
src/components/Fleets/Status/Vehicles/Add/index.test.jsx
View File

@@ -8,7 +8,7 @@ import { BrowserRouter } from "react-router-dom";
import { FleetProvider } from "../../../../Contexts/FleetContext";
import { StatusProvider } from "../../../../Contexts/StatusContext";
import { UserProvider, setToken } from "../../../../Contexts/UserContext";
import { TEST_AUTH_OBJECT_FISKER }from "../../../../../utils/testing";
import { TEST_AUTH_OBJECT } from "../../../../../utils/testing";
import MainForm from "./index";
import addSnapshotSerializer from "../../../../../utils/snapshot";
@@ -36,7 +36,7 @@ describe("FleetVehicleAdd", () => {
});
it("Render", async () => {
setToken(TEST_AUTH_OBJECT_FISKER);
setToken(TEST_AUTH_OBJECT);
const container = await renderFleetVehicleAdd();
expect(container).toMatchSnapshot();
});

63
src/components/Fleets/Status/Vehicles/Table/__snapshots__/index.test.jsx.snap
View File

@@ -153,7 +153,26 @@ exports[`FleetVehiclesTable Render 1`] = `
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
>
No actions
<span>
<a
class=""
href="/"
title="Delete \\"USWESTVIN12345678\\""
>
<svg
aria-hidden="true"
aria-label="Delete USWESTVIN12345678"
class="MuiSvgIcon-root"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
/>
</svg>
</a>
<div />
</span>
</td>
</tr>
<tr
@@ -171,7 +190,26 @@ exports[`FleetVehiclesTable Render 1`] = `
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
>
No actions
<span>
<a
class=""
href="/"
title="Delete \\"USWESTVIN12345679\\""
>
<svg
aria-hidden="true"
aria-label="Delete USWESTVIN12345679"
class="MuiSvgIcon-root"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
/>
</svg>
</a>
<div />
</span>
</td>
</tr>
<tr
@@ -189,7 +227,26 @@ exports[`FleetVehiclesTable Render 1`] = `
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
>
No actions
<span>
<a
class=""
href="/"
title="Delete \\"USWESTVIN12345670\\""
>
<svg
aria-hidden="true"
aria-label="Delete USWESTVIN12345670"
class="MuiSvgIcon-root"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
/>
</svg>
</a>
<div />
</span>
</td>
</tr>
</tbody>

71
src/components/Fleets/Status/Vehicles/Table/index.jsx
View File

@@ -1,3 +1,5 @@
import React, { useEffect, useState } from "react";
import { Link } from 'react-router-dom';
import {
Grid,
Table,
@@ -11,32 +13,27 @@ import {
import AddCircleIcon from "@material-ui/icons/AddCircle";
import DeleteIcon from "@material-ui/icons/Delete";
import clsx from "clsx";
import React, { useEffect, useState } from "react";
import { Link } from "react-router-dom";
import { logger } from "../../../../../services/monitoring";
import { hasRole, Permissions } from "../../../../../utils/roles";
import {
FleetProvider,
useFleetContext,
} from "../../../../Contexts/FleetContext";
import { useStatusContext } from "../../../../Contexts/StatusContext";
import { useUserContext } from "../../../../Contexts/UserContext";
import SearchField from "../../../../Controls/SearchField";
import DeleteConfirmation from "../../../../DeleteConfirmation";
import TableHeaderSortable from "../../../../Table/HeaderSortable";
import { useLocalStorage } from "../../../../useLocalStorage";
import { useUserContext } from "../../../../Contexts/UserContext"
import { useStatusContext } from "../../../../Contexts/StatusContext";
import { FleetProvider, useFleetContext } from "../../../../Contexts/FleetContext"
import useStyles from "../../../../useStyles";
import SearchField from "../../../../Controls/SearchField";
import { logger } from "../../../../../services/monitoring";
import { Roles, hasRole } from "../../../../../utils/roles";
import { useLocalStorage } from "../../../../useLocalStorage";
import DeleteConfirmation from "../../../../DeleteConfirmation";
const tableColumns = [
{
id: "vin",
label: "VIN",
label: "VIN"
},
{
id: "",
label: "Actions",
},
label: "Actions"
}
];
const PAGE_SIZE = "FLEET_STATUS_VEHICLES_TABLE_PAGE_SIZE";
@@ -47,22 +44,11 @@ const MainForm = ({ name }) => {
const [orderBy, setOrderBy] = useState("id");
const [order, setOrder] = useState("desc");
const [search, setSearch] = useState("");
const [showDeleteModal, setShowDeleteModal] = useState(false);
const [showDeleteModal, setShowDeleteModal] = useState(false)
const classes = useStyles();
const { setMessage } = useStatusContext();
const {
fleetVehicles,
totalFleetVehicles,
getFleetVehicles,
deleteFleetVehicle,
} = useFleetContext();
const {
token: {
idToken: { jwtToken: token },
},
groups,
providers,
} = useUserContext();
const { fleetVehicles, totalFleetVehicles, getFleetVehicles, deleteFleetVehicle } = useFleetContext();
const { token: { idToken: { jwtToken: token } }, groups } = useUserContext();
const handleSearch = (query) => {
setSearch(query);
@@ -119,7 +105,7 @@ const MainForm = ({ name }) => {
const onDelete = async (vin) => {
try {
await deleteFleetVehicle(name, { vin: vin }, token);
setMessage(`Deleted ${vin}`);
setMessage(`Deleted ${vin}`)
} catch (e) {
setMessage(e.message);
logger.warn(e.stack);
@@ -128,12 +114,12 @@ const MainForm = ({ name }) => {
const Actions = (vin) => {
let actions = [];
if (hasRole(groups, Permissions.FiskerDelete, providers)) {
if (hasRole([Roles.DELETE], groups)) {
actions.push({
tip: `Delete "${vin}"`,
id: vin,
icon: <DeleteIcon aria-label={`Delete ${vin}`} />,
});
icon: <DeleteIcon aria-label={`Delete ${vin}`} />
})
}
if (actions.length === 0) return ["No actions"];
@@ -154,13 +140,9 @@ const MainForm = ({ name }) => {
{action.icon}
</Link>
</Tooltip>
<DeleteConfirmation
message={action.id}
open={showDeleteModal}
close={() => setShowDeleteModal(false)}
deleteFunction={() => onDelete(action.id)}
/>
<DeleteConfirmation message={action.id} open={showDeleteModal} close={() => setShowDeleteModal(false)} deleteFunction={() => onDelete(action.id)} />
</span>
);
}
});
@@ -170,10 +152,7 @@ const MainForm = ({ name }) => {
<div className={clsx(classes.paper, classes.tableSize)}>
<Grid container className={classes.root} spacing={2}>
<Grid item md={4} className={classes.textJustifyAlign}>
<Link
to={`/fleet/${name}/vehicle-add`}
className={classes.labelInline}
>
<Link to={`/fleet/${name}/vehicle-add`} className={classes.labelInline}>
<AddCircleIcon fontSize="large" />
</Link>
</Grid>
@@ -190,7 +169,7 @@ const MainForm = ({ name }) => {
onSortRequest={handleSort}
/>
<TableBody>
{fleetVehicles.map((vin) => (
{fleetVehicles.map(vin => (
<TableRow key={vin}>
<TableCell align="center">
<Link to={`/vehicle-status/${vin}`}>{vin}</Link>
@@ -217,7 +196,7 @@ const MainForm = ({ name }) => {
</TableRow>
</TableFooter>
</Table>
</div>
</div >
);
};

4
src/components/Fleets/Status/Vehicles/Table/index.test.jsx
View File

@@ -11,7 +11,7 @@ import { BrowserRouter } from "react-router-dom";
import { FleetProvider } from "../../../../Contexts/FleetContext";
import { StatusProvider } from "../../../../Contexts/StatusContext";
import { UserProvider, setToken } from "../../../../Contexts/UserContext";
import { TEST_AUTH_OBJECT_FISKER }from "../../../../../utils/testing";
import { TEST_AUTH_OBJECT } from "../../../../../utils/testing";
import MainForm from "./index";
import addSnapshotSerializer from "../../../../../utils/snapshot";
@@ -39,7 +39,7 @@ describe("FleetVehiclesTable", () => {
});
it("Render", async () => {
setToken(TEST_AUTH_OBJECT_FISKER);
setToken(TEST_AUTH_OBJECT);
const container = await renderFleetVehiclesTable();
expect(container).toMatchSnapshot();
});

4
src/components/Fleets/Status/VehiclesTab.test.jsx
View File

@@ -9,7 +9,7 @@ import { render, waitFor } from "@testing-library/react";
import { BrowserRouter } from "react-router-dom";
import { setToken } from "../../Contexts/UserContext";
import { TEST_AUTH_OBJECT_FISKER } from "../../../utils/testing";
import { TEST_AUTH_OBJECT } from "../../../utils/testing";
import VehiclesTab from "./VehiclesTab";
import addSnapshotSerializer from "../../../utils/snapshot";
@@ -31,7 +31,7 @@ describe("VehiclesTab", () => {
});
it("Render", async () => {
setToken(TEST_AUTH_OBJECT_FISKER);
setToken(TEST_AUTH_OBJECT);
const container = await renderVehiclesTab();
expect(container).toMatchSnapshot();
});

51
src/components/Fleets/Status/__snapshots__/CANFiltersTab.test.jsx.snap
View File

@@ -220,6 +220,23 @@ exports[`CANFiltersTab Render 1`] = `
/>
</svg>
</a>
<a
class=""
href="/"
title="Delete \\"123-456\\""
>
<svg
aria-hidden="true"
aria-label="Delete 123-456"
class="MuiSvgIcon-root"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
/>
</svg>
</a>
</td>
</tr>
<tr
@@ -259,6 +276,23 @@ exports[`CANFiltersTab Render 1`] = `
/>
</svg>
</a>
<a
class=""
href="/"
title="Delete \\"1\\""
>
<svg
aria-hidden="true"
aria-label="Delete 1"
class="MuiSvgIcon-root"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
/>
</svg>
</a>
</td>
</tr>
<tr
@@ -298,6 +332,23 @@ exports[`CANFiltersTab Render 1`] = `
/>
</svg>
</a>
<a
class=""
href="/"
title="Delete \\"1000\\""
>
<svg
aria-hidden="true"
aria-label="Delete 1000"
class="MuiSvgIcon-root"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
/>
</svg>
</a>
</td>
</tr>
</tbody>

63
src/components/Fleets/Status/__snapshots__/VehiclesTab.test.jsx.snap
View File

@@ -152,7 +152,26 @@ exports[`VehiclesTab Render 1`] = `
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
>
No actions
<span>
<a
class=""
href="/"
title="Delete \\"USWESTVIN12345678\\""
>
<svg
aria-hidden="true"
aria-label="Delete USWESTVIN12345678"
class="MuiSvgIcon-root"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
/>
</svg>
</a>
<div />
</span>
</td>
</tr>
<tr
@@ -170,7 +189,26 @@ exports[`VehiclesTab Render 1`] = `
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
>
No actions
<span>
<a
class=""
href="/"
title="Delete \\"USWESTVIN12345679\\""
>
<svg
aria-hidden="true"
aria-label="Delete USWESTVIN12345679"
class="MuiSvgIcon-root"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
/>
</svg>
</a>
<div />
</span>
</td>
</tr>
<tr
@@ -188,7 +226,26 @@ exports[`VehiclesTab Render 1`] = `
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
>
No actions
<span>
<a
class=""
href="/"
title="Delete \\"USWESTVIN12345670\\""
>
<svg
aria-hidden="true"
aria-label="Delete USWESTVIN12345670"
class="MuiSvgIcon-root"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
/>
</svg>
</a>
<div />
</span>
</td>
</tr>
</tbody>

4
src/components/Fleets/Status/index.test.jsx
View File

@@ -12,7 +12,7 @@ import routeData from "react-router";
import { FleetProvider } from "../../Contexts/FleetContext";
import { StatusProvider } from "../../Contexts/StatusContext";
import { UserProvider, setToken } from "../../Contexts/UserContext";
import { TEST_AUTH_OBJECT_FISKER } from "../../../utils/testing";
import { TEST_AUTH_OBJECT } from "../../../utils/testing";
import FleetStatus from "./index";
import addSnapshotSerializer from "../../../utils/snapshot";
@@ -45,7 +45,7 @@ describe("FleetStatus", () => {
})
it("Render", async () => {
setToken(TEST_AUTH_OBJECT_FISKER);
setToken(TEST_AUTH_OBJECT);
const container = await renderCarStatus();
expect(container).toMatchSnapshot();
});

4
src/components/Fleets/Table/index.test.jsx
View File

@@ -11,7 +11,7 @@ import { BrowserRouter } from "react-router-dom";
import { FleetProvider } from "../../Contexts/FleetContext";
import { StatusProvider } from "../../Contexts/StatusContext";
import { UserProvider, setToken } from "../../Contexts/UserContext";
import { TEST_AUTH_OBJECT_FISKER } from "../../../utils/testing";
import { TEST_AUTH_OBJECT } from "../../../utils/testing";
import MainForm from "./index";
import addSnapshotSerializer from "../../../utils/snapshot";
@@ -39,7 +39,7 @@ describe("FleetTable", () => {
});
it("Render", async () => {
setToken(TEST_AUTH_OBJECT_FISKER);
setToken(TEST_AUTH_OBJECT);
const container = await renderFleetTable();
expect(container).toMatchSnapshot();
});

4
src/components/Fleets/Update/index.test.jsx
View File

@@ -8,7 +8,7 @@ import { BrowserRouter } from "react-router-dom";
import { FleetProvider } from "../../Contexts/FleetContext";
import { StatusProvider } from "../../Contexts/StatusContext";
import { UserProvider, setToken } from "../../Contexts/UserContext";
import { TEST_AUTH_OBJECT_FISKER } from "../../../utils/testing";
import { TEST_AUTH_OBJECT } from "../../../utils/testing";
import MainForm from "./index";
import addSnapshotSerializer from "../../../utils/snapshot";
@@ -36,7 +36,7 @@ describe("FleetUpdate", () => {
});
it("Render", async () => {
setToken(TEST_AUTH_OBJECT_FISKER);
setToken(TEST_AUTH_OBJECT);
const container = await renderFleetUpdate();
expect(container).toMatchSnapshot();
});