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

Merge pull request #2960 from Budibase/bug/fix-automation-ordering 

fix issue where automation was not being added in the correct order
This commit is contained in:
Peter Clement 2021-10-11 14:34:02 +01:00 committed by GitHub
parent 5ae5d8ddf0 8b97588851
commit ebe930b1fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/builder/cypress/support/commands.js
View File

@ -5,7 +5,7 @@
// *********************************************** // ***********************************************
// //
Cypress.on('uncaught:exception', (err, runnable) => { Cypress.on("uncaught:exception", () => {
return false return false
}) })

8
packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
View File

@ -4,10 +4,11 @@
import { externalActions } from "./ExternalActions" import { externalActions } from "./ExternalActions"
export let blockIdx export let blockIdx
export let blockComplete
let selectedAction let selectedAction
let actionVal let actionVal
let actions = Object.entries($automationStore.blockDefinitions.ACTION) let actions = Object.entries($automationStore.blockDefinitions.ACTION)
export let blockComplete
const external = actions.reduce((acc, elm) => { const external = actions.reduce((acc, elm) => {
const [k, v] = elm const [k, v] = elm
@ -36,10 +37,9 @@
actionVal.stepId, actionVal.stepId,
actionVal actionVal
) )
automationStore.actions.addBlockToAutomation(newBlock) automationStore.actions.addBlockToAutomation(newBlock, blockIdx + 1)
await automationStore.actions.save( await automationStore.actions.save(
$automationStore.selectedAutomation?.automation, $automationStore.selectedAutomation?.automation
blockIdx
) )
} }
</script> </script>

2
packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
View File

@ -151,7 +151,7 @@
> >
{/if} {/if}
<Button <Button
disabled={disableAddButton ? true : !hasCompletedInputs} disabled={!hasCompletedInputs}
on:click={() => { on:click={() => {
setupToggled = false setupToggled = false
actionModal.show() actionModal.show()