Pre 2.0 bug fixes for automation and app builder (baserow#4161)

* Fix error when creating a branch

* Fix workflow import issue

* Fix previous action data provider

Author: jrmi

backend/src/baserow/contrib/automation/workflows/handler.py

@@ -519,7 +519,7 @@ def import_workflows(
                 cache=cache,
             )
 
-        workflow_instance.get_graph().migrate_graph(id_mapping)
+            workflow_instance.get_graph().migrate_graph(id_mapping)
 
         return [i[0] for i in imported_workflows]
 

web-frontend/modules/automation/components/workflow/WorkflowNode.vue

@@ -145,9 +145,18 @@ const coordsPerEdge = computed(() => {
 
   return nodeEdges.value.map((edge) => {
     const wrap = workflowNode.value
-    const edgeElt = refs[`edge-${edge.uid}`][0].$el
-
-    return [edge.uid, computeEdgeCoords(wrap, edgeElt, hasMultipleEdges.value)]
+    if (Array.isArray(refs[`edge-${edge.uid}`])) {
+      const edgeElt = refs[`edge-${edge.uid}`][0].$el
+
+      return [
+        edge.uid,
+        computeEdgeCoords(wrap, edgeElt, hasMultipleEdges.value),
+      ]
+    } else {
+      // We might have a delay between the edge addition
+      // and the branch being visible
+      return [edge.uid, { startX: 0, startY: 0, endX: 0, endY: 0 }]
+    }
   })
 })
 

web-frontend/modules/automation/components/workflow/sidePanels/NodeSidePanel.vue

@@ -30,6 +30,7 @@
       :application="automation"
       enable-integration-picker
       :default-values="node.service"
+      :edge-in-use-fn="nodeEdgeInUseFn"
       class="margin-top-2"
       @values-changed="handleNodeChange({ service: $event })"
     />
@@ -59,6 +60,7 @@ import { helpers, maxLength } from '@vuelidate/validators'
 import { notifyIf } from '@baserow/modules/core/utils/error'
 
 const store = useStore()
+
 const { app } = useContext()
 
 provide('formulaComponent', AutomationBuilderFormulaInput)
@@ -188,4 +190,17 @@ const handleNodeChange = async ({
 const nodeLoading = computed(() => {
   return store.getters['automationWorkflowNode/getLoading'](node.value)
 })
+
+/**
+ * Responsible for informing the core router service form if an edge has an
+ * output. As the service form can't refer to automation nodes, we have to
+ * perform the check here, and pass the function as a prop into the form.
+ */
+const nodeEdgeInUseFn = (edge) => {
+  return !!store.getters['automationWorkflowNode/getNextNodes'](
+    workflow.value,
+    node.value,
+    edge.uid
+  ).length
+}
 </script>

web-frontend/modules/automation/nodeTypes.js

@@ -601,7 +601,7 @@ export class CoreHttpRequestNodeType extends ActionNodeTypeMixin(NodeType) {
 }
 
 export class CoreIteratorNodeType extends containerNodeTypeMixin(
-  ActionNodeTypeMixin(NodeType)
+  ActionNodeTypeMixin(UtilityNodeMixin(NodeType))
 ) {
   static getType() {
     return 'iterator'

web-frontend/modules/builder/dataProviderTypes.js

@@ -824,15 +824,19 @@ export class PreviousActionDataProviderType extends DataProviderType {
 
     const workflowAction = this.app.store.getters[
       'builderWorkflowAction/getWorkflowActionById'
-    ](applicationContext.page, workflowActionId)
+    ](applicationContext.page, parseInt(workflowActionId))
 
     const actionType = this.app.$registry.get(
       'workflowAction',
       workflowAction.type
     )
 
-    return content
-      ? actionType.getValueAtPath(workflowAction, content, rest)
+    return content[workflowActionId]
+      ? actionType.getValueAtPath(
+          workflowAction,
+          content[workflowActionId],
+          rest
+        )
       : null
   }
 

web-frontend/modules/builder/workflowActionTypes.js

@@ -305,7 +305,7 @@ export class WorkflowActionServiceType extends WorkflowActionType {
     return this.serviceType.getValueAtPath(
       workflowAction.service,
       content,
-      path.join('.')
+      path
     )
   }
 

web-frontend/modules/core/runtimeFormulaContext.js

@@ -49,6 +49,7 @@ export class RuntimeFormulaContext {
     try {
       return dataProviderType.getDataChunk(this.applicationContext, rest)
     } catch (e) {
+      console.debug(`DATA PROVIDER DEBUG: ${e}`)
       throw new UnresolvablePathError(dataProviderType.type, rest.join('.'))
     }
   }

web-frontend/modules/integrations/localBaserow/serviceTypes.js

@@ -86,7 +86,7 @@ export class LocalBaserowTableServiceType extends ServiceType {
     const [field, ...rest] = path
     let humanName = field
 
-    if (schema) {
+    if (schema && field.startsWith('field_')) {
       if (this.returnsList) {
         if (schema.items?.properties?.[field]?.title) {
           humanName = schema.items.properties[field].title