Skip to content

Blockly: Fix ReferenceError due to non-existing input #3610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsjames merged 1 commit into from
Dec 16, 2025
Merged

Blockly: Fix ReferenceError due to non-existing input #3610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-dateoffsets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ export default function (f7) {
* Code part
*/
javascriptGenerator.forBlock['oh_zdt_temporal_unit_input'] = function (block) {
const value = javascriptGenerator.valueToCode(block, 'value', javascriptGenerator.ORDER_ATOMIC)
const value = valueToCode(block, 'value', javascriptGenerator.ORDER_ATOMIC)
return [`(${value})`, javascriptGenerator.ORDER_NONE]
}

Expand Down Expand Up @@ -518,7 +518,7 @@ export default function (f7) {
}

javascriptGenerator.forBlock['oh_zdt_amend'] = function (block) {
const baseZdt = javascriptGenerator.valueToCode(block, 'baseZdt', javascriptGenerator.ORDER_ATOMIC)
const baseZdt = valueToCode(block, 'baseZdt', javascriptGenerator.ORDER_ATOMIC)
const operation = block.getFieldValue('operation')

let code = baseZdt
Expand All @@ -533,7 +533,7 @@ export default function (f7) {
if (operationBlock) {
let i
for (i = 0; i < this.itemCount_; i++) {
let temporal = javascriptGenerator.valueToCode(block, 'ADD' + i, javascriptGenerator.ORDER_ATOMIC)
let temporal = valueToCode(block, 'ADD' + i, javascriptGenerator.ORDER_ATOMIC)
temporal = temporal.replace(/\(/g, '').replace(/\)/g, '')

let inputBlock = this.getInputTargetBlock('ADD' + i)
Expand Down Expand Up @@ -637,7 +637,7 @@ export default function (f7) {
* Code part
*/
javascriptGenerator.forBlock['oh_zdt_toText'] = function (block) {
const date = javascriptGenerator.valueToCode(block, 'date', javascriptGenerator.ORDER_ATOMIC)
const date = valueToCode(block, 'date', javascriptGenerator.ORDER_ATOMIC)
const withtime = block.getFieldValue('withtime')

let code = ''
Expand All @@ -646,7 +646,7 @@ export default function (f7) {
} else if (withtime === 'without') {
code = `${date}.format(time.DateTimeFormatter.ofPattern('yyyy-MM-dd'))`
} else if (withtime === 'withPattern') {
const pattern = javascriptGenerator.valueToCode(block, 'pattern', javascriptGenerator.ORDER_ATOMIC)
const pattern = valueToCode(block, 'pattern', javascriptGenerator.ORDER_ATOMIC)
code = `${date}.format(time.DateTimeFormatter.ofPattern(${pattern}))`
} else {
code = `${date}.format(time.DateTimeFormatter.ofPattern('yyyy-MM-dd\\'T\\'HH:mm:ss.SSSZ'))`
Expand Down Expand Up @@ -688,8 +688,8 @@ export default function (f7) {
* Code part
*/
javascriptGenerator.forBlock['oh_zdt_compare'] = function (block) {
const zdtOne = javascriptGenerator.valueToCode(block, 'zdtOne', javascriptGenerator.ORDER_ATOMIC)
const zdtTwo = javascriptGenerator.valueToCode(block, 'zdtTwo', javascriptGenerator.ORDER_ATOMIC)
const zdtOne = valueToCode(block, 'zdtOne', javascriptGenerator.ORDER_ATOMIC)
const zdtTwo = valueToCode(block, 'zdtTwo', javascriptGenerator.ORDER_ATOMIC)
const operation = block.getFieldValue('operation')
const precision = block.getFieldValue('precision')
const dateComparison = block.getFieldValue('dateComparison')
Expand Down Expand Up @@ -731,9 +731,9 @@ export default function (f7) {
*/
javascriptGenerator.forBlock['oh_zdt_between'] = function (block) {
let zdtCompare = addDateComparisonSupport()
let zdtOne = javascriptGenerator.valueToCode(block, 'zdtOne', javascriptGenerator.ORDER_ATOMIC)
let zdtTwo = javascriptGenerator.valueToCode(block, 'zdtTwo', javascriptGenerator.ORDER_ATOMIC)
let zdtThree = javascriptGenerator.valueToCode(block, 'zdtThree', javascriptGenerator.ORDER_ATOMIC)
let zdtOne = valueToCode(block, 'zdtOne', javascriptGenerator.ORDER_ATOMIC)
let zdtTwo = valueToCode(block, 'zdtTwo', javascriptGenerator.ORDER_ATOMIC)
let zdtThree = valueToCode(block, 'zdtThree', javascriptGenerator.ORDER_ATOMIC)
let dateComparison = block.getFieldValue('dateComparison')

const op = new Map([['dateandtime', 'isBetweenDateTimes'], ['date', 'isBetweenDates'], ['time', 'isBetweenTimes']]).get(dateComparison)
Expand Down Expand Up @@ -764,7 +764,7 @@ export default function (f7) {
* Code part
*/
javascriptGenerator.forBlock['oh_get_zdt_part'] = function (block) {
const zdt = javascriptGenerator.valueToCode(block, 'zdt', javascriptGenerator.ORDER_ATOMIC)
const zdt = valueToCode(block, 'zdt', javascriptGenerator.ORDER_ATOMIC)
let temporalPart = block.getFieldValue('temporalPart')

const op = new Map([['getYear', 'year'], ['getMonthValue', 'monthValue'], ['getDayOfMonth', 'dayOfMonth'], ['getDayOfWeek', 'dayOfWeek().value'], ['getDayOfYear', 'dayOfYear'], ['getHour', 'hour'], ['getMinute', 'minute'], ['getSecond', 'second'], ['getNanoTotal', 'get(time.ChronoField.NANO_OF_SECOND)']])
Expand Down Expand Up @@ -816,8 +816,8 @@ export default function (f7) {
*/
javascriptGenerator.forBlock['oh_get_time_between'] = function (block) {
const temporalPart = block.getFieldValue('temporalPart')
const zdtOne = javascriptGenerator.valueToCode(block, 'zdtOne', javascriptGenerator.ORDER_ATOMIC)
const zdtTwo = javascriptGenerator.valueToCode(block, 'zdtTwo', javascriptGenerator.ORDER_ATOMIC)
const zdtOne = valueToCode(block, 'zdtOne', javascriptGenerator.ORDER_ATOMIC)
const zdtTwo = valueToCode(block, 'zdtTwo', javascriptGenerator.ORDER_ATOMIC)

const code = `time.ChronoUnit.${temporalPart}.between(${zdtOne},${zdtTwo})`
return [code, javascriptGenerator.ORDER_NONE]
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-items.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export default function (f7) {
}

javascriptGenerator.forBlock['oh_getitem_state'] = function (block) {
const itemName = javascriptGenerator.valueToCode(block, 'itemName', javascriptGenerator.ORDER_ATOMIC)
const itemName = valueToCode(block, 'itemName', javascriptGenerator.ORDER_ATOMIC)
return [`items.getItem(${itemName}).state`, 0]
}

Expand Down Expand Up @@ -257,7 +257,7 @@ export default function (f7) {
* Code part
*/
javascriptGenerator.forBlock['oh_getitem_attribute'] = function (block) {
const theItem = javascriptGenerator.valueToCode(block, 'item', javascriptGenerator.ORDER_ATOMIC)
const theItem = valueToCode(block, 'item', javascriptGenerator.ORDER_ATOMIC)
const inputType = blockGetCheckedInputType(block, 'item')
let attributeName = block.getFieldValue('attributeName')

Expand Down
8 changes: 4 additions & 4 deletions bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-math.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export default function (f7) {
if (inputType === 'oh_quantity') {
math_number = math_number_input + '.float'
}
const decimals = javascriptGenerator.valueToCode(block, 'DECIMALS', javascriptGenerator.ORDER_NONE)
const decimals = valueToCode(block, 'DECIMALS', javascriptGenerator.ORDER_NONE)
const operand = block.getFieldValue('op')

let code
Expand Down Expand Up @@ -218,7 +218,7 @@ export default function (f7) {

javascriptGenerator.forBlock['math_single'] = function (block) {
const inputType = blockGetCheckedInputType(block, 'NUM')
const math_number_input = javascriptGenerator.valueToCode(block, 'NUM', javascriptGenerator.ORDER_FUNCTION_CALL)
const math_number_input = valueToCode(block, 'NUM', javascriptGenerator.ORDER_FUNCTION_CALL)
let math_number = math_number_input
if (inputType === 'oh_quantity') {
math_number = math_number_input + '.float'
Expand Down Expand Up @@ -301,8 +301,8 @@ export default function (f7) {
const wasInitialized = javascriptGenerator.isInitialized
try {
javascriptGenerator.isInitialized = 1 // workaround to avoid console warnings
math_number_input1 = javascriptGenerator.valueToCode(block, 'NUM1', javascriptGenerator.ORDER_FUNCTION_CALL)
math_number_input2 = javascriptGenerator.valueToCode(block, 'NUM2', javascriptGenerator.ORDER_FUNCTION_CALL)
math_number_input1 = valueToCode(block, 'NUM1', javascriptGenerator.ORDER_FUNCTION_CALL)
math_number_input2 = valueToCode(block, 'NUM2', javascriptGenerator.ORDER_FUNCTION_CALL)
} catch (e) {
// may throw an exception on workspace startup in uninitialized state but in this case we can ignore
} finally {
Expand Down
16 changes: 8 additions & 8 deletions bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-metadata.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export default function (f7) {
javascriptGenerator.forBlock['oh_get_meta_config'] = function (block) {
const configKey = valueToCode(block, 'configKey', javascriptGenerator.ORDER_ATOMIC)
const theItem = valueToCode(block, 'theItem', javascriptGenerator.ORDER_ATOMIC)
const namespace = javascriptGenerator.valueToCode(block, 'namespace', javascriptGenerator.ORDER_ATOMIC)
const namespace = valueToCode(block, 'namespace', javascriptGenerator.ORDER_ATOMIC)
addGetItemMetaConfigValue()
return [`getItemMetaConfigValue(${theItem}, ${namespace}, ${configKey})`, javascriptGenerator.ORDER_CONDITIONAL]
}
Expand Down Expand Up @@ -94,9 +94,9 @@ export default function (f7) {
}

javascriptGenerator.forBlock['oh_store_meta_value'] = function (block) {
const value = javascriptGenerator.valueToCode(block, 'value', javascriptGenerator.ORDER_ATOMIC)
const theItem = javascriptGenerator.valueToCode(block, 'theItem', javascriptGenerator.ORDER_ATOMIC)
const namespace = javascriptGenerator.valueToCode(block, 'namespace', javascriptGenerator.ORDER_ATOMIC)
const value = valueToCode(block, 'value', javascriptGenerator.ORDER_ATOMIC)
const theItem = valueToCode(block, 'theItem', javascriptGenerator.ORDER_ATOMIC)
const namespace = valueToCode(block, 'namespace', javascriptGenerator.ORDER_ATOMIC)

let itemMeta = addItemMeta()
let code = `${itemMeta} = items.metadata.getMetadata(${theItem}, ${namespace});\n`
Expand Down Expand Up @@ -137,10 +137,10 @@ export default function (f7) {
}

javascriptGenerator.forBlock['oh_store_meta_config'] = function (block) {
const value = javascriptGenerator.valueToCode(block, 'value', javascriptGenerator.ORDER_ATOMIC)
const configKey = javascriptGenerator.valueToCode(block, 'configKey', javascriptGenerator.ORDER_ATOMIC).replaceAll('\'', '')
const theItem = javascriptGenerator.valueToCode(block, 'theItem', javascriptGenerator.ORDER_ATOMIC)
const namespace = javascriptGenerator.valueToCode(block, 'namespace', javascriptGenerator.ORDER_ATOMIC)
const value = valueToCode(block, 'value', javascriptGenerator.ORDER_ATOMIC)
const configKey = valueToCode(block, 'configKey', javascriptGenerator.ORDER_ATOMIC).replaceAll('\'', '')
const theItem = valueToCode(block, 'theItem', javascriptGenerator.ORDER_ATOMIC)
const namespace = valueToCode(block, 'namespace', javascriptGenerator.ORDER_ATOMIC)

let itemMeta = addItemMeta()
let code = `${itemMeta} = items.metadata.getMetadata(${theItem}, ${namespace});\n`
Expand Down
36 changes: 18 additions & 18 deletions bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-notifications.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading