@budibase/server 1.0.212 → 1.0.215

package/coverage/lcov.info

@@ -740,17 +740,19 @@ BRH:20
 end_of_record
 TN:
 SF:src/api/controllers/dev.js
-FN:12,redirect
-FN:49,(anonymous_1)
-FN:50,(anonymous_2)
-FN:55,(anonymous_3)
-FN:56,(anonymous_4)
-FN:61,(anonymous_5)
-FN:62,(anonymous_6)
-FN:67,(anonymous_7)
-FN:79,(anonymous_8)
-FN:129,(anonymous_9)
-FNF:10
+FN:16,redirect
+FN:53,(anonymous_1)
+FN:54,(anonymous_2)
+FN:59,(anonymous_3)
+FN:60,(anonymous_4)
+FN:65,(anonymous_5)
+FN:66,(anonymous_6)
+FN:71,(anonymous_7)
+FN:83,(anonymous_8)
+FN:133,(anonymous_9)
+FN:142,(anonymous_10)
+FN:172,(anonymous_11)
+FNF:12
 FNH:5
 FNDA:0,redirect
 FNDA:54,(anonymous_1)
@@ -762,96 +764,131 @@ FNDA:0,(anonymous_6)
 FNDA:0,(anonymous_7)
 FNDA:1,(anonymous_8)
 FNDA:1,(anonymous_9)
+FNDA:0,(anonymous_10)
+FNDA:0,(anonymous_11)
 DA:1,27
 DA:2,27
 DA:3,27
 DA:4,27
 DA:5,27
-DA:6,27
-DA:7,27
-DA:8,27
-DA:9,27
 DA:10,27
-DA:13,0
-DA:14,0
-DA:15,0
-DA:28,0
-DA:29,0
-DA:30,0
+DA:11,27
+DA:12,27
+DA:13,27
+DA:14,27
+DA:17,0
+DA:18,0
+DA:19,0
 DA:32,0
 DA:33,0
 DA:34,0
+DA:36,0
 DA:37,0
 DA:38,0
+DA:41,0
 DA:42,0
-DA:43,0
-DA:44,0
 DA:46,0
-DA:49,27
-DA:50,54
-DA:51,0
-DA:55,27
-DA:56,54
-DA:57,0
-DA:61,27
-DA:62,54
-DA:63,0
-DA:67,27
-DA:68,0
-DA:69,0
-DA:70,0
+DA:47,0
+DA:48,0
+DA:50,0
+DA:53,27
+DA:54,54
+DA:55,0
+DA:59,27
+DA:60,54
+DA:61,0
+DA:65,27
+DA:66,54
+DA:67,0
+DA:71,27
 DA:72,0
+DA:73,0
 DA:74,0
-DA:79,27
-DA:80,1
-DA:81,1
+DA:76,0
+DA:78,0
+DA:83,27
 DA:84,1
 DA:85,1
-DA:86,1
-DA:87,1
-DA:88,0
+DA:88,1
+DA:89,1
 DA:90,1
 DA:91,1
-DA:95,0
-DA:98,0
-DA:101,1
+DA:92,0
+DA:94,1
+DA:95,1
+DA:99,0
+DA:102,0
 DA:105,1
-DA:106,1
-DA:108,0
-DA:112,1
-DA:113,1
-DA:114,1
-DA:115,1
+DA:109,1
+DA:110,1
+DA:112,0
 DA:116,1
 DA:117,1
 DA:118,1
+DA:119,1
+DA:120,1
 DA:121,1
-DA:123,0
+DA:122,1
 DA:125,1
-DA:129,27
-DA:130,1
-DA:131,1
+DA:127,0
+DA:129,1
+DA:133,27
 DA:134,1
