From 75b8190c01898b3522ce5605191d6a9211cd09a1 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 19 Dec 2023 12:05:27 +0100
Subject: [PATCH] Move updating page to the client

---
 .../src/components/UpdatingApp.svelte}                    | 3 +++
 packages/client/src/index.js                              | 8 ++++++++
 packages/server/src/api/controllers/static/index.ts       | 7 +++----
 .../api/controllers/static/templates/BudibaseApp.svelte   | 6 ++++++
 4 files changed, 20 insertions(+), 4 deletions(-)
 rename packages/{server/src/api/controllers/static/templates/Updating.svelte => client/src/components/UpdatingApp.svelte} (86%)

diff --git a/packages/server/src/api/controllers/static/templates/Updating.svelte b/packages/client/src/components/UpdatingApp.svelte
similarity index 86%
rename from packages/server/src/api/controllers/static/templates/Updating.svelte
rename to packages/client/src/components/UpdatingApp.svelte
index 5c7e23b5b3..b24f591c5c 100644
--- a/packages/server/src/api/controllers/static/templates/Updating.svelte
+++ b/packages/client/src/components/UpdatingApp.svelte
@@ -1,3 +1,6 @@
+<script>
+</script>
+
 <div class="loading">Updating the system...</div>
 
 <style>
diff --git a/packages/client/src/index.js b/packages/client/src/index.js
index a3cb4206c3..f6ed23b2a9 100644
--- a/packages/client/src/index.js
+++ b/packages/client/src/index.js
@@ -1,4 +1,5 @@
 import ClientApp from "./components/ClientApp.svelte"
+import UpdatingApp from "./components/UpdatingApp.svelte"
 import {
   builderStore,
   appStore,
@@ -52,6 +53,13 @@ const loadBudibase = async () => {
     window["##BUDIBASE_APP_EMBEDDED##"] === "true"
   )
 
+  if (window.MIGRATING_APP) {
+    new UpdatingApp({
+      target: window.document.body,
+    })
+    return
+  }
+
   // Fetch environment info
   if (!get(environmentStore)?.loaded) {
     await environmentStore.actions.fetchEnvironment()
diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts
index c23ea349d4..0166f92478 100644
--- a/packages/server/src/api/controllers/static/index.ts
+++ b/packages/server/src/api/controllers/static/index.ts
@@ -156,10 +156,6 @@ export const serveApp = async function (ctx: Ctx) {
     appHbsPath = join(__dirname, "templates", "app.hbs")
   }
 
-  const App = !needMigrations
-    ? require("./templates/BudibaseApp.svelte").default
-    : require("./templates/Updating.svelte").default
-
   let db
   try {
     db = context.getAppDB({ skip_setup: true })
@@ -168,6 +164,7 @@ export const serveApp = async function (ctx: Ctx) {
 
     if (!env.isJest()) {
       const plugins = objectStore.enrichPluginURLs(appInfo.usedPlugins)
+      const App = require("./templates/BudibaseApp.svelte").default
       const { head, html, css } = App.render({
         metaImage:
           branding?.metaImageUrl ||
@@ -188,6 +185,7 @@ export const serveApp = async function (ctx: Ctx) {
           config?.logoUrl !== ""
             ? objectStore.getGlobalFileUrl("settings", "logoUrl")
             : "",
+        appMigrating: needMigrations,
       })
       const appHbs = loadHandlebarsFile(appHbsPath)
       ctx.body = await processString(appHbs, {
@@ -203,6 +201,7 @@ export const serveApp = async function (ctx: Ctx) {
     }
   } catch (error) {
     if (!env.isJest()) {
+      const App = require("./templates/BudibaseApp.svelte").default
       const { head, html, css } = App.render({
         title: branding?.metaTitle,
         metaTitle: branding?.metaTitle,
diff --git a/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte b/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte
index 32edb6dc7b..7819368fc0 100644
--- a/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte
+++ b/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte
@@ -8,6 +8,7 @@
 
   export let clientLibPath
   export let usedPlugins
+  export let appMigrating
 </script>
 
 <svelte:head>
@@ -110,6 +111,11 @@
   <script type="application/javascript">
     window.INIT_TIME = Date.now()
   </script>
+  {#if appMigrating}
+    <script type="application/javascript">
+      window.MIGRATING_APP = true
+    </script>
+  {/if}
   <script type="application/javascript" src={clientLibPath}>
   </script>
   <!-- Custom components need inserted after the core client library -->