From b7ec577efd3ec7f97164ebf1f5ca520075d5ed5d Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 12 Dec 2023 16:57:41 +0100
Subject: [PATCH 01/28] Add redirect

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

diff --git a/packages/builder/src/api.js b/packages/builder/src/api.js
index 37894d9bbc..e93dae65f8 100644
--- a/packages/builder/src/api.js
+++ b/packages/builder/src/api.js
@@ -45,4 +45,9 @@ export const API = createAPIClient({
       }
     }
   },
+  onMigrationDetected: appId => {
+    window.location = `/builder/updating/${appId}?returnUrl=${encodeURI(
+      window.location
+    )}`
+  },
 })

From 9067d38dce059718577f7fee214f7a31495e14c4 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 12 Dec 2023 18:38:29 +0100
Subject: [PATCH 02/28] Create updating page

---
 packages/builder/src/api.js                        | 10 +++++++---
 .../src/pages/builder/updating/[appId].svelte      | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 packages/builder/src/pages/builder/updating/[appId].svelte

diff --git a/packages/builder/src/api.js b/packages/builder/src/api.js
index e93dae65f8..2fa48273f0 100644
--- a/packages/builder/src/api.js
+++ b/packages/builder/src/api.js
@@ -46,8 +46,12 @@ export const API = createAPIClient({
     }
   },
   onMigrationDetected: appId => {
-    window.location = `/builder/updating/${appId}?returnUrl=${encodeURI(
-      window.location
-    )}`
+    const updatingUrl = `/builder/updating/${appId}`
+
+    if (window.location.pathname === updatingUrl) {
+      return
+    }
+
+    window.location = `${updatingUrl}?returnUrl=${encodeURI(window.location)}`
   },
 })
diff --git a/packages/builder/src/pages/builder/updating/[appId].svelte b/packages/builder/src/pages/builder/updating/[appId].svelte
new file mode 100644
index 0000000000..69a2d58eed
--- /dev/null
+++ b/packages/builder/src/pages/builder/updating/[appId].svelte
@@ -0,0 +1,14 @@
+<script>
+  import Spinner from "components/common/Spinner.svelte"
+</script>
+
+<div class="loading">
+  <Spinner size="20" />
+</div>
+
+<style>
+  .loading {
+    display: flex;
+    justify-content: center;
+  }
+</style>

From a2cb32225d35a02179ba41d2ab191485b88a0678 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 12 Dec 2023 18:38:44 +0100
Subject: [PATCH 03/28] Checks

---
 .../src/pages/builder/updating/[appId].svelte   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/builder/src/pages/builder/updating/[appId].svelte b/packages/builder/src/pages/builder/updating/[appId].svelte
index 69a2d58eed..25092dd1a0 100644
--- a/packages/builder/src/pages/builder/updating/[appId].svelte
+++ b/packages/builder/src/pages/builder/updating/[appId].svelte
@@ -1,5 +1,22 @@
 <script>
   import Spinner from "components/common/Spinner.svelte"
+  import { API } from "api"
+
+  setInterval(async () => {
+    const response = await API.get({ url: "/api/migrations/status" })
+    if (!response.migrated) {
+      return
+    }
+
+    const urlParams = new URLSearchParams(window.location.search)
+    const returnUrl = urlParams.get("returnUrl")
+
+    window.location = returnUrl
+  }, 1000)
+
+  setTimeout(() => {
+    alert("Something went wrong 💀")
+  }, 60000)
 </script>
 
 <div class="loading">

From 0b8d7904dfba652c68751f709643b80f399866a1 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 13 Dec 2023 12:44:32 +0100
Subject: [PATCH 04/28] Encode url properly

---
 packages/builder/src/api.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/api.js b/packages/builder/src/api.js
index 2fa48273f0..4817ac2716 100644
--- a/packages/builder/src/api.js
+++ b/packages/builder/src/api.js
@@ -52,6 +52,8 @@ export const API = createAPIClient({
       return
     }
 
-    window.location = `${updatingUrl}?returnUrl=${encodeURI(window.location)}`
+    window.location = `${updatingUrl}?returnUrl=${encodeURIComponent(
+      window.location
+    )}`
   },
 })

From 342a1b487bc17d4aea7ddfd6d0d53037d523960c Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 13 Dec 2023 16:15:11 +0100
Subject: [PATCH 05/28] Update url

---
 packages/builder/src/api.js                                     | 2 +-
 .../[appId].svelte => app/[application]/updating.svelte}        | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/builder/src/pages/builder/{updating/[appId].svelte => app/[application]/updating.svelte} (100%)