-LF:70
-LH:42
-BRDA:12,0,0,0
-BRDA:14,1,0,0
-BRDA:14,1,1,0
-BRDA:28,2,0,0
-BRDA:28,2,1,0
-BRDA:33,3,0,0
-BRDA:33,3,1,0
-BRDA:43,4,0,0
-BRDA:43,4,1,0
-BRDA:87,5,0,0
-BRDA:87,5,1,1
-BRDA:91,6,0,0
-BRDA:91,6,1,1
-BRDA:92,7,0,1
-BRDA:92,7,1,1
-BRDA:106,8,0,0
-BRDA:106,8,1,1
-BRF:17
+DA:135,1
+DA:138,1
+DA:142,27
+DA:144,0
+DA:145,0
+DA:146,0
+DA:147,0
+DA:149,0
+DA:152,0
+DA:155,0
+DA:156,0
+DA:157,0
+DA:160,0
+DA:161,0
+DA:162,0
+DA:164,0
+DA:165,0
+DA:166,0
+DA:172,0
+DA:174,0
+DA:175,0
+DA:176,0
+DA:177,0
+DA:178,0
+DA:181,0
+DA:183,0
+DA:184,0
+LF:95
+LH:43
+BRDA:16,0,0,0
+BRDA:18,1,0,0
+BRDA:18,1,1,0
+BRDA:32,2,0,0
+BRDA:32,2,1,0
+BRDA:37,3,0,0
+BRDA:37,3,1,0
+BRDA:47,4,0,0
+BRDA:47,4,1,0
+BRDA:91,5,0,0
+BRDA:91,5,1,1
+BRDA:95,6,0,0
+BRDA:95,6,1,1
+BRDA:96,7,0,1
+BRDA:96,7,1,1
+BRDA:110,8,0,0
+BRDA:110,8,1,1
+BRDA:144,9,0,0
+BRDA:144,9,1,0
+BRDA:144,10,0,0
+BRDA:144,10,1,0
+BRDA:146,11,0,0
+BRDA:146,11,1,0
+BRDA:176,12,0,0
+BRDA:176,12,1,0
+BRF:25
 BRH:5
 end_of_record
 TN:
@@ -4007,7 +4044,7 @@ DA:16,27
 DA:17,27
 DA:18,27
 DA:21,27
-DA:26,27
+DA:27,27
 LF:12
 LH:12
 BRDA:16,0,0,27
@@ -7528,16 +7565,16 @@ FN:16,(anonymous_2)
 FN:30,(anonymous_3)
 FN:38,(anonymous_4)
 FN:57,(anonymous_5)
-FN:72,(anonymous_6)
-FN:78,(anonymous_7)
-FN:104,(anonymous_8)
-FN:105,(anonymous_9)
-FN:110,(anonymous_10)
-FN:127,(anonymous_11)
-FN:137,(anonymous_12)
-FN:139,(anonymous_13)
-FN:146,(anonymous_14)
-FN:157,(anonymous_15)
+FN:78,(anonymous_6)
+FN:84,(anonymous_7)
+FN:110,(anonymous_8)
+FN:111,(anonymous_9)
+FN:116,(anonymous_10)
+FN:133,(anonymous_11)
+FN:143,(anonymous_12)
+FN:145,(anonymous_13)
+FN:152,(anonymous_14)
+FN:163,(anonymous_15)
 FNF:16
 FNH:15
 FNDA:4,(anonymous_0)
@@ -7579,60 +7616,62 @@ DA:41,2
 DA:43,0
 DA:57,47
 DA:58,245
-DA:59,0
-DA:63,0
+DA:60,0
+DA:61,0
 DA:64,0
-DA:66,0
-DA:68,245
-DA:72,47
-DA:73,2
+DA:69,0
+DA:70,0
+DA:72,0
+DA:74,245
 DA:78,47
-DA:79,3
-DA:80,3
-DA:83,3
-DA:84,3
+DA:79,2
+DA:84,47
 DA:85,3
-DA:86,0
-DA:87,0
+DA:86,3
 DA:89,3
 DA:90,3
-DA:92,3
-DA:93,3
-DA:94,0
+DA:91,3
+DA:92,0
+DA:93,0
+DA:95,3
 DA:96,3
-DA:97,3
-DA:104,47
-DA:105,1
-DA:106,1
+DA:98,3
+DA:99,3
+DA:100,0
+DA:102,3
+DA:103,3
 DA:110,47
-DA:111,4
-DA:112,4
-DA:114,4
-DA:115,4
-DA:116,0
-DA:117,0
-DA:122,4
+DA:111,1
+DA:112,1
+DA:116,47
+DA:117,4
+DA:118,4
+DA:120,4
+DA:121,4
+DA:122,0
 DA:123,0
