From 7892df25cec9987e59b945ab39dbc93873977316 Mon Sep 17 00:00:00 2001
From: Paul Adamsen <117673433+pauladamseniii@users.noreply.github.com>
Date: Tue, 5 Sep 2023 12:09:07 -0400
Subject: [PATCH] CEC-4533 - Add DLT level to TREX config message (#434)

* CEC-4533 - Add DLT level to TREX config message

* Improved log level selection
---
 src/components/Cars/Status/Details/index.jsx  |  34 ++++-
 .../Status/__snapshots__/index.test.jsx.snap  |  10 +-
 .../Update/__snapshots__/index.test.jsx.snap  | 126 +++++++++---------
 src/components/Cars/Update/index.jsx          |  63 +++++++--
 4 files changed, 155 insertions(+), 78 deletions(-)

diff --git a/src/components/Cars/Status/Details/index.jsx b/src/components/Cars/Status/Details/index.jsx
index a62e88d..b359a6f 100644
--- a/src/components/Cars/Status/Details/index.jsx
+++ b/src/components/Cars/Status/Details/index.jsx
@@ -76,6 +76,29 @@ const MainForm = ({ vin }) => {
     }
   }
 
+  const findDLTLevelStr = (dltLevelNum) => {
+    switch (dltLevelNum) {
+      case 0:
+        return "Off"
+      case 1:
+        return "Fatal"
+      case 2:
+        return "Error"
+      case 3:
+        return "Warn"
+      case 4:
+        return "Info"
+      case 5:
+        return "Debug"
+      case 6:
+        return "Verbose"
+      case 255:
+        return "Delete"
+      default:
+        return "Default"
+    }
+  }
+
   if (redirect && redirect.length > 0) {
     return <Redirect to={redirect} />;
   }
@@ -144,11 +167,16 @@ const MainForm = ({ vin }) => {
               <p>
                 <b>DTC Enabled</b>: {(vehicle.canbus.dtc_enabled || false).toString()}
               </p>
-              <p>
-                <b>DLT Logging Enabled</b>: {(vehicle.dlt_enabled || false).toString()}
-              </p>
             </>
           )}
