From b3a5a337f4fe8b417b26767aaed0becea0352c1f Mon Sep 17 00:00:00 2001
From: Tristan Timblin <ttimblin@fiskerinc.com>
Date: Mon, 10 Jul 2023 18:59:39 -0400
Subject: [PATCH 1/2] CEC-4576: fix vertical alignment of force push checkbox
 (#388)

---
 .../App/__snapshots__/App.test.js.snap        |  6 ++-
 .../Details/__snapshots__/index.test.jsx.snap |  6 ++-
 src/components/Cars/Status/Details/index.jsx  | 54 +++++++++++--------
 .../__snapshots__/DetailsTab.test.jsx.snap    |  6 ++-
 .../Status/__snapshots__/index.test.jsx.snap  |  6 ++-
 5 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap
index 9663939..0861a52 100644
--- a/src/components/App/__snapshots__/App.test.js.snap
+++ b/src/components/App/__snapshots__/App.test.js.snap
@@ -11623,7 +11623,11 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                         </div>
                         <div
                           class="MuiGrid-root makeStyles-textCenterAlign-0 MuiGrid-item MuiGrid-grid-md-12"
-                        />
+                        >
+                          <div
+                            class="MuiBox-root MuiBox-root-0"
+                          />
+                        </div>
                         <div
                           class="MuiGrid-root makeStyles-textCenterAlign-0 MuiGrid-item MuiGrid-grid-md-12"
                         >
diff --git a/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap b/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap
index d245fc7..b60da02 100644
--- a/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap
+++ b/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap
@@ -167,7 +167,11 @@ exports[`VehicleDetailsTab Render 1`] = `
               </div>
               <div
                 class="MuiGrid-root makeStyles-textCenterAlign-0 MuiGrid-item MuiGrid-grid-md-12"
-              />
+              >
+                <div
+                  class="MuiBox-root MuiBox-root-0"
+                />
+              </div>
               <div
                 class="MuiGrid-root makeStyles-textCenterAlign-0 MuiGrid-item MuiGrid-grid-md-12"
               >
diff --git a/src/components/Cars/Status/Details/index.jsx b/src/components/Cars/Status/Details/index.jsx
index 2ef5534..a62e88d 100644
--- a/src/components/Cars/Status/Details/index.jsx
+++ b/src/components/Cars/Status/Details/index.jsx
@@ -1,4 +1,4 @@
-import { Checkbox, FormControlLabel, Grid, Tooltip } from "@material-ui/core";
+import { Box, Checkbox, FormControlLabel, Grid, Tooltip } from "@material-ui/core";
 import DeleteIcon from "@material-ui/icons/Delete";
 import EditIcon from "@material-ui/icons/Edit";
 import UploadIcon from '@mui/icons-material/Upload';
@@ -157,27 +157,37 @@ const MainForm = ({ vin }) => {
             </p>
           </Grid>
         )}
-        <Grid item md={12} className={classes.textCenterAlign}>
-          <RoleWrap
-            groups={groups}
-            providers={providers}
-            rolesPerProvider={Permissions.FiskerUpdateDeploy}
-          >
-            <FormControlLabel
-              label="Force Config Update"
-              control={
-                <Checkbox
-                  checked={forced}
-                  onChange={onForcedChange}
-                />
-              }
-            />
-            <Tooltip key={`push-config-${vin}`} title={`Push Config Update to "${vin}"`}>
-              <Link to="#" onClick={() => setShowUploadConfigModal(true)}  >
-                <UploadIcon aria-label={`Push Config Update to "${vin}"`} fontSize="large" />
-              </Link>
-            </Tooltip>
-          </RoleWrap>
+        <Grid
+          item
+          md={12}
+          className={classes.textCenterAlign}
+        >
+          <Box sx={{
+            display: "flex",
+            justifyContent: "center",
+            alignItems: "flex-end"
+          }}>
+            <RoleWrap
+              groups={groups}
+              providers={providers}
+              rolesPerProvider={Permissions.FiskerUpdateDeploy}
+            >
+              <FormControlLabel
+                label="Force Config Update"
+                control={
+                  <Checkbox
+                    checked={forced}
+                    onChange={onForcedChange}
+                  />
+                }
+              />
+              <Tooltip key={`push-config-${vin}`} title={`Push Config Update to "${vin}"`}>
+                <Link to="#" onClick={() => setShowUploadConfigModal(true)}  >
+                  <UploadIcon aria-label={`Push Config Update to "${vin}"`} fontSize="large" />
+                </Link>
+              </Tooltip>
+            </RoleWrap>
+          </Box>
         </Grid>
         <Grid item md={12} className={classes.textCenterAlign}>
           <RoleWrap
diff --git a/src/components/Cars/Status/__snapshots__/DetailsTab.test.jsx.snap b/src/components/Cars/Status/__snapshots__/DetailsTab.test.jsx.snap
index 900b45a..40bbfa5 100644
--- a/src/components/Cars/Status/__snapshots__/DetailsTab.test.jsx.snap
+++ b/src/components/Cars/Status/__snapshots__/DetailsTab.test.jsx.snap
@@ -175,7 +175,11 @@ exports[`DetailsTab Render 1`] = `
                 </div>
                 <div
                   class="MuiGrid-root makeStyles-textCenterAlign-0 MuiGrid-item MuiGrid-grid-md-12"
-                />
+                >
+                  <div
+                    class="MuiBox-root MuiBox-root-0"
+                  />
+                </div>
                 <div
                   class="MuiGrid-root makeStyles-textCenterAlign-0 MuiGrid-item MuiGrid-grid-md-12"
                 >
diff --git a/src/components/Cars/Status/__snapshots__/index.test.jsx.snap b/src/components/Cars/Status/__snapshots__/index.test.jsx.snap
index 097c3b2..cfb8cf3 100644
--- a/src/components/Cars/Status/__snapshots__/index.test.jsx.snap
+++ b/src/components/Cars/Status/__snapshots__/index.test.jsx.snap
@@ -331,7 +331,11 @@ exports[`CarStatus Render 1`] = `
                     </div>
                     <div
                       class="MuiGrid-root makeStyles-textCenterAlign-0 MuiGrid-item MuiGrid-grid-md-12"
-                    />
+                    >
+                      <div
+                        class="MuiBox-root MuiBox-root-0"
+                      />
+                    </div>
                     <div
                       class="MuiGrid-root makeStyles-textCenterAlign-0 MuiGrid-item MuiGrid-grid-md-12"
                     >

From 37c76481aba1346925cf04d6046a104596c0b2e2 Mon Sep 17 00:00:00 2001
From: Paul Adamsen <117673433+pauladamseniii@users.noreply.github.com>
Date: Tue, 11 Jul 2023 16:02:03 -0400
Subject: [PATCH 2/2] CEC-4693 - Hide Aftersales EU (#390)

* CEC-4543 - Add location to digital twin map

* remember previous deployment tab

* different name

* CEC-4693 - Generate EU certificates for aftersales

* CEC-4693 - Hide Aftersales EU

* fix condtional
---
 .env.cec-euprd                                |  1 +
 .env.cec-prd                                  |  1 +
 .env.dev                                      |  1 +
 .env.local                                    |  1 +
 .env.prd                                      |  1 +
 .env.stg                                      |  1 +
 .env.template                                 |  1 +
 .../App/__snapshots__/App.test.js.snap        | 51 -------------------
 .../Certificates/Add/CreateForm.jsx           | 14 +++--
 src/components/Layouts/SideMenu.jsx           |  4 +-
 10 files changed, 20 insertions(+), 56 deletions(-)

diff --git a/.env.cec-euprd b/.env.cec-euprd
index 5eac964..703c11d 100644
--- a/.env.cec-euprd
+++ b/.env.cec-euprd
@@ -20,3 +20,4 @@ REACT_APP_ROLE_UPDATE_DEPLOY=e4af2c4c-6c5e-4784-9097-7c18e776d7b6
 REACT_APP_ECCKEY_ENV=
 REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":49.8327,"lng":9.8816,"zoom":4.5}
 REACT_APP_ENABLE_DEBUGMASK=1
+REACT_APP_SHOW_AFTERSALES_EU_CERT_BUTTON=0
diff --git a/.env.cec-prd b/.env.cec-prd
index 101dd7f..2efe3f4 100644
--- a/.env.cec-prd
+++ b/.env.cec-prd
@@ -20,3 +20,4 @@ REACT_APP_ROLE_UPDATE_DEPLOY=e4af2c4c-6c5e-4784-9097-7c18e776d7b6
 REACT_APP_ECCKEY_ENV=
 REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":37.0902,"lng":-95.7129,"zoom":4.5}
 REACT_APP_ENABLE_DEBUGMASK=1
+REACT_APP_SHOW_AFTERSALES_EU_CERT_BUTTON=1
diff --git a/.env.dev b/.env.dev
index 92dd8fc..6a1adb6 100644
--- a/.env.dev
+++ b/.env.dev
@@ -20,3 +20,4 @@ REACT_APP_ROLE_UPDATE_DEPLOY=3590ec3f-1c05-428b-81a4-40b00baf83de
 REACT_APP_ECCKEY_ENV=stage,prod
 REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":37.0902,"lng":-95.7129,"zoom":4.5}
 REACT_APP_ENABLE_DEBUGMASK=1
+REACT_APP_SHOW_AFTERSALES_EU_CERT_BUTTON=1
diff --git a/.env.local b/.env.local
index 19ba31b..fc35828 100644
--- a/.env.local
+++ b/.env.local
@@ -20,3 +20,4 @@ REACT_APP_ROLE_CAR_DIAGNOSTIC=2914e67f-fb85-4b78-b79d-656f4f37faa1
 REACT_APP_ECCKEY_ENV=dev,stage,prod
 REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":37.0902,"lng":-95.7129,"zoom":4.5}
 REACT_APP_ENABLE_DEBUGMASK=1
+REACT_APP_SHOW_AFTERSALES_EU_CERT_BUTTON=0
diff --git a/.env.prd b/.env.prd
index d84d254..8356435 100644
--- a/.env.prd
+++ b/.env.prd
@@ -20,3 +20,4 @@ REACT_APP_ROLE_UPDATE_DEPLOY=e4af2c4c-6c5e-4784-9097-7c18e776d7b6
 REACT_APP_ECCKEY_ENV=stage
 REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":37.0902,"lng":-95.7129,"zoom":4.5}
 REACT_APP_ENABLE_DEBUGMASK=1
+REACT_APP_SHOW_AFTERSALES_EU_CERT_BUTTON=0
diff --git a/.env.stg b/.env.stg
index e6c8a39..40cd2fb 100644
--- a/.env.stg
+++ b/.env.stg
@@ -20,3 +20,4 @@ REACT_APP_ROLE_UPDATE_DEPLOY=3590ec3f-1c05-428b-81a4-40b00baf83de
 REACT_APP_ECCKEY_ENV=prod
 REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":37.0902,"lng":-95.7129,"zoom":4.5}
 REACT_APP_ENABLE_DEBUGMASK=1
+REACT_APP_SHOW_AFTERSALES_EU_CERT_BUTTON=0
diff --git a/.env.template b/.env.template
index 6f453b7..0a71596 100644
--- a/.env.template
+++ b/.env.template
@@ -19,3 +19,4 @@ REACT_APP_ROLE_CAR_DIAGNOSTIC=2914e67f-fb85-4b78-b79d-656f4f37faa1
 REACT_APP_ROLE_UPDATE_DEPLOY=3590ec3f-1c05-428b-81a4-40b00baf83de
 REACT_APP_ECCKEY_ENV=dev,stage,prod
 REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":37.0902,"lng":-95.7129,"zoom":4.5}
+REACT_APP_SHOW_AFTERSALES_EU_CERT_BUTTON=0
diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap
index 0861a52..c6a7b02 100644
--- a/src/components/App/__snapshots__/App.test.js.snap
+++ b/src/components/App/__snapshots__/App.test.js.snap
@@ -8206,57 +8206,6 @@ exports[`App Route /tools/certificates/add authenticated 1`] = `
                     Aftersales
                   </span>
                 </label>
-                <label
-                  class="MuiFormControlLabel-root"
-                >
-                  <span
-                    aria-disabled="false"
-                    class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-0 MuiRadio-root MuiRadio-colorSecondary MuiIconButton-colorSecondary"
-                  >
-                    <span
-                      class="MuiIconButton-label"
-                    >
-                      <input
-                        class="PrivateSwitchBase-input-0"
-                        name="cert-type"
-                        type="radio"
-                        value="AftersalesEU"
-                      />
-                      <div
-                        class="PrivateRadioButtonIcon-root-0"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="MuiSvgIcon-root"
-                          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>
-                        <svg
-                          aria-hidden="true"
-                          class="MuiSvgIcon-root PrivateRadioButtonIcon-layer-0"
-                          focusable="false"
-                          viewBox="0 0 24 24"
-                        >
-                          <path
-                            d="M8.465 8.465C9.37 7.56 10.62 7 12 7C14.76 7 17 9.24 17 12C17 13.38 16.44 14.63 15.535 15.535C14.63 16.44 13.38 17 12 17C9.24 17 7 14.76 7 12C7 10.62 7.56 9.37 8.465 8.465Z"
-                          />
-                        </svg>
-                      </div>
-                    </span>
-                    <span
-                      class="MuiTouchRipple-root"
-                    />
-                  </span>
-                  <span
-                    class="MuiTypography-root MuiFormControlLabel-label MuiTypography-body1"
-                  >
-                    Aftersales EU
-                  </span>
-                </label>
               </div>
               <button
                 class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-0 MuiButton-containedPrimary MuiButton-fullWidth"
diff --git a/src/components/Certificates/Add/CreateForm.jsx b/src/components/Certificates/Add/CreateForm.jsx
index 387cddd..76c6052 100644
--- a/src/components/Certificates/Add/CreateForm.jsx
+++ b/src/components/Certificates/Add/CreateForm.jsx
@@ -21,13 +21,21 @@ const getCertTypeLabel = (certtype) => {
 };
 
 const getCertsTypes = (providers) => {
+  let CertsTypes = CertTypeData
+
   if (providers.length === 0) return [];
   if ((providers[0] === Providers.MAGNA) || (providers[0] === Providers.FISKER_QA)) {
-    return CertTypeData.filter((item) => {
-      return (item.label === CertTypes.TBOX);
+    CertsTypes = CertsTypes.filter((item) => {
+      return (item.value === CertTypes.TBOX);
     })
   }
-  return CertTypeData;
+  if (process.env.REACT_APP_SHOW_AFTERSALES_EU_CERT_BUTTON === "0") {
+    CertsTypes = CertsTypes.filter((item) => {
+      return (item.value !== CertTypes.AftersalesEU);
+    })
+  }
+
+  return CertsTypes;
 }
 
 const CreateForm = ({ onCreate, busy }) => {
diff --git a/src/components/Layouts/SideMenu.jsx b/src/components/Layouts/SideMenu.jsx
index 408cb76..61139ae 100644
--- a/src/components/Layouts/SideMenu.jsx
+++ b/src/components/Layouts/SideMenu.jsx
@@ -64,11 +64,11 @@ const menuData = [
     icon: <BuildIcon />,
     rolesPerProvider: Permissions.FiskerTools,
     submenus: [
-      {
+      ...process.env.REACT_APP_ENV !== "cec-euprd" ? [{
         label: "Certificate",
         to: "/tools/certificates/add",
         rolesPerProvider: Permissions.FiskerMagnaCertificate,
-      },
+      }] : [],
       {
         label: "Security.dll",
         to: "/tools/security-dll",