From dd8e54c5e13fe8de7947afc0c1d748adbffbc603 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Thu, 15 Jun 2023 15:20:14 +0100
Subject: [PATCH 1/3] update airgap script and enable support for offline mode

---
 .../scripts/airgapped/airgappedDockerBuild.js | 21 ++++++++++++-------
 package.json                                  |  1 +
 .../pages/builder/portal/apps/_layout.svelte  | 21 ++++++++++++-------
 .../pages/builder/portal/apps/index.svelte    |  2 +-
 packages/builder/src/stores/portal/admin.js   |  1 +
 packages/server/src/environment.ts            |  1 +
 .../src/api/controllers/system/environment.ts |  1 +
 .../routes/system/tests/environment.spec.ts   |  1 +
 packages/worker/src/environment.ts            |  1 +
 9 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/hosting/scripts/airgapped/airgappedDockerBuild.js b/hosting/scripts/airgapped/airgappedDockerBuild.js
index cc0ea48eb3..58bc7c09a9 100755
--- a/hosting/scripts/airgapped/airgappedDockerBuild.js
+++ b/hosting/scripts/airgapped/airgappedDockerBuild.js
@@ -2,7 +2,9 @@ const fs = require("fs")
 const { execSync } = require("child_process")
 const path = require("path")
 
