Merge branch 'release/0.9.0'

This commit is contained in:
jwu-fisker
2023-06-14 08:45:22 -07:00
15 changed files with 1168 additions and 651 deletions

View File

@@ -122,14 +122,17 @@ export const FleetProvider = ({ children }) => {
}
};
const addFleetVehicle = async (name, vehicle, token) => {
const addFleetVehicles = async (name, vehicles, token) => {
try {
setBusy(true);
validateFleetName(name);
validateVIN(vehicle.vin);
const result = await api.addFleetVehicle(name, vehicle, token);
for (const vin of vehicles.vins) {
validateVIN(vin);
}
const result = await api.addFleetVehicles(name, vehicles, token);
if (result.error) {
throw new Error(`Add fleet vehicle error. ${result.message}`);
}
@@ -250,7 +253,7 @@ export const FleetProvider = ({ children }) => {
fleetVehicles,
totalFleetVehicles,
getFleetVehicles,
addFleetVehicle,
addFleetVehicles,
deleteFleetVehicle,
fleetCANFilters,

View File

@@ -391,14 +391,14 @@ describe("FleetContext", () => {
});
});
describe("addFleetVehicle", () => {
describe("addFleetVehicles", () => {
beforeEach(async () => {
const TestComp = () => {
const { busy, addFleetVehicle } = useFleetContext();
const { busy, addFleetVehicles } = useFleetContext();
const { message, setMessage } = useStatusContext();
const add = async (name, vehicle) => {
try {
await addFleetVehicle(name, vehicle);
await addFleetVehicles(name, vehicle);
} catch (e) {
setMessage(e.message);
}
@@ -417,8 +417,8 @@ describe("FleetContext", () => {
onClick={() => add({})}
/>
<button
data-testid="addFleetVehicle"
onClick={() => add("US-TEST", { vin: "TESTVIN1234567890" })}
data-testid="addFleetVehicles"
onClick={() => add("US-TEST", { vins: ["TESTVIN1234567890"] })}
/>
</>
);
@@ -456,8 +456,8 @@ describe("FleetContext", () => {
checkBaseResults("Invalid name", "false");
});
it("addFleetVehicle", async () => {
fireEvent.click(screen.getByTestId("addFleetVehicle"));
it("addFleetVehicles", async () => {
fireEvent.click(screen.getByTestId("addFleetVehicles"));
await waitFor(() =>
expect(screen.getByTestId("busy").innerHTML).toEqual("false")
);

View File

@@ -63,7 +63,7 @@ export const useFleetContext = () => ({
fleetVehicles,
totalFleetVehicles,
getFleetVehicles: jest.fn(),
addFleetVehicle: jest.fn(),
addFleetVehicles: jest.fn(),
deleteFleetVehicle: jest.fn(),
fleetCANFilters,