From 4bcc50ee85af6c394b31cab97643323a88e23821 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 7 Oct 2020 11:37:55 +0100
Subject: [PATCH 01/16] Change live animation color from purple to black

---
 .../AutomationPanel/AutomationList/AutomationList.svelte        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationList/AutomationList.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationList/AutomationList.svelte
index 15c42de1fa..7b5b117a91 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationList/AutomationList.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationList/AutomationList.svelte
@@ -51,7 +51,7 @@
     color: var(--grey-6);
   }
   i.live {
-    color: var(--purple);
+    color: var(--ink);
   }
 
   li {

From b9c9408c7ceb714be04cb451b63a3a5913670466 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 7 Oct 2020 11:38:05 +0100
Subject: [PATCH 02/16] Fix create automation modal

---
 .../AutomationList/CreateAutomationModal.svelte               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationList/CreateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationList/CreateAutomationModal.svelte
index 5429e62f13..b0c2f90121 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationList/CreateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationList/CreateAutomationModal.svelte
@@ -36,14 +36,14 @@
   onConfirm={createAutomation}
   disabled={!valid}>
   <Input bind:value={name} label="Name" />
-  <slot name="footer">
+  <div slot="footer">
     <a
       target="_blank"
       href="https://docs.budibase.com/automate/introduction-to-automate">
       <i class="ri-information-line" />
       <span>Learn about automations</span>
     </a>
-  </slot>
+  </div>
 </Modal>
 
 <style>

From a24ce269538802e3933eee6ad0a34569610641e5 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 7 Oct 2020 12:00:15 +0100
Subject: [PATCH 03/16] Remove padding on top nav bar so that things are
 properly centered

---
 packages/builder/src/components/common/Modal/Modal.svelte | 6 ++++--
 packages/builder/src/components/settings/Link.svelte      | 3 +--
 packages/builder/src/pages/[application]/_reset.svelte    | 6 ++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/builder/src/components/common/Modal/Modal.svelte b/packages/builder/src/components/common/Modal/Modal.svelte
index cb334cb78b..496f5dfdfa 100644
--- a/packages/builder/src/components/common/Modal/Modal.svelte
+++ b/packages/builder/src/components/common/Modal/Modal.svelte
@@ -25,8 +25,10 @@
   export let showConfirmButton = true
   export let onConfirm = () => {}
   export let visible = false
+  export let loading = false
 
-  let loading = false
+  let confirmLoading = false
+  $: disabled = loading || confirmLoading || $$restProps.disabled
 
   function show() {
     if (visible) {
@@ -89,7 +91,7 @@
                     <Button
                       primary
                       {...$$restProps}
-                      disabled={$$restProps.disabled || loading}
+                      {disabled}
                       on:click={confirm}>
                       {confirmText}
                     </Button>
diff --git a/packages/builder/src/components/settings/Link.svelte b/packages/builder/src/components/settings/Link.svelte
index 22d47676bc..2591ef2c6f 100644
--- a/packages/builder/src/components/settings/Link.svelte
+++ b/packages/builder/src/components/settings/Link.svelte
@@ -20,8 +20,7 @@
   .topnavitemright {
     cursor: pointer;
     color: var(--grey-7);
-    margin: 0px 20px 0px 0px;
-    padding-top: 4px;
+    margin: 0 20px 0 0;
     font-weight: 500;
     font-size: 1rem;
     height: 100%;
diff --git a/packages/builder/src/pages/[application]/_reset.svelte b/packages/builder/src/pages/[application]/_reset.svelte
index a9744b8b8c..e33a46ad2c 100644
--- a/packages/builder/src/pages/[application]/_reset.svelte
+++ b/packages/builder/src/pages/[application]/_reset.svelte
@@ -127,8 +127,7 @@
   .topnavitem {
     cursor: pointer;
     color: var(--grey-5);
-    margin: 0px 00px 0px 20px;
-    padding-top: 4px;
+    margin: 0 0 0 20px;
     font-weight: 500;
     font-size: var(--font-size-m);
     height: 100%;
@@ -149,8 +148,7 @@
   .topnavitemright {
     cursor: pointer;
     color: var(--grey-7);
-    margin: 0px 20px 0px 0px;
-    padding-top: 4px;
+    margin: 0 20px 0 0;
     font-weight: 500;
     font-size: 1rem;
     height: 100%;

From fff39f65e5e5491391ba4d841f52f63acd59bc25 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 7 Oct 2020 12:40:00 +0100
Subject: [PATCH 04/16] Change create table popover to modal to better support
 data import which can be long

---
 .../ModelNavigator/ModelNavigator.svelte      |  4 +-
 .../modals/CreateTableModal.svelte            | 56 +++++++++++++
 .../popovers/CreateTablePopover.svelte        | 84 -------------------
 3 files changed, 58 insertions(+), 86 deletions(-)
 create mode 100644 packages/builder/src/components/backend/ModelNavigator/modals/CreateTableModal.svelte
 delete mode 100644 packages/builder/src/components/backend/ModelNavigator/popovers/CreateTablePopover.svelte

diff --git a/packages/builder/src/components/backend/ModelNavigator/ModelNavigator.svelte b/packages/builder/src/components/backend/ModelNavigator/ModelNavigator.svelte
index 7cd3101d59..627acab415 100644
--- a/packages/builder/src/components/backend/ModelNavigator/ModelNavigator.svelte
+++ b/packages/builder/src/components/backend/ModelNavigator/ModelNavigator.svelte
@@ -2,7 +2,7 @@
   import { goto } from "@sveltech/routify"
   import { backendUiStore } from "builderStore"
   import ListItem from "./ListItem.svelte"
-  import CreateTablePopover from "./popovers/CreateTablePopover.svelte"
+  import CreateTableModal from "./modals/CreateTableModal.svelte"
   import EditTablePopover from "./popovers/EditTablePopover.svelte"
   import EditViewPopover from "./popovers/EditViewPopover.svelte"
   import { Heading } from "@budibase/bbui"
@@ -28,7 +28,7 @@
       <div class="components-list-container">
         <Heading small>Tables</Heading>
         <Spacer medium />
-        <CreateTablePopover />
+        <CreateTableModal />
         <div class="hierarchy-items-container">
           {#each $backendUiStore.models as model}
             <ListItem
diff --git a/packages/builder/src/components/backend/ModelNavigator/modals/CreateTableModal.svelte b/packages/builder/src/components/backend/ModelNavigator/modals/CreateTableModal.svelte
new file mode 100644
index 0000000000..1892783252
--- /dev/null
+++ b/packages/builder/src/components/backend/ModelNavigator/modals/CreateTableModal.svelte
@@ -0,0 +1,56 @@
+<script>
+  import { goto } from "@sveltech/routify"
+  import { backendUiStore } from "builderStore"
+  import { notifier } from "builderStore/store/notifications"
+  import { Button, Input, Label } from "@budibase/bbui"
+  import Spinner from "components/common/Spinner.svelte"
+  import TableDataImport from "../TableDataImport.svelte"
+  import analytics from "analytics"
+  import { Modal } from "components/common/Modal"
+
+  let visible = false
+  let name
+  let dataImport
+  let loading = false
+
+  function resetState() {
+    name = ""
+    dataImport = undefined
+    loading = false
+  }
+
+  async function saveTable() {
+    loading = true
+    const model = await backendUiStore.actions.models.save({
+      name,
+      schema: dataImport.schema || {},
+      dataImport,
+    })
+    notifier.success(`Table ${name} created successfully.`)
+    $goto(`./model/${model._id}`)
+    analytics.captureEvent("Table Created", { name })
+    visible = false
+    resetState()
+  }
+
+  function onClosed() {
+    visible = false
+    resetState()
+  }
+</script>
+
+<Button primary wide on:click={() => (visible = true)}>Create New Table</Button>
+<Modal
+  bind:visible
+  {loading}
+  title="Create Table"
+  on:hide={onClosed}
+  confirmText="Create"
+  onConfirm={saveTable}
+  disabled={!name || (dataImport && !dataImport.valid)}>
+  <Input data-cy="table-name-input" thin label="Table Name" bind:value={name} />
+  <div>
+    <Label grey extraSmall>Create Table from CSV (Optional)</Label>
+    <TableDataImport bind:dataImport />
+  </div>
+</Modal>
diff --git a/packages/builder/src/components/backend/ModelNavigator/popovers/CreateTablePopover.svelte b/packages/builder/src/components/backend/ModelNavigator/popovers/CreateTablePopover.svelte
deleted file mode 100644
index 1468d206eb..0000000000
--- a/packages/builder/src/components/backend/ModelNavigator/popovers/CreateTablePopover.svelte
+++ /dev/null
@@ -1,84 +0,0 @@
-<script>
-  import { goto } from "@sveltech/routify"
-  import { backendUiStore } from "builderStore"
-  import { notifier } from "builderStore/store/notifications"
-  import { Popover, Button, Icon, Input, Select, Label } from "@budibase/bbui"
-  import Spinner from "components/common/Spinner.svelte"
-  import TableDataImport from "../TableDataImport.svelte"
-  import analytics from "analytics"
-
-  let anchor
-  let dropdown
-  let name
-  let dataImport
-  let loading
-
-  async function saveTable() {
-    loading = true
-    const model = await backendUiStore.actions.models.save({
-      name,
-      schema: dataImport.schema || {},
-      dataImport,
-    })
-    notifier.success(`Table ${name} created successfully.`)
-    $goto(`./model/${model._id}`)
-    analytics.captureEvent("Table Created", { name })
-    name = ""
-    dropdown.hide()
-    loading = false
-  }
-
-  const onClosed = () => {
-    name = ""
-    dropdown.hide()
-  }
-</script>
-
-<div bind:this={anchor}>
-  <Button primary wide on:click={dropdown.show}>Create New Table</Button>
-</div>
-<Popover bind:this={dropdown} {anchor} align="left">
-  <div class="actions">
-    <h5>Create Table</h5>
-    <Input
-      data-cy="table-name-input"
-      thin
-      label="Table Name"
-      bind:value={name} />
-    <div>
-      <Label grey extraSmall>Create Table from CSV (Optional)</Label>
-      <TableDataImport bind:dataImport />
-    </div>
-    <footer>
-      <Button secondary on:click={onClosed}>Cancel</Button>
-      <Button
-        disabled={!name || (dataImport && !dataImport.valid)}
-        primary
-        on:click={saveTable}>
-        <span style={`margin-right: ${loading ? '10px' : 0};`}>Save</span>
-        {#if loading}
-          <Spinner size="10" />
-        {/if}
-      </Button>
-    </footer>
-  </div>
-</Popover>
-
-<style>
-  .actions {
-    display: grid;
-    grid-gap: var(--spacing-xl);
-    min-width: 400px;
-  }
-
-  h5 {
-    margin: 0;
-    font-weight: 500;
-  }
-
-  footer {
-    display: flex;
-    justify-content: flex-end;
-    gap: var(--spacing-m);
-  }
-</style>

From 1b1c0c4e8ff16de3ef1bf04d917c2fa01b3a9d1a Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 8 Oct 2020 09:34:22 +0100
Subject: [PATCH 05/16] Bump BBUI version

---
 packages/builder/package.json                 |   2 +-
 .../src/components/common/Modal/Modal.svelte  | 217 ------------------
 .../common/Modal/ModalContainer.svelte        |  10 -
 .../src/components/common/Modal/context.js    |   1 -
 .../src/components/common/Modal/index.js      |   3 -
 ...NewScreen.svelte => NewScreenModal.svelte} |  13 +-
 packages/builder/yarn.lock                    |  14 +-
 packages/standard-components/package.json     |   2 +-
 8 files changed, 15 insertions(+), 247 deletions(-)
 delete mode 100644 packages/builder/src/components/common/Modal/Modal.svelte
 delete mode 100644 packages/builder/src/components/common/Modal/ModalContainer.svelte
 delete mode 100644 packages/builder/src/components/common/Modal/context.js
 delete mode 100644 packages/builder/src/components/common/Modal/index.js
 rename packages/builder/src/components/userInterface/{NewScreen.svelte => NewScreenModal.svelte} (88%)

diff --git a/packages/builder/package.json b/packages/builder/package.json
index 74bff1b6a8..c2814824db 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -63,7 +63,7 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.40.1",
+    "@budibase/bbui": "^1.41.0",
     "@budibase/client": "^0.1.25",
     "@budibase/colorpicker": "^1.0.1",
     "@fortawesome/fontawesome-free": "^5.14.0",
diff --git a/packages/builder/src/components/common/Modal/Modal.svelte b/packages/builder/src/components/common/Modal/Modal.svelte
deleted file mode 100644
index 496f5dfdfa..0000000000
--- a/packages/builder/src/components/common/Modal/Modal.svelte
+++ /dev/null
@@ -1,217 +0,0 @@
-<script>
-  /**
-   * Confirmation is handled as a callback rather than an event to allow
-   * handling the result - meaning a parent can prevent the modal closing.
-   *
-   * A show/hide API is exposed as part of the modal and also via context for
-   * children inside the modal.
-   * "show" and "hide" events are emitted as visibility changes.
-   *
-   * Modals are rendered at the top of the DOM tree.
-   */
-  import { createEventDispatcher, setContext } from "svelte"
-  import { fade, fly } from "svelte/transition"
-  import Portal from "svelte-portal"
-  import { Button } from "@budibase/bbui"
-  import { ContextKey } from "./context"
-  const dispatch = createEventDispatcher()
-
-  export let wide = false
-  export let padded = true
-  export let title = undefined
-  export let cancelText = "Cancel"
-  export let confirmText = "Confirm"
-  export let showCancelButton = true
-  export let showConfirmButton = true
-  export let onConfirm = () => {}
-  export let visible = false
-  export let loading = false
-
-  let confirmLoading = false
-  $: disabled = loading || confirmLoading || $$restProps.disabled
-
-  function show() {
-    if (visible) {
-      return
-    }
-    visible = true
-    dispatch("show")
-  }
-
-  function hide() {
-    if (!visible) {
-      return
-    }
-    visible = false
-    dispatch("hide")
-  }
-
-  async function confirm() {
-    loading = true
-    if (!onConfirm || (await onConfirm()) !== false) {
-      hide()
-    }
-    loading = false
-  }
-
-  setContext(ContextKey, { show, hide })
-</script>
-
-{#if visible}
-  <Portal target="#modal-container">
-    <div
-      class="overlay"
-      on:click|self={hide}
-      transition:fade={{ duration: 200 }}>
-      <div
-        class="scroll-wrapper"
-        on:click|self={hide}
-        transition:fly={{ y: 50 }}>
-        <div class="content-wrapper" on:click|self={hide}>
-          <div class="modal" class:wide class:padded>
-            {#if title}
-              <header>
-                <h5>{title}</h5>
-                <div class="header-content">
-                  <slot name="header" />
-                </div>
-              </header>
-            {/if}
-            <slot />
-            {#if showCancelButton || showConfirmButton}
-              <footer>
-                <div class="footer-content">
-                  <slot name="footer" />
-                </div>
-                <div class="buttons">
-                  {#if showCancelButton}
-                    <Button secondary on:click={hide}>{cancelText}</Button>
-                  {/if}
-                  {#if showConfirmButton}
-                    <Button
-                      primary
-                      {...$$restProps}
-                      {disabled}
-                      on:click={confirm}>
-                      {confirmText}
-                    </Button>
-                  {/if}
-                </div>
-              </footer>
-            {/if}
-            <i class="ri-close-line" on:click={hide} />
-          </div>
-        </div>
-      </div>
-    </div>
-  </Portal>
-{/if}
-
-<style>
-  .overlay {
-    position: fixed;
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    overflow-x: hidden;
-    overflow-y: auto;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-    background-color: rgba(0, 0, 0, 0.25);
-  }
-
-  .scroll-wrapper {
-    flex: 1 1 auto;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: flex-start;
-    max-height: 100%;
-  }
-
-  .content-wrapper {
-    flex: 1 1 auto;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: flex-start;
-    width: 0;
-  }
-
-  .modal {
-    background-color: white;
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-start;
-    align-items: stretch;
-    box-shadow: 0 0 2.4rem 1.5rem rgba(0, 0, 0, 0.15);
-    position: relative;
-    flex: 0 0 400px;
-    margin: 2rem 0;
-    border-radius: var(--border-radius-m);
-    gap: var(--spacing-xl);
-  }
-  .modal.wide {
-    flex: 0 0 600px;
-  }
-  .modal.padded {
-    padding: var(--spacing-xl);
-  }
-
-  header {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-    margin-right: 40px;
-  }
-  header h5 {
-    margin: 0;
-    font-weight: 500;
-  }
-
-  .header-content {
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-end;
-    align-items: center;
-  }
-
-  i {
-    position: absolute;
-    top: var(--spacing-xl);
-    right: var(--spacing-xl);
-    color: var(--ink);
-    font-size: var(--font-size-xl);
-  }
-  i:hover {
-    color: var(--grey-6);
-    cursor: pointer;
-  }
-
-  footer {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-    gap: var(--spacing-m);
-  }
-
-  .footer-content {
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    align-items: center;
-  }
-
-  .buttons {
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-end;
-    align-items: center;
-    gap: var(--spacing-m);
-  }
-</style>
diff --git a/packages/builder/src/components/common/Modal/ModalContainer.svelte b/packages/builder/src/components/common/Modal/ModalContainer.svelte
deleted file mode 100644
index ed6d9e15ad..0000000000
--- a/packages/builder/src/components/common/Modal/ModalContainer.svelte
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="modal-container" />
-
-<style>
-  #modal-container {
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 999;
-  }
-</style>
diff --git a/packages/builder/src/components/common/Modal/context.js b/packages/builder/src/components/common/Modal/context.js
deleted file mode 100644
index 81ea1cdcf5..0000000000
--- a/packages/builder/src/components/common/Modal/context.js
+++ /dev/null
@@ -1 +0,0 @@
-export const ContextKey = "budibase-modal"
diff --git a/packages/builder/src/components/common/Modal/index.js b/packages/builder/src/components/common/Modal/index.js
deleted file mode 100644
index 9f2767d3f7..0000000000
--- a/packages/builder/src/components/common/Modal/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default as Modal } from "./Modal.svelte"
-export { default as ModalContainer } from "./ModalContainer.svelte"
-export { ContextKey } from "./context"
diff --git a/packages/builder/src/components/userInterface/NewScreen.svelte b/packages/builder/src/components/userInterface/NewScreenModal.svelte
similarity index 88%
rename from packages/builder/src/components/userInterface/NewScreen.svelte
rename to packages/builder/src/components/userInterface/NewScreenModal.svelte
index db23c9d043..109bb2965a 100644
--- a/packages/builder/src/components/userInterface/NewScreen.svelte
+++ b/packages/builder/src/components/userInterface/NewScreenModal.svelte
@@ -3,13 +3,10 @@
   import { pipe } from "components/common/core"
   import { isRootComponent } from "./pagesParsing/searchComponents"
   import { splitName } from "./pagesParsing/splitRootComponentName.js"
-  import { Input, Select, Button, Spacer } from "@budibase/bbui"
-  import { Modal } from "components/common/Modal"
+  import { Input, Select, Button, Spacer, ModalContent } from "@budibase/bbui"
   import { find, filter, some, map, includes } from "lodash/fp"
   import { assign } from "lodash"
 
-  export let visible
-
   let dialog
   let layoutComponents
   let layoutComponent
@@ -60,11 +57,7 @@
   }
 </script>
 
-<Modal
-  bind:visible
-  title="New Screen"
-  confirmText="Create Screen"
-  onConfirm={save}>
+<ModalContent title="New Screen" confirmText="Create Screen" onConfirm={save}>
   <Input label="Name" bind:value={name} />
   <Input
     label="Url"
@@ -76,4 +69,4 @@
       <option value={_component}>{name}</option>
     {/each}
   </Select>
-</Modal>
+</ModalContent>
diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock
index 3c4863feb2..94a7501bce 100644
--- a/packages/builder/yarn.lock
+++ b/packages/builder/yarn.lock
@@ -709,13 +709,14 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@budibase/bbui@^1.40.1":
-  version "1.40.1"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.40.1.tgz#7ebfd52b4da822312d3395447a4f73caa41f8014"
-  integrity sha512-0t5Makyn5jOURKZIQPvd+8G4m6ps4GyfLUkAz5rKJSnAQSAgLiuZ+RihcEReDEJK8tnfW7h2echJTffJduQRRQ==
+"@budibase/bbui@^1.41.0":
+  version "1.41.0"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.41.0.tgz#cb239db3071a4a6c6f0ef48ddde55f5eab9808ce"
+  integrity sha512-pT5u6HDdXcylWgSE1TBt3jETg92GwgAXpUsBVqX+OUE/2lNbmThb8egAckpemHDvm91FAL0nApQYpV7c/qLzvw==
   dependencies:
     sirv-cli "^0.4.6"
     svelte-flatpickr "^2.4.0"
+    svelte-portal "^1.0.0"
 
 "@budibase/colorpicker@^1.0.1":
   version "1.0.1"
@@ -5844,6 +5845,11 @@ svelte-portal@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-0.1.0.tgz#cc2821cc84b05ed5814e0218dcdfcbebc53c1742"
 
+svelte-portal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3"
+  integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q==
+
 svelte@^3.24.1:
   version "3.25.1"
   resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.25.1.tgz#218def1243fea5a97af6eb60f5e232315bb57ac4"
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 93f2451240..9f90c4d92f 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -36,7 +36,7 @@
   "gitHead": "284cceb9b703c38566c6e6363c022f79a08d5691",
   "dependencies": {
     "@beyonk/svelte-googlemaps": "^2.2.0",
-    "@budibase/bbui": "^1.40.1",
+    "@budibase/bbui": "^1.41.0",
     "@fortawesome/fontawesome-free": "^5.14.0",
     "britecharts": "^2.16.1",
     "d3-selection": "^1.4.2",

From 40d1d15b8e9ee1c47867f97241411f503a468b16 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 8 Oct 2020 09:34:45 +0100
Subject: [PATCH 06/16] Bump electron to v10

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index bcf79f73bf..7cb434c696 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -84,7 +84,7 @@
   },
   "devDependencies": {
     "@jest/test-sequencer": "^24.8.0",
-    "electron": "8.2.5",
+    "electron": "10.1.3",
     "electron-builder": "^22.7.0",
     "electron-builder-notarize": "^1.1.2",
     "eslint": "^6.8.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 40eb7edf4c..36afd9c146 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -172,10 +172,10 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@budibase/client@^0.1.24":
-  version "0.1.24"
-  resolved "https://registry.yarnpkg.com/@budibase/client/-/client-0.1.24.tgz#d2967c050af9f559791e0189137f80e621ea2d69"
-  integrity sha512-2Plu9PpF3TOPTDkAAIkPFEjZFolGkty0Sc0vbLk8lee4yqeonBj5paXT44O6kpxLFW47YjN5VCA4+EnwGl358w==
+"@budibase/client@^0.1.25":
+  version "0.1.25"
+  resolved "https://registry.yarnpkg.com/@budibase/client/-/client-0.1.25.tgz#f08c4a614f9018eb0f0faa6d20bb05f7a3215c70"
+  integrity sha512-vZ0cqJwLYcs7MHihFnJO3qOe7qxibnB4Va1+IYNfnPc9kcxy4KvfQxCx/G/DDxP9CXfEvsguy9ymzR3RUAvBHw==
   dependencies:
     deep-equal "^2.0.1"
     mustache "^4.0.1"
@@ -2042,9 +2042,10 @@ electron-updater@^4.3.1:
     lodash.isequal "^4.5.0"
     semver "^7.1.3"
 
-electron@8.2.5:
-  version "8.2.5"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-8.2.5.tgz#ae3cb23d5517b2189fd35298e487198d65d1a291"
+electron@10.1.3:
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-10.1.3.tgz#7e276e373bf30078bd4cb1184850a91268dc0e6c"
+  integrity sha512-CR8LrlG47MdAp317SQ3vGYa2o2cIMdMSMPYH46OVitFLk35dwE9fn3VqvhUIXhCHYcNWIAPzMhkVHpkoFdKWuw==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^12.0.12"

From d24679bc332d886ecf375f136983d7db21946d6b Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 8 Oct 2020 09:35:11 +0100
Subject: [PATCH 07/16] Move modal to BBUI and update usages

---
 packages/builder/src/App.svelte               |   2 -
 .../AutomationList/AutomationList.svelte      |  15 +--
 .../CreateAutomationModal.svelte              |  10 +-
 .../DataTable/buttons/CreateRowButton.svelte  |  13 +-
 .../modals/CreateEditRecordModal.svelte       |   9 +-
 .../DataTable/popovers/RowPopover.svelte      |  13 +-
 .../modals/CreateTableModal.svelte            |  46 +++----
 .../components/common/ConfirmDialog.svelte    |  26 ++--
 .../src/components/settings/Link.svelte       |  12 +-
 .../components/settings/SettingsModal.svelte  |  11 +-
 .../components/start/CreateAppModal.svelte    | 117 ++++++++----------
 .../EventsEditor/EventEditorModal.svelte      |  14 +--
 .../EventsEditor/EventPropertyControl.svelte  |  18 +--
 .../EventsEditor/EventsEditor.svelte          |   9 +-
 .../userInterface/FrontendNavigatePane.svelte |  51 ++------
 .../userInterface/NewScreenModal.svelte       |   8 +-
 .../userInterface/UserInterfaceRoot.svelte    |  26 ++--
 packages/builder/src/pages/index.svelte       |  21 ++--
 18 files changed, 156 insertions(+), 265 deletions(-)

diff --git a/packages/builder/src/App.svelte b/packages/builder/src/App.svelte
index 0badb1012b..a5016db114 100644
--- a/packages/builder/src/App.svelte
+++ b/packages/builder/src/App.svelte
@@ -4,7 +4,6 @@
   import { routes } from "../routify/routes"
   import { initialise } from "builderStore"
   import NotificationDisplay from "components/common/Notification/NotificationDisplay.svelte"
-  import { ModalContainer } from "components/common/Modal"
 
   onMount(async () => {
     await initialise()
@@ -15,4 +14,3 @@
 
 <NotificationDisplay />
 <Router {routes} />
-<ModalContainer />
diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationList/AutomationList.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationList/AutomationList.svelte
index 7b5b117a91..328c0d6122 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationList/AutomationList.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationList/AutomationList.svelte
@@ -2,10 +2,9 @@
   import { onMount } from "svelte"
   import { automationStore } from "builderStore"
   import CreateAutomationModal from "./CreateAutomationModal.svelte"
-  import { Button } from "@budibase/bbui"
-  import { Modal } from "components/common/Modal"
+  import { Button, Modal } from "@budibase/bbui"
 
-  let modalVisible = false
+  let modal
 
   $: selectedAutomationId = $automationStore.selectedAutomation?.automation?._id
 
@@ -15,9 +14,7 @@
 </script>
 
 <section>
-  <Button primary wide on:click={() => (modalVisible = true)}>
-    Create New Automation
-  </Button>
+  <Button primary wide on:click={modal.show}>Create New Automation</Button>
   <ul>
     {#each $automationStore.automations as automation}
       <li
@@ -30,9 +27,9 @@
     {/each}
   </ul>
 </section>
-{#if modalVisible}
-  <CreateAutomationModal bind:visible={modalVisible} />
-{/if}
+<Modal bind:this={modal}>
+  <CreateAutomationModal />
+</Modal>
 
 <style>
   section {
diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationList/CreateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationList/CreateAutomationModal.svelte
index b0c2f90121..5bd535087d 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationList/CreateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationList/CreateAutomationModal.svelte
@@ -1,11 +1,8 @@
 <script>
   import { store, backendUiStore, automationStore } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
-  import { Input } from "@budibase/bbui"
+  import { Input, ModalContent } from "@budibase/bbui"
   import analytics from "analytics"
-  import { Modal } from "components/common/Modal"
-
-  export let visible
 
   let name
 
@@ -29,8 +26,7 @@
   }
 </script>
 
-<Modal
-  bind:visible
+<ModalContent
   title="Create Automation"
   confirmText="Create"
   onConfirm={createAutomation}
@@ -44,7 +40,7 @@
       <span>Learn about automations</span>
     </a>
   </div>
-</Modal>
+</ModalContent>
 
 <style>
   a {
diff --git a/packages/builder/src/components/backend/DataTable/buttons/CreateRowButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/CreateRowButton.svelte
index 4bfb54a3d6..1ef0333398 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/CreateRowButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/CreateRowButton.svelte
@@ -1,17 +1,16 @@
 <script>
-  import { TextButton as Button, Icon } from "@budibase/bbui"
+  import { TextButton as Button, Icon, Modal } from "@budibase/bbui"
   import CreateEditRecordModal from "../modals/CreateEditRecordModal.svelte"
-  import { Modal } from "components/common/Modal"
 
-  let modalVisible
+  let modal
 </script>
 
 <div>
-  <Button text small on:click={() => (modalVisible = true)}>
+  <Button text small on:click={modal.show}>
     <Icon name="addrow" />
     Create New Row
   </Button>
 </div>
-{#if modalVisible}
-  <CreateEditRecordModal bind:visible={modalVisible} />
-{/if}
+<Modal bind:this={modal}>
+  <CreateEditRecordModal />
+</Modal>
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditRecordModal.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditRecordModal.svelte
index 547d68d50a..2e8771ac6e 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditRecordModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditRecordModal.svelte
@@ -3,13 +3,11 @@
   import { notifier } from "builderStore/store/notifications"
   import RecordFieldControl from "../RecordFieldControl.svelte"
   import * as api from "../api"
-  import { Modal } from "components/common/Modal"
+  import { ModalContent } from "@budibase/bbui"
   import ErrorsBox from "components/common/ErrorsBox.svelte"
 
   export let record = {}
-  export let visible
 
-  let modal
   let errors = []
 
   $: creating = record?._id == null
@@ -35,8 +33,7 @@
   }
 </script>
 
-<Modal
-  bind:visible
+<ModalContent
   title={creating ? 'Create Row' : 'Edit Row'}
   confirmText={creating ? 'Create Row' : 'Save Row'}
   onConfirm={saveRecord}>
@@ -46,4 +43,4 @@
       <RecordFieldControl {meta} bind:value={record[key]} />
     </div>
   {/each}
-</Modal>
+</ModalContent>
diff --git a/packages/builder/src/components/backend/DataTable/popovers/RowPopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/RowPopover.svelte
index 67b02bfa9f..040fc34fab 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/RowPopover.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/RowPopover.svelte
@@ -1,22 +1,21 @@
 <script>
   import { backendUiStore } from "builderStore"
-  import { DropdownMenu, Icon } from "@budibase/bbui"
+  import { DropdownMenu, Icon, Modal } from "@budibase/bbui"
   import CreateEditRecordModal from "../modals/CreateEditRecordModal.svelte"
   import * as api from "../api"
   import { notifier } from "builderStore/store/notifications"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import { Modal } from "components/common/Modal"
 
   export let row
 
   let anchor
   let dropdown
   let confirmDeleteDialog
-  let editModalVisible
+  let modal
 
   function showModal() {
     dropdown.hide()
-    editModalVisible = true
+    modal.show()
   }
 
   function showDelete() {
@@ -52,9 +51,9 @@
   okText="Delete Row"
   onOk={deleteRow}
   title="Confirm Delete" />
-{#if editModalVisible}
-  <CreateEditRecordModal bind:visible={editModalVisible} record={row} />
-{/if}
+<Modal bind:this={modal}>
+  <CreateEditRecordModal record={row} />
+</Modal>
 
 <style>
   .ri-more-line:hover {
diff --git a/packages/builder/src/components/backend/ModelNavigator/modals/CreateTableModal.svelte b/packages/builder/src/components/backend/ModelNavigator/modals/CreateTableModal.svelte
index 1892783252..1cc0e8894c 100644
--- a/packages/builder/src/components/backend/ModelNavigator/modals/CreateTableModal.svelte
+++ b/packages/builder/src/components/backend/ModelNavigator/modals/CreateTableModal.svelte
@@ -2,25 +2,21 @@
   import { goto } from "@sveltech/routify"
   import { backendUiStore } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
-  import { Button, Input, Label } from "@budibase/bbui"
+  import { Button, Input, Label, ModalContent, Modal } from "@budibase/bbui"
   import Spinner from "components/common/Spinner.svelte"
   import TableDataImport from "../TableDataImport.svelte"
   import analytics from "analytics"
-  import { Modal } from "components/common/Modal"
 
-  let visible = false
+  let modal
   let name
   let dataImport
-  let loading = false
 
   function resetState() {
     name = ""
     dataImport = undefined
-    loading = false
   }
 
   async function saveTable() {
-    loading = true
     const model = await backendUiStore.actions.models.save({
       name,
       schema: dataImport.schema || {},
@@ -29,28 +25,24 @@
     notifier.success(`Table ${name} created successfully.`)
     $goto(`./model/${model._id}`)
     analytics.captureEvent("Table Created", { name })
-    visible = false
-    resetState()
-  }
-
-  function onClosed() {
-    visible = false
-    resetState()
   }
 </script>
 
-<Button primary wide on:click={() => (visible = true)}>Create New Table</Button>
-<Modal
-  bind:visible
-  {loading}
-  title="Create Table"
-  on:hide={onClosed}
-  confirmText="Create"
-  onConfirm={saveTable}
-  disabled={!name || (dataImport && !dataImport.valid)}>
-  <Input data-cy="table-name-input" thin label="Table Name" bind:value={name} />
-  <div>
-    <Label grey extraSmall>Create Table from CSV (Optional)</Label>
-    <TableDataImport bind:dataImport />
-  </div>
+<Button primary wide on:click={modal.show}>Create New Table</Button>
+<Modal bind:this={modal} on:hide={resetState}>
+  <ModalContent
+    title="Create Table"
+    confirmText="Create"
+    onConfirm={saveTable}
+    disabled={!name || (dataImport && !dataImport.valid)}>
+    <Input
+      data-cy="table-name-input"
+      thin
+      label="Table Name"
+      bind:value={name} />
+    <div>
+      <Label grey extraSmall>Create Table from CSV (Optional)</Label>
+      <TableDataImport bind:dataImport />
+    </div>
+  </ModalContent>
 </Modal>
diff --git a/packages/builder/src/components/common/ConfirmDialog.svelte b/packages/builder/src/components/common/ConfirmDialog.svelte
index 1c702ab532..2cd27573f4 100644
--- a/packages/builder/src/components/common/ConfirmDialog.svelte
+++ b/packages/builder/src/components/common/ConfirmDialog.svelte
@@ -1,33 +1,27 @@
 <script>
-  import { Modal } from "components/common/Modal"
+  import { Modal, ModalContent } from "@budibase/bbui"
 
   export let title = ""
   export let body = ""
   export let okText = "Confirm"
   export let cancelText = "Cancel"
-  export let onOk = () => {}
-  export let onCancel = () => {}
+  export let onOk = undefined
+  export let onCancel = undefined
 
-  let visible = false
+  let modal
 
   export const show = () => {
-    visible = true
+    modal.show()
   }
   export const hide = () => {
-    visible = false
+    modal.hide()
   }
 </script>
 
-<Modal
-  id={title}
-  bind:visible
-  on:hide={onCancel}
-  {title}
-  confirmText={okText}
-  {cancelText}
-  onConfirm={onOk}
-  red>
-  <div class="body">{body}</div>
+<Modal bind:this={modal} on:hide={onCancel}>
+  <ModalContent onConfirm={onOk} {title} confirmText={okText} {cancelText} red>
+    <div class="body">{body}</div>
+  </ModalContent>
 </Modal>
 
 <style>
diff --git a/packages/builder/src/components/settings/Link.svelte b/packages/builder/src/components/settings/Link.svelte
index 2591ef2c6f..3bb6d6e40d 100644
--- a/packages/builder/src/components/settings/Link.svelte
+++ b/packages/builder/src/components/settings/Link.svelte
@@ -1,17 +1,17 @@
 <script>
   import SettingsModal from "./SettingsModal.svelte"
   import { SettingsIcon } from "components/common/Icons/"
-  import { Modal } from "components/common/Modal"
+  import { Modal } from "@budibase/bbui"
 
-  let modalVisible
+  let modal
 </script>
 
-<span class="topnavitemright settings" on:click={() => (modalVisible = true)}>
+<span class="topnavitemright settings" on:click={modal.show}>
   <SettingsIcon />
 </span>
-{#if modalVisible}
-  <SettingsModal bind:visible={modalVisible} />
-{/if}
+<Modal bind:this={modal} width="600px">
+  <SettingsModal />
+</Modal>
 
 <style>
   span:first-letter {
diff --git a/packages/builder/src/components/settings/SettingsModal.svelte b/packages/builder/src/components/settings/SettingsModal.svelte
index b03b6ad63b..44ab581521 100644
--- a/packages/builder/src/components/settings/SettingsModal.svelte
+++ b/packages/builder/src/components/settings/SettingsModal.svelte
@@ -1,7 +1,6 @@
 <script>
   import { General, Users, DangerZone, APIKeys } from "./tabs"
-  import { Switcher } from "@budibase/bbui"
-  import { Modal } from "components/common/Modal"
+  import { Switcher, ModalContent } from "@budibase/bbui"
 
   const tabs = [
     {
@@ -26,17 +25,13 @@
     },
   ]
 
-  export let visible
-
   let value = "GENERAL"
 
   $: selectedTab = tabs.find(tab => tab.key === value).component
 </script>
 
-<Modal
+<ModalContent
   title="Settings"
-  wide
-  bind:visible
   showConfirmButton={false}
   showCancelButton={false}>
   <div class="container">
@@ -44,7 +39,7 @@
       <svelte:component this={selectedTab} />
     </Switcher>
   </div>
-</Modal>
+</ModalContent>
 
 <style>
   .container :global(section > header) {
diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index 587c408ecb..e171dc836e 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -1,6 +1,5 @@
 <script>
   import { writable } from "svelte/store"
-  import { Modal } from "components/common/Modal"
   import { store, automationStore, backendUiStore } from "builderStore"
   import { string, object } from "yup"
   import api, { get } from "builderStore/api"
@@ -18,7 +17,6 @@
   //Move this to context="module" once svelte-forms is updated so that it can bind to stores correctly
   const createAppStore = writable({ currentStep: 0, values: {} })
 
-  export let visible
   export let hasKey
   export let template
 
@@ -201,68 +199,61 @@
   }
 </script>
 
-<Modal
-  bind:visible
-  wide
-  padded={false}
-  showCancelButton={false}
-  showConfirmButton={false}>
-  <div class="container">
-    <div class="sidebar">
-      {#each steps as { active, done }, i}
-        <Indicator
-          active={$createAppStore.currentStep === i}
-          done={i < $createAppStore.currentStep}
-          step={i + 1} />
-      {/each}
-    </div>
-    <div class="body">
-      <div class="heading">
-        <h3 class="header">Get Started with Budibase</h3>
-      </div>
-      <div class="step">
-        <Form bind:values={$createAppStore.values}>
-          {#each steps as step, i (i)}
-            <div class:hidden={$createAppStore.currentStep !== i}>
-              <svelte:component
-                this={step.component}
-                {template}
-                {validationErrors}
-                options={step.options}
-                name={step.name} />
-            </div>
-          {/each}
-        </Form>
-      </div>
-      <div class="footer">
-        {#if $createAppStore.currentStep > 0}
-          <Button medium secondary on:click={back}>Back</Button>
-        {/if}
-        {#if $createAppStore.currentStep < steps.length - 1}
-          <Button medium blue on:click={next} disabled={!currentStepIsValid}>
-            Next
-          </Button>
-        {/if}
-        {#if $createAppStore.currentStep === steps.length - 1}
-          <Button
-            medium
-            blue
-            on:click={signUp}
-            disabled={!fullFormIsValid || submitting}>
-            {submitting ? 'Loading...' : 'Submit'}
-          </Button>
-        {/if}
-      </div>
-    </div>
-    <img src="/_builder/assets/bb-logo.svg" alt="budibase icon" />
-    {#if submitting}
-      <div in:fade class="spinner-container">
-        <Spinner />
-        <span class="spinner-text">Creating your app...</span>
-      </div>
-    {/if}
+<div class="container">
+  <div class="sidebar">
+    {#each steps as { active, done }, i}
+      <Indicator
+        active={$createAppStore.currentStep === i}
+        done={i < $createAppStore.currentStep}
+        step={i + 1} />
+    {/each}
   </div>
-</Modal>
+  <div class="body">
+    <div class="heading">
+      <h3 class="header">Get Started with Budibase</h3>
+    </div>
+    <div class="step">
+      <Form bind:values={$createAppStore.values}>
+        {#each steps as step, i (i)}
+          <div class:hidden={$createAppStore.currentStep !== i}>
+            <svelte:component
+              this={step.component}
+              {template}
+              {validationErrors}
+              options={step.options}
+              name={step.name} />
+          </div>
+        {/each}
+      </Form>
+    </div>
+    <div class="footer">
+      {#if $createAppStore.currentStep > 0}
+        <Button medium secondary on:click={back}>Back</Button>
+      {/if}
+      {#if $createAppStore.currentStep < steps.length - 1}
+        <Button medium blue on:click={next} disabled={!currentStepIsValid}>
+          Next
+        </Button>
+      {/if}
+      {#if $createAppStore.currentStep === steps.length - 1}
+        <Button
+          medium
+          blue
+          on:click={signUp}
+          disabled={!fullFormIsValid || submitting}>
+          {submitting ? 'Loading...' : 'Submit'}
+        </Button>
+      {/if}
+    </div>
+  </div>
+  <img src="/_builder/assets/bb-logo.svg" alt="budibase icon" />
+  {#if submitting}
+    <div in:fade class="spinner-container">
+      <Spinner />
+      <span class="spinner-text">Creating your app...</span>
+    </div>
+  {/if}
+</div>
 
 <style>
   .container {
diff --git a/packages/builder/src/components/userInterface/EventsEditor/EventEditorModal.svelte b/packages/builder/src/components/userInterface/EventsEditor/EventEditorModal.svelte
index 3d0732e174..020cf51fa5 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/EventEditorModal.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/EventEditorModal.svelte
@@ -3,21 +3,18 @@
   import {
     TextButton,
     Button,
-    Heading,
     Body,
-    Spacer,
     DropdownMenu,
+    ModalContent,
   } from "@budibase/bbui"
   import { AddIcon, ArrowDownIcon } from "components/common/Icons/"
   import { EVENT_TYPE_MEMBER_NAME } from "../../common/eventHandlers"
   import actionTypes from "./actions"
   import { createEventDispatcher } from "svelte"
-  import { Modal } from "components/common/Modal"
 
   const dispatch = createEventDispatcher()
 
   export let event
-  export let visible
 
   let addActionButton
   let addActionDropdown
@@ -60,12 +57,7 @@
   }
 </script>
 
-<Modal
-  bind:visible
-  title="Actions"
-  wide
-  confirmText="Save"
-  onConfirm={saveEventData}>
+<ModalContent title="Actions" confirmText="Save" onConfirm={saveEventData}>
   <div slot="header">
     <div bind:this={addActionButton}>
       <TextButton text small blue on:click={addActionDropdown.show}>
@@ -121,7 +113,7 @@
   <div slot="footer">
     <a href="https://docs.budibase.com">Learn more about Actions</a>
   </div>
-</Modal>
+</ModalContent>
 
 <style>
   .action-header {
diff --git a/packages/builder/src/components/userInterface/EventsEditor/EventPropertyControl.svelte b/packages/builder/src/components/userInterface/EventsEditor/EventPropertyControl.svelte
index dac0ab9b7b..6b0beb71b8 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/EventPropertyControl.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/EventPropertyControl.svelte
@@ -1,23 +1,17 @@
 <script>
   import { Button, Modal } from "@budibase/bbui"
   import EventEditorModal from "./EventEditorModal.svelte"
-  import { createEventDispatcher, onMount } from "svelte"
+  import { createEventDispatcher } from "svelte"
   const dispatch = createEventDispatcher()
 
   export let value
   export let name
 
-  let modalVisible = false
+  let modal
 </script>
 
-<Button secondary small on:click={() => (modalVisible = true)}>
-  Define Actions
-</Button>
+<Button secondary small on:click={modal.show}>Define Actions</Button>
 
-{#if modalVisible}
-  <EventEditorModal
-    bind:visible={modalVisible}
-    event={value}
-    eventType={name}
-    on:change />
-{/if}
+<Modal bind:this={modal}>
+  <EventEditorModal event={value} eventType={name} on:change />
+</Modal>
diff --git a/packages/builder/src/components/userInterface/EventsEditor/EventsEditor.svelte b/packages/builder/src/components/userInterface/EventsEditor/EventsEditor.svelte
index 05ecd526b2..14e6656381 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/EventsEditor.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/EventsEditor.svelte
@@ -1,7 +1,7 @@
 <script>
   import { keys, map, includes, filter } from "lodash/fp"
   import EventEditorModal from "./EventEditorModal.svelte"
-  import { Modal } from "components/common/Modal"
+  import { Modal } from "@budibase/bbui"
 
   export const EVENT_TYPE = "event"
   export let component
@@ -47,11 +47,8 @@
   </form>
 </div>
 
-<Modal bind:this={modal}>
-  <EventEditorModal
-    eventOptions={events}
-    event={selectedEvent}
-    on:hide={() => (selectedEvent = null)} />
+<Modal bind:this={modal} width="600px">
+  <EventEditorModal eventOptions={events} event={selectedEvent} />
 </Modal>
 
 <style>
diff --git a/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte b/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte
index 724f351112..64c3ee45f4 100644
--- a/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte
+++ b/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte
@@ -1,21 +1,18 @@
 <script>
-  import { store, backendUiStore } from "builderStore"
+  import { store } from "builderStore"
   import ComponentsHierarchy from "components/userInterface/ComponentsHierarchy.svelte"
   import PageLayout from "components/userInterface/PageLayout.svelte"
   import PagesList from "components/userInterface/PagesList.svelte"
-  import NewScreen from "components/userInterface/NewScreen.svelte"
-  import { Button } from "@budibase/bbui"
-  import { Spacer } from "@budibase/bbui"
+  import NewScreenModal from "components/userInterface/NewScreenModal.svelte"
+  import { Button, Spacer, Modal } from "@budibase/bbui"
 
-  let modalVisible = false
+  let modal
 </script>
 
 <PagesList />
 
 <Spacer medium />
-<Button primary wide on:click={() => (modalVisible = true)}>
-  Create New Screen
-</Button>
+<Button primary wide on:click={modal.show}>Create New Screen</Button>
 <Spacer medium />
 <PageLayout layout={$store.pages[$store.currentPageName]} />
 
@@ -23,38 +20,6 @@
   <ComponentsHierarchy screens={$store.screens} />
 </div>
 
-{#if modalVisible}
-  <NewScreen bind:visible={modalVisible} />
-{/if}
-
-<style>
-  .newscreen {
-    cursor: pointer;
-    border: 1px solid var(--purple);
-    border-radius: 5px;
-    width: 100%;
-    height: 36px;
-    padding: 8px 16px;
-    margin: 20px 0px 12px 0px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    background: var(--purple);
-    color: var(--white);
-    font-size: 14px;
-    font-weight: 500;
-    transition: all 3ms;
-    outline: none;
-  }
-
-  .newscreen:hover {
-    background: var(--purple-light);
-    color: var(--purple);
-  }
-
-  .icon {
-    color: var(--ink);
-    font-size: 16px;
-    margin-right: 4px;
-  }
-</style>
+<Modal bind:this={modal}>
+  <NewScreenModal />
+</Modal>
diff --git a/packages/builder/src/components/userInterface/NewScreenModal.svelte b/packages/builder/src/components/userInterface/NewScreenModal.svelte
index 109bb2965a..d38d4bbb7b 100644
--- a/packages/builder/src/components/userInterface/NewScreenModal.svelte
+++ b/packages/builder/src/components/userInterface/NewScreenModal.svelte
@@ -1,11 +1,7 @@
 <script>
   import { store } from "builderStore"
-  import { pipe } from "components/common/core"
-  import { isRootComponent } from "./pagesParsing/searchComponents"
-  import { splitName } from "./pagesParsing/splitRootComponentName.js"
-  import { Input, Select, Button, Spacer, ModalContent } from "@budibase/bbui"
-  import { find, filter, some, map, includes } from "lodash/fp"
-  import { assign } from "lodash"
+  import { Input, Select, ModalContent } from "@budibase/bbui"
+  import { find, filter, some } from "lodash/fp"
 
   let dialog
   let layoutComponents
diff --git a/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte b/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte
index f668660543..0bf8095e41 100644
--- a/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte
+++ b/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte
@@ -4,19 +4,20 @@
   import PageLayout from "./PageLayout.svelte"
   import PagesList from "./PagesList.svelte"
   import { store } from "builderStore"
-  import NewScreen from "./NewScreen.svelte"
-  import CurrentItemPreview from "./CurrentItemPreview.svelte"
+  import NewScreenModal from "./NewScreenModal.svelte"
+  import CurrentItemPreview from "./AppPreview/CurrentItemPreview.svelte"
   import SettingsView from "./SettingsView.svelte"
   import ComponentsPaneSwitcher from "./ComponentsPaneSwitcher.svelte"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import { last } from "lodash/fp"
   import { AddIcon } from "components/common/Icons"
+  import { Modal } from "@budibase/bbui"
 
   let newScreenPicker
   let confirmDeleteDialog
   let componentToDelete = ""
   let settingsView
-  let modalVisible = false
+  let modal
 
   const settings = () => {
     settingsView.show()
@@ -26,30 +27,24 @@
 </script>
 
 <div class="root">
-
   <div class="ui-nav">
-
     <div class="pages-list-container">
       <div class="nav-header">
         <span class="navigator-title">Navigator</span>
-
         <span class="components-nav-page">Pages</span>
       </div>
-
       <div class="nav-items-container">
         <PagesList />
       </div>
     </div>
-
     <PageLayout layout={$store.pages[$store.currentPageName]} />
-
     <div class="components-list-container">
       <div class="nav-group-header">
         <span class="components-nav-header" style="margin-top: 0;">
           Screens
         </span>
         <div>
-          <button on:click={() => (modalVisible = true)}>
+          <button on:click={modal.show}>
             <AddIcon />
           </button>
         </div>
@@ -58,24 +53,21 @@
         <ComponentsHierarchy screens={$store.screens} />
       </div>
     </div>
-
   </div>
-
   <div class="preview-pane">
     <CurrentItemPreview />
   </div>
-
   {#if $store.currentFrontEndType === 'screen' || $store.currentFrontEndType === 'page'}
     <div class="components-pane">
       <ComponentsPaneSwitcher />
     </div>
   {/if}
-
 </div>
 
-{#if modalVisible}
-  <NewScreen bind:visible={modalVisible} />
-{/if}
+<Modal bind:this={modal}>
+  <NewScreenModal />
+</Modal>
+
 <SettingsView bind:this={settingsView} />
 
 <style>
diff --git a/packages/builder/src/pages/index.svelte b/packages/builder/src/pages/index.svelte
index 166e5855d7..a5a799f825 100644
--- a/packages/builder/src/pages/index.svelte
+++ b/packages/builder/src/pages/index.svelte
@@ -7,15 +7,14 @@
   import { get } from "builderStore/api"
   import Spinner from "components/common/Spinner.svelte"
   import CreateAppModal from "components/start/CreateAppModal.svelte"
-  import { Button, Heading } from "@budibase/bbui"
+  import { Button, Heading, Modal } from "@budibase/bbui"
   import TemplateList from "components/start/TemplateList.svelte"
   import analytics from "analytics"
-  import { Modal } from "components/common/Modal"
 
   let promise = getApps()
   let hasKey
   let template
-  let modalVisible = false
+  let modal
 
   async function getApps() {
     const res = await get("/api/applications")
@@ -42,13 +41,13 @@
     }
 
     if (!keys.budibase) {
-      modalVisible = true
+      modal.show()
     }
   }
 
   function selectTemplate(newTemplate) {
     template = newTemplate
-    modalVisible = true
+    modal.show()
   }
 
   checkIfKeysAndApps()
@@ -57,9 +56,7 @@
 <div class="container">
   <div class="header">
     <Heading medium black>Welcome to the Budibase Beta</Heading>
-    <Button primary purple on:click={() => (modalVisible = true)}>
-      Create New Web App
-    </Button>
+    <Button primary purple on:click={modal.show}>Create New Web App</Button>
   </div>
 
   <div class="banner">
@@ -72,12 +69,12 @@
   <TemplateList onSelect={selectTemplate} />
 
   <AppList />
-
-  {#if modalVisible}
-    <CreateAppModal bind:visible={modalVisible} {hasKey} {template} />
-  {/if}
 </div>
 
+<Modal bind:this={modal} padding={false} width="600px">
+  <CreateAppModal {hasKey} {template} />
+</Modal>
+
 <style>
   .container {
     display: grid;

From ee6c210e672cfe67a1e5ff6d22cb0473e28f23ee Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 8 Oct 2020 09:48:03 +0100
Subject: [PATCH 08/16] Fix frontend crashing when adding components to a data
 provider component with no source

---
 packages/builder/src/builderStore/fetchBindableProperties.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/builder/src/builderStore/fetchBindableProperties.js b/packages/builder/src/builderStore/fetchBindableProperties.js
index c71c498a32..92359ae630 100644
--- a/packages/builder/src/builderStore/fetchBindableProperties.js
+++ b/packages/builder/src/builderStore/fetchBindableProperties.js
@@ -78,6 +78,11 @@ const contextToBindables = (models, walkResult) => context => {
     typeof context.model === "string" ? context.model : context.model.modelId
   const model = models.find(model => model._id === modelId)
 
+  // Avoid crashing whenever no data source has been selected
+  if (model == null) {
+    return []
+  }
+
   const newBindable = key => ({
     type: "context",
     instance: context.instance,

From ff4f7b31e384d055bb53e7b543cf05029c754a45 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 8 Oct 2020 09:48:24 +0100
Subject: [PATCH 09/16] Fix styles in event editor modal

---
 .../EventsEditor/EventEditorModal.svelte              | 11 ++---------
 .../EventsEditor/EventPropertyControl.svelte          |  2 +-
 .../EventsEditor/actions/CreateRecord.svelte          |  2 +-
 .../EventsEditor/actions/NavigateTo.svelte            |  2 +-
 .../EventsEditor/actions/UpdateRecord.svelte          |  2 +-
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/packages/builder/src/components/userInterface/EventsEditor/EventEditorModal.svelte b/packages/builder/src/components/userInterface/EventsEditor/EventEditorModal.svelte
index 020cf51fa5..0e45f2fcac 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/EventEditorModal.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/EventEditorModal.svelte
@@ -86,9 +86,7 @@
       {#each actions as action, index}
         <div class="action-container">
           <div class="action-header" on:click={selectAction(action)}>
-            <Body extraSmall lh>
-              {index + 1}. {action[EVENT_TYPE_MEMBER_NAME]}
-            </Body>
+            <Body small lh>{index + 1}. {action[EVENT_TYPE_MEMBER_NAME]}</Body>
             <div class="row-expander" class:rotate={action !== selectedAction}>
               <ArrowDownIcon />
             </div>
@@ -143,8 +141,7 @@
 
   .actions-container {
     flex: 1;
-    min-height: 0px;
-    padding-bottom: var(--spacing-s);
+    min-height: 0;
     padding-top: 0;
     border: var(--border-light);
     border-width: 0 0 1px 0;
@@ -154,10 +151,6 @@
   .action-container {
     border: var(--border-light);
     border-width: 1px 0 0 0;
-    padding-left: var(--spacing-xl);
-    padding-right: var(--spacing-xl);
-    padding-top: 0;
-    padding-bottom: 0;
   }
 
   .selected-action-container {
diff --git a/packages/builder/src/components/userInterface/EventsEditor/EventPropertyControl.svelte b/packages/builder/src/components/userInterface/EventsEditor/EventPropertyControl.svelte
index 6b0beb71b8..044d0ca5d5 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/EventPropertyControl.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/EventPropertyControl.svelte
@@ -12,6 +12,6 @@
 
 <Button secondary small on:click={modal.show}>Define Actions</Button>
 
-<Modal bind:this={modal}>
+<Modal bind:this={modal} width="600px">
   <EventEditorModal event={value} eventType={name} on:change />
 </Modal>
diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/CreateRecord.svelte b/packages/builder/src/components/userInterface/EventsEditor/actions/CreateRecord.svelte
index b84dcd58a4..b3a6079284 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/CreateRecord.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/CreateRecord.svelte
@@ -60,7 +60,7 @@
     align-items: baseline;
   }
 
-  .root :global(.relative:nth-child(2)) {
+  .root :global(> div:nth-child(2)) {
     grid-column-start: 2;
     grid-column-end: 6;
   }
diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/NavigateTo.svelte b/packages/builder/src/components/userInterface/EventsEditor/actions/NavigateTo.svelte
index 659fb954eb..0b4ab2860e 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/NavigateTo.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/NavigateTo.svelte
@@ -22,7 +22,7 @@
     align-items: baseline;
   }
 
-  .root :global(.relative) {
+  .root :global(> div) {
     flex: 1;
     margin-left: var(--spacing-l);
   }
diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/UpdateRecord.svelte b/packages/builder/src/components/userInterface/EventsEditor/actions/UpdateRecord.svelte
index 6ee3a2aed4..229fec90c5 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/UpdateRecord.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/UpdateRecord.svelte
@@ -119,7 +119,7 @@
     align-items: baseline;
   }
 
-  .root :global(.relative:nth-child(2)) {
+  .root :global(> div:nth-child(2)) {
     grid-column-start: 2;
     grid-column-end: 6;
   }

From 1c559978e9e3cca4fac6964ff2584d215e1deb51 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 8 Oct 2020 10:32:17 +0100
Subject: [PATCH 10/16] Fix relationship view when viewing fields with spaces
 in their name

---
 .../[selectedRecord]/[selectedField]/index.svelte           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/pages/[application]/backend/model/[selectedModel]/relationship/[selectedRecord]/[selectedField]/index.svelte b/packages/builder/src/pages/[application]/backend/model/[selectedModel]/relationship/[selectedRecord]/[selectedField]/index.svelte
index a1828ddd8c..c9a1475716 100644
--- a/packages/builder/src/pages/[application]/backend/model/[selectedModel]/relationship/[selectedRecord]/[selectedField]/index.svelte
+++ b/packages/builder/src/pages/[application]/backend/model/[selectedModel]/relationship/[selectedRecord]/[selectedField]/index.svelte
@@ -3,5 +3,7 @@
   import RelationshipDataTable from "components/backend/DataTable/RelationshipDataTable.svelte"
 </script>
 
-<RelationshipDataTable modelId={$params.selectedModel} recordId={$params.selectedRecord}
-                       fieldName={$params.selectedField}/>
+<RelationshipDataTable
+  modelId={$params.selectedModel}
+  recordId={$params.selectedRecord}
+  fieldName={decodeURI($params.selectedField)} />

From 7a08c5584d479f437a52dd39581058ef68b3fc9c Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 8 Oct 2020 10:40:46 +0100
Subject: [PATCH 11/16] Remove console log statement

---
 .../builder/src/components/userInterface/PropertyGroup.svelte   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/builder/src/components/userInterface/PropertyGroup.svelte b/packages/builder/src/components/userInterface/PropertyGroup.svelte
index 86e5ab90b5..0da68c51d0 100644
--- a/packages/builder/src/components/userInterface/PropertyGroup.svelte
+++ b/packages/builder/src/components/userInterface/PropertyGroup.svelte
@@ -10,8 +10,6 @@
   export let onStyleChanged = () => {}
   export let open = false
 
-  $: console.log(properties)
-
   $: style = componentInstance["_styles"][styleCategory] || {}
 </script>
 

From fa1836ad23ac937880e628ddf9e262f848d77892 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 8 Oct 2020 10:41:20 +0100
Subject: [PATCH 12/16] Improve relationship datatable title when no primary
 display is selected for a model

---
 .../backend/DataTable/RelationshipDataTable.svelte     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte b/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte
index 7a1ebbed78..6712b8cf68 100644
--- a/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte
@@ -9,6 +9,7 @@
   export let fieldName
 
   let record
+  let title
 
   $: data = record?.[fieldName] ?? []
   $: linkedModelId = data?.length ? data[0].modelId : null
@@ -17,8 +18,15 @@
   )
   $: schema = linkedModel?.schema
   $: model = $backendUiStore.models.find(model => model._id === modelId)
-  $: title = `${record?.[model?.primaryDisplay]} - ${fieldName}`
   $: fetchData(modelId, recordId)
+  $: {
+    let recordLabel = record?.[model?.primaryDisplay]
+    if (recordLabel) {
+      title = `${recordLabel} - ${fieldName}`
+    } else {
+      title = fieldName
+    }
+  }
 
   async function fetchData(modelId, recordId) {
     const QUERY_VIEW_URL = `/api/${modelId}/${recordId}/enrich`

From 917bf47925a5cc1cae00a89f124f300c91b0d5b7 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 8 Oct 2020 10:42:14 +0100
Subject: [PATCH 13/16] Fix crashing on creating a record with fields of type
 link or options due to coercing values

---
 packages/server/src/api/controllers/record.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/server/src/api/controllers/record.js b/packages/server/src/api/controllers/record.js
index 56a272492e..9fa4d818e7 100644
--- a/packages/server/src/api/controllers/record.js
+++ b/packages/server/src/api/controllers/record.js
@@ -306,6 +306,16 @@ function coerceRecordValues(rec, model) {
 }
 
 const TYPE_TRANSFORM_MAP = {
+  link: {
+    "": [],
+    [null]: [],
+    [undefined]: undefined,
+  },
+  options: {
+    "": "",
+    [null]: "",
+    [undefined]: undefined,
+  },
   string: {
     "": "",
     [null]: "",

From 9a8c659b797c4b4b982073376dbda7da2a662fb3 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 8 Oct 2020 10:42:53 +0100
Subject: [PATCH 14/16] Unify DataForm and DataFormWide by using single
 component with BBUI styles

---
 .../standard-components/src/DataForm.svelte   | 183 +------------
 .../src/DataFormWide.svelte                   | 246 +-----------------
 packages/standard-components/src/Form.svelte  | 197 ++++++++++++++
 3 files changed, 201 insertions(+), 425 deletions(-)
 create mode 100644 packages/standard-components/src/Form.svelte

diff --git a/packages/standard-components/src/DataForm.svelte b/packages/standard-components/src/DataForm.svelte
index 8165fc6bdd..3cb7b7204c 100644
--- a/packages/standard-components/src/DataForm.svelte
+++ b/packages/standard-components/src/DataForm.svelte
@@ -1,189 +1,10 @@
 <script>
-  import { onMount } from "svelte"
-  import { fade } from "svelte/transition"
-  import {
-    Label,
-    DatePicker,
-    Input,
-    Select,
-    Button,
-    Toggle,
-  } from "@budibase/bbui"
-  import Dropzone from "./attachments/Dropzone.svelte"
-  import LinkedRecordSelector from "./LinkedRecordSelector.svelte"
-  import debounce from "lodash.debounce"
-  import ErrorsBox from "./ErrorsBox.svelte"
-  import { capitalise } from "./helpers"
+  import Form from "./Form.svelte"
 
   export let _bb
   export let model
   export let title
   export let buttonText
-
-  const TYPE_MAP = {
-    string: "text",
-    boolean: "checkbox",
-    number: "number",
-  }
-
-  const DEFAULTS_FOR_TYPE = {
-    string: "",
-    boolean: false,
-    number: null,
-    link: [],
-  }
-
-  let record
-  let store = _bb.store
-  let schema = {}
-  let modelDef = {}
-  let saved = false
-  let recordId
-  let isNew = true
-  let errors = {}
-
-  $: fields = schema ? Object.keys(schema) : []
-  $: if (model && model.length !== 0) {
-    fetchModel()
-  }
-
-  async function fetchModel() {
-    const FETCH_MODEL_URL = `/api/models/${model}`
-    const response = await _bb.api.get(FETCH_MODEL_URL)
-    modelDef = await response.json()
-    schema = modelDef.schema
-    record = {
-      modelId: model,
-    }
-  }
-
-  const save = debounce(async () => {
-    for (let field of fields) {
-      // Assign defaults to empty fields to prevent validation issues
-      if (!(field in record)) {
-        record[field] = DEFAULTS_FOR_TYPE[schema[field].type]
-      }
-    }
-
-    const SAVE_RECORD_URL = `/api/${model}/records`
-    const response = await _bb.api.post(SAVE_RECORD_URL, record)
-
-    const json = await response.json()
-
-    if (response.status === 200) {
-      store.update(state => {
-        state[model] = state[model] ? [...state[model], json] : [json]
-        return state
-      })
-
-      errors = {}
-
-      // wipe form, if new record, otherwise update
-      // model to get new _rev
-      record = isNew ? { modelId: model } : json
-
-      // set saved, and unset after 1 second
-      // i.e. make the success notifier appear, then disappear again after time
-      saved = true
-      setTimeout(() => {
-        saved = false
-      }, 3000)
-    }
-
-    if (response.status === 400) {
-      errors = Object.keys(json.errors)
-        .map(k => ({ dataPath: k, message: json.errors[k] }))
-        .flat()
-    }
-  })
-
-  onMount(async () => {
-    const routeParams = _bb.routeParams()
-    recordId =
-      Object.keys(routeParams).length > 0 && (routeParams.id || routeParams[0])
-    isNew = !recordId || recordId === "new"
-
-    if (isNew) {
-      record = { modelId: model }
-      return
-    }
-
-    const GET_RECORD_URL = `/api/${model}/records/${recordId}`
-    const response = await _bb.api.get(GET_RECORD_URL)
-    record = await response.json()
-  })
 </script>
 
-<form class="form" on:submit|preventDefault>
-  {#if title}
-    <h1>{title}</h1>
-  {/if}
-  <div class="form-content">
-    <ErrorsBox {errors} />
-    {#each fields as field}
-      {#if schema[field].type === 'options'}
-        <Select
-          secondary
-          label={capitalise(schema[field].name)}
-          bind:value={record[field]}>
-          <option value="">Choose an option</option>
-          {#each schema[field].constraints.inclusion as opt}
-            <option>{opt}</option>
-          {/each}
-        </Select>
-      {:else if schema[field].type === 'datetime'}
-        <DatePicker
-          label={capitalise(schema[field].name)}
-          bind:value={record[field]} />
-      {:else if schema[field].type === 'boolean'}
-        <Toggle
-          text={capitalise(schema[field].name)}
-          bind:checked={record[field]} />
-      {:else if schema[field].type === 'number'}
-        <Input
-          label={capitalise(schema[field].name)}
-          type="number"
-          bind:value={record[field]} />
-      {:else if schema[field].type === 'string'}
-        <Input
-          label={capitalise(schema[field].name)}
-          bind:value={record[field]} />
-      {:else if schema[field].type === 'attachment'}
-        <div>
-          <Label extraSmall grey>{schema[field].name}</Label>
-          <Dropzone bind:files={record[field]} />
-        </div>
-      {:else if schema[field].type === 'link'}
-        <LinkedRecordSelector
-          secondary
-          bind:linkedRecords={record[field]}
-          schema={schema[field]} />
-      {/if}
-    {/each}
-    <div class="buttons">
-      <Button primary on:click={save} green={saved}>
-        {#if saved}Success{:else}{buttonText || 'Submit Form'}{/if}
-      </Button>
-    </div>
-  </div>
-</form>
-
-<style>
-  .form {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-
-  .form-content {
-    margin-bottom: var(--spacing-xl);
-    display: grid;
-    gap: var(--spacing-xl);
-    width: 100%;
-  }
-
-  .buttons {
-    display: flex;
-    justify-content: flex-end;
-  }
-</style>
+<Form {_bb} {model} {title} {buttonText} wide={false} />
diff --git a/packages/standard-components/src/DataFormWide.svelte b/packages/standard-components/src/DataFormWide.svelte
index 41aa5443a2..68dfd7b7cf 100644
--- a/packages/standard-components/src/DataFormWide.svelte
+++ b/packages/standard-components/src/DataFormWide.svelte
@@ -1,252 +1,10 @@
 <script>
-  import { onMount } from "svelte"
-  import { fade } from "svelte/transition"
-  import { Label, DatePicker } from "@budibase/bbui"
-  import debounce from "lodash.debounce"
+  import Form from "./Form.svelte"
 
   export let _bb
   export let model
   export let title
   export let buttonText
-
-  const TYPE_MAP = {
-    string: "text",
-    boolean: "checkbox",
-    number: "number",
-  }
-
-  const DEFAULTS_FOR_TYPE = {
-    string: "",
-    boolean: false,
-    number: null,
-    link: [],
-  }
-
-  let record
-  let store = _bb.store
-  let schema = {}
-  let modelDef = {}
-  let saved = false
-  let recordId
-  let isNew = true
-  let errors = {}
-
-  $: if (model && model.length !== 0) {
-    fetchModel()
-  }
-
-  $: fields = schema ? Object.keys(schema) : []
-
-  $: errorMessages = Object.entries(errors).map(
-    ([field, message]) => `${field} ${message}`
-  )
-
-  async function fetchModel() {
-    const FETCH_MODEL_URL = `/api/models/${model}`
-    const response = await _bb.api.get(FETCH_MODEL_URL)
-    modelDef = await response.json()
-    schema = modelDef.schema
-    record = {
-      modelId: model,
-    }
-  }
-
-  const save = debounce(async () => {
-    for (let field of fields) {
-      // Assign defaults to empty fields to prevent validation issues
-      if (!(field in record))
-        record[field] = DEFAULTS_FOR_TYPE[schema[field].type]
-    }
-
-    const SAVE_RECORD_URL = `/api/${model}/records`
-    const response = await _bb.api.post(SAVE_RECORD_URL, record)
-
-    const json = await response.json()
-
-    if (response.status === 200) {
-      store.update(state => {
-        state[model] = state[model] ? [...state[model], json] : [json]
-        return state
-      })
-
-      errors = {}
-
-      // wipe form, if new record, otherwise update
-      // model to get new _rev
-      record = isNew ? { modelId: model } : json
-
-      // set saved, and unset after 1 second
-      // i.e. make the success notifier appear, then disappear again after time
-      saved = true
-      setTimeout(() => {
-        saved = false
-      }, 1000)
-    }
-
-    if (response.status === 400) {
-      errors = json.errors
-    }
-  })
-
-  onMount(async () => {
-    const routeParams = _bb.routeParams()
-    recordId =
-      Object.keys(routeParams).length > 0 && (routeParams.id || routeParams[0])
-    isNew = !recordId || recordId === "new"
-
-    if (isNew) {
-      record = { modelId: model }
-      return
-    }
-
-    const GET_RECORD_URL = `/api/${model}/records/${recordId}`
-    const response = await _bb.api.get(GET_RECORD_URL)
-    const json = await response.json()
-    record = json
-  })
 </script>
 
-<form class="form" on:submit|preventDefault>
-  {#if title}
-    <h1>{title}</h1>
-  {/if}
-  {#each errorMessages as error}
-    <p class="error">{error}</p>
-  {/each}
-  <hr />
-  <div class="form-content">
-    {#each fields as field}
-      <div class="form-item">
-        <Label small forAttr={'form-stacked-text'}>{field}</Label>
-        {#if schema[field].type === 'string' && schema[field].constraints.inclusion}
-          <select bind:value={record[field]}>
-            {#each schema[field].constraints.inclusion as opt}
-              <option>{opt}</option>
-            {/each}
-          </select>
-        {:else if schema[field].type === 'datetime'}
-          <DatePicker bind:value={record[field]} />
-        {:else if schema[field].type === 'boolean'}
-          <input class="input" type="checkbox" bind:checked={record[field]} />
-        {:else if schema[field].type === 'number'}
-          <input class="input" type="number" bind:value={record[field]} />
-        {:else if schema[field].type === 'string'}
-          <input class="input" type="text" bind:value={record[field]} />
-        {/if}
-      </div>
-      <hr />
-    {/each}
-    <div class="button-block">
-      <button on:click={save} class:saved>
-        {#if saved}
-          <div in:fade>
-            <span class:saved>Success</span>
-          </div>
-        {:else}
-          <div>{buttonText || 'Submit Form'}</div>
-        {/if}
-      </button>
-    </div>
-  </div>
-</form>
-
-<style>
-  .form {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    margin: auto;
-    padding: 40px;
-  }
-  .form-content {
-    margin-bottom: 20px;
-  }
-  .input {
-    border-radius: 5px;
-    border: 1px solid #e6e6e6;
-    padding: 1em;
-    font-size: 16px;
-  }
-
-  .form-item {
-    display: grid;
-    grid-template-columns: 30% 1fr;
-    margin-bottom: 16px;
-    align-items: center;
-    gap: 1em;
-  }
-
-  hr {
-    border: 1px solid #f5f5f5;
-    margin: 40px 0px;
-  }
-  hr:nth-last-child(2) {
-    border: 1px solid #f5f5f5;
-    margin: 40px 0px;
-  }
-  .button-block {
-    display: flex;
-    justify-content: flex-end;
-  }
-  button {
-    font-size: 16px;
-    padding: 8px 16px;
-    box-sizing: border-box;
-    border-radius: 4px;
-    color: white;
-    background-color: black;
-    outline: none;
-    height: 40px;
-    cursor: pointer;
-    transition: all 0.2s ease 0s;
-    overflow: hidden;
-    outline: none;
-    user-select: none;
-    white-space: nowrap;
-    text-align: center;
-  }
-
-  button.saved {
-    background-color: #84c991;
-    border: none;
-  }
-
-  button:hover {
-    box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1),
-      0 4px 6px -2px rgba(0, 0, 0, 0.05);
-  }
-
-  input[type="checkbox"] {
-    transform: scale(2);
-    cursor: pointer;
-  }
-
-  select::-ms-expand {
-    display: none;
-  }
-  select {
-    cursor: pointer;
-    display: inline-block;
-    align-items: baseline;
-    box-sizing: border-box;
-    padding: 1em 1em;
-    border: 1px solid #eaeaea;
-    border-radius: 5px;
-    font: inherit;
-    line-height: inherit;
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    -ms-appearance: none;
-    appearance: none;
-    background-repeat: no-repeat;
-    background-image: linear-gradient(45deg, transparent 50%, currentColor 50%),
-      linear-gradient(135deg, currentColor 50%, transparent 50%);
-    background-position: right 17px top 1.5em, right 10px top 1.5em;
-    background-size: 7px 7px, 7px 7px;
-  }
-
-  .error {
-    color: red;
-    font-weight: 500;
-  }
-</style>
+<Form {_bb} {model} {title} {buttonText} wide={true} />
diff --git a/packages/standard-components/src/Form.svelte b/packages/standard-components/src/Form.svelte
new file mode 100644
index 0000000000..937a58f271
--- /dev/null
+++ b/packages/standard-components/src/Form.svelte
@@ -0,0 +1,197 @@
+<script>
+  import { onMount } from "svelte"
+  import { fade } from "svelte/transition"
+  import {
+    Label,
+    DatePicker,
+    Input,
+    Select,
+    Button,
+    Toggle,
+  } from "@budibase/bbui"
+  import Dropzone from "./attachments/Dropzone.svelte"
+  import LinkedRecordSelector from "./LinkedRecordSelector.svelte"
+  import debounce from "lodash.debounce"
+  import ErrorsBox from "./ErrorsBox.svelte"
+  import { capitalise } from "./helpers"
+
+  export let _bb
+  export let model
+  export let title
+  export let buttonText
+  export let wide = false
+
+  const TYPE_MAP = {
+    string: "text",
+    boolean: "checkbox",
+    number: "number",
+  }
+
+  const DEFAULTS_FOR_TYPE = {
+    string: "",
+    boolean: false,
+    number: null,
+    link: [],
+  }
+
+  let record
+  let store = _bb.store
+  let schema = {}
+  let modelDef = {}
+  let saved = false
+  let recordId
+  let isNew = true
+  let errors = {}
+
+  $: fields = schema ? Object.keys(schema) : []
+  $: if (model && model.length !== 0) {
+    fetchModel()
+  }
+
+  async function fetchModel() {
+    const FETCH_MODEL_URL = `/api/models/${model}`
+    const response = await _bb.api.get(FETCH_MODEL_URL)
+    modelDef = await response.json()
+    schema = modelDef.schema
+    record = {
+      modelId: model,
+    }
+  }
+
+  const save = debounce(async () => {
+    for (let field of fields) {
+      // Assign defaults to empty fields to prevent validation issues
+      if (!(field in record)) {
+        record[field] = DEFAULTS_FOR_TYPE[schema[field].type]
+      }
+    }
+
+    const SAVE_RECORD_URL = `/api/${model}/records`
+    const response = await _bb.api.post(SAVE_RECORD_URL, record)
+
+    const json = await response.json()
+
+    if (response.status === 200) {
+      store.update(state => {
+        state[model] = state[model] ? [...state[model], json] : [json]
+        return state
+      })
+
+      errors = {}
+
+      // wipe form, if new record, otherwise update
+      // model to get new _rev
+      record = isNew ? { modelId: model } : json
+
+      // set saved, and unset after 1 second
+      // i.e. make the success notifier appear, then disappear again after time
+      saved = true
+      setTimeout(() => {
+        saved = false
+      }, 3000)
+    }
+
+    if (response.status === 400) {
+      errors = Object.keys(json.errors)
+        .map(k => ({ dataPath: k, message: json.errors[k] }))
+        .flat()
+    }
+  })
+
+  onMount(async () => {
+    const routeParams = _bb.routeParams()
+    recordId =
+      Object.keys(routeParams).length > 0 && (routeParams.id || routeParams[0])
+    isNew = !recordId || recordId === "new"
+
+    if (isNew) {
+      record = { modelId: model }
+      return
+    }
+
+    const GET_RECORD_URL = `/api/${model}/records/${recordId}`
+    const response = await _bb.api.get(GET_RECORD_URL)
+    record = await response.json()
+  })
+</script>
+
+<form class="form" on:submit|preventDefault>
+  {#if title}
+    <h1>{title}</h1>
+  {/if}
+  <div class="form-content">
+    <ErrorsBox {errors} />
+    {#each fields as field}
+      <div class="form-field" class:wide>
+        {#if !(schema[field].type === 'boolean' && !wide)}
+          <Label extraSmall={!wide} grey={!wide}>
+            {capitalise(schema[field].name)}
+          </Label>
+        {/if}
+        {#if schema[field].type === 'options'}
+          <Select secondary bind:value={record[field]}>
+            <option value="">Choose an option</option>
+            {#each schema[field].constraints.inclusion as opt}
+              <option>{opt}</option>
+            {/each}
+          </Select>
+        {:else if schema[field].type === 'datetime'}
+          <DatePicker bind:value={record[field]} />
+        {:else if schema[field].type === 'boolean'}
+          <Toggle
+            text={wide ? null : capitalise(schema[field].name)}
+            bind:checked={record[field]} />
+        {:else if schema[field].type === 'number'}
+          <Input type="number" bind:value={record[field]} />
+        {:else if schema[field].type === 'string'}
+          <Input bind:value={record[field]} />
+        {:else if schema[field].type === 'attachment'}
+          <Dropzone bind:files={record[field]} />
+        {:else if schema[field].type === 'link'}
+          <LinkedRecordSelector
+            secondary
+            showLabel={false}
+            bind:linkedRecords={record[field]}
+            schema={schema[field]} />
+        {/if}
+      </div>
+    {/each}
+    <div class="buttons">
+      <Button primary on:click={save} green={saved}>
+        {#if saved}Success{:else}{buttonText || 'Submit Form'}{/if}
+      </Button>
+    </div>
+  </div>
+</form>
+
+<style>
+  .form {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+
+  .form-content {
+    margin-bottom: var(--spacing-xl);
+    display: grid;
+    gap: var(--spacing-xl);
+    width: 100%;
+  }
+
+  .form-field {
+    display: grid;
+  }
+  .form-field.wide {
+    align-items: center;
+    grid-template-columns: 30% 1fr;
+    gap: var(--spacing-xl);
+  }
+  .form-field.wide :global(label) {
+    margin-bottom: 0;
+  }
+
+  .buttons {
+    display: flex;
+    justify-content: flex-end;
+  }
+</style>

From fbb7bf7413ba399d066e556f4622572aef2f22f2 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 8 Oct 2020 11:36:16 +0100
Subject: [PATCH 15/16] Fixing cypress tests

---
 packages/builder/cypress/support/commands.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index 05b30da98f..79fd83875d 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -66,12 +66,14 @@ Cypress.Commands.add("createTestTableWithData", () => {
 Cypress.Commands.add("createTable", tableName => {
   // Enter model name
   cy.contains("Create New Table").click()
-  cy.get(".menu-container")
-    .get("input")
-    .first()
-    .type(tableName)
-
-  cy.contains("Save").click()
+  cy.get(".modal").within(() => {
+    cy.get("input")
+      .first()
+      .type(tableName)
+    cy.get(".buttons")
+      .contains("Create")
+      .click()
+  })
   cy.contains(tableName).should("be.visible")
 })
 

From 735de553d2330d48b58045a820af9b61fbe3d832 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 8 Oct 2020 12:21:05 +0100
Subject: [PATCH 16/16] Update linked record selector to handle errors and
 remove loading state flashing

---
 .../common/LinkedRecordSelector.svelte        | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/packages/builder/src/components/common/LinkedRecordSelector.svelte b/packages/builder/src/components/common/LinkedRecordSelector.svelte
index 8b20a8e3ac..e7cf245eb8 100644
--- a/packages/builder/src/components/common/LinkedRecordSelector.svelte
+++ b/packages/builder/src/components/common/LinkedRecordSelector.svelte
@@ -8,17 +8,24 @@
   export let schema
   export let linkedRecords = []
 
+  let records = []
+
   $: label = capitalise(schema.name)
   $: linkedModelId = schema.modelId
   $: linkedModel = $backendUiStore.models.find(
     model => model._id === linkedModelId
   )
-  $: promise = fetchRecords(linkedModelId)
+  $: fetchRecords(linkedModelId)
 
   async function fetchRecords(linkedModelId) {
     const FETCH_RECORDS_URL = `/api/${linkedModelId}/records`
-    const response = await api.get(FETCH_RECORDS_URL)
-    return await response.json()
+    try {
+      const response = await api.get(FETCH_RECORDS_URL)
+      records = await response.json()
+    } catch (error) {
+      console.log(error)
+      records = []
+    }
   }
 
   function getPrettyName(record) {
@@ -34,15 +41,13 @@
     table.
   </Label>
 {:else}
-  {#await promise then records}
-    <Multiselect
-      secondary
-      bind:value={linkedRecords}
-      {label}
-      placeholder="Choose some options">
-      {#each records as record}
-        <option value={record._id}>{getPrettyName(record)}</option>
-      {/each}
-    </Multiselect>
-  {/await}
+  <Multiselect
+    secondary
+    bind:value={linkedRecords}
+    {label}
+    placeholder="Choose some options">
+    {#each records as record}
+      <option value={record._id}>{getPrettyName(record)}</option>
+    {/each}
+  </Multiselect>
 {/if}