From 387f2241985abb7e51a91804ed281aa667e9dd3a Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 11 Jul 2022 11:08:56 +0100
Subject: [PATCH 1/5] remove beta stuff and remove self-host banners

---
 .github/workflows/budibase_ci.yml             | 17 ------
 .../components/upgrade/UpgradeModal.svelte    | 33 -----------
 .../builder/app/[application]/_layout.svelte  | 29 +---------
 .../overview/_components/SettingsTab.svelte   | 20 -------
 packages/server/src/api/controllers/dev.js    | 55 +------------------
 .../src/api/controllers/static/index.js       |  8 +--
 packages/server/src/utilities/index.js        |  7 +--
 7 files changed, 6 insertions(+), 163 deletions(-)
 delete mode 100644 packages/builder/src/components/upgrade/UpgradeModal.svelte

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 6e886f3011..e940e6fa10 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -7,7 +7,6 @@ on:
     branches:
       - master
       - develop 
-      - new-design-ui
  pull_request:
     branches:
       - master
@@ -60,19 +59,3 @@ jobs:
       with:
         install: false
         command: yarn test:e2e:ci
-    
-    - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v1
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: eu-west-1
-
-    - name: Upload to S3
-      if: github.ref == 'refs/heads/new-design-ui' 
-      run: | 
-        tar -czvf new_ui.tar.gz packages/server/builder/assets packages/server/builder/index.html 
-        aws s3 cp new_ui.tar.gz s3://prod-budi-app-assets/beta:design_ui/
-        aws s3 cp packages/client/dist/budibase-client.js s3://prod-budi-app-assets/beta:design_ui/budibase-client.js
-        aws cloudfront create-invalidation --distribution-id E3ELKP4RCEHVLW --paths "/beta:design_ui/*"
-        
diff --git a/packages/builder/src/components/upgrade/UpgradeModal.svelte b/packages/builder/src/components/upgrade/UpgradeModal.svelte
deleted file mode 100644
index 7571e6d773..0000000000
--- a/packages/builder/src/components/upgrade/UpgradeModal.svelte
+++ /dev/null
@@ -1,33 +0,0 @@
-<script>
-  import { Modal, ModalContent, Button } from "@budibase/bbui"
-  import { admin } from "stores/portal"
-
-  let upgradeModal
-
-  const onConfirm = () => {
-    window.open(`${$admin.accountPortalUrl}/portal/install`, "_blank")
-  }
-</script>
-
-<div>
-  <Button
-    on:click={upgradeModal.show}
-    quiet
-    primary
-    size="M"
-    icon="DownloadFromCloud">Self-host Budibase</Button
-  >
-</div>
-<Modal bind:this={upgradeModal}>
-  <ModalContent
-    size="M"
-    {onConfirm}
-    title="Self-host Budibase"
-    confirmText="Self-host Budibase"
-  >
-    <span>
-      Self-host budibase for free to get unlimited apps and more - and it only
-      takes a few minutes!
-    </span>
-  </ModalContent>
-</Modal>
diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index 8c3de02202..38cbd1dd86 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -1,23 +1,15 @@
 <script>
   import { store, automationStore } from "builderStore"
   import { roles, flags } from "stores/backend"
-  import {
-    Icon,
-    ActionGroup,
-    Tabs,
-    Tab,
-    notifications,
-    Banner,
-  } from "@budibase/bbui"
+  import { Icon, ActionGroup, Tabs, Tab, notifications } from "@budibase/bbui"
   import RevertModal from "components/deploy/RevertModal.svelte"
   import VersionModal from "components/deploy/VersionModal.svelte"
   import DeployNavigation from "components/deploy/DeployNavigation.svelte"
   import { API } from "api"
-  import { auth, admin } from "stores/portal"
+  import { auth } from "stores/portal"
   import { isActive, goto, layout, redirect } from "@roxi/routify"
   import Logo from "assets/bb-emblem.svg"
   import { capitalise } from "helpers"
-  import UpgradeModal from "components/upgrade/UpgradeModal.svelte"
   import { onMount, onDestroy } from "svelte"
 
   export let application
@@ -66,11 +58,6 @@
     })
   }
 
