OpenHAB
/
openhab-webui
mirror of https://github.com/openhab/openhab-webui.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[blockly] Fix typed var not working for dictionary (#3210) 

Fixes #3038.

Signed-off-by: Stefan Höhn <mail@stefanhoehn.com>
pull/3219/head
stefan-hoehn 2025-06-06 19:02:15 +02:00 committed by GitHub
parent b76889373a
commit c12c18cdde
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-dicts.js
View File

@ -4,6 +4,7 @@
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript.js' import { javascriptGenerator } from 'blockly/javascript.js'
import { blockGetCheckedInputType } from '@/assets/definitions/blockly/utils.js'
export default function (f7) { export default function (f7) {
Blockly.Blocks['dicts_create_with'] = { Blockly.Blocks['dicts_create_with'] = {
@ -190,7 +191,7 @@ export default function (f7) {
.setCheck('String') .setCheck('String')
this.appendValueInput('varName') this.appendValueInput('varName')
.appendField('from dictionary') .appendField('from dictionary')
.setCheck('String') .setCheck(['Dictionary', 'String'])
this.setInputsInline(true) this.setInputsInline(true)
this.setOutput(true, 'String') this.setOutput(true, 'String')
this.setHelpUrl('https://www.openhab.org/docs/configuration/blockly/rules-blockly-standard-ext.html#get-value-of-key-from-dictionary') this.setHelpUrl('https://www.openhab.org/docs/configuration/blockly/rules-blockly-standard-ext.html#get-value-of-key-from-dictionary')
@ -205,7 +206,12 @@ export default function (f7) {
*/ */
javascriptGenerator.forBlock['dicts_get'] = function (block) { javascriptGenerator.forBlock['dicts_get'] = function (block) {
const key = javascriptGenerator.valueToCode(block, 'key', javascriptGenerator.ORDER_ATOMIC) const key = javascriptGenerator.valueToCode(block, 'key', javascriptGenerator.ORDER_ATOMIC)
const varName = javascriptGenerator.valueToCode(block, 'varName', javascriptGenerator.ORDER_ATOMIC).replace(/'/g, '') // note: even though the dict can be directly used without a variable, we need to keep the variable name as "varName" for backwards compatibility
let varName = javascriptGenerator.valueToCode(block, 'varName', javascriptGenerator.ORDER_ATOMIC)
const varNameType = blockGetCheckedInputType(block, 'varName')
if (varNameType !== 'Dictionary') {
varName = varName.replace(/'/g, '')
}
let code = `${varName}[${key}]` let code = `${varName}[${key}]`
return [code, 0] return [code, 0]
} }