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

CEC-3320 - Add other car fields to edit form (#248)

Browse Source 
* CEC-3320 - Add other car fields to edit form

* info_source readonly
This commit is contained in:
Paul Adamsen
2022-12-14 14:21:31 -05:00
committed by GitHub
parent 7d27a0193f
commit e2aecc9f3b
7 changed files with 591 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7958,6 +7958,63 @@ exports[`App Route /vehicle-status authenticated 1`] = `
: :
FISKER123 FISKER123
</p> </p>
<p>
<b>
ICCID
</b>
:
</p>
<p>
<b>
Model
</b>
:
Ocean
</p>
<p>
<b>
Year
</b>
:
2021
</p>
<p>
<b>
Trim
</b>
:
Basic
</p>
<p>
<b>
Country
</b>
:
</p>
<p>
<b>
Powertrain Type
</b>
:
</p>
<p>
<b>
Restraint Type
</b>
:
</p>
<p>
<b>
Body Type
</b>
:
</p>
<p>
<b>
Info Source
</b>
:
</p>
<p> <p>
<b> <b>
Log Level Log Level

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

@@ -30,6 +30,63 @@ exports[`VehicleDetailsTab Render 1`] = `
: :
TESTVIN1234567890 TESTVIN1234567890
</p> </p>
<p>
<b>
ICCID
</b>
:
</p>
<p>
<b>
Model
</b>
:
Ocean
</p>
<p>
<b>
Year
</b>
:
2021
</p>
<p>
<b>
Trim
</b>
:
Basic
</p>
<p>
<b>
Country
</b>
:
</p>
<p>
<b>
Powertrain Type
</b>
:
</p>
<p>
<b>
Restraint Type
</b>
:
</p>
<p>
<b>
Body Type
</b>
:
</p>
<p>
<b>
Info Source
</b>
:
</p>
<p> <p>
<b> <b>
Log Level Log Level

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

@@ -67,6 +67,33 @@ const MainForm = ({ vin }) => {
<p> <p>
<b>VIN</b>: {vin} <b>VIN</b>: {vin}
</p> </p>
<p>
<b>ICCID</b>: {vehicle.iccid}
</p>
<p>
<b>Model</b>: {vehicle.model}
</p>
<p>
<b>Year</b>: {vehicle.year}
</p>
<p>
<b>Trim</b>: {vehicle.trim}
</p>
<p>
<b>Country</b>: {vehicle.country}
</p>
<p>
<b>Powertrain Type</b>: {vehicle.powertrain}
</p>
<p>
<b>Restraint Type</b>: {vehicle.restraint}
</p>
<p>
<b>Body Type</b>: {vehicle.body_type}
</p>
<p>
<b>Info Source</b>: {vehicle.info_source}
</p>
{vehicle.log_level != null && ( {vehicle.log_level != null && (
<p> <p>
<b>Log Level</b>: {vehicle.log_level} <b>Log Level</b>: {vehicle.log_level}

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

@@ -38,6 +38,63 @@ exports[`DetailsTab Render 1`] = `
: :
TESTVIN1234567890 TESTVIN1234567890
</p> </p>
<p>
<b>
ICCID
</b>
:
</p>
<p>
<b>
Model
</b>
:
Ocean
</p>
<p>
<b>
Year
</b>
:
2021
</p>
<p>
<b>
Trim
</b>
:
Basic
</p>
<p>
<b>
Country
</b>
:
</p>
<p>
<b>
Powertrain Type
</b>
:
</p>
<p>
<b>
Restraint Type
</b>
:
</p>
<p>
<b>
Body Type
</b>
:
</p>
<p>
<b>
Info Source
</b>
:
</p>
<p> <p>
<b> <b>
Log Level Log Level

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

@@ -195,6 +195,60 @@ exports[`CarStatus Render 1`] = `
: :
TESTVIN1234567890 TESTVIN1234567890
</p> </p>
<p>
<b>
ICCID
</b>
:
</p>
<p>
<b>
Model
</b>
:
</p>
<p>
<b>
Year
</b>
:
</p>
<p>
<b>
Trim
</b>
:
</p>
<p>
<b>
Country
</b>
:
</p>
<p>
<b>
Powertrain Type
</b>
:
</p>
<p>
<b>
Restraint Type
</b>
:
</p>
<p>
<b>
Body Type
</b>
:
</p>
<p>
<b>
Info Source
</b>
:
</p>
</div> </div>
<div <div
class="MuiGrid-root makeStyles-textCenterAlign-0 MuiGrid-item MuiGrid-grid-md-12" class="MuiGrid-root makeStyles-textCenterAlign-0 MuiGrid-item MuiGrid-grid-md-12"

224
src/components/Cars/Update/__snapshots__/index.test.jsx.snap
View File

@@ -70,6 +70,43 @@ exports[`VehicleUpdate Render 1`] = `
</fieldset> </fieldset>
</div> </div>
</div> </div>
<div
class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined"
data-shrink="true"
for="iccid"
id="iccid-label"
>
ICCID
</label>
<div
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl"
>
<input
aria-invalid="false"
class="MuiInputBase-input MuiOutlinedInput-input"
id="iccid"
maxlength="50"
name="iccid"
type="text"
value=""
/>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-0 MuiOutlinedInput-notchedOutline"
>
<legend
class="PrivateNotchedOutline-legendLabelled-0 PrivateNotchedOutline-legendNotched-0"
>
<span>
ICCID
</span>
</legend>
</fieldset>
</div>
</div>
<div <div
class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth" class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
> >
@@ -210,6 +247,193 @@ exports[`VehicleUpdate Render 1`] = `
</fieldset> </fieldset>
</div> </div>
</div> </div>
<div
class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined"
data-shrink="true"
for="country"
id="country-label"
>
Country
</label>
<div
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl"
>
<input
aria-invalid="false"
class="MuiInputBase-input MuiOutlinedInput-input"
id="country"
maxlength="256"
name="country"
shrink="1"
type="text"
value=""
/>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-0 MuiOutlinedInput-notchedOutline"
>
<legend
class="PrivateNotchedOutline-legendLabelled-0 PrivateNotchedOutline-legendNotched-0"
>
<span>
Country
</span>
</legend>
</fieldset>
</div>
</div>
<div
class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined"
data-shrink="true"
for="powertrain"
id="powertrain-label"
>
Powertrain Type
</label>
<div
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl"
>
<input
aria-invalid="false"
class="MuiInputBase-input MuiOutlinedInput-input"
id="powertrain"
maxlength="256"
name="powertrain"
type="text"
value=""
/>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-0 MuiOutlinedInput-notchedOutline"
>
<legend
class="PrivateNotchedOutline-legendLabelled-0 PrivateNotchedOutline-legendNotched-0"
>
<span>
Powertrain Type
</span>
</legend>
</fieldset>
</div>
</div>
<div
class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined"
data-shrink="true"
for="restraint"
id="restraint-label"
>
Restraint Type
</label>
<div
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl"
>
<input
aria-invalid="false"
class="MuiInputBase-input MuiOutlinedInput-input"
id="restraint"
maxlength="256"
name="restraint"
type="text"
value=""
/>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-0 MuiOutlinedInput-notchedOutline"
>
<legend
class="PrivateNotchedOutline-legendLabelled-0 PrivateNotchedOutline-legendNotched-0"
>
<span>
Restraint Type
</span>
</legend>
</fieldset>
</div>
</div>
<div
class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined"
data-shrink="true"
for="body_type"
id="body_type-label"
>
Body Type
</label>
<div
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl"
>
<input
aria-invalid="false"
class="MuiInputBase-input MuiOutlinedInput-input"
id="body_type"
maxlength="256"
name="body_type"
type="text"
value=""
/>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-0 MuiOutlinedInput-notchedOutline"
>
<legend
class="PrivateNotchedOutline-legendLabelled-0 PrivateNotchedOutline-legendNotched-0"
>
<span>
Body Type
</span>
</legend>
</fieldset>
</div>
</div>
<div
class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined Mui-disabled Mui-disabled"
data-shrink="true"
for="info_source"
id="info_source-label"
>
Info Source
</label>
<div
class="MuiInputBase-root MuiOutlinedInput-root Mui-disabled Mui-disabled MuiInputBase-fullWidth MuiInputBase-formControl"
>
<input
aria-invalid="false"
class="MuiInputBase-input MuiOutlinedInput-input Mui-disabled Mui-disabled"
disabled=""
id="info_source"
name="info_source"
readonly=""
type="text"
value=""
/>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-0 MuiOutlinedInput-notchedOutline"
>
<legend
class="PrivateNotchedOutline-legendLabelled-0 PrivateNotchedOutline-legendNotched-0"
>
<span>
Info Source
</span>
</legend>
</fieldset>
</div>
</div>
<label <label
class="MuiFormLabel-root" class="MuiFormLabel-root"
id="demo-row-radio-buttons-group-label" id="demo-row-radio-buttons-group-label"

115
src/components/Cars/Update/index.jsx
View File

@@ -32,9 +32,15 @@ const MainForm = () => {
const [redirect, setRedirect] = useState(null); const [redirect, setRedirect] = useState(null);
const classes = useStyles(); const classes = useStyles();
const iccidEl = useRef(null);
const modelEl = useRef(null); const modelEl = useRef(null);
const yearEl = useRef(null); const yearEl = useRef(null);
const trimEl = useRef(null); const trimEl = useRef(null);
const countryEl = useRef(null);
const powertrainEl = useRef(null);
const restraintEl = useRef(null);
const bodyTypeEl = useRef(null);
const infoSourceEl = useRef(null);
const [selectedLogLevel, setSelectedLogLevel] = useState("info"); const [selectedLogLevel, setSelectedLogLevel] = useState("info");
const [canbusEnabled, setCANBusEnabled] = useState(true); const [canbusEnabled, setCANBusEnabled] = useState(true);
const [dataLoggerEnabled, setDataLoggerEnabled] = useState(false); const [dataLoggerEnabled, setDataLoggerEnabled] = useState(false);
@@ -71,9 +77,15 @@ const MainForm = () => {
useEffect(() => { useEffect(() => {
setSelectedLogLevel(vehicle.log_level ?? selectedLogLevel); setSelectedLogLevel(vehicle.log_level ?? selectedLogLevel);
iccidEl.current.value = vehicle.iccid ?? ""
modelEl.current.value = vehicle.model ?? "Ocean" modelEl.current.value = vehicle.model ?? "Ocean"
yearEl.current.value = vehicle.year ?? "2022" yearEl.current.value = vehicle.year ?? "2022"
trimEl.current.value = vehicle.trim ?? "Base" trimEl.current.value = vehicle.trim ?? "Base"
countryEl.current.value = vehicle.country ?? ""
powertrainEl.current.value = vehicle.powertrain ?? ""
restraintEl.current.value = vehicle.restraint ?? ""
bodyTypeEl.current.value = vehicle.body_type ?? ""
infoSourceEl.current.value = vehicle.info_source ?? ""
if (vehicle.canbus) { if (vehicle.canbus) {
setCANBusEnabled(vehicle.canbus.enabled ?? canbusEnabled); setCANBusEnabled(vehicle.canbus.enabled ?? canbusEnabled);
@@ -110,9 +122,14 @@ const MainForm = () => {
const formData = { const formData = {
vin: vin, vin: vin,
iccid: iccidEl.current.value,
model: modelEl.current.value, model: modelEl.current.value,
year: parseInt(yearEl.current.value), year: parseInt(yearEl.current.value),
trim: trimEl.current.value, trim: trimEl.current.value,
country: countryEl.current.value,
powertrain: powertrainEl.current.value,
restraint: restraintEl.current.value,
body_type: bodyTypeEl.current.value,
log_level: selectedLogLevel, log_level: selectedLogLevel,
canbus: { canbus: {
enabled: canbusEnabled, enabled: canbusEnabled,
@@ -155,6 +172,22 @@ const MainForm = () => {
required required
fullWidth fullWidth
/> />
<TextField
id="iccid"
name="iccid"
label="ICCID"
InputLabelProps={{
shrink: true
}}
defaultValue=""
variant="outlined"
margin="normal"
inputProps={{
maxLength: "50",
}}
fullWidth
inputRef={iccidEl}
/>
<TextField <TextField
id="model" id="model"
name="model" name="model"
@@ -200,6 +233,88 @@ const MainForm = () => {
fullWidth fullWidth
inputRef={trimEl} inputRef={trimEl}
/> />
<TextField
id="country"
name="country"
label="Country"
InputLabelProps={{
shrink: true
}}
defaultValue=""
variant="outlined"
margin="normal"
inputProps={{
shrink: +true,
maxLength: "256",
}}
fullWidth
inputRef={countryEl}
/>
<TextField
id="powertrain"
name="powertrain"
label="Powertrain Type"
InputLabelProps={{
shrink: true
}}
defaultValue=""
variant="outlined"
margin="normal"
inputProps={{
maxLength: "256",
}}
fullWidth
inputRef={powertrainEl}
/>
<TextField
id="restraint"
name="restraint"
label="Restraint Type"
InputLabelProps={{
shrink: true
}}
defaultValue=""
variant="outlined"
margin="normal"
inputProps={{
maxLength: "256",
}}
fullWidth
inputRef={restraintEl}
/>
<TextField
id="body_type"
name="body_type"
label="Body Type"
InputLabelProps={{
shrink: true
}}
defaultValue=""
variant="outlined"
margin="normal"
inputProps={{
maxLength: "256",
}}
fullWidth
inputRef={bodyTypeEl}
/>
<TextField
id="info_source"
name="info_source"
label="Info Source"
InputLabelProps={{
shrink: true
}}
inputProps={{
readOnly: true
}}
disabled
defaultValue=""
variant="outlined"
margin="normal"
fullWidth
inputRef={infoSourceEl}
/>
<FormLabel id="demo-row-radio-buttons-group-label">Log Level</FormLabel> <FormLabel id="demo-row-radio-buttons-group-label">Log Level</FormLabel>
<RadioGroup <RadioGroup
row row