MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure values typed in the JS step node are properly converted. Allow multiple quote types for readable bindings

This commit is contained in:
Dean 2025-03-13 09:41:39 +00:00
parent 7b3663e0c0
commit 754f486414
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
View File

@ -56,7 +56,10 @@
memo, memo,
fetchData, fetchData,
} from "@budibase/frontend-core" } from "@budibase/frontend-core"
import { getSchemaForDatasourcePlus } from "@/dataBinding" import {
getSchemaForDatasourcePlus,
readableToRuntimeBinding,
} from "@/dataBinding"
import { TriggerStepID, ActionStepID } from "@/constants/backend/automations" import { TriggerStepID, ActionStepID } from "@/constants/backend/automations"
import { onMount, createEventDispatcher } from "svelte" import { onMount, createEventDispatcher } from "svelte"
import { writable } from "svelte/store" import { writable } from "svelte/store"
@ -1034,7 +1037,10 @@
{bindings} {bindings}
{schema} {schema}
panel={AutomationBindingPanel} panel={AutomationBindingPanel}
on:change={e => onChange({ [key]: e.detail })} on:change={e =>
onChange({
[key]: readableToRuntimeBinding(bindings, e.detail),
})}
context={$memoContext} context={$memoContext}
value={inputData[key]} value={inputData[key]}
/> />

2
packages/builder/src/dataBinding.js
View File

@ -37,7 +37,7 @@ const { ContextScopes } = Constants
// Regex to match all instances of template strings // Regex to match all instances of template strings
const CAPTURE_VAR_INSIDE_TEMPLATE = /{{([^}]+)}}/g const CAPTURE_VAR_INSIDE_TEMPLATE = /{{([^}]+)}}/g
const CAPTURE_VAR_INSIDE_JS = /\$\("([^")]+)"\)/g const CAPTURE_VAR_INSIDE_JS = /\$\((["'`])([^"'`]+)\1\)/g
const CAPTURE_HBS_TEMPLATE = /{{[\S\s]*?}}/g const CAPTURE_HBS_TEMPLATE = /{{[\S\s]*?}}/g
const UpdateReferenceAction = { const UpdateReferenceAction = {