Browse Source
Merge pull request #2960 from Budibase/bug/fix-automation-ordering
fix issue where automation was not being added in the correct order
pull/2988/head
Peter Clement
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
6 additions and
6 deletions
-
packages/builder/cypress/support/commands.js
-
packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
-
packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
|
|
|
@ -5,7 +5,7 @@ |
|
|
|
// ***********************************************
|
|
|
|
//
|
|
|
|
|
|
|
|
Cypress.on('uncaught:exception', (err, runnable) => { |
|
|
|
Cypress.on("uncaught:exception", () => { |
|
|
|
return false |
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
@ -4,10 +4,11 @@ |
|
|
|
import { externalActions } from "./ExternalActions" |
|
|
|
|
|
|
|
export let blockIdx |
|
|
|
export let blockComplete |
|
|
|
|
|
|
|
let selectedAction |
|
|
|
let actionVal |
|
|
|
let actions = Object.entries($automationStore.blockDefinitions.ACTION) |
|
|
|
export let blockComplete |
|
|
|
|
|
|
|
const external = actions.reduce((acc, elm) => { |
|
|
|
const [k, v] = elm |
|
|
|
@ -36,10 +37,9 @@ |
|
|
|
actionVal.stepId, |
|
|
|
actionVal |
|
|
|
) |
|
|
|
automationStore.actions.addBlockToAutomation(newBlock) |
|
|
|
automationStore.actions.addBlockToAutomation(newBlock, blockIdx + 1) |
|
|
|
await automationStore.actions.save( |
|
|
|
$automationStore.selectedAutomation?.automation, |
|
|
|
blockIdx |
|
|
|
$automationStore.selectedAutomation?.automation |
|
|
|
) |
|
|
|
} |
|
|
|
</script> |
|
|
|
|
|
|
|
@ -151,7 +151,7 @@ |
|
|
|
> |
|
|
|
{/if} |
|
|
|
<Button |
|
|
|
disabled={disableAddButton ? true : !hasCompletedInputs} |
|
|
|
disabled={!hasCompletedInputs} |
|
|
|
on:click={() => { |
|
|
|
setupToggled = false |
|
|
|
actionModal.show() |
|
|
|
|