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-10-05 14:18:38 -07:00
parent a1ac3888fa 036f3f8c48
commit 2414aa5c28
45 changed files with 1127 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Fleets/Add/__snapshots__/index.test.jsx.snap
View File

@@ -248,7 +248,7 @@ exports[`FleetAddForm Render 1`] = `
class="PrivateSwitchBase-input-0"
name="log-level-group"
type="radio"
value="warn"
value="warning"
/>
<div
class="PrivateRadioButtonIcon-root-0"
@@ -282,7 +282,7 @@ exports[`FleetAddForm Render 1`] = `
<span
class="MuiTypography-root MuiFormControlLabel-label MuiTypography-body1"
>
Warn
Warning
</span>
</label>
<label

2
src/components/Fleets/Add/index.jsx
View File

@@ -129,7 +129,7 @@ const MainForm = () => {
<FormControlLabel value="trace" control={<Radio />} label="Trace" />
<FormControlLabel value="debug" control={<Radio />} label="Debug" />
<FormControlLabel value="info" control={<Radio />} label="Info" />
<FormControlLabel value="warn" control={<Radio />} label="Warn" />
<FormControlLabel value="warning" control={<Radio />} label="Warning" />
<FormControlLabel value="error" control={<Radio />} label="Error" />
<FormControlLabel value="critical" control={<Radio />} label="Critical" />
</RadioGroup>

12
src/components/Fleets/Status/Vehicles/Table/__snapshots__/index.test.jsx.snap
View File

@@ -153,7 +153,7 @@ exports[`FleetVehiclesTable Render 1`] = `
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
>
<div>
<span>
<a
class=""
href="/"
@@ -172,7 +172,7 @@ exports[`FleetVehiclesTable Render 1`] = `
</svg>
</a>
<div />
</div>
</span>
</td>
</tr>
<tr
@@ -190,7 +190,7 @@ exports[`FleetVehiclesTable Render 1`] = `
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
>
<div>
<span>
<a
class=""
href="/"
@@ -209,7 +209,7 @@ exports[`FleetVehiclesTable Render 1`] = `
</svg>
</a>
<div />
</div>
</span>
</td>
</tr>
<tr
@@ -227,7 +227,7 @@ exports[`FleetVehiclesTable Render 1`] = `
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
>
<div>
<span>
<a
class=""
href="/"
@@ -246,7 +246,7 @@ exports[`FleetVehiclesTable Render 1`] = `
</svg>
</a>
<div />
</div>
</span>
</td>
</tr>
</tbody>

4
src/components/Fleets/Status/Vehicles/Table/index.jsx
View File

@@ -147,7 +147,7 @@ const MainForm = ({ name }) => {
);
} else {
return (
<div>
<span key={`delete-${action.id}-of-div`}>
<Tooltip key={`delete-${action.id}`} title={action.tip}>
<Link to="#" onClick={() => onDelete(action.id)}>
{action.icon}
@@ -159,7 +159,7 @@ const MainForm = ({ name }) => {
close={() => setShowDeleteModal(false)}
deleteFunction={() => onDelete(action.id)}
/>
</div>
</span>
);
}
});

12
src/components/Fleets/Status/__snapshots__/VehiclesTab.test.jsx.snap
View File

@@ -152,7 +152,7 @@ exports[`VehiclesTab Render 1`] = `
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
>
<div>
<span>
<a
class=""
href="/"
@@ -171,7 +171,7 @@ exports[`VehiclesTab Render 1`] = `
</svg>
</a>
<div />
</div>
</span>
</td>
</tr>
<tr
@@ -189,7 +189,7 @@ exports[`VehiclesTab Render 1`] = `
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
>
<div>
<span>
<a
class=""
href="/"
@@ -208,7 +208,7 @@ exports[`VehiclesTab Render 1`] = `
</svg>
</a>
<div />
</div>
</span>
</td>
</tr>
<tr
@@ -226,7 +226,7 @@ exports[`VehiclesTab Render 1`] = `
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
>
<div>
<span>
<a
class=""
href="/"
@@ -245,7 +245,7 @@ exports[`VehiclesTab Render 1`] = `
</svg>
</a>
<div />
</div>
</span>
</td>
</tr>
</tbody>

2
src/components/Fleets/Table/__snapshots__/index.test.jsx.snap
View File

