From 46a02ddb0c5a476ba74229522e663ba1d3c644de Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 7 Apr 2021 13:43:11 +0100
Subject: [PATCH 1/6] Fix route error when creating a view

---
 .../backend/DataTable/popovers/CreateViewPopover.svelte         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/DataTable/popovers/CreateViewPopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/CreateViewPopover.svelte
index ab4aa9ecae..93ca7bb211 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/CreateViewPopover.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/CreateViewPopover.svelte
@@ -26,7 +26,7 @@
     notifier.success(`View ${name} created`)
     onClosed()
     analytics.captureEvent("View Created", { name })
-    $goto(`../../../view/${name}`)
+    $goto(`../../view/${name}`)
   }
 </script>
 

From 99c8897500753dac9f6caffc37bcab5f8fa5219c Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 7 Apr 2021 13:46:26 +0100
Subject: [PATCH 2/6] Format tests

---
 .../cypress/integration/createView.spec.js    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/builder/cypress/integration/createView.spec.js b/packages/builder/cypress/integration/createView.spec.js
index a34f68422a..2d4bd121cb 100644
--- a/packages/builder/cypress/integration/createView.spec.js
+++ b/packages/builder/cypress/integration/createView.spec.js
@@ -109,15 +109,17 @@ context("Create a View", () => {
       .find(".ag-cell")
       .then($values => {
         const values = Array.from($values).map(value => value.textContent)
-        expect(values.sort()).to.deep.eq([
-          "Students",
-          "23.333333333333332",
-          "1650",
-          "3",
-          "25",
-          "20",
-          "70",
-        ].sort())
+        expect(values.sort()).to.deep.eq(
+          [
+            "Students",
+            "23.333333333333332",
+            "1650",
+            "3",
+            "25",
+            "20",
+            "70",
+          ].sort()
+        )
       })
   })
 

From a9f50556d3956af97eff859fd4e1ba6ca72d8c58 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 7 Apr 2021 15:08:59 +0100
Subject: [PATCH 3/6] Fix cypress tests not deleting old apps

