From 0892a1db5971ae73e9b9d7d7a80ce8021d7da320 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 2 Feb 2022 15:17:59 +0000
Subject: [PATCH 01/31] Add new rich text component to BBUI

---
 packages/bbui/package.json                    |  1 +
 .../bbui/src/Form/Core/RichTextField.svelte   | 11 +++
 packages/bbui/src/Form/Core/index.js          |  1 +
 packages/bbui/src/Form/RichTextField.svelte   | 30 ++++++
 .../bbui/src/Markdown/MarkdownEditor.svelte   | 38 ++++++++
 .../bbui/src/Markdown/MarkdownViewer.svelte   | 60 ++++++++++++
 packages/bbui/src/Markdown/SpectrumMDE.svelte | 94 +++++++++++++++++++
 packages/bbui/src/index.js                    |  3 +
 packages/bbui/yarn.lock                       | 52 ++++++++++
 9 files changed, 290 insertions(+)
 create mode 100644 packages/bbui/src/Form/Core/RichTextField.svelte
 create mode 100644 packages/bbui/src/Form/RichTextField.svelte
 create mode 100644 packages/bbui/src/Markdown/MarkdownEditor.svelte
 create mode 100644 packages/bbui/src/Markdown/MarkdownViewer.svelte
 create mode 100644 packages/bbui/src/Markdown/SpectrumMDE.svelte

diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 5cc3ccebeb..91a2a17880 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -79,6 +79,7 @@
     "@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"
   },
diff --git a/packages/bbui/src/Form/Core/RichTextField.svelte b/packages/bbui/src/Form/Core/RichTextField.svelte
new file mode 100644
index 0000000000..33534485d2
--- /dev/null
+++ b/packages/bbui/src/Form/Core/RichTextField.svelte
@@ -0,0 +1,11 @@
+<script>
+  import MarkdownEditor from "../../Markdown/MarkdownEditor.svelte"
+
+  export let value = ""
+  export let placeholder = null
+  export let disabled = false
+  export let error = null
+  export let height = null
+</script>
+
+<MarkdownEditor {value} {placeholder} {height} on:change />
diff --git a/packages/bbui/src/Form/Core/index.js b/packages/bbui/src/Form/Core/index.js
index 440c4a1b15..3c3f9acb4d 100644
--- a/packages/bbui/src/Form/Core/index.js
+++ b/packages/bbui/src/Form/Core/index.js
@@ -10,3 +10,4 @@ export { default as CoreSearch } from "./Search.svelte"
 export { default as CoreDatePicker } from "./DatePicker.svelte"
 export { default as CoreDropzone } from "./Dropzone.svelte"
 export { default as CoreStepper } from "./Stepper.svelte"
+export { default as CoreRichTextField } from "./RichTextField.svelte"
diff --git a/packages/bbui/src/Form/RichTextField.svelte b/packages/bbui/src/Form/RichTextField.svelte
new file mode 100644
index 0000000000..10c9d96139
--- /dev/null
+++ b/packages/bbui/src/Form/RichTextField.svelte
@@ -0,0 +1,30 @@
+<script>
+  import Field from "./Field.svelte"
+  import RichTextField from "./Core/RichTextField.svelte"
+  import { createEventDispatcher } from "svelte"
+
+  export let value = null
+  export let label = null
+  export let labelPosition = "above"
+  export let placeholder = null
+  export let disabled = false
+  export let error = null
+  export let height = null
+
+  const dispatch = createEventDispatcher()
+  const onChange = e => {
+    value = e.detail
+    dispatch("change", e.detail)
+  }
+</script>
+
+<Field {label} {labelPosition} {error}>
+  <RichTextField
+    {error}
+    {disabled}
+    {value}
+    {placeholder}
+    {height}
+    on:change={onChange}
+  />
+</Field>
diff --git a/packages/bbui/src/Markdown/MarkdownEditor.svelte b/packages/bbui/src/Markdown/MarkdownEditor.svelte
new file mode 100644
index 0000000000..0b57a6e844
--- /dev/null
+++ b/packages/bbui/src/Markdown/MarkdownEditor.svelte
@@ -0,0 +1,38 @@
+<script>
+  import SpectrumMDE from "./SpectrumMDE.svelte"
+  import { createEventDispatcher, onMount } from "svelte"
+
+  export let value
+  export let height = "300px"
+  export let placeholder
+
+  const dispatch = createEventDispatcher()
+
+  let latestValue
+  let mde
+
+  $: checkValue(value)
+
+  const checkValue = val => {
+    if (mde && val !== latestValue) {
+      mde.value(val)
+    }
+  }
+
+  onMount(() => {
+    mde.codemirror.on("change", () => {
+      latestValue = mde.value()
+      dispatch("change", latestValue)
+    })
+  })
+</script>
+
+<SpectrumMDE
+  bind:mde
+  scroll={true}
+  {height}
+  easyMDEOptions={{
+    initialValue: value,
+    placeholder,
+  }}
+/>
diff --git a/packages/bbui/src/Markdown/MarkdownViewer.svelte b/packages/bbui/src/Markdown/MarkdownViewer.svelte
new file mode 100644
index 0000000000..89865346ee
--- /dev/null
+++ b/packages/bbui/src/Markdown/MarkdownViewer.svelte
@@ -0,0 +1,60 @@
+<script>
+  import SpectrumMDE from "./SpectrumMDE.svelte"
+  import { onMount } from "svelte"
+
+  export let value
+
+  let mde
+
+  // Keep the value up to date
+  $: mde && mde.value(value || "")
+
+  onMount(() => {
+    // Turn on preview mode
+    mde.togglePreview()
+  })
+</script>
+
+<div class="markdown-viewer">
+  <SpectrumMDE
+    bind:mde
+    scroll={false}
+    easyMDEOptions={{
+      initialValue: value,
+      toolbar: false,
+    }}
+  />
+</div>
+
+<style>
+  /* Remove padding, borders and background colors */
+  .markdown-viewer :global(.editor-preview) {
+    padding: 0;
+    border: none;
+    background: transparent;
+  }
+  .markdown-viewer :global(.CodeMirror) {
+    border: none;
+    background: transparent;
+    padding: 0;
+  }
+  .markdown-viewer :global(.EasyMDEContainer) {
+    background: transparent;
+  }
+  /* Hide the actual code editor */
+  .markdown-viewer :global(.CodeMirror-scroll) {
+    display: none;
+  }
+  /*Hide the scrollbar*/
+  .markdown-viewer :global(.CodeMirror-vscrollbar) {
+    display: none !important;
+  }
+  /*Position relatively so we only consume whatever space we need */
+  .markdown-viewer :global(.editor-preview-full) {
+    position: relative;
+  }
+  /* Remove margin on the final component to fully trim the preview */
+  .markdown-viewer :global(.editor-preview-full > :last-child) {
+    margin-bottom: 0;
+  }
+</style>
diff --git a/packages/bbui/src/Markdown/SpectrumMDE.svelte b/packages/bbui/src/Markdown/SpectrumMDE.svelte
new file mode 100644
index 0000000000..e7ca40e557
--- /dev/null
+++ b/packages/bbui/src/Markdown/SpectrumMDE.svelte
@@ -0,0 +1,94 @@
+<script>
+  import EasyMDE from "easymde"
+  import "easymde/dist/easymde.min.css"
+  import { onMount } from "svelte"
+
+  export let height = "300px"
+  export let scroll = false
+  export let easyMDEOptions = null
+  export let mde
+
+  let element
+
+  onMount(() => {
+    height = height || "300px"
+    mde = new EasyMDE({
+      element,
+      spellChecker: false,
+      status: false,
+      unorderedListStyle: "-",
+      maxHeight: scroll ? height : undefined,
+      minHeight: scroll ? undefined : height,
+      ...easyMDEOptions,
+    })
+
+    // Revert the editor when we unmount
+    return () => {
+      mde.toTextArea()
+    }
+  })
+</script>
+
+<textarea bind:this={element} />
+
+<style>
+  /* Toolbar container */
+  :global(.EasyMDEContainer .editor-toolbar) {
+    background: var(--background);
+    border-top: var(--border-light);
+    border-left: var(--border-light);
+    border-right: var(--border-light);
+  }
+  /* Main code mirror instance and default color */
+  :global(.EasyMDEContainer .CodeMirror) {
+    border: var(--border-light);
+    background: var(--background);
+    color: var(--ink);
+  }
+  /* Toolbar button active state */
+  :global(.EasyMDEContainer .editor-toolbar button.active) {
+    background: var(--spectrum-global-color-gray-200);
+    border-color: var(--spectrum-global-color-gray-400);
+  }
+  /* Toolbar button hover state */
+  :global(.EasyMDEContainer .editor-toolbar button:hover) {
+    background: var(--spectrum-global-color-gray-200);
+    border-color: var(--spectrum-global-color-gray-400);
+  }
+  /* Toolbar button color */
+  :global(.EasyMDEContainer .editor-toolbar button i) {
+    color: var(--spectrum-global-color-gray-800);
+  }
+  /* Separator between toolbar buttons*/
+  :global(.EasyMDEContainer .editor-toolbar i.separator) {
+    border-color: var(--spectrum-global-color-gray-300);
+  }
+  /* Cursor */
+  :global(.EasyMDEContainer .CodeMirror-cursor) {
+    border-color: var(--ink);
+  }
+  /* Text selections */
+  :global(.EasyMDEContainer .CodeMirror-selectedtext) {
+    background: var(--spectrum-global-color-gray-400);
+  }
+  /* Background of lines containing selected text */
+  :global(.EasyMDEContainer .CodeMirror-selected) {
+    background: var(--spectrum-global-color-gray-400) !important;
+  }
+  /* Color of text for images and links */
+  :global(.EasyMDEContainer .cm-s-easymde .cm-link) {
+    color: var(--spectrum-global-color-gray-600);
+  }
+  /* Color of URL for images and links */
+  :global(.EasyMDEContainer .cm-s-easymde .cm-url) {
+    color: var(--spectrum-global-color-gray-500);
+  }
+  /* Full preview window */
+  :global(.EasyMDEContainer .editor-preview) {
+    background: var(--background);
+  }
+  /* Side by side preview window */
+  :global(.EasyMDEContainer .editor-preview) {
+    border: var(--border-light);
+  }
+</style>
diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js
index 16f069f4e7..ea5486aadc 100644
--- a/packages/bbui/src/index.js
+++ b/packages/bbui/src/index.js
@@ -60,6 +60,9 @@ export { default as StatusLight } from "./StatusLight/StatusLight.svelte"
 export { default as ColorPicker } from "./ColorPicker/ColorPicker.svelte"
 export { default as InlineAlert } from "./InlineAlert/InlineAlert.svelte"
 export { default as Banner } from "./Banner/Banner.svelte"
+export { default as MarkdownEditor } from "./Markdown/MarkdownEditor.svelte"
+export { default as MarkdownViewer } from "./Markdown/MarkdownViewer.svelte"
+export { default as RichTextField } from "./Form/RichTextField.svelte"
 
 // Renderers
 export { default as BoldRenderer } from "./Table/BoldRenderer.svelte"
diff --git a/packages/bbui/yarn.lock b/packages/bbui/yarn.lock
index 42c88af5a4..1a4f5e4417 100644
--- a/packages/bbui/yarn.lock
+++ b/packages/bbui/yarn.lock
@@ -271,6 +271,13 @@
   resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.2.tgz#ea9062c3c98dfc6ba59e5df14a03025ad8969999"
   integrity sha512-vzS9KqYXot4J3AEER/u618MXWAS+IoMvYMNrOoscKiLLKYQWenaueakUWulFonToPd/9vIpqtdbwxznqrK5qDw==
 
+"@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/estree@*":
   version "0.0.47"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.47.tgz#d7a51db20f0650efec24cd04994f523d93172ed4"
@@ -281,6 +288,11 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
+"@types/marked@^4.0.1":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.2.tgz#cb2dbf10da2f41cf20bd91fb5f89b67540c282f7"
+  integrity sha512-auNrZ/c0w6wsM9DccwVxWHssrMDezHUAXNesdp2RQrCVCyrQbOiSq7yqdJKrUQQpw9VTm7CGYJH2A/YG7jjrjQ==
+
 "@types/node@*":
   version "14.14.41"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.41.tgz#d0b939d94c1d7bd53d04824af45f1139b8c45615"
@@ -303,6 +315,13 @@
   dependencies:
     "@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" "*"
+
 accepts@~1.3.7:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
@@ -525,6 +544,18 @@ coa@^2.0.2:
     chalk "^2.4.1"
     q "^1.1.2"
 
+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 sha1-HGYPkIlIPMtRE7m6nKGcP0mTNx4=
+  dependencies:
+    typo-js "*"
+
+codemirror@^5.63.1:
+  version "5.65.1"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.1.tgz#5988a812c974c467f964bcc1a00c944e373de502"
+  integrity sha512-s6aac+DD+4O2u1aBmdxhB7yz2XU7tG3snOyQ05Kxifahz7hoxnfxIRHxiCSEv3TUC38dIVH8G+lZH9UWSfGQxA==
+
 color-convert@^1.9.0, color-convert@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -861,6 +892,17 @@ dot-prop@^5.2.0:
   dependencies:
     is-obj "^2.0.0"
 
+easymde@^2.16.1:
+  version "2.16.1"
+  resolved "https://registry.yarnpkg.com/easymde/-/easymde-2.16.1.tgz#f4c2380312615cb33826f1a1fecfaa4022ff551a"
+  integrity sha512-FihYgjRsKfhGNk89SHSqxKLC4aJ1kfybPWW6iAmtb5GnXu+tnFPSzSaGBmk1RRlCuhFSjhF0SnIMGVPjEzkr6g==
+  dependencies:
+    "@types/codemirror" "^5.60.4"
+    "@types/marked" "^4.0.1"
+    codemirror "^5.63.1"
+    codemirror-spell-checker "1.1.2"
+    marked "^4.0.10"
+
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -1472,6 +1514,11 @@ magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.4"
 
+marked@^4.0.10:
+  version "4.0.12"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.12.tgz#2262a4e6fd1afd2f13557726238b69a48b982f7d"
+  integrity sha512-hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ==
+
 mdn-data@2.0.14:
   version "2.0.14"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
@@ -2490,6 +2537,11 @@ type-is@~1.6.17, type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
+typo-js@*:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.1.tgz#334a0d8c3f6c56f2f1e15fdf6c31677793cbbe9b"
+  integrity sha512-bTGLjbD3WqZDR3CgEFkyi9Q/SS2oM29ipXrWfDb4M74ea69QwKAECVceYpaBu0GfdnASMg9Qfl67ttB23nePHg==
+
 unbox-primitive@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"

