From 2b08916751d0d4b3d46b33bea30af24cf976aefd Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 15 Sep 2021 12:58:20 +0100
Subject: [PATCH] simplify parsing of internal / external actions

---
 .../FlowChart/ActionModal.svelte              | 31 ++++++-------------
 .../FlowChart/ExternalActions.js              |  2 --
 .../FlowChart/TestDataModal.svelte            |  2 +-
 3 files changed, 10 insertions(+), 25 deletions(-)
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
index 3a58d8c5fd..8820259e90 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
@@ -1,39 +1,26 @@
 <script>
   import { ModalContent, Layout, Detail, Body, Icon } from "@budibase/bbui"
   import { automationStore } from "builderStore"
-  import DiscordLogo from "assets/discord.svg"
-  import ZapierLogo from "assets/zapier.png"
-  import IntegromatLogo from "assets/integromat.png"
-  import SlackLogo from "assets/slack.svg"
-  import n8nlogo from "assets/n8n.png"
-
   import { database } from "stores/backend"
+  import { externalActions } from "./ExternalActions"
   $: instanceId = $database._id
 
   let selectedAction
   let actionVal
+  let actions = Object.entries($automationStore.blockDefinitions.ACTION)
   export let blockComplete
 
-  let externalActionsPredicate = [
-    { name: "zapier", logo: ZapierLogo },
-    { name: "discord", logo: DiscordLogo },
-    { name: "slack", logo: SlackLogo },
-    { name: "integromat", logo: IntegromatLogo },
-    { name: "n8n", logo: n8nlogo },
-  ]
-  let actions = Object.entries($automationStore.blockDefinitions.ACTION)
-
-  const externalActions = actions.reduce((acc, elm) => {
+  const external = actions.reduce((acc, elm) => {
     const [k, v] = elm
-    if (externalActionsPredicate.some(pred => pred.name === k)) {
+    if (!v.internal) {
       acc[k] = v
     }
     return acc
   }, {})
 
-  const internalActions = actions.reduce((acc, elm) => {
+  const internal = actions.reduce((acc, elm) => {
     const [k, v] = elm
-    if (!externalActionsPredicate.some(pred => pred.name === k)) {
+    if (v.internal) {
       acc[k] = v
     }
     return acc
@@ -73,7 +60,7 @@
     <Body size="S">Apps</Body>
 
     <div class="item-list">
-      {#each Object.entries(externalActions) as [idx, action]}
+      {#each Object.entries(external) as [idx, action]}
         <div
           class="item"
           class:selected={selectedAction === action.name}
@@ -83,7 +70,7 @@
             <img
               width="20"
               height="20"
-              src={externalActionsPredicate.find(val => val.name === idx).logo}
+              src={externalActions[action.stepId].icon}
               alt="zapier"
             />
             <span class="icon-spacing">
@@ -98,7 +85,7 @@
     <Detail size="S">Actions</Detail>
 
     <div class="item-list">
-      {#each Object.entries(internalActions) as [idx, action]}
+      {#each Object.entries(internal) as [idx, action]}
         <div
           class="item"
           class:selected={selectedAction === action.name}
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ExternalActions.js b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ExternalActions.js
index e03b3ad4c7..843445a3c2 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ExternalActions.js
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ExternalActions.js
@@ -2,12 +2,10 @@ import DiscordLogo from "assets/discord.svg"
 import ZapierLogo from "assets/zapier.png"
 import IntegromatLogo from "assets/integromat.png"
 import SlackLogo from "assets/slack.svg"
-import n8nlogo from "assets/n8n.png"
 
 export const externalActions = {
   zapier: { name: "zapier", icon: ZapierLogo },
   discord: { name: "discord", icon: DiscordLogo },
   slack: { name: "slack", icon: SlackLogo },
   integromat: { name: "integromat", icon: IntegromatLogo },
-  n8n: { name: "n8n", icon: n8nlogo },
 }
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
index 12e9591ab4..3031246a70 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
@@ -9,13 +9,13 @@
   let trigger = cloneDeep(
     $automationStore.selectedAutomation.automation.definition.trigger
   )
+  let schemaProperties = Object.entries(trigger.schema.outputs.properties || {})
 
   if (!$automationStore.selectedAutomation.automation.testData) {
     $automationStore.selectedAutomation.automation.testData = {}
   }
 
   // get the outputs so we can define the fields
-  let schemaProperties = Object.entries(trigger.schema.outputs.properties || {})
 
   // check to see if there is existing test data in the store
   $: testData = $automationStore.selectedAutomation.automation.testData