-const IMAGES = {
+const IS_SINGLE_IMAGE = process.env.SINGLE_IMAGE
+
+let IMAGES = {
 	worker: "budibase/worker",
 	apps: "budibase/apps",
 	proxy: "budibase/proxy",
@@ -10,7 +12,13 @@ const IMAGES = {
 	couch: "ibmcom/couchdb3",
 	curl: "curlimages/curl",
 	redis: "redis",
-	watchtower: "containrrr/watchtower"
+	watchtower: "containrrr/watchtower",
+}
+
+if (IS_SINGLE_IMAGE) {
+	IMAGES = {
+		budibase: "budibase/budibase"
+	}
 }
 
 const FILES = {
@@ -39,11 +47,10 @@ for (let image in IMAGES) {
 }
 
 // copy config files
-copyFile(FILES.COMPOSE)
+if (!IS_SINGLE_IMAGE) {
+	copyFile(FILES.COMPOSE)
+}
 copyFile(FILES.ENV)
 
 // compress
-execSync(`tar -czf bb-airgapped.tar.gz hosting/scripts/bb-airgapped`)
-
-// clean up
-fs.rmdirSync(OUTPUT_DIR, { recursive: true })
\ No newline at end of file
+execSync(`tar -czf bb-airgapped.tar.gz hosting/scripts/bb-airgapped`)
\ No newline at end of file
diff --git a/package.json b/package.json
index 56f015f8c0..c11ab662a3 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,7 @@
     "build:docker:selfhost": "lerna run --stream build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh latest && cd -",
     "build:docker:develop": "node scripts/pinVersions && lerna run --stream build:docker && yarn build:docker:proxy && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -",
     "build:docker:airgap": "node hosting/scripts/airgapped/airgappedDockerBuild",
+    "build:docker:airgap:single": "SINGLE_IMAGE=1 node hosting/scripts/airgapped/airgappedDockerBuild",
     "build:digitalocean": "cd hosting/digitalocean && ./build.sh && cd -",
     "build:docker:single:multiarch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/single/Dockerfile -t budibase:latest .",
     "build:docker:single:image": "docker build -f hosting/single/Dockerfile -t budibase:latest .",
diff --git a/packages/builder/src/pages/builder/portal/apps/_layout.svelte b/packages/builder/src/pages/builder/portal/apps/_layout.svelte
index 8c887da093..e7c0966c91 100644
--- a/packages/builder/src/pages/builder/portal/apps/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
   import { notifications } from "@budibase/bbui"
-  import { apps, templates, licensing, groups } from "stores/portal"
+  import { admin, apps, templates, licensing, groups } from "stores/portal"
   import { onMount } from "svelte"
   import { redirect } from "@roxi/routify"
 
@@ -9,14 +9,19 @@
 
   onMount(async () => {
     try {
-      // Always load latest
-      await Promise.all([
-        licensing.init(),
-        templates.load(),
-        groups.actions.init(),
-      ])
+      const promises = [licensing.init()]
 
-      if ($templates?.length === 0) {
+      console.log($admin)
+      if (!$admin.offlineMode) {
+        promises.push(templates.load())
+      }
+
+      promises.push(groups.actions.init())
+
+      // Always load latest
+      await Promise.all(promises)
+
+      if (!$admin.offlineMode && $templates?.length === 0) {
         notifications.error("There was a problem loading quick start templates")
       }
 
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index 8b8451f036..08bcfac55c 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -247,7 +247,7 @@
               >
                 Create new app
               </Button>
-              {#if $apps?.length > 0}
+              {#if $apps?.length > 0 && !$admin.offlineMode}
                 <Button
                   size="M"
                   secondary
diff --git a/packages/builder/src/stores/portal/admin.js b/packages/builder/src/stores/portal/admin.js
index cc2f7e4ea9..b9467fd037 100644
--- a/packages/builder/src/stores/portal/admin.js
+++ b/packages/builder/src/stores/portal/admin.js
@@ -46,6 +46,7 @@ export function createAdminStore() {
       store.accountPortalUrl = environment.accountPortalUrl
       store.isDev = environment.isDev
       store.baseUrl = environment.baseUrl
+      store.offlineMode = environment.offlineMode
       return store
     })
   }
diff --git a/packages/server/src/environment.ts b/packages/server/src/environment.ts
index 64b342d577..79ee5d977c 100644
--- a/packages/server/src/environment.ts
+++ b/packages/server/src/environment.ts
@@ -81,6 +81,7 @@ const environment = {
   SELF_HOSTED: process.env.SELF_HOSTED,
   HTTP_MB_LIMIT: process.env.HTTP_MB_LIMIT,
   FORKED_PROCESS_NAME: process.env.FORKED_PROCESS_NAME || "main",
+  OFFLINE_MODE: process.env.OFFLINE_MODE,
   // old
   CLIENT_ID: process.env.CLIENT_ID,
   _set(key: string, value: any) {
diff --git a/packages/worker/src/api/controllers/system/environment.ts b/packages/worker/src/api/controllers/system/environment.ts
index 17cf73b5ed..564a010d63 100644
--- a/packages/worker/src/api/controllers/system/environment.ts
+++ b/packages/worker/src/api/controllers/system/environment.ts
@@ -8,6 +8,7 @@ export const fetch = async (ctx: BBContext) => {
     accountPortalUrl: env.ACCOUNT_PORTAL_URL,
     disableAccountPortal: env.DISABLE_ACCOUNT_PORTAL,
     baseUrl: env.PLATFORM_URL,
+    offlineMode: env.OFFLINE_MODE,
     // in test need to pretend its in production for the UI (Cypress)
     isDev: env.isDev() && !env.isTest(),
   }
diff --git a/packages/worker/src/api/routes/system/tests/environment.spec.ts b/packages/worker/src/api/routes/system/tests/environment.spec.ts
index 4e6907a9d7..01ce7ba282 100644
--- a/packages/worker/src/api/routes/system/tests/environment.spec.ts
+++ b/packages/worker/src/api/routes/system/tests/environment.spec.ts
@@ -24,6 +24,7 @@ describe("/api/system/environment", () => {
         isDev: false,
         multiTenancy: true,
         baseUrl: "http://localhost:10000",
+        offlineMode: false
       })
     })
   })
diff --git a/packages/worker/src/environment.ts b/packages/worker/src/environment.ts
index 678ffe7f14..74d58831d9 100644
--- a/packages/worker/src/environment.ts
+++ b/packages/worker/src/environment.ts
@@ -61,6 +61,7 @@ const environment = {
   CHECKLIST_CACHE_TTL: parseIntSafe(process.env.CHECKLIST_CACHE_TTL) || 3600,
   SESSION_UPDATE_PERIOD: process.env.SESSION_UPDATE_PERIOD,
   ENCRYPTED_TEST_PUBLIC_API_KEY: process.env.ENCRYPTED_TEST_PUBLIC_API_KEY,
+  OFFLINE_MODE: process.env.OFFLINE_MODE,
   /**
    * Mock the email service in use - links to ethereal hosted emails are logged instead.
    */

From 7c49dd716c2279a3b7e31c767311a2da14ef8029 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Thu, 15 Jun 2023 15:29:29 +0100
Subject: [PATCH 2/3] remove console log

---
 packages/builder/src/pages/builder/portal/apps/_layout.svelte   | 1 -
 packages/worker/src/api/routes/system/tests/environment.spec.ts | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/apps/_layout.svelte b/packages/builder/src/pages/builder/portal/apps/_layout.svelte
index e7c0966c91..4818946771 100644
--- a/packages/builder/src/pages/builder/portal/apps/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/_layout.svelte
@@ -11,7 +11,6 @@
     try {
       const promises = [licensing.init()]
 
-      console.log($admin)
       if (!$admin.offlineMode) {
         promises.push(templates.load())
       }
diff --git a/packages/worker/src/api/routes/system/tests/environment.spec.ts b/packages/worker/src/api/routes/system/tests/environment.spec.ts
index 01ce7ba282..897cc970cc 100644
--- a/packages/worker/src/api/routes/system/tests/environment.spec.ts
+++ b/packages/worker/src/api/routes/system/tests/environment.spec.ts
@@ -24,7 +24,7 @@ describe("/api/system/environment", () => {
         isDev: false,
         multiTenancy: true,
         baseUrl: "http://localhost:10000",
-        offlineMode: false
+        offlineMode: false,
       })
     })
   })

From 38be94fa074aceffca92a037cb9a3833f2037154 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 20 Jun 2023 12:36:05 +0100
Subject: [PATCH 3/3] Fix for test case.

---
 packages/worker/src/api/controllers/system/environment.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/worker/src/api/controllers/system/environment.ts b/packages/worker/src/api/controllers/system/environment.ts
index 564a010d63..f3f917c2dd 100644
--- a/packages/worker/src/api/controllers/system/environment.ts
+++ b/packages/worker/src/api/controllers/system/environment.ts
@@ -1,14 +1,14 @@
-import { BBContext } from "@budibase/types"
+import { Ctx } from "@budibase/types"
 import env from "../../../environment"
 
-export const fetch = async (ctx: BBContext) => {
+export const fetch = async (ctx: Ctx) => {
   ctx.body = {
     multiTenancy: !!env.MULTI_TENANCY,
+    offlineMode: !!env.OFFLINE_MODE,
     cloud: !env.SELF_HOSTED,
     accountPortalUrl: env.ACCOUNT_PORTAL_URL,
     disableAccountPortal: env.DISABLE_ACCOUNT_PORTAL,
     baseUrl: env.PLATFORM_URL,
-    offlineMode: env.OFFLINE_MODE,
     // in test need to pretend its in production for the UI (Cypress)
     isDev: env.isDev() && !env.isTest(),
   }