diff --git a/packages/builder/src/api.js b/packages/builder/src/api.js
index 4817ac2716..a854137e2b 100644
--- a/packages/builder/src/api.js
+++ b/packages/builder/src/api.js
@@ -46,7 +46,7 @@ export const API = createAPIClient({
     }
   },
   onMigrationDetected: appId => {
-    const updatingUrl = `/builder/updating/${appId}`
+    const updatingUrl = `/builder/app/${appId}/updating`
 
     if (window.location.pathname === updatingUrl) {
       return
diff --git a/packages/builder/src/pages/builder/updating/[appId].svelte b/packages/builder/src/pages/builder/app/[application]/updating.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/updating/[appId].svelte
rename to packages/builder/src/pages/builder/app/[application]/updating.svelte

From 3a2a2a242cb906cf714864b95fdf0101bd808f15 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 14 Dec 2023 12:52:51 +0100
Subject: [PATCH 06/28] Change interval for timeout

---
 .../builder/app/[application]/updating.svelte | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/updating.svelte b/packages/builder/src/pages/builder/app/[application]/updating.svelte
index 25092dd1a0..22d6371c18 100644
--- a/packages/builder/src/pages/builder/app/[application]/updating.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/updating.svelte
@@ -2,19 +2,27 @@
   import Spinner from "components/common/Spinner.svelte"
   import { API } from "api"
 
-  setInterval(async () => {
-    const response = await API.get({ url: "/api/migrations/status" })
-    if (!response.migrated) {
-      return
-    }
+  let timeout
+  async function checkMigrationsFinished() {
+    timeout = setTimeout(async () => {
+      const response = await API.get({ url: "/api/migrations/status" })
+      if (!response.migrated) {
+        checkMigrationsFinished()
+        return
+      }
 
-    const urlParams = new URLSearchParams(window.location.search)
-    const returnUrl = urlParams.get("returnUrl")
+      const urlParams = new URLSearchParams(window.location.search)
+      const returnUrl = urlParams.get("returnUrl")
 
-    window.location = returnUrl
-  }, 1000)
+      window.location = returnUrl
+    }, 1000)
+  }
+
+  checkMigrationsFinished()
 
   setTimeout(() => {
+    clearTimeout(timeout)
+    // TODO
     alert("Something went wrong 💀")
   }, 60000)
 </script>

From 5f6210e9a06ae5c9b3e94f487314a22228bef841 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 14 Dec 2023 16:01:49 +0100
Subject: [PATCH 07/28] Use routify

---
 .../src/pages/builder/app/[application]/updating.svelte       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/updating.svelte b/packages/builder/src/pages/builder/app/[application]/updating.svelte
index 22d6371c18..a89a3a7165 100644
--- a/packages/builder/src/pages/builder/app/[application]/updating.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/updating.svelte
@@ -1,5 +1,7 @@
 <script>
   import Spinner from "components/common/Spinner.svelte"
+  import { goto } from "@roxi/routify"
+
   import { API } from "api"
 
   let timeout
@@ -14,7 +16,7 @@
       const urlParams = new URLSearchParams(window.location.search)
       const returnUrl = urlParams.get("returnUrl")
 
-      window.location = returnUrl
+      $goto(returnUrl)
     }, 1000)
   }
 

From bfd52b6c50427a49a731cfaea70fd456afd692f6 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 15 Dec 2023 13:27:16 +0100
Subject: [PATCH 08/28] Use routify

---
 packages/builder/src/api.js                   |  8 ++---
 .../builder/src/pages/builder/_layout.svelte  |  5 ++-
 packages/builder/src/stores/portal/index.js   |  1 +
 .../builder/src/stores/portal/navigation.js   | 35 +++++++++++++++++++
 4 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 packages/builder/src/stores/portal/navigation.js

diff --git a/packages/builder/src/api.js b/packages/builder/src/api.js
index a854137e2b..1cc4e2b3da 100644
--- a/packages/builder/src/api.js
+++ b/packages/builder/src/api.js
@@ -5,7 +5,7 @@ import {
 } from "@budibase/frontend-core"
 import { store } from "./builderStore"
 import { get } from "svelte/store"