From 66e104f02b09bbb00ea5382c665a52169be791f5 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 2 Feb 2022 15:18:46 +0000
Subject: [PATCH 02/31] Use new rich text field in build backend UI

---
 .../src/components/backend/DataTable/RowFieldControl.svelte   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
index 0d9ca3644b..a8fb05c2c5 100644
--- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
+++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
@@ -4,9 +4,9 @@
     Select,
     DatePicker,
     Toggle,
-    TextArea,
     Multiselect,
     Label,
+    RichTextField,
   } from "@budibase/bbui"
   import Dropzone from "components/common/Dropzone.svelte"
   import { capitalise } from "helpers"
@@ -43,7 +43,7 @@
 {:else if type === "link"}
   <LinkedRowSelector bind:linkedRows={value} schema={meta} />
 {:else if type === "longform"}
-  <TextArea {label} bind:value />
+  <RichTextField {label} height="200px" bind:value />
 {:else if type === "json"}
   <Label>{label}</Label>
   <Editor

From 0b7dbebe5cc403c64425d1b87b35447efce7f470 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 2 Feb 2022 21:22:49 +0000
Subject: [PATCH 03/31] Update markdown viewer and editor BBUI components

---
 .../bbui/src/Form/Core/RichTextField.svelte   |  3 +-
 packages/bbui/src/Form/RichTextField.svelte   |  2 ++
 .../bbui/src/Markdown/MarkdownEditor.svelte   | 29 +++++++++++++++----
 .../bbui/src/Markdown/MarkdownViewer.svelte   |  6 +++-
 packages/bbui/src/Markdown/SpectrumMDE.svelte | 28 +++++++++---------
 5 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/packages/bbui/src/Form/Core/RichTextField.svelte b/packages/bbui/src/Form/Core/RichTextField.svelte
index 33534485d2..7d2c87fde9 100644
--- a/packages/bbui/src/Form/Core/RichTextField.svelte
+++ b/packages/bbui/src/Form/Core/RichTextField.svelte
@@ -6,6 +6,7 @@
   export let disabled = false
   export let error = null
   export let height = null
+  export let id = null
 </script>
 
-<MarkdownEditor {value} {placeholder} {height} on:change />
+<MarkdownEditor {value} {placeholder} {height} {id} on:change />
diff --git a/packages/bbui/src/Form/RichTextField.svelte b/packages/bbui/src/Form/RichTextField.svelte
index 10c9d96139..8dfc70fa26 100644
--- a/packages/bbui/src/Form/RichTextField.svelte
+++ b/packages/bbui/src/Form/RichTextField.svelte
@@ -10,6 +10,7 @@
   export let disabled = false
   export let error = null
   export let height = null
+  export let id = null
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -25,6 +26,7 @@
     {value}
     {placeholder}
     {height}
+    {id}
     on:change={onChange}
   />
 </Field>
diff --git a/packages/bbui/src/Markdown/MarkdownEditor.svelte b/packages/bbui/src/Markdown/MarkdownEditor.svelte
index 0b57a6e844..0b5811db0d 100644
--- a/packages/bbui/src/Markdown/MarkdownEditor.svelte
+++ b/packages/bbui/src/Markdown/MarkdownEditor.svelte
@@ -2,15 +2,18 @@
   import SpectrumMDE from "./SpectrumMDE.svelte"
   import { createEventDispatcher, onMount } from "svelte"
 
-  export let value
+  export let value = null
   export let height = "300px"
-  export let placeholder
+  export let placeholder = null
+  export let id = null
 
   const dispatch = createEventDispatcher()
 
   let latestValue
   let mde
 
+  // Ensure the value is updated if the value prop changes outside the editor's
+  // control
   $: checkValue(value)
 
   const checkValue = val => {
@@ -19,11 +22,24 @@
     }
   }
 
+  const debounce = (fn, interval) => {
+    let timeout
+    return () => {
+      clearTimeout(timeout)
+      timeout = setTimeout(fn, interval)
+    }
+  }
+
+  const update = () => {
+    latestValue = mde.value()
+    dispatch("change", latestValue)
+  }
+
+  // Debounce the update function to avoid spamming it constantly
+  const debouncedUpdate = debounce(update, 250)
+
   onMount(() => {
-    mde.codemirror.on("change", () => {
-      latestValue = mde.value()
-      dispatch("change", latestValue)
-    })
+    mde.codemirror.on("change", debouncedUpdate)
   })
 </script>
 
@@ -31,6 +47,7 @@
   bind:mde
   scroll={true}
   {height}
+  {id}
   easyMDEOptions={{
     initialValue: value,
     placeholder,
diff --git a/packages/bbui/src/Markdown/MarkdownViewer.svelte b/packages/bbui/src/Markdown/MarkdownViewer.svelte
index 89865346ee..b601bbf027 100644
--- a/packages/bbui/src/Markdown/MarkdownViewer.svelte
+++ b/packages/bbui/src/Markdown/MarkdownViewer.svelte
@@ -3,6 +3,7 @@
   import { onMount } from "svelte"
 
   export let value
+  export let height
 
   let mde
 
@@ -15,7 +16,7 @@
   })
 </script>
 
-<div class="markdown-viewer">
+<div class="markdown-viewer" style="height:{height};">
   <SpectrumMDE
     bind:mde
     scroll={false}
@@ -27,6 +28,9 @@
 </div>
 
 <style>
+  .markdown-viewer {
+    overflow: auto;
+  }
   /* Remove padding, borders and background colors */
   .markdown-viewer :global(.editor-preview) {
     padding: 0;
diff --git a/packages/bbui/src/Markdown/SpectrumMDE.svelte b/packages/bbui/src/Markdown/SpectrumMDE.svelte
index e7ca40e557..2e80a7d198 100644
--- a/packages/bbui/src/Markdown/SpectrumMDE.svelte
+++ b/packages/bbui/src/Markdown/SpectrumMDE.svelte
@@ -4,9 +4,10 @@
   import { onMount } from "svelte"
 
   export let height = "300px"
-  export let scroll = false
+  export let scroll = true
   export let easyMDEOptions = null
-  export let mde
+  export let mde = null
+  export let id = null
 
   let element
 
@@ -19,6 +20,7 @@
       unorderedListStyle: "-",
       maxHeight: scroll ? height : undefined,
       minHeight: scroll ? undefined : height,
+      hideIcons: ["fullscreen", "side-by-side"],
       ...easyMDEOptions,
     })
 
@@ -29,21 +31,21 @@
   })
 </script>
 
-<textarea bind:this={element} />
+<textarea {id} bind:this={element} />
 
 <style>
   /* Toolbar container */
   :global(.EasyMDEContainer .editor-toolbar) {
-    background: var(--background);
-    border-top: var(--border-light);
-    border-left: var(--border-light);
-    border-right: var(--border-light);
+    background: var(--spectrum-global-color-gray-50);
+    border-top: 1px solid var(--spectrum-alias-border-color);
+    border-left: 1px solid var(--spectrum-alias-border-color);
+    border-right: 1px solid var(--spectrum-alias-border-color);
   }
   /* Main code mirror instance and default color */
   :global(.EasyMDEContainer .CodeMirror) {
-    border: var(--border-light);
-    background: var(--background);
-    color: var(--ink);
+    border: 1px solid var(--spectrum-alias-border-color);
+    background: var(--spectrum-global-color-gray-50);
+    color: var(--spectrum-alias-text-color);
   }
   /* Toolbar button active state */
   :global(.EasyMDEContainer .editor-toolbar button.active) {
@@ -65,7 +67,7 @@
   }
   /* Cursor */
   :global(.EasyMDEContainer .CodeMirror-cursor) {
-    border-color: var(--ink);
+    border-color: var(--spectrum-alias-text-color);
   }
   /* Text selections */
   :global(.EasyMDEContainer .CodeMirror-selectedtext) {
@@ -85,10 +87,10 @@
   }
   /* Full preview window */
   :global(.EasyMDEContainer .editor-preview) {
-    background: var(--background);
+    background: var(--spectrum-global-color-gray-50);
   }
   /* Side by side preview window */
   :global(.EasyMDEContainer .editor-preview) {
-    border: var(--border-light);
+    border: 1px solid var(--spectrum-alias-border-color);
   }
 </style>

From 815b6213cf8b970908a111fff97299ba55e21f61 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 2 Feb 2022 21:23:28 +0000
Subject: [PATCH 04/31] Update client app long form text component to be rich
 text and add new markdown viewer component

---
 packages/client/manifest.json                 | 14 +++++++-
 .../src/components/app/MarkdownViewer.svelte  | 19 ++++++++++
 .../components/app/forms/LongFormField.svelte | 35 +++++--------------
 packages/client/src/components/app/index.js   |  1 +
 4 files changed, 42 insertions(+), 27 deletions(-)
 create mode 100644 packages/client/src/components/app/MarkdownViewer.svelte

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 5cb93031bd..75366ee96a 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -2340,7 +2340,6 @@
     "icon": "TextParagraph",
     "styles": ["size"],
     "editable": true,
-    "illegalChildren": ["section"],
     "settings": [
       {
         "type": "field/longform",
@@ -3385,5 +3384,18 @@
         "key": "validation"
       }
     ]
+  },
+  "markdownviewer": {
+    "name": "Markdown Viewer",
+    "icon": "TaskList",
+    "styles": ["size"],
+    "editable": true,
+    "settings": [
+      {
+        "type": "text",
+        "label": "Value",
+        "key": "value"
+      }
+    ]
   }
 }
diff --git a/packages/client/src/components/app/MarkdownViewer.svelte b/packages/client/src/components/app/MarkdownViewer.svelte
new file mode 100644
index 0000000000..23866e20e9
--- /dev/null
+++ b/packages/client/src/components/app/MarkdownViewer.svelte
@@ -0,0 +1,19 @@
+<script>
+  import { MarkdownViewer } from "@budibase/bbui"
+  import { getContext } from "svelte"
+  import Placeholder from "./Placeholder.svelte"
+
+  export let value
+
+  const component = getContext("component")
+  const { builderStore, styleable } = getContext("sdk")
+  const height = $component.styles?.normal?.height
+</script>
+
+<div use:styleable={$component.styles}>
+  {#if value}
+    <MarkdownViewer {value} {height} />
+  {:else if $builderStore.inBuilder}
+    <Placeholder />
+  {/if}
+</div>
diff --git a/packages/client/src/components/app/forms/LongFormField.svelte b/packages/client/src/components/app/forms/LongFormField.svelte
index a58e1fe76c..78f0d7c805 100644
--- a/packages/client/src/components/app/forms/LongFormField.svelte
+++ b/packages/client/src/components/app/forms/LongFormField.svelte
@@ -1,7 +1,6 @@
 <script>
-  import { CoreTextArea } from "@budibase/bbui"
+  import { CoreRichTextField } from "@budibase/bbui"
   import Field from "./Field.svelte"
-  import { getContext } from "svelte"
 
   export let field
   export let label
@@ -12,9 +11,6 @@
 
   let fieldState
   let fieldApi
-
-  const component = getContext("component")
-  $: height = $component.styles?.normal?.height || "124px"
 </script>
 
 <Field
@@ -28,26 +24,13 @@
   bind:fieldApi
 >
   {#if fieldState}
-    <div style="--height: {height};">
-      <CoreTextArea
-        value={fieldState.value}
-        on:change={e => fieldApi.setValue(e.detail)}
-        disabled={fieldState.disabled}
-        error={fieldState.error}
-        id={fieldState.fieldId}
-        {placeholder}
-      />
-    </div>
+    <CoreRichTextField
+      value={fieldState.value}
+      on:change={e => fieldApi.setValue(e.detail)}
+      disabled={fieldState.disabled}
+      error={fieldState.error}
+      id={fieldState.fieldId}
+      {placeholder}
+    />
   {/if}
 </Field>
-
-<style>
-  :global(.spectrum-Form-itemField .spectrum-Textfield--multiline) {
-    min-height: calc(var(--height) - 24px);
-  }
-  :global(.spectrum-Form--labelsAbove
-      .spectrum-Form-itemField
-      .spectrum-Textfield--multiline) {
-    min-height: calc(var(--height) - 24px);
-  }
-</style>
diff --git a/packages/client/src/components/app/index.js b/packages/client/src/components/app/index.js
index ef0f96ce59..5af62201e5 100644
--- a/packages/client/src/components/app/index.js
+++ b/packages/client/src/components/app/index.js
@@ -30,6 +30,7 @@ export { default as daterangepicker } from "./DateRangePicker.svelte"
 export { default as cardstat } from "./CardStat.svelte"
 export { default as spectrumcard } from "./SpectrumCard.svelte"
 export { default as tag } from "./Tag.svelte"
+export { default as markdownviewer } from "./MarkdownViewer.svelte"
 export * from "./charts"
 export * from "./forms"
 export * from "./table"

From 9310ef08f51556df0f178de3c056f3a6fd553d06 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 2 Feb 2022 21:23:39 +0000
Subject: [PATCH 05/31] Add markdown viewer component to builder

---
 .../src/components/design/AppPreview/componentStructure.json   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/design/AppPreview/componentStructure.json b/packages/builder/src/components/design/AppPreview/componentStructure.json
index 0b888ba10b..cacd70a89b 100644
--- a/packages/builder/src/components/design/AppPreview/componentStructure.json
+++ b/packages/builder/src/components/design/AppPreview/componentStructure.json
@@ -81,7 +81,8 @@
       "backgroundimage",
       "link",
       "icon",
-      "embed"
+      "embed",
+      "markdownviewer"
     ]
   }
 ]

From e8f8d6ead9fdf2eb1be079f68b420134434a4787 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 3 Feb 2022 09:06:52 +0000
Subject: [PATCH 06/31] Properly trim markdown viewer component

---
 packages/bbui/src/Markdown/MarkdownViewer.svelte | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/bbui/src/Markdown/MarkdownViewer.svelte b/packages/bbui/src/Markdown/MarkdownViewer.svelte
index b601bbf027..26a716690c 100644
--- a/packages/bbui/src/Markdown/MarkdownViewer.svelte
+++ b/packages/bbui/src/Markdown/MarkdownViewer.svelte
@@ -57,7 +57,10 @@
   .markdown-viewer :global(.editor-preview-full) {
     position: relative;
   }
-  /* Remove margin on the final component to fully trim the preview */
+  /* Remove margin on the first and last components to fully trim the preview */
+  .markdown-viewer :global(.editor-preview-full > :first-child) {
+    margin-top: 0;
+  }
   .markdown-viewer :global(.editor-preview-full > :last-child) {
     margin-bottom: 0;
   }

From f347bafe623581ffeae23baf5713caa4c457ca9f Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 3 Feb 2022 09:32:01 +0000
Subject: [PATCH 07/31] Add custom styles for code blocks and block quotes in
 rich text editor and preview

