merging dev into branch

This commit is contained in:
Drew Taylor
2021-07-22 09:53:32 -07:00
26 changed files with 3619 additions and 240 deletions

View File

@@ -0,0 +1,176 @@
import React, { useContext, useState } from "react";
import api from "../../services/updates";
const CarUpdatesContext = React.createContext();
const validateDeployCarUpdates = (data) => {
if (data === null) {
throw new Error("No car update data");
}
if (!data.manifest_id || data.manifest_id === 0) {
throw new Error("Manifest id required");
}
if (!data.vins || data.vins.length === 0) {
throw new Error("Cars are required");
}
};
export const CarUpdatesProvider = ({ children }) => {
const [busy, setBusy] = useState(false);
const [carUpdates, setCarUpdates] = useState([]);
const [totalCarUpdates, setTotalCarUpdates] = useState(0);
const [delayCount, setDelayCount] = useState(0);
let progressTimer = 0;
const deployCarUpdates = async (data, token) => {
let result;
try {
setBusy(true);
validateDeployCarUpdates(data);
result = await api.createCarUpdates(data, token);
if (result.error)
throw new Error(`Deploy car updates error. ${result.message}`);
} finally {
setBusy(false);
}
return result;
};
const getCarUpdates = async (search, token) => {
let result;
try {
setBusy(true);
result = await api.getCarUpdates(search, token);
if (result.error)
throw new Error(`Get car updates error. ${result.message}`);
setCarUpdates(result.data);
if (search && search.offset === 0 && result.total) {
setTotalCarUpdates(result.total);
}
} finally {
setBusy(false);
}
return result;
};
const getVINUpdates = async (vin, token) => {
let result;
try {
setBusy(true);
result = await api.getVINUpdates(vin, token);
if (result.error)
throw new Error(`Get VIN updates error. ${result.message}`);
} finally {
setBusy(false);
}
return result;
};
const applyProgressStatus = (item, status) => {
if (status.msg === "DONE") {
delete item.progress;
item.status = "downloaded";
} else if (status.msg === "downloading" && status.total > 0) {
let progress = Math.floor((100 * status.bytes) / status.total);
if (progress > 99) progress = 0;
item.progress = progress;
item.status = `downloading ${progress}%`;
} else if (status.error > 0) {
item.status = "download error";
} else {
item.status = "downloading";
}
};
const applyProgressStatuses = (statuses) => {
let items = JSON.parse(JSON.stringify(carUpdates));
statuses.forEach((status) => {
let item = items.find((item) => status.id === item.id);
if (!item || status.id === 0) return;
applyProgressStatus(item, status);
});
setCarUpdates(items);
};
const updateStatusProgress = async (token) => {
stopMonitor();
if (!token || carUpdates.length === 0) return;
try {
setBusy(true);
const carupdateids = carUpdates.reduce((accum, update) => {
if (update.status !== "downloaded") accum.push(update.id);
return accum;
}, []);
if (carupdateids.length === 0) return;
const result = await api.getCarUpdateProgress(
carupdateids.join(","),
token
);
if (result.error)
throw new Error(`Get update progress error. ${result.message}`);
applyProgressStatuses(result.statuses);
} catch (e) {
} finally {
setBusy(false);
}
};
const getDelay = () => {
if (delayCount < 3) {
setDelayCount(delayCount + 1);
return 1000;
}
for (let i = 0, len = carUpdates.length; i < len; i++) {
if (carUpdates[i].status.indexOf("downloading") > -1) return 1000;
}
return 10000;
};
const startMonitor = async (token) => {
const delay = getDelay();
stopMonitor();
progressTimer = setTimeout(() => {
updateStatusProgress(token);
}, delay);
};
const stopMonitor = async () => {
if (progressTimer === 0) return;
clearTimeout(progressTimer);
progressTimer = 0;
};
return (
<CarUpdatesContext.Provider
value={{
busy,
carUpdates,
totalCarUpdates,
deployCarUpdates,
getCarUpdates,
getVINUpdates,
startMonitor,
stopMonitor,
}}
>
{children}
</CarUpdatesContext.Provider>
);
};
export const useCarUpdatesContext = () => useContext(CarUpdatesContext);

View File

@@ -0,0 +1,66 @@
import React, { useContext, useState } from "react";
import api from "../../services/manifests";
const ManifestsContext = React.createContext();
export const ManifestsProvider = ({ children }) => {
const [busy, setBusy] = useState(false);
const [manifests, setManifests] = useState([]);
const [totalManifests, setTotalManifests] = useState(0);
const getManifests = async (search, token) => {
let result;
try {
setBusy(true);
result = await api.getManifests(search, token);
if (result.error)
throw new Error(`Get manifests error. ${result.message}`);
setManifests(result.data);
if (search && search.offset === 0 && result.total) {
setTotalManifests(result.total);
}
} finally {
setBusy(false);
}
return result;
};
const deleteManifest = async (package_id, token) => {
let result;
const index = manifests.findIndex((element) => {
return element.id === package_id;
});
manifests.splice(index, 1);
try {
setBusy(true);
result = await api.deleteManifest(package_id, token);
if (result.error)
throw new Error(`Delete manifest error. ${result.message}`);
} finally {
setBusy(false);
}
return result;
};
return (
<ManifestsContext.Provider
value={{
busy,
manifests,
totalManifests,
getManifests,
deleteManifest,
}}
>
{children}
</ManifestsContext.Provider>
);
};
export const useManifestsContext = () => useContext(ManifestsContext);

