100,
},
{
- label: "Recieved",
+ label: "Received",
events: ["manifest_accepted", "manifest_received"],
progress: () => 100,
},
diff --git a/src/components/Controls/TabPanel/__snapshots__/index.test.jsx.snap b/src/components/Controls/TabPanel/__snapshots__/index.test.jsx.snap
new file mode 100644
index 0000000..184822a
--- /dev/null
+++ b/src/components/Controls/TabPanel/__snapshots__/index.test.jsx.snap
@@ -0,0 +1,19 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TabPanel Render 1`] = `
+
+`;
diff --git a/src/components/Controls/TabPanel/index.jsx b/src/components/Controls/TabPanel/index.jsx
new file mode 100644
index 0000000..d97a74f
--- /dev/null
+++ b/src/components/Controls/TabPanel/index.jsx
@@ -0,0 +1,24 @@
+import React from "react";
+import { Box } from "@material-ui/core";
+
+function TabPanel(props) {
+ const { children, value, index, ...other } = props;
+
+ return (
+
+ {value === index && (
+
+ {children}
+
+ )}
+
+ );
+}
+
+export default TabPanel;
diff --git a/src/components/Controls/TabPanel/index.test.jsx b/src/components/Controls/TabPanel/index.test.jsx
new file mode 100644
index 0000000..50c5e11
--- /dev/null
+++ b/src/components/Controls/TabPanel/index.test.jsx
@@ -0,0 +1,21 @@
+import { render, waitFor } from "@testing-library/react";
+
+import TabPanel from "./index"
+
+
+const renderTabPanel = async () => {
+ const { container } = render(
+
+ Test
+
+ );
+ await waitFor(() => { });
+ return container;
+};
+
+describe("TabPanel", () => {
+ it("Render", async () => {
+ const container = await renderTabPanel();
+ expect(container).toMatchSnapshot();
+ });
+});
diff --git a/src/components/Manifest/List/index.jsx b/src/components/Manifest/List/index.jsx
index 0bcddc7..4e18822 100644
--- a/src/components/Manifest/List/index.jsx
+++ b/src/components/Manifest/List/index.jsx
@@ -147,20 +147,19 @@ const MainForm = () => {
});
}
if (hasRole([Roles.CREATE], groups)) {
- actions = actions.concat([
- {
- tip: `Deploy "${row.name} ${row.version}"`,
- link: `/package-deploy/${row.id}`,
- icon:
,
- },
- {
- tip: `Delete "${row.name} ${row.version}"`,
- id: row.id,
- icon:
,
- },
- ]);
+ actions.push({
+ tip: `Deploy "${row.name} ${row.version}"`,
+ link: `/package-deploy/${row.id}`,
+ icon:
+ })
+ }
+ if (hasRole([Roles.DELETE], groups)) {
+ actions.push({
+ tip: `Delete "${row.name} ${row.version}"`,
+ id: row.id,
+ icon:
+ })
}
-
if (actions.length === 0) return ["No actions"];
return actions.map((action) => {
diff --git a/src/components/Routes/SiteRoutes.jsx b/src/components/Routes/SiteRoutes.jsx
index c6d8b2d..da75dbd 100644
--- a/src/components/Routes/SiteRoutes.jsx
+++ b/src/components/Routes/SiteRoutes.jsx
@@ -7,6 +7,8 @@ import { useUserContext } from "../Contexts/UserContext";
import { Roles } from "../../utils/roles";
const BatteryDatascope = React.lazy(() => import("../Datascope/Battery"));
+const CANFilterCreate = React.lazy(() => import("../CANFilter/Create"))
+const CANFilterUpdate = React.lazy(() => import("../CANFilter/Update"))
const CarsList = React.lazy(() => import("../Cars/List"));
const CarStatus = React.lazy(() => import("../Cars/Status"));
const CarUpdateStatus = React.lazy(() => import("../Cars/UpdateStatus"));
@@ -49,6 +51,22 @@ const SiteRoutes = () => {
groups={groups}
roles={[Roles.READ, Roles.CREATE]}
/>
+
}
+ type={TYPES.PROTECTED}
+ token={token}
+ groups={groups}
+ roles={[Roles.CREATE]}
+ />
+ }
+ type={TYPES.PROTECTED}
+ token={token}
+ groups={groups}
+ roles={[Roles.CREATE]}
+ />
}
diff --git a/src/services/CANFiltersAPI.js b/src/services/CANFiltersAPI.js
new file mode 100644
index 0000000..86122f0
--- /dev/null
+++ b/src/services/CANFiltersAPI.js
@@ -0,0 +1,49 @@
+import {
+ getAuthHeaderOptions,
+ fetchRespHandler,
+ addQueryParams,
+} from "../utils/http";
+
+const API_ENDPOINT = process.env.REACT_APP_UPLOAD_SERVICE_URL;
+
+const canFiltersAPI = {
+ addFilter: async (vin, filter, token) =>
+ fetch(`${API_ENDPOINT}/vehicle/${vin}/filter`, {
+ method: "POST",
+ headers: Object.assign(
+ { "Content-Type": "application/json" },
+ getAuthHeaderOptions(token)
+ ),
+ body: JSON.stringify(filter)
+ }).then(fetchRespHandler),
+
+ getFilters: async (vin, search, token) =>
+ fetch(addQueryParams(`${API_ENDPOINT}/vehicle/${vin}/filters`, search), {
+ method: "GET",
+ headers: Object.assign(
+ { "Content-Type": "application/json" },
+ getAuthHeaderOptions(token)
+ ),
+ }).then(fetchRespHandler),
+
+ updateFilter: async (vin, canID, filter, token) =>
+ fetch(`${API_ENDPOINT}/vehicle/${vin}/filter/${canID}`, {
+ method: "PUT",
+ headers: Object.assign(
+ { "Content-Type": "application/json" },
+ getAuthHeaderOptions(token)
+ ),
+ body: JSON.stringify(filter)
+ }).then(fetchRespHandler),
+
+ deleteFilter: async (vin, canID, token) =>
+ fetch(`${API_ENDPOINT}/vehicle/${vin}/filter/${canID}`, {
+ method: "DELETE",
+ headers: Object.assign(
+ { "Content-Type": "application/json" },
+ getAuthHeaderOptions(token)
+ )
+ }).then(fetchRespHandler),
+};
+
+export default canFiltersAPI;
diff --git a/src/services/__mocks__/CANFiltersAPI.js b/src/services/__mocks__/CANFiltersAPI.js
new file mode 100644
index 0000000..09d3315
--- /dev/null
+++ b/src/services/__mocks__/CANFiltersAPI.js
@@ -0,0 +1,25 @@
+const data = [
+ { can_id: "123", interval: 1000 },
+ { can_id: "456", interval: 0 },
+ { can_id: "789-1000", interval: 5 }
+];
+
+const canFiltersAPI = {
+ addFilter: async (vin, filter, token) => {
+ data.push(filter);
+ return filter;
+ },
+ getFilters: async (vin, search, token) => {
+ return { data };
+ },
+ updateFilter: async (vin, canID, filter, token) => {
+ const index = data.findIndex(element => element.can_id === canID);
+ if (index >= 0) data[index] = filter;
+ },
+ deleteFilter: async (vin, canID, token) => {
+ const index = data.findIndex(element => element.can_id === canID);
+ if (index >= 0) data.splice(index, 1);
+ },
+};
+
+export default canFiltersAPI;
diff --git a/src/utils/roles.js b/src/utils/roles.js
index cc76d40..5932fe9 100644
--- a/src/utils/roles.js
+++ b/src/utils/roles.js
@@ -1,17 +1,18 @@
import { parsePayload } from "./jwt";
export const Roles = {
- CREATE: "efcc3025-e2d8-4212-8227-805c7be39d2c",
READ: "a729bbd4-2038-4649-9127-16782bb1e701",
+ CREATE: "efcc3025-e2d8-4212-8227-805c7be39d2c",
+ DELETE: "8f78dce7-f5f9-4033-a10c-c9c7408bfcfe"
}
export const hasRoleToken = (roles, token) => {
if (!roles || roles.length === 0) return true;
-
+
const groups = getGroups(token);
if (!groups) return false;
-
+
return hasRole(roles, groups);
}
@@ -26,7 +27,7 @@ export const getGroups = (token) => {
export const hasRole = (roles, groups) => {
if (!roles || roles.length === 0) return true;
if (!groups) return false;
-
+
for (let role of roles) {
if (groups.indexOf(role) > -1) return true;
}