Merge branch 'develop' into release/0.9.0
This commit is contained in:
@@ -134,7 +134,7 @@ const MainForm = ({ vin }) => {
|
|||||||
<RoleWrap
|
<RoleWrap
|
||||||
groups={groups}
|
groups={groups}
|
||||||
providers={providers}
|
providers={providers}
|
||||||
rolesPerProvider={Permissions.FiskerCreate}
|
rolesPerProvider={Permissions.FiskerMagnaCreate}
|
||||||
>
|
>
|
||||||
<Tooltip key={`update-${vin}`} title={`Update "${vin}"`}>
|
<Tooltip key={`update-${vin}`} title={`Update "${vin}"`}>
|
||||||
<Link to={`/vehicle-update?vin=${vin}`} style={{ margin: 5 }}>
|
<Link to={`/vehicle-update?vin=${vin}`} style={{ margin: 5 }}>
|
||||||
|
|||||||
@@ -198,7 +198,7 @@ const MainForm = ({ vin, token }) => {
|
|||||||
<RoleWrap
|
<RoleWrap
|
||||||
groups={groups}
|
groups={groups}
|
||||||
providers={providers}
|
providers={providers}
|
||||||
rolesPerProvider={Permissions.FiskerCreate}
|
rolesPerProvider={Permissions.FiskerMagnaCreate}
|
||||||
>
|
>
|
||||||
<Tooltip key={row.vin} title={`Send cancel for ${row.vin}`}>
|
<Tooltip key={row.vin} title={`Send cancel for ${row.vin}`}>
|
||||||
<Link to="#" onClick={() => sendCancel(row)}>
|
<Link to="#" onClick={() => sendCancel(row)}>
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ import { LocalDateTimeString } from "../../../utils/dates";
|
|||||||
import { Permissions } from "../../../utils/roles";
|
import { Permissions } from "../../../utils/roles";
|
||||||
import {
|
import {
|
||||||
CarUpdatesProvider,
|
CarUpdatesProvider,
|
||||||
useCarUpdatesContext,
|
useCarUpdatesContext
|
||||||
} from "../../Contexts/CarUpdatesContext";
|
} from "../../Contexts/CarUpdatesContext";
|
||||||
import {
|
import {
|
||||||
ManifestsProvider,
|
ManifestsProvider,
|
||||||
@@ -179,7 +179,7 @@ const MainForm = () => {
|
|||||||
<RoleWrap
|
<RoleWrap
|
||||||
groups={groups}
|
groups={groups}
|
||||||
providers={providers}
|
providers={providers}
|
||||||
rolesPerProvider={Permissions.FiskerCreate}
|
rolesPerProvider={Permissions.FiskerMagnaCreate}
|
||||||
eitherComponent={<>No action</>}
|
eitherComponent={<>No action</>}
|
||||||
>
|
>
|
||||||
<Tooltip key={row.vin} title={`Send cancel for ${row.vin}`}>
|
<Tooltip key={row.vin} title={`Send cancel for ${row.vin}`}>
|
||||||
|
|||||||
@@ -248,7 +248,7 @@ const SiteRoutes = () => {
|
|||||||
type={TYPES.PROTECTED}
|
type={TYPES.PROTECTED}
|
||||||
token={token}
|
token={token}
|
||||||
groups={groups}
|
groups={groups}
|
||||||
rolesPerGroup={Permissions.FiskerCreate}
|
rolesPerGroup={Permissions.FiskerMagnaCreate}
|
||||||
providers={providers}
|
providers={providers}
|
||||||
/>
|
/>
|
||||||
<AuthRoute
|
<AuthRoute
|
||||||
|
|||||||
Reference in New Issue
Block a user