Merge pull request #16605 from Budibase/feature/automation-state-block

Automation State block

Author: deanhannigan

packages/builder/src/components/automation/AutomationBuilder/FlowChart/BranchNode.svelte

@@ -33,7 +33,7 @@
   export let branchIdx
   export let step
   export let isLast
-  export let bindings
+  export let bindings = []
   export let automation
   export let executed = false
   export let unexecuted = false
@@ -53,7 +53,7 @@
   $: editableConditionUI = branch.conditionUI || {}
 
   // Parse all the bindings into fields for the condition builder
-  $: schemaFields = bindings.map(binding => {
+  $: schemaFields = bindings?.map(binding => {
     return {
       name: `{{${binding.runtimeBinding}}}`,
       displayName: `${binding.category} - ${binding.display.name}`,

packages/builder/src/components/automation/AutomationBuilder/FlowChart/SelectStepSidePanel.svelte

@@ -114,6 +114,7 @@
           AutomationActionStepId.EXECUTE_BASH,
           AutomationActionStepId.EXECUTE_SCRIPT_V2,
           AutomationActionStepId.SERVER_LOG,
+          AutomationActionStepId.EXTRACT_STATE,
         ].includes(k as AutomationActionStepId)
       ),
     },

packages/builder/src/components/automation/AutomationBuilder/FlowChart/StepNode.svelte

@@ -68,13 +68,17 @@
 
   $: userBindings = automationStore.actions.buildUserBindings()
   $: settingBindings = automationStore.actions.buildSettingBindings()
+  $: stateBindings =
+    ($automationStore.selectedNodeId,
+    automationStore.actions.buildStateBindings())
 
   // Combine all bindings for the step
   $: bindings = [
     ...availableBindings,
     ...environmentBindings,
     ...userBindings,
     ...settingBindings,
+    ...stateBindings,
   ]
 
   onMount(() => {

packages/builder/src/components/automation/AutomationBuilder/StepPanel.svelte

@@ -116,7 +116,7 @@
   </div>
   {#if isStep}
     <div class="step-actions">
-      {#if $memoBlock && !isBranchStep($memoBlock) && ($memoBlock.features?.[AutomationFeature.LOOPING] || !$memoBlock.features)}
+      {#if $memoBlock && !isBranchStep($memoBlock) && $memoBlock.features?.[AutomationFeature.LOOPING]}
         <ActionButton
           quiet
           noPadding

packages/builder/src/components/automation/SetupPanel/BlockData.svelte

@@ -111,26 +111,30 @@
       const loopMax = Number(inputs.iterations)
       const loopOutputs = blockResults?.outputs
 
-      let loopMessage = "There was an error"
-
-      // Not technically failed as it continues to run
-      if (loopOutputs?.status === AutomationStepStatus.MAX_ITERATIONS) {
-        loopMessage = `The maximum number of iterations (${loopMax}) has been reached.`
-      } else if (
-        loopOutputs?.status === AutomationStepStatus.FAILURE_CONDITION
-      ) {
-        loopMessage = `The failure condition for the loop was hit: ${inputs.failure}.
+      if (!loopOutputs.success) {
+        let loopMessage = "There was an error"
+
+        // Not technically failed as it continues to run
+        if (loopOutputs?.status === AutomationStepStatus.MAX_ITERATIONS) {
+          loopMessage = `The maximum number of iterations (${loopMax}) has been reached.`
+        } else if (
+          loopOutputs?.status === AutomationStepStatus.FAILURE_CONDITION
+        ) {
+          loopMessage = `The failure condition for the loop was hit: ${inputs.failure}.
           The loop was terminated`
-      } else if (loopOutputs?.status === AutomationStepStatus.INCORRECT_TYPE) {
-        loopMessage = `An 'Input Type' of '${inputs.option}' was configured which does
+        } else if (
+          loopOutputs?.status === AutomationStepStatus.INCORRECT_TYPE
+        ) {
+          loopMessage = `An 'Input Type' of '${inputs.option}' was configured which does
           not match the value supplied`
-      }
+        }
 
-      issues.push({
-        message: loopMessage,
-        type: BlockStatusType.ERROR,
-        source: BlockStatusSource.AUTOMATION_RESULTS,
-      })
+        issues.push({
+          message: loopMessage,
+          type: BlockStatusType.ERROR,
+          source: BlockStatusSource.AUTOMATION_RESULTS,
+        })
+      }
     }
 
     // Process filtered row issues

packages/builder/src/components/automation/SetupPanel/BlockProperties.svelte

@@ -34,13 +34,17 @@
   }
   $: userBindings = automationStore.actions.buildUserBindings()
   $: settingBindings = automationStore.actions.buildSettingBindings()
+  $: stateBindings =
+    ($automationStore.selectedNodeId,
+    automationStore.actions.buildStateBindings())
 
   // Combine all bindings for the step
   $: bindings = [
     ...availableBindings,
     ...environmentBindings,
     ...userBindings,
     ...settingBindings,
+    ...stateBindings,
   ]
 
   // Store for any UX related data

packages/builder/src/components/common/bindings/BindingSidePanel.svelte

@@ -134,7 +134,7 @@
     popoverAnchor = target
     hoverTarget = {
       type: "binding",
-      code: binding.valueHTML,
+      code: binding.valueHTML || "",
     }
     popover.show()
   }