Merge branch 'develop' of github.com:Budibase/budibase into responsive-portal

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.9.125-alpha.7",
+  "version": "0.9.125-alpha.11",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.125-alpha.7",
+  "version": "0.9.125-alpha.11",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",

packages/auth/src/cache/user.js

@@ -6,8 +6,10 @@ const EXPIRY_SECONDS = 3600
 /**
  * The default populate user function
  */
-const populateFromDB = (userId, tenantId) => {
+const populateFromDB = async (userId, tenantId) => {
-  return getGlobalDB(tenantId).get(userId)
+  const user = await getGlobalDB(tenantId).get(userId)
+  user.budibaseAccess = true
+  return user
 }
 
 /**

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.125-alpha.7",
+  "version": "0.9.125-alpha.11",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",

packages/bbui/src/ActionButton/ActionButton.svelte

@@ -12,6 +12,7 @@
   export let dataCy = null
   export let size = "M"
   export let active = false
+  export let fullWidth = false
 
   function longPress(element) {
     if (!longPressable) return
@@ -40,6 +41,7 @@
   class:spectrum-ActionButton--quiet={quiet}
   class:spectrum-ActionButton--emphasized={emphasized}
   class:is-selected={selected}
+  class:fullWidth
   class="spectrum-ActionButton spectrum-ActionButton--size{size}"
   class:active
   {disabled}
@@ -71,6 +73,9 @@
 </button>
 
 <style>
+  .fullWidth {
+    width: 100%;
+  }
   .active,
   .active svg {
     color: var(--spectrum-global-color-blue-600);

packages/bbui/src/Badge/Badge.svelte

@@ -7,6 +7,7 @@
   export let orange = false
   export let yellow = false
   export let seafoam = false
+  export let green = false
   export let active = false
   export let inactive = false
 </script>
@@ -17,6 +18,7 @@
   class:spectrum-Label--large={size === "L"}
   class:spectrum-Label--grey={grey}
   class:spectrum-Label--red={red}
+  class:spectrum-Label--green={green}
   class:spectrum-Label--orange={orange}
   class:spectrum-Label--yellow={yellow}
   class:spectrum-Label--seafoam={seafoam}

packages/bbui/src/Drawer/Drawer.svelte

@@ -6,9 +6,9 @@
   import Heading from "../Typography/Heading.svelte"
 
   export let title
-
+  export let fillWidth
   let visible = false
-
+  $: console.log(fillWidth)
   export function show() {
     if (visible) {
       return
@@ -34,7 +34,7 @@
 
 {#if visible}
   <Portal>
-    <section class="drawer" transition:slide>
+    <section class:fillWidth class="drawer" transition:slide>
       <header>
         <div class="text">
           <Heading size="XS">{title}</Heading>
@@ -63,6 +63,10 @@
     z-index: 2;
   }
 
+  .fillWidth {
+    width: calc(100% - 260px) !important;
+  }
+
   header {
     display: flex;
     justify-content: space-between;

packages/bbui/src/Modal/ModalContent.svelte

@@ -46,8 +46,10 @@
       <h1
         class="spectrum-Dialog-heading spectrum-Dialog-heading--noHeader"
         class:noDivider={!showDivider}
+        class:header-spacing={$$slots.header}
       >
         {title}
+        <slot name="header" />
       </h1>
       {#if showDivider}
         <Divider size="M" />
@@ -120,4 +122,9 @@
   .close-icon :global(svg) {
     margin-right: 0;
   }
+
+  .header-spacing {
+    display: flex;
+    justify-content: space-between;
+  }
 </style>

packages/builder/assets/discord.svg

@@ -0,0 +1,10 @@
+<svg width="71" height="55" viewBox="0 0 71 55" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M60.1045 4.8978C55.5792 2.8214 50.7265 1.2916 45.6527 0.41542C45.5603 0.39851 45.468 0.440769 45.4204 0.525289C44.7963 1.6353 44.105 3.0834 43.6209 4.2216C38.1637 3.4046 32.7345 3.4046 27.3892 4.2216C26.905 3.0581 26.1886 1.6353 25.5617 0.525289C25.5141 0.443589 25.4218 0.40133 25.3294 0.41542C20.2584 1.2888 15.4057 2.8186 10.8776 4.8978C10.8384 4.9147 10.8048 4.9429 10.7825 4.9795C1.57795 18.7309 -0.943561 32.1443 0.293408 45.3914C0.299005 45.4562 0.335386 45.5182 0.385761 45.5576C6.45866 50.0174 12.3413 52.7249 18.1147 54.5195C18.2071 54.5477 18.305 54.5139 18.3638 54.4378C19.7295 52.5728 20.9469 50.6063 21.9907 48.5383C22.0523 48.4172 21.9935 48.2735 21.8676 48.2256C19.9366 47.4931 18.0979 46.6 16.3292 45.5858C16.1893 45.5041 16.1781 45.304 16.3068 45.2082C16.679 44.9293 17.0513 44.6391 17.4067 44.3461C17.471 44.2926 17.5606 44.2813 17.6362 44.3151C29.2558 49.6202 41.8354 49.6202 53.3179 44.3151C53.3935 44.2785 53.4831 44.2898 53.5502 44.3433C53.9057 44.6363 54.2779 44.9293 54.6529 45.2082C54.7816 45.304 54.7732 45.5041 54.6333 45.5858C52.8646 46.6197 51.0259 47.4931 49.0921 48.2228C48.9662 48.2707 48.9102 48.4172 48.9718 48.5383C50.038 50.6034 51.2554 52.5699 52.5959 54.435C52.6519 54.5139 52.7526 54.5477 52.845 54.5195C58.6464 52.7249 64.529 50.0174 70.6019 45.5576C70.6551 45.5182 70.6887 45.459 70.6943 45.3942C72.1747 30.0791 68.2147 16.7757 60.1968 4.9823C60.1772 4.9429 60.1437 4.9147 60.1045 4.8978ZM23.7259 37.3253C20.2276 37.3253 17.3451 34.1136 17.3451 30.1693C17.3451 26.225 20.1717 23.0133 23.7259 23.0133C27.308 23.0133 30.1626 26.2532 30.1066 30.1693C30.1066 34.1136 27.28 37.3253 23.7259 37.3253ZM47.3178 37.3253C43.8196 37.3253 40.9371 34.1136 40.9371 30.1693C40.9371 26.225 43.7636 23.0133 47.3178 23.0133C50.9 23.0133 53.7545 26.2532 53.6986 30.1693C53.6986 34.1136 50.9 37.3253 47.3178 37.3253Z" fill="#5865F2"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="71" height="55" fill="white"/>
+</clipPath>
+</defs>
+</svg>

packages/builder/assets/slack.svg

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 132 132" style="enable-background:new 0 0 132 132;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#E01E5A;}
+	.st1{fill:#36C5F0;}
+	.st2{fill:#2EB67D;}
+	.st3{fill:#ECB22E;}
+</style>
+<g>
+	<g>
+		<path class="st0" d="M30.4,82.2c0,7.1-5.8,12.9-12.9,12.9S4.6,89.3,4.6,82.2c0-7.1,5.8-12.9,12.9-12.9h12.9V82.2z"/>
+		<path class="st0" d="M36.9,82.2c0-7.1,5.8-12.9,12.9-12.9s12.9,5.8,12.9,12.9v32.3c0,7.1-5.8,12.9-12.9,12.9s-12.9-5.8-12.9-12.9
+			C36.9,114.5,36.9,82.2,36.9,82.2z"/>
+	</g>
+	<g>
+		<path class="st1" d="M49.8,30.4c-7.1,0-12.9-5.8-12.9-12.9S42.7,4.6,49.8,4.6s12.9,5.8,12.9,12.9v12.9H49.8z"/>
+		<path class="st1" d="M49.8,36.9c7.1,0,12.9,5.8,12.9,12.9s-5.8,12.9-12.9,12.9H17.5c-7.1,0-12.9-5.8-12.9-12.9s5.8-12.9,12.9-12.9
+			C17.5,36.9,49.8,36.9,49.8,36.9z"/>
+	</g>
+	<g>
+		<path class="st2" d="M101.6,49.8c0-7.1,5.8-12.9,12.9-12.9c7.1,0,12.9,5.8,12.9,12.9s-5.8,12.9-12.9,12.9h-12.9V49.8z"/>
+		<path class="st2" d="M95.1,49.8c0,7.1-5.8,12.9-12.9,12.9c-7.1,0-12.9-5.8-12.9-12.9V17.5c0-7.1,5.8-12.9,12.9-12.9
+			c7.1,0,12.9,5.8,12.9,12.9V49.8z"/>
+	</g>
+	<g>
+		<path class="st3" d="M82.2,101.6c7.1,0,12.9,5.8,12.9,12.9c0,7.1-5.8,12.9-12.9,12.9c-7.1,0-12.9-5.8-12.9-12.9v-12.9H82.2z"/>
+		<path class="st3" d="M82.2,95.1c-7.1,0-12.9-5.8-12.9-12.9c0-7.1,5.8-12.9,12.9-12.9h32.3c7.1,0,12.9,5.8,12.9,12.9
+			c0,7.1-5.8,12.9-12.9,12.9H82.2z"/>
+	</g>
+</g>
+</svg>

packages/builder/cypress/integration/createAutomation.spec.js

@@ -7,26 +7,30 @@ context("Create a automation", () => {
   // https://on.cypress.io/interacting-with-elements
   it("should create a automation", () => {
     cy.createTestTableWithData()
-
+    cy.wait(2000)
     cy.contains("Automate").click()
     cy.get("[data-cy='new-screen'] > .spectrum-Icon").click()
-    cy.get(".spectrum-Dialog-grid").within(() => {
+    cy.get(".modal-inner-wrapper").within(() => {
       cy.get("input").type("Add Row")
+      cy.contains("Row Created").click()
+      cy.wait(500)
       cy.get(".spectrum-Button--cta").click()
     })
 
-    // Add trigger
+    // Setup trigger
-    cy.contains("Trigger").click()
+    cy.contains("Setup").click()
-    cy.contains("Row Created").click()
-    cy.get(".setup").within(() => {
     cy.get(".spectrum-Picker-label").click()
+    cy.wait(500)
     cy.contains("dog").click()
-    })
 
     // Create action
-    cy.contains("Internal").click()
+    cy.contains("Add Action").click()
-    cy.contains("Create Row").click()
+    cy.get(".modal-inner-wrapper").within(() => {
-    cy.get(".setup").within(() => {
+      cy.wait(1000)
+      cy.contains("Create Row").trigger('mouseover').click().click()
+      cy.get(".spectrum-Button--cta").click()
+    })
+    cy.contains("Setup").click()
     cy.get(".spectrum-Picker-label").click()
     cy.contains("dog").click()
     cy.get(".spectrum-Textfield-input")
@@ -35,19 +39,24 @@ context("Create a automation", () => {
     cy.get(".spectrum-Textfield-input")
       .eq(1)
       .type("11")
+
+    cy.contains("Run test").click()
+    cy.get(".modal-inner-wrapper").within(() => {
+      cy.wait(1000)
+      cy.get(".spectrum-Picker-label").click()
+      cy.contains("dog").click()
+      cy.get(".spectrum-Textfield-input")
+        .first()
+        .type("goodboy")
+      cy.get(".spectrum-Textfield-input")
+        .eq(1)
+        .type("11")
+      cy.get(".spectrum-Textfield-input")
+        .eq(2)
+        .type("123456")
+      cy.get(".spectrum-Textfield-input")
+        .eq(3)
+        .type("123456")
     })
-
-    // Save
-    cy.contains("Save Automation").click()
-
-    // Activate Automation
-    cy.get("[data-cy=activate-automation]").click()
-  })
-
-  it("should add row when a new row is added", () => {
-    cy.contains("Data").click()
-    cy.addRow(["Rover", 15])
-    cy.reload()
-    cy.contains("goodboy").should("have.text", "goodboy")
   })
 })

packages/builder/cypress/support/commands.js

@@ -37,9 +37,8 @@ Cypress.Commands.add("createApp", name => {
       cy.contains("Create app").click()
     })
     .then(() => {
-      cy.get(".selected > .content", {
+      cy.expandBudibaseConnection()
-        timeout: 20000,
+      cy.get(".nav-item.selected > .content").should("be.visible")
-      }).should("be.visible")
     })
 })
 
@@ -83,6 +82,7 @@ Cypress.Commands.add("createTable", tableName => {
 
 Cypress.Commands.add("addColumn", (tableName, columnName, type) => {
   // Select Table
+  cy.selectTable(tableName)
   cy.contains(".nav-item", tableName).click()
   cy.contains("Create column").click()
 
@@ -161,3 +161,15 @@ Cypress.Commands.add("createScreen", (screenName, route) => {
     cy.get(".spectrum-Button--cta").click()
   })
 })
+
+Cypress.Commands.add("expandBudibaseConnection", () => {
+  if (Cypress.$(".nav-item > .content > .opened").length === 0) {
+    // expand the Budibase DB connection string
+    cy.get(".icon.arrow").eq(0).click()
+  }
+})
+
+Cypress.Commands.add("selectTable", tableName => {
+  cy.expandBudibaseConnection()
+  cy.contains(".nav-item", tableName).click()
+})

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.125-alpha.7",
+  "version": "0.9.125-alpha.11",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.125-alpha.7",
+    "@budibase/bbui": "^0.9.125-alpha.11",
-    "@budibase/client": "^0.9.125-alpha.7",
+    "@budibase/client": "^0.9.125-alpha.11",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.125-alpha.7",
+    "@budibase/string-templates": "^0.9.125-alpha.11",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/builder/src/builderStore/store/automation/Automation.js

@@ -13,6 +13,10 @@ export default class Automation {
     return this.automation.definition.trigger
   }
 
+  addTestData(data) {
+    this.automation.testData = data
+  }
+
   addBlock(block) {
     // Make sure to add trigger if doesn't exist
     if (!this.hasTrigger() && block.type === "TRIGGER") {

packages/builder/src/builderStore/store/automation/index.js

@@ -17,7 +17,6 @@ const automationActions = store => ({
       state.blockDefinitions = {
         TRIGGER: jsonResponses[1].trigger,
         ACTION: jsonResponses[1].action,
-        LOGIC: jsonResponses[1].logic,
       }
       // if previously selected find the new obj and select it
       if (selected) {
@@ -80,9 +79,14 @@ const automationActions = store => ({
     const { _id } = automation
     return await api.post(`/api/automations/${_id}/trigger`)
   },
-  test: async ({ automation }) => {
+  test: async ({ automation }, testData) => {
     const { _id } = automation
-    return await api.post(`/api/automations/${_id}/test`)
+    const response = await api.post(`/api/automations/${_id}/test`, testData)
+    const json = await response.json()
+    store.update(state => {
+      state.selectedAutomation.testResults = json
+      return state
+    })
   },
   select: automation => {
     store.update(state => {
@@ -91,6 +95,12 @@ const automationActions = store => ({
       return state
     })
   },
+  addTestDataToAutomation: data => {
+    store.update(state => {
+      state.selectedAutomation.addTestData(data)
+      return state
+    })
+  },
   addBlockToAutomation: block => {
     store.update(state => {
       const newBlock = state.selectedAutomation.addBlock(cloneDeep(block))
@@ -132,7 +142,6 @@ export const getAutomationStore = () => {
     blockDefinitions: {
       TRIGGER: [],
       ACTION: [],
-      LOGIC: [],
     },
     selectedAutomation: null,
   }

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

@@ -1,10 +1,8 @@
 <script>
   import { automationStore } from "builderStore"
   import Flowchart from "./FlowChart/FlowChart.svelte"
-  import BlockList from "./BlockList.svelte"
 
   $: automation = $automationStore.selectedAutomation?.automation
-
   function onSelect(block) {
     automationStore.update(state => {
       state.selectedBlock = block
@@ -14,6 +12,5 @@
 </script>
 
 {#if automation}
-  <BlockList />
   <Flowchart {automation} {onSelect} />
 {/if}

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

@@ -1,114 +0,0 @@
-<script>
-  import { sortBy } from "lodash/fp"
-  import { automationStore } from "builderStore"
-  import { ActionButton, Popover, Modal } from "@budibase/bbui"
-  import { DropdownContainer, DropdownItem } from "components/common/Dropdowns"
-  import CreateWebhookModal from "../Shared/CreateWebhookModal.svelte"
-
-  $: hasTrigger = $automationStore.selectedAutomation.hasTrigger()
-  $: tabs = [
-    {
-      label: "Trigger",
-      value: "TRIGGER",
-      icon: "Algorithm",
-      disabled: hasTrigger,
-    },
-    {
-      label: "Internal",
-      value: "ACTION",
-      internal: true,
-      icon: "Actions",
-      disabled: !hasTrigger,
-    },
-    {
-      label: "External",
-      value: "ACTION",
-      internal: false,
-      icon: "Extension",
-      disabled: !hasTrigger,
-    },
-  ]
-
-  let selectedIndex
-  let anchors = []
-  let popover
-  let webhookModal
-  $: selectedTab = selectedIndex == null ? null : tabs[selectedIndex].value
-  $: selectedInternal =
-    selectedIndex == null ? null : tabs[selectedIndex].internal
-  $: anchor = selectedIndex === -1 ? null : anchors[selectedIndex]
-  $: blocks = sortBy(entry => entry[1].name)(
-    Object.entries($automationStore.blockDefinitions[selectedTab] ?? {})
-  ).filter(
-    entry => selectedInternal == null || entry[1].internal === selectedInternal
-  )
-
-  function onChangeTab(idx) {
-    selectedIndex = idx
-    popover.show()
-  }
-
-  function closePopover() {
-    selectedIndex = null
-    popover.hide()
-  }
-
-  function addBlockToAutomation(stepId, blockDefinition) {
-    const newBlock = $automationStore.selectedAutomation.constructBlock(
-      selectedTab,
-      stepId,
-      blockDefinition
-    )
-    automationStore.actions.addBlockToAutomation(newBlock)
-    closePopover()
-    if (stepId === "WEBHOOK") {
-      webhookModal.show()
-    }
-  }
-</script>
-
-<div class="tab-container">
-  {#each tabs as tab, idx}
-    <div bind:this={anchors[idx]}>
-      <ActionButton
-        quiet
-        size="S"
-        icon={tab.icon}
-        disabled={tab.disabled}
-        on:click={tab.disabled ? null : () => onChangeTab(idx)}
-      >
-        {tab.label}
-      </ActionButton>
-    </div>
-  {/each}
-</div>
-<Popover
-  on:close={() => (selectedIndex = null)}
-  bind:this={popover}
-  {anchor}
-  align="left"
->
-  <DropdownContainer>
-    {#each blocks as [stepId, blockDefinition]}
-      <DropdownItem
-        icon={blockDefinition.icon}
-        title={blockDefinition.name}
-        subtitle={blockDefinition.description}
-        on:click={() => addBlockToAutomation(stepId, blockDefinition)}
-      />
-    {/each}
-  </DropdownContainer>
-</Popover>
-<Modal bind:this={webhookModal} width="30%">
-  <CreateWebhookModal />
-</Modal>
-
-<style>
-  .tab-container {
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    align-items: center;
-    min-height: 24px;
-  }
-</style>

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

@@ -0,0 +1,136 @@
+<script>
+  import { ModalContent, Layout, Detail, Body, Icon } from "@budibase/bbui"
+  import { automationStore } from "builderStore"
+  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
+
+  const external = actions.reduce((acc, elm) => {
+    const [k, v] = elm
+    if (!v.internal) {
+      acc[k] = v
+    }
+    return acc
+  }, {})
+
+  const internal = actions.reduce((acc, elm) => {
+    const [k, v] = elm
+    if (v.internal) {
+      acc[k] = v
+    }
+    return acc
+  }, {})
+
+  const selectAction = action => {
+    actionVal = action
+    selectedAction = action.name
+  }
+
+  async function addBlockToAutomation() {
+    const newBlock = $automationStore.selectedAutomation.constructBlock(
+      "ACTION",
+      actionVal.stepId,
+      actionVal
+    )
+    automationStore.actions.addBlockToAutomation(newBlock)
+    await automationStore.actions.save({
+      instanceId,
+      automation: $automationStore.selectedAutomation?.automation,
+    })
+  }
+</script>
+
+<ModalContent
+  title="Create Automation"
+  confirmText="Save"
+  size="M"
+  disabled={!selectedAction}
+  onConfirm={() => {
+    blockComplete = true
+    addBlockToAutomation()
+  }}
+>
+  <Body size="XS">Select an app or event.</Body>
+  <Layout noPadding>
+    <Body size="S">Apps</Body>
+
+    <div class="item-list">
+      {#each Object.entries(external) as [idx, action]}
+        <div
+          class="item"
+          class:selected={selectedAction === action.name}
+          on:click={() => selectAction(action)}
+        >
+          <div class="item-body">
+            <img
+              width="20"
+              height="20"
+              src={externalActions[action.stepId].icon}
+              alt="zapier"
+            />
+            <span class="icon-spacing">
+              <Body size="XS">{idx.charAt(0).toUpperCase() + idx.slice(1)}</Body
+              ></span
+            >
+          </div>
+        </div>
+      {/each}
+    </div>
+
+    <Detail size="S">Actions</Detail>
+
+    <div class="item-list">
+      {#each Object.entries(internal) as [idx, action]}
+        <div
+          class="item"
+          class:selected={selectedAction === action.name}
+          on:click={() => selectAction(action)}
+        >
+          <div class="item-body">
+            <Icon name={action.icon} />
+            <span class="icon-spacing">
+              <Body size="XS">{action.name}</Body></span
+            >
+          </div>
+        </div>
+      {/each}
+    </div>
+  </Layout>
+</ModalContent>
+
+<style>
+  .icon-spacing {
+    margin-left: var(--spacing-m);
+  }
+  .item-body {
+    display: flex;
+    margin-left: var(--spacing-m);
+  }
+  .item-list {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
+    grid-gap: var(--spectrum-alias-grid-baseline);
+  }
+
+  .item {
+    cursor: pointer;
+    display: grid;
+    grid-gap: var(--spectrum-alias-grid-margin-xsmall);
+    padding: var(--spectrum-alias-item-padding-s);
+    background: var(--spectrum-alias-background-color-secondary);
+    transition: 0.3s all;
+    border: solid #3b3d3c;
+    border-radius: 5px;
+    box-sizing: border-box;
+    border-width: 2px;
+  }
+  .item:hover,
+  .selected {
+    background: var(--spectrum-alias-background-color-tertiary);
+  }
+</style>

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

@@ -6,6 +6,7 @@
   xmlns="http://www.w3.org/2000/svg"
 >
   <path
+    stroke-dasharray="5,5"
     d="M5.0625 70H9L4.5 75L0 70H3.9375V65H5.0625V70Z"
     fill="var(--grey-5)"
   />

packages/builder/src/components/automation/AutomationBuilder/FlowChart/ExternalActions.js

@@ -0,0 +1,11 @@
+import DiscordLogo from "assets/discord.svg"
+import ZapierLogo from "assets/zapier.png"
+import IntegromatLogo from "assets/integromat.png"
+import SlackLogo from "assets/slack.svg"
+
+export const externalActions = {
+  zapier: { name: "zapier", icon: ZapierLogo },
+  discord: { name: "discord", icon: DiscordLogo },
+  slack: { name: "slack", icon: SlackLogo },
+  integromat: { name: "integromat", icon: IntegromatLogo },
+}

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

@@ -1,12 +1,25 @@
 <script>
+  import { automationStore } from "builderStore"
+
   import FlowItem from "./FlowItem.svelte"
-  import Arrow from "./Arrow.svelte"
+  import TestDataModal from "./TestDataModal.svelte"
+
   import { flip } from "svelte/animate"
   import { fade, fly } from "svelte/transition"
+  import {
+    Detail,
+    Icon,
+    ActionButton,
+    notifications,
+    Modal,
+  } from "@budibase/bbui"
+  import { database } from "stores/backend"
 
   export let automation
   export let onSelect
+  let testDataModal
   let blocks
+  $: instanceId = $database._id
 
   $: {
     blocks = []
@@ -17,37 +30,91 @@
       blocks = blocks.concat(automation.definition.steps || [])
     }
   }
+
+  async function deleteAutomation() {
+    await automationStore.actions.delete({
+      instanceId,
+      automation: $automationStore.selectedAutomation?.automation,
+    })
+  }
+
+  async function testAutomation() {
+    const result = await automationStore.actions.trigger({
+      automation: $automationStore.selectedAutomation.automation,
+    })
+    if (result.status === 200) {
+      notifications.success(
+        `Automation ${$automationStore.selectedAutomation.automation.name} triggered successfully.`
+      )
+    } else {
+      notifications.error(
+        `Failed to trigger automation ${$automationStore.selectedAutomation.automation.name}.`
+      )
+    }
+    return result
+  }
 </script>
 
-{#if !blocks.length}<i>Add a trigger to your automation to get started</i>{/if}
+<div class="canvas">
-<section class="canvas">
+  <div class="content">
+    <div class="title">
+      <div class="subtitle">
+        <Detail size="L">{automation.name}</Detail>
+        <div
+          style="display:flex;
+          color: var(--spectrum-global-color-gray-400);"
+        >
+          <span on:click={() => deleteAutomation()} class="iconPadding">
+            <Icon name="DeleteOutline" />
+          </span>
+          <ActionButton
+            on:click={() => {
+              testDataModal.show()
+            }}
+            icon="MultipleCheck"
+            size="S">Run test</ActionButton
+          >
+        </div>
+      </div>
+    </div>
     {#each blocks as block, idx (block.id)}
       <div
         class="block"
-      animate:flip={{ duration: 600 }}
+        animate:flip={{ duration: 800 }}
         in:fade|local
-      out:fly|local={{ x: 100 }}
+        out:fly|local={{ x: 500 }}
       >
-      <FlowItem {onSelect} {block} />
+        <FlowItem {testDataModal} {testAutomation} {onSelect} {block} />
         {#if idx !== blocks.length - 1}
-        <Arrow />
+          <div class="separator" />
+          <Icon name="AddCircle" size="S" />
+          <div class="separator" />
         {/if}
       </div>
     {/each}
-</section>
+  </div>
+  <Modal bind:this={testDataModal} width="30%">
+    <TestDataModal {testAutomation} />
+  </Modal>
+</div>
 
 <style>
-  section {
+  .separator {
+    width: 1px;
+    height: 25px;
+    border-left: 1px dashed var(--grey-4);
+    color: var(--grey-4);
+    /* center horizontally */
+    align-self: center;
+  }
+  .canvas {
     margin: 0 -40px calc(-1 * var(--spacing-l)) -40px;
-    padding: var(--spacing-l) 40px 0 40px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
     overflow-y: auto;
-    flex: 1 1 auto;
+    text-align: center;
+    height: 100%;
   }
   /* Fix for firefox not respecting bottom padding in scrolling containers */