---
 .../bbui/src/Markdown/MarkdownViewer.svelte   |  4 +++
 packages/bbui/src/Markdown/SpectrumMDE.svelte | 25 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/packages/bbui/src/Markdown/MarkdownViewer.svelte b/packages/bbui/src/Markdown/MarkdownViewer.svelte
index 26a716690c..ae9213cca7 100644
--- a/packages/bbui/src/Markdown/MarkdownViewer.svelte
+++ b/packages/bbui/src/Markdown/MarkdownViewer.svelte
@@ -64,4 +64,8 @@
   .markdown-viewer :global(.editor-preview-full > :last-child) {
     margin-bottom: 0;
   }
+  /* Code blocks in preview */
+  .markdown-viewer :global(.editor-preview-full pre) {
+    background: var(--spectrum-global-color-gray-200);
+  }
 </style>
diff --git a/packages/bbui/src/Markdown/SpectrumMDE.svelte b/packages/bbui/src/Markdown/SpectrumMDE.svelte
index 2e80a7d198..1331210341 100644
--- a/packages/bbui/src/Markdown/SpectrumMDE.svelte
+++ b/packages/bbui/src/Markdown/SpectrumMDE.svelte
@@ -71,7 +71,7 @@
   }
   /* Text selections */
   :global(.EasyMDEContainer .CodeMirror-selectedtext) {
-    background: var(--spectrum-global-color-gray-400);
+    background: var(--spectrum-global-color-gray-400) !important;
   }
   /* Background of lines containing selected text */
   :global(.EasyMDEContainer .CodeMirror-selected) {
@@ -93,4 +93,27 @@
   :global(.EasyMDEContainer .editor-preview) {
     border: 1px solid var(--spectrum-alias-border-color);
   }
+  /* Code blocks in editor */
+  :global(.EasyMDEContainer .cm-s-easymde .cm-comment) {
+    background: var(--spectrum-global-color-gray-100);
+  }
+  /* Code blocks in preview */
+  :global(.EasyMDEContainer .editor-preview pre) {
+    background: var(--spectrum-global-color-gray-100);
+    padding: 4px;
+    border-radius: 4px;
+  }
+  :global(.EasyMDEContainer .editor-preview code) {
+    color: #e83e8c;
+  }
+  :global(.EasyMDEContainer .editor-preview pre code) {
+    color: var(--spectrum-alias-text-color);
+  }
+  /* Block quotes */
+  :global(.EasyMDEContainer .editor-preview blockquote) {
+    border-left: 4px solid var(--spectrum-global-color-gray-400);
+    color: var(--spectrum-global-color-gray-700);
+    margin-left: 0;
+    padding-left: 20px;
+  }
 </style>

From 392aaa30d0a4f6e3f864e664a5f2e95f07211626 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 3 Feb 2022 09:46:30 +0000
Subject: [PATCH 08/31] Add custom styles for HRs, tables and link colors in
 rich text editor and preview

---
 packages/bbui/src/Markdown/SpectrumMDE.svelte | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/packages/bbui/src/Markdown/SpectrumMDE.svelte b/packages/bbui/src/Markdown/SpectrumMDE.svelte
index 1331210341..3dc8c9e28a 100644
--- a/packages/bbui/src/Markdown/SpectrumMDE.svelte
+++ b/packages/bbui/src/Markdown/SpectrumMDE.svelte
@@ -98,22 +98,39 @@
     background: var(--spectrum-global-color-gray-100);
   }
   /* Code blocks in preview */
