From aa43431d12d2d7886052bbb8705bb7500c2bd151 Mon Sep 17 00:00:00 2001
From: Paul Adamsen <117673433+pauladamseniii@users.noreply.github.com>
Date: Thu, 18 May 2023 12:41:30 -0400
Subject: [PATCH] CEC-4157 - Add new statuses to car_update_progress (#334)

* CEC-4157 - Add new statuses to car_update_progress

* small fix
---
 .../App/__snapshots__/App.test.js.snap        | 110 ++++++-
 .../Contexts/__mocks__/CarUpdatesContext.jsx  |  60 +++-
 .../CarUpdateStatusProgress.test.jsx          |  24 +-
 .../CarUpdateStatusProgress/Statuses.js       |   2 +
 .../CarUpdateStatusProgress.test.jsx.snap     | 284 ++++++++++++++++++
 .../CarUpdateStatusProgress/index.jsx         |   4 +-
 .../CarUpdateStatusTable.test.jsx.snap        |  44 +++
 7 files changed, 524 insertions(+), 4 deletions(-)

diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap
index 209f8f2..08c49aa 100644
--- a/src/components/App/__snapshots__/App.test.js.snap
+++ b/src/components/App/__snapshots__/App.test.js.snap
@@ -5411,6 +5411,114 @@ exports[`App Route /package-status authenticated 1`] = `
                         </a>
                       </td>
                     </tr>
+                    <tr
+                      class="MuiTableRow-root"
+                    >
+                      <td
+                        class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                      >
+                        2
+                      </td>
+                      <td
+                        class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                        style="vertical-align: top;"
+                      >
+                        <a
+                          href="/vehicle-status/1G1FP87S3GN100062"
+                        >
+                          1G1FP87S3GN100062
+                        </a>
+                      </td>
+                      <td
+                        class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                      >
+                        downloaded
+                      </td>
+                      <td
+                        class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                      >
+                        7/1/2021 10:40:07 PM
+                      </td>
+                      <td
+                        class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                      >
+                        7/12/2021 6:22:13 PM
+                      </td>
+                      <td
+                        class="MuiTableCell-root MuiTableCell-body"
+                      >
+                        <a
+                          class=""
+                          href="/package-status/1"
+                          title="Send cancel for 1G1FP87S3GN100062"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root"
+                            focusable="false"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2zm5 13.59L15.59 17 12 13.41 8.41 17 7 15.59 10.59 12 7 8.41 8.41 7 12 10.59 15.59 7 17 8.41 13.41 12 17 15.59z"
+                            />
+                          </svg>
+                        </a>
+                      </td>
+                    </tr>
+                    <tr
+                      class="MuiTableRow-root"
+                    >
+                      <td
+                        class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                      >
+                        3
+                      </td>
+                      <td
+                        class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                        style="vertical-align: top;"
+                      >
+                        <a
+                          href="/vehicle-status/1G1FP87S3GN100062"
+                        >
+                          1G1FP87S3GN100062
+                        </a>
+                      </td>
+                      <td
+                        class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                      >
+                        downloaded
+                      </td>
+                      <td
+                        class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                      >
+                        7/1/2021 10:40:07 PM
+                      </td>
+                      <td
+                        class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                      >
+                        7/12/2021 6:22:13 PM
+                      </td>
+                      <td
+                        class="MuiTableCell-root MuiTableCell-body"
+                      >
+                        <a
+                          class=""
+                          href="/package-status/1"
+                          title="Send cancel for 1G1FP87S3GN100062"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root"
+                            focusable="false"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2zm5 13.59L15.59 17 12 13.41 8.41 17 7 15.59 10.59 12 7 8.41 8.41 7 12 10.59 15.59 7 17 8.41 13.41 12 17 15.59z"
+                            />
+                          </svg>
+                        </a>
+                      </td>
+                    </tr>
                   </tbody>
                   <tfoot
                     class="MuiTableFooter-root"
@@ -5481,7 +5589,7 @@ exports[`App Route /package-status authenticated 1`] = `
                           <p
                             class="MuiTypography-root MuiTablePagination-caption MuiTypography-body2 MuiTypography-colorInherit"
                           >
-                            1-1 of 1
+                            1-2 of 2
                           </p>
                           <div
                             class="MuiTablePagination-actions"
diff --git a/src/components/Contexts/__mocks__/CarUpdatesContext.jsx b/src/components/Contexts/__mocks__/CarUpdatesContext.jsx
index ca78516..4ba1ce9 100644
--- a/src/components/Contexts/__mocks__/CarUpdatesContext.jsx
+++ b/src/components/Contexts/__mocks__/CarUpdatesContext.jsx
@@ -23,8 +23,46 @@ let carUpdates = [
       updated: "2021-08-20T18:37:50.007853Z",
     },
   },
