@budibase/server 1.0.220-alpha.1 → 1.0.220-alpha.4

package/dist/api/controllers/application.js

@@ -19,8 +19,6 @@ const staticViews_1 = require("../../db/views/staticViews");
 const fileSystem_1 = require("../../utilities/fileSystem");
 const utils_1 = require("../../db/utils");
 const { BUILTIN_ROLE_IDS, AccessController, } = require("@budibase/backend-core/roles");
-const layouts_1 = require("../../constants/layouts");
-const fp_1 = require("lodash/fp");
 const { processObject } = require("@budibase/string-templates");
 const { CacheKeys, bustCache } = require("@budibase/backend-core/cache");
 const { getAllApps, isDevAppID, getProdAppID, Replication, } = require("@budibase/backend-core/db");
@@ -190,7 +188,7 @@ const fetchAppPackage = (ctx) => __awaiter(void 0, void 0, void 0, function* ()
         application,
         screens,
         layouts,
-        clientLibPath: (0, utilities_1.clientLibraryPath)(ctx.params.appId, application.version, ctx),
+        clientLibPath: (0, utilities_1.clientLibraryPath)(ctx.params.appId, application.version),
     };
 });
 exports.fetchAppPackage = fetchAppPackage;
@@ -236,14 +234,25 @@ const performAppCreate = (ctx) => __awaiter(void 0, void 0, void 0, function* ()
         updatedAt: new Date().toISOString(),
         createdAt: new Date().toISOString(),
         status: utils_1.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 = yield 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") {
-        yield createEmptyAppPackage(ctx, newApplication);
-    }
     /* istanbul ignore next */
     if (!environment_1.default.isTest()) {
         yield (0, fileSystem_1.createApp)(appId);
@@ -503,12 +512,3 @@ const updateAppPackage = (appPackage, appId) => __awaiter(void 0, void 0, void 0
         return newAppPackage;
     }));
 });
-const createEmptyAppPackage = (ctx, app) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
-    let screensAndLayouts = [];
-    for (let layout of layouts_1.BASE_LAYOUTS) {
-        const cloned = (0, fp_1.cloneDeep)(layout);
-        screensAndLayouts.push(yield processObject(cloned, app));
-    }
-    yield db.bulkDocs(screensAndLayouts);
-});

package/dist/api/controllers/dev.js

@@ -13,8 +13,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");
@@ -129,41 +129,3 @@ exports.getBudibaseVersion = (ctx) => __awaiter(void 0, void 0, void 0, function
     };
     yield events.installation.versionChecked(version);
 });
-// TODO: remove as part of beta program
-exports.checkBetaAccess = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    // 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 = yield fetch(`${baseUrl}/api/beta/access?email=${ctx.query.email}`);
-        const json = yield 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 = (yield 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/dist/api/controllers/layout.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-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,16 +32,11 @@ exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = getAppDB();
         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 = (yield 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 = (yield 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");
         }
         yield db.remove(layoutId, layoutRev);
         yield events.layout.deleted(layoutId);

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

@@ -69,11 +69,7 @@ exports.toggleBetaUiFeature = function (ctx) {
 };
 exports.serveBuilder = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        // 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");
         yield send(ctx, ctx.file, { root: builderPath });
         if (!ctx.file.includes("assets/")) {
             yield events.serve.servedBuilder();

package/dist/api/routes/dev.js

@@ -18,6 +18,5 @@ if (env.isDev() || env.isTest()) {
 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);
+    .post("/api/dev/:appId/revert", authorized(BUILDER), controller.revert);
 module.exports = router;

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

@@ -6,6 +6,7 @@ const { BUILTIN_PERMISSION_IDS, PermissionLevels, } = require("@budibase/backend
 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
     return joiValidator.body(Joi.object({
@@ -144,9 +145,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/dist/middleware/currentapp.js

@@ -73,6 +73,9 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
             try {
                 yield 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/dist/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.220-alpha.0",
-        "@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.3",
+        "@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",
@@ -117,7 +117,7 @@
         "koa-send": "5.0.0",
         "koa-session": "5.12.0",
         "koa-static": "5.0.0",
-        "koa2-ratelimit": "1.1.0",
+        "koa2-ratelimit": "1.1.1",
         "lodash": "4.17.21",
         "memorystream": "0.3.1",
         "mongodb": "3.6.3",
@@ -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",