Restrict range value read only attribute presets support (#651)

Signed-off-by: jsetton <jeremy.setton@gmail.com>
openhab · Jan 30, 2024 · 53770ab · 53770ab
1 parent 14ac403
commit 53770ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/lambda/alexa/smarthome/properties/rangeValue.js b/lambda/alexa/smarthome/properties/rangeValue.js
@@ -192,12 +192,12 @@ export default class RangeValue extends Generic {
     // Define presets as follow:
     //  1) using parameter values if defined
     //  2) using item state options if available
-    //  3) empty object
-    const presets = parameters[Parameter.PRESETS]
+    //  3) empty object if non-controllable property
+    const presets = !this.isNonControllable
       ? parameters[Parameter.PRESETS]
-      : item.stateDescription?.options
-        ? Object.fromEntries(item.stateDescription.options.map((option) => [option.value, option.label]))
-        : {};
+        ? parameters[Parameter.PRESETS]
+        : Object.fromEntries(item.stateDescription?.options?.map((option) => [option.value, option.label]) || [])
+      : {};
     // Update presets parameter, removing duplicate labels and entries
     //  with out of range values, not multiple of range precision, or with no valid labels
     parameters[Parameter.PRESETS] = Object.entries(presets)

diff --git a/lambda/test/alexa/cases/discovery/other.test.js b/lambda/test/alexa/cases/discovery/other.test.js
@@ -122,9 +122,6 @@ export default {
       type: 'Number:Dimensionless',
       name: 'range3',
       label: 'Range Value 3',
-      stateDescription: {
-        pattern: '%d %unit%' // Unit placeholder in state presentation
-      },
       metadata: {
         alexa: {
           value: 'RangeValue',
@@ -172,7 +169,8 @@ export default {
           value: 'RangeValue',
           config: {
             nonControllable: true,
-            // No action mappings support if non controllable
+            // No presets or action mappings support if non controllable
+            presets: '0=@Value.Close',
             actionMappings: 'Close=0'
           }
         }