View File

@@ -13,7 +13,7 @@ import { TEST_AUTH_OBJECT } from "../../utils/testing";
describe("UpdatesContext", () => {
describe("getPackages", () => {
const expectedData = `[{"id":1,"package_name":"Test","version":"1.0","link":"http://cloudfront.com/download"},{"id":2,"package_name":"Test","version":"1.1","link":"http://cloudfront.com/download"},{"id":3,"package_name":"Test","version":"1.2","link":"http://cloudfront.com/download"}]`;
const expectedData = `[{"id":1,"package_name":"Test","version":"1.0","link":"http://cloudfront.com/download","ecu_list":"ECU1 1.0.0,ECU2 1.0.2"},{"id":2,"package_name":"Test","version":"1.1","link":"http://cloudfront.com/download","ecu_list":"ECU1 1.0.1,ECU2 1.0.2"},{"id":3,"package_name":"Test","version":"1.2","link":"http://cloudfront.com/download","ecu_list":"ECU1 1.1.0,ECU2 1.1.2"}]`;
const checkState = (busy, packages, message) => {
expect(screen.getByTestId("busy").innerHTML).toEqual(busy);
expect(screen.getByTestId("packages").innerHTML).toEqual(packages);

View File

@@ -134,11 +134,30 @@ describe("VehicleContext", () => {
});
const expectedVehicleData = [
{ vin: "3C4PDCBG0ET127145", connected: true },
{
vin: "3C4PDCBG0ET127145",
year: 2021,
model: "Ocean",
trim: "Basic",
ecu_list: "ECUA 2.0.0, ECUB 2.1.1",
connected: true,
},
{ vin: "1G1FP87S3GN100062", connected: true },
{ vin: "1HGCG325XYA062256", connected: true },
{ vin: "1J4GZ78YXWC160024", connected: true },
{ vin: "2C3CCAAG8CH222800", connected: true },
{ vin: "KNADM4A39C6028108", connected: true },
{ vin: "1G11C5SL9FF153507", connected: true },
{ vin: "1HGCG325XYA062256", year: 2021, connected: true },
{ vin: "1J4GZ78YXWC160024", year: 2021, model: "Ocean", connected: true },
{ vin: "2C3CCAAG8CH222800", model: "Ocean", trim: "Basic", connected: true },
{
vin: "KNADM4A39C6028108",
year: 2021,
model: "Ocean",
trim: "Basic",
connected: true,
},
{
vin: "1G11C5SL9FF153507",
year: 2021,
model: "Ocean",
trim: "Basic",
connected: true,
},
];

View File

@@ -0,0 +1,31 @@
import React from "react";
const CarUpdatesContext = React.createContext();
let busy = false;
let carUpdates = [
{
id: 1,
vin: "1G1FP87S3GN100062",
updatepackage_id: 18,
status: "downloaded",
created: "2021-07-01T22:40:07.778509Z",
updated: "2021-07-12T18:22:13.736755Z",
},
];
let totalCarUpdates = 1;
export const CarUpdatesProvider = ({ children }) => {
return <div data-testid="mocked-carupdatesprovider">{children}</div>;
};
export const useCarUpdatesContext = () => ({
busy,
carUpdates,
totalCarUpdates,
deployCarUpdates: jest.fn((data) => data),
getCarUpdates: jest.fn(() => carUpdates),
getVINUpdates: jest.fn(() => carUpdates),
startMonitor: jest.fn(),
stopMonitor: jest.fn(),
});

View File

@@ -0,0 +1,27 @@
import React from "react";
const ManifestsContext = React.createContext();
let busy = false;
let manifests = [
{
id: 1,
name: "Test Manifest",
version: "1.0",
created: "2021-07-01T22:40:07.778509Z",
updated: "2021-07-12T18:22:13.736755Z",
},
];
let totalManifests = 1;
export const ManifestsProvider = ({ children }) => {
return <div data-testid="mocked-manifestsprovider">{children}</div>;
};
export const useManifestsContext = () => ({
busy,
manifests,
totalManifests,
getManifests: jest.fn(() => manifests),
deleteManifest: jest.fn(),
});

View File

@@ -10,9 +10,11 @@ const examplePackage = {
version: "1.0",
desc: "Description",
release_notes: "https://www.google.com/",
created: Date.now().toString(),
timestamp: 1625615299,
created: "2021-07-01T22:40:07.778509Z",
updated: "2021-07-12T18:22:13.736755Z",
};
packages.push(examplePackage)
packages.push(examplePackage);
let totalPackages = 0;
let carUpdates = [];
let totalCarUpdates = 0;