+          <p>
+            <b>DLT Logging Enabled</b>: {(vehicle.dlt_enabled || false).toString()}
+          </p>
+          {vehicle.dlt_enabled && (
+            <p>
+              <b>DLT Level</b>: {findDLTLevelStr(vehicle.dlt_level) ?? "Default"}
+            </p>
+          )}
         </Grid>
         {showDebugMask && (
           <Grid item md={12} className={classes.textCenterAlign}>
diff --git a/src/components/Cars/Status/__snapshots__/index.test.jsx.snap b/src/components/Cars/Status/__snapshots__/index.test.jsx.snap
index cfb8cf3..7ada9d4 100644
--- a/src/components/Cars/Status/__snapshots__/index.test.jsx.snap
+++ b/src/components/Cars/Status/__snapshots__/index.test.jsx.snap
@@ -318,7 +318,15 @@ exports[`CarStatus Render 1`] = `
                     </div>
                     <div
                       class="MuiGrid-root makeStyles-textCenterAlign-0 MuiGrid-item MuiGrid-grid-md-12"
-                    />
+                    >
+                      <p>
+                        <b>
+                          DLT Logging Enabled
+                        </b>
+                        : 
+                        false
+                      </p>
+                    </div>
                     <div
                       class="MuiGrid-root makeStyles-textCenterAlign-0 MuiGrid-item MuiGrid-grid-md-12"
                     >
diff --git a/src/components/Cars/Update/__snapshots__/index.test.jsx.snap b/src/components/Cars/Update/__snapshots__/index.test.jsx.snap
index 6101f51..e0d7314 100644
--- a/src/components/Cars/Update/__snapshots__/index.test.jsx.snap
+++ b/src/components/Cars/Update/__snapshots__/index.test.jsx.snap
@@ -968,81 +968,85 @@ exports[`VehicleUpdate Render 1`] = `
                   </fieldset>
                 </div>
               </div>
-              <label
-                class="MuiFormControlLabel-root"
-              >
-                <span
-                  aria-disabled="false"
-                  class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-0 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-checked-0 Mui-checked MuiIconButton-colorSecondary"
+              <div>
+                <label
+                  class="MuiFormControlLabel-root"
                 >
                   <span
-                    class="MuiIconButton-label"
+                    aria-disabled="false"
+                    class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-0 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-checked-0 Mui-checked MuiIconButton-colorSecondary"
                   >
-                    <input
-                      checked=""
-                      class="PrivateSwitchBase-input-0"
-                      data-indeterminate="false"
-                      type="checkbox"
-                      value=""
-                    />
-                    <svg
-                      aria-hidden="true"
-                      class="MuiSvgIcon-root"
-                      focusable="false"
-                      viewBox="0 0 24 24"
+                    <span
+                      class="MuiIconButton-label"
                     >
-                      <path
-                        d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
+                      <input
+                        checked=""
+                        class="PrivateSwitchBase-input-0"
+                        data-indeterminate="false"
+                        type="checkbox"
+                        value=""
                       />
-                    </svg>
+                      <svg
+                        aria-hidden="true"
+                        class="MuiSvgIcon-root"
+                        focusable="false"
+                        viewBox="0 0 24 24"
+                      >
+                        <path
+                          d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
+                        />
+                      </svg>
+                    </span>
+                    <span
+                      class="MuiTouchRipple-root"
+                    />
                   </span>
                   <span
-                    class="MuiTouchRipple-root"
-                  />
-                </span>
-                <span
-                  class="MuiTypography-root MuiFormControlLabel-label MuiTypography-body1"
-                >
-                  DTC Enabled
-                </span>
-              </label>
-              <label
-                class="MuiFormControlLabel-root"
-              >
-                <span
-                  aria-disabled="false"
-                  class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-0 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
+                    class="MuiTypography-root MuiFormControlLabel-label MuiTypography-body1"
+                  >
+                    DTC Enabled
+                  </span>
+                </label>
+              </div>
+              <div>
+                <label
+                  class="MuiFormControlLabel-root"
                 >
                   <span
-                    class="MuiIconButton-label"
+                    aria-disabled="false"
+                    class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-0 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
                   >
-                    <input
-                      class="PrivateSwitchBase-input-0"
-                      data-indeterminate="false"
-                      type="checkbox"
-                      value=""
-                    />
-                    <svg
-                      aria-hidden="true"
-                      class="MuiSvgIcon-root"
-                      focusable="false"
-                      viewBox="0 0 24 24"
+                    <span
+                      class="MuiIconButton-label"
                     >
-                      <path
-                        d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
+                      <input
+                        class="PrivateSwitchBase-input-0"
+                        data-indeterminate="false"
+                        type="checkbox"
+                        value=""
                       />
-                    </svg>
+                      <svg
+                        aria-hidden="true"
+                        class="MuiSvgIcon-root"
+                        focusable="false"
+                        viewBox="0 0 24 24"
+                      >
+                        <path
+                          d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
+                        />
+                      </svg>
+                    </span>
+                    <span
+                      class="MuiTouchRipple-root"
+                    />
                   </span>
                   <span
-                    class="MuiTouchRipple-root"
-                  />
-                </span>
-                <span
-                  class="MuiTypography-root MuiFormControlLabel-label MuiTypography-body1"
-                >
-                  DLT Logging Enabled (supported from T.Rex 1.1.127)
-                </span>
-              </label>
+                    class="MuiTypography-root MuiFormControlLabel-label MuiTypography-body1"
+                  >
+                    DLT Logging Enabled (supported from T.Rex 1.1.127)
+                  </span>
+                </label>
+              </div>
               <div
                 class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
               >
diff --git a/src/components/Cars/Update/index.jsx b/src/components/Cars/Update/index.jsx
index 65c2379..31fe76d 100644
--- a/src/components/Cars/Update/index.jsx
+++ b/src/components/Cars/Update/index.jsx
@@ -48,6 +48,7 @@ const MainForm = () => {
   const [maxDiskBufferSize, setMaxDiskBufferSize] = useState(0);
   const [dtcEnabled, setDTCEnabled] = useState(true);
   const [dltEnabled, setDLTEnabled] = useState(false);
+  const [dltLevel, setDLTLevel] = useState(0);
   const debugMaskEl = useRef(null);
   const tagsEl = useRef(null);
 
@@ -100,7 +101,11 @@ const MainForm = () => {
       setMaxDiskBufferSize(vehicle.canbus.max_disk_buffer_size ?? maxDiskBufferSize);
       setDTCEnabled(vehicle.canbus.dtc_enabled ?? dtcEnabled);
     }
+
     setDLTEnabled(vehicle.dlt_enabled ?? dltEnabled);
+    if (vehicle.dlt_enabled) {
+      setDLTLevel(vehicle.dlt_level?.toString() ?? dltLevel.toString());
+    }
 
     if (showDebugMask) {
       debugMaskEl.current.value = vehicle.debug_mask ?? ""
@@ -131,6 +136,10 @@ const MainForm = () => {
     setDLTEnabled(event.target.checked);
   }
 
+  const onDltLevelChange = (event) => {
+    setDLTLevel(event.target.value);
+  }
+
   const onMaxMemBufferSizeChange = (event) => {
     setMaxMemBufferSize(event.target.value);
   }
@@ -154,7 +163,7 @@ const MainForm = () => {
         restraint: restraintEl.current.value,
         body_type: bodyTypeEl.current.value,
         log_level: selectedLogLevel,
-        tags: tagsEl.current.value.split(",").map(function(word) {
+        tags: tagsEl.current.value.split(",").map(function (word) {
           return word.trim();
         }),
         canbus: {
@@ -165,6 +174,7 @@ const MainForm = () => {
           dtc_enabled: dtcEnabled
         },
         dlt_enabled: dltEnabled,
+        dlt_level: dltEnabled ? parseInt(dltLevel) : 0,
         debug_mask: debugMaskEl.current?.value
       };
 
@@ -424,18 +434,45 @@ const MainForm = () => {
           required
           fullWidth
         />
-        <FormControlLabel control={
-          <Checkbox
-            checked={dtcEnabled}
-            onChange={onDtcEnabledChange}
-          />
-        } label="DTC Enabled" />
-        <FormControlLabel control={
-          <Checkbox
-            checked={dltEnabled}
-            onChange={onDltEnabledChange}
-          />
-        } label="DLT Logging Enabled (supported from T.Rex 1.1.127)" />
+        <div>
+          <FormControlLabel control={
+            <Checkbox
+              checked={dtcEnabled}
+              onChange={onDtcEnabledChange}
+            />
+          } label="DTC Enabled" />
+        </div>
+        <div>
+          <FormControlLabel control={
+            <Checkbox
+              checked={dltEnabled}
+              onChange={onDltEnabledChange}
+            />
+          } label="DLT Logging Enabled (supported from T.Rex 1.1.127)" />
+        </div>
+        {dltEnabled && (
+          <div>
+            <FormLabel id="dlt_level">DLT Log Level</FormLabel>
+            <RadioGroup
+              row
+              aria-labelledby="dlt_level"
+              name="dlt_level"
+              value={dltLevel}
+              onChange={onDltLevelChange}
+              margin="normal"
+              disabled={!dltEnabled}
+            >
+              <FormControlLabel value="0" control={<Radio />} label="Off" />
+              <FormControlLabel value="1" control={<Radio />} label="Fatal" />
+              <FormControlLabel value="2" control={<Radio />} label="Error" />
+              <FormControlLabel value="3" control={<Radio />} label="Warn" />
+              <FormControlLabel value="4" control={<Radio />} label="Info" />
+              <FormControlLabel value="5" control={<Radio />} label="Debug" />
+              <FormControlLabel value="6" control={<Radio />} label="Verbose" />
+              <FormControlLabel value="255" control={<Radio />} label="Delete" />
+            </RadioGroup>
+          </div>
+        )}
         {showDebugMask && (
           <TextField
             id="debug_mask"