+  {
+    id: 2,
+    vin: "1G1FP87S3GN100062",
+    manifest_id: 285,
+    status: "downloaded",
+    msg: "downloaded",
+    created: "2021-07-01T22:40:07.778509Z",
+    updated: "2021-07-12T18:22:13.736755Z",
+    updatemanifest: {
+      id: 285,
+      name: "TEST UPDATE",
+      version: "1000",
+      description: "UPDATE DESCRIPTION",
+      release_notes: "https://releasenotes.com",
+      ecu_list: "AGS 1.0.0,AMP 1.0.0",
+      created: "2021-08-20T18:37:41.960397Z",
+      updated: "2021-08-20T18:37:50.007853Z",
+    },
+  },
+  {
+    id: 3,
+    vin: "1G1FP87S3GN100062",
+    manifest_id: 286,
+    status: "downloaded",
+    msg: "downloaded",
+    created: "2021-07-01T22:40:07.778509Z",
+    updated: "2021-07-12T18:22:13.736755Z",
+    updatemanifest: {
+      id: 286,
+      name: "TEST UPDATE",
+      version: "1000",
+      description: "UPDATE DESCRIPTION",
+      release_notes: "https://releasenotes.com",
+      ecu_list: "AGS 1.0.0,AMP 1.0.0",
+      created: "2021-08-20T18:37:41.960397Z",
+      updated: "2021-08-20T18:37:50.007853Z",
+    },
+  },
 ];