---
 packages/builder/cypress/support/commands.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index 4a8d0b39d3..7ac317142d 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -57,9 +57,9 @@ Cypress.Commands.add("createApp", name => {
 
 Cypress.Commands.add("deleteApp", name => {
   cy.visit(`localhost:${Cypress.env("PORT")}/builder`)
-  cy.get("body").then($body => {
+  cy.get(".apps").then($apps => {
     cy.wait(1000)
-    if ($body.find(`[data-cy="app-${name}"]`).length) {
+    if ($apps.find(`[data-cy="app-${name}"]`).length) {
       cy.get(`[data-cy="app-${name}"] a`).click()
       cy.get("[data-cy=settings-icon]").click()
       cy.get(".modal-content").within(() => {

From e897a5ae61e158a1a27197920c5d914b4464eeaa Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 7 Apr 2021 15:09:35 +0100
Subject: [PATCH 4/6] Fix building loading settings modal before app package
 call finishes

---
 .../pages/builder/[application]/_reset.svelte | 106 +++++++++---------
 1 file changed, 56 insertions(+), 50 deletions(-)

diff --git a/packages/builder/src/pages/builder/[application]/_reset.svelte b/packages/builder/src/pages/builder/[application]/_reset.svelte
index 3be1942e44..2c066d28a5 100644
--- a/packages/builder/src/pages/builder/[application]/_reset.svelte
+++ b/packages/builder/src/pages/builder/[application]/_reset.svelte
@@ -45,65 +45,71 @@
   }
 </script>
 
-<div class="root">
-  <div class="top-nav">
-    <div class="topleftnav">
-      <button class="home-logo">
-        <img
-          src={Logo}
-          alt="budibase icon"
-          on:click={() => $goto(`/builder/`)} />
-      </button>
+{#await promise}
+  <!-- This should probably be some kind of loading state? -->
+  <div class="loading" />
+{:then _}
+  <div class="root">
+    <div class="top-nav">
+      <div class="topleftnav">
+        <button class="home-logo">
+          <img
+            src={Logo}
+            alt="budibase icon"
+            on:click={() => $goto(`/builder/`)} />
+        </button>
 
-      <!-- This gets all indexable subroutes and sticks them in the top nav. -->
-      {#each $layout.children as { path, title }}
-        <span
-          class:active={$isActive(path)}
-          class="topnavitem"
-          on:click={topItemNavigate(path)}>
-          {title}
-        </span>
-      {/each}
-    </div>
-    <div class="toprightnav">
-      <ThemeEditorDropdown />
-      <FeedbackNavLink />
-      <div class="topnavitemright">
-        <a
-          target="_blank"
-          href="https://github.com/Budibase/budibase/discussions">
-          <i class="ri-github-fill" />
-        </a>
+        <!-- This gets all indexable subroutes and sticks them in the top nav. -->
+        {#each $layout.children as { path, title }}
+          <span
+            class:active={$isActive(path)}
+            class="topnavitem"
+            on:click={topItemNavigate(path)}>
+            {title}
+          </span>
+        {/each}
       </div>
-      <SettingsLink />
+      <div class="toprightnav">
+        <ThemeEditorDropdown />
+        <FeedbackNavLink />
+        <div class="topnavitemright">
+          <a
+            target="_blank"
+            href="https://github.com/Budibase/budibase/discussions">
+            <i class="ri-github-fill" />
+          </a>
+        </div>
+        <SettingsLink />
+        <Button
+          secondary
+          on:click={() => {
+            window.open(`/${application}`)
+          }}>
+          Preview
+        </Button>
+      </div>
+    </div>
+    <div class="beta">
       <Button
         secondary
-        on:click={() => {
-          window.open(`/${application}`)
-        }}>
-        Preview
+        href="https://github.com/Budibase/budibase/discussions/categories/ideas">
+        Request feature
       </Button>
     </div>
-  </div>
-  <div class="beta">
-    <Button
-      secondary
-      href="https://github.com/Budibase/budibase/discussions/categories/ideas">
-      Request feature
-    </Button>
-  </div>
-
-  {#await promise}
-    <!-- This should probably be some kind of loading state? -->
-    <div />
-  {:then _}
     <slot />
-  {:catch error}
-    <p>Something went wrong: {error.message}</p>
-  {/await}
-</div>
+  </div>
+{:catch error}
+  <p>Something went wrong: {error.message}</p>
+{/await}
 
 <style>
+  .loading {
+    min-height: 100%;
+    height: 100%;
+    width: 100%;
+    background: var(--background);
+  }
+
   .root {
     min-height: 100%;
     height: 100%;

From 799a5285e331c52e31998d2259dd7a1053c65d8f Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 7 Apr 2021 15:10:03 +0100
Subject: [PATCH 5/6] Only hydrate state from URL once in design section to
 avoid cycles

---
 .../[application]/design/[assetType]/_layout.svelte        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/builder/src/pages/builder/[application]/design/[assetType]/_layout.svelte b/packages/builder/src/pages/builder/[application]/design/[assetType]/_layout.svelte
index 16f0a8323d..87fbb46586 100644
--- a/packages/builder/src/pages/builder/[application]/design/[assetType]/_layout.svelte
+++ b/packages/builder/src/pages/builder/[application]/design/[assetType]/_layout.svelte
@@ -18,6 +18,7 @@
   let previousType
   let previousAsset
   let previousComponentId
+  let hydrationComplete = false
 
   // Hydrate state from URL params
   $: hydrateStateFromURL($params, $leftover)
@@ -30,6 +31,12 @@
   )
 
   const hydrateStateFromURL = (params, leftover) => {
+    if (hydrationComplete) {
+      return
+    } else {
+      hydrationComplete = true
+    }
+
     // Do nothing if no asset type, as that means we've left the page
     if (!params.assetType) {
       return

From a66389f8a2e37112dbb788cef1dab75bc106711f Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 7 Apr 2021 15:14:49 +0100
Subject: [PATCH 6/6] Lint

---
 packages/bbui/src/Actions/position_dropdown.js                | 4 ++--
 packages/bbui/src/Stores/notifications.js                     | 2 --
 .../src/pages/builder/[application]/design/_layout.svelte     | 2 +-
 packages/builder/vite.config.js                               | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/bbui/src/Actions/position_dropdown.js b/packages/bbui/src/Actions/position_dropdown.js
index 01d0ec4553..9bf5a40a67 100644
--- a/packages/bbui/src/Actions/position_dropdown.js
+++ b/packages/bbui/src/Actions/position_dropdown.js
@@ -48,11 +48,11 @@ export default function positionDropdown(element, { anchor, align }) {
   element.style.left = `${calcLeftPosition(dimensions).toFixed(0)}px`
 
   const resizeObserver = new ResizeObserver(entries => {
-    for (let entry of entries) {
+    entries.forEach(() => {
       dimensions = getDimensions()
       element.style[positionSide] = `${dimensions[positionSide]}px`
       element.style.left = `${calcLeftPosition(dimensions).toFixed(0)}px`
-    }
+    })
   })
 
   resizeObserver.observe(anchor)
diff --git a/packages/bbui/src/Stores/notifications.js b/packages/bbui/src/Stores/notifications.js
index 481fb812e4..520e5c97b2 100644
--- a/packages/bbui/src/Stores/notifications.js
+++ b/packages/bbui/src/Stores/notifications.js
@@ -11,8 +11,6 @@ const createNotificationStore = () => {
     })
   }
 
-  let timers = []
-
   const notifications = derived(_notifications, ($_notifications, set) => {
     set($_notifications)
     if ($_notifications.length > 0) {
diff --git a/packages/builder/src/pages/builder/[application]/design/_layout.svelte b/packages/builder/src/pages/builder/[application]/design/_layout.svelte
index 6563895b08..d41fc0ee34 100644
--- a/packages/builder/src/pages/builder/[application]/design/_layout.svelte
+++ b/packages/builder/src/pages/builder/[application]/design/_layout.svelte
@@ -1,2 +1,2 @@
 <!-- routify:options index=1 -->
-<slot />
\ No newline at end of file
+<slot />
diff --git a/packages/builder/vite.config.js b/packages/builder/vite.config.js
index e5a708c919..e76491b54a 100644
--- a/packages/builder/vite.config.js
+++ b/packages/builder/vite.config.js
@@ -27,7 +27,7 @@ export default ({ mode }) => {
       }),
     ],
     optimizeDeps: {
-      include: ['ag-grid-community'],
+      include: ["ag-grid-community"],
       exclude: ["@roxi/routify"],
     },
     resolve: {