diff --git a/src/components/CANFilter/Add/index.test.jsx b/src/components/CANFilter/Add/index.test.jsx
index 6bd1813..7afca84 100644
--- a/src/components/CANFilter/Add/index.test.jsx
+++ b/src/components/CANFilter/Add/index.test.jsx
@@ -1,3 +1,5 @@
+import {TEST_AUTH_OBJECT_FISKER} from "../../../utils/testing";
+
jest.mock("../../Contexts/CANFiltersContext");
jest.mock("../../Contexts/StatusContext");
jest.mock("../../Contexts/UserContext");
@@ -8,7 +10,6 @@ import { BrowserRouter } from "react-router-dom";
import { CANFiltersProvider } from "../../Contexts/CANFiltersContext";
import { StatusProvider } from "../../Contexts/StatusContext";
import { UserProvider, setToken } from "../../Contexts/UserContext";
-import { TEST_AUTH_OBJECT } from "../../../utils/testing";
import MainForm from "./index";
import addSnapshotSerializer from "../../../utils/snapshot";
@@ -35,7 +36,7 @@ describe("CANFiltersAdd", () => {
});
it("Render", async () => {
- setToken(TEST_AUTH_OBJECT);
+ setToken(TEST_AUTH_OBJECT_FISKER);
const container = await renderCANFiltersAdd();
expect(container).toMatchSnapshot();
});
diff --git a/src/components/CANFilter/Table/__snapshots__/index.test.jsx.snap b/src/components/CANFilter/Table/__snapshots__/index.test.jsx.snap
index 00fb3e3..010dd2a 100644
--- a/src/components/CANFilter/Table/__snapshots__/index.test.jsx.snap
+++ b/src/components/CANFilter/Table/__snapshots__/index.test.jsx.snap
@@ -250,23 +250,6 @@ exports[`CANFiltersTable Render 1`] = `
/>
-
-
-
|
-
-
-
|
-
-
-
diff --git a/src/components/CANFilter/Table/index.jsx b/src/components/CANFilter/Table/index.jsx
index 9068090..5156f0b 100644
--- a/src/components/CANFilter/Table/index.jsx
+++ b/src/components/CANFilter/Table/index.jsx
@@ -1,5 +1,3 @@
-import React, { useEffect, useState } from "react";
-import { Link } from 'react-router-dom';
import {
Grid,
Table,
@@ -12,46 +10,46 @@ 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 {
CANFiltersProvider,
useCANFiltersContext,
} from "../../Contexts/CANFiltersContext";
-import TableHeaderSortable from "../../Table/HeaderSortable";
-import {
- useUserContext
-} from "../../Contexts/UserContext"
import { useStatusContext } from "../../Contexts/StatusContext";
-import useStyles from "../../useStyles";
+import { useUserContext } from "../../Contexts/UserContext";
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";
+import TableHeaderSortable from "../../Table/HeaderSortable";
+import { useLocalStorage } from "../../useLocalStorage";
+import useStyles from "../../useStyles";
const tableColumns = [
{
id: "can_id",
- label: "CAN ID"
+ label: "CAN ID",
},
{
id: "interval",
- label: "Interval (ms)"
+ label: "Interval (ms)",
},
{
id: "fleet",
- label: "Fleet"
+ label: "Fleet",
},
{
id: "edge_mask",
- label: "Edge mask"
+ label: "Edge mask",
},
{
id: "",
- label: "Actions"
- }
+ label: "Actions",
+ },
];
const PAGE_SIZE = "CAN_FILTER_TABLE_PAGE_SIZE";
@@ -63,9 +61,16 @@ const MainForm = ({ vin }) => {
const [pageIndex, setPageIndex] = useState(0);
const [orderBy, setOrderBy] = useState("id");
const [order, setOrder] = useState("desc");
- const { getFilters, deleteFilter, filters, totalFilters } = useCANFiltersContext();
+ const { getFilters, deleteFilter, filters, totalFilters } =
+ useCANFiltersContext();
const { setMessage } = useStatusContext();
- const { token: { idToken: { jwtToken: token } }, groups } = useUserContext();
+ const {
+ token: {
+ idToken: { jwtToken: token },
+ },
+ groups,
+ providers,
+ } = useUserContext();
useEffect(() => {
(async () => {
@@ -118,7 +123,7 @@ const MainForm = ({ vin }) => {
const onDelete = async (can_id) => {
try {
await deleteFilter(vin, can_id, token);
- setMessage(`Deleted ${can_id}`)
+ setMessage(`Deleted ${can_id}`);
} catch (e) {
setMessage(e.message);
logger.warn(e.stack);
@@ -126,24 +131,24 @@ const MainForm = ({ vin }) => {
};
const Actions = (row) => {
- if(row.fleet != null) {
- return
+ if (row.fleet != null) {
+ return;
}
let actions = [];
- if (hasRole([Roles.CREATE], groups)) {
+ if (hasRole(groups, Permissions.FiskerCreate, providers)) {
actions.push({
tip: `Update "${row.can_id}"`,
link: `/filter-update?vin=${vin}&can_id=${row.can_id}&interval=${row.interval}`,
- icon:
+ icon:
,
});
}
- if (hasRole([Roles.DELETE], groups)) {
+ if (hasRole(groups, Permissions.FiskerDelete, providers)) {
actions.push({
tip: `Delete "${row.can_id}"`,
id: row.can_id,
- icon:
- })
+ icon:
,
+ });
}
if (actions.length === 0) return ["No actions"];
@@ -177,7 +182,7 @@ const MainForm = ({ vin }) => {
-
+
@@ -196,7 +201,9 @@ const MainForm = ({ vin }) => {
{row.fleet}
- {trimIfMoreThan(row.edge_mask, 15, "...")}
+
+ {trimIfMoreThan(row.edge_mask, 15, "...")}
+
{Actions(row)}
))}
@@ -219,7 +226,7 @@ const MainForm = ({ vin }) => {
-
diff --git a/src/components/Cars/List/index.jsx b/src/components/Cars/List/index.jsx
index 0dbc101..db72783 100644
--- a/src/components/Cars/List/index.jsx
+++ b/src/components/Cars/List/index.jsx
@@ -1,16 +1,18 @@
-import React, { useEffect, useState } from "react";
import { Checkbox, FormControlLabel, Grid, MenuItem } from "@material-ui/core";
import AddCircleIcon from "@material-ui/icons/AddCircle";
-import { Link } from "react-router-dom";
import clsx from "clsx";
+import React, { useEffect, useState } from "react";
+import { Link } from "react-router-dom";
-import { VehicleProvider } from "../../Contexts/VehicleContext";
-import { useUserContext } from "../../Contexts/UserContext";
+import { Permissions } from "../../../utils/roles";
import { useStatusContext } from "../../Contexts/StatusContext";
-import useStyles from "../../useStyles";
-import SearchField from "../../Controls/SearchField";
+import { useUserContext } from "../../Contexts/UserContext";
+import { VehicleProvider } from "../../Contexts/VehicleContext";
import CarSelectionTable from "../../Controls/CarSelectionTable";
import OptionsDropdown from "../../Controls/OptionsDropdown";
+import { RoleWrap } from "../../Controls/RoleWrap";
+import SearchField from "../../Controls/SearchField";
+import useStyles from "../../useStyles";
const MainForm = () => {
const classes = useStyles();
@@ -22,6 +24,8 @@ const MainForm = () => {
token: {
idToken: { jwtToken: token },
},
+ groups,
+ providers,
} = useUserContext();
const handleSearch = (query) => {
@@ -30,11 +34,11 @@ const MainForm = () => {
const handleOnline = (event) => {
setOnline(event.target.checked);
- }
+ };
const handleOnlineHMI = (event) => {
setOnlineHMI(event.target.checked);
- }
+ };
useEffect(() => {
setTitle("Vehicles");
@@ -46,30 +50,34 @@ const MainForm = () => {
-
-
-
+
+
+
+
+
-
+
@@ -79,7 +87,11 @@ const MainForm = () => {
classes={classes}
token={token}
multiSelect={false}
- search={{ search, online: online? true : null, online_hmi: onlineHMI? true : null }}
+ search={{
+ search,
+ online: online ? true : null,
+ online_hmi: onlineHMI ? true : null,
+ }}
/>
);
diff --git a/src/components/Cars/List/index.test.jsx b/src/components/Cars/List/index.test.jsx
index 08b6335..e45d166 100644
--- a/src/components/Cars/List/index.test.jsx
+++ b/src/components/Cars/List/index.test.jsx
@@ -11,7 +11,7 @@ import { BrowserRouter } from "react-router-dom";
import { VehicleProvider } from "../../Contexts/VehicleContext";
import { StatusProvider } from "../../Contexts/StatusContext";
import { UserProvider, setToken } from "../../Contexts/UserContext";
-import { TEST_AUTH_OBJECT } from "../../../utils/testing";
+import { TEST_AUTH_OBJECT_FISKER } from "../../../utils/testing";
import MainForm from "./index";
import addSnapshotSerializer from "../../../utils/snapshot";
@@ -39,7 +39,7 @@ describe("VehicleTable", () => {
});
it("Render", async () => {
- setToken(TEST_AUTH_OBJECT);
+ setToken(TEST_AUTH_OBJECT_FISKER);
const container = await renderVehicleTable();
expect(container).toMatchSnapshot();
});
diff --git a/src/components/Cars/Status/CANFiltersTab.test.jsx b/src/components/Cars/Status/CANFiltersTab.test.jsx
index f7ac32d..518ff0f 100644
--- a/src/components/Cars/Status/CANFiltersTab.test.jsx
+++ b/src/components/Cars/Status/CANFiltersTab.test.jsx
@@ -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 } from "../../../utils/testing";
+import { TEST_AUTH_OBJECT_FISKER } 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);
+ setToken(TEST_AUTH_OBJECT_FISKER);
const container = await renderCANFiltersTab();
expect(container).toMatchSnapshot();
});
diff --git a/src/components/Cars/Status/CANSignalsTab.test.jsx b/src/components/Cars/Status/CANSignalsTab.test.jsx
index 2747b69..f50b265 100644
--- a/src/components/Cars/Status/CANSignalsTab.test.jsx
+++ b/src/components/Cars/Status/CANSignalsTab.test.jsx
@@ -11,7 +11,7 @@ import { render, waitFor } from "@testing-library/react";
import { BrowserRouter } from "react-router-dom";
import CANSignalsTab from "./CANSignalsTab";
import {setToken} from "../../Contexts/UserContext";
-import {TEST_AUTH_OBJECT} from "../../../utils/testing";
+import { TEST_AUTH_OBJECT_FISKER } from "../../../utils/testing";
const renderCANSignalsTab = async () => {
const { container } = render(
@@ -31,7 +31,7 @@ describe("CANSignalsTab", () => {
});
it("Render", async () => {
- setToken(TEST_AUTH_OBJECT);
+ setToken(TEST_AUTH_OBJECT_FISKER);
const container = await renderCANSignalsTab();
expect(container).toMatchSnapshot();
});
diff --git a/src/components/Cars/Status/CarUpdatesTab.test.jsx b/src/components/Cars/Status/CarUpdatesTab.test.jsx
index 291be4b..1251721 100644
--- a/src/components/Cars/Status/CarUpdatesTab.test.jsx
+++ b/src/components/Cars/Status/CarUpdatesTab.test.jsx
@@ -11,7 +11,7 @@ import { BrowserRouter } from "react-router-dom";
import { CANFiltersProvider } from "../../Contexts/CANFiltersContext";
import { StatusProvider } from "../../Contexts/StatusContext";
import { UserProvider, setToken } from "../../Contexts/UserContext";
-import { TEST_AUTH_OBJECT } from "../../../utils/testing";
+import { TEST_AUTH_OBJECT_FISKER } from "../../../utils/testing";
import MainForm from "./CarUpdatesTab";
import addSnapshotSerializer from "../../../utils/snapshot";
@@ -39,7 +39,7 @@ describe("CarUpdatesTab", () => {
});
it("Render", async () => {
- setToken(TEST_AUTH_OBJECT);
+ setToken(TEST_AUTH_OBJECT_FISKER);
const container = await renderCarUpdatesTab();
expect(container).toMatchSnapshot();
});
diff --git a/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap b/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap
index d38148b..bf46c26 100644
--- a/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap
+++ b/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap
@@ -101,23 +101,6 @@ exports[`VehicleDetailsTab Render 1`] = `
/>
-
-
-