-  section > *:last-child {
+  .canvas > *:last-child {
     padding-bottom: 40px;
   }
 
@@ -58,8 +125,24 @@
     align-items: center;
   }
 
-  i {
+  .content {
-    font-size: var(--font-size-m);
+    display: inline-block;
-    color: var(--grey-5);
+    text-align: left;
+  }
+
+  .title {
+    padding-bottom: var(--spacing-xl);
+  }
+
+  .subtitle {
+    padding-bottom: var(--spacing-xl);
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .iconPadding {
+    cursor: pointer;
+    display: flex;
+    padding-right: var(--spacing-m);
   }
 </style>

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

@@ -1,86 +1,204 @@
 <script>
   import { automationStore } from "builderStore"
-  import AutomationBlockTagline from "./AutomationBlockTagline.svelte"
+  import {
-  import { Icon } from "@budibase/bbui"
+    Icon,
+    Divider,
+    Layout,
+    Body,
+    Detail,
+    Modal,
+    Button,
+    StatusLight,
+  } from "@budibase/bbui"
+  import AutomationBlockSetup from "../../SetupPanel/AutomationBlockSetup.svelte"
+  import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
+  import ResultsModal from "./ResultsModal.svelte"
+  import ActionModal from "./ActionModal.svelte"
+  import { database } from "stores/backend"
+  import { externalActions } from "./ExternalActions"
 
   export let onSelect
   export let block
+  export let testDataModal
   let selected
+  let webhookModal
+  let actionModal
+  let resultsModal
+  let setupToggled
+  let blockComplete
+  $: testResult = $automationStore.selectedAutomation.testResults?.steps.filter(
+    step => step.stepId === block.stepId
+  )
+  $: instanceId = $database._id
+
+  $: isTrigger = block.type === "TRIGGER"
 
   $: selected = $automationStore.selectedBlock?.id === block.id
   $: steps =
     $automationStore.selectedAutomation?.automation?.definition?.steps ?? []
-  $: blockIdx = steps.findIndex(step => step.id === block.id)
-  $: allowDeleteTrigger = !steps.length
 
-  function deleteStep() {
+  $: blockIdx = steps.findIndex(step => step.id === block.id)
+  $: lastStep = !isTrigger && blockIdx + 1 === steps.length
+
+  // Logic for hiding / showing the add button.first we check if it has a child
+  // then we check to see whether its inputs have been commpleted
+  $: disableAddButton = isTrigger
+    ? $automationStore.selectedAutomation?.automation?.definition?.steps
+        .length > 0
+    : !isTrigger && steps.length - blockIdx > 1
+  $: hasCompletedInputs = Object.keys(
+    block.schema?.inputs?.properties || {}
+  ).every(x => block?.inputs[x])
+
+  async function deleteStep() {
     automationStore.actions.deleteAutomationBlock(block)
+    await automationStore.actions.save({
+      instanceId,
+      automation: $automationStore.selectedAutomation?.automation,
+    })
   }
 </script>
 
 <div
   class={`block ${block.type} hoverable`}
   class:selected
-  on:click={() => onSelect(block)}
+  on:click={() => {
+    onSelect(block)
+  }}
 >
-  <header>
+  <div class="blockSection">
-    {#if block.type === "TRIGGER"}
+    <div
-      <Icon name="Light" />
+      on:click={() => {
-      <span>When this happens...</span>
+        blockComplete = !blockComplete
-    {:else if block.type === "ACTION"}
+      }}
-      <Icon name="FlashOn" />
+      class="splitHeader"
-      <span>Do this...</span>
+    >
-    {:else if block.type === "LOGIC"}
+      <div class="center-items">
-      <Icon name="Branch2" />
+        {#if externalActions[block.stepId]}
-      <span>Only continue if...</span>
+          <img
+            alt={externalActions[block.stepId].name}
+            width="28px"
+            height="28px"
+            src={externalActions[block.stepId].icon}
+          />
+        {:else}
+          <svg
+            width="28px"
+            height="28px"
+            class="spectrum-Icon"
+            style="color:grey;"
+            focusable="false"
+          >
+            <use xlink:href="#spectrum-icon-18-{block.icon}" />
+          </svg>
         {/if}
-    <div class="label">
+        <div class="iconAlign">
-      {#if block.type === "TRIGGER"}Trigger{:else}Step {blockIdx + 1}{/if}
+          {#if isTrigger}
+            <Body size="XS">When this happens:</Body>
+          {:else}
+            <Body size="XS">Do this:</Body>
+          {/if}
+
+          <Detail size="S">{block?.name?.toUpperCase() || ""}</Detail>
         </div>
-    {#if block.type !== "TRIGGER" || allowDeleteTrigger}
+      </div>
-      <div on:click|stopPropagation={deleteStep}><Icon name="Close" /></div>
+      {#if testResult}
+        <span on:click={() => resultsModal.show()}>
+          <StatusLight
+            positive={isTrigger || testResult[0].outputs?.success}
+            negative={!testResult[0].outputs?.success}
+            ><Body size="XS">View response</Body></StatusLight
+          >
+        </span>
       {/if}
-  </header>
+    </div>
-  <hr />
+  </div>
-  <p>
+  {#if !blockComplete}
-    <AutomationBlockTagline {block} />
+    <Divider noMargin />
-  </p>
+    <div class="blockSection">
+      <Layout noPadding gap="S">
+        <div class="splitHeader">
+          <div
+            on:click|stopPropagation={() => {
+              setupToggled = !setupToggled
+            }}
+            class="center-items"
+          >
+            {#if setupToggled}
+              <Icon size="M" name="ChevronDown" />
+            {:else}
+              <Icon size="M" name="ChevronRight" />
+            {/if}
+            <Detail size="S">Setup</Detail>
+          </div>
+          {#if !isTrigger}
+            <div on:click={() => deleteStep()}>
+              <Icon name="DeleteOutline" />
+            </div>
+          {/if}
+        </div>
+
+        {#if setupToggled}
+          <AutomationBlockSetup
+            schemaProperties={Object.entries(block.schema.inputs.properties)}
+            {block}
+            {webhookModal}
+          />
+          {#if lastStep}
+            <Button on:click={() => testDataModal.show()} cta
+              >Finish and test automation</Button
+            >
+          {/if}
+          <Button
+            disabled={disableAddButton ? true : !hasCompletedInputs}
+            on:click={() => {
+              setupToggled = false
+              actionModal.show()
+            }}
+            primary={!isTrigger}
+            cta={isTrigger}>Add Action</Button
+          >
+        {/if}
+      </Layout>
+    </div>
+  {/if}
+
+  <Modal bind:this={resultsModal} width="30%">
+    <ResultsModal {isTrigger} {testResult} />
+  </Modal>
+
+  <Modal bind:this={actionModal} width="30%">
+    <ActionModal bind:blockComplete />
+  </Modal>
+
+  <Modal bind:this={webhookModal} width="30%">
+    <CreateWebhookModal />
+  </Modal>
 </div>
 
 <style>
+  .center-items {
+    display: flex;
+    align-items: center;
+  }
+  .splitHeader {
+    display: flex;
+    justify-content: space-between;
+  }
+  .iconAlign {
+    padding: 0 0 0 var(--spacing-m);
+    display: inline-block;
+  }
   .block {
     width: 360px;
-    padding: 20px;
-    border-radius: var(--border-radius-m);
-    transition: 0.3s all ease;
-    box-shadow: 0 4px 30px 0 rgba(57, 60, 68, 0.08);
     font-size: 16px;
-    background-color: var(--spectrum-global-color-gray-50);
+    background-color: var(--spectrum-alias-background-color-secondary);
     color: var(--grey-9);
-  }
+    border: 1px solid var(--spectrum-global-color-gray-300);
-  .block.selected,
+    border-radius: 4px 4px 4px 4px;
-  .block:hover {
-    transform: scale(1.1);
-    box-shadow: 0 4px 30px 0 rgba(57, 60, 68, 0.15);
   }
 
-  header {
+  .blockSection {
-    font-size: 16px;
+    padding: var(--spacing-xl);
-    font-weight: 600;
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    align-items: center;
-    gap: var(--spacing-xs);
-  }
-  header span {
-    flex: 1 1 auto;
-  }
-  header .label {
-    font-size: 14px;
-    padding: var(--spacing-s);
-    border-radius: var(--border-radius-m);
-    background-color: var(--grey-2);
-    color: var(--grey-8);
   }
 </style>

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

@@ -0,0 +1,114 @@
+<script>
+  import { ModalContent, Icon, Detail, TextArea } from "@budibase/bbui"
+
+  export let testResult
+  export let isTrigger
+  let inputToggled
+  let outputToggled
+</script>
+
+<ModalContent
+  showCloseIcon={false}
+  showConfirmButton={false}
+  title="Test Automation"
+  cancelText="Close"
+>
+  <div slot="header">
+    <div style="float: right;">
+      {#if isTrigger || testResult[0].outputs.success}
+        <div class="iconSuccess">
+          <Icon size="S" name="CheckmarkCircle" />
+        </div>
+      {:else}
+        <div class="iconFailure">
+          <Icon size="S" name="CloseCircle" />
+        </div>
+      {/if}
+    </div>
+  </div>
+
+  <div
+    on:click={() => {
+      inputToggled = !inputToggled
+    }}
+    class="toggle splitHeader"
+  >
+    <div>
+      <div style="display: flex; align-items: center;">
+        <span style="padding-left: var(--spacing-s);">
+          <Detail size="S">Input</Detail>
+        </span>
+      </div>
+    </div>
+    <div>
+      {#if inputToggled}
+        <Icon size="M" name="ChevronDown" />
+      {:else}
+        <Icon size="M" name="ChevronRight" />
+      {/if}
+    </div>
+  </div>
+  {#if inputToggled}
+    <div class="text-area-container">
+      <TextArea
+        disabled
+        value={JSON.stringify(testResult[0].inputs, null, 2)}
+      />
+    </div>
+  {/if}
+
+  <div
+    on:click={() => {
+      outputToggled = !outputToggled
+    }}
+    class="toggle splitHeader"
+  >
+    <div>
+      <div style="display: flex; align-items: center;">
+        <span style="padding-left: var(--spacing-s);">
+          <Detail size="S">Output</Detail>
+        </span>
+      </div>
+    </div>
+    <div>
+      {#if outputToggled}
+        <Icon size="M" name="ChevronDown" />
+      {:else}
+        <Icon size="M" name="ChevronRight" />
+      {/if}
+    </div>
+  </div>
+  {#if outputToggled}
+    <div class="text-area-container">
+      <TextArea
+        disabled
+        value={JSON.stringify(testResult[0].outputs, null, 2)}
+      />
+    </div>
+  {/if}
+</ModalContent>
+
+<style>
+  .iconSuccess {
+    color: var(--spectrum-global-color-green-600);
+  }
+
+  .iconFailure {
+    color: var(--spectrum-global-color-red-600);
+  }
+
+  .splitHeader {
+    cursor: pointer;
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .toggle {
+    display: flex;
+    align-items: center;
+  }
+
+  .text-area-container :global(textarea) {
+    height: 150px;
+  }
+</style>

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

@@ -0,0 +1,88 @@
+<script>
+  import { ModalContent, Tabs, Tab, TextArea, Label } from "@budibase/bbui"
+  import { automationStore } from "builderStore"
+  import AutomationBlockSetup from "../../SetupPanel/AutomationBlockSetup.svelte"
+  import { cloneDeep } from "lodash/fp"
+
+  let failedParse = null
+  // clone the trigger so we're not mutating the reference
+  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
+
+  // check to see if there is existing test data in the store
+  $: testData = $automationStore.selectedAutomation.automation.testData
+  // Check the schema to see if required fields have been entered
+  $: isError = !trigger.schema.outputs.required.every(
+    required => testData[required]
+  )
+
+  function parseTestJSON(e) {
+    try {
+      const obj = JSON.parse(e.detail)
+      failedParse = null
+      automationStore.actions.addTestDataToAutomation(obj)
+    } catch (e) {
+      failedParse = "Invalid JSON"
+    }
+  }
+</script>
+
+<ModalContent
+  title="Add test data"
+  confirmText="Test"
+  showConfirmButton={true}
+  disabled={isError}
+  onConfirm={() => {
+    automationStore.actions.addTestDataToAutomation(testData)
+    automationStore.actions.test($automationStore.selectedAutomation, testData)
+  }}
+  cancelText="Cancel"
+>
+  <Tabs selected="Form" quiet
+    ><Tab icon="Form" title="Form">
+      <div class="tab-content-padding">
+        <AutomationBlockSetup
+          bind:testData
+          {schemaProperties}
+          isTestModal
+          block={trigger}
+        />
+      </div></Tab
+    >
+    <Tab icon="FileJson" title="JSON">
+      <div class="tab-content-padding">
+        <Label>JSON</Label>
+        <div class="text-area-container">
+          <TextArea
+            value={JSON.stringify(
+              $automationStore.selectedAutomation.automation.testData,
+              null,
+              2
+            )}
+            error={failedParse}
+            on:change={e => parseTestJSON(e)}
+          />
+        </div>
+      </div>
+    </Tab>
+  </Tabs>
+</ModalContent>
+
+<style>
+  .text-area-container :global(textarea) {
+    min-height: 200px;
+    height: 200px;
+  }
+
+  .tab-content-padding {
+    padding: 0 var(--spacing-xl);
+  }
+</style>

packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte

@@ -6,7 +6,6 @@
   import EditAutomationPopover from "./EditAutomationPopover.svelte"
 
   $: selectedAutomationId = $automationStore.selectedAutomation?.automation?._id
-
   onMount(() => {
     automationStore.actions.fetch()
   })

packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte

@@ -2,7 +2,9 @@
   import AutomationList from "./AutomationList.svelte"
   import CreateAutomationModal from "./CreateAutomationModal.svelte"
   import { Icon, Modal, Tabs, Tab } from "@budibase/bbui"
-  let modal
+
+  export let modal
+  export let webhookModal
 </script>
 
 <div class="title">
@@ -11,7 +13,7 @@
       <div class="tab-content-padding">
         <AutomationList />
         <Modal bind:this={modal}>
-          <CreateAutomationModal />
+          <CreateAutomationModal {webhookModal} />
         </Modal>
       </div>
     </Tab>

packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte

@@ -3,12 +3,14 @@
   import { database } from "stores/backend"
   import { automationStore } from "builderStore"
   import { notifications } from "@budibase/bbui"
-  import { Icon, Input, ModalContent } from "@budibase/bbui"
+  import { Input, ModalContent, Layout, Body, Icon } from "@budibase/bbui"
   import analytics from "analytics"
 
   let name
+  let selectedTrigger
+  let triggerVal
+  export let webhookModal
 
-  $: valid = !!name
   $: instanceId = $database._id
 
   async function createAutomation() {
@@ -16,41 +18,97 @@
       name,
       instanceId,
     })
+    const newBlock = $automationStore.selectedAutomation.constructBlock(
+      "TRIGGER",
+      triggerVal.stepId,
+      triggerVal
+    )
+
+    automationStore.actions.addBlockToAutomation(newBlock)
+    if (triggerVal.stepId === "WEBHOOK") {
+      webhookModal.show
+    }
+
+    await automationStore.actions.save({
+      instanceId,
+      automation: $automationStore.selectedAutomation?.automation,
+    })
+
     notifications.success(`Automation ${name} created.`)
+
     $goto(`./${$automationStore.selectedAutomation.automation._id}`)
     analytics.captureEvent("Automation Created", { name })
   }
+  $: triggers = Object.entries($automationStore.blockDefinitions.TRIGGER)
+
+  const selectTrigger = trigger => {
+    triggerVal = trigger
+    selectedTrigger = trigger.name
+  }
 </script>
 
 <ModalContent
   title="Create Automation"
-  confirmText="Create"
+  confirmText="Save"
-  size="L"
+  size="M"
   onConfirm={createAutomation}
-  disabled={!valid}
+  disabled={!selectedTrigger}
 >
+  <Body size="XS"
+    >Please name your automation, then select a trigger. Every automation must
+    start with a trigger.
+  </Body>
   <Input bind:value={name} label="Name" />
-  <a
+
-    slot="footer"
+  <Layout noPadding>
-    target="_blank"
+    <Body size="S">Triggers</Body>
-    href="https://docs.budibase.com/automate/introduction-to-automate"
+
+    <div class="item-list">
+      {#each triggers as [idx, trigger]}
+        <div
+          class="item"
+          class:selected={selectedTrigger === trigger.name}
+          on:click={() => selectTrigger(trigger)}
         >
-    <Icon name="InfoOutline" />
+          <div class="item-body">
-    <span>Learn about automations</span>
+            <Icon name={trigger.icon} />
-  </a>
+            <span class="icon-spacing">
+              <Body size="S">{trigger.name}</Body></span
+            >
+          </div>
+        </div>
+      {/each}
+    </div>
+  </Layout>
 </ModalContent>
 
 <style>
-  a {
+  .icon-spacing {
-    color: var(--ink);
+    margin-left: var(--spacing-m);
-    font-size: 14px;
-    vertical-align: middle;
-    display: flex;
-    align-items: center;
-    text-decoration: none;
   }
-  a span {
+  .item-body {
-    text-decoration: underline;
+    display: flex;
-    margin-left: var(--spectrum-alias-item-padding-s);
+    margin-left: var(--spacing-m);
+  }
+  .item-list {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
+    grid-gap: var(--spectrum-alias-grid-baseline);
+  }
+
+  .item {
+    cursor: pointer;
+    display: grid;
+    grid-gap: var(--spectrum-alias-grid-margin-xsmall);
+    padding: var(--spectrum-alias-item-padding-s);
+    background: var(--spectrum-alias-background-color-secondary);
+    transition: 0.3s all;
+    border: solid #3b3d3c;
+    border-radius: 5px;
+    box-sizing: border-box;
+    border-width: 2px;
+  }
+  .selected {
+    background: var(--spectrum-alias-background-color-tertiary);
   }
 </style>

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

@@ -2,8 +2,16 @@
   import TableSelector from "./TableSelector.svelte"
   import RowSelector from "./RowSelector.svelte"
   import SchemaSetup from "./SchemaSetup.svelte"
-  import { Button, Input, Select, Label } from "@budibase/bbui"
+  import {
+    Button,
+    Input,
+    Select,
+    Label,
+    ActionButton,
+    Drawer,
+  } from "@budibase/bbui"
   import { automationStore } from "builderStore"
+  import { tables } from "stores/backend"
   import WebhookDisplay from "../Shared/WebhookDisplay.svelte"
   import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
   import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"
@@ -12,15 +20,50 @@
   import QueryParamSelector from "./QueryParamSelector.svelte"
   import CronBuilder from "./CronBuilder.svelte"
   import Editor from "components/integration/QueryEditor.svelte"
+  import { database } from "stores/backend"
+  import { debounce } from "lodash"
+  import ModalBindableInput from "components/common/bindings/ModalBindableInput.svelte"
+  import FilterDrawer from "components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte"
+  // need the client lucene builder to convert to the structure API expects
+  import { buildLuceneQuery } from "../../../../../client/src/utils/lucene"
 
   export let block
   export let webhookModal
-  $: inputs = Object.entries(block.schema?.inputs?.properties || {})
+  export let testData
+  export let schemaProperties
+  export let isTestModal = false
+  let drawer
+  let tempFilters = lookForFilters(schemaProperties) || []
+  let fillWidth = true
+
   $: stepId = block.stepId
   $: bindings = getAvailableBindings(
-    block,
+    block || $automationStore.selectedBlock,
     $automationStore.selectedAutomation?.automation?.definition
   )
+  $: instanceId = $database._id
+
+  $: inputData = testData ? testData : block.inputs
+  $: tableId = inputData ? inputData.tableId : null
+  $: table = tableId
+    ? $tables.list.find(table => table._id === inputData.tableId)
+    : { schema: {} }
+  $: schemaFields = table ? Object.values(table.schema) : []
+
+  const onChange = debounce(
+    async function (e, key) {
+      if (isTestModal) {
+        testData[key] = e.detail
+      } else {
+        block.inputs[key] = e.detail
+        await automationStore.actions.save({
+          instanceId,
+          automation: $automationStore.selectedAutomation?.automation,
+        })
+      }
+    },
+    isTestModal ? 0 : 800
+  )
 
   function getAvailableBindings(block, automation) {
     if (!block || !automation) {
@@ -52,64 +95,159 @@
     }
     return bindings
   }
+
+  function lookForFilters(properties) {
+    console.log("testing")
+    if (!properties) {
+      return []
+    }
+    let filters
+    const inputs = testData ? testData : block.inputs
+    for (let [key, field] of properties) {
+      // need to look for the builder definition (keyed separately, see saveFilters)
+      const defKey = `${key}-def`
+      if (field.customType === "filters" && inputs?.[defKey]) {
+        filters = inputs[defKey]
+        break
+      }
+    }
+    return filters || []
+  }
+
+  function saveFilters(key) {
+    const filters = buildLuceneQuery(tempFilters)
+    const defKey = `${key}-def`
+    inputData[key] = filters
+    inputData[defKey] = tempFilters
+    onChange({ detail: filters }, key)
+    // need to store the builder definition in the automation
+    onChange({ detail: tempFilters }, defKey)
+    drawer.hide()
+  }
 </script>
 
 <div class="fields">
-  <div class="block-label">{block.name}</div>
+  {#each schemaProperties as [key, value]}
-  {#each inputs as [key, value]}
     <div class="block-field">
-      <Label>{value.title}</Label>
+      <Label>{value.title || (key === "row" ? "Table" : key)}</Label>
       {#if value.type === "string" && value.enum}
         <Select
-          bind:value={block.inputs[key]}
+          on:change={e => onChange(e, key)}
+          value={inputData[key]}
           options={value.enum}
           getOptionLabel={(x, idx) => (value.pretty ? value.pretty[idx] : x)}
         />
+      {:else if value.customType === "column"}
+        <Select
+          on:change={e => onChange(e, key)}
+          value={inputData[key]}
+          options={Object.keys(table.schema)}
+        />
+      {:else if value.customType === "filters"}
+        <ActionButton on:click={drawer.show}>Define filters</ActionButton>
+        <Drawer bind:this={drawer} {fillWidth} title="Filtering">
+          <Button cta slot="buttons" on:click={() => saveFilters(key)}
+            >Save</Button
+          >
+          <FilterDrawer
+            slot="body"
+            bind:filters={tempFilters}
+            {bindings}
+            {schemaFields}
+            panel={AutomationBindingPanel}
+          />
+        </Drawer>
       {:else if value.customType === "password"}
-        <Input type="password" bind:value={block.inputs[key]} />
+        <Input
+          type="password"
+          on:change={e => onChange(e, key)}
+          value={inputData[key]}
+        />
       {:else if value.customType === "email"}
+        {#if isTestModal}
+          <ModalBindableInput
+            title={value.title}
+            value={inputData[key]}
+            panel={AutomationBindingPanel}
+            type="email"
+            on:change={e => onChange(e, key)}
+            {bindings}
+            fillWidth
+          />
+        {:else}
           <DrawerBindableInput
+            fillWidth
             title={value.title}
             panel={AutomationBindingPanel}
             type="email"
-          value={block.inputs[key]}
+            value={inputData[key]}
-          on:change={e => (block.inputs[key] = e.detail)}
+            on:change={e => onChange(e, key)}
             {bindings}
           />
+        {/if}
       {:else if value.customType === "query"}
-        <QuerySelector bind:value={block.inputs[key]} />
+        <QuerySelector
+          on:change={e => onChange(e, key)}
+          value={inputData[key]}
+        />
       {:else if value.customType === "cron"}
-        <CronBuilder bind:value={block.inputs[key]} />
+        <CronBuilder on:change={e => onChange(e, key)} value={inputData[key]} />
       {:else if value.customType === "queryParams"}
-        <QueryParamSelector bind:value={block.inputs[key]} {bindings} />
+        <QueryParamSelector
+          on:change={e => onChange(e, key)}
+          value={inputData[key]}
+          {bindings}
+        />
       {:else if value.customType === "table"}
-        <TableSelector bind:value={block.inputs[key]} />
+        <TableSelector
+          value={inputData[key]}
+          on:change={e => onChange(e, key)}
+        />
       {:else if value.customType === "row"}
-        <RowSelector bind:value={block.inputs[key]} {bindings} />
+        <RowSelector
+          value={inputData[key]}
+          on:change={e => onChange(e, key)}
+          {bindings}
+        />
       {:else if value.customType === "webhookUrl"}
-        <WebhookDisplay value={block.inputs[key]} />
+        <WebhookDisplay value={inputData[key]} />
       {:else if value.customType === "triggerSchema"}
-        <SchemaSetup bind:value={block.inputs[key]} />
+        <SchemaSetup on:change={e => onChange(e, key)} value={value[key]} />
       {:else if value.customType === "code"}
         <CodeEditorModal>
           <pre>{JSON.stringify(bindings, null, 2)}</pre>
           <Editor
             mode="javascript"
             on:change={e => {
-              block.inputs[key] = e.detail.value
+              onChange(e, key)
+              inputData[key] = e.detail.value
             }}
-            value={block.inputs[key]}
+            value={inputData[key]}
           />
         </CodeEditorModal>
       {:else if value.type === "string" || value.type === "number"}
+        {#if isTestModal}
+          <ModalBindableInput
+            title={value.title}
+            value={inputData[key]}
+            panel={AutomationBindingPanel}
+            type={value.customType}
+            on:change={e => onChange(e, key)}
+            {bindings}
+          />
+        {:else}
+          <div class="test">
             <DrawerBindableInput
+              fillWidth={true}
               title={value.title}
               panel={AutomationBindingPanel}
               type={value.customType}
-          value={block.inputs[key]}
+              value={inputData[key]}
-          on:change={e => (block.inputs[key] = e.detail)}
+              on:change={e => onChange(e, key)}
               {bindings}
             />
+          </div>
+        {/if}
       {/if}
     </div>
   {/each}
@@ -132,9 +270,7 @@
     grid-gap: 5px;
   }
 
-  .block-label {
+  .test :global(.drawer) {
-    font-weight: 600;
+    width: 10000px !important;
-    font-size: var(--font-size-s);
-    color: var(--grey-7);
   }
 </style>

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

@@ -1,7 +1,13 @@
 <script>
   import { Button, Select, Input } from "@budibase/bbui"
+  import { createEventDispatcher } from "svelte"
+  const dispatch = createEventDispatcher()
 
   export let value
+  const onChange = e => {
+    value = e.detail
+    dispatch("change", e.detail)
+  }
 
   let presets = false
 
@@ -30,7 +36,7 @@
 </script>
 
 <div class="block-field">
-  <Input bind:value />
+  <Input on:change={onChange} {value} />
 
   <div class="presets">
     <Button on:click={() => (presets = !presets)}
@@ -38,7 +44,8 @@
     >
     {#if presets}
       <Select
-        bind:value
+        on:change={onChange}
+        {value}
         secondary
         extraThin
         label="Presets"

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

@@ -38,6 +38,7 @@
         label={field.name}
         type="string"
         {bindings}
+        fillWidth={true}
       />
     {/each}
   </div>

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

@@ -3,12 +3,25 @@
   import { Select } from "@budibase/bbui"
   import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
   import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"
+  import { createEventDispatcher } from "svelte"
+  import ModalBindableInput from "components/common/bindings/ModalBindableInput.svelte"
+  import { automationStore } from "builderStore"
+
+  const dispatch = createEventDispatcher()
 
   export let value
   export let bindings
-
   $: table = $tables.list.find(table => table._id === value?.tableId)
   $: schemaFields = Object.entries(table?.schema ?? {})
+  const onChangeTable = e => {
+    value = { tableId: e.detail }
+    dispatch("change", value)
+  }
+
+  const onChange = (e, field) => {
+    value[field] = e.detail
+    dispatch("change", value)
+  }
 
   // Ensure any nullish tableId values get set to empty string so
   // that the select works
@@ -20,7 +33,8 @@
 </script>
 
 <Select
-  bind:value={value.tableId}
+  on:change={onChangeTable}
+  value={value.tableId}
   options={$tables.list}
   getOptionLabel={table => table.name}
   getOptionValue={table => table._id}
@@ -32,21 +46,34 @@
       {#if !schema.autocolumn}
         {#if schemaHasOptions(schema)}
           <Select
+            on:change={e => onChange(e, field)}
             label={field}
-            bind:value={value[field]}
+            value={value[field]}
             options={schema.constraints.inclusion}
           />
         {:else if schema.type === "string" || schema.type === "number"}
+          {#if $automationStore.selectedAutomation.automation.testData}
+            <ModalBindableInput
+              value={value[field]}
+              panel={AutomationBindingPanel}
+              label={field}
+              type={value.customType}
+              on:change={e => onChange(e, field)}
+              {bindings}
+            />
+          {:else}
             <DrawerBindableInput
               panel={AutomationBindingPanel}
               value={value[field]}
-            on:change={e => (value[field] = e.detail)}
+              on:change={e => onChange(e, field)}
               label={field}
               type="string"
               {bindings}
+              fillWidth={true}
             />
           {/if}
         {/if}
+      {/if}
     {/each}
   </div>
 {/if}

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

@@ -1,5 +1,8 @@
 <script>
   import { Input, Select } from "@budibase/bbui"
+  import { createEventDispatcher } from "svelte"
+
+  const dispatch = createEventDispatcher()
 
   export let value = {}
   $: fieldsArray = Object.entries(value).map(([name, type]) => ({
@@ -28,13 +31,13 @@
   function addField() {
     const newValue = { ...value }
     newValue[""] = "string"
-    value = newValue
+    dispatch("change", newValue)
   }
 
   function removeField(name) {
     const newValues = { ...value }
     delete newValues[name]
-    value = newValues
+    dispatch("change", newValues)
   }
 
   const fieldNameChanged = originalName => e => {
@@ -50,6 +53,7 @@
       newVals[current.name] = current.type
       return newVals
     }, {})
+    dispatch("change", value)
   }
 </script>
 
@@ -68,7 +72,10 @@
       />
       <Select
         value={field.type}
-        on:change={e => (value[field.name] = e.target.value)}
+        on:change={e => {
+          value[field.name] = e.target.value
+          dispatch("change", value)
+        }}
         options={typeOptions}
       />
       <i

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

@@ -1,96 +0,0 @@
-<script>
-  import { automationStore } from "builderStore"
-  import { database } from "stores/backend"
-  import { notifications, Button, Modal, Heading, Toggle } from "@budibase/bbui"
-  import AutomationBlockSetup from "./AutomationBlockSetup.svelte"
-  import CreateWebookModal from "../Shared/CreateWebhookModal.svelte"
-
-  let webhookModal
-
-  $: instanceId = $database._id
-  $: automation = $automationStore.selectedAutomation?.automation
-  $: automationLive = automation?.live
-
-  function setAutomationLive(live) {
-    if (automationLive === live) {
-      return
-    }
-    automation.live = live
-    automationStore.actions.save({ instanceId, automation })
-    if (live) {
-      notifications.info(`Automation ${automation.name} enabled.`)
-    } else {
-      notifications.error(`Automation ${automation.name} disabled.`)
-    }
-  }
-
-  async function testAutomation() {
-    const result = await automationStore.actions.test({
-      automation: $automationStore.selectedAutomation.automation,
-    })
-    if (result.status === 200) {
-      notifications.success(
-        `Automation ${automation.name} triggered successfully.`
-      )
-    } else {
-      notifications.error(`Failed to trigger automation ${automation.name}.`)
-    }
-  }
-
-  async function saveAutomation() {
-    await automationStore.actions.save({
-      instanceId,
-      automation,
-    })
-    notifications.success(`Automation ${automation.name} saved.`)
-  }
-</script>
-
-<div class="title">
-  <Heading size="S">Setup</Heading>
-  <Toggle
-    value={automationLive}
-    on:change={() => setAutomationLive(!automationLive)}
-    dataCy="activate-automation"
-    text="Live"
-  />
-</div>
-{#if $automationStore.selectedBlock}
-  <AutomationBlockSetup
-    bind:block={$automationStore.selectedBlock}
-    {webhookModal}
-  />
-{:else if automation}
-  <div class="block-label">{automation.name}</div>
-  <Button secondary on:click={testAutomation}>Test Automation</Button>
-{/if}
-<Button
-  secondary
-  wide
-  data-cy="save-automation-setup"
-  on:click={saveAutomation}
->
-  Save Automation
-</Button>
-<Modal bind:this={webhookModal} width="30%">
-  <CreateWebookModal />
-</Modal>
-
-<style>
-  .title {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-    gap: var(--spacing-xs);
-  }
-  .title :global(h1) {
-    flex: 1 1 auto;
-  }
-
-  .block-label {
-    font-size: var(--spectrum-global-dimension-font-size-75);
-    font-weight: 600;
-    color: var(--grey-7);
-  }
-</style>

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

@@ -1,11 +1,20 @@
 <script>
   import { tables } from "stores/backend"
   import { Select } from "@budibase/bbui"
+  import { createEventDispatcher } from "svelte"
+
+  const dispatch = createEventDispatcher()
 
   export let value
+
+  const onChange = e => {
+    value = e.detail
+    dispatch("change", e.detail)
+  }
 </script>
 
 <Select
+  on:change={onChange}
   bind:value
   options={$tables.list}
   getOptionLabel={table => table.name}

packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte

@@ -9,7 +9,10 @@
   import TableNavigator from "components/backend/TableNavigator/TableNavigator.svelte"
   import ICONS from "./icons"
 
+  let openDataSources = []
+
   function selectDatasource(datasource) {
+    toggleNode(datasource)
     datasources.select(datasource._id)
     $goto(`./datasource/${datasource._id}`)
   }
@@ -19,6 +22,15 @@
     $goto(`./datasource/${query.datasourceId}/${query._id}`)
   }
 
+  function toggleNode(datasource) {
+    const isOpen = openDataSources.includes(datasource._id)
+    if (isOpen) {
+      openDataSources = openDataSources.filter(id => datasource._id !== id)
+    } else {
+      openDataSources = [...openDataSources, datasource._id]
+    }
+  }
+
   onMount(() => {
     datasources.fetch()
     queries.fetch()
@@ -31,8 +43,11 @@
       <NavItem
         border={idx > 0}
         text={datasource.name}
+        opened={openDataSources.includes(datasource._id)}
         selected={$datasources.selected === datasource._id}
+        withArrow={true}
         on:click={() => selectDatasource(datasource)}
+        on:iconClick={() => toggleNode(datasource)}
       >
         <div class="datasource-icon" slot="icon">
           <svelte:component
@@ -46,13 +61,16 @@
         {/if}
       </NavItem>
 
+      {#if openDataSources.includes(datasource._id)}
         <TableNavigator sourceId={datasource._id} />
+      {/if}
 
       {#each $queries.list.filter(query => query.datasourceId === datasource._id) as query}
         <NavItem
           indentLevel={1}
           icon="SQLQuery"
           text={query.name}
+          opened={$queries.selected === query._id}
           selected={$queries.selected === query._id}
           on:click={() => onClickQuery(query)}
         >

packages/builder/src/components/common/NavItem.svelte

@@ -1,5 +1,6 @@
 <script>
   import { Icon } from "@budibase/bbui"
+  import { createEventDispatcher } from "svelte"
 
   export let icon
   export let withArrow = false
@@ -10,6 +11,13 @@
   export let selected = false
   export let opened = false
   export let draggable = false
+
+  const dispatch = createEventDispatcher()
+
+  function onIconClick(event) {
+    event.stopPropagation()
+    dispatch("iconClick")
+  }
 </script>
 
 <div
@@ -28,7 +36,7 @@
 >
   <div class="content">
     {#if withArrow}
-      <div class:opened class="icon arrow">
+      <div class:opened class="icon arrow" on:click={onIconClick}>
         <Icon size="S" name="ChevronRight" />
       </div>
     {/if}

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

@@ -14,6 +14,7 @@
   export let placeholder
   export let label
   export let disabled = false
+  export let fillWidth
 
   const dispatch = createEventDispatcher()
   let bindingDrawer
@@ -45,7 +46,7 @@
     </div>
   {/if}
 </div>
-<Drawer bind:this={bindingDrawer} {title}>
+<Drawer {fillWidth} bind:this={bindingDrawer} {title}>
   <svelte:fragment slot="description">
     Add the objects on the left to enrich your text.
   </svelte:fragment>

packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte

@@ -1,5 +1,5 @@
 <script>
-  import { onMount } from "svelte"
+  import { onMount, onDestroy } from "svelte"
   import { store, currentAsset } from "builderStore"
   import iframeTemplate from "./iframeTemplate"
   import { Screen } from "builderStore/store/screenTemplates/utils/Screen"
@@ -97,16 +97,25 @@
       { once: true }
     )
 
-    // Add listener for events sent by cliebt library in preview
+    // Add listener for events sent by client library in preview
-    iframe.contentWindow.addEventListener("bb-event", event => {
+    iframe.contentWindow.addEventListener("bb-event", handleBudibaseEvent)
+    iframe.contentWindow.addEventListener("keydown", handleKeydownEvent)
+  })
+
+  // remove all iframe event listeners on component destroy
+  onDestroy(() => {
+    iframe.contentWindow.removeEventListener("bb-event", handleBudibaseEvent)
+    iframe.contentWindow.removeEventListener("keydown", handleKeydownEvent)
+  })
+
+  const handleBudibaseEvent = event => {
     const { type, data } = event.detail
     if (type === "select-component" && data.id) {
       store.actions.components.select({ _id: data.id })
     } else if (type === "update-prop") {
       store.actions.components.updateProp(data.prop, data.value)
     } else if (type === "delete-component" && data.id) {
-        idToDelete = data.id
+      confirmDeleteComponent(data.id)
-        confirmDeleteDialog.show()
     } else if (type === "preview-loaded") {
       // Wait for this event to show the client library if intelligent
       // loading is supported
@@ -114,8 +123,20 @@
     } else {
       console.warning(`Client sent unknown event type: ${type}`)
     }
-    })
+  };
-  })
+
+  const handleKeydownEvent = event => {
+    if ((event.key === "Delete" || event.key === "Backspace") &&
+      selectedComponentId &&
+      ['input', 'textarea'].indexOf(iframe.contentWindow.document.activeElement?.tagName.toLowerCase()) === -1) {
+      confirmDeleteComponent(selectedComponentId);
+    }
+  }
+
+  const confirmDeleteComponent = (componentId) => {
+    idToDelete = componentId
+    confirmDeleteDialog.show()
+  }
 
   const deleteComponent = () => {
     store.actions.components.delete({ _id: idToDelete })

packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte

@@ -1,22 +1,24 @@
 <script>
   import {
-    DatePicker,
-    Icon,
-    Button,
-    Select,
-    Combobox,
-    Input,
-    DrawerContent,
-    Layout,
     Body,
+    Button,
+    Combobox,
+    DatePicker,
+    DrawerContent,
+    Icon,
+    Input,
+    Layout,
+    Select,
   } from "@budibase/bbui"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import BindingPanel from "components/common/bindings/BindingPanel.svelte"
   import { generate } from "shortid"
-  import { OperatorOptions, getValidOperatorsForType } from "helpers/lucene"
+  import { getValidOperatorsForType, OperatorOptions } from "helpers/lucene"
 
   export let schemaFields
   export let filters = []
   export let bindings = []
+  export let panel = BindingPanel
 
   const BannedTypes = ["link", "attachment", "formula"]
 
@@ -82,9 +84,7 @@
 
   const getFieldOptions = field => {
     const schema = schemaFields.find(x => x.name === field)
-    const opt = schema?.constraints?.inclusion || []
+    return schema?.constraints?.inclusion || []
-
-    return opt
   }
 </script>
 
@@ -127,6 +127,7 @@
                 title={`Value for "${filter.field}"`}
                 value={filter.value}
                 placeholder="Value"
+                {panel}
                 {bindings}
                 on:change={event => (filter.value = event.detail)}
               />

packages/builder/src/pages/builder/_layout.svelte

@@ -6,16 +6,19 @@
   let loaded = false
 
   $: multiTenancyEnabled = $admin.multiTenancy
-  $: hasAdminUser = $admin?.checklist?.adminUser.checked
+  $: hasAdminUser = $admin?.checklist?.adminUser?.checked
   $: tenantSet = $auth.tenantSet
+  $: cloud = $admin.cloud
 
   onMount(async () => {
-    await admin.init()
     await auth.checkAuth()
+    await admin.init()
     loaded = true
   })
 
   $: {
+    // We should never see the org or admin user creation screens in the cloud
+    if (!cloud) {
       const apiReady = $admin.loaded && $auth.loaded
       // if tenant is not set go to it
       if (loaded && apiReady && multiTenancyEnabled && !tenantSet) {
@@ -26,11 +29,12 @@
         $redirect("./admin")
       }
     }
+  }
   // Redirect to log in at any time if the user isn't authenticated
   $: {
     if (
       loaded &&
-      hasAdminUser &&
+      (hasAdminUser || cloud) &&
       !$auth.user &&
       !$isActive("./auth") &&
       !$isActive("./invite")

packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte

@@ -1,22 +1,50 @@
 <script>
+  import { Heading, Body, Layout, Button, Modal } from "@budibase/bbui"
   import { automationStore } from "builderStore"
   import AutomationPanel from "components/automation/AutomationPanel/AutomationPanel.svelte"
-  import SetupPanel from "components/automation/SetupPanel/SetupPanel.svelte"
+  import CreateAutomationModal from "components/automation/AutomationPanel/CreateAutomationModal.svelte"
+  import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
+  $: automation = $automationStore.automations[0]
+  let modal
+  let webhookModal
 </script>
 
 <!-- routify:options index=3 -->
 <div class="root">
   <div class="nav">
-    <AutomationPanel />
+    <AutomationPanel {modal} {webhookModal} />
   </div>
   <div class="content">
+    {#if automation}
       <slot />
+    {:else}
+      <div class="centered">
+        <div class="main">
+          <Layout gap="S" justifyItems="center">
+            <svg
+              width="60px"
+              height="60px"
+              class="spectrum-Icon"
+              focusable="false"
+            >
+              <use xlink:href="#spectrum-icon-18-WorkflowAdd" />
+            </svg>
+            <Heading size="M">You have no automations</Heading>
+            <Body size="M">Let's fix that. Call the bots!</Body>
+            <Button on:click={() => modal.show()} size="M" cta
+              >Create automation</Button
+            >
+          </Layout>
         </div>
-  {#if $automationStore.selectedAutomation}
-    <div class="setup">
-      <SetupPanel />
       </div>
     {/if}
+  </div>
+  <Modal bind:this={modal}>
+    <CreateAutomationModal {webhookModal} />
+  </Modal>
+  <Modal bind:this={webhookModal} width="30%">
+    <CreateWebhookModal />
+  </Modal>
 </div>
 
 <style>
@@ -24,7 +52,7 @@
     flex: 1 1 auto;
     height: 0;
     display: grid;
-    grid-template-columns: 260px minmax(510px, 1fr) 260px;
+    grid-template-columns: 260px minmax(510px, 1fr);
   }
 
   .nav {
@@ -48,16 +76,20 @@
     gap: var(--spacing-l);
     overflow: hidden;
   }
-
+  .centered {
-  .setup {
+    top: 0;
-    padding: var(--spectrum-global-dimension-size-200);
+    bottom: 0;
-    border-left: var(--border-light);
+    left: 0;
+    right: 0;
+    width: 100%;
+    height: 100%;
     display: flex;
     flex-direction: column;
-    justify-content: flex-start;
+    justify-content: center;
-    align-items: stretch;
+    align-items: center;
-    gap: var(--spacing-l);
+  }
-    background-color: var(--background);
+
-    overflow-y: auto;
+  .main {
+    width: 300px;
   }
 </style>

packages/builder/src/pages/builder/app/[application]/automate/index.svelte

@@ -15,13 +15,3 @@
     }
   })
 </script>
-
-<i>Create your first automation to get started</i>
-
-<style>
-  i {
-    font-size: var(--font-size-m);
-    color: var(--grey-5);
-    margin-top: 2px;
-  }
-</style>

packages/builder/src/pages/builder/auth/org.svelte

@@ -8,6 +8,7 @@
 
   let tenantId = get(auth).tenantSet ? get(auth).tenantId : ""
   $: multiTenancyEnabled = $admin.multiTenancy
+  $: cloud = $admin.cloud
 
   async function setOrg() {
     if (tenantId == null || tenantId === "") {
@@ -25,7 +26,7 @@
 
   onMount(async () => {
     await auth.checkQueryString()
-    if (!multiTenancyEnabled) {
+    if (!multiTenancyEnabled || cloud) {
       $goto("../")
     } else {
       admin.unload()

packages/builder/src/pages/builder/portal/_layout.svelte

@@ -62,7 +62,7 @@
     }
 
     // add link to account portal if the user has access
-    if ($auth?.user?.account) {
+    if ($auth?.user?.accountPortalAccess) {
       menu = menu.concat([
         {
           title: "Account",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.125-alpha.7",
+  "version": "0.9.125-alpha.11",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.125-alpha.7",
+  "version": "0.9.125-alpha.11",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.125-alpha.7",
+    "@budibase/bbui": "^0.9.125-alpha.11",
     "@budibase/standard-components": "^0.9.124",
-    "@budibase/string-templates": "^0.9.125-alpha.7",
+    "@budibase/string-templates": "^0.9.125-alpha.11",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"

packages/client/yarn.lock

@@ -28,10 +28,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@budibase/bbui@^0.9.125":
+"@budibase/bbui@^0.9.125-alpha.11":
-  version "0.9.125"
+  version "0.9.130"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.125.tgz#b1a85e38c884de5fa35de3a778be05f279dc8315"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.130.tgz#cad02a7aa16324eb7a056c5dc0162444fa917964"
-  integrity sha512-amU8NTeuaUrulPQM6kXZbQznZ6fX8uMw7mhsn/23TonbDyHWGSZRJ6pIA2FYc+KOESK1fL62O4yzfQA0OIViNw==
+  integrity sha512-ULOC++363K8QEMasmsDmleF7AzjulFk/ZxGPlOJcVKJU8Bx5wG1uNFgTyJyGpmnbUWHd67eYUEettfH7I+VoOw==
   dependencies:
     "@adobe/spectrum-css-workflow-icons" "^1.2.1"
     "@spectrum-css/actionbutton" "^1.0.1"
@@ -77,10 +77,10 @@
     svelte-flatpickr "^3.1.0"
     svelte-portal "^1.0.0"
 
-"@budibase/bbui@^0.9.125-alpha.5":
+"@budibase/bbui@^0.9.129":
-  version "0.9.128"
+  version "0.9.129"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.128.tgz#71a5e81b02a4f64baa6874bfa4b1d4fed8cc9f0b"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.129.tgz#989bf60d404772d4b308382faba7adac6518ec3e"
-  integrity sha512-UCo9SRs1xsMQ0ClJOtNB7JeVF2+0iMVOfAZE7Rrf5d51W+1YeyM9b3BbfhxHRq1yeKLHrbdczerbTHQkmF1RwQ==
+  integrity sha512-U3uO9K3m7Ph5RQpzXx5IIy94s/KdU9Q8eJXFQwH6neYIKQk3OFo8br5px5C7lE38mtazqq9XvQy0f+MUarKk4A==
   dependencies:
     "@adobe/spectrum-css-workflow-icons" "^1.2.1"
     "@spectrum-css/actionbutton" "^1.0.1"
@@ -155,11 +155,11 @@
     year "^0.2.1"
 
 "@budibase/standard-components@^0.9.124":
-  version "0.9.125"
+  version "0.9.129"
-  resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.125.tgz#92244f009ce22f105694ca85fdc78923f8bcba11"
+  resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.129.tgz#f2cdead99b8f25177c4c291be3032fb9ffd1dac3"
-  integrity sha512-PjCJ39o0EMfrlMTUKDNHr+W1Vpz4saS5HKoOW0kigRvC7pwxnZuApB8uLryQ4hp4YCUelY30B4a7ps/JtYntDg==
+  integrity sha512-RYWBcrz4MGICg9neIPQ4CbU3WTTJoTofi2D4pwA+qvvN3uhqOCcFIZ3+yadZ5Akz2qwMztQ8WDvetowm2srZcA==
   dependencies:
-    "@budibase/bbui" "^0.9.125"
+    "@budibase/bbui" "^0.9.129"
     "@spectrum-css/button" "^3.0.3"
     "@spectrum-css/card" "^3.0.3"
     "@spectrum-css/divider" "^1.0.3"
@@ -172,10 +172,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/string-templates@^0.9.125-alpha.5":
+"@budibase/string-templates@^0.9.125-alpha.11":
-  version "0.9.128"
+  version "0.9.130"
-  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-0.9.128.tgz#50ee46dc0d726d481bd5139cd0b38364649a8463"
+  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-0.9.130.tgz#1be8affcba0dc8ff2b8044c65dd378dc76a165d0"
-  integrity sha512-4TzmnX2o5S2cts08ukB86El4wYm7cHuV2t6a7yDMGPe1mWeKP1WEtVF6rKhXEdbPTiotW8oYondOlgOP7DT9lA==
+  integrity sha512-DXO6Um18/k16i3hYilxvQ4RYNHhd29OJGbzjfQZ2v7z4Oin5y+WMZzpjX1hQS5g9f/CBbzu7qd7EHiz/n8gMqg==
   dependencies:
     "@budibase/handlebars-helpers" "^0.11.4"
     dayjs "^1.10.4"
@@ -1272,7 +1272,12 @@ date.js@^0.3.1:
   dependencies:
     debug "~3.1.0"
 
-dayjs@^1.10.4, dayjs@^1.10.5:
+dayjs@^1.10.4:
+  version "1.10.7"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468"
+  integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==
+
+dayjs@^1.10.5:
   version "1.10.6"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.6.tgz#288b2aa82f2d8418a6c9d4df5898c0737ad02a63"
   integrity sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw==

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.125-alpha.7",
+  "version": "0.9.125-alpha.11",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -49,7 +49,8 @@
       "!src/automations/tests/**/*",
       "!src/utilities/fileProcessor.js",
       "!src/utilities/fileSystem/**/*",
-      "!src/utilities/redis.js"
+      "!src/utilities/redis.js",
+      "!src/api/controllers/row/internalSearch.js"
     ],
     "coverageReporters": [
       "lcov",
@@ -63,9 +64,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.125-alpha.7",
+    "@budibase/auth": "^0.9.125-alpha.11",
-    "@budibase/client": "^0.9.125-alpha.7",
+    "@budibase/client": "^0.9.125-alpha.11",
-    "@budibase/string-templates": "^0.9.125-alpha.7",
+    "@budibase/string-templates": "^0.9.125-alpha.11",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",

packages/server/src/api/controllers/row/index.js

@@ -113,6 +113,7 @@ exports.destroy = async function (ctx) {
 exports.search = async ctx => {
   const tableId = getTableId(ctx)
   try {
+    ctx.status = 200
     ctx.body = await pickApi(tableId).search(ctx)
   } catch (err) {
     ctx.throw(400, err)

packages/server/src/automations/actions.js

@@ -13,6 +13,7 @@ const zapier = require("./steps/zapier")
 const integromat = require("./steps/integromat")
 let filter = require("./steps/filter")
 let delay = require("./steps/delay")
+let queryRow = require("./steps/queryRows")
 
 const ACTION_IMPLS = {
   SEND_EMAIL_SMTP: sendSmtpEmail.run,
@@ -26,6 +27,7 @@ const ACTION_IMPLS = {
   SERVER_LOG: serverLog.run,
   DELAY: delay.run,
   FILTER: filter.run,
+  QUERY_ROWS: queryRow.run,
   // these used to be lowercase step IDs, maintain for backwards compat
   discord: discord.run,
   slack: slack.run,
@@ -44,6 +46,7 @@ const ACTION_DEFINITIONS = {
   SERVER_LOG: serverLog.definition,
   DELAY: delay.definition,
   FILTER: filter.definition,
+  QUERY_ROWS: queryRow.definition,
   // these used to be lowercase step IDs, maintain for backwards compat
   discord: discord.definition,
   slack: slack.definition,

packages/server/src/automations/steps/bash.js

@@ -4,7 +4,7 @@ const { processStringSync } = require("@budibase/string-templates")
 exports.definition = {
   name: "Bash Scripting",
   tagline: "Execute a bash command",
-  icon: "ri-terminal-box-line",
+  icon: "JourneyEvent",
   description: "Run a bash script",
   type: "ACTION",
   internal: true,

packages/server/src/automations/steps/createRow.js

@@ -6,7 +6,7 @@ const usage = require("../../utilities/usageQuota")
 exports.definition = {
   name: "Create Row",
   tagline: "Create a {{inputs.enriched.table.name}} row",
-  icon: "ri-save-3-line",
+  icon: "TableRowAddBottom",
   description: "Add a row to your database",
   type: "ACTION",
   internal: true,

packages/server/src/automations/steps/delay.js

@@ -2,7 +2,7 @@ let { wait } = require("../../utilities")
 
 exports.definition = {
   name: "Delay",
-  icon: "ri-time-line",
+  icon: "Clock",
   tagline: "Delay for {{inputs.time}} milliseconds",
   description: "Delay the automation until an amount of time has passed",
   stepId: "DELAY",

packages/server/src/automations/steps/deleteRow.js

@@ -4,7 +4,7 @@ const usage = require("../../utilities/usageQuota")
 
 exports.definition = {
   description: "Delete a row from your database",
-  icon: "ri-delete-bin-line",
+  icon: "TableRowRemoveCenter",
   name: "Delete Row",
   tagline: "Delete a {{inputs.enriched.table.name}} row",
   type: "ACTION",

packages/server/src/automations/steps/executeQuery.js

@@ -4,7 +4,7 @@ const { buildCtx } = require("./utils")
 exports.definition = {
   name: "External Data Connector",
   tagline: "Execute Data Connector",
-  icon: "ri-database-2-line",
+  icon: "Data",
   description: "Execute a query in an external data connector",
   type: "ACTION",
   stepId: "EXECUTE_QUERY",

packages/server/src/automations/steps/executeScript.js

@@ -4,7 +4,7 @@ const { buildCtx } = require("./utils")
 exports.definition = {
   name: "JS Scripting",
   tagline: "Execute JavaScript Code",
-  icon: "ri-terminal-box-line",
+  icon: "Code",
   description: "Run a piece of JavaScript code in your automation",
   type: "ACTION",
   internal: true,

packages/server/src/automations/steps/filter.js

@@ -18,7 +18,7 @@ exports.PrettyFilterConditions = PrettyFilterConditions
 exports.definition = {
   name: "Filter",
   tagline: "{{inputs.field}} {{inputs.condition}} {{inputs.value}}",
-  icon: "ri-git-branch-line",
+  icon: "Branch2",
   description: "Filter any automations which do not meet certain conditions",
   type: "LOGIC",
   internal: true,

packages/server/src/automations/steps/outgoingWebhook.js

@@ -20,7 +20,7 @@ const BODY_REQUESTS = [RequestType.POST, RequestType.PUT, RequestType.PATCH]
 exports.definition = {
   name: "Outgoing webhook",
   tagline: "Send a {{inputs.requestMethod}} request",
-  icon: "ri-send-plane-line",
+  icon: "Send",
   description: "Send a request of specified method to a URL",
   type: "ACTION",
   internal: true,

packages/server/src/automations/steps/queryRows.js

@@ -0,0 +1,119 @@
+const rowController = require("../../api/controllers/row")
+const tableController = require("../../api/controllers/table")
+const { FieldTypes } = require("../../constants")
+
+const SortOrders = {
+  ASCENDING: "ascending",
+  DESCENDING: "descending",
+}
+
+const SortOrdersPretty = {
+  [SortOrders.ASCENDING]: "Ascending",
+  [SortOrders.DESCENDING]: "Descending",
+}
+
+exports.definition = {
+  description: "Query rows from the database",
+  icon: "Search",
+  name: "Query rows",
+  tagline: "Query rows from {{inputs.enriched.table.name}} table",
+  type: "ACTION",
+  stepId: "QUERY_ROWS",
+  internal: true,
+  inputs: {},
+  schema: {
+    inputs: {
+      properties: {
+        tableId: {
+          type: "string",
+          customType: "table",
+          title: "Table",
+        },
+        filters: {
+          type: "object",
+          customType: "filters",
+          title: "Filtering",
+        },
+        sortColumn: {
+          type: "string",
+          title: "Sort Column",
+          customType: "column",
+        },
+        sortOrder: {
+          type: "string",
+          title: "Sort Order",
+          enum: Object.values(SortOrders),
+          pretty: Object.values(SortOrdersPretty),
+        },
+        limit: {
+          type: "number",
+          title: "Limit",
+        },
+      },
+      required: ["tableId"],
+    },
+    outputs: {
+      properties: {
+        rows: {
+          type: "array",
+          customType: "rows",
+          description: "The rows that were found",
+        },
+        success: {
+          type: "boolean",
+          description: "Whether the deletion was successful",
+        },
+      },
+      required: ["rows", "success"],
+    },
+  },
+}
+
+async function getTable(appId, tableId) {
+  const ctx = {
+    params: {
+      id: tableId,
+    },
+    appId,
+  }
+  await tableController.find(ctx)
+  return ctx.body
+}
+
+exports.run = async function ({ inputs, appId }) {
+  const { tableId, filters, sortColumn, sortOrder, limit } = inputs
+  const table = await getTable(appId, tableId)
+  let sortType = FieldTypes.STRING
+  if (table && table.schema && sortColumn) {
+    const fieldType = table.schema[sortColumn].type
+    sortType =
+      fieldType === FieldTypes.NUMBER ? FieldTypes.NUMBER : FieldTypes.STRING
+  }
+  const ctx = {
+    params: {
+      tableId,
+    },
+    request: {
+      body: {
+        sortOrder,
+        sortType,
+        sort: sortColumn,
+        query: filters || {},
+        limit,
+      },
+    },
+    appId,
+  }
+  try {
+    await rowController.search(ctx)
+    return {
+      rows: ctx.body ? ctx.body.rows : [],
+      success: ctx.status === 200,
+    }
+  } catch (err) {
+    return {
+      success: false,
+      response: err,
+    }
+  }
+}

packages/server/src/automations/steps/sendSmtpEmail.js

@@ -3,7 +3,7 @@ const { sendSmtpEmail } = require("../../utilities/workerRequests")
 exports.definition = {
   description: "Send an email using SMTP",
   tagline: "Send SMTP email to {{inputs.to}}",
-  icon: "ri-mail-open-line",
+  icon: "Email",
   name: "Send Email (SMTP)",
   type: "ACTION",
   internal: true,

packages/server/src/automations/steps/serverLog.js

@@ -7,7 +7,7 @@
 exports.definition = {
   name: "Backend log",
   tagline: "Console log a value in the backend",
-  icon: "ri-server-line",
+  icon: "Monitoring",
   description: "Logs the given text to the server (using console.log)",
   type: "ACTION",
   internal: true,

packages/server/src/automations/steps/updateRow.js

@@ -4,7 +4,7 @@ const automationUtils = require("../automationUtils")
 exports.definition = {
   name: "Update Row",
   tagline: "Update a {{inputs.enriched.table.name}} row",
-  icon: "ri-refresh-line",
+  icon: "Refresh",
   description: "Update a row in your database",
   type: "ACTION",
   internal: true,

packages/server/src/automations/tests/queryRows.spec.js

@@ -0,0 +1,51 @@
+// lucene searching not supported in test due to use of PouchDB
+let rows = []
+jest.mock("../../api/controllers/row/internalSearch", () => ({
+  fullSearch: jest.fn(() => {
+    return {
+      rows,
+    }
+  }),
+  paginatedSearch: jest.fn(),
+}))
+const setup = require("./utilities")
+
+const NAME = "Test"
+
+describe("Test a query step automation", () => {
+  let table
+  let config = setup.getConfig()
+
+  beforeEach(async () => {
+    await config.init()
+    table = await config.createTable()
+    const row = {
+      name: NAME,
+      description: "original description",
+      tableId: table._id,
+    }
+    rows.push(await config.createRow(row))
+    rows.push(await config.createRow(row))
+  })
+
+  afterAll(setup.afterAll)
+
+  it("should be able to run the query step", async () => {
+    const inputs = {
+      tableId: table._id,
+      filters: {
+        equal: {
+          name: NAME,
+        },
+      },
+      sortColumn: "name",
+      sortOrder: "ascending",
+      limit: 10,
+    }
+    const res = await setup.runStep(setup.actions.QUERY_ROWS.stepId, inputs)
+    expect(res.success).toBe(true)
+    expect(res.rows).toBeDefined()
+    expect(res.rows.length).toBe(2)
+    expect(res.rows[0].name).toBe(NAME)
+  })
+})

packages/server/src/automations/triggerInfo/app.js

@@ -1,7 +1,7 @@
 exports.definition = {
   name: "App Action",
   event: "app:trigger",
-  icon: "ri-window-fill",
+  icon: "Apps",
   tagline: "Automation fired from the frontend",
   description: "Trigger an automation from an action inside your app",
   stepId: "APP",

packages/server/src/automations/triggerInfo/cron.js

@@ -1,7 +1,7 @@
 exports.definition = {
   name: "Cron Trigger",
   event: "cron:trigger",
-  icon: "ri-timer-line",
+  icon: "Clock",
   tagline: "Cron Trigger (<b>{{inputs.cron}}</b>)",
   description: "Triggers automation on a cron schedule.",
   stepId: "CRON",

packages/server/src/automations/triggerInfo/rowDeleted.js

@@ -1,7 +1,7 @@
 exports.definition = {
   name: "Row Deleted",
   event: "row:delete",
-  icon: "ri-delete-bin-line",
+  icon: "TableRowRemoveCenter",
   tagline: "Row is deleted from {{inputs.enriched.table.name}}",
   description: "Fired when a row is deleted from your database",
   stepId: "ROW_DELETED",

packages/server/src/automations/triggerInfo/rowSaved.js

@@ -1,7 +1,7 @@
 exports.definition = {
   name: "Row Created",
   event: "row:save",
-  icon: "ri-save-line",
+  icon: "TableRowAddBottom",
   tagline: "Row is added to {{inputs.enriched.table.name}}",
   description: "Fired when a row is added to your database",
   stepId: "ROW_SAVED",

packages/server/src/automations/triggerInfo/rowUpdated.js

@@ -1,7 +1,7 @@
 exports.definition = {
   name: "Row Updated",
   event: "row:update",
-  icon: "ri-refresh-line",
+  icon: "Refresh",
   tagline: "Row is updated in {{inputs.enriched.table.name}}",
   description: "Fired when a row is updated in your database",
   stepId: "ROW_UPDATED",

packages/server/src/automations/triggerInfo/webhook.js

@@ -1,7 +1,7 @@
 exports.definition = {
   name: "Webhook",
   event: "web:trigger",
-  icon: "ri-global-line",
+  icon: "Send",
   tagline: "Webhook endpoint is hit",
   description: "Trigger an automation when a HTTP POST webhook is hit",
   stepId: "WEBHOOK",

packages/server/yarn.lock

@@ -943,10 +943,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/auth@^0.9.125-alpha.7":
+"@budibase/auth@^0.9.125-alpha.11":
-  version "0.9.128"
+  version "0.9.130"
-  resolved "https://registry.yarnpkg.com/@budibase/auth/-/auth-0.9.128.tgz#6bb6c716b6647b7e9362e3faf12b191650ea0ad4"
+  resolved "https://registry.yarnpkg.com/@budibase/auth/-/auth-0.9.130.tgz#04ff77b862e87e22b08ee7bebd5409ff479a2b35"
-  integrity sha512-WCcrtAXilT/4++7PdzyTYgrdVqZcKhUev3NcGrFQf7WbDhkVCuigWbb8Q01KXODjbs0BZC0RshVv/PxrgLbBQA==
+  integrity sha512-wCgbnk8YvBtRQhmWd7w9UGNLL1ocJPHCq10652Dxm8nLnY0oAsgzVVoMsMULyTypfHiYtUEnOs7+JQ/nYa2zkA==
   dependencies:
     "@techpass/passport-openidconnect" "^0.3.0"
     aws-sdk "^2.901.0"
@@ -1015,10 +1015,10 @@
     svelte-flatpickr "^3.1.0"
     svelte-portal "^1.0.0"
 
-"@budibase/bbui@^0.9.128":
+"@budibase/bbui@^0.9.130":
-  version "0.9.128"
+  version "0.9.130"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.128.tgz#71a5e81b02a4f64baa6874bfa4b1d4fed8cc9f0b"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.130.tgz#cad02a7aa16324eb7a056c5dc0162444fa917964"
-  integrity sha512-UCo9SRs1xsMQ0ClJOtNB7JeVF2+0iMVOfAZE7Rrf5d51W+1YeyM9b3BbfhxHRq1yeKLHrbdczerbTHQkmF1RwQ==
+  integrity sha512-ULOC++363K8QEMasmsDmleF7AzjulFk/ZxGPlOJcVKJU8Bx5wG1uNFgTyJyGpmnbUWHd67eYUEettfH7I+VoOw==
   dependencies:
     "@adobe/spectrum-css-workflow-icons" "^1.2.1"
     "@spectrum-css/actionbutton" "^1.0.1"
@@ -1064,14 +1064,14 @@
     svelte-flatpickr "^3.1.0"
     svelte-portal "^1.0.0"
 
-"@budibase/client@^0.9.125-alpha.7":
+"@budibase/client@^0.9.125-alpha.11":
-  version "0.9.128"
+  version "0.9.130"
-  resolved "https://registry.yarnpkg.com/@budibase/client/-/client-0.9.128.tgz#894f1e9c73cb10b30565e8828244f7ff04a34fce"
+  resolved "https://registry.yarnpkg.com/@budibase/client/-/client-0.9.130.tgz#efff68349667ad315cda2973d530cfe8a30b10d3"
-  integrity sha512-/CiijM5O/6yc5gtSAFBMP7eJE686QNX1FsCphpA89DjWdNEG5e2e0ZN9Z7AOTD90BUn7JXEAdvmqwDMGF5m8gg==
+  integrity sha512-PJiOqEf7QF2/MS5CK9WkJl5JYSz/IBDQ1/H665V4Q1Kf5Y/hL+ymXaC5ztWPt6CZlo6dSoAZaD81h7zd6XeuYA==
   dependencies:
-    "@budibase/bbui" "^0.9.128"
+    "@budibase/bbui" "^0.9.130"
-    "@budibase/standard-components" "^0.9.128"
+    "@budibase/standard-components" "^0.9.130"
-    "@budibase/string-templates" "^0.9.128"
+    "@budibase/string-templates" "^0.9.130"
     regexparam "^1.3.0"
     shortid "^2.2.15"
     svelte-spa-router "^3.0.5"
@@ -1122,12 +1122,12 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/standard-components@^0.9.128":
+"@budibase/standard-components@^0.9.130":
-  version "0.9.128"
+  version "0.9.130"
-  resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.128.tgz#5d6e1dd751c6927dcf1ee515a6102bf73b315526"
+  resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.130.tgz#ed24eaafcca959e15c76b81e2340371d268ab131"
-  integrity sha512-fB6BOwk5uhPxW+U+TrIdD+zXU/l22S2YFcjXhaSpYVM+inzih9e+v2FVy2aW0Y85FdJ+MqT420o9EaolSF0p1w==
+  integrity sha512-hsLKnVciI+is6L42IDDcZ8sW/aLD0UyYLQd/hqMZT8WBf58908ujY3nwFZnxV30uwjSmiZeYCYmK3vbHDD0ljQ==
   dependencies:
-    "@budibase/bbui" "^0.9.128"
+    "@budibase/bbui" "^0.9.130"
     "@spectrum-css/button" "^3.0.3"
     "@spectrum-css/card" "^3.0.3"
     "@spectrum-css/divider" "^1.0.3"
@@ -1140,10 +1140,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/string-templates@^0.9.125-alpha.7", "@budibase/string-templates@^0.9.128":
+"@budibase/string-templates@^0.9.125-alpha.11", "@budibase/string-templates@^0.9.130":
-  version "0.9.128"
+  version "0.9.130"
-  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-0.9.128.tgz#50ee46dc0d726d481bd5139cd0b38364649a8463"
+  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-0.9.130.tgz#1be8affcba0dc8ff2b8044c65dd378dc76a165d0"
-  integrity sha512-4TzmnX2o5S2cts08ukB86El4wYm7cHuV2t6a7yDMGPe1mWeKP1WEtVF6rKhXEdbPTiotW8oYondOlgOP7DT9lA==
+  integrity sha512-DXO6Um18/k16i3hYilxvQ4RYNHhd29OJGbzjfQZ2v7z4Oin5y+WMZzpjX1hQS5g9f/CBbzu7qd7EHiz/n8gMqg==
   dependencies:
     "@budibase/handlebars-helpers" "^0.11.4"
     dayjs "^1.10.4"

packages/string-templates/manifest.json

@@ -1090,6 +1090,115 @@
       "description": "<p>Block helper that always renders the inverse block <strong>unless <code>a</code> is less than or equal to <code>b</code></strong>.</p>\n"
     }
   },
+  "object": {
+    "extend": {
+      "args": [
+        "objects"
+      ],
+      "numArgs": 1,
+      "description": "<p>Extend the context with the properties of other objects. A shallow merge is performed to avoid mutating the context.</p>\n"
+    },
+    "forIn": {
+      "args": [
+        "context",
+        "options"
+      ],
+      "numArgs": 2,
+      "description": "<p>Block helper that iterates over the properties of an object, exposing each key and value on the context.</p>\n"
+    },
+    "forOwn": {
+      "args": [
+        "obj",
+        "options"
+      ],
+      "numArgs": 2,
+      "description": "<p>Block helper that iterates over the <strong>own</strong> properties of an object, exposing each key and value on the context.</p>\n"
+    },
+    "toPath": {
+      "args": [
+        "prop"
+      ],
+      "numArgs": 1,
+      "description": "<p>Take arguments and, if they are string or number, convert them to a dot-delineated object property path.</p>\n"
+    },
+    "get": {
+      "args": [
+        "prop",
+        "context",
+        "options"
+      ],
+      "numArgs": 3,
+      "description": "<p>Use property paths (<code>a.b.c</code>) to get a value or nested value from the context. Works as a regular helper or block helper.</p>\n"
+    },
+    "getObject": {
+      "args": [
+        "prop",
+        "context"
+      ],
+      "numArgs": 2,
+      "description": "<p>Use property paths (<code>a.b.c</code>) to get an object from the context. Differs from the <code>get</code> helper in that this helper will return the actual object, including the given property key. Also, this helper does not work as a block helper.</p>\n"
+    },
+    "hasOwn": {
+      "args": [
+        "key",
+        "context"
+      ],
+      "numArgs": 2,
+      "description": "<p>Return true if <code>key</code> is an own, enumerable property of the given <code>context</code> object.</p>\n"
+    },
+    "isObject": {
+      "args": [
+        "value"
+      ],
+      "numArgs": 1,
+      "description": "<p>Return true if <code>value</code> is an object.</p>\n"
+    },
+    "JSONparse": {
+      "args": [
+        "string"
+      ],
+      "numArgs": 1,
+      "description": "<p>Parses the given string using <code>JSON.parse</code>.</p>\n"
+    },
+    "JSONstringify": {
+      "args": [
+        "obj"
+      ],
+      "numArgs": 1,
+      "description": "<p>Stringify an object using <code>JSON.stringify</code>.</p>\n"
+    },
+    "merge": {
+      "args": [
+        "object",
+        "objects"
+      ],
+      "numArgs": 2,
+      "description": "<p>Deeply merge the properties of the given <code>objects</code> with the context object.</p>\n"
+    },
+    "parseJSON": {
+      "args": [
+        "string"
+      ],
+      "numArgs": 1,
+      "description": "<p>Parses the given string using <code>JSON.parse</code>.</p>\n"
+    },
+    "pick": {
+      "args": [
+        "properties",
+        "context",
+        "options"
+      ],
+      "numArgs": 3,
+      "description": "<p>Pick properties from the context object.</p>\n"
+    },
+    "stringify": {
+      "args": [
+        "obj"
+      ],
+      "numArgs": 1,
+      "description": "<p>Stringify an object using <code>JSON.stringify</code>.</p>\n"
+    }
+  },
   "date": {
     "date": {
       "args": [

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.125-alpha.7",
+  "version": "0.9.125-alpha.11",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",

packages/string-templates/scripts/gen-collection-info.js

@@ -11,7 +11,15 @@ const marked = require("marked")
  */
 
 const DIRECTORY = fs.existsSync("node_modules") ? "." : ".."
-const COLLECTIONS = ["math", "array", "number", "url", "string", "comparison"]
+const COLLECTIONS = [
+  "math",
+  "array",
+  "number",
+  "url",
+  "string",
+  "comparison",
+  "object",
+]
 const FILENAME = `${DIRECTORY}/manifest.json`
 const outputJSON = {}
 const ADDED_HELPERS = {

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.125-alpha.7",
+  "version": "0.9.125-alpha.11",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -25,8 +25,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.125-alpha.7",
+    "@budibase/auth": "^0.9.125-alpha.11",
-    "@budibase/string-templates": "^0.9.125-alpha.7",
+    "@budibase/string-templates": "^0.9.125-alpha.11",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

packages/worker/src/api/controllers/global/users.js

@@ -197,10 +197,10 @@ exports.getSelf = async ctx => {
   // this will set the body
   await exports.find(ctx)
 
-  // append the account portal session information if present
+  // forward session information not found in db
-  if (ctx.user.account) {
   ctx.body.account = ctx.user.account
-  }
+  ctx.body.budibaseAccess = ctx.user.budibaseAccess
+  ctx.body.accountPortalAccess = ctx.user.accountPortalAccess
 }
 
 exports.updateSelf = async ctx => {

packages/worker/src/api/index.js

@@ -84,7 +84,10 @@ router
   .use(buildTenancyMiddleware(PUBLIC_ENDPOINTS, NO_TENANCY_ENDPOINTS))
   // for now no public access is allowed to worker (bar health check)
   .use((ctx, next) => {
-    if (!ctx.isAuthenticated && !ctx.publicEndpoint) {
+    if (ctx.publicEndpoint) {
+      return next()
+    }
+    if (!ctx.isAuthenticated || !ctx.user.budibaseAccess) {
       ctx.throw(403, "Unauthorized - no public worker access")
     }
     return next()