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

Merge branch 'release/0.9.0'

Browse Source
This commit is contained in:
jwu-fisker
2023-07-11 13:14:23 -07:00
parent 8069078c8d a8b9783e60
commit 282a1307eb
14 changed files with 72 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.env.cec-euprd
View File

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

1
.env.cec-prd
View File

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

1
.env.dev
View File

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

1
.env.local
View File

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

1
.env.prd
View File

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

1
.env.stg
View File

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

1
.env.template
View File

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

55
src/components/App/__snapshots__/App.test.js.snap
View File

@@ -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"
@@ -11623,7 +11572,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"
>

4
src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap
View File

@@ -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"
>

14
src/components/Cars/Status/Details/index.jsx
View File

@@ -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,7 +157,16 @@ const MainForm = ({ vin }) => {
</p>
</Grid>
)}
<Grid item md={12} className={classes.textCenterAlign}>
<Grid
item
md={12}
className={classes.textCenterAlign}
>
<Box sx={{
display: "flex",
justifyContent: "center",
alignItems: "flex-end"
}}>
<RoleWrap
groups={groups}
providers={providers}
@@ -178,6 +187,7 @@ const MainForm = ({ vin }) => {
</Link>
</Tooltip>
</RoleWrap>
</Box>
</Grid>
<Grid item md={12} className={classes.textCenterAlign}>
<RoleWrap

4
src/components/Cars/Status/__snapshots__/DetailsTab.test.jsx.snap
View File

@@ -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"
>

4
src/components/Cars/Status/__snapshots__/index.test.jsx.snap
View File

@@ -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"
>

14
src/components/Certificates/Add/CreateForm.jsx
View File

@@ -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 }) => {

4
src/components/Layouts/SideMenu.jsx
View File

@@ -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",