admin/ota-admin-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge to main (#17)

Browse Source 
* Fix sign up form bug

* Add run.sh to run setup and run web app

* Output node version

* Update readme with run.sh

* Fix file upload form to handle ota_update service

* Enable file upload form

Enable error boundary to catch React errors (#7)
Fix warning for link noreferrer
Include authorization header with file upload

* Remove default localhost settings (#8)

* Remove default localhost settings
Replace with deployment settings

* Fix for upload data format

* Fix test data for last commit

* Fix json link format and remove localhost default settings (#10)

* Remove default localhost settings
Replace with deployment settings

* Fix for upload data format

* Fix test data for last commit

* Fix link data format

* Fix link json again (#12)

Use id token instead of access token

* nginx things

* Web Worker Sign Out and Use Go API (#13)

* Calculate checksum and send with file upload

* Limit file upload and display rejected file error

* Add sign in timeout

* Check auth token structure before setting
Clean up

* Use web worker timer to sign out
Remove checksum
Point to Go ota update

* Remove checksum dependency

* Use compute auth service and fix static code analyzer warnings (#15)

* Clean up formatting

* Use new compute_auth service
Implment SSO
Implement token refresh
Clean up unit tests

* Fix unit tests

* Fix auth test
Fix warnings

* Update default settings for compute_auth

* Change main UI layout and add VINs to add and upload forms (#16)

* Add new upload update package form
Add new add vehicle form
Add new side menu layout
Add new toolbar layout
Update and add unit tests

* Enable add get and add vehicles

* Integration issues with ota_update service

* Update get vehicle JSON format

* Fix related unit test
Add release notes field

* Add StatusContext to display error and status messages

* Handle api error json (#18)

* Handle api error json

* Fix get vehicles error handling
Update .env.template

Co-authored-by: Rafi Greenberg <rgreenberg@fiskerinc.com>
This commit is contained in:
John Wu
2021-03-17 15:16:08 -07:00
committed by GitHub
parent 86d65b887c
commit 30155887cb
62 changed files with 4800 additions and 3716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/components/ModalProgressBar/index.jsx
View File

@@ -1,7 +1,8 @@
import React from "react";
import Modal from '@material-ui/core/Modal';
import Modal from "@material-ui/core/Modal";
import { Button, LinearProgress } from "@material-ui/core";
import { useFileUploadContext } from "../Contexts/FileUploadContext";
const getModalStyle = () => {
const top = 30;
@@ -21,24 +22,36 @@ const getModalStyle = () => {
};
};
const ModalProgressBar = ({ onCancel, uploading, progress, status }) => {
const ModalProgressBar = () => {
const {
uploading,
progress,
status,
linkURL,
cancel,
} = useFileUploadContext();
const modalStyle = getModalStyle();
const onClickCancel = () => {
if (onCancel) onCancel();
}
const onClickCancel = cancel;
return (
<Modal open={uploading}>
<div style={modalStyle}>
{status && <p>{status}</p>}
{linkURL && (
<p>
<a href={linkURL} target="_blank" rel="noreferrer">
View
</a>
</p>
)}
<LinearProgress variant="determinate" value={progress} />
<Button onClick={onClickCancel}>
{ progress < 100 ? "Cancel" : "Done" }
{progress === 100 || progress === -1 ? "Done" : "Cancel"}
</Button>
</div>
</Modal>
</Modal>
);
}
};
export default ModalProgressBar;