From 2900704a4c7a151cb201b7e759d7ba3d5679dc8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= <kevin.aberg@gmail.com>
Date: Mon, 15 Mar 2021 15:00:34 +0100
Subject: [PATCH] adds routing to the automation tab

---
 .../AutomationBuilder.svelte                  | 17 ++------------
 .../AutomationBuilder/BlockList.svelte        |  1 -
 .../AutomationPanel/AutomationList.svelte     |  2 ++
 .../CreateAutomationModal.svelte              |  4 +++-
 .../TableNavigator/TableNavigator.svelte      |  1 -
 .../automate/[automation]/index.svelte        | 22 +++++++++++++++++++
 .../pages/[application]/automate/index.svelte | 16 ++++++++++++--
 7 files changed, 43 insertions(+), 20 deletions(-)
 create mode 100644 packages/builder/src/pages/[application]/automate/[automation]/index.svelte

diff --git a/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte b/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
index f8a3699f4d..62faff3caa 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
@@ -1,12 +1,9 @@
 <script>
-  import { automationStore, backendUiStore } from "builderStore"
+  import { automationStore } from "builderStore"
   import Flowchart from "./FlowChart/FlowChart.svelte"
   import BlockList from "./BlockList.svelte"
 
   $: automation = $automationStore.selectedAutomation?.automation
-  $: automationLive = automation?.live
-  $: instanceId = $backendUiStore.selectedDatabase._id
-  $: automationCount = $automationStore.automations?.length ?? 0
 
   function onSelect(block) {
     automationStore.update(state => {
@@ -19,14 +16,4 @@
 {#if automation}
   <BlockList />
   <Flowchart {automation} {onSelect} />
-{:else if automationCount === 0}
-  <i>Create your first automation to get started</i>
-{:else}<i>Select an automation to edit</i>{/if}
-
-<style>
-  i {
-    font-size: var(--font-size-m);
-    color: var(--grey-5);
-    margin-top: 2px;
-  }
-</style>
+{/if}
diff --git a/packages/builder/src/components/automation/AutomationBuilder/BlockList.svelte b/packages/builder/src/components/automation/AutomationBuilder/BlockList.svelte
index e00fb92e27..8c3e2996c9 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/BlockList.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/BlockList.svelte
@@ -3,7 +3,6 @@
   import { automationStore } from "builderStore"
   import { DropdownMenu, Modal } from "@budibase/bbui"
   import { DropdownContainer, DropdownItem } from "components/common/Dropdowns"
-  import analytics from "analytics"
   import CreateWebhookModal from "../Shared/CreateWebhookModal.svelte"
 
   $: hasTrigger = $automationStore.selectedAutomation.hasTrigger()
diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
index f7ca959979..68a83828a5 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
@@ -1,5 +1,6 @@
 <script>
   import { onMount } from "svelte"
+  import { goto } from "@sveltech/routify"
   import { automationStore } from "builderStore"
   import NavItem from "components/common/NavItem.svelte"
   import EditAutomationPopover from "./EditAutomationPopover.svelte"
@@ -11,6 +12,7 @@
   })
   function selectAutomation(automation) {
     automationStore.actions.select(automation)
+    $goto(`./${automation._id}`)
   }
 </script>
 
diff --git a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
index 804dceec87..abc7bd9f96 100644
--- a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
@@ -1,5 +1,6 @@
 <script>
-  import { store, backendUiStore, automationStore } from "builderStore"
+  import { backendUiStore, automationStore } from "builderStore"
+  import { goto } from "@sveltech/routify"
   import { notifier } from "builderStore/store/notifications"
   import { Input, ModalContent } from "@budibase/bbui"
   import analytics from "analytics"
@@ -15,6 +16,7 @@
       instanceId,
     })
     notifier.success(`Automation ${name} created.`)
+    $goto(`./${$automationStore.selectedAutomation.automation._id}`)
     analytics.captureEvent("Automation Created", { name })
   }
 </script>
diff --git a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
index 3719d62c62..55e62a8a36 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
@@ -4,7 +4,6 @@
   import { TableNames } from "constants"
   import EditTablePopover from "./popovers/EditTablePopover.svelte"
   import EditViewPopover from "./popovers/EditViewPopover.svelte"
-  import { Switcher } from "@budibase/bbui"
   import NavItem from "components/common/NavItem.svelte"
 
   $: selectedView =
diff --git a/packages/builder/src/pages/[application]/automate/[automation]/index.svelte b/packages/builder/src/pages/[application]/automate/[automation]/index.svelte
new file mode 100644
index 0000000000..a702864846
--- /dev/null
+++ b/packages/builder/src/pages/[application]/automate/[automation]/index.svelte
@@ -0,0 +1,22 @@
+<script>
+    import { onMount } from 'svelte'
+    import { automationStore } from "builderStore"
+    import AutomationBuilder from "components/automation/AutomationBuilder/AutomationBuilder.svelte"
+  
+    onMount(async () => {
+      console.log('Automation Store: ', $automationStore)
+      console.log('Automation Store Methods: ', automationStore)
+      // navigate to first automation in list, if not already selected
+      // if (
+      //   !$leftover &&
+      //   $backendUiStore.tables.length > 0 &&
+      //   (!$backendUiStore.selectedTable || !$backendUiStore.selectedTable._id)
+      // ) {
+      //   // this file routes as .../tables/index, so, go up one.
+      //   $goto(`../${$backendUiStore.tables[0]._id}`)
+      // }
+    })
+  </script>
+  
+  <AutomationBuilder />
+  
\ No newline at end of file
diff --git a/packages/builder/src/pages/[application]/automate/index.svelte b/packages/builder/src/pages/[application]/automate/index.svelte
index 8ef6090d90..7d8899a055 100644
--- a/packages/builder/src/pages/[application]/automate/index.svelte
+++ b/packages/builder/src/pages/[application]/automate/index.svelte
@@ -1,7 +1,8 @@
 <script>
   import { onMount } from 'svelte'
   import { automationStore } from "builderStore"
-  import AutomationBuilder from "components/automation/AutomationBuilder/AutomationBuilder.svelte"
+
+  $: automationCount = $automationStore.automations?.length ?? 0
 
   onMount(async () => {
     console.log('Automation Store: ', $automationStore)
@@ -18,4 +19,15 @@
   })
 </script>
 
-<AutomationBuilder />
+
+{#if automationCount === 0}
+  <i>Create your first automation to get started</i>
+{:else}<i>Select an automation to edit</i>{/if}
+
+<style>
+  i {
+    font-size: var(--font-size-m);
+    color: var(--grey-5);
+    margin-top: 2px;
+  }
+</style>