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

Merge branch 'release/0.0.3'

Browse Source
This commit is contained in:
jwu-fisker
2022-11-22 18:35:06 -08:00
parent e447b34de9 b26423f71d
commit 2412ba6f6b
15 changed files with 430 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/components/Fleets/Status/CANFilters/Add/__snapshots__/index.test.jsx.snap
View File

@@ -152,6 +152,43 @@ exports[`FleetCANFilterAdd Render 1`] = `
</fieldset>
</div>
</div>
<div
class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined"
data-shrink="false"
for="edgeMask"
id="edgeMask-label"
>
EdgeMask (hex representation)
</label>
<div
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl"
>
<input
aria-invalid="false"
class="MuiInputBase-input MuiOutlinedInput-input"
id="edgeMask"
maxlength="255"
name="edgeMask"
type="text"
value=""
/>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-0 MuiOutlinedInput-notchedOutline"
>
<legend
class="PrivateNotchedOutline-legendLabelled-0"
>
<span>
EdgeMask (hex representation)
</span>
</legend>
</fieldset>
</div>
</div>
<button
class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-0 MuiButton-containedPrimary MuiButton-fullWidth"
tabindex="0"

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

@@ -1,12 +1,13 @@
import React, { useEffect, useRef, useState } from "react";
import React, { useEffect, useState } from "react";
import { Redirect, useParams } from "react-router";
import { Button, TextField } from "@material-ui/core";
import { TextField } from "@material-ui/core";
import { useUserContext } from "../../../../Contexts/UserContext";
import { useStatusContext } from "../../../../Contexts/StatusContext";
import { useFleetContext, FleetProvider } from "../../../../Contexts/FleetContext";
import useStyles from "../../../../useStyles";
import { logger } from "../../../../../services/monitoring";
import { CANFilterFragment } from "../../../../CANFilterEditFragment";
const MainForm = () => {
@@ -15,8 +16,9 @@ const MainForm = () => {
const { addFleetCANFilter, busy } = useFleetContext();
const { token: { idToken: { jwtToken: token } } } = useUserContext();
const classes = useStyles();
const canIdEl = useRef(null);
const intervalEl = useRef(null);
const [canId, setCanId] = useState(null);
const [interval, setInterval] = useState("");
const [edgeMask, setEdgeMask] = useState("");
const [redirect, setRedirect] = useState(null);
useEffect(() => {
@@ -41,9 +43,11 @@ const MainForm = () => {
const onSubmit = async (event) => {
try {
event.preventDefault();
const formData = {
can_id: canIdEl.current.value,
interval: parseInt(intervalEl.current.value)
can_id: canId,
interval: (interval == null || interval === "") ? null : interval,
edge_mask: edgeMask === "" ? null : edgeMask,
};
const result = await addFleetCANFilter(name, formData, token);
if (!result || result.error) return;
@@ -77,42 +81,17 @@ const MainForm = () => {
required
fullWidth
/>
<TextField
id="canId"
name="canId"
label="CAN ID"
variant="outlined"
margin="normal"
inputProps={{
maxLength: "255",
}}
required
fullWidth
inputRef={canIdEl}
<CANFilterFragment
fleet={name}
canId={canId}
setCanId={setCanId}
interval={interval}
setInterval={setInterval}
edgeMask={edgeMask}
setEdgeMask={setEdgeMask}
busy={busy}
onSubmit={onSubmit}
/>
<TextField
id="interval"
name="interval"
label="Interval (ms)"
variant="outlined"
margin="normal"
inputProps={{
maxLength: "255",
}}
fullWidth
inputRef={intervalEl}
/>
<Button
type="submit"
disabled={busy}
fullWidth
variant="contained"
color="primary"
className={classes.submit}
onClick={onSubmit}
>
{busy ? "Submitting..." : "Submit"}
</Button>
</form>
</div>
);

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

@@ -131,10 +131,18 @@ const MainForm = ({ name }) => {
const Actions = (row) => {
let actions = [];
if (hasRole(groups, Permissions.FiskerCreate, providers)) {
let link = `/fleet/${name}/filter-update?name=${name}&can_id=${row.can_id}`;
if (row.interval || row.interval===0) {
link = link + `&interval=${row.interval}`
}
if (row.edge_mask) {
link = link + `&edge_mask=${row.edge_mask}`
}
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}`} />,
link,
icon: <EditIcon aria-label={`Update ${row.can_id}`} />
});
}
if (hasRole(groups, Permissions.FiskerDelete, providers)) {

103
src/components/Fleets/Status/CANFilters/Update/__snapshots__/index.test.jsx.snap
View File

@@ -26,54 +26,7 @@ exports[`FleetCANFilterUpdate Render 1`] = `
class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined Mui-required Mui-required"
data-shrink="false"
for="name"
id="name-label"
>
Fleet Name
<span
aria-hidden="true"
class="MuiFormLabel-asterisk MuiInputLabel-asterisk"
>
 
*
</span>
</label>
<div
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl"
>
<input
aria-invalid="false"
class="MuiInputBase-input MuiOutlinedInput-input"
id="name"
maxlength="255"
name="name"
readonly=""
required=""
type="text"
value=""
/>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-0 MuiOutlinedInput-notchedOutline"
>
<legend
class="PrivateNotchedOutline-legendLabelled-0"
>
<span>
Fleet Name
 *
</span>
</legend>
</fieldset>
</div>
</div>
<div
class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined Mui-required Mui-required"
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined Mui-disabled Mui-disabled Mui-required Mui-required"
data-shrink="false"
for="canId"
id="canId-label"
@@ -88,15 +41,15 @@ exports[`FleetCANFilterUpdate Render 1`] = `
</span>
</label>
<div
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl"
class="MuiInputBase-root MuiOutlinedInput-root Mui-disabled Mui-disabled MuiInputBase-fullWidth MuiInputBase-formControl"
>
<input
aria-invalid="false"
class="MuiInputBase-input MuiOutlinedInput-input"
class="MuiInputBase-input MuiOutlinedInput-input Mui-disabled Mui-disabled"
disabled=""
id="canId"
maxlength="255"
name="canId"
readonly=""
required=""
type="text"
value=""
@@ -120,19 +73,12 @@ exports[`FleetCANFilterUpdate Render 1`] = `
class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined Mui-required Mui-required"
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined"
data-shrink="false"
for="interval"
id="interval-label"
>
Interval (ms)
<span
aria-hidden="true"
class="MuiFormLabel-asterisk MuiInputLabel-asterisk"
>
 
*
</span>
</label>
<div
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl"
@@ -143,7 +89,6 @@ exports[`FleetCANFilterUpdate Render 1`] = `
id="interval"
maxlength="255"
name="interval"
required=""
type="text"
value=""
/>
@@ -156,7 +101,43 @@ exports[`FleetCANFilterUpdate Render 1`] = `
>
<span>
Interval (ms)
 *
</span>
</legend>
</fieldset>
</div>
</div>
<div
class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined"
data-shrink="false"
for="edgeMask"
id="edgeMask-label"
>
EdgeMask (hex representation)
</label>
<div
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl"
>
<input
aria-invalid="false"
class="MuiInputBase-input MuiOutlinedInput-input"
id="edgeMask"
maxlength="255"
name="edgeMask"
type="text"
value=""
/>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-0 MuiOutlinedInput-notchedOutline"
>
<legend
class="PrivateNotchedOutline-legendLabelled-0"
>
<span>
EdgeMask (hex representation)
</span>
</legend>
</fieldset>

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

@@ -1,13 +1,13 @@
import React, { useEffect, useRef, useState } from "react";
import React, { useEffect, useState } from "react";
import { Redirect, useParams } from "react-router";
import { useLocation } from "react-router-dom";
import { Button, TextField } from "@material-ui/core";
import { useUserContext } from "../../../../Contexts/UserContext";
import { useStatusContext } from "../../../../Contexts/StatusContext";
import { useFleetContext, FleetProvider } from "../../../../Contexts/FleetContext";
import useStyles from "../../../../useStyles";
import { logger } from "../../../../../services/monitoring";
import {CANFilterFragment} from "../../../../CANFilterEditFragment";
const MainForm = () => {
@@ -16,11 +16,12 @@ const MainForm = () => {
const { updateFleetCANFilter, busy } = useFleetContext();
const { token: { idToken: { jwtToken: token } } } = useUserContext();
const classes = useStyles();
const intervalEl = useRef(null);
const [redirect, setRedirect] = useState(null);
const queries = new URLSearchParams(useLocation().search);
const canID = queries.get("can_id") ?? "";
const interval = queries.get("interval") ?? "";
const [interval, setInterval] = useState(queries.get("interval") ?? "");
const [edgeMask, setEdgeMask] = useState(queries.get("edge_mask") ?? "")
const [redirect, setRedirect] = useState(null);
useEffect(() => {
const title = "Update CAN Filter"
@@ -46,7 +47,8 @@ const MainForm = () => {
event.preventDefault();
const formData = {
can_id: canID,
interval: parseInt(intervalEl.current.value)
interval: (interval == null || interval === "") ? null : interval,
edge_mask: edgeMask === "" ? null : edgeMask,
};
const result = await updateFleetCANFilter(name, canID, formData, token);
if (!result || result.error) return;
@@ -66,59 +68,16 @@ const MainForm = () => {
return (
<div className={classes.paper}>
<form className={classes.form} noValidate action="{onSubmit}">
<TextField
id="name"
name="name"
label="Fleet Name"
variant="outlined"
margin="normal"
inputProps={{
maxLength: "255",
readOnly: true,
}}
value={name}
required
fullWidth
<CANFilterFragment
fleet={name}
canId={canID}
interval={interval}
setInterval={setInterval}
edgeMask={edgeMask}
setEdgeMask={setEdgeMask}
busy={busy}
onSubmit={onSubmit}
/>
<TextField
id="canId"
name="canId"
label="CAN ID"
variant="outlined"
margin="normal"
inputProps={{
maxLength: "255",
readOnly: true,
}}
value={canID}
required
fullWidth
/>
<TextField
id="interval"
name="interval"
label="Interval (ms)"
variant="outlined"
margin="normal"
inputProps={{
maxLength: "255",
}}
defaultValue={interval}
required
fullWidth
inputRef={intervalEl}
/>
<Button
type="submit"
disabled={busy}
fullWidth
variant="contained"
color="primary"
className={classes.submit}
onClick={onSubmit}
>
{busy ? "Submitting..." : "Submit"}
</Button>
</form>
</div>
);