Fix file upload form to handle ota_update service

This commit is contained in:
jwu-fisker
2021-01-15 11:11:51 -08:00
parent 9c3534794b
commit ec4dd7d35d
7 changed files with 25 additions and 13 deletions

View File

@@ -8,6 +8,7 @@ export const FileUploadProvider = ({ children }) => {
const [progress, setProgress] = useState(0);
const [status, setStatus] = useState(null);
const [cancelUpload, setCancelUpload] = useState(null);
const [linkURL, setLinkURL] = useState(null);
const done = () => {
setCancelUpload(null);
@@ -31,18 +32,22 @@ export const FileUploadProvider = ({ children }) => {
const filename = file.name;
setUploading(true);
setLinkURL(null);
setProgress(0);
setStatus(`Uploading ${filename}`);
setCancelUpload(getCancelToken());
const result = await uploadFile(file, setProgress, cancelUpload);
const url = ((result && result.url) ? result.url : "No URL available");
setStatus(`Uploaded ${filename}\n${url}`);
const { data } = await uploadFile(file, setProgress, cancelUpload);
if (data.message) throw new Error(`${data.error}. ${data.message}`);
const url = ((data && data.link) ? data.link : "No URL available");
setLinkURL(url);
setStatus(`Uploaded ${filename}`);
setCancelUpload(null);
setProgress(100);
}
catch (e) {
setStatus(`Error occured: ${e.message}`);
setProgress(-1);
}
};
@@ -51,6 +56,7 @@ export const FileUploadProvider = ({ children }) => {
uploading,
progress,
status,
linkURL,
upload,
cancel,
}}>

View File

@@ -8,12 +8,13 @@ describe("FileUploadContext", () => {
beforeEach(() => {
const TestComp = () => {
const { progress, uploading, status, upload, cancel } = useFileUploadContext();
const { progress, uploading, status, linkURL, upload, cancel } = useFileUploadContext();
return (
<>
<div data-testid="uploading">{uploading.toString()}</div>
<div data-testid="progress">{progress.toString()}</div>
<div data-testid="status">{status}</div>
<div data-testid="linkURL">{linkURL}</div>
<button data-testid="uploadNoFile" onClick={() => upload()}/>
<button data-testid="upload" onClick={() => upload([{ file: { name: "test.jpg" }}])}/>
<button data-testid="cancel" onClick={() => cancel()}/>
@@ -31,20 +32,23 @@ describe("FileUploadContext", () => {
expect(screen.getByTestId("uploading").innerHTML).toEqual("false");
expect(screen.getByTestId("progress").innerHTML).toEqual("0");
expect(screen.getByTestId("status").innerHTML).toEqual("");
expect(screen.getByTestId("linkURL").innerHTML).toEqual("");
})
it("Upload no file", async () => {
fireEvent.click(screen.getByTestId("uploadNoFile"));
expect(screen.getByTestId("uploading").innerHTML).toEqual("false");
expect(screen.getByTestId("progress").innerHTML).toEqual("0");
expect(screen.getByTestId("progress").innerHTML).toEqual("-1");
expect(screen.getByTestId("status").innerHTML).toEqual("Error occured: No file provided");
expect(screen.getByTestId("linkURL").innerHTML).toEqual("");
})
it("Upload file", async () => {
fireEvent.click(screen.getByTestId("upload"));
await waitFor(() => expect(screen.getByTestId("progress").innerHTML).toEqual("100"));
expect(screen.getByTestId("uploading").innerHTML).toEqual("true");
expect(screen.getByTestId("status").innerHTML).toEqual("Uploaded test.jpg\nCLOUDFRONT_URL");
expect(screen.getByTestId("status").innerHTML).toEqual(`Uploaded test.jpg`);
expect(screen.getByTestId("linkURL").innerHTML).toEqual(`CLOUDFRONT_URL`);
})
it("Cancel upload", async () => {
@@ -57,5 +61,6 @@ describe("FileUploadContext", () => {
await waitFor(() => expect(screen.getByTestId("progress").innerHTML).toEqual("0"));
expect(screen.getByTestId("uploading").innerHTML).toEqual("false");
expect(screen.getByTestId("status").innerHTML).toEqual("Upload cancelled");
expect(screen.getByTestId("linkURL").innerHTML).toEqual("");
})
})