Merge branch 'release/0.0.3'

This commit is contained in:
jwu-fisker
2022-11-22 17:16:22 -08:00
79 changed files with 1409 additions and 1011 deletions

View File

@@ -1,5 +1,3 @@
import React, { useEffect, useState } from "react";
import { Link } from "react-router-dom";
import {
Grid,
Table,
@@ -8,25 +6,27 @@ import {
TableFooter,
TablePagination,
TableRow,
Tooltip,
Tooltip
} from "@material-ui/core";
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 TableHeaderSortable from "../../../../Table/HeaderSortable";
import { useUserContext } from "../../../../Contexts/UserContext";
import { useStatusContext } from "../../../../Contexts/StatusContext";
import { logger } from "../../../../../services/monitoring";
import { hasRole, Permissions } from "../../../../../utils/roles";
import {
FleetProvider,
useFleetContext,
useFleetContext
} from "../../../../Contexts/FleetContext";
import useStyles from "../../../../useStyles";
import { useStatusContext } from "../../../../Contexts/StatusContext";
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 DeleteConfirmation from "../../../../DeleteConfirmation";
import TableHeaderSortable from "../../../../Table/HeaderSortable";
import { useLocalStorage } from "../../../../useLocalStorage";
import useStyles from "../../../../useStyles";
const tableColumns = [
{
@@ -61,6 +61,7 @@ const MainForm = ({ name }) => {
idToken: { jwtToken: token },
},
groups,
providers,
} = useUserContext();
const handleSearch = (query) => {
@@ -127,7 +128,7 @@ const MainForm = ({ name }) => {
const Actions = (vin) => {
let actions = [];
if (hasRole([Roles.DELETE], groups)) {
if (hasRole(groups, Permissions.FiskerDelete, providers)) {
actions.push({
tip: `Delete "${vin}"`,
id: vin,