@budibase/server 1.0.212-alpha.1 → 1.0.212-alpha.12

package/dist/api/controllers/application.js

@@ -33,7 +33,7 @@ const { getTenantId, isMultiTenant } = require("@budibase/backend-core/tenancy")
 const user_1 = require("./user");
 const { app: appCache } = require("@budibase/backend-core/cache");
 const utils_2 = require("../../automations/utils");
-const { getAppDB, getProdAppDB, updateAppId, } = require("@budibase/backend-core/context");
+const { getAppDB, getProdAppDB, updateAppId, doInAppContext, } = require("@budibase/backend-core/context");
 const rows_1 = require("../../utilities/usageQuota/rows");
 const pro_1 = require("@budibase/pro");
 const backend_core_1 = require("@budibase/backend-core");
@@ -486,19 +486,21 @@ const sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
 });
 exports.sync = sync;
 const updateAppPackage = (appPackage, appId) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
-    const application = yield db.get(utils_1.DocumentTypes.APP_METADATA);
-    const newAppPackage = Object.assign(Object.assign({}, application), appPackage);
-    if (appPackage._rev !== application._rev) {
-        newAppPackage._rev = application._rev;
-    }
-    // the locked by property is attached by server but generated from
-    // Redis, shouldn't ever store it
-    delete newAppPackage.lockedBy;
-    yield db.put(newAppPackage);
-    // remove any cached metadata, so that it will be updated
-    yield appCache.invalidateAppMetadata(appId);
-    return newAppPackage;
+    return doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
+        const db = getAppDB();
+        const application = yield db.get(utils_1.DocumentTypes.APP_METADATA);
+        const newAppPackage = Object.assign(Object.assign({}, application), appPackage);
+        if (appPackage._rev !== application._rev) {
+            newAppPackage._rev = application._rev;
+        }
+        // the locked by property is attached by server but generated from
+        // Redis, shouldn't ever store it
+        delete newAppPackage.lockedBy;
+        yield db.put(newAppPackage);
+        // remove any cached metadata, so that it will be updated
+        yield appCache.invalidateAppMetadata(appId);
+        return newAppPackage;
+    }));
 });
 const createEmptyAppPackage = (ctx, app) => __awaiter(void 0, void 0, void 0, function* () {
     const db = getAppDB();

package/dist/api/controllers/dev.js

@@ -131,6 +131,20 @@ exports.getBudibaseVersion = (ctx) => __awaiter(void 0, void 0, void 0, function
 });
 // 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";
@@ -149,6 +163,7 @@ exports.checkBetaAccess = (ctx) => __awaiter(void 0, void 0, void 0, function* (
         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/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.212-alpha.0",
+    "version": "1.0.212-alpha.11",
     "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/backend-core": "^1.0.212-alpha.0",
-        "@budibase/client": "^1.0.212-alpha.0",
-        "@budibase/pro": "1.0.212-alpha.0",
-        "@budibase/string-templates": "^1.0.212-alpha.0",
-        "@budibase/types": "^1.0.212-alpha.0",
+        "@budibase/backend-core": "^1.0.212-alpha.11",
+        "@budibase/client": "^1.0.212-alpha.11",
+        "@budibase/pro": "1.0.212-alpha.11",
+        "@budibase/string-templates": "^1.0.212-alpha.11",
+        "@budibase/types": "^1.0.212-alpha.11",
         "@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,