From 3ad66baac0509cc92ed3e429ddebba5f340514b4 Mon Sep 17 00:00:00 2001 From: John Wu <76966357+jwu-fisker@users.noreply.github.com> Date: Fri, 28 May 2021 12:25:56 -0700 Subject: [PATCH] Merge Development (#44) * CEC-244 Remote car commands, search, sortable tables (#42) * Add sortable table header * Send bulk commands page Update table page sizes All tables are sortable * Update site layout Add search to update packages * Reenable Datadog * remove dev stuff * CEC-244 Add search (#43) * Add search to car send command page Add snapshot check --- src/assets/fisker-badge.svg | 1 + src/components/App/App.test.js | 25 +- .../App/__snapshots__/App.test.js.snap | 2987 ++++++++++------- src/components/CarUpdates/Deploy/index.jsx | 75 +- src/components/CarUpdates/Status/index.jsx | 19 +- src/components/Cars/Add/index.jsx | 13 +- src/components/Cars/List/index.jsx | 92 +- src/components/Cars/LogFilter/index.jsx | 123 - src/components/Cars/SendCommand/index.jsx | 77 +- src/components/Cars/SendCommandBulk/index.jsx | 215 ++ src/components/Cars/Status/index.jsx | 77 +- src/components/Contexts/StatusContext.jsx | 3 + src/components/Contexts/VehicleContext.jsx | 17 +- .../Contexts/__mocks__/VehicleContext.jsx | 7 +- src/components/Controls/SearchField/index.jsx | 49 + src/components/Home/index.jsx | 9 +- src/components/Layouts/MenuDrawer.jsx | 52 +- src/components/Layouts/SideMenu.jsx | 7 +- .../__snapshots__/SideMenu.test.jsx.snap | 24 +- src/components/Routes/SiteRoutes.jsx | 9 + src/components/Table/HeaderSortable/index.jsx | 101 + .../Create/__snapshots__/Create.test.js.snap | 21 +- .../UpdatePackages/Create/index.jsx | 15 +- src/components/UpdatePackages/Edit/index.jsx | 13 +- src/components/UpdatePackages/List/index.jsx | 107 +- src/components/useStyles.jsx | 32 +- src/services/__mocks__/vehicles.js | 7 +- src/services/commands.js | 87 +- src/services/vehicles.js | 12 +- 29 files changed, 2732 insertions(+), 1544 deletions(-) create mode 100644 src/assets/fisker-badge.svg delete mode 100644 src/components/Cars/LogFilter/index.jsx create mode 100644 src/components/Cars/SendCommandBulk/index.jsx create mode 100644 src/components/Controls/SearchField/index.jsx create mode 100644 src/components/Table/HeaderSortable/index.jsx diff --git a/src/assets/fisker-badge.svg b/src/assets/fisker-badge.svg new file mode 100644 index 0000000..0c713ce --- /dev/null +++ b/src/assets/fisker-badge.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/App/App.test.js b/src/components/App/App.test.js index 2a898f9..65ede98 100644 --- a/src/components/App/App.test.js +++ b/src/components/App/App.test.js @@ -87,6 +87,10 @@ describe("App", () => { await check("/vehicle-status/FISKER123", "span.MuiButton-label", "Sign In"); }); + it("Route /vehicles-command unauthenticated", async () => { + await check("/vehicles-command", "span.MuiButton-label", "Sign In"); + }); + it("Route / authenticated", async () => { setToken(TEST_AUTH_OBJECT); await check("/", "h1", "Welcome John!"); @@ -99,37 +103,42 @@ describe("App", () => { it("Route /package-upload authenticated", async () => { setToken(TEST_AUTH_OBJECT); - await check("/package-upload", "h1", "Create Update Package"); + await check("/package-upload", "h6", "Create Update Package"); }); it("Route /vehicle-add authenticated", async () => { setToken(TEST_AUTH_OBJECT); - await check("/vehicle-add", "h1", "Add Vehicle"); + await check("/vehicle-add", "h6", "Add Vehicle"); }); it("Route /updates authenticated", async () => { setToken(TEST_AUTH_OBJECT); - await check("/updates", "h1", "Update Packages"); + await check("/updates", "h6", "Deploy Packages"); }); it("Route /update authenticated", async () => { setToken(TEST_AUTH_OBJECT); - await check("/update/1", "h1", "Edit Update Package 1"); + await check("/update/1", "h6", "Edit Update Package 1"); }); it("Route /carupdate-status authenticated", async () => { setToken(TEST_AUTH_OBJECT); - await check("/carupdate-status/1", "h1", ""); + await check("/carupdate-status/1", "h6", ""); }); it("Route /vehicles authenticated", async () => { setToken(TEST_AUTH_OBJECT); - await check("/vehicles", "h1", "Vehicles"); + await check("/vehicles", "h6", "Vehicles"); }); it("Route /vehicle-status authenticated", async () => { setToken(TEST_AUTH_OBJECT); - await check("/vehicle-status/FISKER123", "h1", "FISKER123 Updates"); + await check("/vehicle-status/FISKER123", "h6", "Vehicle FISKER123 Details"); + }); + + it("Route /vehicles-command authenticated", async () => { + setToken(TEST_AUTH_OBJECT); + await check("/vehicles-command", "h6", "Send Command"); }); it("Route /page-not-found unauthenticated", async () => { @@ -143,6 +152,6 @@ describe("App", () => { it("Route /carupdate-deploy authenticated", async () => { setToken(TEST_AUTH_OBJECT); - await check("/carupdate-deploy/1", "h1", "Deploy [1]"); + await check("/carupdate-deploy/1", "h6", "Deploy "); }); }); diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap index c8bd935..b93036c 100644 --- a/src/components/App/__snapshots__/App.test.js.snap +++ b/src/components/App/__snapshots__/App.test.js.snap @@ -6,45 +6,19 @@ exports[`App Route / authenticated 1`] = ` data-testid="mocked-userprovider" >
-
- Fisker OTA Portal -
+ />
- + Fisker Admin Portal
- View Packages + Deploy Packages
+
  • + +
    + + Send Command + +
    + +     +

    • - Fisker OTA Portal -
    + />
    -
    - Fisker OTA Portal + Deploy
    - + Fisker Admin Portal
    - View Packages + Deploy Packages
    +
  • + +
    + + Send Command + +
    + +     +
    • -

    - Deploy - [1] -

    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    -