-DA:127,47
-DA:128,0
-DA:137,47
-DA:138,1
-DA:140,1
-DA:141,1
-DA:146,47
-DA:147,29
-DA:148,29
-DA:149,29
-DA:150,29
-DA:151,29
-DA:152,0
+DA:128,4
+DA:129,0
+DA:133,47
+DA:134,0
+DA:143,47
+DA:144,1
+DA:146,1
+DA:147,1
+DA:152,47
+DA:153,29
 DA:154,29
-DA:157,47
-DA:158,1
-DA:159,1
-DA:160,0
-DA:162,1
-LF:76
+DA:155,29
+DA:156,29
+DA:157,29
+DA:158,0
+DA:160,29
+DA:163,47
+DA:164,1
+DA:165,1
+DA:166,0
+DA:168,1
+LF:78
 LH:62
 BRDA:18,0,0,1
 BRDA:18,0,1,0
@@ -7642,29 +7681,33 @@ BRDA:39,2,0,2
 BRDA:39,2,1,0
 BRDA:58,3,0,0
 BRDA:58,3,1,245
-BRDA:63,4,0,0
-BRDA:63,4,1,0
-BRDA:93,5,0,0
-BRDA:93,5,1,3
-BRDA:116,6,0,0
-BRDA:116,6,1,0
-BRDA:122,7,0,0
-BRDA:122,7,1,4
-BRDA:122,8,0,4
-BRDA:122,8,1,4
-BRDA:150,9,0,29
-BRDA:150,9,1,26
-BRDA:151,10,0,29
-BRDA:151,10,1,0
-BRDA:154,11,0,0
-BRDA:154,11,1,29
-BRDA:154,12,0,29
-BRDA:154,12,1,26
-BRDA:159,13,0,0
-BRDA:159,13,1,1
-BRDA:159,14,0,1
-BRDA:159,14,1,0
-BRF:30
+BRDA:60,4,0,0
+BRDA:60,4,1,0
+BRDA:60,5,0,0
+BRDA:60,5,1,0
+BRDA:69,6,0,0
+BRDA:69,6,1,0
+BRDA:99,7,0,0
+BRDA:99,7,1,3
+BRDA:122,8,0,0
+BRDA:122,8,1,0
+BRDA:128,9,0,0
+BRDA:128,9,1,4
+BRDA:128,10,0,4
+BRDA:128,10,1,4
+BRDA:156,11,0,29
+BRDA:156,11,1,26
+BRDA:157,12,0,29
+BRDA:157,12,1,0
+BRDA:160,13,0,0
+BRDA:160,13,1,29
+BRDA:160,14,0,29
+BRDA:160,14,1,26
+BRDA:165,15,0,0
+BRDA:165,15,1,1
+BRDA:165,16,0,1
+BRDA:165,16,1,0
+BRF:34
 BRH:16
 end_of_record
 TN:

package/dist/api/controllers/application.js

@@ -189,7 +189,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),
+        clientLibPath: (0, utilities_1.clientLibraryPath)(ctx.params.appId, application.version, ctx),
     };
 });
 exports.fetchAppPackage = fetchAppPackage;

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 } = require("@budibase/backend-core/db");
-const { DocumentTypes } = require("../../db/utils");
+const { Replication, getProdAppID, dangerousGetDB, } = require("@budibase/backend-core/db");
+const { DocumentTypes, getRowParams } = 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,3 +129,41 @@ 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/static/index.js

@@ -21,8 +21,11 @@ const { upload } = require("../../../utilities/fileSystem");
 const { attachmentsRelativeURL } = require("../../../utilities");
 const { DocumentTypes, isDevAppID } = require("../../../db/utils");
 const { getAppDB, getAppId } = require("@budibase/backend-core/context");
+const { setCookie, clearCookie } = require("@budibase/backend-core/utils");
 const AWS = require("aws-sdk");
 const { events } = require("@budibase/backend-core");
