From b839325a86e86dbec8adc9b94f9a3c63eda86ab4 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 26 Aug 2022 08:47:50 +0100
Subject: [PATCH 001/151] Add initial work on grid layout

---
 .../src/builderStore/store/frontend.js        |  19 ++-
 .../[screenId]/_components/AppPreview.svelte  |   2 +
 .../_components/settings/componentStyles.js   |  61 ++++++++
 .../new/_components/componentStructure.json   |   3 +-
 packages/client/manifest.json                 |   9 ++
 .../client/src/components/Component.svelte    |   4 +
 .../client/src/components/app/Grid.svelte     |  81 +++++++++++
 packages/client/src/components/app/index.js   |   1 +
 .../src/components/preview/DNDHandler.svelte  | 137 ++++++++++++++++--
 .../src/components/preview/Indicator.svelte   | 100 +++++++++++++
 .../components/preview/IndicatorSet.svelte    |   1 +
 packages/client/src/index.js                  |   4 +
 packages/client/src/stores/builder.js         |  15 +-
 packages/client/src/utils/styleable.js        |   2 +-
 14 files changed, 423 insertions(+), 16 deletions(-)
 create mode 100644 packages/client/src/components/app/Grid.svelte

diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index 4d0653208c..9deeef15f1 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -439,7 +439,16 @@ export const getFrontendStore = () => {
         return {
           _id: Helpers.uuid(),
           _component: definition.component,
-          _styles: { normal: {}, hover: {}, active: {} },
+          _styles: {
+            normal: {
+              "grid-column-start": 1,
+              "grid-column-end": 2,
+              "grid-row-start": 1,
+              "grid-row-end": 2,
+            },
+            hover: {},
+            active: {},
+          },
           _instanceName: `New ${definition.name}`,
           ...cloneDeep(props),
           ...extras,
@@ -873,6 +882,14 @@ export const getFrontendStore = () => {
           }
         })
       },
+      updateStyles: async styles => {
+        await store.actions.components.patch(component => {
+          component._styles.normal = {
+            ...component._styles.normal,
+            ...styles,
+          }
+        })
+      },
       updateCustomStyle: async style => {
         await store.actions.components.patch(component => {
           component._styles.custom = style
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index 9f81effd1d..ba132053b7 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -143,6 +143,8 @@
         }
       } else if (type === "update-prop") {
         await store.actions.components.updateSetting(data.prop, data.value)
+      } else if (type === "update-styles") {
+        await store.actions.components.updateStyles(data.styles)
       } else if (type === "delete-component" && data.id) {
         // Legacy type, can be deleted in future
         confirmDeleteComponent(data.id)
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/componentStyles.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/componentStyles.js
index d4912241b3..710cbed9b1 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/componentStyles.js
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/componentStyles.js
@@ -1,6 +1,67 @@
 import { Input, Select } from "@budibase/bbui"
 import ColorPicker from "components/design/settings/controls/ColorPicker.svelte"
 
+export const grid = {
+  label: "Grid",
+  columns: "1fr 1fr",
+  settings: [
+    {
+      label: "Col. start",
+      key: "grid-column-start",
+      control: Select,
+      placeholder: "Auto",
+      options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
+    },
+    {
+      label: "Col. end",
+      key: "grid-column-end",
+      control: Select,
+      placeholder: "Auto",
+      options: [
+        { label: "1", value: 2 },
+        { label: "2", value: 3 },
+        { label: "3", value: 4 },
+        { label: "4", value: 5 },
+        { label: "5", value: 6 },
+        { label: "6", value: 7 },
+        { label: "7", value: 8 },
+        { label: "8", value: 9 },
+        { label: "9", value: 10 },
+        { label: "10", value: 11 },
+        { label: "11", value: 12 },
+        { label: "12", value: 13 },
+      ],
+    },
+    {
+      label: "Row start",
+      key: "grid-row-start",
+      control: Select,
+      placeholder: "Auto",
+      options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
+    },
+    {
+      label: "Row end",
+      key: "grid-row-end",
+      control: Select,
+      placeholder: "Auto",
+      options: [
+        { label: "1", value: 2 },
+        { label: "2", value: 3 },
+        { label: "3", value: 4 },
+        { label: "4", value: 5 },
+        { label: "5", value: 6 },
+        { label: "6", value: 7 },
+        { label: "7", value: 8 },
+        { label: "8", value: 9 },
+        { label: "9", value: 10 },
+        { label: "10", value: 11 },
+        { label: "11", value: 12 },
+        { label: "12", value: 13 },
+      ],
+    },
+  ],
+}
+
 export const margin = {
   label: "Margin",
   columns: "1fr 1fr",
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/componentStructure.json b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/componentStructure.json
index acd28c6a41..fddff9d0d9 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/componentStructure.json
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/componentStructure.json
@@ -13,7 +13,8 @@
     "icon": "ClassicGridView",
     "children": [
       "container",
-      "section"
+      "section",
+      "grid"
     ]
   },
   {
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 87cc8b2567..642b4e0f99 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -86,6 +86,7 @@
     "hasChildren": true,
     "showSettingsBar": true,
     "styles": [
+      "grid",
       "padding",
       "size",
       "background",
@@ -4378,5 +4379,13 @@
         "required": true
       }
     ]
+  },
+  "grid": {
+    "name": "Grid",
+    "icon": "ViewGrid",
+    "hasChildren": true,
+    "styles": [
+      "size"
+    ]
   }
 }
\ No newline at end of file
diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index a7f506a387..e55b5288e5 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -151,6 +151,10 @@
     children: children.length,
     styles: {
       ...instance._styles,
+      normal: {
+        ...instance._styles?.normal,
+        ...(selected ? $builderStore.gridStyles : null),
+      },
       id,
       empty: emptyState,
       interactive,
diff --git a/packages/client/src/components/app/Grid.svelte b/packages/client/src/components/app/Grid.svelte
new file mode 100644
index 0000000000..51c5162386
--- /dev/null
+++ b/packages/client/src/components/app/Grid.svelte
@@ -0,0 +1,81 @@
+<script>
+  import { getContext } from "svelte"
+  import { fade } from "svelte/transition"
+
+  const component = getContext("component")
+  const { styleable, builderStore } = getContext("sdk")
+
+  $: coords = generateCoords(12)
+
+  const generateCoords = num => {
+    let grid = []
+    for (let row = 0; row < num; row++) {
+      for (let col = 0; col < num; col++) {
+        grid.push({ row, col })
+      }
+    }
+    return grid
+  }
+</script>
+
+<div class="grid" use:styleable={$component.styles}>
+  <div class="underlay">
+    {#each coords as coord}
+      <div class="placeholder" />
+    {/each}
+  </div>
+  <slot />
+  {#if $builderStore.isDragging}
+    <div
+      class="overlay"
+      in:fade={{ duration: 130 }}
+      out:fade|self={{ duration: 130 }}
+    >
+      {#each coords as coord}
+        <div
+          class="placeholder grid-coord"
+          data-row={coord.row}
+          data-col={coord.col}
+        />
+      {/each}
+    </div>
+  {/if}
+</div>
+
+<style>
+  .grid {
+    position: relative;
+    min-height: 400px;
+  }
+  .grid,
+  .underlay,
+  .overlay {
+    display: grid;
+    grid-template-columns: repeat(12, 1fr);
+    grid-template-rows: repeat(12, 1fr);
+  }
+  .underlay,
+  .overlay {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    grid-gap: 2px;
+    background-color: var(--spectrum-global-color-gray-200);
+    border: 2px solid var(--spectrum-global-color-gray-200);
+  }
+  .underlay {
+    z-index: -1;
+  }
+  .overlay {
+    z-index: 999;
+    background-color: var(--spectrum-global-color-gray-500);
+    border-color: var(--spectrum-global-color-gray-500);
+    opacity: 0.3;
+  }
+
+  .placeholder {
+    background-color: var(--spectrum-global-color-gray-100);
+  }
+</style>
diff --git a/packages/client/src/components/app/index.js b/packages/client/src/components/app/index.js
index 1c0d868433..b64e074115 100644
--- a/packages/client/src/components/app/index.js
+++ b/packages/client/src/components/app/index.js
@@ -34,6 +34,7 @@ export { default as spectrumcard } from "./SpectrumCard.svelte"
 export { default as tag } from "./Tag.svelte"
 export { default as markdownviewer } from "./MarkdownViewer.svelte"
 export { default as embeddedmap } from "./embedded-map/EmbeddedMap.svelte"
+export { default as grid } from "./Grid.svelte"
 export * from "./charts"
 export * from "./forms"
 export * from "./table"
diff --git a/packages/client/src/components/preview/DNDHandler.svelte b/packages/client/src/components/preview/DNDHandler.svelte
index c37eb93afa..719f17efe3 100644
--- a/packages/client/src/components/preview/DNDHandler.svelte
+++ b/packages/client/src/components/preview/DNDHandler.svelte
@@ -12,7 +12,7 @@
   import { get } from "svelte/store"
   import IndicatorSet from "./IndicatorSet.svelte"
   import DNDPositionIndicator from "./DNDPositionIndicator.svelte"
-  import { builderStore } from "stores"
+  import { builderStore, componentStore } from "stores"
 
   let dragInfo
   let dropInfo
@@ -35,22 +35,41 @@
 
   const getDOMNodeForComponent = component => {
     const parent = component.closest(".component")
-    const children = Array.from(parent.children)
-    return children[0]
+    const children = Array.from(parent?.children || [])
+    return children?.[0]
   }
 
   // Callback when initially starting a drag on a draggable component
   const onDragStart = e => {
-    const parent = e.target.closest(".component")
-    if (!parent?.classList.contains("draggable")) {
+    var img = new Image()
+    img.src =
+      "data:image/gif;base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="
+    e.dataTransfer.setDragImage(img, 0, 0)
+
+    // Resize component
+    if (e.target.classList.contains("anchor")) {
+      dragInfo = {
+        target: e.target.dataset.id,
+        side: e.target.dataset.side,
+        mode: "resize",
+      }
+    } else {
+      // Drag component
+      const parent = e.target.closest(".component")
+      if (!parent?.classList.contains("draggable")) {
+        return
+      }
+      dragInfo = {
+        target: parent.dataset.id,
+        parent: parent.dataset.parent,
+        mode: "move",
+      }
+    }
+
+    if (!dragInfo) {
       return
     }
 
-    // Update state
-    dragInfo = {
-      target: parent.dataset.id,
-      parent: parent.dataset.parent,
-    }
     builderStore.actions.selectComponent(dragInfo.target)
     builderStore.actions.setDragging(true)
 
@@ -71,20 +90,48 @@
       }
     }
 
+    // Update grid styles
+    if ($builderStore.gridStyles) {
+      builderStore.actions.updateStyles($builderStore.gridStyles)
+    }
+
     // Reset state and styles
     dragInfo = null
     dropInfo = null
-    builderStore.actions.setDragging(false)
   }
 
   // Callback when on top of a component
   const onDragOver = e => {
     // Skip if we aren't validly dragging currently
-    if (!dragInfo || !dropInfo) {
+    if (!dragInfo) {
       return
     }
 
     e.preventDefault()
+
+    // Set drag info for grids if not set
+    if (!dragInfo.grid) {
+      const coord = e.target.closest(".grid-coord")
+      if (coord) {
+        const row = parseInt(coord.dataset.row)
+        const col = parseInt(coord.dataset.col)
+        const component = $componentStore.selectedComponent
+        const getStyle = x => parseInt(component._styles.normal?.[x] || "0")
+        dragInfo.grid = {
+          startRow: row,
+          startCol: col,
+          rowDeltaMin: 1 - getStyle("grid-row-start"),
+          rowDeltaMax: 13 - getStyle("grid-row-end"),
+          colDeltaMin: 1 - getStyle("grid-column-start"),
+          colDeltaMax: 13 - getStyle("grid-column-end"),
+        }
+      }
+    }
+
+    if (!dropInfo) {
+      return
+    }
+
     const { droppableInside, bounds } = dropInfo
     const { top, left, height, width } = bounds
     const mouseY = e.clientY
@@ -147,6 +194,72 @@
       return
     }
 
+    const coord = e.target.closest(".grid-coord")
+    if (coord && dragInfo.grid) {
+      const row = parseInt(coord.dataset.row)
+      const col = parseInt(coord.dataset.col)
+      const { mode, side, grid } = dragInfo
+      const {
+        startRow,
+        startCol,
+        rowDeltaMin,
+        rowDeltaMax,
+        colDeltaMin,
+        colDeltaMax,
+      } = grid
+
+      const component = $componentStore.selectedComponent
+      const rowStart = parseInt(
+        component._styles.normal?.["grid-row-start"] || 0
+      )
+      const rowEnd = parseInt(component._styles.normal?.["grid-row-end"] || 0)
+      const colStart = parseInt(
+        component._styles.normal?.["grid-column-start"] || 0
+      )
+      const colEnd = parseInt(
+        component._styles.normal?.["grid-column-end"] || 0
+      )
+
+      let rowDelta = row - startRow
+      let colDelta = col - startCol
+
+      if (mode === "move") {
+        rowDelta = Math.min(Math.max(rowDelta, rowDeltaMin), rowDeltaMax)
+        colDelta = Math.min(Math.max(colDelta, colDeltaMin), colDeltaMax)
+        builderStore.actions.setGridStyles({
+          "grid-row-start": rowStart + rowDelta,
+          "grid-row-end": rowEnd + rowDelta,
+          "grid-column-start": colStart + colDelta,
+          "grid-column-end": colEnd + colDelta,
+        })
+      } else if (mode === "resize") {
+        let newStyles = {}
+        if (side === "right") {
+          newStyles["grid-column-end"] = colEnd + colDelta
+        } else if (side === "left") {
+          newStyles["grid-column-start"] = colStart + colDelta
+        } else if (side === "top") {
+          newStyles["grid-row-start"] = rowStart + rowDelta
+        } else if (side === "bottom") {
+          newStyles["grid-row-end"] = rowEnd + rowDelta
+        } else if (side === "bottom-right") {
+          newStyles["grid-column-end"] = colEnd + colDelta
+          newStyles["grid-row-end"] = rowEnd + rowDelta
+        } else if (side === "bottom-left") {
+          newStyles["grid-column-start"] = colStart + colDelta
+          newStyles["grid-row-end"] = rowEnd + rowDelta
+        } else if (side === "top-right") {
+          newStyles["grid-column-end"] = colEnd + colDelta
+          newStyles["grid-row-start"] = rowStart + rowDelta
+        } else if (side === "top-left") {
+          newStyles["grid-column-start"] = colStart + colDelta
+          newStyles["grid-row-start"] = rowStart + rowDelta
+        }
+        builderStore.actions.setGridStyles(newStyles)
+      }
+    }
+    return
+
     const element = e.target.closest(".component:not(.block)")
     if (
       element &&
diff --git a/packages/client/src/components/preview/Indicator.svelte b/packages/client/src/components/preview/Indicator.svelte
index 1cb669bdc4..d450dd666a 100644
--- a/packages/client/src/components/preview/Indicator.svelte
+++ b/packages/client/src/components/preview/Indicator.svelte
@@ -13,6 +13,7 @@
   export let transition = false
   export let line = false
   export let alignRight = false
+  export let componentId
 
   $: flipped = top < 24
 </script>
@@ -40,6 +41,54 @@
       {/if}
     </div>
   {/if}
+  <div
+    draggable={true}
+    class="anchor right"
+    data-side="right"
+    data-id={componentId}
+  />
+  <div
+    draggable={true}
+    class="anchor top"
+    data-side="top"
+    data-id={componentId}
+  />
+  <div
+    draggable={true}
+    class="anchor left"
+    data-side="left"
+    data-id={componentId}
+  />
+  <div
+    draggable={true}
+    class="anchor bottom"
+    data-side="bottom"
+    data-id={componentId}
+  />
+  <div
+    draggable={true}
+    class="anchor bottom-right"
+    data-side="bottom-right"
+    data-id={componentId}
+  />
+  <div
+    draggable={true}
+    class="anchor bottom-left"
+    data-side="bottom-left"
+    data-id={componentId}
+  />
+  <div
+    draggable={true}
+    class="anchor top-right"
+    data-side="top-right"
+    data-id={componentId}
+  />
+  <div
+    draggable={true}
+    class="anchor top-left"
+    data-side="top-left"
+    data-id={componentId}
+  />
 </div>
 
 <style>
@@ -105,4 +154,55 @@
   /* Icon styles */
   .label :global(.spectrum-Icon + .text) {
   }
+
+  /* Anchor */
+  .anchor {
+    position: absolute;
+    width: 10px;
+    height: 10px;
+    border-radius: 50%;
+    background-color: var(--color);
+    pointer-events: all;
+  }
+  .anchor.right {
+    right: -6px;
+    top: calc(50% - 5px);
+    cursor: e-resize;
+  }
+  .anchor.left {
+    left: -6px;
+    top: calc(50% - 5px);
+    cursor: w-resize;
+  }
+  .anchor.bottom {
+    left: calc(50% - 5px);
+    bottom: -6px;
+    cursor: s-resize;
+  }
+  .anchor.top {
+    left: calc(50% - 5px);
+    top: -6px;
+    cursor: n-resize;
+  }
+
+  .anchor.bottom-right {
+    right: -6px;
+    bottom: -6px;
+    cursor: se-resize;
+  }
+  .anchor.bottom-left {
+    left: -6px;
+    bottom: -6px;
+    cursor: sw-resize;
+  }
+  .anchor.top-right {
+    right: -6px;
+    top: -6px;
+    cursor: ne-resize;
+  }
+  .anchor.top-left {
+    left: -6px;
+    top: -6px;
+    cursor: nw-resize;
+  }
 </style>
diff --git a/packages/client/src/components/preview/IndicatorSet.svelte b/packages/client/src/components/preview/IndicatorSet.svelte
index 662741d100..99db893faa 100644
--- a/packages/client/src/components/preview/IndicatorSet.svelte
+++ b/packages/client/src/components/preview/IndicatorSet.svelte
@@ -127,6 +127,7 @@
       height={indicator.height}
       text={idx === 0 ? text : null}
       icon={idx === 0 ? icon : null}
+      {componentId}
       {transition}
       {zIndex}
       {color}
diff --git a/packages/client/src/index.js b/packages/client/src/index.js
index b582dab4d3..b590ee9b00 100644
--- a/packages/client/src/index.js
+++ b/packages/client/src/index.js
@@ -32,6 +32,10 @@ const loadBudibase = () => {
   const enableDevTools = !get(builderStore).inBuilder && get(appStore).isDevApp
   devToolsStore.actions.setEnabled(enableDevTools)
 
+  if (get(builderStore).gridOffset) {
+    builderStore.actions.setDragging(false)
+  }
+
   // Create app if one hasn't been created yet
   if (!app) {
     app = new ClientApp({
diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.js
index 32eb956d52..77540b3205 100644
--- a/packages/client/src/stores/builder.js
+++ b/packages/client/src/stores/builder.js
@@ -40,6 +40,9 @@ const createBuilderStore = () => {
     updateProp: (prop, value) => {
       dispatchEvent("update-prop", { prop, value })
     },
+    updateStyles: styles => {
+      dispatchEvent("update-styles", { styles })
+    },
     keyDown: (key, ctrlKey) => {
       dispatchEvent("key-down", { key, ctrlKey })
     },
@@ -67,7 +70,11 @@ const createBuilderStore = () => {
       if (dragging === get(store).isDragging) {
         return
       }
-      store.update(state => ({ ...state, isDragging: dragging }))
+      store.update(state => ({
+        ...state,
+        isDragging: dragging,
+        gridStyles: null,
+      }))
     },
     setEditMode: enabled => {
       if (enabled === get(store).editMode) {
@@ -84,6 +91,12 @@ const createBuilderStore = () => {
     highlightSetting: setting => {
       dispatchEvent("highlight-setting", { setting })
     },
+    setGridStyles: styles => {
+      store.update(state => {
+        state.gridStyles = styles
+        return state
+      })
+    },
   }
   return {
     ...store,
diff --git a/packages/client/src/utils/styleable.js b/packages/client/src/utils/styleable.js
index b07a3213d9..5cbe74bb68 100644
--- a/packages/client/src/utils/styleable.js
+++ b/packages/client/src/utils/styleable.js
@@ -27,7 +27,7 @@ export const styleable = (node, styles = {}) => {
   const setupStyles = (newStyles = {}) => {
     let baseStyles = {}
     if (newStyles.empty) {
-      baseStyles.border = "2px dashed var(--spectrum-global-color-gray-600)"
+      // baseStyles.border = "2px dashed var(--spectrum-global-color-gray-600)"
       baseStyles.padding = "var(--spacing-l)"
       baseStyles.overflow = "hidden"
     }

From 166064f6df8999ca4c3cf6560bba703d8de12342 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 26 Aug 2022 14:47:29 +0100
Subject: [PATCH 002/151] Don't clear grid dnd state when loading client
 library

---
 .../client/src/components/preview/DNDHandler.svelte    |  1 +
 packages/client/src/index.js                           | 10 ++++++----
 packages/client/src/stores/builder.js                  |  9 +++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/components/preview/DNDHandler.svelte b/packages/client/src/components/preview/DNDHandler.svelte
index 719f17efe3..7a89b958ae 100644
--- a/packages/client/src/components/preview/DNDHandler.svelte
+++ b/packages/client/src/components/preview/DNDHandler.svelte
@@ -93,6 +93,7 @@
     // Update grid styles
     if ($builderStore.gridStyles) {
       builderStore.actions.updateStyles($builderStore.gridStyles)
+      builderStore.actions.clearGridNextLoad()
     }
 
     // Reset state and styles
diff --git a/packages/client/src/index.js b/packages/client/src/index.js
index b590ee9b00..3c2f375ac8 100644
--- a/packages/client/src/index.js
+++ b/packages/client/src/index.js
@@ -9,6 +9,10 @@ loadSpectrumIcons()
 let app
 
 const loadBudibase = () => {
+  if (get(builderStore).clearGridNextLoad) {
+    builderStore.actions.setDragging(false)
+  }
+
   // Update builder store with any builder flags
   builderStore.set({
     inBuilder: !!window["##BUDIBASE_IN_BUILDER##"],
@@ -21,6 +25,8 @@ const loadBudibase = () => {
     previewDevice: window["##BUDIBASE_PREVIEW_DEVICE##"],
     navigation: window["##BUDIBASE_PREVIEW_NAVIGATION##"],
     hiddenComponentIds: window["##BUDIBASE_HIDDEN_COMPONENT_IDS##"],
+    gridStyles: get(builderStore).gridStyles,
+    isDragging: get(builderStore).isDragging,
   })
 
   // Set app ID - this window flag is set by both the preview and the real
@@ -32,10 +38,6 @@ const loadBudibase = () => {
   const enableDevTools = !get(builderStore).inBuilder && get(appStore).isDevApp
   devToolsStore.actions.setEnabled(enableDevTools)
 
-  if (get(builderStore).gridOffset) {
-    builderStore.actions.setDragging(false)
-  }
-
   // Create app if one hasn't been created yet
   if (!app) {
     app = new ClientApp({
diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.js
index 77540b3205..1ab8cdb725 100644
--- a/packages/client/src/stores/builder.js
+++ b/packages/client/src/stores/builder.js
@@ -19,6 +19,8 @@ const createBuilderStore = () => {
     isDragging: false,
     navigation: null,
     hiddenComponentIds: [],
+    gridStyles: null,
+    clearGridNextLoad: false,
 
     // Legacy - allow the builder to specify a layout
     layout: null,
@@ -74,6 +76,7 @@ const createBuilderStore = () => {
         ...state,
         isDragging: dragging,
         gridStyles: null,
+        clearGridNextLoad: false,
       }))
     },
     setEditMode: enabled => {
@@ -97,6 +100,12 @@ const createBuilderStore = () => {
         return state
       })
     },
+    clearGridNextLoad: () => {
+      store.update(state => {
+        state.clearGridNextLoad = true
+        return state
+      })
+    },
   }
   return {
     ...store,

From 8592f79eaaacae58cedfbdc420c49f8ffdb8a9ca Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@nedap.com>
Date: Thu, 7 Jul 2022 23:06:57 +0200
Subject: [PATCH 003/151] 6538 - add validation to datasource config modal

---
 .../IntegrationConfigForm.svelte              | 21 +++++++++++++++
 .../modals/DatasourceConfigModal.svelte       |  3 +++
 .../src/helpers/validation/yup/index.js       | 27 ++++++++++++++++++-
 3 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
index 27358df0be..1f740bf35b 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
@@ -10,10 +10,14 @@
   import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
   import { capitalise } from "helpers"
   import { IntegrationTypes } from "constants/backend"
+  import { createValidationStore } from "helpers/validation/yup"
+  import { createEventDispatcher } from "svelte"
 
   export let datasource
   export let schema
   export let creating
+  const validation = createValidationStore()
+  const dispatch = createEventDispatcher()
 
   function filter([key, value]) {
     if (!value) {
@@ -31,6 +35,17 @@
     .filter(el => filter(el))
     .map(([key]) => key)
 
+  // setup the validation for each required field
+  $: configKeys.forEach(key => {
+    if (schema[key].required) {
+      validation.addValidatorType(key, schema[key].type, schema[key].required)
+    }
+  })
+  // run the validation whenever the config changes
+  $: validation.check(config)
+  // dispatch the validation result
+  $: dispatch("valid", $validation.valid)
+
   let addButton
 
   function getDisplayName(key) {
@@ -79,6 +94,9 @@
             type={schema[configKey].type}
             on:change
             bind:value={config[configKey]}
+            on:blur={($validation.touched[configKey] = true)}
+            error={$validation.touched[configKey] &&
+              $validation.errors[configKey]}
           />
         </div>
       {:else}
@@ -88,6 +106,9 @@
             type={schema[configKey].type}
             on:change
             bind:value={config[configKey]}
+            on:blur={($validation.touched[configKey] = true)}
+            error={$validation.touched[configKey] &&
+              $validation.errors[configKey]}
           />
         </div>
       {/if}
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte
index c8a5bc96eb..edbe55178f 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte
@@ -13,6 +13,7 @@
   // kill the reference so the input isn't saved
   let datasource = cloneDeep(integration)
   let skipFetch = false
+  let isValid = false
 
   $: name =
     IntegrationNames[datasource.type] || datasource.name || datasource.type
@@ -53,6 +54,7 @@
     return true
   }}
   size="L"
+  disabled={!isValid}
 >
   <Layout noPadding>
     <Body size="XS"
@@ -63,5 +65,6 @@
     schema={datasource.schema}
     bind:datasource
     creating={true}
+    on:valid={e => (isValid = e.detail)}
   />
 </ModalContent>
diff --git a/packages/builder/src/helpers/validation/yup/index.js b/packages/builder/src/helpers/validation/yup/index.js
index 6783ad7e58..9b38adbf9d 100644
--- a/packages/builder/src/helpers/validation/yup/index.js
+++ b/packages/builder/src/helpers/validation/yup/index.js
@@ -1,5 +1,5 @@
 import { capitalise } from "helpers"
-import { object } from "yup"
+import { object, string, number } from "yup"
 import { writable, get } from "svelte/store"
 import { notifications } from "@budibase/bbui"
 
@@ -20,6 +20,30 @@ export const createValidationStore = () => {
     validator[propertyName] = propertyValidator
   }
 
+  const addValidatorType = (propertyName, type, required) => {
+    if (!type || !propertyName) {
+      return
+    }
+
+    let propertyValidator
+    switch (type) {
+      case "number":
+        propertyValidator = number()
+        break
+      case "email":
+        propertyValidator = string().email()
+        break
+      default:
+        propertyValidator = string()
+    }
+
+    if (required) {
+      propertyValidator = propertyValidator.required()
+    }
+
+    validator[propertyName] = propertyValidator
+  }
+
   const check = async values => {
     const obj = object().shape(validator)
     // clear the previous errors
@@ -62,5 +86,6 @@ export const createValidationStore = () => {
     set: validation.set,
     check,
     addValidator,
+    addValidatorType,
   }
 }

From 9c9d2de4a555ce2087fb1bfe3338ff9ff3a5589d Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 3 Oct 2022 11:56:31 +0100
Subject: [PATCH 004/151] Type updates for app backups work in pro + linting.

---
 packages/types/src/documents/global/index.ts     | 1 +
 packages/types/src/documents/global/schedules.ts | 9 +++++++++
 packages/types/src/sdk/licensing/feature.ts      | 1 +
 3 files changed, 11 insertions(+)
 create mode 100644 packages/types/src/documents/global/schedules.ts

diff --git a/packages/types/src/documents/global/index.ts b/packages/types/src/documents/global/index.ts
index 84684df369..edce416a3f 100644
--- a/packages/types/src/documents/global/index.ts
+++ b/packages/types/src/documents/global/index.ts
@@ -3,3 +3,4 @@ export * from "./user"
 export * from "./userGroup"
 export * from "./plugin"
 export * from "./quotas"
+export * from "./schedules"
diff --git a/packages/types/src/documents/global/schedules.ts b/packages/types/src/documents/global/schedules.ts
new file mode 100644
index 0000000000..357a841a9a
--- /dev/null
+++ b/packages/types/src/documents/global/schedules.ts
@@ -0,0 +1,9 @@
+export enum ScheduleType {
+  APP_BACKUP = "app_backup",
+}
+
+export enum ScheduleRepeatPeriod {
+  DAILY = "daily",
+  WEEKLY = "weekly",
+  MONTHLY = "monthly",
+}
diff --git a/packages/types/src/sdk/licensing/feature.ts b/packages/types/src/sdk/licensing/feature.ts
index cbd1f4a50c..f06a8d1382 100644
--- a/packages/types/src/sdk/licensing/feature.ts
+++ b/packages/types/src/sdk/licensing/feature.ts
@@ -1,3 +1,4 @@
 export enum Feature {
   USER_GROUPS = "userGroups",
+  APP_BACKUPS = "appBackups",
 }

From 29659813efa90cb5d78b03249a69a5ae08b1a99a Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 3 Oct 2022 14:02:58 +0100
Subject: [PATCH 005/151] Add document and api types

---
 packages/types/src/api/web/app/backup.ts      | 15 +++++++++
 packages/types/src/api/web/app/index.ts       |  1 +
 packages/types/src/api/web/index.ts           |  2 ++
 packages/types/src/api/web/schedule.ts        | 15 +++++++++
 packages/types/src/api/web/user.ts            |  7 ++++
 packages/types/src/documents/app/backup.ts    | 21 ++++++++++++
 packages/types/src/documents/app/index.ts     |  1 +
 packages/types/src/documents/global/index.ts  |  2 +-
 .../types/src/documents/global/schedule.ts    | 32 +++++++++++++++++++
 .../types/src/documents/global/schedules.ts   |  9 ------
 .../src/api/controllers/global/users.ts       |  4 ++-
 packages/worker/src/sdk/users/users.ts        |  7 +++-
 12 files changed, 104 insertions(+), 12 deletions(-)
 create mode 100644 packages/types/src/api/web/app/backup.ts
 create mode 100644 packages/types/src/api/web/app/index.ts
 create mode 100644 packages/types/src/api/web/schedule.ts
 create mode 100644 packages/types/src/documents/app/backup.ts
 create mode 100644 packages/types/src/documents/global/schedule.ts
 delete mode 100644 packages/types/src/documents/global/schedules.ts

diff --git a/packages/types/src/api/web/app/backup.ts b/packages/types/src/api/web/app/backup.ts
new file mode 100644
index 0000000000..57ffba0d70
--- /dev/null
+++ b/packages/types/src/api/web/app/backup.ts
@@ -0,0 +1,15 @@
+import { AppBackupTrigger } from "../../../documents"
+
+export interface SearchAppBackupsRequest {
+  trigger: AppBackupTrigger
+  startDate: string
+  endDate: string
+}
+
+export interface CreateAppBackupRequest {
+  name: string
+}
+
+export interface UpdateAppBackupRequest {
+  name: string
+}
diff --git a/packages/types/src/api/web/app/index.ts b/packages/types/src/api/web/app/index.ts
new file mode 100644
index 0000000000..1d73755cb6
--- /dev/null
+++ b/packages/types/src/api/web/app/index.ts
@@ -0,0 +1 @@
+export * from "./backup"
diff --git a/packages/types/src/api/web/index.ts b/packages/types/src/api/web/index.ts
index 0129fb38d9..1dbe22aa46 100644
--- a/packages/types/src/api/web/index.ts
+++ b/packages/types/src/api/web/index.ts
@@ -1,3 +1,5 @@
 export * from "./analytics"
 export * from "./user"
 export * from "./errors"
+export * from "./schedule"
+export * from "./app"
diff --git a/packages/types/src/api/web/schedule.ts b/packages/types/src/api/web/schedule.ts
new file mode 100644
index 0000000000..bf762b1603
--- /dev/null
+++ b/packages/types/src/api/web/schedule.ts
@@ -0,0 +1,15 @@
+import {
+  ScheduleMetadata,
+  ScheduleRepeatPeriod,
+  ScheduleType,
+} from "../../documents"
+
+export interface CreateScheduleRequest {
+  type: ScheduleType
+  name: string
+  startDate: string
+  repeat: ScheduleRepeatPeriod
+  metadata: ScheduleMetadata
+}
+
+export interface UpdateScheduleRequest extends CreateScheduleRequest {}
diff --git a/packages/types/src/api/web/user.ts b/packages/types/src/api/web/user.ts
index c66d3203e8..98ffcdf360 100644
--- a/packages/types/src/api/web/user.ts
+++ b/packages/types/src/api/web/user.ts
@@ -44,3 +44,10 @@ export interface InviteUsersResponse {
   successful: { email: string }[]
   unsuccessful: { email: string; reason: string }[]
 }
+
+export interface SearchUsersRequest {
+  page?: string
+  email?: string
+  appId?: string
+  userIds?: string[]
+}
diff --git a/packages/types/src/documents/app/backup.ts b/packages/types/src/documents/app/backup.ts
new file mode 100644
index 0000000000..a935ed5ba1
--- /dev/null
+++ b/packages/types/src/documents/app/backup.ts
@@ -0,0 +1,21 @@
+import { Document } from "../document"
+
+export enum AppBackupTrigger {
+  PUBLISH = "publish",
+  MANUAL = "manual",
+  SCHEDULED = "scheduled",
+}
+
+export interface AppBackupContents {
+  datasources: string[]
+  screens: string[]
+  automations: string[]
+}
+
+export interface AppBackup extends Document {
+  trigger: AppBackupTrigger
+  name: string
+  date: string
+  userId: string
+  contents: AppBackupContents
+}
diff --git a/packages/types/src/documents/app/index.ts b/packages/types/src/documents/app/index.ts
index e8b29257fc..dad594b804 100644
--- a/packages/types/src/documents/app/index.ts
+++ b/packages/types/src/documents/app/index.ts
@@ -10,3 +10,4 @@ export * from "./view"
 export * from "../document"
 export * from "./row"
 export * from "./user"
+export * from "./backup"
diff --git a/packages/types/src/documents/global/index.ts b/packages/types/src/documents/global/index.ts
index edce416a3f..9f779d4937 100644
--- a/packages/types/src/documents/global/index.ts
+++ b/packages/types/src/documents/global/index.ts
@@ -3,4 +3,4 @@ export * from "./user"
 export * from "./userGroup"
 export * from "./plugin"
 export * from "./quotas"
-export * from "./schedules"
+export * from "./schedule"
diff --git a/packages/types/src/documents/global/schedule.ts b/packages/types/src/documents/global/schedule.ts
new file mode 100644
index 0000000000..63bb9284fe
--- /dev/null
+++ b/packages/types/src/documents/global/schedule.ts
@@ -0,0 +1,32 @@
+import { Document } from "../document"
+
+export enum ScheduleType {
+  APP_BACKUP = "app_backup",
+}
+
+export enum ScheduleRepeatPeriod {
+  DAILY = "daily",
+  WEEKLY = "weekly",
+  MONTHLY = "monthly",
+}
+
+export interface Schedule extends Document {
+  type: ScheduleType
+  name: string
+  startDate: string
+  repeat: ScheduleRepeatPeriod
+  metadata: ScheduleMetadata
+}
+
+export type ScheduleMetadata = AppBackupScheduleMetadata
+
+export const isAppBackupMetadata = (
+  type: ScheduleType,
+  metadata: ScheduleMetadata
+): metadata is AppBackupScheduleMetadata => {
+  return type === ScheduleType.APP_BACKUP
+}
+
+export interface AppBackupScheduleMetadata {
+  apps: string[]
+}
diff --git a/packages/types/src/documents/global/schedules.ts b/packages/types/src/documents/global/schedules.ts
deleted file mode 100644
index 357a841a9a..0000000000
--- a/packages/types/src/documents/global/schedules.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export enum ScheduleType {
-  APP_BACKUP = "app_backup",
-}
-
-export enum ScheduleRepeatPeriod {
-  DAILY = "daily",
-  WEEKLY = "weekly",
-  MONTHLY = "monthly",
-}
diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index 8894330f67..ea1df5b45a 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -7,6 +7,7 @@ import {
   CloudAccount,
   InviteUserRequest,
   InviteUsersRequest,
+  SearchUsersRequest,
   User,
 } from "@budibase/types"
 import {
@@ -144,7 +145,8 @@ export const destroy = async (ctx: any) => {
 }
 
 export const search = async (ctx: any) => {
-  const paginated = await sdk.users.paginatedUsers(ctx.request.body)
+  const body = ctx.request.body as SearchUsersRequest
+  const paginated = await sdk.users.paginatedUsers(body)
   // user hashed password shouldn't ever be returned
   for (let user of paginated.data) {
     if (user) {
diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts
index 775514ea5e..3b98c8ef52 100644
--- a/packages/worker/src/sdk/users/users.ts
+++ b/packages/worker/src/sdk/users/users.ts
@@ -27,6 +27,7 @@ import {
   MigrationType,
   PlatformUserByEmail,
   RowResponse,
+  SearchUsersRequest,
   User,
 } from "@budibase/types"
 import { sendEmail } from "../../utilities/email"
@@ -56,7 +57,8 @@ export const paginatedUsers = async ({
   page,
   email,
   appId,
-}: { page?: string; email?: string; appId?: string } = {}) => {
+  userIds,
+}: SearchUsersRequest = {}) => {
   const db = tenancy.getGlobalDB()
   // get one extra document, to have the next page
   const opts: any = {
@@ -77,6 +79,9 @@ export const paginatedUsers = async ({
   } else if (email) {
     userList = await usersCore.searchGlobalUsersByEmail(email, opts)
     property = "email"
+  }
+  if (userIds) {
+    // TODO: search users by userIds
   } else {
     // no search, query allDocs
     const response = await db.allDocs(dbUtils.getGlobalUserParams(null, opts))

From e78ed801b249fbf85ca7b1e886082c9a6e7640f5 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 3 Oct 2022 19:36:33 +0100
Subject: [PATCH 006/151] Linting.

---
 .../TestConfiguration/InternalAPIClient.ts          |  6 ++----
 .../internal-api/TestConfiguration/applications.ts  |  8 ++------
 .../config/internal-api/TestConfiguration/auth.ts   |  6 +++---
 .../config/internal-api/fixtures/applications.ts    |  9 ++++-----
 .../tests/internal-api/applications/create.spec.ts  | 13 +++++++------
 5 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/qa-core/src/config/internal-api/TestConfiguration/InternalAPIClient.ts b/qa-core/src/config/internal-api/TestConfiguration/InternalAPIClient.ts
index bfcbb9f4e2..dafc2b1ff2 100644
--- a/qa-core/src/config/internal-api/TestConfiguration/InternalAPIClient.ts
+++ b/qa-core/src/config/internal-api/TestConfiguration/InternalAPIClient.ts
@@ -16,9 +16,7 @@ class InternalAPIClient {
 
   constructor(appId?: string) {
     if (!env.BUDIBASE_SERVER_URL) {
-      throw new Error(
-        "Must set BUDIBASE_SERVER_URL env var"
-      )
+      throw new Error("Must set BUDIBASE_SERVER_URL env var")
     }
     this.host = `${env.BUDIBASE_SERVER_URL}/api`
     this.appId = appId
@@ -55,4 +53,4 @@ class InternalAPIClient {
   put = this.apiCall("PUT")
 }
 
-export default InternalAPIClient
\ No newline at end of file
+export default InternalAPIClient
diff --git a/qa-core/src/config/internal-api/TestConfiguration/applications.ts b/qa-core/src/config/internal-api/TestConfiguration/applications.ts
index 10e4a6657b..0c51487122 100644
--- a/qa-core/src/config/internal-api/TestConfiguration/applications.ts
+++ b/qa-core/src/config/internal-api/TestConfiguration/applications.ts
@@ -1,6 +1,4 @@
-import {
-  Application,
-} from "@budibase/server/api/controllers/public/mapping/types"
+import { Application } from "@budibase/server/api/controllers/public/mapping/types"
 import { App } from "@budibase/types"
 import { Response } from "node-fetch"
 import InternalAPIClient from "./InternalAPIClient"
@@ -37,9 +35,7 @@ export default class AppApi {
     return [response, json]
   }
 
-  async create(
-    body: any
-  ): Promise<[Response, Partial<App>]> {
+  async create(body: any): Promise<[Response, Partial<App>]> {
     const response = await this.api.post(`/applications`, { body })
     const json = await response.json()
     return [response, json]
diff --git a/qa-core/src/config/internal-api/TestConfiguration/auth.ts b/qa-core/src/config/internal-api/TestConfiguration/auth.ts
index 6ac53f24b6..d83c859ab3 100644
--- a/qa-core/src/config/internal-api/TestConfiguration/auth.ts
+++ b/qa-core/src/config/internal-api/TestConfiguration/auth.ts
@@ -9,11 +9,11 @@ export default class AuthApi {
   }
 
   async login(): Promise<[Response, any]> {
-    const response = await this.api.post(`/global/auth/default/login`, { 
+    const response = await this.api.post(`/global/auth/default/login`, {
       body: {
         username: process.env.BB_ADMIN_USER_EMAIL,
-        password: process.env.BB_ADMIN_USER_PASSWORD
-      }
+        password: process.env.BB_ADMIN_USER_PASSWORD,
+      },
     })
     const cookie = response.headers.get("set-cookie")
     this.api.cookie = cookie as any
diff --git a/qa-core/src/config/internal-api/fixtures/applications.ts b/qa-core/src/config/internal-api/fixtures/applications.ts
index dfad7e0b46..9076a05e1b 100644
--- a/qa-core/src/config/internal-api/fixtures/applications.ts
+++ b/qa-core/src/config/internal-api/fixtures/applications.ts
@@ -1,10 +1,9 @@
 import generator from "../../generator"
-import {
-  Application,
-} from "@budibase/server/api/controllers/public/mapping/types"
+import { Application } from "@budibase/server/api/controllers/public/mapping/types"
 
-
-const generate = (overrides: Partial<Application> = {}): Partial<Application> => ({
+const generate = (
+  overrides: Partial<Application> = {}
+): Partial<Application> => ({
   name: generator.word(),
   url: `/${generator.word()}`,
   ...overrides,
diff --git a/qa-core/src/tests/internal-api/applications/create.spec.ts b/qa-core/src/tests/internal-api/applications/create.spec.ts
index 81d43d9c91..2c934e0bd7 100644
--- a/qa-core/src/tests/internal-api/applications/create.spec.ts
+++ b/qa-core/src/tests/internal-api/applications/create.spec.ts
@@ -24,14 +24,14 @@ describe("Internal API - /applications endpoints", () => {
       useTemplate: "true",
       templateName: "Near Miss Register",
       templateKey: "app/near-miss-register",
-      templateFile: undefined
+      templateFile: undefined,
     })
   }
 
   it("GET - fetch applications", async () => {
     await config.applications.create({
       ...generateApp(),
-      useTemplate: false
+      useTemplate: false,
     })
     const [response, apps] = await config.applications.fetch()
     expect(response).toHaveStatusCode(200)
@@ -57,7 +57,7 @@ describe("Internal API - /applications endpoints", () => {
     expect(publish).toEqual({
       _id: expect.any(String),
       appUrl: app.url,
-      status: "SUCCESS"
+      status: "SUCCESS",
     })
   })
 
@@ -70,7 +70,8 @@ describe("Internal API - /applications endpoints", () => {
     config.applications.api.appId = app.appId
 
     // check preview renders
-    const [previewResponse, previewRenders] = await config.applications.canRender()
+    const [previewResponse, previewRenders] =
+      await config.applications.canRender()
     expect(previewResponse).toHaveStatusCode(200)
     expect(previewRenders).toBe(true)
 
@@ -79,8 +80,8 @@ describe("Internal API - /applications endpoints", () => {
 
     // check published app renders
     config.applications.api.appId = db.getProdAppID(app.appId)
-    const [publishedAppResponse, publishedAppRenders] = await config.applications.canRender()
+    const [publishedAppResponse, publishedAppRenders] =
+      await config.applications.canRender()
     expect(publishedAppRenders).toBe(true)
   })
-
 })

From ef52bde670d5b73e5a742216de6573014d9d0af5 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 6 Oct 2022 19:10:45 +0100
Subject: [PATCH 007/151] Building out initial SDK work - converting some
 existing exporting work to typescript.

---
 .../api/controllers/{backup.js => backup.ts}  |  12 +-
 packages/server/src/api/controllers/cloud.js  |  11 +-
 packages/server/src/api/routes/backup.js      |  10 --
 packages/server/src/api/routes/backup.ts      |  10 ++
 packages/server/src/sdk/app/export.ts         | 113 ++++++++++++++++++
 packages/server/src/sdk/app/index.ts          |   1 +
 packages/server/src/sdk/index.ts              |   5 +
 .../server/src/utilities/fileSystem/index.js  | 106 ----------------
 8 files changed, 139 insertions(+), 129 deletions(-)
 rename packages/server/src/api/controllers/{backup.js => backup.ts} (56%)
 delete mode 100644 packages/server/src/api/routes/backup.js
 create mode 100644 packages/server/src/api/routes/backup.ts
 create mode 100644 packages/server/src/sdk/app/export.ts
 create mode 100644 packages/server/src/sdk/app/index.ts
 create mode 100644 packages/server/src/sdk/index.ts

diff --git a/packages/server/src/api/controllers/backup.js b/packages/server/src/api/controllers/backup.ts
similarity index 56%
rename from packages/server/src/api/controllers/backup.js
rename to packages/server/src/api/controllers/backup.ts
index 5e08c823ed..cd2ea415a4 100644
--- a/packages/server/src/api/controllers/backup.js
+++ b/packages/server/src/api/controllers/backup.ts
@@ -1,15 +1,15 @@
-const { streamBackup } = require("../../utilities/fileSystem")
-const { events, context } = require("@budibase/backend-core")
-const { DocumentType } = require("../../db/utils")
-const { isQsTrue } = require("../../utilities")
+import sdk from "../../sdk"
+import { events, context } from "@budibase/backend-core"
+import { DocumentType } from "../../db/utils"
+import { isQsTrue } from "../../utilities"
 
-exports.exportAppDump = async function (ctx) {
+export async function exportAppDump(ctx: any) {
   let { appId, excludeRows } = ctx.query
   const appName = decodeURI(ctx.query.appname)
   excludeRows = isQsTrue(excludeRows)
   const backupIdentifier = `${appName}-export-${new Date().getTime()}.txt`
   ctx.attachment(backupIdentifier)
-  ctx.body = await streamBackup(appId, excludeRows)
+  ctx.body = await sdk.apps.exports.streamBackup(appId, excludeRows)
 
   await context.doInAppContext(appId, async () => {
     const appDb = context.getAppDB()
diff --git a/packages/server/src/api/controllers/cloud.js b/packages/server/src/api/controllers/cloud.js
index 1e6abb1d3b..55aa6bb548 100644
--- a/packages/server/src/api/controllers/cloud.js
+++ b/packages/server/src/api/controllers/cloud.js
@@ -1,14 +1,11 @@
 const env = require("../../environment")
 const { getAllApps, getGlobalDBName } = require("@budibase/backend-core/db")
-const {
-  exportDB,
-  sendTempFile,
-  readFileSync,
-} = require("../../utilities/fileSystem")
+const { sendTempFile, readFileSync } = require("../../utilities/fileSystem")
 const { stringToReadStream } = require("../../utilities")
 const { getGlobalDB } = require("@budibase/backend-core/tenancy")
 const { create } = require("./application")
 const { getDocParams, DocumentType, isDevAppID } = require("../../db/utils")
+const sdk = require("../../sdk")
 
 async function createApp(appName, appImport) {
   const ctx = {
@@ -27,7 +24,7 @@ exports.exportApps = async ctx => {
     ctx.throw(400, "Exporting only allowed in multi-tenant cloud environments.")
   }
   const apps = await getAllApps({ all: true })
-  const globalDBString = await exportDB(getGlobalDBName(), {
+  const globalDBString = await sdk.apps.exports.exportDB(getGlobalDBName(), {
     filter: doc => !doc._id.startsWith(DocumentType.USER),
   })
   let allDBs = {
@@ -38,7 +35,7 @@ exports.exportApps = async ctx => {
     // only export the dev apps as they will be the latest, the user can republish the apps
     // in their self hosted environment
     if (isDevAppID(appId)) {
-      allDBs[app.name] = await exportDB(appId)
+      allDBs[app.name] = await sdk.apps.exports.exportDB(appId)
     }
   }
   const filename = `cloud-export-${new Date().getTime()}.txt`
diff --git a/packages/server/src/api/routes/backup.js b/packages/server/src/api/routes/backup.js
deleted file mode 100644
index 9f3b27e95a..0000000000
--- a/packages/server/src/api/routes/backup.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const Router = require("@koa/router")
-const controller = require("../controllers/backup")
-const authorized = require("../../middleware/authorized")
-const { BUILDER } = require("@budibase/backend-core/permissions")
-
-const router = new Router()
-
-router.get("/api/backups/export", authorized(BUILDER), controller.exportAppDump)
-
-module.exports = router
diff --git a/packages/server/src/api/routes/backup.ts b/packages/server/src/api/routes/backup.ts
new file mode 100644
index 0000000000..2473fa9f67
--- /dev/null
+++ b/packages/server/src/api/routes/backup.ts
@@ -0,0 +1,10 @@
+import Router from "@koa/router"
+import * as controller from "../controllers/backup"
+import authorized from "../../middleware/authorized"
+import { BUILDER } from "@budibase/backend-core/permissions"
+
+const router = new Router()
+
+router.get("/api/backups/export", authorized(BUILDER), controller.exportAppDump)
+
+export default router
diff --git a/packages/server/src/sdk/app/export.ts b/packages/server/src/sdk/app/export.ts
new file mode 100644
index 0000000000..70c4446273
--- /dev/null
+++ b/packages/server/src/sdk/app/export.ts
@@ -0,0 +1,113 @@
+import { closeDB, dangerousGetDB, doWithDB } from "@budibase/backend-core/db"
+import { budibaseTempDir } from "../../utilities/budibaseDir"
+import { streamUpload } from "../../utilities/fileSystem/utilities"
+import { ObjectStoreBuckets } from "../../constants"
+import {
+  LINK_USER_METADATA_PREFIX,
+  TABLE_ROW_PREFIX,
+  USER_METDATA_PREFIX,
+} from "../../db/utils"
+import fs from "fs"
+import env from "../../environment"
+import { join } from "path"
+const MemoryStream = require("memorystream")
+
+/**
+ * Exports a DB to either file or a variable (memory).
+ * @param {string} dbName the DB which is to be exported.
+ * @param {object} opts various options for the export, e.g. whether to stream,
+ * a filter function or the name of the export.
+ * @return {*} either a readable stream or a string
+ */
+export async function exportDB(
+  dbName: string,
+  opts: { stream?: boolean; filter?: any; exportName?: string } = {}
+) {
+  // streaming a DB dump is a bit more complicated, can't close DB
+  if (opts?.stream) {
+    const db = dangerousGetDB(dbName)
+    const memStream = new MemoryStream()
+    memStream.on("end", async () => {
+      await closeDB(db)
+    })
+    db.dump(memStream, { filter: opts?.filter })
+    return memStream
+  }
+
+  return doWithDB(dbName, async (db: any) => {
+    // Write the dump to file if required
+    if (opts?.exportName) {
+      const path = join(budibaseTempDir(), opts?.exportName)
+      const writeStream = fs.createWriteStream(path)
+      await db.dump(writeStream, { filter: opts?.filter })
+
+      // Upload the dump to the object store if self-hosted
+      if (env.SELF_HOSTED) {
+        await streamUpload(
+          ObjectStoreBuckets.BACKUPS,
+          join(dbName, opts?.exportName),
+          fs.createReadStream(path)
+        )
+      }
+
+      return fs.createReadStream(path)
+    }
+
+    // Stringify the dump in memory if required
+    const memStream = new MemoryStream()
+    let appString = ""
+    memStream.on("data", (chunk: any) => {
+      appString += chunk.toString()
+    })
+    await db.dump(memStream, { filter: opts?.filter })
+    return appString
+  })
+}
+
+function defineFilter(excludeRows?: boolean) {
+  const ids = [USER_METDATA_PREFIX, LINK_USER_METADATA_PREFIX]
+  if (excludeRows) {
+    ids.push(TABLE_ROW_PREFIX)
+  }
+  return (doc: any) =>
+    !ids.map(key => doc._id.includes(key)).reduce((prev, curr) => prev || curr)
+}
+
+/**
+ * Local utility to back up the database state for an app, excluding global user
+ * data or user relationships.
+ * @param {string} appId The app to back up
+ * @param {object} config Config to send to export DB
+ * @param {boolean} excludeRows Flag to state whether the export should include data.
+ * @returns {*} either a string or a stream of the backup
+ */
+async function backupAppData(
+  appId: string,
+  config: any,
+  excludeRows?: boolean
+) {
+  return await exportDB(appId, {
+    ...config,
+    filter: defineFilter(excludeRows),
+  })
+}
+
+/**
+ * Streams a backup of the database state for an app
+ * @param {string} appId The ID of the app which is to be backed up.
+ * @param {boolean} excludeRows Flag to state whether the export should include data.
+ * @returns {*} a readable stream of the backup which is written in real time
+ */
+export async function streamBackup(appId: string, excludeRows: boolean) {
+  return await backupAppData(appId, { stream: true }, excludeRows)
+}
+
+/**
+ * Takes a copy of the database state for an app to the object store.
+ * @param {string} appId The ID of the app which is to be backed up.
+ * @param {string} backupName The name of the backup located in the object store.
+ * @return {*} a readable stream to the completed backup file
+ */
+export async function performBackup(appId: string, backupName: string) {
+  return await backupAppData(appId, { exportName: backupName })
+}
diff --git a/packages/server/src/sdk/app/index.ts b/packages/server/src/sdk/app/index.ts
new file mode 100644
index 0000000000..3927539bc8
--- /dev/null
+++ b/packages/server/src/sdk/app/index.ts
@@ -0,0 +1 @@
+export * as exports from "./export"
diff --git a/packages/server/src/sdk/index.ts b/packages/server/src/sdk/index.ts
new file mode 100644
index 0000000000..9199c1cc72
--- /dev/null
+++ b/packages/server/src/sdk/index.ts
@@ -0,0 +1,5 @@
+import * as apps from "./app"
+
+export default {
+  apps,
+}
diff --git a/packages/server/src/utilities/fileSystem/index.js b/packages/server/src/utilities/fileSystem/index.js
index 4e9b13cca0..656ba4816c 100644
--- a/packages/server/src/utilities/fileSystem/index.js
+++ b/packages/server/src/utilities/fileSystem/index.js
@@ -2,17 +2,11 @@ const { budibaseTempDir } = require("../budibaseDir")
 const fs = require("fs")
 const { join } = require("path")
 const uuid = require("uuid/v4")
-const {
-  doWithDB,
-  dangerousGetDB,
-  closeDB,
-} = require("@budibase/backend-core/db")
 const { ObjectStoreBuckets } = require("../../constants")
 const {
   upload,
   retrieve,
   retrieveToTmp,
-  streamUpload,
   deleteFolder,
   downloadTarball,
   downloadTarballDirect,
@@ -21,12 +15,6 @@ const {
 const { updateClientLibrary } = require("./clientLibrary")
 const { checkSlashesInUrl } = require("../")
 const env = require("../../environment")
-const {
-  USER_METDATA_PREFIX,
-  LINK_USER_METADATA_PREFIX,
-  TABLE_ROW_PREFIX,
-} = require("../../db/utils")
-const MemoryStream = require("memorystream")
 const { getAppId } = require("@budibase/backend-core/context")
 const tar = require("tar")
 const fetch = require("node-fetch")
@@ -124,100 +112,6 @@ exports.apiFileReturn = contents => {
   return fs.createReadStream(path)
 }
 
-exports.defineFilter = excludeRows => {
-  const ids = [USER_METDATA_PREFIX, LINK_USER_METADATA_PREFIX]
-  if (excludeRows) {
-    ids.push(TABLE_ROW_PREFIX)
-  }
-  return doc =>
-    !ids.map(key => doc._id.includes(key)).reduce((prev, curr) => prev || curr)
-}
-
-/**
- * Local utility to back up the database state for an app, excluding global user
- * data or user relationships.
- * @param {string} appId The app to backup
- * @param {object} config Config to send to export DB
- * @param {boolean} excludeRows Flag to state whether the export should include data.
- * @returns {*} either a string or a stream of the backup
- */
-const backupAppData = async (appId, config, excludeRows) => {
-  return await exports.exportDB(appId, {
-    ...config,
-    filter: exports.defineFilter(excludeRows),
-  })
-}
-
-/**
- * Takes a copy of the database state for an app to the object store.
- * @param {string} appId The ID of the app which is to be backed up.
- * @param {string} backupName The name of the backup located in the object store.
- * @return {*} a readable stream to the completed backup file
- */
-exports.performBackup = async (appId, backupName) => {
-  return await backupAppData(appId, { exportName: backupName })
-}
-
-/**
- * Streams a backup of the database state for an app
- * @param {string} appId The ID of the app which is to be backed up.
- * @param {boolean} excludeRows Flag to state whether the export should include data.
- * @returns {*} a readable stream of the backup which is written in real time
- */
-exports.streamBackup = async (appId, excludeRows) => {
-  return await backupAppData(appId, { stream: true }, excludeRows)
-}
-
-/**
- * Exports a DB to either file or a variable (memory).
- * @param {string} dbName the DB which is to be exported.
- * @param {string} exportName optional - provide a filename to write the backup to a file
- * @param {boolean} stream optional - whether to perform a full backup
- * @param {function} filter optional - a filter function to clear out any un-wanted docs.
- * @return {*} either a readable stream or a string
- */
-exports.exportDB = async (dbName, { stream, filter, exportName } = {}) => {
-  // streaming a DB dump is a bit more complicated, can't close DB
-  if (stream) {
-    const db = dangerousGetDB(dbName)
-    const memStream = new MemoryStream()
-    memStream.on("end", async () => {
-      await closeDB(db)
-    })
-    db.dump(memStream, { filter })
-    return memStream
-  }
-
-  return doWithDB(dbName, async db => {
-    // Write the dump to file if required
-    if (exportName) {
-      const path = join(budibaseTempDir(), exportName)
-      const writeStream = fs.createWriteStream(path)
-      await db.dump(writeStream, { filter })
-
-      // Upload the dump to the object store if self hosted
-      if (env.SELF_HOSTED) {
-        await streamUpload(
-          ObjectStoreBuckets.BACKUPS,
-          join(dbName, exportName),
-          fs.createReadStream(path)
-        )
-      }
-
-      return fs.createReadStream(path)
-    }
-
-    // Stringify the dump in memory if required
-    const memStream = new MemoryStream()
-    let appString = ""
-    memStream.on("data", chunk => {
-      appString += chunk.toString()
-    })
-    await db.dump(memStream, { filter })
-    return appString
-  })
-}
-
 /**
  * Writes the provided contents to a temporary file, which can be used briefly.
  * @param {string} fileContents contents which will be written to a temp file.

From 9efb8f98bc4a105e00680eae97ed6d0916ada783 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 7 Oct 2022 21:08:20 +0100
Subject: [PATCH 008/151] Updating koa versions to align with pro - types were
 inaccurate and couldn't be imported correctly.

---
 packages/server/package.json            |   8 +-
 packages/server/src/api/routes/index.ts |   8 +-
 packages/server/yarn.lock               | 118 +++++-------------------
 packages/worker/package.json            |   1 -
 4 files changed, 36 insertions(+), 99 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 2f2409850e..dba6bfbe79 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -86,7 +86,7 @@
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
     "@google-cloud/firestore": "5.0.2",
-    "@koa/router": "8.0.0",
+    "@koa/router": "8.0.8",
     "@sendgrid/mail": "7.1.1",
     "@sentry/node": "6.17.7",
     "airtable": "0.10.1",
@@ -112,7 +112,7 @@
     "js-yaml": "4.1.0",
     "jsonschema": "1.4.0",
     "knex": "0.95.15",
-    "koa": "2.7.0",
+    "koa": "2.13.4",
     "koa-body": "4.2.0",
     "koa-compress": "4.0.1",
     "koa-connect": "2.1.0",
@@ -163,8 +163,8 @@
     "@types/global-agent": "2.1.1",
     "@types/google-spreadsheet": "3.1.5",
     "@types/jest": "27.5.1",
-    "@types/koa": "2.13.4",
-    "@types/koa__router": "8.0.0",
+    "@types/koa": "2.13.5",
+    "@types/koa__router": "8.0.11",
     "@types/lodash": "4.14.180",
     "@types/mongodb": "3.6.3",
     "@types/node": "14.18.20",
diff --git a/packages/server/src/api/routes/index.ts b/packages/server/src/api/routes/index.ts
index 64f5f9cb89..1cf34d4a68 100644
--- a/packages/server/src/api/routes/index.ts
+++ b/packages/server/src/api/routes/index.ts
@@ -25,11 +25,15 @@ import devRoutes from "./dev"
 import cloudRoutes from "./cloud"
 import migrationRoutes from "./migrations"
 import pluginRoutes from "./plugin"
+import Router from "@koa/router"
+import { api } from "@budibase/pro"
 
 export { default as staticRoutes } from "./static"
 export { default as publicRoutes } from "./public"
 
-export const mainRoutes = [
+const appBackupRoutes = api.appBackups
+const scheduleRoutes = api.schedules
+export const mainRoutes: Router[] = [
   authRoutes,
   deployRoutes,
   layoutRoutes,
@@ -59,4 +63,6 @@ export const mainRoutes = [
   rowRoutes,
   migrationRoutes,
   pluginRoutes,
+  appBackupRoutes,
+  scheduleRoutes,
 ]
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 18ab07c17f..bf95495815 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -2003,18 +2003,6 @@
   resolved "https://registry.yarnpkg.com/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796"
   integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==
 
-"@koa/router@8.0.0":
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/@koa/router/-/router-8.0.0.tgz#fd4ffa6f03d8293a04c023cb4a22b612401fbe70"
-  integrity sha512-P70CGOGs6JPu/mnrd9lt6ESzlBXLHT/uTK8+5U4M7Oapt8la/tiZv2c7X9jq0ksFsM59RH3AwJYzKOuavDcjIw==
-  dependencies:
-    debug "^3.1.0"
-    http-errors "^1.3.1"
-    koa-compose "^3.0.0"
-    methods "^1.0.1"
-    path-to-regexp "^1.1.1"
-    urijs "^1.19.0"
-
 "@koa/router@8.0.8":
   version "8.0.8"
   resolved "https://registry.yarnpkg.com/@koa/router/-/router-8.0.8.tgz#95f32d11373d03d89dcb63fabe9ac6f471095236"
@@ -2851,7 +2839,7 @@
   dependencies:
     "@types/koa" "*"
 
-"@types/koa@*", "@types/koa@2.13.4":
+"@types/koa@*":
   version "2.13.4"
   resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.13.4.tgz#10620b3f24a8027ef5cbae88b393d1b31205726b"
   integrity sha512-dfHYMfU+z/vKtQB7NUrthdAEiSvnLebvBjwHtfFmpZmB7em2N3WVQdHgnFq+xvyVgxW5jKDmjWfLD3lw4g4uTw==
@@ -2865,10 +2853,24 @@
     "@types/koa-compose" "*"
     "@types/node" "*"
 
-"@types/koa__router@8.0.0":
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/@types/koa__router/-/koa__router-8.0.0.tgz#057a7254a25df5bc93b42a1acacb2d99cd02d297"
-  integrity sha512-XaGqudqJyFOmByN+f9BrEIZEgLfBnvVtZlm/beuTxWpbWpMHiA+ZmA+mB5dsrbGemko61wUA+WG0jhUzMSq+JA==
+"@types/koa@2.13.5":
+  version "2.13.5"
+  resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.13.5.tgz#64b3ca4d54e08c0062e89ec666c9f45443b21a61"
+  integrity sha512-HSUOdzKz3by4fnqagwthW/1w/yJspTgppyyalPVbgZf8jQWvdIXcVW5h2DGtw4zYntOaeRGx49r1hxoPWrD4aA==
+  dependencies:
+    "@types/accepts" "*"
+    "@types/content-disposition" "*"
+    "@types/cookies" "*"
+    "@types/http-assert" "*"
+    "@types/http-errors" "*"
+    "@types/keygrip" "*"
+    "@types/koa-compose" "*"
+    "@types/node" "*"
+
+"@types/koa__router@8.0.11":
+  version "8.0.11"
+  resolved "https://registry.yarnpkg.com/@types/koa__router/-/koa__router-8.0.11.tgz#d7b37e6db934fc072ea1baa2ab92bc8ac4564f3e"
+  integrity sha512-WXgKWpBsbS14kzmzD9LeFapOIa678h7zvUHxDwXwSx4ETKXhXLVUAToX6jZ/U7EihM7qwyD9W/BZvB0MRu7MTQ==
   dependencies:
     "@types/koa" "*"
 
@@ -3523,7 +3525,7 @@ any-base@^1.1.0:
   resolved "https://registry.yarnpkg.com/any-base/-/any-base-1.1.0.tgz#ae101a62bc08a597b4c9ab5b7089d456630549fe"
   integrity sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg==
 
-any-promise@^1.0.0, any-promise@^1.1.0:
+any-promise@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
   integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==
@@ -4907,14 +4909,6 @@ cookiejar@^2.1.0:
   resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.3.tgz#fc7a6216e408e74414b90230050842dacda75acc"
   integrity sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==
 
-cookies@~0.7.1:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.7.3.tgz#7912ce21fbf2e8c2da70cf1c3f351aecf59dadfa"
-  integrity sha512-+gixgxYSgQLTaTIilDHAdlNPZDENDQernEMiIcZpYYP14zgHsCt4Ce1FEjFtcp6GefhozebB6orvhAAWx/IS0A==
-  dependencies:
-    depd "~1.1.2"
-    keygrip "~1.0.3"
-
 cookies@~0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.8.0.tgz#1293ce4b391740a8406e3c9870e828c4b54f3f90"
@@ -5138,13 +5132,6 @@ debug@^3.1.0, debug@^3.2.6, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
 debuglog@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@@ -5710,11 +5697,6 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-error-inject@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/error-inject/-/error-inject-1.0.0.tgz#e2b3d91b54aed672f309d950d154850fa11d4f37"
-  integrity sha512-JM8N6PytDbmIYm1IhPWlo8vr3NtfjhDY/1MhD/a5b/aad/USE8a0+NsqE9d5n+GVGmuNkPQWm4bFQWv18d8tMg==
-
 error-stack-parser@^2.0.6:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286"
@@ -7396,7 +7378,7 @@ http-errors@2.0.0:
     statuses "2.0.1"
     toidentifier "1.0.1"
 
-http-errors@^1.3.1, http-errors@^1.6.3, http-errors@^1.7.3, http-errors@~1.8.0:
+http-errors@^1.6.3, http-errors@^1.7.3, http-errors@~1.8.0:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
   integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
@@ -9265,11 +9247,6 @@ jws@^4.0.0:
     jwa "^2.0.0"
     safe-buffer "^5.0.1"
 
-keygrip@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.0.3.tgz#399d709f0aed2bab0a059e0cdd3a5023a053e1dc"
-  integrity sha512-/PpesirAIfaklxUzp4Yb7xBper9MwP6hNRA6BGGUFCgbJ+BM5CKBtsoxinNXkLHAr+GXS1/lSlF2rP7cv5Fl+g==
-
 keygrip@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.1.0.tgz#871b1681d5e159c62a445b0c74b615e0917e7226"
@@ -9355,13 +9332,6 @@ koa-body@4.2.0:
     co-body "^5.1.1"
     formidable "^1.1.1"
 
-koa-compose@^3.0.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-3.2.1.tgz#a85ccb40b7d986d8e5a345b3a1ace8eabcf54de7"
-  integrity sha512-8gen2cvKHIZ35eDEik5WOo8zbVp9t4cP8p4hW4uE55waxolLRexKKrqfCpwhGVppnB40jWeF8bZeTVg99eZgPw==
-  dependencies:
-    any-promise "^1.1.0"
-
 koa-compose@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-4.1.0.tgz#507306b9371901db41121c812e923d0d67d3e877"
@@ -9383,14 +9353,6 @@ koa-connect@2.1.0:
   resolved "https://registry.yarnpkg.com/koa-connect/-/koa-connect-2.1.0.tgz#16bce0a917c4cb24233aaac83fbc5b83804b4a1c"
   integrity sha512-O9pcFafHk0oQsBevlbTBlB9co+2RUQJ4zCzu3qJPmGlGoeEZkne+7gWDkecqDPSbCtED6LmhlQladxs6NjOnMQ==
 
-koa-convert@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/koa-convert/-/koa-convert-1.2.0.tgz#da40875df49de0539098d1700b50820cebcd21d0"
-  integrity sha512-K9XqjmEDStGX09v3oxR7t5uPRy0jqJdvodHa6wxWTHrTfDq0WUNnYTOOUZN6g8OM8oZQXprQASbiIXG2Ez8ehA==
-  dependencies:
-    co "^4.6.0"
-    koa-compose "^3.0.0"
-
 koa-convert@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/koa-convert/-/koa-convert-2.0.0.tgz#86a0c44d81d40551bae22fee6709904573eea4f5"
@@ -9492,37 +9454,7 @@ koa2-ratelimit@1.1.1:
   resolved "https://registry.yarnpkg.com/koa2-ratelimit/-/koa2-ratelimit-1.1.1.tgz#9c1d8257770e4a0a08063ba2ddcaf690fd457d23"
   integrity sha512-IpxGMdZqEhMykW0yYKGVB4vDEacPvSBH4hNpDL38ABj3W2KHNLujAljGEDg7eEjXvrRbXRSWXzANhV3c9v7nyg==
 
-koa@2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/koa/-/koa-2.7.0.tgz#7e00843506942b9d82c6cc33749f657c6e5e7adf"
-  integrity sha512-7ojD05s2Q+hFudF8tDLZ1CpCdVZw8JQELWSkcfG9bdtoTDzMmkRF6BQBU7JzIzCCOY3xd3tftiy/loHBUYaY2Q==
-  dependencies:
-    accepts "^1.3.5"
-    cache-content-type "^1.0.0"
-    content-disposition "~0.5.2"
-    content-type "^1.0.4"
-    cookies "~0.7.1"
-    debug "~3.1.0"
-    delegates "^1.0.0"
-    depd "^1.1.2"
-    destroy "^1.0.4"
-    error-inject "^1.0.0"
-    escape-html "^1.0.3"
-    fresh "~0.5.2"
-    http-assert "^1.3.0"
-    http-errors "^1.6.3"
-    is-generator-function "^1.0.7"
-    koa-compose "^4.1.0"
-    koa-convert "^1.2.0"
-    koa-is-json "^1.0.0"
-    on-finished "^2.3.0"
-    only "~0.0.2"
-    parseurl "^1.3.2"
-    statuses "^1.5.0"
-    type-is "^1.6.16"
-    vary "^1.1.2"
-
-koa@^2.13.1, koa@^2.13.4:
+koa@2.13.4, koa@^2.13.1, koa@^2.13.4:
   version "2.13.4"
   resolved "https://registry.yarnpkg.com/koa/-/koa-2.13.4.tgz#ee5b0cb39e0b8069c38d115139c774833d32462e"
   integrity sha512-43zkIKubNbnrULWlHdN5h1g3SEKXOEzoAlRsHOTFpnlDu8JlAOZSMJBLULusuXRequboiwJcj5vtYXKB3k7+2g==
@@ -10116,7 +10048,7 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-methods@^1.0.1, methods@^1.1.1, methods@^1.1.2:
+methods@^1.1.1, methods@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
@@ -11202,7 +11134,7 @@ path-parser@^6.1.0:
     search-params "3.0.0"
     tslib "^1.10.0"
 
-path-to-regexp@1.x, path-to-regexp@^1.1.1:
+path-to-regexp@1.x:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
   integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
@@ -14203,7 +14135,7 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-urijs@^1.19.0, urijs@^1.19.2:
+urijs@^1.19.2:
   version "1.19.11"
   resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.11.tgz#204b0d6b605ae80bea54bea39280cdb7c9f923cc"
   integrity sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 46927f8725..3ce04ac0f2 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -72,7 +72,6 @@
   "devDependencies": {
     "@types/jest": "26.0.23",
     "@types/koa": "2.13.4",
-    "@types/koa-router": "7.4.4",
     "@types/koa__router": "8.0.11",
     "@types/node": "14.18.20",
     "@types/uuid": "8.3.4",

From 1f36eec89a7faa297b6a589536b0110c6327639c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 10 Oct 2022 20:08:59 +0100
Subject: [PATCH 009/151] Some updates towards supporting attachments in app
 exports.

---
 .../backend-core/src/objectStore/index.ts     | 64 +++++++++++++++++--
 packages/builder/src/stores/portal/apps.js    | 13 ++++
 packages/server/src/api/controllers/backup.ts |  2 +-
 packages/server/src/api/controllers/cloud.js  |  2 +-
 .../src/api/controllers/static/index.ts       |  4 +-
 packages/server/src/constants/index.js        |  6 +-
 packages/server/src/sdk/app/export.ts         | 59 ++++++++---------
 .../src/utilities/fileSystem/utilities.js     |  2 +
 packages/worker/src/sdk/users/users.ts        | 11 +---
 9 files changed, 110 insertions(+), 53 deletions(-)

diff --git a/packages/backend-core/src/objectStore/index.ts b/packages/backend-core/src/objectStore/index.ts
index 17e002cc49..903ba28ed1 100644
--- a/packages/backend-core/src/objectStore/index.ts
+++ b/packages/backend-core/src/objectStore/index.ts
@@ -18,6 +18,10 @@ const STATE = {
   bucketCreationPromises: {},
 }
 
+type ListParams = {
+  ContinuationToken?: string
+}
+
 const CONTENT_TYPE_MAP: any = {
   html: "text/html",
   css: "text/css",
@@ -93,7 +97,7 @@ export const ObjectStore = (bucket: any) => {
  * Given an object store and a bucket name this will make sure the bucket exists,
  * if it does not exist then it will create it.
  */
-export const makeSureBucketExists = async (client: any, bucketName: any) => {
+export const makeSureBucketExists = async (client: any, bucketName: string) => {
   bucketName = sanitizeBucket(bucketName)
   try {
     await client
@@ -168,8 +172,8 @@ export const upload = async ({
  * through to the object store.
  */
 export const streamUpload = async (
-  bucketName: any,
-  filename: any,
+  bucketName: string,
+  filename: string,
   stream: any,
   extra = {}
 ) => {
@@ -202,7 +206,7 @@ export const streamUpload = async (
  * retrieves the contents of a file from the object store, if it is a known content type it
  * will be converted, otherwise it will be returned as a buffer stream.
  */
-export const retrieve = async (bucketName: any, filepath: any) => {
+export const retrieve = async (bucketName: string, filepath: string) => {
   const objectStore = ObjectStore(bucketName)
   const params = {
     Bucket: sanitizeBucket(bucketName),
@@ -217,10 +221,38 @@ export const retrieve = async (bucketName: any, filepath: any) => {
   }
 }
 
+export const listAllObjects = async (bucketName: string, path: string) => {
+  const objectStore = ObjectStore(bucketName)
+  const list = (params: ListParams = {}) => {
+    return objectStore
+      .listObjectsV2({
+        ...params,
+        Bucket: sanitizeBucket(bucketName),
+        Prefix: sanitizeKey(path),
+      })
+      .promise()
+  }
+  let isTruncated = false,
+    token,
+    objects: AWS.S3.Types.Object[] = []
+  do {
+    let params: ListParams = {}
+    if (token) {
+      params.ContinuationToken = token
+    }
+    const response = await list(params)
+    if (response.Contents) {
+      objects = objects.concat(response.Contents)
+    }
+    isTruncated = !!response.IsTruncated
+  } while (isTruncated)
+  return objects
+}
+
 /**
  * Same as retrieval function but puts to a temporary file.
  */
-export const retrieveToTmp = async (bucketName: any, filepath: any) => {
+export const retrieveToTmp = async (bucketName: string, filepath: string) => {
   bucketName = sanitizeBucket(bucketName)
   filepath = sanitizeKey(filepath)
   const data = await retrieve(bucketName, filepath)
@@ -229,10 +261,30 @@ export const retrieveToTmp = async (bucketName: any, filepath: any) => {
   return outputPath
 }
 
+export const retrieveDirectory = async (bucketName: string, path: string) => {
+  let writePath = join(budibaseTempDir(), v4())
+  const objects = await listAllObjects(bucketName, path)
+  let fullObjects = await Promise.all(
+    objects.map(obj => retrieve(bucketName, obj.Key!))
+  )
+  let count = 0
+  for (let obj of objects) {
+    const filename = obj.Key!
+    const data = fullObjects[count++]
+    const possiblePath = filename.split("/")
+    if (possiblePath.length > 1) {
+      const dirs = possiblePath.slice(0, possiblePath.length - 1)
+      fs.mkdirSync(join(writePath, ...dirs), { recursive: true })
+    }
+    fs.writeFileSync(join(writePath, ...possiblePath), data)
+  }
+  return writePath
+}
+
 /**
  * Delete a single file.
  */
-export const deleteFile = async (bucketName: any, filepath: any) => {
+export const deleteFile = async (bucketName: string, filepath: string) => {
   const objectStore = ObjectStore(bucketName)
   await makeSureBucketExists(objectStore, bucketName)
   const params = {
diff --git a/packages/builder/src/stores/portal/apps.js b/packages/builder/src/stores/portal/apps.js
index a83e35e941..f84e0c973c 100644
--- a/packages/builder/src/stores/portal/apps.js
+++ b/packages/builder/src/stores/portal/apps.js
@@ -2,6 +2,9 @@ import { writable } from "svelte/store"
 import { AppStatus } from "../../constants"
 import { API } from "api"
 
+// properties that should always come from the dev app, not the deployed
+const DEV_PROPS = ["updatedBy", "updatedAt"]
+
 const extractAppId = id => {
   const split = id?.split("_") || []
   return split.length ? split[split.length - 1] : null
@@ -57,9 +60,19 @@ export function createAppStore() {
           return
         }
 
+        let devProps = {}
+        if (appMap[id]) {
+          const entries = Object.entries(appMap[id]).filter(
+            ([key]) => DEV_PROPS.indexOf(key) !== -1
+          )
+          entries.forEach(entry => {
+            devProps[entry[0]] = entry[1]
+          })
+        }
         appMap[id] = {
           ...appMap[id],
           ...app,
+          ...devProps,
           prodId: app.appId,
           prodRev: app._rev,
         }
diff --git a/packages/server/src/api/controllers/backup.ts b/packages/server/src/api/controllers/backup.ts
index cd2ea415a4..878a81e110 100644
--- a/packages/server/src/api/controllers/backup.ts
+++ b/packages/server/src/api/controllers/backup.ts
@@ -9,7 +9,7 @@ export async function exportAppDump(ctx: any) {
   excludeRows = isQsTrue(excludeRows)
   const backupIdentifier = `${appName}-export-${new Date().getTime()}.txt`
   ctx.attachment(backupIdentifier)
-  ctx.body = await sdk.apps.exports.streamBackup(appId, excludeRows)
+  ctx.body = await sdk.apps.exports.streamExportApp(appId, excludeRows)
 
   await context.doInAppContext(appId, async () => {
     const appDb = context.getAppDB()
diff --git a/packages/server/src/api/controllers/cloud.js b/packages/server/src/api/controllers/cloud.js
index 55aa6bb548..5de5141d74 100644
--- a/packages/server/src/api/controllers/cloud.js
+++ b/packages/server/src/api/controllers/cloud.js
@@ -35,7 +35,7 @@ exports.exportApps = async ctx => {
     // only export the dev apps as they will be the latest, the user can republish the apps
     // in their self hosted environment
     if (isDevAppID(appId)) {
-      allDBs[app.name] = await sdk.apps.exports.exportDB(appId)
+      allDBs[app.name] = await sdk.apps.exports.exportApp(appId)
     }
   }
   const filename = `cloud-export-${new Date().getTime()}.txt`
diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts
index 08213c2cf8..f60dc12971 100644
--- a/packages/server/src/api/controllers/static/index.ts
+++ b/packages/server/src/api/controllers/static/index.ts
@@ -5,7 +5,7 @@ require("svelte/register")
 const send = require("koa-send")
 const { resolve, join } = require("../../../utilities/centralPath")
 const uuid = require("uuid")
-const { ObjectStoreBuckets } = require("../../../constants")
+const { ObjectStoreBuckets, ATTACHMENT_PATH } = require("../../../constants")
 const { processString } = require("@budibase/string-templates")
 const {
   loadHandlebarsFile,
@@ -90,7 +90,7 @@ export const uploadFile = async function (ctx: any) {
 
     return prepareUpload({
       file,
-      s3Key: `${ctx.appId}/attachments/${processedFileName}`,
+      s3Key: `${ctx.appId}/${ATTACHMENT_PATH}/${processedFileName}`,
       bucket: ObjectStoreBuckets.APPS,
     })
   })
diff --git a/packages/server/src/constants/index.js b/packages/server/src/constants/index.js
index c002c10f7b..c1a992f70e 100644
--- a/packages/server/src/constants/index.js
+++ b/packages/server/src/constants/index.js
@@ -1,6 +1,6 @@
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
 const { UserStatus } = require("@budibase/backend-core/constants")
-const { ObjectStoreBuckets } = require("@budibase/backend-core/objectStore")
+const { objectStore } = require("@budibase/backend-core")
 
 exports.JobQueues = {
   AUTOMATIONS: "automationQueue",
@@ -209,6 +209,8 @@ exports.AutomationErrors = {
 }
 
 // pass through the list from the auth/core lib
-exports.ObjectStoreBuckets = ObjectStoreBuckets
+exports.ObjectStoreBuckets = objectStore.ObjectStoreBuckets
+
+exports.ATTACHMENT_PATH = "attachments"
 
 exports.MAX_AUTOMATION_RECURRING_ERRORS = 5
diff --git a/packages/server/src/sdk/app/export.ts b/packages/server/src/sdk/app/export.ts
index 70c4446273..bf7ea81cbc 100644
--- a/packages/server/src/sdk/app/export.ts
+++ b/packages/server/src/sdk/app/export.ts
@@ -1,7 +1,10 @@
-import { closeDB, dangerousGetDB, doWithDB } from "@budibase/backend-core/db"
+import { db as dbCore } from "@budibase/backend-core"
 import { budibaseTempDir } from "../../utilities/budibaseDir"
-import { streamUpload } from "../../utilities/fileSystem/utilities"
-import { ObjectStoreBuckets } from "../../constants"
+import {
+  streamUpload,
+  retrieveDirectory,
+} from "../../utilities/fileSystem/utilities"
+import { ObjectStoreBuckets, ATTACHMENT_PATH } from "../../constants"
 import {
   LINK_USER_METADATA_PREFIX,
   TABLE_ROW_PREFIX,
@@ -25,16 +28,16 @@ export async function exportDB(
 ) {
   // streaming a DB dump is a bit more complicated, can't close DB
   if (opts?.stream) {
-    const db = dangerousGetDB(dbName)
+    const db = dbCore.dangerousGetDB(dbName)
     const memStream = new MemoryStream()
     memStream.on("end", async () => {
-      await closeDB(db)
+      await dbCore.closeDB(db)
     })
     db.dump(memStream, { filter: opts?.filter })
     return memStream
   }
 
-  return doWithDB(dbName, async (db: any) => {
+  return dbCore.doWithDB(dbName, async (db: any) => {
     // Write the dump to file if required
     if (opts?.exportName) {
       const path = join(budibaseTempDir(), opts?.exportName)
@@ -49,18 +52,17 @@ export async function exportDB(
           fs.createReadStream(path)
         )
       }
-
       return fs.createReadStream(path)
+    } else {
+      // Stringify the dump in memory if required
+      const memStream = new MemoryStream()
+      let appString = ""
+      memStream.on("data", (chunk: any) => {
+        appString += chunk.toString()
+      })
+      await db.dump(memStream, { filter: opts?.filter })
+      return appString
     }
-
-    // Stringify the dump in memory if required
-    const memStream = new MemoryStream()
-    let appString = ""
-    memStream.on("data", (chunk: any) => {
-      appString += chunk.toString()
-    })
-    await db.dump(memStream, { filter: opts?.filter })
-    return appString
   })
 }
 
@@ -81,12 +83,17 @@ function defineFilter(excludeRows?: boolean) {
  * @param {boolean} excludeRows Flag to state whether the export should include data.
  * @returns {*} either a string or a stream of the backup
  */
-async function backupAppData(
+export async function exportApp(
   appId: string,
-  config: any,
+  config?: any,
   excludeRows?: boolean
 ) {
-  return await exportDB(appId, {
+  const attachmentsPath = `${dbCore.getProdAppID(appId)}/${ATTACHMENT_PATH}`
+  const tmpPath = await retrieveDirectory(
+    ObjectStoreBuckets.APPS,
+    attachmentsPath
+  )
+  await exportDB(appId, {
     ...config,
     filter: defineFilter(excludeRows),
   })
@@ -98,16 +105,6 @@ async function backupAppData(
  * @param {boolean} excludeRows Flag to state whether the export should include data.
  * @returns {*} a readable stream of the backup which is written in real time
  */
-export async function streamBackup(appId: string, excludeRows: boolean) {
-  return await backupAppData(appId, { stream: true }, excludeRows)
-}
-
-/**
- * Takes a copy of the database state for an app to the object store.
- * @param {string} appId The ID of the app which is to be backed up.
- * @param {string} backupName The name of the backup located in the object store.
- * @return {*} a readable stream to the completed backup file
- */
-export async function performBackup(appId: string, backupName: string) {
-  return await backupAppData(appId, { exportName: backupName })
+export async function streamExportApp(appId: string, excludeRows: boolean) {
+  return await exportApp(appId, { stream: true }, excludeRows)
 }
diff --git a/packages/server/src/utilities/fileSystem/utilities.js b/packages/server/src/utilities/fileSystem/utilities.js
index 1c804c0142..01ba58f5bc 100644
--- a/packages/server/src/utilities/fileSystem/utilities.js
+++ b/packages/server/src/utilities/fileSystem/utilities.js
@@ -6,6 +6,7 @@ const {
   streamUpload,
   retrieve,
   retrieveToTmp,
+  retrieveDirectory,
   deleteFolder,
   uploadDirectory,
   downloadTarball,
@@ -27,6 +28,7 @@ exports.upload = upload
 exports.streamUpload = streamUpload
 exports.retrieve = retrieve
 exports.retrieveToTmp = retrieveToTmp
+exports.retrieveDirectory = retrieveDirectory
 exports.deleteFolder = deleteFolder
 exports.uploadDirectory = uploadDirectory
 exports.downloadTarball = downloadTarball
diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts
index 3b98c8ef52..ce03a12587 100644
--- a/packages/worker/src/sdk/users/users.ts
+++ b/packages/worker/src/sdk/users/users.ts
@@ -99,16 +99,7 @@ export const paginatedUsers = async ({
  */
 export const getUser = async (userId: string) => {
   const db = tenancy.getGlobalDB()
-  let user
-  try {
-    user = await db.get(userId)
-  } catch (err: any) {
-    // no user found, just return nothing
-    if (err.status === 404) {
-      return {}
-    }
-    throw err
-  }
+  let user = await db.get(userId)
   if (user) {
     delete user.password
   }

From 7c71f76b705374506ca24fed38e05216f15e9b21 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 11 Oct 2022 18:21:58 +0100
Subject: [PATCH 010/151] Export to tarball through tmp.

---
 packages/server/src/api/controllers/cloud.js  | 119 +++++++++---------
 packages/server/src/sdk/app/export.ts         | 116 +++++++++++------
 .../server/src/utilities/fileSystem/index.js  |   4 +
 3 files changed, 136 insertions(+), 103 deletions(-)

diff --git a/packages/server/src/api/controllers/cloud.js b/packages/server/src/api/controllers/cloud.js
index 5de5141d74..d766a7987f 100644
--- a/packages/server/src/api/controllers/cloud.js
+++ b/packages/server/src/api/controllers/cloud.js
@@ -1,24 +1,9 @@
 const env = require("../../environment")
 const { getAllApps, getGlobalDBName } = require("@budibase/backend-core/db")
-const { sendTempFile, readFileSync } = require("../../utilities/fileSystem")
-const { stringToReadStream } = require("../../utilities")
-const { getGlobalDB } = require("@budibase/backend-core/tenancy")
-const { create } = require("./application")
-const { getDocParams, DocumentType, isDevAppID } = require("../../db/utils")
+const { streamFile } = require("../../utilities/fileSystem")
+const { DocumentType, isDevAppID } = require("../../db/utils")
 const sdk = require("../../sdk")
 
-async function createApp(appName, appImport) {
-  const ctx = {
-    request: {
-      body: {
-        templateString: appImport,
-        name: appName,
-      },
-    },
-  }
-  return create(ctx)
-}
-
 exports.exportApps = async ctx => {
   if (env.SELF_HOSTED || !env.MULTI_TENANCY) {
     ctx.throw(400, "Exporting only allowed in multi-tenant cloud environments.")
@@ -27,29 +12,18 @@ exports.exportApps = async ctx => {
   const globalDBString = await sdk.apps.exports.exportDB(getGlobalDBName(), {
     filter: doc => !doc._id.startsWith(DocumentType.USER),
   })
-  let allDBs = {
-    global: globalDBString,
-  }
-  for (let app of apps) {
-    const appId = app.appId || app._id
-    // only export the dev apps as they will be the latest, the user can republish the apps
-    // in their self hosted environment
-    if (isDevAppID(appId)) {
-      allDBs[app.name] = await sdk.apps.exports.exportApp(appId)
-    }
-  }
-  const filename = `cloud-export-${new Date().getTime()}.txt`
-  ctx.attachment(filename)
-  ctx.body = sendTempFile(JSON.stringify(allDBs))
-}
-
-async function getAllDocType(db, docType) {
-  const response = await db.allDocs(
-    getDocParams(docType, null, {
-      include_docs: true,
-    })
+  // only export the dev apps as they will be the latest, the user can republish the apps
+  // in their self-hosted environment
+  let appIds = apps
+    .map(app => app.appId || app._id)
+    .filter(appId => isDevAppID(appId))
+  const tmpPath = await sdk.apps.exports.exportMultipleApps(
+    appIds,
+    globalDBString
   )
-  return response.rows.map(row => row.doc)
+  const filename = `cloud-export-${new Date().getTime()}.tar.gz`
+  ctx.attachment(filename)
+  ctx.body = streamFile(tmpPath)
 }
 
 async function hasBeenImported() {
@@ -77,30 +51,51 @@ exports.importApps = async ctx => {
       "Import file is required and environment must be fresh to import apps."
     )
   }
-  const importFile = ctx.request.files.importFile
-  const importString = readFileSync(importFile.path)
-  const dbs = JSON.parse(importString)
-  const globalDbImport = dbs.global
-  // remove from the list of apps
-  delete dbs.global
-  const globalDb = getGlobalDB()
-  // load the global db first
-  await globalDb.load(stringToReadStream(globalDbImport))
-  for (let [appName, appImport] of Object.entries(dbs)) {
-    await createApp(appName, appImport)
-  }
 
-  // if there are any users make sure to remove them
-  let users = await getAllDocType(globalDb, DocumentType.USER)
-  let userDeletionPromises = []
-  for (let user of users) {
-    userDeletionPromises.push(globalDb.remove(user._id, user._rev))
-  }
-  if (userDeletionPromises.length > 0) {
-    await Promise.all(userDeletionPromises)
-  }
-
-  await globalDb.bulkDocs(users)
+  // TODO: IMPLEMENT TARBALL EXTRACTION, APP IMPORT, ATTACHMENT IMPORT AND GLOBAL DB IMPORT
+  // async function getAllDocType(db, docType) {
+  //   const response = await db.allDocs(
+  //     getDocParams(docType, null, {
+  //       include_docs: true,
+  //     })
+  //   )
+  //   return response.rows.map(row => row.doc)
+  // }
+  // async function createApp(appName, appImport) {
+  //   const ctx = {
+  //     request: {
+  //       body: {
+  //         templateString: appImport,
+  //         name: appName,
+  //       },
+  //     },
+  //   }
+  //   return create(ctx)
+  // }
+  // const importFile = ctx.request.files.importFile
+  // const importString = readFileSync(importFile.path)
+  // const dbs = JSON.parse(importString)
+  // const globalDbImport = dbs.global
+  // // remove from the list of apps
+  // delete dbs.global
+  // const globalDb = getGlobalDB()
+  // // load the global db first
+  // await globalDb.load(stringToReadStream(globalDbImport))
+  // for (let [appName, appImport] of Object.entries(dbs)) {
+  //   await createApp(appName, appImport)
+  // }
+  //
+  // // if there are any users make sure to remove them
+  // let users = await getAllDocType(globalDb, DocumentType.USER)
+  // let userDeletionPromises = []
+  // for (let user of users) {
+  //   userDeletionPromises.push(globalDb.remove(user._id, user._rev))
+  // }
+  // if (userDeletionPromises.length > 0) {
+  //   await Promise.all(userDeletionPromises)
+  // }
+  //
+  // await globalDb.bulkDocs(users)
   ctx.body = {
     message: "Apps successfully imported.",
   }
diff --git a/packages/server/src/sdk/app/export.ts b/packages/server/src/sdk/app/export.ts
index bf7ea81cbc..ad71062483 100644
--- a/packages/server/src/sdk/app/export.ts
+++ b/packages/server/src/sdk/app/export.ts
@@ -1,9 +1,7 @@
 import { db as dbCore } from "@budibase/backend-core"
 import { budibaseTempDir } from "../../utilities/budibaseDir"
-import {
-  streamUpload,
-  retrieveDirectory,
-} from "../../utilities/fileSystem/utilities"
+import { retrieveDirectory } from "../../utilities/fileSystem/utilities"
+import { streamFile } from "../../utilities/fileSystem"
 import { ObjectStoreBuckets, ATTACHMENT_PATH } from "../../constants"
 import {
   LINK_USER_METADATA_PREFIX,
@@ -11,10 +9,35 @@ import {
   USER_METDATA_PREFIX,
 } from "../../db/utils"
 import fs from "fs"
-import env from "../../environment"
 import { join } from "path"
+const uuid = require("uuid/v4")
+const tar = require("tar")
 const MemoryStream = require("memorystream")
 
+const DB_EXPORT_FILE = "db.txt"
+const GLOBAL_DB_EXPORT_FILE = "global.txt"
+type ExportOpts = {
+  filter?: any
+  exportPath?: string
+  tar?: boolean
+  excludeRows?: boolean
+}
+
+function tarFiles(cwd: string, files: string[], exportName?: string) {
+  exportName = exportName ? `${exportName}.tar.gz` : "export.tar.gz"
+  tar.create(
+    {
+      sync: true,
+      gzip: true,
+      file: exportName,
+      recursive: true,
+      cwd,
+    },
+    files
+  )
+  return join(cwd, exportName)
+}
+
 /**
  * Exports a DB to either file or a variable (memory).
  * @param {string} dbName the DB which is to be exported.
@@ -22,36 +45,13 @@ const MemoryStream = require("memorystream")
  * a filter function or the name of the export.
  * @return {*} either a readable stream or a string
  */
-export async function exportDB(
-  dbName: string,
-  opts: { stream?: boolean; filter?: any; exportName?: string } = {}
-) {
-  // streaming a DB dump is a bit more complicated, can't close DB
-  if (opts?.stream) {
-    const db = dbCore.dangerousGetDB(dbName)
-    const memStream = new MemoryStream()
-    memStream.on("end", async () => {
-      await dbCore.closeDB(db)
-    })
-    db.dump(memStream, { filter: opts?.filter })
-    return memStream
-  }
-
+export async function exportDB(dbName: string, opts: ExportOpts = {}) {
   return dbCore.doWithDB(dbName, async (db: any) => {
     // Write the dump to file if required
-    if (opts?.exportName) {
-      const path = join(budibaseTempDir(), opts?.exportName)
+    if (opts?.exportPath) {
+      const path = opts?.exportPath
       const writeStream = fs.createWriteStream(path)
       await db.dump(writeStream, { filter: opts?.filter })
-
-      // Upload the dump to the object store if self-hosted
-      if (env.SELF_HOSTED) {
-        await streamUpload(
-          ObjectStoreBuckets.BACKUPS,
-          join(dbName, opts?.exportName),
-          fs.createReadStream(path)
-        )
-      }
       return fs.createReadStream(path)
     } else {
       // Stringify the dump in memory if required
@@ -79,24 +79,57 @@ function defineFilter(excludeRows?: boolean) {
  * Local utility to back up the database state for an app, excluding global user
  * data or user relationships.
  * @param {string} appId The app to back up
- * @param {object} config Config to send to export DB
- * @param {boolean} excludeRows Flag to state whether the export should include data.
+ * @param {object} config Config to send to export DB/attachment export
  * @returns {*} either a string or a stream of the backup
  */
-export async function exportApp(
-  appId: string,
-  config?: any,
-  excludeRows?: boolean
-) {
-  const attachmentsPath = `${dbCore.getProdAppID(appId)}/${ATTACHMENT_PATH}`
+export async function exportApp(appId: string, config?: ExportOpts) {
+  const prodAppId = dbCore.getProdAppID(appId)
+  const attachmentsPath = `${prodAppId}/${ATTACHMENT_PATH}`
+  // export attachments to tmp
   const tmpPath = await retrieveDirectory(
     ObjectStoreBuckets.APPS,
     attachmentsPath
   )
+  // move out of app directory, simplify structure
+  fs.renameSync(join(tmpPath, attachmentsPath), join(tmpPath, ATTACHMENT_PATH))
+  // remove the old app directory created by object export
+  fs.rmdirSync(join(tmpPath, prodAppId))
+  // enforce an export of app DB to the tmp path
+  const dbPath = join(tmpPath, DB_EXPORT_FILE)
   await exportDB(appId, {
     ...config,
-    filter: defineFilter(excludeRows),
+    filter: defineFilter(config?.excludeRows),
+    exportPath: dbPath,
   })
+  // if tar requested, return where the tarball is
+  if (config?.tar) {
+    // now the tmpPath contains both the DB export and attachments, tar this
+    return tarFiles(tmpPath, [ATTACHMENT_PATH, DB_EXPORT_FILE])
+  }
+  // tar not requested, turn the directory where export is
+  else {
+    return tmpPath
+  }
+}
+
+export async function exportMultipleApps(
+  appIds: string[],
+  globalDbContents?: string
+) {
+  const tmpPath = join(budibaseTempDir(), uuid())
+  let exportPromises: Promise<void>[] = []
+  const exportAndMove = async (appId: string) => {
+    const path = await exportApp(appId)
+    await fs.promises.rename(path, join(tmpPath, appId))
+  }
+  for (let appId of appIds) {
+    exportPromises.push(exportAndMove(appId))
+  }
+  await Promise.all(exportPromises)
+  if (globalDbContents) {
+    fs.writeFileSync(join(tmpPath, GLOBAL_DB_EXPORT_FILE), globalDbContents)
+  }
+  return tarFiles(tmpPath, [...appIds, GLOBAL_DB_EXPORT_FILE])
 }
 
 /**
@@ -106,5 +139,6 @@ export async function exportApp(
  * @returns {*} a readable stream of the backup which is written in real time
  */
 export async function streamExportApp(appId: string, excludeRows: boolean) {
-  return await exportApp(appId, { stream: true }, excludeRows)
+  const tmpPath = await exportApp(appId, { excludeRows, tar: true })
+  return streamFile(tmpPath)
 }
diff --git a/packages/server/src/utilities/fileSystem/index.js b/packages/server/src/utilities/fileSystem/index.js
index 656ba4816c..69bf38c819 100644
--- a/packages/server/src/utilities/fileSystem/index.js
+++ b/packages/server/src/utilities/fileSystem/index.js
@@ -112,6 +112,10 @@ exports.apiFileReturn = contents => {
   return fs.createReadStream(path)
 }
 
+exports.streamFile = path => {
+  return fs.createReadStream(path)
+}
+
 /**
  * Writes the provided contents to a temporary file, which can be used briefly.
  * @param {string} fileContents contents which will be written to a temp file.

From f237befbce935481aca9c6760d58c4d55d5e0756 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 11 Oct 2022 19:28:13 +0100
Subject: [PATCH 011/151] Some fixes + cleanup of tmp directory.

---
 .../backend-core/src/objectStore/index.ts     |  1 +
 packages/server/src/api/controllers/backup.ts |  2 +-
 packages/server/src/sdk/app/export.ts         | 43 +++++++++++++------
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/packages/backend-core/src/objectStore/index.ts b/packages/backend-core/src/objectStore/index.ts
index 903ba28ed1..4c88166375 100644
--- a/packages/backend-core/src/objectStore/index.ts
+++ b/packages/backend-core/src/objectStore/index.ts
@@ -263,6 +263,7 @@ export const retrieveToTmp = async (bucketName: string, filepath: string) => {
 
 export const retrieveDirectory = async (bucketName: string, path: string) => {
   let writePath = join(budibaseTempDir(), v4())
+  fs.mkdirSync(writePath)
   const objects = await listAllObjects(bucketName, path)
   let fullObjects = await Promise.all(
     objects.map(obj => retrieve(bucketName, obj.Key!))
diff --git a/packages/server/src/api/controllers/backup.ts b/packages/server/src/api/controllers/backup.ts
index 878a81e110..7fe197de76 100644
--- a/packages/server/src/api/controllers/backup.ts
+++ b/packages/server/src/api/controllers/backup.ts
@@ -7,7 +7,7 @@ export async function exportAppDump(ctx: any) {
   let { appId, excludeRows } = ctx.query
   const appName = decodeURI(ctx.query.appname)
   excludeRows = isQsTrue(excludeRows)
-  const backupIdentifier = `${appName}-export-${new Date().getTime()}.txt`
+  const backupIdentifier = `${appName}-export-${new Date().getTime()}.tar.gz`
   ctx.attachment(backupIdentifier)
   ctx.body = await sdk.apps.exports.streamExportApp(appId, excludeRows)
 
diff --git a/packages/server/src/sdk/app/export.ts b/packages/server/src/sdk/app/export.ts
index ad71062483..68aa873129 100644
--- a/packages/server/src/sdk/app/export.ts
+++ b/packages/server/src/sdk/app/export.ts
@@ -23,19 +23,19 @@ type ExportOpts = {
   excludeRows?: boolean
 }
 
-function tarFiles(cwd: string, files: string[], exportName?: string) {
-  exportName = exportName ? `${exportName}.tar.gz` : "export.tar.gz"
+function tarFilesToTmp(tmpDir: string, files: string[]) {
+  const exportFile = join(budibaseTempDir(), `${uuid()}.tar.gz`)
   tar.create(
     {
       sync: true,
       gzip: true,
-      file: exportName,
+      file: exportFile,
       recursive: true,
-      cwd,
+      cwd: tmpDir,
     },
     files
   )
-  return join(cwd, exportName)
+  return exportFile
 }
 
 /**
@@ -52,7 +52,7 @@ export async function exportDB(dbName: string, opts: ExportOpts = {}) {
       const path = opts?.exportPath
       const writeStream = fs.createWriteStream(path)
       await db.dump(writeStream, { filter: opts?.filter })
-      return fs.createReadStream(path)
+      return path
     } else {
       // Stringify the dump in memory if required
       const memStream = new MemoryStream()
@@ -90,10 +90,16 @@ export async function exportApp(appId: string, config?: ExportOpts) {
     ObjectStoreBuckets.APPS,
     attachmentsPath
   )
-  // move out of app directory, simplify structure
-  fs.renameSync(join(tmpPath, attachmentsPath), join(tmpPath, ATTACHMENT_PATH))
-  // remove the old app directory created by object export
-  fs.rmdirSync(join(tmpPath, prodAppId))
+  const downloadedPath = join(tmpPath, attachmentsPath),
+    tmpAttachmentPath = join(tmpPath, ATTACHMENT_PATH)
+  if (fs.existsSync(downloadedPath)) {
+    // move out of app directory, simplify structure
+    fs.renameSync(downloadedPath, tmpAttachmentPath)
+    // remove the old app directory created by object export
+    fs.rmdirSync(join(tmpPath, prodAppId))
+  } else {
+    fs.mkdirSync(tmpAttachmentPath)
+  }
   // enforce an export of app DB to the tmp path
   const dbPath = join(tmpPath, DB_EXPORT_FILE)
   await exportDB(appId, {
@@ -104,7 +110,10 @@ export async function exportApp(appId: string, config?: ExportOpts) {
   // if tar requested, return where the tarball is
   if (config?.tar) {
     // now the tmpPath contains both the DB export and attachments, tar this
-    return tarFiles(tmpPath, [ATTACHMENT_PATH, DB_EXPORT_FILE])
+    const tarPath = tarFilesToTmp(tmpPath, [ATTACHMENT_PATH, DB_EXPORT_FILE])
+    // cleanup the tmp export files as tarball returned
+    fs.rmSync(tmpPath, { recursive: true, force: true })
+    return tarPath
   }
   // tar not requested, turn the directory where export is
   else {
@@ -112,6 +121,13 @@ export async function exportApp(appId: string, config?: ExportOpts) {
   }
 }
 
+/**
+ * Export all apps + global DB (if supplied) to a single tarball, this includes
+ * the attachments for each app as well.
+ * @param {string[]} appIds The IDs of the apps to be exported.
+ * @param {string} globalDbContents The contents of the global DB to export as well.
+ * @return {string} The path to the tarball.
+ */
 export async function exportMultipleApps(
   appIds: string[],
   globalDbContents?: string
@@ -129,7 +145,10 @@ export async function exportMultipleApps(
   if (globalDbContents) {
     fs.writeFileSync(join(tmpPath, GLOBAL_DB_EXPORT_FILE), globalDbContents)
   }
-  return tarFiles(tmpPath, [...appIds, GLOBAL_DB_EXPORT_FILE])
+  const tarPath = tarFilesToTmp(tmpPath, [...appIds, GLOBAL_DB_EXPORT_FILE])
+  // clear up the tmp path now tarball generated
+  fs.rmSync(tmpPath, { recursive: true, force: true })
+  return tarPath
 }
 
 /**

From 19133f08e6d3190b8600dccd6cfd7a34d242db57 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 11 Oct 2022 20:25:22 +0100
Subject: [PATCH 012/151] Adding import functionality - still need to update
 the attachments URL.

---
 .../backend-core/src/objectStore/index.ts     | 26 ++++---
 .../server/src/api/controllers/application.ts | 13 +---
 .../src/api/controllers/static/index.ts       |  4 +-
 packages/server/src/constants/index.js        |  2 +-
 packages/server/src/sdk/app/constants.ts      |  4 ++
 .../src/sdk/app/{export.ts => exports.ts}     | 15 ++--
 packages/server/src/sdk/app/imports.ts        | 71 +++++++++++++++++++
 packages/server/src/sdk/app/index.ts          |  3 +-
 .../server/src/utilities/fileSystem/index.js  | 15 ----
 9 files changed, 107 insertions(+), 46 deletions(-)
 create mode 100644 packages/server/src/sdk/app/constants.ts
 rename packages/server/src/sdk/app/{export.ts => exports.ts} (93%)
 create mode 100644 packages/server/src/sdk/app/imports.ts

diff --git a/packages/backend-core/src/objectStore/index.ts b/packages/backend-core/src/objectStore/index.ts
index 4c88166375..e210f9dccc 100644
--- a/packages/backend-core/src/objectStore/index.ts
+++ b/packages/backend-core/src/objectStore/index.ts
@@ -36,16 +36,16 @@ const STRING_CONTENT_TYPES = [
 ]
 
 // does normal sanitization and then swaps dev apps to apps
-export function sanitizeKey(input: any) {
+export function sanitizeKey(input: string) {
   return sanitize(sanitizeBucket(input)).replace(/\\/g, "/")
 }
 
 // simply handles the dev app to app conversion
-export function sanitizeBucket(input: any) {
+export function sanitizeBucket(input: string) {
   return input.replace(new RegExp(APP_DEV_PREFIX, "g"), APP_PREFIX)
 }
 
-function publicPolicy(bucketName: any) {
+function publicPolicy(bucketName: string) {
   return {
     Version: "2012-10-17",
     Statement: [
@@ -73,7 +73,7 @@ const PUBLIC_BUCKETS = [
  * @return {Object} an S3 object store object, check S3 Nodejs SDK for usage.
  * @constructor
  */
-export const ObjectStore = (bucket: any) => {
+export const ObjectStore = (bucket: string) => {
   const config: any = {
     s3ForcePathStyle: true,
     signatureVersion: "v4",
@@ -295,7 +295,7 @@ export const deleteFile = async (bucketName: string, filepath: string) => {
   return objectStore.deleteObject(params)
 }
 
-export const deleteFiles = async (bucketName: any, filepaths: any) => {
+export const deleteFiles = async (bucketName: string, filepaths: string[]) => {
   const objectStore = ObjectStore(bucketName)
   await makeSureBucketExists(objectStore, bucketName)
   const params = {
@@ -311,8 +311,8 @@ export const deleteFiles = async (bucketName: any, filepaths: any) => {
  * Delete a path, including everything within.
  */
 export const deleteFolder = async (
-  bucketName: any,
-  folder: any
+  bucketName: string,
+  folder: string
 ): Promise<any> => {
   bucketName = sanitizeBucket(bucketName)
   folder = sanitizeKey(folder)
@@ -345,9 +345,9 @@ export const deleteFolder = async (
 }
 
 export const uploadDirectory = async (
-  bucketName: any,
-  localPath: any,
-  bucketPath: any
+  bucketName: string,
+  localPath: string,
+  bucketPath: string
 ) => {
   bucketName = sanitizeBucket(bucketName)
   let uploads = []
@@ -379,7 +379,11 @@ exports.downloadTarballDirect = async (
   await streamPipeline(response.body, zlib.Unzip(), tar.extract(path))
 }
 
-export const downloadTarball = async (url: any, bucketName: any, path: any) => {
+export const downloadTarball = async (
+  url: string,
+  bucketName: string,
+  path: string
+) => {
   bucketName = sanitizeBucket(bucketName)
   path = sanitizeKey(path)
   const response = await fetch(url)
diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts
index a7caf85e94..87bc7d0033 100644
--- a/packages/server/src/api/controllers/application.ts
+++ b/packages/server/src/api/controllers/application.ts
@@ -5,11 +5,7 @@ import {
   createRoutingView,
   createAllSearchIndex,
 } from "../../db/views/staticViews"
-import {
-  getTemplateStream,
-  createApp,
-  deleteApp,
-} from "../../utilities/fileSystem"
+import { createApp, deleteApp } from "../../utilities/fileSystem"
 import {
   generateAppID,
   getLayoutParams,
@@ -50,6 +46,7 @@ import { errors, events, migrations } from "@budibase/backend-core"
 import { App, Layout, Screen, MigrationType } from "@budibase/types"
 import { BASE_LAYOUT_PROP_IDS } from "../../constants/layouts"
 import { enrichPluginURLs } from "../../utilities/plugins"
+import sdk from "../../sdk"
 
 const URL_REGEX_SLASH = /\/|\\/g
 
@@ -153,11 +150,7 @@ async function createInstance(template: any) {
       throw "Error loading database dump from memory."
     }
   } else if (template && template.useTemplate === "true") {
-    /* istanbul ignore next */
-    const { ok } = await db.load(await getTemplateStream(template))
-    if (!ok) {
-      throw "Error loading database dump from template."
-    }
+    await sdk.apps.imports.importApp(appId, db, template)
   } else {
     // create the users table
     await db.put(USERS_TABLE_SCHEMA)
diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts
index f60dc12971..ec2ea70820 100644
--- a/packages/server/src/api/controllers/static/index.ts
+++ b/packages/server/src/api/controllers/static/index.ts
@@ -5,7 +5,7 @@ require("svelte/register")
 const send = require("koa-send")
 const { resolve, join } = require("../../../utilities/centralPath")
 const uuid = require("uuid")
-const { ObjectStoreBuckets, ATTACHMENT_PATH } = require("../../../constants")
+const { ObjectStoreBuckets, ATTACHMENT_DIR } = require("../../../constants")
 const { processString } = require("@budibase/string-templates")
 const {
   loadHandlebarsFile,
@@ -90,7 +90,7 @@ export const uploadFile = async function (ctx: any) {
 
     return prepareUpload({
       file,
-      s3Key: `${ctx.appId}/${ATTACHMENT_PATH}/${processedFileName}`,
+      s3Key: `${ctx.appId}/${ATTACHMENT_DIR}/${processedFileName}`,
       bucket: ObjectStoreBuckets.APPS,
     })
   })
diff --git a/packages/server/src/constants/index.js b/packages/server/src/constants/index.js
index c1a992f70e..b9362cecf6 100644
--- a/packages/server/src/constants/index.js
+++ b/packages/server/src/constants/index.js
@@ -211,6 +211,6 @@ exports.AutomationErrors = {
 // pass through the list from the auth/core lib
 exports.ObjectStoreBuckets = objectStore.ObjectStoreBuckets
 
-exports.ATTACHMENT_PATH = "attachments"
+exports.ATTACHMENT_DIR = "attachments"
 
 exports.MAX_AUTOMATION_RECURRING_ERRORS = 5
diff --git a/packages/server/src/sdk/app/constants.ts b/packages/server/src/sdk/app/constants.ts
new file mode 100644
index 0000000000..e831172683
--- /dev/null
+++ b/packages/server/src/sdk/app/constants.ts
@@ -0,0 +1,4 @@
+import { ATTACHMENT_DIR as attachmentDir } from "../../constants"
+export const DB_EXPORT_FILE = "db.txt"
+export const ATTACHMENT_DIR = attachmentDir
+export const GLOBAL_DB_EXPORT_FILE = "global.txt"
diff --git a/packages/server/src/sdk/app/export.ts b/packages/server/src/sdk/app/exports.ts
similarity index 93%
rename from packages/server/src/sdk/app/export.ts
rename to packages/server/src/sdk/app/exports.ts
index 68aa873129..1ecf69de68 100644
--- a/packages/server/src/sdk/app/export.ts
+++ b/packages/server/src/sdk/app/exports.ts
@@ -2,20 +2,23 @@ import { db as dbCore } from "@budibase/backend-core"
 import { budibaseTempDir } from "../../utilities/budibaseDir"
 import { retrieveDirectory } from "../../utilities/fileSystem/utilities"
 import { streamFile } from "../../utilities/fileSystem"
-import { ObjectStoreBuckets, ATTACHMENT_PATH } from "../../constants"
+import { ObjectStoreBuckets } from "../../constants"
 import {
   LINK_USER_METADATA_PREFIX,
   TABLE_ROW_PREFIX,
   USER_METDATA_PREFIX,
 } from "../../db/utils"
+import {
+  DB_EXPORT_FILE,
+  GLOBAL_DB_EXPORT_FILE,
+  ATTACHMENT_DIR,
+} from "./constants"
 import fs from "fs"
 import { join } from "path"
 const uuid = require("uuid/v4")
 const tar = require("tar")
 const MemoryStream = require("memorystream")
 
-const DB_EXPORT_FILE = "db.txt"
-const GLOBAL_DB_EXPORT_FILE = "global.txt"
 type ExportOpts = {
   filter?: any
   exportPath?: string
@@ -84,14 +87,14 @@ function defineFilter(excludeRows?: boolean) {
  */
 export async function exportApp(appId: string, config?: ExportOpts) {
   const prodAppId = dbCore.getProdAppID(appId)
-  const attachmentsPath = `${prodAppId}/${ATTACHMENT_PATH}`
+  const attachmentsPath = `${prodAppId}/${ATTACHMENT_DIR}`
   // export attachments to tmp
   const tmpPath = await retrieveDirectory(
     ObjectStoreBuckets.APPS,
     attachmentsPath
   )
   const downloadedPath = join(tmpPath, attachmentsPath),
-    tmpAttachmentPath = join(tmpPath, ATTACHMENT_PATH)
+    tmpAttachmentPath = join(tmpPath, ATTACHMENT_DIR)
   if (fs.existsSync(downloadedPath)) {
     // move out of app directory, simplify structure
     fs.renameSync(downloadedPath, tmpAttachmentPath)
@@ -110,7 +113,7 @@ export async function exportApp(appId: string, config?: ExportOpts) {
   // if tar requested, return where the tarball is
   if (config?.tar) {
     // now the tmpPath contains both the DB export and attachments, tar this
-    const tarPath = tarFilesToTmp(tmpPath, [ATTACHMENT_PATH, DB_EXPORT_FILE])
+    const tarPath = tarFilesToTmp(tmpPath, [ATTACHMENT_DIR, DB_EXPORT_FILE])
     // cleanup the tmp export files as tarball returned
     fs.rmSync(tmpPath, { recursive: true, force: true })
     return tarPath
diff --git a/packages/server/src/sdk/app/imports.ts b/packages/server/src/sdk/app/imports.ts
new file mode 100644
index 0000000000..96629db39a
--- /dev/null
+++ b/packages/server/src/sdk/app/imports.ts
@@ -0,0 +1,71 @@
+import { db as dbCore } from "@budibase/backend-core"
+import { budibaseTempDir } from "../../utilities/budibaseDir"
+import { DB_EXPORT_FILE, ATTACHMENT_DIR } from "./constants"
+import { uploadDirectory } from "../../utilities/fileSystem/utilities"
+import { ObjectStoreBuckets } from "../../constants"
+import { join } from "path"
+import fs from "fs"
+const uuid = require("uuid/v4")
+const tar = require("tar")
+
+type TemplateType = {
+  file?: {
+    type: string
+    path: string
+  }
+  key?: string
+}
+
+/**
+ * This function manages temporary template files which are stored by Koa.
+ * @param {Object} template The template object retrieved from the Koa context object.
+ * @returns {Object} Returns a fs read stream which can be loaded into the database.
+ */
+async function getTemplateStream(template: TemplateType) {
+  if (template.file) {
+    return fs.createReadStream(template.file.path)
+  } else if (template.key) {
+    const [type, name] = template.key.split("/")
+    const tmpPath = await exports.downloadTemplate(type, name)
+    return fs.createReadStream(join(tmpPath, name, "db", "dump.txt"))
+  }
+}
+
+export async function importApp(
+  appId: string,
+  db: PouchDB.Database,
+  template: TemplateType
+) {
+  let prodAppId = dbCore.getProdAppID(appId)
+  let dbStream: any
+  if (template.file && template.file.type === "application/gzip") {
+    const tmpPath = join(budibaseTempDir(), uuid())
+    fs.mkdirSync(tmpPath)
+    // extract the tarball
+    tar.extract({
+      sync: true,
+      cwd: tmpPath,
+      file: template.file.path,
+    })
+    const attachmentPath = join(tmpPath, ATTACHMENT_DIR)
+    // have to handle object import
+    if (fs.existsSync(attachmentPath)) {
+      await uploadDirectory(
+        ObjectStoreBuckets.APPS,
+        attachmentPath,
+        join(prodAppId, ATTACHMENT_DIR)
+      )
+    }
+    dbStream = fs.createReadStream(join(tmpPath, DB_EXPORT_FILE))
+  } else {
+    dbStream = await getTemplateStream(template)
+  }
+  // @ts-ignore
+  const { ok } = await db.load(dbStream)
+  if (!ok) {
+    throw "Error loading database dump from template."
+  } else {
+    // TODO: need to iterate over attachments and update their URLs
+  }
+  return ok
+}
diff --git a/packages/server/src/sdk/app/index.ts b/packages/server/src/sdk/app/index.ts
index 3927539bc8..5ac7c04b2c 100644
--- a/packages/server/src/sdk/app/index.ts
+++ b/packages/server/src/sdk/app/index.ts
@@ -1 +1,2 @@
-export * as exports from "./export"
+export * as exports from "./exports"
+export * as imports from "./imports"
diff --git a/packages/server/src/utilities/fileSystem/index.js b/packages/server/src/utilities/fileSystem/index.js
index 69bf38c819..1eb8a481e5 100644
--- a/packages/server/src/utilities/fileSystem/index.js
+++ b/packages/server/src/utilities/fileSystem/index.js
@@ -74,21 +74,6 @@ exports.checkDevelopmentEnvironment = () => {
   }
 }
 
-/**
- * This function manages temporary template files which are stored by Koa.
- * @param {Object} template The template object retrieved from the Koa context object.
- * @returns {Object} Returns an fs read stream which can be loaded into the database.
- */
-exports.getTemplateStream = async template => {
-  if (template.file) {
-    return fs.createReadStream(template.file.path)
-  } else {
-    const [type, name] = template.key.split("/")
-    const tmpPath = await exports.downloadTemplate(type, name)
-    return fs.createReadStream(join(tmpPath, name, "db", "dump.txt"))
-  }
-}
-
 /**
  * Used to retrieve a handlebars file from the system which will be used as a template.
  * This is allowable as the template handlebars files should be static and identical across

From 8210233f3655575c66b59ddec4f6bfbfb17d6d73 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Wed, 12 Oct 2022 10:22:54 +0100
Subject: [PATCH 013/151] Edit clone of column

---
 packages/builder/src/components/backend/DataTable/Table.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte
index 85b271dee8..adc35a333d 100644
--- a/packages/builder/src/components/backend/DataTable/Table.svelte
+++ b/packages/builder/src/components/backend/DataTable/Table.svelte
@@ -8,6 +8,7 @@
   import CreateEditRow from "./modals/CreateEditRow.svelte"
   import CreateEditUser from "./modals/CreateEditUser.svelte"
   import CreateEditColumn from "./modals/CreateEditColumn.svelte"
+  import { cloneDeep } from "lodash/fp"
   import {
     TableNames,
     UNEDITABLE_USER_FIELDS,
@@ -110,7 +111,7 @@
   }
 
   const editColumn = field => {
-    editableColumn = schema?.[field]
+    editableColumn = cloneDeep(schema?.[field])
     if (editableColumn) {
       editColumnModal.show()
     }

From 8d7f40e443a6ee81f6cdfdc8651f98b4b45d927b Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 12 Oct 2022 17:02:23 +0100
Subject: [PATCH 014/151] Refactoring more to Typescript, adding the ability to
 use the _find API of CouchDB.

---
 .../src/db/{index.js => index.ts}             |  54 ++++--
 packages/backend-core/src/db/utils.ts         |  30 +---
 .../server/src/api/controllers/application.ts |   2 +-
 packages/server/src/api/controllers/backup.ts |   2 +-
 packages/server/src/api/controllers/cloud.js  |   7 +-
 .../src/api/controllers/table/bulkFormula.js  |   7 +-
 .../src/api/controllers/table/external.js     |   8 +-
 .../server/src/api/controllers/table/index.js |   8 +-
 .../src/api/controllers/table/internal.ts     |  10 +-
 .../server/src/api/controllers/table/utils.ts |  40 -----
 .../server/src/api/controllers/view/index.js  |   4 +-
 .../server/src/automations/automationUtils.js |   4 +-
 .../functions/backfill/app/tables.ts          |  19 +--
 .../src/sdk/app/{ => backups}/constants.ts    |   0
 .../src/sdk/app/{ => backups}/exports.ts      |  10 +-
 .../src/sdk/app/{ => backups}/imports.ts      |  33 +++-
 packages/server/src/sdk/app/backups/index.ts  |   7 +
 packages/server/src/sdk/app/index.ts          |   2 -
 packages/server/src/sdk/app/tables/index.ts   |  60 +++++++
 packages/server/src/sdk/index.ts              |   6 +-
 packages/types/package.json                   |   3 +-
 packages/types/src/core/db.ts                 |  22 +++
 packages/types/src/core/index.ts              |   1 +
 packages/types/src/documents/app/table.ts     |   1 +
 packages/types/src/index.ts                   |   1 +
 packages/types/yarn.lock                      | 158 ++++++++++++++++++
 26 files changed, 369 insertions(+), 130 deletions(-)
 rename packages/backend-core/src/db/{index.js => index.ts} (58%)
 rename packages/server/src/sdk/app/{ => backups}/constants.ts (100%)
 rename packages/server/src/sdk/app/{ => backups}/exports.ts (94%)
 rename packages/server/src/sdk/app/{ => backups}/imports.ts (62%)
 create mode 100644 packages/server/src/sdk/app/backups/index.ts
 delete mode 100644 packages/server/src/sdk/app/index.ts
 create mode 100644 packages/server/src/sdk/app/tables/index.ts
 create mode 100644 packages/types/src/core/db.ts
 create mode 100644 packages/types/src/core/index.ts

diff --git a/packages/backend-core/src/db/index.js b/packages/backend-core/src/db/index.ts
similarity index 58%
rename from packages/backend-core/src/db/index.js
rename to packages/backend-core/src/db/index.ts
index aa6f7ebc2c..016155033a 100644
--- a/packages/backend-core/src/db/index.js
+++ b/packages/backend-core/src/db/index.ts
@@ -1,8 +1,11 @@
-const pouch = require("./pouch")
-const env = require("../environment")
+import pouch from "./pouch"
+import env from "../environment"
+import { checkSlashesInUrl } from "../helpers"
+import fetch from "node-fetch"
+import { PouchOptions, CouchFindOptions } from "@budibase/types"
 
-const openDbs = []
-let PouchDB
+const openDbs: string[] = []
+let PouchDB: any
 let initialised = false
 const dbList = new Set()
 
@@ -14,8 +17,8 @@ if (env.MEMORY_LEAK_CHECK) {
 }
 
 const put =
-  dbPut =>
-  async (doc, options = {}) => {
+  (dbPut: any) =>
+  async (doc: any, options = {}) => {
     if (!doc.createdAt) {
       doc.createdAt = new Date().toISOString()
     }
@@ -29,7 +32,7 @@ const checkInitialised = () => {
   }
 }
 
-exports.init = opts => {
+export async function init(opts: PouchOptions) {
   PouchDB = pouch.getPouch(opts)
   initialised = true
 }
@@ -37,7 +40,7 @@ exports.init = opts => {
 // NOTE: THIS IS A DANGEROUS FUNCTION - USE WITH CAUTION
 // this function is prone to leaks, should only be used
 // in situations that using the function doWithDB does not work
-exports.dangerousGetDB = (dbName, opts) => {
+export async function dangerousGetDB(dbName: string, opts: any) {
   checkInitialised()
   if (env.isTest()) {
     dbList.add(dbName)
@@ -53,7 +56,7 @@ exports.dangerousGetDB = (dbName, opts) => {
 
 // use this function if you have called dangerousGetDB - close
 // the databases you've opened once finished
-exports.closeDB = async db => {
+export async function closeDB(db: PouchDB.Database) {
   if (!db || env.isTest()) {
     return
   }
@@ -71,7 +74,7 @@ exports.closeDB = async db => {
 // we have to use a callback for this so that we can close
 // the DB when we're done, without this manual requests would
 // need to close the database when done with it to avoid memory leaks
-exports.doWithDB = async (dbName, cb, opts = {}) => {
+export async function doWithDB(dbName: string, cb: any, opts = {}) {
   const db = exports.dangerousGetDB(dbName, opts)
   // need this to be async so that we can correctly close DB after all
   // async operations have been completed
@@ -82,10 +85,39 @@ exports.doWithDB = async (dbName, cb, opts = {}) => {
   }
 }
 
-exports.allDbs = () => {
+export function allDbs() {
   if (!env.isTest()) {
     throw new Error("Cannot be used outside test environment.")
   }
   checkInitialised()
   return [...dbList]
 }
+
+export async function directCouchQuery(
+  path: string,
+  method: string = "GET",
+  body?: any
+) {
+  let { url, cookie } = pouch.getCouchInfo()
+  const couchUrl = `${url}/${path}`
+  const params: any = {
+    method: method,
+    headers: {
+      Authorization: cookie,
+    },
+  }
+  if (body && method !== "GET") {
+    params.body = body
+  }
+  const response = await fetch(checkSlashesInUrl(encodeURI(couchUrl)), params)
+  if (response.status < 300) {
+    return await response.json()
+  } else {
+    throw "Cannot connect to CouchDB instance"
+  }
+}
+
+export async function directCouchFind(dbName: string, opts: CouchFindOptions) {
+  const json = await directCouchQuery(`${dbName}/_find`, "POST", opts)
+  return { rows: json.docs, bookmark: json.bookmark }
+}
diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts
index 1c4be7e366..c78c11217e 100644
--- a/packages/backend-core/src/db/utils.ts
+++ b/packages/backend-core/src/db/utils.ts
@@ -4,11 +4,8 @@ import env from "../environment"
 import { SEPARATOR, DocumentType, UNICODE_MAX, ViewName } from "./constants"
 import { getTenantId, getGlobalDB } from "../context"
 import { getGlobalDBName } from "./tenancy"
-import fetch from "node-fetch"
-import { doWithDB, allDbs } from "./index"
-import { getCouchInfo } from "./pouch"
+import { doWithDB, allDbs, directCouchQuery } from "./index"
 import { getAppMetadata } from "../cache/appMetadata"
-import { checkSlashesInUrl } from "../helpers"
 import { isDevApp, isDevAppID, getProdAppID } from "./conversions"
 import { APP_PREFIX } from "./constants"
 import * as events from "../events"
@@ -209,22 +206,11 @@ export async function getAllDbs(opts = { efficient: false }) {
     return allDbs()
   }
   let dbs: any[] = []
-  let { url, cookie } = getCouchInfo()
-  async function addDbs(couchUrl: string) {
-    const response = await fetch(checkSlashesInUrl(encodeURI(couchUrl)), {
-      method: "GET",
-      headers: {
-        Authorization: cookie,
-      },
-    })
-    if (response.status === 200) {
-      let json = await response.json()
-      dbs = dbs.concat(json)
-    } else {
-      throw "Cannot connect to CouchDB instance"
-    }
+  async function addDbs(couchPath: string) {
+    const json = await directCouchQuery(couchPath)
+    dbs = dbs.concat(json)
   }
-  let couchUrl = `${url}/_all_dbs`
+  let couchPath = "/_all_dbs"
   let tenantId = getTenantId()
   if (!env.MULTI_TENANCY || (!efficient && tenantId === DEFAULT_TENANT_ID)) {
     // just get all DBs when:
@@ -232,12 +218,12 @@ export async function getAllDbs(opts = { efficient: false }) {
     // - default tenant
     //    - apps dbs don't contain tenant id
     //    - non-default tenant dbs are filtered out application side in getAllApps
-    await addDbs(couchUrl)
+    await addDbs(couchPath)
   } else {
     // get prod apps
-    await addDbs(getStartEndKeyURL(couchUrl, DocumentType.APP, tenantId))
+    await addDbs(getStartEndKeyURL(couchPath, DocumentType.APP, tenantId))
     // get dev apps
-    await addDbs(getStartEndKeyURL(couchUrl, DocumentType.APP_DEV, tenantId))
+    await addDbs(getStartEndKeyURL(couchPath, DocumentType.APP_DEV, tenantId))
     // add global db name
     dbs.push(getGlobalDBName(tenantId))
   }
diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts
index 87bc7d0033..f3dca51f72 100644
--- a/packages/server/src/api/controllers/application.ts
+++ b/packages/server/src/api/controllers/application.ts
@@ -150,7 +150,7 @@ async function createInstance(template: any) {
       throw "Error loading database dump from memory."
     }
   } else if (template && template.useTemplate === "true") {
-    await sdk.apps.imports.importApp(appId, db, template)
+    await sdk.backups.importApp(appId, db, template)
   } else {
     // create the users table
     await db.put(USERS_TABLE_SCHEMA)
diff --git a/packages/server/src/api/controllers/backup.ts b/packages/server/src/api/controllers/backup.ts
index 7fe197de76..0ffda2c733 100644
--- a/packages/server/src/api/controllers/backup.ts
+++ b/packages/server/src/api/controllers/backup.ts
@@ -9,7 +9,7 @@ export async function exportAppDump(ctx: any) {
   excludeRows = isQsTrue(excludeRows)
   const backupIdentifier = `${appName}-export-${new Date().getTime()}.tar.gz`
   ctx.attachment(backupIdentifier)
-  ctx.body = await sdk.apps.exports.streamExportApp(appId, excludeRows)
+  ctx.body = await sdk.backups.streamExportApp(appId, excludeRows)
 
   await context.doInAppContext(appId, async () => {
     const appDb = context.getAppDB()
diff --git a/packages/server/src/api/controllers/cloud.js b/packages/server/src/api/controllers/cloud.js
index d766a7987f..323c7409db 100644
--- a/packages/server/src/api/controllers/cloud.js
+++ b/packages/server/src/api/controllers/cloud.js
@@ -9,7 +9,7 @@ exports.exportApps = async ctx => {
     ctx.throw(400, "Exporting only allowed in multi-tenant cloud environments.")
   }
   const apps = await getAllApps({ all: true })
-  const globalDBString = await sdk.apps.exports.exportDB(getGlobalDBName(), {
+  const globalDBString = await sdk.backups.exportDB(getGlobalDBName(), {
     filter: doc => !doc._id.startsWith(DocumentType.USER),
   })
   // only export the dev apps as they will be the latest, the user can republish the apps
@@ -17,10 +17,7 @@ exports.exportApps = async ctx => {
   let appIds = apps
     .map(app => app.appId || app._id)
     .filter(appId => isDevAppID(appId))
-  const tmpPath = await sdk.apps.exports.exportMultipleApps(
-    appIds,
-    globalDBString
-  )
+  const tmpPath = await sdk.backups.exportMultipleApps(appIds, globalDBString)
   const filename = `cloud-export-${new Date().getTime()}.tar.gz`
   ctx.attachment(filename)
   ctx.body = streamFile(tmpPath)
diff --git a/packages/server/src/api/controllers/table/bulkFormula.js b/packages/server/src/api/controllers/table/bulkFormula.js
index d736c126f2..733c16d455 100644
--- a/packages/server/src/api/controllers/table/bulkFormula.js
+++ b/packages/server/src/api/controllers/table/bulkFormula.js
@@ -1,10 +1,11 @@
 const { FieldTypes, FormulaTypes } = require("../../../constants")
-const { getAllInternalTables, clearColumns } = require("./utils")
+const { clearColumns } = require("./utils")
 const { doesContainStrings } = require("@budibase/string-templates")
 const { cloneDeep } = require("lodash/fp")
 const { isEqual, uniq } = require("lodash")
 const { updateAllFormulasInTable } = require("../row/staticFormula")
 const { getAppDB } = require("@budibase/backend-core/context")
+const sdk = require("../../../sdk")
 
 function isStaticFormula(column) {
   return (
@@ -39,7 +40,7 @@ function getFormulaThatUseColumn(table, columnNames) {
  */
 async function checkIfFormulaNeedsCleared(table, { oldTable, deletion }) {
   // start by retrieving all tables, remove the current table from the list
-  const tables = (await getAllInternalTables()).filter(
+  const tables = (await sdk.tables.getAllInternalTables()).filter(
     tbl => tbl._id !== table._id
   )
   const schemaToUse = oldTable ? oldTable.schema : table.schema
@@ -99,7 +100,7 @@ async function updateRelatedFormulaLinksOnTables(
 ) {
   const db = getAppDB()
   // start by retrieving all tables, remove the current table from the list
-  const tables = (await getAllInternalTables()).filter(
+  const tables = (await sdk.tables.getAllInternalTables()).filter(
     tbl => tbl._id !== table._id
   )
   // clone the tables, so we can compare at end
diff --git a/packages/server/src/api/controllers/table/external.js b/packages/server/src/api/controllers/table/external.js
index d919e9dad7..fe9270fe1d 100644
--- a/packages/server/src/api/controllers/table/external.js
+++ b/packages/server/src/api/controllers/table/external.js
@@ -3,7 +3,6 @@ const {
   breakExternalTableId,
 } = require("../../../integrations/utils")
 const {
-  getTable,
   generateForeignKey,
   generateJunctionTableName,
   foreignKeyStructure,
@@ -20,6 +19,7 @@ const csvParser = require("../../../utilities/csvParser")
 const { handleRequest } = require("../row/external")
 const { getAppDB } = require("@budibase/backend-core/context")
 const { events } = require("@budibase/backend-core")
+const sdk = require("../../../sdk")
 
 async function makeTableRequest(
   datasource,
@@ -181,7 +181,7 @@ exports.save = async function (ctx) {
 
   let oldTable
   if (ctx.request.body && ctx.request.body._id) {
-    oldTable = await getTable(ctx.request.body._id)
+    oldTable = await sdk.tables.getTable(ctx.request.body._id)
   }
 
   if (hasTypeChanged(tableToSave, oldTable)) {
@@ -281,7 +281,7 @@ exports.save = async function (ctx) {
 }
 
 exports.destroy = async function (ctx) {
-  const tableToDelete = await getTable(ctx.params.tableId)
+  const tableToDelete = await sdk.tables.getTable(ctx.params.tableId)
   if (!tableToDelete || !tableToDelete.created) {
     ctx.throw(400, "Cannot delete tables which weren't created in Budibase.")
   }
@@ -303,7 +303,7 @@ exports.destroy = async function (ctx) {
 }
 
 exports.bulkImport = async function (ctx) {
-  const table = await getTable(ctx.params.tableId)
+  const table = await sdk.tables.getTable(ctx.params.tableId)
   const { dataImport } = ctx.request.body
   if (!dataImport || !dataImport.schema || !dataImport.csvString) {
     ctx.throw(400, "Provided data import information is invalid.")
diff --git a/packages/server/src/api/controllers/table/index.js b/packages/server/src/api/controllers/table/index.js
index e6192457af..3a20f4dff6 100644
--- a/packages/server/src/api/controllers/table/index.js
+++ b/packages/server/src/api/controllers/table/index.js
@@ -4,8 +4,8 @@ const csvParser = require("../../../utilities/csvParser")
 const { isExternalTable, isSQL } = require("../../../integrations/utils")
 const { getDatasourceParams } = require("../../../db/utils")
 const { getAppDB } = require("@budibase/backend-core/context")
-const { getTable, getAllInternalTables } = require("./utils")
 const { events } = require("@budibase/backend-core")
+const sdk = require("../../../sdk")
 
 function pickApi({ tableId, table }) {
   if (table && !tableId) {
@@ -23,7 +23,7 @@ function pickApi({ tableId, table }) {
 exports.fetch = async function (ctx) {
   const db = getAppDB()
 
-  const internal = await getAllInternalTables()
+  const internal = await sdk.tables.getAllInternalTables()
 
   const externalTables = await db.allDocs(
     getDatasourceParams("plus", {
@@ -50,7 +50,7 @@ exports.fetch = async function (ctx) {
 
 exports.find = async function (ctx) {
   const tableId = ctx.params.tableId
-  ctx.body = await getTable(tableId)
+  ctx.body = await sdk.tables.getTable(tableId)
 }
 
 exports.save = async function (ctx) {
@@ -101,7 +101,7 @@ exports.validateCSVSchema = async function (ctx) {
   const { csvString, schema = {}, tableId } = ctx.request.body
   let existingTable
   if (tableId) {
-    existingTable = await getTable(tableId)
+    existingTable = await sdk.tables.getTable(tableId)
   }
   let result = await csvParser.parse(csvString, schema)
   if (existingTable) {
diff --git a/packages/server/src/api/controllers/table/internal.ts b/packages/server/src/api/controllers/table/internal.ts
index 7e55c71aea..a50009b1f6 100644
--- a/packages/server/src/api/controllers/table/internal.ts
+++ b/packages/server/src/api/controllers/table/internal.ts
@@ -1,12 +1,7 @@
 import { updateLinks, EventType } from "../../../db/linkedRows"
 import { getRowParams, generateTableID } from "../../../db/utils"
 import { FieldTypes } from "../../../constants"
-import {
-  TableSaveFunctions,
-  hasTypeChanged,
-  getTable,
-  handleDataImport,
-} from "./utils"
+import { TableSaveFunctions, hasTypeChanged, handleDataImport } from "./utils"
 const { getAppDB } = require("@budibase/backend-core/context")
 import { isTest } from "../../../environment"
 import {
@@ -19,6 +14,7 @@ import { quotas } from "@budibase/pro"
 import { isEqual } from "lodash"
 import { cloneDeep } from "lodash/fp"
 import env from "../../../environment"
+import sdk from "../../../sdk"
 
 function checkAutoColumns(table: Table, oldTable: Table) {
   if (!table.schema) {
@@ -188,7 +184,7 @@ export async function destroy(ctx: any) {
 }
 
 export async function bulkImport(ctx: any) {
-  const table = await getTable(ctx.params.tableId)
+  const table = await sdk.tables.getTable(ctx.params.tableId)
   const { dataImport } = ctx.request.body
   await handleDataImport(ctx.user, table, dataImport)
   return table
diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts
index c2aa2f47c9..79c551b63a 100644
--- a/packages/server/src/api/controllers/table/utils.ts
+++ b/packages/server/src/api/controllers/table/utils.ts
@@ -256,46 +256,6 @@ class TableSaveFunctions {
   }
 }
 
-export async function getAllInternalTables() {
-  const db = getAppDB()
-  const internalTables = await db.allDocs(
-    getTableParams(null, {
-      include_docs: true,
-    })
-  )
-  return internalTables.rows.map((tableDoc: any) => ({
-    ...tableDoc.doc,
-    type: "internal",
-    sourceId: BudibaseInternalDB._id,
-  }))
-}
-
-export async function getAllExternalTables(datasourceId: any) {
-  const db = getAppDB()
-  const datasource = await db.get(datasourceId)
-  if (!datasource || !datasource.entities) {
-    throw "Datasource is not configured fully."
-  }
-  return datasource.entities
-}
-
-export async function getExternalTable(datasourceId: any, tableName: any) {
-  const entities = await getAllExternalTables(datasourceId)
-  return entities[tableName]
-}
-
-export async function getTable(tableId: any) {
-  const db = getAppDB()
-  if (isExternalTable(tableId)) {
-    let { datasourceId, tableName } = breakExternalTableId(tableId)
-    const datasource = await db.get(datasourceId)
-    const table = await getExternalTable(datasourceId, tableName)
-    return { ...table, sql: isSQL(datasource) }
-  } else {
-    return db.get(tableId)
-  }
-}
-
 export async function checkForViewUpdates(
   table: any,
   rename: any,
diff --git a/packages/server/src/api/controllers/view/index.js b/packages/server/src/api/controllers/view/index.js
index b2c3a84c59..91657cfc21 100644
--- a/packages/server/src/api/controllers/view/index.js
+++ b/packages/server/src/api/controllers/view/index.js
@@ -3,12 +3,12 @@ const { apiFileReturn } = require("../../../utilities/fileSystem")
 const exporters = require("./exporters")
 const { saveView, getView, getViews, deleteView } = require("./utils")
 const { fetchView } = require("../row")
-const { getTable } = require("../table/utils")
 const { FieldTypes } = require("../../../constants")
 const { getAppDB } = require("@budibase/backend-core/context")
 const { events } = require("@budibase/backend-core")
 const { DocumentType } = require("../../../db/utils")
 const { cloneDeep, isEqual } = require("lodash")
+const sdk = require("../../../sdk")
 
 exports.fetch = async ctx => {
   ctx.body = await getViews()
@@ -144,7 +144,7 @@ exports.exportView = async ctx => {
 
   let schema = view && view.meta && view.meta.schema
   const tableId = ctx.params.tableId || view.meta.tableId
-  const table = await getTable(tableId)
+  const table = await sdk.tables.getTable(tableId)
   if (!schema) {
     schema = table.schema
   }
diff --git a/packages/server/src/automations/automationUtils.js b/packages/server/src/automations/automationUtils.js
index 0646e453c2..06a79e6ab4 100644
--- a/packages/server/src/automations/automationUtils.js
+++ b/packages/server/src/automations/automationUtils.js
@@ -1,10 +1,10 @@
-const { getTable } = require("../api/controllers/table/utils")
 const {
   findHBSBlocks,
   decodeJSBinding,
   isJSBinding,
   encodeJSBinding,
 } = require("@budibase/string-templates")
+const sdk = require("../sdk")
 
 /**
  * When values are input to the system generally they will be of type string as this is required for template strings.
@@ -64,7 +64,7 @@ exports.cleanInputValues = (inputs, schema) => {
  * @returns {Promise<Object>} The cleaned up rows object, will should now have all the required primitive types.
  */
 exports.cleanUpRow = async (tableId, row) => {
-  let table = await getTable(tableId)
+  let table = await sdk.tables.getTable(tableId)
   return exports.cleanInputValues(row, { properties: table.schema })
 }
 
diff --git a/packages/server/src/migrations/functions/backfill/app/tables.ts b/packages/server/src/migrations/functions/backfill/app/tables.ts
index 150a3b4d4a..b6d896a1ca 100644
--- a/packages/server/src/migrations/functions/backfill/app/tables.ts
+++ b/packages/server/src/migrations/functions/backfill/app/tables.ts
@@ -1,18 +1,11 @@
 import { events } from "@budibase/backend-core"
-import { getTableParams } from "../../../../db/utils"
-import { Table } from "@budibase/types"
+import sdk from "../../../../sdk"
 
-const getTables = async (appDb: any): Promise<Table[]> => {
-  const response = await appDb.allDocs(
-    getTableParams(null, {
-      include_docs: true,
-    })
-  )
-  return response.rows.map((row: any) => row.doc)
-}
-
-export const backfill = async (appDb: any, timestamp: string | number) => {
-  const tables = await getTables(appDb)
+export const backfill = async (
+  appDb: PouchDB.Database,
+  timestamp: string | number
+) => {
+  const tables = await sdk.tables.getAllInternalTables(appDb)
 
   for (const table of tables) {
     await events.table.created(table, timestamp)
diff --git a/packages/server/src/sdk/app/constants.ts b/packages/server/src/sdk/app/backups/constants.ts
similarity index 100%
rename from packages/server/src/sdk/app/constants.ts
rename to packages/server/src/sdk/app/backups/constants.ts
diff --git a/packages/server/src/sdk/app/exports.ts b/packages/server/src/sdk/app/backups/exports.ts
similarity index 94%
rename from packages/server/src/sdk/app/exports.ts
rename to packages/server/src/sdk/app/backups/exports.ts
index 1ecf69de68..adf39f7e15 100644
--- a/packages/server/src/sdk/app/exports.ts
+++ b/packages/server/src/sdk/app/backups/exports.ts
@@ -1,13 +1,13 @@
 import { db as dbCore } from "@budibase/backend-core"
-import { budibaseTempDir } from "../../utilities/budibaseDir"
-import { retrieveDirectory } from "../../utilities/fileSystem/utilities"
-import { streamFile } from "../../utilities/fileSystem"
-import { ObjectStoreBuckets } from "../../constants"
+import { budibaseTempDir } from "../../../utilities/budibaseDir"
+import { retrieveDirectory } from "../../../utilities/fileSystem/utilities"
+import { streamFile } from "../../../utilities/fileSystem"
+import { ObjectStoreBuckets } from "../../../constants"
 import {
   LINK_USER_METADATA_PREFIX,
   TABLE_ROW_PREFIX,
   USER_METDATA_PREFIX,
-} from "../../db/utils"
+} from "../../../db/utils"
 import {
   DB_EXPORT_FILE,
   GLOBAL_DB_EXPORT_FILE,
diff --git a/packages/server/src/sdk/app/imports.ts b/packages/server/src/sdk/app/backups/imports.ts
similarity index 62%
rename from packages/server/src/sdk/app/imports.ts
rename to packages/server/src/sdk/app/backups/imports.ts
index 96629db39a..0ea7eeaa1b 100644
--- a/packages/server/src/sdk/app/imports.ts
+++ b/packages/server/src/sdk/app/backups/imports.ts
@@ -1,10 +1,12 @@
 import { db as dbCore } from "@budibase/backend-core"
-import { budibaseTempDir } from "../../utilities/budibaseDir"
+import { budibaseTempDir } from "../../../utilities/budibaseDir"
 import { DB_EXPORT_FILE, ATTACHMENT_DIR } from "./constants"
-import { uploadDirectory } from "../../utilities/fileSystem/utilities"
-import { ObjectStoreBuckets } from "../../constants"
+import { uploadDirectory } from "../../../utilities/fileSystem/utilities"
+import { ObjectStoreBuckets, FieldTypes } from "../../../constants"
 import { join } from "path"
 import fs from "fs"
+import sdk from "../../"
+import { CouchFindOptions, Row } from "@budibase/types"
 const uuid = require("uuid/v4")
 const tar = require("tar")
 
@@ -64,8 +66,29 @@ export async function importApp(
   const { ok } = await db.load(dbStream)
   if (!ok) {
     throw "Error loading database dump from template."
-  } else {
-    // TODO: need to iterate over attachments and update their URLs
+  }
+  // iterate through attachment documents and update them
+  const tables = await sdk.tables.getAllInternalTables(db)
+  for (let table of tables) {
+    const attachmentCols: string[] = []
+    for (let [key, column] of Object.entries(table.schema)) {
+      if (column.type === FieldTypes.ATTACHMENT) {
+        attachmentCols.push(key)
+      }
+    }
+    // no attachment columns, nothing to do
+    if (attachmentCols.length === 0) {
+      continue
+    }
+    // use the CouchDB Mango query API to lookup rows that have attachments
+    const params: CouchFindOptions = { selector: {} }
+    attachmentCols.forEach(col => (params.selector[col] = { $exists: true }))
+    const { rows } = await dbCore.directCouchFind(db.name, params)
+    for (let row of rows) {
+      // TODO:
+    }
+    // write back the updated attachments
+    await db.bulkDocs(rows)
   }
   return ok
 }
diff --git a/packages/server/src/sdk/app/backups/index.ts b/packages/server/src/sdk/app/backups/index.ts
new file mode 100644
index 0000000000..fe7e4e1049
--- /dev/null
+++ b/packages/server/src/sdk/app/backups/index.ts
@@ -0,0 +1,7 @@
+import * as exportApps from "./exports"
+import * as importApps from "./imports"
+
+export default {
+  ...exportApps,
+  ...importApps,
+}
diff --git a/packages/server/src/sdk/app/index.ts b/packages/server/src/sdk/app/index.ts
deleted file mode 100644
index 5ac7c04b2c..0000000000
--- a/packages/server/src/sdk/app/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * as exports from "./exports"
-export * as imports from "./imports"
diff --git a/packages/server/src/sdk/app/tables/index.ts b/packages/server/src/sdk/app/tables/index.ts
new file mode 100644
index 0000000000..eeaf869055
--- /dev/null
+++ b/packages/server/src/sdk/app/tables/index.ts
@@ -0,0 +1,60 @@
+import { getAppDB } from "@budibase/backend-core/context"
+import { BudibaseInternalDB, getTableParams } from "../../../db/utils"
+import {
+  breakExternalTableId,
+  isExternalTable,
+  isSQL,
+} from "../../../integrations/utils"
+import { Table } from "@budibase/types"
+
+async function getAllInternalTables(db?: PouchDB.Database): Promise<Table[]> {
+  if (!db) {
+    db = getAppDB() as PouchDB.Database
+  }
+  const internalTables = await db.allDocs(
+    getTableParams(null, {
+      include_docs: true,
+    })
+  )
+  return internalTables.rows.map((tableDoc: any) => ({
+    ...tableDoc.doc,
+    type: "internal",
+    sourceId: BudibaseInternalDB._id,
+  }))
+}
+
+async function getAllExternalTables(datasourceId: any): Promise<Table[]> {
+  const db = getAppDB()
+  const datasource = await db.get(datasourceId)
+  if (!datasource || !datasource.entities) {
+    throw "Datasource is not configured fully."
+  }
+  return datasource.entities
+}
+
+async function getExternalTable(
+  datasourceId: any,
+  tableName: any
+): Promise<Table> {
+  const entities = await getAllExternalTables(datasourceId)
+  return entities[tableName]
+}
+
+async function getTable(tableId: any): Promise<Table> {
+  const db = getAppDB()
+  if (isExternalTable(tableId)) {
+    let { datasourceId, tableName } = breakExternalTableId(tableId)
+    const datasource = await db.get(datasourceId)
+    const table = await getExternalTable(datasourceId, tableName)
+    return { ...table, sql: isSQL(datasource) }
+  } else {
+    return db.get(tableId)
+  }
+}
+
+export default {
+  getAllInternalTables,
+  getAllExternalTables,
+  getExternalTable,
+  getTable,
+}
diff --git a/packages/server/src/sdk/index.ts b/packages/server/src/sdk/index.ts
index 9199c1cc72..8cf9d21c41 100644
--- a/packages/server/src/sdk/index.ts
+++ b/packages/server/src/sdk/index.ts
@@ -1,5 +1,7 @@
-import * as apps from "./app"
+import { default as backups } from "./app/backups"
+import { default as tables } from "./app/tables"
 
 export default {
-  apps,
+  backups,
+  tables,
 }
diff --git a/packages/types/package.json b/packages/types/package.json
index 93271fb93e..0787093e46 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -16,6 +16,7 @@
     "@types/koa": "2.13.4",
     "@types/node": "14.18.20",
     "rimraf": "3.0.2",
-    "typescript": "4.7.3"
+    "typescript": "4.7.3",
+    "@types/pouchdb": "6.4.0"
   }
 }
diff --git a/packages/types/src/core/db.ts b/packages/types/src/core/db.ts
new file mode 100644
index 0000000000..6d47a5c36b
--- /dev/null
+++ b/packages/types/src/core/db.ts
@@ -0,0 +1,22 @@
+export type PouchOptions = {
+  inMemory: boolean
+  replication: boolean
+  onDisk: boolean
+  find: boolean
+}
+
+export enum SortOption {
+  ASCENDING = "asc",
+  DESCENDING = "desc",
+}
+
+export type CouchFindOptions = {
+  selector: PouchDB.Find.Selector
+  fields?: string[]
+  sort?: {
+    [key: string]: SortOption
+  }[]
+  limit?: number
+  skip?: number
+  bookmark?: string
+}
diff --git a/packages/types/src/core/index.ts b/packages/types/src/core/index.ts
new file mode 100644
index 0000000000..9071393365
--- /dev/null
+++ b/packages/types/src/core/index.ts
@@ -0,0 +1 @@
+export * from "./db"
diff --git a/packages/types/src/documents/app/table.ts b/packages/types/src/documents/app/table.ts
index 72cff4f056..b98c562852 100644
--- a/packages/types/src/documents/app/table.ts
+++ b/packages/types/src/documents/app/table.ts
@@ -49,4 +49,5 @@ export interface Table extends Document {
   sourceId?: string
   relatedFormula?: string[]
   constrained?: string[]
+  sql?: boolean
 }
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 4adb2fda97..92d2ceb050 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -1,3 +1,4 @@
 export * from "./documents"
 export * from "./sdk"
 export * from "./api"
+export * from "./core"
diff --git a/packages/types/yarn.lock b/packages/types/yarn.lock
index c80ff652ba..f225ffc442 100644
--- a/packages/types/yarn.lock
+++ b/packages/types/yarn.lock
@@ -39,6 +39,13 @@
     "@types/keygrip" "*"
     "@types/node" "*"
 
+"@types/debug@*":
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
+  integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==
+  dependencies:
+    "@types/ms" "*"
+
 "@types/express-serve-static-core@^4.17.18":
   version "4.17.29"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz#2a1795ea8e9e9c91b4a4bbe475034b20c1ec711c"
@@ -113,6 +120,11 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
   integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
+"@types/ms@*":
+  version "0.7.31"
+  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
+  integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
+
 "@types/node@*":
   version "18.0.6"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.6.tgz#0ba49ac517ad69abe7a1508bc9b3a5483df9d5d7"
@@ -123,6 +135,152 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.20.tgz#268f028b36eaf51181c3300252f605488c4f0650"
   integrity sha512-Q8KKwm9YqEmUBRsqJ2GWJDtXltBDxTdC4m5vTdXBolu2PeQh8LX+f6BTwU+OuXPu37fLxoN6gidqBmnky36FXA==
 
+"@types/pouchdb-adapter-cordova-sqlite@*":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-cordova-sqlite/-/pouchdb-adapter-cordova-sqlite-1.0.1.tgz#49e5ee6df7cc0c23196fcb340f43a560e74eb1d6"
+  integrity sha512-nqlXpW1ho3KBg1mUQvZgH2755y3z/rw4UA7ZJCPMRTHofxGMY8izRVw5rHBL4/7P615or0J2udpRYxgkT3D02g==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-fruitdown@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-fruitdown/-/pouchdb-adapter-fruitdown-6.1.3.tgz#9b140ad9645cc56068728acf08ec19ac0046658e"
+  integrity sha512-Wz1Z1JLOW1hgmFQjqnSkmyyfH7by/iWb4abKn684WMvQfmxx6BxKJpJ4+eulkVPQzzgMMSgU1MpnQOm9FgRkbw==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-http@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-http/-/pouchdb-adapter-http-6.1.3.tgz#6e592d5f48deb6274a21ddac1498dd308096bcf3"
+  integrity sha512-9Z4TLbF/KJWy/D2sWRPBA+RNU0odQimfdvlDX+EY7rGcd3aVoH8qjD/X0Xcd/0dfBH5pKrNIMFFQgW/TylRCmA==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-idb@*":
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-idb/-/pouchdb-adapter-idb-6.1.4.tgz#cb9a18864585d600820cd325f007614c5c3989cd"
+  integrity sha512-KIAXbkF4uYUz0ZwfNEFLtEkK44mEWopAsD76UhucH92XnJloBysav+TjI4FFfYQyTjoW3S1s6V+Z14CUJZ0F6w==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-leveldb@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-leveldb/-/pouchdb-adapter-leveldb-6.1.3.tgz#17c7e75d75b992050bca15991e97fba575c61bb3"
+  integrity sha512-ex8NFqQGFwEpFi7AaZ5YofmuemfZNsL3nTFZBUCAKYMBkazQij1pe2ILLStSvJr0XS0qxgXjCEW19T5Wqiiskg==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-localstorage@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-localstorage/-/pouchdb-adapter-localstorage-6.1.3.tgz#0dde02ba6b9d6073a295a20196563942ba9a54bd"
+  integrity sha512-oor040tye1KKiGLWYtIy7rRT7C2yoyX3Tf6elEJRpjOA7Ja/H8lKc4LaSh9ATbptIcES6MRqZDxtp7ly9hsW3Q==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-memory@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-memory/-/pouchdb-adapter-memory-6.1.3.tgz#9eabdbc890fcf58960ee8b68b8685f837e75c844"
+  integrity sha512-gVbsIMzDzgZYThFVT4eVNsmuZwVm/4jDxP1sjlgc3qtDIxbtBhGgyNfcskwwz9Zu5Lv1avkDsIWvcxQhnvRlHg==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-node-websql@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-node-websql/-/pouchdb-adapter-node-websql-6.1.3.tgz#aa18bc68af8cf509acd12c400010dcd5fab2243d"
+  integrity sha512-F/P+os6Jsa7CgHtH64+Z0HfwIcj0hIRB5z8gNhF7L7dxPWoAfkopK5H2gydrP3sQrlGyN4WInF+UJW/Zu1+FKg==
+  dependencies:
+    "@types/pouchdb-adapter-websql" "*"
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-websql@*":
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-websql/-/pouchdb-adapter-websql-6.1.4.tgz#359fbe42ccac0ac90b492ddb8c32fafd0aa96d79"
+  integrity sha512-zMJQCtXC40hBsIDRn0GhmpeGMK0f9l/OGWfLguvczROzxxcOD7REI+e6SEmX7gJKw5JuMvlfuHzkQwjmvSJbtg==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-browser@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-browser/-/pouchdb-browser-6.1.3.tgz#8f33d6ef58d6817d1f6d36979148a1c7f63244d8"
+  integrity sha512-EdYowrWxW9SWBMX/rux2eq7dbHi5Zeyzz+FF/IAsgQKnUxgeCO5VO2j4zTzos0SDyJvAQU+EYRc11r7xGn5tvA==
+  dependencies:
+    "@types/pouchdb-adapter-http" "*"
+    "@types/pouchdb-adapter-idb" "*"
+    "@types/pouchdb-adapter-websql" "*"
+    "@types/pouchdb-core" "*"
+    "@types/pouchdb-mapreduce" "*"
+    "@types/pouchdb-replication" "*"
+
+"@types/pouchdb-core@*":
+  version "7.0.10"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-core/-/pouchdb-core-7.0.10.tgz#d1ea1549e7fad6cb579f71459b1bc27252e06a5a"
+  integrity sha512-mKhjLlWWXyV3PTTjDhzDV1kc2dolO7VYFa75IoKM/hr8Er9eo8RIbS7mJLfC8r/C3p6ihZu9yZs1PWC1LQ0SOA==
+  dependencies:
+    "@types/debug" "*"
+    "@types/pouchdb-find" "*"
+
+"@types/pouchdb-find@*":
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-find/-/pouchdb-find-7.3.0.tgz#b917030e9f4bf6e56bf8c3b9fe4b2a25e989009a"
+  integrity sha512-sFPli5tBjGX9UfXioik1jUzPdcN84eV82n0lmEFuoPepWqkLjQcyri0eOa++HYOaNPyMDhKFBqEALEZivK2dRg==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-http@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-http/-/pouchdb-http-6.1.3.tgz#09576c0d409da1f8dee34ec5b768415e2472ea52"
+  integrity sha512-0e9E5SqNOyPl/3FnEIbENssB4FlJsNYuOy131nxrZk36S+y1R/6qO7ZVRypWpGTqBWSuVd7gCsq2UDwO/285+w==
+  dependencies:
+    "@types/pouchdb-adapter-http" "*"
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-mapreduce@*":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-mapreduce/-/pouchdb-mapreduce-6.1.7.tgz#9ab32d1e0f234f1bf6d1e4c5d7e216e9e23ac0a3"
+  integrity sha512-WzBwm7tmO9QhfRzVaWT4v6JQSS/fG2OoUDrWrhX87rPe2Pn6laPvdK5li6myNRxCoI/l5e8Jd+oYBAFnaiFucA==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-node@*":
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-node/-/pouchdb-node-6.1.4.tgz#5214c0169fcfd2237d373380bbd65a934feb5dfb"
+  integrity sha512-wnTCH8X1JOPpNOfVhz8HW0AvmdHh6pt40MuRj0jQnK7QEHsHS79WujsKTKSOF8QXtPwpvCNSsI7ut7H7tfxxJQ==
+  dependencies:
+    "@types/pouchdb-adapter-http" "*"
+    "@types/pouchdb-adapter-leveldb" "*"
+    "@types/pouchdb-core" "*"
+    "@types/pouchdb-mapreduce" "*"
+    "@types/pouchdb-replication" "*"
+
+"@types/pouchdb-replication@*":
+  version "6.4.4"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-replication/-/pouchdb-replication-6.4.4.tgz#743406c90f13a988fa3e346ea74ce40acd170d00"
+  integrity sha512-BsE5LKpjJK4iAf6Fx5kyrMw+33V+Ip7uWldUnU2BYrrvtR+MLD22dcImm7DZN1st2wPPb91i0XEnQzvP0w1C/Q==
+  dependencies:
+    "@types/pouchdb-core" "*"
+    "@types/pouchdb-find" "*"
+
+"@types/pouchdb@6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb/-/pouchdb-6.4.0.tgz#f9c41ca64b23029f9bf2eb4bf6956e6431cb79f8"
+  integrity sha512-eGCpX+NXhd5VLJuJMzwe3L79fa9+IDTrAG3CPaf4s/31PD56hOrhDJTSmRELSXuiqXr6+OHzzP0PldSaWsFt7w==
+  dependencies:
+    "@types/pouchdb-adapter-cordova-sqlite" "*"
+    "@types/pouchdb-adapter-fruitdown" "*"
+    "@types/pouchdb-adapter-http" "*"
+    "@types/pouchdb-adapter-idb" "*"
+    "@types/pouchdb-adapter-leveldb" "*"
+    "@types/pouchdb-adapter-localstorage" "*"
+    "@types/pouchdb-adapter-memory" "*"
+    "@types/pouchdb-adapter-node-websql" "*"
+    "@types/pouchdb-adapter-websql" "*"
+    "@types/pouchdb-browser" "*"
+    "@types/pouchdb-core" "*"
+    "@types/pouchdb-http" "*"
+    "@types/pouchdb-mapreduce" "*"
+    "@types/pouchdb-node" "*"
+    "@types/pouchdb-replication" "*"
+
 "@types/qs@*":
   version "6.9.7"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"

From f5dd87f8f9d6c6077ec35000661a7a57f87bb3ed Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 12 Oct 2022 17:34:17 +0100
Subject: [PATCH 015/151] Adding first pass of attachments updating.

---
 packages/backend-core/src/db/index.ts         |  4 +-
 .../server/src/sdk/app/backups/constants.ts   |  2 +-
 .../server/src/sdk/app/backups/imports.ts     | 84 +++++++++++++------
 packages/types/src/documents/app/row.ts       |  8 ++
 4 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/packages/backend-core/src/db/index.ts b/packages/backend-core/src/db/index.ts
index 016155033a..2728b83682 100644
--- a/packages/backend-core/src/db/index.ts
+++ b/packages/backend-core/src/db/index.ts
@@ -32,7 +32,7 @@ const checkInitialised = () => {
   }
 }
 
-export async function init(opts: PouchOptions) {
+export async function init(opts?: PouchOptions) {
   PouchDB = pouch.getPouch(opts)
   initialised = true
 }
@@ -40,7 +40,7 @@ export async function init(opts: PouchOptions) {
 // NOTE: THIS IS A DANGEROUS FUNCTION - USE WITH CAUTION
 // this function is prone to leaks, should only be used
 // in situations that using the function doWithDB does not work
-export async function dangerousGetDB(dbName: string, opts: any) {
+export async function dangerousGetDB(dbName: string, opts?: any) {
   checkInitialised()
   if (env.isTest()) {
     dbList.add(dbName)
diff --git a/packages/server/src/sdk/app/backups/constants.ts b/packages/server/src/sdk/app/backups/constants.ts
index e831172683..f022168846 100644
--- a/packages/server/src/sdk/app/backups/constants.ts
+++ b/packages/server/src/sdk/app/backups/constants.ts
@@ -1,4 +1,4 @@
-import { ATTACHMENT_DIR as attachmentDir } from "../../constants"
+import { ATTACHMENT_DIR as attachmentDir } from "../../../constants"
 export const DB_EXPORT_FILE = "db.txt"
 export const ATTACHMENT_DIR = attachmentDir
 export const GLOBAL_DB_EXPORT_FILE = "global.txt"
diff --git a/packages/server/src/sdk/app/backups/imports.ts b/packages/server/src/sdk/app/backups/imports.ts
index 0ea7eeaa1b..297274e26b 100644
--- a/packages/server/src/sdk/app/backups/imports.ts
+++ b/packages/server/src/sdk/app/backups/imports.ts
@@ -1,4 +1,5 @@
 import { db as dbCore } from "@budibase/backend-core"
+import { TABLE_ROW_PREFIX } from "../../../db/utils"
 import { budibaseTempDir } from "../../../utilities/budibaseDir"
 import { DB_EXPORT_FILE, ATTACHMENT_DIR } from "./constants"
 import { uploadDirectory } from "../../../utilities/fileSystem/utilities"
@@ -6,7 +7,7 @@ import { ObjectStoreBuckets, FieldTypes } from "../../../constants"
 import { join } from "path"
 import fs from "fs"
 import sdk from "../../"
-import { CouchFindOptions, Row } from "@budibase/types"
+import { CouchFindOptions, RowAttachment } from "@budibase/types"
 const uuid = require("uuid/v4")
 const tar = require("tar")
 
@@ -18,6 +19,63 @@ type TemplateType = {
   key?: string
 }
 
+async function updateAttachmentColumns(
+  prodAppId: string,
+  db: PouchDB.Database
+) {
+  // iterate through attachment documents and update them
+  const tables = await sdk.tables.getAllInternalTables(db)
+  for (let table of tables) {
+    const attachmentCols: string[] = []
+    for (let [key, column] of Object.entries(table.schema)) {
+      if (column.type === FieldTypes.ATTACHMENT) {
+        attachmentCols.push(key)
+      }
+    }
+    // no attachment columns, nothing to do
+    if (attachmentCols.length === 0) {
+      continue
+    }
+    // use the CouchDB Mango query API to lookup rows that have attachments
+    const params: CouchFindOptions = {
+      selector: {
+        _id: {
+          $regex: `^${TABLE_ROW_PREFIX}`,
+        },
+      },
+    }
+    attachmentCols.forEach(col => (params.selector[col] = { $exists: true }))
+    const { rows } = await dbCore.directCouchFind(db.name, params)
+    for (let row of rows) {
+      for (let column of attachmentCols) {
+        if (!Array.isArray(row[column])) {
+          continue
+        }
+        row[column] = row[column].map((attachment: RowAttachment) => {
+          // URL looks like: /prod-budi-app-assets/appId/attachments/file.csv
+          const urlParts = attachment.url.split("/")
+          // drop the first empty element
+          urlParts.shift()
+          // get the prefix
+          const prefix = urlParts.shift()
+          // remove the app ID
+          urlParts.shift()
+          // add new app ID
+          urlParts.unshift(prodAppId)
+          const key = urlParts.join("/")
+          return {
+            ...attachment,
+            key,
+            url: `/${prefix}/${key}`,
+          }
+        })
+      }
+    }
+    // write back the updated attachments
+    await db.bulkDocs(rows)
+  }
+}
+
 /**
  * This function manages temporary template files which are stored by Koa.
  * @param {Object} template The template object retrieved from the Koa context object.
@@ -67,28 +125,6 @@ export async function importApp(
   if (!ok) {
     throw "Error loading database dump from template."
   }
-  // iterate through attachment documents and update them
-  const tables = await sdk.tables.getAllInternalTables(db)
-  for (let table of tables) {
-    const attachmentCols: string[] = []
-    for (let [key, column] of Object.entries(table.schema)) {
-      if (column.type === FieldTypes.ATTACHMENT) {
-        attachmentCols.push(key)
-      }
-    }
-    // no attachment columns, nothing to do
-    if (attachmentCols.length === 0) {
-      continue
-    }
-    // use the CouchDB Mango query API to lookup rows that have attachments
-    const params: CouchFindOptions = { selector: {} }
-    attachmentCols.forEach(col => (params.selector[col] = { $exists: true }))
-    const { rows } = await dbCore.directCouchFind(db.name, params)
-    for (let row of rows) {
-      // TODO:
-    }
-    // write back the updated attachments
-    await db.bulkDocs(rows)
-  }
+  await updateAttachmentColumns(prodAppId, db)
   return ok
 }
diff --git a/packages/types/src/documents/app/row.ts b/packages/types/src/documents/app/row.ts
index ee5c0231e7..2cac32279b 100644
--- a/packages/types/src/documents/app/row.ts
+++ b/packages/types/src/documents/app/row.ts
@@ -16,6 +16,14 @@ export enum FieldType {
   INTERNAL = "internal",
 }
 
+export interface RowAttachment {
+  size: number
+  name: string
+  url: string
+  extension: string
+  key: string
+}
+
 export interface Row extends Document {
   type?: string
   tableId?: string

From 23f95b8be2d67cb8b20e1ab9826820f26120614b Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Wed, 12 Oct 2022 17:34:55 +0100
Subject: [PATCH 016/151] making bucketnames configurable in helm chart

---
 charts/budibase/templates/app-service-deployment.yaml    | 4 ++++
 charts/budibase/templates/worker-service-deployment.yaml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
index f72d1aef03..25a5dd410a 100644
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -80,6 +80,10 @@ spec:
           value: {{ .Values.services.objectStore.url }}
         - name: PLUGIN_BUCKET_NAME
           value: {{ .Values.services.objectStore.pluginBucketName | default "plugins" | quote }}
+        - name: APPS_BUCKET_NAME
+          value: {{ .Values.services.objectStore.appsBucketName | default "apps" | quote }}
+        - name: GLOBAL_CLOUD_BUCKET_NAME
+          value: {{ .Values.services.objectStore.globalCloudBucketName | default "global" | quote }}
         - name: PORT
           value: {{ .Values.services.apps.port | quote }}
         {{ if .Values.services.worker.publicApiRateLimitPerSecond }}
diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml
index b1c6110d95..1284b9c411 100644
--- a/charts/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@@ -79,6 +79,10 @@ spec:
           value: {{ .Values.services.objectStore.url }}
         - name: PLUGIN_BUCKET_NAME
           value: {{ .Values.services.objectStore.pluginBucketName | default "plugins" | quote }}
+        - name: APPS_BUCKET_NAME
+          value: {{ .Values.services.objectStore.appsBucketName | default "apps" | quote }}
+        - name: GLOBAL_CLOUD_BUCKET_NAME
+          value: {{ .Values.services.objectStore.globalCloudBucketName | default "global" | quote }}
         - name: PORT
           value: {{ .Values.services.worker.port | quote }}
         - name: MULTI_TENANCY

From 4da37058511480aa92d8e81df59bb7fc53af9f46 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 12 Oct 2022 17:37:52 +0100
Subject: [PATCH 017/151] Quick fixes to DB TS conversion.

---
 packages/backend-core/src/db/index.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend-core/src/db/index.ts b/packages/backend-core/src/db/index.ts
index 2728b83682..7a2337359a 100644
--- a/packages/backend-core/src/db/index.ts
+++ b/packages/backend-core/src/db/index.ts
@@ -40,7 +40,7 @@ export async function init(opts?: PouchOptions) {
 // NOTE: THIS IS A DANGEROUS FUNCTION - USE WITH CAUTION
 // this function is prone to leaks, should only be used
 // in situations that using the function doWithDB does not work
-export async function dangerousGetDB(dbName: string, opts?: any) {
+export function dangerousGetDB(dbName: string, opts?: any) {
   checkInitialised()
   if (env.isTest()) {
     dbList.add(dbName)
@@ -75,13 +75,13 @@ export async function closeDB(db: PouchDB.Database) {
 // the DB when we're done, without this manual requests would
 // need to close the database when done with it to avoid memory leaks
 export async function doWithDB(dbName: string, cb: any, opts = {}) {
-  const db = exports.dangerousGetDB(dbName, opts)
+  const db = dangerousGetDB(dbName, opts)
   // need this to be async so that we can correctly close DB after all
   // async operations have been completed
   try {
     return await cb(db)
   } finally {
-    await exports.closeDB(db)
+    await closeDB(db)
   }
 }
 

From 2eae3f2a6c954eb49053b60615633f6ec7dfac9c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 12 Oct 2022 17:57:31 +0100
Subject: [PATCH 018/151] Fixes for find functionality after testing.

---
 packages/backend-core/src/db/index.ts | 11 ++++++++++-
 packages/backend-core/src/db/utils.ts | 17 ++++++++---------
 packages/server/src/sdk/index.ts      |  8 +++++++-
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/packages/backend-core/src/db/index.ts b/packages/backend-core/src/db/index.ts
index 7a2337359a..8374aecd8d 100644
--- a/packages/backend-core/src/db/index.ts
+++ b/packages/backend-core/src/db/index.ts
@@ -107,7 +107,8 @@ export async function directCouchQuery(
     },
   }
   if (body && method !== "GET") {
-    params.body = body
+    params.body = JSON.stringify(body)
+    params.headers["Content-Type"] = "application/json"
   }
   const response = await fetch(checkSlashesInUrl(encodeURI(couchUrl)), params)
   if (response.status < 300) {
@@ -117,6 +118,14 @@ export async function directCouchQuery(
   }
 }
 
+export async function directCouchAllDbs(queryString?: string) {
+  let couchPath = "/_all_dbs"
+  if (queryString) {
+    couchPath += `?${queryString}`
+  }
+  return await directCouchQuery(couchPath)
+}
+
 export async function directCouchFind(dbName: string, opts: CouchFindOptions) {
   const json = await directCouchQuery(`${dbName}/_find`, "POST", opts)
   return { rows: json.docs, bookmark: json.bookmark }
diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts
index c78c11217e..8d824d60bb 100644
--- a/packages/backend-core/src/db/utils.ts
+++ b/packages/backend-core/src/db/utils.ts
@@ -4,7 +4,7 @@ import env from "../environment"
 import { SEPARATOR, DocumentType, UNICODE_MAX, ViewName } from "./constants"
 import { getTenantId, getGlobalDB } from "../context"
 import { getGlobalDBName } from "./tenancy"
-import { doWithDB, allDbs, directCouchQuery } from "./index"
+import { doWithDB, allDbs, directCouchQuery, directCouchAllDbs } from "./index"
 import { getAppMetadata } from "../cache/appMetadata"
 import { isDevApp, isDevAppID, getProdAppID } from "./conversions"
 import { APP_PREFIX } from "./constants"
@@ -188,9 +188,9 @@ export function getRoleParams(roleId = null, otherProps = {}) {
   return getDocParams(DocumentType.ROLE, roleId, otherProps)
 }
 
-export function getStartEndKeyURL(base: any, baseKey: any, tenantId = null) {
+export function getStartEndKeyURL(baseKey: any, tenantId = null) {
   const tenancy = tenantId ? `${SEPARATOR}${tenantId}` : ""
-  return `${base}?startkey="${baseKey}${tenancy}"&endkey="${baseKey}${tenancy}${UNICODE_MAX}"`
+  return `startkey="${baseKey}${tenancy}"&endkey="${baseKey}${tenancy}${UNICODE_MAX}"`
 }
 
 /**
@@ -206,11 +206,10 @@ export async function getAllDbs(opts = { efficient: false }) {
     return allDbs()
   }
   let dbs: any[] = []
-  async function addDbs(couchPath: string) {
-    const json = await directCouchQuery(couchPath)
+  async function addDbs(queryString?: string) {
+    const json = await directCouchAllDbs(queryString)
     dbs = dbs.concat(json)
   }
-  let couchPath = "/_all_dbs"
   let tenantId = getTenantId()
   if (!env.MULTI_TENANCY || (!efficient && tenantId === DEFAULT_TENANT_ID)) {
     // just get all DBs when:
@@ -218,12 +217,12 @@ export async function getAllDbs(opts = { efficient: false }) {
     // - default tenant
     //    - apps dbs don't contain tenant id
     //    - non-default tenant dbs are filtered out application side in getAllApps
-    await addDbs(couchPath)
+    await addDbs()
   } else {
     // get prod apps
-    await addDbs(getStartEndKeyURL(couchPath, DocumentType.APP, tenantId))
+    await addDbs(getStartEndKeyURL(DocumentType.APP, tenantId))
     // get dev apps
-    await addDbs(getStartEndKeyURL(couchPath, DocumentType.APP_DEV, tenantId))
+    await addDbs(getStartEndKeyURL(DocumentType.APP_DEV, tenantId))
     // add global db name
     dbs.push(getGlobalDBName(tenantId))
   }
diff --git a/packages/server/src/sdk/index.ts b/packages/server/src/sdk/index.ts
index 8cf9d21c41..85c01cdb44 100644
--- a/packages/server/src/sdk/index.ts
+++ b/packages/server/src/sdk/index.ts
@@ -1,7 +1,13 @@
 import { default as backups } from "./app/backups"
 import { default as tables } from "./app/tables"
 
-export default {
+const toExport = {
   backups,
   tables,
 }
+
+// default export for TS
+export default toExport
+
+// default export for JS
+module.exports = toExport

From bd52533f017d844bc662ec9150df8d71b6e0377b Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 12 Oct 2022 16:58:49 +0000
Subject: [PATCH 019/151] v2.0.30

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index f5ecd09c34..96c2575602 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.29",
+  "version": "2.0.30",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 05606920a3..888483b56e 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.29",
+  "version": "2.0.30",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "^2.0.29",
+    "@budibase/types": "^2.0.30",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index d453fcf3b1..9472f84bb4 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.29",
+  "version": "2.0.30",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^2.0.29",
+    "@budibase/string-templates": "^2.0.30",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 7fcfa6221f..25d833c378 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.29",
+  "version": "2.0.30",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.29",
-    "@budibase/client": "^2.0.29",
-    "@budibase/frontend-core": "^2.0.29",
-    "@budibase/string-templates": "^2.0.29",
+    "@budibase/bbui": "^2.0.30",
+    "@budibase/client": "^2.0.30",
+    "@budibase/frontend-core": "^2.0.30",
+    "@budibase/string-templates": "^2.0.30",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 0cf8656079..58e6aea835 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.29",
+  "version": "2.0.30",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.0.29",
-    "@budibase/string-templates": "^2.0.29",
-    "@budibase/types": "^2.0.29",
+    "@budibase/backend-core": "^2.0.30",
+    "@budibase/string-templates": "^2.0.30",
+    "@budibase/types": "^2.0.30",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 367c8b2a87..f01e9f4ea5 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.29",
+  "version": "2.0.30",
   "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": "^2.0.29",
-    "@budibase/frontend-core": "^2.0.29",
-    "@budibase/string-templates": "^2.0.29",
+    "@budibase/bbui": "^2.0.30",
+    "@budibase/frontend-core": "^2.0.30",
+    "@budibase/string-templates": "^2.0.30",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index daafebee22..ace3316711 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.29",
+  "version": "2.0.30",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.0.29",
+    "@budibase/bbui": "^2.0.30",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index fbe5b7b637..438bcf8fb0 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.29",
+  "version": "2.0.30",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index f387181441..5fd6803ea0 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.29",
+  "version": "2.0.30",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.0.29",
-    "@budibase/client": "^2.0.29",
+    "@budibase/backend-core": "^2.0.30",
+    "@budibase/client": "^2.0.30",
     "@budibase/pro": "2.0.29",
-    "@budibase/string-templates": "^2.0.29",
-    "@budibase/types": "^2.0.29",
+    "@budibase/string-templates": "^2.0.30",
+    "@budibase/types": "^2.0.30",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 28da60a3e3..64b3e52bf7 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.29",
+  "version": "2.0.30",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index d6f467ef88..209294dbee 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.29",
+  "version": "2.0.30",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 64910f3708..a410b8dd84 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.29",
+  "version": "2.0.30",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.0.29",
+    "@budibase/backend-core": "^2.0.30",
     "@budibase/pro": "2.0.29",
-    "@budibase/string-templates": "^2.0.29",
-    "@budibase/types": "^2.0.29",
+    "@budibase/string-templates": "^2.0.30",
+    "@budibase/types": "^2.0.30",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 847fcbc41e61fca4f168df0de9cca072664dacf1 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 12 Oct 2022 17:02:51 +0000
Subject: [PATCH 020/151] Update pro version to 2.0.30

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 5fd6803ea0..e2242dd1ef 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.0.30",
     "@budibase/client": "^2.0.30",
-    "@budibase/pro": "2.0.29",
+    "@budibase/pro": "2.0.30",
     "@budibase/string-templates": "^2.0.30",
     "@budibase/types": "^2.0.30",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 97f550267c..35555f7f27 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.29":
-  version "2.0.29"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.29.tgz#d5856d49d8cc64790961631dfe0fface7f7be4e4"
-  integrity sha512-05mnl6YcucWrO1X6bVBYG6r7Yig/fIHbokLRfEvFFrZNe/EcRB3iLeOG1+2190dv5TbO/jhabS3kcrbDs54HHw==
+"@budibase/backend-core@2.0.30":
+  version "2.0.30"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30.tgz#5cc53e8560572d789ae687ec2181b629526c2f3f"
+  integrity sha512-+X4DwtMf1Xv4ygG7OJN0wOxZgjJ1wul1gUVOXJm44sRIEOx0LHpyx8xT4npC9e2VKKezpF5GZFE2IrB9lwWsoQ==
   dependencies:
-    "@budibase/types" "^2.0.29"
+    "@budibase/types" "^2.0.30"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.29":
-  version "2.0.29"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.29.tgz#169055bc39894f90341226fbff4a1601418d0b42"
-  integrity sha512-ELBoQ7/MXlgatCJNvTNXgF7DK02pfYx5Yy1s/2BJr4iGe26+5Q65ztiC7Jp+d/owese+f5kqKJRNuU1KINUfjQ==
+"@budibase/pro@2.0.30":
+  version "2.0.30"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30.tgz#4c739ed97e04d6dfc875dfb550262ef7085dc9d4"
+  integrity sha512-unel/xYLpeWUI+I0vstITH9UTVkjKS+SS0Ce4jCQlpMyOSB8zCie/sO6Ie2TakrI+vnuYuypnRT8fqlbgtrNyA==
   dependencies:
-    "@budibase/backend-core" "2.0.29"
-    "@budibase/types" "2.0.29"
+    "@budibase/backend-core" "2.0.30"
+    "@budibase/types" "2.0.30"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.29", "@budibase/types@^2.0.29":
-  version "2.0.29"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.29.tgz#8b27f695aded7ad7523c4943deb556eadfb66c3c"
-  integrity sha512-wwpHgDwKff2UhNmKAdrzIxmDQ/crY77AZdFyWNpPvrHYIetyh2Kp5ikEKyZlYHTEpS2IPDE8EKn4coDeu+mGlQ==
+"@budibase/types@2.0.30", "@budibase/types@^2.0.30":
+  version "2.0.30"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30.tgz#ac3d2d714ebf2820875150739959e5f6b851aceb"
+  integrity sha512-46uCHPcLAAjAFRkE53skS7oLjI/Fa+2Mn4vZjIApa1/0JXyR2HnzTzJocbrQfYFTYLkdniMfLRticcKC/E2X1w==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a410b8dd84..6723ba89e7 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.0.30",
-    "@budibase/pro": "2.0.29",
+    "@budibase/pro": "2.0.30",
     "@budibase/string-templates": "^2.0.30",
     "@budibase/types": "^2.0.30",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 3ecc2a4f02..b9bfaed432 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.29":
-  version "2.0.29"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.29.tgz#d5856d49d8cc64790961631dfe0fface7f7be4e4"
-  integrity sha512-05mnl6YcucWrO1X6bVBYG6r7Yig/fIHbokLRfEvFFrZNe/EcRB3iLeOG1+2190dv5TbO/jhabS3kcrbDs54HHw==
+"@budibase/backend-core@2.0.30":
+  version "2.0.30"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30.tgz#5cc53e8560572d789ae687ec2181b629526c2f3f"
+  integrity sha512-+X4DwtMf1Xv4ygG7OJN0wOxZgjJ1wul1gUVOXJm44sRIEOx0LHpyx8xT4npC9e2VKKezpF5GZFE2IrB9lwWsoQ==
   dependencies:
-    "@budibase/types" "^2.0.29"
+    "@budibase/types" "^2.0.30"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.29":
-  version "2.0.29"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.29.tgz#169055bc39894f90341226fbff4a1601418d0b42"
-  integrity sha512-ELBoQ7/MXlgatCJNvTNXgF7DK02pfYx5Yy1s/2BJr4iGe26+5Q65ztiC7Jp+d/owese+f5kqKJRNuU1KINUfjQ==
+"@budibase/pro@2.0.30":
+  version "2.0.30"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30.tgz#4c739ed97e04d6dfc875dfb550262ef7085dc9d4"
+  integrity sha512-unel/xYLpeWUI+I0vstITH9UTVkjKS+SS0Ce4jCQlpMyOSB8zCie/sO6Ie2TakrI+vnuYuypnRT8fqlbgtrNyA==
   dependencies:
-    "@budibase/backend-core" "2.0.29"
-    "@budibase/types" "2.0.29"
+    "@budibase/backend-core" "2.0.30"
+    "@budibase/types" "2.0.30"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.29", "@budibase/types@^2.0.29":
-  version "2.0.29"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.29.tgz#8b27f695aded7ad7523c4943deb556eadfb66c3c"
-  integrity sha512-wwpHgDwKff2UhNmKAdrzIxmDQ/crY77AZdFyWNpPvrHYIetyh2Kp5ikEKyZlYHTEpS2IPDE8EKn4coDeu+mGlQ==
+"@budibase/types@2.0.30", "@budibase/types@^2.0.30":
+  version "2.0.30"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30.tgz#ac3d2d714ebf2820875150739959e5f6b851aceb"
+  integrity sha512-46uCHPcLAAjAFRkE53skS7oLjI/Fa+2Mn4vZjIApa1/0JXyR2HnzTzJocbrQfYFTYLkdniMfLRticcKC/E2X1w==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From d1c9a56e9a01cad3bae1c139a3cb29bb409ef2b2 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 12 Oct 2022 19:15:28 +0100
Subject: [PATCH 021/151] Full import implementation - needs further testing,
 untars the file with all apps, then adds each of them individually.

---
 .../pages/builder/portal/apps/index.svelte    |   3 +-
 packages/server/src/api/controllers/cloud.js  | 123 +++++++++++-------
 .../server/src/sdk/app/backups/exports.ts     |  17 ++-
 .../server/src/sdk/app/backups/imports.ts     |  36 +++--
 4 files changed, 112 insertions(+), 67 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index a2fa954389..0b760c4b4a 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -21,7 +21,6 @@
   import { API } from "api"
   import { onMount } from "svelte"
   import { apps, auth, admin, templates, licensing } from "stores/portal"
-  import download from "downloadjs"
   import { goto } from "@roxi/routify"
   import AppRow from "components/start/AppRow.svelte"
   import { AppStatus } from "constants"
@@ -140,7 +139,7 @@
 
   const initiateAppsExport = () => {
     try {
-      download(`/api/cloud/export`)
+      window.location = `/api/cloud/export`
       notifications.success("Apps exported successfully")
     } catch (err) {
       notifications.error(`Error exporting apps: ${err}`)
diff --git a/packages/server/src/api/controllers/cloud.js b/packages/server/src/api/controllers/cloud.js
index 323c7409db..9397bc69a6 100644
--- a/packages/server/src/api/controllers/cloud.js
+++ b/packages/server/src/api/controllers/cloud.js
@@ -1,9 +1,45 @@
 const env = require("../../environment")
 const { getAllApps, getGlobalDBName } = require("@budibase/backend-core/db")
+const { getGlobalDB } = require("@budibase/backend-core/tenancy")
 const { streamFile } = require("../../utilities/fileSystem")
-const { DocumentType, isDevAppID } = require("../../db/utils")
+const { stringToReadStream } = require("../../utilities")
+const {
+  getDocParams,
+  DocumentType,
+  isDevAppID,
+  APP_PREFIX,
+} = require("../../db/utils")
+const { create } = require("./application")
+const { join } = require("path")
+const fs = require("fs")
 const sdk = require("../../sdk")
 
+async function createApp(appName, appDirectory) {
+  const ctx = {
+    request: {
+      body: {
+        useTemplate: true,
+        name: appName,
+      },
+      files: {
+        templateFile: {
+          path: appDirectory,
+        },
+      },
+    },
+  }
+  return create(ctx)
+}
+
+async function getAllDocType(db, docType) {
+  const response = await db.allDocs(
+    getDocParams(docType, null, {
+      include_docs: true,
+    })
+  )
+  return response.rows.map(row => row.doc)
+}
+
 exports.exportApps = async ctx => {
   if (env.SELF_HOSTED || !env.MULTI_TENANCY) {
     ctx.throw(400, "Exporting only allowed in multi-tenant cloud environments.")
@@ -14,10 +50,13 @@ exports.exportApps = async ctx => {
   })
   // only export the dev apps as they will be the latest, the user can republish the apps
   // in their self-hosted environment
-  let appIds = apps
-    .map(app => app.appId || app._id)
-    .filter(appId => isDevAppID(appId))
-  const tmpPath = await sdk.backups.exportMultipleApps(appIds, globalDBString)
+  let appMetadata = apps
+    .filter(app => isDevAppID(app.appId || app._id))
+    .map(app => ({ appId: app.appId || app._id, name: app.name }))
+  const tmpPath = await sdk.backups.exportMultipleApps(
+    appMetadata,
+    globalDBString
+  )
   const filename = `cloud-export-${new Date().getTime()}.tar.gz`
   ctx.attachment(filename)
   ctx.body = streamFile(tmpPath)
@@ -48,51 +87,37 @@ exports.importApps = async ctx => {
       "Import file is required and environment must be fresh to import apps."
     )
   }
+  if (ctx.request.files.importFile.type !== "application/gzip") {
+    ctx.throw(400, "Import file must be a gzipped tarball.")
+  }
 
-  // TODO: IMPLEMENT TARBALL EXTRACTION, APP IMPORT, ATTACHMENT IMPORT AND GLOBAL DB IMPORT
-  // async function getAllDocType(db, docType) {
-  //   const response = await db.allDocs(
-  //     getDocParams(docType, null, {
-  //       include_docs: true,
-  //     })
-  //   )
-  //   return response.rows.map(row => row.doc)
-  // }
-  // async function createApp(appName, appImport) {
-  //   const ctx = {
-  //     request: {
-  //       body: {
-  //         templateString: appImport,
-  //         name: appName,
-  //       },
-  //     },
-  //   }
-  //   return create(ctx)
-  // }
-  // const importFile = ctx.request.files.importFile
-  // const importString = readFileSync(importFile.path)
-  // const dbs = JSON.parse(importString)
-  // const globalDbImport = dbs.global
-  // // remove from the list of apps
-  // delete dbs.global
-  // const globalDb = getGlobalDB()
-  // // load the global db first
-  // await globalDb.load(stringToReadStream(globalDbImport))
-  // for (let [appName, appImport] of Object.entries(dbs)) {
-  //   await createApp(appName, appImport)
-  // }
-  //
-  // // if there are any users make sure to remove them
-  // let users = await getAllDocType(globalDb, DocumentType.USER)
-  // let userDeletionPromises = []
-  // for (let user of users) {
-  //   userDeletionPromises.push(globalDb.remove(user._id, user._rev))
-  // }
-  // if (userDeletionPromises.length > 0) {
-  //   await Promise.all(userDeletionPromises)
-  // }
-  //
-  // await globalDb.bulkDocs(users)
+  // initially get all the app databases out of the tarball
+  const tmpPath = sdk.backups.untarFile(ctx.request.file.importFile)
+  const globalDbImport = sdk.backups.getGlobalDBFile(tmpPath)
+  const appNames = fs
+    .readdirSync(tmpPath)
+    .filter(dir => dir.startsWith(APP_PREFIX))
+
+  const globalDb = getGlobalDB()
+  // load the global db first
+  await globalDb.load(stringToReadStream(globalDbImport))
+  const appCreationPromises = []
+  for (let appName of appNames) {
+    appCreationPromises.push(createApp(appName, join(tmpPath, appName)))
+  }
+  await Promise.all(appCreationPromises)
+
+  // if there are any users make sure to remove them
+  let users = await getAllDocType(globalDb, DocumentType.USER)
+  let userDeletionPromises = []
+  for (let user of users) {
+    userDeletionPromises.push(globalDb.remove(user._id, user._rev))
+  }
+  if (userDeletionPromises.length > 0) {
+    await Promise.all(userDeletionPromises)
+  }
+
+  await globalDb.bulkDocs(users)
   ctx.body = {
     message: "Apps successfully imported.",
   }
diff --git a/packages/server/src/sdk/app/backups/exports.ts b/packages/server/src/sdk/app/backups/exports.ts
index adf39f7e15..5a028c27a9 100644
--- a/packages/server/src/sdk/app/backups/exports.ts
+++ b/packages/server/src/sdk/app/backups/exports.ts
@@ -127,28 +127,33 @@ export async function exportApp(appId: string, config?: ExportOpts) {
 /**
  * Export all apps + global DB (if supplied) to a single tarball, this includes
  * the attachments for each app as well.
- * @param {string[]} appIds The IDs of the apps to be exported.
+ * @param {object[]} appMetadata The IDs and names of apps to export.
  * @param {string} globalDbContents The contents of the global DB to export as well.
  * @return {string} The path to the tarball.
  */
 export async function exportMultipleApps(
-  appIds: string[],
+  appMetadata: { appId: string; name: string }[],
   globalDbContents?: string
 ) {
   const tmpPath = join(budibaseTempDir(), uuid())
+  fs.mkdirSync(tmpPath)
   let exportPromises: Promise<void>[] = []
-  const exportAndMove = async (appId: string) => {
+  // export each app to a directory, then move it into the complete export
+  const exportAndMove = async (appId: string, appName: string) => {
     const path = await exportApp(appId)
     await fs.promises.rename(path, join(tmpPath, appId))
   }
-  for (let appId of appIds) {
-    exportPromises.push(exportAndMove(appId))
+  for (let metadata of appMetadata) {
+    exportPromises.push(exportAndMove(metadata.appId, metadata.name))
   }
+  // wait for all exports to finish
   await Promise.all(exportPromises)
+  // add the global DB contents
   if (globalDbContents) {
     fs.writeFileSync(join(tmpPath, GLOBAL_DB_EXPORT_FILE), globalDbContents)
   }
-  const tarPath = tarFilesToTmp(tmpPath, [...appIds, GLOBAL_DB_EXPORT_FILE])
+  const appNames = appMetadata.map(metadata => metadata.name)
+  const tarPath = tarFilesToTmp(tmpPath, [...appNames, GLOBAL_DB_EXPORT_FILE])
   // clear up the tmp path now tarball generated
   fs.rmSync(tmpPath, { recursive: true, force: true })
   return tarPath
diff --git a/packages/server/src/sdk/app/backups/imports.ts b/packages/server/src/sdk/app/backups/imports.ts
index 297274e26b..13d8e7aab0 100644
--- a/packages/server/src/sdk/app/backups/imports.ts
+++ b/packages/server/src/sdk/app/backups/imports.ts
@@ -1,7 +1,11 @@
 import { db as dbCore } from "@budibase/backend-core"
 import { TABLE_ROW_PREFIX } from "../../../db/utils"
 import { budibaseTempDir } from "../../../utilities/budibaseDir"
-import { DB_EXPORT_FILE, ATTACHMENT_DIR } from "./constants"
+import {
+  DB_EXPORT_FILE,
+  ATTACHMENT_DIR,
+  GLOBAL_DB_EXPORT_FILE,
+} from "./constants"
 import { uploadDirectory } from "../../../utilities/fileSystem/utilities"
 import { ObjectStoreBuckets, FieldTypes } from "../../../constants"
 import { join } from "path"
@@ -91,6 +95,22 @@ async function getTemplateStream(template: TemplateType) {
   }
 }
 
+export function untarFile(file: { path: string }) {
+  const tmpPath = join(budibaseTempDir(), uuid())
+  fs.mkdirSync(tmpPath)
+  // extract the tarball
+  tar.extract({
+    sync: true,
+    cwd: tmpPath,
+    file: file.path,
+  })
+  return tmpPath
+}
+
+export function getGlobalDBFile(tmpPath: string) {
+  return fs.readFileSync(join(tmpPath, GLOBAL_DB_EXPORT_FILE), "utf8")
+}
+
 export async function importApp(
   appId: string,
   db: PouchDB.Database,
@@ -98,15 +118,11 @@ export async function importApp(
 ) {
   let prodAppId = dbCore.getProdAppID(appId)
   let dbStream: any
-  if (template.file && template.file.type === "application/gzip") {
-    const tmpPath = join(budibaseTempDir(), uuid())
-    fs.mkdirSync(tmpPath)
-    // extract the tarball
-    tar.extract({
-      sync: true,
-      cwd: tmpPath,
-      file: template.file.path,
-    })
+  const isTar = template.file && template.file.type === "application/gzip"
+  const isDirectory =
+    template.file && fs.lstatSync(template.file.path).isDirectory()
+  if (template.file && (isTar || isDirectory)) {
+    const tmpPath = isTar ? untarFile(template.file) : template.file.path
     const attachmentPath = join(tmpPath, ATTACHMENT_DIR)
     // have to handle object import
     if (fs.existsSync(attachmentPath)) {

From 5d0dd41de34c851580f4cd541154bbbd4d6a82e5 Mon Sep 17 00:00:00 2001
From: Jonny McCullagh <jonny.mccullagh@redbranch.net>
Date: Thu, 13 Oct 2022 11:57:00 +0100
Subject: [PATCH 022/151] single image mount nfs share if vars defined

---
 hosting/single/runner.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/hosting/single/runner.sh b/hosting/single/runner.sh
index e02b33d771..9ab6875d10 100644
--- a/hosting/single/runner.sh
+++ b/hosting/single/runner.sh
@@ -18,6 +18,7 @@ declare -a DOCKER_VARS=("APP_PORT" "APPS_URL" "ARCHITECTURE" "BUDIBASE_ENVIRONME
 [[ -z "${WORKER_URL}" ]] && export WORKER_URL=http://localhost:4002
 [[ -z "${APPS_URL}" ]] && export APPS_URL=http://localhost:4001
 #  export CUSTOM_DOMAIN=budi001.custom.com
+
 # Azure App Service customisations
 if [[ "${TARGETBUILD}" = "aas" ]]; then
     DATA_DIR=/home
@@ -26,6 +27,13 @@ else
     DATA_DIR=${DATA_DIR:-/data}
 fi
 
+# Mount NFS or GCP Filestore if env vars exist for it
+if [[ -z ${FILESHARE_IP} && -z ${FILESHARE_NAME} ]]; then
+    echo "Mount file share ${FILESHARE_IP}:/${FILESHARE_NAME} to ${DATA_DIR}"
+    mount -o nolock ${FILESHARE_IP}:/${FILESHARE_NAME} ${DATA_DIR}
+    echo "Mounting completed."
+fi
+
 if [ -f "${DATA_DIR}/.env" ]; then
     # Read in the .env file and export the variables
     for LINE in $(cat ${DATA_DIR}/.env); do export $LINE; done

From 7b2e471d829507c44ff8af917d8835b27d691a55 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 13 Oct 2022 15:32:31 +0100
Subject: [PATCH 023/151] Only hide plugin search bar when no plugins exist

---
 .../src/pages/builder/portal/manage/plugins/index.svelte        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte b/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte
index 84722c27be..b9b84307a8 100644
--- a/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte
@@ -55,7 +55,7 @@
           Add plugin
         </Button>
       </div>
-      {#if filteredPlugins?.length}
+      {#if $plugins?.length}
         <div class="filters">
           <div class="select">
             <Select

From 907b838db366b3079801372e57f07d5a40a81e43 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 13 Oct 2022 15:46:53 +0100
Subject: [PATCH 024/151] Fixing multi-app import from cloud.

---
 packages/server/src/api/controllers/cloud.js  | 24 ++++++-------------
 .../server/src/sdk/app/backups/exports.ts     |  2 +-
 .../server/src/sdk/app/backups/imports.ts     |  6 ++++-
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/packages/server/src/api/controllers/cloud.js b/packages/server/src/api/controllers/cloud.js
index 9397bc69a6..27b576f181 100644
--- a/packages/server/src/api/controllers/cloud.js
+++ b/packages/server/src/api/controllers/cloud.js
@@ -3,15 +3,9 @@ const { getAllApps, getGlobalDBName } = require("@budibase/backend-core/db")
 const { getGlobalDB } = require("@budibase/backend-core/tenancy")
 const { streamFile } = require("../../utilities/fileSystem")
 const { stringToReadStream } = require("../../utilities")
-const {
-  getDocParams,
-  DocumentType,
-  isDevAppID,
-  APP_PREFIX,
-} = require("../../db/utils")
+const { getDocParams, DocumentType, isDevAppID } = require("../../db/utils")
 const { create } = require("./application")
 const { join } = require("path")
-const fs = require("fs")
 const sdk = require("../../sdk")
 
 async function createApp(appName, appDirectory) {
@@ -41,9 +35,9 @@ async function getAllDocType(db, docType) {
 }
 
 exports.exportApps = async ctx => {
-  if (env.SELF_HOSTED || !env.MULTI_TENANCY) {
-    ctx.throw(400, "Exporting only allowed in multi-tenant cloud environments.")
-  }
+  // if (env.SELF_HOSTED || !env.MULTI_TENANCY) {
+  //   ctx.throw(400, "Exporting only allowed in multi-tenant cloud environments.")
+  // }
   const apps = await getAllApps({ all: true })
   const globalDBString = await sdk.backups.exportDB(getGlobalDBName(), {
     filter: doc => !doc._id.startsWith(DocumentType.USER),
@@ -92,20 +86,16 @@ exports.importApps = async ctx => {
   }
 
   // initially get all the app databases out of the tarball
-  const tmpPath = sdk.backups.untarFile(ctx.request.file.importFile)
+  const tmpPath = sdk.backups.untarFile(ctx.request.files.importFile)
   const globalDbImport = sdk.backups.getGlobalDBFile(tmpPath)
-  const appNames = fs
-    .readdirSync(tmpPath)
-    .filter(dir => dir.startsWith(APP_PREFIX))
+  const appNames = sdk.backups.getListOfAppsInMulti(tmpPath)
 
   const globalDb = getGlobalDB()
   // load the global db first
   await globalDb.load(stringToReadStream(globalDbImport))
-  const appCreationPromises = []
   for (let appName of appNames) {
-    appCreationPromises.push(createApp(appName, join(tmpPath, appName)))
+    await createApp(appName, join(tmpPath, appName))
   }
-  await Promise.all(appCreationPromises)
 
   // if there are any users make sure to remove them
   let users = await getAllDocType(globalDb, DocumentType.USER)
diff --git a/packages/server/src/sdk/app/backups/exports.ts b/packages/server/src/sdk/app/backups/exports.ts
index 5a028c27a9..4656a83d51 100644
--- a/packages/server/src/sdk/app/backups/exports.ts
+++ b/packages/server/src/sdk/app/backups/exports.ts
@@ -141,7 +141,7 @@ export async function exportMultipleApps(
   // export each app to a directory, then move it into the complete export
   const exportAndMove = async (appId: string, appName: string) => {
     const path = await exportApp(appId)
-    await fs.promises.rename(path, join(tmpPath, appId))
+    await fs.promises.rename(path, join(tmpPath, appName))
   }
   for (let metadata of appMetadata) {
     exportPromises.push(exportAndMove(metadata.appId, metadata.name))
diff --git a/packages/server/src/sdk/app/backups/imports.ts b/packages/server/src/sdk/app/backups/imports.ts
index 13d8e7aab0..d09c4b3f02 100644
--- a/packages/server/src/sdk/app/backups/imports.ts
+++ b/packages/server/src/sdk/app/backups/imports.ts
@@ -1,5 +1,5 @@
 import { db as dbCore } from "@budibase/backend-core"
-import { TABLE_ROW_PREFIX } from "../../../db/utils"
+import { APP_PREFIX, TABLE_ROW_PREFIX } from "../../../db/utils"
 import { budibaseTempDir } from "../../../utilities/budibaseDir"
 import {
   DB_EXPORT_FILE,
@@ -111,6 +111,10 @@ export function getGlobalDBFile(tmpPath: string) {
   return fs.readFileSync(join(tmpPath, GLOBAL_DB_EXPORT_FILE), "utf8")
 }
 
+export function getListOfAppsInMulti(tmpPath: string) {
+  return fs.readdirSync(tmpPath).filter(dir => dir !== GLOBAL_DB_EXPORT_FILE)
+}
+
 export async function importApp(
   appId: string,
   db: PouchDB.Database,

From 167f8f368bd27f721a8c7e662f022748d5852636 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 13 Oct 2022 15:58:44 +0100
Subject: [PATCH 025/151] Only show sortable fields for sort column settings

---
 .../design/settings/componentSettings.js      |  2 +
 .../controls/SortableFieldSelect.svelte       | 47 +++++++++++++++++++
 packages/client/manifest.json                 |  8 ++--
 3 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte

diff --git a/packages/builder/src/components/design/settings/componentSettings.js b/packages/builder/src/components/design/settings/componentSettings.js
index 56ae3de490..6b109f80c3 100644
--- a/packages/builder/src/components/design/settings/componentSettings.js
+++ b/packages/builder/src/components/design/settings/componentSettings.js
@@ -7,6 +7,7 @@ import TableSelect from "./controls/TableSelect.svelte"
 import ColorPicker from "./controls/ColorPicker.svelte"
 import { IconSelect } from "./controls/IconSelect"
 import FieldSelect from "./controls/FieldSelect.svelte"
+import SortableFieldSelect from "./controls/SortableFieldSelect.svelte"
 import MultiFieldSelect from "./controls/MultiFieldSelect.svelte"
 import SearchFieldSelect from "./controls/SearchFieldSelect.svelte"
 import SchemaSelect from "./controls/SchemaSelect.svelte"
@@ -41,6 +42,7 @@ const componentMap = {
   filter: FilterEditor,
   url: URLSelect,
   columns: ColumnEditor,
+  "field/sortable": SortableFieldSelect,
   "field/string": FormFieldSelect,
   "field/number": FormFieldSelect,
   "field/options": FormFieldSelect,
diff --git a/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
new file mode 100644
index 0000000000..21ed68ce68
--- /dev/null
+++ b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
@@ -0,0 +1,47 @@
+<script>
+  import { Select } from "@budibase/bbui"
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "builderStore/dataBinding"
+  import { currentAsset } from "builderStore"
+  import { createEventDispatcher } from "svelte"
+  import { UNSORTABLE_TYPES } from "constants"
+
+  export let componentInstance = {}
+  export let value = ""
+  export let placeholder
+
+  const dispatch = createEventDispatcher()
+  $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
+  $: schema = getSchemaForDatasource($currentAsset, datasource).schema
+  $: options = getSortableFields(schema)
+  $: boundValue = getValidValue(value, options)
+
+  const getSortableFields = schema => {
+    return Object.entries(schema || {})
+      .filter(entry => !UNSORTABLE_TYPES.includes(entry[1].type))
+      .map(entry => entry[0])
+  }
+
+  const getValidValue = (value, options) => {
+    // Reset value if there aren't any options
+    if (!Array.isArray(options)) {
+      return null
+    }
+
+    // Reset value if the value isn't found in the options
+    if (options.indexOf(value) === -1) {
+      return null
+    }
+
+    return value
+  }
+
+  const onChange = value => {
+    boundValue = getValidValue(value.detail, options)
+    dispatch("change", boundValue)
+  }
+</script>
+
+<Select {placeholder} value={boundValue} on:change={onChange} {options} />
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index b6d4941e4c..d9c9b14676 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -3523,7 +3523,7 @@
         "key": "filter"
       },
       {
-        "type": "field",
+        "type": "field/sortable",
         "label": "Sort Column",
         "key": "sortColumn"
       },
@@ -3853,7 +3853,7 @@
         "key": "filter"
       },
       {
-        "type": "field",
+        "type": "field/sortable",
         "label": "Sort Column",
         "key": "sortColumn"
       },
@@ -4018,7 +4018,7 @@
         "key": "filter"
       },
       {
-        "type": "field",
+        "type": "field/sortable",
         "label": "Sort Column",
         "key": "sortColumn"
       },
@@ -4177,7 +4177,7 @@
         "key": "filter"
       },
       {
-        "type": "field",
+        "type": "field/sortable",
         "label": "Sort Column",
         "key": "sortColumn"
       },

From bfee51aeab32fa50d082f3b416e4d970aca52387 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 13 Oct 2022 16:11:53 +0100
Subject: [PATCH 026/151] Update formula tooltip to explain they cannot be
 sorted by

---
 .../components/backend/DataTable/modals/CreateEditColumn.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 21059b32dd..44a750cbb1 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -487,7 +487,7 @@
         ]}
         getOptionLabel={option => option.label}
         getOptionValue={option => option.value}
-        tooltip="Dynamic formula are calculated when retrieved, but cannot be filtered,
+        tooltip="Dynamic formula are calculated when retrieved, but cannot be filtered or sorted by,
          while static formula are calculated when the row is saved."
       />
     {/if}

From 35525bfedd9b03db51e22e29567c2817f0ae1e13 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 13 Oct 2022 17:27:04 +0100
Subject: [PATCH 027/151] Moving queue implementation into backend-core - so
 that pro can access.

---
 packages/backend-core/package.json            |   1 +
 packages/backend-core/src/index.ts            |   2 +
 packages/backend-core/src/queue/constants.ts  |   4 +
 .../backend-core/src/queue/inMemoryQueue.ts   | 127 +++++++++++++++++
 packages/backend-core/src/queue/index.ts      |   2 +
 packages/backend-core/src/queue/queue.ts      |  47 +++++++
 packages/backend-core/yarn.lock               | 129 +++++++++++++++++-
 packages/server/src/automations/bullboard.js  |  33 +----
 packages/server/src/constants/index.js        |   4 -
 9 files changed, 314 insertions(+), 35 deletions(-)
 create mode 100644 packages/backend-core/src/queue/constants.ts
 create mode 100644 packages/backend-core/src/queue/inMemoryQueue.ts
 create mode 100644 packages/backend-core/src/queue/index.ts
 create mode 100644 packages/backend-core/src/queue/queue.ts

diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index abcf72491a..404b7da346 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -26,6 +26,7 @@
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",
     "bcryptjs": "2.4.3",
+    "bull": "^4.10.1",
     "dotenv": "16.0.1",
     "emitter-listener": "1.1.2",
     "ioredis": "4.28.0",
diff --git a/packages/backend-core/src/index.ts b/packages/backend-core/src/index.ts
index 42cad17620..659a56c051 100644
--- a/packages/backend-core/src/index.ts
+++ b/packages/backend-core/src/index.ts
@@ -19,6 +19,7 @@ import pino from "./pino"
 import * as middleware from "./middleware"
 import plugins from "./plugin"
 import encryption from "./security/encryption"
+import * as queue from "./queue"
 
 // mimic the outer package exports
 import * as db from "./pkg/db"
@@ -63,6 +64,7 @@ const core = {
   ...errorClasses,
   middleware,
   encryption,
+  queue,
 }
 
 export = core
diff --git a/packages/backend-core/src/queue/constants.ts b/packages/backend-core/src/queue/constants.ts
new file mode 100644
index 0000000000..d8fb3121a3
--- /dev/null
+++ b/packages/backend-core/src/queue/constants.ts
@@ -0,0 +1,4 @@
+export enum JobQueue {
+  AUTOMATIONS = "automationQueue",
+  APP_BACKUPS = "appBackupQueue",
+}
diff --git a/packages/backend-core/src/queue/inMemoryQueue.ts b/packages/backend-core/src/queue/inMemoryQueue.ts
new file mode 100644
index 0000000000..80ee7362e4
--- /dev/null
+++ b/packages/backend-core/src/queue/inMemoryQueue.ts
@@ -0,0 +1,127 @@
+import events from "events"
+
+/**
+ * Bull works with a Job wrapper around all messages that contains a lot more information about
+ * the state of the message, this object constructor implements the same schema of Bull jobs
+ * for the sake of maintaining API consistency.
+ * @param {string} queue The name of the queue which the message will be carried on.
+ * @param {object} message The JSON message which will be passed back to the consumer.
+ * @returns {Object} A new job which can now be put onto the queue, this is mostly an
+ * internal structure so that an in memory queue can be easily swapped for a Bull queue.
+ */
+function newJob(queue: string, message: any) {
+  return {
+    timestamp: Date.now(),
+    queue: queue,
+    data: message,
+  }
+}
+
+/**
+ * This is designed to replicate Bull (https://github.com/OptimalBits/bull) in memory as a sort of mock.
+ * It is relatively simple, using an event emitter internally to register when messages are available
+ * to the consumers - in can support many inputs and many consumers.
+ */
+class InMemoryQueue {
+  _name: string
+  _opts?: any
+  _messages: any[]
+  _emitter: EventEmitter
+  /**
+   * The constructor the queue, exactly the same as that of Bulls.
+   * @param {string} name The name of the queue which is being configured.
+   * @param {object|null} opts This is not used by the in memory queue as there is no real use
+   * case when in memory, but is the same API as Bull
+   */
+  constructor(name: string, opts = null) {
+    this._name = name
+    this._opts = opts
+    this._messages = []
+    this._emitter = new events.EventEmitter()
+  }
+
+  /**
+   * Same callback API as Bull, each callback passed to this will consume messages as they are
+   * available. Please note this is a queue service, not a notification service, so each
+   * consumer will receive different messages.
+   * @param {function<object>} func The callback function which will return a "Job", the same
+   * as the Bull API, within this job the property "data" contains the JSON message. Please
+   * note this is incredibly limited compared to Bull as in reality the Job would contain
+   * a lot more information about the queue and current status of Bull cluster.
+   */
+  process(func: any) {
+    this._emitter.on("message", async () => {
+      if (this._messages.length <= 0) {
+        return
+      }
+      let msg = this._messages.shift()
+      let resp = func(msg)
+      if (resp.then != null) {
+        await resp
+      }
+    })
+  }
+
+  // simply puts a message to the queue and emits to the queue for processing
+  /**
+   * Simple function to replicate the add message functionality of Bull, putting
+   * a new message on the queue. This then emits an event which will be used to
+   * return the message to a consumer (if one is attached).
+   * @param {object} msg A message to be transported over the queue, this should be
+   * a JSON message as this is required by Bull.
+   * @param {boolean} repeat serves no purpose for the import queue.
+   */
+  // eslint-disable-next-line no-unused-vars
+  add(msg: any, repeat: boolean) {
+    if (typeof msg !== "object") {
+      throw "Queue only supports carrying JSON."
+    }
+    this._messages.push(newJob(this._name, msg))
+    this._emitter.emit("message")
+  }
+
+  /**
+   * replicating the close function from bull, which waits for jobs to finish.
+   */
+  async close() {
+    return []
+  }
+
+  /**
+   * This removes a cron which has been implemented, this is part of Bull API.
+   * @param {string} cronJobId The cron which is to be removed.
+   */
+  removeRepeatableByKey(cronJobId: string) {
+    // TODO: implement for testing
+    console.log(cronJobId)
+  }
+
+  /**
+   * Implemented for tests
+   */
+  getRepeatableJobs() {
+    return []
+  }
+
+  // eslint-disable-next-line no-unused-vars
+  removeJobs(pattern: string) {
+    // no-op
+  }
+
+  /**
+   * Implemented for tests
+   */
+  async clean() {
+    return []
+  }
+
+  async getJob() {
+    return {}
+  }
+
+  on() {
+    // do nothing
+  }
+}
+
+export = InMemoryQueue
diff --git a/packages/backend-core/src/queue/index.ts b/packages/backend-core/src/queue/index.ts
new file mode 100644
index 0000000000..b7d565ba13
--- /dev/null
+++ b/packages/backend-core/src/queue/index.ts
@@ -0,0 +1,2 @@
+export * from "./queue"
+export * from "./constants"
diff --git a/packages/backend-core/src/queue/queue.ts b/packages/backend-core/src/queue/queue.ts
new file mode 100644
index 0000000000..de2c738ca4
--- /dev/null
+++ b/packages/backend-core/src/queue/queue.ts
@@ -0,0 +1,47 @@
+import env from "../environment"
+import { getRedisOptions } from "../redis/utils"
+import { JobQueue } from "./constants"
+import inMemoryQueue from "./inMemoryQueue"
+import BullQueue from "bull"
+import InMemoryQueue from "./inMemoryQueue"
+const { opts, redisProtocolUrl } = getRedisOptions()
+
+const CLEANUP_PERIOD_MS = 60 * 1000
+let QUEUES: BullQueue.Queue[] | InMemoryQueue[] = []
+let cleanupInterval: NodeJS.Timeout
+
+async function cleanup() {
+  for (let queue of QUEUES) {
+    await queue.clean(CLEANUP_PERIOD_MS, "completed")
+  }
+}
+
+export function createQueue(jobQueue: JobQueue) {
+  const queueConfig: any = redisProtocolUrl || { redis: opts }
+  let queue: any
+  if (env.isTest()) {
+    queue = new BullQueue(jobQueue, queueConfig)
+  } else {
+    queue = new inMemoryQueue(jobQueue, queueConfig)
+  }
+  QUEUES.push(queue)
+  if (!cleanupInterval) {
+    cleanupInterval = setInterval(cleanup, CLEANUP_PERIOD_MS)
+    // fire off an initial cleanup
+    cleanup().catch(err => {
+      console.error(`Unable to cleanup automation queue initially - ${err}`)
+    })
+  }
+  return queue
+}
+
+exports.shutdown = async () => {
+  if (QUEUES.length) {
+    clearInterval(cleanupInterval)
+    for (let queue of QUEUES) {
+      await queue.close()
+    }
+    QUEUES = []
+  }
+  console.log("Queues shutdown")
+}
diff --git a/packages/backend-core/yarn.lock b/packages/backend-core/yarn.lock
index 6bc9b63728..31d25320c7 100644
--- a/packages/backend-core/yarn.lock
+++ b/packages/backend-core/yarn.lock
@@ -291,6 +291,11 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
+"@budibase/types@2.0.30-alpha.3":
+  version "2.0.30-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.3.tgz#cb55bcced75b711cc8a675284fbacaa8ebf1c0f2"
+  integrity sha512-rHeFVuNbSSE4fMnX6uyrM2r47m+neqFXlVNOkhHU9i7KoIcIZbEYInU8CjUFR2da3ruST9ajXjJ5UenX2+MnTg==
+
 "@hapi/hoek@^9.0.0":
   version "9.3.0"
   resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
@@ -543,6 +548,36 @@
     semver "^7.3.5"
     tar "^6.1.11"
 
+"@msgpackr-extract/msgpackr-extract-darwin-arm64@2.1.2":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.1.2.tgz#9571b87be3a3f2c46de05585470bc4f3af2f6f00"
+  integrity sha512-TyVLn3S/+ikMDsh0gbKv2YydKClN8HaJDDpONlaZR+LVJmsxLFUgA+O7zu59h9+f9gX1aj/ahw9wqa6rosmrYQ==
+
+"@msgpackr-extract/msgpackr-extract-darwin-x64@2.1.2":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-2.1.2.tgz#bfbc6936ede2955218f5621a675679a5fe8e6f4c"
+  integrity sha512-YPXtcVkhmVNoMGlqp81ZHW4dMxK09msWgnxtsDpSiZwTzUBG2N+No2bsr7WMtBKCVJMSD6mbAl7YhKUqkp/Few==
+
+"@msgpackr-extract/msgpackr-extract-linux-arm64@2.1.2":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-2.1.2.tgz#22555e28382af2922e7450634c8a2f240bb9eb82"
+  integrity sha512-vHZ2JiOWF2+DN9lzltGbhtQNzDo8fKFGrf37UJrgqxU0yvtERrzUugnfnX1wmVfFhSsF8OxrfqiNOUc5hko1Zg==
+
+"@msgpackr-extract/msgpackr-extract-linux-arm@2.1.2":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-2.1.2.tgz#ffb6ae1beea7ac572b6be6bf2a8e8162ebdd8be7"
+  integrity sha512-42R4MAFeIeNn+L98qwxAt360bwzX2Kf0ZQkBBucJ2Ircza3asoY4CDbgiu9VWklq8gWJVSJSJBwDI+c/THiWkA==
+
+"@msgpackr-extract/msgpackr-extract-linux-x64@2.1.2":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-2.1.2.tgz#7caf62eebbfb1345de40f75e89666b3d4194755f"
+  integrity sha512-RjRoRxg7Q3kPAdUSC5EUUPlwfMkIVhmaRTIe+cqHbKrGZ4M6TyCA/b5qMaukQ/1CHWrqYY2FbKOAU8Hg0pQFzg==
+
+"@msgpackr-extract/msgpackr-extract-win32-x64@2.1.2":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.1.2.tgz#f2d8b9ddd8d191205ed26ce54aba3dfc5ae3e7c9"
+  integrity sha512-rIZVR48zA8hGkHIK7ED6+ZiXsjRCcAVBJbm8o89OKAMTmEAQ2QvoOxoiu3w2isAaWwzgtQIOFIqHwvZDyLKCvw==
+
 "@shopify/jest-koa-mocks@5.0.1":
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/@shopify/jest-koa-mocks/-/jest-koa-mocks-5.0.1.tgz#fba490b6b7985fbb571eb9974897d396a3642e94"
@@ -1497,6 +1532,21 @@ buffer@^5.5.0, buffer@^5.6.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
+bull@^4.10.1:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/bull/-/bull-4.10.1.tgz#f14974b6089358b62b495a2cbf838aadc098e43f"
+  integrity sha512-Fp21tRPb2EaZPVfmM+ONZKVz2RA+to+zGgaTLyCKt3JMSU8OOBqK8143OQrnGuGpsyE5G+9FevFAGhdZZfQP2g==
+  dependencies:
+    cron-parser "^4.2.1"
+    debuglog "^1.0.0"
+    get-port "^5.1.1"
+    ioredis "^4.28.5"
+    lodash "^4.17.21"
+    msgpackr "^1.5.2"
+    p-timeout "^3.2.0"
+    semver "^7.3.2"
+    uuid "^8.3.0"
+
 cache-content-type@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-content-type/-/cache-content-type-1.0.1.tgz#035cde2b08ee2129f4a8315ea8f00a00dba1453c"
@@ -1764,6 +1814,13 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
+cron-parser@^4.2.1:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-4.6.0.tgz#404c3fdbff10ae80eef6b709555d577ef2fd2e0d"
+  integrity sha512-guZNLMGUgg6z4+eGhmHGw7ft+v6OQeuHzd1gcLxCo9Yg/qoxmG3nindp2/uwGCLizEisf2H0ptqeVXeoCpP6FA==
+  dependencies:
+    luxon "^3.0.1"
+
 cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -1837,6 +1894,11 @@ debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
+debuglog@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==
+
 decimal.js@^10.2.1:
   version "10.3.1"
   resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
@@ -2318,6 +2380,11 @@ get-package-type@^0.1.0:
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
+get-port@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
+  integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
+
 get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -2652,6 +2719,23 @@ ioredis@4.28.0:
     redis-parser "^3.0.0"
     standard-as-callback "^2.1.0"
 
+ioredis@^4.28.5:
+  version "4.28.5"
+  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.28.5.tgz#5c149e6a8d76a7f8fa8a504ffc85b7d5b6797f9f"
+  integrity sha512-3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A==
+  dependencies:
+    cluster-key-slot "^1.1.0"
+    debug "^4.3.1"
+    denque "^1.1.0"
+    lodash.defaults "^4.2.0"
+    lodash.flatten "^4.4.0"
+    lodash.isarguments "^3.1.0"
+    p-map "^2.1.0"
+    redis-commands "1.7.0"
+    redis-errors "^1.2.0"
+    redis-parser "^3.0.0"
+    standard-as-callback "^2.1.0"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -3725,6 +3809,11 @@ ltgt@2.2.1, ltgt@^2.1.2, ltgt@~2.2.0:
   resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5"
   integrity sha512-AI2r85+4MquTw9ZYqabu4nMwy9Oftlfa/e/52t9IjtfG+mGBbTNdAoZ3RQKLHR6r0wQnwZnPIEh/Ya6XTWAKNA==
 
+luxon@^3.0.1:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/luxon/-/luxon-3.0.4.tgz#d179e4e9f05e092241e7044f64aaa54796b03929"
+  integrity sha512-aV48rGUwP/Vydn8HT+5cdr26YYQiUZ42NM6ToMoaGKwYfWbfLeRkEu1wXWMHBZT6+KyLfcbbtVcoQFCbbPjKlw==
+
 make-dir@^3.0.0, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -3872,6 +3961,27 @@ ms@^2.1.1, ms@^2.1.3:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
+msgpackr-extract@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/msgpackr-extract/-/msgpackr-extract-2.1.2.tgz#56272030f3e163e1b51964ef8b1cd5e7240c03ed"
+  integrity sha512-cmrmERQFb19NX2JABOGtrKdHMyI6RUyceaPBQ2iRz9GnDkjBWFjNJC0jyyoOfZl2U/LZE3tQCCQc4dlRyA8mcA==
+  dependencies:
+    node-gyp-build-optional-packages "5.0.3"
+  optionalDependencies:
+    "@msgpackr-extract/msgpackr-extract-darwin-arm64" "2.1.2"
+    "@msgpackr-extract/msgpackr-extract-darwin-x64" "2.1.2"
+    "@msgpackr-extract/msgpackr-extract-linux-arm" "2.1.2"
+    "@msgpackr-extract/msgpackr-extract-linux-arm64" "2.1.2"
+    "@msgpackr-extract/msgpackr-extract-linux-x64" "2.1.2"
+    "@msgpackr-extract/msgpackr-extract-win32-x64" "2.1.2"
+
+msgpackr@^1.5.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.7.2.tgz#68d6debf5999d6b61abb6e7046a689991ebf7261"
+  integrity sha512-mWScyHTtG6TjivXX9vfIy2nBtRupaiAj0HQ2mtmpmYujAmqZmaaEVPaSZ1NKLMvicaMLFzEaMk0ManxMRg8rMQ==
+  optionalDependencies:
+    msgpackr-extract "^2.1.2"
+
 napi-macros@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.0.0.tgz#2b6bae421e7b96eb687aa6c77a7858640670001b"
@@ -3919,6 +4029,11 @@ node-forge@^0.7.1:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz#fdf3b418aee1f94f0ef642cd63486c77ca9724ac"
   integrity sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==
 
+node-gyp-build-optional-packages@5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz#92a89d400352c44ad3975010368072b41ad66c17"
+  integrity sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==
+
 node-gyp-build@~4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.1.1.tgz#d7270b5d86717068d114cc57fff352f96d745feb"
@@ -4075,6 +4190,11 @@ p-cancelable@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
   integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
 
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
+
 p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -4094,6 +4214,13 @@ p-map@^2.1.0:
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
   integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
+p-timeout@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
+  integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
+  dependencies:
+    p-finally "^1.0.0"
+
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
@@ -5360,7 +5487,7 @@ uuid@8.1.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz#6f1536eb43249f473abc6bd58ff983da1ca30d8d"
   integrity sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==
 
-uuid@8.3.2, uuid@^8.3.2:
+uuid@8.3.2, uuid@^8.3.0, uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
diff --git a/packages/server/src/automations/bullboard.js b/packages/server/src/automations/bullboard.js
index 3aac6c4fed..b0ccf14634 100644
--- a/packages/server/src/automations/bullboard.js
+++ b/packages/server/src/automations/bullboard.js
@@ -1,37 +1,15 @@
 const { createBullBoard } = require("@bull-board/api")
 const { BullAdapter } = require("@bull-board/api/bullAdapter")
 const { KoaAdapter } = require("@bull-board/koa")
-const env = require("../environment")
-const Queue = env.isTest()
-  ? require("../utilities/queue/inMemoryQueue")
-  : require("bull")
-const { JobQueues } = require("../constants")
-const { utils } = require("@budibase/backend-core/redis")
-const { opts, redisProtocolUrl } = utils.getRedisOptions()
+const { queue } = require("@budibase/backend-core")
 const listeners = require("./listeners")
 
-const CLEANUP_PERIOD_MS = 60 * 1000
-const queueConfig = redisProtocolUrl || { redis: opts }
-let cleanupInternal = null
-
-let automationQueue = new Queue(JobQueues.AUTOMATIONS, queueConfig)
+let automationQueue = queue.createQueue(queue.JobQueues.AUTOMATIONS)
 listeners.addListeners(automationQueue)
 
-async function cleanup() {
-  await automationQueue.clean(CLEANUP_PERIOD_MS, "completed")
-}
-
 const PATH_PREFIX = "/bulladmin"
 
 exports.init = () => {
-  // cleanup the events every 5 minutes
-  if (!cleanupInternal) {
-    cleanupInternal = setInterval(cleanup, CLEANUP_PERIOD_MS)
-    // fire off an initial cleanup
-    cleanup().catch(err => {
-      console.error(`Unable to cleanup automation queue initially - ${err}`)
-    })
-  }
   // Set up queues for bull board admin
   const queues = [automationQueue]
   const adapters = []
@@ -48,12 +26,7 @@ exports.init = () => {
 }
 
 exports.shutdown = async () => {
-  if (automationQueue) {
-    clearInterval(cleanupInternal)
-    await automationQueue.close()
-    automationQueue = null
-  }
-  console.log("Bull shutdown")
+  await queue.shutdown()
 }
 
 exports.queue = automationQueue
diff --git a/packages/server/src/constants/index.js b/packages/server/src/constants/index.js
index b9362cecf6..73bffeabd6 100644
--- a/packages/server/src/constants/index.js
+++ b/packages/server/src/constants/index.js
@@ -2,10 +2,6 @@ const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
 const { UserStatus } = require("@budibase/backend-core/constants")
 const { objectStore } = require("@budibase/backend-core")
 
-exports.JobQueues = {
-  AUTOMATIONS: "automationQueue",
-}
-
 const FilterTypes = {
   STRING: "string",
   FUZZY: "fuzzy",

From b6ca14aa85bf83784da4d23e546bbbc99eea177f Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 13 Oct 2022 17:39:26 +0100
Subject: [PATCH 028/151] Renaming some queue to automationQueue, getting build
 working.

---
 packages/backend-core/package.json           |  1 +
 packages/backend-core/yarn.lock              |  7 +++++++
 packages/server/src/automations/bullboard.js |  4 ++--
 packages/server/src/automations/index.js     |  8 ++++----
 packages/server/src/automations/triggers.js  |  8 ++++----
 packages/server/src/automations/utils.ts     | 14 +++++++-------
 6 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 404b7da346..eb90fa4159 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -64,6 +64,7 @@
   },
   "devDependencies": {
     "@types/chance": "1.1.3",
+    "@types/ioredis": "^4.28.10",
     "@types/jest": "27.5.1",
     "@types/koa": "2.0.52",
     "@types/lodash": "4.14.180",
diff --git a/packages/backend-core/yarn.lock b/packages/backend-core/yarn.lock
index 31d25320c7..22b93d7b3e 100644
--- a/packages/backend-core/yarn.lock
+++ b/packages/backend-core/yarn.lock
@@ -768,6 +768,13 @@
   resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-1.8.2.tgz#7315b4c4c54f82d13fa61c228ec5c2ea5cc9e0e1"
   integrity sha512-EqX+YQxINb+MeXaIqYDASb6U6FCHbWjkj4a1CKDBks3d/QiB2+PqBLyO72vLDgAO1wUI4O+9gweRcQK11bTL/w==
 
+"@types/ioredis@^4.28.10":
+  version "4.28.10"
+  resolved "https://registry.yarnpkg.com/@types/ioredis/-/ioredis-4.28.10.tgz#40ceb157a4141088d1394bb87c98ed09a75a06ff"
+  integrity sha512-69LyhUgrXdgcNDv7ogs1qXZomnfOEnSmrmMFqKgt1XMJxmoOSG/u3wYy13yACIfKuMJ8IhKgHafDO3sx19zVQQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44"
diff --git a/packages/server/src/automations/bullboard.js b/packages/server/src/automations/bullboard.js
index b0ccf14634..9dfa7546ec 100644
--- a/packages/server/src/automations/bullboard.js
+++ b/packages/server/src/automations/bullboard.js
@@ -4,7 +4,7 @@ const { KoaAdapter } = require("@bull-board/koa")
 const { queue } = require("@budibase/backend-core")
 const listeners = require("./listeners")
 
-let automationQueue = queue.createQueue(queue.JobQueues.AUTOMATIONS)
+let automationQueue = queue.createQueue(queue.JobQueue.AUTOMATIONS)
 listeners.addListeners(automationQueue)
 
 const PATH_PREFIX = "/bulladmin"
@@ -29,4 +29,4 @@ exports.shutdown = async () => {
   await queue.shutdown()
 }
 
-exports.queue = automationQueue
+exports.automationQueue = automationQueue
diff --git a/packages/server/src/automations/index.js b/packages/server/src/automations/index.js
index 2baa868890..521991dd2c 100644
--- a/packages/server/src/automations/index.js
+++ b/packages/server/src/automations/index.js
@@ -1,5 +1,5 @@
 const { processEvent } = require("./utils")
-const { queue, shutdown } = require("./bullboard")
+const { automationQueue, shutdown } = require("./bullboard")
 const { TRIGGER_DEFINITIONS, rebootTrigger } = require("./triggers")
 const { ACTION_DEFINITIONS } = require("./actions")
 
@@ -8,7 +8,7 @@ const { ACTION_DEFINITIONS } = require("./actions")
  */
 exports.init = async function () {
   // this promise will not complete
-  const promise = queue.process(async job => {
+  const promise = automationQueue.process(async job => {
     await processEvent(job)
   })
   // on init we need to trigger any reboot automations
@@ -17,13 +17,13 @@ exports.init = async function () {
 }
 
 exports.getQueues = () => {
-  return [queue]
+  return [automationQueue]
 }
 
 exports.shutdown = () => {
   return shutdown()
 }
 
-exports.queue = queue
+exports.automationQueue = automationQueue
 exports.TRIGGER_DEFINITIONS = TRIGGER_DEFINITIONS
 exports.ACTION_DEFINITIONS = ACTION_DEFINITIONS
diff --git a/packages/server/src/automations/triggers.js b/packages/server/src/automations/triggers.js
index 395390113a..6a4bbd8da6 100644
--- a/packages/server/src/automations/triggers.js
+++ b/packages/server/src/automations/triggers.js
@@ -4,7 +4,7 @@ const { coerce } = require("../utilities/rowProcessor")
 const { definitions } = require("./triggerInfo")
 const { isDevAppID } = require("../db/utils")
 // need this to call directly, so we can get a response
-const { queue } = require("./bullboard")
+const { automationQueue } = require("./bullboard")
 const { checkTestFlag } = require("../utilities/redis")
 const utils = require("./utils")
 const env = require("../environment")
@@ -56,7 +56,7 @@ async function queueRelevantRowAutomations(event, eventType) {
         automationTrigger.inputs &&
         automationTrigger.inputs.tableId === event.row.tableId
       ) {
-        await queue.add({ automation, event }, JOB_OPTS)
+        await automationQueue.add({ automation, event }, JOB_OPTS)
       }
     }
   })
@@ -110,7 +110,7 @@ exports.externalTrigger = async function (
   if (getResponses) {
     return utils.processEvent({ data })
   } else {
-    return queue.add(data, JOB_OPTS)
+    return automationQueue.add(data, JOB_OPTS)
   }
 }
 
@@ -136,7 +136,7 @@ exports.rebootTrigger = async () => {
               timestamp: Date.now(),
             },
           }
-          rebootEvents.push(queue.add(job, JOB_OPTS))
+          rebootEvents.push(automationQueue.add(job, JOB_OPTS))
         }
       }
       await Promise.all(rebootEvents)
diff --git a/packages/server/src/automations/utils.ts b/packages/server/src/automations/utils.ts
index 7e19486798..54b8078f30 100644
--- a/packages/server/src/automations/utils.ts
+++ b/packages/server/src/automations/utils.ts
@@ -1,7 +1,7 @@
 import { Thread, ThreadType } from "../threads"
 import { definitions } from "./triggerInfo"
 import * as webhooks from "../api/controllers/webhook"
-import { queue } from "./bullboard"
+import { automationQueue } from "./bullboard"
 import newid from "../db/newid"
 import { updateEntityMetadata } from "../utilities"
 import { MetadataTypes, WebhookType } from "../constants"
@@ -79,12 +79,12 @@ export function removeDeprecated(definitions: any) {
 // end the repetition and the job itself
 export async function disableAllCrons(appId: any) {
   const promises = []
-  const jobs = await queue.getRepeatableJobs()
+  const jobs = await automationQueue.getRepeatableJobs()
   for (let job of jobs) {
     if (job.key.includes(`${appId}_cron`)) {
-      promises.push(queue.removeRepeatableByKey(job.key))
+      promises.push(automationQueue.removeRepeatableByKey(job.key))
       if (job.id) {
-        promises.push(queue.removeJobs(job.id))
+        promises.push(automationQueue.removeJobs(job.id))
       }
     }
   }
@@ -92,8 +92,8 @@ export async function disableAllCrons(appId: any) {
 }
 
 export async function disableCron(jobId: string, jobKey: string) {
-  await queue.removeRepeatableByKey(jobKey)
-  await queue.removeJobs(jobId)
+  await automationQueue.removeRepeatableByKey(jobKey)
+  await automationQueue.removeJobs(jobId)
   console.log(`jobId=${jobId} disabled`)
 }
 
@@ -141,7 +141,7 @@ export async function enableCronTrigger(appId: any, automation: Automation) {
   ) {
     // make a job id rather than letting Bull decide, makes it easier to handle on way out
     const jobId = `${appId}_cron_${newid()}`
-    const job: any = await queue.add(
+    const job: any = await automationQueue.add(
       {
         automation,
         event: { appId, timestamp: Date.now() },

From d620e54fdbb1e8ffdd5da6492adc36bc46b7fa45 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 13 Oct 2022 17:55:05 +0100
Subject: [PATCH 029/151] Handling listeners as part of queue creation, rather
 than external part.

---
 .../src/queue}/listeners.ts                   | 62 +++++++++++--------
 packages/backend-core/src/queue/queue.ts      | 12 ++--
 packages/server/src/automations/bullboard.js  |  8 ++-
 3 files changed, 50 insertions(+), 32 deletions(-)
 rename packages/{server/src/automations => backend-core/src/queue}/listeners.ts (52%)

diff --git a/packages/server/src/automations/listeners.ts b/packages/backend-core/src/queue/listeners.ts
similarity index 52%
rename from packages/server/src/automations/listeners.ts
rename to packages/backend-core/src/queue/listeners.ts
index 9f8667bd29..c5db628ef0 100644
--- a/packages/server/src/automations/listeners.ts
+++ b/packages/backend-core/src/queue/listeners.ts
@@ -1,78 +1,90 @@
-import { Queue, Job, JobId } from "bull"
-import { AutomationEvent } from "../definitions/automations"
-import * as automation from "../threads/automation"
+import { Job, JobId, Queue } from "bull"
+import { JobQueue } from "./constants"
 
-export const addListeners = (queue: Queue) => {
-  logging(queue)
-  handleStalled(queue)
+export type StalledFn = (job: Job) => Promise<void>
+
+export const addListeners = (
+  queue: Queue,
+  jobQueue: JobQueue,
+  removeStalled?: StalledFn
+) => {
+  logging(queue, jobQueue)
+  if (removeStalled) {
+    handleStalled(queue, removeStalled)
+  }
 }
 
-const handleStalled = (queue: Queue) => {
+const handleStalled = (queue: Queue, removeStalled: StalledFn) => {
   queue.on("stalled", async (job: Job) => {
-    await automation.removeStalled(job as AutomationEvent)
+    await removeStalled(job)
   })
 }
 
-const logging = (queue: Queue) => {
+const logging = (queue: Queue, jobQueue: JobQueue) => {
+  let eventType: string
+  switch (jobQueue) {
+    case JobQueue.AUTOMATIONS:
+      eventType = "automation-event"
+      break
+    case JobQueue.APP_BACKUPS:
+      eventType = "app-backup-event"
+      break
+  }
   if (process.env.NODE_DEBUG?.includes("bull")) {
     queue
       .on("error", (error: any) => {
         // An error occurred.
-        console.error(`automation-event=error error=${JSON.stringify(error)}`)
+        console.error(`${eventType}=error error=${JSON.stringify(error)}`)
       })
       .on("waiting", (jobId: JobId) => {
         // A Job is waiting to be processed as soon as a worker is idling.
-        console.log(`automation-event=waiting jobId=${jobId}`)
+        console.log(`${eventType}=waiting jobId=${jobId}`)
       })
       .on("active", (job: Job, jobPromise: any) => {
         // A job has started. You can use `jobPromise.cancel()`` to abort it.
-        console.log(`automation-event=active jobId=${job.id}`)
+        console.log(`${eventType}=active jobId=${job.id}`)
       })
       .on("stalled", (job: Job) => {
         // A job has been marked as stalled. This is useful for debugging job
         // workers that crash or pause the event loop.
         console.error(
-          `automation-event=stalled jobId=${job.id} job=${JSON.stringify(job)}`
+          `${eventType}=stalled jobId=${job.id} job=${JSON.stringify(job)}`
         )
       })
       .on("progress", (job: Job, progress: any) => {
         // A job's progress was updated!
         console.log(
-          `automation-event=progress jobId=${job.id} progress=${progress}`
+          `${eventType}=progress jobId=${job.id} progress=${progress}`
         )
       })
       .on("completed", (job: Job, result) => {
         // A job successfully completed with a `result`.
-        console.log(
-          `automation-event=completed jobId=${job.id} result=${result}`
-        )
+        console.log(`${eventType}=completed jobId=${job.id} result=${result}`)
       })
       .on("failed", (job, err: any) => {
         // A job failed with reason `err`!
-        console.log(`automation-event=failed jobId=${job.id} error=${err}`)
+        console.log(`${eventType}=failed jobId=${job.id} error=${err}`)
       })
       .on("paused", () => {
         // The queue has been paused.
-        console.log(`automation-event=paused`)
+        console.log(`${eventType}=paused`)
       })
       .on("resumed", (job: Job) => {
         // The queue has been resumed.
-        console.log(`automation-event=paused jobId=${job.id}`)
+        console.log(`${eventType}=paused jobId=${job.id}`)
       })
       .on("cleaned", (jobs: Job[], type: string) => {
         // Old jobs have been cleaned from the queue. `jobs` is an array of cleaned
         // jobs, and `type` is the type of jobs cleaned.
-        console.log(
-          `automation-event=cleaned length=${jobs.length} type=${type}`
-        )
+        console.log(`${eventType}=cleaned length=${jobs.length} type=${type}`)
       })
       .on("drained", () => {
         // Emitted every time the queue has processed all the waiting jobs (even if there can be some delayed jobs not yet processed)
-        console.log(`automation-event=drained`)
+        console.log(`${eventType}=drained`)
       })
       .on("removed", (job: Job) => {
         // A job successfully removed.
-        console.log(`automation-event=removed jobId=${job.id}`)
+        console.log(`${eventType}=removed jobId=${job.id}`)
       })
   }
 }
diff --git a/packages/backend-core/src/queue/queue.ts b/packages/backend-core/src/queue/queue.ts
index de2c738ca4..8f7ac79e7a 100644
--- a/packages/backend-core/src/queue/queue.ts
+++ b/packages/backend-core/src/queue/queue.ts
@@ -1,9 +1,9 @@
 import env from "../environment"
 import { getRedisOptions } from "../redis/utils"
 import { JobQueue } from "./constants"
-import inMemoryQueue from "./inMemoryQueue"
-import BullQueue from "bull"
 import InMemoryQueue from "./inMemoryQueue"
+import BullQueue from "bull"
+import { addListeners, StalledFn } from "./listeners"
 const { opts, redisProtocolUrl } = getRedisOptions()
 
 const CLEANUP_PERIOD_MS = 60 * 1000
@@ -16,14 +16,18 @@ async function cleanup() {
   }
 }
 
-export function createQueue(jobQueue: JobQueue) {
+export function createQueue(
+  jobQueue: JobQueue,
+  removeStalled: StalledFn
+): BullQueue.Queue {
   const queueConfig: any = redisProtocolUrl || { redis: opts }
   let queue: any
   if (env.isTest()) {
     queue = new BullQueue(jobQueue, queueConfig)
   } else {
-    queue = new inMemoryQueue(jobQueue, queueConfig)
+    queue = new InMemoryQueue(jobQueue, queueConfig)
   }
+  addListeners(queue, jobQueue, removeStalled)
   QUEUES.push(queue)
   if (!cleanupInterval) {
     cleanupInterval = setInterval(cleanup, CLEANUP_PERIOD_MS)
diff --git a/packages/server/src/automations/bullboard.js b/packages/server/src/automations/bullboard.js
index 9dfa7546ec..af2243f13d 100644
--- a/packages/server/src/automations/bullboard.js
+++ b/packages/server/src/automations/bullboard.js
@@ -2,10 +2,12 @@ const { createBullBoard } = require("@bull-board/api")
 const { BullAdapter } = require("@bull-board/api/bullAdapter")
 const { KoaAdapter } = require("@bull-board/koa")
 const { queue } = require("@budibase/backend-core")
-const listeners = require("./listeners")
+const automation = require("../threads/automation")
 
-let automationQueue = queue.createQueue(queue.JobQueue.AUTOMATIONS)
-listeners.addListeners(automationQueue)
+let automationQueue = queue.createQueue(
+  queue.JobQueue.AUTOMATIONS,
+  automation.removeStalled
+)
 
 const PATH_PREFIX = "/bulladmin"
 

From 6ff52c64a38fee01aaef6ec12b5debdab7d6658a Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Thu, 13 Oct 2022 18:07:55 +0100
Subject: [PATCH 030/151] ipv6 change for master

---
 hosting/proxy/10-listen-on-ipv6-by-default.sh | 24 +++++++++++++++++++
 hosting/proxy/Dockerfile                      |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 hosting/proxy/10-listen-on-ipv6-by-default.sh

diff --git a/hosting/proxy/10-listen-on-ipv6-by-default.sh b/hosting/proxy/10-listen-on-ipv6-by-default.sh
new file mode 100644
index 0000000000..1d62732ea1
--- /dev/null
+++ b/hosting/proxy/10-listen-on-ipv6-by-default.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+# vim:sw=4:ts=4:et
+
+set -e
+
+ME=$(basename $0)
+NGINX_CONF_FILE="/etc/nginx/nginx.conf"
+DEFAULT_CONF_FILE="/etc/nginx/conf.d/default.conf"
+
+# check if we have ipv6 available
+if [ ! -f "/proc/net/if_inet6" ]; then
+    # ipv6 not available so delete lines from nginx conf
+    if [ -f "$NGINX_CONF_FILE" ]; then
+        sed -i '/listen  \[::\]/d' $NGINX_CONF_FILE
+    fi
+    if [ -f "$DEFAULT_CONF_FILE" ]; then
+        sed -i '/listen  \[::\]/d' $DEFAULT_CONF_FILE
+    fi
+    echo "$ME: info: ipv6 not available so delete lines from nginx conf"
+else
+    echo "$ME: info: ipv6 is available so no need to delete lines from nginx conf"
+fi
+
+exit 0
\ No newline at end of file
diff --git a/hosting/proxy/Dockerfile b/hosting/proxy/Dockerfile
index 298762aaf1..a9c94c06fa 100644
--- a/hosting/proxy/Dockerfile
+++ b/hosting/proxy/Dockerfile
@@ -5,6 +5,7 @@ FROM nginx:latest
 # override the output dir to output directly to /etc/nginx instead of /etc/nginx/conf.d
 ENV NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx
 COPY .generated-nginx.prod.conf /etc/nginx/templates/nginx.conf.template
+COPY 10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh
 
 # Error handling
 COPY error.html /usr/share/nginx/html/error.html

From dea4338d54580bc7ccbaef5c980c68b17c2cca44 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 14 Oct 2022 09:26:51 +0000
Subject: [PATCH 031/151] v2.0.31

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 96c2575602..7d825bcefb 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.30",
+  "version": "2.0.31",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 888483b56e..1c3957949b 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "^2.0.30",
+    "@budibase/types": "^2.0.31",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 9472f84bb4..7f508ef0e0 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^2.0.30",
+    "@budibase/string-templates": "^2.0.31",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 25d833c378..2f8591ef30 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.30",
-    "@budibase/client": "^2.0.30",
-    "@budibase/frontend-core": "^2.0.30",
-    "@budibase/string-templates": "^2.0.30",
+    "@budibase/bbui": "^2.0.31",
+    "@budibase/client": "^2.0.31",
+    "@budibase/frontend-core": "^2.0.31",
+    "@budibase/string-templates": "^2.0.31",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 58e6aea835..1fcac0164a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.0.30",
-    "@budibase/string-templates": "^2.0.30",
-    "@budibase/types": "^2.0.30",
+    "@budibase/backend-core": "^2.0.31",
+    "@budibase/string-templates": "^2.0.31",
+    "@budibase/types": "^2.0.31",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index f01e9f4ea5..7434bcc4c6 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "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": "^2.0.30",
-    "@budibase/frontend-core": "^2.0.30",
-    "@budibase/string-templates": "^2.0.30",
+    "@budibase/bbui": "^2.0.31",
+    "@budibase/frontend-core": "^2.0.31",
+    "@budibase/string-templates": "^2.0.31",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index ace3316711..d871e129fc 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.0.30",
+    "@budibase/bbui": "^2.0.31",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 438bcf8fb0..c993a6b75d 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index e2242dd1ef..0c2a1dd20b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.0.30",
-    "@budibase/client": "^2.0.30",
+    "@budibase/backend-core": "^2.0.31",
+    "@budibase/client": "^2.0.31",
     "@budibase/pro": "2.0.30",
-    "@budibase/string-templates": "^2.0.30",
-    "@budibase/types": "^2.0.30",
+    "@budibase/string-templates": "^2.0.31",
+    "@budibase/types": "^2.0.31",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 64b3e52bf7..970bf98e8c 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 209294dbee..a7d589b405 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 6723ba89e7..8bc2e41db8 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.0.30",
+    "@budibase/backend-core": "^2.0.31",
     "@budibase/pro": "2.0.30",
-    "@budibase/string-templates": "^2.0.30",
-    "@budibase/types": "^2.0.30",
+    "@budibase/string-templates": "^2.0.31",
+    "@budibase/types": "^2.0.31",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From b035a708f2933aee8a6f0e1e38936770d19008e3 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 14 Oct 2022 09:30:15 +0000
Subject: [PATCH 032/151] Update pro version to 2.0.31

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 0c2a1dd20b..ca9d1a17bc 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.0.31",
     "@budibase/client": "^2.0.31",
-    "@budibase/pro": "2.0.30",
+    "@budibase/pro": "2.0.31",
     "@budibase/string-templates": "^2.0.31",
     "@budibase/types": "^2.0.31",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 35555f7f27..eaf629b010 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.30":
-  version "2.0.30"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30.tgz#5cc53e8560572d789ae687ec2181b629526c2f3f"
-  integrity sha512-+X4DwtMf1Xv4ygG7OJN0wOxZgjJ1wul1gUVOXJm44sRIEOx0LHpyx8xT4npC9e2VKKezpF5GZFE2IrB9lwWsoQ==
+"@budibase/backend-core@2.0.31":
+  version "2.0.31"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.31.tgz#199fddbbaf987dde7477f12e7f9ab7f4435bdafd"
+  integrity sha512-te7fMsEWflKbPiv8vxh+U31562Yn4W3vUBcHUm3Oer38rv0nprUJoyxO1YGBVcOJVNAEtNAtEdoPayFezU3YOw==
   dependencies:
-    "@budibase/types" "^2.0.30"
+    "@budibase/types" "^2.0.31"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.30":
-  version "2.0.30"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30.tgz#4c739ed97e04d6dfc875dfb550262ef7085dc9d4"
-  integrity sha512-unel/xYLpeWUI+I0vstITH9UTVkjKS+SS0Ce4jCQlpMyOSB8zCie/sO6Ie2TakrI+vnuYuypnRT8fqlbgtrNyA==
+"@budibase/pro@2.0.31":
+  version "2.0.31"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.31.tgz#238f3057f9fac654efeb65ec8fcce83caa364ac2"
+  integrity sha512-VUx6PT/1RqCp0UNANmooJcKeMrGQNCM/rbMhOvvtbqvWhRa1sYn00RdXTAzzy++plOS8vue+f/BFewrr1yYlug==
   dependencies:
-    "@budibase/backend-core" "2.0.30"
-    "@budibase/types" "2.0.30"
+    "@budibase/backend-core" "2.0.31"
+    "@budibase/types" "2.0.31"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.30", "@budibase/types@^2.0.30":
-  version "2.0.30"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30.tgz#ac3d2d714ebf2820875150739959e5f6b851aceb"
-  integrity sha512-46uCHPcLAAjAFRkE53skS7oLjI/Fa+2Mn4vZjIApa1/0JXyR2HnzTzJocbrQfYFTYLkdniMfLRticcKC/E2X1w==
+"@budibase/types@2.0.31", "@budibase/types@^2.0.31":
+  version "2.0.31"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.31.tgz#699ccd746cff39d4439e6f01a62c38a9f1a98bad"
+  integrity sha512-Eyx9wEVi4ZHrJ6410aM98IW7EWrsmYJ0ixmm/wD2tIhb57N33YgFWobsdR/G1wJUTZnR76Ve2tAweDgXmvtscQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 8bc2e41db8..e4379020b7 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.0.31",
-    "@budibase/pro": "2.0.30",
+    "@budibase/pro": "2.0.31",
     "@budibase/string-templates": "^2.0.31",
     "@budibase/types": "^2.0.31",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index b9bfaed432..0d6085ef5a 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.30":
-  version "2.0.30"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30.tgz#5cc53e8560572d789ae687ec2181b629526c2f3f"
-  integrity sha512-+X4DwtMf1Xv4ygG7OJN0wOxZgjJ1wul1gUVOXJm44sRIEOx0LHpyx8xT4npC9e2VKKezpF5GZFE2IrB9lwWsoQ==
+"@budibase/backend-core@2.0.31":
+  version "2.0.31"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.31.tgz#199fddbbaf987dde7477f12e7f9ab7f4435bdafd"
+  integrity sha512-te7fMsEWflKbPiv8vxh+U31562Yn4W3vUBcHUm3Oer38rv0nprUJoyxO1YGBVcOJVNAEtNAtEdoPayFezU3YOw==
   dependencies:
-    "@budibase/types" "^2.0.30"
+    "@budibase/types" "^2.0.31"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.30":
-  version "2.0.30"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30.tgz#4c739ed97e04d6dfc875dfb550262ef7085dc9d4"
-  integrity sha512-unel/xYLpeWUI+I0vstITH9UTVkjKS+SS0Ce4jCQlpMyOSB8zCie/sO6Ie2TakrI+vnuYuypnRT8fqlbgtrNyA==
+"@budibase/pro@2.0.31":
+  version "2.0.31"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.31.tgz#238f3057f9fac654efeb65ec8fcce83caa364ac2"
+  integrity sha512-VUx6PT/1RqCp0UNANmooJcKeMrGQNCM/rbMhOvvtbqvWhRa1sYn00RdXTAzzy++plOS8vue+f/BFewrr1yYlug==
   dependencies:
-    "@budibase/backend-core" "2.0.30"
-    "@budibase/types" "2.0.30"
+    "@budibase/backend-core" "2.0.31"
+    "@budibase/types" "2.0.31"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.30", "@budibase/types@^2.0.30":
-  version "2.0.30"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30.tgz#ac3d2d714ebf2820875150739959e5f6b851aceb"
-  integrity sha512-46uCHPcLAAjAFRkE53skS7oLjI/Fa+2Mn4vZjIApa1/0JXyR2HnzTzJocbrQfYFTYLkdniMfLRticcKC/E2X1w==
+"@budibase/types@2.0.31", "@budibase/types@^2.0.31":
+  version "2.0.31"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.31.tgz#699ccd746cff39d4439e6f01a62c38a9f1a98bad"
+  integrity sha512-Eyx9wEVi4ZHrJ6410aM98IW7EWrsmYJ0ixmm/wD2tIhb57N33YgFWobsdR/G1wJUTZnR76Ve2tAweDgXmvtscQ==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From b702c7482a5bdf8270137ead8ffaec4fbb6abc40 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 14 Oct 2022 13:26:42 +0100
Subject: [PATCH 033/151] Fixes for cronjob stop - correctly handle this
 without stalled job handle.

---
 packages/backend-core/src/queue/listeners.ts  | 21 +++++++--
 packages/backend-core/src/queue/queue.ts      |  2 +-
 packages/server/src/automations/utils.ts      | 10 ++--
 .../server/src/definitions/automations.ts     | 12 -----
 packages/server/src/threads/automation.ts     | 47 ++++++++-----------
 5 files changed, 44 insertions(+), 48 deletions(-)

diff --git a/packages/backend-core/src/queue/listeners.ts b/packages/backend-core/src/queue/listeners.ts
index c5db628ef0..0e06fb5ef0 100644
--- a/packages/backend-core/src/queue/listeners.ts
+++ b/packages/backend-core/src/queue/listeners.ts
@@ -3,24 +3,35 @@ import { JobQueue } from "./constants"
 
 export type StalledFn = (job: Job) => Promise<void>
 
-export const addListeners = (
+export function addListeners(
   queue: Queue,
   jobQueue: JobQueue,
   removeStalled?: StalledFn
-) => {
+) {
   logging(queue, jobQueue)
   if (removeStalled) {
     handleStalled(queue, removeStalled)
   }
 }
 
-const handleStalled = (queue: Queue, removeStalled: StalledFn) => {
+function handleStalled(queue: Queue, removeStalled?: StalledFn) {
   queue.on("stalled", async (job: Job) => {
-    await removeStalled(job)
+    if (removeStalled) {
+      await removeStalled(job)
+    } else if (job.opts.repeat) {
+      const jobId = job.id
+      const repeatJobs = await queue.getRepeatableJobs()
+      for (let repeatJob of repeatJobs) {
+        if (repeatJob.id === jobId) {
+          await queue.removeRepeatableByKey(repeatJob.key)
+        }
+      }
+      console.log(`jobId=${jobId} disabled`)
+    }
   })
 }
 
-const logging = (queue: Queue, jobQueue: JobQueue) => {
+function logging(queue: Queue, jobQueue: JobQueue) {
   let eventType: string
   switch (jobQueue) {
     case JobQueue.AUTOMATIONS:
diff --git a/packages/backend-core/src/queue/queue.ts b/packages/backend-core/src/queue/queue.ts
index 8f7ac79e7a..d83e421456 100644
--- a/packages/backend-core/src/queue/queue.ts
+++ b/packages/backend-core/src/queue/queue.ts
@@ -18,7 +18,7 @@ async function cleanup() {
 
 export function createQueue(
   jobQueue: JobQueue,
-  removeStalled: StalledFn
+  removeStalled?: StalledFn
 ): BullQueue.Queue {
   const queueConfig: any = redisProtocolUrl || { redis: opts }
   let queue: any
diff --git a/packages/server/src/automations/utils.ts b/packages/server/src/automations/utils.ts
index 54b8078f30..0eebcb21cf 100644
--- a/packages/server/src/automations/utils.ts
+++ b/packages/server/src/automations/utils.ts
@@ -91,9 +91,13 @@ export async function disableAllCrons(appId: any) {
   return Promise.all(promises)
 }
 
-export async function disableCron(jobId: string, jobKey: string) {
-  await automationQueue.removeRepeatableByKey(jobKey)
-  await automationQueue.removeJobs(jobId)
+export async function disableCronById(jobId: number | string) {
+  const repeatJobs = await automationQueue.getRepeatableJobs()
+  for (let repeatJob of repeatJobs) {
+    if (repeatJob.id === jobId) {
+      await automationQueue.removeRepeatableByKey(repeatJob.key)
+    }
+  }
   console.log(`jobId=${jobId} disabled`)
 }
 
diff --git a/packages/server/src/definitions/automations.ts b/packages/server/src/definitions/automations.ts
index ed1455c049..877a1b4579 100644
--- a/packages/server/src/definitions/automations.ts
+++ b/packages/server/src/definitions/automations.ts
@@ -27,18 +27,6 @@ export interface TriggerOutput {
   timestamp?: number
 }
 
-export interface AutomationEvent {
-  data: {
-    automation: Automation
-    event: any
-  }
-  opts?: {
-    repeat?: {
-      jobId: string
-    }
-  }
-}
-
 export interface AutomationContext extends AutomationResults {
   steps: any[]
   trigger: any
diff --git a/packages/server/src/threads/automation.ts b/packages/server/src/threads/automation.ts
index 64ae9439d8..b4b290462e 100644
--- a/packages/server/src/threads/automation.ts
+++ b/packages/server/src/threads/automation.ts
@@ -1,6 +1,11 @@
 import { default as threadUtils } from "./utils"
+import { Job } from "bull"
 threadUtils.threadSetup()
-import { isRecurring, disableCron, isErrorInOutput } from "../automations/utils"
+import {
+  isRecurring,
+  disableCronById,
+  isErrorInOutput,
+} from "../automations/utils"
 import { default as actions } from "../automations/actions"
 import { default as automationUtils } from "../automations/automationUtils"
 import { default as AutomationEmitter } from "../events/AutomationEmitter"
@@ -13,7 +18,6 @@ import {
   LoopStep,
   LoopStepType,
   LoopInput,
-  AutomationEvent,
   TriggerOutput,
   AutomationContext,
   AutomationMetadata,
@@ -73,19 +77,16 @@ class Orchestrator {
   _automation: Automation
   _emitter: any
   _context: AutomationContext
-  _repeat?: { jobId: string; jobKey: string }
+  _job: Job
   executionOutput: AutomationContext
 
-  constructor(automation: Automation, triggerOutput: TriggerOutput, opts: any) {
+  constructor(job: Job) {
+    let automation = job.data.automation,
+      triggerOutput = job.data.event
     const metadata = triggerOutput.metadata
     this._chainCount = metadata ? metadata.automationChainCount : 0
     this._appId = triggerOutput.appId as string
-    if (opts?.repeat) {
-      this._repeat = {
-        jobId: opts.repeat.jobId,
-        jobKey: opts.repeat.key,
-      }
-    }
+    this._job = job
     const triggerStepId = automation.definition.trigger.stepId
     triggerOutput = this.cleanupTriggerOutputs(triggerStepId, triggerOutput)
     // remove from context
@@ -134,7 +135,7 @@ class Orchestrator {
   }
 
   async stopCron(reason: string) {
-    if (!this._repeat) {
+    if (!this._job.opts.repeat) {
       return
     }
     logWarn(
@@ -142,7 +143,7 @@ class Orchestrator {
     )
     const automation = this._automation
     const trigger = automation.definition.trigger
-    await disableCron(this._repeat?.jobId, this._repeat?.jobKey)
+    await disableCronById(this._job.id)
     this.updateExecutionOutput(
       trigger.id,
       trigger.stepId,
@@ -156,7 +157,7 @@ class Orchestrator {
   }
 
   async checkIfShouldStop(metadata: AutomationMetadata): Promise<boolean> {
-    if (!metadata.errorCount || !this._repeat) {
+    if (!metadata.errorCount || !this._job.opts.repeat) {
       return false
     }
     if (metadata.errorCount >= MAX_AUTOMATION_RECURRING_ERRORS) {
@@ -475,17 +476,13 @@ class Orchestrator {
   }
 }
 
-export function execute(input: AutomationEvent, callback: WorkerCallback) {
-  const appId = input.data.event.appId
+export function execute(job: Job, callback: WorkerCallback) {
+  const appId = job.data.event.appId
   if (!appId) {
     throw new Error("Unable to execute, event doesn't contain app ID.")
   }
   doInAppContext(appId, async () => {
-    const automationOrchestrator = new Orchestrator(
-      input.data.automation,
-      input.data.event,
-      input.opts
-    )
+    const automationOrchestrator = new Orchestrator(job)
     try {
       const response = await automationOrchestrator.execute()
       callback(null, response)
@@ -495,17 +492,13 @@ export function execute(input: AutomationEvent, callback: WorkerCallback) {
   })
 }
 
-export const removeStalled = async (input: AutomationEvent) => {
-  const appId = input.data.event.appId
+export const removeStalled = async (job: Job) => {
+  const appId = job.data.event.appId
   if (!appId) {
     throw new Error("Unable to execute, event doesn't contain app ID.")
   }
   await doInAppContext(appId, async () => {
-    const automationOrchestrator = new Orchestrator(
-      input.data.automation,
-      input.data.event,
-      input.opts
-    )
+    const automationOrchestrator = new Orchestrator(job)
     await automationOrchestrator.stopCron("stalled")
   })
 }

From 0bd2a18e46f09c51a75d19f6161a1a3c0bfb358a Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 14 Oct 2022 19:24:03 +0100
Subject: [PATCH 034/151] Main types and work for the CRUD operations of app
 backup backend in pro + the listeners to handle exporting apps from the
 server.

---
 packages/backend-core/package.json            |  1 +
 packages/backend-core/src/db/constants.ts     |  2 +
 .../backend-core/src/objectStore/index.ts     |  3 +-
 packages/backend-core/src/queue/constants.ts  |  4 +-
 packages/backend-core/src/queue/listeners.ts  |  4 +-
 packages/backend-core/src/queue/queue.ts      |  4 +-
 packages/backend-core/yarn.lock               | 10 ++++-
 packages/server/src/app.ts                    |  2 +
 packages/server/src/automations/bullboard.js  |  2 +-
 packages/server/src/sdk/app/backups/backup.ts | 39 +++++++++++++++++++
 packages/server/src/sdk/app/backups/index.ts  |  2 +
 packages/types/src/api/web/app/backup.ts      |  1 +
 packages/types/src/documents/app/backup.ts    | 37 +++++++++++++-----
 13 files changed, 93 insertions(+), 18 deletions(-)
 create mode 100644 packages/server/src/sdk/app/backups/backup.ts

diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index eb90fa4159..17977decba 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -63,6 +63,7 @@
     ]
   },
   "devDependencies": {
+    "@types/bull": "^3.15.9",
     "@types/chance": "1.1.3",
     "@types/ioredis": "^4.28.10",
     "@types/jest": "27.5.1",
diff --git a/packages/backend-core/src/db/constants.ts b/packages/backend-core/src/db/constants.ts
index a61e8a2af2..8f8f45638b 100644
--- a/packages/backend-core/src/db/constants.ts
+++ b/packages/backend-core/src/db/constants.ts
@@ -21,6 +21,7 @@ export enum ViewName {
   ACCOUNT_BY_EMAIL = "account_by_email",
   PLATFORM_USERS_LOWERCASE = "platform_users_lowercase",
   USER_BY_GROUP = "by_group_user",
+  APP_BACKUP_BY_TRIGGER = "by_trigger",
 }
 
 export const DeprecatedViews = {
@@ -49,6 +50,7 @@ export enum DocumentType {
   TABLE = "ta",
   DATASOURCE = "datasource",
   DATASOURCE_PLUS = "datasource_plus",
+  APP_BACKUP = "backup",
 }
 
 export const StaticDatabases = {
diff --git a/packages/backend-core/src/objectStore/index.ts b/packages/backend-core/src/objectStore/index.ts
index e210f9dccc..8453c9aee6 100644
--- a/packages/backend-core/src/objectStore/index.ts
+++ b/packages/backend-core/src/objectStore/index.ts
@@ -27,6 +27,7 @@ const CONTENT_TYPE_MAP: any = {
   css: "text/css",
   js: "application/javascript",
   json: "application/json",
+  gz: "application/gzip",
 }
 const STRING_CONTENT_TYPES = [
   CONTENT_TYPE_MAP.html,
@@ -149,7 +150,7 @@ export const upload = async ({
   type,
   metadata,
 }: any) => {
-  const extension = [...filename.split(".")].pop()
+  const extension = filename.split(".").pop()
   const fileBytes = fs.readFileSync(path)
 
   const objectStore = ObjectStore(bucketName)
diff --git a/packages/backend-core/src/queue/constants.ts b/packages/backend-core/src/queue/constants.ts
index d8fb3121a3..e8323dacb8 100644
--- a/packages/backend-core/src/queue/constants.ts
+++ b/packages/backend-core/src/queue/constants.ts
@@ -1,4 +1,4 @@
 export enum JobQueue {
-  AUTOMATIONS = "automationQueue",
-  APP_BACKUPS = "appBackupQueue",
+  AUTOMATION = "automationQueue",
+  APP_BACKUP = "appBackupQueue",
 }
diff --git a/packages/backend-core/src/queue/listeners.ts b/packages/backend-core/src/queue/listeners.ts
index 0e06fb5ef0..f264c3a84c 100644
--- a/packages/backend-core/src/queue/listeners.ts
+++ b/packages/backend-core/src/queue/listeners.ts
@@ -34,10 +34,10 @@ function handleStalled(queue: Queue, removeStalled?: StalledFn) {
 function logging(queue: Queue, jobQueue: JobQueue) {
   let eventType: string
   switch (jobQueue) {
-    case JobQueue.AUTOMATIONS:
+    case JobQueue.AUTOMATION:
       eventType = "automation-event"
       break
-    case JobQueue.APP_BACKUPS:
+    case JobQueue.APP_BACKUP:
       eventType = "app-backup-event"
       break
   }
diff --git a/packages/backend-core/src/queue/queue.ts b/packages/backend-core/src/queue/queue.ts
index d83e421456..6dd10ee091 100644
--- a/packages/backend-core/src/queue/queue.ts
+++ b/packages/backend-core/src/queue/queue.ts
@@ -16,10 +16,10 @@ async function cleanup() {
   }
 }
 
-export function createQueue(
+export function createQueue<T>(
   jobQueue: JobQueue,
   removeStalled?: StalledFn
-): BullQueue.Queue {
+): BullQueue.Queue<T> {
   const queueConfig: any = redisProtocolUrl || { redis: opts }
   let queue: any
   if (env.isTest()) {
diff --git a/packages/backend-core/yarn.lock b/packages/backend-core/yarn.lock
index 22b93d7b3e..d2831ca8fe 100644
--- a/packages/backend-core/yarn.lock
+++ b/packages/backend-core/yarn.lock
@@ -698,6 +698,14 @@
     "@types/connect" "*"
     "@types/node" "*"
 
+"@types/bull@^3.15.9":
+  version "3.15.9"
+  resolved "https://registry.yarnpkg.com/@types/bull/-/bull-3.15.9.tgz#e10e0901ec3762bff85716b3c580277960751c93"
+  integrity sha512-MPUcyPPQauAmynoO3ezHAmCOhbB0pWmYyijr/5ctaCqhbKWsjW0YCod38ZcLzUBprosfZ9dPqfYIcfdKjk7RNQ==
+  dependencies:
+    "@types/ioredis" "*"
+    "@types/redis" "^2.8.0"
+
 "@types/chance@1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@types/chance/-/chance-1.1.3.tgz#d19fe9391288d60fdccd87632bfc9ab2b4523fea"
@@ -768,7 +776,7 @@
   resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-1.8.2.tgz#7315b4c4c54f82d13fa61c228ec5c2ea5cc9e0e1"
   integrity sha512-EqX+YQxINb+MeXaIqYDASb6U6FCHbWjkj4a1CKDBks3d/QiB2+PqBLyO72vLDgAO1wUI4O+9gweRcQK11bTL/w==
 
-"@types/ioredis@^4.28.10":
+"@types/ioredis@*", "@types/ioredis@^4.28.10":
   version "4.28.10"
   resolved "https://registry.yarnpkg.com/@types/ioredis/-/ioredis-4.28.10.tgz#40ceb157a4141088d1394bb87c98ed09a75a06ff"
   integrity sha512-69LyhUgrXdgcNDv7ogs1qXZomnfOEnSmrmMFqKgt1XMJxmoOSG/u3wYy13yACIfKuMJ8IhKgHafDO3sx19zVQQ==
diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts
index 3bfe8976f7..776adb602d 100644
--- a/packages/server/src/app.ts
+++ b/packages/server/src/app.ts
@@ -37,6 +37,7 @@ import {
 } from "./utilities/workerRequests"
 import { watch } from "./watch"
 import { initialise as initialiseWebsockets } from "./websocket"
+import sdk from "./sdk"
 
 const app = new Koa()
 
@@ -108,6 +109,7 @@ module.exports = server.listen(env.PORT || 0, async () => {
   eventEmitter.emitPort(env.PORT)
   fileSystem.init()
   await redis.init()
+  await sdk.backups.init()
 
   // run migrations on startup if not done via http
   // not recommended in a clustered environment
diff --git a/packages/server/src/automations/bullboard.js b/packages/server/src/automations/bullboard.js
index af2243f13d..c4f33e07a9 100644
--- a/packages/server/src/automations/bullboard.js
+++ b/packages/server/src/automations/bullboard.js
@@ -5,7 +5,7 @@ const { queue } = require("@budibase/backend-core")
 const automation = require("../threads/automation")
 
 let automationQueue = queue.createQueue(
-  queue.JobQueue.AUTOMATIONS,
+  queue.JobQueue.AUTOMATION,
   automation.removeStalled
 )
 
diff --git a/packages/server/src/sdk/app/backups/backup.ts b/packages/server/src/sdk/app/backups/backup.ts
new file mode 100644
index 0000000000..6a0d370653
--- /dev/null
+++ b/packages/server/src/sdk/app/backups/backup.ts
@@ -0,0 +1,39 @@
+import { backups } from "@budibase/pro"
+import { objectStore, tenancy } from "@budibase/backend-core"
+import { exportApp } from "./exports"
+import { Job } from "bull"
+import fs from "fs"
+import env from "../../../environment"
+
+export async function init() {
+  await backups.addAppBackupProcessor(async (job: Job) => {
+    const appId = job.data.appId,
+      trigger = job.data.trigger,
+      name = job.data.name
+    const createdAt = new Date().toISOString()
+    const tarPath = await exportApp(appId, { tar: true })
+    let filename = `${appId}/backup-${createdAt}.tar.gz`
+    // add the tenant to the bucket path if backing up within a multi-tenant environment
+    if (env.MULTI_TENANCY) {
+      const tenantId = tenancy.getTenantIDFromAppID(appId)
+      filename = `${tenantId}/${filename}`
+    }
+    const bucket = objectStore.ObjectStoreBuckets.BACKUPS
+    const metadata = {
+      appId,
+      createdAt,
+      trigger,
+      name,
+    }
+    await objectStore.upload({
+      path: tarPath,
+      type: "application/gzip",
+      bucket,
+      filename,
+      metadata,
+    })
+    await backups.storeAppBackupMetadata(filename, metadata)
+    // clear up the tarball after uploading it
+    fs.rmSync(tarPath)
+  })
+}
diff --git a/packages/server/src/sdk/app/backups/index.ts b/packages/server/src/sdk/app/backups/index.ts
index fe7e4e1049..94210c2c4c 100644
--- a/packages/server/src/sdk/app/backups/index.ts
+++ b/packages/server/src/sdk/app/backups/index.ts
@@ -1,7 +1,9 @@
 import * as exportApps from "./exports"
 import * as importApps from "./imports"
+import * as backup from "./backup"
 
 export default {
   ...exportApps,
   ...importApps,
+  ...backup,
 }
diff --git a/packages/types/src/api/web/app/backup.ts b/packages/types/src/api/web/app/backup.ts
index 57ffba0d70..092cf714b5 100644
--- a/packages/types/src/api/web/app/backup.ts
+++ b/packages/types/src/api/web/app/backup.ts
@@ -4,6 +4,7 @@ export interface SearchAppBackupsRequest {
   trigger: AppBackupTrigger
   startDate: string
   endDate: string
+  page?: string
 }
 
 export interface CreateAppBackupRequest {
diff --git a/packages/types/src/documents/app/backup.ts b/packages/types/src/documents/app/backup.ts
index a935ed5ba1..fb8ef61e3a 100644
--- a/packages/types/src/documents/app/backup.ts
+++ b/packages/types/src/documents/app/backup.ts
@@ -6,16 +6,35 @@ export enum AppBackupTrigger {
   SCHEDULED = "scheduled",
 }
 
-export interface AppBackupContents {
-  datasources: string[]
-  screens: string[]
-  automations: string[]
-}
-
 export interface AppBackup extends Document {
   trigger: AppBackupTrigger
   name: string
-  date: string
-  userId: string
-  contents: AppBackupContents
+  createdAt: string
+  filename: string
+  appId: string
+  userId?: string
+  contents?: {
+    datasources: string[]
+    screens: string[]
+    automations: string[]
+  }
+}
+
+export type AppBackupFetchOpts = {
+  trigger?: AppBackupTrigger
+  limit?: number
+  page?: string
+  paginate?: boolean
+  startDate?: string
+  endDate?: string
+}
+
+export interface AppBackupQueueData {
+  trigger: AppBackupTrigger
+  name?: string
+  appId: string
+}
+
+export interface AppBackupMetadata extends AppBackupQueueData {
+  createdAt: string
 }

From 1373630b33af7739e55c6e79fe424f580616e431 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 14 Oct 2022 20:10:44 +0100
Subject: [PATCH 035/151] Minor fixes after testing manual backup system.

---
 packages/backend-core/src/context/index.ts    |  3 ++
 packages/server/src/api/routes/index.ts       | 10 ++--
 packages/server/src/sdk/app/backups/backup.ts | 50 ++++++++++---------
 packages/types/src/sdk/koa.ts                 |  9 +++-
 4 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/packages/backend-core/src/context/index.ts b/packages/backend-core/src/context/index.ts
index 35eeee608b..7efe0e23f7 100644
--- a/packages/backend-core/src/context/index.ts
+++ b/packages/backend-core/src/context/index.ts
@@ -53,6 +53,9 @@ export const getTenantIDFromAppID = (appId: string) => {
   if (!appId) {
     return null
   }
+  if (!isMultiTenant()) {
+    return DEFAULT_TENANT_ID
+  }
   const split = appId.split(SEPARATOR)
   const hasDev = split[1] === DocumentType.DEV
   if ((hasDev && split.length === 3) || (!hasDev && split.length === 2)) {
diff --git a/packages/server/src/api/routes/index.ts b/packages/server/src/api/routes/index.ts
index 1cf34d4a68..02a4900077 100644
--- a/packages/server/src/api/routes/index.ts
+++ b/packages/server/src/api/routes/index.ts
@@ -34,6 +34,8 @@ export { default as publicRoutes } from "./public"
 const appBackupRoutes = api.appBackups
 const scheduleRoutes = api.schedules
 export const mainRoutes: Router[] = [
+  appBackupRoutes,
+  backupRoutes,
   authRoutes,
   deployRoutes,
   layoutRoutes,
@@ -53,16 +55,14 @@ export const mainRoutes: Router[] = [
   permissionRoutes,
   datasourceRoutes,
   queryRoutes,
-  backupRoutes,
   metadataRoutes,
   devRoutes,
   cloudRoutes,
-  // these need to be handled last as they still use /api/:tableId
-  // this could be breaking as koa may recognise other routes as this
-  tableRoutes,
   rowRoutes,
   migrationRoutes,
   pluginRoutes,
-  appBackupRoutes,
   scheduleRoutes,
+  // these need to be handled last as they still use /api/:tableId
+  // this could be breaking as koa may recognise other routes as this
+  tableRoutes,
 ]
diff --git a/packages/server/src/sdk/app/backups/backup.ts b/packages/server/src/sdk/app/backups/backup.ts
index 6a0d370653..fb4bcc6022 100644
--- a/packages/server/src/sdk/app/backups/backup.ts
+++ b/packages/server/src/sdk/app/backups/backup.ts
@@ -10,30 +10,32 @@ export async function init() {
     const appId = job.data.appId,
       trigger = job.data.trigger,
       name = job.data.name
-    const createdAt = new Date().toISOString()
-    const tarPath = await exportApp(appId, { tar: true })
-    let filename = `${appId}/backup-${createdAt}.tar.gz`
-    // add the tenant to the bucket path if backing up within a multi-tenant environment
-    if (env.MULTI_TENANCY) {
-      const tenantId = tenancy.getTenantIDFromAppID(appId)
-      filename = `${tenantId}/${filename}`
-    }
-    const bucket = objectStore.ObjectStoreBuckets.BACKUPS
-    const metadata = {
-      appId,
-      createdAt,
-      trigger,
-      name,
-    }
-    await objectStore.upload({
-      path: tarPath,
-      type: "application/gzip",
-      bucket,
-      filename,
-      metadata,
+    const tenantId = tenancy.getTenantIDFromAppID(appId)
+    await tenancy.doInTenant(tenantId, async () => {
+      const createdAt = new Date().toISOString()
+      const tarPath = await exportApp(appId, { tar: true })
+      let filename = `${appId}/backup-${createdAt}.tar.gz`
+      // add the tenant to the bucket path if backing up within a multi-tenant environment
+      if (env.MULTI_TENANCY) {
+        filename = `${tenantId}/${filename}`
+      }
+      const bucket = objectStore.ObjectStoreBuckets.BACKUPS
+      const metadata = {
+        appId,
+        createdAt,
+        trigger,
+        name,
+      }
+      await objectStore.upload({
+        path: tarPath,
+        type: "application/gzip",
+        bucket,
+        filename,
+        metadata,
+      })
+      await backups.storeAppBackupMetadata(filename, metadata)
+      // clear up the tarball after uploading it
+      fs.rmSync(tarPath)
     })
-    await backups.storeAppBackupMetadata(filename, metadata)
-    // clear up the tarball after uploading it
-    fs.rmSync(tarPath)
   })
 }
diff --git a/packages/types/src/sdk/koa.ts b/packages/types/src/sdk/koa.ts
index 8d419d5cf1..250b176d79 100644
--- a/packages/types/src/sdk/koa.ts
+++ b/packages/types/src/sdk/koa.ts
@@ -7,7 +7,12 @@ export interface ContextUser extends User {
   license: License
 }
 
-export interface BBContext extends Context {
+export interface BBContext {
   user?: ContextUser
-  body: any
+  request: {
+    body: any
+  }
+  params: any
+  body?: any
+  redirect?: any
 }

From ecb47851d60760ac09867435bd53d95d04ca08a7 Mon Sep 17 00:00:00 2001
From: Jonny McCullagh <jonny.mccullagh@redbranch.net>
Date: Mon, 17 Oct 2022 10:20:09 +0100
Subject: [PATCH 036/151] make proxy ipv6 customise script executable

---
 hosting/proxy/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hosting/proxy/Dockerfile b/hosting/proxy/Dockerfile
index a9c94c06fa..f11480fd73 100644
--- a/hosting/proxy/Dockerfile
+++ b/hosting/proxy/Dockerfile
@@ -6,6 +6,7 @@ FROM nginx:latest
 ENV NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx
 COPY .generated-nginx.prod.conf /etc/nginx/templates/nginx.conf.template
 COPY 10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh
+RUN chmod +x /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh
 
 # Error handling
 COPY error.html /usr/share/nginx/html/error.html

From bb4e3ba8cfa6cc95578b111df7bcf5a4b19381bd Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 17 Oct 2022 15:26:09 +0100
Subject: [PATCH 037/151] Adding in required events for app backup system.

---
 .../backend-core/src/events/publishers/backup.ts     | 12 ++++++++++++
 packages/backend-core/src/events/publishers/index.ts |  1 +
 packages/types/src/sdk/events/backup.ts              |  7 +++++++
 packages/types/src/sdk/events/event.ts               |  3 +++
 packages/types/src/sdk/events/index.ts               |  1 +
 5 files changed, 24 insertions(+)
 create mode 100644 packages/backend-core/src/events/publishers/backup.ts
 create mode 100644 packages/types/src/sdk/events/backup.ts

diff --git a/packages/backend-core/src/events/publishers/backup.ts b/packages/backend-core/src/events/publishers/backup.ts
new file mode 100644
index 0000000000..00b4f8db69
--- /dev/null
+++ b/packages/backend-core/src/events/publishers/backup.ts
@@ -0,0 +1,12 @@
+import { AppBackup, AppBackupRevertEvent, Event } from "@budibase/types"
+import { publishEvent } from "../events"
+
+export async function appBackupRestored(backup: AppBackup) {
+  const properties: AppBackupRevertEvent = {
+    appId: backup.appId,
+    backupName: backup.name,
+    backupCreatedAt: backup.createdAt,
+  }
+
+  await publishEvent(Event.APP_BACKUP_RESTORED, properties)
+}
diff --git a/packages/backend-core/src/events/publishers/index.ts b/packages/backend-core/src/events/publishers/index.ts
index 6fe42c4bda..7306312a8f 100644
--- a/packages/backend-core/src/events/publishers/index.ts
+++ b/packages/backend-core/src/events/publishers/index.ts
@@ -19,3 +19,4 @@ export * as installation from "./installation"
 export * as backfill from "./backfill"
 export * as group from "./group"
 export * as plugin from "./plugin"
+export * as backup from "./backup"
diff --git a/packages/types/src/sdk/events/backup.ts b/packages/types/src/sdk/events/backup.ts
new file mode 100644
index 0000000000..f3ddafcafc
--- /dev/null
+++ b/packages/types/src/sdk/events/backup.ts
@@ -0,0 +1,7 @@
+import { BaseEvent } from "./event"
+
+export interface AppBackupRevertEvent extends BaseEvent {
+  appId: string
+  backupName: string
+  backupCreatedAt: string
+}
diff --git a/packages/types/src/sdk/events/event.ts b/packages/types/src/sdk/events/event.ts
index 73e5315713..71caf2bf96 100644
--- a/packages/types/src/sdk/events/event.ts
+++ b/packages/types/src/sdk/events/event.ts
@@ -168,6 +168,9 @@ export enum Event {
   PLUGIN_INIT = "plugin:init",
   PLUGIN_IMPORTED = "plugin:imported",
   PLUGIN_DELETED = "plugin:deleted",
+
+  // BACKUP
+  APP_BACKUP_RESTORED = "app:backup:restored",
 }
 
 // properties added at the final stage of the event pipeline
diff --git a/packages/types/src/sdk/events/index.ts b/packages/types/src/sdk/events/index.ts
index cc0c2b9aa1..5abc30f5b9 100644
--- a/packages/types/src/sdk/events/index.ts
+++ b/packages/types/src/sdk/events/index.ts
@@ -20,3 +20,4 @@ export * from "./backfill"
 export * from "./identification"
 export * from "./userGroup"
 export * from "./plugin"
+export * from "./backup"

From 65184704090de0fa8c1685269f419b1330c10e14 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 17 Oct 2022 17:32:23 +0100
Subject: [PATCH 038/151] updating variable name

---
 charts/budibase/templates/app-service-deployment.yaml    | 2 +-
 charts/budibase/templates/worker-service-deployment.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
index 25a5dd410a..af2a3ed544 100644
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -83,7 +83,7 @@ spec:
         - name: APPS_BUCKET_NAME
           value: {{ .Values.services.objectStore.appsBucketName | default "apps" | quote }}
         - name: GLOBAL_CLOUD_BUCKET_NAME
-          value: {{ .Values.services.objectStore.globalCloudBucketName | default "global" | quote }}
+          value: {{ .Values.services.objectStore.globalBucketName | default "global" | quote }}
         - name: PORT
           value: {{ .Values.services.apps.port | quote }}
         {{ if .Values.services.worker.publicApiRateLimitPerSecond }}
diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml
index 1284b9c411..e7dccfae1c 100644
--- a/charts/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@@ -82,7 +82,7 @@ spec:
         - name: APPS_BUCKET_NAME
           value: {{ .Values.services.objectStore.appsBucketName | default "apps" | quote }}
         - name: GLOBAL_CLOUD_BUCKET_NAME
-          value: {{ .Values.services.objectStore.globalCloudBucketName | default "global" | quote }}
+          value: {{ .Values.services.objectStore.globalBucketName | default "global" | quote }}
         - name: PORT
           value: {{ .Values.services.worker.port | quote }}
         - name: MULTI_TENANCY

From 873b20219cc03880be89f4cf352dbe208af72736 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 17 Oct 2022 16:43:56 +0000
Subject: [PATCH 039/151] v2.0.32

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 7d825bcefb..824ebe4902 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.31",
+  "version": "2.0.32",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 1c3957949b..cba777c4c0 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "^2.0.31",
+    "@budibase/types": "^2.0.32",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 7f508ef0e0..1300a954c3 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^2.0.31",
+    "@budibase/string-templates": "^2.0.32",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 2f8591ef30..09e9dcd27a 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.31",
-    "@budibase/client": "^2.0.31",
-    "@budibase/frontend-core": "^2.0.31",
-    "@budibase/string-templates": "^2.0.31",
+    "@budibase/bbui": "^2.0.32",
+    "@budibase/client": "^2.0.32",
+    "@budibase/frontend-core": "^2.0.32",
+    "@budibase/string-templates": "^2.0.32",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 1fcac0164a..1e4515b822 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.0.31",
-    "@budibase/string-templates": "^2.0.31",
-    "@budibase/types": "^2.0.31",
+    "@budibase/backend-core": "^2.0.32",
+    "@budibase/string-templates": "^2.0.32",
+    "@budibase/types": "^2.0.32",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 7434bcc4c6..32409da298 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "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": "^2.0.31",
-    "@budibase/frontend-core": "^2.0.31",
-    "@budibase/string-templates": "^2.0.31",
+    "@budibase/bbui": "^2.0.32",
+    "@budibase/frontend-core": "^2.0.32",
+    "@budibase/string-templates": "^2.0.32",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index d871e129fc..e0cef709b7 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.0.31",
+    "@budibase/bbui": "^2.0.32",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index c993a6b75d..7903b47981 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index ca9d1a17bc..5574b4ca88 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.0.31",
-    "@budibase/client": "^2.0.31",
+    "@budibase/backend-core": "^2.0.32",
+    "@budibase/client": "^2.0.32",
     "@budibase/pro": "2.0.31",
-    "@budibase/string-templates": "^2.0.31",
-    "@budibase/types": "^2.0.31",
+    "@budibase/string-templates": "^2.0.32",
+    "@budibase/types": "^2.0.32",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 970bf98e8c..9fdceec45f 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index a7d589b405..33509d5929 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index e4379020b7..eb5ffa2e73 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.0.31",
+    "@budibase/backend-core": "^2.0.32",
     "@budibase/pro": "2.0.31",
-    "@budibase/string-templates": "^2.0.31",
-    "@budibase/types": "^2.0.31",
+    "@budibase/string-templates": "^2.0.32",
+    "@budibase/types": "^2.0.32",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 64c09a9888c93e2f9771e02c457e98886ff54a1e Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 17 Oct 2022 16:47:08 +0000
Subject: [PATCH 040/151] Update pro version to 2.0.32

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 5574b4ca88..9f49ac5767 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.0.32",
     "@budibase/client": "^2.0.32",
-    "@budibase/pro": "2.0.31",
+    "@budibase/pro": "2.0.32",
     "@budibase/string-templates": "^2.0.32",
     "@budibase/types": "^2.0.32",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index eaf629b010..fb3d88015c 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.31":
-  version "2.0.31"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.31.tgz#199fddbbaf987dde7477f12e7f9ab7f4435bdafd"
-  integrity sha512-te7fMsEWflKbPiv8vxh+U31562Yn4W3vUBcHUm3Oer38rv0nprUJoyxO1YGBVcOJVNAEtNAtEdoPayFezU3YOw==
+"@budibase/backend-core@2.0.32":
+  version "2.0.32"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.32.tgz#638c89302cc834d7cc11c5ce97bb3305392b9c85"
+  integrity sha512-4Pmh1VFmXlwnh5B5Jq75h+i5hVvOEQmDRVRvbsNk5sYAk/xxVbf7/kIQJ0OuhuTA+WfY8EpQLDEnHGhdTeFhWA==
   dependencies:
-    "@budibase/types" "^2.0.31"
+    "@budibase/types" "^2.0.32"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.31":
-  version "2.0.31"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.31.tgz#238f3057f9fac654efeb65ec8fcce83caa364ac2"
-  integrity sha512-VUx6PT/1RqCp0UNANmooJcKeMrGQNCM/rbMhOvvtbqvWhRa1sYn00RdXTAzzy++plOS8vue+f/BFewrr1yYlug==
+"@budibase/pro@2.0.32":
+  version "2.0.32"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.32.tgz#b091d5fda894cdce179f97441b9ed69ba7859f84"
+  integrity sha512-5LNXUGu+J6pH8iNfkv2jWxyBJhek0M3KtAJvTspREeK5BZ+dxHR2AxceIksKVFy3Tco7mGs2haSRQ0qActIgCg==
   dependencies:
-    "@budibase/backend-core" "2.0.31"
-    "@budibase/types" "2.0.31"
+    "@budibase/backend-core" "2.0.32"
+    "@budibase/types" "2.0.32"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.31", "@budibase/types@^2.0.31":
-  version "2.0.31"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.31.tgz#699ccd746cff39d4439e6f01a62c38a9f1a98bad"
-  integrity sha512-Eyx9wEVi4ZHrJ6410aM98IW7EWrsmYJ0ixmm/wD2tIhb57N33YgFWobsdR/G1wJUTZnR76Ve2tAweDgXmvtscQ==
+"@budibase/types@2.0.32", "@budibase/types@^2.0.32":
+  version "2.0.32"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.32.tgz#dda8989d7e59cdae8088447c568cabd7ea99dee5"
+  integrity sha512-ALTVPOdRlGFzI8AvYJcBncQiLxqM3coZV0Jc5fCJbSNZ9pObHxibhkCunGSevdEOC1l5p/vT7/B5bUD4fUvnsg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index eb5ffa2e73..de35922a91 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.0.32",
-    "@budibase/pro": "2.0.31",
+    "@budibase/pro": "2.0.32",
     "@budibase/string-templates": "^2.0.32",
     "@budibase/types": "^2.0.32",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 0d6085ef5a..4955805d4e 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.31":
-  version "2.0.31"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.31.tgz#199fddbbaf987dde7477f12e7f9ab7f4435bdafd"
-  integrity sha512-te7fMsEWflKbPiv8vxh+U31562Yn4W3vUBcHUm3Oer38rv0nprUJoyxO1YGBVcOJVNAEtNAtEdoPayFezU3YOw==
+"@budibase/backend-core@2.0.32":
+  version "2.0.32"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.32.tgz#638c89302cc834d7cc11c5ce97bb3305392b9c85"
+  integrity sha512-4Pmh1VFmXlwnh5B5Jq75h+i5hVvOEQmDRVRvbsNk5sYAk/xxVbf7/kIQJ0OuhuTA+WfY8EpQLDEnHGhdTeFhWA==
   dependencies:
-    "@budibase/types" "^2.0.31"
+    "@budibase/types" "^2.0.32"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.31":
-  version "2.0.31"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.31.tgz#238f3057f9fac654efeb65ec8fcce83caa364ac2"
-  integrity sha512-VUx6PT/1RqCp0UNANmooJcKeMrGQNCM/rbMhOvvtbqvWhRa1sYn00RdXTAzzy++plOS8vue+f/BFewrr1yYlug==
+"@budibase/pro@2.0.32":
+  version "2.0.32"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.32.tgz#b091d5fda894cdce179f97441b9ed69ba7859f84"
+  integrity sha512-5LNXUGu+J6pH8iNfkv2jWxyBJhek0M3KtAJvTspREeK5BZ+dxHR2AxceIksKVFy3Tco7mGs2haSRQ0qActIgCg==
   dependencies:
-    "@budibase/backend-core" "2.0.31"
-    "@budibase/types" "2.0.31"
+    "@budibase/backend-core" "2.0.32"
+    "@budibase/types" "2.0.32"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.31", "@budibase/types@^2.0.31":
-  version "2.0.31"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.31.tgz#699ccd746cff39d4439e6f01a62c38a9f1a98bad"
-  integrity sha512-Eyx9wEVi4ZHrJ6410aM98IW7EWrsmYJ0ixmm/wD2tIhb57N33YgFWobsdR/G1wJUTZnR76Ve2tAweDgXmvtscQ==
+"@budibase/types@2.0.32", "@budibase/types@^2.0.32":
+  version "2.0.32"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.32.tgz#dda8989d7e59cdae8088447c568cabd7ea99dee5"
+  integrity sha512-ALTVPOdRlGFzI8AvYJcBncQiLxqM3coZV0Jc5fCJbSNZ9pObHxibhkCunGSevdEOC1l5p/vT7/B5bUD4fUvnsg==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 8003f8b28342bb33564204e74d8f5f87508141e9 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 17 Oct 2022 18:50:52 +0100
Subject: [PATCH 041/151] Work for backup download endpoint.

---
 packages/types/src/documents/app/backup.ts | 2 ++
 packages/types/src/sdk/koa.ts              | 1 +
 2 files changed, 3 insertions(+)

diff --git a/packages/types/src/documents/app/backup.ts b/packages/types/src/documents/app/backup.ts
index fb8ef61e3a..5fb602860e 100644
--- a/packages/types/src/documents/app/backup.ts
+++ b/packages/types/src/documents/app/backup.ts
@@ -10,6 +10,7 @@ export interface AppBackup extends Document {
   trigger: AppBackupTrigger
   name: string
   createdAt: string
+  createdBy?: string
   filename: string
   appId: string
   userId?: string
@@ -31,6 +32,7 @@ export type AppBackupFetchOpts = {
 
 export interface AppBackupQueueData {
   trigger: AppBackupTrigger
+  createdBy?: string
   name?: string
   appId: string
 }
diff --git a/packages/types/src/sdk/koa.ts b/packages/types/src/sdk/koa.ts
index 250b176d79..e6f4a5094e 100644
--- a/packages/types/src/sdk/koa.ts
+++ b/packages/types/src/sdk/koa.ts
@@ -15,4 +15,5 @@ export interface BBContext {
   params: any
   body?: any
   redirect?: any
+  attachment: any
 }

From f795cb0e33b727f09029934d41af9d8fc1b2b06c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 17 Oct 2022 19:42:36 +0100
Subject: [PATCH 042/151] Reformatting types to allow queue to be used for
 import and export.

---
 packages/server/src/sdk/app/backups/backup.ts | 66 ++++++++++---------
 .../server/src/sdk/app/backups/imports.ts     |  2 +-
 packages/types/src/documents/app/backup.ts    | 23 +++++--
 3 files changed, 55 insertions(+), 36 deletions(-)

diff --git a/packages/server/src/sdk/app/backups/backup.ts b/packages/server/src/sdk/app/backups/backup.ts
index fb4bcc6022..cb758536bd 100644
--- a/packages/server/src/sdk/app/backups/backup.ts
+++ b/packages/server/src/sdk/app/backups/backup.ts
@@ -5,37 +5,41 @@ import { Job } from "bull"
 import fs from "fs"
 import env from "../../../environment"
 
-export async function init() {
-  await backups.addAppBackupProcessor(async (job: Job) => {
-    const appId = job.data.appId,
-      trigger = job.data.trigger,
-      name = job.data.name
-    const tenantId = tenancy.getTenantIDFromAppID(appId)
-    await tenancy.doInTenant(tenantId, async () => {
-      const createdAt = new Date().toISOString()
-      const tarPath = await exportApp(appId, { tar: true })
-      let filename = `${appId}/backup-${createdAt}.tar.gz`
-      // add the tenant to the bucket path if backing up within a multi-tenant environment
-      if (env.MULTI_TENANCY) {
-        filename = `${tenantId}/${filename}`
-      }
-      const bucket = objectStore.ObjectStoreBuckets.BACKUPS
-      const metadata = {
-        appId,
-        createdAt,
-        trigger,
-        name,
-      }
-      await objectStore.upload({
-        path: tarPath,
-        type: "application/gzip",
-        bucket,
-        filename,
-        metadata,
-      })
-      await backups.storeAppBackupMetadata(filename, metadata)
-      // clear up the tarball after uploading it
-      fs.rmSync(tarPath)
+async function importProcessor(job: Job) {}
+
+async function exportProcessor(job: Job) {
+  const appId = job.data.appId,
+    trigger = job.data.trigger,
+    name = job.data.name
+  const tenantId = tenancy.getTenantIDFromAppID(appId)
+  await tenancy.doInTenant(tenantId, async () => {
+    const createdAt = new Date().toISOString()
+    const tarPath = await exportApp(appId, { tar: true })
+    let filename = `${appId}/backup-${createdAt}.tar.gz`
+    // add the tenant to the bucket path if backing up within a multi-tenant environment
+    if (env.MULTI_TENANCY) {
+      filename = `${tenantId}/${filename}`
+    }
+    const bucket = objectStore.ObjectStoreBuckets.BACKUPS
+    const metadata = {
+      appId,
+      createdAt,
+      trigger,
+      name,
+    }
+    await objectStore.upload({
+      path: tarPath,
+      type: "application/gzip",
+      bucket,
+      filename,
+      metadata,
     })
+    await backups.storeAppBackupMetadata(filename, metadata)
+    // clear up the tarball after uploading it
+    fs.rmSync(tarPath)
   })
 }
+
+export async function init() {
+  await backups.addAppBackupProcessors(importProcessor, exportProcessor)
+}
diff --git a/packages/server/src/sdk/app/backups/imports.ts b/packages/server/src/sdk/app/backups/imports.ts
index d09c4b3f02..60ce63d51e 100644
--- a/packages/server/src/sdk/app/backups/imports.ts
+++ b/packages/server/src/sdk/app/backups/imports.ts
@@ -1,5 +1,5 @@
 import { db as dbCore } from "@budibase/backend-core"
-import { APP_PREFIX, TABLE_ROW_PREFIX } from "../../../db/utils"
+import { TABLE_ROW_PREFIX } from "../../../db/utils"
 import { budibaseTempDir } from "../../../utilities/budibaseDir"
 import {
   DB_EXPORT_FILE,
diff --git a/packages/types/src/documents/app/backup.ts b/packages/types/src/documents/app/backup.ts
index 5fb602860e..28e927c772 100644
--- a/packages/types/src/documents/app/backup.ts
+++ b/packages/types/src/documents/app/backup.ts
@@ -6,6 +6,11 @@ export enum AppBackupTrigger {
   SCHEDULED = "scheduled",
 }
 
+export enum AppBackupEventType {
+  EXPORT = "export",
+  IMPORT = "import",
+}
+
 export interface AppBackup extends Document {
   trigger: AppBackupTrigger
   name: string
@@ -31,12 +36,22 @@ export type AppBackupFetchOpts = {
 }
 
 export interface AppBackupQueueData {
-  trigger: AppBackupTrigger
-  createdBy?: string
-  name?: string
+  eventType: AppBackupEventType
   appId: string
+  export?: {
+    trigger: AppBackupTrigger
+    name?: string
+    createdBy?: string
+  }
+  import?: {
+    backupId: string
+  }
 }
 
-export interface AppBackupMetadata extends AppBackupQueueData {
+export interface AppBackupMetadata {
+  appId: string
+  trigger: AppBackupTrigger
+  name?: string
+  createdBy?: string
   createdAt: string
 }

From d1e729ec55e96c988be85a69f986d78ac64b1f6b Mon Sep 17 00:00:00 2001
From: Jonny McCullagh <jonny.mccullagh@redbranch.net>
Date: Tue, 18 Oct 2022 09:33:04 +0100
Subject: [PATCH 043/151] proxy IPv6 removal needs to happen after envsubst

---
 ...n-ipv6-by-default.sh => 80-listen-on-ipv6-by-default.sh} | 0
 hosting/proxy/Dockerfile                                    | 6 ++++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename hosting/proxy/{10-listen-on-ipv6-by-default.sh => 80-listen-on-ipv6-by-default.sh} (100%)

diff --git a/hosting/proxy/10-listen-on-ipv6-by-default.sh b/hosting/proxy/80-listen-on-ipv6-by-default.sh
similarity index 100%
rename from hosting/proxy/10-listen-on-ipv6-by-default.sh
rename to hosting/proxy/80-listen-on-ipv6-by-default.sh
diff --git a/hosting/proxy/Dockerfile b/hosting/proxy/Dockerfile
index f11480fd73..c1b11b23f7 100644
--- a/hosting/proxy/Dockerfile
+++ b/hosting/proxy/Dockerfile
@@ -5,8 +5,10 @@ FROM nginx:latest
 # override the output dir to output directly to /etc/nginx instead of /etc/nginx/conf.d
 ENV NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx
 COPY .generated-nginx.prod.conf /etc/nginx/templates/nginx.conf.template
-COPY 10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh
-RUN chmod +x /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh
+# IPv6 removal needs to happen after envsubst
+RUN rm -rf /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh
+COPY 80-listen-on-ipv6-by-default.sh /docker-entrypoint.d/80-listen-on-ipv6-by-default.sh
+RUN chmod +x /docker-entrypoint.d/80-listen-on-ipv6-by-default.sh
 
 # Error handling
 COPY error.html /usr/share/nginx/html/error.html

From 15bbc788473c384fc3ed28f6476325de3a6cf6e0 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 18 Oct 2022 16:18:22 +0100
Subject: [PATCH 044/151] Add grid functionality separately to DND

---
 .../client/src/components/Component.svelte    |   5 +-
 .../client/src/components/app/Grid.svelte     |  45 +-
 .../src/components/preview/DNDHandler.svelte  |  39 +-
 .../components/preview/GridDNDHandler.svelte  | 656 ++++--------------
 .../components/preview/HoverIndicator.svelte  |   4 +-
 .../src/components/preview/Indicator.svelte   |  72 +-
 .../components/preview/IndicatorSet.svelte    |  21 +
 .../preview/SelectionIndicator.svelte         |   5 +-
 .../src/components/preview/SettingsBar.svelte |   4 +-
 packages/client/src/index.js                  |   2 -
 packages/client/src/stores/builder.js         |   7 +
 packages/client/src/stores/dnd.js             |  12 -
 packages/client/src/stores/index.js           |   1 -
 13 files changed, 251 insertions(+), 622 deletions(-)

diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index 742b93bb42..fe99c3e4cd 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -21,7 +21,6 @@
     devToolsStore,
     componentStore,
     appStore,
-    dndIsDragging,
     dndComponentPath,
   } from "stores"
   import { Helpers } from "@budibase/bbui"
@@ -163,7 +162,7 @@
   // nested layers. Only reset this when dragging stops.
   let pad = false
   $: pad = pad || (interactive && hasChildren && inDndPath)
-  $: $dndIsDragging, (pad = false)
+  $: $builderStore.dragging, (pad = false)
 
   // Update component context
   $: store.set({
@@ -427,7 +426,7 @@
   const scrollIntoView = () => {
     // Don't scroll into view if we selected this component because we were
     // starting dragging on it
-    if (get(dndIsDragging)) {
+    if (get(builderStore).dragging) {
       return
     }
     const node = document.getElementsByClassName(id)?.[0]?.children[0]
diff --git a/packages/client/src/components/app/Grid.svelte b/packages/client/src/components/app/Grid.svelte
index 51c5162386..9a588dbf17 100644
--- a/packages/client/src/components/app/Grid.svelte
+++ b/packages/client/src/components/app/Grid.svelte
@@ -1,11 +1,14 @@
 <script>
   import { getContext } from "svelte"
-  import { fade } from "svelte/transition"
+  import GridDNDHandler from "../preview/GridDNDHandler.svelte"
 
   const component = getContext("component")
   const { styleable, builderStore } = getContext("sdk")
 
-  $: coords = generateCoords(12)
+  const cols = 12
+
+  let node
+  $: coords = generateCoords(cols)
 
   const generateCoords = num => {
     let grid = []
@@ -18,44 +21,36 @@
   }
 </script>
 
-<div class="grid" use:styleable={$component.styles}>
+<div
+  bind:this={node}
+  class="grid"
+  use:styleable={$component.styles}
+  data-cols={cols}
+>
   <div class="underlay">
     {#each coords as coord}
       <div class="placeholder" />
     {/each}
   </div>
   <slot />
-  {#if $builderStore.isDragging}
-    <div
-      class="overlay"
-      in:fade={{ duration: 130 }}
-      out:fade|self={{ duration: 130 }}
-    >
-      {#each coords as coord}
-        <div
-          class="placeholder grid-coord"
-          data-row={coord.row}
-          data-col={coord.col}
-        />
-      {/each}
-    </div>
-  {/if}
 </div>
 
+{#if $builderStore.inBuilder && node}
+  <GridDNDHandler {node} />
+{/if}
+
 <style>
   .grid {
     position: relative;
     min-height: 400px;
   }
   .grid,
-  .underlay,
-  .overlay {
+  .underlay {
     display: grid;
     grid-template-columns: repeat(12, 1fr);
     grid-template-rows: repeat(12, 1fr);
   }
-  .underlay,
-  .overlay {
+  .underlay {
     position: absolute;
     top: 0;
     left: 0;
@@ -68,12 +63,6 @@
   .underlay {
     z-index: -1;
   }
-  .overlay {
-    z-index: 999;
-    background-color: var(--spectrum-global-color-gray-500);
-    border-color: var(--spectrum-global-color-gray-500);
-    opacity: 0.3;
-  }
 
   .placeholder {
     background-color: var(--spectrum-global-color-gray-100);
diff --git a/packages/client/src/components/preview/DNDHandler.svelte b/packages/client/src/components/preview/DNDHandler.svelte
index a9c52f0099..a29a1aa522 100644
--- a/packages/client/src/components/preview/DNDHandler.svelte
+++ b/packages/client/src/components/preview/DNDHandler.svelte
@@ -2,13 +2,7 @@
   import { onMount, onDestroy } from "svelte"
   import { get } from "svelte/store"
   import IndicatorSet from "./IndicatorSet.svelte"
-  import {
-    builderStore,
-    screenStore,
-    dndStore,
-    dndParent,
-    dndIsDragging,
-  } from "stores"
+  import { builderStore, screenStore, dndStore, dndParent } from "stores"
   import DNDPlaceholderOverlay from "./DNDPlaceholderOverlay.svelte"
   import { Utils } from "@budibase/frontend-core"
   import { findComponentById } from "utils/components.js"
@@ -22,6 +16,10 @@
   $: target = $dndStore.target
   $: drop = $dndStore.drop
 
+  const insideGrid = e => {
+    return e.target?.closest?.(".grid") != null
+  }
+
   // Util to get the inner DOM node by a component ID
   const getDOMNode = id => {
     const component = document.getElementsByClassName(id)[0]
@@ -51,10 +49,14 @@
 
     // Reset state
     dndStore.actions.reset()
+    builderStore.actions.setDragging(false)
   }
 
   // Callback when initially starting a drag on a draggable component
   const onDragStart = e => {
+    if (insideGrid(e)) {
+      return
+    }
     const component = e.target.closest(".component")
     if (!component?.classList.contains("draggable")) {
       return
@@ -83,6 +85,7 @@
       index,
     })
     builderStore.actions.selectComponent(id)
+    builderStore.actions.setDragging(true)
 
     // Set initial drop info to show placeholder exactly where the dragged
     // component is.
@@ -99,9 +102,9 @@
 
   // Core logic for handling drop events and determining where to render the
   // drop target placeholder
-  const processEvent = (mouseX, mouseY) => {
+  const processEvent = Utils.throttle((mouseX, mouseY) => {
     if (!target) {
-      return null
+      return
     }
     let { id, parent, node, acceptsChildren, empty } = target
 
@@ -201,17 +204,17 @@
       parent: id,
       index: idx,
     })
-  }
-  const throttledProcessEvent = Utils.throttle(processEvent, ThrottleRate)
+  }, ThrottleRate)
 
   const handleEvent = e => {
     e.preventDefault()
-    throttledProcessEvent(e.clientX, e.clientY)
+    e.stopPropagation()
+    processEvent(e.clientX, e.clientY)
   }
 
-  // Callback when on top of a component
+  // Callback when on top of a component.
   const onDragOver = e => {
-    if (!source || !target) {
+    if (!source || !target || insideGrid(e)) {
       return
     }
     handleEvent(e)
@@ -219,7 +222,7 @@
 
   // Callback when entering a potential drop target
   const onDragEnter = e => {
-    if (!source) {
+    if (!source || insideGrid(e)) {
       return
     }
 
@@ -241,8 +244,8 @@
   }
 
   // Callback when dropping a drag on top of some component
-  const onDrop = () => {
-    if (!source || !drop?.parent || drop?.index == null) {
+  const onDrop = e => {
+    if (!source || !drop?.parent || drop?.index == null || insideGrid(e)) {
       return
     }
 
@@ -326,6 +329,6 @@
   prefix="Inside"
 />
 
-{#if $dndIsDragging}
+{#if $builderStore.dragging}
   <DNDPlaceholderOverlay />
 {/if}
diff --git a/packages/client/src/components/preview/GridDNDHandler.svelte b/packages/client/src/components/preview/GridDNDHandler.svelte
index a15292a604..ce2b049fd3 100644
--- a/packages/client/src/components/preview/GridDNDHandler.svelte
+++ b/packages/client/src/components/preview/GridDNDHandler.svelte
@@ -1,27 +1,17 @@
 <script>
   import { onMount, onDestroy } from "svelte"
-  import { get } from "svelte/store"
-  import IndicatorSet from "./IndicatorSet.svelte"
-  import {
-    builderStore,
-    screenStore,
-    dndStore,
-    dndParent,
-    dndIsDragging,
-  } from "stores"
-  import DNDPlaceholderOverlay from "./DNDPlaceholderOverlay.svelte"
+  import { builderStore, componentStore } from "stores"
   import { Utils } from "@budibase/frontend-core"
-  import { findComponentById } from "utils/components.js"
-  import { DNDPlaceholderID } from "constants"
-  import { DNDModes } from "stores/dnd.js"
 
-  const ThrottleRate = 130
+  let dragInfo
+  let gridStyles
 
-  // Cache some dnd store state as local variables as it massively helps
-  // performance. It lets us avoid calling svelte getters on every DOM action.
-  $: source = $dndStore.source
-  $: target = $dndStore.target
-  $: drop = $dndStore.drop
+  $: dragNode = getDOMNode(dragInfo?.id)
+  $: applyStyles(dragNode, gridStyles)
+
+  const insideGrid = e => {
+    return e.target?.closest?.(".grid") || e.target.classList.contains("anchor")
+  }
 
   // Util to get the inner DOM node by a component ID
   const getDOMNode = id => {
@@ -29,535 +19,195 @@
     return [...component.children][0]
   }
 
-  // Util to calculate the variance of a set of data
-  const variance = arr => {
-    const mean = arr.reduce((a, b) => a + b, 0) / arr.length
-    let squareSum = 0
-    arr.forEach(value => {
-      const delta = value - mean
-      squareSum += delta * delta
+  const applyStyles = (dragNode, gridStyles) => {
+    if (!dragNode || !gridStyles) {
+      return
+    }
+    Object.entries(gridStyles).forEach(([style, value]) => {
+      dragNode.style[style] = value
     })
-    return squareSum / arr.length
   }
 
   // Callback when drag stops (whether dropped or not)
   const stopDragging = () => {
+    // Save changes
+    if (gridStyles) {
+      builderStore.actions.updateStyles(gridStyles)
+    }
+
     // Reset listener
-    if (source?.id) {
-      const component = document.getElementsByClassName(source?.id)[0]
-      if (component) {
-        component.removeEventListener("dragend", stopDragging)
-      }
+    if (dragInfo?.domTarget) {
+      dragInfo.domTarget.removeEventListener("dragend", stopDragging)
     }
 
     // Reset state
-    dndStore.actions.reset()
-  }
-
-  const calculatePointDelta = (point1, point2) => {
-    const deltaX = Math.abs(point1[0] - point2[0])
-    const deltaY = Math.abs(point1[1] - point2[1])
-    return Math.sqrt(deltaX * deltaX + deltaY * deltaY)
+    dragInfo = null
+    gridStyles = null
+    builderStore.actions.setDragging(false)
   }
 
   // Callback when initially starting a drag on a draggable component
   const onDragStart = e => {
-    // New stuff
-    // var img = new Image()
-    // img.src =
-    //   "data:image/gif;base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="
-    // e.dataTransfer.setDragImage(img, 0, 0)
-    //
-    // // Resize component
-    // if (e.target.classList.contains("anchor")) {
-    //   dragInfo = {
-    //     target: e.target.dataset.id,
-    //     side: e.target.dataset.side,
-    //     mode: "resize",
-    //   }
-    // } else {
-    //   // Drag component
-    //   const parent = e.target.closest(".component")
-    //   if (!parent?.classList.contains("draggable")) {
-    //     return
-    //   }
-    //   dragInfo = {
-    //     target: parent.dataset.id,
-    //     parent: parent.dataset.parent,
-    //     mode: "move",
-    //   }
-    // }
-    // if (!dragInfo) {
-    //   return
-    // }
-    //
-    // builderStore.actions.selectComponent(dragInfo.target)
-    // builderStore.actions.setDragging(true)
-
-    // Current stuff
-    const component = e.target.closest(".component")
-    if (!component?.classList.contains("draggable")) {
+    if (!insideGrid(e)) {
       return
     }
 
     // Hide drag ghost image
     e.dataTransfer.setDragImage(new Image(), 0, 0)
 
-    // Add event handler to clear all drag state when dragging ends
-    component.addEventListener("dragend", stopDragging)
-
-    //
-
-    // Update state
-    const id = component.dataset.id
-    const parentId = component.dataset.parent
-    const parent = findComponentById(
-      get(screenStore).activeScreen?.props,
-      parentId
-    )
-    const index = parent._children.findIndex(
-      x => x._id === component.dataset.id
-    )
-    dndStore.actions.startDraggingExistingComponent({
-      id,
-      bounds: component.children[0].getBoundingClientRect(),
-      parent: parentId,
-      index,
-    })
-    builderStore.actions.selectComponent(id)
-
-    // Set initial drop info to show placeholder exactly where the dragged
-    // component is.
-    // Execute this asynchronously to prevent bugs caused by updating state in
-    // the same handler as selecting a new component (which causes a client
-    // re-initialisation).
-    setTimeout(() => {
-      dndStore.actions.updateDrop({
-        parent: parentId,
-        index,
-      })
-    }, 0)
-  }
-
-  // Core logic for handling drop events and determining where to render the
-  // drop target placeholder
-  const processEvent = (mouseX, mouseY) => {
-    if (!target) {
-      return null
-    }
-    let { id, parent, node, acceptsChildren, empty } = target
-
-    // If we're over something that does not accept children then we go up a
-    // level and consider the mouse position relative to the parent
-    if (!acceptsChildren) {
-      id = parent
-      empty = false
-      node = getDOMNode(parent)
+    // Extract state
+    let mode, id, side
+    if (e.target.classList.contains("anchor")) {
+      // Handle resize
+      mode = "resize"
+      id = e.target.dataset.id
+      side = e.target.dataset.side
+    } else {
+      // Handle move
+      mode = "move"
+      const component = e.target.closest(".component")
+      id = component.dataset.id
     }
 
-    // We're now hovering over something which does accept children.
-    // If it is empty, just go inside it.
-    if (empty) {
-      dndStore.actions.updateDrop({
-        parent: id,
-        index: 0,
-      })
+    // Find grid parent
+    const domComponent = getDOMNode(id)
+    const gridId = domComponent?.closest(".grid")?.parentNode.dataset.id
+    if (!gridId) {
       return
     }
 
-    // As the first DOM node in a component may not necessarily contain the
-    // child components, we can find to try the parent of the first child
-    // component and use that as the real parent DOM node
-    const childNode = node.getElementsByClassName("component")[0]
-    if (childNode?.parentNode) {
-      node = childNode.parentNode
+    // Update state
+    dragInfo = {
+      domTarget: e.target,
+      id,
+      gridId,
+      mode,
+      side,
     }
+    // builderStore.actions.selectComponent(dragInfo.id)
+    // builderStore.actions.setDragging(true)
 
-    // Append an ephemeral div to allow us to determine layout if only one
-    // child exists
-    let ephemeralDiv
-    if (node.children.length === 1) {
-      ephemeralDiv = document.createElement("div")
-      ephemeralDiv.dataset.id = DNDPlaceholderID
-      node.appendChild(ephemeralDiv)
-    }
-
-    // We're now hovering over something which accepts children and is not
-    // empty, so we need to work out where to inside the placeholder
-    // Calculate the coordinates of various locations on each child.
-    const childCoords = [...(node.children || [])].map(node => {
-      const child = node.children?.[0] || node
-      const bounds = child.getBoundingClientRect()
-      return {
-        placeholder: node.dataset.id === DNDPlaceholderID,
-        centerX: bounds.left + bounds.width / 2,
-        centerY: bounds.top + bounds.height / 2,
-        left: bounds.left,
-        right: bounds.right,
-        top: bounds.top,
-        bottom: bounds.bottom,
-      }
-    })
-
-    // Now that we've calculated the position of the children, we no longer need
-    // the ephemeral div
-    if (ephemeralDiv) {
-      node.removeChild(ephemeralDiv)
-    }
-
-    // Calculate the variance between each set of positions on the children
-    const variances = Object.keys(childCoords[0])
-      .filter(x => x !== "placeholder")
-      .map(key => {
-        const coords = childCoords.map(x => x[key])
-        return {
-          variance: variance(coords),
-          side: key,
-        }
-      })
-
-    // Sort by variance. The lowest variance position indicates whether we are
-    // in a row or column layout
-    variances.sort((a, b) => {
-      return a.variance < b.variance ? -1 : 1
-    })
-    const column = ["centerX", "left", "right"].includes(variances[0].side)
-
-    // Calculate breakpoints between child components so we can determine the
-    // index to drop the component in.
-    // We want to ignore the placeholder from this calculation as it should not
-    // be considered a real child of the parent.
-    let breakpoints = childCoords
-      .filter(x => !x.placeholder)
-      .map(x => {
-        return column ? x.centerY : x.centerX
-      })
-
-    // Determine the index to drop the component in
-    const mousePosition = column ? mouseY : mouseX
-    let idx = 0
-    while (idx < breakpoints.length && breakpoints[idx] < mousePosition) {
-      idx++
-    }
-    dndStore.actions.updateDrop({
-      parent: id,
-      index: idx,
-    })
+    // Add event handler to clear all drag state when dragging ends
+    dragInfo.domTarget.addEventListener("dragend", stopDragging)
   }
-  const throttledProcessEvent = Utils.throttle(processEvent, ThrottleRate)
+
+  // Callback when entering a potential drop target
+  const onDragEnter = e => {
+    // Skip if we aren't validly dragging currently
+    if (!dragInfo || dragInfo.grid || !insideGrid(e)) {
+      return
+    }
+
+    const compDef = $componentStore.selectedComponent
+    const domGrid = getDOMNode(dragInfo.gridId)
+    if (domGrid) {
+      const getStyle = x => parseInt(compDef._styles.normal?.[x] || "0")
+      dragInfo.grid = {
+        startX: e.clientX,
+        startY: e.clientY,
+        rowStart: getStyle("grid-row-start"),
+        rowEnd: getStyle("grid-row-end"),
+        colStart: getStyle("grid-column-start"),
+        colEnd: getStyle("grid-column-end"),
+        rowDeltaMin: 1 - getStyle("grid-row-start"),
+        rowDeltaMax:
+          parseInt(domGrid.dataset.cols) + 1 - getStyle("grid-row-end"),
+        colDeltaMin: 1 - getStyle("grid-column-start"),
+        colDeltaMax:
+          parseInt(domGrid.dataset.cols) + 1 - getStyle("grid-column-end"),
+      }
+      handleEvent(e)
+    }
+  }
+
+  const processEvent = Utils.throttle((mouseX, mouseY) => {
+    if (!dragInfo?.grid) {
+      return
+    }
+
+    const { mode, side, gridId, grid } = dragInfo
+    const {
+      startX,
+      startY,
+      rowStart,
+      rowEnd,
+      colStart,
+      colEnd,
+      rowDeltaMin,
+      rowDeltaMax,
+      colDeltaMin,
+      colDeltaMax,
+    } = grid
+
+    const domGrid = getDOMNode(gridId)
+    const cols = parseInt(domGrid.dataset.cols)
+    const { width, height } = domGrid.getBoundingClientRect()
+
+    const colWidth = width / cols
+    const diffX = mouseX - startX
+    let deltaX = Math.round(diffX / colWidth)
+    const rowHeight = height / cols
+    const diffY = mouseY - startY
+    let deltaY = Math.round(diffY / rowHeight)
+
+    if (mode === "move") {
+      deltaY = Math.min(Math.max(deltaY, rowDeltaMin), rowDeltaMax)
+      deltaX = Math.min(Math.max(deltaX, colDeltaMin), colDeltaMax)
+      gridStyles = {
+        "grid-row-start": rowStart + deltaY,
+        "grid-row-end": rowEnd + deltaY,
+        "grid-column-start": colStart + deltaX,
+        "grid-column-end": colEnd + deltaX,
+      }
+    } else if (mode === "resize") {
+      let newStyles = {}
+      if (side === "right") {
+        newStyles["grid-column-end"] = Math.max(colEnd + deltaX, colStart + 1)
+      } else if (side === "left") {
+        newStyles["grid-column-start"] = Math.min(colStart + deltaX, colEnd - 1)
+      } else if (side === "top") {
+        newStyles["grid-row-start"] = Math.min(rowStart + deltaY, rowEnd - 1)
+      } else if (side === "bottom") {
+        newStyles["grid-row-end"] = Math.max(rowEnd + deltaY, rowStart + 1)
+      } else if (side === "bottom-right") {
+        newStyles["grid-column-end"] = Math.max(colEnd + deltaX, colStart + 1)
+        newStyles["grid-row-end"] = Math.max(rowEnd + deltaY, rowStart + 1)
+      } else if (side === "bottom-left") {
+        newStyles["grid-column-start"] = Math.min(colStart + deltaX, colEnd - 1)
+        newStyles["grid-row-end"] = Math.max(rowEnd + deltaY, rowStart + 1)
+      } else if (side === "top-right") {
+        newStyles["grid-column-end"] = Math.max(colEnd + deltaX, colStart + 1)
+        newStyles["grid-row-start"] = Math.min(rowStart + deltaY, rowEnd - 1)
+      } else if (side === "top-left") {
+        newStyles["grid-column-start"] = Math.min(colStart + deltaX, colEnd - 1)
+        newStyles["grid-row-start"] = Math.min(rowStart + deltaY, rowEnd - 1)
+      }
+      gridStyles = newStyles
+    }
+  }, 100)
 
   const handleEvent = e => {
     e.preventDefault()
-    throttledProcessEvent(e.clientX, e.clientY)
+    e.stopPropagation()
+    processEvent(e.clientX, e.clientY)
   }
 
-  // Callback when on top of a component
   const onDragOver = e => {
-    // New stuff
-    // // Skip if we aren't validly dragging currently
-    // if (!dragInfo) {
-    //   return
-    // }
-    //
-    // e.preventDefault()
-    //
-    // // Set drag info for grids if not set
-    // if (!dragInfo.grid) {
-    //   const coord = e.target.closest(".grid-coord")
-    //   if (coord) {
-    //     const row = parseInt(coord.dataset.row)
-    //     const col = parseInt(coord.dataset.col)
-    //     const component = $componentStore.selectedComponent
-    //     const getStyle = x => parseInt(component._styles.normal?.[x] || "0")
-    //     dragInfo.grid = {
-    //       startRow: row,
-    //       startCol: col,
-    //       rowDeltaMin: 1 - getStyle("grid-row-start"),
-    //       rowDeltaMax: 13 - getStyle("grid-row-end"),
-    //       colDeltaMin: 1 - getStyle("grid-column-start"),
-    //       colDeltaMax: 13 - getStyle("grid-column-end"),
-    //     }
-    //   }
-    // }
-    //
-    // if (!dropInfo) {
-    //   return
-    // }
-    //
-    // const { droppableInside, bounds } = dropInfo
-    // const { top, left, height, width } = bounds
-    // const mouseY = e.clientY
-    // const mouseX = e.clientX
-    // const snapFactor = droppableInside ? 0.33 : 0.5
-    // const snapLimitV = Math.min(40, height * snapFactor)
-    // const snapLimitH = Math.min(40, width * snapFactor)
-    //
-    // // Determine all sies we are within snap range of
-    // let sides = []
-    // if (mouseY <= top + snapLimitV) {
-    //   sides.push(Sides.Top)
-    // } else if (mouseY >= top + height - snapLimitV) {
-    //   sides.push(Sides.Bottom)
-    // }
-    // if (mouseX < left + snapLimitH) {
-    //   sides.push(Sides.Left)
-    // } else if (mouseX > left + width - snapLimitH) {
-    //   sides.push(Sides.Right)
-    // }
-    //
-    // // When no edges match, drop inside if possible
-    // if (!sides.length) {
-    //   dropInfo.mode = droppableInside ? "inside" : null
-    //   dropInfo.side = null
-    //   return
-    // }
-    //
-    // // When one edge matches, use that edge
-    // if (sides.length === 1) {
-    //   dropInfo.side = sides[0]
-    //   if ([Sides.Top, Sides.Left].includes(sides[0])) {
-    //     dropInfo.mode = "above"
-    //   } else {
-    //     dropInfo.mode = "below"
-    //   }
-    //   return
-    // }
-    //
-    // // When 2 edges match, work out which is closer
-    // const mousePoint = [mouseX, mouseY]
-    // const edges = getEdges(bounds, mousePoint)
-    // const edge1 = edges[sides[0]]
-    // const delta1 = calculatePointDelta(mousePoint, edge1)
-    // const edge2 = edges[sides[1]]
-    // const delta2 = calculatePointDelta(mousePoint, edge2)
-    // const edge = delta1 < delta2 ? sides[0] : sides[1]
-    // dropInfo.side = edge
-    // if ([Sides.Top, Sides.Left].includes(edge)) {
-    //   dropInfo.mode = "above"
-    // } else {
-    //   dropInfo.mode = "below"
-    // }
-
-    // Current stuff
-    if (!source || !target) {
+    if (!dragInfo?.grid || !insideGrid(e)) {
       return
     }
     handleEvent(e)
   }
 
-  // Callback when entering a potential drop target
-  const onDragEnter = e => {
-    // // New stuff
-    // const coord = e.target.closest(".grid-coord")
-    // if (coord && dragInfo.grid) {
-    //   const row = parseInt(coord.dataset.row)
-    //   const col = parseInt(coord.dataset.col)
-    //   const { mode, side, grid } = dragInfo
-    //   const {
-    //     startRow,
-    //     startCol,
-    //     rowDeltaMin,
-    //     rowDeltaMax,
-    //     colDeltaMin,
-    //     colDeltaMax,
-    //   } = grid
-    //
-    //   const component = $componentStore.selectedComponent
-    //   const rowStart = parseInt(
-    //     component._styles.normal?.["grid-row-start"] || 0
-    //   )
-    //   const rowEnd = parseInt(component._styles.normal?.["grid-row-end"] || 0)
-    //   const colStart = parseInt(
-    //     component._styles.normal?.["grid-column-start"] || 0
-    //   )
-    //   const colEnd = parseInt(
-    //     component._styles.normal?.["grid-column-end"] || 0
-    //   )
-    //
-    //   let rowDelta = row - startRow
-    //   let colDelta = col - startCol
-    //
-    //   if (mode === "move") {
-    //     rowDelta = Math.min(Math.max(rowDelta, rowDeltaMin), rowDeltaMax)
-    //     colDelta = Math.min(Math.max(colDelta, colDeltaMin), colDeltaMax)
-    //     builderStore.actions.setGridStyles({
-    //       "grid-row-start": rowStart + rowDelta,
-    //       "grid-row-end": rowEnd + rowDelta,
-    //       "grid-column-start": colStart + colDelta,
-    //       "grid-column-end": colEnd + colDelta,
-    //     })
-    //   } else if (mode === "resize") {
-    //     let newStyles = {}
-    //     if (side === "right") {
-    //       newStyles["grid-column-end"] = colEnd + colDelta
-    //     } else if (side === "left") {
-    //       newStyles["grid-column-start"] = colStart + colDelta
-    //     } else if (side === "top") {
-    //       newStyles["grid-row-start"] = rowStart + rowDelta
-    //     } else if (side === "bottom") {
-    //       newStyles["grid-row-end"] = rowEnd + rowDelta
-    //     } else if (side === "bottom-right") {
-    //       newStyles["grid-column-end"] = colEnd + colDelta
-    //       newStyles["grid-row-end"] = rowEnd + rowDelta
-    //     } else if (side === "bottom-left") {
-    //       newStyles["grid-column-start"] = colStart + colDelta
-    //       newStyles["grid-row-end"] = rowEnd + rowDelta
-    //     } else if (side === "top-right") {
-    //       newStyles["grid-column-end"] = colEnd + colDelta
-    //       newStyles["grid-row-start"] = rowStart + rowDelta
-    //     } else if (side === "top-left") {
-    //       newStyles["grid-column-start"] = colStart + colDelta
-    //       newStyles["grid-row-start"] = rowStart + rowDelta
-    //     }
-    //     builderStore.actions.setGridStyles(newStyles)
-    //   }
-    // }
-    // return
-    //
-    // const element = e.target.closest(".component:not(.block)")
-    // if (
-    //   element &&
-    //   element.classList.contains("droppable") &&
-    //   element.dataset.id !== dragInfo.target
-    // ) {
-    //   // Do nothing if this is the same target
-    //   if (element.dataset.id === dropInfo?.target) {
-    //     return
-    //   }
-    //
-    //   // Ensure the dragging flag is always set.
-    //   // There's a bit of a race condition between the app reinitialisation
-    //   // after selecting the DND component and setting this the first time
-    //   if (!get(builderStore).isDragging) {
-    //     builderStore.actions.setDragging(true)
-    //   }
-    //
-    //   // Store target ID
-    //   const target = element.dataset.id
-    //
-    //   // Precompute and store some info to avoid recalculating everything in
-    //   // dragOver
-    //   const child = getDOMNodeForComponent(e.target)
-    //   const bounds = child.getBoundingClientRect()
-    //   dropInfo = {
-    //     target,
-    //     name: element.dataset.name,
-    //     icon: element.dataset.icon,
-    //     droppableInside: element.classList.contains("empty"),
-    //     bounds,
-    //   }
-    // } else {
-    //   dropInfo = null
-    // }
-
-    // Current stuff
-    if (!source) {
-      return
-    }
-
-    // Find the next valid component to consider dropping over, ignoring nested
-    // block components
-    const component = e.target?.closest?.(
-      `.component:not(.block):not(.${source.id})`
-    )
-    if (component && component.classList.contains("droppable")) {
-      dndStore.actions.updateTarget({
-        id: component.dataset.id,
-        parent: component.dataset.parent,
-        node: getDOMNode(component.dataset.id),
-        empty: component.classList.contains("empty"),
-        acceptsChildren: component.classList.contains("parent"),
-      })
-      handleEvent(e)
-    }
-  }
-
-  // Callback when dropping a drag on top of some component
-  const onDrop = () => {
-    if (!source || !drop?.parent || drop?.index == null) {
-      return
-    }
-
-    // Check if we're adding a new component rather than moving one
-    if (source.newComponentType) {
-      builderStore.actions.dropNewComponent(
-        source.newComponentType,
-        drop.parent,
-        drop.index
-      )
-      return
-    }
-
-    // Convert parent + index into target + mode
-    let legacyDropTarget, legacyDropMode
-    const parent = findComponentById(
-      get(screenStore).activeScreen?.props,
-      drop.parent
-    )
-    if (!parent) {
-      return
-    }
-
-    // Do nothing if we didn't change the location
-    if (source.parent === drop.parent && source.index === drop.index) {
-      return
-    }
-
-    // Filter out source component and placeholder from consideration
-    const children = parent._children?.filter(
-      x => x._id !== DNDPlaceholderID && x._id !== source.id
-    )
-
-    // Use inside if no existing children
-    if (!children?.length) {
-      legacyDropTarget = parent._id
-      legacyDropMode = "inside"
-    } else if (drop.index === 0) {
-      legacyDropTarget = children[0]?._id
-      legacyDropMode = "above"
-    } else {
-      legacyDropTarget = children[drop.index - 1]?._id
-      legacyDropMode = "below"
-    }
-
-    if (legacyDropTarget && legacyDropMode) {
-      builderStore.actions.moveComponent(
-        source.id,
-        legacyDropTarget,
-        legacyDropMode
-      )
-    }
-  }
-
   onMount(() => {
-    // Events fired on the draggable target
     document.addEventListener("dragstart", onDragStart, false)
-
-    // Events fired on the drop targets
-    document.addEventListener("dragover", onDragOver, false)
     document.addEventListener("dragenter", onDragEnter, false)
-    document.addEventListener("drop", onDrop, false)
+    document.addEventListener("dragover", onDragOver, false)
   })
 
   onDestroy(() => {
-    // Events fired on the draggable target
     document.removeEventListener("dragstart", onDragStart, false)
-
-    // Events fired on the drop targets
-    document.removeEventListener("dragover", onDragOver, false)
     document.removeEventListener("dragenter", onDragEnter, false)
-    document.removeEventListener("drop", onDrop, false)
+    document.removeEventListener("dragover", onDragOver, false)
   })
 </script>
-
-<IndicatorSet
-  componentId={$dndParent}
-  color="var(--spectrum-global-color-static-green-500)"
-  zIndex="930"
-  transition
-  prefix="Inside"
-/>
-
-{#if $dndIsDragging}
-  <DNDPlaceholderOverlay />
-{/if}
diff --git a/packages/client/src/components/preview/HoverIndicator.svelte b/packages/client/src/components/preview/HoverIndicator.svelte
index d5583ed3db..55930f7708 100644
--- a/packages/client/src/components/preview/HoverIndicator.svelte
+++ b/packages/client/src/components/preview/HoverIndicator.svelte
@@ -1,7 +1,7 @@
 <script>
   import { onMount, onDestroy } from "svelte"
   import IndicatorSet from "./IndicatorSet.svelte"
-  import { builderStore, dndIsDragging } from "stores"
+  import { builderStore } from "stores"
 
   let componentId
   $: zIndex = componentId === $builderStore.selectedComponentId ? 900 : 920
@@ -30,7 +30,7 @@
 </script>
 
 <IndicatorSet
-  componentId={$dndIsDragging ? null : componentId}
+  componentId={$builderStore.dragging ? null : componentId}
   color="var(--spectrum-global-color-static-blue-200)"
   transition
   {zIndex}
diff --git a/packages/client/src/components/preview/Indicator.svelte b/packages/client/src/components/preview/Indicator.svelte
index de66a5f544..f4b6dd457f 100644
--- a/packages/client/src/components/preview/Indicator.svelte
+++ b/packages/client/src/components/preview/Indicator.svelte
@@ -10,10 +10,22 @@
   export let icon
   export let color
   export let zIndex
+  export let componentId
   export let transition = false
   export let line = false
   export let alignRight = false
-  export let componentId
+  export let showResizeAnchors = false
+
+  const AnchorSides = [
+    "right",
+    "left",
+    "top",
+    "bottom",
+    "bottom-right",
+    "bottom-left",
+    "top-right",
+    "top-left",
+  ]
 
   $: flipped = top < 24
 </script>
@@ -41,54 +53,16 @@
       {/if}
     </div>
   {/if}
-  <div
-    draggable={true}
-    class="anchor right"
-    data-side="right"
-    data-id={componentId}
-  />
-  <div
-    draggable={true}
-    class="anchor top"
-    data-side="top"
-    data-id={componentId}
-  />
-  <div
-    draggable={true}
-    class="anchor left"
-    data-side="left"
-    data-id={componentId}
-  />
-  <div
-    draggable={true}
-    class="anchor bottom"
-    data-side="bottom"
-    data-id={componentId}
-  />
-  <div
-    draggable={true}
-    class="anchor bottom-right"
-    data-side="bottom-right"
-    data-id={componentId}
-  />
-  <div
-    draggable={true}
-    class="anchor bottom-left"
-    data-side="bottom-left"
-    data-id={componentId}
-  />
-  <div
-    draggable={true}
-    class="anchor top-right"
-    data-side="top-right"
-    data-id={componentId}
-  />
-  <div
-    draggable={true}
-    class="anchor top-left"
-    data-side="top-left"
-    data-id={componentId}
-  />
+  {#if showResizeAnchors}
+    {#each AnchorSides as side}
+      <div
+        draggable="true"
+        class="anchor {side}"
+        data-side={side}
+        data-id={componentId}
+      />
+    {/each}
+  {/if}
 </div>
 
 <style>
diff --git a/packages/client/src/components/preview/IndicatorSet.svelte b/packages/client/src/components/preview/IndicatorSet.svelte
index 99db893faa..dc4355b30f 100644
--- a/packages/client/src/components/preview/IndicatorSet.svelte
+++ b/packages/client/src/components/preview/IndicatorSet.svelte
@@ -9,11 +9,13 @@
   export let transition
   export let zIndex
   export let prefix = null
+  export let allowResizeAnchors = false
 
   let indicators = []
   let interval
   let text
   let icon
+  let insideGrid = false
 
   $: visibleIndicators = indicators.filter(x => x.visible)
   $: offset = $builderStore.inBuilder ? 0 : 2
@@ -23,6 +25,19 @@
   let callbackCount = 0
   let nextIndicators = []
 
+  const checkInsideGrid = id => {
+    const component = document.getElementsByClassName(id)[0]
+    const domNode = component?.children[0]
+
+    // Ignore grid itself
+    if (domNode?.classList.contains("grid")) {
+      return false
+    }
+
+    // Check if we're a descendent of a grid
+    return domNode?.closest(".grid") != null
+  }
+
   const createIntersectionCallback = idx => entries => {
     if (callbackCount >= observers.length) {
       return
@@ -52,6 +67,11 @@
     observers = []
     nextIndicators = []
 
+    // Check if we're inside a grid
+    if (allowResizeAnchors) {
+      insideGrid = checkInsideGrid(componentId)
+    }
+
     // Determine next set of indicators
     const parents = document.getElementsByClassName(componentId)
     if (parents.length) {
@@ -127,6 +147,7 @@
       height={indicator.height}
       text={idx === 0 ? text : null}
       icon={idx === 0 ? icon : null}
+      showResizeAnchors={allowResizeAnchors && insideGrid}
       {componentId}
       {transition}
       {zIndex}
diff --git a/packages/client/src/components/preview/SelectionIndicator.svelte b/packages/client/src/components/preview/SelectionIndicator.svelte
index 49341a7976..bca0341628 100644
--- a/packages/client/src/components/preview/SelectionIndicator.svelte
+++ b/packages/client/src/components/preview/SelectionIndicator.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { builderStore, dndIsDragging } from "stores"
+  import { builderStore } from "stores"
   import IndicatorSet from "./IndicatorSet.svelte"
 
   $: color = $builderStore.editMode
@@ -8,8 +8,9 @@
 </script>
 
 <IndicatorSet
-  componentId={$dndIsDragging ? null : $builderStore.selectedComponentId}
+  componentId={$builderStore.selectedComponentId}
   {color}
   zIndex="910"
   transition
+  allowResizeAnchors
 />
diff --git a/packages/client/src/components/preview/SettingsBar.svelte b/packages/client/src/components/preview/SettingsBar.svelte
index 757d8b88db..8ef0c81af0 100644
--- a/packages/client/src/components/preview/SettingsBar.svelte
+++ b/packages/client/src/components/preview/SettingsBar.svelte
@@ -3,7 +3,7 @@
   import SettingsButton from "./SettingsButton.svelte"
   import SettingsColorPicker from "./SettingsColorPicker.svelte"
   import SettingsPicker from "./SettingsPicker.svelte"
-  import { builderStore, componentStore, dndIsDragging } from "stores"
+  import { builderStore, componentStore } from "stores"
   import { domDebounce } from "utils/domDebounce"
 
   const verticalOffset = 36
@@ -16,7 +16,7 @@
   let measured = false
 
   $: definition = $componentStore.selectedComponentDefinition
-  $: showBar = definition?.showSettingsBar && !$dndIsDragging
+  $: showBar = definition?.showSettingsBar && !$builderStore.dragging
   $: settings = getBarSettings(definition)
 
   const getBarSettings = definition => {
diff --git a/packages/client/src/index.js b/packages/client/src/index.js
index 8a622f911b..e9c821c54f 100644
--- a/packages/client/src/index.js
+++ b/packages/client/src/index.js
@@ -41,8 +41,6 @@ const loadBudibase = async () => {
     previewDevice: window["##BUDIBASE_PREVIEW_DEVICE##"],
     navigation: window["##BUDIBASE_PREVIEW_NAVIGATION##"],
     hiddenComponentIds: window["##BUDIBASE_HIDDEN_COMPONENT_IDS##"],
-    gridStyles: get(builderStore).gridStyles,
-    isDragging: get(builderStore).isDragging,
     usedPlugins: window["##BUDIBASE_USED_PLUGINS##"],
     location: window["##BUDIBASE_LOCATION##"],
   })
diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.js
index 176b8942fc..41fd9bb92d 100644
--- a/packages/client/src/stores/builder.js
+++ b/packages/client/src/stores/builder.js
@@ -19,6 +19,7 @@ const createBuilderStore = () => {
     navigation: null,
     hiddenComponentIds: [],
     usedPlugins: null,
+    dragging: false,
 
     // Legacy - allow the builder to specify a layout
     layout: null,
@@ -111,6 +112,12 @@ const createBuilderStore = () => {
       // Notify the builder so we can reload component definitions
       dispatchEvent("reload-plugin")
     },
+    setDragging: dragging => {
+      store.update(state => {
+        state.dragging = dragging
+        return state
+      })
+    },
   }
   return {
     ...store,
diff --git a/packages/client/src/stores/dnd.js b/packages/client/src/stores/dnd.js
index 12a77df3c5..d9363e4725 100644
--- a/packages/client/src/stores/dnd.js
+++ b/packages/client/src/stores/dnd.js
@@ -10,9 +10,6 @@ const createDndStore = () => {
 
     // Info about where the component would be dropped
     drop: null,
-
-    // Grid info
-    gridStyles: null,
   }
   const store = writable(initialState)
 
@@ -62,13 +59,6 @@ const createDndStore = () => {
     store.set(initialState)
   }
 
-  const setGridStyles = styles => {
-    store.update(state => {
-      state.gridStyles = styles
-      return state
-    })
-  }
-
   return {
     subscribe: store.subscribe,
     actions: {
@@ -77,7 +67,6 @@ const createDndStore = () => {
       updateTarget,
       updateDrop,
       reset,
-      setGridStyles,
     },
   }
 }
@@ -88,7 +77,6 @@ export const dndStore = createDndStore()
 // performance by deriving any state that needs to be externally observed.
 // By doing this and using primitives, we can avoid invalidating other stores
 // or components which depend on DND state unless values actually change.
-export const dndIsDragging = derived(dndStore, $dndStore => !!$dndStore.source)
 export const dndParent = derived(dndStore, $dndStore => $dndStore.drop?.parent)
 export const dndIndex = derived(dndStore, $dndStore => $dndStore.drop?.index)
 export const dndBounds = derived(
diff --git a/packages/client/src/stores/index.js b/packages/client/src/stores/index.js
index c431302d43..e28ebf7bc4 100644
--- a/packages/client/src/stores/index.js
+++ b/packages/client/src/stores/index.js
@@ -21,7 +21,6 @@ export {
   dndParent,
   dndBounds,
   dndIsNewComponent,
-  dndIsDragging,
 } from "./dnd"
 
 // Context stores are layered and duplicated, so it is not a singleton

From caa4954d8ebc37cc91bede28fa9113afc78aadb0 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 18 Oct 2022 16:42:25 +0100
Subject: [PATCH 045/151] Updating export/import to include the budibase client
 and manifest.

---
 packages/client/yarn.lock                     |  5 +++
 packages/server/src/sdk/app/backups/backup.ts | 15 +++++--
 .../server/src/sdk/app/backups/exports.ts     | 37 ++++++++----------
 .../server/src/sdk/app/backups/imports.ts     | 39 ++++++++++++++-----
 4 files changed, 63 insertions(+), 33 deletions(-)

diff --git a/packages/client/yarn.lock b/packages/client/yarn.lock
index 4ed5b395fe..fbe688c0b7 100644
--- a/packages/client/yarn.lock
+++ b/packages/client/yarn.lock
@@ -670,6 +670,11 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+html5-qrcode@^2.2.1:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/html5-qrcode/-/html5-qrcode-2.2.3.tgz#5acb826860365e7c7ab91e1e14528ea16a502e8a"
+  integrity sha512-9CtEz5FVT56T76entiQxyrASzBWl8Rm30NHiQH8T163Eml5LS14BoZlYel9igxbikOt7O8KhvrT3awN1Y2HMqw==
+
 htmlparser2@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
diff --git a/packages/server/src/sdk/app/backups/backup.ts b/packages/server/src/sdk/app/backups/backup.ts
index cb758536bd..2a85424f71 100644
--- a/packages/server/src/sdk/app/backups/backup.ts
+++ b/packages/server/src/sdk/app/backups/backup.ts
@@ -1,16 +1,23 @@
 import { backups } from "@budibase/pro"
 import { objectStore, tenancy } from "@budibase/backend-core"
+import { AppBackupQueueData } from "@budibase/types"
 import { exportApp } from "./exports"
 import { Job } from "bull"
 import fs from "fs"
 import env from "../../../environment"
 
-async function importProcessor(job: Job) {}
+async function importProcessor(job: Job) {
+  const data: AppBackupQueueData = job.data
+  const appId = data.appId,
+    backupId = data.import!.backupId
+  const { path, metadata } = await backups.downloadAppBackup(backupId)
+}
 
 async function exportProcessor(job: Job) {
-  const appId = job.data.appId,
-    trigger = job.data.trigger,
-    name = job.data.name
+  const data: AppBackupQueueData = job.data
+  const appId = data.appId,
+    trigger = data.export!.trigger,
+    name = data.export!.name
   const tenantId = tenancy.getTenantIDFromAppID(appId)
   await tenancy.doInTenant(tenantId, async () => {
     const createdAt = new Date().toISOString()
diff --git a/packages/server/src/sdk/app/backups/exports.ts b/packages/server/src/sdk/app/backups/exports.ts
index 4656a83d51..4ca8c439a7 100644
--- a/packages/server/src/sdk/app/backups/exports.ts
+++ b/packages/server/src/sdk/app/backups/exports.ts
@@ -1,6 +1,9 @@
 import { db as dbCore } from "@budibase/backend-core"
 import { budibaseTempDir } from "../../../utilities/budibaseDir"
-import { retrieveDirectory } from "../../../utilities/fileSystem/utilities"
+import {
+  retrieveDirectory,
+  retrieve,
+} from "../../../utilities/fileSystem/utilities"
 import { streamFile } from "../../../utilities/fileSystem"
 import { ObjectStoreBuckets } from "../../../constants"
 import {
@@ -8,11 +11,7 @@ import {
   TABLE_ROW_PREFIX,
   USER_METDATA_PREFIX,
 } from "../../../db/utils"
-import {
-  DB_EXPORT_FILE,
-  GLOBAL_DB_EXPORT_FILE,
-  ATTACHMENT_DIR,
-} from "./constants"
+import { DB_EXPORT_FILE, GLOBAL_DB_EXPORT_FILE } from "./constants"
 import fs from "fs"
 import { join } from "path"
 const uuid = require("uuid/v4")
@@ -87,21 +86,19 @@ function defineFilter(excludeRows?: boolean) {
  */
 export async function exportApp(appId: string, config?: ExportOpts) {
   const prodAppId = dbCore.getProdAppID(appId)
-  const attachmentsPath = `${prodAppId}/${ATTACHMENT_DIR}`
-  // export attachments to tmp
-  const tmpPath = await retrieveDirectory(
-    ObjectStoreBuckets.APPS,
-    attachmentsPath
-  )
-  const downloadedPath = join(tmpPath, attachmentsPath),
-    tmpAttachmentPath = join(tmpPath, ATTACHMENT_DIR)
+  const appPath = `${prodAppId}/`
+  // export bucket contents
+  const tmpPath = await retrieveDirectory(ObjectStoreBuckets.APPS, appPath)
+  const downloadedPath = join(tmpPath, appPath)
   if (fs.existsSync(downloadedPath)) {
-    // move out of app directory, simplify structure
-    fs.renameSync(downloadedPath, tmpAttachmentPath)
+    const allFiles = fs.readdirSync(downloadedPath)
+    for (let file of allFiles) {
+      const path = join(downloadedPath, file)
+      // move out of app directory, simplify structure
+      fs.renameSync(path, join(downloadedPath, "..", file))
+    }
     // remove the old app directory created by object export
-    fs.rmdirSync(join(tmpPath, prodAppId))
-  } else {
-    fs.mkdirSync(tmpAttachmentPath)
+    fs.rmdirSync(downloadedPath)
   }
   // enforce an export of app DB to the tmp path
   const dbPath = join(tmpPath, DB_EXPORT_FILE)
@@ -113,7 +110,7 @@ export async function exportApp(appId: string, config?: ExportOpts) {
   // if tar requested, return where the tarball is
   if (config?.tar) {
     // now the tmpPath contains both the DB export and attachments, tar this
-    const tarPath = tarFilesToTmp(tmpPath, [ATTACHMENT_DIR, DB_EXPORT_FILE])
+    const tarPath = tarFilesToTmp(tmpPath, fs.readdirSync(tmpPath))
     // cleanup the tmp export files as tarball returned
     fs.rmSync(tmpPath, { recursive: true, force: true })
     return tarPath
diff --git a/packages/server/src/sdk/app/backups/imports.ts b/packages/server/src/sdk/app/backups/imports.ts
index 60ce63d51e..b63a0ee922 100644
--- a/packages/server/src/sdk/app/backups/imports.ts
+++ b/packages/server/src/sdk/app/backups/imports.ts
@@ -6,9 +6,12 @@ import {
   ATTACHMENT_DIR,
   GLOBAL_DB_EXPORT_FILE,
 } from "./constants"
-import { uploadDirectory } from "../../../utilities/fileSystem/utilities"
+import {
+  uploadDirectory,
+  upload,
+} from "../../../utilities/fileSystem/utilities"
 import { ObjectStoreBuckets, FieldTypes } from "../../../constants"
-import { join } from "path"
+import { join, basename } from "path"
 import fs from "fs"
 import sdk from "../../"
 import { CouchFindOptions, RowAttachment } from "@budibase/types"
@@ -127,14 +130,32 @@ export async function importApp(
     template.file && fs.lstatSync(template.file.path).isDirectory()
   if (template.file && (isTar || isDirectory)) {
     const tmpPath = isTar ? untarFile(template.file) : template.file.path
-    const attachmentPath = join(tmpPath, ATTACHMENT_DIR)
+    const contents = fs.readdirSync(tmpPath)
     // have to handle object import
-    if (fs.existsSync(attachmentPath)) {
-      await uploadDirectory(
-        ObjectStoreBuckets.APPS,
-        attachmentPath,
-        join(prodAppId, ATTACHMENT_DIR)
-      )
+    if (contents.length) {
+      let promises = []
+      let excludedFiles = [GLOBAL_DB_EXPORT_FILE, DB_EXPORT_FILE]
+      for (let filename of contents) {
+        const path = join(tmpPath, filename)
+        if (excludedFiles.includes(filename)) {
+          continue
+        }
+        filename = join(prodAppId, filename)
+        if (fs.lstatSync(path).isDirectory()) {
+          promises.push(
+            uploadDirectory(ObjectStoreBuckets.APPS, path, filename)
+          )
+        } else {
+          promises.push(
+            upload({
+              bucket: ObjectStoreBuckets.APPS,
+              path,
+              filename,
+            })
+          )
+        }
+      }
+      await Promise.all(promises)
     }
     dbStream = fs.createReadStream(join(tmpPath, DB_EXPORT_FILE))
   } else {

From b52f413aa573b410d603f555ac893eeb78fe5545 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 18 Oct 2022 17:04:18 +0100
Subject: [PATCH 046/151] Removing attachment dir constant - no longer needed.

---
 .../src/api/controllers/deploy/index.ts       | 21 ++++++++++++-------
 packages/server/src/constants/index.js        |  2 --
 packages/server/src/sdk/app/backups/backup.ts |  1 +
 .../server/src/sdk/app/backups/constants.ts   |  2 --
 .../server/src/sdk/app/backups/imports.ts     |  8 ++-----
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/server/src/api/controllers/deploy/index.ts b/packages/server/src/api/controllers/deploy/index.ts
index a51e7ad6ec..a1cb905930 100644
--- a/packages/server/src/api/controllers/deploy/index.ts
+++ b/packages/server/src/api/controllers/deploy/index.ts
@@ -1,23 +1,25 @@
 import Deployment from "./Deployment"
 import {
-  Replication,
-  getProdAppID,
   getDevelopmentAppID,
+  getProdAppID,
+  Replication,
 } from "@budibase/backend-core/db"
 import { DocumentType, getAutomationParams } from "../../../db/utils"
 import {
+  clearMetadata,
   disableAllCrons,
   enableCronTrigger,
-  clearMetadata,
 } from "../../../automations/utils"
 import { app as appCache } from "@budibase/backend-core/cache"
 import {
-  getAppId,
   getAppDB,
-  getProdAppDB,
+  getAppId,
   getDevAppDB,
+  getProdAppDB,
 } from "@budibase/backend-core/context"
 import { events } from "@budibase/backend-core"
+import { backups } from "@budibase/pro"
+import { AppBackupTrigger } from "@budibase/types"
 
 // the max time we can wait for an invalidation to complete before considering it failed
 const MAX_PENDING_TIME_MS = 30 * 60000
@@ -98,13 +100,18 @@ async function initDeployedApp(prodAppId: any) {
   console.log("Enabled cron triggers for deployed app..")
 }
 
-async function deployApp(deployment: any) {
+async function deployApp(deployment: any, userId: string) {
   let replication
   try {
     const appId = getAppId()
     const devAppId = getDevelopmentAppID(appId)
     const productionAppId = getProdAppID(appId)
 
+    // trigger backup initially
+    await backups.triggerAppBackup(productionAppId, AppBackupTrigger.PUBLISH, {
+      createdBy: userId,
+    })
+
     const config: any = {
       source: devAppId,
       target: productionAppId,
@@ -205,7 +212,7 @@ const _deployApp = async function (ctx: any) {
 
   console.log("Deploying app...")
 
-  let app = await deployApp(deployment)
+  let app = await deployApp(deployment, ctx.user._id)
 
   await events.app.published(app)
   ctx.body = deployment
diff --git a/packages/server/src/constants/index.js b/packages/server/src/constants/index.js
index 6b5bc4bf83..a3bccae754 100644
--- a/packages/server/src/constants/index.js
+++ b/packages/server/src/constants/index.js
@@ -209,6 +209,4 @@ exports.AutomationErrors = {
 // pass through the list from the auth/core lib
 exports.ObjectStoreBuckets = objectStore.ObjectStoreBuckets
 
-exports.ATTACHMENT_DIR = "attachments"
-
 exports.MAX_AUTOMATION_RECURRING_ERRORS = 5
diff --git a/packages/server/src/sdk/app/backups/backup.ts b/packages/server/src/sdk/app/backups/backup.ts
index 2a85424f71..92f70a5a84 100644
--- a/packages/server/src/sdk/app/backups/backup.ts
+++ b/packages/server/src/sdk/app/backups/backup.ts
@@ -11,6 +11,7 @@ async function importProcessor(job: Job) {
   const appId = data.appId,
     backupId = data.import!.backupId
   const { path, metadata } = await backups.downloadAppBackup(backupId)
+  // start by removing app database and contents of bucket - which will be updated
 }
 
 async function exportProcessor(job: Job) {
diff --git a/packages/server/src/sdk/app/backups/constants.ts b/packages/server/src/sdk/app/backups/constants.ts
index f022168846..2f011ea2de 100644
--- a/packages/server/src/sdk/app/backups/constants.ts
+++ b/packages/server/src/sdk/app/backups/constants.ts
@@ -1,4 +1,2 @@
-import { ATTACHMENT_DIR as attachmentDir } from "../../../constants"
 export const DB_EXPORT_FILE = "db.txt"
-export const ATTACHMENT_DIR = attachmentDir
 export const GLOBAL_DB_EXPORT_FILE = "global.txt"
diff --git a/packages/server/src/sdk/app/backups/imports.ts b/packages/server/src/sdk/app/backups/imports.ts
index b63a0ee922..b29a9eede5 100644
--- a/packages/server/src/sdk/app/backups/imports.ts
+++ b/packages/server/src/sdk/app/backups/imports.ts
@@ -1,17 +1,13 @@
 import { db as dbCore } from "@budibase/backend-core"
 import { TABLE_ROW_PREFIX } from "../../../db/utils"
 import { budibaseTempDir } from "../../../utilities/budibaseDir"
-import {
-  DB_EXPORT_FILE,
-  ATTACHMENT_DIR,
-  GLOBAL_DB_EXPORT_FILE,
-} from "./constants"
+import { DB_EXPORT_FILE, GLOBAL_DB_EXPORT_FILE } from "./constants"
 import {
   uploadDirectory,
   upload,
 } from "../../../utilities/fileSystem/utilities"
 import { ObjectStoreBuckets, FieldTypes } from "../../../constants"
-import { join, basename } from "path"
+import { join } from "path"
 import fs from "fs"
 import sdk from "../../"
 import { CouchFindOptions, RowAttachment } from "@budibase/types"

From a870d2473ded59f548abbbb51967a7321f7c6d64 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 18 Oct 2022 18:29:21 +0100
Subject: [PATCH 047/151] Allow grid DND without selecting components

---
 .../src/builderStore/store/frontend.js        | 14 ++---
 .../[screenId]/_components/AppPreview.svelte  |  2 +-
 .../client/src/components/Component.svelte    |  3 +-
 .../src/components/preview/DNDHandler.svelte  | 12 +++--
 .../components/preview/GridDNDHandler.svelte  | 16 +++---
 .../components/preview/HoverIndicator.svelte  | 26 +++++++--
 .../src/components/preview/Indicator.svelte   | 53 +++++++++++--------
 .../src/components/preview/SettingsBar.svelte |  4 +-
 packages/client/src/stores/builder.js         | 11 +---
 packages/client/src/stores/dnd.js             |  1 +
 packages/client/src/stores/index.js           |  1 +
 11 files changed, 88 insertions(+), 55 deletions(-)

diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index c8ebf258ca..2b8a5ec701 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -542,12 +542,11 @@ export const getFrontendStore = () => {
       },
       patch: async (patchFn, componentId, screenId) => {
         // Use selected component by default
-        if (!componentId && !screenId) {
+        if (!componentId || !screenId) {
           const state = get(store)
-          componentId = state.selectedComponentId
-          screenId = state.selectedScreenId
+          componentId = componentId || state.selectedComponentId
+          screenId = screenId || state.selectedScreenId
         }
-        // Invalid if only a screen or component ID provided
         if (!componentId || !screenId || !patchFn) {
           return
         }
@@ -902,13 +901,14 @@ export const getFrontendStore = () => {
           }
         })
       },
-      updateStyles: async styles => {
-        await store.actions.components.patch(component => {
+      updateStyles: async (styles, id) => {
+        const patchFn = component => {
           component._styles.normal = {
             ...component._styles.normal,
             ...styles,
           }
-        })
+        }
+        await store.actions.components.patch(patchFn, id)
       },
       updateCustomStyle: async style => {
         await store.actions.components.patch(component => {
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index 0972a2c8d6..501fbe5b4f 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -156,7 +156,7 @@
       } else if (type === "update-prop") {
         await store.actions.components.updateSetting(data.prop, data.value)
       } else if (type === "update-styles") {
-        await store.actions.components.updateStyles(data.styles)
+        await store.actions.components.updateStyles(data.styles, data.id)
       } else if (type === "delete-component" && data.id) {
         // Legacy type, can be deleted in future
         confirmDeleteComponent(data.id)
diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index fe99c3e4cd..6e5d09646a 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -22,6 +22,7 @@
     componentStore,
     appStore,
     dndComponentPath,
+    dndIsDragging,
   } from "stores"
   import { Helpers } from "@budibase/bbui"
   import { getActiveConditions, reduceConditionActions } from "utils/conditions"
@@ -162,7 +163,7 @@
   // nested layers. Only reset this when dragging stops.
   let pad = false
   $: pad = pad || (interactive && hasChildren && inDndPath)
-  $: $builderStore.dragging, (pad = false)
+  $: $dndIsDragging, (pad = false)
 
   // Update component context
   $: store.set({
diff --git a/packages/client/src/components/preview/DNDHandler.svelte b/packages/client/src/components/preview/DNDHandler.svelte
index a29a1aa522..43d1d52480 100644
--- a/packages/client/src/components/preview/DNDHandler.svelte
+++ b/packages/client/src/components/preview/DNDHandler.svelte
@@ -2,7 +2,13 @@
   import { onMount, onDestroy } from "svelte"
   import { get } from "svelte/store"
   import IndicatorSet from "./IndicatorSet.svelte"
-  import { builderStore, screenStore, dndStore, dndParent } from "stores"
+  import {
+    builderStore,
+    screenStore,
+    dndStore,
+    dndParent,
+    dndIsDragging,
+  } from "stores"
   import DNDPlaceholderOverlay from "./DNDPlaceholderOverlay.svelte"
   import { Utils } from "@budibase/frontend-core"
   import { findComponentById } from "utils/components.js"
@@ -49,7 +55,6 @@
 
     // Reset state
     dndStore.actions.reset()
-    builderStore.actions.setDragging(false)
   }
 
   // Callback when initially starting a drag on a draggable component
@@ -85,7 +90,6 @@
       index,
     })
     builderStore.actions.selectComponent(id)
-    builderStore.actions.setDragging(true)
 
     // Set initial drop info to show placeholder exactly where the dragged
     // component is.
@@ -329,6 +333,6 @@
   prefix="Inside"
 />
 
-{#if $builderStore.dragging}
+{#if $dndIsDragging}
   <DNDPlaceholderOverlay />
 {/if}
diff --git a/packages/client/src/components/preview/GridDNDHandler.svelte b/packages/client/src/components/preview/GridDNDHandler.svelte
index ce2b049fd3..22fecc9d1d 100644
--- a/packages/client/src/components/preview/GridDNDHandler.svelte
+++ b/packages/client/src/components/preview/GridDNDHandler.svelte
@@ -1,7 +1,8 @@
 <script>
   import { onMount, onDestroy } from "svelte"
-  import { builderStore, componentStore } from "stores"
+  import { builderStore, screenStore } from "stores"
   import { Utils } from "@budibase/frontend-core"
+  import { findComponentById } from "utils/components.js"
 
   let dragInfo
   let gridStyles
@@ -32,7 +33,7 @@
   const stopDragging = () => {
     // Save changes
     if (gridStyles) {
-      builderStore.actions.updateStyles(gridStyles)
+      builderStore.actions.updateStyles(gridStyles, dragInfo.id)
     }
 
     // Reset listener
@@ -43,7 +44,6 @@
     // Reset state
     dragInfo = null
     gridStyles = null
-    builderStore.actions.setDragging(false)
   }
 
   // Callback when initially starting a drag on a draggable component
@@ -84,8 +84,6 @@
       mode,
       side,
     }
-    // builderStore.actions.selectComponent(dragInfo.id)
-    // builderStore.actions.setDragging(true)
 
     // Add event handler to clear all drag state when dragging ends
     dragInfo.domTarget.addEventListener("dragend", stopDragging)
@@ -98,7 +96,13 @@
       return
     }
 
-    const compDef = $componentStore.selectedComponent
+    const compDef = findComponentById(
+      $screenStore.activeScreen.props,
+      dragInfo.id
+    )
+    if (!compDef) {
+      return
+    }
     const domGrid = getDOMNode(dragInfo.gridId)
     if (domGrid) {
       const getStyle = x => parseInt(compDef._styles.normal?.[x] || "0")
diff --git a/packages/client/src/components/preview/HoverIndicator.svelte b/packages/client/src/components/preview/HoverIndicator.svelte
index 55930f7708..380520d469 100644
--- a/packages/client/src/components/preview/HoverIndicator.svelte
+++ b/packages/client/src/components/preview/HoverIndicator.svelte
@@ -1,14 +1,31 @@
 <script>
   import { onMount, onDestroy } from "svelte"
   import IndicatorSet from "./IndicatorSet.svelte"
-  import { builderStore } from "stores"
+  import { builderStore, dndIsDragging } from "stores"
 
   let componentId
   $: zIndex = componentId === $builderStore.selectedComponentId ? 900 : 920
 
   const onMouseOver = e => {
-    const element = e.target.closest(".interactive.component")
-    const newId = element?.dataset?.id
+    // Ignore if dragging
+    if (e.buttons > 0) {
+      console.log("ignore")
+      return
+    }
+
+    let newId
+
+    if (e.target.classList.contains("anchor")) {
+      // Handle resize anchors
+      newId = e.target.dataset.id
+      console.log("anchor", newId)
+    } else {
+      // Handle normal components
+      const element = e.target.closest(".interactive.component")
+      newId = element?.dataset?.id
+      console.log("normal", newId)
+    }
+
     if (newId !== componentId) {
       componentId = newId
     }
@@ -30,8 +47,9 @@
 </script>
 
 <IndicatorSet
-  componentId={$builderStore.dragging ? null : componentId}
+  componentId={$dndIsDragging ? null : componentId}
   color="var(--spectrum-global-color-static-blue-200)"
   transition
   {zIndex}
+  allowResizeAnchors
 />
diff --git a/packages/client/src/components/preview/Indicator.svelte b/packages/client/src/components/preview/Indicator.svelte
index f4b6dd457f..04eaa49d6d 100644
--- a/packages/client/src/components/preview/Indicator.svelte
+++ b/packages/client/src/components/preview/Indicator.svelte
@@ -60,7 +60,9 @@
         class="anchor {side}"
         data-side={side}
         data-id={componentId}
-      />
+      >
+        <div class="anchor-inner" />
+      </div>
     {/each}
   {/if}
 </div>
@@ -131,52 +133,61 @@
 
   /* Anchor */
   .anchor {
+    --size: 24px;
     position: absolute;
-    width: 10px;
-    height: 10px;
-    border-radius: 50%;
-    background-color: var(--color);
+    width: var(--size);
+    height: var(--size);
     pointer-events: all;
+    display: grid;
+    place-items: center;
+    border-radius: 50%;
+  }
+  .anchor-inner {
+    width: 12px;
+    height: 12px;
+    background: white;
+    border: 2px solid var(--color);
+    pointer-events: none;
   }
   .anchor.right {
-    right: -6px;
-    top: calc(50% - 5px);
+    right: calc(var(--size) / -2 - 1px);
+    top: calc(50% - var(--size) / 2);
     cursor: e-resize;
   }
   .anchor.left {
-    left: -6px;
-    top: calc(50% - 5px);
+    left: calc(var(--size) / -2 - 1px);
+    top: calc(50% - var(--size) / 2);
     cursor: w-resize;
   }
   .anchor.bottom {
-    left: calc(50% - 5px);
-    bottom: -6px;
+    left: calc(50% - var(--size) / 2 + 1px);
+    bottom: calc(var(--size) / -2 - 1px);
     cursor: s-resize;
   }
   .anchor.top {
-    left: calc(50% - 5px);
-    top: -6px;
+    left: calc(50% - var(--size) / 2 + 1px);
+    top: calc(var(--size) / -2 - 1px);
     cursor: n-resize;
   }
 
   .anchor.bottom-right {
-    right: -6px;
-    bottom: -6px;
+    right: calc(var(--size) / -2 - 1px);
+    bottom: calc(var(--size) / -2 - 1px);
     cursor: se-resize;
   }
   .anchor.bottom-left {
-    left: -6px;
-    bottom: -6px;
+    left: calc(var(--size) / -2 - 1px);
+    bottom: calc(var(--size) / -2 - 1px);
     cursor: sw-resize;
   }
   .anchor.top-right {
-    right: -6px;
-    top: -6px;
+    right: calc(var(--size) / -2 - 1px);
+    top: calc(var(--size) / -2 - 1px);
     cursor: ne-resize;
   }
   .anchor.top-left {
-    left: -6px;
-    top: -6px;
+    left: calc(var(--size) / -2 - 1px);
+    top: calc(var(--size) / -2 - 1px);
     cursor: nw-resize;
   }
 </style>
diff --git a/packages/client/src/components/preview/SettingsBar.svelte b/packages/client/src/components/preview/SettingsBar.svelte
index 8ef0c81af0..757d8b88db 100644
--- a/packages/client/src/components/preview/SettingsBar.svelte
+++ b/packages/client/src/components/preview/SettingsBar.svelte
@@ -3,7 +3,7 @@
   import SettingsButton from "./SettingsButton.svelte"
   import SettingsColorPicker from "./SettingsColorPicker.svelte"
   import SettingsPicker from "./SettingsPicker.svelte"
-  import { builderStore, componentStore } from "stores"
+  import { builderStore, componentStore, dndIsDragging } from "stores"
   import { domDebounce } from "utils/domDebounce"
 
   const verticalOffset = 36
@@ -16,7 +16,7 @@
   let measured = false
 
   $: definition = $componentStore.selectedComponentDefinition
-  $: showBar = definition?.showSettingsBar && !$builderStore.dragging
+  $: showBar = definition?.showSettingsBar && !$dndIsDragging
   $: settings = getBarSettings(definition)
 
   const getBarSettings = definition => {
diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.js
index 41fd9bb92d..30fcc39bad 100644
--- a/packages/client/src/stores/builder.js
+++ b/packages/client/src/stores/builder.js
@@ -19,7 +19,6 @@ const createBuilderStore = () => {
     navigation: null,
     hiddenComponentIds: [],
     usedPlugins: null,
-    dragging: false,
 
     // Legacy - allow the builder to specify a layout
     layout: null,
@@ -41,8 +40,8 @@ const createBuilderStore = () => {
     updateProp: (prop, value) => {
       dispatchEvent("update-prop", { prop, value })
     },
-    updateStyles: styles => {
-      dispatchEvent("update-styles", { styles })
+    updateStyles: (styles, id) => {
+      dispatchEvent("update-styles", { styles, id })
     },
     keyDown: (key, ctrlKey) => {
       dispatchEvent("key-down", { key, ctrlKey })
@@ -112,12 +111,6 @@ const createBuilderStore = () => {
       // Notify the builder so we can reload component definitions
       dispatchEvent("reload-plugin")
     },
-    setDragging: dragging => {
-      store.update(state => {
-        state.dragging = dragging
-        return state
-      })
-    },
   }
   return {
     ...store,
diff --git a/packages/client/src/stores/dnd.js b/packages/client/src/stores/dnd.js
index d9363e4725..9f17a5aa90 100644
--- a/packages/client/src/stores/dnd.js
+++ b/packages/client/src/stores/dnd.js
@@ -87,3 +87,4 @@ export const dndIsNewComponent = derived(
   dndStore,
   $dndStore => $dndStore.source?.newComponentType != null
 )
+export const dndIsDragging = derived(dndStore, $dndStore => !!$dndStore.source)
diff --git a/packages/client/src/stores/index.js b/packages/client/src/stores/index.js
index e28ebf7bc4..c431302d43 100644
--- a/packages/client/src/stores/index.js
+++ b/packages/client/src/stores/index.js
@@ -21,6 +21,7 @@ export {
   dndParent,
   dndBounds,
   dndIsNewComponent,
+  dndIsDragging,
 } from "./dnd"
 
 // Context stores are layered and duplicated, so it is not a singleton

From 81aa2fbfcc3e4b7c7962939bddb9c66994df195b Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 18 Oct 2022 18:38:49 +0100
Subject: [PATCH 048/151] add base ui and backups tab

---
 .../overview/backups/ActionsRenderer.svelte   |  25 +++
 .../backups/AutomationsRenderer.svelte        |  20 +++
 .../portal/overview/backups/BackupsTab.svelte | 165 ++++++++++++++++++
 .../overview/backups/CreateBackupModal.svelte |  21 +++
 .../backups/DatasourceRenderer.svelte         |  19 ++
 .../overview/backups/ScreensRenderer.svelte   |  19 ++
 .../overview/backups/TriggerRenderer.svelte   |  27 +++
 .../overview/[application]/index.svelte       |   9 +-
 8 files changed, 300 insertions(+), 5 deletions(-)
 create mode 100644 packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
 create mode 100644 packages/builder/src/components/portal/overview/backups/AutomationsRenderer.svelte
 create mode 100644 packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
 create mode 100644 packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte
 create mode 100644 packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte
 create mode 100644 packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte
 create mode 100644 packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte

diff --git a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
new file mode 100644
index 0000000000..5cf9388adc
--- /dev/null
+++ b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
@@ -0,0 +1,25 @@
+<script>
+  import { ActionButton, ActionMenu, MenuItem, Icon } from "@budibase/bbui"
+
+  export let value
+</script>
+
+<div class="cell">
+  <ActionButton>Restore</ActionButton>
+  <ActionMenu>
+    <div slot="control">
+      <Icon size="M" hoverable name="MoreSmallList" />
+    </div>
+
+    <MenuItem icon="Delete">Delete</MenuItem>
+  </ActionMenu>
+</div>
+
+<style>
+  .cell {
+    display: flex;
+    flex-direction: row;
+    gap: var(--spacing-m);
+    align-items: center;
+  }
+</style>
diff --git a/packages/builder/src/components/portal/overview/backups/AutomationsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/AutomationsRenderer.svelte
new file mode 100644
index 0000000000..df9a323c7c
--- /dev/null
+++ b/packages/builder/src/components/portal/overview/backups/AutomationsRenderer.svelte
@@ -0,0 +1,20 @@
+<script>
+  import { Icon } from "@budibase/bbui"
+
+  export let value
+  $: console.log(value)
+</script>
+
+<div class="cell">
+  <Icon name="JourneyVoyager" />
+  <div>{value.length}</div>
+</div>
+
+<style>
+  .cell {
+    display: flex;
+    flex-direction: row;
+    gap: var(--spacing-m);
+    align-items: center;
+  }
+</style>
diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
new file mode 100644
index 0000000000..a95bb23ecb
--- /dev/null
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -0,0 +1,165 @@
+<script>
+  import {
+    ActionButton,
+    Layout,
+    Pagination,
+    Select,
+    Table,
+    Modal,
+  } from "@budibase/bbui"
+  import { onMount } from "svelte"
+  import { backups } from "stores/portal"
+  import DatasourceRenderer from "./DatasourceRenderer.svelte"
+  import ScreensRenderer from "./ScreensRenderer.svelte"
+  import AutomationsRenderer from "./AutomationsRenderer.svelte"
+  import CreateBackupModal from "./CreateBackupModal.svelte"
+  import TriggerRenderer from "./TriggerRenderer.svelte"
+  import ActionsRenderer from "./ActionsRenderer.svelte"
+
+  export let app
+  let backupData = null
+  let modal
+
+  const triggers = {
+    PUBLISH: "Publish",
+    SCHEDULED: "Scheduled",
+    MANUAL: "Manual",
+  }
+
+  const schema = {
+    trigger: {
+      displayName: "Trigger",
+    },
+    name: {
+      displayName: "Name",
+    },
+    date: {
+      displayName: "Date",
+    },
+    datasources: {
+      displayName: "Data",
+    },
+    screens: {
+      displayName: "Screens",
+    },
+    automations: {
+      displayName: "Automations",
+    },
+    userId: {
+      displayName: "User",
+    },
+    actions: {
+      displayName: null,
+    },
+  }
+
+  const customRenderers = [
+    { column: "datasources", component: DatasourceRenderer },
+    { column: "screens", component: ScreensRenderer },
+    { column: "automations", component: AutomationsRenderer },
+    { column: "trigger", component: TriggerRenderer },
+    { column: "actions", component: ActionsRenderer },
+  ]
+
+  async function fetchBackups() {
+    backups.load()
+    backupData = enrichBackupData($backups)
+  }
+
+  function enrichBackupData(backups) {
+    let enrichedBackups = backups.map(backup => {
+      return {
+        ...backup,
+        ...Object.assign(...backup.contents),
+      }
+    })
+
+    return enrichedBackups
+  }
+
+  function createManualBackup(name) {
+    backups.createManualBackup({ appId: app.appId, name })
+  }
+
+  onMount(async () => {
+    console.log(await backups.searchBackups(app.appId))
+
+    await fetchBackups()
+  })
+</script>
+
+<div class="root">
+  <Layout noPadding gap="M" alignContent="start">
+    <div class="search">
+      <div class="select">
+        <Select
+          placeholder="All"
+          label="Trigger"
+          options={Object.values(triggers)}
+        />
+      </div>
+      <div class="split-buttons">
+        <ActionButton on:click={modal.show} icon="SaveAsFloppy"
+          >Create new backup</ActionButton
+        >
+      </div>
+    </div>
+    {#if backupData}
+      <div>
+        <Table
+          {schema}
+          allowSelectRows={false}
+          allowEditColumns={false}
+          allowEditRows={false}
+          data={backupData}
+          {customRenderers}
+          placeholderText="No backups found"
+          border={false}
+        />
+        <div class="pagination">
+          <Pagination page={1} />
+        </div>
+      </div>
+    {/if}
+  </Layout>
+</div>
+
+<Modal bind:this={modal}>
+  <CreateBackupModal {createManualBackup} />
+</Modal>
+
+<style>
+  .root {
+    display: grid;
+    grid-template-columns: 1fr;
+    height: 100%;
+    padding: var(--spectrum-alias-grid-gutter-medium)
+      var(--spectrum-alias-grid-gutter-large);
+  }
+
+  .search {
+    display: flex;
+    gap: var(--spacing-xl);
+    width: 100%;
+    align-items: flex-end;
+  }
+
+  .select {
+    flex-basis: 150px;
+  }
+
+  .pagination {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+    margin-top: var(--spacing-xl);
+  }
+
+  .split-buttons {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    flex: 1;
+    gap: var(--spacing-xl);
+  }
+</style>
diff --git a/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte b/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte
new file mode 100644
index 0000000000..133e0b9443
--- /dev/null
+++ b/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte
@@ -0,0 +1,21 @@
+<script>
+  import { ModalContent, Input } from "@budibase/bbui"
+
+  export let createManualBackup
+
+  let name
+</script>
+
+<ModalContent
+  onConfirm={() => createManualBackup(name)}
+  title="Create new backup"
+  confirmText="Create"
+  ><Input
+    label="Backup name"
+    bind:value={name}
+    placeholder={"test"}
+  /></ModalContent
+>
+
+<style>
+</style>
diff --git a/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte b/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte
new file mode 100644
index 0000000000..69f9aa7929
--- /dev/null
+++ b/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte
@@ -0,0 +1,19 @@
+<script>
+  import { Icon } from "@budibase/bbui"
+
+  export let value
+</script>
+
+<div class="cell">
+  <Icon name="Data" />
+  <div>{value.length}</div>
+</div>
+
+<style>
+  .cell {
+    display: flex;
+    flex-direction: row;
+    gap: var(--spacing-m);
+    align-items: center;
+  }
+</style>
diff --git a/packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte
new file mode 100644
index 0000000000..afafec0870
--- /dev/null
+++ b/packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte
@@ -0,0 +1,19 @@
+<script>
+  import { Icon } from "@budibase/bbui"
+
+  export let value
+</script>
+
+<div class="cell">
+  <Icon name="WebPage" />
+  <div>{value.length}</div>
+</div>
+
+<style>
+  .cell {
+    display: flex;
+    flex-direction: row;
+    gap: var(--spacing-m);
+    align-items: center;
+  }
+</style>
diff --git a/packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte b/packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte
new file mode 100644
index 0000000000..81b50e7112
--- /dev/null
+++ b/packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte
@@ -0,0 +1,27 @@
+<script>
+  import { Icon } from "@budibase/bbui"
+
+  export let value
+</script>
+
+<div class="cell">
+  {#if value === "PUBLISH"}
+    <Icon name="GlobeCheck" />
+    <div>{value}</div>
+  {:else if value === "MANUAL"}
+    <Icon name="Floppy" />
+    <div>{value}</div>
+  {:else if value === "SCHEDULED"}
+    <Icon name="Clock" />
+    <div>{value}</div>
+  {/if}
+</div>
+
+<style>
+  .cell {
+    display: flex;
+    flex-direction: row;
+    gap: var(--spacing-m);
+    align-items: center;
+  }
+</style>
diff --git a/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte b/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte
index fe0e2443a2..c7ad77029a 100644
--- a/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte
+++ b/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte
@@ -33,6 +33,7 @@
   import ExportAppModal from "components/start/ExportAppModal.svelte"
   import { checkIncomingDeploymentStatus } from "components/deploy/utils"
   import { onDestroy, onMount } from "svelte"
+  import BackupsTab from "components/portal/overview/backups/BackupsTab.svelte"
 
   export let application
 
@@ -323,11 +324,9 @@
               <HistoryTab app={selectedApp} />
             </Tab>
           {/if}
-          {#if false}
-            <Tab title="Backups">
-              <div class="container">Backups contents</div>
-            </Tab>
-          {/if}
+          <Tab title="Backups">
+            <BackupsTab app={selectedApp} />
+          </Tab>
           <Tab title="Settings">
             <SettingsTab app={selectedApp} />
           </Tab>

From a367863d43da6255edc2edf20f65e02aef325dfb Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 18 Oct 2022 18:49:24 +0100
Subject: [PATCH 049/151] Allow normal DND in and out of grid children

---
 packages/client/manifest.json                         |  4 +++-
 .../client/src/components/preview/DNDHandler.svelte   | 11 +++++++----
 .../src/components/preview/GridDNDHandler.svelte      |  8 +++++++-
 .../src/components/preview/HoverIndicator.svelte      |  4 ----
 .../client/src/components/preview/IndicatorSet.svelte |  5 +++--
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 80ed9623cd..16f4bc10c6 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -4573,7 +4573,9 @@
     "hasChildren": true,
     "styles": [
       "size"
-    ]
+    ],
+    "illegalChildren": ["grid", "section"],
+    "allowedDirectChildren": [""]
   },
   "formblock": {
     "name": "Form Block",
diff --git a/packages/client/src/components/preview/DNDHandler.svelte b/packages/client/src/components/preview/DNDHandler.svelte
index 43d1d52480..f556346ad2 100644
--- a/packages/client/src/components/preview/DNDHandler.svelte
+++ b/packages/client/src/components/preview/DNDHandler.svelte
@@ -23,7 +23,10 @@
   $: drop = $dndStore.drop
 
   const insideGrid = e => {
-    return e.target?.closest?.(".grid") != null
+    return e.target
+      ?.closest?.(".component")
+      ?.parentNode?.closest?.(".component")
+      ?.childNodes[0]?.classList.contains("grid")
   }
 
   // Util to get the inner DOM node by a component ID
@@ -218,7 +221,7 @@
 
   // Callback when on top of a component.
   const onDragOver = e => {
-    if (!source || !target || insideGrid(e)) {
+    if (!source || !target) {
       return
     }
     handleEvent(e)
@@ -226,7 +229,7 @@
 
   // Callback when entering a potential drop target
   const onDragEnter = e => {
-    if (!source || insideGrid(e)) {
+    if (!source) {
       return
     }
 
@@ -249,7 +252,7 @@
 
   // Callback when dropping a drag on top of some component
   const onDrop = e => {
-    if (!source || !drop?.parent || drop?.index == null || insideGrid(e)) {
+    if (!source || !drop?.parent || drop?.index == null) {
       return
     }
 
diff --git a/packages/client/src/components/preview/GridDNDHandler.svelte b/packages/client/src/components/preview/GridDNDHandler.svelte
index 22fecc9d1d..2b1541e1e4 100644
--- a/packages/client/src/components/preview/GridDNDHandler.svelte
+++ b/packages/client/src/components/preview/GridDNDHandler.svelte
@@ -11,7 +11,13 @@
   $: applyStyles(dragNode, gridStyles)
 
   const insideGrid = e => {
-    return e.target?.closest?.(".grid") || e.target.classList.contains("anchor")
+    return (
+      e.target
+        ?.closest?.(".component")
+        ?.parentNode?.closest?.(".component")
+        ?.childNodes[0]?.classList.contains("grid") ||
+      e.target.classList.contains("anchor")
+    )
   }
 
   // Util to get the inner DOM node by a component ID
diff --git a/packages/client/src/components/preview/HoverIndicator.svelte b/packages/client/src/components/preview/HoverIndicator.svelte
index 380520d469..230edeb70c 100644
--- a/packages/client/src/components/preview/HoverIndicator.svelte
+++ b/packages/client/src/components/preview/HoverIndicator.svelte
@@ -9,21 +9,17 @@
   const onMouseOver = e => {
     // Ignore if dragging
     if (e.buttons > 0) {
-      console.log("ignore")
       return
     }
 
     let newId
-
     if (e.target.classList.contains("anchor")) {
       // Handle resize anchors
       newId = e.target.dataset.id
-      console.log("anchor", newId)
     } else {
       // Handle normal components
       const element = e.target.closest(".interactive.component")
       newId = element?.dataset?.id
-      console.log("normal", newId)
     }
 
     if (newId !== componentId) {
diff --git a/packages/client/src/components/preview/IndicatorSet.svelte b/packages/client/src/components/preview/IndicatorSet.svelte
index dc4355b30f..51a60ce981 100644
--- a/packages/client/src/components/preview/IndicatorSet.svelte
+++ b/packages/client/src/components/preview/IndicatorSet.svelte
@@ -34,8 +34,9 @@
       return false
     }
 
-    // Check if we're a descendent of a grid
-    return domNode?.closest(".grid") != null
+    return component?.parentNode
+      ?.closest?.(".component")
+      ?.childNodes[0]?.classList.contains("grid")
   }
 
   const createIntersectionCallback = idx => entries => {

From 7ae1e3a3eea73cd1cda0beb978faa498df115d66 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 18 Oct 2022 19:00:19 +0100
Subject: [PATCH 050/151] add apis and svelte store

---
 packages/builder/src/stores/portal/backups.js | 40 +++++++++++++++++++
 packages/builder/src/stores/portal/index.js   |  1 +
 packages/frontend-core/src/api/backups.js     | 20 ++++++++++
 packages/frontend-core/src/api/index.js       |  2 +
 4 files changed, 63 insertions(+)
 create mode 100644 packages/builder/src/stores/portal/backups.js
 create mode 100644 packages/frontend-core/src/api/backups.js

diff --git a/packages/builder/src/stores/portal/backups.js b/packages/builder/src/stores/portal/backups.js
new file mode 100644
index 0000000000..70b973a3e8
--- /dev/null
+++ b/packages/builder/src/stores/portal/backups.js
@@ -0,0 +1,40 @@
+import { writable } from "svelte/store"
+import { API } from "api"
+
+export function createBackupsStore() {
+  const { subscribe, set } = writable([])
+
+  async function load() {
+    set([
+      {
+        trigger: "PUBLISH",
+        name: "A Backup",
+        date: "1665407451",
+        userId: "Peter Clement",
+        contents: [
+          { datasources: ["datasource1", "datasource2"] },
+          { screens: ["screen1", "screen2"] },
+          { automations: ["automation1", "automation2"] },
+        ],
+      },
+    ])
+  }
+
+  async function searchBackups(appId) {
+    return API.searchBackups(appId)
+  }
+
+  async function createManualBackup(appId, name) {
+    let resp = API.createManualBackup(appId, name)
+    return resp
+  }
+
+  return {
+    subscribe,
+    load,
+    createManualBackup,
+    searchBackups,
+  }
+}
+
+export const backups = createBackupsStore()
diff --git a/packages/builder/src/stores/portal/index.js b/packages/builder/src/stores/portal/index.js
index fa7aa7e3cf..5406ddc3dc 100644
--- a/packages/builder/src/stores/portal/index.js
+++ b/packages/builder/src/stores/portal/index.js
@@ -9,3 +9,4 @@ export { templates } from "./templates"
 export { licensing } from "./licensing"
 export { groups } from "./groups"
 export { plugins } from "./plugins"
+export { backups } from "./backups"
diff --git a/packages/frontend-core/src/api/backups.js b/packages/frontend-core/src/api/backups.js
new file mode 100644
index 0000000000..45079e3e7e
--- /dev/null
+++ b/packages/frontend-core/src/api/backups.js
@@ -0,0 +1,20 @@
+export const buildBackupsEndpoints = API => ({
+  /**
+   * Gets a list of users in the current tenant.
+   */
+  searchBackups: async appId => {
+    return await API.post({
+      url: `/api/apps/${appId}/backups/search`,
+      body: {
+        trigger: "MANUAL",
+      },
+    })
+  },
+
+  createManualBackup: async ({ appId, name }) => {
+    return await API.post({
+      url: `/api/apps/${appId}/backups`,
+      body: { name },
+    })
+  },
+})
diff --git a/packages/frontend-core/src/api/index.js b/packages/frontend-core/src/api/index.js
index 3b9bb5b57e..9a40b21351 100644
--- a/packages/frontend-core/src/api/index.js
+++ b/packages/frontend-core/src/api/index.js
@@ -25,6 +25,7 @@ import { buildViewEndpoints } from "./views"
 import { buildLicensingEndpoints } from "./licensing"
 import { buildGroupsEndpoints } from "./groups"
 import { buildPluginEndpoints } from "./plugins"
+import { buildBackupsEndpoints } from "./backups"
 
 const defaultAPIClientConfig = {
   /**
@@ -245,5 +246,6 @@ export const createAPIClient = config => {
     ...buildLicensingEndpoints(API),
     ...buildGroupsEndpoints(API),
     ...buildPluginEndpoints(API),
+    ...buildBackupsEndpoints(API),
   }
 }

From bdc4e29b2da5d06d75ced004654c7422ffe6a8fc Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 18 Oct 2022 19:43:19 +0100
Subject: [PATCH 051/151] Finishing import processor - download backup, delete
 dev DB and then import over the top of this. Also includes a rollback feature
 if the backup fails to restore for whatever reason.

---
 packages/server/src/sdk/app/backups/backup.ts | 37 +++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/sdk/app/backups/backup.ts b/packages/server/src/sdk/app/backups/backup.ts
index 92f70a5a84..cc2338e274 100644
--- a/packages/server/src/sdk/app/backups/backup.ts
+++ b/packages/server/src/sdk/app/backups/backup.ts
@@ -1,17 +1,48 @@
 import { backups } from "@budibase/pro"
-import { objectStore, tenancy } from "@budibase/backend-core"
+import { objectStore, tenancy, db as dbCore } from "@budibase/backend-core"
 import { AppBackupQueueData } from "@budibase/types"
 import { exportApp } from "./exports"
+import { importApp } from "./imports"
 import { Job } from "bull"
 import fs from "fs"
 import env from "../../../environment"
 
+async function removeExistingApp(devId: string) {
+  const devDb = dbCore.dangerousGetDB(devId, { skip_setup: true })
+  await devDb.destroy()
+}
+
 async function importProcessor(job: Job) {
   const data: AppBackupQueueData = job.data
   const appId = data.appId,
     backupId = data.import!.backupId
-  const { path, metadata } = await backups.downloadAppBackup(backupId)
-  // start by removing app database and contents of bucket - which will be updated
+  const tenantId = tenancy.getTenantIDFromAppID(appId)
+  tenancy.doInTenant(tenantId, async () => {
+    const devAppId = dbCore.getDevAppID(appId)
+    const performImport = async (path: string) => {
+      await importApp(devAppId, dbCore.dangerousGetDB(devAppId), {
+        file: {
+          type: "application/gzip",
+          path,
+        },
+        key: path,
+      })
+    }
+    // initially export the current state to disk - incase something goes wrong
+    const backupTarPath = await exportApp(devAppId, { tar: true })
+    // get the backup ready on disk
+    const { path } = await backups.downloadAppBackup(backupId)
+    // start by removing app database and contents of bucket - which will be updated
+    await removeExistingApp(devAppId)
+    try {
+      await performImport(path)
+    } catch (err) {
+      // rollback - clear up failed import and re-import the pre-backup
+      await removeExistingApp(devAppId)
+      await performImport(backupTarPath)
+    }
+    fs.rmSync(backupTarPath)
+  })
 }
 
 async function exportProcessor(job: Job) {

From 71439d4b825e2b4b13729c5058ef0c80fb84d13d Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 19 Oct 2022 10:16:54 +0100
Subject: [PATCH 052/151] add datepicker range and test search

---
 packages/bbui/src/Form/Core/DatePicker.svelte                | 3 ++-
 packages/bbui/src/Form/DatePicker.svelte                     | 3 ++-
 .../src/components/portal/overview/backups/BackupsTab.svelte | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/bbui/src/Form/Core/DatePicker.svelte b/packages/bbui/src/Form/Core/DatePicker.svelte
index 1a7ab59818..6f91890d61 100644
--- a/packages/bbui/src/Form/Core/DatePicker.svelte
+++ b/packages/bbui/src/Form/Core/DatePicker.svelte
@@ -17,7 +17,7 @@
   export let timeOnly = false
   export let ignoreTimezones = false
   export let time24hr = false
-
+  export let range = false
   const dispatch = createEventDispatcher()
   const flatpickrId = `${uuid()}-wrapper`
   let open = false
@@ -41,6 +41,7 @@
     time_24hr: time24hr || false,
     altFormat: timeOnly ? "H:i" : enableTime ? "F j Y, H:i" : "F j, Y",
     wrap: true,
+    mode: "range" || null,
     appendTo,
     disableMobile: "true",
     onReady: () => {
diff --git a/packages/bbui/src/Form/DatePicker.svelte b/packages/bbui/src/Form/DatePicker.svelte
index a0b102dbe8..e2d4547af4 100644
--- a/packages/bbui/src/Form/DatePicker.svelte
+++ b/packages/bbui/src/Form/DatePicker.svelte
@@ -14,7 +14,7 @@
   export let placeholder = null
   export let appendTo = undefined
   export let ignoreTimezones = false
-
+  export let range = false
   const dispatch = createEventDispatcher()
 
   const onChange = e => {
@@ -34,6 +34,7 @@
     {time24hr}
     {appendTo}
     {ignoreTimezones}
+    {range}
     on:change={onChange}
   />
 </Field>
diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index a95bb23ecb..cc47dba3ad 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -1,6 +1,7 @@
 <script>
   import {
     ActionButton,
+    DatePicker,
     Layout,
     Pagination,
     Select,
@@ -98,6 +99,10 @@
           options={Object.values(triggers)}
         />
       </div>
+      <div>
+        <DatePicker range label="Filter range" />
+      </div>
+
       <div class="split-buttons">
         <ActionButton on:click={modal.show} icon="SaveAsFloppy"
           >Create new backup</ActionButton

From f5845a8a6e026689bb469103e3f657cbc0e8591e Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 19 Oct 2022 11:47:07 +0100
Subject: [PATCH 053/151] Protection for real app IDs.

---
 packages/server/src/sdk/app/backups/exports.ts | 5 +----
 packages/types/src/sdk/koa.ts                  | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/sdk/app/backups/exports.ts b/packages/server/src/sdk/app/backups/exports.ts
index 4ca8c439a7..26277fcd66 100644
--- a/packages/server/src/sdk/app/backups/exports.ts
+++ b/packages/server/src/sdk/app/backups/exports.ts
@@ -1,9 +1,6 @@
 import { db as dbCore } from "@budibase/backend-core"
 import { budibaseTempDir } from "../../../utilities/budibaseDir"
-import {
-  retrieveDirectory,
-  retrieve,
-} from "../../../utilities/fileSystem/utilities"
+import { retrieveDirectory } from "../../../utilities/fileSystem/utilities"
 import { streamFile } from "../../../utilities/fileSystem"
 import { ObjectStoreBuckets } from "../../../constants"
 import {
diff --git a/packages/types/src/sdk/koa.ts b/packages/types/src/sdk/koa.ts
index e6f4a5094e..1b48d95015 100644
--- a/packages/types/src/sdk/koa.ts
+++ b/packages/types/src/sdk/koa.ts
@@ -16,4 +16,5 @@ export interface BBContext {
   body?: any
   redirect?: any
   attachment: any
+  throw: any
 }

From ab494256fba7f3519031d0412e117641bb346869 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 19 Oct 2022 11:15:01 +0000
Subject: [PATCH 054/151] v2.0.33

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 824ebe4902..854f49ae42 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.32",
+  "version": "2.0.33",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index cba777c4c0..effca67953 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "^2.0.32",
+    "@budibase/types": "^2.0.33",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 1300a954c3..900879e882 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^2.0.32",
+    "@budibase/string-templates": "^2.0.33",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 09e9dcd27a..2c4264160f 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.32",
-    "@budibase/client": "^2.0.32",
-    "@budibase/frontend-core": "^2.0.32",
-    "@budibase/string-templates": "^2.0.32",
+    "@budibase/bbui": "^2.0.33",
+    "@budibase/client": "^2.0.33",
+    "@budibase/frontend-core": "^2.0.33",
+    "@budibase/string-templates": "^2.0.33",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 1e4515b822..34e1d74169 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.0.32",
-    "@budibase/string-templates": "^2.0.32",
-    "@budibase/types": "^2.0.32",
+    "@budibase/backend-core": "^2.0.33",
+    "@budibase/string-templates": "^2.0.33",
+    "@budibase/types": "^2.0.33",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 32409da298..8aa264bf70 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "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": "^2.0.32",
-    "@budibase/frontend-core": "^2.0.32",
-    "@budibase/string-templates": "^2.0.32",
+    "@budibase/bbui": "^2.0.33",
+    "@budibase/frontend-core": "^2.0.33",
+    "@budibase/string-templates": "^2.0.33",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index e0cef709b7..0c0b18df9b 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.0.32",
+    "@budibase/bbui": "^2.0.33",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 7903b47981..3612328dc5 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 9f49ac5767..0efa35375a 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.0.32",
-    "@budibase/client": "^2.0.32",
+    "@budibase/backend-core": "^2.0.33",
+    "@budibase/client": "^2.0.33",
     "@budibase/pro": "2.0.32",
-    "@budibase/string-templates": "^2.0.32",
-    "@budibase/types": "^2.0.32",
+    "@budibase/string-templates": "^2.0.33",
+    "@budibase/types": "^2.0.33",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 9fdceec45f..fb3450760c 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 33509d5929..ba513029bb 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index de35922a91..a061110eb9 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.0.32",
+    "@budibase/backend-core": "^2.0.33",
     "@budibase/pro": "2.0.32",
-    "@budibase/string-templates": "^2.0.32",
-    "@budibase/types": "^2.0.32",
+    "@budibase/string-templates": "^2.0.33",
+    "@budibase/types": "^2.0.33",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 3d2bf594bd196c5ea261d3c7e439d87dde62227a Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 19 Oct 2022 11:18:16 +0000
Subject: [PATCH 055/151] Update pro version to 2.0.33

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 0efa35375a..65940c7bc2 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.0.33",
     "@budibase/client": "^2.0.33",
-    "@budibase/pro": "2.0.32",
+    "@budibase/pro": "2.0.33",
     "@budibase/string-templates": "^2.0.33",
     "@budibase/types": "^2.0.33",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index fb3d88015c..a6acdda8b9 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.32":
-  version "2.0.32"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.32.tgz#638c89302cc834d7cc11c5ce97bb3305392b9c85"
-  integrity sha512-4Pmh1VFmXlwnh5B5Jq75h+i5hVvOEQmDRVRvbsNk5sYAk/xxVbf7/kIQJ0OuhuTA+WfY8EpQLDEnHGhdTeFhWA==
+"@budibase/backend-core@2.0.33":
+  version "2.0.33"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.33.tgz#adb9e727deeb8a46932f8f12090a9562dc34bb54"
+  integrity sha512-cHlBvk7JW351WfzvzE13VkPxcTwjFY/+dORsANjm2WeesmO9SKDINzakTEISI1EpJCl4r/b7P4jpx3OgX+iecg==
   dependencies:
-    "@budibase/types" "^2.0.32"
+    "@budibase/types" "^2.0.33"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.32":
-  version "2.0.32"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.32.tgz#b091d5fda894cdce179f97441b9ed69ba7859f84"
-  integrity sha512-5LNXUGu+J6pH8iNfkv2jWxyBJhek0M3KtAJvTspREeK5BZ+dxHR2AxceIksKVFy3Tco7mGs2haSRQ0qActIgCg==
+"@budibase/pro@2.0.33":
+  version "2.0.33"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.33.tgz#be74080445036373c2cb34798b5a6f6a11267f7e"
+  integrity sha512-bVQmw/qY9WqDkmdX38Ga0UdQg7xd+uLzXAqRPkuOBeKr+gXvIdYrRHuuaoos47asxhd9+NcwjyYNai6FZ/w30w==
   dependencies:
-    "@budibase/backend-core" "2.0.32"
-    "@budibase/types" "2.0.32"
+    "@budibase/backend-core" "2.0.33"
+    "@budibase/types" "2.0.33"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.32", "@budibase/types@^2.0.32":
-  version "2.0.32"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.32.tgz#dda8989d7e59cdae8088447c568cabd7ea99dee5"
-  integrity sha512-ALTVPOdRlGFzI8AvYJcBncQiLxqM3coZV0Jc5fCJbSNZ9pObHxibhkCunGSevdEOC1l5p/vT7/B5bUD4fUvnsg==
+"@budibase/types@2.0.33", "@budibase/types@^2.0.33":
+  version "2.0.33"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.33.tgz#0e87fd976ad9e5a84f05b3dfa0daf71e9150cd7b"
+  integrity sha512-QVUciZO4wkJpWyWNgP1MxKdfDzP1of6iDLFfo6J/lgp5voluFxEZsY0A5MOMQEf8TFw990h3gCOCNaN/GwMviw==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a061110eb9..748fb7a065 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.0.33",
-    "@budibase/pro": "2.0.32",
+    "@budibase/pro": "2.0.33",
     "@budibase/string-templates": "^2.0.33",
     "@budibase/types": "^2.0.33",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 4955805d4e..e8058520eb 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.32":
-  version "2.0.32"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.32.tgz#638c89302cc834d7cc11c5ce97bb3305392b9c85"
-  integrity sha512-4Pmh1VFmXlwnh5B5Jq75h+i5hVvOEQmDRVRvbsNk5sYAk/xxVbf7/kIQJ0OuhuTA+WfY8EpQLDEnHGhdTeFhWA==
+"@budibase/backend-core@2.0.33":
+  version "2.0.33"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.33.tgz#adb9e727deeb8a46932f8f12090a9562dc34bb54"
+  integrity sha512-cHlBvk7JW351WfzvzE13VkPxcTwjFY/+dORsANjm2WeesmO9SKDINzakTEISI1EpJCl4r/b7P4jpx3OgX+iecg==
   dependencies:
-    "@budibase/types" "^2.0.32"
+    "@budibase/types" "^2.0.33"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.32":
-  version "2.0.32"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.32.tgz#b091d5fda894cdce179f97441b9ed69ba7859f84"
-  integrity sha512-5LNXUGu+J6pH8iNfkv2jWxyBJhek0M3KtAJvTspREeK5BZ+dxHR2AxceIksKVFy3Tco7mGs2haSRQ0qActIgCg==
+"@budibase/pro@2.0.33":
+  version "2.0.33"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.33.tgz#be74080445036373c2cb34798b5a6f6a11267f7e"
+  integrity sha512-bVQmw/qY9WqDkmdX38Ga0UdQg7xd+uLzXAqRPkuOBeKr+gXvIdYrRHuuaoos47asxhd9+NcwjyYNai6FZ/w30w==
   dependencies:
-    "@budibase/backend-core" "2.0.32"
-    "@budibase/types" "2.0.32"
+    "@budibase/backend-core" "2.0.33"
+    "@budibase/types" "2.0.33"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.32", "@budibase/types@^2.0.32":
-  version "2.0.32"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.32.tgz#dda8989d7e59cdae8088447c568cabd7ea99dee5"
-  integrity sha512-ALTVPOdRlGFzI8AvYJcBncQiLxqM3coZV0Jc5fCJbSNZ9pObHxibhkCunGSevdEOC1l5p/vT7/B5bUD4fUvnsg==
+"@budibase/types@2.0.33", "@budibase/types@^2.0.33":
+  version "2.0.33"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.33.tgz#0e87fd976ad9e5a84f05b3dfa0daf71e9150cd7b"
+  integrity sha512-QVUciZO4wkJpWyWNgP1MxKdfDzP1of6iDLFfo6J/lgp5voluFxEZsY0A5MOMQEf8TFw990h3gCOCNaN/GwMviw==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 645235be96283446dcf7d2d26203753456e61276 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 19 Oct 2022 13:16:42 +0100
Subject: [PATCH 056/151] Fix resizing not working inside grids

---
 .../components/preview/GridDNDHandler.svelte  | 200 +++++++++---------
 1 file changed, 100 insertions(+), 100 deletions(-)

diff --git a/packages/client/src/components/preview/GridDNDHandler.svelte b/packages/client/src/components/preview/GridDNDHandler.svelte
index 2b1541e1e4..802a4c9b46 100644
--- a/packages/client/src/components/preview/GridDNDHandler.svelte
+++ b/packages/client/src/components/preview/GridDNDHandler.svelte
@@ -10,12 +10,12 @@
   $: dragNode = getDOMNode(dragInfo?.id)
   $: applyStyles(dragNode, gridStyles)
 
-  const insideGrid = e => {
+  const isChildOfGrid = e => {
     return (
       e.target
-        ?.closest?.(".component")
-        ?.parentNode?.closest?.(".component")
-        ?.childNodes[0]?.classList.contains("grid") ||
+        .closest?.(".component")
+        ?.parentNode.closest(".component")
+        ?.childNodes[0].classList.contains("grid") ||
       e.target.classList.contains("anchor")
     )
   }
@@ -35,101 +35,6 @@
     })
   }
 
-  // Callback when drag stops (whether dropped or not)
-  const stopDragging = () => {
-    // Save changes
-    if (gridStyles) {
-      builderStore.actions.updateStyles(gridStyles, dragInfo.id)
-    }
-
-    // Reset listener
-    if (dragInfo?.domTarget) {
-      dragInfo.domTarget.removeEventListener("dragend", stopDragging)
-    }
-
-    // Reset state
-    dragInfo = null
-    gridStyles = null
-  }
-
-  // Callback when initially starting a drag on a draggable component
-  const onDragStart = e => {
-    if (!insideGrid(e)) {
-      return
-    }
-
-    // Hide drag ghost image
-    e.dataTransfer.setDragImage(new Image(), 0, 0)
-
-    // Extract state
-    let mode, id, side
-    if (e.target.classList.contains("anchor")) {
-      // Handle resize
-      mode = "resize"
-      id = e.target.dataset.id
-      side = e.target.dataset.side
-    } else {
-      // Handle move
-      mode = "move"
-      const component = e.target.closest(".component")
-      id = component.dataset.id
-    }
-
-    // Find grid parent
-    const domComponent = getDOMNode(id)
-    const gridId = domComponent?.closest(".grid")?.parentNode.dataset.id
-    if (!gridId) {
-      return
-    }
-
-    // Update state
-    dragInfo = {
-      domTarget: e.target,
-      id,
-      gridId,
-      mode,
-      side,
-    }
-
-    // Add event handler to clear all drag state when dragging ends
-    dragInfo.domTarget.addEventListener("dragend", stopDragging)
-  }
-
-  // Callback when entering a potential drop target
-  const onDragEnter = e => {
-    // Skip if we aren't validly dragging currently
-    if (!dragInfo || dragInfo.grid || !insideGrid(e)) {
-      return
-    }
-
-    const compDef = findComponentById(
-      $screenStore.activeScreen.props,
-      dragInfo.id
-    )
-    if (!compDef) {
-      return
-    }
-    const domGrid = getDOMNode(dragInfo.gridId)
-    if (domGrid) {
-      const getStyle = x => parseInt(compDef._styles.normal?.[x] || "0")
-      dragInfo.grid = {
-        startX: e.clientX,
-        startY: e.clientY,
-        rowStart: getStyle("grid-row-start"),
-        rowEnd: getStyle("grid-row-end"),
-        colStart: getStyle("grid-column-start"),
-        colEnd: getStyle("grid-column-end"),
-        rowDeltaMin: 1 - getStyle("grid-row-start"),
-        rowDeltaMax:
-          parseInt(domGrid.dataset.cols) + 1 - getStyle("grid-row-end"),
-        colDeltaMin: 1 - getStyle("grid-column-start"),
-        colDeltaMax:
-          parseInt(domGrid.dataset.cols) + 1 - getStyle("grid-column-end"),
-      }
-      handleEvent(e)
-    }
-  }
-
   const processEvent = Utils.throttle((mouseX, mouseY) => {
     if (!dragInfo?.grid) {
       return
@@ -202,13 +107,108 @@
     processEvent(e.clientX, e.clientY)
   }
 
+  // Callback when initially starting a drag on a draggable component
+  const onDragStart = e => {
+    if (!isChildOfGrid(e)) {
+      return
+    }
+
+    // Hide drag ghost image
+    e.dataTransfer.setDragImage(new Image(), 0, 0)
+
+    // Extract state
+    let mode, id, side
+    if (e.target.classList.contains("anchor")) {
+      // Handle resize
+      mode = "resize"
+      id = e.target.dataset.id
+      side = e.target.dataset.side
+    } else {
+      // Handle move
+      mode = "move"
+      const component = e.target.closest(".component")
+      id = component.dataset.id
+    }
+
+    // Find grid parent
+    const domComponent = getDOMNode(id)
+    const gridId = domComponent?.closest(".grid")?.parentNode.dataset.id
+    if (!gridId) {
+      return
+    }
+
+    // Update state
+    dragInfo = {
+      domTarget: e.target,
+      id,
+      gridId,
+      mode,
+      side,
+    }
+
+    // Add event handler to clear all drag state when dragging ends
+    dragInfo.domTarget.addEventListener("dragend", stopDragging)
+  }
+
+  // Callback when entering a potential drop target
+  const onDragEnter = e => {
+    // Skip if we aren't validly dragging currently
+    if (!dragInfo || dragInfo.grid) {
+      return
+    }
+
+    const compDef = findComponentById(
+      $screenStore.activeScreen.props,
+      dragInfo.id
+    )
+    if (!compDef) {
+      return
+    }
+    const domGrid = getDOMNode(dragInfo.gridId)
+    if (domGrid) {
+      const getStyle = x => parseInt(compDef._styles.normal?.[x] || "0")
+      dragInfo.grid = {
+        startX: e.clientX,
+        startY: e.clientY,
+        rowStart: getStyle("grid-row-start"),
+        rowEnd: getStyle("grid-row-end"),
+        colStart: getStyle("grid-column-start"),
+        colEnd: getStyle("grid-column-end"),
+        rowDeltaMin: 1 - getStyle("grid-row-start"),
+        rowDeltaMax:
+          parseInt(domGrid.dataset.cols) + 1 - getStyle("grid-row-end"),
+        colDeltaMin: 1 - getStyle("grid-column-start"),
+        colDeltaMax:
+          parseInt(domGrid.dataset.cols) + 1 - getStyle("grid-column-end"),
+      }
+      handleEvent(e)
+    }
+  }
+
   const onDragOver = e => {
-    if (!dragInfo?.grid || !insideGrid(e)) {
+    if (!dragInfo?.grid) {
       return
     }
     handleEvent(e)
   }
 
+  // Callback when drag stops (whether dropped or not)
+  const stopDragging = () => {
+    // Save changes
+    if (gridStyles) {
+      builderStore.actions.updateStyles(gridStyles, dragInfo.id)
+    }
+
+    // Reset listener
+    if (dragInfo?.domTarget) {
+      dragInfo.domTarget.removeEventListener("dragend", stopDragging)
+    }
+
+    // Reset state
+    dragInfo = null
+    gridStyles = null
+  }
+
   onMount(() => {
     document.addEventListener("dragstart", onDragStart, false)
     document.addEventListener("dragenter", onDragEnter, false)

From 59bf052b70cb0d6db2709f1f97de98f03961730d Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 19 Oct 2022 13:52:56 +0100
Subject: [PATCH 057/151] Fixing issue with metadata name not being provided
 for uploaded backup on publish.

---
 packages/server/src/sdk/app/backups/backup.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/sdk/app/backups/backup.ts b/packages/server/src/sdk/app/backups/backup.ts
index cc2338e274..0f2a1aa760 100644
--- a/packages/server/src/sdk/app/backups/backup.ts
+++ b/packages/server/src/sdk/app/backups/backup.ts
@@ -49,7 +49,7 @@ async function exportProcessor(job: Job) {
   const data: AppBackupQueueData = job.data
   const appId = data.appId,
     trigger = data.export!.trigger,
-    name = data.export!.name
+    name = data.export!.name || `${trigger} - backup`
   const tenantId = tenancy.getTenantIDFromAppID(appId)
   await tenancy.doInTenant(tenantId, async () => {
     const createdAt = new Date().toISOString()

From 9a94e9da7c5403f77d89aa54ccfacf5414baf9a5 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 19 Oct 2022 14:39:28 +0100
Subject: [PATCH 058/151] Use a container as the DND placeholder and use approx
 size when dragging into grids

---
 .../src/builderStore/store/frontend.js        |  7 +-
 packages/client/manifest.json                 |  3 +-
 .../client/src/components/Component.svelte    | 94 ++++++++++++++++---
 .../components/preview/DNDPlaceholder.svelte  | 33 -------
 .../preview/DNDPlaceholderOverlay.svelte      |  3 +-
 .../components/preview/GridDNDHandler.svelte  | 12 +--
 packages/client/src/constants.js              |  1 -
 packages/client/src/stores/components.js      | 12 +--
 packages/client/src/stores/screens.js         | 17 +++-
 9 files changed, 108 insertions(+), 74 deletions(-)
 delete mode 100644 packages/client/src/components/preview/DNDPlaceholder.svelte

diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index 2b8a5ec701..10ed0c71c5 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -446,12 +446,7 @@ export const getFrontendStore = () => {
           _id: Helpers.uuid(),
           _component: definition.component,
           _styles: {
-            normal: {
-              "grid-column-start": 1,
-              "grid-column-end": 2,
-              "grid-row-start": 1,
-              "grid-row-end": 2,
-            },
+            normal: {},
             hover: {},
             active: {},
           },
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 16f4bc10c6..94b3ac36be 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -87,10 +87,9 @@
     "showSettingsBar": true,
     "size": {
       "width": 400,
-      "height": 100
+      "height": 200
     },
     "styles": [
-      "grid",
       "padding",
       "size",
       "background",
diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index 6e5d09646a..d9264f93bf 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -35,6 +35,7 @@
   export let isScreen = false
   export let isBlock = false
   export let parent = null
+  export let parentType = null
 
   // Get parent contexts
   const context = getContext("context")
@@ -165,23 +166,35 @@
   $: pad = pad || (interactive && hasChildren && inDndPath)
   $: $dndIsDragging, (pad = false)
 
+  // We can apply additional styles automatically if required.
+  // One use case for this is ensuring grid children have proper styles to
+  // display properly inside a grid.
+  $: additionalStyles = getAdditionalStyles(
+    instance._styles?.normal || {},
+    parentType,
+    definition
+  )
+
+  // Compute overall styles
+  $: styles = {
+    ...instance._styles,
+    normal: {
+      ...instance._styles?.normal,
+      ...additionalStyles,
+    },
+    custom: customCSS,
+    id,
+    empty: emptyState,
+    interactive,
+    draggable,
+    editable,
+  }
+
   // Update component context
   $: store.set({
     id,
     children: children.length,
-    styles: {
-      ...instance._styles,
-      normal: {
-        ...instance._styles?.normal,
-        ...(selected ? $builderStore.gridStyles : null),
-      },
-      custom: customCSS,
-      id,
-      empty: emptyState,
-      interactive,
-      draggable,
-      editable,
-    },
+    styles,
     empty: emptyState,
     selected,
     name,
@@ -442,6 +455,54 @@
     })
   }
 
+  const getAdditionalStyles = (styles, parentType, definition) => {
+    let newStyles = {}
+
+    // Ensure grid styles are set
+    if (parentType?.endsWith("/grid")) {
+      newStyles = {
+        ...newStyles,
+        overflow: "hidden",
+        width: "auto",
+        height: "auto",
+      }
+
+      // Guess rough grid size from definition size
+      let columns = 6
+      let rows = 4
+      if (definition.size?.width) {
+        columns = Math.round(definition.size.width / 100)
+      }
+      if (definition.size?.height) {
+        rows = Math.round(definition.size.height / 100)
+      }
+
+      // Ensure grid position styles are set
+      if (!styles["grid-column-start"]) {
+        newStyles["grid-column-start"] = 1
+      }
+      if (!styles["grid-column-end"]) {
+        newStyles["grid-column-end"] = columns + 1
+      }
+      if (!styles["grid-row-start"]) {
+        newStyles["grid-row-start"] = 1
+      }
+      if (!styles["grid-row-end"]) {
+        newStyles["grid-row-end"] = rows + 1
+      }
+
+      // Ensure grid end styles aren't before grid start styles
+      if (newStyles["grid-column-end"] <= newStyles["grid-column-start"]) {
+        newStyles["grid-column-end"] = newStyles["grid-column-start"] + 1
+      }
+      if (newStyles["grid-row-end"] <= newStyles["grid-row-start"]) {
+        newStyles["grid-row-end"] = newStyles["grid-row-start"] + 1
+      }
+    }
+
+    return newStyles
+  }
+
   onMount(() => {
     if (
       $appStore.isDevApp &&
@@ -450,6 +511,7 @@
       componentStore.actions.registerInstance(id, {
         component: instance._component,
         getSettings: () => cachedSettings,
+        getStyles: () => styles,
         getRawSettings: () => ({ ...staticSettings, ...dynamicSettings }),
         getDataContext: () => get(context),
         reload: () => initialise(instance, true),
@@ -490,7 +552,11 @@
         <ComponentPlaceholder />
       {:else if children.length}
         {#each children as child (child._id)}
-          <svelte:self instance={child} parent={id} />
+          <svelte:self
+            instance={child}
+            parent={id}
+            parentType={instance._component}
+          />
         {/each}
       {:else if emptyState}
         {#if isScreen}
diff --git a/packages/client/src/components/preview/DNDPlaceholder.svelte b/packages/client/src/components/preview/DNDPlaceholder.svelte
deleted file mode 100644
index 3725f9e06e..0000000000
--- a/packages/client/src/components/preview/DNDPlaceholder.svelte
+++ /dev/null
@@ -1,33 +0,0 @@
-<script>
-  import { dndBounds } from "stores"
-  import { DNDPlaceholderID } from "constants"
-
-  $: style = getStyle($dndBounds)
-
-  const getStyle = bounds => {
-    if (!bounds) {
-      return null
-    }
-    return `--height: ${bounds.height}px; --width: ${bounds.width}px;`
-  }
-</script>
-
-{#if style}
-  <div class="wrapper">
-    <div class="placeholder" id={DNDPlaceholderID} {style} />
-  </div>
-{/if}
-
-<style>
-  .wrapper {
-    overflow: hidden;
-  }
-  .placeholder {
-    display: block;
-    height: var(--height);
-    width: var(--width);
-    max-height: 100%;
-    max-width: 100%;
-    opacity: 0;
-  }
-</style>
diff --git a/packages/client/src/components/preview/DNDPlaceholderOverlay.svelte b/packages/client/src/components/preview/DNDPlaceholderOverlay.svelte
index 6ed2df6a87..0be7faff1b 100644
--- a/packages/client/src/components/preview/DNDPlaceholderOverlay.svelte
+++ b/packages/client/src/components/preview/DNDPlaceholderOverlay.svelte
@@ -6,7 +6,8 @@
   let left, top, height, width
 
   const updatePosition = () => {
-    const node = document.getElementById(DNDPlaceholderID)
+    const node =
+      document.getElementsByClassName(DNDPlaceholderID)[0]?.childNodes[0]
     if (!node) {
       height = 0
       width = 0
diff --git a/packages/client/src/components/preview/GridDNDHandler.svelte b/packages/client/src/components/preview/GridDNDHandler.svelte
index 802a4c9b46..1cb4f92da6 100644
--- a/packages/client/src/components/preview/GridDNDHandler.svelte
+++ b/packages/client/src/components/preview/GridDNDHandler.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount, onDestroy } from "svelte"
-  import { builderStore, screenStore } from "stores"
+  import { builderStore, componentStore, screenStore } from "stores"
   import { Utils } from "@budibase/frontend-core"
   import { findComponentById } from "utils/components.js"
 
@@ -157,16 +157,14 @@
       return
     }
 
-    const compDef = findComponentById(
-      $screenStore.activeScreen.props,
-      dragInfo.id
-    )
-    if (!compDef) {
+    const instance = componentStore.actions.getComponentInstance(dragInfo.id)
+    if (!instance) {
       return
     }
+    const styles = instance.getStyles()
     const domGrid = getDOMNode(dragInfo.gridId)
     if (domGrid) {
-      const getStyle = x => parseInt(compDef._styles.normal?.[x] || "0")
+      const getStyle = x => parseInt(styles?.normal?.[x] || "0")
       dragInfo.grid = {
         startX: e.clientX,
         startY: e.clientY,
diff --git a/packages/client/src/constants.js b/packages/client/src/constants.js
index bd387c7f9d..6c882c9792 100644
--- a/packages/client/src/constants.js
+++ b/packages/client/src/constants.js
@@ -32,5 +32,4 @@ export const ActionTypes = {
 }
 
 export const DNDPlaceholderID = "dnd-placeholder"
-export const DNDPlaceholderType = "dnd-placeholder"
 export const ScreenslotType = "screenslot"
diff --git a/packages/client/src/stores/components.js b/packages/client/src/stores/components.js
index b34dfe375d..98a8236408 100644
--- a/packages/client/src/stores/components.js
+++ b/packages/client/src/stores/components.js
@@ -5,9 +5,8 @@ import { devToolsStore } from "./devTools"
 import { screenStore } from "./screens"
 import { builderStore } from "./builder"
 import Router from "../components/Router.svelte"
-import DNDPlaceholder from "../components/preview/DNDPlaceholder.svelte"
 import * as AppComponents from "../components/app/index.js"
-import { DNDPlaceholderType, ScreenslotType } from "../constants.js"
+import { ScreenslotType } from "../constants.js"
 
 const budibasePrefix = "@budibase/standard-components/"
 
@@ -103,8 +102,6 @@ const createComponentStore = () => {
     // Screenslot is an edge case
     if (type === ScreenslotType) {
       type = `${budibasePrefix}${type}`
-    } else if (type === DNDPlaceholderType) {
-      return {}
     }
 
     // Handle built-in components
@@ -124,8 +121,6 @@ const createComponentStore = () => {
     }
     if (type === ScreenslotType) {
       return Router
-    } else if (type === DNDPlaceholderType) {
-      return DNDPlaceholder
     }
 
     // Handle budibase components
@@ -140,6 +135,10 @@ const createComponentStore = () => {
     return customComponentManifest?.[type]?.Component
   }
 
+  const getComponentInstance = id => {
+    return get(store).mountedComponents[id]
+  }
+
   const registerCustomComponent = ({ Component, schema, version }) => {
     if (!Component || !schema?.schema?.name || !version) {
       return
@@ -171,6 +170,7 @@ const createComponentStore = () => {
       getComponentById,
       getComponentDefinition,
       getComponentConstructor,
+      getComponentInstance,
       registerCustomComponent,
     },
   }
diff --git a/packages/client/src/stores/screens.js b/packages/client/src/stores/screens.js
index 0787610d80..fdfd5d5673 100644
--- a/packages/client/src/stores/screens.js
+++ b/packages/client/src/stores/screens.js
@@ -2,11 +2,11 @@ import { derived } from "svelte/store"
 import { routeStore } from "./routes"
 import { builderStore } from "./builder"
 import { appStore } from "./app"
-import { dndIndex, dndParent, dndIsNewComponent } from "./dnd.js"
+import { dndIndex, dndParent, dndIsNewComponent, dndBounds } from "./dnd.js"
 import { RoleUtils } from "@budibase/frontend-core"
 import { findComponentById, findComponentParent } from "../utils/components.js"
 import { Helpers } from "@budibase/bbui"
-import { DNDPlaceholderID, DNDPlaceholderType } from "constants"
+import { DNDPlaceholderID } from "constants"
 
 const createScreenStore = () => {
   const store = derived(
@@ -17,6 +17,7 @@ const createScreenStore = () => {
       dndParent,
       dndIndex,
       dndIsNewComponent,
+      dndBounds,
     ],
     ([
       $appStore,
@@ -25,6 +26,7 @@ const createScreenStore = () => {
       $dndParent,
       $dndIndex,
       $dndIsNewComponent,
+      $dndBounds,
     ]) => {
       let activeLayout, activeScreen
       let screens
@@ -79,8 +81,15 @@ const createScreenStore = () => {
 
         // Insert placeholder component
         const placeholder = {
-          _component: DNDPlaceholderID,
-          _id: DNDPlaceholderType,
+          _component: "@budibase/standard-components/container",
+          _id: DNDPlaceholderID,
+          _styles: {
+            normal: {
+              width: `${$dndBounds?.width || 666}px`,
+              height: `${$dndBounds?.height || 666}px`,
+              opacity: 0,
+            },
+          },
           static: true,
         }
         let parent = findComponentById(activeScreen.props, $dndParent)

From 3e7d631031be376e2d83a675a7c3b9ad42275ba4 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 19 Oct 2022 16:08:34 +0100
Subject: [PATCH 059/151] add paging and add more custom table renderers

---
 .../overview/backups/ActionsRenderer.svelte   |  1 +
 .../backups/AutomationsRenderer.svelte        |  3 +-
 .../portal/overview/backups/BackupsTab.svelte | 74 ++++++++++++++-----
 .../backups/DatasourceRenderer.svelte         |  2 +-
 .../overview/backups/DateRenderer.svelte      | 17 +++++
 .../overview/backups/DaysRenderer.svelte      | 18 +++++
 .../overview/backups/ScreensRenderer.svelte   |  2 +-
 .../overview/backups/TriggerRenderer.svelte   | 16 ++--
 packages/builder/src/stores/portal/backups.js |  4 +-
 packages/frontend-core/src/api/backups.js     |  7 +-
 10 files changed, 111 insertions(+), 33 deletions(-)
 create mode 100644 packages/builder/src/components/portal/overview/backups/DateRenderer.svelte
 create mode 100644 packages/builder/src/components/portal/overview/backups/DaysRenderer.svelte

diff --git a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
index 5cf9388adc..094a27bb1e 100644
--- a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
@@ -21,5 +21,6 @@
     flex-direction: row;
     gap: var(--spacing-m);
     align-items: center;
+    margin-left: auto;
   }
 </style>
diff --git a/packages/builder/src/components/portal/overview/backups/AutomationsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/AutomationsRenderer.svelte
index df9a323c7c..eb8eda6b6d 100644
--- a/packages/builder/src/components/portal/overview/backups/AutomationsRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/AutomationsRenderer.svelte
@@ -2,12 +2,11 @@
   import { Icon } from "@budibase/bbui"
 
   export let value
-  $: console.log(value)
 </script>
 
 <div class="cell">
   <Icon name="JourneyVoyager" />
-  <div>{value.length}</div>
+  <div>{value?.length}</div>
 </div>
 
 <style>
diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index cc47dba3ad..6123306a9d 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -3,6 +3,7 @@
     ActionButton,
     DatePicker,
     Layout,
+    notifications,
     Pagination,
     Select,
     Table,
@@ -10,16 +11,26 @@
   } from "@budibase/bbui"
   import { onMount } from "svelte"
   import { backups } from "stores/portal"
+  import { createPaginationStore } from "helpers/pagination"
   import DatasourceRenderer from "./DatasourceRenderer.svelte"
   import ScreensRenderer from "./ScreensRenderer.svelte"
   import AutomationsRenderer from "./AutomationsRenderer.svelte"
   import CreateBackupModal from "./CreateBackupModal.svelte"
   import TriggerRenderer from "./TriggerRenderer.svelte"
   import ActionsRenderer from "./ActionsRenderer.svelte"
+  import DateRenderer from "./DateRenderer.svelte"
+  import DaysRenderer from "./DaysRenderer.svelte"
 
   export let app
+
   let backupData = null
   let modal
+  let trigger = null
+  let pageInfo = createPaginationStore()
+  $: page = $pageInfo.page
+  $: console.log(page)
+
+  $: fetchBackups(app.instance._id, trigger, page)
 
   const triggers = {
     PUBLISH: "Publish",
@@ -31,10 +42,14 @@
     trigger: {
       displayName: "Trigger",
     },
+    days: {
+      displayName: null,
+    },
+
     name: {
       displayName: "Name",
     },
-    date: {
+    createdAt: {
       displayName: "Date",
     },
     datasources: {
@@ -60,33 +75,52 @@
     { column: "automations", component: AutomationsRenderer },
     { column: "trigger", component: TriggerRenderer },
     { column: "actions", component: ActionsRenderer },
+    { column: "createdAt", component: DateRenderer },
+    { column: "days", component: DaysRenderer },
   ]
 
-  async function fetchBackups() {
-    backups.load()
-    backupData = enrichBackupData($backups)
-  }
-
-  function enrichBackupData(backups) {
-    let enrichedBackups = backups.map(backup => {
+  function flattenBackups(backups) {
+    let flattened = backups.map(backup => {
       return {
         ...backup,
-        ...Object.assign(...backup.contents),
+        days: getDaysBetween(backup.createdAt),
+        //...Object.assign(...backup?.contents),
       }
     })
 
-    return enrichedBackups
+    return flattened
   }
 
-  function createManualBackup(name) {
-    backups.createManualBackup({ appId: app.appId, name })
+  function getDaysBetween(date) {
+    const now = new Date()
+    const backupDate = new Date(date)
+    backupDate.setDate(backupDate.getDate() - 1)
+    console.log(backupDate)
+    const oneDay = 24 * 60 * 60 * 1000
+    return now > backupDate
+      ? Math.round(Math.abs((now - backupDate) / oneDay))
+      : 0
   }
 
-  onMount(async () => {
-    console.log(await backups.searchBackups(app.appId))
+  async function fetchBackups(appId, trigger, page) {
+    const response = await backups.searchBackups(appId, trigger, page)
+    pageInfo.fetched(response.hasNextPage, response.nextPage)
 
-    await fetchBackups()
-  })
+    // flatten so we have an easier structure to use for the table schema
+    backupData = flattenBackups(response.data)
+  }
+
+  async function createManualBackup(name) {
+    try {
+      let response = await backups.createManualBackup({
+        appId: app.instance._id,
+        name,
+      })
+      notifications.success(response.message)
+    } catch {
+      notifications.error("Unable to create backup")
+    }
+  }
 </script>
 
 <div class="root">
@@ -122,7 +156,13 @@
           border={false}
         />
         <div class="pagination">
-          <Pagination page={1} />
+          <Pagination
+            page={$pageInfo.pageNumber}
+            hasPrevPage={$pageInfo.loading ? false : $pageInfo.hasPrevPage}
+            hasNextPage={$pageInfo.loading ? false : $pageInfo.hasNextPage}
+            goToPrevPage={pageInfo.prevPage}
+            goToNextPage={pageInfo.nextPage}
+          />
         </div>
       </div>
     {/if}
diff --git a/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte b/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte
index 69f9aa7929..d815c6f412 100644
--- a/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte
@@ -6,7 +6,7 @@
 
 <div class="cell">
   <Icon name="Data" />
-  <div>{value.length}</div>
+  <div>{value?.length}</div>
 </div>
 
 <style>
diff --git a/packages/builder/src/components/portal/overview/backups/DateRenderer.svelte b/packages/builder/src/components/portal/overview/backups/DateRenderer.svelte
new file mode 100644
index 0000000000..d1c4b34b2c
--- /dev/null
+++ b/packages/builder/src/components/portal/overview/backups/DateRenderer.svelte
@@ -0,0 +1,17 @@
+<script>
+  import DateTimeRenderer from "components/common/renderers/DateTimeRenderer.svelte"
+  export let value
+</script>
+
+<div class="cell">
+  <DateTimeRenderer {value} />
+</div>
+
+<style>
+  .cell {
+    display: flex;
+    flex-direction: row;
+    gap: var(--spacing-m);
+    align-items: center;
+  }
+</style>
diff --git a/packages/builder/src/components/portal/overview/backups/DaysRenderer.svelte b/packages/builder/src/components/portal/overview/backups/DaysRenderer.svelte
new file mode 100644
index 0000000000..c6fe631663
--- /dev/null
+++ b/packages/builder/src/components/portal/overview/backups/DaysRenderer.svelte
@@ -0,0 +1,18 @@
+<script>
+  export let value
+  $: console.log(value)
+</script>
+
+<div class="cell">
+  {value}
+  {`day${value == 1 ? "" : "s"} ago`}
+</div>
+
+<style>
+  .cell {
+    display: flex;
+    flex-direction: row;
+    gap: var(--spacing-m);
+    align-items: center;
+  }
+</style>
diff --git a/packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte
index afafec0870..f192ee98f1 100644
--- a/packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte
@@ -6,7 +6,7 @@
 
 <div class="cell">
   <Icon name="WebPage" />
-  <div>{value.length}</div>
+  <div>{value?.length}</div>
 </div>
 
 <style>
diff --git a/packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte b/packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte
index 81b50e7112..171e8551fb 100644
--- a/packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte
@@ -2,18 +2,20 @@
   import { Icon } from "@budibase/bbui"
 
   export let value
+
+  let trigger = value.charAt(0).toUpperCase() + value.slice(1)
 </script>
 
 <div class="cell">
-  {#if value === "PUBLISH"}
+  {#if value === "publish"}
     <Icon name="GlobeCheck" />
-    <div>{value}</div>
-  {:else if value === "MANUAL"}
-    <Icon name="Floppy" />
-    <div>{value}</div>
-  {:else if value === "SCHEDULED"}
+    <div>{trigger}</div>
+  {:else if value === "manual"}
+    <Icon name="SaveFloppy" />
+    <div>{trigger}</div>
+  {:else if value === "scheduled"}
     <Icon name="Clock" />
-    <div>{value}</div>
+    <div>{trigger}</div>
   {/if}
 </div>
 
diff --git a/packages/builder/src/stores/portal/backups.js b/packages/builder/src/stores/portal/backups.js
index 70b973a3e8..cf190e7e92 100644
--- a/packages/builder/src/stores/portal/backups.js
+++ b/packages/builder/src/stores/portal/backups.js
@@ -20,8 +20,8 @@ export function createBackupsStore() {
     ])
   }
 
-  async function searchBackups(appId) {
-    return API.searchBackups(appId)
+  async function searchBackups(appId, trigger, page) {
+    return API.searchBackups({appId, trigger, page})
   }
 
   async function createManualBackup(appId, name) {
diff --git a/packages/frontend-core/src/api/backups.js b/packages/frontend-core/src/api/backups.js
index 45079e3e7e..9f2e9e31af 100644
--- a/packages/frontend-core/src/api/backups.js
+++ b/packages/frontend-core/src/api/backups.js
@@ -2,12 +2,13 @@ export const buildBackupsEndpoints = API => ({
   /**
    * Gets a list of users in the current tenant.
    */
-  searchBackups: async appId => {
+  searchBackups: async ({appId, trigger, page}) => {
+    console.log(page)
     return await API.post({
       url: `/api/apps/${appId}/backups/search`,
       body: {
-        trigger: "MANUAL",
-      },
+        page,
+      }
     })
   },
 

From 627b0afa18ac83f08469afcd8def3473fbd52ca6 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 19 Oct 2022 16:11:25 +0100
Subject: [PATCH 060/151] lint

---
 .../src/components/portal/overview/backups/BackupsTab.svelte | 1 -
 packages/builder/src/stores/portal/backups.js                | 2 +-
 packages/frontend-core/src/api/backups.js                    | 5 +++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index 6123306a9d..e9412f7400 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -9,7 +9,6 @@
     Table,
     Modal,
   } from "@budibase/bbui"
-  import { onMount } from "svelte"
   import { backups } from "stores/portal"
   import { createPaginationStore } from "helpers/pagination"
   import DatasourceRenderer from "./DatasourceRenderer.svelte"
diff --git a/packages/builder/src/stores/portal/backups.js b/packages/builder/src/stores/portal/backups.js
index cf190e7e92..9038f64aba 100644
--- a/packages/builder/src/stores/portal/backups.js
+++ b/packages/builder/src/stores/portal/backups.js
@@ -21,7 +21,7 @@ export function createBackupsStore() {
   }
 
   async function searchBackups(appId, trigger, page) {
-    return API.searchBackups({appId, trigger, page})
+    return API.searchBackups({ appId, trigger, page })
   }
 
   async function createManualBackup(appId, name) {
diff --git a/packages/frontend-core/src/api/backups.js b/packages/frontend-core/src/api/backups.js
index 9f2e9e31af..ae81bdcfc2 100644
--- a/packages/frontend-core/src/api/backups.js
+++ b/packages/frontend-core/src/api/backups.js
@@ -2,13 +2,14 @@ export const buildBackupsEndpoints = API => ({
   /**
    * Gets a list of users in the current tenant.
    */
-  searchBackups: async ({appId, trigger, page}) => {
+  searchBackups: async ({ appId, trigger, page }) => {
     console.log(page)
     return await API.post({
       url: `/api/apps/${appId}/backups/search`,
       body: {
         page,
-      }
+        trigger,
+      },
     })
   },
 

From 113a23ba3d1440d30e433b5c36c0d9e9ecd379b6 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 19 Oct 2022 16:48:32 +0100
Subject: [PATCH 061/151] Adding statistics output for backups.

---
 .../src/events/publishers/backup.ts           |  4 +-
 packages/server/src/sdk/app/backups/backup.ts | 22 ++++--
 .../server/src/sdk/app/statistics/index.ts    | 77 +++++++++++++++++++
 packages/types/src/documents/app/backup.ts    | 26 +++----
 4 files changed, 105 insertions(+), 24 deletions(-)
 create mode 100644 packages/server/src/sdk/app/statistics/index.ts

diff --git a/packages/backend-core/src/events/publishers/backup.ts b/packages/backend-core/src/events/publishers/backup.ts
index 00b4f8db69..bd346cad64 100644
--- a/packages/backend-core/src/events/publishers/backup.ts
+++ b/packages/backend-core/src/events/publishers/backup.ts
@@ -4,8 +4,8 @@ import { publishEvent } from "../events"
 export async function appBackupRestored(backup: AppBackup) {
   const properties: AppBackupRevertEvent = {
     appId: backup.appId,
-    backupName: backup.name,
-    backupCreatedAt: backup.createdAt,
+    backupName: backup.name!,
+    backupCreatedAt: backup.timestamp,
   }
 
   await publishEvent(Event.APP_BACKUP_RESTORED, properties)
diff --git a/packages/server/src/sdk/app/backups/backup.ts b/packages/server/src/sdk/app/backups/backup.ts
index 0f2a1aa760..6f7906d1cc 100644
--- a/packages/server/src/sdk/app/backups/backup.ts
+++ b/packages/server/src/sdk/app/backups/backup.ts
@@ -3,6 +3,7 @@ import { objectStore, tenancy, db as dbCore } from "@budibase/backend-core"
 import { AppBackupQueueData } from "@budibase/types"
 import { exportApp } from "./exports"
 import { importApp } from "./imports"
+import { calculateBackupStats } from "../statistics"
 import { Job } from "bull"
 import fs from "fs"
 import env from "../../../environment"
@@ -52,26 +53,35 @@ async function exportProcessor(job: Job) {
     name = data.export!.name || `${trigger} - backup`
   const tenantId = tenancy.getTenantIDFromAppID(appId)
   await tenancy.doInTenant(tenantId, async () => {
-    const createdAt = new Date().toISOString()
-    const tarPath = await exportApp(appId, { tar: true })
-    let filename = `${appId}/backup-${createdAt}.tar.gz`
+    const devAppId = dbCore.getDevAppID(appId),
+      prodAppId = dbCore.getProdAppID(appId)
+    const timestamp = new Date().toISOString()
+    const tarPath = await exportApp(devAppId, { tar: true })
+    const contents = await calculateBackupStats(devAppId)
+    let filename = `${prodAppId}/backup-${timestamp}.tar.gz`
     // add the tenant to the bucket path if backing up within a multi-tenant environment
     if (env.MULTI_TENANCY) {
       filename = `${tenantId}/${filename}`
     }
     const bucket = objectStore.ObjectStoreBuckets.BACKUPS
     const metadata = {
-      appId,
-      createdAt,
+      appId: prodAppId,
+      timestamp,
       trigger,
       name,
+      contents,
     }
     await objectStore.upload({
       path: tarPath,
       type: "application/gzip",
       bucket,
       filename,
-      metadata,
+      metadata: {
+        name,
+        trigger,
+        timestamp,
+        appId: prodAppId,
+      },
     })
     await backups.storeAppBackupMetadata(filename, metadata)
     // clear up the tarball after uploading it
diff --git a/packages/server/src/sdk/app/statistics/index.ts b/packages/server/src/sdk/app/statistics/index.ts
new file mode 100644
index 0000000000..3f03158264
--- /dev/null
+++ b/packages/server/src/sdk/app/statistics/index.ts
@@ -0,0 +1,77 @@
+import { context, db as dbCore } from "@budibase/backend-core"
+import {
+  getDatasourceParams,
+  getTableParams,
+  getAutomationParams,
+  getScreenParams,
+} from "../../../db/utils"
+
+async function runInContext(appId: string, cb: any, db?: PouchDB.Database) {
+  if (db) {
+    return cb(db)
+  } else {
+    const devAppId = dbCore.getDevAppID(appId)
+    return context.doInAppContext(devAppId, () => {
+      const db = context.getAppDB()
+      return cb(db)
+    })
+  }
+}
+
+export async function calculateDatasourceCount(
+  appId: string,
+  db?: PouchDB.Database
+) {
+  return runInContext(
+    appId,
+    async (db: PouchDB.Database) => {
+      const datasourceList = await db.allDocs(getDatasourceParams())
+      const tableList = await db.allDocs(getTableParams())
+      return datasourceList.rows.length + tableList.rows.length
+    },
+    db
+  )
+}
+
+export async function calculateAutomationCount(
+  appId: string,
+  db?: PouchDB.Database
+) {
+  return runInContext(
+    appId,
+    async (db: PouchDB.Database) => {
+      const automationList = await db.allDocs(getAutomationParams())
+      return automationList.rows.length
+    },
+    db
+  )
+}
+
+export async function calculateScreenCount(
+  appId: string,
+  db?: PouchDB.Database
+) {
+  return runInContext(
+    appId,
+    async (db: PouchDB.Database) => {
+      const screenList = await db.allDocs(getScreenParams())
+      return screenList.rows.length
+    },
+    db
+  )
+}
+
+export async function calculateBackupStats(appId: string) {
+  return runInContext(appId, async (db: PouchDB.Database) => {
+    const promises = []
+    promises.push(calculateDatasourceCount(appId, db))
+    promises.push(calculateAutomationCount(appId, db))
+    promises.push(calculateScreenCount(appId, db))
+    const responses = await Promise.all(promises)
+    return {
+      datasources: responses[0],
+      automations: responses[1],
+      screens: responses[2],
+    }
+  })
+}
diff --git a/packages/types/src/documents/app/backup.ts b/packages/types/src/documents/app/backup.ts
index 28e927c772..a62b603a96 100644
--- a/packages/types/src/documents/app/backup.ts
+++ b/packages/types/src/documents/app/backup.ts
@@ -11,21 +11,23 @@ export enum AppBackupEventType {
   IMPORT = "import",
 }
 
-export interface AppBackup extends Document {
-  trigger: AppBackupTrigger
-  name: string
-  createdAt: string
-  createdBy?: string
-  filename: string
+export interface AppBackupMetadata {
   appId: string
-  userId?: string
-  contents?: {
+  trigger: AppBackupTrigger
+  name?: string
+  createdBy?: string
+  timestamp: string
+  contents: {
     datasources: string[]
     screens: string[]
     automations: string[]
   }
 }
 
+export interface AppBackup extends Document, AppBackupMetadata {
+  filename: string
+}
+
 export type AppBackupFetchOpts = {
   trigger?: AppBackupTrigger
   limit?: number
@@ -47,11 +49,3 @@ export interface AppBackupQueueData {
     backupId: string
   }
 }
-
-export interface AppBackupMetadata {
-  appId: string
-  trigger: AppBackupTrigger
-  name?: string
-  createdBy?: string
-  createdAt: string
-}

From 10c81c1adcdae34091ce4d6cb6c546f007735480 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 19 Oct 2022 16:57:14 +0100
Subject: [PATCH 062/151] Fixing issue with using templates.

---
 packages/server/src/sdk/app/backups/imports.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/sdk/app/backups/imports.ts b/packages/server/src/sdk/app/backups/imports.ts
index b29a9eede5..aaab85ec92 100644
--- a/packages/server/src/sdk/app/backups/imports.ts
+++ b/packages/server/src/sdk/app/backups/imports.ts
@@ -6,6 +6,7 @@ import {
   uploadDirectory,
   upload,
 } from "../../../utilities/fileSystem/utilities"
+import { downloadTemplate } from "../../../utilities/fileSystem"
 import { ObjectStoreBuckets, FieldTypes } from "../../../constants"
 import { join } from "path"
 import fs from "fs"
@@ -89,7 +90,7 @@ async function getTemplateStream(template: TemplateType) {
     return fs.createReadStream(template.file.path)
   } else if (template.key) {
     const [type, name] = template.key.split("/")
-    const tmpPath = await exports.downloadTemplate(type, name)
+    const tmpPath = await downloadTemplate(type, name)
     return fs.createReadStream(join(tmpPath, name, "db", "dump.txt"))
   }
 }

From f11c0bbfd777e16420d205fc1b73fb998d0670c1 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 19 Oct 2022 19:19:36 +0100
Subject: [PATCH 063/151] Some type updates and processor handling for backup
 document being created before backup/restore occurs.

---
 packages/server/src/sdk/app/backups/backup.ts | 24 +++++++------
 packages/types/src/documents/app/backup.ts    | 34 +++++++++++++------
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/packages/server/src/sdk/app/backups/backup.ts b/packages/server/src/sdk/app/backups/backup.ts
index 6f7906d1cc..97fe12e63d 100644
--- a/packages/server/src/sdk/app/backups/backup.ts
+++ b/packages/server/src/sdk/app/backups/backup.ts
@@ -1,6 +1,6 @@
 import { backups } from "@budibase/pro"
-import { objectStore, tenancy, db as dbCore } from "@budibase/backend-core"
-import { AppBackupQueueData } from "@budibase/types"
+import { db as dbCore, objectStore, tenancy } from "@budibase/backend-core"
+import { AppBackupQueueData, AppBackupStatus } from "@budibase/types"
 import { exportApp } from "./exports"
 import { importApp } from "./imports"
 import { calculateBackupStats } from "../statistics"
@@ -42,6 +42,11 @@ async function importProcessor(job: Job) {
       await removeExistingApp(devAppId)
       await performImport(backupTarPath)
     }
+    await backups.updateRestoreStatus(
+      data.docId,
+      data.docRev,
+      AppBackupStatus.COMPLETE
+    )
     fs.rmSync(backupTarPath)
   })
 }
@@ -64,13 +69,6 @@ async function exportProcessor(job: Job) {
       filename = `${tenantId}/${filename}`
     }
     const bucket = objectStore.ObjectStoreBuckets.BACKUPS
-    const metadata = {
-      appId: prodAppId,
-      timestamp,
-      trigger,
-      name,
-      contents,
-    }
     await objectStore.upload({
       path: tarPath,
       type: "application/gzip",
@@ -83,7 +81,13 @@ async function exportProcessor(job: Job) {
         appId: prodAppId,
       },
     })
-    await backups.storeAppBackupMetadata(filename, metadata)
+    await backups.updateBackupStatus(
+      data.docId,
+      data.docRev,
+      AppBackupStatus.COMPLETE,
+      contents,
+      filename
+    )
     // clear up the tarball after uploading it
     fs.rmSync(tarPath)
   })
diff --git a/packages/types/src/documents/app/backup.ts b/packages/types/src/documents/app/backup.ts
index a62b603a96..a6d75efcff 100644
--- a/packages/types/src/documents/app/backup.ts
+++ b/packages/types/src/documents/app/backup.ts
@@ -1,31 +1,41 @@
 import { Document } from "../document"
 
+export enum AppBackupType {
+  BACKUP = "backup",
+  RESTORE = "restore",
+}
+
+export enum AppBackupStatus {
+  STARTED = "started",
+  COMPLETE = "complete",
+  FAILED = "failed",
+}
+
 export enum AppBackupTrigger {
   PUBLISH = "publish",
   MANUAL = "manual",
   SCHEDULED = "scheduled",
 }
 
-export enum AppBackupEventType {
-  EXPORT = "export",
-  IMPORT = "import",
+export interface AppBackupContents {
+  datasources: string[]
+  screens: string[]
+  automations: string[]
 }
 
 export interface AppBackupMetadata {
   appId: string
-  trigger: AppBackupTrigger
+  trigger?: AppBackupTrigger
+  type: AppBackupType
+  status: AppBackupStatus
   name?: string
   createdBy?: string
   timestamp: string
-  contents: {
-    datasources: string[]
-    screens: string[]
-    automations: string[]
-  }
+  contents?: AppBackupContents
 }
 
 export interface AppBackup extends Document, AppBackupMetadata {
-  filename: string
+  filename?: string
 }
 
 export type AppBackupFetchOpts = {
@@ -38,8 +48,9 @@ export type AppBackupFetchOpts = {
 }
 
 export interface AppBackupQueueData {
-  eventType: AppBackupEventType
   appId: string
+  docId: string
+  docRev: string
   export?: {
     trigger: AppBackupTrigger
     name?: string
@@ -47,5 +58,6 @@ export interface AppBackupQueueData {
   }
   import?: {
     backupId: string
+    createdBy?: string
   }
 }

From 1dffcd8d6ccae61ade35cffbb0b83d33e4e62f54 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 20 Oct 2022 08:43:33 +0100
Subject: [PATCH 064/151] Update how grid DND styles are applied to remove
 flashing

---
 packages/client/manifest.json                 |  7 ++++-
 .../client/src/components/Component.svelte    |  7 +++++
 .../components/preview/GridDNDHandler.svelte  | 30 +++++++++----------
 packages/client/src/stores/components.js      |  9 ++++++
 4 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 94b3ac36be..39f4ec9aac 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -4574,7 +4574,12 @@
       "size"
     ],
     "illegalChildren": ["grid", "section"],
-    "allowedDirectChildren": [""]
+    "allowedDirectChildren": [""],
+    "size": {
+      "width": 800,
+      "height": 400
+    },
+    "showEmptyState": false
   },
   "formblock": {
     "name": "Form Block",
diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index d9264f93bf..439863fb2b 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -91,6 +91,10 @@
   let settingsDefinitionMap
   let missingRequiredSettings = false
 
+  // Temporary styles which can be added in the app preview for things like DND.
+  // We clear these whenever a new instance is received.
+  let ephemeralStyles
+
   // Set up initial state for each new component instance
   $: initialise(instance)
 
@@ -181,6 +185,7 @@
     normal: {
       ...instance._styles?.normal,
       ...additionalStyles,
+      ...ephemeralStyles,
     },
     custom: customCSS,
     id,
@@ -214,6 +219,7 @@
       return
     } else {
       lastInstanceKey = instanceKey
+      ephemeralStyles = null
     }
 
     // Pull definition and constructor
@@ -515,6 +521,7 @@
         getRawSettings: () => ({ ...staticSettings, ...dynamicSettings }),
         getDataContext: () => get(context),
         reload: () => initialise(instance, true),
+        setEphemeralStyles: styles => (ephemeralStyles = styles),
       })
     }
   })
diff --git a/packages/client/src/components/preview/GridDNDHandler.svelte b/packages/client/src/components/preview/GridDNDHandler.svelte
index 1cb4f92da6..7094e5c507 100644
--- a/packages/client/src/components/preview/GridDNDHandler.svelte
+++ b/packages/client/src/components/preview/GridDNDHandler.svelte
@@ -1,14 +1,18 @@
 <script>
   import { onMount, onDestroy } from "svelte"
-  import { builderStore, componentStore, screenStore } from "stores"
+  import { builderStore, componentStore } from "stores"
   import { Utils } from "@budibase/frontend-core"
-  import { findComponentById } from "utils/components.js"
 
   let dragInfo
   let gridStyles
 
-  $: dragNode = getDOMNode(dragInfo?.id)
-  $: applyStyles(dragNode, gridStyles)
+  $: jsonStyles = JSON.stringify(gridStyles)
+  $: id = dragInfo?.id
+  $: instance = componentStore.actions.getComponentInstance(id)
+
+  // We don't clear grid styles because that causes flashing, as the component
+  // will revert to its original position until the save completes.
+  $: gridStyles && instance?.setEphemeralStyles(gridStyles)
 
   const isChildOfGrid = e => {
     return (
@@ -26,15 +30,6 @@
     return [...component.children][0]
   }
 
-  const applyStyles = (dragNode, gridStyles) => {
-    if (!dragNode || !gridStyles) {
-      return
-    }
-    Object.entries(gridStyles).forEach(([style, value]) => {
-      dragNode.style[style] = value
-    })
-  }
-
   const processEvent = Utils.throttle((mouseX, mouseY) => {
     if (!dragInfo?.grid) {
       return
@@ -68,12 +63,15 @@
     if (mode === "move") {
       deltaY = Math.min(Math.max(deltaY, rowDeltaMin), rowDeltaMax)
       deltaX = Math.min(Math.max(deltaX, colDeltaMin), colDeltaMax)
-      gridStyles = {
+      const newStyles = {
         "grid-row-start": rowStart + deltaY,
         "grid-row-end": rowEnd + deltaY,
         "grid-column-start": colStart + deltaX,
         "grid-column-end": colEnd + deltaX,
       }
+      if (JSON.stringify(newStyles) !== jsonStyles) {
+        gridStyles = newStyles
+      }
     } else if (mode === "resize") {
       let newStyles = {}
       if (side === "right") {
@@ -97,7 +95,9 @@
         newStyles["grid-column-start"] = Math.min(colStart + deltaX, colEnd - 1)
         newStyles["grid-row-start"] = Math.min(rowStart + deltaY, rowEnd - 1)
       }
-      gridStyles = newStyles
+      if (JSON.stringify(newStyles) !== jsonStyles) {
+        gridStyles = newStyles
+      }
     }
   }, 100)
 
diff --git a/packages/client/src/stores/components.js b/packages/client/src/stores/components.js
index 98a8236408..d30ffaa2bb 100644
--- a/packages/client/src/stores/components.js
+++ b/packages/client/src/stores/components.js
@@ -48,6 +48,9 @@ const createComponentStore = () => {
   )
 
   const registerInstance = (id, instance) => {
+    if (!id) {
+      return
+    }
     store.update(state => {
       // If this is a custom component, flag it so we can reload this component
       // later if required
@@ -67,6 +70,9 @@ const createComponentStore = () => {
   }
 
   const unregisterInstance = id => {
+    if (!id) {
+      return
+    }
     store.update(state => {
       // Remove from custom component map if required
       const component = state.mountedComponents[id]?.instance?.component
@@ -136,6 +142,9 @@ const createComponentStore = () => {
   }
 
   const getComponentInstance = id => {
+    if (!id) {
+      return null
+    }
     return get(store).mountedComponents[id]
   }
 

From 2e09dcbe035b6d087a66a5f7e2ee96bccea3dec0 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 20 Oct 2022 08:46:42 +0100
Subject: [PATCH 065/151] Ensure a fixed height is set on grid by default

---
 packages/client/src/components/app/Grid.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/app/Grid.svelte b/packages/client/src/components/app/Grid.svelte
index 9a588dbf17..7e2ec68627 100644
--- a/packages/client/src/components/app/Grid.svelte
+++ b/packages/client/src/components/app/Grid.svelte
@@ -42,7 +42,7 @@
 <style>
   .grid {
     position: relative;
-    min-height: 400px;
+    height: 400px;
   }
   .grid,
   .underlay {

From f5c9e22d422479c7d97a471b4fcb6e0f6ba29922 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 20 Oct 2022 11:46:04 +0100
Subject: [PATCH 066/151] fix paging and add deletion

---
 packages/bbui/src/Table/CellRenderer.svelte   |  1 +
 packages/bbui/src/Table/Table.svelte          |  1 +
 .../overview/backups/ActionsRenderer.svelte   | 50 +++++++++++++++++--
 .../backups/AutomationsRenderer.svelte        |  2 +-
 .../portal/overview/backups/BackupsTab.svelte | 40 ++++++++++++---
 .../backups/DatasourceRenderer.svelte         |  2 +-
 .../overview/backups/DaysRenderer.svelte      |  1 -
 .../overview/backups/ScreensRenderer.svelte   |  2 +-
 packages/builder/src/stores/portal/backups.js | 40 +++++++--------
 packages/frontend-core/src/api/backups.js     | 16 ++++--
 10 files changed, 117 insertions(+), 38 deletions(-)

diff --git a/packages/bbui/src/Table/CellRenderer.svelte b/packages/bbui/src/Table/CellRenderer.svelte
index 246323244a..5004401d91 100644
--- a/packages/bbui/src/Table/CellRenderer.svelte
+++ b/packages/bbui/src/Table/CellRenderer.svelte
@@ -56,6 +56,7 @@
       {schema}
       value={cellValue}
       on:clickrelationship
+      on:buttonclick
     >
       <slot />
     </svelte:component>
diff --git a/packages/bbui/src/Table/Table.svelte b/packages/bbui/src/Table/Table.svelte
index 01a2ca4835..7745c3c407 100644
--- a/packages/bbui/src/Table/Table.svelte
+++ b/packages/bbui/src/Table/Table.svelte
@@ -387,6 +387,7 @@
                   schema={schema[field]}
                   value={deepGet(row, field)}
                   on:clickrelationship
+                  on:buttonclick
                 >
                   <slot />
                 </CellRenderer>
diff --git a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
index 094a27bb1e..fa7b330a34 100644
--- a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
@@ -1,20 +1,64 @@
 <script>
   import { ActionButton, ActionMenu, MenuItem, Icon } from "@budibase/bbui"
+  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import { createEventDispatcher } from "svelte"
 
-  export let value
+  export let row
+
+  let deleteDialog
+  let restoreDialog
+  let editDialog
+  const dispatch = createEventDispatcher()
+
+  const onClickRestore = () => {
+    dispatch("buttonclick", {
+      type: "backupRestore",
+      backupId: row._id,
+    })
+  }
+
+  const onClickDelete = () => {
+    dispatch("buttonclick", {
+      type: "backupDelete",
+      backupId: row._id,
+    })
+  }
 </script>
 
 <div class="cell">
-  <ActionButton>Restore</ActionButton>
+  <ActionButton on:click={restoreDialog.show}>Restore</ActionButton>
   <ActionMenu>
     <div slot="control">
       <Icon size="M" hoverable name="MoreSmallList" />
     </div>
 
-    <MenuItem icon="Delete">Delete</MenuItem>
+    <MenuItem on:click={deleteDialog.show} icon="Delete">Delete</MenuItem>
+    <MenuItem on:click={editDialog.show} icon="Edit">Edit</MenuItem>
   </ActionMenu>
 </div>
 
+<ConfirmDialog
+  bind:this={deleteDialog}
+  okText="Delete Backup"
+  onOk={onClickDelete}
+  title="Confirm Deletion"
+>
+  Are you sure you wish to delete the backup
+  <i>{row.name}</i>
+  This action cannot be undone.
+</ConfirmDialog>
+
+<ConfirmDialog
+  bind:this={restoreDialog}
+  okText="Restore Backup"
+  onOk={onClickRestore}
+  title="Confirm Restore"
+  warning={false}
+>
+  Are you sure you wish to restore this backup
+  <i>{row.name}</i>. This action cannot be undone.
+</ConfirmDialog>
+
 <style>
   .cell {
     display: flex;
diff --git a/packages/builder/src/components/portal/overview/backups/AutomationsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/AutomationsRenderer.svelte
index eb8eda6b6d..08ea5fb118 100644
--- a/packages/builder/src/components/portal/overview/backups/AutomationsRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/AutomationsRenderer.svelte
@@ -6,7 +6,7 @@
 
 <div class="cell">
   <Icon name="JourneyVoyager" />
-  <div>{value?.length}</div>
+  <div>{value || 0}</div>
 </div>
 
 <style>
diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index e9412f7400..41cb2a1546 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -3,14 +3,15 @@
     ActionButton,
     DatePicker,
     Layout,
+    Modal,
     notifications,
     Pagination,
     Select,
     Table,
-    Modal,
   } from "@budibase/bbui"
   import { backups } from "stores/portal"
   import { createPaginationStore } from "helpers/pagination"
+
   import DatasourceRenderer from "./DatasourceRenderer.svelte"
   import ScreensRenderer from "./ScreensRenderer.svelte"
   import AutomationsRenderer from "./AutomationsRenderer.svelte"
@@ -27,9 +28,8 @@
   let trigger = null
   let pageInfo = createPaginationStore()
   $: page = $pageInfo.page
-  $: console.log(page)
 
-  $: fetchBackups(app.instance._id, trigger, page)
+  $: fetchBackups(trigger, page)
 
   const triggers = {
     PUBLISH: "Publish",
@@ -83,10 +83,9 @@
       return {
         ...backup,
         days: getDaysBetween(backup.createdAt),
-        //...Object.assign(...backup?.contents),
+        ...backup?.contents,
       }
     })
-
     return flattened
   }
 
@@ -94,15 +93,18 @@
     const now = new Date()
     const backupDate = new Date(date)
     backupDate.setDate(backupDate.getDate() - 1)
-    console.log(backupDate)
     const oneDay = 24 * 60 * 60 * 1000
     return now > backupDate
       ? Math.round(Math.abs((now - backupDate) / oneDay))
       : 0
   }
 
-  async function fetchBackups(appId, trigger, page) {
-    const response = await backups.searchBackups(appId, trigger, page)
+  async function fetchBackups(trigger, page) {
+    const response = await backups.searchBackups({
+      appId: app.instance._id,
+      trigger,
+      page,
+    })
     pageInfo.fetched(response.hasNextPage, response.nextPage)
 
     // flatten so we have an easier structure to use for the table schema
@@ -120,6 +122,26 @@
       notifications.error("Unable to create backup")
     }
   }
+
+  function selectBackup({ detail }) {
+    console.log(detail)
+  }
+  async function deleteBackup(backupId) {
+    await backups.deleteBackup({ appId: app.instance._id, backupId })
+    await fetchBackups(app.instance._id, trigger, page)
+  }
+  async function restoreBackup(backupId) {
+    console.log(backupId)
+    //backups.restoreBackup(app.instance._id, backupId)
+  }
+
+  async function handleButtonClick({ detail }) {
+    if (detail.type === "backupDelete") {
+      deleteBackup(detail.backupId)
+    } else if (detail.type === "backupRestore") {
+      restoreBackup(detail.backupId)
+    }
+  }
 </script>
 
 <div class="root">
@@ -145,6 +167,7 @@
     {#if backupData}
       <div>
         <Table
+          on:click={selectBackup}
           {schema}
           allowSelectRows={false}
           allowEditColumns={false}
@@ -153,6 +176,7 @@
           {customRenderers}
           placeholderText="No backups found"
           border={false}
+          on:buttonclick={handleButtonClick}
         />
         <div class="pagination">
           <Pagination
diff --git a/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte b/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte
index d815c6f412..e69fa2f625 100644
--- a/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte
@@ -6,7 +6,7 @@
 
 <div class="cell">
   <Icon name="Data" />
-  <div>{value?.length}</div>
+  <div>{value || 0}</div>
 </div>
 
 <style>
diff --git a/packages/builder/src/components/portal/overview/backups/DaysRenderer.svelte b/packages/builder/src/components/portal/overview/backups/DaysRenderer.svelte
index c6fe631663..ba05a1e64b 100644
--- a/packages/builder/src/components/portal/overview/backups/DaysRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/DaysRenderer.svelte
@@ -1,6 +1,5 @@
 <script>
   export let value
-  $: console.log(value)
 </script>
 
 <div class="cell">
diff --git a/packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte
index f192ee98f1..e97f140da7 100644
--- a/packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte
@@ -6,7 +6,7 @@
 
 <div class="cell">
   <Icon name="WebPage" />
-  <div>{value?.length}</div>
+  <div>{value || 0}</div>
 </div>
 
 <style>
diff --git a/packages/builder/src/stores/portal/backups.js b/packages/builder/src/stores/portal/backups.js
index 9038f64aba..ef3631374b 100644
--- a/packages/builder/src/stores/portal/backups.js
+++ b/packages/builder/src/stores/portal/backups.js
@@ -2,38 +2,38 @@ import { writable } from "svelte/store"
 import { API } from "api"
 
 export function createBackupsStore() {
-  const { subscribe, set } = writable([])
+  const store = writable({})
 
-  async function load() {
-    set([
-      {
-        trigger: "PUBLISH",
-        name: "A Backup",
-        date: "1665407451",
-        userId: "Peter Clement",
-        contents: [
-          { datasources: ["datasource1", "datasource2"] },
-          { screens: ["screen1", "screen2"] },
-          { automations: ["automation1", "automation2"] },
-        ],
-      },
-    ])
+  function selectBackup(backupId) {
+    store.update(state => {
+      state.selectedBackup = backupId
+      return state
+    })
   }
 
-  async function searchBackups(appId, trigger, page) {
+  async function searchBackups({ appId, trigger, page } = {}) {
     return API.searchBackups({ appId, trigger, page })
   }
 
+  async function restoreBackup({ appId, backupId }) {
+    return API.restoreBackup({ appId, backupId })
+  }
+
+  async function deleteBackup({ appId, backupId }) {
+    return API.deleteBackup({ appId, backupId })
+  }
+
   async function createManualBackup(appId, name) {
-    let resp = API.createManualBackup(appId, name)
-    return resp
+    return API.createManualBackup(appId, name)
   }
 
   return {
-    subscribe,
-    load,
     createManualBackup,
     searchBackups,
+    selectBackup,
+    deleteBackup,
+    restoreBackup,
+    subscribe: store.subscribe,
   }
 }
 
diff --git a/packages/frontend-core/src/api/backups.js b/packages/frontend-core/src/api/backups.js
index ae81bdcfc2..2e7e4cf399 100644
--- a/packages/frontend-core/src/api/backups.js
+++ b/packages/frontend-core/src/api/backups.js
@@ -2,13 +2,11 @@ export const buildBackupsEndpoints = API => ({
   /**
    * Gets a list of users in the current tenant.
    */
-  searchBackups: async ({ appId, trigger, page }) => {
-    console.log(page)
+  searchBackups: async ({ appId, page }) => {
     return await API.post({
       url: `/api/apps/${appId}/backups/search`,
       body: {
         page,
-        trigger,
       },
     })
   },
@@ -19,4 +17,16 @@ export const buildBackupsEndpoints = API => ({
       body: { name },
     })
   },
+
+  deleteBackup: async ({ appId, backupId }) => {
+    return await API.delete({
+      url: `/api/apps/${appId}/backups/${backupId}`,
+    })
+  },
+
+  updateBackup: async ({ appId, backupId }) => {
+    return await API.patch({
+      url: `/api/apps/${appId}/backups/${backupId}}`,
+    })
+  },
 })

From 53788789d7a13cc562ec6cb6cbbf96dc60fe454c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 20 Oct 2022 12:47:45 +0100
Subject: [PATCH 067/151] Correcting contents rendering.

---
 .../overview/backups/AutomationsRenderer.svelte      |  2 +-
 .../portal/overview/backups/BackupsTab.svelte        | 12 +++++-------
 .../overview/backups/DatasourceRenderer.svelte       |  2 +-
 .../portal/overview/backups/ScreensRenderer.svelte   |  2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/builder/src/components/portal/overview/backups/AutomationsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/AutomationsRenderer.svelte
index eb8eda6b6d..5f7caff02d 100644
--- a/packages/builder/src/components/portal/overview/backups/AutomationsRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/AutomationsRenderer.svelte
@@ -6,7 +6,7 @@
 
 <div class="cell">
   <Icon name="JourneyVoyager" />
-  <div>{value?.length}</div>
+  <div>{value}</div>
 </div>
 
 <style>
diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index e9412f7400..db23d38a41 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -3,11 +3,11 @@
     ActionButton,
     DatePicker,
     Layout,
+    Modal,
     notifications,
     Pagination,
     Select,
     Table,
-    Modal,
   } from "@budibase/bbui"
   import { backups } from "stores/portal"
   import { createPaginationStore } from "helpers/pagination"
@@ -32,9 +32,9 @@
   $: fetchBackups(app.instance._id, trigger, page)
 
   const triggers = {
-    PUBLISH: "Publish",
-    SCHEDULED: "Scheduled",
-    MANUAL: "Manual",
+    PUBLISH: "publish",
+    SCHEDULED: "scheduled",
+    MANUAL: "manual",
   }
 
   const schema = {
@@ -79,15 +79,13 @@
   ]
 
   function flattenBackups(backups) {
-    let flattened = backups.map(backup => {
+    return backups.map(backup => {
       return {
         ...backup,
         days: getDaysBetween(backup.createdAt),
         //...Object.assign(...backup?.contents),
       }
     })
-
-    return flattened
   }
 
   function getDaysBetween(date) {
diff --git a/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte b/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte
index d815c6f412..97254f4f3f 100644
--- a/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte
@@ -6,7 +6,7 @@
 
 <div class="cell">
   <Icon name="Data" />
-  <div>{value?.length}</div>
+  <div>{value}</div>
 </div>
 
 <style>
diff --git a/packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte
index f192ee98f1..234a104570 100644
--- a/packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte
@@ -6,7 +6,7 @@
 
 <div class="cell">
   <Icon name="WebPage" />
-  <div>{value?.length}</div>
+  <div>{value}</div>
 </div>
 
 <style>

From 047d605f2f0b52b43fd8e38d65308a39a268982b Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 20 Oct 2022 13:33:50 +0100
Subject: [PATCH 068/151] add restore funtionality

---
 .../overview/backups/ActionsRenderer.svelte   | 21 ++++++++++++----
 .../portal/overview/backups/BackupsTab.svelte | 24 ++++++++++++-------
 .../overview/backups/TriggerRenderer.svelte   |  7 ++++--
 packages/frontend-core/src/api/backups.js     | 21 ++++++++++++----
 4 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
index fa7b330a34..b302b99d53 100644
--- a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
@@ -1,5 +1,12 @@
 <script>
-  import { ActionButton, ActionMenu, MenuItem, Icon } from "@budibase/bbui"
+  import {
+    ActionButton,
+    ActionMenu,
+    MenuItem,
+    Icon,
+    Heading,
+    Body,
+  } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import { createEventDispatcher } from "svelte"
 
@@ -7,13 +14,16 @@
 
   let deleteDialog
   let restoreDialog
-  let editDialog
+
+  let restoreBackupName
+
   const dispatch = createEventDispatcher()
 
   const onClickRestore = () => {
     dispatch("buttonclick", {
       type: "backupRestore",
       backupId: row._id,
+      restoreBackupName,
     })
   }
 
@@ -33,7 +43,8 @@
     </div>
 
     <MenuItem on:click={deleteDialog.show} icon="Delete">Delete</MenuItem>
-    <MenuItem on:click={editDialog.show} icon="Edit">Edit</MenuItem>
+    <MenuItem icon="Edit">Edit</MenuItem>
+    <MenuItem icon="Edit">Download</MenuItem>
   </ActionMenu>
 </div>
 
@@ -55,8 +66,8 @@
   title="Confirm Restore"
   warning={false}
 >
-  Are you sure you wish to restore this backup
-  <i>{row.name}</i>. This action cannot be undone.
+  <Heading size="S">{row.name}</Heading>
+  <Body size="S">{new Date(row.timestamp).toLocaleString()}</Body>
 </ConfirmDialog>
 
 <style>
diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index 41cb2a1546..46e177182a 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -80,9 +80,21 @@
 
   function flattenBackups(backups) {
     let flattened = backups.map(backup => {
+      if (!backup.name) {
+        if (backup.trigger === "publish") {
+          backup.name = "Published Backup"
+        } else if (backup.trigger === "scheduled") {
+          backup.name = "Scheduled Backup"
+        }
+      }
+
+      if (backup.type === "restore") {
+        backup.trigger = "restore"
+        backup.name = "Restored"
+      }
       return {
         ...backup,
-        days: getDaysBetween(backup.createdAt),
+        days: getDaysBetween(backup.timestamp),
         ...backup?.contents,
       }
     })
@@ -123,19 +135,15 @@
     }
   }
 
-  function selectBackup({ detail }) {
-    console.log(detail)
-  }
   async function deleteBackup(backupId) {
     await backups.deleteBackup({ appId: app.instance._id, backupId })
     await fetchBackups(app.instance._id, trigger, page)
   }
   async function restoreBackup(backupId) {
-    console.log(backupId)
-    //backups.restoreBackup(app.instance._id, backupId)
+    backups.restoreBackup({ appId: app.instance._id, backupId })
   }
 
-  async function handleButtonClick({ detail }) {
+  function handleButtonClick({ detail }) {
     if (detail.type === "backupDelete") {
       deleteBackup(detail.backupId)
     } else if (detail.type === "backupRestore") {
@@ -152,6 +160,7 @@
           placeholder="All"
           label="Trigger"
           options={Object.values(triggers)}
+          bind:value={trigger}
         />
       </div>
       <div>
@@ -167,7 +176,6 @@
     {#if backupData}
       <div>
         <Table
-          on:click={selectBackup}
           {schema}
           allowSelectRows={false}
           allowEditColumns={false}
diff --git a/packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte b/packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte
index 171e8551fb..f896cb03c5 100644
--- a/packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte
@@ -2,8 +2,8 @@
   import { Icon } from "@budibase/bbui"
 
   export let value
-
-  let trigger = value.charAt(0).toUpperCase() + value.slice(1)
+  $: console.log(value)
+  let trigger = value?.charAt(0).toUpperCase() + value?.slice(1)
 </script>
 
 <div class="cell">
@@ -16,6 +16,9 @@
   {:else if value === "scheduled"}
     <Icon name="Clock" />
     <div>{trigger}</div>
+  {:else if value === "restore"}
+    <Icon name="Refresh" />
+    <div>{trigger}</div>
   {/if}
 </div>
 
diff --git a/packages/frontend-core/src/api/backups.js b/packages/frontend-core/src/api/backups.js
index 2e7e4cf399..1fd85b15bd 100644
--- a/packages/frontend-core/src/api/backups.js
+++ b/packages/frontend-core/src/api/backups.js
@@ -2,12 +2,17 @@ export const buildBackupsEndpoints = API => ({
   /**
    * Gets a list of users in the current tenant.
    */
-  searchBackups: async ({ appId, page }) => {
+  searchBackups: async ({ appId, trigger, page }) => {
+    const opts = {}
+    if (page) {
+      opts.page = page
+    }
+    if (trigger) {
+      opts.trigger = trigger.toLowerCase()
+    }
     return await API.post({
       url: `/api/apps/${appId}/backups/search`,
-      body: {
-        page,
-      },
+      body: opts,
     })
   },
 
@@ -26,7 +31,13 @@ export const buildBackupsEndpoints = API => ({
 
   updateBackup: async ({ appId, backupId }) => {
     return await API.patch({
-      url: `/api/apps/${appId}/backups/${backupId}}`,
+      url: `/api/apps/${appId}/backups/${backupId}`,
+    })
+  },
+
+  restoreBackup: async ({ appId, backupId }) => {
+    return await API.post({
+      url: `/api/apps/${appId}/backups/${backupId}/import`,
     })
   },
 })

From f5557fd8059fd613618fd96bce125d72eee89224 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 20 Oct 2022 15:05:50 +0100
Subject: [PATCH 069/151] Fetching a list of backup/restore events includes the
 full user object.

---
 packages/backend-core/src/db/constants.ts     |  19 ++-
 packages/backend-core/src/db/utils.ts         |  74 ++++++++++-
 .../server/src/api/controllers/table/utils.ts |  13 +-
 packages/server/src/db/utils.js               | 125 +++---------------
 packages/types/src/documents/app/backup.ts    |   3 +-
 5 files changed, 108 insertions(+), 126 deletions(-)

diff --git a/packages/backend-core/src/db/constants.ts b/packages/backend-core/src/db/constants.ts
index 8f8f45638b..446f1f7d01 100644
--- a/packages/backend-core/src/db/constants.ts
+++ b/packages/backend-core/src/db/constants.ts
@@ -31,6 +31,10 @@ export const DeprecatedViews = {
   ],
 }
 
+export enum InternalTable {
+  USER_METADATA = "ta_users",
+}
+
 export enum DocumentType {
   USER = "us",
   GROUP = "gr",
@@ -47,10 +51,23 @@ export enum DocumentType {
   AUTOMATION_LOG = "log_au",
   ACCOUNT_METADATA = "acc_metadata",
   PLUGIN = "plg",
-  TABLE = "ta",
   DATASOURCE = "datasource",
   DATASOURCE_PLUS = "datasource_plus",
   APP_BACKUP = "backup",
+  TABLE = "ta",
+  ROW = "ro",
+  AUTOMATION = "au",
+  LINK = "li",
+  WEBHOOK = "wh",
+  INSTANCE = "inst",
+  LAYOUT = "layout",
+  SCREEN = "screen",
+  QUERY = "query",
+  DEPLOYMENTS = "deployments",
+  METADATA = "metadata",
+  MEM_VIEW = "view",
+  USER_FLAG = "flag",
+  AUTOMATION_METADATA = "meta_au",
 }
 
 export const StaticDatabases = {
diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts
index 8d824d60bb..c04da5da4f 100644
--- a/packages/backend-core/src/db/utils.ts
+++ b/packages/backend-core/src/db/utils.ts
@@ -1,10 +1,16 @@
 import { newid } from "../hashing"
 import { DEFAULT_TENANT_ID, Configs } from "../constants"
 import env from "../environment"
-import { SEPARATOR, DocumentType, UNICODE_MAX, ViewName } from "./constants"
+import {
+  SEPARATOR,
+  DocumentType,
+  UNICODE_MAX,
+  ViewName,
+  InternalTable,
+} from "./constants"
 import { getTenantId, getGlobalDB } from "../context"
 import { getGlobalDBName } from "./tenancy"
-import { doWithDB, allDbs, directCouchQuery, directCouchAllDbs } from "./index"
+import { doWithDB, allDbs, directCouchAllDbs } from "./index"
 import { getAppMetadata } from "../cache/appMetadata"
 import { isDevApp, isDevAppID, getProdAppID } from "./conversions"
 import { APP_PREFIX } from "./constants"
@@ -40,8 +46,8 @@ export const generateAppID = (tenantId = null) => {
  * @returns {object} Parameters which can then be used with an allDocs request.
  */
 export function getDocParams(
-  docType: any,
-  docId: any = null,
+  docType: string,
+  docId?: string | null,
   otherProps: any = {}
 ) {
   if (docId == null) {
@@ -54,6 +60,28 @@ export function getDocParams(
   }
 }
 
+/**
+ * Gets the DB allDocs/query params for retrieving a row.
+ * @param {string|null} tableId The table in which the rows have been stored.
+ * @param {string|null} rowId The ID of the row which is being specifically queried for. This can be
+ * left null to get all the rows in the table.
+ * @param {object} otherProps Any other properties to add to the request.
+ * @returns {object} Parameters which can then be used with an allDocs request.
+ */
+export function getRowParams(
+  tableId?: string | null,
+  rowId?: string | null,
+  otherProps = {}
+) {
+  if (tableId == null) {
+    return getDocParams(DocumentType.ROW, null, otherProps)
+  }
+
+  const endOfKey = rowId == null ? `${tableId}${SEPARATOR}` : rowId
+
+  return getDocParams(DocumentType.ROW, endOfKey, otherProps)
+}
+
 /**
  * Retrieve the correct index for a view based on default design DB.
  */
@@ -61,6 +89,17 @@ export function getQueryIndex(viewName: ViewName) {
   return `database/${viewName}`
 }
 
+/**
+ * Gets a new row ID for the specified table.
+ * @param {string} tableId The table which the row is being created for.
+ * @param {string|null} id If an ID is to be used then the UUID can be substituted for this.
+ * @returns {string} The new ID which a row doc can be stored under.
+ */
+export function generateRowID(tableId: string, id?: string) {
+  id = id || newid()
+  return `${DocumentType.ROW}${SEPARATOR}${tableId}${SEPARATOR}${id}`
+}
+
 /**
  * Check if a given ID is that of a table.
  * @returns {boolean}
@@ -128,6 +167,33 @@ export function getGlobalUserParams(globalId: any, otherProps: any = {}) {
   }
 }
 
+/**
+ * Gets parameters for retrieving users, this is a utility function for the getDocParams function.
+ */
+export function getUserMetadataParams(userId?: string, otherProps = {}) {
+  return getRowParams(InternalTable.USER_METADATA, userId, otherProps)
+}
+
+/**
+ * Generates a new user ID based on the passed in global ID.
+ * @param {string} globalId The ID of the global user.
+ * @returns {string} The new user ID which the user doc can be stored under.
+ */
+export function generateUserMetadataID(globalId: string) {
+  return generateRowID(InternalTable.USER_METADATA, globalId)
+}
+
+/**
+ * Breaks up the ID to get the global ID.
+ */
+export function getGlobalIDFromUserMetadataID(id: string) {
+  const prefix = `${DocumentType.ROW}${SEPARATOR}${InternalTable.USER_METADATA}${SEPARATOR}`
+  if (!id || !id.includes(prefix)) {
+    return id
+  }
+  return id.split(prefix)[1]
+}
+
 export function getUsersByAppParams(appId: any, otherProps: any = {}) {
   const prodAppId = getProdAppID(appId)
   return {
diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts
index 79c551b63a..6d17d12f3d 100644
--- a/packages/server/src/api/controllers/table/utils.ts
+++ b/packages/server/src/api/controllers/table/utils.ts
@@ -1,11 +1,5 @@
 import { transform } from "../../../utilities/csvParser"
-import {
-  getRowParams,
-  generateRowID,
-  InternalTables,
-  getTableParams,
-  BudibaseInternalDB,
-} from "../../../db/utils"
+import { getRowParams, generateRowID, InternalTables } from "../../../db/utils"
 import { isEqual } from "lodash"
 import { AutoFieldSubTypes, FieldTypes } from "../../../constants"
 import {
@@ -17,11 +11,6 @@ import {
   SwitchableTypes,
   CanSwitchTypes,
 } from "../../../constants"
-import {
-  isExternalTable,
-  breakExternalTableId,
-  isSQL,
-} from "../../../integrations/utils"
 import { getViews, saveView } from "../view/utils"
 import viewTemplate from "../view/viewBuilder"
 const { getAppDB } = require("@budibase/backend-core/context")
diff --git a/packages/server/src/db/utils.js b/packages/server/src/db/utils.js
index 046172df73..acd72cbf66 100644
--- a/packages/server/src/db/utils.js
+++ b/packages/server/src/db/utils.js
@@ -1,6 +1,7 @@
 const newid = require("./newid")
 const {
-  DocumentType: CoreDocTypes,
+  DocumentType: CoreDocType,
+  InternalTable,
   getRoleParams,
   generateRoleID,
   APP_DEV_PREFIX,
@@ -13,6 +14,12 @@ const {
   generateAppID,
   getQueryIndex,
   ViewName,
+  getDocParams,
+  getRowParams,
+  generateRowID,
+  getUserMetadataParams,
+  generateUserMetadataID,
+  getGlobalIDFromUserMetadataID,
 } = require("@budibase/backend-core/db")
 
 const UNICODE_MAX = "\ufff0"
@@ -23,28 +30,7 @@ const AppStatus = {
   DEPLOYED: "published",
 }
 
-const DocumentType = {
-  ...CoreDocTypes,
-  TABLE: "ta",
-  ROW: "ro",
-  USER: "us",
-  AUTOMATION: "au",
-  LINK: "li",
-  WEBHOOK: "wh",
-  INSTANCE: "inst",
-  LAYOUT: "layout",
-  SCREEN: "screen",
-  QUERY: "query",
-  DEPLOYMENTS: "deployments",
-  METADATA: "metadata",
-  MEM_VIEW: "view",
-  USER_FLAG: "flag",
-  AUTOMATION_METADATA: "meta_au",
-}
-
-const InternalTables = {
-  USER_METADATA: "ta_users",
-}
+const DocumentType = CoreDocType
 
 const SearchIndexes = {
   ROWS: "rows",
@@ -64,11 +50,11 @@ exports.APP_PREFIX = APP_PREFIX
 exports.APP_DEV_PREFIX = APP_DEV_PREFIX
 exports.isDevAppID = isDevAppID
 exports.isProdAppID = isProdAppID
-exports.USER_METDATA_PREFIX = `${DocumentType.ROW}${SEPARATOR}${InternalTables.USER_METADATA}${SEPARATOR}`
-exports.LINK_USER_METADATA_PREFIX = `${DocumentType.LINK}${SEPARATOR}${InternalTables.USER_METADATA}${SEPARATOR}`
+exports.USER_METDATA_PREFIX = `${DocumentType.ROW}${SEPARATOR}${InternalTable.USER_METADATA}${SEPARATOR}`
+exports.LINK_USER_METADATA_PREFIX = `${DocumentType.LINK}${SEPARATOR}${InternalTable.USER_METADATA}${SEPARATOR}`
 exports.TABLE_ROW_PREFIX = `${DocumentType.ROW}${SEPARATOR}${DocumentType.TABLE}`
 exports.ViewName = ViewName
-exports.InternalTables = InternalTables
+exports.InternalTables = InternalTable
 exports.DocumentType = DocumentType
 exports.SEPARATOR = SEPARATOR
 exports.UNICODE_MAX = UNICODE_MAX
@@ -77,36 +63,15 @@ exports.AppStatus = AppStatus
 exports.BudibaseInternalDB = BudibaseInternalDB
 exports.generateAppID = generateAppID
 exports.generateDevAppID = getDevelopmentAppID
-
 exports.generateRoleID = generateRoleID
 exports.getRoleParams = getRoleParams
-
 exports.getQueryIndex = getQueryIndex
-
-/**
- * If creating DB allDocs/query params with only a single top level ID this can be used, this
- * is usually the case as most of our docs are top level e.g. tables, automations, users and so on.
- * More complex cases such as link docs and rows which have multiple levels of IDs that their
- * ID consists of need their own functions to build the allDocs parameters.
- * @param {string} docType The type of document which input params are being built for, e.g. user,
- * link, app, table and so on.
- * @param {string|null} docId The ID of the document minus its type - this is only needed if looking
- * for a singular document.
- * @param {object} otherProps Add any other properties onto the request, e.g. include_docs.
- * @returns {object} Parameters which can then be used with an allDocs request.
- */
-function getDocParams(docType, docId = null, otherProps = {}) {
-  if (docId == null) {
-    docId = ""
-  }
-  return {
-    ...otherProps,
-    startkey: `${docType}${SEPARATOR}${docId}`,
-    endkey: `${docType}${SEPARATOR}${docId}${UNICODE_MAX}`,
-  }
-}
-
 exports.getDocParams = getDocParams
+exports.getRowParams = getRowParams
+exports.generateRowID = generateRowID
+exports.getUserMetadataParams = getUserMetadataParams
+exports.generateUserMetadataID = generateUserMetadataID
+exports.getGlobalIDFromUserMetadataID = getGlobalIDFromUserMetadataID
 
 /**
  * Gets parameters for retrieving tables, this is a utility function for the getDocParams function.
@@ -123,24 +88,6 @@ exports.generateTableID = () => {
   return `${DocumentType.TABLE}${SEPARATOR}${newid()}`
 }
 
-/**
- * Gets the DB allDocs/query params for retrieving a row.
- * @param {string|null} tableId The table in which the rows have been stored.
- * @param {string|null} rowId The ID of the row which is being specifically queried for. This can be
- * left null to get all the rows in the table.
- * @param {object} otherProps Any other properties to add to the request.
- * @returns {object} Parameters which can then be used with an allDocs request.
- */
-exports.getRowParams = (tableId = null, rowId = null, otherProps = {}) => {
-  if (tableId == null) {
-    return getDocParams(DocumentType.ROW, null, otherProps)
-  }
-
-  const endOfKey = rowId == null ? `${tableId}${SEPARATOR}` : rowId
-
-  return getDocParams(DocumentType.ROW, endOfKey, otherProps)
-}
-
 /**
  * Given a row ID this will find the table ID within it (only works for internal tables).
  * @param {string} rowId The ID of the row.
@@ -153,44 +100,6 @@ exports.getTableIDFromRowID = rowId => {
   return `${DocumentType.TABLE}${SEPARATOR}${components[0]}`
 }
 
-/**
- * Gets a new row ID for the specified table.
- * @param {string} tableId The table which the row is being created for.
- * @param {string|null} id If an ID is to be used then the UUID can be substituted for this.
- * @returns {string} The new ID which a row doc can be stored under.
- */
-exports.generateRowID = (tableId, id = null) => {
-  id = id || newid()
-  return `${DocumentType.ROW}${SEPARATOR}${tableId}${SEPARATOR}${id}`
-}
-
-/**
- * Gets parameters for retrieving users, this is a utility function for the getDocParams function.
- */
-exports.getUserMetadataParams = (userId = null, otherProps = {}) => {
-  return exports.getRowParams(InternalTables.USER_METADATA, userId, otherProps)
-}
-
-/**
- * Generates a new user ID based on the passed in global ID.
- * @param {string} globalId The ID of the global user.
- * @returns {string} The new user ID which the user doc can be stored under.
- */
-exports.generateUserMetadataID = globalId => {
-  return exports.generateRowID(InternalTables.USER_METADATA, globalId)
-}
-
-/**
- * Breaks up the ID to get the global ID.
- */
-exports.getGlobalIDFromUserMetadataID = id => {
-  const prefix = `${DocumentType.ROW}${SEPARATOR}${InternalTables.USER_METADATA}${SEPARATOR}`
-  if (!id || !id.includes(prefix)) {
-    return id
-  }
-  return id.split(prefix)[1]
-}
-
 /**
  * Gets parameters for retrieving automations, this is a utility function for the getDocParams function.
  */
diff --git a/packages/types/src/documents/app/backup.ts b/packages/types/src/documents/app/backup.ts
index a6d75efcff..520013a8bb 100644
--- a/packages/types/src/documents/app/backup.ts
+++ b/packages/types/src/documents/app/backup.ts
@@ -1,4 +1,5 @@
 import { Document } from "../document"
+import { User } from "../../"
 
 export enum AppBackupType {
   BACKUP = "backup",
@@ -29,7 +30,7 @@ export interface AppBackupMetadata {
   type: AppBackupType
   status: AppBackupStatus
   name?: string
-  createdBy?: string
+  createdBy?: string | User
   timestamp: string
   contents?: AppBackupContents
 }

From 62ada4f7cc03ba1e70c0a2e8e1b026953b6fdab5 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 20 Oct 2022 15:09:43 +0100
Subject: [PATCH 070/151] integrate download and update and update datepicker

---
 packages/bbui/src/Form/Core/DatePicker.svelte |  8 ++--
 .../overview/backups/ActionsRenderer.svelte   | 37 +++++++++++++++++--
 .../portal/overview/backups/BackupsTab.svelte | 34 +++++++++++------
 packages/builder/src/stores/portal/backups.js | 10 +++++
 packages/frontend-core/src/api/backups.js     | 17 ++++++++-
 5 files changed, 86 insertions(+), 20 deletions(-)

diff --git a/packages/bbui/src/Form/Core/DatePicker.svelte b/packages/bbui/src/Form/Core/DatePicker.svelte
index 6f91890d61..2ff123d353 100644
--- a/packages/bbui/src/Form/Core/DatePicker.svelte
+++ b/packages/bbui/src/Form/Core/DatePicker.svelte
@@ -41,7 +41,7 @@
     time_24hr: time24hr || false,
     altFormat: timeOnly ? "H:i" : enableTime ? "F j Y, H:i" : "F j, Y",
     wrap: true,
-    mode: "range" || null,
+    mode: range ? "range" : null,
     appendTo,
     disableMobile: "true",
     onReady: () => {
@@ -62,12 +62,13 @@
     const [dates] = event.detail
     const noTimezone = enableTime && !timeOnly && ignoreTimezones
     let newValue = dates[0]
+
     if (newValue) {
       newValue = newValue.toISOString()
     }
 
     // If time only set date component to 2000-01-01
-    if (timeOnly) {
+    else if (timeOnly) {
       // Classic flackpickr causing issues.
       // When selecting a value for the first time for a "time only" field,
       // the time is always offset by 1 hour for some reason (regardless of time
@@ -94,8 +95,9 @@
       newValue = new Date(dates[0].getTime() - offset)
         .toISOString()
         .slice(0, -1)
+    } else if (range) {
+      console.log("hello")
     }
-
     dispatch("change", newValue)
   }
 
diff --git a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
index b302b99d53..c43a78c437 100644
--- a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
@@ -4,17 +4,21 @@
     ActionMenu,
     MenuItem,
     Icon,
+    Input,
     Heading,
     Body,
   } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import { createEventDispatcher } from "svelte"
+  import download from "downloadjs"
+  import { backups } from "stores/portal"
 
   export let row
 
   let deleteDialog
   let restoreDialog
-
+  let updateDialog
+  let name
   let restoreBackupName
 
   const dispatch = createEventDispatcher()
@@ -33,6 +37,21 @@
       backupId: row._id,
     })
   }
+
+  const onClickUpdate = () => {
+    dispatch("buttonclick", {
+      type: "backupUpdate",
+      backupId: row._id,
+      name,
+    })
+  }
+  async function downloadExport() {
+    let resp = await backups.downloadBackup({
+      backupId: row._id,
+      appId: row.appId,
+    })
+    download(resp, row.filename)
+  }
 </script>
 
 <div class="cell">
@@ -43,8 +62,8 @@
     </div>
 
     <MenuItem on:click={deleteDialog.show} icon="Delete">Delete</MenuItem>
-    <MenuItem icon="Edit">Edit</MenuItem>
-    <MenuItem icon="Edit">Download</MenuItem>
+    <MenuItem on:click={updateDialog.show} icon="Edit">Update</MenuItem>
+    <MenuItem on:click={downloadExport} icon="Download">Download</MenuItem>
   </ActionMenu>
 </div>
 
@@ -70,6 +89,18 @@
   <Body size="S">{new Date(row.timestamp).toLocaleString()}</Body>
 </ConfirmDialog>
 
+<ConfirmDialog
+  bind:this={updateDialog}
+  disabled={!name}
+  okText="Confirm"
+  onOk={onClickUpdate}
+  title="Update Backup"
+  warning={false}
+>
+  <Input onlabel="Backup name" placeholder={row.name} bind:value={name} />
+  <ConfirmDialog />
+</ConfirmDialog>
+
 <style>
   .cell {
     display: flex;
diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index caa5946049..5f58f2a8d7 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -122,19 +122,25 @@
     }
   }
 
-  async function deleteBackup(backupId) {
-    await backups.deleteBackup({ appId: app.instance._id, backupId })
-    await fetchBackups(app.instance._id, trigger, page)
-  }
-  async function restoreBackup(backupId) {
-    backups.restoreBackup({ appId: app.instance._id, backupId })
-  }
-
-  function handleButtonClick({ detail }) {
+  async function handleButtonClick({ detail }) {
     if (detail.type === "backupDelete") {
-      deleteBackup(detail.backupId)
+      await backups.deleteBackup({
+        appId: app.instance._id,
+        backupId: detail.backupId,
+      })
+      await fetchBackups(app.instance._id, trigger, page)
     } else if (detail.type === "backupRestore") {
-      restoreBackup(detail.backupId)
+      await backups.restoreBackup({
+        appId: app.instance._id,
+        backupId: detail.backupId,
+      })
+    } else if (detail.type === "backupUpdate") {
+      await backups.updateBackup({
+        appId: app.instance._id,
+        backupId: detail.backupId,
+        name: detail.name,
+      })
+      await fetchBackups(app.instance._id, trigger, page)
     }
   }
 </script>
@@ -151,7 +157,11 @@
         />
       </div>
       <div>
-        <DatePicker range label="Filter range" />
+        <DatePicker
+          range
+          label={"Filter Range"}
+          on:change={e => console.log(e)}
+        />
       </div>
 
       <div class="split-buttons">
diff --git a/packages/builder/src/stores/portal/backups.js b/packages/builder/src/stores/portal/backups.js
index ef3631374b..2894e90674 100644
--- a/packages/builder/src/stores/portal/backups.js
+++ b/packages/builder/src/stores/portal/backups.js
@@ -27,12 +27,22 @@ export function createBackupsStore() {
     return API.createManualBackup(appId, name)
   }
 
+  async function downloadBackup({ appId, backupId }) {
+    return API.downloadBackup({ appId, backupId })
+  }
+
+  async function updateBackup({ appId, backupId, name }) {
+    return API.updateBackup({ appId, backupId, name })
+  }
+
   return {
     createManualBackup,
     searchBackups,
     selectBackup,
     deleteBackup,
     restoreBackup,
+    downloadBackup,
+    updateBackup,
     subscribe: store.subscribe,
   }
 }
diff --git a/packages/frontend-core/src/api/backups.js b/packages/frontend-core/src/api/backups.js
index 1fd85b15bd..97379898f3 100644
--- a/packages/frontend-core/src/api/backups.js
+++ b/packages/frontend-core/src/api/backups.js
@@ -2,7 +2,7 @@ export const buildBackupsEndpoints = API => ({
   /**
    * Gets a list of users in the current tenant.
    */
-  searchBackups: async ({ appId, trigger, page }) => {
+  searchBackups: async ({ appId, trigger, page, startDate, endDate }) => {
     const opts = {}
     if (page) {
       opts.page = page
@@ -10,6 +10,12 @@ export const buildBackupsEndpoints = API => ({
     if (trigger) {
       opts.trigger = trigger.toLowerCase()
     }
+
+    if (startDate) {
+      opts.startDate = startDate
+      opts.endDate = endDate
+    }
+    console.log(opts)
     return await API.post({
       url: `/api/apps/${appId}/backups/search`,
       body: opts,
@@ -29,9 +35,10 @@ export const buildBackupsEndpoints = API => ({
     })
   },
 
-  updateBackup: async ({ appId, backupId }) => {
+  updateBackup: async ({ appId, backupId, name }) => {
     return await API.patch({
       url: `/api/apps/${appId}/backups/${backupId}`,
+      body: { name },
     })
   },
 
@@ -40,4 +47,10 @@ export const buildBackupsEndpoints = API => ({
       url: `/api/apps/${appId}/backups/${backupId}/import`,
     })
   },
+
+  downloadBackup: async ({ appId, backupId }) => {
+    return await API.get({
+      url: `/api/apps/${appId}/backups/${backupId}/file`,
+    })
+  },
 })

From 73a229b9ec230bea5c38692b385163ccd62ed7ef Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 20 Oct 2022 16:03:53 +0100
Subject: [PATCH 071/151] Add proper validation for nesting illegal
 combinations of components

---
 .../src/builderStore/store/frontend.js        | 84 +++++++++++++++++--
 .../[screenId]/_components/AppPreview.svelte  |  3 +-
 .../navigation/ComponentKeyHandler.svelte     |  5 +-
 .../navigation/ComponentTree.svelte           | 30 +------
 .../new/_components/NewComponentPanel.svelte  |  2 +-
 packages/client/manifest.json                 | 10 ++-
 .../client/src/components/Component.svelte    |  4 +-
 .../components/preview/GridDNDHandler.svelte  |  3 +-
 packages/frontend-core/src/utils/utils.js     | 30 +++++--
 9 files changed, 116 insertions(+), 55 deletions(-)

diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index 10ed0c71c5..b6d315f15d 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -182,7 +182,70 @@ export const getFrontendStore = () => {
           return state
         })
       },
+      validate: screen => {
+        // Recursive function to find any illegal children in component trees
+        const findIllegalChild = (
+          component,
+          illegalChildren = [],
+          legalDirectChildren = []
+        ) => {
+          const type = component._component
+          if (illegalChildren.includes(type)) {
+            return type
+          }
+          if (
+            legalDirectChildren.length &&
+            !legalDirectChildren.includes(type)
+          ) {
+            return type
+          }
+          if (!component?._children?.length) {
+            return
+          }
+
+          const definition = store.actions.components.getDefinition(
+            component._component
+          )
+
+          // Reset whitelist for direct children
+          legalDirectChildren = []
+          if (definition?.legalDirectChildren?.length) {
+            legalDirectChildren = definition.legalDirectChildren.map(x => {
+              return `@budibase/standard-components/${x}`
+            })
+          }
+
+          // Append blacklisted components and remove duplicates
+          if (definition?.illegalChildren?.length) {
+            const blacklist = definition.illegalChildren.map(x => {
+              return `@budibase/standard-components/${x}`
+            })
+            illegalChildren = [...new Set([...illegalChildren, ...blacklist])]
+          }
+
+          // Recurse on all children
+          for (let child of component._children) {
+            const illegalChild = findIllegalChild(
+              child,
+              illegalChildren,
+              legalDirectChildren
+            )
+            if (illegalChild) {
+              return illegalChild
+            }
+          }
+        }
+
+        // Validate the entire tree and throw and error if an illegal child is
+        // found anywhere
+        const illegalChild = findIllegalChild(screen.props)
+        if (illegalChild) {
+          const def = store.actions.components.getDefinition(illegalChild)
+          throw `A ${def.name} can't be inserted here`
+        }
+      },
       save: async screen => {
+        store.actions.screens.validate(screen)
         const state = get(store)
         const creatingNewScreen = screen._id === undefined
         const savedScreen = await API.saveScreen(screen)
@@ -624,16 +687,24 @@ export const getFrontendStore = () => {
         }
         let newComponentId
 
+        // Remove copied component if cutting, regardless if pasting works
+        let componentToPaste = cloneDeep(state.componentToPaste)
+        if (componentToPaste.isCut) {
+          store.update(state => {
+            delete state.componentToPaste
+            return state
+          })
+        }
+
         // Patch screen
         const patch = screen => {
           // Get up to date ref to target
           targetComponent = findComponent(screen.props, targetComponent._id)
           if (!targetComponent) {
-            return
+            return false
           }
-          const cut = state.componentToPaste.isCut
-          const originalId = state.componentToPaste._id
-          let componentToPaste = cloneDeep(state.componentToPaste)
+          const cut = componentToPaste.isCut
+          const originalId = componentToPaste._id
           delete componentToPaste.isCut
 
           // Make new component unique if copying
@@ -688,11 +759,8 @@ export const getFrontendStore = () => {
         const targetScreenId = targetScreen?._id || state.selectedScreenId
         await store.actions.screens.patch(patch, targetScreenId)
 
+        // Select the new component
         store.update(state => {
-          // Remove copied component if cutting
-          if (state.componentToPaste.isCut) {
-            delete state.componentToPaste
-          }
           state.selectedScreenId = targetScreenId
           state.selectedComponentId = newComponentId
           return state
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index 501fbe5b4f..3c7edf096f 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -222,8 +222,7 @@
         console.warn(`Client sent unknown event type: ${type}`)
       }
     } catch (error) {
-      console.warn(error)
-      notifications.error("Error handling event from app preview")
+      notifications.error(error || "Error handling event from app preview")
     }
   }
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentKeyHandler.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentKeyHandler.svelte
index 7a71c9253a..f83e5d6194 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentKeyHandler.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentKeyHandler.svelte
@@ -80,10 +80,9 @@
         event.preventDefault()
         event.stopPropagation()
       }
-      return handler(component)
+      return await handler(component)
     } catch (error) {
-      console.error(error)
-      notifications.error("Error handling key press")
+      notifications.error(error || "Error handling key press")
     }
   }
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte
index 5cb6d31345..00234edc79 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte
@@ -70,34 +70,12 @@
     closedNodes = closedNodes
   }
 
-  const onDrop = async (e, component) => {
+  const onDrop = async e => {
     e.stopPropagation()
     try {
-      const compDef = store.actions.components.getDefinition(
-        $dndStore.source?._component
-      )
-      if (!compDef) {
-        return
-      }
-      const compTypeName = compDef.name.toLowerCase()
-      const path = findComponentPath(currentScreen.props, component._id)
-
-      for (let pathComp of path) {
-        const pathCompDef = store.actions.components.getDefinition(
-          pathComp?._component
-        )
-        if (pathCompDef?.illegalChildren?.indexOf(compTypeName) > -1) {
-          notifications.warning(
-            `${compDef.name} cannot be a child of ${pathCompDef.name} (${pathComp._instanceName})`
-          )
-          return
-        }
-      }
-
       await dndStore.actions.drop()
     } catch (error) {
-      console.error(error)
-      notifications.error("Error saving component")
+      notifications.error(error || "Error saving component")
     }
   }
 
@@ -137,9 +115,7 @@
         on:dragstart={() => dndStore.actions.dragstart(component)}
         on:dragover={dragover(component, index)}
         on:iconClick={() => toggleNodeOpen(component._id)}
-        on:drop={e => {
-          onDrop(e, component)
-        }}
+        on:drop={onDrop}
         text={getComponentText(component)}
         icon={getComponentIcon(component)}
         withArrow={componentHasChildren(component)}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte
index 778a14ffff..ca8912a74f 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte
@@ -138,7 +138,7 @@
       await store.actions.components.create(component)
       $goto("../")
     } catch (error) {
-      notifications.error("Error creating component")
+      notifications.error(error || "Error creating component")
     }
   }
 
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 39f4ec9aac..bedc915d42 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -4573,8 +4573,14 @@
     "styles": [
       "size"
     ],
-    "illegalChildren": ["grid", "section"],
-    "allowedDirectChildren": [""],
+    "illegalChildren": ["section", "grid"],
+    "legalDirectChildren": [
+      "container",
+      "tableblock",
+      "cardsblock",
+      "repeaterblock",
+      "formblock"
+    ],
     "size": {
       "width": 800,
       "height": 400
diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index 439863fb2b..bc430ee92c 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -477,10 +477,10 @@
       let columns = 6
       let rows = 4
       if (definition.size?.width) {
-        columns = Math.round(definition.size.width / 100)
+        columns = Math.min(12, Math.round(definition.size.width / 100))
       }
       if (definition.size?.height) {
-        rows = Math.round(definition.size.height / 100)
+        rows = Math.min(12, Math.round(definition.size.height / 50))
       }
 
       // Ensure grid position styles are set
diff --git a/packages/client/src/components/preview/GridDNDHandler.svelte b/packages/client/src/components/preview/GridDNDHandler.svelte
index 7094e5c507..ed7c3df269 100644
--- a/packages/client/src/components/preview/GridDNDHandler.svelte
+++ b/packages/client/src/components/preview/GridDNDHandler.svelte
@@ -12,7 +12,8 @@
 
   // We don't clear grid styles because that causes flashing, as the component
   // will revert to its original position until the save completes.
-  $: gridStyles && instance?.setEphemeralStyles(gridStyles)
+  $: gridStyles &&
+    instance?.setEphemeralStyles({ ...gridStyles, "z-index": 999 })
 
   const isChildOfGrid = e => {
     return (
diff --git a/packages/frontend-core/src/utils/utils.js b/packages/frontend-core/src/utils/utils.js
index 8aa49392fb..d4cf579af1 100644
--- a/packages/frontend-core/src/utils/utils.js
+++ b/packages/frontend-core/src/utils/utils.js
@@ -6,17 +6,29 @@
  */
 export const sequential = fn => {
   let queue = []
-  return async (...params) => {
-    queue.push(async () => {
-      await fn(...params)
-      queue.shift()
-      if (queue.length) {
-        await queue[0]()
+  return (...params) => {
+    return new Promise((resolve, reject) => {
+      queue.push(async () => {
+        let data, error
+        try {
+          data = await fn(...params)
+        } catch (err) {
+          error = err
+        }
+        queue.shift()
+        if (queue.length) {
+          queue[0]()
+        }
+        if (error) {
+          reject(error)
+        } else {
+          resolve(data)
+        }
+      })
+      if (queue.length === 1) {
+        queue[0]()
       }
     })
-    if (queue.length === 1) {
-      await queue[0]()
-    }
   }
 }
 

From d138d5ebaa1bc81b3b7f65cbc053679b6ca41046 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 20 Oct 2022 16:10:09 +0100
Subject: [PATCH 072/151] add ability tofilter by range

---
 packages/bbui/src/Form/Core/DatePicker.svelte | 13 +++++++------
 packages/bbui/src/Form/DatePicker.svelte      |  8 +++++++-
 .../portal/overview/backups/BackupsTab.svelte | 19 ++++++++++++++-----
 .../overview/backups/TriggerRenderer.svelte   |  2 +-
 packages/builder/src/stores/portal/backups.js |  4 ++--
 packages/frontend-core/src/api/backups.js     |  3 +--
 6 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/packages/bbui/src/Form/Core/DatePicker.svelte b/packages/bbui/src/Form/Core/DatePicker.svelte
index 2ff123d353..15200e111e 100644
--- a/packages/bbui/src/Form/Core/DatePicker.svelte
+++ b/packages/bbui/src/Form/Core/DatePicker.svelte
@@ -62,11 +62,9 @@
     const [dates] = event.detail
     const noTimezone = enableTime && !timeOnly && ignoreTimezones
     let newValue = dates[0]
-
     if (newValue) {
       newValue = newValue.toISOString()
     }
-
     // If time only set date component to 2000-01-01
     else if (timeOnly) {
       // Classic flackpickr causing issues.
@@ -95,10 +93,13 @@
       newValue = new Date(dates[0].getTime() - offset)
         .toISOString()
         .slice(0, -1)
-    } else if (range) {
-      console.log("hello")
     }
-    dispatch("change", newValue)
+
+    if (range) {
+      dispatch("change", event.detail)
+    } else {
+      dispatch("change", newValue)
+    }
   }
 
   const clearDateOnBackspace = event => {
@@ -163,7 +164,7 @@
 {#key redrawOptions}
   <Flatpickr
     bind:flatpickr
-    value={parseDate(value)}
+    value={range ? value : parseDate(value)}
     on:open={onOpen}
     on:close={onClose}
     options={flatpickrOptions}
diff --git a/packages/bbui/src/Form/DatePicker.svelte b/packages/bbui/src/Form/DatePicker.svelte
index e2d4547af4..6a0ba4ad36 100644
--- a/packages/bbui/src/Form/DatePicker.svelte
+++ b/packages/bbui/src/Form/DatePicker.svelte
@@ -18,7 +18,13 @@
   const dispatch = createEventDispatcher()
 
   const onChange = e => {
-    value = e.detail
+    if (range) {
+      // Flatpickr cant take two dates and work out what to display, needs to be provided a string.
+      // Like - "Date1 to Date2". Hence passing in that specifically from the array
+      value = e.detail[1]
+    } else {
+      value = e.detail
+    }
     dispatch("change", e.detail)
   }
 </script>
diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index 5f58f2a8d7..bdd4940d48 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -27,9 +27,11 @@
   let modal
   let trigger = null
   let pageInfo = createPaginationStore()
-  $: page = $pageInfo.page
+  let startDate
+  let endDate
 
-  $: fetchBackups(trigger, page)
+  $: page = $pageInfo.page
+  $: fetchBackups(trigger, page, startDate, endDate)
 
   const triggers = {
     PUBLISH: "publish",
@@ -98,11 +100,13 @@
       : 0
   }
 
-  async function fetchBackups(trigger, page) {
+  async function fetchBackups(trigger, page, startDate, endDate) {
     const response = await backups.searchBackups({
       appId: app.instance._id,
       trigger,
       page,
+      startDate,
+      endDate,
     })
     pageInfo.fetched(response.hasNextPage, response.nextPage)
 
@@ -158,9 +162,14 @@
       </div>
       <div>
         <DatePicker
-          range
+          range={true}
           label={"Filter Range"}
-          on:change={e => console.log(e)}
+          on:change={e => {
+            if (e.detail[0].length > 1) {
+              startDate = e.detail[0][0].toISOString()
+              endDate = e.detail[0][1].toISOString()
+            }
+          }}
         />
       </div>
 
diff --git a/packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte b/packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte
index f896cb03c5..ec7662f221 100644
--- a/packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte
@@ -2,7 +2,7 @@
   import { Icon } from "@budibase/bbui"
 
   export let value
-  $: console.log(value)
+
   let trigger = value?.charAt(0).toUpperCase() + value?.slice(1)
 </script>
 
diff --git a/packages/builder/src/stores/portal/backups.js b/packages/builder/src/stores/portal/backups.js
index 2894e90674..2e0139cf6a 100644
--- a/packages/builder/src/stores/portal/backups.js
+++ b/packages/builder/src/stores/portal/backups.js
@@ -11,8 +11,8 @@ export function createBackupsStore() {
     })
   }
 
-  async function searchBackups({ appId, trigger, page } = {}) {
-    return API.searchBackups({ appId, trigger, page })
+  async function searchBackups({ appId, trigger, page, startDate, endDate }) {
+    return API.searchBackups({ appId, trigger, page, startDate, endDate })
   }
 
   async function restoreBackup({ appId, backupId }) {
diff --git a/packages/frontend-core/src/api/backups.js b/packages/frontend-core/src/api/backups.js
index 97379898f3..22101dd26a 100644
--- a/packages/frontend-core/src/api/backups.js
+++ b/packages/frontend-core/src/api/backups.js
@@ -11,11 +11,10 @@ export const buildBackupsEndpoints = API => ({
       opts.trigger = trigger.toLowerCase()
     }
 
-    if (startDate) {
+    if (startDate && endDate) {
       opts.startDate = startDate
       opts.endDate = endDate
     }
-    console.log(opts)
     return await API.post({
       url: `/api/apps/${appId}/backups/search`,
       body: opts,

From 0c2ae220a2194ca414b2a26b8630f4bc5a91111e Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 20 Oct 2022 17:43:54 +0100
Subject: [PATCH 073/151] Updating rendering of table - as per Andy's new
 designs based on the restore event.

---
 .../overview/backups/ActionsRenderer.svelte   | 11 ++--
 .../overview/backups/AppSizeRenderer.svelte   | 41 +++++++++++++
 .../portal/overview/backups/BackupsTab.svelte | 57 +++++++------------
 .../backups/DatasourceRenderer.svelte         |  6 +-
 .../overview/backups/DateRenderer.svelte      |  7 ++-
 .../overview/backups/DaysRenderer.svelte      | 17 ------
 .../overview/backups/ScreensRenderer.svelte   | 19 -------
 .../overview/backups/StatusRenderer.svelte    | 10 ++++
 .../overview/backups/TriggerRenderer.svelte   | 32 -----------
 .../overview/backups/TypeRenderer.svelte      | 20 +++++++
 ...onsRenderer.svelte => UserRenderer.svelte} | 10 ++--
 packages/frontend-core/src/api/backups.js     |  2 -
 12 files changed, 112 insertions(+), 120 deletions(-)
 create mode 100644 packages/builder/src/components/portal/overview/backups/AppSizeRenderer.svelte
 delete mode 100644 packages/builder/src/components/portal/overview/backups/DaysRenderer.svelte
 delete mode 100644 packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte
 create mode 100644 packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte
 delete mode 100644 packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte
 create mode 100644 packages/builder/src/components/portal/overview/backups/TypeRenderer.svelte
 rename packages/builder/src/components/portal/overview/backups/{AutomationsRenderer.svelte => UserRenderer.svelte} (55%)

diff --git a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
index c43a78c437..834b2b1969 100644
--- a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
@@ -1,6 +1,5 @@
 <script>
   import {
-    ActionButton,
     ActionMenu,
     MenuItem,
     Icon,
@@ -55,15 +54,17 @@
 </script>
 
 <div class="cell">
-  <ActionButton on:click={restoreDialog.show}>Restore</ActionButton>
-  <ActionMenu>
+  <ActionMenu align="right">
     <div slot="control">
       <Icon size="M" hoverable name="MoreSmallList" />
     </div>
 
-    <MenuItem on:click={deleteDialog.show} icon="Delete">Delete</MenuItem>
+    {#if row.type !== "restore"}
+      <MenuItem on:click={restoreDialog.show} icon="Revert">Restore</MenuItem>
+      <MenuItem on:click={deleteDialog.show} icon="Delete">Delete</MenuItem>
+      <MenuItem on:click={downloadExport} icon="Download">Download</MenuItem>
+    {/if}
     <MenuItem on:click={updateDialog.show} icon="Edit">Update</MenuItem>
-    <MenuItem on:click={downloadExport} icon="Download">Download</MenuItem>
   </ActionMenu>
 </div>
 
diff --git a/packages/builder/src/components/portal/overview/backups/AppSizeRenderer.svelte b/packages/builder/src/components/portal/overview/backups/AppSizeRenderer.svelte
new file mode 100644
index 0000000000..c103399f5b
--- /dev/null
+++ b/packages/builder/src/components/portal/overview/backups/AppSizeRenderer.svelte
@@ -0,0 +1,41 @@
+<script>
+  import { Icon } from "@budibase/bbui"
+
+  export let row
+
+  $: automations = row?.automations
+  $: datasources = row?.datasources
+  $: screens = row?.screens
+</script>
+
+<div class="cell">
+  {#if automations != null && screens != null && datasources != null}
+    <div class="item">
+      <Icon name="Data" />
+      <div>{datasources || 0}</div>
+    </div>
+    <div class="item">
+      <Icon name="WebPage" />
+      <div>{screens || 0}</div>
+    </div>
+    <div class="item">
+      <Icon name="JourneyVoyager" />
+      <div>{automations || 0}</div>
+    </div>
+  {/if}
+</div>
+
+<style>
+  .cell {
+    display: flex;
+    flex-direction: row;
+    gap: calc(var(--spacing-xl) * 2);
+    align-items: center;
+  }
+
+  .item {
+    display: flex;
+    gap: var(--spacing-s);
+    flex-direction: row;
+  }
+</style>
diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index 5f58f2a8d7..9812279b24 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -12,14 +12,13 @@
   import { backups } from "stores/portal"
   import { createPaginationStore } from "helpers/pagination"
 
-  import DatasourceRenderer from "./DatasourceRenderer.svelte"
-  import ScreensRenderer from "./ScreensRenderer.svelte"
-  import AutomationsRenderer from "./AutomationsRenderer.svelte"
+  import AppSizeRenderer from "./AppSizeRenderer.svelte"
   import CreateBackupModal from "./CreateBackupModal.svelte"
-  import TriggerRenderer from "./TriggerRenderer.svelte"
   import ActionsRenderer from "./ActionsRenderer.svelte"
   import DateRenderer from "./DateRenderer.svelte"
-  import DaysRenderer from "./DaysRenderer.svelte"
+  import UserRenderer from "./UserRenderer.svelte"
+  import StatusRenderer from "./StatusRenderer.svelte"
+  import TypeRenderer from "./TypeRenderer.svelte"
 
   export let app
 
@@ -38,66 +37,47 @@
   }
 
   const schema = {
-    trigger: {
-      displayName: "Trigger",
-    },
-    days: {
-      displayName: null,
-    },
-
-    name: {
-      displayName: "Name",
+    type: {
+      displayName: "Type",
     },
     createdAt: {
       displayName: "Date",
     },
-    datasources: {
-      displayName: "Data",
+    name: {
+      displayName: "Name",
     },
-    screens: {
-      displayName: "Screens",
+    appSize: {
+      displayName: "App size",
     },
-    automations: {
-      displayName: "Automations",
-    },
-    userId: {
+    createdBy: {
       displayName: "User",
     },
+    status: {
+      displayName: "Status",
+    },
     actions: {
       displayName: null,
     },
   }
 
   const customRenderers = [
-    { column: "datasources", component: DatasourceRenderer },
-    { column: "screens", component: ScreensRenderer },
-    { column: "automations", component: AutomationsRenderer },
-    { column: "trigger", component: TriggerRenderer },
+    { column: "appSize", component: AppSizeRenderer },
     { column: "actions", component: ActionsRenderer },
     { column: "createdAt", component: DateRenderer },
-    { column: "days", component: DaysRenderer },
+    { column: "createdBy", component: UserRenderer },
+    { column: "status", component: StatusRenderer },
+    { column: "type", component: TypeRenderer },
   ]
 
   function flattenBackups(backups) {
     return backups.map(backup => {
       return {
         ...backup,
-        days: getDaysBetween(backup.timestamp),
         ...backup?.contents,
       }
     })
   }
 
-  function getDaysBetween(date) {
-    const now = new Date()
-    const backupDate = new Date(date)
-    backupDate.setDate(backupDate.getDate() - 1)
-    const oneDay = 24 * 60 * 60 * 1000
-    return now > backupDate
-      ? Math.round(Math.abs((now - backupDate) / oneDay))
-      : 0
-  }
-
   async function fetchBackups(trigger, page) {
     const response = await backups.searchBackups({
       appId: app.instance._id,
@@ -123,6 +103,7 @@
   }
 
   async function handleButtonClick({ detail }) {
+    console.log(detail.type)
     if (detail.type === "backupDelete") {
       await backups.deleteBackup({
         appId: app.instance._id,
diff --git a/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte b/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte
index e69fa2f625..198339dae9 100644
--- a/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte
@@ -5,8 +5,10 @@
 </script>
 
 <div class="cell">
-  <Icon name="Data" />
-  <div>{value || 0}</div>
+  {#if value != null}
+    <Icon name="Data" />
+    <div>{value || 0}</div>
+  {/if}
 </div>
 
 <style>
diff --git a/packages/builder/src/components/portal/overview/backups/DateRenderer.svelte b/packages/builder/src/components/portal/overview/backups/DateRenderer.svelte
index d1c4b34b2c..ec58c9ea07 100644
--- a/packages/builder/src/components/portal/overview/backups/DateRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/DateRenderer.svelte
@@ -1,10 +1,15 @@
 <script>
   import DateTimeRenderer from "components/common/renderers/DateTimeRenderer.svelte"
+  import dayjs from "dayjs"
+  import relativeTime from "dayjs/plugin/relativeTime"
+  dayjs.extend(relativeTime)
+
   export let value
+  $: timeSince = dayjs(value).fromNow()
 </script>
 
 <div class="cell">
-  <DateTimeRenderer {value} />
+  {timeSince} - <DateTimeRenderer {value} />
 </div>
 
 <style>
diff --git a/packages/builder/src/components/portal/overview/backups/DaysRenderer.svelte b/packages/builder/src/components/portal/overview/backups/DaysRenderer.svelte
deleted file mode 100644
index ba05a1e64b..0000000000
--- a/packages/builder/src/components/portal/overview/backups/DaysRenderer.svelte
+++ /dev/null
@@ -1,17 +0,0 @@
-<script>
-  export let value
-</script>
-
-<div class="cell">
-  {value}
-  {`day${value == 1 ? "" : "s"} ago`}
-</div>
-
-<style>
-  .cell {
-    display: flex;
-    flex-direction: row;
-    gap: var(--spacing-m);
-    align-items: center;
-  }
-</style>
diff --git a/packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte
deleted file mode 100644
index e97f140da7..0000000000
--- a/packages/builder/src/components/portal/overview/backups/ScreensRenderer.svelte
+++ /dev/null
@@ -1,19 +0,0 @@
-<script>
-  import { Icon } from "@budibase/bbui"
-
-  export let value
-</script>
-
-<div class="cell">
-  <Icon name="WebPage" />
-  <div>{value || 0}</div>
-</div>
-
-<style>
-  .cell {
-    display: flex;
-    flex-direction: row;
-    gap: var(--spacing-m);
-    align-items: center;
-  }
-</style>
diff --git a/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte b/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte
new file mode 100644
index 0000000000..8fd98f663e
--- /dev/null
+++ b/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte
@@ -0,0 +1,10 @@
+<script>
+  import { Badge } from "@budibase/bbui"
+
+  export let value = "started"
+  $: status = value.charAt(0).toUpperCase() + value.slice(1)
+</script>
+
+<Badge green={value === "complete"} red={value === "failed"} size="S">
+  {status}
+</Badge>
diff --git a/packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte b/packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte
deleted file mode 100644
index f896cb03c5..0000000000
--- a/packages/builder/src/components/portal/overview/backups/TriggerRenderer.svelte
+++ /dev/null
@@ -1,32 +0,0 @@
-<script>
-  import { Icon } from "@budibase/bbui"
-
-  export let value
-  $: console.log(value)
-  let trigger = value?.charAt(0).toUpperCase() + value?.slice(1)
-</script>
-
-<div class="cell">
-  {#if value === "publish"}
-    <Icon name="GlobeCheck" />
-    <div>{trigger}</div>
-  {:else if value === "manual"}
-    <Icon name="SaveFloppy" />
-    <div>{trigger}</div>
-  {:else if value === "scheduled"}
-    <Icon name="Clock" />
-    <div>{trigger}</div>
-  {:else if value === "restore"}
-    <Icon name="Refresh" />
-    <div>{trigger}</div>
-  {/if}
-</div>
-
-<style>
-  .cell {
-    display: flex;
-    flex-direction: row;
-    gap: var(--spacing-m);
-    align-items: center;
-  }
-</style>
diff --git a/packages/builder/src/components/portal/overview/backups/TypeRenderer.svelte b/packages/builder/src/components/portal/overview/backups/TypeRenderer.svelte
new file mode 100644
index 0000000000..9057a2adee
--- /dev/null
+++ b/packages/builder/src/components/portal/overview/backups/TypeRenderer.svelte
@@ -0,0 +1,20 @@
+<script>
+  export let row
+
+  $: baseTrig = row?.trigger || "manual"
+  $: type = row?.type || "backup"
+  $: trigger = baseTrig.charAt(0).toUpperCase() + baseTrig.slice(1)
+</script>
+
+<div class="cell">
+  {trigger}
+  {type}
+</div>
+
+<style>
+  .cell {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+  }
+</style>
diff --git a/packages/builder/src/components/portal/overview/backups/AutomationsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/UserRenderer.svelte
similarity index 55%
rename from packages/builder/src/components/portal/overview/backups/AutomationsRenderer.svelte
rename to packages/builder/src/components/portal/overview/backups/UserRenderer.svelte
index 08ea5fb118..42b25bcca8 100644
--- a/packages/builder/src/components/portal/overview/backups/AutomationsRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/UserRenderer.svelte
@@ -1,12 +1,14 @@
 <script>
-  import { Icon } from "@budibase/bbui"
-
   export let value
+  $: username = value?.firstName
+    ? `${value?.firstName} ${value?.lastName}`
+    : value?.email
 </script>
 
 <div class="cell">
-  <Icon name="JourneyVoyager" />
-  <div>{value || 0}</div>
+  {#if value != null}
+    <div>{username}</div>
+  {/if}
 </div>
 
 <style>
diff --git a/packages/frontend-core/src/api/backups.js b/packages/frontend-core/src/api/backups.js
index 97379898f3..a15c1e7ec4 100644
--- a/packages/frontend-core/src/api/backups.js
+++ b/packages/frontend-core/src/api/backups.js
@@ -10,12 +10,10 @@ export const buildBackupsEndpoints = API => ({
     if (trigger) {
       opts.trigger = trigger.toLowerCase()
     }
-
     if (startDate) {
       opts.startDate = startDate
       opts.endDate = endDate
     }
-    console.log(opts)
     return await API.post({
       url: `/api/apps/${appId}/backups/search`,
       body: opts,

From 1eac53230ede21f9e8287a0d491445704573e05f Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 20 Oct 2022 18:46:16 +0100
Subject: [PATCH 074/151] Adding restore work - new modal to create a backup.

---
 .../overview/backups/ActionsRenderer.svelte   | 14 +++++++++---
 .../backups/CreateRestoreModal.svelte         | 22 +++++++++++++++++++
 packages/frontend-core/src/api/backups.js     |  3 ++-
 packages/types/src/documents/app/backup.ts    |  1 +
 4 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte

diff --git a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
index 834b2b1969..6a6a5a8060 100644
--- a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
@@ -6,8 +6,10 @@
     Input,
     Heading,
     Body,
+    Modal,
   } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import CreateRestoreModal from "./CreateRestoreModal.svelte"
   import { createEventDispatcher } from "svelte"
   import download from "downloadjs"
   import { backups } from "stores/portal"
@@ -19,12 +21,14 @@
   let updateDialog
   let name
   let restoreBackupName
+  let restoreBackupModal
 
   const dispatch = createEventDispatcher()
 
-  const onClickRestore = () => {
+  const onClickRestore = name => {
     dispatch("buttonclick", {
       type: "backupRestore",
+      name,
       backupId: row._id,
       restoreBackupName,
     })
@@ -68,6 +72,10 @@
   </ActionMenu>
 </div>
 
+<Modal bind:this={restoreBackupModal}>
+  <CreateRestoreModal confirm={name => onClickRestore(name)} />
+</Modal>
+
 <ConfirmDialog
   bind:this={deleteDialog}
   okText="Delete Backup"
@@ -81,8 +89,8 @@
 
 <ConfirmDialog
   bind:this={restoreDialog}
-  okText="Restore Backup"
-  onOk={onClickRestore}
+  okText="Continue"
+  onOk={restoreBackupModal?.show}
   title="Confirm Restore"
   warning={false}
 >
diff --git a/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte b/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte
new file mode 100644
index 0000000000..3c554563da
--- /dev/null
+++ b/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte
@@ -0,0 +1,22 @@
+<script>
+  import { ModalContent, Input, Body } from "@budibase/bbui"
+
+  export let confirm
+
+  let name
+</script>
+
+<ModalContent
+  onConfirm={() => confirm(name)}
+  title="Backup your current version"
+  confirmText="Confirm Restore"
+>
+  <Body size="S"
+    >Create a backup of your current app to allow you to roll back after
+    restoring this backup</Body
+  >
+  <Input label="Backup name" bind:value={name} />
+</ModalContent>
+
+<style>
+</style>
diff --git a/packages/frontend-core/src/api/backups.js b/packages/frontend-core/src/api/backups.js
index 82fb9533d8..85df0eab1e 100644
--- a/packages/frontend-core/src/api/backups.js
+++ b/packages/frontend-core/src/api/backups.js
@@ -40,9 +40,10 @@ export const buildBackupsEndpoints = API => ({
     })
   },
 
-  restoreBackup: async ({ appId, backupId }) => {
+  restoreBackup: async ({ appId, backupId, name }) => {
     return await API.post({
       url: `/api/apps/${appId}/backups/${backupId}/import`,
+      body: { name },
     })
   },
 
diff --git a/packages/types/src/documents/app/backup.ts b/packages/types/src/documents/app/backup.ts
index 520013a8bb..9179852331 100644
--- a/packages/types/src/documents/app/backup.ts
+++ b/packages/types/src/documents/app/backup.ts
@@ -59,6 +59,7 @@ export interface AppBackupQueueData {
   }
   import?: {
     backupId: string
+    nameForBackup: string
     createdBy?: string
   }
 }

From 854cb23947f96ae55d1f3395b44e9c1d12b14f73 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 20 Oct 2022 19:07:10 +0100
Subject: [PATCH 075/151] Getting the import system to carry out a backup of
 the app before the restore.

---
 packages/server/src/sdk/app/backups/backup.ts | 145 +++++++++++-------
 packages/types/src/documents/app/backup.ts    |   2 +
 2 files changed, 93 insertions(+), 54 deletions(-)

diff --git a/packages/server/src/sdk/app/backups/backup.ts b/packages/server/src/sdk/app/backups/backup.ts
index 97fe12e63d..2741e41096 100644
--- a/packages/server/src/sdk/app/backups/backup.ts
+++ b/packages/server/src/sdk/app/backups/backup.ts
@@ -1,6 +1,11 @@
 import { backups } from "@budibase/pro"
 import { db as dbCore, objectStore, tenancy } from "@budibase/backend-core"
-import { AppBackupQueueData, AppBackupStatus } from "@budibase/types"
+import {
+  AppBackupQueueData,
+  AppBackupStatus,
+  AppBackupTrigger,
+  AppBackupType,
+} from "@budibase/types"
 import { exportApp } from "./exports"
 import { importApp } from "./imports"
 import { calculateBackupStats } from "../statistics"
@@ -8,19 +13,96 @@ import { Job } from "bull"
 import fs from "fs"
 import env from "../../../environment"
 
+type BackupOpts = {
+  doc?: { id: string; rev: string }
+  createdBy?: string
+}
+
 async function removeExistingApp(devId: string) {
   const devDb = dbCore.dangerousGetDB(devId, { skip_setup: true })
   await devDb.destroy()
 }
 
+async function runBackup(
+  name: string,
+  trigger: AppBackupTrigger,
+  tenantId: string,
+  appId: string,
+  opts?: BackupOpts
+) {
+  const devAppId = dbCore.getDevAppID(appId),
+    prodAppId = dbCore.getProdAppID(appId)
+  const timestamp = new Date().toISOString()
+  const tarPath = await exportApp(devAppId, { tar: true })
+  const contents = await calculateBackupStats(devAppId)
+  let filename = `${prodAppId}/backup-${timestamp}.tar.gz`
+  // add the tenant to the bucket path if backing up within a multi-tenant environment
+  if (env.MULTI_TENANCY) {
+    filename = `${tenantId}/${filename}`
+  }
+  const bucket = objectStore.ObjectStoreBuckets.BACKUPS
+  await objectStore.upload({
+    path: tarPath,
+    type: "application/gzip",
+    bucket,
+    filename,
+    metadata: {
+      name,
+      trigger,
+      timestamp,
+      appId: prodAppId,
+    },
+  })
+  if (opts?.doc) {
+    await backups.updateBackupStatus(
+      opts.doc.id,
+      opts.doc.rev,
+      AppBackupStatus.COMPLETE,
+      contents,
+      filename
+    )
+  } else {
+    await backups.storeAppBackupMetadata(
+      {
+        appId: prodAppId,
+        timestamp,
+        name,
+        trigger,
+        type: AppBackupType.BACKUP,
+        status: AppBackupStatus.COMPLETE,
+        contents,
+        createdBy: opts?.createdBy,
+      },
+      { filename }
+    )
+  }
+  // clear up the tarball after uploading it
+  fs.rmSync(tarPath)
+}
+
 async function importProcessor(job: Job) {
   const data: AppBackupQueueData = job.data
   const appId = data.appId,
-    backupId = data.import!.backupId
-  const tenantId = tenancy.getTenantIDFromAppID(appId)
+    backupId = data.import!.backupId,
+    nameForBackup = data.import!.nameForBackup,
+    createdBy = data.import!.createdBy
+  const tenantId = tenancy.getTenantIDFromAppID(appId) as string
   tenancy.doInTenant(tenantId, async () => {
     const devAppId = dbCore.getDevAppID(appId)
-    const performImport = async (path: string) => {
+    // initially export the current state to disk - incase something goes wrong
+    await runBackup(
+      nameForBackup,
+      AppBackupTrigger.RESTORING,
+      tenantId,
+      appId,
+      { createdBy }
+    )
+    // get the backup ready on disk
+    const { path } = await backups.downloadAppBackup(backupId)
+    // start by removing app database and contents of bucket - which will be updated
+    await removeExistingApp(devAppId)
+    let status = AppBackupStatus.COMPLETE
+    try {
       await importApp(devAppId, dbCore.dangerousGetDB(devAppId), {
         file: {
           type: "application/gzip",
@@ -28,26 +110,10 @@ async function importProcessor(job: Job) {
         },
         key: path,
       })
-    }
-    // initially export the current state to disk - incase something goes wrong
-    const backupTarPath = await exportApp(devAppId, { tar: true })
-    // get the backup ready on disk
-    const { path } = await backups.downloadAppBackup(backupId)
-    // start by removing app database and contents of bucket - which will be updated
-    await removeExistingApp(devAppId)
-    try {
-      await performImport(path)
     } catch (err) {
-      // rollback - clear up failed import and re-import the pre-backup
-      await removeExistingApp(devAppId)
-      await performImport(backupTarPath)
+      status = AppBackupStatus.FAILED
     }
-    await backups.updateRestoreStatus(
-      data.docId,
-      data.docRev,
-      AppBackupStatus.COMPLETE
-    )
-    fs.rmSync(backupTarPath)
+    await backups.updateRestoreStatus(data.docId, data.docRev, status)
   })
 }
 
@@ -56,40 +122,11 @@ async function exportProcessor(job: Job) {
   const appId = data.appId,
     trigger = data.export!.trigger,
     name = data.export!.name || `${trigger} - backup`
-  const tenantId = tenancy.getTenantIDFromAppID(appId)
+  const tenantId = tenancy.getTenantIDFromAppID(appId) as string
   await tenancy.doInTenant(tenantId, async () => {
-    const devAppId = dbCore.getDevAppID(appId),
-      prodAppId = dbCore.getProdAppID(appId)
-    const timestamp = new Date().toISOString()
-    const tarPath = await exportApp(devAppId, { tar: true })
-    const contents = await calculateBackupStats(devAppId)
-    let filename = `${prodAppId}/backup-${timestamp}.tar.gz`
-    // add the tenant to the bucket path if backing up within a multi-tenant environment
-    if (env.MULTI_TENANCY) {
-      filename = `${tenantId}/${filename}`
-    }
-    const bucket = objectStore.ObjectStoreBuckets.BACKUPS
-    await objectStore.upload({
-      path: tarPath,
-      type: "application/gzip",
-      bucket,
-      filename,
-      metadata: {
-        name,
-        trigger,
-        timestamp,
-        appId: prodAppId,
-      },
+    return runBackup(name, trigger, tenantId, appId, {
+      doc: { id: data.docId, rev: data.docRev },
     })
-    await backups.updateBackupStatus(
-      data.docId,
-      data.docRev,
-      AppBackupStatus.COMPLETE,
-      contents,
-      filename
-    )
-    // clear up the tarball after uploading it
-    fs.rmSync(tarPath)
   })
 }
 
diff --git a/packages/types/src/documents/app/backup.ts b/packages/types/src/documents/app/backup.ts
index 520013a8bb..c9671e8269 100644
--- a/packages/types/src/documents/app/backup.ts
+++ b/packages/types/src/documents/app/backup.ts
@@ -16,6 +16,7 @@ export enum AppBackupTrigger {
   PUBLISH = "publish",
   MANUAL = "manual",
   SCHEDULED = "scheduled",
+  RESTORING = "restoring",
 }
 
 export interface AppBackupContents {
@@ -59,6 +60,7 @@ export interface AppBackupQueueData {
   }
   import?: {
     backupId: string
+    nameForBackup: string
     createdBy?: string
   }
 }

From 6a96d447e9805c47a61e7532821fd860f10d3792 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 20 Oct 2022 19:49:14 +0100
Subject: [PATCH 076/151] Ensure allowed component list is actually accurate
 and prevent any way around illegal component nesting

---
 .../src/builderStore/store/frontend.js        |  4 +-
 .../new/_components/NewComponentPanel.svelte  | 54 ++++++++++++++++---
 2 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index b6d315f15d..97fad5f1bb 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -236,12 +236,12 @@ export const getFrontendStore = () => {
           }
         }
 
-        // Validate the entire tree and throw and error if an illegal child is
+        // Validate the entire tree and throw an error if an illegal child is
         // found anywhere
         const illegalChild = findIllegalChild(screen.props)
         if (illegalChild) {
           const def = store.actions.components.getDefinition(illegalChild)
-          throw `A ${def.name} can't be inserted here`
+          throw `You can't place a ${def.name} here`
         }
       },
       save: async screen => {
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte
index ca8912a74f..0610be6d0a 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte
@@ -11,9 +11,10 @@
     notifications,
   } from "@budibase/bbui"
   import structure from "./componentStructure.json"
-  import { store, selectedComponent } from "builderStore"
+  import { store, selectedComponent, selectedScreen } from "builderStore"
   import { onMount } from "svelte"
   import { fly } from "svelte/transition"
+  import { findComponentPath } from "builderStore/componentUtils"
 
   let section = "components"
   let searchString
@@ -21,8 +22,10 @@
   let selectedIndex
   let componentList = []
 
-  $: currentDefinition = store.actions.components.getDefinition(
-    $selectedComponent?._component
+  $: allowedComponents = getAllowedComponents(
+    $store.components,
+    $selectedScreen,
+    $selectedComponent
   )
   $: enrichedStructure = enrichStructure(
     structure,
@@ -31,13 +34,50 @@
   )
   $: filteredStructure = filterStructure(
     enrichedStructure,
-    section,
-    currentDefinition,
+    allowedComponents,
     searchString
   )
   $: blocks = enrichedStructure.find(x => x.name === "Blocks").children
   $: orderMap = createComponentOrderMap(componentList)
 
+  const getAllowedComponents = (allComponents, screen, component) => {
+    const path = findComponentPath(screen?.props, component?._id)
+    if (!path?.length) {
+      return []
+    }
+
+    // Get initial set of allowed components
+    let allowedComponents = []
+    const definition = store.actions.components.getDefinition(
+      component?._component
+    )
+    if (definition.legalDirectChildren?.length) {
+      allowedComponents = definition.legalDirectChildren.map(x => {
+        return `@budibase/standard-components/${x}`
+      })
+    } else {
+      allowedComponents = Object.keys(allComponents)
+    }
+
+    // Build up list of illegal children from ancestors
+    let illegalChildren = definition.illegalChildren || []
+    path.forEach(ancestor => {
+      const def = store.actions.components.getDefinition(ancestor._component)
+      const blacklist = def?.illegalChildren?.map(x => {
+        return `@budibase/standard-components/${x}`
+      })
+      illegalChildren = [...illegalChildren, ...(blacklist || [])]
+    })
+    illegalChildren = [...new Set(illegalChildren)]
+
+    // Filter out illegal children from allowed components
+    allowedComponents = allowedComponents.filter(x => {
+      return !illegalChildren.includes(x)
+    })
+
+    return allowedComponents
+  }
+
   // Creates a simple lookup map from an array, so we can find the selected
   // component much faster
   const createComponentOrderMap = list => {
@@ -90,7 +130,7 @@
     return enrichedStructure
   }
 
-  const filterStructure = (structure, section, currentDefinition, search) => {
+  const filterStructure = (structure, allowedComponents, search) => {
     selectedIndex = search ? 0 : null
     componentList = []
     if (!structure?.length) {
@@ -114,7 +154,7 @@
         }
 
         // Check if the component is allowed as a child
-        return !currentDefinition?.illegalChildren?.includes(name)
+        return allowedComponents.includes(child.component)
       })
       if (matchedChildren.length) {
         filteredStructure.push({

From 93c042d0eb47d27d235f64436cad252f9441aefd Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 21 Oct 2022 14:10:08 +0100
Subject: [PATCH 077/151] fix download issue and pass name for backup after
 restore

---
 .../portal/overview/backups/ActionsRenderer.svelte   | 12 +++---------
 .../portal/overview/backups/BackupsTab.svelte        |  2 +-
 .../portal/overview/backups/StatusRenderer.svelte    |  2 +-
 packages/builder/src/stores/portal/backups.js        |  4 ++--
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
index 6a6a5a8060..bb09ad3f6d 100644
--- a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
@@ -11,8 +11,6 @@
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import CreateRestoreModal from "./CreateRestoreModal.svelte"
   import { createEventDispatcher } from "svelte"
-  import download from "downloadjs"
-  import { backups } from "stores/portal"
 
   export let row
 
@@ -20,7 +18,6 @@
   let restoreDialog
   let updateDialog
   let name
-  let restoreBackupName
   let restoreBackupModal
 
   const dispatch = createEventDispatcher()
@@ -30,7 +27,7 @@
       type: "backupRestore",
       name,
       backupId: row._id,
-      restoreBackupName,
+      restoreBackupName: name,
     })
   }
 
@@ -48,12 +45,9 @@
       name,
     })
   }
+
   async function downloadExport() {
-    let resp = await backups.downloadBackup({
-      backupId: row._id,
-      appId: row.appId,
-    })
-    download(resp, row.filename)
+    window.location = `/api/apps/${row.appId}/backups/${row._id}/file`
   }
 </script>
 
diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index 3d257db5a8..d435360362 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -107,7 +107,6 @@
   }
 
   async function handleButtonClick({ detail }) {
-    console.log(detail.type)
     if (detail.type === "backupDelete") {
       await backups.deleteBackup({
         appId: app.instance._id,
@@ -118,6 +117,7 @@
       await backups.restoreBackup({
         appId: app.instance._id,
         backupId: detail.backupId,
+        name: detail.restoreBackupName,
       })
     } else if (detail.type === "backupUpdate") {
       await backups.updateBackup({
diff --git a/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte b/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte
index 8fd98f663e..610b080d37 100644
--- a/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte
@@ -2,7 +2,7 @@
   import { Badge } from "@budibase/bbui"
 
   export let value = "started"
-  $: status = value.charAt(0).toUpperCase() + value.slice(1)
+  $: status = value?.charAt(0).toUpperCase() + value?.slice(1)
 </script>
 
 <Badge green={value === "complete"} red={value === "failed"} size="S">
diff --git a/packages/builder/src/stores/portal/backups.js b/packages/builder/src/stores/portal/backups.js
index 2e0139cf6a..af336c73ab 100644
--- a/packages/builder/src/stores/portal/backups.js
+++ b/packages/builder/src/stores/portal/backups.js
@@ -15,8 +15,8 @@ export function createBackupsStore() {
     return API.searchBackups({ appId, trigger, page, startDate, endDate })
   }
 
-  async function restoreBackup({ appId, backupId }) {
-    return API.restoreBackup({ appId, backupId })
+  async function restoreBackup({ appId, backupId, name }) {
+    return API.restoreBackup({ appId, backupId, name })
   }
 
   async function deleteBackup({ appId, backupId }) {

From cdcfbc6dce5f4dd0119c1cf6fed9b4f40a1599c3 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Fri, 21 Oct 2022 14:20:40 +0100
Subject: [PATCH 078/151] Initial commit for chart block component

---
 .../settings/ComponentSettingsSection.svelte  |  29 +-
 .../new/_components/componentStructure.json   |   3 +-
 packages/client/manifest.json                 | 471 ++++++++++++++++++
 .../components/app/blocks/ChartBlock.svelte   | 107 ++++
 .../client/src/components/app/blocks/index.js |   1 +
 .../components/app/charts/ApexChart.svelte    |   5 +-
 .../app/charts/ApexOptionsBuilder.js          |   3 +
 7 files changed, 605 insertions(+), 14 deletions(-)
 create mode 100644 packages/client/src/components/app/blocks/ChartBlock.svelte

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte
index efd3db8ff7..12a7eea87d 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte
@@ -29,6 +29,10 @@
 
     // Filter out settings which shouldn't be rendered
     sections.forEach(section => {
+      section.visible = shouldDisplay(instance, section)
+      if (!section.visible) {
+        return
+      }
       section.settings.forEach(setting => {
         setting.visible = canRenderControl(instance, setting, isScreen)
       })
@@ -46,17 +50,7 @@
     }
   }
 
-  const canRenderControl = (instance, setting, isScreen) => {
-    // Prevent rendering on click setting for screens
-    if (setting?.type === "event" && isScreen) {
-      return false
-    }
-
-    const control = getComponentForSetting(setting)
-    if (!control) {
-      return false
-    }
-
+  const shouldDisplay = (instance, setting) => {
     // Parse dependant settings
     if (setting.dependsOn) {
       let dependantSetting = setting.dependsOn
@@ -93,6 +87,19 @@
 
     return true
   }
+
+  const canRenderControl = (instance, setting, isScreen) => {
+    // Prevent rendering on click setting for screens
+    if (setting?.type === "event" && isScreen) {
+      return false
+    }
+    const control = getComponentForSetting(setting)
+    if (!control) {
+      return false
+    }
+
+    return shouldDisplay(instance, setting)
+  }
 </script>
 
 {#each sections as section, idx (section.name)}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/componentStructure.json b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/componentStructure.json
index 3d9cf7e2a3..3100c7467c 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/componentStructure.json
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/componentStructure.json
@@ -6,7 +6,8 @@
       "tableblock",
       "cardsblock",
       "repeaterblock",
-      "formblock"
+      "formblock",
+      "chartblock"
     ]
   },
   {
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 763ac46b3f..93a53c15a3 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -3972,6 +3972,477 @@
       }
     ]
   },
+  "chartblock": {
+    "block": true,
+    "name": "Chart block",
+    "icon": "GraphPie",
+    "hasChildren": false,
+    "settings": [
+      {
+        "type": "select",
+        "label": "Chart Type",
+        "key": "chartType",
+        "required": true,
+        "options": [
+          {
+            "label": "Pie",
+            "value": "pie"
+          },
+          {
+            "label": "Bar",
+            "value": "bar"
+          },
+          {
+            "label": "Line",
+            "value": "line"
+          },
+          {
+            "label": "Donut",
+            "value": "donut"
+          },
+          {
+            "label": "Candlestick",
+            "value": "candlestick"
+          },
+          {
+            "label": "Area",
+            "value": "area"
+          }
+        ]
+      },
+      {
+        "type": "dataSource",
+        "label": "Data",
+        "key": "dataSource",
+        "required": true
+      },
+      {
+        "type": "text",
+        "label": "Title",
+        "key": "chartTitle"
+      },
+      {
+        "type": "filter",
+        "label": "Filtering",
+        "key": "filter"
+      },
+      {
+        "type": "field",
+        "label": "Sort Column",
+        "key": "sortColumn"
+      },
+      {
+        "type": "select",
+        "label": "Sort Order",
+        "key": "sortOrder",
+        "options": [
+          "Ascending",
+          "Descending"
+        ],
+        "defaultValue": "Ascending"
+      },
+      {
+        "type": "number",
+        "label": "Limit",
+        "key": "limit",
+        "defaultValue": 50
+      },
+      {
+        "type": "text",
+        "label": "Width",
+        "key": "width"
+      },
+      {
+        "type": "text",
+        "label": "Height",
+        "key": "height",
+        "defaultValue": "400"
+      },
+      {
+        "type": "select",
+        "label": "Colors",
+        "key": "palette",
+        "defaultValue": "Palette 1",
+        "options": [
+          "Custom",
+          "Palette 1",
+          "Palette 2",
+          "Palette 3",
+          "Palette 4",
+          "Palette 5",
+          "Palette 6",
+          "Palette 7",
+          "Palette 8",
+          "Palette 9",
+          "Palette 10"
+        ]
+      },
+      {
+        "type": "color",
+        "label": "C1",
+        "key": "c1",
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C2",
+        "key": "c2",
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C3",
+        "key": "c3",
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C4",
+        "key": "c4",
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C5",
+        "key": "c5",
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "boolean",
+        "label": "Data Labels",
+        "key": "dataLabels",
+        "defaultValue": false
+      },
+      {
+        "type": "boolean",
+        "label": "Legend",
+        "key": "legend",
+        "defaultValue": true
+      },
+      {
+        "type": "boolean",
+        "label": "Animate",
+        "key": "animate",
+        "defaultValue": false
+      },
+      {
+        "section": true,
+        "name": "Pie Chart",
+        "icon": "GraphPie",
+        "dependsOn": {
+          "setting": "chartType",
+          "value": "pie"
+        },
+        "settings": [
+          {
+            "type": "field",
+            "label": "Label Col.",
+            "key": "labelColumn",
+            "dependsOn": "dataSource",
+            "required": true
+          },
+          {
+            "type": "field",
+            "label": "Data Col.",
+            "key": "valueColumn",
+            "dependsOn": "dataSource",
+            "required": true
+          }
+        ]
+      },
+      {
+        "section": true,
+        "name": "Donut Chart",
+        "icon": "GraphDonut",
+        "dependsOn": {
+          "setting": "chartType",
+          "value": "donut"
+        },
+        "settings": [
+          {
+            "type": "field",
+            "label": "Label Col.",
+            "key": "labelColumn",
+            "dependsOn": "dataSource",
+            "required": true
+          },
+          {
+            "type": "field",
+            "label": "Data Col.",
+            "key": "valueColumn",
+            "dependsOn": "dataSource",
+            "required": true
+          }
+        ]
+      },
+      {
+        "section": true,
+        "name": "Bar Chart",
+        "icon": "GraphBarVertical",
+        "dependsOn": {
+          "setting": "chartType",
+          "value": "bar"
+        },
+        "settings": [
+          {
+            "type": "field",
+            "label": "Label Col.",
+            "key": "labelColumn",
+            "dependsOn": "dataSource",
+            "required": true
+          },
+          {
+            "type": "multifield",
+            "label": "Data Cols.",
+            "key": "valueColumns",
+            "dependsOn": "dataSource",
+            "required": true
+          },
+          {
+            "type": "select",
+            "label": "Format",
+            "key": "yAxisUnits",
+            "options": [
+              "Default",
+              "Thousands",
+              "Millions"
+            ],
+            "defaultValue": "Default"
+          },
+          {
+            "type": "text",
+            "label": "Y Axis Label",
+            "key": "yAxisLabel"
+          },
+          {
+            "type": "text",
+            "label": "X Axis Label",
+            "key": "xAxisLabel"
+          },
+          {
+            "type": "boolean",
+            "label": "Stacked",
+            "key": "stacked",
+            "defaultValue": false
+          },
+          {
+            "type": "boolean",
+            "label": "Horizontal",
+            "key": "horizontal",
+            "defaultValue": false
+          }
+        ]
+      },
+      {
+        "section": true,
+        "name": "Line Chart",
+        "icon": "GraphTrend",
+        "dependsOn": {
+          "setting": "chartType",
+          "value": "line"
+        },
+        "settings": [
+          {
+            "type": "field",
+            "label": "Label Col.",
+            "key": "labelColumn",
+            "dependsOn": "dataSource",
+            "required": true
+          },
+          {
+            "type": "multifield",
+            "label": "Data Cols.",
+            "key": "valueColumns",
+            "dependsOn": "dataSource",
+            "required": true
+          },
+          {
+            "type": "select",
+            "label": "Format",
+            "key": "yAxisUnits",
+            "options": [
+              "Default",
+              "Thousands",
+              "Millions"
+            ],
+            "defaultValue": "Default"
+          },
+          {
+            "type": "text",
+            "label": "Y Axis Label",
+            "key": "yAxisLabel"
+          },
+          {
+            "type": "text",
+            "label": "X Axis Label",
+            "key": "xAxisLabel"
+          },
+          {
+            "type": "select",
+            "label": "Curve",
+            "key": "curve",
+            "options": [
+              "Smooth",
+              "Straight",
+              "Stepline"
+            ],
+            "defaultValue": "Smooth"
+          }
+        ]
+      },
+      {
+        "section": true,
+        "name": "Area Chart",
+        "icon": "GraphAreaStacked",
+        "dependsOn": {
+          "setting": "chartType",
+          "value": "area"
+        },
+        "settings": [
+          {
+            "type": "field",
+            "label": "Label Col.",
+            "key": "labelColumn",
+            "dependsOn": "dataSource",
+            "required": true
+          },
+          {
+            "type": "multifield",
+            "label": "Data Cols.",
+            "key": "valueColumns",
+            "dependsOn": "dataSource",
+            "required": true
+          },
+          {
+            "type": "select",
+            "label": "Format",
+            "key": "yAxisUnits",
+            "options": [
+              "Default",
+              "Thousands",
+              "Millions"
+            ],
+            "defaultValue": "Default"
+          },
+          {
+            "type": "text",
+            "label": "Y Axis Label",
+            "key": "yAxisLabel"
+          },
+          {
+            "type": "text",
+            "label": "X Axis Label",
+            "key": "xAxisLabel"
+          },
+          {
+            "type": "select",
+            "label": "Curve",
+            "key": "curve",
+            "options": [
+              "Smooth",
+              "Straight",
+              "Stepline"
+            ],
+            "defaultValue": "Smooth"
+          },
+          {
+            "type": "boolean",
+            "label": "Stacked",
+            "key": "stacked",
+            "defaultValue": true
+          },
+          {
+            "type": "boolean",
+            "label": "Gradient",
+            "key": "gradient",
+            "defaultValue": false
+          }
+        ]
+      },
+      {
+        "section": true,
+        "name": "Candlestick Chart",
+        "icon": "GraphBarVerticalStacked",
+        "dependsOn": {
+          "setting": "chartType",
+          "value": "candlestick"
+        },
+        "settings": [
+          {
+            "type": "field",
+            "label": "Date Col.",
+            "key": "dateColumn",
+            "dependsOn": "dataSource",
+            "required": true
+          },
+          {
+            "type": "field",
+            "label": "Open Col.",
+            "key": "openColumn",
+            "dependsOn": "dataSource",
+            "required": true
+          },
+          {
+            "type": "field",
+            "label": "Close Col.",
+            "key": "closeColumn",
+            "dependsOn": "dataSource",
+            "required": true
+          },
+          {
+            "type": "field",
+            "label": "High Col.",
+            "key": "highColumn",
+            "dependsOn": "dataSource",
+            "required": true
+          },
+          {
+            "type": "field",
+            "label": "Low Col.",
+            "key": "lowColumn",
+            "dependsOn": "dataSource",
+            "required": true
+          },
+          {
+            "type": "select",
+            "label": "Format",
+            "key": "yAxisUnits",
+            "options": [
+              "Default",
+              "Thousands",
+              "Millions"
+            ],
+            "defaultValue": "Default"
+          },
+          {
+            "type": "text",
+            "label": "Y Axis Label",
+            "key": "yAxisLabel"
+          },
+          {
+            "type": "text",
+            "label": "X Axis Label",
+            "key": "xAxisLabel"
+          }
+        ]
+      }
+    ]
+  },
   "tableblock": {
     "block": true,
     "name": "Table block",
diff --git a/packages/client/src/components/app/blocks/ChartBlock.svelte b/packages/client/src/components/app/blocks/ChartBlock.svelte
new file mode 100644
index 0000000000..7a2f8469b8
--- /dev/null
+++ b/packages/client/src/components/app/blocks/ChartBlock.svelte
@@ -0,0 +1,107 @@
+<script>
+  import { getContext } from "svelte"
+  import Block from "components/Block.svelte"
+  import BlockComponent from "components/BlockComponent.svelte"
+  import Placeholder from "components/app/Placeholder.svelte"
+  import { makePropSafe as safe } from "@budibase/string-templates"
+
+  // Datasource
+  export let filter
+  export let sortColumn
+  export let sortOrder
+  export let limit
+
+  // Block
+  export let chartTitle
+  export let chartType
+  export let dataSource
+  export let palette
+  export let c1, c2, c3, c4, c5
+  export let labelColumn
+  export let legend
+  export let animate
+  export let dataLabels
+  export let height
+  export let width
+
+  // Pie/Donut
+  export let valueColumn
+
+  // Bar
+  export let stacked
+  export let horizontal
+
+  // Bar/Line/Area
+  export let valueColumns
+  export let yAxisUnits
+  export let yAxisLabel
+  export let xAxisLabel
+  export let curve
+
+  // Area
+  export let gradient
+
+  // Candlestick
+  export let closeColumn
+  export let openColumn
+  export let highColumn
+  export let lowColumn
+  export let dateColumn
+
+  const component = getContext("component")
+
+  let dataProviderId
+
+  $: colors = c1 && c2 && c3 && c4 && c5 ? [c1, c2, c3, c4, c5] : null
+</script>
+
+<Block>
+  <BlockComponent
+    type="dataprovider"
+    context="provider"
+    bind:id={dataProviderId}
+    props={{
+      dataSource,
+      filter,
+      sortColumn,
+      sortOrder,
+      limit,
+    }}
+    order={0}
+  >
+    {#if $component.empty}
+      <Placeholder />
+    {:else}
+      <BlockComponent
+        type={chartType}
+        props={{
+          dataProvider: `{{ literal ${safe(dataProviderId)} }}`,
+          height,
+          width,
+          title: chartTitle,
+          labelColumn,
+          valueColumn,
+          valueColumns,
+          palette,
+          dataLabels,
+          legend,
+          animate,
+          ...colors,
+          yAxisUnits,
+          yAxisLabel,
+          xAxisLabel,
+          stacked,
+          horizontal,
+          curve,
+          gradient, //issue?
+          closeColumn,
+          openColumn,
+          highColumn,
+          lowColumn,
+          dateColumn,
+        }}
+        order={1}
+      />
+    {/if}
+  </BlockComponent>
+</Block>
diff --git a/packages/client/src/components/app/blocks/index.js b/packages/client/src/components/app/blocks/index.js
index 32b2b98c06..734bff2c0f 100644
--- a/packages/client/src/components/app/blocks/index.js
+++ b/packages/client/src/components/app/blocks/index.js
@@ -2,3 +2,4 @@ export { default as tableblock } from "./TableBlock.svelte"
 export { default as cardsblock } from "./CardsBlock.svelte"
 export { default as repeaterblock } from "./RepeaterBlock.svelte"
 export { default as formblock } from "./FormBlock.svelte"
+export { default as chartblock } from "./ChartBlock.svelte"
diff --git a/packages/client/src/components/app/charts/ApexChart.svelte b/packages/client/src/components/app/charts/ApexChart.svelte
index 87d78bf5a2..eed8fb2e6c 100644
--- a/packages/client/src/components/app/charts/ApexChart.svelte
+++ b/packages/client/src/components/app/charts/ApexChart.svelte
@@ -24,8 +24,9 @@
     display: flex !important;
     text-transform: capitalize;
   }
-  div :global(.apexcharts-yaxis-label),
-  div :global(.apexcharts-xaxis-label) {
+  div :global(.apexcharts-text.apexcharts-xaxis-title-text),
+  div :global(.apexcharts-text.apexcharts-yaxis-title-text),
+  div :global(.apexcharts-title-text) {
     fill: var(--spectrum-global-color-gray-600);
   }
 
diff --git a/packages/client/src/components/app/charts/ApexOptionsBuilder.js b/packages/client/src/components/app/charts/ApexOptionsBuilder.js
index 6b3e3a4440..04b5805df3 100644
--- a/packages/client/src/components/app/charts/ApexOptionsBuilder.js
+++ b/packages/client/src/components/app/charts/ApexOptionsBuilder.js
@@ -184,6 +184,9 @@ export class ApexOptionsBuilder {
   }
 
   palette(palette) {
+    if (!palette) {
+      return this
+    }
     return this.setOption(
       ["theme", "palette"],
       palette.toLowerCase().replace(/[\W]/g, "")

From d17241d8d7c1c1a81ce6887eb97eae5c6c3727ba Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 21 Oct 2022 16:00:10 +0100
Subject: [PATCH 079/151] refetch after backup / delete / update

---
 .../components/portal/overview/backups/BackupsTab.svelte  | 8 ++++++--
 .../portal/overview/backups/StatusRenderer.svelte         | 7 ++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index d435360362..7ba2bd8370 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -100,6 +100,7 @@
         appId: app.instance._id,
         name,
       })
+      await fetchBackups(trigger, page)
       notifications.success(response.message)
     } catch {
       notifications.error("Unable to create backup")
@@ -112,20 +113,21 @@
         appId: app.instance._id,
         backupId: detail.backupId,
       })
-      await fetchBackups(app.instance._id, trigger, page)
+      await fetchBackups(trigger, page)
     } else if (detail.type === "backupRestore") {
       await backups.restoreBackup({
         appId: app.instance._id,
         backupId: detail.backupId,
         name: detail.restoreBackupName,
       })
+      await fetchBackups(trigger, page)
     } else if (detail.type === "backupUpdate") {
       await backups.updateBackup({
         appId: app.instance._id,
         backupId: detail.backupId,
         name: detail.name,
       })
-      await fetchBackups(app.instance._id, trigger, page)
+      await fetchBackups(trigger, page)
     }
   }
 </script>
@@ -138,6 +140,8 @@
           placeholder="All"
           label="Trigger"
           options={Object.values(triggers)}
+          getOptionLabel={trigger =>
+            trigger.charAt(0).toUpperCase() + trigger.slice(1)}
           bind:value={trigger}
         />
       </div>
diff --git a/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte b/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte
index 610b080d37..95834b024e 100644
--- a/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte
@@ -5,6 +5,11 @@
   $: status = value?.charAt(0).toUpperCase() + value?.slice(1)
 </script>
 
-<Badge green={value === "complete"} red={value === "failed"} size="S">
+<Badge
+  grey={value === "started"}
+  green={value === "complete"}
+  red={value === "failed"}
+  size="S"
+>
   {status}
 </Badge>

From 2a2f41a8615f1143af1012790c04175ba1c2a45a Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 21 Oct 2022 16:02:13 +0100
Subject: [PATCH 080/151] Fixing issue discovered by tests.

---
 packages/backend-core/src/queue/queue.ts         |  2 +-
 .../server/src/api/controllers/deploy/index.ts   | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/backend-core/src/queue/queue.ts b/packages/backend-core/src/queue/queue.ts
index 6dd10ee091..7eaafe38a8 100644
--- a/packages/backend-core/src/queue/queue.ts
+++ b/packages/backend-core/src/queue/queue.ts
@@ -22,7 +22,7 @@ export function createQueue<T>(
 ): BullQueue.Queue<T> {
   const queueConfig: any = redisProtocolUrl || { redis: opts }
   let queue: any
-  if (env.isTest()) {
+  if (!env.isTest()) {
     queue = new BullQueue(jobQueue, queueConfig)
   } else {
     queue = new InMemoryQueue(jobQueue, queueConfig)
diff --git a/packages/server/src/api/controllers/deploy/index.ts b/packages/server/src/api/controllers/deploy/index.ts
index a1cb905930..b3b875e397 100644
--- a/packages/server/src/api/controllers/deploy/index.ts
+++ b/packages/server/src/api/controllers/deploy/index.ts
@@ -20,6 +20,7 @@ import {
 import { events } from "@budibase/backend-core"
 import { backups } from "@budibase/pro"
 import { AppBackupTrigger } from "@budibase/types"
+import env from "../../../environment"
 
 // the max time we can wait for an invalidation to complete before considering it failed
 const MAX_PENDING_TIME_MS = 30 * 60000
@@ -107,10 +108,17 @@ async function deployApp(deployment: any, userId: string) {
     const devAppId = getDevelopmentAppID(appId)
     const productionAppId = getProdAppID(appId)
 
-    // trigger backup initially
-    await backups.triggerAppBackup(productionAppId, AppBackupTrigger.PUBLISH, {
-      createdBy: userId,
-    })
+    // can't do this in test
+    if (!env.isTest()) {
+      // trigger backup initially
+      await backups.triggerAppBackup(
+        productionAppId,
+        AppBackupTrigger.PUBLISH,
+        {
+          createdBy: userId,
+        }
+      )
+    }
 
     const config: any = {
       source: devAppId,

From 67b6821b376b377bd76a77e729e351fced116030 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 21 Oct 2022 16:52:46 +0100
Subject: [PATCH 081/151] Fix components being selected when starting dragging

---
 packages/client/src/components/Component.svelte | 2 +-
 packages/client/src/utils/computed.js           | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 packages/client/src/utils/computed.js

diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index bc430ee92c..669cc8afdc 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -446,7 +446,7 @@
   const scrollIntoView = () => {
     // Don't scroll into view if we selected this component because we were
     // starting dragging on it
-    if (get(builderStore).dragging) {
+    if (get(dndIsDragging)) {
       return
     }
     const node = document.getElementsByClassName(id)?.[0]?.children[0]
diff --git a/packages/client/src/utils/computed.js b/packages/client/src/utils/computed.js
new file mode 100644
index 0000000000..e69de29bb2

From f1714ab2a5c02d7ff25989ac4a1e0ca3a820de1d Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 21 Oct 2022 16:54:01 +0100
Subject: [PATCH 082/151] Improve performance by fixing multiple instances of
 redundant client app initialisations

---
 packages/builder/src/builderStore/store/frontend.js  | 12 +++++-------
 .../design/[screenId]/_components/AppPreview.svelte  |  8 ++++++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index 97fad5f1bb..fc8b1b8427 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -667,16 +667,14 @@ export const getFrontendStore = () => {
         })
 
         // Select the parent if cutting
-        if (cut) {
+        if (cut && selectParent) {
           const screen = get(selectedScreen)
           const parent = findComponentParent(screen?.props, component._id)
           if (parent) {
-            if (selectParent) {
-              store.update(state => {
-                state.selectedComponentId = parent._id
-                return state
-              })
-            }
+            store.update(state => {
+              state.selectedComponentId = parent._id
+              return state
+            })
           }
         }
       },
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index 3c7edf096f..2a606233c2 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -86,7 +86,11 @@
         : [],
     isBudibaseEvent: true,
     usedPlugins: $store.usedPlugins,
-    location: window.location,
+    location: {
+      protocol: window.location.protocol,
+      hostname: window.location.hostname,
+      port: window.location.port,
+    },
   }
 
   // Refresh the preview when required
@@ -189,7 +193,7 @@
 
         // Cut and paste the component to the new destination
         if (source && destination) {
-          store.actions.components.copy(source, true)
+          store.actions.components.copy(source, true, false)
           await store.actions.components.paste(destination, data.mode)
         }
       } else if (type === "click-nav") {

From 794db1a7db0aa3ce657bbde237e8313f02bc8278 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 21 Oct 2022 16:54:34 +0100
Subject: [PATCH 083/151] Make DND feel much smoother by persisting the end
 position of drops, and more performance by properly memoizing some state
 values

---
 .../src/components/preview/DNDHandler.svelte  |  7 +-
 packages/client/src/index.js                  |  9 ++-
 packages/client/src/stores/dnd.js             | 28 ++++---
 packages/client/src/stores/index.js           |  1 +
 packages/client/src/stores/screens.js         | 79 ++++++++++++-------
 packages/client/src/utils/computed.js         | 26 ++++++
 6 files changed, 107 insertions(+), 43 deletions(-)

diff --git a/packages/client/src/components/preview/DNDHandler.svelte b/packages/client/src/components/preview/DNDHandler.svelte
index f556346ad2..e04bd81750 100644
--- a/packages/client/src/components/preview/DNDHandler.svelte
+++ b/packages/client/src/components/preview/DNDHandler.svelte
@@ -57,7 +57,9 @@
     }
 
     // Reset state
-    dndStore.actions.reset()
+    if (!$dndStore.dropped) {
+      dndStore.actions.reset()
+    }
   }
 
   // Callback when initially starting a drag on a draggable component
@@ -251,7 +253,7 @@
   }
 
   // Callback when dropping a drag on top of some component
-  const onDrop = e => {
+  const onDrop = () => {
     if (!source || !drop?.parent || drop?.index == null) {
       return
     }
@@ -299,6 +301,7 @@
     }
 
     if (legacyDropTarget && legacyDropMode) {
+      dndStore.actions.markDropped()
       builderStore.actions.moveComponent(
         source.id,
         legacyDropTarget,
diff --git a/packages/client/src/index.js b/packages/client/src/index.js
index e9c821c54f..e61df37d95 100644
--- a/packages/client/src/index.js
+++ b/packages/client/src/index.js
@@ -24,10 +24,6 @@ loadSpectrumIcons()
 let app
 
 const loadBudibase = async () => {
-  if (get(builderStore).clearGridNextLoad) {
-    builderStore.actions.setDragging(false)
-  }
-
   // Update builder store with any builder flags
   builderStore.set({
     ...get(builderStore),
@@ -45,6 +41,11 @@ const loadBudibase = async () => {
     location: window["##BUDIBASE_LOCATION##"],
   })
 
+  // Reset DND state if we completed a successful drop
+  if (get(dndStore).dropped) {
+    dndStore.actions.reset()
+  }
+
   // Set app ID - this window flag is set by both the preview and the real
   // server rendered app HTML
   appStore.actions.setAppId(window["##BUDIBASE_APP_ID##"])
diff --git a/packages/client/src/stores/dnd.js b/packages/client/src/stores/dnd.js
index 9f17a5aa90..eee338c167 100644
--- a/packages/client/src/stores/dnd.js
+++ b/packages/client/src/stores/dnd.js
@@ -1,4 +1,5 @@
 import { writable, derived } from "svelte/store"
+import { computed } from "../utils/computed.js"
 
 const createDndStore = () => {
   const initialState = {
@@ -10,6 +11,9 @@ const createDndStore = () => {
 
     // Info about where the component would be dropped
     drop: null,
+
+    // Whether the current drop has been completed successfully
+    dropped: false,
   }
   const store = writable(initialState)
 
@@ -59,6 +63,13 @@ const createDndStore = () => {
     store.set(initialState)
   }
 
+  const markDropped = () => {
+    store.update(state => {
+      state.dropped = true
+      return state
+    })
+  }
+
   return {
     subscribe: store.subscribe,
     actions: {
@@ -67,6 +78,7 @@ const createDndStore = () => {
       updateTarget,
       updateDrop,
       reset,
+      markDropped,
     },
   }
 }
@@ -77,14 +89,12 @@ export const dndStore = createDndStore()
 // performance by deriving any state that needs to be externally observed.
 // By doing this and using primitives, we can avoid invalidating other stores
 // or components which depend on DND state unless values actually change.
-export const dndParent = derived(dndStore, $dndStore => $dndStore.drop?.parent)
-export const dndIndex = derived(dndStore, $dndStore => $dndStore.drop?.index)
-export const dndBounds = derived(
+export const dndParent = computed(dndStore, x => x.drop?.parent)
+export const dndIndex = computed(dndStore, x => x.drop?.index)
+export const dndDropped = computed(dndStore, x => x.dropped)
+export const dndBounds = computed(dndStore, x => x.source?.bounds)
+export const dndIsDragging = computed(dndStore, x => !!x.source)
+export const dndIsNewComponent = computed(
   dndStore,
-  $dndStore => $dndStore.source?.bounds
+  x => x.source?.newComponentType != null
 )
-export const dndIsNewComponent = derived(
-  dndStore,
-  $dndStore => $dndStore.source?.newComponentType != null
-)
-export const dndIsDragging = derived(dndStore, $dndStore => !!$dndStore.source)
diff --git a/packages/client/src/stores/index.js b/packages/client/src/stores/index.js
index c431302d43..7a06e55a67 100644
--- a/packages/client/src/stores/index.js
+++ b/packages/client/src/stores/index.js
@@ -22,6 +22,7 @@ export {
   dndBounds,
   dndIsNewComponent,
   dndIsDragging,
+  dndDropped,
 } from "./dnd"
 
 // Context stores are layered and duplicated, so it is not a singleton
diff --git a/packages/client/src/stores/screens.js b/packages/client/src/stores/screens.js
index fdfd5d5673..d9d91ad51a 100644
--- a/packages/client/src/stores/screens.js
+++ b/packages/client/src/stores/screens.js
@@ -2,7 +2,13 @@ import { derived } from "svelte/store"
 import { routeStore } from "./routes"
 import { builderStore } from "./builder"
 import { appStore } from "./app"
-import { dndIndex, dndParent, dndIsNewComponent, dndBounds } from "./dnd.js"
+import {
+  dndIndex,
+  dndParent,
+  dndIsNewComponent,
+  dndBounds,
+  dndDropped,
+} from "./dnd.js"
 import { RoleUtils } from "@budibase/frontend-core"
 import { findComponentById, findComponentParent } from "../utils/components.js"
 import { Helpers } from "@budibase/bbui"
@@ -18,6 +24,7 @@ const createScreenStore = () => {
       dndIndex,
       dndIsNewComponent,
       dndBounds,
+      dndDropped,
     ],
     ([
       $appStore,
@@ -27,6 +34,7 @@ const createScreenStore = () => {
       $dndIndex,
       $dndIsNewComponent,
       $dndBounds,
+      $dndDropped,
     ]) => {
       let activeLayout, activeScreen
       let screens
@@ -64,39 +72,54 @@ const createScreenStore = () => {
 
       // Insert DND placeholder if required
       if (activeScreen && $dndParent && $dndIndex != null) {
+        const { selectedComponentId } = $builderStore
+
+        // Extract and save the selected component as we need a reference to it
+        // later, and we may be removing it
+        let selectedParent = findComponentParent(
+          activeScreen.props,
+          selectedComponentId
+        )
+        const selectedComponent = selectedParent?._children?.find(
+          x => x._id === selectedComponentId
+        )
+
         // Remove selected component from tree if we are moving an existing
         // component
-        const { selectedComponentId } = $builderStore
-        if (!$dndIsNewComponent) {
-          let selectedParent = findComponentParent(
-            activeScreen.props,
-            selectedComponentId
+        if (!$dndIsNewComponent && selectedParent) {
+          selectedParent._children = selectedParent._children?.filter(
+            x => x._id !== selectedComponentId
           )
-          if (selectedParent) {
-            selectedParent._children = selectedParent._children?.filter(
-              x => x._id !== selectedComponentId
-            )
-          }
         }
 
-        // Insert placeholder component
-        const placeholder = {
-          _component: "@budibase/standard-components/container",
-          _id: DNDPlaceholderID,
-          _styles: {
-            normal: {
-              width: `${$dndBounds?.width || 666}px`,
-              height: `${$dndBounds?.height || 666}px`,
-              opacity: 0,
-            },
-          },
-          static: true,
-        }
-        let parent = findComponentById(activeScreen.props, $dndParent)
-        if (!parent._children?.length) {
-          parent._children = [placeholder]
+        // Insert placeholder component if dragging, or artificially insert
+        // the dropped component in the new location if the drop completed
+        let componentToInsert
+        if ($dndDropped && !$dndIsNewComponent) {
+          componentToInsert = selectedComponent
         } else {
-          parent._children.splice($dndIndex, 0, placeholder)
+          componentToInsert = {
+            _component: "@budibase/standard-components/container",
+            _id: DNDPlaceholderID,
+            _styles: {
+              normal: {
+                width: `${$dndBounds?.width || 400}px`,
+                height: `${$dndBounds?.height || 200}px`,
+                opacity: 0,
+              },
+            },
+            static: true,
+          }
+        }
+        if (componentToInsert) {
+          let parent = findComponentById(activeScreen.props, $dndParent)
+          if (parent) {
+            if (!parent._children?.length) {
+              parent._children = [componentToInsert]
+            } else {
+              parent._children.splice($dndIndex, 0, componentToInsert)
+            }
+          }
         }
       }
 
diff --git a/packages/client/src/utils/computed.js b/packages/client/src/utils/computed.js
index e69de29bb2..02bf97710a 100644
--- a/packages/client/src/utils/computed.js
+++ b/packages/client/src/utils/computed.js
@@ -0,0 +1,26 @@
+import { writable } from "svelte/store"
+
+const getKey = value => {
+  if (value == null || typeof value !== "object") {
+    return value
+  } else {
+    return JSON.stringify(value)
+  }
+}
+
+export const computed = (store, getValue) => {
+  const initialValue = getValue(store)
+  const computedStore = writable(initialValue)
+  let lastKey = getKey(initialValue)
+
+  store.subscribe(state => {
+    const value = getValue(state)
+    const key = getKey(value)
+    if (key !== lastKey) {
+      lastKey = key
+      computedStore.set(value)
+    }
+  })
+
+  return computedStore
+}

From 4dc6b869a8f3ca89cc615e614d275e1491e3b335 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 21 Oct 2022 16:59:26 +0100
Subject: [PATCH 084/151] Lint and improve comments

---
 packages/client/src/stores/dnd.js     |  2 +-
 packages/client/src/utils/computed.js | 34 ++++++++++++++++++---------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/packages/client/src/stores/dnd.js b/packages/client/src/stores/dnd.js
index eee338c167..532dea0ad5 100644
--- a/packages/client/src/stores/dnd.js
+++ b/packages/client/src/stores/dnd.js
@@ -1,4 +1,4 @@
-import { writable, derived } from "svelte/store"
+import { writable } from "svelte/store"
 import { computed } from "../utils/computed.js"
 
 const createDndStore = () => {
diff --git a/packages/client/src/utils/computed.js b/packages/client/src/utils/computed.js
index 02bf97710a..aa89e7ad1b 100644
--- a/packages/client/src/utils/computed.js
+++ b/packages/client/src/utils/computed.js
@@ -1,20 +1,22 @@
 import { writable } from "svelte/store"
 
-const getKey = value => {
-  if (value == null || typeof value !== "object") {
-    return value
-  } else {
-    return JSON.stringify(value)
-  }
-}
-
-export const computed = (store, getValue) => {
-  const initialValue = getValue(store)
+/**
+ * Extension of Svelte's built in "derived" stores, which the addition of deep
+ * comparison of non-primitives. Falls back to using shallow comparison for
+ * primitive types to avoid performance penalties.
+ * Useful for instances where a deep comparison is cheaper than an additional
+ * store invalidation.
+ * @param store the store to observer
+ * @param deriveValue the derivation function
+ * @returns {Writable<*>} a derived svelte store containing just the derived value
+ */
+export const computed = (store, deriveValue) => {
+  const initialValue = deriveValue(store)
   const computedStore = writable(initialValue)
   let lastKey = getKey(initialValue)
 
   store.subscribe(state => {
-    const value = getValue(state)
+    const value = deriveValue(state)
     const key = getKey(value)
     if (key !== lastKey) {
       lastKey = key
@@ -24,3 +26,13 @@ export const computed = (store, getValue) => {
 
   return computedStore
 }
+
+// Helper function to serialise any value into a primitive which can be cheaply
+// and shallowly compared
+const getKey = value => {
+  if (value == null || typeof value !== "object") {
+    return value
+  } else {
+    return JSON.stringify(value)
+  }
+}

From 1064095d94cb877ad22150bee5242512a50a3490 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 21 Oct 2022 17:03:01 +0100
Subject: [PATCH 085/151] Updating frontend to allow searching by type and
 trigger.

---
 .../portal/overview/backups/BackupsTab.svelte | 51 ++++++++++++-------
 packages/builder/src/stores/portal/backups.js | 11 +++-
 packages/frontend-core/src/api/backups.js     |  5 +-
 3 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index 7ba2bd8370..cb20013b9b 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -24,18 +24,31 @@
 
   let backupData = null
   let modal
-  let trigger = null
   let pageInfo = createPaginationStore()
-  let startDate
-  let endDate
+  let filterOpt = null
+  let startDate = null
+  let endDate = null
+  let filters = getFilters()
 
   $: page = $pageInfo.page
-  $: fetchBackups(trigger, page, startDate, endDate)
+  $: fetchBackups(filterOpt, page, startDate, endDate)
 
-  const triggers = {
-    PUBLISH: "publish",
-    SCHEDULED: "scheduled",
-    MANUAL: "manual",
+  function getFilters() {
+    const options = []
+    let types = ["backup"]
+    let triggers = ["manual", "publish", "scheduled", "restoring"]
+    for (let type of types) {
+      for (let trigger of triggers) {
+        let label = `${trigger} ${type}`
+        label = label.charAt(0).toUpperCase() + label?.slice(1)
+        options.push({ label, value: { type, trigger } })
+      }
+    }
+    options.push({
+      label: `Manual restore`,
+      value: { type: "restore", trigger: "manual" },
+    })
+    return options
   }
 
   const schema = {
@@ -80,10 +93,10 @@
     })
   }
 
-  async function fetchBackups(trigger, page, startDate, endDate) {
+  async function fetchBackups(filters, page, startDate, endDate) {
     const response = await backups.searchBackups({
       appId: app.instance._id,
-      trigger,
+      ...filters,
       page,
       startDate,
       endDate,
@@ -100,7 +113,7 @@
         appId: app.instance._id,
         name,
       })
-      await fetchBackups(trigger, page)
+      await fetchBackups(filterOpt, page)
       notifications.success(response.message)
     } catch {
       notifications.error("Unable to create backup")
@@ -113,21 +126,21 @@
         appId: app.instance._id,
         backupId: detail.backupId,
       })
-      await fetchBackups(trigger, page)
+      await fetchBackups(filterOpt, page)
     } else if (detail.type === "backupRestore") {
       await backups.restoreBackup({
         appId: app.instance._id,
         backupId: detail.backupId,
         name: detail.restoreBackupName,
       })
-      await fetchBackups(trigger, page)
+      await fetchBackups(filterOpt, page)
     } else if (detail.type === "backupUpdate") {
       await backups.updateBackup({
         appId: app.instance._id,
         backupId: detail.backupId,
         name: detail.name,
       })
-      await fetchBackups(trigger, page)
+      await fetchBackups(filterOpt, page)
     }
   }
 </script>
@@ -138,11 +151,11 @@
       <div class="select">
         <Select
           placeholder="All"
-          label="Trigger"
-          options={Object.values(triggers)}
-          getOptionLabel={trigger =>
-            trigger.charAt(0).toUpperCase() + trigger.slice(1)}
-          bind:value={trigger}
+          label="Type"
+          options={filters}
+          getOptionValue={filter => filter.value}
+          getOptionLabel={filter => filter.label}
+          bind:value={filterOpt}
         />
       </div>
       <div>
diff --git a/packages/builder/src/stores/portal/backups.js b/packages/builder/src/stores/portal/backups.js
index af336c73ab..c041edbed8 100644
--- a/packages/builder/src/stores/portal/backups.js
+++ b/packages/builder/src/stores/portal/backups.js
@@ -11,8 +11,15 @@ export function createBackupsStore() {
     })
   }
 
-  async function searchBackups({ appId, trigger, page, startDate, endDate }) {
-    return API.searchBackups({ appId, trigger, page, startDate, endDate })
+  async function searchBackups({
+    appId,
+    trigger,
+    type,
+    page,
+    startDate,
+    endDate,
+  }) {
+    return API.searchBackups({ appId, trigger, type, page, startDate, endDate })
   }
 
   async function restoreBackup({ appId, backupId, name }) {
diff --git a/packages/frontend-core/src/api/backups.js b/packages/frontend-core/src/api/backups.js
index 85df0eab1e..ad0be0ed70 100644
--- a/packages/frontend-core/src/api/backups.js
+++ b/packages/frontend-core/src/api/backups.js
@@ -2,13 +2,14 @@ export const buildBackupsEndpoints = API => ({
   /**
    * Gets a list of users in the current tenant.
    */
-  searchBackups: async ({ appId, trigger, page, startDate, endDate }) => {
+  searchBackups: async ({ appId, trigger, type, page, startDate, endDate }) => {
     const opts = {}
     if (page) {
       opts.page = page
     }
-    if (trigger) {
+    if (trigger && type) {
       opts.trigger = trigger.toLowerCase()
+      opts.type = type.toLowerCase()
     }
     if (startDate && endDate) {
       opts.startDate = startDate

From 5aeeed47e1bf28ab4eb151d7c996cc5da3ca3a02 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 21 Oct 2022 17:04:20 +0100
Subject: [PATCH 086/151] Type updates for searching by type + trigger on app
 backup documents.

---
 packages/types/src/api/web/app/backup.ts   | 3 ++-
 packages/types/src/documents/app/backup.ts | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/types/src/api/web/app/backup.ts b/packages/types/src/api/web/app/backup.ts
index 092cf714b5..f16f8416ae 100644
--- a/packages/types/src/api/web/app/backup.ts
+++ b/packages/types/src/api/web/app/backup.ts
@@ -1,7 +1,8 @@
-import { AppBackupTrigger } from "../../../documents"
+import { AppBackupTrigger, AppBackupType } from "../../../documents"
 
 export interface SearchAppBackupsRequest {
   trigger: AppBackupTrigger
+  type: AppBackupType
   startDate: string
   endDate: string
   page?: string
diff --git a/packages/types/src/documents/app/backup.ts b/packages/types/src/documents/app/backup.ts
index c9671e8269..f7b6239b4f 100644
--- a/packages/types/src/documents/app/backup.ts
+++ b/packages/types/src/documents/app/backup.ts
@@ -42,6 +42,7 @@ export interface AppBackup extends Document, AppBackupMetadata {
 
 export type AppBackupFetchOpts = {
   trigger?: AppBackupTrigger
+  type?: AppBackupType
   limit?: number
   page?: string
   paginate?: boolean

From 24cc71267c0eda1af4395f050ac36d3f3a76e699 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 21 Oct 2022 17:51:25 +0100
Subject: [PATCH 087/151] Fix stale hover indiciator

---
 .../client/src/components/preview/HoverIndicator.svelte   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/preview/HoverIndicator.svelte b/packages/client/src/components/preview/HoverIndicator.svelte
index 230edeb70c..7d7d3e0540 100644
--- a/packages/client/src/components/preview/HoverIndicator.svelte
+++ b/packages/client/src/components/preview/HoverIndicator.svelte
@@ -4,7 +4,13 @@
   import { builderStore, dndIsDragging } from "stores"
 
   let componentId
+
   $: zIndex = componentId === $builderStore.selectedComponentId ? 900 : 920
+  $: {
+    if ($dndIsDragging) {
+      componentId = null
+    }
+  }
 
   const onMouseOver = e => {
     // Ignore if dragging
@@ -43,7 +49,7 @@
 </script>
 
 <IndicatorSet
-  componentId={$dndIsDragging ? null : componentId}
+  {componentId}
   color="var(--spectrum-global-color-static-blue-200)"
   transition
   {zIndex}

From b26ab6f8b3a1f81d98e5cf87d8417186caf37255 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 21 Oct 2022 17:51:35 +0100
Subject: [PATCH 088/151] Fix flashing settings bar in stale position

---
 packages/client/src/components/preview/SettingsBar.svelte | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/client/src/components/preview/SettingsBar.svelte b/packages/client/src/components/preview/SettingsBar.svelte
index 757d8b88db..332409986a 100644
--- a/packages/client/src/components/preview/SettingsBar.svelte
+++ b/packages/client/src/components/preview/SettingsBar.svelte
@@ -17,6 +17,11 @@
 
   $: definition = $componentStore.selectedComponentDefinition
   $: showBar = definition?.showSettingsBar && !$dndIsDragging
+  $: {
+    if (!showBar) {
+      measured = false
+    }
+  }
   $: settings = getBarSettings(definition)
 
   const getBarSettings = definition => {

From fe5d11232f0b151b14c8488b8cbad384e05a2290 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 21 Oct 2022 18:25:35 +0100
Subject: [PATCH 089/151] Update with PR comments.

---
 packages/backend-core/package.json            |   5 +-
 packages/server/package.json                  |   4 +-
 packages/server/src/sdk/app/backups/backup.ts |  14 +-
 packages/server/yarn.lock                     | 604 +++++++++++++++++-
 packages/types/src/documents/app/backup.ts    |   1 +
 packages/types/src/sdk/koa.ts                 |   1 +
 6 files changed, 594 insertions(+), 35 deletions(-)

diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index a3bb329b72..69d4968e81 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -26,7 +26,7 @@
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",
     "bcryptjs": "2.4.3",
-    "bull": "^4.10.1",
+    "bull": "4.10.1",
     "dotenv": "16.0.1",
     "emitter-listener": "1.1.2",
     "ioredis": "4.28.0",
@@ -63,9 +63,8 @@
     ]
   },
   "devDependencies": {
-    "@types/bull": "^3.15.9",
     "@types/chance": "1.1.3",
-    "@types/ioredis": "^4.28.10",
+    "@types/ioredis": "4.28.10",
     "@types/jest": "27.5.1",
     "@types/koa": "2.0.52",
     "@types/lodash": "4.14.180",
diff --git a/packages/server/package.json b/packages/server/package.json
index 539dc46ed9..42eb3b2df1 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -93,7 +93,7 @@
     "arangojs": "7.2.0",
     "aws-sdk": "2.1030.0",
     "bcryptjs": "2.4.3",
-    "bull": "4.8.5",
+    "bull": "4.10.1",
     "chmodr": "1.2.0",
     "chokidar": "3.5.3",
     "csvtojson": "2.0.10",
@@ -159,9 +159,9 @@
     "@jest/test-sequencer": "24.9.0",
     "@types/apidoc": "0.50.0",
     "@types/bson": "4.2.0",
-    "@types/bull": "3.15.8",
     "@types/global-agent": "2.1.1",
     "@types/google-spreadsheet": "3.1.5",
+    "@types/ioredis": "4.28.10",
     "@types/jest": "27.5.1",
     "@types/koa": "2.13.5",
     "@types/koa__router": "8.0.11",
diff --git a/packages/server/src/sdk/app/backups/backup.ts b/packages/server/src/sdk/app/backups/backup.ts
index 2741e41096..abb2272a99 100644
--- a/packages/server/src/sdk/app/backups/backup.ts
+++ b/packages/server/src/sdk/app/backups/backup.ts
@@ -89,6 +89,11 @@ async function importProcessor(job: Job) {
   const tenantId = tenancy.getTenantIDFromAppID(appId) as string
   tenancy.doInTenant(tenantId, async () => {
     const devAppId = dbCore.getDevAppID(appId)
+    const { rev } = await backups.updateRestoreStatus(
+      data.docId,
+      data.docRev,
+      AppBackupStatus.PENDING
+    )
     // initially export the current state to disk - incase something goes wrong
     await runBackup(
       nameForBackup,
@@ -113,7 +118,7 @@ async function importProcessor(job: Job) {
     } catch (err) {
       status = AppBackupStatus.FAILED
     }
-    await backups.updateRestoreStatus(data.docId, data.docRev, status)
+    await backups.updateRestoreStatus(data.docId, rev, status)
   })
 }
 
@@ -124,8 +129,13 @@ async function exportProcessor(job: Job) {
     name = data.export!.name || `${trigger} - backup`
   const tenantId = tenancy.getTenantIDFromAppID(appId) as string
   await tenancy.doInTenant(tenantId, async () => {
+    const { rev } = await backups.updateBackupStatus(
+      data.docId,
+      data.docRev,
+      AppBackupStatus.PENDING
+    )
     return runBackup(name, trigger, tenantId, appId, {
-      doc: { id: data.docId, rev: data.docRev },
+      doc: { id: data.docId, rev },
     })
   })
 }
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 0467492533..e124ce969d 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1130,6 +1130,59 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
+"@budibase/bbui@2.0.30-alpha.7":
+  version "2.0.30-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.0.30-alpha.7.tgz#2d0f00b3f244e9d579b146710b6a697c1fa5c3b8"
+  integrity sha512-0Ml31GFHqXUGVcIVoKHQPK79TbugtO0L7jgtQ3oaok+Z2YzWYfSudXsjDZwZrBWyKxTy9odXaodA2Me9O1x6dA==
+  dependencies:
+    "@adobe/spectrum-css-workflow-icons" "^1.2.1"
+    "@budibase/string-templates" "2.0.30-alpha.7"
+    "@spectrum-css/actionbutton" "^1.0.1"
+    "@spectrum-css/actiongroup" "^1.0.1"
+    "@spectrum-css/avatar" "^3.0.2"
+    "@spectrum-css/button" "^3.0.1"
+    "@spectrum-css/buttongroup" "^3.0.2"
+    "@spectrum-css/checkbox" "^3.0.2"
+    "@spectrum-css/dialog" "^3.0.1"
+    "@spectrum-css/divider" "^1.0.3"
+    "@spectrum-css/dropzone" "^3.0.2"
+    "@spectrum-css/fieldgroup" "^3.0.2"
+    "@spectrum-css/fieldlabel" "^3.0.1"
+    "@spectrum-css/icon" "^3.0.1"
+    "@spectrum-css/illustratedmessage" "^3.0.2"
+    "@spectrum-css/inlinealert" "^2.0.1"
+    "@spectrum-css/inputgroup" "^3.0.2"
+    "@spectrum-css/label" "^2.0.10"
+    "@spectrum-css/link" "^3.1.1"
+    "@spectrum-css/menu" "^3.0.1"
+    "@spectrum-css/modal" "^3.0.1"
+    "@spectrum-css/pagination" "^3.0.3"
+    "@spectrum-css/picker" "^1.0.1"
+    "@spectrum-css/popover" "^3.0.1"
+    "@spectrum-css/progressbar" "^1.0.2"
+    "@spectrum-css/progresscircle" "^1.0.2"
+    "@spectrum-css/radio" "^3.0.2"
+    "@spectrum-css/search" "^3.0.2"
+    "@spectrum-css/sidenav" "^3.0.2"
+    "@spectrum-css/slider" "3.0.1"
+    "@spectrum-css/statuslight" "^3.0.2"
+    "@spectrum-css/stepper" "^3.0.3"
+    "@spectrum-css/switch" "^1.0.2"
+    "@spectrum-css/table" "^3.0.1"
+    "@spectrum-css/tabs" "^3.2.12"
+    "@spectrum-css/tags" "^3.0.2"
+    "@spectrum-css/textfield" "^3.0.1"
+    "@spectrum-css/toast" "^3.0.1"
+    "@spectrum-css/tooltip" "^3.0.3"
+    "@spectrum-css/treeview" "^3.0.2"
+    "@spectrum-css/typography" "^3.0.1"
+    "@spectrum-css/underlay" "^2.0.9"
+    "@spectrum-css/vars" "^3.0.1"
+    dayjs "^1.10.4"
+    easymde "^2.16.1"
+    svelte-flatpickr "^3.2.3"
+    svelte-portal "^1.0.0"
+
 "@budibase/bbui@^0.9.139":
   version "0.9.190"
   resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81"
@@ -1180,6 +1233,71 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
+"@budibase/client@2.0.30-alpha.7":
+  version "2.0.30-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.0.30-alpha.7.tgz#1243ba442e966574def4b146734266b5b8f9b83c"
+  integrity sha512-mSe97YjLDwm7cKt+ujT/DwedDz19Dkw/m9kyLp2PlmzlnBnzmP/H6vjHvLGBO8nDUbKoYy8MJwR3OQeiwSEimw==
+  dependencies:
+    "@budibase/bbui" "2.0.30-alpha.7"
+    "@budibase/frontend-core" "2.0.30-alpha.7"
+    "@budibase/string-templates" "2.0.30-alpha.7"
+    "@spectrum-css/button" "^3.0.3"
+    "@spectrum-css/card" "^3.0.3"
+    "@spectrum-css/divider" "^1.0.3"
+    "@spectrum-css/link" "^3.1.3"
+    "@spectrum-css/page" "^3.0.1"
+    "@spectrum-css/tag" "^3.1.4"
+    "@spectrum-css/typography" "^3.0.2"
+    "@spectrum-css/vars" "^3.0.1"
+    apexcharts "^3.22.1"
+    dayjs "^1.10.5"
+    downloadjs "1.4.7"
+    html5-qrcode "^2.2.1"
+    leaflet "^1.7.1"
+    regexparam "^1.3.0"
+    sanitize-html "^2.7.0"
+    screenfull "^6.0.1"
+    shortid "^2.2.15"
+    socket.io-client "^4.5.1"
+    svelte "^3.49.0"
+    svelte-apexcharts "^1.0.2"
+    svelte-flatpickr "^3.1.0"
+    svelte-spa-router "^3.0.5"
+
+"@budibase/frontend-core@2.0.30-alpha.7":
+  version "2.0.30-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.0.30-alpha.7.tgz#86f73b28db3bf9208a772296c13bc0765f898bb0"
+  integrity sha512-Vy14lDwx5MesXH3mX031QR+qUaOZmlV7PzPR0tXHAv/vxZHSc6SwUiKNdT1bpHEw0qLnm4jtsZpKGbO9FqFw+w==
+  dependencies:
+    "@budibase/bbui" "2.0.30-alpha.7"
+    lodash "^4.17.21"
+    svelte "^3.46.2"
+
+"@budibase/handlebars-helpers@^0.11.8":
+  version "0.11.8"
+  resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841"
+  integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ==
+  dependencies:
+    array-sort "^1.0.0"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    for-in "^1.0.2"
+    get-object "^0.2.0"
+    get-value "^3.0.1"
+    handlebars "^4.7.7"
+    handlebars-utils "^1.0.6"
+    has-value "^2.0.2"
+    helper-md "^0.2.2"
+    html-tag "^2.0.0"
+    is-even "^1.0.0"
+    is-glob "^4.0.1"
+    kind-of "^6.0.3"
+    micromatch "^3.1.5"
+    relative "^3.0.2"
+    striptags "^3.1.1"
+    to-gfm-code-block "^0.1.1"
+    year "^0.2.1"
+
 "@budibase/pro@2.0.30-alpha.7":
   version "2.0.30-alpha.7"
   resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.7.tgz#1432b47141b305666dc005c5fc5a02d9cd38cf6a"
@@ -1209,6 +1327,18 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
+"@budibase/string-templates@2.0.30-alpha.7":
+  version "2.0.30-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.0.30-alpha.7.tgz#f26ea4b16587acdbbf2368659585437b03df9f7d"
+  integrity sha512-EtWyN3TElpLE7YfHjM4hyhehmhbr6xcMt/MiT+6Yy/MZlloB5QT4x3UMKX4SriKwNSlK2UYsHLCzt7Ho1V8DqA==
+  dependencies:
+    "@budibase/handlebars-helpers" "^0.11.8"
+    dayjs "^1.10.4"
+    handlebars "^4.7.6"
+    handlebars-utils "^1.0.6"
+    lodash "^4.17.20"
+    vm2 "^3.9.4"
+
 "@budibase/types@2.0.30-alpha.7":
   version "2.0.30-alpha.7"
   resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.7.tgz#fe85563eb42ce01869e653a790a7f213ea2d6308"
@@ -2467,6 +2597,11 @@
   resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.23.tgz#c218560d472e13a3e0d1499b762df1206dcffbfd"
   integrity sha512-4IFw2/HMQJRzM0M2c5na/HeY7y5vJoGpMFBkXNpQyhW4TRo7N1rGwYQ5dRD3s4OVEWV4/rjfGV0d/qhfwKUTog==
 
+"@spectrum-css/slider@3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/slider/-/slider-3.0.1.tgz#5281e6f47eb5a4fd3d1816c138bf66d01d7f2e49"
+  integrity sha512-DI2dtMRnQuDM1miVzl3SGyR1khUEKnwdXfO5EHDFwkC3yav43F5QogkfjmjFmWWobMVovdJlAuiaaJ/IHejD0Q==
+
 "@spectrum-css/statuslight@^3.0.2":
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.8.tgz#3b0ea80712573679870a85d469850230e794a0f7"
@@ -2492,6 +2627,16 @@
   resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.16.tgz#c3f7800d8d6f7c9930c28cd01354816328bf72b1"
   integrity sha512-JUcMB/fiDG/KoyrVstlUMacFJUY4OHKqhMRuPtu9ggUXWCRbSkY8he92v6u0HwY3DuhDoOxNTK8d/PLjk/fsbg==
 
+"@spectrum-css/tabs@^3.2.12":
+  version "3.2.20"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.20.tgz#f8c139402619e2b9cda14da31d21f3bd9b0f14a3"
+  integrity sha512-wfKFLJpjvx22mXZht+FTK5dYw7t/kkwK/dNwM+Fa8nxn7N97WH392iy+wEgqXPU4HJmgUWxaZANITOaAw4sa0A==
+
+"@spectrum-css/tag@^3.1.4":
+  version "3.3.14"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/tag/-/tag-3.3.14.tgz#2d1ca0759da6a3a2970d14bcabf33bd4a8f63a5f"
+  integrity sha512-S4RUaxN/83Pr/SYkQHeZNh2NXmtumUEzhrsrrliI6bAt3bjs+mLresTGd9qkIX2+Ycq1JHWTr0HTga4ti1YYyA==
+
 "@spectrum-css/tags@^3.0.2":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.3.tgz#fc76d2735cdc442de91b7eb3bee49a928c0767ac"
@@ -2656,19 +2801,18 @@
   dependencies:
     bson "*"
 
-"@types/bull@3.15.8":
-  version "3.15.8"
-  resolved "https://registry.yarnpkg.com/@types/bull/-/bull-3.15.8.tgz#ae2139f94490d740b37c8da5d828ce75dd82ce7c"
-  integrity sha512-8DbSPMSsZH5PWPnGEkAZLYgJEH4ghHJNKF7LB6Wr5R0/v6g+Vs+JoaA7kcvLtHE936xg2WpFPkaoaJgExOmKDw==
-  dependencies:
-    "@types/ioredis" "*"
-    "@types/redis" "^2.8.0"
-
 "@types/caseless@*":
   version "0.12.2"
   resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8"
   integrity sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==
 
+"@types/codemirror@^5.60.4":
+  version "5.60.5"
+  resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-5.60.5.tgz#5b989a3b4bbe657458cf372c92b6bfda6061a2b7"
+  integrity sha512-TiECZmm8St5YxjFUp64LK0c8WU5bxMDt9YaAek1UqUb9swrSCoJhh92fWu1p3mTEqlHjhB5sY7OFBhWroJXZVg==
+  dependencies:
+    "@types/tern" "*"
+
 "@types/connect@*":
   version "3.4.35"
   resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
@@ -2780,7 +2924,7 @@
   resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-1.8.2.tgz#7315b4c4c54f82d13fa61c228ec5c2ea5cc9e0e1"
   integrity sha512-EqX+YQxINb+MeXaIqYDASb6U6FCHbWjkj4a1CKDBks3d/QiB2+PqBLyO72vLDgAO1wUI4O+9gweRcQK11bTL/w==
 
-"@types/ioredis@*":
+"@types/ioredis@^4.28.10":
   version "4.28.10"
   resolved "https://registry.yarnpkg.com/@types/ioredis/-/ioredis-4.28.10.tgz#40ceb157a4141088d1394bb87c98ed09a75a06ff"
   integrity sha512-69LyhUgrXdgcNDv7ogs1qXZomnfOEnSmrmMFqKgt1XMJxmoOSG/u3wYy13yACIfKuMJ8IhKgHafDO3sx19zVQQ==
@@ -2884,6 +3028,11 @@
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
   integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
 
+"@types/marked@^4.0.7":
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.7.tgz#400a76809fd08c2bbd9e25f3be06ea38c8e0a1d3"
+  integrity sha512-eEAhnz21CwvKVW+YvRvcTuFKNU9CV1qH+opcgVK3pIMI6YZzDm6gc8o2vHjldFk6MGKt5pueSB7IOpvpx5Qekw==
+
 "@types/mime@^1":
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
@@ -2973,13 +3122,6 @@
   dependencies:
     redis "*"
 
-"@types/redis@^2.8.0":
-  version "2.8.32"
-  resolved "https://registry.yarnpkg.com/@types/redis/-/redis-2.8.32.tgz#1d3430219afbee10f8cfa389dad2571a05ecfb11"
-  integrity sha512-7jkMKxcGq9p242exlbsVzuJb57KqHRhNl4dHoQu2Y5v9bCAbtIXXH0R3HleSQW4CTOqpHIYUW3t6tpUj4BVQ+w==
-  dependencies:
-    "@types/node" "*"
-
 "@types/request@^2.48.7":
   version "2.48.8"
   resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.8.tgz#0b90fde3b655ab50976cb8c5ac00faca22f5a82c"
@@ -3016,6 +3158,13 @@
     "@types/cookiejar" "*"
     "@types/node" "*"
 
+"@types/tern@*":
+  version "0.23.4"
+  resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.4.tgz#03926eb13dbeaf3ae0d390caf706b2643a0127fb"
+  integrity sha512-JAUw1iXGO1qaWwEOzxTKJZ/5JxVeON9kvGZ/osgZaJImBnyjyn0cjovPsf6FNLmyGY8Vw9DoXZCMlfMkMwHRWg==
+  dependencies:
+    "@types/estree" "*"
+
 "@types/tough-cookie@*":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
@@ -3627,7 +3776,7 @@ arg@^4.1.0:
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
-argparse@^1.0.7:
+argparse@^1.0.10, argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
@@ -3674,6 +3823,15 @@ array-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
   integrity sha512-H3LU5RLiSsGXPhN+Nipar0iR0IofH+8r89G2y1tBKxQ/agagKyAjhkAFDRBfodP2caPrNKHpAWNIM/c9yeL7uA==
 
+array-sort@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a"
+  integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==
+  dependencies:
+    default-compare "^1.0.0"
+    get-value "^2.0.6"
+    kind-of "^5.0.2"
+
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -3824,6 +3982,13 @@ atomic-sleep@^1.0.0:
   resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b"
   integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==
 
+autolinker@~0.28.0:
+  version "0.28.1"
+  resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47"
+  integrity sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ==
+  dependencies:
+    gulp-header "^1.7.1"
+
 available-typed-arrays@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
@@ -4378,10 +4543,10 @@ buffer@^5.1.0, buffer@^5.2.0, buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-bull@4.8.5:
-  version "4.8.5"
-  resolved "https://registry.yarnpkg.com/bull/-/bull-4.8.5.tgz#eebafddc3249d6d5e8ced1c42b8bfa8efcc274aa"
-  integrity sha512-2Z630e4f6VsLJnWMAtfEHwIqJYmND4W3dcG48RIbXeWpvb4UnYtpe/zxEdslJu0PKrltB4IkFj5YtBsdeQRn8w==
+bull@4.10.1:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/bull/-/bull-4.10.1.tgz#f14974b6089358b62b495a2cbf838aadc098e43f"
+  integrity sha512-Fp21tRPb2EaZPVfmM+ONZKVz2RA+to+zGgaTLyCKt3JMSU8OOBqK8143OQrnGuGpsyE5G+9FevFAGhdZZfQP2g==
   dependencies:
     cron-parser "^4.2.1"
     debuglog "^1.0.0"
@@ -4673,6 +4838,18 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
+codemirror-spell-checker@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz#1c660f9089483ccb5113b9ba9ca19c3f4993371e"
+  integrity sha512-2Tl6n0v+GJRsC9K3MLCdLaMOmvWL0uukajNJseorZJsslaxZyZMgENocPU8R0DyoTAiKsyqiemSOZo7kjGV0LQ==
+  dependencies:
+    typo-js "*"
+
+codemirror@^5.63.1:
+  version "5.65.9"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.9.tgz#ec70c92aa206ee4c9853d5f1e7c4ed356cdab68c"
+  integrity sha512-19Jox5sAKpusTDgqgKB5dawPpQcY+ipQK7xoEI+MVucEF9qqFaXpeqY1KaoyGBso/wHQoDa4HMMxMjdsS3Zzzw==
+
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
@@ -4823,6 +5000,13 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
+concat-with-sourcemaps@*:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
+  integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
+  dependencies:
+    source-map "^0.6.1"
+
 condense-newlines@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/condense-newlines/-/condense-newlines-0.2.1.tgz#3de985553139475d32502c83b02f60684d24c55f"
@@ -5236,6 +5420,13 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
+default-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f"
+  integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==
+  dependencies:
+    kind-of "^5.0.2"
+
 default-shell@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/default-shell/-/default-shell-1.0.1.tgz#752304bddc6174f49eb29cb988feea0b8813c8bc"
@@ -5408,11 +5599,25 @@ doctrine@3.0.0, doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
+dom-serializer@^1.0.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
+  integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^4.2.0"
+    entities "^2.0.0"
+
 dom-walk@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
   integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
 
+domelementtype@^2.0.1, domelementtype@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
+  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
+
 domexception@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
@@ -5427,6 +5632,22 @@ domexception@^2.0.1:
   dependencies:
     webidl-conversions "^5.0.0"
 
+domhandler@^4.0.0, domhandler@^4.2.0:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
+  integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
+  dependencies:
+    domelementtype "^2.2.0"
+
+domutils@^2.5.2:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
+  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
+  dependencies:
+    dom-serializer "^1.0.1"
+    domelementtype "^2.2.0"
+    domhandler "^4.2.0"
+
 dot-prop@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
@@ -5471,6 +5692,11 @@ download@8.0.0:
     p-event "^2.1.0"
     pify "^4.0.1"
 
+downloadjs@1.4.7:
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/downloadjs/-/downloadjs-1.4.7.tgz#f69f96f940e0d0553dac291139865a3cd0101e3c"
+  integrity sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q==
+
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
@@ -5486,6 +5712,17 @@ duplexify@^4.0.0:
     readable-stream "^3.1.1"
     stream-shift "^1.0.0"
 
+easymde@^2.16.1:
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/easymde/-/easymde-2.18.0.tgz#ff1397d07329b1a7b9187d2d0c20766fa16b3b1b"
+  integrity sha512-IxVVUxNWIoXLeqtBU4BLc+eS/ScYhT1Dcb6yF5Wchoj1iXAV+TIIDWx+NCaZhY7RcSHqDPKllbYq7nwGKILnoA==
+  dependencies:
+    "@types/codemirror" "^5.60.4"
+    "@types/marked" "^4.0.7"
+    codemirror "^5.63.1"
+    codemirror-spell-checker "1.1.2"
+    marked "^4.1.0"
+
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -5643,6 +5880,17 @@ end-stream@~0.1.0:
   dependencies:
     write-stream "~0.4.3"
 
+engine.io-client@~6.2.3:
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.2.3.tgz#a8cbdab003162529db85e9de31575097f6d29458"
+  integrity sha512-aXPtgF1JS3RuuKcpSrBtimSjYvrbhKW9froICH4s0F3XQWLxsKNxqzG39nnvQZQnva4CMvUK63T7shevxRyYHw==
+  dependencies:
+    "@socket.io/component-emitter" "~3.1.0"
+    debug "~4.3.1"
+    engine.io-parser "~5.0.3"
+    ws "~8.2.3"
+    xmlhttprequest-ssl "~2.0.0"
+
 engine.io-parser@~5.0.3:
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0"
@@ -5672,6 +5920,16 @@ enhanced-resolve@^5.9.3:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
+ent@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
+  integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==
+
+entities@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
+  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
+
 entities@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
@@ -6683,6 +6941,11 @@ fs-constants@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
+fs-exists-sync@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
+  integrity sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==
+
 fs-extra@8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -6831,6 +7094,14 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.3"
 
+get-object@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c"
+  integrity sha512-7P6y6k6EzEFmO/XyUyFlXm1YLJy9xeA1x/grNV8276abX5GuwUtYgKFkRFkLixw4hf4Pz9q2vgv/8Ar42R0HuQ==
+  dependencies:
+    is-number "^2.0.2"
+    isobject "^0.2.0"
+
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
@@ -6893,6 +7164,13 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
 
+get-value@^3.0.0, get-value@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8"
+  integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA==
+  dependencies:
+    isobject "^3.0.1"
+
 getopts@2.2.5:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.2.5.tgz#67a0fe471cacb9c687d817cab6450b96dde8313b"
@@ -7198,7 +7476,24 @@ gtoken@^5.0.4:
     google-p12-pem "^3.1.3"
     jws "^4.0.0"
 
-handlebars@^4.7.7:
+gulp-header@^1.7.1:
+  version "1.8.12"
+  resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84"
+  integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ==
+  dependencies:
+    concat-with-sourcemaps "*"
+    lodash.template "^4.4.0"
+    through2 "^2.0.0"
+
+handlebars-utils@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9"
+  integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw==
+  dependencies:
+    kind-of "^6.0.0"
+    typeof-article "^0.1.1"
+
+handlebars@^4.7.6, handlebars@^4.7.7:
   version "4.7.7"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
   integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
@@ -7292,6 +7587,14 @@ has-value@^1.0.0:
     has-values "^1.0.0"
     isobject "^3.0.0"
 
+has-value@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658"
+  integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA==
+  dependencies:
+    get-value "^3.0.0"
+    has-values "^2.0.1"
+
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
@@ -7305,6 +7608,13 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
+has-values@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d"
+  integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w==
+  dependencies:
+    kind-of "^6.0.2"
+
 has-yarn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
@@ -7317,6 +7627,16 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+helper-md@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f"
+  integrity sha512-49TaQzK+Ic7ZVTq4i1UZxRUJEmAilTk8hz7q4I0WNUaTclLR8ArJV5B3A1fe1xF2HtsDTr2gYKLaVTof/Lt84Q==
+  dependencies:
+    ent "^2.2.0"
+    extend-shallow "^2.0.1"
+    fs-exists-sync "^0.1.0"
+    remarkable "^1.6.2"
+
 homedir-polyfill@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
@@ -7353,6 +7673,29 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
+html-tag@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed"
+  integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g==
+  dependencies:
+    is-self-closing "^1.0.1"
+    kind-of "^6.0.0"
+
+html5-qrcode@^2.2.1:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/html5-qrcode/-/html5-qrcode-2.2.3.tgz#5acb826860365e7c7ab91e1e14528ea16a502e8a"
+  integrity sha512-9CtEz5FVT56T76entiQxyrASzBWl8Rm30NHiQH8T163Eml5LS14BoZlYel9igxbikOt7O8KhvrT3awN1Y2HMqw==
+
+htmlparser2@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
+  integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^4.0.0"
+    domutils "^2.5.2"
+    entities "^2.0.0"
+
 http-assert@^1.3.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.5.0.tgz#c389ccd87ac16ed2dfa6246fd73b926aa00e6b8f"
@@ -7819,6 +8162,13 @@ is-docker@^2.0.0, is-docker@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
+is-even@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06"
+  integrity sha512-LEhnkAdJqic4Dbqn58A0y52IXoHWlsueqQkKfMfdEnIYG8A1sm/GHidKkS6yvXlMoRrkM34csHnXQtOqcb+Jzg==
+  dependencies:
+    is-odd "^0.1.2"
+
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -7925,6 +8275,13 @@ is-number-object@^1.0.4:
   dependencies:
     has-tostringtag "^1.0.0"
 
+is-number@^2.0.2:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==
+  dependencies:
+    kind-of "^3.0.2"
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -7947,6 +8304,13 @@ is-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf"
   integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==
 
+is-odd@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7"
+  integrity sha512-Ri7C2K7o5IrUU9UEI8losXJCCD/UtsaIrkR5sxIcFg4xQ9cRJXlWA5DQvTE0yDc0krvSNLsRGXN11UPS6KyfBw==
+  dependencies:
+    is-number "^3.0.0"
+
 is-path-inside@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
@@ -7964,6 +8328,11 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-plain-object@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
 is-potential-custom-element-name@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
@@ -7992,6 +8361,13 @@ is-retry-allowed@^2.2.0:
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d"
   integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==
 
+is-self-closing@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4"
+  integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg==
+  dependencies:
+    self-closing-tags "^1.0.1"
+
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
@@ -8102,6 +8478,11 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
+isobject@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e"
+  integrity sha512-VaWq6XYAsbvM0wf4dyBO7WH9D7GosB7ZZlqrawI9BBiTMINBeCyqSKBa35m870MY3O4aM31pYyZi9DfGrYMJrQ==
+
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
@@ -9277,7 +9658,7 @@ keyv@^3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
@@ -9291,12 +9672,12 @@ kind-of@^4.0.0:
   dependencies:
     is-buffer "^1.1.5"
 
-kind-of@^5.0.0:
+kind-of@^5.0.0, kind-of@^5.0.2:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
-kind-of@^6.0.0, kind-of@^6.0.2:
+kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
@@ -9511,6 +9892,11 @@ lcid@^2.0.0:
   dependencies:
     invert-kv "^2.0.0"
 
+leaflet@^1.7.1:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.2.tgz#168b6c6ef1d4d1e8409bde2c4ad050c249c4dbe6"
+  integrity sha512-Kc77HQvWO+y9y2oIs3dn5h5sy2kr3j41ewdqCMEUA4N89lgfUUfOBy7wnnHEstDpefiGFObq12FdopGRMx4J7g==
+
 left-pad@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
@@ -9705,6 +10091,11 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+lodash._reinterpolate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==
+
 lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
@@ -9815,6 +10206,21 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==
 
+lodash.template@^4.4.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
+  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+    lodash.templatesettings "^4.0.0"
+
+lodash.templatesettings@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
+  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+
 lodash.without@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac"
@@ -9825,7 +10231,7 @@ lodash.xor@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.xor/-/lodash.xor-4.5.0.tgz#4d48ed7e98095b0632582ba714d3ff8ae8fb1db6"
   integrity sha512-sVN2zimthq7aZ5sPGXnSz32rZPuqcparVW50chJQe+mzTYV+IsxSsl/2gnkWWE2Of7K3myBQBqtLKOUEHJKRsQ==
 
-lodash@4.17.21, lodash@^4.14.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.7.0:
+lodash@4.17.21, lodash@^4.14.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -9967,6 +10373,11 @@ markdown-it@^12.2.0:
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
+marked@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-4.1.1.tgz#2f709a4462abf65a283f2453dc1c42ab177d302e"
+  integrity sha512-0cNMnTcUJPxbA6uWmCmjWz4NJRe/0Xfk2NhXCUHjew9qJzFN20krFnsUe7QynwqOwa5m1fZ4UDg0ycKFVC0ccw==
+
 matcher@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca"
@@ -10062,7 +10473,7 @@ methods@^1.1.1, methods@^1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
-micromatch@^3.1.10, micromatch@^3.1.4:
+micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.5:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -10353,6 +10764,16 @@ nan@^2.12.1:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916"
   integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==
 
+nanoid@^2.1.0:
+  version "2.1.11"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280"
+  integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==
+
+nanoid@^3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
+  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
+
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -11009,6 +11430,11 @@ parse-passwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
 
+parse-srcset@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1"
+  integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==
+
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
@@ -11370,6 +11796,15 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==
 
+postcss@^8.3.11:
+  version "8.4.18"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.18.tgz#6d50046ea7d3d66a85e0e782074e7203bc7fbca2"
+  integrity sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==
+  dependencies:
+    nanoid "^3.3.4"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
 postgres-array@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e"
@@ -12114,6 +12549,16 @@ regexp.prototype.flags@^1.4.3:
     define-properties "^1.1.3"
     functions-have-names "^1.2.2"
 
+regexparam@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-2.0.1.tgz#c912f5dae371e3798100b3c9ce22b7414d0889fa"
+  integrity sha512-zRgSaYemnNYxUv+/5SeoHI0eJIgTL/A2pUtXUPLHQxUldagouJ9p+K6IbIZ/JiQuCEv2E2B1O11SjVQy3aMCkw==
+
+regexparam@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f"
+  integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g==
+
 regexpp@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
@@ -12162,6 +12607,21 @@ relative-microtime@^2.0.0:
   resolved "https://registry.yarnpkg.com/relative-microtime/-/relative-microtime-2.0.0.tgz#cceed2af095ecd72ea32011279c79e5fcc7de29b"
   integrity sha512-l18ha6HEZc+No/uK4GyAnNxgKW7nvEe35IaeN54sShMojtqik2a6GbTyuiezkjpPaqP874Z3lW5ysBo5irz4NA==
 
+relative@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f"
+  integrity sha512-Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA==
+  dependencies:
+    isobject "^2.0.0"
+
+remarkable@^1.6.2:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00"
+  integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg==
+  dependencies:
+    argparse "^1.0.10"
+    autolinker "~0.28.0"
+
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -12449,6 +12909,18 @@ sane@^4.0.3:
     minimist "^1.1.1"
     walker "~1.0.5"
 
+sanitize-html@^2.7.0:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.7.2.tgz#54c5189af75e3237d996e4b9a5e3eaad12c7f7fc"
+  integrity sha512-DggSTe7MviO+K4YTCwprG6W1vsG+IIX67yp/QY55yQqKCJYSWzCA1rZbaXzkjoKeL9+jqwm56wD6srYLtUNivg==
+  dependencies:
+    deepmerge "^4.2.2"
+    escape-string-regexp "^4.0.0"
+    htmlparser2 "^6.0.0"
+    is-plain-object "^5.0.0"
+    parse-srcset "^1.0.2"
+    postcss "^8.3.11"
+
 sanitize-s3-objectkey@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/sanitize-s3-objectkey/-/sanitize-s3-objectkey-0.0.1.tgz#efa9887cd45275b40234fb4bb12fc5754fe64e7e"
@@ -12487,6 +12959,11 @@ schema-utils@^3.1.0, schema-utils@^3.1.1:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
+screenfull@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-6.0.2.tgz#3dbe4b8c4f8f49fb8e33caa8f69d0bca730ab238"
+  integrity sha512-AQdy8s4WhNvUZ6P8F6PB21tSPIYKniic+Ogx0AacBMjKP1GUHN2E9URxQHtCusiwxudnCKkdy4GrHXPPJSkCCw==
+
 search-params@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/search-params/-/search-params-3.0.0.tgz#dbc7c243058e5a33ae1e9870be91f5aced4100d8"
@@ -12504,6 +12981,11 @@ seek-bzip@^1.0.5:
   dependencies:
     commander "^2.8.1"
 
+self-closing-tags@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d"
+  integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA==
+
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
@@ -12649,6 +13131,13 @@ shimmer@^1.2.0:
   resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
   integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
 
+shortid@^2.2.15:
+  version "2.2.16"
+  resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608"
+  integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g==
+  dependencies:
+    nanoid "^2.1.0"
+
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -12789,6 +13278,16 @@ socket.io-adapter@~2.4.0:
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz#b50a4a9ecdd00c34d4c8c808224daa1a786152a6"
   integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==
 
+socket.io-client@^4.5.1:
+  version "4.5.3"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.5.3.tgz#bed69209d001465b2fea650d2e95c1e82768ab5e"
+  integrity sha512-I/hqDYpQ6JKwtJOf5ikM+Qz+YujZPMEl6qBLhxiP0nX+TfXKhW4KZZG8lamrD6Y5ngjmYHreESVasVCgi5Kl3A==
+  dependencies:
+    "@socket.io/component-emitter" "~3.1.0"
+    debug "~4.3.2"
+    engine.io-client "~6.2.3"
+    socket.io-parser "~4.2.0"
+
 socket.io-parser@~4.2.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5"
@@ -12851,6 +13350,11 @@ source-list-map@^2.0.1:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
+source-map-js@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+
 source-map-resolve@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
@@ -13252,6 +13756,11 @@ strip-outer@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
+striptags@^3.1.1:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052"
+  integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==
+
 style-loader@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575"
@@ -13351,11 +13860,23 @@ svelte-portal@^1.0.0:
   resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3"
   integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q==
 
+svelte-spa-router@^3.0.5:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/svelte-spa-router/-/svelte-spa-router-3.3.0.tgz#2fc0967a49dc361dfe4d38dddad6e662eed5b42c"
+  integrity sha512-cwRNe7cxD43sCvSfEeaKiNZg3FCizGxeMcf7CPiWRP3jKXjEma3vxyyuDtPOam6nWbVxl9TNM3hlE/i87ZlqcQ==
+  dependencies:
+    regexparam "2.0.1"
+
 svelte@3.49.0:
   version "3.49.0"
   resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.49.0.tgz#5baee3c672306de1070c3b7888fc2204e36a4029"
   integrity sha512-+lmjic1pApJWDfPCpUUTc1m8azDqYCG1JN9YEngrx/hUyIcFJo6VZhj0A1Ai0wqoHcEIuQy+e9tk+4uDgdtsFA==
 
+svelte@^3.46.2, svelte@^3.49.0:
+  version "3.52.0"
+  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.52.0.tgz#08259eff20904c63882b66a5d409a55e8c6743b8"
+  integrity sha512-FxcnEUOAVfr10vDU5dVgJN19IvqeHQCS1zfe8vayTfis9A2t5Fhx+JDe5uv/C3j//bB1umpLJ6quhgs9xyUbCQ==
+
 svg.draggable.js@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz#c514a2f1405efb6f0263e7958f5b68fce50603ba"
@@ -13713,6 +14234,11 @@ to-fast-properties@^2.0.0:
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
+to-gfm-code-block@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82"
+  integrity sha512-LQRZWyn8d5amUKnfR9A9Uu7x9ss7Re8peuWR2gkh1E+ildOfv2aF26JpuDg8JtvCduu5+hOrMIH+XstZtnagqg==
+
 to-json-schema@0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/to-json-schema/-/to-json-schema-0.2.5.tgz#ef3c3f11ad64460dcfbdbafd0fd525d69d62a98f"
@@ -13978,6 +14504,13 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
+typeof-article@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af"
+  integrity sha512-Vn42zdX3FhmUrzEmitX3iYyLb+Umwpmv8fkZRIknYh84lmdrwqZA5xYaoKiIj2Rc5i/5wcDrpUmZcbk1U51vTw==
+  dependencies:
+    kind-of "^3.1.0"
+
 typeof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/typeof/-/typeof-1.0.0.tgz#9c84403f2323ae5399167275497638ea1d2f2440"
@@ -13988,6 +14521,11 @@ typescript@4.6.2:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4"
   integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==
 
+typo-js@*:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.2.tgz#340484d81fe518e77c81a5a770162b14492f183b"
+  integrity sha512-C7pYBQK17EjSg8tVNY91KHdUt5Nf6FMJ+c3js076quPmBML57PmNMzAcIq/2kf/hSYtFABNDIYNYlJRl5BJhGw==
+
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
@@ -14317,7 +14855,7 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vm2@3.9.11:
+vm2@3.9.11, vm2@^3.9.4:
   version "3.9.11"
   resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.11.tgz#a880f510a606481719ec3f9803b940c5805a06fe"
   integrity sha512-PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg==
@@ -14776,6 +15314,11 @@ xmlchars@^2.2.0:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
+xmlhttprequest-ssl@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67"
+  integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==
+
 xpath.js@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/xpath.js/-/xpath.js-1.1.0.tgz#3816a44ed4bb352091083d002a383dd5104a5ff1"
@@ -14896,6 +15439,11 @@ yauzl@^2.4.2:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
+year@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0"
+  integrity sha512-9GnJUZ0QM4OgXuOzsKNzTJ5EOkums1Xc+3YQXp+Q+UxFjf7zLucp9dQ8QMIft0Szs1E1hUiXFim1OYfEKFq97w==
+
 ylru@^1.2.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.3.2.tgz#0de48017473275a4cbdfc83a1eaf67c01af8a785"
diff --git a/packages/types/src/documents/app/backup.ts b/packages/types/src/documents/app/backup.ts
index f7b6239b4f..1dd7b45287 100644
--- a/packages/types/src/documents/app/backup.ts
+++ b/packages/types/src/documents/app/backup.ts
@@ -8,6 +8,7 @@ export enum AppBackupType {
 
 export enum AppBackupStatus {
   STARTED = "started",
+  PENDING = "pending",
   COMPLETE = "complete",
   FAILED = "failed",
 }
diff --git a/packages/types/src/sdk/koa.ts b/packages/types/src/sdk/koa.ts
index 1b48d95015..56666f7e2a 100644
--- a/packages/types/src/sdk/koa.ts
+++ b/packages/types/src/sdk/koa.ts
@@ -9,6 +9,7 @@ export interface ContextUser extends User {
 
 export interface BBContext {
   user?: ContextUser
+  status?: number
   request: {
     body: any
   }

From 89dd9b259d7b4d963b87fd2ccf624adcbd38fb11 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 21 Oct 2022 18:33:58 +0100
Subject: [PATCH 090/151] Adding in new pending state.

---
 .../components/portal/overview/backups/StatusRenderer.svelte    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte b/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte
index 95834b024e..a30ecde98b 100644
--- a/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte
@@ -6,7 +6,7 @@
 </script>
 
 <Badge
-  grey={value === "started"}
+  grey={value === "started" || value === "pending"}
   green={value === "complete"}
   red={value === "failed"}
   size="S"

From e1dca87507da2deae2a22261d5c23a3d613f6654 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 21 Oct 2022 18:52:39 +0100
Subject: [PATCH 091/151] Fixing test case.

---
 .../src/api/routes/tests/backup.spec.js       |  2 +-
 .../server/src/sdk/app/backups/exports.ts     | 10 +++-
 .../internal-api/TestConfiguration/screens.ts | 38 +++++++-------
 .../config/internal-api/fixtures/screens.ts   | 50 +++++++++----------
 .../internal-api/screens/screens.spec.ts      | 33 ++++++++----
 5 files changed, 75 insertions(+), 58 deletions(-)

diff --git a/packages/server/src/api/routes/tests/backup.spec.js b/packages/server/src/api/routes/tests/backup.spec.js
index 7f92a4f3d1..7863129c75 100644
--- a/packages/server/src/api/routes/tests/backup.spec.js
+++ b/packages/server/src/api/routes/tests/backup.spec.js
@@ -21,7 +21,7 @@ describe("/backups", () => {
         .set(config.defaultHeaders())
         .expect(200)
       expect(res.text).toBeDefined()
-      expect(res.text.includes(`"db_name":"${config.getAppId()}"`)).toEqual(true)
+      expect(res.headers["content-type"]).toEqual("application/gzip")
       expect(events.app.exported.mock.calls.length).toBe(1)
     })
 
diff --git a/packages/server/src/sdk/app/backups/exports.ts b/packages/server/src/sdk/app/backups/exports.ts
index 26277fcd66..8de51ed1e6 100644
--- a/packages/server/src/sdk/app/backups/exports.ts
+++ b/packages/server/src/sdk/app/backups/exports.ts
@@ -1,7 +1,7 @@
 import { db as dbCore } from "@budibase/backend-core"
 import { budibaseTempDir } from "../../../utilities/budibaseDir"
 import { retrieveDirectory } from "../../../utilities/fileSystem/utilities"
-import { streamFile } from "../../../utilities/fileSystem"
+import { streamFile, createTempFolder } from "../../../utilities/fileSystem"
 import { ObjectStoreBuckets } from "../../../constants"
 import {
   LINK_USER_METADATA_PREFIX,
@@ -11,6 +11,7 @@ import {
 import { DB_EXPORT_FILE, GLOBAL_DB_EXPORT_FILE } from "./constants"
 import fs from "fs"
 import { join } from "path"
+import env from "../../../environment"
 const uuid = require("uuid/v4")
 const tar = require("tar")
 const MemoryStream = require("memorystream")
@@ -85,7 +86,12 @@ export async function exportApp(appId: string, config?: ExportOpts) {
   const prodAppId = dbCore.getProdAppID(appId)
   const appPath = `${prodAppId}/`
   // export bucket contents
-  const tmpPath = await retrieveDirectory(ObjectStoreBuckets.APPS, appPath)
+  let tmpPath
+  if (!env.isTest()) {
+    tmpPath = await retrieveDirectory(ObjectStoreBuckets.APPS, appPath)
+  } else {
+    tmpPath = createTempFolder(uuid())
+  }
   const downloadedPath = join(tmpPath, appPath)
   if (fs.existsSync(downloadedPath)) {
     const allFiles = fs.readdirSync(downloadedPath)
diff --git a/qa-core/src/config/internal-api/TestConfiguration/screens.ts b/qa-core/src/config/internal-api/TestConfiguration/screens.ts
index 30c688022a..7814ffdfbc 100644
--- a/qa-core/src/config/internal-api/TestConfiguration/screens.ts
+++ b/qa-core/src/config/internal-api/TestConfiguration/screens.ts
@@ -1,23 +1,23 @@
-import { Screen } from  "@budibase/types"
+import { Screen } from "@budibase/types"
 import { Response } from "node-fetch"
 import InternalAPIClient from "./InternalAPIClient"
-  
-  export default class ScreenApi {
-    api: InternalAPIClient
-  
-    constructor(apiClient: InternalAPIClient) {
-      this.api = apiClient
-    }
-  
-    async create(body: any): Promise<[Response, Screen]> {
-      const response = await this.api.post(`/screens`, { body })
-      const json = await response.json()
-      return [response, json]
-    }
 
-    async delete(screenId: string, rev: string): Promise<[Response, Screen]> {
-      const response = await this.api.del(`/screens/${screenId}/${rev}`)
-      const json = await response.json()
-      return [response, json]
-    }
+export default class ScreenApi {
+  api: InternalAPIClient
+
+  constructor(apiClient: InternalAPIClient) {
+    this.api = apiClient
   }
+
+  async create(body: any): Promise<[Response, Screen]> {
+    const response = await this.api.post(`/screens`, { body })
+    const json = await response.json()
+    return [response, json]
+  }
+
+  async delete(screenId: string, rev: string): Promise<[Response, Screen]> {
+    const response = await this.api.del(`/screens/${screenId}/${rev}`)
+    const json = await response.json()
+    return [response, json]
+  }
+}
diff --git a/qa-core/src/config/internal-api/fixtures/screens.ts b/qa-core/src/config/internal-api/fixtures/screens.ts
index 1ebc1eb5c8..044a35ba83 100644
--- a/qa-core/src/config/internal-api/fixtures/screens.ts
+++ b/qa-core/src/config/internal-api/fixtures/screens.ts
@@ -3,32 +3,32 @@ import generator from "../../generator"
 const randomId = generator.guid()
 
 const generateScreen = (roleId: string): any => ({
-    showNavigation: true,
-    width: "Large",
-    name: randomId,
-    template: "createFromScratch",
-    props: {
-        _id: randomId,
-        _component:
-            "@budibase/standard-components/container",
-        _styles: {
-            normal: {},
-            hover: {},
-            active: {},
-            selected: {}
-        },
-        _children: [],
-        _instanceName: "New Screen",
-        direction: "column",
-        hAlign: "stretch",
-        vAlign: "top",
-        size: "grow",
-        gap: "M"
-    }, routing: {
-        route: "/test",
-        roleId: roleId,
-        homeScreen: false
+  showNavigation: true,
+  width: "Large",
+  name: randomId,
+  template: "createFromScratch",
+  props: {
+    _id: randomId,
+    _component: "@budibase/standard-components/container",
+    _styles: {
+      normal: {},
+      hover: {},
+      active: {},
+      selected: {},
     },
+    _children: [],
+    _instanceName: "New Screen",
+    direction: "column",
+    hAlign: "stretch",
+    vAlign: "top",
+    size: "grow",
+    gap: "M",
+  },
+  routing: {
+    route: "/test",
+    roleId: roleId,
+    homeScreen: false,
+  },
 })
 
 export default generateScreen
diff --git a/qa-core/src/tests/internal-api/screens/screens.spec.ts b/qa-core/src/tests/internal-api/screens/screens.spec.ts
index 68e1022cb4..1e0d647c3c 100644
--- a/qa-core/src/tests/internal-api/screens/screens.spec.ts
+++ b/qa-core/src/tests/internal-api/screens/screens.spec.ts
@@ -2,10 +2,9 @@ import TestConfiguration from "../../../config/internal-api/TestConfiguration"
 import { App } from "@budibase/types"
 import InternalAPIClient from "../../../config/internal-api/TestConfiguration/InternalAPIClient"
 import generateApp from "../../../config/internal-api/fixtures/applications"
-import { Screen } from  "@budibase/types"
+import { Screen } from "@budibase/types"
 import generateScreen from "../../../config/internal-api/fixtures/screens"
 
-
 describe("Internal API - /screens endpoints", () => {
   const api = new InternalAPIClient()
   const config = new TestConfiguration<Screen>(api)
@@ -21,13 +20,17 @@ describe("Internal API - /screens endpoints", () => {
 
   it("POST - Create a screen with each role type", async () => {
     // Create app
-    const [appResponse, app] = await appConfig.applications.create(generateApp())
-    
+    const [appResponse, app] = await appConfig.applications.create(
+      generateApp()
+    )
+
     // Create Screen
     const roleArray = ["BASIC", "POWER", "ADMIN", "PUBLIC"]
     appConfig.applications.api.appId = app.appId
     for (let role in roleArray) {
-      const [response, screen] = await config.screen.create(generateScreen(roleArray[role]))
+      const [response, screen] = await config.screen.create(
+        generateScreen(roleArray[role])
+      )
       expect(response).toHaveStatusCode(200)
       expect(screen.routing.roleId).toEqual(roleArray[role])
     }
@@ -35,11 +38,15 @@ describe("Internal API - /screens endpoints", () => {
 
   it("GET - Fetch screens", async () => {
     // Create app
-    const [appResponse, app] = await appConfig.applications.create(generateApp())
-    
+    const [appResponse, app] = await appConfig.applications.create(
+      generateApp()
+    )
+
     // Create Screen
     appConfig.applications.api.appId = app.appId
-    const [response, screen] = await config.screen.create(generateScreen("BASIC"))
+    const [response, screen] = await config.screen.create(
+      generateScreen("BASIC")
+    )
 
     // Check screen exists
     const [routesResponse, routes] = await appConfig.applications.getRoutes()
@@ -49,11 +56,15 @@ describe("Internal API - /screens endpoints", () => {
 
   it("DELETE - Delete a screen", async () => {
     // Create app
-    const [appResponse, app] = await appConfig.applications.create(generateApp())
-    
+    const [appResponse, app] = await appConfig.applications.create(
+      generateApp()
+    )
+
     // Create Screen
     appConfig.applications.api.appId = app.appId
-    const [screenResponse, screen] = await config.screen.create(generateScreen("BASIC"))
+    const [screenResponse, screen] = await config.screen.create(
+      generateScreen("BASIC")
+    )
 
     // Delete Screen
     const [response] = await config.screen.delete(screen._id!, screen._rev!)

From ce78c5ecb918935a40c767ef1aba7286aa0e9293 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 24 Oct 2022 09:02:50 +0100
Subject: [PATCH 092/151] Refactor app preview event sending to support async
 callbacks in client library

---
 .../[screenId]/_components/AppPreview.svelte  | 236 ++++++++----------
 .../src/components/preview/DNDHandler.svelte  |  24 +-
 packages/client/src/index.js                  |  19 +-
 packages/client/src/stores/builder.js         |  36 ++-
 packages/client/src/stores/dnd.js             |  12 -
 packages/client/src/stores/events.js          |  31 +++
 packages/client/src/stores/index.js           |   2 +-
 packages/client/src/stores/screens.js         |  55 ++--
 8 files changed, 199 insertions(+), 216 deletions(-)
 create mode 100644 packages/client/src/stores/events.js

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index 2a606233c2..9cbb283fef 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -103,7 +103,7 @@
   )
 
   // Register handler to send custom to the preview
-  $: store.actions.preview.registerEventHandler((name, payload) => {
+  $: sendPreviewEvent = (name, payload) => {
     iframe?.contentWindow.postMessage(
       JSON.stringify({
         name,
@@ -112,37 +112,30 @@
         runtimeEvent: true,
       })
     )
-  })
+  }
+  $: store.actions.preview.registerEventHandler(sendPreviewEvent)
 
   // Update the iframe with the builder info to render the correct preview
   const refreshContent = message => {
     iframe?.contentWindow.postMessage(message)
   }
 
-  const receiveMessage = message => {
-    const handlers = {
-      [MessageTypes.READY]: () => {
-        // Initialise the app when mounted
-        if ($store.clientFeatures.messagePassing) {
-          if (!loading) return
-        }
-
-        // Display preview immediately if the intelligent loading feature
-        // is not supported
-        if (!$store.clientFeatures.intelligentLoading) {
-          loading = false
-        }
-        refreshContent(json)
-      },
-      [MessageTypes.ERROR]: event => {
-        // Catch any app errors
-        loading = false
-        error = event.error || "An unknown error occurred"
-      },
+  const receiveMessage = async message => {
+    if (!message?.data?.type) {
+      return
     }
 
-    const messageHandler = handlers[message.data.type] || handleBudibaseEvent
-    messageHandler(message)
+    // Await the event handler
+    try {
+      await handleBudibaseEvent(message)
+    } catch (error) {
+      notifications.error(error || "Error handling event from app preview")
+    }
+
+    // Reply that the event has been completed
+    if (message.data?.id) {
+      sendPreviewEvent("event-completed", message.data?.id)
+    }
   }
 
   const handleBudibaseEvent = async event => {
@@ -150,83 +143,94 @@
     if (!type) {
       return
     }
-
-    try {
-      if (type === "select-component" && data.id) {
-        $store.selectedComponentId = data.id
-        if (!$isActive("./components")) {
-          $goto("./components")
-        }
-      } else if (type === "update-prop") {
-        await store.actions.components.updateSetting(data.prop, data.value)
-      } else if (type === "update-styles") {
-        await store.actions.components.updateStyles(data.styles, data.id)
-      } else if (type === "delete-component" && data.id) {
-        // Legacy type, can be deleted in future
-        confirmDeleteComponent(data.id)
-      } else if (type === "key-down") {
-        const { key, ctrlKey } = data
-        document.dispatchEvent(new KeyboardEvent("keydown", { key, ctrlKey }))
-      } else if (type === "duplicate-component" && data.id) {
-        const rootComponent = get(currentAsset).props
-        const component = findComponent(rootComponent, data.id)
-        store.actions.components.copy(component)
-        await store.actions.components.paste(component)
-      } else if (type === "preview-loaded") {
-        // Wait for this event to show the client library if intelligent
-        // loading is supported
-        loading = false
-      } else if (type === "move-component") {
-        const { componentId, destinationComponentId } = data
-        const rootComponent = get(currentAsset).props
-
-        // Get source and destination components
-        const source = findComponent(rootComponent, componentId)
-        const destination = findComponent(rootComponent, destinationComponentId)
-
-        // Stop if the target is a child of source
-        const path = findComponentPath(source, destinationComponentId)
-        const ids = path.map(component => component._id)
-        if (ids.includes(data.destinationComponentId)) {
-          return
-        }
-
-        // Cut and paste the component to the new destination
-        if (source && destination) {
-          store.actions.components.copy(source, true, false)
-          await store.actions.components.paste(destination, data.mode)
-        }
-      } else if (type === "click-nav") {
-        if (!$isActive("./navigation")) {
-          $goto("./navigation")
-        }
-      } else if (type === "request-add-component") {
-        toggleAddComponent()
-      } else if (type === "highlight-setting") {
-        store.actions.settings.highlight(data.setting)
-
-        // Also scroll setting into view
-        const selector = `[data-cy="${data.setting}-prop-control"`
-        const element = document.querySelector(selector)?.parentElement
-        if (element) {
-          element.scrollIntoView({
-            behavior: "smooth",
-            block: "center",
-          })
-        }
-      } else if (type === "eject-block") {
-        const { id, definition } = data
-        await store.actions.components.handleEjectBlock(id, definition)
-      } else if (type === "reload-plugin") {
-        await store.actions.components.refreshDefinitions()
-      } else if (type === "drop-new-component") {
-        const { component, parent, index } = data
-        await store.actions.components.create(component, null, parent, index)
-      } else {
-        console.warn(`Client sent unknown event type: ${type}`)
+    if (type === MessageTypes.READY) {
+      // Initialise the app when mounted
+      if ($store.clientFeatures.messagePassing) {
+        if (!loading) return
       }
-    } catch (error) {
-      notifications.error(error || "Error handling event from app preview")
+
+      // Display preview immediately if the intelligent loading feature
+      // is not supported
+      if (!$store.clientFeatures.intelligentLoading) {
+        loading = false
+      }
+      refreshContent(json)
+    } else if (type === MessageTypes.ERROR) {
+      // Catch any app errors
+      loading = false
+      error = event.error || "An unknown error occurred"
+    } else if (type === "select-component" && data.id) {
+      $store.selectedComponentId = data.id
+      if (!$isActive("./components")) {
+        $goto("./components")
+      }
+    } else if (type === "update-prop") {
+      await store.actions.components.updateSetting(data.prop, data.value)
+    } else if (type === "update-styles") {
+      await store.actions.components.updateStyles(data.styles, data.id)
+    } else if (type === "delete-component" && data.id) {
+      // Legacy type, can be deleted in future
+      confirmDeleteComponent(data.id)
+    } else if (type === "key-down") {
+      const { key, ctrlKey } = data
+      document.dispatchEvent(new KeyboardEvent("keydown", { key, ctrlKey }))
+    } else if (type === "duplicate-component" && data.id) {
+      const rootComponent = get(currentAsset).props
+      const component = findComponent(rootComponent, data.id)
+      store.actions.components.copy(component)
+      await store.actions.components.paste(component)
+    } else if (type === "preview-loaded") {
+      // Wait for this event to show the client library if intelligent
+      // loading is supported
+      loading = false
+    } else if (type === "move-component") {
+      const { componentId, destinationComponentId } = data
+      const rootComponent = get(currentAsset).props
+
+      // Get source and destination components
+      const source = findComponent(rootComponent, componentId)
+      const destination = findComponent(rootComponent, destinationComponentId)
+
+      // Stop if the target is a child of source
+      const path = findComponentPath(source, destinationComponentId)
+      const ids = path.map(component => component._id)
+      if (ids.includes(data.destinationComponentId)) {
+        return
+      }
+
+      // Cut and paste the component to the new destination
+      if (source && destination) {
+        store.actions.components.copy(source, true, false)
+        await store.actions.components.paste(destination, data.mode)
+      }
+    } else if (type === "click-nav") {
+      if (!$isActive("./navigation")) {
+        $goto("./navigation")
+      }
+    } else if (type === "request-add-component") {
+      toggleAddComponent()
+    } else if (type === "highlight-setting") {
+      store.actions.settings.highlight(data.setting)
+
+      // Also scroll setting into view
+      const selector = `[data-cy="${data.setting}-prop-control"`
+      const element = document.querySelector(selector)?.parentElement
+      if (element) {
+        element.scrollIntoView({
+          behavior: "smooth",
+          block: "center",
+        })
+      }
+    } else if (type === "eject-block") {
+      const { id, definition } = data
+      await store.actions.components.handleEjectBlock(id, definition)
+    } else if (type === "reload-plugin") {
+      await store.actions.components.refreshDefinitions()
+    } else if (type === "drop-new-component") {
+      const { component, parent, index } = data
+      await store.actions.components.create(component, null, parent, index)
+    } else {
+      console.warn(`Client sent unknown event type: ${type}`)
     }
   }
 
@@ -259,42 +263,10 @@
 
   onMount(() => {
     window.addEventListener("message", receiveMessage)
-    if (!$store.clientFeatures.messagePassing) {
-      // Legacy - remove in later versions of BB
-      iframe.contentWindow.addEventListener(
-        "ready",
-        () => {
-          receiveMessage({ data: { type: MessageTypes.READY } })
-        },
-        { once: true }
-      )
-      iframe.contentWindow.addEventListener(
-        "error",
-        event => {
-          receiveMessage({
-            data: { type: MessageTypes.ERROR, error: event.detail },
-          })
-        },
-        { once: true }
-      )
-      // Add listener for events sent by client library in preview
-      iframe.contentWindow.addEventListener("bb-event", handleBudibaseEvent)
-    }
   })
 
-  // Remove all iframe event listeners on component destroy
   onDestroy(() => {
     window.removeEventListener("message", receiveMessage)
-
-    if (iframe.contentWindow) {
-      if (!$store.clientFeatures.messagePassing) {
-        // Legacy - remove in later versions of BB
-        iframe.contentWindow.removeEventListener(
-          "bb-event",
-          handleBudibaseEvent
-        )
-      }
-    }
   })
 </script>
 
diff --git a/packages/client/src/components/preview/DNDHandler.svelte b/packages/client/src/components/preview/DNDHandler.svelte
index e04bd81750..42a2fafbdd 100644
--- a/packages/client/src/components/preview/DNDHandler.svelte
+++ b/packages/client/src/components/preview/DNDHandler.svelte
@@ -22,6 +22,9 @@
   $: target = $dndStore.target
   $: drop = $dndStore.drop
 
+  // Local flag for whether we are awaiting an async drop event
+  let dropping = false
+
   const insideGrid = e => {
     return e.target
       ?.closest?.(".component")
@@ -48,6 +51,10 @@
 
   // Callback when drag stops (whether dropped or not)
   const stopDragging = () => {
+    if (dropping) {
+      return
+    }
+
     // Reset listener
     if (source?.id) {
       const component = document.getElementsByClassName(source?.id)[0]
@@ -57,9 +64,7 @@
     }
 
     // Reset state
-    if (!$dndStore.dropped) {
-      dndStore.actions.reset()
-    }
+    dndStore.actions.reset()
   }
 
   // Callback when initially starting a drag on a draggable component
@@ -253,18 +258,21 @@
   }
 
   // Callback when dropping a drag on top of some component
-  const onDrop = () => {
+  const onDrop = async () => {
     if (!source || !drop?.parent || drop?.index == null) {
       return
     }
 
     // Check if we're adding a new component rather than moving one
     if (source.newComponentType) {
-      builderStore.actions.dropNewComponent(
+      dropping = true
+      await builderStore.actions.dropNewComponent(
         source.newComponentType,
         drop.parent,
         drop.index
       )
+      dropping = false
+      stopDragging()
       return
     }
 
@@ -301,12 +309,14 @@
     }
 
     if (legacyDropTarget && legacyDropMode) {
-      dndStore.actions.markDropped()
-      builderStore.actions.moveComponent(
+      dropping = true
+      await builderStore.actions.moveComponent(
         source.id,
         legacyDropTarget,
         legacyDropMode
       )
+      dropping = false
+      stopDragging()
     }
   }
 
diff --git a/packages/client/src/index.js b/packages/client/src/index.js
index e61df37d95..80f8754e20 100644
--- a/packages/client/src/index.js
+++ b/packages/client/src/index.js
@@ -7,6 +7,7 @@ import {
   componentStore,
   environmentStore,
   dndStore,
+  eventStore,
 } from "./stores"
 import loadSpectrumIcons from "@budibase/bbui/spectrum-icons-rollup.js"
 import { get } from "svelte/store"
@@ -42,9 +43,9 @@ const loadBudibase = async () => {
   })
 
   // Reset DND state if we completed a successful drop
-  if (get(dndStore).dropped) {
-    dndStore.actions.reset()
-  }
+  // if (get(dndStore).dropped) {
+  //   dndStore.actions.reset()
+  // }
 
   // Set app ID - this window flag is set by both the preview and the real
   // server rendered app HTML
@@ -59,15 +60,17 @@ const loadBudibase = async () => {
   devToolsStore.actions.setEnabled(enableDevTools)
 
   // Register handler for runtime events from the builder
-  window.handleBuilderRuntimeEvent = (name, payload) => {
+  window.handleBuilderRuntimeEvent = (type, data) => {
     if (!window["##BUDIBASE_IN_BUILDER##"]) {
       return
     }
-    if (name === "eject-block") {
-      const block = blockStore.actions.getBlock(payload)
+    if (type === "event-completed") {
+      eventStore.actions.resolveEvent(data)
+    } else if (type === "eject-block") {
+      const block = blockStore.actions.getBlock(data)
       block?.eject()
-    } else if (name === "dragging-new-component") {
-      const { dragging, component } = payload
+    } else if (type === "dragging-new-component") {
+      const { dragging, component } = data
       if (dragging) {
         const definition =
           componentStore.actions.getComponentDefinition(component)
diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.js
index 30fcc39bad..fdad9a5f88 100644
--- a/packages/client/src/stores/builder.js
+++ b/packages/client/src/stores/builder.js
@@ -1,10 +1,7 @@
 import { writable, get } from "svelte/store"
 import { API } from "api"
 import { devToolsStore } from "./devTools.js"
-
-const dispatchEvent = (type, data = {}) => {
-  window.parent.postMessage({ type, data })
-}
+import { eventStore } from "./events.js"
 
 const createBuilderStore = () => {
   const initialState = {
@@ -19,6 +16,7 @@ const createBuilderStore = () => {
     navigation: null,
     hiddenComponentIds: [],
     usedPlugins: null,
+    eventResolvers: {},
 
     // Legacy - allow the builder to specify a layout
     layout: null,
@@ -35,25 +33,25 @@ const createBuilderStore = () => {
         selectedComponentId: id,
       }))
       devToolsStore.actions.setAllowSelection(false)
-      dispatchEvent("select-component", { id })
+      eventStore.actions.dispatchEvent("select-component", { id })
     },
     updateProp: (prop, value) => {
-      dispatchEvent("update-prop", { prop, value })
+      eventStore.actions.dispatchEvent("update-prop", { prop, value })
     },
     updateStyles: (styles, id) => {
-      dispatchEvent("update-styles", { styles, id })
+      eventStore.actions.dispatchEvent("update-styles", { styles, id })
     },
     keyDown: (key, ctrlKey) => {
-      dispatchEvent("key-down", { key, ctrlKey })
+      eventStore.actions.dispatchEvent("key-down", { key, ctrlKey })
     },
     duplicateComponent: id => {
-      dispatchEvent("duplicate-component", { id })
+      eventStore.actions.dispatchEvent("duplicate-component", { id })
     },
     deleteComponent: id => {
-      dispatchEvent("delete-component", { id })
+      eventStore.actions.dispatchEvent("delete-component", { id })
     },
     notifyLoaded: () => {
-      dispatchEvent("preview-loaded")
+      eventStore.actions.dispatchEvent("preview-loaded")
     },
     analyticsPing: async () => {
       try {
@@ -62,15 +60,15 @@ const createBuilderStore = () => {
         // Do nothing
       }
     },
-    moveComponent: (componentId, destinationComponentId, mode) => {
-      dispatchEvent("move-component", {
+    moveComponent: async (componentId, destinationComponentId, mode) => {
+      await eventStore.actions.dispatchEvent("move-component", {
         componentId,
         destinationComponentId,
         mode,
       })
     },
     dropNewComponent: (component, parent, index) => {
-      dispatchEvent("drop-new-component", {
+      eventStore.actions.dispatchEvent("drop-new-component", {
         component,
         parent,
         index,
@@ -83,16 +81,16 @@ const createBuilderStore = () => {
       store.update(state => ({ ...state, editMode: enabled }))
     },
     clickNav: () => {
-      dispatchEvent("click-nav")
+      eventStore.actions.dispatchEvent("click-nav")
     },
     requestAddComponent: () => {
-      dispatchEvent("request-add-component")
+      eventStore.actions.dispatchEvent("request-add-component")
     },
     highlightSetting: setting => {
-      dispatchEvent("highlight-setting", { setting })
+      eventStore.actions.dispatchEvent("highlight-setting", { setting })
     },
     ejectBlock: (id, definition) => {
-      dispatchEvent("eject-block", { id, definition })
+      eventStore.actions.dispatchEvent("eject-block", { id, definition })
     },
     updateUsedPlugin: (name, hash) => {
       // Check if we used this plugin
@@ -109,7 +107,7 @@ const createBuilderStore = () => {
       }
 
       // Notify the builder so we can reload component definitions
-      dispatchEvent("reload-plugin")
+      eventStore.actions.dispatchEvent("reload-plugin")
     },
   }
   return {
diff --git a/packages/client/src/stores/dnd.js b/packages/client/src/stores/dnd.js
index 532dea0ad5..1bdd510eb7 100644
--- a/packages/client/src/stores/dnd.js
+++ b/packages/client/src/stores/dnd.js
@@ -11,9 +11,6 @@ const createDndStore = () => {
 
     // Info about where the component would be dropped
     drop: null,
-
-    // Whether the current drop has been completed successfully
-    dropped: false,
   }
   const store = writable(initialState)
 
@@ -63,13 +60,6 @@ const createDndStore = () => {
     store.set(initialState)
   }
 
-  const markDropped = () => {
-    store.update(state => {
-      state.dropped = true
-      return state
-    })
-  }
-
   return {
     subscribe: store.subscribe,
     actions: {
@@ -78,7 +68,6 @@ const createDndStore = () => {
       updateTarget,
       updateDrop,
       reset,
-      markDropped,
     },
   }
 }
@@ -91,7 +80,6 @@ export const dndStore = createDndStore()
 // or components which depend on DND state unless values actually change.
 export const dndParent = computed(dndStore, x => x.drop?.parent)
 export const dndIndex = computed(dndStore, x => x.drop?.index)
-export const dndDropped = computed(dndStore, x => x.dropped)
 export const dndBounds = computed(dndStore, x => x.source?.bounds)
 export const dndIsDragging = computed(dndStore, x => !!x.source)
 export const dndIsNewComponent = computed(
diff --git a/packages/client/src/stores/events.js b/packages/client/src/stores/events.js
new file mode 100644
index 0000000000..6a67554247
--- /dev/null
+++ b/packages/client/src/stores/events.js
@@ -0,0 +1,31 @@
+import { writable, get } from "svelte/store"
+
+const createEventStore = () => {
+  const initialState = {
+    eventResolvers: {},
+  }
+  const store = writable(initialState)
+
+  const actions = {
+    dispatchEvent: (type, data) => {
+      const id = Math.random()
+      return new Promise(resolve => {
+        window.parent.postMessage({ type, data, id })
+        store.update(state => {
+          state.eventResolvers[id] = resolve
+          return state
+        })
+      })
+    },
+    resolveEvent: data => {
+      get(store).eventResolvers[data]?.()
+    },
+  }
+
+  return {
+    subscribe: store.subscribe,
+    actions,
+  }
+}
+
+export const eventStore = createEventStore()
diff --git a/packages/client/src/stores/index.js b/packages/client/src/stores/index.js
index 7a06e55a67..173f3ad4fe 100644
--- a/packages/client/src/stores/index.js
+++ b/packages/client/src/stores/index.js
@@ -15,6 +15,7 @@ export { uploadStore } from "./uploads.js"
 export { rowSelectionStore } from "./rowSelection.js"
 export { blockStore } from "./blocks.js"
 export { environmentStore } from "./environment"
+export { eventStore } from "./events.js"
 export {
   dndStore,
   dndIndex,
@@ -22,7 +23,6 @@ export {
   dndBounds,
   dndIsNewComponent,
   dndIsDragging,
-  dndDropped,
 } from "./dnd"
 
 // Context stores are layered and duplicated, so it is not a singleton
diff --git a/packages/client/src/stores/screens.js b/packages/client/src/stores/screens.js
index d9d91ad51a..6ef164dc9d 100644
--- a/packages/client/src/stores/screens.js
+++ b/packages/client/src/stores/screens.js
@@ -2,13 +2,7 @@ import { derived } from "svelte/store"
 import { routeStore } from "./routes"
 import { builderStore } from "./builder"
 import { appStore } from "./app"
-import {
-  dndIndex,
-  dndParent,
-  dndIsNewComponent,
-  dndBounds,
-  dndDropped,
-} from "./dnd.js"
+import { dndIndex, dndParent, dndIsNewComponent, dndBounds } from "./dnd.js"
 import { RoleUtils } from "@budibase/frontend-core"
 import { findComponentById, findComponentParent } from "../utils/components.js"
 import { Helpers } from "@budibase/bbui"
@@ -24,7 +18,6 @@ const createScreenStore = () => {
       dndIndex,
       dndIsNewComponent,
       dndBounds,
-      dndDropped,
     ],
     ([
       $appStore,
@@ -34,7 +27,6 @@ const createScreenStore = () => {
       $dndIndex,
       $dndIsNewComponent,
       $dndBounds,
-      $dndDropped,
     ]) => {
       let activeLayout, activeScreen
       let screens
@@ -80,9 +72,6 @@ const createScreenStore = () => {
           activeScreen.props,
           selectedComponentId
         )
-        const selectedComponent = selectedParent?._children?.find(
-          x => x._id === selectedComponentId
-        )
 
         // Remove selected component from tree if we are moving an existing
         // component
@@ -92,33 +81,25 @@ const createScreenStore = () => {
           )
         }
 
-        // Insert placeholder component if dragging, or artificially insert
-        // the dropped component in the new location if the drop completed
-        let componentToInsert
-        if ($dndDropped && !$dndIsNewComponent) {
-          componentToInsert = selectedComponent
-        } else {
-          componentToInsert = {
-            _component: "@budibase/standard-components/container",
-            _id: DNDPlaceholderID,
-            _styles: {
-              normal: {
-                width: `${$dndBounds?.width || 400}px`,
-                height: `${$dndBounds?.height || 200}px`,
-                opacity: 0,
-              },
+        // Insert placeholder component
+        const componentToInsert = {
+          _component: "@budibase/standard-components/container",
+          _id: DNDPlaceholderID,
+          _styles: {
+            normal: {
+              width: `${$dndBounds?.width || 400}px`,
+              height: `${$dndBounds?.height || 200}px`,
+              opacity: 0,
             },
-            static: true,
-          }
+          },
+          static: true,
         }
-        if (componentToInsert) {
-          let parent = findComponentById(activeScreen.props, $dndParent)
-          if (parent) {
-            if (!parent._children?.length) {
-              parent._children = [componentToInsert]
-            } else {
-              parent._children.splice($dndIndex, 0, componentToInsert)
-            }
+        let parent = findComponentById(activeScreen.props, $dndParent)
+        if (parent) {
+          if (!parent._children?.length) {
+            parent._children = [componentToInsert]
+          } else {
+            parent._children.splice($dndIndex, 0, componentToInsert)
           }
         }
       }

From 32bac91dc7bf9340c32784bfcb269cc5398ea3b3 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 24 Oct 2022 09:03:50 +0100
Subject: [PATCH 093/151] Remove spam of environment API calls

---
 packages/client/src/index.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/index.js b/packages/client/src/index.js
index 80f8754e20..f49e6df5a2 100644
--- a/packages/client/src/index.js
+++ b/packages/client/src/index.js
@@ -42,17 +42,14 @@ const loadBudibase = async () => {
     location: window["##BUDIBASE_LOCATION##"],
   })
 
-  // Reset DND state if we completed a successful drop
-  // if (get(dndStore).dropped) {
-  //   dndStore.actions.reset()
-  // }
-
   // Set app ID - this window flag is set by both the preview and the real
   // server rendered app HTML
   appStore.actions.setAppId(window["##BUDIBASE_APP_ID##"])
 
   // Fetch environment info
-  await environmentStore.actions.fetchEnvironment()
+  if (!get(environmentStore)) {
+    await environmentStore.actions.fetchEnvironment()
+  }
 
   // Enable dev tools or not. We need to be using a dev app and not inside
   // the builder preview to enable them.

From a11854d9573c2aec6640910ad0fbcea0231f7aeb Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 24 Oct 2022 09:13:05 +0100
Subject: [PATCH 094/151] Fix issue with getting environment details

---
 packages/client/src/index.js              | 2 +-
 packages/client/src/stores/environment.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/index.js b/packages/client/src/index.js
index f49e6df5a2..951c55270b 100644
--- a/packages/client/src/index.js
+++ b/packages/client/src/index.js
@@ -47,7 +47,7 @@ const loadBudibase = async () => {
   appStore.actions.setAppId(window["##BUDIBASE_APP_ID##"])
 
   // Fetch environment info
-  if (!get(environmentStore)) {
+  if (!get(environmentStore)?.loaded) {
     await environmentStore.actions.fetchEnvironment()
   }
 
diff --git a/packages/client/src/stores/environment.js b/packages/client/src/stores/environment.js
index ebeb67c622..bcc1493cd9 100644
--- a/packages/client/src/stores/environment.js
+++ b/packages/client/src/stores/environment.js
@@ -2,6 +2,7 @@ import { API } from "api"
 import { writable } from "svelte/store"
 
 const initialState = {
+  loaded: false,
   cloud: false,
 }
 
@@ -15,6 +16,7 @@ const createEnvironmentStore = () => {
         store.set({
           ...initialState,
           ...environment,
+          loaded: true,
         })
       } catch (error) {
         store.set(initialState)

From c111f02e709d8452a54bb84a39fbf650326db983 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 24 Oct 2022 09:38:07 +0100
Subject: [PATCH 095/151] Improve client grid DND event handling

---
 packages/client/src/components/ClientApp.svelte |  2 ++
 packages/client/src/components/Component.svelte |  1 -
 packages/client/src/components/app/Grid.svelte  |  7 +------
 .../components/preview/GridDNDHandler.svelte    | 17 +++++++++--------
 packages/client/src/stores/builder.js           |  4 ++--
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index 537e963ff3..2fb0a92dab 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -30,6 +30,7 @@
   import HoverIndicator from "components/preview/HoverIndicator.svelte"
   import CustomThemeWrapper from "./CustomThemeWrapper.svelte"
   import DNDHandler from "components/preview/DNDHandler.svelte"
+  import GridDNDHandler from "components/preview/GridDNDHandler.svelte"
   import KeyboardManager from "components/preview/KeyboardManager.svelte"
   import DevToolsHeader from "components/devtools/DevToolsHeader.svelte"
   import DevTools from "components/devtools/DevTools.svelte"
@@ -196,6 +197,7 @@
                 {/if}
                 {#if $builderStore.inBuilder}
                   <DNDHandler />
+                  <GridDNDHandler />
                 {/if}
               </div>
             </QueryParamsProvider>
diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index 669cc8afdc..c59ef050cd 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -219,7 +219,6 @@
       return
     } else {
       lastInstanceKey = instanceKey
-      ephemeralStyles = null
     }
 
     // Pull definition and constructor
diff --git a/packages/client/src/components/app/Grid.svelte b/packages/client/src/components/app/Grid.svelte
index 7e2ec68627..8348a3ba91 100644
--- a/packages/client/src/components/app/Grid.svelte
+++ b/packages/client/src/components/app/Grid.svelte
@@ -1,9 +1,8 @@
 <script>
   import { getContext } from "svelte"
-  import GridDNDHandler from "../preview/GridDNDHandler.svelte"
 
   const component = getContext("component")
-  const { styleable, builderStore } = getContext("sdk")
+  const { styleable } = getContext("sdk")
 
   const cols = 12
 
@@ -35,10 +34,6 @@
   <slot />
 </div>
 
-{#if $builderStore.inBuilder && node}
-  <GridDNDHandler {node} />
-{/if}
-
 <style>
   .grid {
     position: relative;
diff --git a/packages/client/src/components/preview/GridDNDHandler.svelte b/packages/client/src/components/preview/GridDNDHandler.svelte
index ed7c3df269..4a95080523 100644
--- a/packages/client/src/components/preview/GridDNDHandler.svelte
+++ b/packages/client/src/components/preview/GridDNDHandler.svelte
@@ -5,15 +5,15 @@
 
   let dragInfo
   let gridStyles
+  let id
 
   $: jsonStyles = JSON.stringify(gridStyles)
-  $: id = dragInfo?.id
+  $: id = dragInfo?.id || id
   $: instance = componentStore.actions.getComponentInstance(id)
-
-  // We don't clear grid styles because that causes flashing, as the component
-  // will revert to its original position until the save completes.
-  $: gridStyles &&
-    instance?.setEphemeralStyles({ ...gridStyles, "z-index": 999 })
+  $: instance?.setEphemeralStyles({
+    ...gridStyles,
+    ...(gridStyles ? { "z-index": 999 } : null),
+  })
 
   const isChildOfGrid = e => {
     return (
@@ -192,10 +192,11 @@
   }
 
   // Callback when drag stops (whether dropped or not)
-  const stopDragging = () => {
+  const stopDragging = async () => {
+    console.log("STOP")
     // Save changes
     if (gridStyles) {
-      builderStore.actions.updateStyles(gridStyles, dragInfo.id)
+      await builderStore.actions.updateStyles(gridStyles, dragInfo.id)
     }
 
     // Reset listener
diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.js
index fdad9a5f88..1ddcaf82b9 100644
--- a/packages/client/src/stores/builder.js
+++ b/packages/client/src/stores/builder.js
@@ -38,8 +38,8 @@ const createBuilderStore = () => {
     updateProp: (prop, value) => {
       eventStore.actions.dispatchEvent("update-prop", { prop, value })
     },
-    updateStyles: (styles, id) => {
-      eventStore.actions.dispatchEvent("update-styles", { styles, id })
+    updateStyles: async (styles, id) => {
+      await eventStore.actions.dispatchEvent("update-styles", { styles, id })
     },
     keyDown: (key, ctrlKey) => {
       eventStore.actions.dispatchEvent("key-down", { key, ctrlKey })

From fb0866f0d9f902a797790d1dcd663641079ee50a Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 24 Oct 2022 09:43:45 +0100
Subject: [PATCH 096/151] Tidy up

---
 .../[screenId]/_components/AppPreview.svelte     | 16 ++++------------
 .../src/components/preview/GridDNDHandler.svelte |  7 ++++---
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index 9cbb283fef..2b3b685dc4 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -124,6 +124,7 @@
     if (!message?.data?.type) {
       return
     }
+    console.debug(`CLIENT: [${message.data.type}]`)
 
     // Await the event handler
     try {
@@ -139,20 +140,11 @@
   }
 
   const handleBudibaseEvent = async event => {
-    const { type, data } = event.data || event.detail
-    if (!type) {
-      return
-    }
+    const { type, data } = event.data
     if (type === MessageTypes.READY) {
       // Initialise the app when mounted
-      if ($store.clientFeatures.messagePassing) {
-        if (!loading) return
-      }
-
-      // Display preview immediately if the intelligent loading feature
-      // is not supported
-      if (!$store.clientFeatures.intelligentLoading) {
-        loading = false
+      if (!loading) {
+        return
       }
       refreshContent(json)
     } else if (type === MessageTypes.ERROR) {
diff --git a/packages/client/src/components/preview/GridDNDHandler.svelte b/packages/client/src/components/preview/GridDNDHandler.svelte
index 4a95080523..335f463c08 100644
--- a/packages/client/src/components/preview/GridDNDHandler.svelte
+++ b/packages/client/src/components/preview/GridDNDHandler.svelte
@@ -7,10 +7,12 @@
   let gridStyles
   let id
 
+  // Some memoisation of primitive types for performance
   $: jsonStyles = JSON.stringify(gridStyles)
   $: id = dragInfo?.id || id
-  $: instance = componentStore.actions.getComponentInstance(id)
-  $: instance?.setEphemeralStyles({
+
+  // Set ephemeral grid styles on the dragged component
+  $: componentStore.actions.getComponentInstance(id)?.setEphemeralStyles({
     ...gridStyles,
     ...(gridStyles ? { "z-index": 999 } : null),
   })
@@ -193,7 +195,6 @@
 
   // Callback when drag stops (whether dropped or not)
   const stopDragging = async () => {
-    console.log("STOP")
     // Save changes
     if (gridStyles) {
       await builderStore.actions.updateStyles(gridStyles, dragInfo.id)

From 777e8f91f1fb71e55f3c9e4b2eda9e226dbe58c2 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Mon, 24 Oct 2022 09:46:53 +0100
Subject: [PATCH 097/151] Remove touch check for error consistency

---
 .../TableIntegrationMenu/IntegrationConfigForm.svelte     | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
index 1f740bf35b..1417de6dab 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
@@ -94,9 +94,7 @@
             type={schema[configKey].type}
             on:change
             bind:value={config[configKey]}
-            on:blur={($validation.touched[configKey] = true)}
-            error={$validation.touched[configKey] &&
-              $validation.errors[configKey]}
+            error={$validation.errors[configKey]}
           />
         </div>
       {:else}
@@ -106,9 +104,7 @@
             type={schema[configKey].type}
             on:change
             bind:value={config[configKey]}
-            on:blur={($validation.touched[configKey] = true)}
-            error={$validation.touched[configKey] &&
-              $validation.errors[configKey]}
+            error={$validation.errors[configKey]}
           />
         </div>
       {/if}

From 4daf9c26155b4e47c00514580323968aa1ec2407 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 24 Oct 2022 10:04:14 +0100
Subject: [PATCH 098/151] Addressing majority of PR comments.

---
 packages/backend-core/package.json            |  2 +-
 .../src/events/publishers/backup.ts           |  4 ++--
 packages/backend-core/src/queue/listeners.ts  | 12 +++++-----
 packages/backend-core/src/queue/queue.ts      |  4 ++--
 packages/backend-core/yarn.lock               | 23 ++++---------------
 packages/server/package.json                  |  2 +-
 packages/server/src/api/controllers/cloud.js  |  6 ++---
 packages/server/src/sdk/index.ts              |  6 ++---
 packages/server/yarn.lock                     | 16 +------------
 packages/types/src/core/index.ts              |  1 -
 packages/types/src/{core => sdk}/db.ts        |  0
 packages/types/src/sdk/events/backup.ts       |  2 +-
 packages/types/src/sdk/index.ts               |  1 +
 packages/worker/src/sdk/users/users.ts        |  3 ---
 14 files changed, 26 insertions(+), 56 deletions(-)
 delete mode 100644 packages/types/src/core/index.ts
 rename packages/types/src/{core => sdk}/db.ts (100%)

diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index e9c9261f62..3ca2281bd2 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -64,7 +64,7 @@
   },
   "devDependencies": {
     "@types/chance": "1.1.3",
-    "@types/ioredis": "4.28.10",
+    "@types/ioredis": "4.28.0",
     "@types/jest": "27.5.1",
     "@types/koa": "2.0.52",
     "@types/lodash": "4.14.180",
diff --git a/packages/backend-core/src/events/publishers/backup.ts b/packages/backend-core/src/events/publishers/backup.ts
index bd346cad64..0fc81da259 100644
--- a/packages/backend-core/src/events/publishers/backup.ts
+++ b/packages/backend-core/src/events/publishers/backup.ts
@@ -1,8 +1,8 @@
-import { AppBackup, AppBackupRevertEvent, Event } from "@budibase/types"
+import { AppBackup, AppBackupRestoreEvent, Event } from "@budibase/types"
 import { publishEvent } from "../events"
 
 export async function appBackupRestored(backup: AppBackup) {
-  const properties: AppBackupRevertEvent = {
+  const properties: AppBackupRestoreEvent = {
     appId: backup.appId,
     backupName: backup.name!,
     backupCreatedAt: backup.timestamp,
diff --git a/packages/backend-core/src/queue/listeners.ts b/packages/backend-core/src/queue/listeners.ts
index f264c3a84c..e1975b5d06 100644
--- a/packages/backend-core/src/queue/listeners.ts
+++ b/packages/backend-core/src/queue/listeners.ts
@@ -6,18 +6,18 @@ export type StalledFn = (job: Job) => Promise<void>
 export function addListeners(
   queue: Queue,
   jobQueue: JobQueue,
-  removeStalled?: StalledFn
+  removeStalledCb?: StalledFn
 ) {
   logging(queue, jobQueue)
-  if (removeStalled) {
-    handleStalled(queue, removeStalled)
+  if (removeStalledCb) {
+    handleStalled(queue, removeStalledCb)
   }
 }
 
-function handleStalled(queue: Queue, removeStalled?: StalledFn) {
+function handleStalled(queue: Queue, removeStalledCb?: StalledFn) {
   queue.on("stalled", async (job: Job) => {
-    if (removeStalled) {
-      await removeStalled(job)
+    if (removeStalledCb) {
+      await removeStalledCb(job)
     } else if (job.opts.repeat) {
       const jobId = job.id
       const repeatJobs = await queue.getRepeatableJobs()
diff --git a/packages/backend-core/src/queue/queue.ts b/packages/backend-core/src/queue/queue.ts
index 7eaafe38a8..e2f9ea9d94 100644
--- a/packages/backend-core/src/queue/queue.ts
+++ b/packages/backend-core/src/queue/queue.ts
@@ -18,7 +18,7 @@ async function cleanup() {
 
 export function createQueue<T>(
   jobQueue: JobQueue,
-  removeStalled?: StalledFn
+  opts: { removeStalledCb?: StalledFn }
 ): BullQueue.Queue<T> {
   const queueConfig: any = redisProtocolUrl || { redis: opts }
   let queue: any
@@ -27,7 +27,7 @@ export function createQueue<T>(
   } else {
     queue = new InMemoryQueue(jobQueue, queueConfig)
   }
-  addListeners(queue, jobQueue, removeStalled)
+  addListeners(queue, jobQueue, opts?.removeStalledCb)
   QUEUES.push(queue)
   if (!cleanupInterval) {
     cleanupInterval = setInterval(cleanup, CLEANUP_PERIOD_MS)
diff --git a/packages/backend-core/yarn.lock b/packages/backend-core/yarn.lock
index d2831ca8fe..d301526ba1 100644
--- a/packages/backend-core/yarn.lock
+++ b/packages/backend-core/yarn.lock
@@ -291,11 +291,6 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/types@2.0.30-alpha.3":
-  version "2.0.30-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.3.tgz#cb55bcced75b711cc8a675284fbacaa8ebf1c0f2"
-  integrity sha512-rHeFVuNbSSE4fMnX6uyrM2r47m+neqFXlVNOkhHU9i7KoIcIZbEYInU8CjUFR2da3ruST9ajXjJ5UenX2+MnTg==
-
 "@hapi/hoek@^9.0.0":
   version "9.3.0"
   resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
@@ -698,14 +693,6 @@
     "@types/connect" "*"
     "@types/node" "*"
 
-"@types/bull@^3.15.9":
-  version "3.15.9"
-  resolved "https://registry.yarnpkg.com/@types/bull/-/bull-3.15.9.tgz#e10e0901ec3762bff85716b3c580277960751c93"
-  integrity sha512-MPUcyPPQauAmynoO3ezHAmCOhbB0pWmYyijr/5ctaCqhbKWsjW0YCod38ZcLzUBprosfZ9dPqfYIcfdKjk7RNQ==
-  dependencies:
-    "@types/ioredis" "*"
-    "@types/redis" "^2.8.0"
-
 "@types/chance@1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@types/chance/-/chance-1.1.3.tgz#d19fe9391288d60fdccd87632bfc9ab2b4523fea"
@@ -776,10 +763,10 @@
   resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-1.8.2.tgz#7315b4c4c54f82d13fa61c228ec5c2ea5cc9e0e1"
   integrity sha512-EqX+YQxINb+MeXaIqYDASb6U6FCHbWjkj4a1CKDBks3d/QiB2+PqBLyO72vLDgAO1wUI4O+9gweRcQK11bTL/w==
 
-"@types/ioredis@*", "@types/ioredis@^4.28.10":
-  version "4.28.10"
-  resolved "https://registry.yarnpkg.com/@types/ioredis/-/ioredis-4.28.10.tgz#40ceb157a4141088d1394bb87c98ed09a75a06ff"
-  integrity sha512-69LyhUgrXdgcNDv7ogs1qXZomnfOEnSmrmMFqKgt1XMJxmoOSG/u3wYy13yACIfKuMJ8IhKgHafDO3sx19zVQQ==
+"@types/ioredis@4.28.0":
+  version "4.28.0"
+  resolved "https://registry.yarnpkg.com/@types/ioredis/-/ioredis-4.28.0.tgz#609b2ea0d91231df2dd7f67dd77436bc72584911"
+  integrity sha512-HSA/JQivJgV0e+353gvgu6WVoWvGRe0HyHOnAN2AvbVIhUlJBhNnnkP8gEEokrDWrxywrBkwo8NuDZ6TVPL9XA==
   dependencies:
     "@types/node" "*"
 
@@ -1547,7 +1534,7 @@ buffer@^5.5.0, buffer@^5.6.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-bull@^4.10.1:
+bull@4.10.1:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/bull/-/bull-4.10.1.tgz#f14974b6089358b62b495a2cbf838aadc098e43f"
   integrity sha512-Fp21tRPb2EaZPVfmM+ONZKVz2RA+to+zGgaTLyCKt3JMSU8OOBqK8143OQrnGuGpsyE5G+9FevFAGhdZZfQP2g==
diff --git a/packages/server/package.json b/packages/server/package.json
index 80d72723fb..88ee16dab3 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -163,7 +163,7 @@
     "@types/google-spreadsheet": "3.1.5",
     "@types/ioredis": "4.28.10",
     "@types/jest": "27.5.1",
-    "@types/koa": "2.13.5",
+    "@types/koa": "2.13.4",
     "@types/koa__router": "8.0.11",
     "@types/lodash": "4.14.180",
     "@types/node": "14.18.20",
diff --git a/packages/server/src/api/controllers/cloud.js b/packages/server/src/api/controllers/cloud.js
index 27b576f181..0a111eae83 100644
--- a/packages/server/src/api/controllers/cloud.js
+++ b/packages/server/src/api/controllers/cloud.js
@@ -35,9 +35,9 @@ async function getAllDocType(db, docType) {
 }
 
 exports.exportApps = async ctx => {
-  // if (env.SELF_HOSTED || !env.MULTI_TENANCY) {
-  //   ctx.throw(400, "Exporting only allowed in multi-tenant cloud environments.")
-  // }
+  if (env.SELF_HOSTED || !env.MULTI_TENANCY) {
+    ctx.throw(400, "Exporting only allowed in multi-tenant cloud environments.")
+  }
   const apps = await getAllApps({ all: true })
   const globalDBString = await sdk.backups.exportDB(getGlobalDBName(), {
     filter: doc => !doc._id.startsWith(DocumentType.USER),
diff --git a/packages/server/src/sdk/index.ts b/packages/server/src/sdk/index.ts
index 85c01cdb44..8bdc4f8e77 100644
--- a/packages/server/src/sdk/index.ts
+++ b/packages/server/src/sdk/index.ts
@@ -1,13 +1,13 @@
 import { default as backups } from "./app/backups"
 import { default as tables } from "./app/tables"
 
-const toExport = {
+const sdk = {
   backups,
   tables,
 }
 
 // default export for TS
-export default toExport
+export default sdk
 
 // default export for JS
-module.exports = toExport
+module.exports = sdk
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 4d07fc6450..5fa18745e7 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -2831,7 +2831,7 @@
   dependencies:
     "@types/koa" "*"
 
-"@types/koa@*":
+"@types/koa@*", "@types/koa@2.13.4":
   version "2.13.4"
   resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.13.4.tgz#10620b3f24a8027ef5cbae88b393d1b31205726b"
   integrity sha512-dfHYMfU+z/vKtQB7NUrthdAEiSvnLebvBjwHtfFmpZmB7em2N3WVQdHgnFq+xvyVgxW5jKDmjWfLD3lw4g4uTw==
@@ -2845,20 +2845,6 @@
     "@types/koa-compose" "*"
     "@types/node" "*"
 
-"@types/koa@2.13.5":
-  version "2.13.5"
-  resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.13.5.tgz#64b3ca4d54e08c0062e89ec666c9f45443b21a61"
-  integrity sha512-HSUOdzKz3by4fnqagwthW/1w/yJspTgppyyalPVbgZf8jQWvdIXcVW5h2DGtw4zYntOaeRGx49r1hxoPWrD4aA==
-  dependencies:
-    "@types/accepts" "*"
-    "@types/content-disposition" "*"
-    "@types/cookies" "*"
-    "@types/http-assert" "*"
-    "@types/http-errors" "*"
-    "@types/keygrip" "*"
-    "@types/koa-compose" "*"
-    "@types/node" "*"
-
 "@types/koa__router@8.0.11":
   version "8.0.11"
   resolved "https://registry.yarnpkg.com/@types/koa__router/-/koa__router-8.0.11.tgz#d7b37e6db934fc072ea1baa2ab92bc8ac4564f3e"
diff --git a/packages/types/src/core/index.ts b/packages/types/src/core/index.ts
deleted file mode 100644
index 9071393365..0000000000
--- a/packages/types/src/core/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./db"
diff --git a/packages/types/src/core/db.ts b/packages/types/src/sdk/db.ts
similarity index 100%
rename from packages/types/src/core/db.ts
rename to packages/types/src/sdk/db.ts
diff --git a/packages/types/src/sdk/events/backup.ts b/packages/types/src/sdk/events/backup.ts
index f3ddafcafc..8d3e2b1afa 100644
--- a/packages/types/src/sdk/events/backup.ts
+++ b/packages/types/src/sdk/events/backup.ts
@@ -1,6 +1,6 @@
 import { BaseEvent } from "./event"
 
-export interface AppBackupRevertEvent extends BaseEvent {
+export interface AppBackupRestoreEvent extends BaseEvent {
   appId: string
   backupName: string
   backupCreatedAt: string
diff --git a/packages/types/src/sdk/index.ts b/packages/types/src/sdk/index.ts
index 0c374dd105..724b152303 100644
--- a/packages/types/src/sdk/index.ts
+++ b/packages/types/src/sdk/index.ts
@@ -8,3 +8,4 @@ export * from "./search"
 export * from "./koa"
 export * from "./auth"
 export * from "./locks"
+export * from "./db"
diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts
index ce03a12587..b0290507fc 100644
--- a/packages/worker/src/sdk/users/users.ts
+++ b/packages/worker/src/sdk/users/users.ts
@@ -79,9 +79,6 @@ export const paginatedUsers = async ({
   } else if (email) {
     userList = await usersCore.searchGlobalUsersByEmail(email, opts)
     property = "email"
-  }
-  if (userIds) {
-    // TODO: search users by userIds
   } else {
     // no search, query allDocs
     const response = await db.allDocs(dbUtils.getGlobalUserParams(null, opts))

From fbed8923dc4ca87e4a56185f7bd4068e9e237a3c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 24 Oct 2022 10:14:35 +0100
Subject: [PATCH 099/151] Moving statistics under backups sdk subfolder.

---
 packages/server/src/sdk/app/backups/backup.ts                   | 2 +-
 packages/server/src/sdk/app/backups/index.ts                    | 2 ++
 .../src/sdk/app/{statistics/index.ts => backups/statistics.ts}  | 0
 3 files changed, 3 insertions(+), 1 deletion(-)
 rename packages/server/src/sdk/app/{statistics/index.ts => backups/statistics.ts} (100%)

diff --git a/packages/server/src/sdk/app/backups/backup.ts b/packages/server/src/sdk/app/backups/backup.ts
index abb2272a99..ac85b2940f 100644
--- a/packages/server/src/sdk/app/backups/backup.ts
+++ b/packages/server/src/sdk/app/backups/backup.ts
@@ -8,7 +8,7 @@ import {
 } from "@budibase/types"
 import { exportApp } from "./exports"
 import { importApp } from "./imports"
-import { calculateBackupStats } from "../statistics"
+import { calculateBackupStats } from "./statistics"
 import { Job } from "bull"
 import fs from "fs"
 import env from "../../../environment"
diff --git a/packages/server/src/sdk/app/backups/index.ts b/packages/server/src/sdk/app/backups/index.ts
index 94210c2c4c..c2dd7a7b71 100644
--- a/packages/server/src/sdk/app/backups/index.ts
+++ b/packages/server/src/sdk/app/backups/index.ts
@@ -1,9 +1,11 @@
 import * as exportApps from "./exports"
 import * as importApps from "./imports"
 import * as backup from "./backup"
+import * as statistics from "./statistics"
 
 export default {
   ...exportApps,
   ...importApps,
   ...backup,
+  ...statistics,
 }
diff --git a/packages/server/src/sdk/app/statistics/index.ts b/packages/server/src/sdk/app/backups/statistics.ts
similarity index 100%
rename from packages/server/src/sdk/app/statistics/index.ts
rename to packages/server/src/sdk/app/backups/statistics.ts

From 2bfeb850133c8a86922e3e9a497f97cf7f1c80b8 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Mon, 24 Oct 2022 10:18:51 +0100
Subject: [PATCH 100/151] Make NaN undefined

---
 packages/builder/src/helpers/helpers.js              | 7 ++++++-
 packages/builder/src/helpers/validation/yup/index.js | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/helpers/helpers.js b/packages/builder/src/helpers/helpers.js
index 9b0fa51a52..72c034d9a6 100644
--- a/packages/builder/src/helpers/helpers.js
+++ b/packages/builder/src/helpers/helpers.js
@@ -17,7 +17,12 @@ export const convertCamel = str => {
 
 export const pipe = (arg, funcs) => flow(funcs)(arg)
 
-export const capitalise = s => s.substring(0, 1).toUpperCase() + s.substring(1)
+export const capitalise = s => {
+  if (!s) {
+    return s
+  }
+  return s.substring(0, 1).toUpperCase() + s.substring(1)
+}
 
 export const lowercase = s => s.substring(0, 1).toLowerCase() + s.substring(1)
 
diff --git a/packages/builder/src/helpers/validation/yup/index.js b/packages/builder/src/helpers/validation/yup/index.js
index 9b38adbf9d..c064ffa583 100644
--- a/packages/builder/src/helpers/validation/yup/index.js
+++ b/packages/builder/src/helpers/validation/yup/index.js
@@ -28,7 +28,9 @@ export const createValidationStore = () => {
     let propertyValidator
     switch (type) {
       case "number":
-        propertyValidator = number()
+        propertyValidator = number().transform(value =>
+          isNaN(value) ? undefined : value
+        )
         break
       case "email":
         propertyValidator = string().email()

From 46761749bf803ef519a459585be69b6aef4460f5 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Mon, 24 Oct 2022 10:39:39 +0100
Subject: [PATCH 101/151] Add validation to config screen

---
 .../data/datasource/[selectedDatasource]/index.svelte     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
index 7db07bbe6c..1b6e927270 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
@@ -23,7 +23,8 @@
 
   let importQueriesModal
 
-  let changed
+  let changed,
+    isValid = true
   let integration, baseDatasource, datasource
   let queryList
   const querySchema = {
@@ -101,12 +102,15 @@
       <Divider />
       <div class="config-header">
         <Heading size="S">Configuration</Heading>
-        <Button disabled={!changed} cta on:click={saveDatasource}>Save</Button>
+        <Button disabled={!changed || !isValid} cta on:click={saveDatasource}
+          >Save</Button
+        >
       </div>
       <IntegrationConfigForm
         on:change={hasChanged}
         schema={integration.datasource}
         bind:datasource
+        on:valid={e => (isValid = e.detail)}
       />
       {#if datasource.plus}
         <PlusConfigForm bind:datasource save={saveDatasource} />

From 3951550074e06e33e78ce488ab72eba14bfa18e4 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 24 Oct 2022 12:05:59 +0100
Subject: [PATCH 102/151] Make grid rows and columns configurable and simplify
 grid style application

---
 packages/client/manifest.json                 | 18 +++++-
 .../client/src/components/Component.svelte    | 58 -------------------
 .../client/src/components/app/Grid.svelte     | 52 ++++++++++++++---
 .../components/preview/GridDNDHandler.svelte  | 35 +++++------
 4 files changed, 79 insertions(+), 84 deletions(-)

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index bedc915d42..09dd7aa015 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -4585,7 +4585,23 @@
       "width": 800,
       "height": 400
     },
-    "showEmptyState": false
+    "showEmptyState": false,
+    "settings": [
+      {
+        "type": "number",
+        "label": "Rows",
+        "key": "rows",
+        "defaultValue": 12,
+        "min": 1
+      },
+      {
+        "type": "number",
+        "label": "Columns",
+        "key": "cols",
+        "defaultValue": 12,
+        "min": 1
+      }
+    ]
   },
   "formblock": {
     "name": "Form Block",
diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index c59ef050cd..dc2f8c1d5f 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -170,21 +170,11 @@
   $: pad = pad || (interactive && hasChildren && inDndPath)
   $: $dndIsDragging, (pad = false)
 
-  // We can apply additional styles automatically if required.
-  // One use case for this is ensuring grid children have proper styles to
-  // display properly inside a grid.
-  $: additionalStyles = getAdditionalStyles(
-    instance._styles?.normal || {},
-    parentType,
-    definition
-  )
-
   // Compute overall styles
   $: styles = {
     ...instance._styles,
     normal: {
       ...instance._styles?.normal,
-      ...additionalStyles,
       ...ephemeralStyles,
     },
     custom: customCSS,
@@ -460,54 +450,6 @@
     })
   }
 
-  const getAdditionalStyles = (styles, parentType, definition) => {
-    let newStyles = {}
-
-    // Ensure grid styles are set
-    if (parentType?.endsWith("/grid")) {
-      newStyles = {
-        ...newStyles,
-        overflow: "hidden",
-        width: "auto",
-        height: "auto",
-      }
-
-      // Guess rough grid size from definition size
-      let columns = 6
-      let rows = 4
-      if (definition.size?.width) {
-        columns = Math.min(12, Math.round(definition.size.width / 100))
-      }
-      if (definition.size?.height) {
-        rows = Math.min(12, Math.round(definition.size.height / 50))
-      }
-
-      // Ensure grid position styles are set
-      if (!styles["grid-column-start"]) {
-        newStyles["grid-column-start"] = 1
-      }
-      if (!styles["grid-column-end"]) {
-        newStyles["grid-column-end"] = columns + 1
-      }
-      if (!styles["grid-row-start"]) {
-        newStyles["grid-row-start"] = 1
-      }
-      if (!styles["grid-row-end"]) {
-        newStyles["grid-row-end"] = rows + 1
-      }
-
-      // Ensure grid end styles aren't before grid start styles
-      if (newStyles["grid-column-end"] <= newStyles["grid-column-start"]) {
-        newStyles["grid-column-end"] = newStyles["grid-column-start"] + 1
-      }
-      if (newStyles["grid-row-end"] <= newStyles["grid-row-start"]) {
-        newStyles["grid-row-end"] = newStyles["grid-row-start"] + 1
-      }
-    }
-
-    return newStyles
-  }
-
   onMount(() => {
     if (
       $appStore.isDevApp &&
diff --git a/packages/client/src/components/app/Grid.svelte b/packages/client/src/components/app/Grid.svelte
index 8348a3ba91..1c50d8c5b9 100644
--- a/packages/client/src/components/app/Grid.svelte
+++ b/packages/client/src/components/app/Grid.svelte
@@ -4,15 +4,21 @@
   const component = getContext("component")
   const { styleable } = getContext("sdk")
 
-  const cols = 12
+  export let cols = 12
+  export let rows = 12
 
   let node
-  $: coords = generateCoords(cols)
 
-  const generateCoords = num => {
+  // Deliberately non-reactive as we want this fixed whenever the grid renders
+  const defaultColSpan = Math.ceil((cols + 1) / 2)
+  const defaultRowSpan = Math.ceil((rows + 1) / 2)
+
+  $: coords = generateCoords(rows, cols)
+
+  const generateCoords = (rows, cols) => {
     let grid = []
-    for (let row = 0; row < num; row++) {
-      for (let col = 0; col < num; col++) {
+    for (let row = 0; row < rows; row++) {
+      for (let col = 0; col < cols; col++) {
         grid.push({ row, col })
       }
     }
@@ -23,7 +29,17 @@
 <div
   bind:this={node}
   class="grid"
-  use:styleable={$component.styles}
+  use:styleable={{
+    ...$component.styles,
+    normal: {
+      ...$component.styles?.normal,
+      "--cols": cols,
+      "--rows": rows,
+      "--default-col-span": defaultColSpan,
+      "--default-row-span": defaultRowSpan,
+    },
+  }}
+  data-rows={rows}
   data-cols={cols}
 >
   <div class="underlay">
@@ -35,6 +51,26 @@
 </div>
 
 <style>
+  /*
+    Ensure all children of containers which are top level children of
+    grids do not overflow
+  */
+  :global(.grid > .component > .valid-container > .component > *) {
+    max-height: 100%;
+    max-width: 100%;
+  }
+
+  /* Ensure all top level children have some grid styles set */
+  :global(.grid > .component > *) {
+    overflow: hidden;
+    width: auto;
+    height: auto;
+    grid-column-start: 1;
+    grid-column-end: var(--default-col-span);
+    grid-row-start: 1;
+    grid-row-end: var(--default-row-span);
+  }
+
   .grid {
     position: relative;
     height: 400px;
@@ -42,8 +78,8 @@
   .grid,
   .underlay {
     display: grid;
-    grid-template-columns: repeat(12, 1fr);
-    grid-template-rows: repeat(12, 1fr);
+    grid-template-rows: repeat(var(--rows), 1fr);
+    grid-template-columns: repeat(var(--cols), 1fr);
   }
   .underlay {
     position: absolute;
diff --git a/packages/client/src/components/preview/GridDNDHandler.svelte b/packages/client/src/components/preview/GridDNDHandler.svelte
index 335f463c08..61bd8db08f 100644
--- a/packages/client/src/components/preview/GridDNDHandler.svelte
+++ b/packages/client/src/components/preview/GridDNDHandler.svelte
@@ -54,12 +54,13 @@
 
     const domGrid = getDOMNode(gridId)
     const cols = parseInt(domGrid.dataset.cols)
+    const rows = parseInt(domGrid.dataset.rows)
     const { width, height } = domGrid.getBoundingClientRect()
 
     const colWidth = width / cols
     const diffX = mouseX - startX
     let deltaX = Math.round(diffX / colWidth)
-    const rowHeight = height / cols
+    const rowHeight = height / rows
     const diffY = mouseY - startY
     let deltaY = Math.round(diffY / rowHeight)
 
@@ -160,27 +161,27 @@
       return
     }
 
-    const instance = componentStore.actions.getComponentInstance(dragInfo.id)
-    if (!instance) {
-      return
-    }
-    const styles = instance.getStyles()
     const domGrid = getDOMNode(dragInfo.gridId)
+    const gridCols = parseInt(domGrid.dataset.cols)
+    const gridRows = parseInt(domGrid.dataset.rows)
+    const domNode = getDOMNode(dragInfo.id)
+    const styles = window.getComputedStyle(domNode)
     if (domGrid) {
-      const getStyle = x => parseInt(styles?.normal?.[x] || "0")
+      const minMax = (value, min, max) => Math.min(max, Math.max(min, value))
+      const getStyle = x => parseInt(styles?.[x] || "0")
+      const getColStyle = x => minMax(getStyle(x), 1, gridCols + 1)
+      const getRowStyle = x => minMax(getStyle(x), 1, gridRows + 1)
       dragInfo.grid = {
         startX: e.clientX,
         startY: e.clientY,
-        rowStart: getStyle("grid-row-start"),
-        rowEnd: getStyle("grid-row-end"),
-        colStart: getStyle("grid-column-start"),
-        colEnd: getStyle("grid-column-end"),
-        rowDeltaMin: 1 - getStyle("grid-row-start"),
-        rowDeltaMax:
-          parseInt(domGrid.dataset.cols) + 1 - getStyle("grid-row-end"),
-        colDeltaMin: 1 - getStyle("grid-column-start"),
-        colDeltaMax:
-          parseInt(domGrid.dataset.cols) + 1 - getStyle("grid-column-end"),
+        rowStart: getRowStyle("grid-row-start"),
+        rowEnd: getRowStyle("grid-row-end"),
+        colStart: getColStyle("grid-column-start"),
+        colEnd: getColStyle("grid-column-end"),
+        rowDeltaMin: 1 - getRowStyle("grid-row-start"),
+        rowDeltaMax: gridRows + 1 - getRowStyle("grid-row-end"),
+        colDeltaMin: 1 - getColStyle("grid-column-start"),
+        colDeltaMax: gridCols + 1 - getColStyle("grid-column-end"),
       }
       handleEvent(e)
     }

From 5340b49d6b15480562b75ff705f56192a68c810d Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 24 Oct 2022 12:06:50 +0100
Subject: [PATCH 103/151] Some fixes based on PR comments.

---
 packages/backend-core/src/queue/queue.ts |  6 +++---
 packages/types/src/index.ts              |  1 -
 packages/types/src/sdk/koa.ts            | 20 ++++++++------------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/packages/backend-core/src/queue/queue.ts b/packages/backend-core/src/queue/queue.ts
index e2f9ea9d94..b4eeeb31aa 100644
--- a/packages/backend-core/src/queue/queue.ts
+++ b/packages/backend-core/src/queue/queue.ts
@@ -4,7 +4,7 @@ import { JobQueue } from "./constants"
 import InMemoryQueue from "./inMemoryQueue"
 import BullQueue from "bull"
 import { addListeners, StalledFn } from "./listeners"
-const { opts, redisProtocolUrl } = getRedisOptions()
+const { opts: redisOpts, redisProtocolUrl } = getRedisOptions()
 
 const CLEANUP_PERIOD_MS = 60 * 1000
 let QUEUES: BullQueue.Queue[] | InMemoryQueue[] = []
@@ -18,9 +18,9 @@ async function cleanup() {
 
 export function createQueue<T>(
   jobQueue: JobQueue,
-  opts: { removeStalledCb?: StalledFn }
+  opts: { removeStalledCb?: StalledFn } = {}
 ): BullQueue.Queue<T> {
-  const queueConfig: any = redisProtocolUrl || { redis: opts }
+  const queueConfig: any = redisProtocolUrl || { redis: redisOpts }
   let queue: any
   if (!env.isTest()) {
     queue = new BullQueue(jobQueue, queueConfig)
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 92d2ceb050..4adb2fda97 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -1,4 +1,3 @@
 export * from "./documents"
 export * from "./sdk"
 export * from "./api"
-export * from "./core"
diff --git a/packages/types/src/sdk/koa.ts b/packages/types/src/sdk/koa.ts
index 56666f7e2a..8004ba72ae 100644
--- a/packages/types/src/sdk/koa.ts
+++ b/packages/types/src/sdk/koa.ts
@@ -1,4 +1,4 @@
-import { Context } from "koa"
+import { Context, Request } from "koa"
 import { User } from "../documents"
 import { License } from "../sdk"
 
@@ -7,15 +7,11 @@ export interface ContextUser extends User {
   license: License
 }
 
-export interface BBContext {
-  user?: ContextUser
-  status?: number
-  request: {
-    body: any
-  }
-  params: any
-  body?: any
-  redirect?: any
-  attachment: any
-  throw: any
+export interface BBRequest extends Request {
+  body: any
+}
+
+export interface BBContext extends Context {
+  request: BBRequest
+  user?: ContextUser
 }

From c76ca029ce2969ecdd2dc6546753d8e279500de7 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 24 Oct 2022 12:15:50 +0100
Subject: [PATCH 104/151] Add sensible max number of rows and columns in a grid

---
 packages/client/manifest.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 09dd7aa015..cc4034dbca 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -4592,14 +4592,16 @@
         "label": "Rows",
         "key": "rows",
         "defaultValue": 12,
-        "min": 1
+        "min": 1,
+        "max": 32
       },
       {
         "type": "number",
         "label": "Columns",
         "key": "cols",
         "defaultValue": 12,
-        "min": 1
+        "min": 1,
+        "max": 32
       }
     ]
   },

From 2834a02ef4aae73d9171765132b244ffab92bdd7 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Mon, 24 Oct 2022 12:20:43 +0100
Subject: [PATCH 105/151] Ensure chart axis labelling fits the current theme

---
 packages/client/src/components/app/charts/ApexChart.svelte | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/client/src/components/app/charts/ApexChart.svelte b/packages/client/src/components/app/charts/ApexChart.svelte
index eed8fb2e6c..265d6d3523 100644
--- a/packages/client/src/components/app/charts/ApexChart.svelte
+++ b/packages/client/src/components/app/charts/ApexChart.svelte
@@ -26,6 +26,8 @@
   }
   div :global(.apexcharts-text.apexcharts-xaxis-title-text),
   div :global(.apexcharts-text.apexcharts-yaxis-title-text),
+  div :global(.apexcharts-text.apexcharts-xaxis-label),
+  div :global(.apexcharts-text.apexcharts-yaxis-label),
   div :global(.apexcharts-title-text) {
     fill: var(--spectrum-global-color-gray-600);
   }

From 5614c5db6173345986de8a8ac554bbb47921b4b9 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 24 Oct 2022 13:05:40 +0100
Subject: [PATCH 106/151] Replace isTest check with mock for triggering app
 backup

---
 packages/server/specs/openapi.json            |  3 ++
 packages/server/specs/openapi.yaml            |  3 ++
 .../src/api/controllers/deploy/index.ts       | 16 ++------
 .../src/api/routes/tests/deployment.spec.js   | 25 ------------
 .../src/api/routes/tests/deployment.spec.ts   | 40 +++++++++++++++++++
 .../src/tests/utilities/TestConfiguration.js  |  7 +++-
 6 files changed, 55 insertions(+), 39 deletions(-)
 delete mode 100644 packages/server/src/api/routes/tests/deployment.spec.js
 create mode 100644 packages/server/src/api/routes/tests/deployment.spec.ts

diff --git a/packages/server/specs/openapi.json b/packages/server/specs/openapi.json
index ce410823ec..62f59e9113 100644
--- a/packages/server/specs/openapi.json
+++ b/packages/server/specs/openapi.json
@@ -783,6 +783,7 @@
                       "type": "string",
                       "enum": [
                         "string",
+                        "barcodeqr",
                         "longform",
                         "options",
                         "number",
@@ -986,6 +987,7 @@
                           "type": "string",
                           "enum": [
                             "string",
+                            "barcodeqr",
                             "longform",
                             "options",
                             "number",
@@ -1200,6 +1202,7 @@
                             "type": "string",
                             "enum": [
                               "string",
+                              "barcodeqr",
                               "longform",
                               "options",
                               "number",
diff --git a/packages/server/specs/openapi.yaml b/packages/server/specs/openapi.yaml
index ed13ac01f4..25069f40a4 100644
--- a/packages/server/specs/openapi.yaml
+++ b/packages/server/specs/openapi.yaml
@@ -579,6 +579,7 @@ components:
                     type: string
                     enum:
                       - string
+                      - barcodeqr
                       - longform
                       - options
                       - number
@@ -741,6 +742,7 @@ components:
                         type: string
                         enum:
                           - string
+                          - barcodeqr
                           - longform
                           - options
                           - number
@@ -910,6 +912,7 @@ components:
                           type: string
                           enum:
                             - string
+                            - barcodeqr
                             - longform
                             - options
                             - number
diff --git a/packages/server/src/api/controllers/deploy/index.ts b/packages/server/src/api/controllers/deploy/index.ts
index b3b875e397..a1cb905930 100644
--- a/packages/server/src/api/controllers/deploy/index.ts
+++ b/packages/server/src/api/controllers/deploy/index.ts
@@ -20,7 +20,6 @@ import {
 import { events } from "@budibase/backend-core"
 import { backups } from "@budibase/pro"
 import { AppBackupTrigger } from "@budibase/types"
-import env from "../../../environment"
 
 // the max time we can wait for an invalidation to complete before considering it failed
 const MAX_PENDING_TIME_MS = 30 * 60000
@@ -108,17 +107,10 @@ async function deployApp(deployment: any, userId: string) {
     const devAppId = getDevelopmentAppID(appId)
     const productionAppId = getProdAppID(appId)
 
-    // can't do this in test
-    if (!env.isTest()) {
-      // trigger backup initially
-      await backups.triggerAppBackup(
-        productionAppId,
-        AppBackupTrigger.PUBLISH,
-        {
-          createdBy: userId,
-        }
-      )
-    }
+    // trigger backup initially
+    await backups.triggerAppBackup(productionAppId, AppBackupTrigger.PUBLISH, {
+      createdBy: userId,
+    })
 
     const config: any = {
       source: devAppId,
diff --git a/packages/server/src/api/routes/tests/deployment.spec.js b/packages/server/src/api/routes/tests/deployment.spec.js
deleted file mode 100644
index be126fa239..0000000000
--- a/packages/server/src/api/routes/tests/deployment.spec.js
+++ /dev/null
@@ -1,25 +0,0 @@
-const setup = require("./utilities")
-const { events } = require("@budibase/backend-core")
-
-describe("/deployments", () => {
-  let request = setup.getRequest()
-  let config = setup.getConfig()
-
-  afterAll(setup.afterAll)
-
-  beforeEach(async () => {
-    await config.init()
-    jest.clearAllMocks()
-  })
-
-  describe("deploy", () => {
-    it("should deploy the application", async () => {
-      await request
-        .post(`/api/deploy`)
-        .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
-        .expect(200)
-      expect(events.app.published.mock.calls.length).toBe(1)
-    })
-  })
-})
\ No newline at end of file
diff --git a/packages/server/src/api/routes/tests/deployment.spec.ts b/packages/server/src/api/routes/tests/deployment.spec.ts
new file mode 100644
index 0000000000..e659ff1a69
--- /dev/null
+++ b/packages/server/src/api/routes/tests/deployment.spec.ts
@@ -0,0 +1,40 @@
+const triggerAppBackupMock = jest.fn()
+jest.mock("@budibase/pro", () => ({
+  ...jest.requireActual("@budibase/pro"),
+  backups: {
+    triggerAppBackup: triggerAppBackupMock,
+    addAppBackupProcessors: jest.fn(),
+  },
+}))
+import setup from "./utilities"
+import { events } from "@budibase/backend-core"
+import { AppBackupTrigger } from "@budibase/types"
+
+describe("/deployments", () => {
+  let request = setup.getRequest()
+  let config = setup.getConfig()
+
+  afterAll(setup.afterAll)
+
+  beforeEach(async () => {
+    await config.init()
+    jest.clearAllMocks()
+  })
+
+  describe("deploy", () => {
+    it("should deploy the application", async () => {
+      await request
+        .post(`/api/deploy`)
+        .set(config.defaultHeaders())
+        .expect("Content-Type", /json/)
+        .expect(200)
+      expect(triggerAppBackupMock).toBeCalledTimes(1)
+      expect(triggerAppBackupMock).toBeCalledWith(
+        config.prodAppId,
+        AppBackupTrigger.PUBLISH,
+        { createdBy: config.userMetadataId }
+      )
+      expect((events.app.published as jest.Mock).mock.calls.length).toBe(1)
+    })
+  })
+})
diff --git a/packages/server/src/tests/utilities/TestConfiguration.js b/packages/server/src/tests/utilities/TestConfiguration.js
index 38aa84be2d..097b2eabaf 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.js
+++ b/packages/server/src/tests/utilities/TestConfiguration.js
@@ -25,7 +25,7 @@ const newid = require("../../db/newid")
 const context = require("@budibase/backend-core/context")
 const { generateDevInfoID, SEPARATOR } = require("@budibase/backend-core/db")
 const { encrypt } = require("@budibase/backend-core/encryption")
-const { DocumentType } = require("../../db/utils")
+const { DocumentType, generateUserMetadataID } = require("../../db/utils")
 
 const GLOBAL_USER_ID = "us_uuid1"
 const EMAIL = "babs@babs.com"
@@ -95,7 +95,10 @@ class TestConfiguration {
 
   // use a new id as the name to avoid name collisions
   async init(appName = newid()) {
-    await this.globalUser()
+    this.user = await this.globalUser()
+    this.globalUserId = this.user._id
+    this.userMetadataId = generateUserMetadataID(this.globalUserId)
+
     return this.createApp(appName)
   }
 

From 421708463abb34be09fb322b86a8469f5a9f5e24 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 24 Oct 2022 13:08:53 +0100
Subject: [PATCH 107/151] Add some additional styles to grids to ensure
 components render properly

---
 .../client/src/components/app/Grid.svelte     | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/components/app/Grid.svelte b/packages/client/src/components/app/Grid.svelte
index 1c50d8c5b9..761d5a4378 100644
--- a/packages/client/src/components/app/Grid.svelte
+++ b/packages/client/src/components/app/Grid.svelte
@@ -2,7 +2,7 @@
   import { getContext } from "svelte"
 
   const component = getContext("component")
-  const { styleable } = getContext("sdk")
+  const { styleable, builderStore } = getContext("sdk")
 
   export let cols = 12
   export let rows = 12
@@ -11,6 +11,7 @@
 
   // Deliberately non-reactive as we want this fixed whenever the grid renders
   const defaultColSpan = Math.ceil((cols + 1) / 2)
+  console.log(defaultColSpan)
   const defaultRowSpan = Math.ceil((rows + 1) / 2)
 
   $: coords = generateCoords(rows, cols)
@@ -37,16 +38,20 @@
       "--rows": rows,
       "--default-col-span": defaultColSpan,
       "--default-row-span": defaultRowSpan,
+      padding: "0 !important",
+      gap: "0 !important",
     },
   }}
   data-rows={rows}
   data-cols={cols}
 >
-  <div class="underlay">
-    {#each coords as coord}
-      <div class="placeholder" />
-    {/each}
-  </div>
+  {#if $builderStore.inBuilder}
+    <div class="underlay">
+      {#each coords as coord}
+        <div class="placeholder" />
+      {/each}
+    </div>
+  {/if}
   <slot />
 </div>
 
@@ -69,6 +74,8 @@
     grid-column-end: var(--default-col-span);
     grid-row-start: 1;
     grid-row-end: var(--default-row-span);
+    max-height: 100%;
+    max-width: 100%;
   }
 
   .grid {
@@ -94,7 +101,6 @@
   .underlay {
     z-index: -1;
   }
-
   .placeholder {
     background-color: var(--spectrum-global-color-gray-100);
   }

From ba1fe6db8a7673f605d22f9aecf519664f8789be Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 24 Oct 2022 13:09:29 +0100
Subject: [PATCH 108/151] Remove some debug logging

---
 .../design/[screenId]/_components/AppPreview.svelte              | 1 -
 packages/client/src/components/app/Grid.svelte                   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index 2b3b685dc4..0399b6375b 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -124,7 +124,6 @@
     if (!message?.data?.type) {
       return
     }
-    console.debug(`CLIENT: [${message.data.type}]`)
 
     // Await the event handler
     try {
diff --git a/packages/client/src/components/app/Grid.svelte b/packages/client/src/components/app/Grid.svelte
index 761d5a4378..91d900ee26 100644
--- a/packages/client/src/components/app/Grid.svelte
+++ b/packages/client/src/components/app/Grid.svelte
@@ -11,7 +11,6 @@
 
   // Deliberately non-reactive as we want this fixed whenever the grid renders
   const defaultColSpan = Math.ceil((cols + 1) / 2)
-  console.log(defaultColSpan)
   const defaultRowSpan = Math.ceil((rows + 1) / 2)
 
   $: coords = generateCoords(rows, cols)

From 21cc815976f7e98a1086850c00a3be66b9dd7c41 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 24 Oct 2022 13:14:46 +0100
Subject: [PATCH 109/151] Allow padding on grids when using DND

---
 packages/client/src/components/app/Grid.svelte | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/client/src/components/app/Grid.svelte b/packages/client/src/components/app/Grid.svelte
index 91d900ee26..01861718f0 100644
--- a/packages/client/src/components/app/Grid.svelte
+++ b/packages/client/src/components/app/Grid.svelte
@@ -7,8 +7,6 @@
   export let cols = 12
   export let rows = 12
 
-  let node
-
   // Deliberately non-reactive as we want this fixed whenever the grid renders
   const defaultColSpan = Math.ceil((cols + 1) / 2)
   const defaultRowSpan = Math.ceil((rows + 1) / 2)
@@ -27,7 +25,6 @@
 </script>
 
 <div
-  bind:this={node}
   class="grid"
   use:styleable={{
     ...$component.styles,
@@ -37,7 +34,6 @@
       "--rows": rows,
       "--default-col-span": defaultColSpan,
       "--default-row-span": defaultRowSpan,
-      padding: "0 !important",
       gap: "0 !important",
     },
   }}

From 66150274036ca0f5648b9ef219c7532a15fc0338 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 24 Oct 2022 13:24:19 +0100
Subject: [PATCH 110/151] Fix selection indicator appearing while dragging

---
 .../client/src/components/preview/HoverIndicator.svelte    | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/client/src/components/preview/HoverIndicator.svelte b/packages/client/src/components/preview/HoverIndicator.svelte
index 7d7d3e0540..f976e2cffb 100644
--- a/packages/client/src/components/preview/HoverIndicator.svelte
+++ b/packages/client/src/components/preview/HoverIndicator.svelte
@@ -6,11 +6,6 @@
   let componentId
 
   $: zIndex = componentId === $builderStore.selectedComponentId ? 900 : 920
-  $: {
-    if ($dndIsDragging) {
-      componentId = null
-    }
-  }
 
   const onMouseOver = e => {
     // Ignore if dragging
@@ -49,7 +44,7 @@
 </script>
 
 <IndicatorSet
-  {componentId}
+  componentId={$dndIsDragging ? null : componentId}
   color="var(--spectrum-global-color-static-blue-200)"
   transition
   {zIndex}

From 1a37e1fc95c8c3909b56aae02e424814b0b56e3b Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 24 Oct 2022 13:28:22 +0100
Subject: [PATCH 111/151] Remove some unnecessary code

---
 .../_components/settings/componentStyles.js   | 61 -------------------
 .../client/src/components/Component.svelte    | 30 ++++-----
 2 files changed, 13 insertions(+), 78 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/componentStyles.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/componentStyles.js
index 710cbed9b1..d4912241b3 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/componentStyles.js
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/componentStyles.js
@@ -1,67 +1,6 @@
 import { Input, Select } from "@budibase/bbui"
 import ColorPicker from "components/design/settings/controls/ColorPicker.svelte"
 
-export const grid = {
-  label: "Grid",
-  columns: "1fr 1fr",
-  settings: [
-    {
-      label: "Col. start",
-      key: "grid-column-start",
-      control: Select,
-      placeholder: "Auto",
-      options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
-    },
-    {
-      label: "Col. end",
-      key: "grid-column-end",
-      control: Select,
-      placeholder: "Auto",
-      options: [
-        { label: "1", value: 2 },
-        { label: "2", value: 3 },
-        { label: "3", value: 4 },
-        { label: "4", value: 5 },
-        { label: "5", value: 6 },
-        { label: "6", value: 7 },
-        { label: "7", value: 8 },
-        { label: "8", value: 9 },
-        { label: "9", value: 10 },
-        { label: "10", value: 11 },
-        { label: "11", value: 12 },
-        { label: "12", value: 13 },
-      ],
-    },
-    {
-      label: "Row start",
-      key: "grid-row-start",
-      control: Select,
-      placeholder: "Auto",
-      options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
-    },
-    {
-      label: "Row end",
-      key: "grid-row-end",
-      control: Select,
-      placeholder: "Auto",
-      options: [
-        { label: "1", value: 2 },
-        { label: "2", value: 3 },
-        { label: "3", value: 4 },
-        { label: "4", value: 5 },
-        { label: "5", value: 6 },
-        { label: "6", value: 7 },
-        { label: "7", value: 8 },
-        { label: "8", value: 9 },
-        { label: "9", value: 10 },
-        { label: "10", value: 11 },
-        { label: "11", value: 12 },
-        { label: "12", value: 13 },
-      ],
-    },
-  ],
-}
-
 export const margin = {
   label: "Margin",
   columns: "1fr 1fr",
diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index dc2f8c1d5f..e87efacd4c 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -170,26 +170,23 @@
   $: pad = pad || (interactive && hasChildren && inDndPath)
   $: $dndIsDragging, (pad = false)
 
-  // Compute overall styles
-  $: styles = {
-    ...instance._styles,
-    normal: {
-      ...instance._styles?.normal,
-      ...ephemeralStyles,
-    },
-    custom: customCSS,
-    id,
-    empty: emptyState,
-    interactive,
-    draggable,
-    editable,
-  }
-
   // Update component context
   $: store.set({
     id,
     children: children.length,
-    styles,
+    styles: {
+      ...instance._styles,
+      normal: {
+        ...instance._styles?.normal,
+        ...ephemeralStyles,
+      },
+      custom: customCSS,
+      id,
+      empty: emptyState,
+      interactive,
+      draggable,
+      editable,
+    },
     empty: emptyState,
     selected,
     name,
@@ -458,7 +455,6 @@
       componentStore.actions.registerInstance(id, {
         component: instance._component,
         getSettings: () => cachedSettings,
-        getStyles: () => styles,
         getRawSettings: () => ({ ...staticSettings, ...dynamicSettings }),
         getDataContext: () => get(context),
         reload: () => initialise(instance, true),

From c888b703ddfbff333b1b2b417f01bf92918c8e2a Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 24 Oct 2022 13:32:48 +0100
Subject: [PATCH 112/151] Improve comments and namimg conventions

---
 packages/client/src/components/preview/DNDHandler.svelte    | 6 ++++--
 .../client/src/components/preview/GridDNDHandler.svelte     | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/components/preview/DNDHandler.svelte b/packages/client/src/components/preview/DNDHandler.svelte
index 42a2fafbdd..1855166e0c 100644
--- a/packages/client/src/components/preview/DNDHandler.svelte
+++ b/packages/client/src/components/preview/DNDHandler.svelte
@@ -25,7 +25,9 @@
   // Local flag for whether we are awaiting an async drop event
   let dropping = false
 
-  const insideGrid = e => {
+  // Util to check if a DND event originates from a grid (or inside a grid).
+  // This is important as we do not handle grid DND in this handler.
+  const isGridEvent = e => {
     return e.target
       ?.closest?.(".component")
       ?.parentNode?.closest?.(".component")
@@ -69,7 +71,7 @@
 
   // Callback when initially starting a drag on a draggable component
   const onDragStart = e => {
-    if (insideGrid(e)) {
+    if (isGridEvent(e)) {
       return
     }
     const component = e.target.closest(".component")
diff --git a/packages/client/src/components/preview/GridDNDHandler.svelte b/packages/client/src/components/preview/GridDNDHandler.svelte
index 61bd8db08f..46e2e575b0 100644
--- a/packages/client/src/components/preview/GridDNDHandler.svelte
+++ b/packages/client/src/components/preview/GridDNDHandler.svelte
@@ -17,7 +17,9 @@
     ...(gridStyles ? { "z-index": 999 } : null),
   })
 
-  const isChildOfGrid = e => {
+  // Util to check if a DND event originates from a grid (or inside a grid).
+  // This is important as we do not handle grid DND in this handler.
+  const isGridEvent = e => {
     return (
       e.target
         .closest?.(".component")
@@ -113,7 +115,7 @@
 
   // Callback when initially starting a drag on a draggable component
   const onDragStart = e => {
-    if (!isChildOfGrid(e)) {
+    if (!isGridEvent(e)) {
       return
     }
 

From 729c4d082eeb2c0db2b24eaf47b00bc5fbe641d9 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 24 Oct 2022 13:33:33 +0100
Subject: [PATCH 113/151] Remove unnecessary code

---
 packages/client/src/components/Component.svelte | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index e87efacd4c..18b6488189 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -35,7 +35,6 @@
   export let isScreen = false
   export let isBlock = false
   export let parent = null
-  export let parentType = null
 
   // Get parent contexts
   const context = getContext("context")
@@ -496,11 +495,7 @@
         <ComponentPlaceholder />
       {:else if children.length}
         {#each children as child (child._id)}
-          <svelte:self
-            instance={child}
-            parent={id}
-            parentType={instance._component}
-          />
+          <svelte:self instance={child} parent={id} />
         {/each}
       {:else if emptyState}
         {#if isScreen}

From bc2d499625b2cf5ffa101934fd1f93ba104a769e Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 24 Oct 2022 13:33:36 +0100
Subject: [PATCH 114/151] Adding a check to see if app backups feature is
 enabled.

---
 .../src/api/controllers/deploy/index.ts       | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/server/src/api/controllers/deploy/index.ts b/packages/server/src/api/controllers/deploy/index.ts
index b3b875e397..f1700aef87 100644
--- a/packages/server/src/api/controllers/deploy/index.ts
+++ b/packages/server/src/api/controllers/deploy/index.ts
@@ -110,14 +110,17 @@ async function deployApp(deployment: any, userId: string) {
 
     // can't do this in test
     if (!env.isTest()) {
-      // trigger backup initially
-      await backups.triggerAppBackup(
-        productionAppId,
-        AppBackupTrigger.PUBLISH,
-        {
-          createdBy: userId,
-        }
-      )
+      // don't try this if feature isn't allowed, will error
+      if (!(await backups.isEnabled())) {
+        // trigger backup initially
+        await backups.triggerAppBackup(
+          productionAppId,
+          AppBackupTrigger.PUBLISH,
+          {
+            createdBy: userId,
+          }
+        )
+      }
     }
 
     const config: any = {

From d746c425034a4d23ac05f2b256cd7ba9c89e32d1 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 24 Oct 2022 14:23:16 +0100
Subject: [PATCH 115/151] Remove pro mock and invert if condition on backups
 enabled

---
 .../server/src/api/controllers/deploy/index.ts    |  2 +-
 .../src/api/routes/tests/deployment.spec.ts       | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/packages/server/src/api/controllers/deploy/index.ts b/packages/server/src/api/controllers/deploy/index.ts
index 4a7cc5a754..cb4534a1a5 100644
--- a/packages/server/src/api/controllers/deploy/index.ts
+++ b/packages/server/src/api/controllers/deploy/index.ts
@@ -108,7 +108,7 @@ async function deployApp(deployment: any, userId: string) {
     const productionAppId = getProdAppID(appId)
 
     // don't try this if feature isn't allowed, will error
-    if (!(await backups.isEnabled())) {
+    if (await backups.isEnabled()) {
       // trigger backup initially
       await backups.triggerAppBackup(
         productionAppId,
diff --git a/packages/server/src/api/routes/tests/deployment.spec.ts b/packages/server/src/api/routes/tests/deployment.spec.ts
index e659ff1a69..0219e3f2b4 100644
--- a/packages/server/src/api/routes/tests/deployment.spec.ts
+++ b/packages/server/src/api/routes/tests/deployment.spec.ts
@@ -1,14 +1,5 @@
-const triggerAppBackupMock = jest.fn()
-jest.mock("@budibase/pro", () => ({
-  ...jest.requireActual("@budibase/pro"),
-  backups: {
-    triggerAppBackup: triggerAppBackupMock,
-    addAppBackupProcessors: jest.fn(),
-  },
-}))
 import setup from "./utilities"
 import { events } from "@budibase/backend-core"
-import { AppBackupTrigger } from "@budibase/types"
 
 describe("/deployments", () => {
   let request = setup.getRequest()
@@ -28,12 +19,6 @@ describe("/deployments", () => {
         .set(config.defaultHeaders())
         .expect("Content-Type", /json/)
         .expect(200)
-      expect(triggerAppBackupMock).toBeCalledTimes(1)
-      expect(triggerAppBackupMock).toBeCalledWith(
-        config.prodAppId,
-        AppBackupTrigger.PUBLISH,
-        { createdBy: config.userMetadataId }
-      )
       expect((events.app.published as jest.Mock).mock.calls.length).toBe(1)
     })
   })

From 146cdaa1312bc1040372867b8d748963cdc16a2b Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 24 Oct 2022 15:00:00 +0100
Subject: [PATCH 116/151] add pro check and default state

---
 packages/builder/assets/backups-default.png   | Bin 0 -> 321261 bytes
 .../portal/overview/backups/BackupsTab.svelte | 154 ++++++++++++++----
 .../builder/src/stores/portal/licensing.js    |   6 +
 packages/frontend-core/src/constants.js       |   1 +
 4 files changed, 126 insertions(+), 35 deletions(-)
 create mode 100644 packages/builder/assets/backups-default.png

diff --git a/packages/builder/assets/backups-default.png b/packages/builder/assets/backups-default.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e37cbb6c74e0c17967762d6c6c6e70df97a278b
GIT binary patch
literal 321261
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%0ABbl!}{wv$JTAR
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
HO@jUpqn{#b

literal 0
HcmV?d00001

diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index cb20013b9b..a8c679a5d8 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -1,17 +1,23 @@
 <script>
   import {
     ActionButton,
+    Button,
     DatePicker,
+    Divider,
     Layout,
     Modal,
     notifications,
     Pagination,
     Select,
+    Heading,
+    Body,
+    Tags,
+    Tag,
     Table,
+    Page,
   } from "@budibase/bbui"
-  import { backups } from "stores/portal"
+  import { backups, licensing, auth, admin } from "stores/portal"
   import { createPaginationStore } from "helpers/pagination"
-
   import AppSizeRenderer from "./AppSizeRenderer.svelte"
   import CreateBackupModal from "./CreateBackupModal.svelte"
   import ActionsRenderer from "./ActionsRenderer.svelte"
@@ -19,7 +25,7 @@
   import UserRenderer from "./UserRenderer.svelte"
   import StatusRenderer from "./StatusRenderer.svelte"
   import TypeRenderer from "./TypeRenderer.svelte"
-
+  import BackupsDefault from "assets/backups-default.png"
   export let app
 
   let backupData = null
@@ -30,6 +36,7 @@
   let endDate = null
   let filters = getFilters()
 
+  $: console.log(backupData)
   $: page = $pageInfo.page
   $: fetchBackups(filterOpt, page, startDate, endDate)
 
@@ -146,38 +153,78 @@
 </script>
 
 <div class="root">
-  <Layout noPadding gap="M" alignContent="start">
-    <div class="search">
-      <div class="select">
-        <Select
-          placeholder="All"
-          label="Type"
-          options={filters}
-          getOptionValue={filter => filter.value}
-          getOptionLabel={filter => filter.label}
-          bind:value={filterOpt}
-        />
-      </div>
-      <div>
-        <DatePicker
-          range={true}
-          label={"Filter Range"}
-          on:change={e => {
-            if (e.detail[0].length > 1) {
-              startDate = e.detail[0][0].toISOString()
-              endDate = e.detail[0][1].toISOString()
-            }
-          }}
-        />
-      </div>
+  {#if !$licensing.backupsEnabled}
+    <Page wide={false}>
+      <Layout gap="XS" noPadding>
+        <div class="title">
+          <Heading size="M">Backups</Heading>
+          <Tags>
+            <Tag icon="LockClosed">Pro plan</Tag>
+          </Tags>
+        </div>
+        <div>
+          <Body>
+            Backup your apps and restore them to their previous state.
+            {#if !$auth.accountPortalAccess && !$licensing.groupsEnabled && $admin.cloud}
+              Contact your account holder to upgrade your plan.
+            {/if}
+          </Body>
+        </div>
+        <Divider />
+        <div class="pro-buttons">
+          <Button
+            newStyles
+            primary
+            disabled={!$auth.accountPortalAccess && $admin.cloud}
+            on:click={$licensing.goToUpgradePage()}
+          >
+            Upgrade
+          </Button>
+          <!--Show the view plans button-->
+          <Button
+            newStyles
+            secondary
+            on:click={() => {
+              window.open("https://budibase.com/pricing/", "_blank")
+            }}
+          >
+            View Plans
+          </Button>
+        </div>
+      </Layout>
+    </Page>
+  {:else if backupData}
+    <Layout noPadding gap="M" alignContent="start">
+      <div class="search">
+        <div class="select">
+          <Select
+            placeholder="All"
+            label="Type"
+            options={filters}
+            getOptionValue={filter => filter.value}
+            getOptionLabel={filter => filter.label}
+            bind:value={filterOpt}
+          />
+        </div>
+        <div>
+          <DatePicker
+            range={true}
+            label={"Filter Range"}
+            on:change={e => {
+              if (e.detail[0].length > 1) {
+                startDate = e.detail[0][0].toISOString()
+                endDate = e.detail[0][1].toISOString()
+              }
+            }}
+          />
+        </div>
 
-      <div class="split-buttons">
-        <ActionButton on:click={modal.show} icon="SaveAsFloppy"
-          >Create new backup</ActionButton
-        >
+        <div class="split-buttons">
+          <ActionButton on:click={modal.show} icon="SaveAsFloppy"
+            >Create new backup</ActionButton
+          >
+        </div>
       </div>
-    </div>
-    {#if backupData}
       <div>
         <Table
           {schema}
@@ -200,8 +247,28 @@
           />
         </div>
       </div>
-    {/if}
-  </Layout>
+    </Layout>
+  {:else if !backupData}
+    <Page wide={false}>
+      <div class="align">
+        <img
+          width="200px"
+          height="100px"
+          src={BackupsDefault}
+          alt="BackupsDefault"
+        />
+        <Layout gap="S">
+          <Heading>You have no backups yet</Heading>
+          <div class="opacity">
+            <Body size="S">You can manually backup your app any time</Body>
+          </div>
+          <div class="padding">
+            <Button cta>Create Backup</Button>
+          </div>
+        </Layout>
+      </div>
+    </Page>
+  {/if}
 </div>
 
 <Modal bind:this={modal}>
@@ -242,4 +309,21 @@
     flex: 1;
     gap: var(--spacing-xl);
   }
+
+  .title {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: var(--spacing-m);
+  }
+
+  .align {
+    margin-top: 5%;
+    text-align: center;
+  }
+
+  .pro-buttons {
+    display: flex;
+    gap: var(--spacing-m);
+  }
 </style>
diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js
index 179dac9689..59a1622c9f 100644
--- a/packages/builder/src/stores/portal/licensing.js
+++ b/packages/builder/src/stores/portal/licensing.js
@@ -14,6 +14,7 @@ export const createLicensingStore = () => {
     isFreePlan: true,
     // features
     groupsEnabled: false,
+    backupsEnabled: false,
     // the currently used quotas from the db
     quotaUsage: undefined,
     // derived quota metrics for percentages used
@@ -56,12 +57,17 @@ export const createLicensingStore = () => {
       const groupsEnabled = license.features.includes(
         Constants.Features.USER_GROUPS
       )
+      const backupsEnabled = license.features.includes(
+        Constants.Features.BACKUPS
+      )
+
       store.update(state => {
         return {
           ...state,
           license,
           isFreePlan,
           groupsEnabled,
+          backupsEnabled,
         }
       })
     },
diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js
index 9a5acf8a9b..1eed492c25 100644
--- a/packages/frontend-core/src/constants.js
+++ b/packages/frontend-core/src/constants.js
@@ -113,6 +113,7 @@ export const ApiVersion = "1"
 
 export const Features = {
   USER_GROUPS: "userGroups",
+  BACKUPS: "appBackups",
 }
 
 // Role IDs

From 1aca8756f663bdff694e4ed6a45dc5aa29918ce9 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 24 Oct 2022 15:09:32 +0100
Subject: [PATCH 117/151] pr comments

---
 packages/bbui/src/Form/DatePicker.svelte                    | 2 +-
 .../portal/overview/backups/ActionsRenderer.svelte          | 1 -
 .../portal/overview/backups/StatusRenderer.svelte           | 2 +-
 packages/builder/src/stores/portal/backups.js               | 5 -----
 packages/frontend-core/src/api/backups.js                   | 6 ------
 5 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/packages/bbui/src/Form/DatePicker.svelte b/packages/bbui/src/Form/DatePicker.svelte
index 6a0ba4ad36..04ce8b5467 100644
--- a/packages/bbui/src/Form/DatePicker.svelte
+++ b/packages/bbui/src/Form/DatePicker.svelte
@@ -21,7 +21,7 @@
     if (range) {
       // Flatpickr cant take two dates and work out what to display, needs to be provided a string.
       // Like - "Date1 to Date2". Hence passing in that specifically from the array
-      value = e.detail[1]
+      value = e?.detail[1]
     } else {
       value = e.detail
     }
diff --git a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
index bb09ad3f6d..8d1dfb52c5 100644
--- a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
@@ -101,7 +101,6 @@
   warning={false}
 >
   <Input onlabel="Backup name" placeholder={row.name} bind:value={name} />
-  <ConfirmDialog />
 </ConfirmDialog>
 
 <style>
diff --git a/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte b/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte
index a30ecde98b..3b3cce731d 100644
--- a/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte
@@ -2,7 +2,7 @@
   import { Badge } from "@budibase/bbui"
 
   export let value = "started"
-  $: status = value?.charAt(0).toUpperCase() + value?.slice(1)
+  $: status = value[0].toUpperCase() + value?.slice(1)
 </script>
 
 <Badge
diff --git a/packages/builder/src/stores/portal/backups.js b/packages/builder/src/stores/portal/backups.js
index c041edbed8..328a9d37cc 100644
--- a/packages/builder/src/stores/portal/backups.js
+++ b/packages/builder/src/stores/portal/backups.js
@@ -34,10 +34,6 @@ export function createBackupsStore() {
     return API.createManualBackup(appId, name)
   }
 
-  async function downloadBackup({ appId, backupId }) {
-    return API.downloadBackup({ appId, backupId })
-  }
-
   async function updateBackup({ appId, backupId, name }) {
     return API.updateBackup({ appId, backupId, name })
   }
@@ -48,7 +44,6 @@ export function createBackupsStore() {
     selectBackup,
     deleteBackup,
     restoreBackup,
-    downloadBackup,
     updateBackup,
     subscribe: store.subscribe,
   }
diff --git a/packages/frontend-core/src/api/backups.js b/packages/frontend-core/src/api/backups.js
index ad0be0ed70..8658815b15 100644
--- a/packages/frontend-core/src/api/backups.js
+++ b/packages/frontend-core/src/api/backups.js
@@ -47,10 +47,4 @@ export const buildBackupsEndpoints = API => ({
       body: { name },
     })
   },
-
-  downloadBackup: async ({ appId, backupId }) => {
-    return await API.get({
-      url: `/api/apps/${appId}/backups/${backupId}/file`,
-    })
-  },
 })

From 39c83d8fb13dc26d2712e5f44cc0fbd16e151802 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 24 Oct 2022 15:28:43 +0100
Subject: [PATCH 118/151] Move backup processing into pro

---
 packages/server/src/app.ts                    |  15 +-
 packages/server/src/sdk/app/backups/backup.ts | 145 ------------------
 packages/server/src/sdk/app/backups/index.ts  |   2 -
 3 files changed, 14 insertions(+), 148 deletions(-)
 delete mode 100644 packages/server/src/sdk/app/backups/backup.ts

diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts
index 776adb602d..330adadd3d 100644
--- a/packages/server/src/app.ts
+++ b/packages/server/src/app.ts
@@ -38,6 +38,7 @@ import {
 import { watch } from "./watch"
 import { initialise as initialiseWebsockets } from "./websocket"
 import sdk from "./sdk"
+import * as pro from "@budibase/pro"
 
 const app = new Koa()
 
@@ -103,13 +104,25 @@ server.on("close", async () => {
   }
 })
 
+const initPro = async () => {
+  await pro.init({
+    backups: {
+      processing: {
+        exportAppFn: sdk.backups.exportApp,
+        importAppFn: sdk.backups.importApp,
+        statsFn: sdk.backups.calculateBackupStats,
+      },
+    },
+  })
+}
+
 module.exports = server.listen(env.PORT || 0, async () => {
   console.log(`Budibase running on ${JSON.stringify(server.address())}`)
   env._set("PORT", server.address().port)
   eventEmitter.emitPort(env.PORT)
   fileSystem.init()
   await redis.init()
-  await sdk.backups.init()
+  await initPro()
 
   // run migrations on startup if not done via http
   // not recommended in a clustered environment
diff --git a/packages/server/src/sdk/app/backups/backup.ts b/packages/server/src/sdk/app/backups/backup.ts
deleted file mode 100644
index ac85b2940f..0000000000
--- a/packages/server/src/sdk/app/backups/backup.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-import { backups } from "@budibase/pro"
-import { db as dbCore, objectStore, tenancy } from "@budibase/backend-core"
-import {
-  AppBackupQueueData,
-  AppBackupStatus,
-  AppBackupTrigger,
-  AppBackupType,
-} from "@budibase/types"
-import { exportApp } from "./exports"
-import { importApp } from "./imports"
-import { calculateBackupStats } from "./statistics"
-import { Job } from "bull"
-import fs from "fs"
-import env from "../../../environment"
-
-type BackupOpts = {
-  doc?: { id: string; rev: string }
-  createdBy?: string
-}
-
-async function removeExistingApp(devId: string) {
-  const devDb = dbCore.dangerousGetDB(devId, { skip_setup: true })
-  await devDb.destroy()
-}
-
-async function runBackup(
-  name: string,
-  trigger: AppBackupTrigger,
-  tenantId: string,
-  appId: string,
-  opts?: BackupOpts
-) {
-  const devAppId = dbCore.getDevAppID(appId),
-    prodAppId = dbCore.getProdAppID(appId)
-  const timestamp = new Date().toISOString()
-  const tarPath = await exportApp(devAppId, { tar: true })
-  const contents = await calculateBackupStats(devAppId)
-  let filename = `${prodAppId}/backup-${timestamp}.tar.gz`
-  // add the tenant to the bucket path if backing up within a multi-tenant environment
-  if (env.MULTI_TENANCY) {
-    filename = `${tenantId}/${filename}`
-  }
-  const bucket = objectStore.ObjectStoreBuckets.BACKUPS
-  await objectStore.upload({
-    path: tarPath,
-    type: "application/gzip",
-    bucket,
-    filename,
-    metadata: {
-      name,
-      trigger,
-      timestamp,
-      appId: prodAppId,
-    },
-  })
-  if (opts?.doc) {
-    await backups.updateBackupStatus(
-      opts.doc.id,
-      opts.doc.rev,
-      AppBackupStatus.COMPLETE,
-      contents,
-      filename
-    )
-  } else {
-    await backups.storeAppBackupMetadata(
-      {
-        appId: prodAppId,
-        timestamp,
-        name,
-        trigger,
-        type: AppBackupType.BACKUP,
-        status: AppBackupStatus.COMPLETE,
-        contents,
-        createdBy: opts?.createdBy,
-      },
-      { filename }
-    )
-  }
-  // clear up the tarball after uploading it
-  fs.rmSync(tarPath)
-}
-
-async function importProcessor(job: Job) {
-  const data: AppBackupQueueData = job.data
-  const appId = data.appId,
-    backupId = data.import!.backupId,
-    nameForBackup = data.import!.nameForBackup,
-    createdBy = data.import!.createdBy
-  const tenantId = tenancy.getTenantIDFromAppID(appId) as string
-  tenancy.doInTenant(tenantId, async () => {
-    const devAppId = dbCore.getDevAppID(appId)
-    const { rev } = await backups.updateRestoreStatus(
-      data.docId,
-      data.docRev,
-      AppBackupStatus.PENDING
-    )
-    // initially export the current state to disk - incase something goes wrong
-    await runBackup(
-      nameForBackup,
-      AppBackupTrigger.RESTORING,
-      tenantId,
-      appId,
-      { createdBy }
-    )
-    // get the backup ready on disk
-    const { path } = await backups.downloadAppBackup(backupId)
-    // start by removing app database and contents of bucket - which will be updated
-    await removeExistingApp(devAppId)
-    let status = AppBackupStatus.COMPLETE
-    try {
-      await importApp(devAppId, dbCore.dangerousGetDB(devAppId), {
-        file: {
-          type: "application/gzip",
-          path,
-        },
-        key: path,
-      })
-    } catch (err) {
-      status = AppBackupStatus.FAILED
-    }
-    await backups.updateRestoreStatus(data.docId, rev, status)
-  })
-}
-
-async function exportProcessor(job: Job) {
-  const data: AppBackupQueueData = job.data
-  const appId = data.appId,
-    trigger = data.export!.trigger,
-    name = data.export!.name || `${trigger} - backup`
-  const tenantId = tenancy.getTenantIDFromAppID(appId) as string
-  await tenancy.doInTenant(tenantId, async () => {
-    const { rev } = await backups.updateBackupStatus(
-      data.docId,
-      data.docRev,
-      AppBackupStatus.PENDING
-    )
-    return runBackup(name, trigger, tenantId, appId, {
-      doc: { id: data.docId, rev },
-    })
-  })
-}
-
-export async function init() {
-  await backups.addAppBackupProcessors(importProcessor, exportProcessor)
-}
diff --git a/packages/server/src/sdk/app/backups/index.ts b/packages/server/src/sdk/app/backups/index.ts
index c2dd7a7b71..8e5697c53c 100644
--- a/packages/server/src/sdk/app/backups/index.ts
+++ b/packages/server/src/sdk/app/backups/index.ts
@@ -1,11 +1,9 @@
 import * as exportApps from "./exports"
 import * as importApps from "./imports"
-import * as backup from "./backup"
 import * as statistics from "./statistics"
 
 export default {
   ...exportApps,
   ...importApps,
-  ...backup,
   ...statistics,
 }

From 2ffae3a0d62f372953828250851c86b715b99a48 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 24 Oct 2022 15:38:03 +0100
Subject: [PATCH 119/151] always show automation history tab

---
 .../components/portal/overview/backups/BackupsTab.svelte  | 7 +++----
 .../builder/portal/overview/[application]/index.svelte    | 8 +++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index a8c679a5d8..e5725030d8 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -36,7 +36,6 @@
   let endDate = null
   let filters = getFilters()
 
-  $: console.log(backupData)
   $: page = $pageInfo.page
   $: fetchBackups(filterOpt, page, startDate, endDate)
 
@@ -193,7 +192,7 @@
         </div>
       </Layout>
     </Page>
-  {:else if backupData}
+  {:else if backupData?.length > 0}
     <Layout noPadding gap="M" alignContent="start">
       <div class="search">
         <div class="select">
@@ -248,7 +247,7 @@
         </div>
       </div>
     </Layout>
-  {:else if !backupData}
+  {:else if backupData?.length === 0}
     <Page wide={false}>
       <div class="align">
         <img
@@ -263,7 +262,7 @@
             <Body size="S">You can manually backup your app any time</Body>
           </div>
           <div class="padding">
-            <Button cta>Create Backup</Button>
+            <Button on:click={modal.show} cta>Create Backup</Button>
           </div>
         </Layout>
       </div>
diff --git a/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte b/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte
index c7ad77029a..cc31eec348 100644
--- a/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte
+++ b/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte
@@ -319,11 +319,9 @@
           <Tab title="Access">
             <AccessTab app={selectedApp} />
           </Tab>
-          {#if isPublished}
-            <Tab title="Automation History">
-              <HistoryTab app={selectedApp} />
-            </Tab>
-          {/if}
+          <Tab title="Automation History">
+            <HistoryTab app={selectedApp} />
+          </Tab>
           <Tab title="Backups">
             <BackupsTab app={selectedApp} />
           </Tab>

From ae8145baecf114d9b96244ba03668fda32f486c8 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 24 Oct 2022 15:43:48 +0100
Subject: [PATCH 120/151] Adding in retention days for app backups.

---
 packages/types/src/sdk/licensing/quota.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/types/src/sdk/licensing/quota.ts b/packages/types/src/sdk/licensing/quota.ts
index 74777d4590..86a092c6f5 100644
--- a/packages/types/src/sdk/licensing/quota.ts
+++ b/packages/types/src/sdk/licensing/quota.ts
@@ -25,6 +25,7 @@ export enum MonthlyQuotaName {
 
 export enum ConstantQuotaName {
   AUTOMATION_LOG_RETENTION_DAYS = "automationLogRetentionDays",
+  APP_BACKUPS_RETENTION_DAYS = "appBackupRetentionDays",
 }
 
 export type MeteredQuotaName = StaticQuotaName | MonthlyQuotaName
@@ -76,6 +77,7 @@ export type StaticQuotas = {
 
 export type ConstantQuotas = {
   [ConstantQuotaName.AUTOMATION_LOG_RETENTION_DAYS]: Quota
+  [ConstantQuotaName.APP_BACKUPS_RETENTION_DAYS]: Quota
 }
 
 export type Quotas = {

From 74a6594320251ef38a7ba2a0da8964ed9200a3d1 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 24 Oct 2022 16:20:03 +0100
Subject: [PATCH 121/151] autofill restore backup name

---
 .../overview/backups/ActionsRenderer.svelte   |  2 +-
 .../overview/backups/CreateBackupModal.svelte |  6 +---
 .../backups/CreateRestoreModal.svelte         |  9 ++++--
 .../overview/backups/UserRenderer.svelte      |  9 ++++--
 .../builder/app/[application]/_layout.svelte  | 29 +++++++++++--------
 5 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
index 8d1dfb52c5..db249dd224 100644
--- a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
@@ -85,7 +85,7 @@
   bind:this={restoreDialog}
   okText="Continue"
   onOk={restoreBackupModal?.show}
-  title="Confirm Restore"
+  title="Confirm restore"
   warning={false}
 >
   <Heading size="S">{row.name}</Heading>
diff --git a/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte b/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte
index 133e0b9443..09b92e8c39 100644
--- a/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte
+++ b/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte
@@ -10,11 +10,7 @@
   onConfirm={() => createManualBackup(name)}
   title="Create new backup"
   confirmText="Create"
-  ><Input
-    label="Backup name"
-    bind:value={name}
-    placeholder={"test"}
-  /></ModalContent
+  ><Input label="Backup name" bind:value={name} /></ModalContent
 >
 
 <style>
diff --git a/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte b/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte
index 3c554563da..79b1c8cd7e 100644
--- a/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte
+++ b/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte
@@ -1,15 +1,20 @@
 <script>
   import { ModalContent, Input, Body } from "@budibase/bbui"
-
+  import { auth } from "stores/portal"
+  $: console.log($auth.user)
   export let confirm
 
-  let name
+  let templateName = $auth.user.firstName
+    ? `${$auth.user.firstName}'s Backup`
+    : "Restore Backup"
+  let name = templateName
 </script>
 
 <ModalContent
   onConfirm={() => confirm(name)}
   title="Backup your current version"
   confirmText="Confirm Restore"
+  disabled={!name}
 >
   <Body size="S"
     >Create a backup of your current app to allow you to roll back after
diff --git a/packages/builder/src/components/portal/overview/backups/UserRenderer.svelte b/packages/builder/src/components/portal/overview/backups/UserRenderer.svelte
index 42b25bcca8..abab314d05 100644
--- a/packages/builder/src/components/portal/overview/backups/UserRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/UserRenderer.svelte
@@ -1,8 +1,11 @@
 <script>
   export let value
-  $: username = value?.firstName
-    ? `${value?.firstName} ${value?.lastName}`
-    : value?.email
+
+  let firstName = value?.firstName
+  let lastName = value?.lastName || ""
+
+  $: username =
+    firstName && lastName ? `${firstName} ${lastName}` : value?.email
 </script>
 
 <div class="cell">
diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index 5d25bba0fc..a854d09304 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -113,18 +113,23 @@
           >
             Access
           </MenuItem>
-          {#if isPublished}
-            <MenuItem
-              on:click={() =>
-                $goto(
-                  `../../portal/overview/${application}?tab=${encodeURIComponent(
-                    "Automation History"
-                  )}`
-                )}
-            >
-              Automation history
-            </MenuItem>
-          {/if}
+          <MenuItem
+            on:click={() =>
+              $goto(
+                `../../portal/overview/${application}?tab=${encodeURIComponent(
+                  "Automation History"
+                )}`
+              )}
+          >
+            Automation history
+          </MenuItem>
+          <MenuItem
+            on:click={() =>
+              $goto(`../../portal/overview/${application}?tab=Backups`)}
+          >
+            Backups
+          </MenuItem>
+
           <MenuItem
             on:click={() =>
               $goto(`../../portal/overview/${application}?tab=Settings`)}

From f4d3d99b9e4aa7093135762df9f78d5309d228d1 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Mon, 24 Oct 2022 16:21:08 +0100
Subject: [PATCH 122/151] Removed unnecessary block configuration elements

---
 .../components/app/blocks/ChartBlock.svelte   | 68 ++++++++-----------
 1 file changed, 29 insertions(+), 39 deletions(-)

diff --git a/packages/client/src/components/app/blocks/ChartBlock.svelte b/packages/client/src/components/app/blocks/ChartBlock.svelte
index 7a2f8469b8..cc2d156129 100644
--- a/packages/client/src/components/app/blocks/ChartBlock.svelte
+++ b/packages/client/src/components/app/blocks/ChartBlock.svelte
@@ -1,8 +1,6 @@
 <script>
-  import { getContext } from "svelte"
   import Block from "components/Block.svelte"
   import BlockComponent from "components/BlockComponent.svelte"
-  import Placeholder from "components/app/Placeholder.svelte"
   import { makePropSafe as safe } from "@budibase/string-templates"
 
   // Datasource
@@ -48,8 +46,6 @@
   export let lowColumn
   export let dateColumn
 
-  const component = getContext("component")
-
   let dataProviderId
 
   $: colors = c1 && c2 && c3 && c4 && c5 ? [c1, c2, c3, c4, c5] : null
@@ -67,41 +63,35 @@
       sortOrder,
       limit,
     }}
-    order={0}
   >
-    {#if $component.empty}
-      <Placeholder />
-    {:else}
-      <BlockComponent
-        type={chartType}
-        props={{
-          dataProvider: `{{ literal ${safe(dataProviderId)} }}`,
-          height,
-          width,
-          title: chartTitle,
-          labelColumn,
-          valueColumn,
-          valueColumns,
-          palette,
-          dataLabels,
-          legend,
-          animate,
-          ...colors,
-          yAxisUnits,
-          yAxisLabel,
-          xAxisLabel,
-          stacked,
-          horizontal,
-          curve,
-          gradient, //issue?
-          closeColumn,
-          openColumn,
-          highColumn,
-          lowColumn,
-          dateColumn,
-        }}
-        order={1}
-      />
-    {/if}
+    <BlockComponent
+      type={chartType}
+      props={{
+        dataProvider: `{{ literal ${safe(dataProviderId)} }}`,
+        height,
+        width,
+        title: chartTitle,
+        labelColumn,
+        valueColumn,
+        valueColumns,
+        palette,
+        dataLabels,
+        legend,
+        animate,
+        ...colors,
+        yAxisUnits,
+        yAxisLabel,
+        xAxisLabel,
+        stacked,
+        horizontal,
+        curve,
+        gradient, //issue?
+        closeColumn,
+        openColumn,
+        highColumn,
+        lowColumn,
+        dateColumn,
+      }}
+    />
   </BlockComponent>
 </Block>

From 72028b57ec8b6d7a737fc875f5f5791c55a395bf Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Mon, 24 Oct 2022 16:31:58 +0100
Subject: [PATCH 123/151] Don't attempt to render the internal chart until a
 type has been set

---
 .../components/app/blocks/ChartBlock.svelte   | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/packages/client/src/components/app/blocks/ChartBlock.svelte b/packages/client/src/components/app/blocks/ChartBlock.svelte
index cc2d156129..92151ad9c0 100644
--- a/packages/client/src/components/app/blocks/ChartBlock.svelte
+++ b/packages/client/src/components/app/blocks/ChartBlock.svelte
@@ -64,34 +64,36 @@
       limit,
     }}
   >
-    <BlockComponent
-      type={chartType}
-      props={{
-        dataProvider: `{{ literal ${safe(dataProviderId)} }}`,
-        height,
-        width,
-        title: chartTitle,
-        labelColumn,
-        valueColumn,
-        valueColumns,
-        palette,
-        dataLabels,
-        legend,
-        animate,
-        ...colors,
-        yAxisUnits,
-        yAxisLabel,
-        xAxisLabel,
-        stacked,
-        horizontal,
-        curve,
-        gradient, //issue?
-        closeColumn,
-        openColumn,
-        highColumn,
-        lowColumn,
-        dateColumn,
-      }}
-    />
+    {#if dataProviderId && chartType}
+      <BlockComponent
+        type={chartType}
+        props={{
+          dataProvider: `{{ literal ${safe(dataProviderId)} }}`,
+          height,
+          width,
+          title: chartTitle,
+          labelColumn,
+          valueColumn,
+          valueColumns,
+          palette,
+          dataLabels,
+          legend,
+          animate,
+          ...colors,
+          yAxisUnits,
+          yAxisLabel,
+          xAxisLabel,
+          stacked,
+          horizontal,
+          curve,
+          gradient, //issue?
+          closeColumn,
+          openColumn,
+          highColumn,
+          lowColumn,
+          dateColumn,
+        }}
+      />
+    {/if}
   </BlockComponent>
 </Block>

From 195beec0699e9244fac65ffc06990ea6507b08f4 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 24 Oct 2022 16:52:29 +0100
Subject: [PATCH 124/151] ui comments

---
 .../overview/backups/ActionsRenderer.svelte   |  4 +--
 .../portal/overview/backups/BackupsTab.svelte | 26 ++++++++++++-------
 .../overview/backups/CreateBackupModal.svelte |  6 ++++-
 .../backups/CreateRestoreModal.svelte         |  2 +-
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
index db249dd224..b9ca38cf72 100644
--- a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
@@ -47,7 +47,7 @@
   }
 
   async function downloadExport() {
-    window.location = `/api/apps/${row.appId}/backups/${row._id}/file`
+    window.open(`/api/apps/${row.appId}/backups/${row._id}/file`, "_blank")
   }
 </script>
 
@@ -88,7 +88,7 @@
   title="Confirm restore"
   warning={false}
 >
-  <Heading size="S">{row.name}</Heading>
+  <Heading size="S">{row.name || "Backup"}</Heading>
   <Body size="S">{new Date(row.timestamp).toLocaleString()}</Body>
 </ConfirmDialog>
 
diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index e5725030d8..958ee995c7 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -26,6 +26,8 @@
   import StatusRenderer from "./StatusRenderer.svelte"
   import TypeRenderer from "./TypeRenderer.svelte"
   import BackupsDefault from "assets/backups-default.png"
+  import { onMount } from "svelte"
+
   export let app
 
   let backupData = null
@@ -149,6 +151,10 @@
       await fetchBackups(filterOpt, page)
     }
   }
+
+  onMount(() => {
+    fetchBackups(filterOpt, page, startDate, endDate)
+  })
 </script>
 
 <div class="root">
@@ -171,14 +177,16 @@
         </div>
         <Divider />
         <div class="pro-buttons">
-          <Button
-            newStyles
-            primary
-            disabled={!$auth.accountPortalAccess && $admin.cloud}
-            on:click={$licensing.goToUpgradePage()}
-          >
-            Upgrade
-          </Button>
+          {#if $auth.accountPortalAccess}
+            <Button
+              newStyles
+              primary
+              disabled={!$auth.accountPortalAccess && $admin.cloud}
+              on:click={$licensing.goToUpgradePage()}
+            >
+              Upgrade
+            </Button>
+          {/if}
           <!--Show the view plans button-->
           <Button
             newStyles
@@ -252,7 +260,7 @@
       <div class="align">
         <img
           width="200px"
-          height="100px"
+          height="120px"
           src={BackupsDefault}
           alt="BackupsDefault"
         />
diff --git a/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte b/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte
index 09b92e8c39..d7a511890e 100644
--- a/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte
+++ b/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte
@@ -1,9 +1,13 @@
 <script>
   import { ModalContent, Input } from "@budibase/bbui"
+  import { auth } from "stores/portal"
 
   export let createManualBackup
 
-  let name
+  let templateName = $auth.user.firstName
+    ? `${$auth.user.firstName}'s Backup`
+    : "New Backup"
+  let name = templateName
 </script>
 
 <ModalContent
diff --git a/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte b/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte
index 79b1c8cd7e..4ffb105772 100644
--- a/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte
+++ b/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { ModalContent, Input, Body } from "@budibase/bbui"
   import { auth } from "stores/portal"
-  $: console.log($auth.user)
+
   export let confirm
 
   let templateName = $auth.user.firstName

From 69f3dabb0669d2a0abcd79d1cc919990b9e1a12a Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 24 Oct 2022 16:19:21 +0000
Subject: [PATCH 125/151] v2.0.30-alpha.14

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index b15124be55..8bff9aa2fc 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.30-alpha.13",
+  "version": "2.0.30-alpha.14",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index e6dff805ca..6f55269dd6 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.30-alpha.13",
+  "version": "2.0.30-alpha.14",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "2.0.30-alpha.13",
+    "@budibase/types": "2.0.30-alpha.14",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 6e252dfbfa..9ac1cd3200 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.30-alpha.13",
+  "version": "2.0.30-alpha.14",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "2.0.30-alpha.13",
+    "@budibase/string-templates": "2.0.30-alpha.14",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 7846e6b6b8..16f15420b9 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.30-alpha.13",
+  "version": "2.0.30-alpha.14",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.0.30-alpha.13",
-    "@budibase/client": "2.0.30-alpha.13",
-    "@budibase/frontend-core": "2.0.30-alpha.13",
-    "@budibase/string-templates": "2.0.30-alpha.13",
+    "@budibase/bbui": "2.0.30-alpha.14",
+    "@budibase/client": "2.0.30-alpha.14",
+    "@budibase/frontend-core": "2.0.30-alpha.14",
+    "@budibase/string-templates": "2.0.30-alpha.14",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 8ef38268be..d4d00452ab 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.30-alpha.13",
+  "version": "2.0.30-alpha.14",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.0.30-alpha.13",
-    "@budibase/string-templates": "2.0.30-alpha.13",
-    "@budibase/types": "2.0.30-alpha.13",
+    "@budibase/backend-core": "2.0.30-alpha.14",
+    "@budibase/string-templates": "2.0.30-alpha.14",
+    "@budibase/types": "2.0.30-alpha.14",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index e84186805a..1953933666 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.30-alpha.13",
+  "version": "2.0.30-alpha.14",
   "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": "2.0.30-alpha.13",
-    "@budibase/frontend-core": "2.0.30-alpha.13",
-    "@budibase/string-templates": "2.0.30-alpha.13",
+    "@budibase/bbui": "2.0.30-alpha.14",
+    "@budibase/frontend-core": "2.0.30-alpha.14",
+    "@budibase/string-templates": "2.0.30-alpha.14",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 7c911cd40a..9785cd53b5 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.30-alpha.13",
+  "version": "2.0.30-alpha.14",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.0.30-alpha.13",
+    "@budibase/bbui": "2.0.30-alpha.14",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index d739d0add1..b2cabceb70 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.30-alpha.13",
+  "version": "2.0.30-alpha.14",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 1c0efb0527..0aff79587e 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.30-alpha.13",
+  "version": "2.0.30-alpha.14",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.0.30-alpha.13",
-    "@budibase/client": "2.0.30-alpha.13",
+    "@budibase/backend-core": "2.0.30-alpha.14",
+    "@budibase/client": "2.0.30-alpha.14",
     "@budibase/pro": "2.0.30-alpha.13",
-    "@budibase/string-templates": "2.0.30-alpha.13",
-    "@budibase/types": "2.0.30-alpha.13",
+    "@budibase/string-templates": "2.0.30-alpha.14",
+    "@budibase/types": "2.0.30-alpha.14",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index a4ca399d8e..6c984f034a 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.30-alpha.13",
+  "version": "2.0.30-alpha.14",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 879ed72fbb..0f989066cd 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.30-alpha.13",
+  "version": "2.0.30-alpha.14",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 78fb31b9f4..e78ffc573b 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.30-alpha.13",
+  "version": "2.0.30-alpha.14",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.0.30-alpha.13",
+    "@budibase/backend-core": "2.0.30-alpha.14",
     "@budibase/pro": "2.0.30-alpha.13",
-    "@budibase/string-templates": "2.0.30-alpha.13",
-    "@budibase/types": "2.0.30-alpha.13",
+    "@budibase/string-templates": "2.0.30-alpha.14",
+    "@budibase/types": "2.0.30-alpha.14",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 90ec8278c64965b602d23d2c374b229fc4558bec Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 24 Oct 2022 16:22:29 +0000
Subject: [PATCH 126/151] Update pro version to 2.0.30-alpha.14

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 0aff79587e..8c429e2bb8 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.0.30-alpha.14",
     "@budibase/client": "2.0.30-alpha.14",
-    "@budibase/pro": "2.0.30-alpha.13",
+    "@budibase/pro": "2.0.30-alpha.14",
     "@budibase/string-templates": "2.0.30-alpha.14",
     "@budibase/types": "2.0.30-alpha.14",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 5d041c26d0..02fac81e31 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.30-alpha.13":
-  version "2.0.30-alpha.13"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.13.tgz#d32384e136bb458b3ae66435dcb1b73ea1dd371c"
-  integrity sha512-Jp5H84L68ru+8kSLFe/ysYncgW0LpJsSY1HBpXD/QJ9a/3/weDvOFfDUddq547B18ZclOGdEDt7USdqshiwxJA==
+"@budibase/backend-core@2.0.30-alpha.14":
+  version "2.0.30-alpha.14"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.14.tgz#d959788c885b596d48cc8e1246391634dcea9085"
+  integrity sha512-9JOSuGvdL/D2TfkPzRlveEQMY+Ub9z+rxoL40JWCZDktzbTRWCooOO7tdh9Oo0HqDt+VEhOB7NJm9uckLFxHMw==
   dependencies:
-    "@budibase/types" "2.0.30-alpha.13"
+    "@budibase/types" "2.0.30-alpha.14"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.30-alpha.13":
-  version "2.0.30-alpha.13"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.13.tgz#64d2536a098c5c46ae20ff2dff4740a7e88e2051"
-  integrity sha512-uxK5Zo6ZBxw82ZZrz1E2xXm7CBz/TB3VPnBHy5b2dQgEgshEbAxnxwzO1LiFmyb/dc62W1emO/lFIfhmp7tqtA==
+"@budibase/pro@2.0.30-alpha.14":
+  version "2.0.30-alpha.14"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.14.tgz#ed375f219a5109cb206caadc22fe3b5f09c93878"
+  integrity sha512-UUYIzMvJJcVgzRi2EccEYOI5za7d8MW0c2PZRN9WPLczeuJsVpQcTDW4JWt8LdzwWDSd6i5J1otBmy76bkt2pw==
   dependencies:
-    "@budibase/backend-core" "2.0.30-alpha.13"
-    "@budibase/types" "2.0.30-alpha.13"
+    "@budibase/backend-core" "2.0.30-alpha.14"
+    "@budibase/types" "2.0.30-alpha.14"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.30-alpha.13":
-  version "2.0.30-alpha.13"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.13.tgz#820e1c0e908ead50e76dfdf233f1b64931818ef5"
-  integrity sha512-tiyRl5Y2JFYSM/mJRszGsrp52+FL6O71tZasytn9H9Zenrcdr33eRWSC+RvoUGIXUub3uCoPht8aAC7YXNm/7g==
+"@budibase/types@2.0.30-alpha.14":
+  version "2.0.30-alpha.14"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.14.tgz#7b2591e71a233c15aadf54d2af2a762850f67027"
+  integrity sha512-0JZ/0zqXNBsRNlqNwQWhIBCEjKBndWbmAr+lsgTCEWGl6CTFi4VIXLoFrgRNCFxQEIZW5FkkVEQ4xG1NyxXUzQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index e78ffc573b..9f60e99efc 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.0.30-alpha.14",
-    "@budibase/pro": "2.0.30-alpha.13",
+    "@budibase/pro": "2.0.30-alpha.14",
     "@budibase/string-templates": "2.0.30-alpha.14",
     "@budibase/types": "2.0.30-alpha.14",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index cd817803c1..d2a138d69f 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.30-alpha.13":
-  version "2.0.30-alpha.13"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.13.tgz#d32384e136bb458b3ae66435dcb1b73ea1dd371c"
-  integrity sha512-Jp5H84L68ru+8kSLFe/ysYncgW0LpJsSY1HBpXD/QJ9a/3/weDvOFfDUddq547B18ZclOGdEDt7USdqshiwxJA==
+"@budibase/backend-core@2.0.30-alpha.14":
+  version "2.0.30-alpha.14"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.14.tgz#d959788c885b596d48cc8e1246391634dcea9085"
+  integrity sha512-9JOSuGvdL/D2TfkPzRlveEQMY+Ub9z+rxoL40JWCZDktzbTRWCooOO7tdh9Oo0HqDt+VEhOB7NJm9uckLFxHMw==
   dependencies:
-    "@budibase/types" "2.0.30-alpha.13"
+    "@budibase/types" "2.0.30-alpha.14"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.30-alpha.13":
-  version "2.0.30-alpha.13"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.13.tgz#64d2536a098c5c46ae20ff2dff4740a7e88e2051"
-  integrity sha512-uxK5Zo6ZBxw82ZZrz1E2xXm7CBz/TB3VPnBHy5b2dQgEgshEbAxnxwzO1LiFmyb/dc62W1emO/lFIfhmp7tqtA==
+"@budibase/pro@2.0.30-alpha.14":
+  version "2.0.30-alpha.14"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.14.tgz#ed375f219a5109cb206caadc22fe3b5f09c93878"
+  integrity sha512-UUYIzMvJJcVgzRi2EccEYOI5za7d8MW0c2PZRN9WPLczeuJsVpQcTDW4JWt8LdzwWDSd6i5J1otBmy76bkt2pw==
   dependencies:
-    "@budibase/backend-core" "2.0.30-alpha.13"
-    "@budibase/types" "2.0.30-alpha.13"
+    "@budibase/backend-core" "2.0.30-alpha.14"
+    "@budibase/types" "2.0.30-alpha.14"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.30-alpha.13":
-  version "2.0.30-alpha.13"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.13.tgz#820e1c0e908ead50e76dfdf233f1b64931818ef5"
-  integrity sha512-tiyRl5Y2JFYSM/mJRszGsrp52+FL6O71tZasytn9H9Zenrcdr33eRWSC+RvoUGIXUub3uCoPht8aAC7YXNm/7g==
+"@budibase/types@2.0.30-alpha.14":
+  version "2.0.30-alpha.14"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.14.tgz#7b2591e71a233c15aadf54d2af2a762850f67027"
+  integrity sha512-0JZ/0zqXNBsRNlqNwQWhIBCEjKBndWbmAr+lsgTCEWGl6CTFi4VIXLoFrgRNCFxQEIZW5FkkVEQ4xG1NyxXUzQ==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 544a6300b8a5cadf9c6457dc9cf7202645dfa895 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 24 Oct 2022 17:42:53 +0000
Subject: [PATCH 127/151] v2.0.30-alpha.15

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  6 +++---
 packages/worker/package.json           |  8 ++++----
 12 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/lerna.json b/lerna.json
index 8bff9aa2fc..9bbd97990e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.30-alpha.14",
+  "version": "2.0.30-alpha.15",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index a50d0ac552..37fc1a17c7 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.30-alpha.14",
+  "version": "2.0.30-alpha.15",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "2.0.30-alpha.14",
+    "@budibase/types": "2.0.30-alpha.15",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 9ac1cd3200..96222f703c 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.30-alpha.14",
+  "version": "2.0.30-alpha.15",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "2.0.30-alpha.14",
+    "@budibase/string-templates": "2.0.30-alpha.15",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 16f15420b9..921d3bb68f 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.30-alpha.14",
+  "version": "2.0.30-alpha.15",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.0.30-alpha.14",
-    "@budibase/client": "2.0.30-alpha.14",
-    "@budibase/frontend-core": "2.0.30-alpha.14",
-    "@budibase/string-templates": "2.0.30-alpha.14",
+    "@budibase/bbui": "2.0.30-alpha.15",
+    "@budibase/client": "2.0.30-alpha.15",
+    "@budibase/frontend-core": "2.0.30-alpha.15",
+    "@budibase/string-templates": "2.0.30-alpha.15",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index d4d00452ab..90062749b8 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.30-alpha.14",
+  "version": "2.0.30-alpha.15",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.0.30-alpha.14",
-    "@budibase/string-templates": "2.0.30-alpha.14",
-    "@budibase/types": "2.0.30-alpha.14",
+    "@budibase/backend-core": "2.0.30-alpha.15",
+    "@budibase/string-templates": "2.0.30-alpha.15",
+    "@budibase/types": "2.0.30-alpha.15",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 1953933666..3e79c0f2d4 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.30-alpha.14",
+  "version": "2.0.30-alpha.15",
   "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": "2.0.30-alpha.14",
-    "@budibase/frontend-core": "2.0.30-alpha.14",
-    "@budibase/string-templates": "2.0.30-alpha.14",
+    "@budibase/bbui": "2.0.30-alpha.15",
+    "@budibase/frontend-core": "2.0.30-alpha.15",
+    "@budibase/string-templates": "2.0.30-alpha.15",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 9785cd53b5..9831fbb456 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.30-alpha.14",
+  "version": "2.0.30-alpha.15",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.0.30-alpha.14",
+    "@budibase/bbui": "2.0.30-alpha.15",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index b2cabceb70..7ffe17d72a 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.30-alpha.14",
+  "version": "2.0.30-alpha.15",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 50b6576360..60d04fdad5 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.30-alpha.14",
+  "version": "2.0.30-alpha.15",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.0.30-alpha.14",
-    "@budibase/client": "2.0.30-alpha.14",
+    "@budibase/backend-core": "2.0.30-alpha.15",
+    "@budibase/client": "2.0.30-alpha.15",
     "@budibase/pro": "2.0.30-alpha.14",
-    "@budibase/string-templates": "2.0.30-alpha.14",
-    "@budibase/types": "2.0.30-alpha.14",
+    "@budibase/string-templates": "2.0.30-alpha.15",
+    "@budibase/types": "2.0.30-alpha.15",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 6c984f034a..1de52aa8e2 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.30-alpha.14",
+  "version": "2.0.30-alpha.15",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index ac934941ef..a929d1b357 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.30-alpha.14",
+  "version": "2.0.30-alpha.15",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,8 +15,8 @@
   "devDependencies": {
     "@types/koa": "2.13.4",
     "@types/node": "14.18.20",
+    "@types/pouchdb": "6.4.0",
     "rimraf": "3.0.2",
-    "typescript": "4.7.3",
-    "@types/pouchdb": "6.4.0"
+    "typescript": "4.7.3"
   }
 }
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 5a0fe31425..d5cdbc0cbf 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.30-alpha.14",
+  "version": "2.0.30-alpha.15",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.0.30-alpha.14",
+    "@budibase/backend-core": "2.0.30-alpha.15",
     "@budibase/pro": "2.0.30-alpha.14",
-    "@budibase/string-templates": "2.0.30-alpha.14",
-    "@budibase/types": "2.0.30-alpha.14",
+    "@budibase/string-templates": "2.0.30-alpha.15",
+    "@budibase/types": "2.0.30-alpha.15",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 953306aa66784ecf83450477189d1a9a01ae44c0 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 24 Oct 2022 17:46:29 +0000
Subject: [PATCH 128/151] Update pro version to 2.0.30-alpha.15

---
 packages/server/package.json |   2 +-
 packages/server/yarn.lock    |  32 +++----
 packages/worker/package.json |   2 +-
 packages/worker/yarn.lock    | 158 +++++++++++++++++++++++++++++++----
 4 files changed, 160 insertions(+), 34 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 60d04fdad5..3d461da841 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.0.30-alpha.15",
     "@budibase/client": "2.0.30-alpha.15",
-    "@budibase/pro": "2.0.30-alpha.14",
+    "@budibase/pro": "2.0.30-alpha.15",
     "@budibase/string-templates": "2.0.30-alpha.15",
     "@budibase/types": "2.0.30-alpha.15",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 33efb13a59..73b087f7d4 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,17 +1094,18 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.30-alpha.14":
-  version "2.0.30-alpha.14"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.14.tgz#d959788c885b596d48cc8e1246391634dcea9085"
-  integrity sha512-9JOSuGvdL/D2TfkPzRlveEQMY+Ub9z+rxoL40JWCZDktzbTRWCooOO7tdh9Oo0HqDt+VEhOB7NJm9uckLFxHMw==
+"@budibase/backend-core@2.0.30-alpha.15":
+  version "2.0.30-alpha.15"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.15.tgz#755200b1275afafbd30ad4b9d3c392469362e535"
+  integrity sha512-XxBM4kgid6QqS+Z8KE5C625YCtvzSpuRy6dpbEDJBmH3GlYTaO3Vve6+KSHaAOpUrrq/bzhp/mjnd5+tGGQR7g==
   dependencies:
-    "@budibase/types" "2.0.30-alpha.14"
+    "@budibase/types" "2.0.30-alpha.15"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
     bcryptjs "2.4.3"
+    bull "4.10.1"
     dotenv "16.0.1"
     emitter-listener "1.1.2"
     ioredis "4.28.0"
@@ -1180,14 +1181,15 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.30-alpha.14":
-  version "2.0.30-alpha.14"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.14.tgz#ed375f219a5109cb206caadc22fe3b5f09c93878"
-  integrity sha512-UUYIzMvJJcVgzRi2EccEYOI5za7d8MW0c2PZRN9WPLczeuJsVpQcTDW4JWt8LdzwWDSd6i5J1otBmy76bkt2pw==
+"@budibase/pro@2.0.30-alpha.15":
+  version "2.0.30-alpha.15"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.15.tgz#04dc25e14312c6a95bcb85957b51a33e0238410d"
+  integrity sha512-hNdAhZS5ET7VGusruKOm21N6QaM/m/8nKYS9AxSHYUGb2Pj6MoZcPwKig3JbWr5v20vtTwPayk9aQcnKuLoYAA==
   dependencies:
-    "@budibase/backend-core" "2.0.30-alpha.14"
-    "@budibase/types" "2.0.30-alpha.14"
+    "@budibase/backend-core" "2.0.30-alpha.15"
+    "@budibase/types" "2.0.30-alpha.15"
     "@koa/router" "8.0.8"
+    bull "4.10.1"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
@@ -1209,10 +1211,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.30-alpha.14":
-  version "2.0.30-alpha.14"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.14.tgz#7b2591e71a233c15aadf54d2af2a762850f67027"
-  integrity sha512-0JZ/0zqXNBsRNlqNwQWhIBCEjKBndWbmAr+lsgTCEWGl6CTFi4VIXLoFrgRNCFxQEIZW5FkkVEQ4xG1NyxXUzQ==
+"@budibase/types@2.0.30-alpha.15":
+  version "2.0.30-alpha.15"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.15.tgz#0d2deadb69e83d7effa20baa903186cb32e31f23"
+  integrity sha512-58TdID53W4zVecX0zSnOQGXgY/r+ZA9k0BlxmF3aD4OFnB5VZPgsNaHHDbSKU1r72Byp4Kc6LQ/EQ7FfYzOBxQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index d5cdbc0cbf..ef892f8691 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.0.30-alpha.15",
-    "@budibase/pro": "2.0.30-alpha.14",
+    "@budibase/pro": "2.0.30-alpha.15",
     "@budibase/string-templates": "2.0.30-alpha.15",
     "@budibase/types": "2.0.30-alpha.15",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index c6550296e1..1c8e9b527e 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,17 +291,18 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.30-alpha.14":
-  version "2.0.30-alpha.14"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.14.tgz#d959788c885b596d48cc8e1246391634dcea9085"
-  integrity sha512-9JOSuGvdL/D2TfkPzRlveEQMY+Ub9z+rxoL40JWCZDktzbTRWCooOO7tdh9Oo0HqDt+VEhOB7NJm9uckLFxHMw==
+"@budibase/backend-core@2.0.30-alpha.15":
+  version "2.0.30-alpha.15"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.15.tgz#755200b1275afafbd30ad4b9d3c392469362e535"
+  integrity sha512-XxBM4kgid6QqS+Z8KE5C625YCtvzSpuRy6dpbEDJBmH3GlYTaO3Vve6+KSHaAOpUrrq/bzhp/mjnd5+tGGQR7g==
   dependencies:
-    "@budibase/types" "2.0.30-alpha.14"
+    "@budibase/types" "2.0.30-alpha.15"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
     bcryptjs "2.4.3"
+    bull "4.10.1"
     dotenv "16.0.1"
     emitter-listener "1.1.2"
     ioredis "4.28.0"
@@ -327,21 +328,22 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.30-alpha.14":
-  version "2.0.30-alpha.14"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.14.tgz#ed375f219a5109cb206caadc22fe3b5f09c93878"
-  integrity sha512-UUYIzMvJJcVgzRi2EccEYOI5za7d8MW0c2PZRN9WPLczeuJsVpQcTDW4JWt8LdzwWDSd6i5J1otBmy76bkt2pw==
+"@budibase/pro@2.0.30-alpha.15":
+  version "2.0.30-alpha.15"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.15.tgz#04dc25e14312c6a95bcb85957b51a33e0238410d"
+  integrity sha512-hNdAhZS5ET7VGusruKOm21N6QaM/m/8nKYS9AxSHYUGb2Pj6MoZcPwKig3JbWr5v20vtTwPayk9aQcnKuLoYAA==
   dependencies:
-    "@budibase/backend-core" "2.0.30-alpha.14"
-    "@budibase/types" "2.0.30-alpha.14"
+    "@budibase/backend-core" "2.0.30-alpha.15"
+    "@budibase/types" "2.0.30-alpha.15"
     "@koa/router" "8.0.8"
+    bull "4.10.1"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.30-alpha.14":
-  version "2.0.30-alpha.14"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.14.tgz#7b2591e71a233c15aadf54d2af2a762850f67027"
-  integrity sha512-0JZ/0zqXNBsRNlqNwQWhIBCEjKBndWbmAr+lsgTCEWGl6CTFi4VIXLoFrgRNCFxQEIZW5FkkVEQ4xG1NyxXUzQ==
+"@budibase/types@2.0.30-alpha.15":
+  version "2.0.30-alpha.15"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.15.tgz#0d2deadb69e83d7effa20baa903186cb32e31f23"
+  integrity sha512-58TdID53W4zVecX0zSnOQGXgY/r+ZA9k0BlxmF3aD4OFnB5VZPgsNaHHDbSKU1r72Byp4Kc6LQ/EQ7FfYzOBxQ==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"
@@ -649,6 +651,36 @@
     semver "^7.3.5"
     tar "^6.1.11"
 
+"@msgpackr-extract/msgpackr-extract-darwin-arm64@2.1.2":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.1.2.tgz#9571b87be3a3f2c46de05585470bc4f3af2f6f00"
+  integrity sha512-TyVLn3S/+ikMDsh0gbKv2YydKClN8HaJDDpONlaZR+LVJmsxLFUgA+O7zu59h9+f9gX1aj/ahw9wqa6rosmrYQ==
+
+"@msgpackr-extract/msgpackr-extract-darwin-x64@2.1.2":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-2.1.2.tgz#bfbc6936ede2955218f5621a675679a5fe8e6f4c"
+  integrity sha512-YPXtcVkhmVNoMGlqp81ZHW4dMxK09msWgnxtsDpSiZwTzUBG2N+No2bsr7WMtBKCVJMSD6mbAl7YhKUqkp/Few==
+
+"@msgpackr-extract/msgpackr-extract-linux-arm64@2.1.2":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-2.1.2.tgz#22555e28382af2922e7450634c8a2f240bb9eb82"
+  integrity sha512-vHZ2JiOWF2+DN9lzltGbhtQNzDo8fKFGrf37UJrgqxU0yvtERrzUugnfnX1wmVfFhSsF8OxrfqiNOUc5hko1Zg==
+
+"@msgpackr-extract/msgpackr-extract-linux-arm@2.1.2":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-2.1.2.tgz#ffb6ae1beea7ac572b6be6bf2a8e8162ebdd8be7"
+  integrity sha512-42R4MAFeIeNn+L98qwxAt360bwzX2Kf0ZQkBBucJ2Ircza3asoY4CDbgiu9VWklq8gWJVSJSJBwDI+c/THiWkA==
+
+"@msgpackr-extract/msgpackr-extract-linux-x64@2.1.2":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-2.1.2.tgz#7caf62eebbfb1345de40f75e89666b3d4194755f"
+  integrity sha512-RjRoRxg7Q3kPAdUSC5EUUPlwfMkIVhmaRTIe+cqHbKrGZ4M6TyCA/b5qMaukQ/1CHWrqYY2FbKOAU8Hg0pQFzg==
+
+"@msgpackr-extract/msgpackr-extract-win32-x64@2.1.2":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.1.2.tgz#f2d8b9ddd8d191205ed26ce54aba3dfc5ae3e7c9"
+  integrity sha512-rIZVR48zA8hGkHIK7ED6+ZiXsjRCcAVBJbm8o89OKAMTmEAQ2QvoOxoiu3w2isAaWwzgtQIOFIqHwvZDyLKCvw==
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -1727,6 +1759,21 @@ buffer@^5.1.0, buffer@^5.5.0, buffer@^5.6.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
+bull@4.10.1:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/bull/-/bull-4.10.1.tgz#f14974b6089358b62b495a2cbf838aadc098e43f"
+  integrity sha512-Fp21tRPb2EaZPVfmM+ONZKVz2RA+to+zGgaTLyCKt3JMSU8OOBqK8143OQrnGuGpsyE5G+9FevFAGhdZZfQP2g==
+  dependencies:
+    cron-parser "^4.2.1"
+    debuglog "^1.0.0"
+    get-port "^5.1.1"
+    ioredis "^4.28.5"
+    lodash "^4.17.21"
+    msgpackr "^1.5.2"
+    p-timeout "^3.2.0"
+    semver "^7.3.2"
+    uuid "^8.3.0"
+
 bytes@3.1.2, bytes@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
@@ -2134,6 +2181,13 @@ create-require@^1.1.0:
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
+cron-parser@^4.2.1:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-4.6.0.tgz#404c3fdbff10ae80eef6b709555d577ef2fd2e0d"
+  integrity sha512-guZNLMGUgg6z4+eGhmHGw7ft+v6OQeuHzd1gcLxCo9Yg/qoxmG3nindp2/uwGCLizEisf2H0ptqeVXeoCpP6FA==
+  dependencies:
+    luxon "^3.0.1"
+
 cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -2216,6 +2270,11 @@ debug@^3.1.0, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
+debuglog@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==
+
 decimal.js@^10.2.1:
   version "10.3.1"
   resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
@@ -3139,6 +3198,11 @@ get-package-type@^0.1.0:
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
+get-port@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
+  integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
+
 get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -3653,6 +3717,23 @@ ioredis@4.28.0:
     redis-parser "^3.0.0"
     standard-as-callback "^2.1.0"
 
+ioredis@^4.28.5:
+  version "4.28.5"
+  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.28.5.tgz#5c149e6a8d76a7f8fa8a504ffc85b7d5b6797f9f"
+  integrity sha512-3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A==
+  dependencies:
+    cluster-key-slot "^1.1.0"
+    debug "^4.3.1"
+    denque "^1.1.0"
+    lodash.defaults "^4.2.0"
+    lodash.flatten "^4.4.0"
+    lodash.isarguments "^3.1.0"
+    p-map "^2.1.0"
+    redis-commands "1.7.0"
+    redis-errors "^1.2.0"
+    redis-parser "^3.0.0"
+    standard-as-callback "^2.1.0"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -4888,7 +4969,7 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==
 
-lodash@4.17.21, lodash@^4.14.0, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.7.0:
+lodash@4.17.21, lodash@^4.14.0, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -4928,6 +5009,11 @@ ltgt@2.2.1, ltgt@^2.1.2, ltgt@~2.2.0:
   resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5"
   integrity sha512-AI2r85+4MquTw9ZYqabu4nMwy9Oftlfa/e/52t9IjtfG+mGBbTNdAoZ3RQKLHR6r0wQnwZnPIEh/Ya6XTWAKNA==
 
+luxon@^3.0.1:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/luxon/-/luxon-3.0.4.tgz#d179e4e9f05e092241e7044f64aaa54796b03929"
+  integrity sha512-aV48rGUwP/Vydn8HT+5cdr26YYQiUZ42NM6ToMoaGKwYfWbfLeRkEu1wXWMHBZT6+KyLfcbbtVcoQFCbbPjKlw==
+
 make-dir@^3.0.0, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -5137,6 +5223,27 @@ ms@^2.0.0, ms@^2.1.1, ms@^2.1.3:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
+msgpackr-extract@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/msgpackr-extract/-/msgpackr-extract-2.1.2.tgz#56272030f3e163e1b51964ef8b1cd5e7240c03ed"
+  integrity sha512-cmrmERQFb19NX2JABOGtrKdHMyI6RUyceaPBQ2iRz9GnDkjBWFjNJC0jyyoOfZl2U/LZE3tQCCQc4dlRyA8mcA==
+  dependencies:
+    node-gyp-build-optional-packages "5.0.3"
+  optionalDependencies:
+    "@msgpackr-extract/msgpackr-extract-darwin-arm64" "2.1.2"
+    "@msgpackr-extract/msgpackr-extract-darwin-x64" "2.1.2"
+    "@msgpackr-extract/msgpackr-extract-linux-arm" "2.1.2"
+    "@msgpackr-extract/msgpackr-extract-linux-arm64" "2.1.2"
+    "@msgpackr-extract/msgpackr-extract-linux-x64" "2.1.2"
+    "@msgpackr-extract/msgpackr-extract-win32-x64" "2.1.2"
+
+msgpackr@^1.5.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.7.2.tgz#68d6debf5999d6b61abb6e7046a689991ebf7261"
+  integrity sha512-mWScyHTtG6TjivXX9vfIy2nBtRupaiAj0HQ2mtmpmYujAmqZmaaEVPaSZ1NKLMvicaMLFzEaMk0ManxMRg8rMQ==
+  optionalDependencies:
+    msgpackr-extract "^2.1.2"
+
 mute-stream@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
@@ -5199,6 +5306,11 @@ node-forge@^0.7.1:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz#fdf3b418aee1f94f0ef642cd63486c77ca9724ac"
   integrity sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==
 
+node-gyp-build-optional-packages@5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz#92a89d400352c44ad3975010368072b41ad66c17"
+  integrity sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==
+
 node-gyp-build@~4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.1.1.tgz#d7270b5d86717068d114cc57fff352f96d745feb"
@@ -5436,6 +5548,11 @@ p-cancelable@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
   integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
 
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
+
 p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -5455,6 +5572,13 @@ p-map@^2.1.0:
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
   integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
+p-timeout@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
+  integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
+  dependencies:
+    p-finally "^1.0.0"
+
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
@@ -7344,7 +7468,7 @@ uuid@8.1.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz#6f1536eb43249f473abc6bd58ff983da1ca30d8d"
   integrity sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==
 
-uuid@8.3.2, uuid@^8.3.2:
+uuid@8.3.2, uuid@^8.3.0, uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==

From 6568e40267bdfa4aba4335dd9829d2ca9252b75c Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 25 Oct 2022 08:01:42 +0100
Subject: [PATCH 129/151] Rename grid component as beta

---
 packages/client/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index cc4034dbca..7da72cefba 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -4567,7 +4567,7 @@
     ]
   },
   "grid": {
-    "name": "Grid",
+    "name": "Grid (Beta)",
     "icon": "ViewGrid",
     "hasChildren": true,
     "styles": [

From 17cb526c629c442588fd72a4675b6fa089c8fb61 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 25 Oct 2022 07:31:09 +0000
Subject: [PATCH 130/151] v2.0.30-alpha.16

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 9bbd97990e..d0a817ca3e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.30-alpha.15",
+  "version": "2.0.30-alpha.16",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 37fc1a17c7..78036410ff 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.30-alpha.15",
+  "version": "2.0.30-alpha.16",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "2.0.30-alpha.15",
+    "@budibase/types": "2.0.30-alpha.16",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 96222f703c..f0216109c0 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.30-alpha.15",
+  "version": "2.0.30-alpha.16",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "2.0.30-alpha.15",
+    "@budibase/string-templates": "2.0.30-alpha.16",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 921d3bb68f..cbab97bbc5 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.30-alpha.15",
+  "version": "2.0.30-alpha.16",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.0.30-alpha.15",
-    "@budibase/client": "2.0.30-alpha.15",
-    "@budibase/frontend-core": "2.0.30-alpha.15",
-    "@budibase/string-templates": "2.0.30-alpha.15",
+    "@budibase/bbui": "2.0.30-alpha.16",
+    "@budibase/client": "2.0.30-alpha.16",
+    "@budibase/frontend-core": "2.0.30-alpha.16",
+    "@budibase/string-templates": "2.0.30-alpha.16",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 90062749b8..f8f3536259 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.30-alpha.15",
+  "version": "2.0.30-alpha.16",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.0.30-alpha.15",
-    "@budibase/string-templates": "2.0.30-alpha.15",
-    "@budibase/types": "2.0.30-alpha.15",
+    "@budibase/backend-core": "2.0.30-alpha.16",
+    "@budibase/string-templates": "2.0.30-alpha.16",
+    "@budibase/types": "2.0.30-alpha.16",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 3e79c0f2d4..4b09a0474a 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.30-alpha.15",
+  "version": "2.0.30-alpha.16",
   "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": "2.0.30-alpha.15",
-    "@budibase/frontend-core": "2.0.30-alpha.15",
-    "@budibase/string-templates": "2.0.30-alpha.15",
+    "@budibase/bbui": "2.0.30-alpha.16",
+    "@budibase/frontend-core": "2.0.30-alpha.16",
+    "@budibase/string-templates": "2.0.30-alpha.16",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 9831fbb456..3ab87b6564 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.30-alpha.15",
+  "version": "2.0.30-alpha.16",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.0.30-alpha.15",
+    "@budibase/bbui": "2.0.30-alpha.16",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 7ffe17d72a..06a9484870 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.30-alpha.15",
+  "version": "2.0.30-alpha.16",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 3d461da841..374692bd9f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.30-alpha.15",
+  "version": "2.0.30-alpha.16",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.0.30-alpha.15",
-    "@budibase/client": "2.0.30-alpha.15",
+    "@budibase/backend-core": "2.0.30-alpha.16",
+    "@budibase/client": "2.0.30-alpha.16",
     "@budibase/pro": "2.0.30-alpha.15",
-    "@budibase/string-templates": "2.0.30-alpha.15",
-    "@budibase/types": "2.0.30-alpha.15",
+    "@budibase/string-templates": "2.0.30-alpha.16",
+    "@budibase/types": "2.0.30-alpha.16",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 1de52aa8e2..d1216d7ad4 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.30-alpha.15",
+  "version": "2.0.30-alpha.16",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index a929d1b357..914136b453 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.30-alpha.15",
+  "version": "2.0.30-alpha.16",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index ef892f8691..e8cd8d88c6 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.30-alpha.15",
+  "version": "2.0.30-alpha.16",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.0.30-alpha.15",
+    "@budibase/backend-core": "2.0.30-alpha.16",
     "@budibase/pro": "2.0.30-alpha.15",
-    "@budibase/string-templates": "2.0.30-alpha.15",
-    "@budibase/types": "2.0.30-alpha.15",
+    "@budibase/string-templates": "2.0.30-alpha.16",
+    "@budibase/types": "2.0.30-alpha.16",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 57fda3dea0f736207ffde4c797671f96f8152626 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 25 Oct 2022 07:34:21 +0000
Subject: [PATCH 131/151] Update pro version to 2.0.30-alpha.16

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 374692bd9f..a3ec4568aa 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.0.30-alpha.16",
     "@budibase/client": "2.0.30-alpha.16",
-    "@budibase/pro": "2.0.30-alpha.15",
+    "@budibase/pro": "2.0.30-alpha.16",
     "@budibase/string-templates": "2.0.30-alpha.16",
     "@budibase/types": "2.0.30-alpha.16",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 73b087f7d4..123bb8802a 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.30-alpha.15":
-  version "2.0.30-alpha.15"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.15.tgz#755200b1275afafbd30ad4b9d3c392469362e535"
-  integrity sha512-XxBM4kgid6QqS+Z8KE5C625YCtvzSpuRy6dpbEDJBmH3GlYTaO3Vve6+KSHaAOpUrrq/bzhp/mjnd5+tGGQR7g==
+"@budibase/backend-core@2.0.30-alpha.16":
+  version "2.0.30-alpha.16"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.16.tgz#3a3cc5e9442470ae848ecd006068e57c8bc67193"
+  integrity sha512-4qlKTcWyRPNEeLpyakwfYnZpJNLZ/mplSKYHlsvPOvfNXv78tQdwHpCsO443dczGoQwbe+cpszlHY69uQZKTjA==
   dependencies:
-    "@budibase/types" "2.0.30-alpha.15"
+    "@budibase/types" "2.0.30-alpha.16"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1181,13 +1181,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.30-alpha.15":
-  version "2.0.30-alpha.15"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.15.tgz#04dc25e14312c6a95bcb85957b51a33e0238410d"
-  integrity sha512-hNdAhZS5ET7VGusruKOm21N6QaM/m/8nKYS9AxSHYUGb2Pj6MoZcPwKig3JbWr5v20vtTwPayk9aQcnKuLoYAA==
+"@budibase/pro@2.0.30-alpha.16":
+  version "2.0.30-alpha.16"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.16.tgz#7ee44fdaf9a95dd1b9cd25bc75ab26d115f73822"
+  integrity sha512-nSb3MvsNBHpoFsLW68b9Miq8Y32LhqJrJBGp3+6Mc9DFl7yXlRmCtkV93oVYZO9HfV7Q6newRx4BFZFHCQYzig==
   dependencies:
-    "@budibase/backend-core" "2.0.30-alpha.15"
-    "@budibase/types" "2.0.30-alpha.15"
+    "@budibase/backend-core" "2.0.30-alpha.16"
+    "@budibase/types" "2.0.30-alpha.16"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1211,10 +1211,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.30-alpha.15":
-  version "2.0.30-alpha.15"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.15.tgz#0d2deadb69e83d7effa20baa903186cb32e31f23"
-  integrity sha512-58TdID53W4zVecX0zSnOQGXgY/r+ZA9k0BlxmF3aD4OFnB5VZPgsNaHHDbSKU1r72Byp4Kc6LQ/EQ7FfYzOBxQ==
+"@budibase/types@2.0.30-alpha.16":
+  version "2.0.30-alpha.16"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.16.tgz#9ca9ae8f31bf2fbc0422ec26738bae4cc7a27363"
+  integrity sha512-856VjV07pw9WpBdjzzU1qVHb/vNIBAD2lnYtqa1Z30nFO1fJGDSbnbepDtog1Nb3vGOF+YPTu9r/+Gkszbku0g==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index e8cd8d88c6..be9367203f 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.0.30-alpha.16",
-    "@budibase/pro": "2.0.30-alpha.15",
+    "@budibase/pro": "2.0.30-alpha.16",
     "@budibase/string-templates": "2.0.30-alpha.16",
     "@budibase/types": "2.0.30-alpha.16",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 1c8e9b527e..c2b2417209 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.30-alpha.15":
-  version "2.0.30-alpha.15"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.15.tgz#755200b1275afafbd30ad4b9d3c392469362e535"
-  integrity sha512-XxBM4kgid6QqS+Z8KE5C625YCtvzSpuRy6dpbEDJBmH3GlYTaO3Vve6+KSHaAOpUrrq/bzhp/mjnd5+tGGQR7g==
+"@budibase/backend-core@2.0.30-alpha.16":
+  version "2.0.30-alpha.16"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.16.tgz#3a3cc5e9442470ae848ecd006068e57c8bc67193"
+  integrity sha512-4qlKTcWyRPNEeLpyakwfYnZpJNLZ/mplSKYHlsvPOvfNXv78tQdwHpCsO443dczGoQwbe+cpszlHY69uQZKTjA==
   dependencies:
-    "@budibase/types" "2.0.30-alpha.15"
+    "@budibase/types" "2.0.30-alpha.16"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -328,22 +328,22 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.30-alpha.15":
-  version "2.0.30-alpha.15"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.15.tgz#04dc25e14312c6a95bcb85957b51a33e0238410d"
-  integrity sha512-hNdAhZS5ET7VGusruKOm21N6QaM/m/8nKYS9AxSHYUGb2Pj6MoZcPwKig3JbWr5v20vtTwPayk9aQcnKuLoYAA==
+"@budibase/pro@2.0.30-alpha.16":
+  version "2.0.30-alpha.16"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.16.tgz#7ee44fdaf9a95dd1b9cd25bc75ab26d115f73822"
+  integrity sha512-nSb3MvsNBHpoFsLW68b9Miq8Y32LhqJrJBGp3+6Mc9DFl7yXlRmCtkV93oVYZO9HfV7Q6newRx4BFZFHCQYzig==
   dependencies:
-    "@budibase/backend-core" "2.0.30-alpha.15"
-    "@budibase/types" "2.0.30-alpha.15"
+    "@budibase/backend-core" "2.0.30-alpha.16"
+    "@budibase/types" "2.0.30-alpha.16"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.30-alpha.15":
-  version "2.0.30-alpha.15"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.15.tgz#0d2deadb69e83d7effa20baa903186cb32e31f23"
-  integrity sha512-58TdID53W4zVecX0zSnOQGXgY/r+ZA9k0BlxmF3aD4OFnB5VZPgsNaHHDbSKU1r72Byp4Kc6LQ/EQ7FfYzOBxQ==
+"@budibase/types@2.0.30-alpha.16":
+  version "2.0.30-alpha.16"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.16.tgz#9ca9ae8f31bf2fbc0422ec26738bae4cc7a27363"
+  integrity sha512-856VjV07pw9WpBdjzzU1qVHb/vNIBAD2lnYtqa1Z30nFO1fJGDSbnbepDtog1Nb3vGOF+YPTu9r/+Gkszbku0g==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 9face50a0713cf0e16942dd04f887eb0663da17a Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 25 Oct 2022 09:02:55 +0100
Subject: [PATCH 132/151] Fix build failure around PouchDB type

---
 .../backend-core/src/cache/writethrough.ts    |   1 +
 packages/backend-core/src/db/index.ts         |  11 +-
 .../src/db/{pouch.js => pouch.ts}             |  19 ++-
 packages/server/package.json                  |   1 +
 .../functions/backfill/app/tables.ts          |   1 +
 .../server/src/sdk/app/backups/imports.ts     |   1 +
 .../server/src/sdk/app/backups/statistics.ts  |   1 +
 packages/server/src/sdk/app/tables/index.ts   |   1 +
 packages/server/yarn.lock                     | 158 ++++++++++++++++++
 packages/types/src/sdk/db.ts                  |   2 +
 packages/worker/package.json                  |   1 +
 packages/worker/yarn.lock                     | 158 ++++++++++++++++++
 .../TestConfiguration/applications.ts         |   2 -
 .../internal-api/TestConfiguration/rows.ts    |  38 ++---
 .../internal-api/TestConfiguration/tables.ts  |  57 +++----
 .../src/config/internal-api/fixtures/rows.ts  |   8 +-
 .../src/config/internal-api/fixtures/table.ts |  54 +++---
 .../fixtures/types/responseMessage.ts         |   4 +-
 .../internal-api/applications/create.spec.ts  |  46 +++--
 19 files changed, 457 insertions(+), 107 deletions(-)
 rename packages/backend-core/src/db/{pouch.js => pouch.ts} (88%)

diff --git a/packages/backend-core/src/cache/writethrough.ts b/packages/backend-core/src/cache/writethrough.ts
index ec6b1604c8..495ba58590 100644
--- a/packages/backend-core/src/cache/writethrough.ts
+++ b/packages/backend-core/src/cache/writethrough.ts
@@ -1,6 +1,7 @@
 import BaseCache from "./base"
 import { getWritethroughClient } from "../redis/init"
 import { logWarn } from "../logging"
+import PouchDB from "pouchdb"
 
 const DEFAULT_WRITE_RATE_MS = 10000
 let CACHE: BaseCache | null = null
diff --git a/packages/backend-core/src/db/index.ts b/packages/backend-core/src/db/index.ts
index 8374aecd8d..429cd61fc1 100644
--- a/packages/backend-core/src/db/index.ts
+++ b/packages/backend-core/src/db/index.ts
@@ -1,11 +1,12 @@
-import pouch from "./pouch"
+import * as pouch from "./pouch"
 import env from "../environment"
 import { checkSlashesInUrl } from "../helpers"
 import fetch from "node-fetch"
 import { PouchOptions, CouchFindOptions } from "@budibase/types"
+import PouchDB from "pouchdb"
 
 const openDbs: string[] = []
-let PouchDB: any
+let Pouch: any
 let initialised = false
 const dbList = new Set()
 
@@ -33,19 +34,19 @@ const checkInitialised = () => {
 }
 
 export async function init(opts?: PouchOptions) {
-  PouchDB = pouch.getPouch(opts)
+  Pouch = pouch.getPouch(opts)
   initialised = true
 }
 
 // NOTE: THIS IS A DANGEROUS FUNCTION - USE WITH CAUTION
 // this function is prone to leaks, should only be used
 // in situations that using the function doWithDB does not work
-export function dangerousGetDB(dbName: string, opts?: any) {
+export function dangerousGetDB(dbName: string, opts?: any): PouchDB.Database {
   checkInitialised()
   if (env.isTest()) {
     dbList.add(dbName)
   }
-  const db = new PouchDB(dbName, opts)
+  const db = new Pouch(dbName, opts)
   if (env.MEMORY_LEAK_CHECK) {
     openDbs.push(db.name)
   }
diff --git a/packages/backend-core/src/db/pouch.js b/packages/backend-core/src/db/pouch.ts
similarity index 88%
rename from packages/backend-core/src/db/pouch.js
rename to packages/backend-core/src/db/pouch.ts
index 12d7d787e3..1e37da9240 100644
--- a/packages/backend-core/src/db/pouch.js
+++ b/packages/backend-core/src/db/pouch.ts
@@ -1,7 +1,7 @@
-const PouchDB = require("pouchdb")
-const env = require("../environment")
+import PouchDB from "pouchdb"
+import env from "../environment"
 
-exports.getUrlInfo = (url = env.COUCH_DB_URL) => {
+export const getUrlInfo = (url = env.COUCH_DB_URL) => {
   let cleanUrl, username, password, host
   if (url) {
     // Ensure the URL starts with a protocol
@@ -44,8 +44,8 @@ exports.getUrlInfo = (url = env.COUCH_DB_URL) => {
   }
 }
 
-exports.getCouchInfo = () => {
-  const urlInfo = exports.getUrlInfo()
+export const getCouchInfo = () => {
+  const urlInfo = getUrlInfo()
   let username
   let password
   if (env.COUCH_DB_USERNAME) {
@@ -82,11 +82,11 @@ exports.getCouchInfo = () => {
  * This should be rarely used outside of the main application config.
  * Exposed for exceptional cases such as in-memory views.
  */
-exports.getPouch = (opts = {}) => {
-  let { url, cookie } = exports.getCouchInfo()
+export const getPouch = (opts: any = {}) => {
+  let { url, cookie } = getCouchInfo()
   let POUCH_DB_DEFAULTS = {
     prefix: url,
-    fetch: (url, opts) => {
+    fetch: (url: string, opts: any) => {
       // use a specific authorization cookie - be very explicit about how we authenticate
       opts.headers.set("Authorization", cookie)
       return PouchDB.fetch(url, opts)
@@ -98,6 +98,7 @@ exports.getPouch = (opts = {}) => {
     PouchDB.plugin(inMemory)
     POUCH_DB_DEFAULTS = {
       prefix: undefined,
+      // @ts-ignore
       adapter: "memory",
     }
   }
@@ -105,6 +106,7 @@ exports.getPouch = (opts = {}) => {
   if (opts.onDisk) {
     POUCH_DB_DEFAULTS = {
       prefix: undefined,
+      // @ts-ignore
       adapter: "leveldb",
     }
   }
@@ -112,6 +114,7 @@ exports.getPouch = (opts = {}) => {
   if (opts.replication) {
     const replicationStream = require("pouchdb-replication-stream")
     PouchDB.plugin(replicationStream.plugin)
+    // @ts-ignore
     PouchDB.adapter("writableStream", replicationStream.adapters.writableStream)
   }
 
diff --git a/packages/server/package.json b/packages/server/package.json
index a3ec4568aa..2b2289cfc6 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -169,6 +169,7 @@
     "@types/node": "14.18.20",
     "@types/node-fetch": "2.6.1",
     "@types/oracledb": "5.2.2",
+    "@types/pouchdb": "6.4.0",
     "@types/redis": "4.0.11",
     "@typescript-eslint/parser": "5.12.0",
     "apidoc": "0.50.4",
diff --git a/packages/server/src/migrations/functions/backfill/app/tables.ts b/packages/server/src/migrations/functions/backfill/app/tables.ts
index b6d896a1ca..6663c3c43b 100644
--- a/packages/server/src/migrations/functions/backfill/app/tables.ts
+++ b/packages/server/src/migrations/functions/backfill/app/tables.ts
@@ -1,5 +1,6 @@
 import { events } from "@budibase/backend-core"
 import sdk from "../../../../sdk"
+import PouchDB from "pouchdb"
 
 export const backfill = async (
   appDb: PouchDB.Database,
diff --git a/packages/server/src/sdk/app/backups/imports.ts b/packages/server/src/sdk/app/backups/imports.ts
index aaab85ec92..f6f2939b7d 100644
--- a/packages/server/src/sdk/app/backups/imports.ts
+++ b/packages/server/src/sdk/app/backups/imports.ts
@@ -14,6 +14,7 @@ import sdk from "../../"
 import { CouchFindOptions, RowAttachment } from "@budibase/types"
 const uuid = require("uuid/v4")
 const tar = require("tar")
+import PouchDB from "pouchdb"
 
 type TemplateType = {
   file?: {
diff --git a/packages/server/src/sdk/app/backups/statistics.ts b/packages/server/src/sdk/app/backups/statistics.ts
index 3f03158264..7a8e24dc58 100644
--- a/packages/server/src/sdk/app/backups/statistics.ts
+++ b/packages/server/src/sdk/app/backups/statistics.ts
@@ -5,6 +5,7 @@ import {
   getAutomationParams,
   getScreenParams,
 } from "../../../db/utils"
+import PouchDB from "pouchdb"
 
 async function runInContext(appId: string, cb: any, db?: PouchDB.Database) {
   if (db) {
diff --git a/packages/server/src/sdk/app/tables/index.ts b/packages/server/src/sdk/app/tables/index.ts
index eeaf869055..5af92404a1 100644
--- a/packages/server/src/sdk/app/tables/index.ts
+++ b/packages/server/src/sdk/app/tables/index.ts
@@ -6,6 +6,7 @@ import {
   isSQL,
 } from "../../../integrations/utils"
 import { Table } from "@budibase/types"
+import PouchDB from "pouchdb"
 
 async function getAllInternalTables(db?: PouchDB.Database): Promise<Table[]> {
   if (!db) {
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 123bb8802a..71d36f924c 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -2700,6 +2700,13 @@
   resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
   integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
 
+"@types/debug@*":
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
+  integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==
+  dependencies:
+    "@types/ms" "*"
+
 "@types/eslint-scope@^3.7.3":
   version "3.7.3"
   resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224"
@@ -2869,6 +2876,11 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
   integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
+"@types/ms@*":
+  version "0.7.31"
+  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
+  integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
+
 "@types/node-fetch@2.6.1":
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.1.tgz#8f127c50481db65886800ef496f20bbf15518975"
@@ -2923,6 +2935,152 @@
     "@types/node" "*"
     dotenv "^8.2.0"
 
+"@types/pouchdb-adapter-cordova-sqlite@*":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-cordova-sqlite/-/pouchdb-adapter-cordova-sqlite-1.0.1.tgz#49e5ee6df7cc0c23196fcb340f43a560e74eb1d6"
+  integrity sha512-nqlXpW1ho3KBg1mUQvZgH2755y3z/rw4UA7ZJCPMRTHofxGMY8izRVw5rHBL4/7P615or0J2udpRYxgkT3D02g==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-fruitdown@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-fruitdown/-/pouchdb-adapter-fruitdown-6.1.3.tgz#9b140ad9645cc56068728acf08ec19ac0046658e"
+  integrity sha512-Wz1Z1JLOW1hgmFQjqnSkmyyfH7by/iWb4abKn684WMvQfmxx6BxKJpJ4+eulkVPQzzgMMSgU1MpnQOm9FgRkbw==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-http@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-http/-/pouchdb-adapter-http-6.1.3.tgz#6e592d5f48deb6274a21ddac1498dd308096bcf3"
+  integrity sha512-9Z4TLbF/KJWy/D2sWRPBA+RNU0odQimfdvlDX+EY7rGcd3aVoH8qjD/X0Xcd/0dfBH5pKrNIMFFQgW/TylRCmA==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-idb@*":
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-idb/-/pouchdb-adapter-idb-6.1.4.tgz#cb9a18864585d600820cd325f007614c5c3989cd"
+  integrity sha512-KIAXbkF4uYUz0ZwfNEFLtEkK44mEWopAsD76UhucH92XnJloBysav+TjI4FFfYQyTjoW3S1s6V+Z14CUJZ0F6w==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-leveldb@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-leveldb/-/pouchdb-adapter-leveldb-6.1.3.tgz#17c7e75d75b992050bca15991e97fba575c61bb3"
+  integrity sha512-ex8NFqQGFwEpFi7AaZ5YofmuemfZNsL3nTFZBUCAKYMBkazQij1pe2ILLStSvJr0XS0qxgXjCEW19T5Wqiiskg==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-localstorage@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-localstorage/-/pouchdb-adapter-localstorage-6.1.3.tgz#0dde02ba6b9d6073a295a20196563942ba9a54bd"
+  integrity sha512-oor040tye1KKiGLWYtIy7rRT7C2yoyX3Tf6elEJRpjOA7Ja/H8lKc4LaSh9ATbptIcES6MRqZDxtp7ly9hsW3Q==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-memory@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-memory/-/pouchdb-adapter-memory-6.1.3.tgz#9eabdbc890fcf58960ee8b68b8685f837e75c844"
+  integrity sha512-gVbsIMzDzgZYThFVT4eVNsmuZwVm/4jDxP1sjlgc3qtDIxbtBhGgyNfcskwwz9Zu5Lv1avkDsIWvcxQhnvRlHg==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-node-websql@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-node-websql/-/pouchdb-adapter-node-websql-6.1.3.tgz#aa18bc68af8cf509acd12c400010dcd5fab2243d"
+  integrity sha512-F/P+os6Jsa7CgHtH64+Z0HfwIcj0hIRB5z8gNhF7L7dxPWoAfkopK5H2gydrP3sQrlGyN4WInF+UJW/Zu1+FKg==
+  dependencies:
+    "@types/pouchdb-adapter-websql" "*"
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-websql@*":
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-websql/-/pouchdb-adapter-websql-6.1.4.tgz#359fbe42ccac0ac90b492ddb8c32fafd0aa96d79"
+  integrity sha512-zMJQCtXC40hBsIDRn0GhmpeGMK0f9l/OGWfLguvczROzxxcOD7REI+e6SEmX7gJKw5JuMvlfuHzkQwjmvSJbtg==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-browser@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-browser/-/pouchdb-browser-6.1.3.tgz#8f33d6ef58d6817d1f6d36979148a1c7f63244d8"
+  integrity sha512-EdYowrWxW9SWBMX/rux2eq7dbHi5Zeyzz+FF/IAsgQKnUxgeCO5VO2j4zTzos0SDyJvAQU+EYRc11r7xGn5tvA==
+  dependencies:
+    "@types/pouchdb-adapter-http" "*"
+    "@types/pouchdb-adapter-idb" "*"
+    "@types/pouchdb-adapter-websql" "*"
+    "@types/pouchdb-core" "*"
+    "@types/pouchdb-mapreduce" "*"
+    "@types/pouchdb-replication" "*"
+
+"@types/pouchdb-core@*":
+  version "7.0.10"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-core/-/pouchdb-core-7.0.10.tgz#d1ea1549e7fad6cb579f71459b1bc27252e06a5a"
+  integrity sha512-mKhjLlWWXyV3PTTjDhzDV1kc2dolO7VYFa75IoKM/hr8Er9eo8RIbS7mJLfC8r/C3p6ihZu9yZs1PWC1LQ0SOA==
+  dependencies:
+    "@types/debug" "*"
+    "@types/pouchdb-find" "*"
+
+"@types/pouchdb-find@*":
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-find/-/pouchdb-find-7.3.0.tgz#b917030e9f4bf6e56bf8c3b9fe4b2a25e989009a"
+  integrity sha512-sFPli5tBjGX9UfXioik1jUzPdcN84eV82n0lmEFuoPepWqkLjQcyri0eOa++HYOaNPyMDhKFBqEALEZivK2dRg==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-http@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-http/-/pouchdb-http-6.1.3.tgz#09576c0d409da1f8dee34ec5b768415e2472ea52"
+  integrity sha512-0e9E5SqNOyPl/3FnEIbENssB4FlJsNYuOy131nxrZk36S+y1R/6qO7ZVRypWpGTqBWSuVd7gCsq2UDwO/285+w==
+  dependencies:
+    "@types/pouchdb-adapter-http" "*"
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-mapreduce@*":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-mapreduce/-/pouchdb-mapreduce-6.1.7.tgz#9ab32d1e0f234f1bf6d1e4c5d7e216e9e23ac0a3"
+  integrity sha512-WzBwm7tmO9QhfRzVaWT4v6JQSS/fG2OoUDrWrhX87rPe2Pn6laPvdK5li6myNRxCoI/l5e8Jd+oYBAFnaiFucA==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-node@*":
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-node/-/pouchdb-node-6.1.4.tgz#5214c0169fcfd2237d373380bbd65a934feb5dfb"
+  integrity sha512-wnTCH8X1JOPpNOfVhz8HW0AvmdHh6pt40MuRj0jQnK7QEHsHS79WujsKTKSOF8QXtPwpvCNSsI7ut7H7tfxxJQ==
+  dependencies:
+    "@types/pouchdb-adapter-http" "*"
+    "@types/pouchdb-adapter-leveldb" "*"
+    "@types/pouchdb-core" "*"
+    "@types/pouchdb-mapreduce" "*"
+    "@types/pouchdb-replication" "*"
+
+"@types/pouchdb-replication@*":
+  version "6.4.4"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-replication/-/pouchdb-replication-6.4.4.tgz#743406c90f13a988fa3e346ea74ce40acd170d00"
+  integrity sha512-BsE5LKpjJK4iAf6Fx5kyrMw+33V+Ip7uWldUnU2BYrrvtR+MLD22dcImm7DZN1st2wPPb91i0XEnQzvP0w1C/Q==
+  dependencies:
+    "@types/pouchdb-core" "*"
+    "@types/pouchdb-find" "*"
+
+"@types/pouchdb@6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb/-/pouchdb-6.4.0.tgz#f9c41ca64b23029f9bf2eb4bf6956e6431cb79f8"
+  integrity sha512-eGCpX+NXhd5VLJuJMzwe3L79fa9+IDTrAG3CPaf4s/31PD56hOrhDJTSmRELSXuiqXr6+OHzzP0PldSaWsFt7w==
+  dependencies:
+    "@types/pouchdb-adapter-cordova-sqlite" "*"
+    "@types/pouchdb-adapter-fruitdown" "*"
+    "@types/pouchdb-adapter-http" "*"
+    "@types/pouchdb-adapter-idb" "*"
+    "@types/pouchdb-adapter-leveldb" "*"
+    "@types/pouchdb-adapter-localstorage" "*"
+    "@types/pouchdb-adapter-memory" "*"
+    "@types/pouchdb-adapter-node-websql" "*"
+    "@types/pouchdb-adapter-websql" "*"
+    "@types/pouchdb-browser" "*"
+    "@types/pouchdb-core" "*"
+    "@types/pouchdb-http" "*"
+    "@types/pouchdb-mapreduce" "*"
+    "@types/pouchdb-node" "*"
+    "@types/pouchdb-replication" "*"
+
 "@types/prettier@^2.1.5":
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.6.3.tgz#68ada76827b0010d0db071f739314fa429943d0a"
diff --git a/packages/types/src/sdk/db.ts b/packages/types/src/sdk/db.ts
index 6d47a5c36b..2ba0b7bc93 100644
--- a/packages/types/src/sdk/db.ts
+++ b/packages/types/src/sdk/db.ts
@@ -1,3 +1,5 @@
+import PouchDB from "pouchdb"
+
 export type PouchOptions = {
   inMemory: boolean
   replication: boolean
diff --git a/packages/worker/package.json b/packages/worker/package.json
index be9367203f..f3f34dee72 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -74,6 +74,7 @@
     "@types/koa": "2.13.4",
     "@types/koa__router": "8.0.11",
     "@types/node": "14.18.20",
+    "@types/pouchdb": "6.4.0",
     "@types/uuid": "8.3.4",
     "@typescript-eslint/parser": "5.12.0",
     "copyfiles": "2.4.1",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index c2b2417209..7b9a49fd5c 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -954,6 +954,13 @@
     "@types/keygrip" "*"
     "@types/node" "*"
 
+"@types/debug@*":
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
+  integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==
+  dependencies:
+    "@types/ms" "*"
+
 "@types/express-serve-static-core@^4.17.18":
   version "4.17.28"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8"
@@ -1084,6 +1091,11 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
   integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
+"@types/ms@*":
+  version "0.7.31"
+  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
+  integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
+
 "@types/node@*":
   version "17.0.41"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.41.tgz#1607b2fd3da014ae5d4d1b31bc792a39348dfb9b"
@@ -1094,6 +1106,152 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.20.tgz#268f028b36eaf51181c3300252f605488c4f0650"
   integrity sha512-Q8KKwm9YqEmUBRsqJ2GWJDtXltBDxTdC4m5vTdXBolu2PeQh8LX+f6BTwU+OuXPu37fLxoN6gidqBmnky36FXA==
 
+"@types/pouchdb-adapter-cordova-sqlite@*":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-cordova-sqlite/-/pouchdb-adapter-cordova-sqlite-1.0.1.tgz#49e5ee6df7cc0c23196fcb340f43a560e74eb1d6"
+  integrity sha512-nqlXpW1ho3KBg1mUQvZgH2755y3z/rw4UA7ZJCPMRTHofxGMY8izRVw5rHBL4/7P615or0J2udpRYxgkT3D02g==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-fruitdown@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-fruitdown/-/pouchdb-adapter-fruitdown-6.1.3.tgz#9b140ad9645cc56068728acf08ec19ac0046658e"
+  integrity sha512-Wz1Z1JLOW1hgmFQjqnSkmyyfH7by/iWb4abKn684WMvQfmxx6BxKJpJ4+eulkVPQzzgMMSgU1MpnQOm9FgRkbw==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-http@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-http/-/pouchdb-adapter-http-6.1.3.tgz#6e592d5f48deb6274a21ddac1498dd308096bcf3"
+  integrity sha512-9Z4TLbF/KJWy/D2sWRPBA+RNU0odQimfdvlDX+EY7rGcd3aVoH8qjD/X0Xcd/0dfBH5pKrNIMFFQgW/TylRCmA==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-idb@*":
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-idb/-/pouchdb-adapter-idb-6.1.4.tgz#cb9a18864585d600820cd325f007614c5c3989cd"
+  integrity sha512-KIAXbkF4uYUz0ZwfNEFLtEkK44mEWopAsD76UhucH92XnJloBysav+TjI4FFfYQyTjoW3S1s6V+Z14CUJZ0F6w==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-leveldb@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-leveldb/-/pouchdb-adapter-leveldb-6.1.3.tgz#17c7e75d75b992050bca15991e97fba575c61bb3"
+  integrity sha512-ex8NFqQGFwEpFi7AaZ5YofmuemfZNsL3nTFZBUCAKYMBkazQij1pe2ILLStSvJr0XS0qxgXjCEW19T5Wqiiskg==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-localstorage@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-localstorage/-/pouchdb-adapter-localstorage-6.1.3.tgz#0dde02ba6b9d6073a295a20196563942ba9a54bd"
+  integrity sha512-oor040tye1KKiGLWYtIy7rRT7C2yoyX3Tf6elEJRpjOA7Ja/H8lKc4LaSh9ATbptIcES6MRqZDxtp7ly9hsW3Q==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-memory@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-memory/-/pouchdb-adapter-memory-6.1.3.tgz#9eabdbc890fcf58960ee8b68b8685f837e75c844"
+  integrity sha512-gVbsIMzDzgZYThFVT4eVNsmuZwVm/4jDxP1sjlgc3qtDIxbtBhGgyNfcskwwz9Zu5Lv1avkDsIWvcxQhnvRlHg==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-node-websql@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-node-websql/-/pouchdb-adapter-node-websql-6.1.3.tgz#aa18bc68af8cf509acd12c400010dcd5fab2243d"
+  integrity sha512-F/P+os6Jsa7CgHtH64+Z0HfwIcj0hIRB5z8gNhF7L7dxPWoAfkopK5H2gydrP3sQrlGyN4WInF+UJW/Zu1+FKg==
+  dependencies:
+    "@types/pouchdb-adapter-websql" "*"
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-websql@*":
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-websql/-/pouchdb-adapter-websql-6.1.4.tgz#359fbe42ccac0ac90b492ddb8c32fafd0aa96d79"
+  integrity sha512-zMJQCtXC40hBsIDRn0GhmpeGMK0f9l/OGWfLguvczROzxxcOD7REI+e6SEmX7gJKw5JuMvlfuHzkQwjmvSJbtg==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-browser@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-browser/-/pouchdb-browser-6.1.3.tgz#8f33d6ef58d6817d1f6d36979148a1c7f63244d8"
+  integrity sha512-EdYowrWxW9SWBMX/rux2eq7dbHi5Zeyzz+FF/IAsgQKnUxgeCO5VO2j4zTzos0SDyJvAQU+EYRc11r7xGn5tvA==
+  dependencies:
+    "@types/pouchdb-adapter-http" "*"
+    "@types/pouchdb-adapter-idb" "*"
+    "@types/pouchdb-adapter-websql" "*"
+    "@types/pouchdb-core" "*"
+    "@types/pouchdb-mapreduce" "*"
+    "@types/pouchdb-replication" "*"
+
+"@types/pouchdb-core@*":
+  version "7.0.10"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-core/-/pouchdb-core-7.0.10.tgz#d1ea1549e7fad6cb579f71459b1bc27252e06a5a"
+  integrity sha512-mKhjLlWWXyV3PTTjDhzDV1kc2dolO7VYFa75IoKM/hr8Er9eo8RIbS7mJLfC8r/C3p6ihZu9yZs1PWC1LQ0SOA==
+  dependencies:
+    "@types/debug" "*"
+    "@types/pouchdb-find" "*"
+
+"@types/pouchdb-find@*":
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-find/-/pouchdb-find-7.3.0.tgz#b917030e9f4bf6e56bf8c3b9fe4b2a25e989009a"
+  integrity sha512-sFPli5tBjGX9UfXioik1jUzPdcN84eV82n0lmEFuoPepWqkLjQcyri0eOa++HYOaNPyMDhKFBqEALEZivK2dRg==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-http@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-http/-/pouchdb-http-6.1.3.tgz#09576c0d409da1f8dee34ec5b768415e2472ea52"
+  integrity sha512-0e9E5SqNOyPl/3FnEIbENssB4FlJsNYuOy131nxrZk36S+y1R/6qO7ZVRypWpGTqBWSuVd7gCsq2UDwO/285+w==
+  dependencies:
+    "@types/pouchdb-adapter-http" "*"
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-mapreduce@*":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-mapreduce/-/pouchdb-mapreduce-6.1.7.tgz#9ab32d1e0f234f1bf6d1e4c5d7e216e9e23ac0a3"
+  integrity sha512-WzBwm7tmO9QhfRzVaWT4v6JQSS/fG2OoUDrWrhX87rPe2Pn6laPvdK5li6myNRxCoI/l5e8Jd+oYBAFnaiFucA==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-node@*":
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-node/-/pouchdb-node-6.1.4.tgz#5214c0169fcfd2237d373380bbd65a934feb5dfb"
+  integrity sha512-wnTCH8X1JOPpNOfVhz8HW0AvmdHh6pt40MuRj0jQnK7QEHsHS79WujsKTKSOF8QXtPwpvCNSsI7ut7H7tfxxJQ==
+  dependencies:
+    "@types/pouchdb-adapter-http" "*"
+    "@types/pouchdb-adapter-leveldb" "*"
+    "@types/pouchdb-core" "*"
+    "@types/pouchdb-mapreduce" "*"
+    "@types/pouchdb-replication" "*"
+
+"@types/pouchdb-replication@*":
+  version "6.4.4"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-replication/-/pouchdb-replication-6.4.4.tgz#743406c90f13a988fa3e346ea74ce40acd170d00"
+  integrity sha512-BsE5LKpjJK4iAf6Fx5kyrMw+33V+Ip7uWldUnU2BYrrvtR+MLD22dcImm7DZN1st2wPPb91i0XEnQzvP0w1C/Q==
+  dependencies:
+    "@types/pouchdb-core" "*"
+    "@types/pouchdb-find" "*"
+
+"@types/pouchdb@6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb/-/pouchdb-6.4.0.tgz#f9c41ca64b23029f9bf2eb4bf6956e6431cb79f8"
+  integrity sha512-eGCpX+NXhd5VLJuJMzwe3L79fa9+IDTrAG3CPaf4s/31PD56hOrhDJTSmRELSXuiqXr6+OHzzP0PldSaWsFt7w==
+  dependencies:
+    "@types/pouchdb-adapter-cordova-sqlite" "*"
+    "@types/pouchdb-adapter-fruitdown" "*"
+    "@types/pouchdb-adapter-http" "*"
+    "@types/pouchdb-adapter-idb" "*"
+    "@types/pouchdb-adapter-leveldb" "*"
+    "@types/pouchdb-adapter-localstorage" "*"
+    "@types/pouchdb-adapter-memory" "*"
+    "@types/pouchdb-adapter-node-websql" "*"
+    "@types/pouchdb-adapter-websql" "*"
+    "@types/pouchdb-browser" "*"
+    "@types/pouchdb-core" "*"
+    "@types/pouchdb-http" "*"
+    "@types/pouchdb-mapreduce" "*"
+    "@types/pouchdb-node" "*"
+    "@types/pouchdb-replication" "*"
+
 "@types/prettier@^2.1.5":
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.6.3.tgz#68ada76827b0010d0db071f739314fa429943d0a"
diff --git a/qa-core/src/config/internal-api/TestConfiguration/applications.ts b/qa-core/src/config/internal-api/TestConfiguration/applications.ts
index 8d276911c8..c5e81f3718 100644
--- a/qa-core/src/config/internal-api/TestConfiguration/applications.ts
+++ b/qa-core/src/config/internal-api/TestConfiguration/applications.ts
@@ -8,8 +8,6 @@ import { AppPackageResponse } from "../fixtures/types/appPackage"
 import { DeployConfig } from "../fixtures/types/deploy"
 import { responseMessage } from "../fixtures/types/responseMessage"
 
-
-
 export default class AppApi {
   api: InternalAPIClient
 
diff --git a/qa-core/src/config/internal-api/TestConfiguration/rows.ts b/qa-core/src/config/internal-api/TestConfiguration/rows.ts
index 010c8936c1..a0e9b7c408 100644
--- a/qa-core/src/config/internal-api/TestConfiguration/rows.ts
+++ b/qa-core/src/config/internal-api/TestConfiguration/rows.ts
@@ -3,26 +3,26 @@ import { Row } from "@budibase/types"
 import InternalAPIClient from "./InternalAPIClient"
 
 export default class RowsApi {
-    api: InternalAPIClient
+  api: InternalAPIClient
 
-    constructor(apiClient: InternalAPIClient) {
-        this.api = apiClient
-    }
+  constructor(apiClient: InternalAPIClient) {
+    this.api = apiClient
+  }
 
-    async getAll(tableId: string): Promise<[Response, Row[]]> {
-        const response = await this.api.get(`/${tableId}/rows`)
-        const json = await response.json()
-        return [response, json]
-    }
-    async add(tableId: string, body: any): Promise<[Response, Row]> {
-        const response = await this.api.post(`/${tableId}/rows`, { body })
-        const json = await response.json()
-        return [response, json]
-    }
+  async getAll(tableId: string): Promise<[Response, Row[]]> {
+    const response = await this.api.get(`/${tableId}/rows`)
+    const json = await response.json()
+    return [response, json]
+  }
+  async add(tableId: string, body: any): Promise<[Response, Row]> {
+    const response = await this.api.post(`/${tableId}/rows`, { body })
+    const json = await response.json()
+    return [response, json]
+  }
 
-    async delete(tableId: string, body: any): Promise<[Response, Row[]]> {
-        const response = await this.api.del(`/${tableId}/rows/`, { body })
-        const json = await response.json()
-        return [response, json]
-    }
+  async delete(tableId: string, body: any): Promise<[Response, Row[]]> {
+    const response = await this.api.del(`/${tableId}/rows/`, { body })
+    const json = await response.json()
+    return [response, json]
+  }
 }
diff --git a/qa-core/src/config/internal-api/TestConfiguration/tables.ts b/qa-core/src/config/internal-api/TestConfiguration/tables.ts
index bbafc73de5..58dc1a5a74 100644
--- a/qa-core/src/config/internal-api/TestConfiguration/tables.ts
+++ b/qa-core/src/config/internal-api/TestConfiguration/tables.ts
@@ -3,38 +3,39 @@ import { Table } from "@budibase/types"
 import InternalAPIClient from "./InternalAPIClient"
 import { responseMessage } from "../fixtures/types/responseMessage"
 
-
 export default class TablesApi {
-    api: InternalAPIClient
+  api: InternalAPIClient
 
-    constructor(apiClient: InternalAPIClient) {
-        this.api = apiClient
-    }
+  constructor(apiClient: InternalAPIClient) {
+    this.api = apiClient
+  }
 
-    async getAll(expectedNumber: Number): Promise<[Response, Table[]]> {
-        const response = await this.api.get(`/tables`)
-        const json = await response.json()
-        expect(response).toHaveStatusCode(200)
-        expect(json.length).toBe(expectedNumber)
-        return [response, json]
-    }
+  async getAll(expectedNumber: Number): Promise<[Response, Table[]]> {
+    const response = await this.api.get(`/tables`)
+    const json = await response.json()
+    expect(response).toHaveStatusCode(200)
+    expect(json.length).toBe(expectedNumber)
+    return [response, json]
+  }
 
-    async getTableById(id: string): Promise<[Response, Table]> {
-        const response = await this.api.get(`/tables/${id}`)
-        const json = await response.json()
-        return [response, json]
-    }
+  async getTableById(id: string): Promise<[Response, Table]> {
+    const response = await this.api.get(`/tables/${id}`)
+    const json = await response.json()
+    return [response, json]
+  }
 
-    async save(body: any): Promise<[Response, Table]> {
-        const response = await this.api.post(`/tables`, { body })
-        const json = await response.json()
-        return [response, json]
-    }
-
-    async delete(id: string, revId: string): Promise<[Response, responseMessage]> {
-        const response = await this.api.del(`/tables/${id}/${revId}`)
-        const json = await response.json()
-        return [response, json]
-    }
+  async save(body: any): Promise<[Response, Table]> {
+    const response = await this.api.post(`/tables`, { body })
+    const json = await response.json()
+    return [response, json]
+  }
 
+  async delete(
+    id: string,
+    revId: string
+  ): Promise<[Response, responseMessage]> {
+    const response = await this.api.del(`/tables/${id}/${revId}`)
+    const json = await response.json()
+    return [response, json]
+  }
 }
diff --git a/qa-core/src/config/internal-api/fixtures/rows.ts b/qa-core/src/config/internal-api/fixtures/rows.ts
index f3c12d9ddd..90f6350dcf 100644
--- a/qa-core/src/config/internal-api/fixtures/rows.ts
+++ b/qa-core/src/config/internal-api/fixtures/rows.ts
@@ -1,8 +1,8 @@
 import { Row } from "@budibase/types"
 
 export const generateNewRowForTable = (tableId: string): Row => {
-    return {
-        TestColumn: "TestRow",
-        tableId: tableId
-    }
+  return {
+    TestColumn: "TestRow",
+    tableId: tableId,
+  }
 }
diff --git a/qa-core/src/config/internal-api/fixtures/table.ts b/qa-core/src/config/internal-api/fixtures/table.ts
index 9787dc500a..5060a405bb 100644
--- a/qa-core/src/config/internal-api/fixtures/table.ts
+++ b/qa-core/src/config/internal-api/fixtures/table.ts
@@ -1,34 +1,34 @@
 import { Table } from "@budibase/types"
 
 export const generateTable = (): Table => {
-    return {
-        name: "Test Table",
-        schema: {},
-        sourceId: "bb_internal",
-        type: "internal",
-        dataImport: {
-            valid: true,
-            schema: {}
-        }
-    }
+  return {
+    name: "Test Table",
+    schema: {},
+    sourceId: "bb_internal",
+    type: "internal",
+    dataImport: {
+      valid: true,
+      schema: {},
+    },
+  }
 }
 
 export const generateNewColumnForTable = (tableData: any): Table => {
-    const newColumn = tableData
-    newColumn.schema = {
-        TestColumn: {
-            type: "string",
-            name: "TestColumn",
-            constraints: {
-                presence: { allowEmpty: false },
-                length: { maximum: null },
-                type: "string"
-            }
-        }
-    }
-    newColumn.indexes = {
-        0: "TestColumn"
-    }
-    newColumn.updatedAt = new Date().toISOString()
-    return newColumn
+  const newColumn = tableData
+  newColumn.schema = {
+    TestColumn: {
+      type: "string",
+      name: "TestColumn",
+      constraints: {
+        presence: { allowEmpty: false },
+        length: { maximum: null },
+        type: "string",
+      },
+    },
+  }
+  newColumn.indexes = {
+    0: "TestColumn",
+  }
+  newColumn.updatedAt = new Date().toISOString()
+  return newColumn
 }
diff --git a/qa-core/src/config/internal-api/fixtures/types/responseMessage.ts b/qa-core/src/config/internal-api/fixtures/types/responseMessage.ts
index 74931123fa..06c701c059 100644
--- a/qa-core/src/config/internal-api/fixtures/types/responseMessage.ts
+++ b/qa-core/src/config/internal-api/fixtures/types/responseMessage.ts
@@ -1 +1,3 @@
-export interface responseMessage { message: string }
+export interface responseMessage {
+  message: string
+}
diff --git a/qa-core/src/tests/internal-api/applications/create.spec.ts b/qa-core/src/tests/internal-api/applications/create.spec.ts
index f96c915f14..ee46bebf8f 100644
--- a/qa-core/src/tests/internal-api/applications/create.spec.ts
+++ b/qa-core/src/tests/internal-api/applications/create.spec.ts
@@ -5,7 +5,10 @@ import InternalAPIClient from "../../../config/internal-api/TestConfiguration/In
 import generateApp from "../../../config/internal-api/fixtures/applications"
 import generator from "../../../config/generator"
 import generateScreen from "../../../config/internal-api/fixtures/screens"
-import { generateTable, generateNewColumnForTable } from "../../../config/internal-api/fixtures/table"
+import {
+  generateTable,
+  generateNewColumnForTable,
+} from "../../../config/internal-api/fixtures/table"
 import { generateNewRowForTable } from "../../../config/internal-api/fixtures/rows"
 
 describe("Internal API - /applications endpoints", () => {
@@ -119,7 +122,7 @@ describe("Internal API - /applications endpoints", () => {
     const [updateResponse, updatedApp] = await config.applications.update(
       <string>app.appId,
       {
-        name: generator.word()
+        name: generator.word(),
       }
     )
     expect(updateResponse).toHaveStatusCode(200)
@@ -188,7 +191,9 @@ describe("Internal API - /applications endpoints", () => {
     await config.tables.getAll(2)
 
     // Add new table
-    const [createdTableResponse, createdTableData] = await config.tables.save(generateTable())
+    const [createdTableResponse, createdTableData] = await config.tables.save(
+      generateTable()
+    )
     expect(createdTableResponse).toHaveStatusCode(200)
     expect(createdTableData._id).toBeDefined()
     expect(createdTableData._rev).toBeDefined()
@@ -197,20 +202,27 @@ describe("Internal API - /applications endpoints", () => {
     await config.tables.getAll(3)
 
     //Get information about the table
-    const [tableInfoResponse, tableInfo] = await config.tables.getTableById(<string>createdTableData._id)
+    const [tableInfoResponse, tableInfo] = await config.tables.getTableById(
+      <string>createdTableData._id
+    )
     expect(tableInfoResponse).toHaveStatusCode(200)
     expect(tableInfo._id).toEqual(createdTableData._id)
 
     //Add Column to table
     const newColumn = generateNewColumnForTable(createdTableData)
-    const [addColumnResponse, addColumnData] = await config.tables.save(newColumn)
+    const [addColumnResponse, addColumnData] = await config.tables.save(
+      newColumn
+    )
     expect(addColumnResponse).toHaveStatusCode(200)
     expect(addColumnData._id).toEqual(createdTableData._id)
     expect(addColumnData.schema.TestColumn).toBeDefined()
 
     //Add Row to table
     const newRow = generateNewRowForTable(<string>addColumnData._id)
-    const [addRowResponse, addRowData] = await config.rows.add(<string>addColumnData._id, newRow)
+    const [addRowResponse, addRowData] = await config.rows.add(
+      <string>addColumnData._id,
+      newRow
+    )
     console.log(addRowData)
     expect(addRowResponse).toHaveStatusCode(200)
     expect(addRowData._id).toBeDefined()
@@ -218,24 +230,32 @@ describe("Internal API - /applications endpoints", () => {
     expect(addRowData.tableId).toEqual(addColumnData._id)
 
     //Get Row from table
-    const [getRowResponse, getRowData] = await config.rows.getAll(<string>addColumnData._id)
+    const [getRowResponse, getRowData] = await config.rows.getAll(
+      <string>addColumnData._id
+    )
     expect(getRowResponse).toHaveStatusCode(200)
     expect(getRowData.length).toEqual(1)
 
     //Delete Row from table
     const rowToDelete = {
-      rows: [
-        getRowData[0]
-      ]
+      rows: [getRowData[0]],
     }
-    const [deleteRowResponse, deleteRowData] = await config.rows.delete(<string>addColumnData._id, rowToDelete)
+    const [deleteRowResponse, deleteRowData] = await config.rows.delete(
+      <string>addColumnData._id,
+      rowToDelete
+    )
     expect(deleteRowResponse).toHaveStatusCode(200)
     expect(deleteRowData[0]._id).toEqual(getRowData[0]._id)
 
     //Delete the table
-    const [deleteTableResponse, deleteTable] = await config.tables.delete(<string>addColumnData._id, <string>addColumnData._rev)
+    const [deleteTableResponse, deleteTable] = await config.tables.delete(
+      <string>addColumnData._id,
+      <string>addColumnData._rev
+    )
     expect(deleteTableResponse).toHaveStatusCode(200)
-    expect(deleteTable.message).toEqual(`Table ${createdTableData._id} deleted.`)
+    expect(deleteTable.message).toEqual(
+      `Table ${createdTableData._id} deleted.`
+    )
 
     //Table was deleted
     await config.tables.getAll(2)

From fd0e08d566dfe720f1c1adf7cf41a979d051ebc3 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 25 Oct 2022 08:53:55 +0000
Subject: [PATCH 133/151] v2.0.30-alpha.17

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index d0a817ca3e..46f9ab99b5 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.30-alpha.16",
+  "version": "2.0.30-alpha.17",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 78036410ff..e87c5ce602 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.30-alpha.16",
+  "version": "2.0.30-alpha.17",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "2.0.30-alpha.16",
+    "@budibase/types": "2.0.30-alpha.17",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index f0216109c0..f36b8363a5 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.30-alpha.16",
+  "version": "2.0.30-alpha.17",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "2.0.30-alpha.16",
+    "@budibase/string-templates": "2.0.30-alpha.17",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index cbab97bbc5..a44773b11f 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.30-alpha.16",
+  "version": "2.0.30-alpha.17",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.0.30-alpha.16",
-    "@budibase/client": "2.0.30-alpha.16",
-    "@budibase/frontend-core": "2.0.30-alpha.16",
-    "@budibase/string-templates": "2.0.30-alpha.16",
+    "@budibase/bbui": "2.0.30-alpha.17",
+    "@budibase/client": "2.0.30-alpha.17",
+    "@budibase/frontend-core": "2.0.30-alpha.17",
+    "@budibase/string-templates": "2.0.30-alpha.17",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index f8f3536259..570b9484d0 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.30-alpha.16",
+  "version": "2.0.30-alpha.17",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.0.30-alpha.16",
-    "@budibase/string-templates": "2.0.30-alpha.16",
-    "@budibase/types": "2.0.30-alpha.16",
+    "@budibase/backend-core": "2.0.30-alpha.17",
+    "@budibase/string-templates": "2.0.30-alpha.17",
+    "@budibase/types": "2.0.30-alpha.17",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 4b09a0474a..02aac4d9f0 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.30-alpha.16",
+  "version": "2.0.30-alpha.17",
   "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": "2.0.30-alpha.16",
-    "@budibase/frontend-core": "2.0.30-alpha.16",
-    "@budibase/string-templates": "2.0.30-alpha.16",
+    "@budibase/bbui": "2.0.30-alpha.17",
+    "@budibase/frontend-core": "2.0.30-alpha.17",
+    "@budibase/string-templates": "2.0.30-alpha.17",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 3ab87b6564..d6e55cee2f 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.30-alpha.16",
+  "version": "2.0.30-alpha.17",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.0.30-alpha.16",
+    "@budibase/bbui": "2.0.30-alpha.17",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 06a9484870..554ea5f9bd 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.30-alpha.16",
+  "version": "2.0.30-alpha.17",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 2b2289cfc6..b3af75e43a 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.30-alpha.16",
+  "version": "2.0.30-alpha.17",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.0.30-alpha.16",
-    "@budibase/client": "2.0.30-alpha.16",
+    "@budibase/backend-core": "2.0.30-alpha.17",
+    "@budibase/client": "2.0.30-alpha.17",
     "@budibase/pro": "2.0.30-alpha.16",
-    "@budibase/string-templates": "2.0.30-alpha.16",
-    "@budibase/types": "2.0.30-alpha.16",
+    "@budibase/string-templates": "2.0.30-alpha.17",
+    "@budibase/types": "2.0.30-alpha.17",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index d1216d7ad4..7e5908a9dd 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.30-alpha.16",
+  "version": "2.0.30-alpha.17",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 914136b453..872ea1b650 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.30-alpha.16",
+  "version": "2.0.30-alpha.17",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index f3f34dee72..7f1e9f5e15 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.30-alpha.16",
+  "version": "2.0.30-alpha.17",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.0.30-alpha.16",
+    "@budibase/backend-core": "2.0.30-alpha.17",
     "@budibase/pro": "2.0.30-alpha.16",
-    "@budibase/string-templates": "2.0.30-alpha.16",
-    "@budibase/types": "2.0.30-alpha.16",
+    "@budibase/string-templates": "2.0.30-alpha.17",
+    "@budibase/types": "2.0.30-alpha.17",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 07be3b0c74c405407bbb77ed762d1e610f9a4499 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 25 Oct 2022 08:57:34 +0000
Subject: [PATCH 134/151] Update pro version to 2.0.30-alpha.17

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index b3af75e43a..098f7c04a8 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.0.30-alpha.17",
     "@budibase/client": "2.0.30-alpha.17",
-    "@budibase/pro": "2.0.30-alpha.16",
+    "@budibase/pro": "2.0.30-alpha.17",
     "@budibase/string-templates": "2.0.30-alpha.17",
     "@budibase/types": "2.0.30-alpha.17",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 71d36f924c..1d508e38f5 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.30-alpha.16":
-  version "2.0.30-alpha.16"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.16.tgz#3a3cc5e9442470ae848ecd006068e57c8bc67193"
-  integrity sha512-4qlKTcWyRPNEeLpyakwfYnZpJNLZ/mplSKYHlsvPOvfNXv78tQdwHpCsO443dczGoQwbe+cpszlHY69uQZKTjA==
+"@budibase/backend-core@2.0.30-alpha.17":
+  version "2.0.30-alpha.17"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.17.tgz#57a5b8894c9453445d81fc45d792f482d2ef98c2"
+  integrity sha512-PoWVpJlMNls/xIdKMjAQ7qCLqgZsEScqC40sBj/SUCAOGlDuzVKCQYk3hAnF+Q+5kLiWkPRoOsxu6fUh0viIFg==
   dependencies:
-    "@budibase/types" "2.0.30-alpha.16"
+    "@budibase/types" "2.0.30-alpha.17"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1181,13 +1181,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.30-alpha.16":
-  version "2.0.30-alpha.16"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.16.tgz#7ee44fdaf9a95dd1b9cd25bc75ab26d115f73822"
-  integrity sha512-nSb3MvsNBHpoFsLW68b9Miq8Y32LhqJrJBGp3+6Mc9DFl7yXlRmCtkV93oVYZO9HfV7Q6newRx4BFZFHCQYzig==
+"@budibase/pro@2.0.30-alpha.17":
+  version "2.0.30-alpha.17"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.17.tgz#f6c01d0f5983bc28aad4e0e6a11efa3f9fab6340"
+  integrity sha512-TvU5CJdTdd8c/aTymg2EzMfXg24i3ZdpjBfsFTDhnS3BOFP/rpMU2LyHCbhhFj6dvJzLNwY2FOKh+RYkL0hxNw==
   dependencies:
-    "@budibase/backend-core" "2.0.30-alpha.16"
-    "@budibase/types" "2.0.30-alpha.16"
+    "@budibase/backend-core" "2.0.30-alpha.17"
+    "@budibase/types" "2.0.30-alpha.17"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1211,10 +1211,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.30-alpha.16":
-  version "2.0.30-alpha.16"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.16.tgz#9ca9ae8f31bf2fbc0422ec26738bae4cc7a27363"
-  integrity sha512-856VjV07pw9WpBdjzzU1qVHb/vNIBAD2lnYtqa1Z30nFO1fJGDSbnbepDtog1Nb3vGOF+YPTu9r/+Gkszbku0g==
+"@budibase/types@2.0.30-alpha.17":
+  version "2.0.30-alpha.17"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.17.tgz#c860278094551731f0a232288c47c5b4d129678a"
+  integrity sha512-wCGHNIJXfd8C8i9lIxlCqnbE3fLPeQy6csNbvyEpt6gw/4ixDwUJbtnL6r9NzPdpjdZl5OlaqDPm+Xy4jWLI6Q==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 7f1e9f5e15..ecbdadda4b 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.0.30-alpha.17",
-    "@budibase/pro": "2.0.30-alpha.16",
+    "@budibase/pro": "2.0.30-alpha.17",
     "@budibase/string-templates": "2.0.30-alpha.17",
     "@budibase/types": "2.0.30-alpha.17",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 7b9a49fd5c..67ee133953 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.30-alpha.16":
-  version "2.0.30-alpha.16"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.16.tgz#3a3cc5e9442470ae848ecd006068e57c8bc67193"
-  integrity sha512-4qlKTcWyRPNEeLpyakwfYnZpJNLZ/mplSKYHlsvPOvfNXv78tQdwHpCsO443dczGoQwbe+cpszlHY69uQZKTjA==
+"@budibase/backend-core@2.0.30-alpha.17":
+  version "2.0.30-alpha.17"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.17.tgz#57a5b8894c9453445d81fc45d792f482d2ef98c2"
+  integrity sha512-PoWVpJlMNls/xIdKMjAQ7qCLqgZsEScqC40sBj/SUCAOGlDuzVKCQYk3hAnF+Q+5kLiWkPRoOsxu6fUh0viIFg==
   dependencies:
-    "@budibase/types" "2.0.30-alpha.16"
+    "@budibase/types" "2.0.30-alpha.17"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -328,22 +328,22 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.30-alpha.16":
-  version "2.0.30-alpha.16"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.16.tgz#7ee44fdaf9a95dd1b9cd25bc75ab26d115f73822"
-  integrity sha512-nSb3MvsNBHpoFsLW68b9Miq8Y32LhqJrJBGp3+6Mc9DFl7yXlRmCtkV93oVYZO9HfV7Q6newRx4BFZFHCQYzig==
+"@budibase/pro@2.0.30-alpha.17":
+  version "2.0.30-alpha.17"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.17.tgz#f6c01d0f5983bc28aad4e0e6a11efa3f9fab6340"
+  integrity sha512-TvU5CJdTdd8c/aTymg2EzMfXg24i3ZdpjBfsFTDhnS3BOFP/rpMU2LyHCbhhFj6dvJzLNwY2FOKh+RYkL0hxNw==
   dependencies:
-    "@budibase/backend-core" "2.0.30-alpha.16"
-    "@budibase/types" "2.0.30-alpha.16"
+    "@budibase/backend-core" "2.0.30-alpha.17"
+    "@budibase/types" "2.0.30-alpha.17"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.30-alpha.16":
-  version "2.0.30-alpha.16"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.16.tgz#9ca9ae8f31bf2fbc0422ec26738bae4cc7a27363"
-  integrity sha512-856VjV07pw9WpBdjzzU1qVHb/vNIBAD2lnYtqa1Z30nFO1fJGDSbnbepDtog1Nb3vGOF+YPTu9r/+Gkszbku0g==
+"@budibase/types@2.0.30-alpha.17":
+  version "2.0.30-alpha.17"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.17.tgz#c860278094551731f0a232288c47c5b4d129678a"
+  integrity sha512-wCGHNIJXfd8C8i9lIxlCqnbE3fLPeQy6csNbvyEpt6gw/4ixDwUJbtnL6r9NzPdpjdZl5OlaqDPm+Xy4jWLI6Q==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From b7c4a1e2331945549ce7bbf8ee50662e0bf98868 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 25 Oct 2022 11:30:17 +0000
Subject: [PATCH 135/151] v2.0.34-alpha.0

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 854f49ae42..7cb99d5b61 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.33",
+  "version": "2.0.34-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 5b0b21db74..ca16b858a0 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.33",
+  "version": "2.0.34-alpha.0",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "^2.0.33",
+    "@budibase/types": "2.0.34-alpha.0",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 900879e882..257fddff0c 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.33",
+  "version": "2.0.34-alpha.0",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^2.0.33",
+    "@budibase/string-templates": "2.0.34-alpha.0",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 2c4264160f..9570edc5cb 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.33",
+  "version": "2.0.34-alpha.0",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.33",
-    "@budibase/client": "^2.0.33",
-    "@budibase/frontend-core": "^2.0.33",
-    "@budibase/string-templates": "^2.0.33",
+    "@budibase/bbui": "2.0.34-alpha.0",
+    "@budibase/client": "2.0.34-alpha.0",
+    "@budibase/frontend-core": "2.0.34-alpha.0",
+    "@budibase/string-templates": "2.0.34-alpha.0",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 34e1d74169..16d2eac2ee 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.33",
+  "version": "2.0.34-alpha.0",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.0.33",
-    "@budibase/string-templates": "^2.0.33",
-    "@budibase/types": "^2.0.33",
+    "@budibase/backend-core": "2.0.34-alpha.0",
+    "@budibase/string-templates": "2.0.34-alpha.0",
+    "@budibase/types": "2.0.34-alpha.0",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 8428eaddd9..7b6481196a 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.33",
+  "version": "2.0.34-alpha.0",
   "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": "^2.0.33",
-    "@budibase/frontend-core": "^2.0.33",
-    "@budibase/string-templates": "^2.0.33",
+    "@budibase/bbui": "2.0.34-alpha.0",
+    "@budibase/frontend-core": "2.0.34-alpha.0",
+    "@budibase/string-templates": "2.0.34-alpha.0",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 0c0b18df9b..1a1015a769 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.33",
+  "version": "2.0.34-alpha.0",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.0.33",
+    "@budibase/bbui": "2.0.34-alpha.0",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 3612328dc5..d5e4e60b33 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.33",
+  "version": "2.0.34-alpha.0",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 599df17bd2..10429cb0c1 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.33",
+  "version": "2.0.34-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.0.33",
-    "@budibase/client": "^2.0.33",
+    "@budibase/backend-core": "2.0.34-alpha.0",
+    "@budibase/client": "2.0.34-alpha.0",
     "@budibase/pro": "2.0.33",
-    "@budibase/string-templates": "^2.0.33",
-    "@budibase/types": "^2.0.33",
+    "@budibase/string-templates": "2.0.34-alpha.0",
+    "@budibase/types": "2.0.34-alpha.0",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index fb3450760c..010afd4d4f 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.33",
+  "version": "2.0.34-alpha.0",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 23eb98908c..20123a3259 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.33",
+  "version": "2.0.34-alpha.0",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 4890d427d8..ab94b83f7f 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.33",
+  "version": "2.0.34-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.0.33",
+    "@budibase/backend-core": "2.0.34-alpha.0",
     "@budibase/pro": "2.0.33",
-    "@budibase/string-templates": "^2.0.33",
-    "@budibase/types": "^2.0.33",
+    "@budibase/string-templates": "2.0.34-alpha.0",
+    "@budibase/types": "2.0.34-alpha.0",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 621179989c1dabfb9693b51d945289351bb6aad0 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 25 Oct 2022 11:33:50 +0000
Subject: [PATCH 136/151] Update pro version to 2.0.34-alpha.0

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 32 +++++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 32 +++++++++++++++++---------------
 4 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 10429cb0c1..5bbe0c303a 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.0.34-alpha.0",
     "@budibase/client": "2.0.34-alpha.0",
-    "@budibase/pro": "2.0.33",
+    "@budibase/pro": "2.0.34-alpha.0",
     "@budibase/string-templates": "2.0.34-alpha.0",
     "@budibase/types": "2.0.34-alpha.0",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index e0e2b3be19..a5bbfb453b 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,17 +1094,18 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.33":
-  version "2.0.33"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.33.tgz#adb9e727deeb8a46932f8f12090a9562dc34bb54"
-  integrity sha512-cHlBvk7JW351WfzvzE13VkPxcTwjFY/+dORsANjm2WeesmO9SKDINzakTEISI1EpJCl4r/b7P4jpx3OgX+iecg==
+"@budibase/backend-core@2.0.34-alpha.0":
+  version "2.0.34-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34-alpha.0.tgz#2e3506a6253807613e130f871649dbc961da4844"
+  integrity sha512-LHwujActrahEcS7YP4iL8ZukrLUDNCYCQ3Ub0rPr9F6K8miljY5x/NW9VuFNfReWO7PqOQMuUxX1+lRHnGOvXg==
   dependencies:
-    "@budibase/types" "^2.0.33"
+    "@budibase/types" "2.0.34-alpha.0"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
     bcryptjs "2.4.3"
+    bull "4.10.1"
     dotenv "16.0.1"
     emitter-listener "1.1.2"
     ioredis "4.28.0"
@@ -1180,14 +1181,15 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.33":
-  version "2.0.33"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.33.tgz#be74080445036373c2cb34798b5a6f6a11267f7e"
-  integrity sha512-bVQmw/qY9WqDkmdX38Ga0UdQg7xd+uLzXAqRPkuOBeKr+gXvIdYrRHuuaoos47asxhd9+NcwjyYNai6FZ/w30w==
+"@budibase/pro@2.0.34-alpha.0":
+  version "2.0.34-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34-alpha.0.tgz#da22ce1dd8dd104fde261bcc449a36ce4a9796e2"
+  integrity sha512-SDGth6/qYBmxwCjJcdjriU8O4nn7rGoctLkvsZWJbfKhiipsBvpP0ReWJyQSJFFLVMTFSTgo79CG8XIFfd/O4w==
   dependencies:
-    "@budibase/backend-core" "2.0.33"
-    "@budibase/types" "2.0.33"
+    "@budibase/backend-core" "2.0.34-alpha.0"
+    "@budibase/types" "2.0.34-alpha.0"
     "@koa/router" "8.0.8"
+    bull "4.10.1"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
@@ -1209,10 +1211,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.33", "@budibase/types@^2.0.33":
-  version "2.0.33"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.33.tgz#0e87fd976ad9e5a84f05b3dfa0daf71e9150cd7b"
-  integrity sha512-QVUciZO4wkJpWyWNgP1MxKdfDzP1of6iDLFfo6J/lgp5voluFxEZsY0A5MOMQEf8TFw990h3gCOCNaN/GwMviw==
+"@budibase/types@2.0.34-alpha.0":
+  version "2.0.34-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34-alpha.0.tgz#d629c67100bf7d5ef5578b1c32f037e9720fc85c"
+  integrity sha512-VbVvcNzp0up8O9dtTID3F0jnGaGSFNzCbu3BeFD4o5n76IpKnN2OfBtGAD/9UMDeZ9DMDuqb4VoZIX198/fW1w==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index ab94b83f7f..f2743b15a3 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.0.34-alpha.0",
-    "@budibase/pro": "2.0.33",
+    "@budibase/pro": "2.0.34-alpha.0",
     "@budibase/string-templates": "2.0.34-alpha.0",
     "@budibase/types": "2.0.34-alpha.0",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 2ab9415a3a..3a8fd3e1dc 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,17 +291,18 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.33":
-  version "2.0.33"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.33.tgz#adb9e727deeb8a46932f8f12090a9562dc34bb54"
-  integrity sha512-cHlBvk7JW351WfzvzE13VkPxcTwjFY/+dORsANjm2WeesmO9SKDINzakTEISI1EpJCl4r/b7P4jpx3OgX+iecg==
+"@budibase/backend-core@2.0.34-alpha.0":
+  version "2.0.34-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34-alpha.0.tgz#2e3506a6253807613e130f871649dbc961da4844"
+  integrity sha512-LHwujActrahEcS7YP4iL8ZukrLUDNCYCQ3Ub0rPr9F6K8miljY5x/NW9VuFNfReWO7PqOQMuUxX1+lRHnGOvXg==
   dependencies:
-    "@budibase/types" "^2.0.33"
+    "@budibase/types" "2.0.34-alpha.0"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
     bcryptjs "2.4.3"
+    bull "4.10.1"
     dotenv "16.0.1"
     emitter-listener "1.1.2"
     ioredis "4.28.0"
@@ -327,21 +328,22 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.33":
-  version "2.0.33"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.33.tgz#be74080445036373c2cb34798b5a6f6a11267f7e"
-  integrity sha512-bVQmw/qY9WqDkmdX38Ga0UdQg7xd+uLzXAqRPkuOBeKr+gXvIdYrRHuuaoos47asxhd9+NcwjyYNai6FZ/w30w==
+"@budibase/pro@2.0.34-alpha.0":
+  version "2.0.34-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34-alpha.0.tgz#da22ce1dd8dd104fde261bcc449a36ce4a9796e2"
+  integrity sha512-SDGth6/qYBmxwCjJcdjriU8O4nn7rGoctLkvsZWJbfKhiipsBvpP0ReWJyQSJFFLVMTFSTgo79CG8XIFfd/O4w==
   dependencies:
-    "@budibase/backend-core" "2.0.33"
-    "@budibase/types" "2.0.33"
+    "@budibase/backend-core" "2.0.34-alpha.0"
+    "@budibase/types" "2.0.34-alpha.0"
     "@koa/router" "8.0.8"
+    bull "4.10.1"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.33", "@budibase/types@^2.0.33":
-  version "2.0.33"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.33.tgz#0e87fd976ad9e5a84f05b3dfa0daf71e9150cd7b"
-  integrity sha512-QVUciZO4wkJpWyWNgP1MxKdfDzP1of6iDLFfo6J/lgp5voluFxEZsY0A5MOMQEf8TFw990h3gCOCNaN/GwMviw==
+"@budibase/types@2.0.34-alpha.0":
+  version "2.0.34-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34-alpha.0.tgz#d629c67100bf7d5ef5578b1c32f037e9720fc85c"
+  integrity sha512-VbVvcNzp0up8O9dtTID3F0jnGaGSFNzCbu3BeFD4o5n76IpKnN2OfBtGAD/9UMDeZ9DMDuqb4VoZIX198/fW1w==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 56456f3f6ded2aef9e30d352900c8e9a2dac042d Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 25 Oct 2022 13:37:26 +0100
Subject: [PATCH 137/151] Startup fixes

---
 packages/backend-core/src/redis/redlock.ts  | 7 ++++++-
 packages/server/src/app.ts                  | 8 +++++---
 packages/server/src/automations/triggers.js | 4 ++--
 packages/server/src/migrations/index.ts     | 1 +
 packages/types/src/sdk/locks.ts             | 4 ++++
 packages/worker/src/migrations/index.ts     | 1 +
 6 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/packages/backend-core/src/redis/redlock.ts b/packages/backend-core/src/redis/redlock.ts
index abb13b2534..586302c9b1 100644
--- a/packages/backend-core/src/redis/redlock.ts
+++ b/packages/backend-core/src/redis/redlock.ts
@@ -55,7 +55,12 @@ export const doWithLock = async (opts: LockOptions, task: any) => {
   let lock
   try {
     // aquire lock
-    let name: string = `${tenancy.getTenantId()}_${opts.name}`
+    let name: string
+    if (opts.systemLock) {
+      name = opts.name
+    } else {
+      name = `${tenancy.getTenantId()}_${opts.name}`
+    }
     if (opts.nameSuffix) {
       name = name + `_${opts.nameSuffix}`
     }
diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts
index 330adadd3d..d8ed2c872b 100644
--- a/packages/server/src/app.ts
+++ b/packages/server/src/app.ts
@@ -122,7 +122,6 @@ module.exports = server.listen(env.PORT || 0, async () => {
   eventEmitter.emitPort(env.PORT)
   fileSystem.init()
   await redis.init()
-  await initPro()
 
   // run migrations on startup if not done via http
   // not recommended in a clustered environment
@@ -180,8 +179,11 @@ module.exports = server.listen(env.PORT || 0, async () => {
   // check for version updates
   await installation.checkInstallVersion()
 
-  // done last - this will never complete
-  await automations.init()
+  // done last - these will never complete
+  let promises = []
+  promises.push(automations.init())
+  promises.push(initPro())
+  await Promise.all(promises)
 })
 
 const shutdown = () => {
diff --git a/packages/server/src/automations/triggers.js b/packages/server/src/automations/triggers.js
index 6a4bbd8da6..3481cebf9b 100644
--- a/packages/server/src/automations/triggers.js
+++ b/packages/server/src/automations/triggers.js
@@ -116,8 +116,8 @@ exports.externalTrigger = async function (
 
 exports.rebootTrigger = async () => {
   // reboot cron option is only available on the main thread at
-  // startup and only usable in self host
-  if (env.isInThread() || !env.SELF_HOSTED) {
+  // startup and only usable in self host and single tenant environments
+  if (env.isInThread() || !env.SELF_HOSTED || env.MULTI_TENANCY) {
     return
   }
   // iterate through all production apps, find the reboot crons
diff --git a/packages/server/src/migrations/index.ts b/packages/server/src/migrations/index.ts
index 275a954a78..6ef6a3fda6 100644
--- a/packages/server/src/migrations/index.ts
+++ b/packages/server/src/migrations/index.ts
@@ -97,6 +97,7 @@ const migrateWithLock = async (options?: MigrationOptions) => {
       type: LockType.TRY_ONCE,
       name: LockName.MIGRATIONS,
       ttl: 1000 * 60 * 15, // auto expire the migration lock after 15 minutes
+      systemLock: true,
     },
     async () => {
       await migrations.runMigrations(MIGRATIONS, options)
diff --git a/packages/types/src/sdk/locks.ts b/packages/types/src/sdk/locks.ts
index 3aa067bea1..e2f1902762 100644
--- a/packages/types/src/sdk/locks.ts
+++ b/packages/types/src/sdk/locks.ts
@@ -28,4 +28,8 @@ export interface LockOptions {
    * The suffix to add to the lock name for additional uniqueness
    */
   nameSuffix?: string
+  /**
+   * This is a system-wide lock - don't use tenancy in lock key
+   */
+  systemLock?: boolean
 }
diff --git a/packages/worker/src/migrations/index.ts b/packages/worker/src/migrations/index.ts
index 19ef076a52..642fbeb54e 100644
--- a/packages/worker/src/migrations/index.ts
+++ b/packages/worker/src/migrations/index.ts
@@ -53,6 +53,7 @@ const migrateWithLock = async (options?: MigrationOptions) => {
       type: LockType.TRY_ONCE,
       name: LockName.MIGRATIONS,
       ttl: 1000 * 60 * 15, // auto expire the migration lock after 15 minutes
+      systemLock: true,
     },
     async () => {
       await migrations.runMigrations(MIGRATIONS, options)

From c9ae15fef16f858100b33a477f6a448bd14bd742 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 25 Oct 2022 13:45:43 +0100
Subject: [PATCH 138/151] Remove defaults for bucket names from k8s chart

---
 charts/budibase/templates/app-service-deployment.yaml    | 6 +++---
 charts/budibase/templates/worker-service-deployment.yaml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
index af2a3ed544..d71ee6e178 100644
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -79,11 +79,11 @@ spec:
         - name: MINIO_URL
           value: {{ .Values.services.objectStore.url }}
         - name: PLUGIN_BUCKET_NAME
-          value: {{ .Values.services.objectStore.pluginBucketName | default "plugins" | quote }}
+          value: {{ .Values.services.objectStore.pluginBucketName | quote }}
         - name: APPS_BUCKET_NAME
-          value: {{ .Values.services.objectStore.appsBucketName | default "apps" | quote }}
+          value: {{ .Values.services.objectStore.appsBucketName | quote }}
         - name: GLOBAL_CLOUD_BUCKET_NAME
-          value: {{ .Values.services.objectStore.globalBucketName | default "global" | quote }}
+          value: {{ .Values.services.objectStore.globalBucketName | quote }}
         - name: PORT
           value: {{ .Values.services.apps.port | quote }}
         {{ if .Values.services.worker.publicApiRateLimitPerSecond }}
diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml
index e7dccfae1c..ffcda1ab72 100644
--- a/charts/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@@ -78,11 +78,11 @@ spec:
         - name: MINIO_URL
           value: {{ .Values.services.objectStore.url }}
         - name: PLUGIN_BUCKET_NAME
-          value: {{ .Values.services.objectStore.pluginBucketName | default "plugins" | quote }}
+          value: {{ .Values.services.objectStore.pluginBucketName | quote }}
         - name: APPS_BUCKET_NAME
-          value: {{ .Values.services.objectStore.appsBucketName | default "apps" | quote }}
+          value: {{ .Values.services.objectStore.appsBucketName | quote }}
         - name: GLOBAL_CLOUD_BUCKET_NAME
-          value: {{ .Values.services.objectStore.globalBucketName | default "global" | quote }}
+          value: {{ .Values.services.objectStore.globalBucketName | quote }}
         - name: PORT
           value: {{ .Values.services.worker.port | quote }}
         - name: MULTI_TENANCY

From 02d54713d38df0eeeebe08021c90762c80561231 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 25 Oct 2022 13:32:58 +0000
Subject: [PATCH 139/151] v2.0.34-alpha.1

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 7cb99d5b61..249ae6885e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.34-alpha.0",
+  "version": "2.0.34-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index ca16b858a0..6d9ea76a66 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.34-alpha.0",
+  "version": "2.0.34-alpha.1",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "2.0.34-alpha.0",
+    "@budibase/types": "2.0.34-alpha.1",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 257fddff0c..8deaa4aaa8 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.34-alpha.0",
+  "version": "2.0.34-alpha.1",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "2.0.34-alpha.0",
+    "@budibase/string-templates": "2.0.34-alpha.1",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 9570edc5cb..9bd800e205 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.34-alpha.0",
+  "version": "2.0.34-alpha.1",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.0.34-alpha.0",
-    "@budibase/client": "2.0.34-alpha.0",
-    "@budibase/frontend-core": "2.0.34-alpha.0",
-    "@budibase/string-templates": "2.0.34-alpha.0",
+    "@budibase/bbui": "2.0.34-alpha.1",
+    "@budibase/client": "2.0.34-alpha.1",
+    "@budibase/frontend-core": "2.0.34-alpha.1",
+    "@budibase/string-templates": "2.0.34-alpha.1",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 16d2eac2ee..312bbafba4 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.34-alpha.0",
+  "version": "2.0.34-alpha.1",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.0.34-alpha.0",
-    "@budibase/string-templates": "2.0.34-alpha.0",
-    "@budibase/types": "2.0.34-alpha.0",
+    "@budibase/backend-core": "2.0.34-alpha.1",
+    "@budibase/string-templates": "2.0.34-alpha.1",
+    "@budibase/types": "2.0.34-alpha.1",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 7b6481196a..631cfc8b45 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.34-alpha.0",
+  "version": "2.0.34-alpha.1",
   "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": "2.0.34-alpha.0",
-    "@budibase/frontend-core": "2.0.34-alpha.0",
-    "@budibase/string-templates": "2.0.34-alpha.0",
+    "@budibase/bbui": "2.0.34-alpha.1",
+    "@budibase/frontend-core": "2.0.34-alpha.1",
+    "@budibase/string-templates": "2.0.34-alpha.1",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 1a1015a769..61b36d57b8 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.34-alpha.0",
+  "version": "2.0.34-alpha.1",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.0.34-alpha.0",
+    "@budibase/bbui": "2.0.34-alpha.1",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index d5e4e60b33..f196babed5 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.34-alpha.0",
+  "version": "2.0.34-alpha.1",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 5bbe0c303a..cd275e3175 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.34-alpha.0",
+  "version": "2.0.34-alpha.1",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.0.34-alpha.0",
-    "@budibase/client": "2.0.34-alpha.0",
+    "@budibase/backend-core": "2.0.34-alpha.1",
+    "@budibase/client": "2.0.34-alpha.1",
     "@budibase/pro": "2.0.34-alpha.0",
-    "@budibase/string-templates": "2.0.34-alpha.0",
-    "@budibase/types": "2.0.34-alpha.0",
+    "@budibase/string-templates": "2.0.34-alpha.1",
+    "@budibase/types": "2.0.34-alpha.1",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 010afd4d4f..aa1e81f69c 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.34-alpha.0",
+  "version": "2.0.34-alpha.1",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 20123a3259..11509434fd 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.34-alpha.0",
+  "version": "2.0.34-alpha.1",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index f2743b15a3..0d4073da96 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.34-alpha.0",
+  "version": "2.0.34-alpha.1",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.0.34-alpha.0",
+    "@budibase/backend-core": "2.0.34-alpha.1",
     "@budibase/pro": "2.0.34-alpha.0",
-    "@budibase/string-templates": "2.0.34-alpha.0",
-    "@budibase/types": "2.0.34-alpha.0",
+    "@budibase/string-templates": "2.0.34-alpha.1",
+    "@budibase/types": "2.0.34-alpha.1",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 5e495c6b9cc5c7d76987df58995c7748b03330c6 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 25 Oct 2022 13:36:55 +0000
Subject: [PATCH 140/151] Update pro version to 2.0.34-alpha.1

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index cd275e3175..aa8a154237 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.0.34-alpha.1",
     "@budibase/client": "2.0.34-alpha.1",
-    "@budibase/pro": "2.0.34-alpha.0",
+    "@budibase/pro": "2.0.34-alpha.1",
     "@budibase/string-templates": "2.0.34-alpha.1",
     "@budibase/types": "2.0.34-alpha.1",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index a5bbfb453b..6d14f2815b 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.34-alpha.0":
-  version "2.0.34-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34-alpha.0.tgz#2e3506a6253807613e130f871649dbc961da4844"
-  integrity sha512-LHwujActrahEcS7YP4iL8ZukrLUDNCYCQ3Ub0rPr9F6K8miljY5x/NW9VuFNfReWO7PqOQMuUxX1+lRHnGOvXg==
+"@budibase/backend-core@2.0.34-alpha.1":
+  version "2.0.34-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34-alpha.1.tgz#855277b12c31d7f9bc2d83b8b8c84031924cae50"
+  integrity sha512-4GZ3PzVIHBNtWkcUy6XvThGisdY+79waLiLngUp1HDawO+xJrpr1rA0WofwoYrK14ZfQzib8ujfMZWH2ujEtBQ==
   dependencies:
-    "@budibase/types" "2.0.34-alpha.0"
+    "@budibase/types" "2.0.34-alpha.1"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1181,13 +1181,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.34-alpha.0":
-  version "2.0.34-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34-alpha.0.tgz#da22ce1dd8dd104fde261bcc449a36ce4a9796e2"
-  integrity sha512-SDGth6/qYBmxwCjJcdjriU8O4nn7rGoctLkvsZWJbfKhiipsBvpP0ReWJyQSJFFLVMTFSTgo79CG8XIFfd/O4w==
+"@budibase/pro@2.0.34-alpha.1":
+  version "2.0.34-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34-alpha.1.tgz#7da5e46bb38b7defe49b6029bd28cde1c7850eba"
+  integrity sha512-pIDQ0WXL3YfqBX0SjBGA9uxRFcHh+ydsC2aRe0gKCeTriNx0F76WlY4SiIn/5LuwnaH3xIcOAViMOGPDF1WTiQ==
   dependencies:
-    "@budibase/backend-core" "2.0.34-alpha.0"
-    "@budibase/types" "2.0.34-alpha.0"
+    "@budibase/backend-core" "2.0.34-alpha.1"
+    "@budibase/types" "2.0.34-alpha.1"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1211,10 +1211,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.34-alpha.0":
-  version "2.0.34-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34-alpha.0.tgz#d629c67100bf7d5ef5578b1c32f037e9720fc85c"
-  integrity sha512-VbVvcNzp0up8O9dtTID3F0jnGaGSFNzCbu3BeFD4o5n76IpKnN2OfBtGAD/9UMDeZ9DMDuqb4VoZIX198/fW1w==
+"@budibase/types@2.0.34-alpha.1":
+  version "2.0.34-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34-alpha.1.tgz#8e7a093ac12bedcb71a5b075cdd4d8bd543823b5"
+  integrity sha512-YbID4zuwktUNgX5PRvJVgt6LzuXLDVt0Vxs5SNOd+IsoC6yz8fZjKC4pNj4wd6QAiIw2+eOxzaNFbj8ogE1tPg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 0d4073da96..9f911512e9 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.0.34-alpha.1",
-    "@budibase/pro": "2.0.34-alpha.0",
+    "@budibase/pro": "2.0.34-alpha.1",
     "@budibase/string-templates": "2.0.34-alpha.1",
     "@budibase/types": "2.0.34-alpha.1",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 3a8fd3e1dc..32b539bec7 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.34-alpha.0":
-  version "2.0.34-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34-alpha.0.tgz#2e3506a6253807613e130f871649dbc961da4844"
-  integrity sha512-LHwujActrahEcS7YP4iL8ZukrLUDNCYCQ3Ub0rPr9F6K8miljY5x/NW9VuFNfReWO7PqOQMuUxX1+lRHnGOvXg==
+"@budibase/backend-core@2.0.34-alpha.1":
+  version "2.0.34-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34-alpha.1.tgz#855277b12c31d7f9bc2d83b8b8c84031924cae50"
+  integrity sha512-4GZ3PzVIHBNtWkcUy6XvThGisdY+79waLiLngUp1HDawO+xJrpr1rA0WofwoYrK14ZfQzib8ujfMZWH2ujEtBQ==
   dependencies:
-    "@budibase/types" "2.0.34-alpha.0"
+    "@budibase/types" "2.0.34-alpha.1"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -328,22 +328,22 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.34-alpha.0":
-  version "2.0.34-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34-alpha.0.tgz#da22ce1dd8dd104fde261bcc449a36ce4a9796e2"
-  integrity sha512-SDGth6/qYBmxwCjJcdjriU8O4nn7rGoctLkvsZWJbfKhiipsBvpP0ReWJyQSJFFLVMTFSTgo79CG8XIFfd/O4w==
+"@budibase/pro@2.0.34-alpha.1":
+  version "2.0.34-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34-alpha.1.tgz#7da5e46bb38b7defe49b6029bd28cde1c7850eba"
+  integrity sha512-pIDQ0WXL3YfqBX0SjBGA9uxRFcHh+ydsC2aRe0gKCeTriNx0F76WlY4SiIn/5LuwnaH3xIcOAViMOGPDF1WTiQ==
   dependencies:
-    "@budibase/backend-core" "2.0.34-alpha.0"
-    "@budibase/types" "2.0.34-alpha.0"
+    "@budibase/backend-core" "2.0.34-alpha.1"
+    "@budibase/types" "2.0.34-alpha.1"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.34-alpha.0":
-  version "2.0.34-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34-alpha.0.tgz#d629c67100bf7d5ef5578b1c32f037e9720fc85c"
-  integrity sha512-VbVvcNzp0up8O9dtTID3F0jnGaGSFNzCbu3BeFD4o5n76IpKnN2OfBtGAD/9UMDeZ9DMDuqb4VoZIX198/fW1w==
+"@budibase/types@2.0.34-alpha.1":
+  version "2.0.34-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34-alpha.1.tgz#8e7a093ac12bedcb71a5b075cdd4d8bd543823b5"
+  integrity sha512-YbID4zuwktUNgX5PRvJVgt6LzuXLDVt0Vxs5SNOd+IsoC6yz8fZjKC4pNj4wd6QAiIw2+eOxzaNFbj8ogE1tPg==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 679e22384ca23ff1ee4b6522ad61c255c2c7a09f Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 25 Oct 2022 16:05:19 +0100
Subject: [PATCH 141/151] Assorted Backups UI fixes

---
 packages/bbui/src/Form/Core/DatePicker.svelte |  2 +-
 .../overview/backups/ActionsRenderer.svelte   |  2 +-
 .../portal/overview/backups/BackupsTab.svelte | 54 +++++++++++--------
 .../overview/backups/CreateBackupModal.svelte |  1 +
 .../backups/CreateRestoreModal.svelte         |  2 +-
 5 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/packages/bbui/src/Form/Core/DatePicker.svelte b/packages/bbui/src/Form/Core/DatePicker.svelte
index 15200e111e..9e7d44dbc3 100644
--- a/packages/bbui/src/Form/Core/DatePicker.svelte
+++ b/packages/bbui/src/Form/Core/DatePicker.svelte
@@ -66,7 +66,7 @@
       newValue = newValue.toISOString()
     }
     // If time only set date component to 2000-01-01
-    else if (timeOnly) {
+    if (timeOnly) {
       // Classic flackpickr causing issues.
       // When selecting a value for the first time for a "time only" field,
       // the time is always offset by 1 hour for some reason (regardless of time
diff --git a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
index b9ca38cf72..a243992c5c 100644
--- a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
@@ -77,7 +77,7 @@
   title="Confirm Deletion"
 >
   Are you sure you wish to delete the backup
-  <i>{row.name}</i>
+  <i>{row.name}?&nbsp;</i>
   This action cannot be undone.
 </ConfirmDialog>
 
diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index 958ee995c7..9c1db4e978 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -62,24 +62,31 @@
   const schema = {
     type: {
       displayName: "Type",
+      width: "auto",
     },
     createdAt: {
       displayName: "Date",
+      width: "auto",
     },
     name: {
       displayName: "Name",
+      width: "auto",
     },
     appSize: {
       displayName: "App size",
+      width: "auto",
     },
     createdBy: {
       displayName: "User",
+      width: "auto",
     },
     status: {
       displayName: "Status",
+      width: "auto",
     },
     actions: {
       displayName: null,
+      width: "5%",
     },
   }
 
@@ -169,7 +176,7 @@
         </div>
         <div>
           <Body>
-            Backup your apps and restore them to their previous state.
+            Back up your apps and restore them to their previous state.
             {#if !$auth.accountPortalAccess && !$licensing.groupsEnabled && $admin.cloud}
               Contact your account holder to upgrade your plan.
             {/if}
@@ -195,12 +202,32 @@
               window.open("https://budibase.com/pricing/", "_blank")
             }}
           >
-            View Plans
+            View plans
           </Button>
         </div>
       </Layout>
     </Page>
-  {:else if backupData?.length > 0}
+  {:else if backupData?.length === 0 && !filterOpt && !startDate}
+    <Page wide={false}>
+      <div class="align">
+        <img
+          width="200px"
+          height="120px"
+          src={BackupsDefault}
+          alt="BackupsDefault"
+        />
+        <Layout gap="S">
+          <Heading>You have no backups yet</Heading>
+          <div class="opacity">
+            <Body size="S">You can manually backup your app any time</Body>
+          </div>
+          <div class="padding">
+            <Button on:click={modal.show} cta>Create Backup</Button>
+          </div>
+        </Layout>
+      </div>
+    </Page>
+  {:else}
     <Layout noPadding gap="M" alignContent="start">
       <div class="search">
         <div class="select">
@@ -235,6 +262,7 @@
       <div>
         <Table
           {schema}
+          disableSorting
           allowSelectRows={false}
           allowEditColumns={false}
           allowEditRows={false}
@@ -255,26 +283,6 @@
         </div>
       </div>
     </Layout>
-  {:else if backupData?.length === 0}
-    <Page wide={false}>
-      <div class="align">
-        <img
-          width="200px"
-          height="120px"
-          src={BackupsDefault}
-          alt="BackupsDefault"
-        />
-        <Layout gap="S">
-          <Heading>You have no backups yet</Heading>
-          <div class="opacity">
-            <Body size="S">You can manually backup your app any time</Body>
-          </div>
-          <div class="padding">
-            <Button on:click={modal.show} cta>Create Backup</Button>
-          </div>
-        </Layout>
-      </div>
-    </Page>
   {/if}
 </div>
 
diff --git a/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte b/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte
index d7a511890e..4701115640 100644
--- a/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte
+++ b/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte
@@ -13,6 +13,7 @@
 <ModalContent
   onConfirm={() => createManualBackup(name)}
   title="Create new backup"
+  diabled={!name}
   confirmText="Create"
   ><Input label="Backup name" bind:value={name} /></ModalContent
 >
diff --git a/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte b/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte
index 4ffb105772..62ef3e239d 100644
--- a/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte
+++ b/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte
@@ -12,7 +12,7 @@
 
 <ModalContent
   onConfirm={() => confirm(name)}
-  title="Backup your current version"
+  title="Back up your current version"
   confirmText="Confirm Restore"
   disabled={!name}
 >

From e48d4aaf1aaf6c895320c7cfe24e9c4605164770 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 25 Oct 2022 16:06:22 +0100
Subject: [PATCH 142/151] formatting

---
 .../components/portal/overview/backups/ActionsRenderer.svelte   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
index a243992c5c..576cec488b 100644
--- a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
@@ -77,7 +77,7 @@
   title="Confirm Deletion"
 >
   Are you sure you wish to delete the backup
-  <i>{row.name}?&nbsp;</i>
+  <i>{row.name}?</i>
   This action cannot be undone.
 </ConfirmDialog>
 

From 27fa18ad7dab9178ef9e746ab88b7b95a1b0976e Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 25 Oct 2022 16:15:50 +0100
Subject: [PATCH 143/151] fix icon sizing

---
 .../src/components/portal/overview/backups/BackupsTab.svelte  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index 9c1db4e978..acc8573e31 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -211,8 +211,8 @@
     <Page wide={false}>
       <div class="align">
         <img
-          width="200px"
-          height="120px"
+          width="220px"
+          height="130px"
           src={BackupsDefault}
           alt="BackupsDefault"
         />

From db55041c44273ba480a3256399b8c4644a0d778e Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 25 Oct 2022 16:18:33 +0100
Subject: [PATCH 144/151] Slightly reduce DND padding between nested layers

---
 packages/client/src/components/Component.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index 18b6488189..b98548fc9c 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -515,8 +515,8 @@
     display: contents;
   }
   .component.pad :global(> *) {
-    padding: var(--spacing-l) !important;
-    gap: var(--spacing-l) !important;
+    padding: var(--spacing-m) !important;
+    gap: var(--spacing-m) !important;
     border: 2px dashed var(--spectrum-global-color-gray-400) !important;
     border-radius: 4px !important;
     transition: padding 260ms ease-out, border 260ms ease-out;

From 5a2001bcbc7cc4f24676d0a3df182871b7a8e987 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 25 Oct 2022 16:22:29 +0100
Subject: [PATCH 145/151] fix loading state

---
 .../components/portal/overview/backups/BackupsTab.svelte | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index acc8573e31..0afb7c1760 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -37,7 +37,7 @@
   let startDate = null
   let endDate = null
   let filters = getFilters()
-
+  let loaded = false
   $: page = $pageInfo.page
   $: fetchBackups(filterOpt, page, startDate, endDate)
 
@@ -161,7 +161,10 @@
 
   onMount(() => {
     fetchBackups(filterOpt, page, startDate, endDate)
+    loaded = true
   })
+  $: console.log(loaded)
+  $: console.log(backups.length)
 </script>
 
 <div class="root">
@@ -207,7 +210,7 @@
         </div>
       </Layout>
     </Page>
-  {:else if backupData?.length === 0 && !filterOpt && !startDate}
+  {:else if backupData?.length === 0 && !loaded && !filterOpt && !startDate}
     <Page wide={false}>
       <div class="align">
         <img
@@ -227,7 +230,7 @@
         </Layout>
       </div>
     </Page>
-  {:else}
+  {:else if loaded}
     <Layout noPadding gap="M" alignContent="start">
       <div class="search">
         <div class="select">

From e41ada9062de09d36c4ac35ab255fff2d7fa08d9 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 26 Oct 2022 09:03:50 +0100
Subject: [PATCH 146/151] remove logs

---
 .../src/components/portal/overview/backups/BackupsTab.svelte    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index 0afb7c1760..9a9dc3c5c0 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -163,8 +163,6 @@
     fetchBackups(filterOpt, page, startDate, endDate)
     loaded = true
   })
-  $: console.log(loaded)
-  $: console.log(backups.length)
 </script>
 
 <div class="root">

From 887470d4b5abbfcbbd258357e041d8f137d2fe84 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Wed, 26 Oct 2022 09:24:28 +0100
Subject: [PATCH 147/151] Ensure tmpDir/.budibase always exists

---
 packages/backend-core/src/objectStore/utils.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/backend-core/src/objectStore/utils.js b/packages/backend-core/src/objectStore/utils.js
index 9cf4f5f70e..2d4faf55d1 100644
--- a/packages/backend-core/src/objectStore/utils.js
+++ b/packages/backend-core/src/objectStore/utils.js
@@ -1,5 +1,6 @@
 const { join } = require("path")
 const { tmpdir } = require("os")
+const fs = require("fs")
 const env = require("../environment")
 
 /****************************************************
@@ -16,6 +17,11 @@ exports.ObjectStoreBuckets = {
   PLUGINS: env.PLUGIN_BUCKET_NAME,
 }
 
-exports.budibaseTempDir = function () {
-  return join(tmpdir(), ".budibase")
+const bbTmp = join(tmpdir(), ".budibase")
+if (!fs.existsSync(bbTmp)) {
+  fs.mkdirSync(bbTmp)
+}
+
+exports.budibaseTempDir = function () {
+  return bbTmp
 }

From fca7a2dd8fc30f345046735862ec130640017aa6 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 26 Oct 2022 08:48:28 +0000
Subject: [PATCH 148/151] v2.0.34-alpha.2

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 249ae6885e..4926d588e2 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.34-alpha.1",
+  "version": "2.0.34-alpha.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 6d9ea76a66..f1162245cb 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.34-alpha.1",
+  "version": "2.0.34-alpha.2",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "2.0.34-alpha.1",
+    "@budibase/types": "2.0.34-alpha.2",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 8deaa4aaa8..e426609f94 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.34-alpha.1",
+  "version": "2.0.34-alpha.2",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "2.0.34-alpha.1",
+    "@budibase/string-templates": "2.0.34-alpha.2",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 9bd800e205..bcecf8777d 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.34-alpha.1",
+  "version": "2.0.34-alpha.2",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.0.34-alpha.1",
-    "@budibase/client": "2.0.34-alpha.1",
-    "@budibase/frontend-core": "2.0.34-alpha.1",
-    "@budibase/string-templates": "2.0.34-alpha.1",
+    "@budibase/bbui": "2.0.34-alpha.2",
+    "@budibase/client": "2.0.34-alpha.2",
+    "@budibase/frontend-core": "2.0.34-alpha.2",
+    "@budibase/string-templates": "2.0.34-alpha.2",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 312bbafba4..3958ed4c9d 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.34-alpha.1",
+  "version": "2.0.34-alpha.2",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.0.34-alpha.1",
-    "@budibase/string-templates": "2.0.34-alpha.1",
-    "@budibase/types": "2.0.34-alpha.1",
+    "@budibase/backend-core": "2.0.34-alpha.2",
+    "@budibase/string-templates": "2.0.34-alpha.2",
+    "@budibase/types": "2.0.34-alpha.2",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 631cfc8b45..ca3d10cdb6 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.34-alpha.1",
+  "version": "2.0.34-alpha.2",
   "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": "2.0.34-alpha.1",
-    "@budibase/frontend-core": "2.0.34-alpha.1",
-    "@budibase/string-templates": "2.0.34-alpha.1",
+    "@budibase/bbui": "2.0.34-alpha.2",
+    "@budibase/frontend-core": "2.0.34-alpha.2",
+    "@budibase/string-templates": "2.0.34-alpha.2",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 61b36d57b8..08195dd49e 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.34-alpha.1",
+  "version": "2.0.34-alpha.2",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.0.34-alpha.1",
+    "@budibase/bbui": "2.0.34-alpha.2",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index f196babed5..c0ebca2897 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.34-alpha.1",
+  "version": "2.0.34-alpha.2",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index aa8a154237..4e89898cce 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.34-alpha.1",
+  "version": "2.0.34-alpha.2",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.0.34-alpha.1",
-    "@budibase/client": "2.0.34-alpha.1",
+    "@budibase/backend-core": "2.0.34-alpha.2",
+    "@budibase/client": "2.0.34-alpha.2",
     "@budibase/pro": "2.0.34-alpha.1",
-    "@budibase/string-templates": "2.0.34-alpha.1",
-    "@budibase/types": "2.0.34-alpha.1",
+    "@budibase/string-templates": "2.0.34-alpha.2",
+    "@budibase/types": "2.0.34-alpha.2",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index aa1e81f69c..adcb3431ef 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.34-alpha.1",
+  "version": "2.0.34-alpha.2",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 11509434fd..acaa09db45 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.34-alpha.1",
+  "version": "2.0.34-alpha.2",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 9f911512e9..f7f31097cb 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.34-alpha.1",
+  "version": "2.0.34-alpha.2",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.0.34-alpha.1",
+    "@budibase/backend-core": "2.0.34-alpha.2",
     "@budibase/pro": "2.0.34-alpha.1",
-    "@budibase/string-templates": "2.0.34-alpha.1",
-    "@budibase/types": "2.0.34-alpha.1",
+    "@budibase/string-templates": "2.0.34-alpha.2",
+    "@budibase/types": "2.0.34-alpha.2",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From a70b2201c4fe333205995725ff93d604c1089756 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 26 Oct 2022 08:51:37 +0000
Subject: [PATCH 149/151] Update pro version to 2.0.34-alpha.2

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 4e89898cce..c83b33b8a9 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.0.34-alpha.2",
     "@budibase/client": "2.0.34-alpha.2",
-    "@budibase/pro": "2.0.34-alpha.1",
+    "@budibase/pro": "2.0.34-alpha.2",
     "@budibase/string-templates": "2.0.34-alpha.2",
     "@budibase/types": "2.0.34-alpha.2",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 6d14f2815b..d317ce3d16 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.34-alpha.1":
-  version "2.0.34-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34-alpha.1.tgz#855277b12c31d7f9bc2d83b8b8c84031924cae50"
-  integrity sha512-4GZ3PzVIHBNtWkcUy6XvThGisdY+79waLiLngUp1HDawO+xJrpr1rA0WofwoYrK14ZfQzib8ujfMZWH2ujEtBQ==
+"@budibase/backend-core@2.0.34-alpha.2":
+  version "2.0.34-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34-alpha.2.tgz#c5ff9f3a0a42759cff8c5b4dbb108dd71011076e"
+  integrity sha512-qHVaRXfUl0eFncOzSUsl+AAQjDX066SkFuYuXqYghqFQhycVhnVM6vM0jsk7Y7ETc0NoQwm3itgioGs8QuhgsA==
   dependencies:
-    "@budibase/types" "2.0.34-alpha.1"
+    "@budibase/types" "2.0.34-alpha.2"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1181,13 +1181,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.34-alpha.1":
-  version "2.0.34-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34-alpha.1.tgz#7da5e46bb38b7defe49b6029bd28cde1c7850eba"
-  integrity sha512-pIDQ0WXL3YfqBX0SjBGA9uxRFcHh+ydsC2aRe0gKCeTriNx0F76WlY4SiIn/5LuwnaH3xIcOAViMOGPDF1WTiQ==
+"@budibase/pro@2.0.34-alpha.2":
+  version "2.0.34-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34-alpha.2.tgz#25537bdbda6636881d9b118111413178345b3aff"
+  integrity sha512-uNVkV5yWfNt9NPapWdx/pEeVF3noGouZMJNPPPlJLTGqd4Kb0ssaH2C0Rwr+6EBZRzki0r0A6lHS0B/W6GO/xg==
   dependencies:
-    "@budibase/backend-core" "2.0.34-alpha.1"
-    "@budibase/types" "2.0.34-alpha.1"
+    "@budibase/backend-core" "2.0.34-alpha.2"
+    "@budibase/types" "2.0.34-alpha.2"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1211,10 +1211,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.34-alpha.1":
-  version "2.0.34-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34-alpha.1.tgz#8e7a093ac12bedcb71a5b075cdd4d8bd543823b5"
-  integrity sha512-YbID4zuwktUNgX5PRvJVgt6LzuXLDVt0Vxs5SNOd+IsoC6yz8fZjKC4pNj4wd6QAiIw2+eOxzaNFbj8ogE1tPg==
+"@budibase/types@2.0.34-alpha.2":
+  version "2.0.34-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34-alpha.2.tgz#c9fbf49179670f638e20349032be523a2e2bdc06"
+  integrity sha512-tGj6fdbOwJaOuFCS0no1X1jHE1mpJYoCSdFCUaEHzEGdj0JcFUB8qpfBMPgtXuNOy1dh0y+65v7pLgYawyRJiA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index f7f31097cb..5baa38f432 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.0.34-alpha.2",
-    "@budibase/pro": "2.0.34-alpha.1",
+    "@budibase/pro": "2.0.34-alpha.2",
     "@budibase/string-templates": "2.0.34-alpha.2",
     "@budibase/types": "2.0.34-alpha.2",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 32b539bec7..194b2e6375 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.34-alpha.1":
-  version "2.0.34-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34-alpha.1.tgz#855277b12c31d7f9bc2d83b8b8c84031924cae50"
-  integrity sha512-4GZ3PzVIHBNtWkcUy6XvThGisdY+79waLiLngUp1HDawO+xJrpr1rA0WofwoYrK14ZfQzib8ujfMZWH2ujEtBQ==
+"@budibase/backend-core@2.0.34-alpha.2":
+  version "2.0.34-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34-alpha.2.tgz#c5ff9f3a0a42759cff8c5b4dbb108dd71011076e"
+  integrity sha512-qHVaRXfUl0eFncOzSUsl+AAQjDX066SkFuYuXqYghqFQhycVhnVM6vM0jsk7Y7ETc0NoQwm3itgioGs8QuhgsA==
   dependencies:
-    "@budibase/types" "2.0.34-alpha.1"
+    "@budibase/types" "2.0.34-alpha.2"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -328,22 +328,22 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.34-alpha.1":
-  version "2.0.34-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34-alpha.1.tgz#7da5e46bb38b7defe49b6029bd28cde1c7850eba"
-  integrity sha512-pIDQ0WXL3YfqBX0SjBGA9uxRFcHh+ydsC2aRe0gKCeTriNx0F76WlY4SiIn/5LuwnaH3xIcOAViMOGPDF1WTiQ==
+"@budibase/pro@2.0.34-alpha.2":
+  version "2.0.34-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34-alpha.2.tgz#25537bdbda6636881d9b118111413178345b3aff"
+  integrity sha512-uNVkV5yWfNt9NPapWdx/pEeVF3noGouZMJNPPPlJLTGqd4Kb0ssaH2C0Rwr+6EBZRzki0r0A6lHS0B/W6GO/xg==
   dependencies:
-    "@budibase/backend-core" "2.0.34-alpha.1"
-    "@budibase/types" "2.0.34-alpha.1"
+    "@budibase/backend-core" "2.0.34-alpha.2"
+    "@budibase/types" "2.0.34-alpha.2"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.34-alpha.1":
-  version "2.0.34-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34-alpha.1.tgz#8e7a093ac12bedcb71a5b075cdd4d8bd543823b5"
-  integrity sha512-YbID4zuwktUNgX5PRvJVgt6LzuXLDVt0Vxs5SNOd+IsoC6yz8fZjKC4pNj4wd6QAiIw2+eOxzaNFbj8ogE1tPg==
+"@budibase/types@2.0.34-alpha.2":
+  version "2.0.34-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34-alpha.2.tgz#c9fbf49179670f638e20349032be523a2e2bdc06"
+  integrity sha512-tGj6fdbOwJaOuFCS0no1X1jHE1mpJYoCSdFCUaEHzEGdj0JcFUB8qpfBMPgtXuNOy1dh0y+65v7pLgYawyRJiA==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 9c203e1830d55eeffc0d054cdd4190711016e091 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 26 Oct 2022 09:14:18 +0000
Subject: [PATCH 150/151] v2.0.34-alpha.3

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 4926d588e2..16540f235e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.34-alpha.2",
+  "version": "2.0.34-alpha.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index f1162245cb..83ed8eb7d6 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.34-alpha.2",
+  "version": "2.0.34-alpha.3",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "2.0.34-alpha.2",
+    "@budibase/types": "2.0.34-alpha.3",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index e426609f94..37650dda37 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.34-alpha.2",
+  "version": "2.0.34-alpha.3",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "2.0.34-alpha.2",
+    "@budibase/string-templates": "2.0.34-alpha.3",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index bcecf8777d..a1d217f0a7 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.34-alpha.2",
+  "version": "2.0.34-alpha.3",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.0.34-alpha.2",
-    "@budibase/client": "2.0.34-alpha.2",
-    "@budibase/frontend-core": "2.0.34-alpha.2",
-    "@budibase/string-templates": "2.0.34-alpha.2",
+    "@budibase/bbui": "2.0.34-alpha.3",
+    "@budibase/client": "2.0.34-alpha.3",
+    "@budibase/frontend-core": "2.0.34-alpha.3",
+    "@budibase/string-templates": "2.0.34-alpha.3",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 3958ed4c9d..71aa45e881 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.34-alpha.2",
+  "version": "2.0.34-alpha.3",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.0.34-alpha.2",
-    "@budibase/string-templates": "2.0.34-alpha.2",
-    "@budibase/types": "2.0.34-alpha.2",
+    "@budibase/backend-core": "2.0.34-alpha.3",
+    "@budibase/string-templates": "2.0.34-alpha.3",
+    "@budibase/types": "2.0.34-alpha.3",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index ca3d10cdb6..35d0f25091 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.34-alpha.2",
+  "version": "2.0.34-alpha.3",
   "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": "2.0.34-alpha.2",
-    "@budibase/frontend-core": "2.0.34-alpha.2",
-    "@budibase/string-templates": "2.0.34-alpha.2",
+    "@budibase/bbui": "2.0.34-alpha.3",
+    "@budibase/frontend-core": "2.0.34-alpha.3",
+    "@budibase/string-templates": "2.0.34-alpha.3",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 08195dd49e..d2e9194421 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.34-alpha.2",
+  "version": "2.0.34-alpha.3",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.0.34-alpha.2",
+    "@budibase/bbui": "2.0.34-alpha.3",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index c0ebca2897..26ca291b5f 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.34-alpha.2",
+  "version": "2.0.34-alpha.3",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index c83b33b8a9..2de0aef0d0 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.34-alpha.2",
+  "version": "2.0.34-alpha.3",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.0.34-alpha.2",
-    "@budibase/client": "2.0.34-alpha.2",
+    "@budibase/backend-core": "2.0.34-alpha.3",
+    "@budibase/client": "2.0.34-alpha.3",
     "@budibase/pro": "2.0.34-alpha.2",
-    "@budibase/string-templates": "2.0.34-alpha.2",
-    "@budibase/types": "2.0.34-alpha.2",
+    "@budibase/string-templates": "2.0.34-alpha.3",
+    "@budibase/types": "2.0.34-alpha.3",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index adcb3431ef..18b1f8f821 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.34-alpha.2",
+  "version": "2.0.34-alpha.3",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index acaa09db45..38a7ea7746 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.34-alpha.2",
+  "version": "2.0.34-alpha.3",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 5baa38f432..fa1e477f24 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.34-alpha.2",
+  "version": "2.0.34-alpha.3",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.0.34-alpha.2",
+    "@budibase/backend-core": "2.0.34-alpha.3",
     "@budibase/pro": "2.0.34-alpha.2",
-    "@budibase/string-templates": "2.0.34-alpha.2",
-    "@budibase/types": "2.0.34-alpha.2",
+    "@budibase/string-templates": "2.0.34-alpha.3",
+    "@budibase/types": "2.0.34-alpha.3",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 94f4ed560444fc6170169dea918fc7319b3c9679 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 26 Oct 2022 09:17:40 +0000
Subject: [PATCH 151/151] Update pro version to 2.0.34-alpha.3

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 2de0aef0d0..f0e2852c39 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.0.34-alpha.3",
     "@budibase/client": "2.0.34-alpha.3",
-    "@budibase/pro": "2.0.34-alpha.2",
+    "@budibase/pro": "2.0.34-alpha.3",
     "@budibase/string-templates": "2.0.34-alpha.3",
     "@budibase/types": "2.0.34-alpha.3",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index d317ce3d16..ea1938ba50 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.34-alpha.2":
-  version "2.0.34-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34-alpha.2.tgz#c5ff9f3a0a42759cff8c5b4dbb108dd71011076e"
-  integrity sha512-qHVaRXfUl0eFncOzSUsl+AAQjDX066SkFuYuXqYghqFQhycVhnVM6vM0jsk7Y7ETc0NoQwm3itgioGs8QuhgsA==
+"@budibase/backend-core@2.0.34-alpha.3":
+  version "2.0.34-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34-alpha.3.tgz#a05c7bb0b3b8537f46b0d797c613a1d54cbcc3a3"
+  integrity sha512-L4qZBkpc7LVMsHY8B9imXs3ZI1xNcuPeNe7q64k1VxypSkTwDdW6YmIebd0aoXrQxgl1FfotVR94dSM3B6sTxQ==
   dependencies:
-    "@budibase/types" "2.0.34-alpha.2"
+    "@budibase/types" "2.0.34-alpha.3"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1181,13 +1181,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.34-alpha.2":
-  version "2.0.34-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34-alpha.2.tgz#25537bdbda6636881d9b118111413178345b3aff"
-  integrity sha512-uNVkV5yWfNt9NPapWdx/pEeVF3noGouZMJNPPPlJLTGqd4Kb0ssaH2C0Rwr+6EBZRzki0r0A6lHS0B/W6GO/xg==
+"@budibase/pro@2.0.34-alpha.3":
+  version "2.0.34-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34-alpha.3.tgz#ebdf5f29f12273eda268d52940ba0d2b07147e3a"
+  integrity sha512-PwXETyajP40H5VvqKJGzKldsIBLnnXXxAMIKmWTz7dnDBCzjdurawotaSFXIno7Tr2NUG1H22inwKm99zs8pZg==
   dependencies:
-    "@budibase/backend-core" "2.0.34-alpha.2"
-    "@budibase/types" "2.0.34-alpha.2"
+    "@budibase/backend-core" "2.0.34-alpha.3"
+    "@budibase/types" "2.0.34-alpha.3"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1211,10 +1211,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.34-alpha.2":
-  version "2.0.34-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34-alpha.2.tgz#c9fbf49179670f638e20349032be523a2e2bdc06"
-  integrity sha512-tGj6fdbOwJaOuFCS0no1X1jHE1mpJYoCSdFCUaEHzEGdj0JcFUB8qpfBMPgtXuNOy1dh0y+65v7pLgYawyRJiA==
+"@budibase/types@2.0.34-alpha.3":
+  version "2.0.34-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34-alpha.3.tgz#f2301ece6e65c09beb4a9c76b3b90bd77835f14b"
+  integrity sha512-1GUNU0NOSy/KkwUpDaPXLCHl3nRAeX2G0i2+ueERcpjbEVcQwwAG7hRUbcwS93lkddrukFipE+Qmh8cvtq751A==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index fa1e477f24..b44cc10ef3 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.0.34-alpha.3",
-    "@budibase/pro": "2.0.34-alpha.2",
+    "@budibase/pro": "2.0.34-alpha.3",
     "@budibase/string-templates": "2.0.34-alpha.3",
     "@budibase/types": "2.0.34-alpha.3",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 194b2e6375..e32fdc5059 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.34-alpha.2":
-  version "2.0.34-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34-alpha.2.tgz#c5ff9f3a0a42759cff8c5b4dbb108dd71011076e"
-  integrity sha512-qHVaRXfUl0eFncOzSUsl+AAQjDX066SkFuYuXqYghqFQhycVhnVM6vM0jsk7Y7ETc0NoQwm3itgioGs8QuhgsA==
+"@budibase/backend-core@2.0.34-alpha.3":
+  version "2.0.34-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34-alpha.3.tgz#a05c7bb0b3b8537f46b0d797c613a1d54cbcc3a3"
+  integrity sha512-L4qZBkpc7LVMsHY8B9imXs3ZI1xNcuPeNe7q64k1VxypSkTwDdW6YmIebd0aoXrQxgl1FfotVR94dSM3B6sTxQ==
   dependencies:
-    "@budibase/types" "2.0.34-alpha.2"
+    "@budibase/types" "2.0.34-alpha.3"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -328,22 +328,22 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.34-alpha.2":
-  version "2.0.34-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34-alpha.2.tgz#25537bdbda6636881d9b118111413178345b3aff"
-  integrity sha512-uNVkV5yWfNt9NPapWdx/pEeVF3noGouZMJNPPPlJLTGqd4Kb0ssaH2C0Rwr+6EBZRzki0r0A6lHS0B/W6GO/xg==
+"@budibase/pro@2.0.34-alpha.3":
+  version "2.0.34-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34-alpha.3.tgz#ebdf5f29f12273eda268d52940ba0d2b07147e3a"
+  integrity sha512-PwXETyajP40H5VvqKJGzKldsIBLnnXXxAMIKmWTz7dnDBCzjdurawotaSFXIno7Tr2NUG1H22inwKm99zs8pZg==
   dependencies:
-    "@budibase/backend-core" "2.0.34-alpha.2"
-    "@budibase/types" "2.0.34-alpha.2"
+    "@budibase/backend-core" "2.0.34-alpha.3"
+    "@budibase/types" "2.0.34-alpha.3"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.34-alpha.2":
-  version "2.0.34-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34-alpha.2.tgz#c9fbf49179670f638e20349032be523a2e2bdc06"
-  integrity sha512-tGj6fdbOwJaOuFCS0no1X1jHE1mpJYoCSdFCUaEHzEGdj0JcFUB8qpfBMPgtXuNOy1dh0y+65v7pLgYawyRJiA==
+"@budibase/types@2.0.34-alpha.3":
+  version "2.0.34-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34-alpha.3.tgz#f2301ece6e65c09beb4a9c76b3b90bd77835f14b"
+  integrity sha512-1GUNU0NOSy/KkwUpDaPXLCHl3nRAeX2G0i2+ueERcpjbEVcQwwAG7hRUbcwS93lkddrukFipE+Qmh8cvtq751A==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"