console: Add default values to static adr

TheThingsNetwork · Feb 18, 2025 · 183e10c · 183e10c
1 parent abb3dfc
commit 183e10c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/pkg/webui/console/components/mac-settings-section/index.js b/pkg/webui/console/components/mac-settings-section/index.js
@@ -124,9 +124,6 @@ const maxDutyCycleOptions = [
   { value: 'DUTY_CYCLE_16384', label: '0.006%' },
 ]
 
-const encodeAdrMode = value => ({ [value]: {} })
-const decodeAdrMode = value => (value !== undefined ? Object.keys(value)[0] : null)
-
 const MacSettingsSection = props => {
   const {
     activationMode,
@@ -238,6 +235,20 @@ const MacSettingsSection = props => {
     [values],
   )
 
+  const getEncodedAdrModeValue = useCallback(mode => {
+    if (mode === 'static') {
+      return {
+        data_rate_index: 0,
+        tx_power_index: 0,
+        nb_trans: 1,
+      }
+    }
+    return {}
+  }, [])
+
+  const encodeAdrMode = value => ({ [value]: getEncodedAdrModeValue(value) })
+  const decodeAdrMode = value => (value !== undefined ? Object.keys(value)[0] : null)
+
   return (
     <Form.CollapseSection
       id="mac-settings"
@@ -697,13 +708,16 @@ const MacSettingsSection = props => {
             component={Input}
             type="number"
             inputWidth="xs"
+            max={15}
           />
           <Form.Field
             title={m.adrUplinks}
             name="mac_settings.adr.static.nb_trans"
             component={Input}
             type="number"
             inputWidth="xs"
+            min={1}
+            max={15}
           />
         </>
       )}

diff --git a/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js b/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js
@@ -356,8 +356,13 @@ const validationSchema = Yup.object()
               return Yup.object().shape({
                 static: Yup.object().shape({
                   data_rate_index: Yup.number().nullable(),
-                  tx_power_index: Yup.number().nullable(),
-                  nb_trans: Yup.number().nullable(),
+                  tx_power_index: Yup.number()
+                    .nullable()
+                    .max(15, Yup.passValues(sharedMessages.validateNumberLte)),
+                  nb_trans: Yup.number()
+                    .nullable()
+                    .min(1, Yup.passValues(sharedMessages.validateNumberGte))
+                    .max(15, Yup.passValues(sharedMessages.validateNumberLte)),
                 }),
               })
             } else if (value && 'disabled' in value) {

diff --git a/sdk/js/src/service/devices/index.js b/sdk/js/src/service/devices/index.js
@@ -114,7 +114,7 @@ class Devices {
       }
     }
 
-    if (paths.includes('mac_settings')) {
+    if (paths.some(path => path.includes('mac_settings'))) {
       const { mac_settings = {} } = device
 
       if (
@@ -137,7 +137,7 @@ class Devices {
         }
 
         if (typeof mac_settings.adr.static.nb_trans === 'undefined') {
-          mac_settings.adr.static.nb_trans = 0
+          mac_settings.adr.static.nb_trans = 1
         }
 
         if (typeof mac_settings.adr.static.tx_power_index === 'undefined') {