-  async function newDesignUi() {
-    await flags.toggleUiFeature("design_ui")
-    window.location.reload()
-  }
-
   onMount(async () => {
     if (!hasSynced && application) {
       try {
@@ -95,15 +82,6 @@
   <div class="loading" />
 {:then _}
   <div class="root">
-    {#if betaAccess}
-      <Banner
-        extraButtonText="Try New UI (Beta)"
-        extraButtonAction={newDesignUi}
-      >
-        Try the <b>all new</b> budibase design interface. (Not recommended for existing
-        budibase apps)
-      </Banner>
-    {/if}
     <div class="top-nav">
       <div class="topleftnav">
         <button class="home-logo">
@@ -131,9 +109,6 @@
         <ActionGroup />
       </div>
       <div class="toprightnav">
-        {#if $admin.cloud && $auth.user.account}
-          <UpgradeModal />
-        {/if}
         <VersionModal />
         <RevertModal />
         <Icon name="Play" hoverable on:click={previewApp} />
diff --git a/packages/builder/src/pages/builder/portal/overview/_components/SettingsTab.svelte b/packages/builder/src/pages/builder/portal/overview/_components/SettingsTab.svelte
index 913a694025..2409579c68 100644
--- a/packages/builder/src/pages/builder/portal/overview/_components/SettingsTab.svelte
+++ b/packages/builder/src/pages/builder/portal/overview/_components/SettingsTab.svelte
@@ -18,8 +18,6 @@
 
   let versionModal
   let updatingModal
-  let selfHostPath =
-    "https://docs.budibase.com/docs/hosting-methods#self-host-budibase"
 
   $: updateAvailable = clientPackage.version !== $store.version
   $: appUrl = `${window.origin}/app${app?.url}`
@@ -86,24 +84,6 @@
           </Body>
         </Layout>
       </span>
-      <span class="selfhost-section">
-        <Layout gap="XS" paddingY="XXL" paddingX="">
-          <Heading size="S">Self-host Budibase</Heading>
-          <Divider />
-          <Body>
-            Self-host Budibase for free to get unlimited apps and more - and it
-            only takes a few minutes!
-            <div class="page-action">
-              <Button
-                secondary
-                on:click={() => {
-                  window.open(selfHostPath, "_blank")
-                }}>Self-host Budibase</Button
-              >
-            </div>
-          </Body>
-        </Layout>
-      </span>
     </Layout>
     <VersionModal bind:this={versionModal} hideIcon={true} />
     <Modal bind:this={updatingModal} padding={false} width="600px">
diff --git a/packages/server/src/api/controllers/dev.js b/packages/server/src/api/controllers/dev.js
index 45ff0c293a..3c5835ac21 100644
--- a/packages/server/src/api/controllers/dev.js
+++ b/packages/server/src/api/controllers/dev.js
@@ -3,12 +3,8 @@ const env = require("../../environment")
 const { checkSlashesInUrl } = require("../../utilities")
 const { request } = require("../../utilities/workerRequests")
 const { clearLock } = require("../../utilities/redis")
-const {
-  Replication,
-  getProdAppID,
-  dangerousGetDB,
-} = require("@budibase/backend-core/db")
-const { DocumentTypes, getRowParams } = require("../../db/utils")
+const { Replication, getProdAppID } = require("@budibase/backend-core/db")
+const { DocumentTypes } = require("../../db/utils")
 const { app: appCache } = require("@budibase/backend-core/cache")
 const { getProdAppDB, getAppDB } = require("@budibase/backend-core/context")
 const { events } = require("@budibase/backend-core")
@@ -137,50 +133,3 @@ exports.getBudibaseVersion = async ctx => {
   }
   await events.installation.versionChecked(version)
 }
-
-// TODO: remove as part of beta program
-exports.checkBetaAccess = async ctx => {
-  // go to the cloud platform if running self hosted
-  if (env.SELF_HOSTED || !env.MULTI_TENANCY) {
-    let baseUrl = ""
-    if (env.ACCOUNT_PORTAL_URL) {
-      baseUrl = env.ACCOUNT_PORTAL_URL.replace("account.", "")
-    } else {
-      baseUrl = "https://budibase.app"
-    }
-
-    const response = await fetch(
-      `${baseUrl}/api/beta/access?email=${ctx.query.email}`
-    )
-    const json = await response.json()
-    ctx.body = json
-    return
-  }
-
-  const userToCheck = ctx.query.email
-  const BETA_USERS_DB = "app_bb_f9b77d06b9db4e3ca185476ab87a2364"
-  const BETA_USERS_TABLE = "ta_8c2c6df1c03f49cfb6340e85e066dd15"
-
-  try {
-    const db = dangerousGetDB(BETA_USERS_DB)
-    const betaUsers = (
-      await db.allDocs(
-        getRowParams(BETA_USERS_TABLE, null, {
-          include_docs: true,
-        })
-      )
-    ).rows.map(row => row.doc)
-
-    let access = false
-    for (let betaUser of betaUsers) {
-      if (betaUser["Email address"].trim() === userToCheck) {
-        access = true
-        break
-      }
-    }
-    ctx.body = { access }
-  } catch (err) {
-    console.error(err)
-    ctx.body = { access: false }
-  }
-}
diff --git a/packages/server/src/api/controllers/static/index.js b/packages/server/src/api/controllers/static/index.js
index d99c476206..578dc57a77 100644
--- a/packages/server/src/api/controllers/static/index.js
+++ b/packages/server/src/api/controllers/static/index.js
@@ -73,13 +73,7 @@ exports.toggleBetaUiFeature = async function (ctx) {
 }
 
 exports.serveBuilder = async function (ctx) {
-  // Temporary: New Design UI
-  const designUiCookie = ctx.cookies.get("beta:design_ui")
-  // TODO: get this from the tmp Dir that we downloaded from MinIO
-  const uiPath = designUiCookie ? "new_design_ui" : "builder"
-
-  let builderPath = resolve(TOP_LEVEL_PATH, uiPath)
-  await send(ctx, ctx.file, { root: builderPath })
+  await send(ctx, ctx.file, { root: TOP_LEVEL_PATH })
   if (!ctx.file.includes("assets/")) {
     await events.serve.servedBuilder()
   }
diff --git a/packages/server/src/utilities/index.js b/packages/server/src/utilities/index.js
index 0fc18a1ae6..241bf87159 100644
--- a/packages/server/src/utilities/index.js
+++ b/packages/server/src/utilities/index.js
@@ -54,13 +54,8 @@ exports.objectStoreUrl = () => {
  * @return {string} The URL to be inserted into appPackage response or server rendered
  * app index file.
  */
-exports.clientLibraryPath = (appId, version, ctx) => {
+exports.clientLibraryPath = (appId, version) => {
   if (env.isProd()) {
-    // TODO: remove - for beta testing UI
-    if (ctx && ctx.cookies.get("beta:design_ui")) {
-      return "https://cdn.budi.live/beta:design_ui/budibase-client.js"
-    }
-
     let url = `${exports.objectStoreUrl()}/${sanitizeKey(
       appId
     )}/budibase-client.js`

From 95a7155b79ca359d5cc6b57d0ae78a96ef9a6b68 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 11 Jul 2022 11:16:31 +0100
Subject: [PATCH 2/5] update builder path

---
 packages/server/src/api/controllers/static/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/api/controllers/static/index.js b/packages/server/src/api/controllers/static/index.js
index 578dc57a77..86bce89b4a 100644
--- a/packages/server/src/api/controllers/static/index.js
+++ b/packages/server/src/api/controllers/static/index.js
@@ -73,7 +73,8 @@ exports.toggleBetaUiFeature = async function (ctx) {
 }
 
 exports.serveBuilder = async function (ctx) {
-  await send(ctx, ctx.file, { root: TOP_LEVEL_PATH })
+  const builderPath = resolve(TOP_LEVEL_PATH, "builder")
+  await send(ctx, ctx.file, { root: builderPath })
   if (!ctx.file.includes("assets/")) {
     await events.serve.servedBuilder()
   }

From abcc909c140c8d54f97db89cb4078aaad5493bfe Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 11 Jul 2022 11:29:00 +0100
Subject: [PATCH 3/5] lint fix

---
 packages/server/src/api/controllers/application.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts
index f2e22f7e45..df461f40f8 100644
--- a/packages/server/src/api/controllers/application.ts
+++ b/packages/server/src/api/controllers/application.ts
@@ -229,11 +229,7 @@ export const fetchAppPackage = async (ctx: any) => {
     application,
     screens,
     layouts,
-    clientLibPath: clientLibraryPath(
-      ctx.params.appId,
-      application.version,
-      ctx
-    ),
+    clientLibPath: clientLibraryPath(ctx.params.appId, application.version),
   }
 }
 

From 763863d6b54f3eff92f79cc5ff2e7f8691cdc7f3 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 11 Jul 2022 11:38:53 +0100
Subject: [PATCH 4/5] remove beta middleware

---
 packages/server/src/api/routes/dev.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/server/src/api/routes/dev.js b/packages/server/src/api/routes/dev.js
index 854e4f7035..165149ca8b 100644
--- a/packages/server/src/api/routes/dev.js
+++ b/packages/server/src/api/routes/dev.js
@@ -22,6 +22,5 @@ router
   .get("/api/dev/version", authorized(BUILDER), controller.getBudibaseVersion)
   .delete("/api/dev/:appId/lock", authorized(BUILDER), controller.clearLock)
   .post("/api/dev/:appId/revert", authorized(BUILDER), controller.revert)
-  .get("/api/beta/access", controller.checkBetaAccess)
 
 module.exports = router

From 6f8b8df2491d31abd069660e35d60da6c85a8263 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 11 Jul 2022 11:50:32 +0100
Subject: [PATCH 5/5] make BB admin user env vars optional

---
 charts/budibase/templates/app-service-deployment.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
index 27a4dea654..7a2c483cc8 100644
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -122,10 +122,14 @@ spec:
           value: {{ .Values.globals.automationMaxIterations | quote }}
         - name: TENANT_FEATURE_FLAGS
           value: {{ .Values.globals.tenantFeatureFlags | quote }}
+        {{ if .Values.globals.bbAdminUserEmail }}
         - name: BB_ADMIN_USER_EMAIL
           value: { { .Values.globals.bbAdminUserEmail | quote } }
+        {{ end }}
+        {{ if .Values.globals.bbAdminUserPassword }}
         - name: BB_ADMIN_USER_PASSWORD
           value: { { .Values.globals.bbAdminUserPassword | quote } }
+        {{ end }}
 
         image: budibase/apps:{{ .Values.globals.appVersion }}
         imagePullPolicy: Always