@@ -304,7 +304,7 @@ exports[`FleetTable Render 1`] = `
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
>
warn
warning
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"

4
src/components/Fleets/Update/__snapshots__/index.test.jsx.snap
View File

@@ -248,7 +248,7 @@ exports[`FleetUpdate Render 1`] = `
class="PrivateSwitchBase-input-0"
name="log-level-group"
type="radio"
value="warn"
value="warning"
/>
<div
class="PrivateRadioButtonIcon-root-0"
@@ -282,7 +282,7 @@ exports[`FleetUpdate Render 1`] = `
<span
class="MuiTypography-root MuiFormControlLabel-label MuiTypography-body1"
>
Warn
Warning
</span>
</label>
<label

92
src/components/Fleets/Update/index.jsx
View File

@@ -9,30 +9,30 @@ import {
FormLabel,
Radio,
RadioGroup,
TextField
TextField,
} from "@material-ui/core";
import useStyles from "../../useStyles";
import {
useFleetContext,
FleetProvider
} from "../../Contexts/FleetContext";
import { useFleetContext, FleetProvider } from "../../Contexts/FleetContext";
import { useStatusContext } from "../../Contexts/StatusContext";
import { useUserContext } from "../../Contexts/UserContext";
import { logger } from "../../../services/monitoring";
const MainForm = () => {
const queries = new URLSearchParams(useLocation().search);
const { fleet, getFleet, updateFleet, busy } = useFleetContext();
const { token: { idToken: { jwtToken: token } } } = useUserContext();
const {
token: {
idToken: { jwtToken: token },
},
} = useUserContext();
const { setMessage, setTitle, setSitePath } = useStatusContext();
const [redirect, setRedirect] = useState(null);
const classes = useStyles();
const [name, setName] = useState(queries.get("name") ?? "");
const [oldName, ] = useState(name);
const [oldName] = useState(name);
const [selectedLogLevel, setSelectedLogLevel] = useState("info");
const [canbusEnabled, setCANBusEnabled] = useState(true);
const [dataLoggerEnabled, setDataLoggerEnabled] = useState(false);
@@ -71,36 +71,40 @@ const MainForm = () => {
if (fleet.canbus) {
setCANBusEnabled(fleet.canbus.enabled ?? canbusEnabled);
setDataLoggerEnabled(fleet.canbus.data_logger_enabled ?? dataLoggerEnabled);
setDataLoggerEnabled(
fleet.canbus.data_logger_enabled ?? dataLoggerEnabled
);
setMaxMemBufferSize(fleet.canbus.max_mem_buffer_size ?? maxMemBufferSize);
setMaxDiskBufferSize(fleet.canbus.max_disk_buffer_size ?? maxDiskBufferSize);
setMaxDiskBufferSize(
fleet.canbus.max_disk_buffer_size ?? maxDiskBufferSize
);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [fleet]);
const onNameChange = (event) => {
setName(event.target.value);
}
};
const onLogLevelChange = (event) => {
setSelectedLogLevel(event.target.value);
}
};
const onCANBusChange = (event) => {
setCANBusEnabled(event.target.checked);
}
};
const onDataLoggerChange = (event) => {
setDataLoggerEnabled(event.target.checked);
}
};
const onMaxMemBufferSizeChange = (event) => {
setMaxMemBufferSize(event.target.value);
}
};
const onMaxDiskBufferSizeChange = (event) => {
setMaxDiskBufferSize(event.target.value);
}
};
const onSubmit = async (event) => {
try {
@@ -112,12 +116,13 @@ const MainForm = () => {
enabled: canbusEnabled,
data_logger_enabled: canbusEnabled ? dataLoggerEnabled : false,
max_mem_buffer_size: canbusEnabled ? parseInt(maxMemBufferSize) : 0,
max_disk_buffer_size: canbusEnabled && dataLoggerEnabled ? parseInt(maxDiskBufferSize) : 0
}
max_disk_buffer_size:
canbusEnabled && dataLoggerEnabled
? parseInt(maxDiskBufferSize)
: 0,
},
};
console.log(oldName);
const result = await updateFleet(oldName, formData, token);
if (!result || result.error) return;
@@ -162,22 +167,30 @@ const MainForm = () => {
<FormControlLabel value="trace" control={<Radio />} label="Trace" />
<FormControlLabel value="debug" control={<Radio />} label="Debug" />
<FormControlLabel value="info" control={<Radio />} label="Info" />
<FormControlLabel value="warn" control={<Radio />} label="Warn" />
<FormControlLabel
value="warning"
control={<Radio />}
label="Warning"
/>
<FormControlLabel value="error" control={<Radio />} label="Error" />
<FormControlLabel value="critical" control={<Radio />} label="Critical" />
<FormControlLabel
value="critical"
control={<Radio />}
label="Critical"
/>
</RadioGroup>
<FormLabel id="demo-row-radio-buttons-group-label">CAN Bus</FormLabel>
<FormGroup>
<FormControlLabel control={
<Checkbox
checked={canbusEnabled}
onChange={onCANBusChange}
/>
} label="CAN Bus Enabled" />
<FormControlLabel
control={
<Checkbox checked={canbusEnabled} onChange={onCANBusChange} />
}
label="CAN Bus Enabled"
/>
<TextField
id="max_mem_buffer_size"
name="max_mem_buffer_size"
label='Max Memory Buffer Size (0 uses default size)'
label="Max Memory Buffer Size (0 uses default size)"
value={maxMemBufferSize}
onChange={onMaxMemBufferSizeChange}
variant="outlined"
@@ -190,18 +203,21 @@ const MainForm = () => {
required
fullWidth
/>
<FormControlLabel control={
<Checkbox
checked={dataLoggerEnabled}
onChange={onDataLoggerChange}
disabled={!canbusEnabled}
/>
} label="Data Logger Enabled" />
<FormControlLabel
control={
<Checkbox
checked={dataLoggerEnabled}
onChange={onDataLoggerChange}
disabled={!canbusEnabled}
/>
}
label="Data Logger Enabled"
/>
</FormGroup>
<TextField
id="max_disk_buffer_size"
name="max_disk_buffer_size"
label='Max Disk Buffer Size (0 uses default size)'
label="Max Disk Buffer Size (0 uses default size)"
value={maxDiskBufferSize}
onChange={onMaxDiskBufferSizeChange}
variant="outlined"
@@ -236,4 +252,4 @@ const FleetUpdateForm = (props) => (
</FleetProvider>
);
export default FleetUpdateForm;
export default FleetUpdateForm;