Merge to main (#17)

* 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>

src/components/App/App.test.js

@@ -1,11 +1,12 @@
 jest.mock("../Contexts/UserContext");
 jest.mock("../Contexts/FileUploadContext");
+jest.mock("../Contexts/VehicleContext");
 
-import { render, screen, cleanup, waitForElementToBeRemoved, waitFor } from "@testing-library/react"
+import { render, screen, cleanup, waitForElementToBeRemoved } from "@testing-library/react";
 import { setToken } from "../Contexts/UserContext";
 import App from ".";
 
-const TEST_TOKEN = { accessToken: { jwtToken: "TEST" }};
+const TEST_TOKEN = { idToken: { jwtToken: "TEST" } };
 const LOADING_STATUS = "Loading...";
 
 const renderRoute = async (route) => {
@@ -26,40 +27,40 @@ describe("App", () => {
 
   it("Route / unauthenticated", async () => {
     const container = await renderRoute("/");
-    expect(container.querySelector("h1").innerHTML).toEqual("Sign in");
-    expect(container).toMatchSnapshot();
-  });
-
-  it("Route /signup unauthenticated", async () => {
-    const container = await renderRoute("/signup");
-    expect(container.querySelector("h1").innerHTML).toEqual("Sign up");
+    expect(container.querySelector("span.MuiButton-label").innerHTML).toEqual("Sign In");
     expect(container).toMatchSnapshot();
   });
 
   it("Route /home unauthenticated", async () => {
     const container = await renderRoute("/home");
-    expect(container.querySelector("h1").innerHTML).toEqual("Sign in");
+    expect(container.querySelector("span.MuiButton-label").innerHTML).toEqual("Sign In");
+    expect(container).toMatchSnapshot();
+  });
+
+  it("Route /vehicle-add unauthenticated", async () => {
+    const container = await renderRoute("/vehicle-add");
+    expect(container.querySelector("span.MuiButton-label").innerHTML).toEqual("Sign In");
     expect(container).toMatchSnapshot();
   });
 
   it("Route / authenticated", async () => {
     setToken(TEST_TOKEN);
     const container = await renderRoute("/");
-    expect(container.querySelector("h1").innerHTML).toEqual("Upload file");
-    expect(container).toMatchSnapshot();
-  });
-
-  it("Route /signup authenticated", async () => {
-    setToken(TEST_TOKEN);
-    const container = await renderRoute("/signup");
-    expect(container.querySelector("h1").innerHTML).toEqual("Upload file");
+    expect(container.querySelector("h1").innerHTML).toEqual("Upload Update Package");
     expect(container).toMatchSnapshot();
   });
 
   it("Route /home authenticated", async () => {
     setToken(TEST_TOKEN);
     const container = await renderRoute("/home");
-    expect(container.querySelector("h1").innerHTML).toEqual("Upload file");
+    expect(container.querySelector("h1").innerHTML).toEqual("Upload Update Package");
+    expect(container).toMatchSnapshot();
+  });
+
+  it("Route /vehicle-add authenticated", async () => {
+    setToken(TEST_TOKEN);
+    const container = await renderRoute("/vehicle-add");
+    expect(container.querySelector("h1").innerHTML).toEqual("Add Vehicle");
     expect(container).toMatchSnapshot();
   });
 
@@ -75,5 +76,4 @@ describe("App", () => {
     expect(container.querySelector("h1").innerHTML).toEqual("Page Not Found");
     expect(container).toMatchSnapshot();
   });
-
 })

src/components/App/index.jsx

@@ -1,12 +1,23 @@
-import React from 'react';
-import { UserProvider } from '../Contexts/UserContext';
-import SiteRoutes from '../Routes/SiteRoutes';
+import React from "react";
+import { BrowserRouter } from "react-router-dom";
+import { UserProvider } from "../Contexts/UserContext";
+import { StatusProvider } from "../Contexts/StatusContext";
+import { CssBaseline } from "@material-ui/core";
+import MenuDrawer from "../Layouts/MenuDrawer";
+import SiteRoutes from "../Routes/SiteRoutes";
 
 function App() {
   return (
-    <UserProvider>
-      <SiteRoutes />
-    </UserProvider>
+    <StatusProvider>
+      <UserProvider>
+        <CssBaseline />
+        <BrowserRouter>
+          <MenuDrawer>
+            <SiteRoutes />
+          </MenuDrawer>
+        </BrowserRouter>
+      </UserProvider>
+    </StatusProvider>
   );
 }