+const fs = require("fs");
+const { downloadTarballDirect, } = require("../../../utilities/fileSystem/utilities");
 function prepareUpload({ s3Key, bucket, metadata, file }) {
     return __awaiter(this, void 0, void 0, function* () {
         const response = yield upload({
@@ -42,9 +45,35 @@ function prepareUpload({ s3Key, bucket, metadata, file }) {
         };
     });
 }
+exports.toggleBetaUiFeature = function (ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const cookieName = `beta:${ctx.params.feature}`;
+        if (ctx.cookies.get(cookieName)) {
+            clearCookie(ctx, cookieName);
+            ctx.body = {
+                message: `${ctx.params.feature} disabled`,
+            };
+            return;
+        }
+        let builderPath = resolve(TOP_LEVEL_PATH, "new_design_ui");
+        // // download it from S3
+        if (!fs.existsSync(builderPath)) {
+            fs.mkdirSync(builderPath);
+        }
+        yield downloadTarballDirect("https://cdn.budi.live/beta:design_ui/new_ui.tar.gz", builderPath);
+        setCookie(ctx, {}, cookieName);
+        ctx.body = {
+            message: `${ctx.params.feature} enabled`,
+        };
+    });
+};
 exports.serveBuilder = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        let builderPath = resolve(TOP_LEVEL_PATH, "builder");
+        // 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);
         yield send(ctx, ctx.file, { root: builderPath });
         if (!ctx.file.includes("assets/")) {
             yield events.serve.servedBuilder();
@@ -80,7 +109,7 @@ exports.serveApp = function (ctx) {
                 title: appInfo.name,
                 production: env.isProd(),
                 appId,
-                clientLibPath: clientLibraryPath(appId, appInfo.version),
+                clientLibPath: clientLibraryPath(appId, appInfo.version, ctx),
             });
             const appHbs = loadHandlebarsFile(`${__dirname}/templates/app.hbs`);
             ctx.body = yield processString(appHbs, {

package/dist/api/routes/dev.js

@@ -18,5 +18,6 @@ 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);
+    .post("/api/dev/:appId/revert", authorized(BUILDER), controller.revert)
+    .get("/api/beta/access", controller.checkBetaAccess);
 module.exports = router;

package/dist/api/routes/static.js

@@ -68,6 +68,7 @@ router
     // TODO: for now this builder endpoint is not authorized/secured, will need to be
     .get("/builder/:file*", controller.serveBuilder)
     .post("/api/attachments/process", (0, authorized_1.default)(permissions_1.BUILDER), controller.uploadFile)
+    .post("/api/beta/:feature", controller.toggleBetaUiFeature)
     .post("/api/attachments/:tableId/upload", (0, resourceId_1.paramResource)("tableId"), (0, authorized_1.default)(permissions_1.PermissionTypes.TABLE, permissions_1.PermissionLevels.WRITE), controller.uploadFile)
     .get("/:appId/:path*", controller.serveApp)
     .get("/app/:appUrl/:path*", controller.serveApp)

package/dist/environment.js

@@ -56,7 +56,8 @@ module.exports = {
     SALT_ROUNDS: process.env.SALT_ROUNDS,
     LOGGER: process.env.LOGGER,
     LOG_LEVEL: process.env.LOG_LEVEL,
-    AUTOMATION_MAX_ITERATIONS: process.env.AUTOMATION_MAX_ITERATIONS,
+    ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL,
+    AUTOMATION_MAX_ITERATIONS: parseIntSafe(process.env.AUTOMATION_MAX_ITERATIONS) || 200,
     SENDGRID_API_KEY: process.env.SENDGRID_API_KEY,
     DYNAMO_ENDPOINT: process.env.DYNAMO_ENDPOINT,
     QUERY_THREAD_TIMEOUT: parseIntSafe(process.env.QUERY_THREAD_TIMEOUT),

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.211",
+    "version": "1.0.214",
     "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.211",
-        "@budibase/client": "^1.0.211",
-        "@budibase/pro": "1.0.211",
-        "@budibase/string-templates": "^1.0.211",
+        "@budibase/backend-core": "^1.0.214",
+        "@budibase/client": "^1.0.214",
+        "@budibase/pro": "1.0.214",
+        "@budibase/string-templates": "^1.0.214",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -150,7 +150,7 @@
         "@babel/core": "7.17.4",
         "@babel/preset-env": "7.16.11",
         "@budibase/standard-components": "^0.9.139",
-        "@budibase/types": "^1.0.211",
+        "@budibase/types": "^1.0.214",
         "@jest/test-sequencer": "24.9.0",
         "@types/apidoc": "0.50.0",
         "@types/bson": "4.2.0",