-import { auth } from "./stores/portal"
+import { auth, navigation } from "./stores/portal"
 
 export const API = createAPIClient({
   attachHeaders: headers => {
@@ -52,8 +52,8 @@ export const API = createAPIClient({
       return
     }
 
-    window.location = `${updatingUrl}?returnUrl=${encodeURIComponent(
-      window.location
-    )}`
+    navigation.actions.goTo(
+      `${updatingUrl}?returnUrl=${encodeURIComponent(window.location)}`
+    )
   },
 })
diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte
index b216958045..fb9fdd68a4 100644
--- a/packages/builder/src/pages/builder/_layout.svelte
+++ b/packages/builder/src/pages/builder/_layout.svelte
@@ -1,10 +1,11 @@
 <script>
   import { isActive, redirect, params } from "@roxi/routify"
-  import { admin, auth, licensing } from "stores/portal"
+  import { admin, auth, licensing, navigation } from "stores/portal"
   import { onMount } from "svelte"
   import { CookieUtils, Constants } from "@budibase/frontend-core"
   import { API } from "api"
   import Branding from "./Branding.svelte"
+  import { goto } from "@roxi/routify"
 
   let loaded = false
 
@@ -17,6 +18,8 @@
 
   $: useAccountPortal = cloud && !$admin.disableAccountPortal
 
+  navigation.actions.init($goto)
+
   const validateTenantId = async () => {
     const host = window.location.host
     if (host.includes("localhost:") || !baseUrl) {
diff --git a/packages/builder/src/stores/portal/index.js b/packages/builder/src/stores/portal/index.js
index e70df5c3ee..7f1b9e10f0 100644
--- a/packages/builder/src/stores/portal/index.js
+++ b/packages/builder/src/stores/portal/index.js
@@ -16,5 +16,6 @@ export { environment } from "./environment"
 export { menu } from "./menu"
 export { auditLogs } from "./auditLogs"
 export { features } from "./features"
+export { navigation } from "./navigation"
 
 export const sideBarCollapsed = writable(false)
diff --git a/packages/builder/src/stores/portal/navigation.js b/packages/builder/src/stores/portal/navigation.js
new file mode 100644
index 0000000000..78a2851315
--- /dev/null
+++ b/packages/builder/src/stores/portal/navigation.js
@@ -0,0 +1,35 @@
+import { writable } from "svelte/store"
+
+export function createNavigationStore() {
+  const { subscribe } = writable([])
+
+  let initialisated = false
+  let _goTo
+
+  const init = goToFunc => {
+    initialisated = true
+    if (typeof goToFunc !== "function") {
+      throw new Error('A valid "goToFunc" must be provided')
+    }
+
+    _goTo = goToFunc
+  }
+
+  const goTo = (...params) => {
+    if (!initialisated) {
+      throw new Error("You need to call navigation.init first")
+    }
+
+    _goTo(...params)
+  }
+
+  return {
+    subscribe,
+    actions: {
+      init,
+      goTo,
+    },
+  }
+}
+
+export const navigation = createNavigationStore()

From 8515221cdfc7794563ed2788267e08a8c65e53c3 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 15 Dec 2023 13:37:22 +0100
Subject: [PATCH 09/28] Use store

---
 packages/builder/src/api.js                   |  2 +-
 .../builder/src/stores/portal/navigation.js   | 30 ++++++++-----------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/packages/builder/src/api.js b/packages/builder/src/api.js
index 1cc4e2b3da..9130c60dea 100644
--- a/packages/builder/src/api.js
+++ b/packages/builder/src/api.js
@@ -52,7 +52,7 @@ export const API = createAPIClient({
       return
     }
 
-    navigation.actions.goTo(
+    get(navigation).goto(
       `${updatingUrl}?returnUrl=${encodeURIComponent(window.location)}`
     )
   },
diff --git a/packages/builder/src/stores/portal/navigation.js b/packages/builder/src/stores/portal/navigation.js
index 78a2851315..a6d0f0a98e 100644
--- a/packages/builder/src/stores/portal/navigation.js
+++ b/packages/builder/src/stores/portal/navigation.js
@@ -1,33 +1,27 @@
 import { writable } from "svelte/store"
 
 export function createNavigationStore() {
-  const { subscribe } = writable([])
+  const store = writable({
+    initialisated: false,
+    goto: undefined,
+  })
+  const { set, subscribe, get } = store
 
-  let initialisated = false
-  let _goTo
-
-  const init = goToFunc => {
-    initialisated = true
-    if (typeof goToFunc !== "function") {
-      throw new Error('A valid "goToFunc" must be provided')
+  const init = gotoFunc => {
+    if (typeof gotoFunc !== "function") {
+      throw new Error('A valid "gotoFunc" must be provided')
     }
 
-    _goTo = goToFunc
-  }
-
-  const goTo = (...params) => {
-    if (!initialisated) {
-      throw new Error("You need to call navigation.init first")
-    }
-
-    _goTo(...params)
+    set({
+      initialisated: true,
+      goto: gotoFunc,
+    })
   }
 
   return {
     subscribe,
     actions: {
       init,
-      goTo,
     },
   }
 }

From f8ce1ee3654756e1a5851eb854b5902ea254dca5 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 15 Dec 2023 13:44:52 +0100
Subject: [PATCH 10/28] Use redirect instead of goto

---
 packages/builder/src/pages/builder/_layout.svelte | 3 +--
 packages/builder/src/stores/portal/navigation.js  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte
index fb9fdd68a4..62d3951fb5 100644
--- a/packages/builder/src/pages/builder/_layout.svelte
+++ b/packages/builder/src/pages/builder/_layout.svelte
@@ -5,7 +5,6 @@
   import { CookieUtils, Constants } from "@budibase/frontend-core"
   import { API } from "api"
   import Branding from "./Branding.svelte"
-  import { goto } from "@roxi/routify"
 
   let loaded = false
 
@@ -18,7 +17,7 @@
 
   $: useAccountPortal = cloud && !$admin.disableAccountPortal
 
-  navigation.actions.init($goto)
+  navigation.actions.init($redirect)
 
   const validateTenantId = async () => {
     const host = window.location.host
diff --git a/packages/builder/src/stores/portal/navigation.js b/packages/builder/src/stores/portal/navigation.js
index a6d0f0a98e..3fde06f7aa 100644
--- a/packages/builder/src/stores/portal/navigation.js
+++ b/packages/builder/src/stores/portal/navigation.js
@@ -5,7 +5,7 @@ export function createNavigationStore() {
     initialisated: false,
     goto: undefined,
   })
-  const { set, subscribe, get } = store
+  const { set, subscribe } = store
 
   const init = gotoFunc => {
     if (typeof gotoFunc !== "function") {

From bce1b86059e84ff26b0eee99068476b775530de2 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 15 Dec 2023 13:52:15 +0100
Subject: [PATCH 11/28] Use redirect instead of goto

---
 .../src/pages/builder/app/[application]/updating.svelte       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/updating.svelte b/packages/builder/src/pages/builder/app/[application]/updating.svelte
index a89a3a7165..4da91ed074 100644
--- a/packages/builder/src/pages/builder/app/[application]/updating.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/updating.svelte
@@ -1,6 +1,6 @@
 <script>
   import Spinner from "components/common/Spinner.svelte"
-  import { goto } from "@roxi/routify"
+  import { redirect } from "@roxi/routify"
 
   import { API } from "api"
 
@@ -16,7 +16,7 @@
       const urlParams = new URLSearchParams(window.location.search)
       const returnUrl = urlParams.get("returnUrl")
 
-      $goto(returnUrl)
+      $redirect(returnUrl)
     }, 1000)
   }
 

From 13f80ad7350082b5cac30eefab69578880c0dbad Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 15 Dec 2023 14:15:39 +0100
Subject: [PATCH 12/28] Tidy up

---
 .../builder/app/[application]/updating.svelte | 20 +++++++++++--------
 packages/frontend-core/src/api/index.js       |  2 ++
 packages/frontend-core/src/api/migrations.js  | 10 ++++++++++
 3 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 packages/frontend-core/src/api/migrations.js

diff --git a/packages/builder/src/pages/builder/app/[application]/updating.svelte b/packages/builder/src/pages/builder/app/[application]/updating.svelte
index 4da91ed074..dca01e3495 100644
--- a/packages/builder/src/pages/builder/app/[application]/updating.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/updating.svelte
@@ -4,13 +4,18 @@
 
   import { API } from "api"
 
-  let timeout
+  const timeoutMs = 60000 // 1 minute
+  const loadTime = Date.now()
+
   async function checkMigrationsFinished() {
-    timeout = setTimeout(async () => {
-      const response = await API.get({ url: "/api/migrations/status" })
+    setTimeout(async () => {
+      const response = await API.getMigrationStatus()
       if (!response.migrated) {
-        checkMigrationsFinished()
-        return
+        if (loadTime + timeoutMs > Date.now()) {
+          return checkMigrationsFinished()
+        }
+
+        return migrationTimeout()
       }
 
       const urlParams = new URLSearchParams(window.location.search)
@@ -22,11 +27,10 @@
 
   checkMigrationsFinished()
 
-  setTimeout(() => {
-    clearTimeout(timeout)
+  function migrationTimeout() {
     // TODO
     alert("Something went wrong 💀")
-  }, 60000)
+  }
 </script>
 
 <div class="loading">
diff --git a/packages/frontend-core/src/api/index.js b/packages/frontend-core/src/api/index.js
index d4b4f3636e..066ab16f6e 100644
--- a/packages/frontend-core/src/api/index.js
+++ b/packages/frontend-core/src/api/index.js
@@ -33,6 +33,7 @@ import { buildEnvironmentVariableEndpoints } from "./environmentVariables"
 import { buildEventEndpoints } from "./events"
 import { buildAuditLogsEndpoints } from "./auditLogs"
 import { buildLogsEndpoints } from "./logs"
+import { buildMigrationEndpoints } from "./migrations"
 
 /**
  * Random identifier to uniquely identify a session in a tab. This is
@@ -298,6 +299,7 @@ export const createAPIClient = config => {
     ...buildEventEndpoints(API),
     ...buildAuditLogsEndpoints(API),
     ...buildLogsEndpoints(API),
+    ...buildMigrationEndpoints(API),
     viewV2: buildViewV2Endpoints(API),
   }
 }
diff --git a/packages/frontend-core/src/api/migrations.js b/packages/frontend-core/src/api/migrations.js
new file mode 100644
index 0000000000..2da70d6fcb
--- /dev/null
+++ b/packages/frontend-core/src/api/migrations.js
@@ -0,0 +1,10 @@
+export const buildMigrationEndpoints = API => ({
+  /**
+   * Gets the info about the current app migration
+   */
+  getMigrationStatus: async () => {
+    return await API.get({
+      url: "/api/migrations/status",
+    })
+  },
+})

From c80504ca93d9afd54bc91a78d2bb2575aceb7711 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 18 Dec 2023 10:59:33 +0100
Subject: [PATCH 13/28] Use ?params

---
 packages/builder/src/api.js                                | 2 +-
 .../src/pages/builder/app/[application]/updating.svelte    | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/api.js b/packages/builder/src/api.js
index 9130c60dea..febf6603bb 100644
--- a/packages/builder/src/api.js
+++ b/packages/builder/src/api.js
@@ -53,7 +53,7 @@ export const API = createAPIClient({
     }
 
     get(navigation).goto(
-      `${updatingUrl}?returnUrl=${encodeURIComponent(window.location)}`
+      `${updatingUrl}?returnUrl=${encodeURIComponent(window.location.pathname)}`
     )
   },
 })
diff --git a/packages/builder/src/pages/builder/app/[application]/updating.svelte b/packages/builder/src/pages/builder/app/[application]/updating.svelte
index dca01e3495..0ea9de2ee3 100644
--- a/packages/builder/src/pages/builder/app/[application]/updating.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/updating.svelte
@@ -1,6 +1,6 @@
 <script>
   import Spinner from "components/common/Spinner.svelte"
-  import { redirect } from "@roxi/routify"
+  import { redirect, params } from "@roxi/routify"
 
   import { API } from "api"
 
@@ -18,9 +18,8 @@
         return migrationTimeout()
       }
 
-      const urlParams = new URLSearchParams(window.location.search)
-      const returnUrl = urlParams.get("returnUrl")
-
+      // For some reason routify params is not stripping the ? properly, so we need to check both with and without ?
+      const returnUrl = $params.returnUrl || $params["?returnUrl"]
       $redirect(returnUrl)
     }, 1000)
   }

From e4f70d12e9b9792dd4add2a4eaadbeb198c32c8c Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 4 Jan 2024 12:14:05 +0100
Subject: [PATCH 14/28] Change url

---
 packages/builder/src/api.js                                     | 2 +-
 .../updating.svelte => updating/[application].svelte}           | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/builder/src/pages/builder/app/{[application]/updating.svelte => updating/[application].svelte} (100%)

diff --git a/packages/builder/src/api.js b/packages/builder/src/api.js
index febf6603bb..ac878bf82f 100644
--- a/packages/builder/src/api.js
+++ b/packages/builder/src/api.js
@@ -46,7 +46,7 @@ export const API = createAPIClient({
     }
   },
   onMigrationDetected: appId => {
-    const updatingUrl = `/builder/app/${appId}/updating`
+    const updatingUrl = `/builder/app/updating/${appId}`
 
     if (window.location.pathname === updatingUrl) {
       return
diff --git a/packages/builder/src/pages/builder/app/[application]/updating.svelte b/packages/builder/src/pages/builder/app/updating/[application].svelte
similarity index 100%
rename from packages/builder/src/pages/builder/app/[application]/updating.svelte
rename to packages/builder/src/pages/builder/app/updating/[application].svelte

From 401f057b0447cf88df121324e16af5cfad329ace Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 4 Jan 2024 12:23:46 +0100
Subject: [PATCH 15/28] Basic design

---
 .../builder/app/updating/[application].svelte     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/builder/src/pages/builder/app/updating/[application].svelte b/packages/builder/src/pages/builder/app/updating/[application].svelte
index 0ea9de2ee3..bbcdccf917 100644
--- a/packages/builder/src/pages/builder/app/updating/[application].svelte
+++ b/packages/builder/src/pages/builder/app/updating/[application].svelte
@@ -33,6 +33,11 @@
 </script>
 
 <div class="loading">
+  <p class="loading-message">
+    🛠️ We are updating the system. <br />Please wait, we will be back in a
+    second!
+  </p>
+
   <Spinner size="20" />
 </div>
 
@@ -40,5 +45,15 @@
   .loading {
     display: flex;
     justify-content: center;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    gap: var(--spacing-xl);
+    height: 100vh;
+    margin: 0;
+  }
+  .loading-message {
+    text-align: center;
+    font-size: 18px;
   }
 </style>

From ec4324697427d58e3ab5a211813f5dc9baf6c240 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 4 Jan 2024 12:28:36 +0100
Subject: [PATCH 16/28] Error

---
 .../builder/app/updating/[application].svelte | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/updating/[application].svelte b/packages/builder/src/pages/builder/app/updating/[application].svelte
index bbcdccf917..ff8a873700 100644
--- a/packages/builder/src/pages/builder/app/updating/[application].svelte
+++ b/packages/builder/src/pages/builder/app/updating/[application].svelte
@@ -7,6 +7,8 @@
   const timeoutMs = 60000 // 1 minute
   const loadTime = Date.now()
 
+  let timedOut = false
+
   async function checkMigrationsFinished() {
     setTimeout(async () => {
       const response = await API.getMigrationStatus()
@@ -27,18 +29,23 @@
   checkMigrationsFinished()
 
   function migrationTimeout() {
-    // TODO
-    alert("Something went wrong 💀")
+    timedOut = true
   }
 </script>
 
 <div class="loading">
-  <p class="loading-message">
-    🛠️ We are updating the system. <br />Please wait, we will be back in a
-    second!
-  </p>
+  {#if !timedOut}
+    <p class="loading-message">
+      🛠️ We are updating the system. <br />Please wait, we will be back in a
+      second!
+    </p>
 
-  <Spinner size="20" />
+    <Spinner size="20" />
+  {:else}
+    <p class="loading-message timeout">
+      An error occurred. Please try again later.
+    </p>
+  {/if}
 </div>
 
 <style>
@@ -56,4 +63,7 @@
     text-align: center;
     font-size: 18px;
   }
+  .timeout {
+    color: rgb(196, 46, 46);
+  }
 </style>

From b115ead329e7da914bfceb035ade56543998a38e Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 8 Jan 2024 10:46:14 +0100
Subject: [PATCH 17/28] Format frontend

---
 .../builder/app/updating/[application].svelte | 40 +++++++++----------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/updating/[application].svelte b/packages/builder/src/pages/builder/app/updating/[application].svelte
index ff8a873700..6994331eff 100644
--- a/packages/builder/src/pages/builder/app/updating/[application].svelte
+++ b/packages/builder/src/pages/builder/app/updating/[application].svelte
@@ -1,10 +1,9 @@
 <script>
-  import Spinner from "components/common/Spinner.svelte"
   import { redirect, params } from "@roxi/routify"
 
   import { API } from "api"
 
-  const timeoutMs = 60000 // 1 minute
+  const timeoutMs = 180000 // 3 minutes
   const loadTime = Date.now()
 
   let timedOut = false
@@ -31,39 +30,36 @@
   function migrationTimeout() {
     timedOut = true
   }
+
+  $: text = !timedOut ? "System update" : "Something went wrong!"
+  $: subtext = !timedOut
+    ? "Please wait and we will be back in a second!"
+    : "An error occurred, please try again later"
 </script>
 
-<div class="loading">
-  {#if !timedOut}
-    <p class="loading-message">
-      🛠️ We are updating the system. <br />Please wait, we will be back in a
-      second!
-    </p>
-
-    <Spinner size="20" />
-  {:else}
-    <p class="loading-message timeout">
-      An error occurred. Please try again later.
-    </p>
-  {/if}
+<div class="loading" class:timeout={timedOut}>
+  <span class="header">{text}</span>
+  <span class="subtext">{subtext}</span>
 </div>
 
 <style>
   .loading {
     display: flex;
     justify-content: center;
-    align-items: center;
-    justify-content: center;
     flex-direction: column;
-    gap: var(--spacing-xl);
+    gap: var(--spacing-l);
     height: 100vh;
-    margin: 0;
-  }
-  .loading-message {
     text-align: center;
     font-size: 18px;
   }
-  .timeout {
+  .header {
+    font-weight: 700;
+  }
+  .timeout .header {
     color: rgb(196, 46, 46);
   }
+  .subtext {
+    font-size: 16px;
+    color: var(--grey-7);
+  }
 </style>

From a427b322beaa5ab63bc9969f83cde54ac1bd7b3e Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 8 Jan 2024 11:11:46 +0100
Subject: [PATCH 18/28] Move ui to frontend-core

---
 .../builder/app/updating/[application].svelte | 64 +++----------------
 .../src/components/Updating.svelte            | 61 ++++++++++++++++++
 .../frontend-core/src/components/index.js     |  1 +
 3 files changed, 71 insertions(+), 55 deletions(-)
 create mode 100644 packages/frontend-core/src/components/Updating.svelte

diff --git a/packages/builder/src/pages/builder/app/updating/[application].svelte b/packages/builder/src/pages/builder/app/updating/[application].svelte
index 6994331eff..ec6196aaca 100644
--- a/packages/builder/src/pages/builder/app/updating/[application].svelte
+++ b/packages/builder/src/pages/builder/app/updating/[application].svelte
@@ -1,65 +1,19 @@
 <script>
+  import { Updating } from "@budibase/frontend-core"
   import { redirect, params } from "@roxi/routify"
 
   import { API } from "api"
 
-  const timeoutMs = 180000 // 3 minutes
-  const loadTime = Date.now()
-
-  let timedOut = false
-
-  async function checkMigrationsFinished() {
-    setTimeout(async () => {
-      const response = await API.getMigrationStatus()
-      if (!response.migrated) {
-        if (loadTime + timeoutMs > Date.now()) {
-          return checkMigrationsFinished()
-        }
-
-        return migrationTimeout()
-      }
-
-      // For some reason routify params is not stripping the ? properly, so we need to check both with and without ?
-      const returnUrl = $params.returnUrl || $params["?returnUrl"]
-      $redirect(returnUrl)
-    }, 1000)
+  async function isMigrationDone() {
+    const response = await API.getMigrationStatus()
+    return response.migrated
   }
 
-  checkMigrationsFinished()
-
-  function migrationTimeout() {
-    timedOut = true
+  async function onMigrationDone() {
+    // For some reason routify params is not stripping the ? properly, so we need to check both with and without ?
+    const returnUrl = $params.returnUrl || $params["?returnUrl"]
+    $redirect(returnUrl)
   }
-
-  $: text = !timedOut ? "System update" : "Something went wrong!"
-  $: subtext = !timedOut
-    ? "Please wait and we will be back in a second!"
-    : "An error occurred, please try again later"
 </script>
 
-<div class="loading" class:timeout={timedOut}>
-  <span class="header">{text}</span>
-  <span class="subtext">{subtext}</span>
-</div>
-
-<style>
-  .loading {
-    display: flex;
-    justify-content: center;
-    flex-direction: column;
-    gap: var(--spacing-l);
-    height: 100vh;
-    text-align: center;
-    font-size: 18px;
-  }
-  .header {
-    font-weight: 700;
-  }
-  .timeout .header {
-    color: rgb(196, 46, 46);
-  }
-  .subtext {
-    font-size: 16px;
-    color: var(--grey-7);
-  }
-</style>
+<Updating timeoutMs={180000} {isMigrationDone} {onMigrationDone} />
diff --git a/packages/frontend-core/src/components/Updating.svelte b/packages/frontend-core/src/components/Updating.svelte
new file mode 100644
index 0000000000..b591c7e61c
--- /dev/null
+++ b/packages/frontend-core/src/components/Updating.svelte
@@ -0,0 +1,61 @@
+<script>
+  export let isMigrationDone
+  export let onMigrationDone
+  export let timeoutMs = 180000 // 3 minutes
+
+  const loadTime = Date.now()
+  let timedOut = false
+
+  async function checkMigrationsFinished() {
+    setTimeout(async () => {
+      const isMigrated = await isMigrationDone()
+      if (!isMigrated) {
+        if (loadTime + timeoutMs > Date.now()) {
+          return checkMigrationsFinished()
+        }
+
+        return migrationTimeout()
+      }
+
+      onMigrationDone()
+    }, 1000)
+  }
+
+  checkMigrationsFinished()
+
+  function migrationTimeout() {
+    timedOut = true
+  }
+
+  $: text = !timedOut ? "System update" : "Something went wrong!"
+  $: subtext = !timedOut
+    ? "Please wait and we will be back in a second!"
+    : "An error occurred, please try again later"
+</script>
+
+<div class="loading" class:timeout={timedOut}>
+  <span class="header">{text}</span>
+  <span class="subtext">{subtext}</span>
+</div>
+
+<style>
+  .loading {
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+    gap: var(--spacing-l);
+    height: 100vh;
+    text-align: center;
+    font-size: 18px;
+  }
+  .header {
+    font-weight: 700;
+  }
+  .timeout .header {
+    color: rgb(196, 46, 46);
+  }
+  .subtext {
+    font-size: 16px;
+    color: var(--grey-7);
+  }
+</style>
diff --git a/packages/frontend-core/src/components/index.js b/packages/frontend-core/src/components/index.js
index 01a7c78cb8..f724e1e4d9 100644
--- a/packages/frontend-core/src/components/index.js
+++ b/packages/frontend-core/src/components/index.js
@@ -3,4 +3,5 @@ export { default as TestimonialPage } from "./TestimonialPage.svelte"
 export { default as Testimonial } from "./Testimonial.svelte"
 export { default as UserAvatar } from "./UserAvatar.svelte"
 export { default as UserAvatars } from "./UserAvatars.svelte"
+export { default as Updating } from "./Updating.svelte"
 export { Grid } from "./grid"

From d46b22e4a6af1dccd8353d176c879b5a48643682 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 8 Jan 2024 11:52:31 +0100
Subject: [PATCH 19/28] Fix initial checks

---
 packages/server/src/appMigrations/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/appMigrations/index.ts b/packages/server/src/appMigrations/index.ts
index b382d8b533..0758b9f324 100644
--- a/packages/server/src/appMigrations/index.ts
+++ b/packages/server/src/appMigrations/index.ts
@@ -17,7 +17,7 @@ export const getLatestMigrationId = () =>
     .sort()
     .reverse()[0]
 
-const getTimestamp = (versionId: string) => versionId?.split("_")[0]
+const getTimestamp = (versionId: string) => versionId?.split("_")[0] || ""
 
 export async function checkMissingMigrations(
   ctx: UserCtx,

From a8019d86cca93376a5e00f1697a09e6d67e8c54a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 8 Jan 2024 12:09:24 +0100
Subject: [PATCH 20/28] Move api checks

---
 .../src/pages/builder/app/updating/[application].svelte  | 9 +--------
 packages/frontend-core/src/components/Updating.svelte    | 8 +++++---
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/updating/[application].svelte b/packages/builder/src/pages/builder/app/updating/[application].svelte
index ec6196aaca..ec851fa08d 100644
--- a/packages/builder/src/pages/builder/app/updating/[application].svelte
+++ b/packages/builder/src/pages/builder/app/updating/[application].svelte
@@ -2,13 +2,6 @@
   import { Updating } from "@budibase/frontend-core"
   import { redirect, params } from "@roxi/routify"
 
-  import { API } from "api"
-
-  async function isMigrationDone() {
-    const response = await API.getMigrationStatus()
-    return response.migrated
-  }
-
   async function onMigrationDone() {
     // For some reason routify params is not stripping the ? properly, so we need to check both with and without ?
     const returnUrl = $params.returnUrl || $params["?returnUrl"]
@@ -16,4 +9,4 @@
   }
 </script>
 
-<Updating timeoutMs={180000} {isMigrationDone} {onMigrationDone} />
+<Updating {onMigrationDone} />
diff --git a/packages/frontend-core/src/components/Updating.svelte b/packages/frontend-core/src/components/Updating.svelte
index b591c7e61c..57433c1164 100644
--- a/packages/frontend-core/src/components/Updating.svelte
+++ b/packages/frontend-core/src/components/Updating.svelte
@@ -1,5 +1,6 @@
 <script>
-  export let isMigrationDone
+  import { API } from "api"
+
   export let onMigrationDone
   export let timeoutMs = 180000 // 3 minutes
 
@@ -8,8 +9,9 @@
 
   async function checkMigrationsFinished() {
     setTimeout(async () => {
-      const isMigrated = await isMigrationDone()
-      if (!isMigrated) {
+      const response = await API.getMigrationStatus()
+
+      if (!response.migrated) {
         if (loadTime + timeoutMs > Date.now()) {
           return checkMigrationsFinished()
         }

From 83dce5de267a39dde5c38b29c1ff640ca198e641 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 8 Jan 2024 12:48:04 +0100
Subject: [PATCH 21/28] Update error message

Co-authored-by: Sam Rose <hello@samwho.dev>
---
 packages/builder/src/stores/portal/navigation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/stores/portal/navigation.js b/packages/builder/src/stores/portal/navigation.js
index 3fde06f7aa..7bcda68eee 100644
--- a/packages/builder/src/stores/portal/navigation.js
+++ b/packages/builder/src/stores/portal/navigation.js
@@ -9,7 +9,7 @@ export function createNavigationStore() {
 
   const init = gotoFunc => {
     if (typeof gotoFunc !== "function") {
-      throw new Error('A valid "gotoFunc" must be provided')
+      throw new Error(`gotoFunc must be a function, found a "${typeof gotoFunc}" instead`)
     }
 
     set({

From 13325b63a274701af96c6a0e6cc1f7ea18482500 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 8 Jan 2024 12:51:29 +0100
Subject: [PATCH 22/28] Use seconds instead of ms

---
 packages/frontend-core/src/components/Updating.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/frontend-core/src/components/Updating.svelte b/packages/frontend-core/src/components/Updating.svelte
index 57433c1164..fb5171a6ca 100644
--- a/packages/frontend-core/src/components/Updating.svelte
+++ b/packages/frontend-core/src/components/Updating.svelte
@@ -2,7 +2,7 @@
   import { API } from "api"
 
   export let onMigrationDone
-  export let timeoutMs = 180000 // 3 minutes
+  export let timeoutSeconds = 3 * 60 // 3 minutes
 
   const loadTime = Date.now()
   let timedOut = false
@@ -11,6 +11,7 @@
     setTimeout(async () => {
       const response = await API.getMigrationStatus()
 
+      const timeoutMs = timeoutSeconds * 1000
       if (!response.migrated) {
         if (loadTime + timeoutMs > Date.now()) {
           return checkMigrationsFinished()

From f7f51e790980f3793ec5bcc793d89b0f22be2d7f Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 8 Jan 2024 13:07:33 +0100
Subject: [PATCH 23/28] Change copy

---
 .../src/components/Updating.svelte            | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/packages/frontend-core/src/components/Updating.svelte b/packages/frontend-core/src/components/Updating.svelte
index fb5171a6ca..6b8a86425e 100644
--- a/packages/frontend-core/src/components/Updating.svelte
+++ b/packages/frontend-core/src/components/Updating.svelte
@@ -29,16 +29,25 @@
   function migrationTimeout() {
     timedOut = true
   }
-
-  $: text = !timedOut ? "System update" : "Something went wrong!"
-  $: subtext = !timedOut
-    ? "Please wait and we will be back in a second!"
-    : "An error occurred, please try again later"
 </script>
 
 <div class="loading" class:timeout={timedOut}>
-  <span class="header">{text}</span>
-  <span class="subtext">{subtext}</span>
+  <span class="header">
+    {#if !timedOut}
+      System update
+    {:else}
+      Something went wrong!
+    {/if}
+  </span>
+  <span class="subtext">
+    {#if !timedOut}
+      Please wait and we will be back in a second!
+    {:else}
+      An error occurred, please try again later.
+      <br />
+      Contact support if the issue persists.
+    {/if}</span
+  >
 </div>
 
 <style>

From 72410d1f281a7f10a2db37142e68aba0f625ae51 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 8 Jan 2024 13:10:40 +0100
Subject: [PATCH 24/28] Lint

---
 packages/builder/src/stores/portal/navigation.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/stores/portal/navigation.js b/packages/builder/src/stores/portal/navigation.js
index 7bcda68eee..67a06eff53 100644
--- a/packages/builder/src/stores/portal/navigation.js
+++ b/packages/builder/src/stores/portal/navigation.js
@@ -9,7 +9,9 @@ export function createNavigationStore() {
 
   const init = gotoFunc => {
     if (typeof gotoFunc !== "function") {
-      throw new Error(`gotoFunc must be a function, found a "${typeof gotoFunc}" instead`)
+      throw new Error(
+        `gotoFunc must be a function, found a "${typeof gotoFunc}" instead`
+      )
     }
 
     set({

From 82ce1f2e93e388149d8239b14034424be7c1b43d Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 8 Jan 2024 13:31:41 +0100
Subject: [PATCH 25/28] Add link

---
 packages/frontend-core/src/components/Updating.svelte | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/frontend-core/src/components/Updating.svelte b/packages/frontend-core/src/components/Updating.svelte
index 6b8a86425e..7a13de3ca5 100644
--- a/packages/frontend-core/src/components/Updating.svelte
+++ b/packages/frontend-core/src/components/Updating.svelte
@@ -45,7 +45,9 @@
     {:else}
       An error occurred, please try again later.
       <br />
-      Contact support if the issue persists.
+      Contact
+      <a href="https://budibase.com/support/" target="_blank">support</a> if the
+      issue persists.
     {/if}</span
   >
 </div>
@@ -70,4 +72,9 @@
     font-size: 16px;
     color: var(--grey-7);
   }
+
+  .subtext a {
+    color: var(--grey-7);
+    font-weight: 700;
+  }
 </style>

From 43aca917d718d4b75f0280fa5f2087d79958b234 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 8 Jan 2024 13:33:41 +0100
Subject: [PATCH 26/28] Fix import

---
 packages/frontend-core/src/components/Updating.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend-core/src/components/Updating.svelte b/packages/frontend-core/src/components/Updating.svelte
index 7a13de3ca5..0b80fd2391 100644
--- a/packages/frontend-core/src/components/Updating.svelte
+++ b/packages/frontend-core/src/components/Updating.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { API } from "api"
+  import { API } from "../api"
 
   export let onMigrationDone
   export let timeoutSeconds = 3 * 60 // 3 minutes

From 3dcb3dec3f5bca818cf6526212a9e41105287367 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 8 Jan 2024 13:35:07 +0100
Subject: [PATCH 27/28] Fix import

---
 packages/frontend-core/src/components/Updating.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend-core/src/components/Updating.svelte b/packages/frontend-core/src/components/Updating.svelte
index 0b80fd2391..16e4b51de4 100644
--- a/packages/frontend-core/src/components/Updating.svelte
+++ b/packages/frontend-core/src/components/Updating.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { API } from "../api"
+  import * as API from "../api"
 
   export let onMigrationDone
   export let timeoutSeconds = 3 * 60 // 3 minutes

From 03a933005d7f3c4bb595b6ee6e4d2f95aca987d3 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 8 Jan 2024 13:42:38 +0100
Subject: [PATCH 28/28] Pass isMigrationDone

---
 .../src/pages/builder/app/updating/[application].svelte  | 9 ++++++++-
 packages/frontend-core/src/components/Updating.svelte    | 9 ++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/updating/[application].svelte b/packages/builder/src/pages/builder/app/updating/[application].svelte
index ec851fa08d..1f92861edf 100644
--- a/packages/builder/src/pages/builder/app/updating/[application].svelte
+++ b/packages/builder/src/pages/builder/app/updating/[application].svelte
@@ -2,6 +2,13 @@
   import { Updating } from "@budibase/frontend-core"
   import { redirect, params } from "@roxi/routify"
 
+  import { API } from "api"
+
+  async function isMigrationDone() {
+    const response = await API.getMigrationStatus()
+    return response.migrated
+  }
+
   async function onMigrationDone() {
     // For some reason routify params is not stripping the ? properly, so we need to check both with and without ?
     const returnUrl = $params.returnUrl || $params["?returnUrl"]
@@ -9,4 +16,4 @@
   }
 </script>
 
-<Updating {onMigrationDone} />
+<Updating {isMigrationDone} {onMigrationDone} />
diff --git a/packages/frontend-core/src/components/Updating.svelte b/packages/frontend-core/src/components/Updating.svelte
index 16e4b51de4..7d4a101fee 100644
--- a/packages/frontend-core/src/components/Updating.svelte
+++ b/packages/frontend-core/src/components/Updating.svelte
@@ -1,18 +1,17 @@
 <script>
-  import * as API from "../api"
-
+  export let isMigrationDone
   export let onMigrationDone
-  export let timeoutSeconds = 3 * 60 // 3 minutes
+  export let timeoutSeconds = 10 // 3 minutes
 
   const loadTime = Date.now()
   let timedOut = false
 
   async function checkMigrationsFinished() {
     setTimeout(async () => {
-      const response = await API.getMigrationStatus()
+      const isMigrated = await isMigrationDone()
 
       const timeoutMs = timeoutSeconds * 1000
-      if (!response.migrated) {
+      if (!isMigrated) {
         if (loadTime + timeoutMs > Date.now()) {
           return checkMigrationsFinished()
         }