@budibase/server 1.0.212-alpha.0 → 1.0.212-alpha.11

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/row/internalSearch.js

@@ -18,7 +18,7 @@ const { getAppId } = require("@budibase/backend-core/context");
  */
 class QueryBuilder {
     constructor(base) {
-        this.query = Object.assign({ string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {} }, base);
+        this.query = Object.assign({ string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {}, oneOf: {} }, base);
         this.limit = 50;
         this.sortOrder = "ascending";
         this.sortType = "string";
@@ -96,6 +96,10 @@ class QueryBuilder {
         this.query.notEmpty[key] = value;
         return this;
     }
+    addOneOf(key, value) {
+        this.query.oneOf[key] = value;
+        return this;
+    }
     /**
      * Preprocesses a value before going into a lucene search.
      * Transforms strings to lowercase and wraps strings and bools in quotes.
@@ -201,6 +205,23 @@ class QueryBuilder {
         if (this.query.notEmpty) {
             build(this.query.notEmpty, key => `${key}:["" TO *]`);
         }
+        if (this.query.oneOf) {
+            build(this.query.oneOf, (key, value) => {
+                if (!Array.isArray(value)) {
+                    if (typeof value === "string") {
+                        value = value.split(",");
+                    }
+                    else {
+                        return "";
+                    }
+                }
+                let orStatement = `${builder.preprocess(value[0], allPreProcessingOpts)}`;
+                for (let i = 1; i < value.length; i++) {
+                    orStatement += ` OR ${builder.preprocess(value[i], allPreProcessingOpts)}`;
+                }
+                return `${key}:(${orStatement})`;
+            });
+        }
         return query;
     }
     buildSearchBody() {

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/automations/automationUtils.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { getTable } = require("../api/controllers/table/utils");
-const { findHBSBlocks } = require("@budibase/string-templates");
+const { findHBSBlocks, decodeJSBinding, isJSBinding, encodeJSBinding, } = require("@budibase/string-templates");
 /**
  * When values are input to the system generally they will be of type string as this is required for template strings.
  * This can generate some odd scenarios as the Schema of the automation requires a number but the builder might supply
@@ -81,11 +81,23 @@ exports.getError = err => {
     return typeof err !== "string" ? err.toString() : err;
 };
 exports.substituteLoopStep = (hbsString, substitute) => {
-    let blocks = findHBSBlocks(hbsString);
+    let blocks = [];
+    let checkForJS = isJSBinding(hbsString);
+    if (checkForJS) {
+        hbsString = decodeJSBinding(hbsString);
+        blocks.push(hbsString);
+    }
+    else {
+        blocks = findHBSBlocks(hbsString);
+    }
     for (let block of blocks) {
-        let oldBlock = block;
         block = block.replace(/loop/, substitute);
-        hbsString = hbsString.replace(new RegExp(oldBlock, "g"), block);
+        if (checkForJS) {
+            hbsString = encodeJSBinding(block);
+        }
+        else {
+            hbsString = block;
+        }
     }
     return hbsString;
 };

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.212-alpha.10",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -77,11 +77,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/types": "^1.0.211",
-        "@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.212-alpha.10",
+        "@budibase/client": "^1.0.212-alpha.10",
+        "@budibase/pro": "1.0.212-alpha.10",
+        "@budibase/string-templates": "^1.0.212-alpha.10",
+        "@budibase/types": "^1.0.212-alpha.10",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",

package/dist/threads/automation.js

@@ -195,7 +195,7 @@ class Orchestrator {
                                 }
                             }
                         }
-                        if (index === parseInt(env.AUTOMATION_MAX_ITERATIONS) ||
+                        if (index === env.AUTOMATION_MAX_ITERATION ||
                             index === parseInt(loopStep.inputs.iterations)) {
                             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
                                 status: AutomationErrors.MAX_ITERATIONS,