-let totalCarUpdates = 1;
+let totalCarUpdates = 2;
 let carUpdateLog = {
   data: [
     {
@@ -56,6 +94,26 @@ let carUpdateLog = {
       created: "2021-08-23T17:06:38.030052Z",
       updated: "2021-08-23T17:06:38.030052Z",
     },
+    {
+      id: 87,
+      carupdate_id: 285,
+      username: "test username 2",
+      status: "install_scheduled",
+      error_code: 0,
+      info: "TEST",
+      created: "2021-08-23T17:06:38.030052Z",
+      updated: "2021-08-23T17:06:38.030052Z",
+    },
+    {
+      id: 86,
+      carupdate_id: 286,
+      username: "test username 2",
+      status: "requirements_failed",
+      error_code: 0,
+      info: "TEST",
+      created: "2021-08-23T17:06:38.030052Z",
+      updated: "2021-08-23T17:06:38.030052Z",
+    },
   ],
   total: 3,
 };
diff --git a/src/components/Controls/CarUpdateStatusProgress/CarUpdateStatusProgress.test.jsx b/src/components/Controls/CarUpdateStatusProgress/CarUpdateStatusProgress.test.jsx
index c6eb25a..0c68f90 100644
--- a/src/components/Controls/CarUpdateStatusProgress/CarUpdateStatusProgress.test.jsx
+++ b/src/components/Controls/CarUpdateStatusProgress/CarUpdateStatusProgress.test.jsx
@@ -13,7 +13,7 @@ const TestWrapper = ({ status }) => {
 
 const renderCarUpdateStatusProgress = async (status) => {
   const { container } = render(<TestWrapper status={status} />);
-  await waitFor(() => {});
+  await waitFor(() => { });
   return container;
 };
 
@@ -144,6 +144,28 @@ describe("CarUpdateStatusProgress", () => {
         err: 0,
       },
     },
+    {
+      name: "install_scheduled",
+      status: {
+        car_update_id: 1,
+        ecu: "TEST",
+        installed: 5,
+        total_files: 10,
+        msg: s.InstallSucceeded,
+        err: 0,
+      },
+    },
+    {
+      name: "requirements_failed",
+      status: {
+        car_update_id: 1,
+        ecu: "TEST",
+        installed: 5,
+        total_files: 10,
+        msg: s.InstallFailed,
+        err: 0,
+      },
+    },
   ];
   for (let i = 0, len = tests.length; i < len; i++) {
     const test = tests[i];
diff --git a/src/components/Controls/CarUpdateStatusProgress/Statuses.js b/src/components/Controls/CarUpdateStatusProgress/Statuses.js
index fc9be48..a60d887 100644
--- a/src/components/Controls/CarUpdateStatusProgress/Statuses.js
+++ b/src/components/Controls/CarUpdateStatusProgress/Statuses.js
@@ -34,6 +34,8 @@ const Statuses = {
   PackageDownloadCompleted: "package_download_complete",
   PackageInstallStarted: "package_install_start",
   PackageInstallCompleted: "package_install_complete",
+  RequirementsFailed: "requirements_failed",
+  InstallScheduled: "install_scheduled",
 };
 
 export default Statuses;
diff --git a/src/components/Controls/CarUpdateStatusProgress/__snapshots__/CarUpdateStatusProgress.test.jsx.snap b/src/components/Controls/CarUpdateStatusProgress/__snapshots__/CarUpdateStatusProgress.test.jsx.snap
index c037ba9..af4dcb1 100644
--- a/src/components/Controls/CarUpdateStatusProgress/__snapshots__/CarUpdateStatusProgress.test.jsx.snap
+++ b/src/components/Controls/CarUpdateStatusProgress/__snapshots__/CarUpdateStatusProgress.test.jsx.snap
@@ -994,6 +994,148 @@ exports[`CarUpdateStatusProgress Render install_error 1`] = `
 </div>
 `;
 
+exports[`CarUpdateStatusProgress Render install_scheduled 1`] = `
+<div>
+  <div
+    style="width: 100%; display: flex; justify-content: space-between; flex-wrap: wrap;"
+  >
+    <div
+      class="makeStyles-textCenterAlign-0"
+    >
+      <svg
+        aria-hidden="true"
+        class="MuiSvgIcon-root makeStyles-progressIcon-0 makeStyles-progressSuccess-0"
+        focusable="false"
+        viewBox="0 0 24 24"
+      >
+        <path
+          d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
+        />
+      </svg>
+      <p
+        class="MuiTypography-root MuiTypography-body1"
+      >
+        Pending
+      </p>
+    </div>
+    <div
+      class="makeStyles-textCenterAlign-0"
+    >
+      <svg
+        aria-hidden="true"
+        class="MuiSvgIcon-root makeStyles-progressIcon-0 makeStyles-progressSuccess-0"
+        focusable="false"
+        viewBox="0 0 24 24"
+      >
+        <path
+          d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
+        />
+      </svg>
+      <p
+        class="MuiTypography-root MuiTypography-body1"
+      >
+        Received
+      </p>
+    </div>
+    <div
+      class="makeStyles-textCenterAlign-0"
+    >
+      <svg
+        aria-hidden="true"
+        class="MuiSvgIcon-root makeStyles-progressIcon-0 makeStyles-progressSuccess-0"
+        focusable="false"
+        viewBox="0 0 24 24"
+      >
+        <path
+          d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
+        />
+      </svg>
+      <p
+        class="MuiTypography-root MuiTypography-body1"
+      >
+        Precondition
+      </p>
+    </div>
+    <div
+      class="makeStyles-textCenterAlign-0"
+    >
+      <svg
+        aria-hidden="true"
+        class="MuiSvgIcon-root makeStyles-progressIcon-0 makeStyles-progressSuccess-0"
+        focusable="false"
+        viewBox="0 0 24 24"
+      >
+        <path
+          d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
+        />
+      </svg>
+      <p
+        class="MuiTypography-root MuiTypography-body1"
+      >
+        Download
+      </p>
+    </div>
+    <div
+      class="makeStyles-textCenterAlign-0"
+    >
+      <svg
+        aria-hidden="true"
+        class="MuiSvgIcon-root makeStyles-progressIcon-0 makeStyles-progressSuccess-0"
+        focusable="false"
+        viewBox="0 0 24 24"
+      >
+        <path
+          d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
+        />
+      </svg>
+      <p
+        class="MuiTypography-root MuiTypography-body1"
+      >
+        Approved
+      </p>
+    </div>
+    <div
+      class="makeStyles-textCenterAlign-0"
+    >
+      <svg
+        aria-hidden="true"
+        class="MuiSvgIcon-root makeStyles-progressIcon-0"
+        focusable="false"
+        viewBox="0 0 24 24"
+      >
+        <path
+          d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+        />
+      </svg>
+      <p
+        class="MuiTypography-root MuiTypography-body1"
+      >
+        Install
+      </p>
+    </div>
+    <div
+      class="makeStyles-textCenterAlign-0"
+    >
+      <svg
+        aria-hidden="true"
+        class="MuiSvgIcon-root makeStyles-progressIcon-0"
+        focusable="false"
+        viewBox="0 0 24 24"
+      >
+        <path
+          d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+        />
+      </svg>
+      <p
+        class="MuiTypography-root MuiTypography-body1"
+      >
+        Updated
+      </p>
+    </div>
+  </div>
+</div>
+`;
+
 exports[`CarUpdateStatusProgress Render installing 1`] = `
 <div>
   <div
@@ -1561,3 +1703,145 @@ exports[`CarUpdateStatusProgress Render package_download_complete 1`] = `
   </div>
 </div>
 `;
+
+exports[`CarUpdateStatusProgress Render requirements_failed 1`] = `
+<div>
+  <div
+    style="width: 100%; display: flex; justify-content: space-between; flex-wrap: wrap;"
+  >
+    <div
+      class="makeStyles-textCenterAlign-0"
+    >
+      <svg
+        aria-hidden="true"
+        class="MuiSvgIcon-root makeStyles-progressIcon-0 makeStyles-progressSuccess-0"
+        focusable="false"
+        viewBox="0 0 24 24"
+      >
+        <path
+          d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
+        />
+      </svg>
+      <p
+        class="MuiTypography-root MuiTypography-body1"
+      >
+        Pending
+      </p>
+    </div>
+    <div
+      class="makeStyles-textCenterAlign-0"
+    >
+      <svg
+        aria-hidden="true"
+        class="MuiSvgIcon-root makeStyles-progressIcon-0 makeStyles-progressSuccess-0"
+        focusable="false"
+        viewBox="0 0 24 24"
+      >
+        <path
+          d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
+        />
+      </svg>
+      <p
+        class="MuiTypography-root MuiTypography-body1"
+      >
+        Received
+      </p>
+    </div>
+    <div
+      class="makeStyles-textCenterAlign-0"
+    >
+      <svg
+        aria-hidden="true"
+        class="MuiSvgIcon-root makeStyles-progressIcon-0 makeStyles-progressSuccess-0"
+        focusable="false"
+        viewBox="0 0 24 24"
+      >
+        <path
+          d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
+        />
+      </svg>
+      <p
+        class="MuiTypography-root MuiTypography-body1"
+      >
+        Precondition
+      </p>
+    </div>
+    <div
+      class="makeStyles-textCenterAlign-0"
+    >
+      <svg
+        aria-hidden="true"
+        class="MuiSvgIcon-root makeStyles-progressIcon-0 makeStyles-progressSuccess-0"
+        focusable="false"
+        viewBox="0 0 24 24"
+      >
+        <path
+          d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
+        />
+      </svg>
+      <p
+        class="MuiTypography-root MuiTypography-body1"
+      >
+        Download
+      </p>
+    </div>
+    <div
+      class="makeStyles-textCenterAlign-0"
+    >
+      <svg
+        aria-hidden="true"
+        class="MuiSvgIcon-root makeStyles-progressIcon-0 makeStyles-progressSuccess-0"
+        focusable="false"
+        viewBox="0 0 24 24"
+      >
+        <path
+          d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
+        />
+      </svg>
+      <p
+        class="MuiTypography-root MuiTypography-body1"
+      >
+        Approved
+      </p>
+    </div>
+    <div
+      class="makeStyles-textCenterAlign-0"
+    >
+      <svg
+        aria-hidden="true"
+        class="MuiSvgIcon-root makeStyles-progressIcon-0 makeStyles-progressError-0"
+        focusable="false"
+        viewBox="0 0 24 24"
+      >
+        <path
+          d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-2h2v2zm0-4h-2V7h2v6z"
+        />
+      </svg>
+      <p
+        class="MuiTypography-root MuiTypography-body1"
+      >
+        Install
+      </p>
+    </div>
+    <div
+      class="makeStyles-textCenterAlign-0"
+    >
+      <svg
+        aria-hidden="true"
+        class="MuiSvgIcon-root makeStyles-progressIcon-0"
+        focusable="false"
+        viewBox="0 0 24 24"
+      >
+        <path
+          d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+        />
+      </svg>
+      <p
+        class="MuiTypography-root MuiTypography-body1"
+      >
+        Updated
+      </p>
+    </div>
+  </div>
+</div>
+`;
diff --git a/src/components/Controls/CarUpdateStatusProgress/index.jsx b/src/components/Controls/CarUpdateStatusProgress/index.jsx
index 2131b30..6b9cd1d 100644
--- a/src/components/Controls/CarUpdateStatusProgress/index.jsx
+++ b/src/components/Controls/CarUpdateStatusProgress/index.jsx
@@ -56,9 +56,11 @@ const PHASES = [
       s.Installing,
       s.InstallSucceeded,
       s.InstallFailed,
+      s.RequirementsFailed,
+      s.InstallScheduled,
     ],
     progress: (msg, progress) => {
-      if (msg === s.InstallFailed) return ErrorStatus;
+      if (msg === s.InstallFailed || msg === s.RequirementsFailed) return ErrorStatus;
       if (msg === s.PackageInstallCompleted) return CompleteStatus;
       return progress;
     },
diff --git a/src/components/Controls/CarUpdateStatusTable/__snapshots__/CarUpdateStatusTable.test.jsx.snap b/src/components/Controls/CarUpdateStatusTable/__snapshots__/CarUpdateStatusTable.test.jsx.snap
index 5807971..1e588b0 100644
--- a/src/components/Controls/CarUpdateStatusTable/__snapshots__/CarUpdateStatusTable.test.jsx.snap
+++ b/src/components/Controls/CarUpdateStatusTable/__snapshots__/CarUpdateStatusTable.test.jsx.snap
@@ -175,6 +175,50 @@ exports[`CarUpdateStatusTable Render 1`] = `
             class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
           />
         </tr>
+        <tr
+          class="MuiTableRow-root"
+        >
+          <td
+            class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+          >
+            8/23/2021 5:06:38 PM
+          </td>
+          <td
+            class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+          >
+            install_scheduled
+          </td>
+          <td
+            class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+          >
+            TEST
+          </td>
+          <td
+            class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+          />
+        </tr>
+        <tr
+          class="MuiTableRow-root"
+        >
+          <td
+            class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+          >
+            8/23/2021 5:06:38 PM
+          </td>
+          <td
+            class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+          >
+            requirements_failed
+          </td>
+          <td
+            class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+          >
+            TEST
+          </td>
+          <td
+            class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+          />
+        </tr>
       </tbody>
       <tfoot
         class="MuiTableFooter-root"