Merge branch 'develop' into release/0.0.3

2022-10-12 16:23:00 -07:00
parent 7c215e82c6 3d06baa272
commit 3fe1c99dcc
8 changed files with 12 additions and 12 deletions
--- a/src/components/CANFilter/Add/snapshots/index.test.jsx.snap
+++ b/src/components/CANFilter/Add/snapshots/index.test.jsx.snap
@@ -124,7 +124,7 @@ exports[`CANFiltersAdd Render 1`] = `
                  for="interval"
                  id="interval-label"
                >
-                  Interval
+                  Interval (ms)
                </label>
                <div
                  class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl"
@@ -146,7 +146,7 @@ exports[`CANFiltersAdd Render 1`] = `
                      class="PrivateNotchedOutline-legendLabelled-0"
                    >
                      <span>
-                        Interval
+                        Interval (ms)
                      </span>
                    </legend>
                  </fieldset>
--- a/src/components/CANFilter/Add/index.jsx
+++ b/src/components/CANFilter/Add/index.jsx
@@ -93,7 +93,7 @@ const MainForm = () => {
        <TextField
          id="interval"
          name="interval"
-          label="Interval"
+          label="Interval (ms)"
          variant="outlined"
          margin="normal"
          inputProps={{
--- a/src/components/CANFilter/Update/snapshots/index.test.jsx.snap
+++ b/src/components/CANFilter/Update/snapshots/index.test.jsx.snap
@@ -125,7 +125,7 @@ exports[`CANFiltersUpdate Render 1`] = `
                  for="interval"
                  id="interval-label"
                >
-                  Interval
+                  Interval (ms)
                  <span
                    aria-hidden="true"
                    class="MuiFormLabel-asterisk MuiInputLabel-asterisk"
@@ -155,7 +155,7 @@ exports[`CANFiltersUpdate Render 1`] = `
                      class="PrivateNotchedOutline-legendLabelled-0"
                    >
                      <span>
-                        Interval
+                        Interval (ms)
                         *
                      </span>
                    </legend>
--- a/src/components/CANFilter/Update/index.jsx
+++ b/src/components/CANFilter/Update/index.jsx
@@ -95,7 +95,7 @@ const MainForm = () => {
        <TextField
          id="interval"
          name="interval"
-          label="Interval"
+          label="Interval (ms)"
          variant="outlined"
          margin="normal"
          inputProps={{
--- a/src/components/Fleets/Status/CANFilters/Add/snapshots/index.test.jsx.snap
+++ b/src/components/Fleets/Status/CANFilters/Add/snapshots/index.test.jsx.snap
@@ -124,7 +124,7 @@ exports[`FleetCANFilterAdd Render 1`] = `
                  for="interval"
                  id="interval-label"
                >
-                  Interval
+                  Interval (ms)
                </label>
                <div
                  class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl"
@@ -146,7 +146,7 @@ exports[`FleetCANFilterAdd Render 1`] = `
                      class="PrivateNotchedOutline-legendLabelled-0"
                    >
                      <span>
-                        Interval
+                        Interval (ms)
                      </span>
                    </legend>
                  </fieldset>
--- a/src/components/Fleets/Status/CANFilters/Add/index.jsx
+++ b/src/components/Fleets/Status/CANFilters/Add/index.jsx
@@ -93,7 +93,7 @@ const MainForm = () => {
        <TextField
          id="interval"
          name="interval"
-          label="Interval"
+          label="Interval (ms)"
          variant="outlined"
          margin="normal"
          inputProps={{
--- a/src/components/Fleets/Status/CANFilters/Update/snapshots/index.test.jsx.snap
+++ b/src/components/Fleets/Status/CANFilters/Update/snapshots/index.test.jsx.snap
@@ -125,7 +125,7 @@ exports[`FleetCANFilterUpdate Render 1`] = `
                  for="interval"
                  id="interval-label"
                >
-                  Interval
+                  Interval (ms)
                  <span
                    aria-hidden="true"
                    class="MuiFormLabel-asterisk MuiInputLabel-asterisk"
@@ -155,7 +155,7 @@ exports[`FleetCANFilterUpdate Render 1`] = `
                      class="PrivateNotchedOutline-legendLabelled-0"
                    >
                      <span>
-                        Interval
+                        Interval (ms)
                         *
                      </span>
                    </legend>
--- a/src/components/Fleets/Status/CANFilters/Update/index.jsx
+++ b/src/components/Fleets/Status/CANFilters/Update/index.jsx
@@ -97,7 +97,7 @@ const MainForm = () => {
        <TextField
          id="interval"
          name="interval"
-          label="Interval"
+          label="Interval (ms)"
          variant="outlined"
          margin="normal"
          inputProps={{