-  :global(.EasyMDEContainer .editor-preview pre) {
+  :global(.EasyMDEContainer pre) {
     background: var(--spectrum-global-color-gray-100);
     padding: 4px;
     border-radius: 4px;
   }
-  :global(.EasyMDEContainer .editor-preview code) {
+  :global(.EasyMDEContainer code) {
     color: #e83e8c;
   }
-  :global(.EasyMDEContainer .editor-preview pre code) {
+  :global(.EasyMDEContainer pre code) {
     color: var(--spectrum-alias-text-color);
   }
   /* Block quotes */
-  :global(.EasyMDEContainer .editor-preview blockquote) {
+  :global(.EasyMDEContainer blockquote) {
     border-left: 4px solid var(--spectrum-global-color-gray-400);
     color: var(--spectrum-global-color-gray-700);
     margin-left: 0;
     padding-left: 20px;
   }
+  /* HR's */
+  :global(.EasyMDEContainer hr) {
+    background-color: var(--spectrum-global-color-gray-300);
+    border: none;
+    height: 2px;
+  }
+  /*  Tables */
+  :global(.EasyMDEContainer td, .EasyMDEContainer th) {
+    border-color: var(--spectrum-alias-border-color) !important;
+  }
+  /*  Links */
+  :global(.EasyMDEContainer a) {
+    color: var(--primaryColor);
+  }
+  :global(.EasyMDEContainer a:hover) {
+    color: var(--primaryColorHover);
+  }
 </style>

From aacd8b01c678ffefc437b4e61b3d1936291f76ee Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 3 Feb 2022 10:46:41 +0000
Subject: [PATCH 09/31] Update rich text field height to be set dynamically

---
 .../bbui/src/Markdown/MarkdownEditor.svelte   | 29 +++++++++----------
 .../bbui/src/Markdown/MarkdownViewer.svelte   | 11 ++++---
 .../components/app/forms/LongFormField.svelte | 25 ++++++++++++++++
 3 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/packages/bbui/src/Markdown/MarkdownEditor.svelte b/packages/bbui/src/Markdown/MarkdownEditor.svelte
index 0b5811db0d..498fce614e 100644
--- a/packages/bbui/src/Markdown/MarkdownEditor.svelte
+++ b/packages/bbui/src/Markdown/MarkdownEditor.svelte
@@ -1,6 +1,6 @@
 <script>
   import SpectrumMDE from "./SpectrumMDE.svelte"
-  import { createEventDispatcher, onMount } from "svelte"
+  import { createEventDispatcher } from "svelte"
 
   export let value = null
   export let height = "300px"
@@ -15,6 +15,7 @@
   // Ensure the value is updated if the value prop changes outside the editor's
   // control
   $: checkValue(value)
+  $: mde?.codemirror.on("change", debouncedUpdate)
 
   const checkValue = val => {
     if (mde && val !== latestValue) {
@@ -37,19 +38,17 @@
 
   // Debounce the update function to avoid spamming it constantly
   const debouncedUpdate = debounce(update, 250)
-
-  onMount(() => {
-    mde.codemirror.on("change", debouncedUpdate)
-  })
 </script>
 
-<SpectrumMDE
-  bind:mde
-  scroll={true}
-  {height}
-  {id}
-  easyMDEOptions={{
-    initialValue: value,
-    placeholder,
-  }}
-/>
+{#key height}
+  <SpectrumMDE
+    bind:mde
+    scroll={true}
+    {height}
+    {id}
+    easyMDEOptions={{
+      initialValue: value,
+      placeholder,
+    }}
+  />
+{/key}
diff --git a/packages/bbui/src/Markdown/MarkdownViewer.svelte b/packages/bbui/src/Markdown/MarkdownViewer.svelte
index ae9213cca7..5705020f45 100644
--- a/packages/bbui/src/Markdown/MarkdownViewer.svelte
+++ b/packages/bbui/src/Markdown/MarkdownViewer.svelte
@@ -1,6 +1,5 @@
 <script>
   import SpectrumMDE from "./SpectrumMDE.svelte"
-  import { onMount } from "svelte"
 
   export let value
   export let height
@@ -9,11 +8,11 @@
 
   // Keep the value up to date
   $: mde && mde.value(value || "")
-
-  onMount(() => {
-    // Turn on preview mode
-    mde.togglePreview()
-  })
+  $: {
+    if (mde && !mde.isPreviewActive()) {
+      mde.togglePreview()
+    }
+  }
 </script>
 
 <div class="markdown-viewer" style="height:{height};">
diff --git a/packages/client/src/components/app/forms/LongFormField.svelte b/packages/client/src/components/app/forms/LongFormField.svelte
index 78f0d7c805..645ec0a581 100644
--- a/packages/client/src/components/app/forms/LongFormField.svelte
+++ b/packages/client/src/components/app/forms/LongFormField.svelte
@@ -1,4 +1,6 @@
 <script>
+  import { getContext, setContext } from "svelte"
+  import { writable } from "svelte/store"
   import { CoreRichTextField } from "@budibase/bbui"
   import Field from "./Field.svelte"
 
@@ -11,6 +13,28 @@
 
   let fieldState
   let fieldApi
+
+  const component = getContext("component")
+  const newContext = writable($component)
+  setContext("component", newContext)
+
+  // Extract the settings height so we can pass it on to the rich text field.
+  // We then wipe the height style so that the field will automatically size
+  // itself based on the height of the rich text field.
+  let height
+  $: {
+    height = $component.styles?.normal?.height
+    newContext.set({
+      ...$component,
+      styles: {
+        ...$component.styles,
+        normal: {
+          ...$component.styles.normal,
+          height: undefined,
+        },
+      },
+    })
+  }
 </script>
 
 <Field
@@ -31,6 +55,7 @@
       error={fieldState.error}
       id={fieldState.fieldId}
       {placeholder}
+      {height}
     />
   {/if}
 </Field>

From 160849d0f513632e4e95343917b3e6e81df3b88d Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 3 Feb 2022 11:53:51 +0000
Subject: [PATCH 10/31] Support a customisable offset for fullscreen mode for
 rich text editors

---
 .../bbui/src/Form/Core/RichTextField.svelte     | 10 +++++++++-
 packages/bbui/src/Form/RichTextField.svelte     |  2 ++
 .../bbui/src/Markdown/MarkdownEditor.svelte     |  2 ++
 packages/bbui/src/Markdown/SpectrumMDE.svelte   | 17 +++++++++++++++--
 .../components/app/forms/LongFormField.svelte   |  5 +++++
 5 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/packages/bbui/src/Form/Core/RichTextField.svelte b/packages/bbui/src/Form/Core/RichTextField.svelte
index 7d2c87fde9..3f7ab60014 100644
--- a/packages/bbui/src/Form/Core/RichTextField.svelte
+++ b/packages/bbui/src/Form/Core/RichTextField.svelte
@@ -7,6 +7,14 @@
   export let error = null
   export let height = null
   export let id = null
+  export let fullScreenOffset = 0
 </script>
 
-<MarkdownEditor {value} {placeholder} {height} {id} on:change />
+<MarkdownEditor
+  {value}
+  {placeholder}
+  {height}
+  {id}
+  {fullScreenOffset}
+  on:change
+/>
diff --git a/packages/bbui/src/Form/RichTextField.svelte b/packages/bbui/src/Form/RichTextField.svelte
index 8dfc70fa26..91c130bf74 100644
--- a/packages/bbui/src/Form/RichTextField.svelte
+++ b/packages/bbui/src/Form/RichTextField.svelte
@@ -11,6 +11,7 @@
   export let error = null
   export let height = null
   export let id = null
+  export let fullScreenOffset = 0
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -27,6 +28,7 @@
     {placeholder}
     {height}
     {id}
+    {fullScreenOffset}
     on:change={onChange}
   />
 </Field>
diff --git a/packages/bbui/src/Markdown/MarkdownEditor.svelte b/packages/bbui/src/Markdown/MarkdownEditor.svelte
index 498fce614e..370436f578 100644
--- a/packages/bbui/src/Markdown/MarkdownEditor.svelte
+++ b/packages/bbui/src/Markdown/MarkdownEditor.svelte
@@ -6,6 +6,7 @@
   export let height = "300px"
   export let placeholder = null
   export let id = null
+  export let fullScreenOffset = 0
 
   const dispatch = createEventDispatcher()
 
@@ -46,6 +47,7 @@
     scroll={true}
     {height}
     {id}
+    {fullScreenOffset}
     easyMDEOptions={{
       initialValue: value,
       placeholder,
diff --git a/packages/bbui/src/Markdown/SpectrumMDE.svelte b/packages/bbui/src/Markdown/SpectrumMDE.svelte
index 3dc8c9e28a..3048697c15 100644
--- a/packages/bbui/src/Markdown/SpectrumMDE.svelte
+++ b/packages/bbui/src/Markdown/SpectrumMDE.svelte
@@ -8,6 +8,7 @@
   export let easyMDEOptions = null
   export let mde = null
   export let id = null
+  export let fullScreenOffset = 0
 
   let element
 
@@ -20,7 +21,7 @@
       unorderedListStyle: "-",
       maxHeight: scroll ? height : undefined,
       minHeight: scroll ? undefined : height,
-      hideIcons: ["fullscreen", "side-by-side"],
+      // hideIcons: ["fullscreen", "side-by-side"],
       ...easyMDEOptions,
     })
 
@@ -31,7 +32,9 @@
   })
 </script>
 
-<textarea {id} bind:this={element} />
+<div style={`--fullscreen-offset:${fullScreenOffset || "0px"}`}>
+  <textarea {id} bind:this={element} />
+</div>
 
 <style>
   /* Toolbar container */
@@ -133,4 +136,14 @@
   :global(.EasyMDEContainer a:hover) {
     color: var(--primaryColorHover);
   }
+  /* Allow full screen offset */
+  :global(.EasyMDEContainer .editor-toolbar.fullscreen) {
+    top: var(--fullscreen-offset);
+  }
+  :global(.EasyMDEContainer .CodeMirror-fullscreen) {
+    top: calc(50px + var(--fullscreen-offset));
+  }
+  :global(.EasyMDEContainer .editor-preview-side) {
+    top: calc(50px + var(--fullscreen-offset));
+  }
 </style>
diff --git a/packages/client/src/components/app/forms/LongFormField.svelte b/packages/client/src/components/app/forms/LongFormField.svelte
index 645ec0a581..443469566f 100644
--- a/packages/client/src/components/app/forms/LongFormField.svelte
+++ b/packages/client/src/components/app/forms/LongFormField.svelte
@@ -14,10 +14,14 @@
   let fieldState
   let fieldApi
 
+  const context = getContext("context")
   const component = getContext("component")
   const newContext = writable($component)
   setContext("component", newContext)
 
+  // Determine the offset needed for full screen mode
+  $: offset = $context.device.mobile ? "61px" : "137px"
+
   // Extract the settings height so we can pass it on to the rich text field.
   // We then wipe the height style so that the field will automatically size
   // itself based on the height of the rich text field.
@@ -56,6 +60,7 @@
       id={fieldState.fieldId}
       {placeholder}
       {height}
+      fullScreenOffset={offset}
     />
   {/if}
 </Field>

From b84ec36271ae03b2b426f97ceecbcf63537a61c7 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 3 Feb 2022 11:54:07 +0000
Subject: [PATCH 11/31] Update setting label of markdown viewer component

---
 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 75366ee96a..6396deed4c 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -3393,7 +3393,7 @@
     "settings": [
       {
         "type": "text",
-        "label": "Value",
+        "label": "Markdown",
         "key": "value"
       }
     ]

From 0005b058290e6fb42701f6930a510b19ccebeb8e Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 3 Feb 2022 14:08:30 +0000
Subject: [PATCH 12/31] Add error border when rich text field fails validation

---
 .../bbui/src/Form/Core/RichTextField.svelte   | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/packages/bbui/src/Form/Core/RichTextField.svelte b/packages/bbui/src/Form/Core/RichTextField.svelte
index 3f7ab60014..f14c778471 100644
--- a/packages/bbui/src/Form/Core/RichTextField.svelte
+++ b/packages/bbui/src/Form/Core/RichTextField.svelte
@@ -10,11 +10,30 @@
   export let fullScreenOffset = 0
 </script>
 
-<MarkdownEditor
-  {value}
-  {placeholder}
-  {height}
-  {id}
-  {fullScreenOffset}
-  on:change
-/>
+<div class:error>
+  <MarkdownEditor
+    {value}
+    {placeholder}
+    {height}
+    {id}
+    {fullScreenOffset}
+    on:change
+  />
+</div>
+
+<style>
+  .error :global(.EasyMDEContainer .editor-toolbar) {
+    border-top-color: var(--spectrum-semantic-negative-color-default);
+    border-left-color: var(--spectrum-semantic-negative-color-default);
+    border-right-color: var(--spectrum-semantic-negative-color-default);
+  }
+  .error :global(.EasyMDEContainer .CodeMirror) {
+    border-bottom-color: var(--spectrum-semantic-negative-color-default);
+    border-left-color: var(--spectrum-semantic-negative-color-default);
+    border-right-color: var(--spectrum-semantic-negative-color-default);
+  }
+  .error :global(.EasyMDEContainer .editor-preview-side) {
+    border-bottom-color: var(--spectrum-semantic-negative-color-default);
+    border-right-color: var(--spectrum-semantic-negative-color-default);
+  }
+</style>

From a0c3ee1c8b576192fb2f7e4da24d243c5c04d73c Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 3 Feb 2022 14:28:15 +0000
Subject: [PATCH 13/31] Add support for disabling rich text fields

---
 .../bbui/src/Form/Core/RichTextField.svelte   |  1 +
 .../bbui/src/Markdown/MarkdownEditor.svelte   |  2 ++
 packages/bbui/src/Markdown/SpectrumMDE.svelte | 22 +++++++++++++++++--
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/packages/bbui/src/Form/Core/RichTextField.svelte b/packages/bbui/src/Form/Core/RichTextField.svelte
index f14c778471..4520f1bf28 100644
--- a/packages/bbui/src/Form/Core/RichTextField.svelte
+++ b/packages/bbui/src/Form/Core/RichTextField.svelte
@@ -17,6 +17,7 @@
     {height}
     {id}
     {fullScreenOffset}
+    {disabled}
     on:change
   />
 </div>
diff --git a/packages/bbui/src/Markdown/MarkdownEditor.svelte b/packages/bbui/src/Markdown/MarkdownEditor.svelte
index 370436f578..4ab961d646 100644
--- a/packages/bbui/src/Markdown/MarkdownEditor.svelte
+++ b/packages/bbui/src/Markdown/MarkdownEditor.svelte
@@ -7,6 +7,7 @@
   export let placeholder = null
   export let id = null
   export let fullScreenOffset = 0
+  export let disabled = false
 
   const dispatch = createEventDispatcher()
 
@@ -48,6 +49,7 @@
     {height}
     {id}
     {fullScreenOffset}
+    {disabled}
     easyMDEOptions={{
       initialValue: value,
       placeholder,
diff --git a/packages/bbui/src/Markdown/SpectrumMDE.svelte b/packages/bbui/src/Markdown/SpectrumMDE.svelte
index 3048697c15..0e3a7c75cc 100644
--- a/packages/bbui/src/Markdown/SpectrumMDE.svelte
+++ b/packages/bbui/src/Markdown/SpectrumMDE.svelte
@@ -9,6 +9,7 @@
   export let mde = null
   export let id = null
   export let fullScreenOffset = 0
+  export let disabled = false
 
   let element
 
@@ -32,11 +33,28 @@
   })
 </script>
 
-<div style={`--fullscreen-offset:${fullScreenOffset || "0px"}`}>
-  <textarea {id} bind:this={element} />
+<div class:disabled style={`--fullscreen-offset:${fullScreenOffset || "0px"}`}>
+  <textarea disabled {id} bind:this={element} />
 </div>
 
 <style>
+  /* Disabled styles */
+  .disabled :global(textarea) {
+    display: none;
+  }
+  .disabled :global(.CodeMirror-cursor) {
+    display: none;
+  }
+  .disabled :global(.EasyMDEContainer) {
+    pointer-events: none;
+  }
+  .disabled :global(.editor-toolbar button i) {
+    color: var(--spectrum-global-color-gray-400);
+  }
+  .disabled :global(.CodeMirror) {
+    color: var(--spectrum-global-color-gray-600);
+  }
+
   /* Toolbar container */
   :global(.EasyMDEContainer .editor-toolbar) {
     background: var(--spectrum-global-color-gray-50);

From f946f2f68d54e370013e28efa4cb6517067e5b18 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 3 Feb 2022 18:26:26 +0000
Subject: [PATCH 14/31] Fix for #4308 - triple brace conversion was not working
 correctly, wrote this into the string templates instead - also fixing an
 issue with the RBAC for Rest.

---
 .../integration/AccessLevelSelect.svelte      |  1 +
 packages/server/src/threads/query.js          | 11 ++-----
 packages/string-templates/src/index.cjs       |  1 +
 packages/string-templates/src/index.js        | 31 ++++++++++++++++---
 packages/string-templates/src/index.mjs       |  1 +
 packages/string-templates/src/utilities.js    |  1 +
 packages/string-templates/test/basic.spec.js  | 20 ++++++++++++
 7 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/packages/builder/src/components/integration/AccessLevelSelect.svelte b/packages/builder/src/components/integration/AccessLevelSelect.svelte
index 97587c287a..86065893d4 100644
--- a/packages/builder/src/components/integration/AccessLevelSelect.svelte
+++ b/packages/builder/src/components/integration/AccessLevelSelect.svelte
@@ -26,6 +26,7 @@
 
   async function getPermissions(queryToFetch) {
     if (fetched?._id === queryToFetch?._id) {
+      loaded = true
       return
     }
     fetched = queryToFetch
diff --git a/packages/server/src/threads/query.js b/packages/server/src/threads/query.js
index 35164ac642..7498ff4fb0 100644
--- a/packages/server/src/threads/query.js
+++ b/packages/server/src/threads/query.js
@@ -5,9 +5,6 @@ const { integrations } = require("../integrations")
 const { processStringSync } = require("@budibase/string-templates")
 const CouchDB = require("../db")
 
-const IS_TRIPLE_BRACE = new RegExp(/^{{3}.*}{3}$/)
-const IS_HANDLEBARS = new RegExp(/^{{2}.*}{2}$/)
-
 class QueryRunner {
   constructor(input, flags = { noRecursiveQuery: false }) {
     this.appId = input.appId
@@ -185,12 +182,8 @@ class QueryRunner {
         enrichedQuery[key] = this.enrichQueryFields(fields[key], parameters)
       } else if (typeof fields[key] === "string") {
         // enrich string value as normal
-        let value = fields[key]
-        // add triple brace to avoid escaping e.g. '=' in cookie header
-        if (IS_HANDLEBARS.test(value) && !IS_TRIPLE_BRACE.test(value)) {
-          value = `{${value}}`
-        }
-        enrichedQuery[key] = processStringSync(value, parameters, {
+        enrichedQuery[key] = processStringSync(fields[key], parameters, {
+          noEscaping: true,
           noHelpers: true,
         })
       } else {
diff --git a/packages/string-templates/src/index.cjs b/packages/string-templates/src/index.cjs
index 5d05f0f57f..dadaea4bba 100644
--- a/packages/string-templates/src/index.cjs
+++ b/packages/string-templates/src/index.cjs
@@ -15,6 +15,7 @@ module.exports.processStringSync = templates.processStringSync
 module.exports.processObjectSync = templates.processObjectSync
 module.exports.processString = templates.processString
 module.exports.processObject = templates.processObject
+module.exports.disableEscaping = templates.disableEscaping
 
 /**
  * Use vm2 to run JS scripts in a node env
diff --git a/packages/string-templates/src/index.js b/packages/string-templates/src/index.js
index d824d5f1db..404161c4eb 100644
--- a/packages/string-templates/src/index.js
+++ b/packages/string-templates/src/index.js
@@ -3,11 +3,12 @@ const { registerAll } = require("./helpers/index")
 const processors = require("./processors")
 const { atob, btoa } = require("./utilities")
 const manifest = require("../manifest.json")
+const { FIND_DOUBLE_HBS_REGEX } = require("./utilities")
 
 const hbsInstance = handlebars.create()
 registerAll(hbsInstance)
 const hbsInstanceNoHelpers = handlebars.create()
-const defaultOpts = { noHelpers: false }
+const defaultOpts = { noHelpers: false, noEscaping: false }
 
 /**
  * utility function to check if the object is valid
@@ -57,7 +58,7 @@ module.exports.processObject = async (object, context, opts) => {
  * then nothing will occur.
  * @param {string} string The template string which is the filled from the context object.
  * @param {object} context An object of information which will be used to enrich the string.
- * @param {object} opts optional - specify some options for processing.
+ * @param {object|undefined} opts optional - specify some options for processing.
  * @returns {Promise<string>} The enriched string, all templates should have been replaced if they can be.
  */
 module.exports.processString = async (string, context, opts) => {
@@ -71,7 +72,7 @@ module.exports.processString = async (string, context, opts) => {
  * @param {object|array} object The input structure which is to be recursed, it is important to note that
  * if the structure contains any cycles then this will fail.
  * @param {object} context The context that handlebars should fill data from.
- * @param {object} opts optional - specify some options for processing.
+ * @param {object|undefined} opts optional - specify some options for processing.
  * @returns {object|array} The structure input, as fully updated as possible.
  */
 module.exports.processObjectSync = (object, context, opts) => {
@@ -92,7 +93,7 @@ module.exports.processObjectSync = (object, context, opts) => {
  * then nothing will occur. This is a pure sync call and therefore does not have the full functionality of the async call.
  * @param {string} string The template string which is the filled from the context object.
  * @param {object} context An object of information which will be used to enrich the string.
- * @param {object} opts optional - specify some options for processing.
+ * @param {object|undefined} opts optional - specify some options for processing.
  * @returns {string} The enriched string, all templates should have been replaced if they can be.
  */
 module.exports.processStringSync = (string, context, opts) => {
@@ -109,7 +110,9 @@ module.exports.processStringSync = (string, context, opts) => {
     string = processors.preprocess(string, shouldFinalise)
     // this does not throw an error when template can't be fulfilled, have to try correct beforehand
     const instance = opts.noHelpers ? hbsInstanceNoHelpers : hbsInstance
-    const template = instance.compile(string, {
+    const templateString =
+      opts && opts.noEscaping ? exports.disableEscaping(string) : string
+    const template = instance.compile(templateString, {
       strict: false,
     })
     const now = Math.floor(Date.now() / 1000) * 1000
@@ -124,6 +127,24 @@ module.exports.processStringSync = (string, context, opts) => {
   }
 }
 
+/**
+ * By default with expressions like {{ name }} handlebars will escape various
+ * characters, which can be problematic. To fix this we use the syntax {{{ name }}},
+ * this function will find any double braces and switch to triple.
+ * @param string the string to have double HBS statements converted to triple.
+ */
+module.exports.disableEscaping = string => {
+  let regexp = new RegExp(FIND_DOUBLE_HBS_REGEX)
+  const matches = string.match(regexp)
+  if (matches == null) {
+    return string
+  }
+  for (let match of matches) {
+    string = string.replace(match, `{${match}}`)
+  }
+  return string
+}
+
 /**
  * Simple utility function which makes sure that a templating property has been wrapped in literal specifiers correctly.
  * @param {string} property The property which is to be wrapped.
diff --git a/packages/string-templates/src/index.mjs b/packages/string-templates/src/index.mjs
index 446e71ef88..395a0f497c 100644
--- a/packages/string-templates/src/index.mjs
+++ b/packages/string-templates/src/index.mjs
@@ -15,6 +15,7 @@ export const processStringSync = templates.processStringSync
 export const processObjectSync = templates.processObjectSync
 export const processString = templates.processString
 export const processObject = templates.processObject
+export const disableEscaping = templates.disableEscaping
 
 /**
  * Use polyfilled vm to run JS scripts in a browser Env
diff --git a/packages/string-templates/src/utilities.js b/packages/string-templates/src/utilities.js
index 645aca78ba..9704f84ecc 100644
--- a/packages/string-templates/src/utilities.js
+++ b/packages/string-templates/src/utilities.js
@@ -1,6 +1,7 @@
 const ALPHA_NUMERIC_REGEX = /^[A-Za-z0-9]+$/g
 
 module.exports.FIND_HBS_REGEX = /{{([^{].*?)}}/g
+module.exports.FIND_DOUBLE_HBS_REGEX = /(?<!{){{[^{}]+}}(?!})/g
 
 module.exports.isAlphaNumeric = char => {
   return char.match(ALPHA_NUMERIC_REGEX)
diff --git a/packages/string-templates/test/basic.spec.js b/packages/string-templates/test/basic.spec.js
index b437e386fc..89a749832a 100644
--- a/packages/string-templates/test/basic.spec.js
+++ b/packages/string-templates/test/basic.spec.js
@@ -4,6 +4,7 @@ const {
   isValid,
   makePropSafe,
   getManifest,
+  disableEscaping,
 } = require("../src/index.cjs")
 
 describe("Test that the string processing works correctly", () => {
@@ -146,3 +147,22 @@ describe("check manifest", () => {
     )
   })
 })
+
+describe("check that disabling escaping function works", () => {
+  it("should work for a single statement", () => {
+    expect(disableEscaping("{{ name }}")).toEqual("{{{ name }}}")
+  })
+
+  it("should work for two statements", () => {
+    expect(disableEscaping("{{ name }} welcome to {{ platform }}")).toEqual("{{{ name }}} welcome to {{{ platform }}}")
+  })
+
+  it("shouldn't convert triple braces", () => {
+    expect(disableEscaping("{{{ name }}}")).toEqual("{{{ name }}}")
+  })
+
+  it("should work with a combination", () => {
+    expect(disableEscaping("{{ name }} welcome to {{{ platform }}}")).toEqual("{{{ name }}} welcome to {{{ platform }}}")
+  })
+})
+

From 2dea8789e8e2f284c630ce7eb4b074c461fcc14a Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 4 Feb 2022 12:19:39 +0000
Subject: [PATCH 15/31] v1.0.49

---
 lerna.json                             | 2 +-
 packages/backend-core/package.json     | 2 +-
 packages/bbui/package.json             | 2 +-
 packages/builder/package.json          | 8 ++++----
 packages/cli/package.json              | 2 +-
 packages/client/package.json           | 6 +++---
 packages/server/package.json           | 8 ++++----
 packages/string-templates/package.json | 2 +-
 packages/worker/package.json           | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lerna.json b/lerna.json
index 801ba1b871..2e979b7175 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.48",
+  "version": "1.0.49",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index f1998660a8..b382fded28 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index d9192c8b71..89ceca0261 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": "1.0.48",
+  "version": "1.0.49",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index f956a22027..a92a613f4f 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.48",
-    "@budibase/client": "^1.0.48",
+    "@budibase/bbui": "^1.0.49",
+    "@budibase/client": "^1.0.49",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^1.0.48",
+    "@budibase/string-templates": "^1.0.49",
     "@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 016de84bef..22872872c7 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 4cdbd22f18..6573c17151 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "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": "^1.0.48",
+    "@budibase/bbui": "^1.0.49",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^1.0.48",
+    "@budibase/string-templates": "^1.0.49",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 16a3a6803f..23d7768b7e 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,9 +70,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.48",
-    "@budibase/client": "^1.0.48",
-    "@budibase/string-templates": "^1.0.48",
+    "@budibase/backend-core": "^1.0.49",
+    "@budibase/client": "^1.0.49",
+    "@budibase/string-templates": "^1.0.49",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 69c7ae8f83..617d54b09e 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index f263f50a27..458ae31de4 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -29,8 +29,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.48",
-    "@budibase/string-templates": "^1.0.48",
+    "@budibase/backend-core": "^1.0.49",
+    "@budibase/string-templates": "^1.0.49",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

From 48ce006ac32c36a1ad7fc2a28d8e553c12a938e1 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 4 Feb 2022 14:25:20 +0000
Subject: [PATCH 16/31] Hide some icons on mobile to avoid fullscreen mobile
 icon wrapping in rich text editor

---
 packages/bbui/src/Form/Core/RichTextField.svelte              | 2 ++
 packages/bbui/src/Form/RichTextField.svelte                   | 2 ++
 packages/bbui/src/Markdown/MarkdownEditor.svelte              | 2 ++
 packages/bbui/src/Markdown/SpectrumMDE.svelte                 | 1 -
 packages/client/src/components/app/forms/LongFormField.svelte | 3 +++
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/bbui/src/Form/Core/RichTextField.svelte b/packages/bbui/src/Form/Core/RichTextField.svelte
index 4520f1bf28..df39fc1a0a 100644
--- a/packages/bbui/src/Form/Core/RichTextField.svelte
+++ b/packages/bbui/src/Form/Core/RichTextField.svelte
@@ -8,6 +8,7 @@
   export let height = null
   export let id = null
   export let fullScreenOffset = 0
+  export let easyMDEOptions = null
 </script>
 
 <div class:error>
@@ -18,6 +19,7 @@
     {id}
     {fullScreenOffset}
     {disabled}
+    {easyMDEOptions}
     on:change
   />
 </div>
diff --git a/packages/bbui/src/Form/RichTextField.svelte b/packages/bbui/src/Form/RichTextField.svelte
index 91c130bf74..d357a13ae2 100644
--- a/packages/bbui/src/Form/RichTextField.svelte
+++ b/packages/bbui/src/Form/RichTextField.svelte
@@ -12,6 +12,7 @@
   export let height = null
   export let id = null
   export let fullScreenOffset = 0
+  export let easyMDEOptions = null
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -29,6 +30,7 @@
     {height}
     {id}
     {fullScreenOffset}
+    {easyMDEOptions}
     on:change={onChange}
   />
 </Field>
diff --git a/packages/bbui/src/Markdown/MarkdownEditor.svelte b/packages/bbui/src/Markdown/MarkdownEditor.svelte
index 4ab961d646..9265d14f46 100644
--- a/packages/bbui/src/Markdown/MarkdownEditor.svelte
+++ b/packages/bbui/src/Markdown/MarkdownEditor.svelte
@@ -8,6 +8,7 @@
   export let id = null
   export let fullScreenOffset = 0
   export let disabled = false
+  export let easyMDEOptions
 
   const dispatch = createEventDispatcher()
 
@@ -53,6 +54,7 @@
     easyMDEOptions={{
       initialValue: value,
       placeholder,
+      ...easyMDEOptions,
     }}
   />
 {/key}
diff --git a/packages/bbui/src/Markdown/SpectrumMDE.svelte b/packages/bbui/src/Markdown/SpectrumMDE.svelte
index 0e3a7c75cc..fd7e0840e9 100644
--- a/packages/bbui/src/Markdown/SpectrumMDE.svelte
+++ b/packages/bbui/src/Markdown/SpectrumMDE.svelte
@@ -22,7 +22,6 @@
       unorderedListStyle: "-",
       maxHeight: scroll ? height : undefined,
       minHeight: scroll ? undefined : height,
-      // hideIcons: ["fullscreen", "side-by-side"],
       ...easyMDEOptions,
     })
 
diff --git a/packages/client/src/components/app/forms/LongFormField.svelte b/packages/client/src/components/app/forms/LongFormField.svelte
index 443469566f..3a63799e58 100644
--- a/packages/client/src/components/app/forms/LongFormField.svelte
+++ b/packages/client/src/components/app/forms/LongFormField.svelte
@@ -61,6 +61,9 @@
       {placeholder}
       {height}
       fullScreenOffset={offset}
+      easyMDEOptions={{
+        hideIcons: $context.device.mobile ? ["side-by-side", "guide"] : [],
+      }}
     />
   {/if}
 </Field>

From 587a260c2b7c6660e456e916269c80618a673bd4 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 7 Feb 2022 12:04:21 +0000
Subject: [PATCH 17/31] Improve text area and long form height settings

---
 packages/bbui/src/Form/Core/TextArea.svelte      | 16 ++++++++++++++--
 packages/bbui/src/Markdown/MarkdownEditor.svelte |  2 +-
 packages/bbui/src/Markdown/SpectrumMDE.svelte    |  4 ++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/bbui/src/Form/Core/TextArea.svelte b/packages/bbui/src/Form/Core/TextArea.svelte
index b615e97bff..465212cd44 100644
--- a/packages/bbui/src/Form/Core/TextArea.svelte
+++ b/packages/bbui/src/Form/Core/TextArea.svelte
@@ -22,11 +22,23 @@
     dispatch("change", event.target.value)
     focus = false
   }
+
+  const getStyleString = (attribute, value) => {
+    if (!attribute || value == null) {
+      return ""
+    }
+    if (isNaN(value)) {
+      return `${attribute}:${value};`
+    }
+    return `${attribute}:${value}px;`
+  }
+
+  $: heightString = getStyleString("height", height)
+  $: minHeightString = getStyleString("min-height", minHeight)
 </script>
 
 <div
-  style={(height ? `height: ${height}px;` : "") +
-    (minHeight ? `min-height: ${minHeight}px` : "")}
+  style={`${heightString}${minHeightString}`}
   class="spectrum-Textfield spectrum-Textfield--multiline"
   class:is-invalid={!!error}
   class:is-disabled={disabled}
diff --git a/packages/bbui/src/Markdown/MarkdownEditor.svelte b/packages/bbui/src/Markdown/MarkdownEditor.svelte
index 9265d14f46..7fb6414ad8 100644
--- a/packages/bbui/src/Markdown/MarkdownEditor.svelte
+++ b/packages/bbui/src/Markdown/MarkdownEditor.svelte
@@ -3,7 +3,7 @@
   import { createEventDispatcher } from "svelte"
 
   export let value = null
-  export let height = "300px"
+  export let height = null
   export let placeholder = null
   export let id = null
   export let fullScreenOffset = 0
diff --git a/packages/bbui/src/Markdown/SpectrumMDE.svelte b/packages/bbui/src/Markdown/SpectrumMDE.svelte
index fd7e0840e9..eb7198bf5b 100644
--- a/packages/bbui/src/Markdown/SpectrumMDE.svelte
+++ b/packages/bbui/src/Markdown/SpectrumMDE.svelte
@@ -3,7 +3,7 @@
   import "easymde/dist/easymde.min.css"
   import { onMount } from "svelte"
 
-  export let height = "300px"
+  export let height = null
   export let scroll = true
   export let easyMDEOptions = null
   export let mde = null
@@ -14,7 +14,7 @@
   let element
 
   onMount(() => {
-    height = height || "300px"
+    height = height || "200px"
     mde = new EasyMDE({
       element,
       spellChecker: false,

From d12cd2abdfe35bbbea3d9345a674bfe8aff4be02 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 7 Feb 2022 12:04:43 +0000
Subject: [PATCH 18/31] Add rich text option to long form data type

---
 .../backend/DataTable/RowFieldControl.svelte      |  7 ++++++-
 .../DataTable/modals/CreateEditColumn.svelte      | 15 ++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
index a8fb05c2c5..8ab6d75c5d 100644
--- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
+++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
@@ -7,6 +7,7 @@
     Multiselect,
     Label,
     RichTextField,
+    TextArea,
   } from "@budibase/bbui"
   import Dropzone from "components/common/Dropzone.svelte"
   import { capitalise } from "helpers"
@@ -43,7 +44,11 @@
 {:else if type === "link"}
   <LinkedRowSelector bind:linkedRows={value} schema={meta} />
 {:else if type === "longform"}
-  <RichTextField {label} height="200px" bind:value />
+  {#if meta.useRichText}
+    <RichTextField {label} height="150px" bind:value />
+  {:else}
+    <TextArea {label} height="150px" bind:value />
+  {/if}
 {:else if type === "json"}
   <Label>{label}</Label>
   <Editor
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 0d73f3d36d..edac352f8a 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -367,7 +367,7 @@
 
   {#if canBeSearched && !external}
     <div>
-      <Label grey small>Search Indexes</Label>
+      <Label>Search Indexes</Label>
       <Toggle
         value={indexes[0] === field.name}
         disabled={indexes[1] === field.name}
@@ -394,6 +394,19 @@
       label="Options (one per line)"
       bind:values={field.constraints.inclusion}
     />
+  {:else if field.type === "longform"}
+    <div>
+      <Label
+        size="M"
+        tooltip="Rich text includes support for images, links, tables, lists and more"
+      >
+        Formatting
+      </Label>
+      <Toggle
+        bind:value={field.useRichText}
+        text="Enable rich text support (markdown)"
+      />
+    </div>
   {:else if field.type === "array"}
     <ValuesList
       label="Options (one per line)"

From 3b6128f33fb49349571b11303d36d4df1d1f5c8a Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 7 Feb 2022 12:11:20 +0000
Subject: [PATCH 19/31] Use automatic formatting for generated longform fields

---
 .../store/screenTemplates/utils/commonComponents.js          | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js b/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js
index ae45b4f25d..9fe8cc9563 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js
@@ -169,6 +169,11 @@ export function makeDatasourceFormComponents(datasource) {
           optionsSource: "schema",
         })
       }
+      if (fieldType === "longform") {
+        component.customProps({
+          format: "auto",
+        })
+      }
       if (fieldType === "array") {
         component.customProps({
           placeholder: "Choose an option",

From 2975e4a8f74747ca4628290a5a4753361b2962ee Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 7 Feb 2022 12:12:02 +0000
Subject: [PATCH 20/31] Add format setting on long form fields to allow choice
 between rich text and plain text, and default to automatically determining
 from the schema

---
 packages/client/manifest.json                 | 21 ++++++++
 .../components/app/forms/LongFormField.svelte | 50 +++++++++++++------
 2 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 00a9ae36f8..38d29cb081 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -2391,6 +2391,27 @@
         "label": "Default value",
         "key": "defaultValue"
       },
+      {
+        "type": "select",
+        "label": "Formatting",
+        "key": "format",
+        "placeholder": null,
+        "options": [
+          {
+            "label": "Auto",
+            "value": "auto"
+          },
+          {
+            "label": "Plain text",
+            "value": "plain"
+          },
+          {
+            "label": "Rich text (markdown)",
+            "value": "rich"
+          }
+        ],
+        "defaultValue": "auto"
+      },
       {
         "type": "boolean",
         "label": "Disabled",
diff --git a/packages/client/src/components/app/forms/LongFormField.svelte b/packages/client/src/components/app/forms/LongFormField.svelte
index 3a63799e58..e156eef52a 100644
--- a/packages/client/src/components/app/forms/LongFormField.svelte
+++ b/packages/client/src/components/app/forms/LongFormField.svelte
@@ -1,7 +1,7 @@
 <script>
   import { getContext, setContext } from "svelte"
   import { writable } from "svelte/store"
-  import { CoreRichTextField } from "@budibase/bbui"
+  import { CoreRichTextField, CoreTextArea } from "@budibase/bbui"
   import Field from "./Field.svelte"
 
   export let field
@@ -10,15 +10,22 @@
   export let disabled = false
   export let validation
   export let defaultValue = ""
+  export let format = "auto"
 
   let fieldState
   let fieldApi
+  let fieldSchema
 
   const context = getContext("context")
   const component = getContext("component")
   const newContext = writable($component)
   setContext("component", newContext)
 
+  // Determine whether we should use a rich or plain text component.
+  // We treat undefined as "auto".
+  $: useRichText =
+    format === "rich" || (format !== "plain" && fieldSchema?.useRichText)
+
   // Determine the offset needed for full screen mode
   $: offset = $context.device.mobile ? "61px" : "137px"
 
@@ -27,7 +34,7 @@
   // itself based on the height of the rich text field.
   let height
   $: {
-    height = $component.styles?.normal?.height
+    height = $component.styles?.normal?.height || "150px"
     newContext.set({
       ...$component,
       styles: {
@@ -50,20 +57,33 @@
   type="longform"
   bind:fieldState
   bind:fieldApi
+  bind:fieldSchema
 >
   {#if fieldState}
-    <CoreRichTextField
-      value={fieldState.value}
-      on:change={e => fieldApi.setValue(e.detail)}
-      disabled={fieldState.disabled}
-      error={fieldState.error}
-      id={fieldState.fieldId}
-      {placeholder}
-      {height}
-      fullScreenOffset={offset}
-      easyMDEOptions={{
-        hideIcons: $context.device.mobile ? ["side-by-side", "guide"] : [],
-      }}
-    />
+    {#if useRichText}
+      <CoreRichTextField
+        value={fieldState.value}
+        on:change={e => fieldApi.setValue(e.detail)}
+        disabled={fieldState.disabled}
+        error={fieldState.error}
+        id={fieldState.fieldId}
+        {placeholder}
+        {height}
+        fullScreenOffset={offset}
+        easyMDEOptions={{
+          hideIcons: $context.device.mobile ? ["side-by-side", "guide"] : [],
+        }}
+      />
+    {:else}
+      <CoreTextArea
+        value={fieldState.value}
+        on:change={e => fieldApi.setValue(e.detail)}
+        disabled={fieldState.disabled}
+        error={fieldState.error}
+        id={fieldState.fieldId}
+        {placeholder}
+        minHeight={height}
+      />
+    {/if}
   {/if}
 </Field>

From b31780d26c685efc79cb4ba39e1267e16a68c9fe Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 7 Feb 2022 12:13:11 +0000
Subject: [PATCH 21/31] Revert rich text field name to long form field

---
 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 38d29cb081..ab48142ad5 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -2365,7 +2365,7 @@
     ]
   },
   "longformfield": {
-    "name": "Rich Text",
+    "name": "Long Form Field",
     "icon": "TextParagraph",
     "styles": ["size"],
     "editable": true,

From 6245d605e89667515a18a73d50f7cb3cfa07a274 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 7 Feb 2022 12:49:33 +0000
Subject: [PATCH 22/31] Update rich text editor fullscreen and side-by-side
 modes to work on desktop and mobile properly with any type of layout
 navigation

---
 .../bbui/src/Form/Core/RichTextField.svelte   |  2 +-
 packages/bbui/src/Form/RichTextField.svelte   |  2 +-
 packages/bbui/src/Markdown/SpectrumMDE.svelte | 28 ++++++++++++++---
 .../client/src/components/app/Layout.svelte   | 31 +++++++++++++++++--
 .../components/app/forms/LongFormField.svelte |  9 +++---
 5 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/packages/bbui/src/Form/Core/RichTextField.svelte b/packages/bbui/src/Form/Core/RichTextField.svelte
index df39fc1a0a..f964405f0d 100644
--- a/packages/bbui/src/Form/Core/RichTextField.svelte
+++ b/packages/bbui/src/Form/Core/RichTextField.svelte
@@ -7,7 +7,7 @@
   export let error = null
   export let height = null
   export let id = null
-  export let fullScreenOffset = 0
+  export let fullScreenOffset = null
   export let easyMDEOptions = null
 </script>
 
diff --git a/packages/bbui/src/Form/RichTextField.svelte b/packages/bbui/src/Form/RichTextField.svelte
index d357a13ae2..275242df49 100644
--- a/packages/bbui/src/Form/RichTextField.svelte
+++ b/packages/bbui/src/Form/RichTextField.svelte
@@ -11,7 +11,7 @@
   export let error = null
   export let height = null
   export let id = null
-  export let fullScreenOffset = 0
+  export let fullScreenOffset = null
   export let easyMDEOptions = null
 
   const dispatch = createEventDispatcher()
diff --git a/packages/bbui/src/Markdown/SpectrumMDE.svelte b/packages/bbui/src/Markdown/SpectrumMDE.svelte
index eb7198bf5b..9b0832c91f 100644
--- a/packages/bbui/src/Markdown/SpectrumMDE.svelte
+++ b/packages/bbui/src/Markdown/SpectrumMDE.svelte
@@ -8,7 +8,7 @@
   export let easyMDEOptions = null
   export let mde = null
   export let id = null
-  export let fullScreenOffset = 0
+  export let fullScreenOffset = null
   export let disabled = false
 
   let element
@@ -30,9 +30,18 @@
       mde.toTextArea()
     }
   })
+
+  $: styleString = getStyleString(fullScreenOffset)
+
+  const getStyleString = offset => {
+    let string = ""
+    string += `--fullscreen-offset-x:${offset?.x || "0px"};`
+    string += `--fullscreen-offset-y:${offset?.y || "0px"};`
+    return string
+  }
 </script>
 
-<div class:disabled style={`--fullscreen-offset:${fullScreenOffset || "0px"}`}>
+<div class:disabled style={styleString}>
   <textarea disabled {id} bind:this={element} />
 </div>
 
@@ -155,12 +164,21 @@
   }
   /* Allow full screen offset */
   :global(.EasyMDEContainer .editor-toolbar.fullscreen) {
-    top: var(--fullscreen-offset);
+    left: var(--fullscreen-offset-x);
+    top: var(--fullscreen-offset-y);
   }
   :global(.EasyMDEContainer .CodeMirror-fullscreen) {
-    top: calc(50px + var(--fullscreen-offset));
+    left: var(--fullscreen-offset-x);
+    top: calc(50px + var(--fullscreen-offset-y));
   }
+
+  :global(.EasyMDEContainer .CodeMirror-fullscreen.CodeMirror-sided) {
+    width: calc((100% - var(--fullscreen-offset-x)) / 2) !important;
+  }
+
   :global(.EasyMDEContainer .editor-preview-side) {
-    top: calc(50px + var(--fullscreen-offset));
+    left: calc(50% + (var(--fullscreen-offset-x) / 2));
+    top: calc(50px + var(--fullscreen-offset-y));
+    width: calc((100% - var(--fullscreen-offset-x)) / 2) !important;
   }
 </style>
diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte
index 59765f9305..600d295cba 100644
--- a/packages/client/src/components/app/Layout.svelte
+++ b/packages/client/src/components/app/Layout.svelte
@@ -1,5 +1,6 @@
 <script>
-  import { getContext } from "svelte"
+  import { getContext, setContext } from "svelte"
+  import { writable } from "svelte/store"
   import { Heading, Icon } from "@budibase/bbui"
   import { FieldTypes } from "../../constants"
   import active from "svelte-spa-router/active"
@@ -29,6 +30,16 @@
     Small: "s",
   }
 
+  // Set some layout context. This isn't used in bindings but can be used
+  // determine things about the current app layout.
+  $: mobile = $context.device.mobile
+  const store = writable({ headerHeight: 0 })
+  $: store.set({
+    screenXOffset: getScreenXOffset(navigation, mobile),
+    screenYOffset: getScreenYOffset(navigation, mobile),
+  })
+  setContext("layout", store)
+
   // Permanently go into peek mode if we ever get the peek flag
   let isPeeking = false
   $: {
@@ -58,13 +69,27 @@
     if ($builderStore.inBuilder) return
     window.location.href = "/builder/apps"
   }
+
+  const getScreenXOffset = (navigation, mobile) => {
+    if (navigation !== "Left") {
+      return 0
+    }
+    return mobile ? "0px" : "250px"
+  }
+  const getScreenYOffset = (navigation, mobile) => {
+    if (mobile) {
+      return !navigation || navigation === "None" ? 0 : "61px"
+    } else {
+      return navigation === "Top" ? "137px" : "0px"
+    }
+  }
 </script>
 
 <div
   class="layout layout--{typeClass}"
   use:styleable={$component.styles}
-  class:desktop={!$context.device.mobile}
-  class:mobile={!!$context.device.mobile}
+  class:desktop={!mobile}
+  class:mobile={!!mobile}
 >
   {#if typeClass !== "none"}
     <div
diff --git a/packages/client/src/components/app/forms/LongFormField.svelte b/packages/client/src/components/app/forms/LongFormField.svelte
index e156eef52a..15a10827b2 100644
--- a/packages/client/src/components/app/forms/LongFormField.svelte
+++ b/packages/client/src/components/app/forms/LongFormField.svelte
@@ -18,6 +18,7 @@
 
   const context = getContext("context")
   const component = getContext("component")
+  const layout = getContext("layout")
   const newContext = writable($component)
   setContext("component", newContext)
 
@@ -26,9 +27,6 @@
   $: useRichText =
     format === "rich" || (format !== "plain" && fieldSchema?.useRichText)
 
-  // Determine the offset needed for full screen mode
-  $: offset = $context.device.mobile ? "61px" : "137px"
-
   // Extract the settings height so we can pass it on to the rich text field.
   // We then wipe the height style so that the field will automatically size
   // itself based on the height of the rich text field.
@@ -69,7 +67,10 @@
         id={fieldState.fieldId}
         {placeholder}
         {height}
-        fullScreenOffset={offset}
+        fullScreenOffset={{
+          x: $layout.screenXOffset,
+          y: $layout.screenYOffset,
+        }}
         easyMDEOptions={{
           hideIcons: $context.device.mobile ? ["side-by-side", "guide"] : [],
         }}

From ae86b0eeec35c32a4b8227ad9c6bf4534ee729a0 Mon Sep 17 00:00:00 2001
From: SucculentAnimal <succulent.animal@gmail.com>
Date: Mon, 7 Feb 2022 21:02:19 +0800
Subject: [PATCH 23/31] Re-add Japanese README

---
 i18n/README.jp.md | 214 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 214 insertions(+)
 create mode 100644 i18n/README.jp.md

diff --git a/i18n/README.jp.md b/i18n/README.jp.md
new file mode 100644
index 0000000000..6fea497d53
--- /dev/null
+++ b/i18n/README.jp.md
@@ -0,0 +1,214 @@
+<p align="center">
+  <a href="https://www.budibase.com">
+    <img alt="Budibase" src="https://d33wubrfki0l68.cloudfront.net/aac32159d7207b5085e74a7ef67afbb7027786c5/2b1fd/img/logo/bb-emblem.svg" width="60" />
+  </a>
+</p>
+<h1 align="center">
+  Budibase
+</h1>
+
+<h3 align="center">
+  使って楽しいローコードプラットフォーム
+</h3>
+<p align="center">
+  Budibaseはオープンソースのローコードプラットフォームで、生産性を向上させるツールを簡単に構築することができます。
+</p>
+
+<h3 align="center">
+ 🤖 🎨 🚀
+</h3>
+<br>
+
+<p align="center">
+  <img alt="Budibase design ui" src="https://res.cloudinary.com/daog6scxm/image/upload/v1633524049/ui/design-ui-wide-mobile_gdaveq.jpg">
+</p>
+
+<p align="center">
+  <a href="https://github.com/Budibase/budibase/releases">
+    <img alt="GitHub all releases" src="https://img.shields.io/github/downloads/Budibase/budibase/total">
+  </a>
+  <a href="https://github.com/Budibase/budibase/releases">
+    <img alt="GitHub release (latest by date)" src="https://img.shields.io/github/v/release/Budibase/budibase">
+  </a>
+  <a href="https://twitter.com/intent/follow?screen_name=budibase">
+    <img src="https://img.shields.io/twitter/follow/budibase?style=social" alt="Follow @budibase" />
+  </a>
+  <img src="https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg" alt="Code of conduct" />
+  <a href="https://codecov.io/gh/Budibase/budibase">
+    <img src="https://codecov.io/gh/Budibase/budibase/graph/badge.svg?token=E8W2ZFXQOH"/>
+  </a>
+</p>
+
+<h3 align="center">
+  <a href="https://docs.budibase.com/getting-started">はじめに</a>
+  <span> · </span>
+  <a href="https://docs.budibase.com">ドキュメント</a>
+  <span> · </span>
+  <a href="https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas">機能リクエスト</a>
+  <span> · </span>
+  <a href="https://github.com/Budibase/budibase/issues">バグ報告</a>
+  <span> · </span>
+  サポート: <a href="https://github.com/Budibase/budibase/discussions">ディスカッション</a>
+</h3>
+
+<br /><br />
+## ✨ 特徴
+
+### "本物"のソフトウェアを構築できます 
+ほかのプラットフォームとは違い、Budibaseだけでシングルページのアプリケーションを制作し完成させることができます。Budibaseで作られたアプリケーションは素晴らしいパフォーマンスを持っており、レスポンシブデザインにも対応しています。ユーザー達にいい印象を与えること間違いなしでしょう！
+<br /><br />
+
+### 拡張性が高くオープンソース
+Budibaseはオープンソースで、GPL v3ライセンスの下に公開されています。このことは、Budibaseが常にあなたのそばにいるという安心感を与えてくれることでしょう。そして、私たちは開発者に優しい環境を提供しているので、あなたは好きなだけにソースコードをフォークして改造、もしくは直接Budibaseにコントリビュートすることができます。 
+<br /><br />
+
+### 既存のデータ、もしくは一から始める
+Budibaseはいろんなツールから既存のデータを使用できます。たとえばMongoDB、CouchDB、 PostgreSQL、MySQL、Airtable、S3、DynamoDB、REST APIなど。ほかのプラットフォームにない特徴として、Budibaseはデータなしの状態でビジネスアプリケーションの構築を一から始めることができます。 [新しいデータリソースをリクエスト](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas)。
+
+<p align="center">
+  <img alt="Budibase data" src="https://res.cloudinary.com/daog6scxm/image/upload/v1636970242/Out%20of%20beta%20launch/data_n1tlhf.png">
+</p>
+<br /><br />
+
+### パワフルな内蔵コンポーネントでアプリケーションを設計し構築
+
+Budibaseには、美しくデザインされた強力なコンポーネントが付属しており、それら使用しUIを簡単に構築することができます。また、CSSによるスタイリングオプションも豊富に用意されているので、よりクリエイティブな表現もも可能です。
+ [Request new component](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas)。
+
+<p align="center">
+  <img alt="Budibase design" src="https://res.cloudinary.com/daog6scxm/image/upload/v1636970243/Out%20of%20beta%20launch/design-like-a-pro_qhlfeu.gif">
+</p>
+<br /><br />
+
+### プロセスを自動化し、ほかのツールと連携し、Webhookをでつながる！
+定型化した作業を自動化して時間を節約しましょう。Webhookに接続、Eメールの自動送信など、すべてBudibaseに任せましょう。 こちらで簡単に [新しいオートメーションを作る](https://github.com/Budibase/automations)または[新しいオートメーションをリクエストすることができます](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas)。
+
+<p align="center">
+  <img alt="Budibase automations" src="https://res.cloudinary.com/daog6scxm/image/upload/v1636970486/Out%20of%20beta%20launch/automation_riro7u.png">
+</p>
+<br /><br />
+
+### 使い親しんだツールとの統合
+Budibaseは多くの人気ツールと統合されており、あなたのニーズに合わせたパーフェクトなアプリケーションを構築することができます。
+
+<p align="center">
+  <img alt="Budibase integrations" src="https://res.cloudinary.com/daog6scxm/image/upload/v1636970242/Out%20of%20beta%20launch/integrations_kc7dqt.png">
+</p>
+<br /><br />
+
+### 管理者のパラダイス
+Budibaseはどんな規模のプロジェクトにも柔軟に対応できます。Budibaseを使えば、個人または組織のサーバーでセルフホスティングし、ユーザー、オンボーディング、SMTP、アプリ、グループ、テーマなどをひとまとめに管理することが可能です。また、ユーザーやグループにアプリポータルを提供し、グループ管理者にユーザー管理を委ねることも可能です。
+- プロモーションビデオを視聴する： https://youtu.be/xoljVpty_Kw
+
+<br /><br /><br />
+
+## 🏁 始めましょう
+
+<a href="https://docs.budibase.com/self-hosting/self-host"><img src="https://res.cloudinary.com/daog6scxm/image/upload/v1634808888/logo/deploy_npl9za.png" /></a>
+
+Docker、KubernetesもしくはDegital Oceanを使用しセルフホスティングするか、セルフホスティングに困難がある、もしくは今すぐ開始したい場合はBudibase Cloudを使用しすぐに始めましょう。
+
+### [Budibaseをセルフホスティングする](https://docs.budibase.com/self-hosting/self-host)
+
+### [Budibase Cloudを使用する](https://budibase.com)
+
+
+<br /><br />
+
+## 🎓 Budibaseを学ぶ
+
+Budibaseのドキュメント[はここです](https://docs.budibase.com)。
+<br />
+
+
+<br /><br />
+
+## 💬 コミュニティ
+
+もし何か問題がある、もしくはBudibaseコミュニティのほかのユーザーと交流したいのであれば私たちの[Github discussions](https://github.com/Budibase/budibase/discussions)までお越しください。
+
+<br /><br /><br />
+
+
+## ❗ 行動規範
+
+Budibase は、すべての人を歓迎し、多様で、ハラスメントのない環境を提供することに尽力しています。Budibase コミュニティに参加するすべての人たちが私たちの[**行動規範**](https://github.com/Budibase/budibase/blob/HEAD/.github/CODE_OF_CONDUCT.md)を遵守していただくことお願いします。必ず読んでください。
+<br />
+
+
+<br /><br />
+
+
+## 🙌 Budibaseにコントリビュート
+
+
+バグレポートからプルリクエストの作成まで、すべての貢献は感謝、そして歓迎されております。新しい新機能の実装やAPIの変更を計画している場合は、まずIssueを作成してください。これであなたの貴重な考えは私たちにも伝わり、無駄とはなりません。
+
+### どこから始めるか混乱していますか？
+ここはコントリビュートをはじめるための最適な場所です！ [First time issues project](https://github.com/Budibase/budibase/projects/22).
+
+### リポジトリの構成
+Budibaseは、lernaによってmonorepo方式で管理されています。budibase パッケージのビルドと公開はlernaによって管理されています。Budibaseを構成するパッケージは以下の通り：
+
+- [packages/builder](https://github.com/Budibase/budibase/tree/HEAD/packages/builder) - budibase builder クライアントサイドのsvelteアプリケーションのコードが含まれています。
+
+- [packages/client](https://github.com/Budibase/budibase/tree/HEAD/packages/client) - ブラウザ上で動作するモジュールで、JSONの定義を読み取り、そこから"生きている"Webアプリケーションを作成します。
+
+- [packages/server](https://github.com/Budibase/budibase/tree/HEAD/packages/server) - budibaseのサーバーです。この Koa アプリは、builder アプリと budibase アプリの JS を提供し、データベースとファイル システムと対話するための API を提供する役割を担っています。
+
+詳しくは[CONTRIBUTING.md](https://github.com/Budibase/budibase/blob/HEAD/.github/CONTRIBUTING.md)をご覧ください。
+
+<br /><br />
+
+
+## 📝 ライセンス
+
+Budibase はオープンソースであり、[GPL v3](https://www.gnu.org/licenses/gpl-3.0.en.html)ライセンスの下に公開されています。クライアントとコンポーネントライブラリは [MPL](https://directory.fsf.org/wiki/License:MPL-2.0)で公開されています - ですから、あなたが制作したアプリケーションはどのようなライセンスでも公開することができます。
+
+<br /><br />
+
+## ⭐ スター数の履歴
+
+[![Stargazers over time](https://starchart.cc/Budibase/budibase.svg)](https://starchart.cc/Budibase/budibase)
+
+ビルダーのアップデートの間に問題が発生する場合は[ここ](https://github.com/Budibase/budibase/blob/HEAD/.github/CONTRIBUTING.md#troubleshooting)を参考に環境をクリアにしてください。
+
+<br /><br />
+
+## Contributors ✨
+
+すばらしい皆さまに感謝しかありません。([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="http://martinmck.com"><img src="https://avatars1.githubusercontent.com/u/11256663?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martin McKeaveney</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=shogunpurple" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=shogunpurple" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=shogunpurple" title="Tests">⚠️</a> <a href="#infra-shogunpurple" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="http://www.michaeldrury.co.uk/"><img src="https://avatars2.githubusercontent.com/u/4407001?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Drury</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=mike12345567" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=mike12345567" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=mike12345567" title="Tests">⚠️</a> <a href="#infra-mike12345567" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="https://github.com/aptkingston"><img src="https://avatars3.githubusercontent.com/u/9075550?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andrew Kingston</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=aptkingston" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=aptkingston" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=aptkingston" title="Tests">⚠️</a> <a href="#design-aptkingston" title="Design">🎨</a></td>
+    <td align="center"><a href="https://budibase.com/"><img src="https://avatars3.githubusercontent.com/u/3524181?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Shanks</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=mjashanks" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=mjashanks" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=mjashanks" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/kevmodrome"><img src="https://avatars3.githubusercontent.com/u/534488?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kevin Åberg Kultalahti</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=kevmodrome" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=kevmodrome" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=kevmodrome" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://www.budibase.com/"><img src="https://avatars2.githubusercontent.com/u/49767913?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joe</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=joebudi" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=joebudi" title="Code">💻</a> <a href="#content-joebudi" title="Content">🖋</a> <a href="#design-joebudi" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/Rory-Powell"><img src="https://avatars.githubusercontent.com/u/8755148?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rory Powell</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=Rory-Powell" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=Rory-Powell" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=Rory-Powell" title="Tests">⚠️</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/PClmnt"><img src="https://avatars.githubusercontent.com/u/5665926?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Clement</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=PClmnt" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=PClmnt" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=PClmnt" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/Conor-Mack"><img src="https://avatars1.githubusercontent.com/u/36074859?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Conor_Mack</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=Conor-Mack" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=Conor-Mack" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/pngwn"><img src="https://avatars1.githubusercontent.com/u/12937446?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pngwn</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=pngwn" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=pngwn" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/HugoLd"><img src="https://avatars0.githubusercontent.com/u/26521848?v=4?s=100" width="100px;" alt=""/><br /><sub><b>HugoLd</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=HugoLd" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/victoriasloan"><img src="https://avatars.githubusercontent.com/u/9913651?v=4?s=100" width="100px;" alt=""/><br /><sub><b>victoriasloan</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=victoriasloan" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/yashank09"><img src="https://avatars.githubusercontent.com/u/37672190?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yashank09</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=yashank09" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/SOVLOOKUP"><img src="https://avatars.githubusercontent.com/u/53158137?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SOVLOOKUP</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=SOVLOOKUP" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/seoulaja"><img src="https://avatars.githubusercontent.com/u/15101654?v=4?s=100" width="100px;" alt=""/><br /><sub><b>seoulaja</b></sub></a><br /><a href="#translation-seoulaja" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/mslourens"><img src="https://avatars.githubusercontent.com/u/1907152?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maurits Lourens</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=mslourens" title="Tests">⚠️</a> <a href="https://github.com/Budibase/budibase/commits?author=mslourens" title="Code">💻</a></td>
+  </tr>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+このプロジェクトは、[all-contributors](https://github.com/all-contributors/all-contributors)仕様に準拠しています。どのような貢献でも歓迎します。
+

From dd07f3516f4a18ba138a7eed64703bbca1c18a2b Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 7 Feb 2022 15:15:28 +0000
Subject: [PATCH 24/31] Remove automatic dismissal of error notifications and
 instead allow only manual dismissal, and also enable pointer events so errors
 can be copied

---
 .../bbui/src/Notification/Notification.svelte | 29 +++++++++++++++++++
 .../Notification/NotificationDisplay.svelte   | 13 ++++++---
 packages/bbui/src/Stores/notifications.js     | 25 ++++++++++------
 3 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/packages/bbui/src/Notification/Notification.svelte b/packages/bbui/src/Notification/Notification.svelte
index cebc859bda..1d21131553 100644
--- a/packages/bbui/src/Notification/Notification.svelte
+++ b/packages/bbui/src/Notification/Notification.svelte
@@ -1,7 +1,12 @@
 <script>
+  import { createEventDispatcher } from "svelte"
+
   export let type = "info"
   export let icon = "Info"
   export let message = ""
+  export let dismissable = false
+
+  const dispatch = createEventDispatcher()
 </script>
 
 <div class="spectrum-Toast spectrum-Toast--{type}">
@@ -17,4 +22,28 @@
   <div class="spectrum-Toast-body">
     <div class="spectrum-Toast-content">{message || ""}</div>
   </div>
+  {#if dismissable}
+    <div class="spectrum-Toast-buttons">
+      <button
+        class="spectrum-ClearButton spectrum-ClearButton--overBackground spectrum-ClearButton--sizeM"
+        on:click={() => dispatch("dismiss")}
+      >
+        <div class="spectrum-ClearButton-fill">
+          <svg
+            class="spectrum-ClearButton-icon spectrum-Icon spectrum-UIIcon-Cross100"
+            focusable="false"
+            aria-hidden="true"
+          >
+            <use xlink:href="#spectrum-css-icon-Cross100" />
+          </svg>
+        </div>
+      </button>
+    </div>
+  {/if}
 </div>
+
+<style>
+  .spectrum-Toast {
+    pointer-events: all;
+  }
+</style>
diff --git a/packages/bbui/src/Notification/NotificationDisplay.svelte b/packages/bbui/src/Notification/NotificationDisplay.svelte
index 9d96bf7e70..eb778f3aa0 100644
--- a/packages/bbui/src/Notification/NotificationDisplay.svelte
+++ b/packages/bbui/src/Notification/NotificationDisplay.svelte
@@ -1,7 +1,6 @@
 <script>
   import "@spectrum-css/toast/dist/index-vars.css"
   import Portal from "svelte-portal"
-  import { flip } from "svelte/animate"
   import { notifications } from "../Stores/notifications"
   import Notification from "./Notification.svelte"
   import { fly } from "svelte/transition"
@@ -9,9 +8,15 @@
 
 <Portal target=".modal-container">
   <div class="notifications">
-    {#each $notifications as { type, icon, message, id } (id)}
-      <div animate:flip transition:fly={{ y: -30 }}>
-        <Notification {type} {icon} {message} />
+    {#each $notifications as { type, icon, message, id, dismissable } (id)}
+      <div transition:fly={{ y: -30 }}>
+        <Notification
+          {type}
+          {icon}
+          {message}
+          {dismissable}
+          on:dismiss={() => notifications.dismiss(id)}
+        />
       </div>
     {/each}
   </div>
diff --git a/packages/bbui/src/Stores/notifications.js b/packages/bbui/src/Stores/notifications.js
index ce0c9921f0..f4e80dc8cc 100644
--- a/packages/bbui/src/Stores/notifications.js
+++ b/packages/bbui/src/Stores/notifications.js
@@ -20,20 +20,26 @@ export const createNotificationStore = () => {
     setTimeout(() => (block = false), timeout)
   }
 
-  const send = (message, type = "default", icon = "") => {
+  const send = (message, type = "default", icon = "", timeout = true) => {
     if (block) {
       return
     }
     let _id = id()
     _notifications.update(state => {
-      return [...state, { id: _id, type, message, icon }]
+      return [...state, { id: _id, type, message, icon, dismissable: !timeout }]
+    })
+    if (timeout) {
+      const timeoutId = setTimeout(() => {
+        dismissNotification(_id)
+      }, NOTIFICATION_TIMEOUT)
+      timeoutIds.add(timeoutId)
+    }
+  }
+
+  const dismissNotification = id => {
+    _notifications.update(state => {
+      return state.filter(n => n.id !== id)
     })
-    const timeoutId = setTimeout(() => {
-      _notifications.update(state => {
-        return state.filter(({ id }) => id !== _id)
-      })
-    }, NOTIFICATION_TIMEOUT)
-    timeoutIds.add(timeoutId)
   }
 
   const { subscribe } = _notifications
@@ -42,10 +48,11 @@ export const createNotificationStore = () => {
     subscribe,
     send,
     info: msg => send(msg, "info", "Info"),
-    error: msg => send(msg, "error", "Alert"),
+    error: msg => send(msg, "error", "Alert", false),
     warning: msg => send(msg, "warning", "Alert"),
     success: msg => send(msg, "success", "CheckmarkCircle"),
     blockNotifications,
+    dismiss: dismissNotification,
   }
 }
 

From fe495345f828c9570b78056fdd5c89b798d6280c Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 7 Feb 2022 15:24:46 +0000
Subject: [PATCH 25/31] Update auto dismissal of notifications

---
 packages/bbui/src/Stores/notifications.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/bbui/src/Stores/notifications.js b/packages/bbui/src/Stores/notifications.js
index f4e80dc8cc..640f8218c4 100644
--- a/packages/bbui/src/Stores/notifications.js
+++ b/packages/bbui/src/Stores/notifications.js
@@ -20,15 +20,18 @@ export const createNotificationStore = () => {
     setTimeout(() => (block = false), timeout)
   }
 
-  const send = (message, type = "default", icon = "", timeout = true) => {
+  const send = (message, type = "default", icon = "", autoDismiss = true) => {
     if (block) {
       return
     }
     let _id = id()
     _notifications.update(state => {
-      return [...state, { id: _id, type, message, icon, dismissable: !timeout }]
+      return [
+        ...state,
+        { id: _id, type, message, icon, dismissable: !autoDismiss },
+      ]
     })
-    if (timeout) {
+    if (autoDismiss) {
       const timeoutId = setTimeout(() => {
         dismissNotification(_id)
       }, NOTIFICATION_TIMEOUT)

From 85b6943853bd098e41d05c9662189e0be1589fa1 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 7 Feb 2022 15:25:03 +0000
Subject: [PATCH 26/31] Prevent notifications in client apps from being
 automatically dismissed

---
 .../overlay/NotificationDisplay.svelte        |  2 ++
 .../overlay/PeekScreenDisplay.svelte          |  4 ++--
 packages/client/src/stores/notification.js    | 20 ++++++++++++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/components/overlay/NotificationDisplay.svelte b/packages/client/src/components/overlay/NotificationDisplay.svelte
index 6e8be21647..667f706ff2 100644
--- a/packages/client/src/components/overlay/NotificationDisplay.svelte
+++ b/packages/client/src/components/overlay/NotificationDisplay.svelte
@@ -19,6 +19,8 @@
           type={$notificationStore.type}
           message={$notificationStore.message}
           icon={$notificationStore.icon}
+          dismissable={$notificationStore.dismissable}
+          on:dismiss={notificationStore.actions.dismiss}
         />
       </div>
     {/key}
diff --git a/packages/client/src/components/overlay/PeekScreenDisplay.svelte b/packages/client/src/components/overlay/PeekScreenDisplay.svelte
index 7d3531d236..72ea58c194 100644
--- a/packages/client/src/components/overlay/PeekScreenDisplay.svelte
+++ b/packages/client/src/components/overlay/PeekScreenDisplay.svelte
@@ -25,8 +25,8 @@
   }
 
   const proxyNotification = event => {
-    const { message, type, icon } = event.detail
-    notificationStore.actions.send(message, type, icon)
+    const { message, type, icon, autoDismiss } = event.detail
+    notificationStore.actions.send(message, type, icon, autoDismiss)
   }
 
   const proxyStateUpdate = event => {
diff --git a/packages/client/src/stores/notification.js b/packages/client/src/stores/notification.js
index 64178328c0..e12eccf210 100644
--- a/packages/client/src/stores/notification.js
+++ b/packages/client/src/stores/notification.js
@@ -19,7 +19,7 @@ const createNotificationStore = () => {
     setTimeout(() => (block = false), timeout)
   }
 
-  const send = (message, type = "info", icon) => {
+  const send = (message, type = "info", icon, autoDismiss = true) => {
     if (block) {
       return
     }
@@ -32,6 +32,7 @@ const createNotificationStore = () => {
           message,
           type,
           icon,
+          autoDismiss,
         },
       })
       return
@@ -42,12 +43,20 @@ const createNotificationStore = () => {
       type,
       message,
       icon,
+      dismissable: !autoDismiss,
       delay: get(store) != null,
     })
     clearTimeout(timeout)
-    timeout = setTimeout(() => {
-      store.set(null)
-    }, NOTIFICATION_TIMEOUT)
+    if (autoDismiss) {
+      timeout = setTimeout(() => {
+        store.set(null)
+      }, NOTIFICATION_TIMEOUT)
+    }
+  }
+
+  const dismiss = () => {
+    clearTimeout(timeout)
+    store.set(null)
   }
 
   return {
@@ -57,8 +66,9 @@ const createNotificationStore = () => {
       info: msg => send(msg, "info", "Info"),
       success: msg => send(msg, "success", "CheckmarkCircle"),
       warning: msg => send(msg, "warning", "Alert"),
-      error: msg => send(msg, "error", "Alert"),
+      error: msg => send(msg, "error", "Alert", false),
       blockNotifications,
+      dismiss,
     },
   }
 }

From 6881cee40e7830bfdbe86caf0f6c2c3a3ddd7e51 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 7 Feb 2022 15:46:09 +0000
Subject: [PATCH 27/31] v1.0.49-alpha.15

---
 lerna.json                             | 2 +-
 packages/backend-core/package.json     | 2 +-
 packages/bbui/package.json             | 2 +-
 packages/builder/package.json          | 8 ++++----
 packages/cli/package.json              | 2 +-
 packages/client/package.json           | 6 +++---
 packages/server/package.json           | 8 ++++----
 packages/string-templates/package.json | 2 +-
 packages/worker/package.json           | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lerna.json b/lerna.json
index 60dcddc4cb..0a489345a2 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.49-alpha.14",
+  "version": "1.0.49-alpha.15",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 7f8aa6e4c7..6368c31eb9 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.49-alpha.14",
+  "version": "1.0.49-alpha.15",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 0fdd23f349..eb6996e1b5 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": "1.0.49-alpha.14",
+  "version": "1.0.49-alpha.15",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 3101d4f25c..6d2ffa4a42 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.49-alpha.14",
+  "version": "1.0.49-alpha.15",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -66,10 +66,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.49-alpha.14",
-    "@budibase/client": "^1.0.49-alpha.14",
+    "@budibase/bbui": "^1.0.49-alpha.15",
+    "@budibase/client": "^1.0.49-alpha.15",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^1.0.49-alpha.14",
+    "@budibase/string-templates": "^1.0.49-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 5e909b02c6..1ea3f38b62 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.49-alpha.14",
+  "version": "1.0.49-alpha.15",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 2c4e00e8a3..ecc248217f 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.49-alpha.14",
+  "version": "1.0.49-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": "^1.0.49-alpha.14",
+    "@budibase/bbui": "^1.0.49-alpha.15",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^1.0.49-alpha.14",
+    "@budibase/string-templates": "^1.0.49-alpha.15",
     "regexparam": "^1.3.0",
     "rollup-plugin-polyfill-node": "^0.8.0",
     "shortid": "^2.2.15",
diff --git a/packages/server/package.json b/packages/server/package.json
index 9d58d99838..deca632044 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.49-alpha.14",
+  "version": "1.0.49-alpha.15",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,9 +70,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.49-alpha.14",
-    "@budibase/client": "^1.0.49-alpha.14",
-    "@budibase/string-templates": "^1.0.49-alpha.14",
+    "@budibase/backend-core": "^1.0.49-alpha.15",
+    "@budibase/client": "^1.0.49-alpha.15",
+    "@budibase/string-templates": "^1.0.49-alpha.15",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 9492de19c2..70a2607283 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.49-alpha.14",
+  "version": "1.0.49-alpha.15",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 76ebaff106..41dbeea5c4 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.49-alpha.14",
+  "version": "1.0.49-alpha.15",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -34,8 +34,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.49-alpha.14",
-    "@budibase/string-templates": "^1.0.49-alpha.14",
+    "@budibase/backend-core": "^1.0.49-alpha.15",
+    "@budibase/string-templates": "^1.0.49-alpha.15",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

From d91efb9678b26ae64669c2b65682f5a21b4e12eb Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 7 Feb 2022 16:54:28 +0000
Subject: [PATCH 28/31] v1.0.49-alpha.16

---
 lerna.json                             | 2 +-
 packages/backend-core/package.json     | 2 +-
 packages/bbui/package.json             | 2 +-
 packages/builder/package.json          | 8 ++++----
 packages/cli/package.json              | 2 +-
 packages/client/package.json           | 6 +++---
 packages/server/package.json           | 8 ++++----
 packages/string-templates/package.json | 2 +-
 packages/worker/package.json           | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lerna.json b/lerna.json
index 0a489345a2..1f8f86aaab 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.49-alpha.15",
+  "version": "1.0.49-alpha.16",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 6368c31eb9..74db761b8c 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.49-alpha.15",
+  "version": "1.0.49-alpha.16",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index eb6996e1b5..d1d8df7581 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": "1.0.49-alpha.15",
+  "version": "1.0.49-alpha.16",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 6d2ffa4a42..cf3c9b8311 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.49-alpha.15",
+  "version": "1.0.49-alpha.16",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -66,10 +66,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.49-alpha.15",
-    "@budibase/client": "^1.0.49-alpha.15",
+    "@budibase/bbui": "^1.0.49-alpha.16",
+    "@budibase/client": "^1.0.49-alpha.16",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^1.0.49-alpha.15",
+    "@budibase/string-templates": "^1.0.49-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 1ea3f38b62..5f2167bb9b 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.49-alpha.15",
+  "version": "1.0.49-alpha.16",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index ecc248217f..4a2eb58f2a 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.49-alpha.15",
+  "version": "1.0.49-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": "^1.0.49-alpha.15",
+    "@budibase/bbui": "^1.0.49-alpha.16",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^1.0.49-alpha.15",
+    "@budibase/string-templates": "^1.0.49-alpha.16",
     "regexparam": "^1.3.0",
     "rollup-plugin-polyfill-node": "^0.8.0",
     "shortid": "^2.2.15",
diff --git a/packages/server/package.json b/packages/server/package.json
index deca632044..7589b73f79 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.49-alpha.15",
+  "version": "1.0.49-alpha.16",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,9 +70,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.49-alpha.15",
-    "@budibase/client": "^1.0.49-alpha.15",
-    "@budibase/string-templates": "^1.0.49-alpha.15",
+    "@budibase/backend-core": "^1.0.49-alpha.16",
+    "@budibase/client": "^1.0.49-alpha.16",
+    "@budibase/string-templates": "^1.0.49-alpha.16",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 70a2607283..f30cd1ec85 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.49-alpha.15",
+  "version": "1.0.49-alpha.16",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 41dbeea5c4..3f3cd3356c 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.49-alpha.15",
+  "version": "1.0.49-alpha.16",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -34,8 +34,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.49-alpha.15",
-    "@budibase/string-templates": "^1.0.49-alpha.15",
+    "@budibase/backend-core": "^1.0.49-alpha.16",
+    "@budibase/string-templates": "^1.0.49-alpha.16",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

From 8bf26bed76700728469026aeb5a534612c0eda46 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 7 Feb 2022 20:42:24 +0000
Subject: [PATCH 29/31] v1.0.50-alpha.0

---
 lerna.json                             | 2 +-
 packages/backend-core/package.json     | 2 +-
 packages/bbui/package.json             | 2 +-
 packages/builder/package.json          | 8 ++++----
 packages/cli/package.json              | 2 +-
 packages/client/package.json           | 6 +++---
 packages/server/package.json           | 8 ++++----
 packages/string-templates/package.json | 2 +-
 packages/worker/package.json           | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lerna.json b/lerna.json
index 2e979b7175..2339e8a855 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.49",
+  "version": "1.0.50-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index b382fded28..28221a9041 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.49",
+  "version": "1.0.50-alpha.0",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 47e965375b..90d6125a06 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": "1.0.49",
+  "version": "1.0.50-alpha.0",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index c775afb304..b73a1da78b 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.49",
+  "version": "1.0.50-alpha.0",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -66,10 +66,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.49",
-    "@budibase/client": "^1.0.49",
+    "@budibase/bbui": "^1.0.50-alpha.0",
+    "@budibase/client": "^1.0.50-alpha.0",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^1.0.49",
+    "@budibase/string-templates": "^1.0.50-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 22872872c7..641f97806e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.49",
+  "version": "1.0.50-alpha.0",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index ff47301dff..e205aa15af 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.49",
+  "version": "1.0.50-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": "^1.0.49",
+    "@budibase/bbui": "^1.0.50-alpha.0",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^1.0.49",
+    "@budibase/string-templates": "^1.0.50-alpha.0",
     "regexparam": "^1.3.0",
     "rollup-plugin-polyfill-node": "^0.8.0",
     "shortid": "^2.2.15",
diff --git a/packages/server/package.json b/packages/server/package.json
index bee25d9eed..dc1de08b14 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.49",
+  "version": "1.0.50-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,9 +70,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.49",
-    "@budibase/client": "^1.0.49",
-    "@budibase/string-templates": "^1.0.49",
+    "@budibase/backend-core": "^1.0.50-alpha.0",
+    "@budibase/client": "^1.0.50-alpha.0",
+    "@budibase/string-templates": "^1.0.50-alpha.0",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index db56864d80..ff669e4220 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.49",
+  "version": "1.0.50-alpha.0",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index c95667f892..d896d51ff8 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.49",
+  "version": "1.0.50-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -34,8 +34,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.49",
-    "@budibase/string-templates": "^1.0.49",
+    "@budibase/backend-core": "^1.0.50-alpha.0",
+    "@budibase/string-templates": "^1.0.50-alpha.0",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

From 7019338b2dace75a6183f5feb9bacbebe43a7194 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 8 Feb 2022 11:30:23 +0000
Subject: [PATCH 30/31] Add dist to string-templates release

---
 packages/string-templates/package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index ff669e4220..7b7db0796a 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -13,6 +13,9 @@
     },
     "./package.json": "./package.json"
   },
+  "files": [
+    "dist"
+  ],
   "scripts": {
     "build": "tsc && rollup -c",
     "dev:builder": "tsc && rollup -cw",

From 5aa0b87e17d0314dd16ef159acf62ba1709419a5 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 8 Feb 2022 11:53:04 +0000
Subject: [PATCH 31/31] v1.0.50-alpha.1

---
 lerna.json                             | 2 +-
 packages/backend-core/package.json     | 2 +-
 packages/bbui/package.json             | 2 +-
 packages/builder/package.json          | 8 ++++----
 packages/cli/package.json              | 2 +-
 packages/client/package.json           | 6 +++---
 packages/server/package.json           | 8 ++++----
 packages/string-templates/package.json | 2 +-
 packages/worker/package.json           | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lerna.json b/lerna.json
index 2339e8a855..a1ba0a29d6 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.50-alpha.0",
+  "version": "1.0.50-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 28221a9041..53cd59f957 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.50-alpha.0",
+  "version": "1.0.50-alpha.1",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 90d6125a06..4cbb249df7 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": "1.0.50-alpha.0",
+  "version": "1.0.50-alpha.1",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index b73a1da78b..52b04cce6b 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.50-alpha.0",
+  "version": "1.0.50-alpha.1",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -66,10 +66,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.50-alpha.0",
-    "@budibase/client": "^1.0.50-alpha.0",
+    "@budibase/bbui": "^1.0.50-alpha.1",
+    "@budibase/client": "^1.0.50-alpha.1",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^1.0.50-alpha.0",
+    "@budibase/string-templates": "^1.0.50-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 641f97806e..86cbb1d468 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.50-alpha.0",
+  "version": "1.0.50-alpha.1",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index e205aa15af..782334bcda 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.50-alpha.0",
+  "version": "1.0.50-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": "^1.0.50-alpha.0",
+    "@budibase/bbui": "^1.0.50-alpha.1",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^1.0.50-alpha.0",
+    "@budibase/string-templates": "^1.0.50-alpha.1",
     "regexparam": "^1.3.0",
     "rollup-plugin-polyfill-node": "^0.8.0",
     "shortid": "^2.2.15",
diff --git a/packages/server/package.json b/packages/server/package.json
index dc1de08b14..875d328973 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.50-alpha.0",
+  "version": "1.0.50-alpha.1",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,9 +70,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.50-alpha.0",
-    "@budibase/client": "^1.0.50-alpha.0",
-    "@budibase/string-templates": "^1.0.50-alpha.0",
+    "@budibase/backend-core": "^1.0.50-alpha.1",
+    "@budibase/client": "^1.0.50-alpha.1",
+    "@budibase/string-templates": "^1.0.50-alpha.1",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 7b7db0796a..370c23f498 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.50-alpha.0",
+  "version": "1.0.50-alpha.1",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index d896d51ff8..03eca5e89f 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.50-alpha.0",
+  "version": "1.0.50-alpha.1",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -34,8 +34,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.50-alpha.0",
-    "@budibase/string-templates": "^1.0.50-alpha.0",
+    "@budibase/backend-core": "^1.0.50-alpha.1",
+    "@budibase/string-templates": "^1.0.50-alpha.1",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",