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

Ensure the code editors are in the correct modes

This commit is contained in:
Dean 2023-07-14 14:19:19 +01:00
parent c9f6c057c6
commit 18a05faf67
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@
import { import {
bindingsToCompletions, bindingsToCompletions,
jsAutocomplete, jsAutocomplete,
hbAutocomplete,
EditorModes, EditorModes,
} from "components/common/CodeEditor" } from "components/common/CodeEditor"
import FilterDrawer from "components/design/settings/controls/FilterEditor/FilterDrawer.svelte" import FilterDrawer from "components/design/settings/controls/FilterEditor/FilterDrawer.svelte"
@ -70,7 +71,10 @@
$: queryLimit = tableId?.includes("datasource") ? "∞" : "1000" $: queryLimit = tableId?.includes("datasource") ? "∞" : "1000"
$: isTrigger = block?.type === "TRIGGER" $: isTrigger = block?.type === "TRIGGER"
$: isUpdateRow = stepId === ActionStepID.UPDATE_ROW $: isUpdateRow = stepId === ActionStepID.UPDATE_ROW
$: codeMode =
stepId === "EXECUTE_BASH" ? EditorModes.Handlebars : EditorModes.JS
$: buildCompletions =
stepId === "EXECUTE_BASH" ? hbAutocomplete : jsAutocomplete
/** /**
* TODO - Remove after November 2023 * TODO - Remove after November 2023
* ******************************* * *******************************
@ -497,17 +501,21 @@
inputData[key] = e.detail inputData[key] = e.detail
}} }}
completions={[ completions={[
jsAutocomplete([ buildCompletions([
...bindingsToCompletions(bindings, EditorModes.JS), ...bindingsToCompletions(bindings, codeMode),
]), ]),
]} ]}
mode={EditorModes.JS} mode={codeMode}
height={500} height={500}
/> />
<div class="messaging"> <div class="messaging">
<Icon name="FlashOn" /> <Icon name="FlashOn" />
<div class="messaging-wrap"> <div class="messaging-wrap">
<div>Add available bindings by typing <strong>$</strong></div> <div>
Add available bindings by typing <strong
>{codeMode == EditorModes.JS ? "$" : "{{"}</strong
>
</div>
</div> </div>
</div> </div>
</CodeEditorModal> </CodeEditorModal>