Merge branch 'main' into release/0.10.0

This commit is contained in:
Tristan Timblin
2023-08-03 20:06:44 -04:00
committed by GitHub
8 changed files with 41 additions and 34 deletions

View File

@@ -23,7 +23,7 @@ const checkVehiclesResult = (error, busy, vehicles) => {
const checkFleetsResult = (error, busy, fleets) => { const checkFleetsResult = (error, busy, fleets) => {
checkBaseResults(error, busy); checkBaseResults(error, busy);
expect(screen.getByTestId("fleets").innerHTML).toEqual(fleets); expect(screen.getByTestId("fleets").innerHTML).toEqual(fleets);
} };
const checkBaseResults = (error, busy) => { const checkBaseResults = (error, busy) => {
expect(screen.getByTestId("error").innerHTML).toEqual(error); expect(screen.getByTestId("error").innerHTML).toEqual(error);
@@ -69,7 +69,7 @@ describe("VehicleContext", () => {
); );
checkFleetsResult("", "false", JSON.stringify(["fleet1", "fleet2"])); checkFleetsResult("", "false", JSON.stringify(["fleet1", "fleet2"]));
}); });
}) });
describe("getVehicles", () => { describe("getVehicles", () => {
beforeEach(() => { beforeEach(() => {

View File

@@ -19,8 +19,8 @@ export const Parameters = (props) => {
{params.dataFunc(data, handleDataChange)} {params.dataFunc(data, handleDataChange)}
</div> </div>
</FormControl> </FormControl>
) );
} };
Parameters.propTypes = { Parameters.propTypes = {
params: PropTypes.any, params: PropTypes.any,

View File

@@ -5,7 +5,7 @@ import addSnapshotSerializer from "../../../utils/snapshot";
const renderState = { const renderState = {
EMPTY: 0, EMPTY: 0,
JUST_DATA: 1, JUST_DATA: 1,
} };
const renderParameters = async (rs) => { const renderParameters = async (rs) => {
await waitFor(() => { await waitFor(() => {
@@ -13,37 +13,40 @@ const renderParameters = async (rs) => {
}); });
if (rs === renderState.EMPTY) { if (rs === renderState.EMPTY) {
const { container } = render(<Parameters/>) const { container } = render(<Parameters />);
return container; return container;
} }
const params = {dataFunc:(val, handleValChange) => <div>val.toString()</div>} const params = {
dataFunc: (val, handleValChange) => <div>val.toString()</div>,
};
const [data, handleDataChange] = [true, (_) => {}]; const [data, handleDataChange] = [true, (_) => {}];
if (rs === renderState.JUST_DATA) { if (rs === renderState.JUST_DATA) {
const { container } = render(<Parameters const { container } = render(
<Parameters
params={params} params={params}
data={data} data={data}
handleDataChange={handleDataChange} handleDataChange={handleDataChange}
/>) />
);
return container; return container;
} }
} };
describe("Params", () => { describe("Params", () => {
beforeAll(() => { beforeAll(() => {
addSnapshotSerializer(expect); addSnapshotSerializer(expect);
}) });
it("Render empty", async () => { it("Render empty", async () => {
const container = await renderParameters(renderState.EMPTY); const container = await renderParameters(renderState.EMPTY);
expect(container).toMatchSnapshot(); expect(container).toMatchSnapshot();
}) });
it("Render just data", async () => { it("Render just data", async () => {
const container = await renderParameters(renderState.JUST_DATA); const container = await renderParameters(renderState.JUST_DATA);
expect(container).toMatchSnapshot(); expect(container).toMatchSnapshot();
}) });
}) });

View File

@@ -6,7 +6,7 @@ import {
TableFooter, TableFooter,
TablePagination, TablePagination,
TableRow, TableRow,
Tooltip, Tooltip
} from "@material-ui/core"; } from "@material-ui/core";
import AddCircleIcon from "@material-ui/icons/AddCircle"; import AddCircleIcon from "@material-ui/icons/AddCircle";
import DeleteIcon from "@material-ui/icons/Delete"; import DeleteIcon from "@material-ui/icons/Delete";
@@ -18,7 +18,7 @@ import { logger } from "../../../../../services/monitoring";
import { hasRole, Permissions } from "../../../../../utils/roles"; import { hasRole, Permissions } from "../../../../../utils/roles";
import { import {
FleetProvider, FleetProvider,
useFleetContext, useFleetContext
} from "../../../../Contexts/FleetContext"; } from "../../../../Contexts/FleetContext";
import { useStatusContext } from "../../../../Contexts/StatusContext"; import { useStatusContext } from "../../../../Contexts/StatusContext";
import { useUserContext } from "../../../../Contexts/UserContext"; import { useUserContext } from "../../../../Contexts/UserContext";

View File

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