[blockly] Fix code generation for Thing object on Thing status block (o…

…penhab#2688) Fixes openhab#2670. Signed-off-by: Stefan Höhn <[email protected]>
stefan-hoehn · Jul 26, 2024 · 2de240e · 2de240e
1 parent 0c03554
commit 2de240e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-things.js b/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-things.js
@@ -56,7 +56,7 @@ export default function defineOHBlocks (f7, isGraalJs) {
     init: function () {
       this.appendValueInput('thingUid')
         .appendField('get thing status')
-        .setCheck(['String', 'oh_thing'])
+        .setCheck(['String', 'oh_thing', 'oh_thingtype'])
       this.setInputsInline(false)
       this.setOutput(true, 'String')
       this.setColour(0)
@@ -67,8 +67,10 @@ export default function defineOHBlocks (f7, isGraalJs) {
 
   javascriptGenerator.forBlock['oh_getthing_state'] = function (block) {
     const thingUid = javascriptGenerator.valueToCode(block, 'thingUid', javascriptGenerator.ORDER_ATOMIC)
+    const inputType = blockGetCheckedInputType(block, 'thingUid')
     if (isGraalJs) {
-      return [`things.getThing(${thingUid}).status`, 0]
+      let code = (inputType === 'oh_thingtype') ? `${thingUid}.status` : `things.getThing(${thingUid}).status`
+      return [code, 0]
     } else {
       const things = javascriptGenerator.provideFunction_(
         'things',