@budibase/server 1.0.220-alpha.0 → 1.0.220-alpha.3

package/dist/utilities/index.js

@@ -57,12 +57,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`;
         // append app version to bust the cache
         if (version) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.220-alpha.0",
+  "version": "1.0.220-alpha.3",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,10 +77,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.0.220-alpha.0",
-    "@budibase/client": "^1.0.220-alpha.0",
-    "@budibase/pro": "1.0.219",
-    "@budibase/string-templates": "^1.0.220-alpha.0",
+    "@budibase/backend-core": "^1.0.220-alpha.3",
+    "@budibase/client": "^1.0.220-alpha.3",
+    "@budibase/pro": "1.0.220-alpha.2",
+    "@budibase/string-templates": "^1.0.220-alpha.3",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -151,7 +151,7 @@
     "@babel/core": "7.17.4",
     "@babel/preset-env": "7.16.11",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/types": "^1.0.220-alpha.0",
+    "@budibase/types": "^1.0.220-alpha.3",
     "@jest/test-sequencer": "24.9.0",
     "@types/apidoc": "0.50.0",
     "@types/bson": "4.2.0",
@@ -195,5 +195,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "00cefe45cc19f1151ad2a4590d6a5aed0afa0ea7"
+  "gitHead": "52fce58f07a3a1c6fba0d7861ca3a868b4ee5325"
 }

package/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),
   }
 }
 
@@ -280,16 +276,26 @@ const performAppCreate = async (ctx: any) => {
     updatedAt: new Date().toISOString(),
     createdAt: new Date().toISOString(),
     status: AppStatus.DEV,
+    navigation: {
+      navigation: "Top",
+      title: name,
+      navWidth: "Large",
+      navBackground: "var(--spectrum-global-color-gray-100)",
+      links: [
+        {
+          url: "/home",
+          text: "Home",
+        },
+      ],
+    },
+    theme: "spectrum--light",
+    customTheme: {
+      buttonBorderRadius: "16px",
+    },
   }
   const response = await db.put(newApplication, { force: true })
   newApplication._rev = response.rev
 
-  // Only create the default home screens and layout if we aren't importing
-  // an app
-  if (useTemplate !== "true") {
-    await createEmptyAppPackage(ctx, newApplication)
-  }
-
   /* istanbul ignore next */
   if (!env.isTest()) {
     await createApp(appId)
@@ -569,15 +575,3 @@ const updateAppPackage = async (appPackage: any, appId: any) => {
     return newAppPackage
   })
 }
-
-const createEmptyAppPackage = async (ctx: any, app: any) => {
-  const db = getAppDB()
-
-  let screensAndLayouts = []
-  for (let layout of BASE_LAYOUTS) {
-    const cloned = cloneDeep(layout)
-    screensAndLayouts.push(await processObject(cloned, app))
-  }
-
-  await db.bulkDocs(screensAndLayouts)
-}

package/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 }
-  }
-}

package/src/api/controllers/layout.js

@@ -1,7 +1,4 @@
-const {
-  EMPTY_LAYOUT,
-  BASE_LAYOUT_PROP_IDS,
-} = require("../../constants/layouts")
+const { EMPTY_LAYOUT } = require("../../constants/layouts")
 const { generateLayoutID, getScreenParams } = require("../../db/utils")
 const { getAppDB } = require("@budibase/backend-core/context")
 const { events } = require("@budibase/backend-core")
@@ -32,19 +29,15 @@ exports.destroy = async function (ctx) {
   const layoutId = ctx.params.layoutId,
     layoutRev = ctx.params.layoutRev
 
-  if (Object.values(BASE_LAYOUT_PROP_IDS).includes(layoutId)) {
-    ctx.throw(400, "Cannot delete a built-in layout")
-  } else {
-    const layoutsUsedByScreens = (
-      await db.allDocs(
-        getScreenParams(null, {
-          include_docs: true,
-        })
-      )
-    ).rows.map(element => element.doc.layoutId)
-    if (layoutsUsedByScreens.includes(layoutId)) {
-      ctx.throw(400, "Cannot delete a layout that's being used by a screen")
-    }
+  const layoutsUsedByScreens = (
+    await db.allDocs(
+      getScreenParams(null, {
+        include_docs: true,
+      })
+    )
+  ).rows.map(element => element.doc.layoutId)
+  if (layoutsUsedByScreens.includes(layoutId)) {
+    ctx.throw(400, "Cannot delete a layout that's being used by a screen")
   }
 
   await db.remove(layoutId, layoutRev)

package/src/api/controllers/static/index.js

@@ -73,12 +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)
+  const builderPath = resolve(TOP_LEVEL_PATH, "builder")
   await send(ctx, ctx.file, { root: builderPath })
   if (!ctx.file.includes("assets/")) {
     await events.serve.servedBuilder()

package/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

package/src/api/routes/tests/application.spec.js

@@ -59,14 +59,13 @@ describe("/applications", () => {
       expect(events.app.templateImported).toBeCalledTimes(1)
     })
 
-
     it("creates app from file", async () => {
       const res = await request
         .post("/api/applications")
         .field("name", "My App")
         .field("useTemplate", "true")
         .set(config.defaultHeaders())
-        .attach('templateFile', 'src/api/routes/tests/data/export.txt')
+        .attach("templateFile", "src/api/routes/tests/data/export.txt")
         .expect("Content-Type", /json/)
         .expect(200)
       expect(res.body._id).toBeDefined()
@@ -107,8 +106,7 @@ describe("/applications", () => {
         .set(config.defaultHeaders())
         .expect("Content-Type", /json/)
         .expect(200)
-      // should have empty packages
-      expect(res.body.layouts.length).toEqual(2)
+      expect(res.body.libraries.length).toEqual(1)
     })
   })
 
@@ -120,7 +118,7 @@ describe("/applications", () => {
         .expect("Content-Type", /json/)
         .expect(200)
       expect(res.body.application).toBeDefined()
-      expect(res.body.layouts.length).toEqual(2)
+      expect(res.body.application.appId).toEqual(config.getAppId())
     })
   })
 
@@ -171,7 +169,7 @@ describe("/applications", () => {
         .set(config.defaultHeaders())
         .expect("Content-Type", /json/)
         .expect(200)
-        expect(events.app.versionUpdated).toBeCalledTimes(1)
+      expect(events.app.versionUpdated).toBeCalledTimes(1)
     })
     it("should be able to revert the app client library version", async () => {
       // We need to first update the version so that we can then revert
@@ -185,7 +183,7 @@ describe("/applications", () => {
         .set(config.defaultHeaders())
         .expect("Content-Type", /json/)
         .expect(200)
-        expect(events.app.versionReverted).toBeCalledTimes(1)
+      expect(events.app.versionReverted).toBeCalledTimes(1)
     })
   })
 

package/src/api/routes/utils/validators.js

@@ -9,6 +9,7 @@ const Joi = require("joi")
 
 const OPTIONAL_STRING = Joi.string().optional().allow(null).allow("")
 const OPTIONAL_NUMBER = Joi.number().optional().allow(null)
+const OPTIONAL_BOOLEAN = Joi.boolean().optional().allow(null)
 
 exports.tableValidator = () => {
   // prettier-ignore
@@ -160,9 +161,12 @@ exports.screenValidator = () => {
   // prettier-ignore
   return joiValidator.body(Joi.object({
     name: Joi.string().required(),
+    showNavigation: OPTIONAL_BOOLEAN,
+    width: OPTIONAL_STRING,
     routing: Joi.object({
       route: Joi.string().required(),
       roleId: Joi.string().required().allow(""),
+      homeScreen: OPTIONAL_BOOLEAN,
     }).required().unknown(true),
     props: Joi.object({
       _id: Joi.string().required(),

package/src/middleware/currentapp.js

@@ -74,6 +74,10 @@ module.exports = async (ctx, next) => {
       try {
         await getRole(roleHeader)
         roleId = roleHeader
+
+        // Delete admin and builder flags so that the specified role is honoured
+        delete ctx.user.builder
+        delete ctx.user.admin
       } catch (error) {
         // Swallow error and do nothing
       }

package/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`