@budibase/server 1.1.29 → 1.1.32-alpha.0

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

@@ -74,6 +74,7 @@ function initDeployedApp(prodAppId) {
         const automations = (yield db.allDocs((0, utils_1.getAutomationParams)(null, {
             include_docs: true,
         }))).rows.map((row) => row.doc);
+        yield (0, utils_2.clearMetadata)();
         console.log("You have " + automations.length + " automations");
         const promises = [];
         console.log("Disabling prod crons..");

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

@@ -241,7 +241,7 @@ function execute(ctx, opts = { rowsOnly: false, isAutomation: false }) {
 }
 function executeV1(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        return execute(ctx, { rowsOnly: true });
+        return execute(ctx, { rowsOnly: true, isAutomation: false });
     });
 }
 exports.executeV1 = executeV1;

package/dist/api/controllers/query/validation.js

@@ -1,5 +1,5 @@
 "use strict";
-const joiValidator = require("../../../middleware/joi-validator");
+const { joiValidator } = require("@budibase/backend-core/auth");
 const Joi = require("joi");
 const OPTIONAL_STRING = Joi.string().optional().allow(null).allow("");
 exports.queryValidation = () => {

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({ allOr: false, string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {}, oneOf: {} }, base);
+        this.query = Object.assign({ allOr: false, string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {}, oneOf: {}, contains: {} }, base);
         this.limit = 50;
         this.sortOrder = "ascending";
         this.sortType = "string";
@@ -100,6 +100,10 @@ class QueryBuilder {
         this.query.oneOf[key] = value;
         return this;
     }
+    addContains(key, value) {
+        this.query.contains[key] = value;
+        return this;
+    }
     /**
      * Preprocesses a value before going into a lucene search.
      * Transforms strings to lowercase and wraps strings and bools in quotes.
@@ -142,6 +146,27 @@ class QueryBuilder {
             }
             return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`;
         };
+        const contains = (key, value) => {
+            if (!value && value !== 0) {
+                return null;
+            }
+            return `${key}:${builder.preprocess(value, { escape: true })}`;
+        };
+        const 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})`;
+        };
         function build(structure, queryFn) {
             for (let [key, value] of Object.entries(structure)) {
                 key = builder.preprocess(key.replace(/ /g, "_"), {
@@ -216,21 +241,10 @@ class QueryBuilder {
             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})`;
-            });
+            build(this.query.oneOf, oneOf);
+        }
+        if (this.query.contains) {
+            build(this.query.contains, contains);
         }
         // make sure table ID is always added as an AND
         if (tableId) {

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

@@ -1,5 +1,5 @@
 "use strict";
-const joiValidator = require("../../../middleware/joi-validator");
+const { joiValidator } = require("@budibase/backend-core/auth");
 const { DataSourceOperation } = require("../../../constants");
 const { WebhookType } = require("../../../constants");
 const { BUILTIN_PERMISSION_IDS, PermissionLevels, } = require("@budibase/backend-core/permissions");

package/dist/automations/steps/queryRows.js

@@ -89,6 +89,26 @@ function getTable(appId, tableId) {
         return ctx.body;
     });
 }
+function typeCoercion(filters, table) {
+    if (!filters || !table) {
+        return filters;
+    }
+    for (let key of Object.keys(filters)) {
+        if (typeof filters[key] === "object") {
+            for (let [property, value] of Object.entries(filters[key])) {
+                const column = table.schema[property];
+                // convert string inputs
+                if (!column || typeof value !== "string") {
+                    continue;
+                }
+                if (column.type === FieldTypes.NUMBER) {
+                    filters[key][property] = parseFloat(value);
+                }
+            }
+        }
+    }
+    return filters;
+}
 exports.run = function ({ inputs, appId }) {
     return __awaiter(this, void 0, void 0, function* () {
         const { tableId, filters, sortColumn, sortOrder, limit } = inputs;
@@ -107,7 +127,7 @@ exports.run = function ({ inputs, appId }) {
                 sortType,
                 limit,
                 sort: sortColumn,
-                query: filters || {},
+                query: typeCoercion(filters || {}, table),
                 // default to ascending, like data tab
                 sortOrder: sortOrder || SortOrders.ASCENDING,
             },

package/dist/automations/steps/serverLog.js

@@ -40,16 +40,22 @@ exports.definition = {
                     type: "boolean",
                     description: "Whether the action was successful",
                 },
+                message: {
+                    type: "string",
+                    description: "What was output",
+                },
             },
-            required: ["success"],
+            required: ["success", "message"],
         },
     },
 };
 exports.run = function ({ inputs, appId }) {
     return __awaiter(this, void 0, void 0, function* () {
-        console.log(`App ${appId} - ${inputs.text}`);
+        const message = `App ${appId} - ${inputs.text}`;
+        console.log(message);
         return {
             success: true,
+            message,
         };
     });
 };

package/dist/automations/utils.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cleanupAutomations = exports.checkForWebhooks = exports.enableCronTrigger = exports.disableAllCrons = exports.removeDeprecated = exports.updateTestHistory = exports.processEvent = void 0;
+exports.isErrorInOutput = exports.isRecurring = exports.cleanupAutomations = exports.checkForWebhooks = exports.enableCronTrigger = exports.clearMetadata = exports.disableCron = exports.disableAllCrons = exports.removeDeprecated = exports.updateTestHistory = exports.processEvent = void 0;
 const threads_1 = require("../threads");
 const triggerInfo_1 = require("./triggerInfo");
 const webhooks = __importStar(require("../api/controllers/webhook"));
@@ -44,6 +44,7 @@ const newid_1 = __importDefault(require("../db/newid"));
 const utilities_1 = require("../utilities");
 const constants_1 = require("../constants");
 const db_1 = require("@budibase/backend-core/db");
+const utils_1 = require("../db/utils");
 const fp_1 = require("lodash/fp");
 const context_1 = require("@budibase/backend-core/context");
 const backend_core_1 = require("@budibase/backend-core");
@@ -114,6 +115,26 @@ function disableAllCrons(appId) {
     });
 }
 exports.disableAllCrons = disableAllCrons;
+function disableCron(jobId, jobKey) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield bullboard_1.queue.removeRepeatableByKey(jobKey);
+        yield bullboard_1.queue.removeJobs(jobId);
+    });
+}
+exports.disableCron = disableCron;
+function clearMetadata() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const db = (0, context_1.getProdAppDB)();
+        const automationMetadata = (yield db.allDocs((0, utils_1.getAutomationMetadataParams)({
+            include_docs: true,
+        }))).rows.map((row) => row.doc);
+        for (let metadata of automationMetadata) {
+            metadata._deleted = true;
+        }
+        yield db.bulkDocs(automationMetadata);
+    });
+}
+exports.clearMetadata = clearMetadata;
 /**
  * This function handles checking of any cron jobs that need to be enabled/updated.
  * @param {string} appId The ID of the app in which we are checking for webhooks
@@ -228,3 +249,28 @@ function cleanupAutomations(appId) {
     });
 }
 exports.cleanupAutomations = cleanupAutomations;
+/**
+ * Checks if the supplied automation is of a recurring type.
+ * @param automation The automation to check.
+ * @return {boolean} if it is recurring (cron).
+ */
+function isRecurring(automation) {
+    return automation.definition.trigger.stepId === triggerInfo_1.definitions.CRON.stepId;
+}
+exports.isRecurring = isRecurring;
+function isErrorInOutput(output) {
+    var _a;
+    let first = true, error = false;
+    for (let step of output.steps) {
+        // skip the trigger, its always successful if automation ran
+        if (first) {
+            first = false;
+            continue;
+        }
+        if (!((_a = step.outputs) === null || _a === void 0 ? void 0 : _a.success)) {
+            error = true;
+        }
+    }
+    return error;
+}
+exports.isErrorInOutput = isErrorInOutput;

package/dist/constants/index.js

@@ -185,9 +185,6 @@ exports.AutomationErrors = {
     MAX_ITERATIONS: "MAX_ITERATIONS_REACHED",
     FAILURE_CONDITION: "FAILURE_CONDITION_MET",
 };
-exports.LoopStepTypes = {
-    ARRAY: "Array",
-    STRING: "String",
-};
 // pass through the list from the auth/core lib
 exports.ObjectStoreBuckets = ObjectStoreBuckets;
+exports.MAX_AUTOMATION_RECURRING_ERRORS = 5;

package/dist/db/utils.js

@@ -7,7 +7,7 @@ const AppStatus = {
     ALL: "all",
     DEPLOYED: "published",
 };
-const DocumentTypes = Object.assign(Object.assign({}, CoreDocTypes), { TABLE: "ta", ROW: "ro", USER: "us", AUTOMATION: "au", LINK: "li", WEBHOOK: "wh", INSTANCE: "inst", LAYOUT: "layout", SCREEN: "screen", DATASOURCE: "datasource", DATASOURCE_PLUS: "datasource_plus", QUERY: "query", DEPLOYMENTS: "deployments", METADATA: "metadata", MEM_VIEW: "view", USER_FLAG: "flag" });
+const DocumentTypes = Object.assign(Object.assign({}, CoreDocTypes), { TABLE: "ta", ROW: "ro", USER: "us", AUTOMATION: "au", LINK: "li", WEBHOOK: "wh", INSTANCE: "inst", LAYOUT: "layout", SCREEN: "screen", DATASOURCE: "datasource", DATASOURCE_PLUS: "datasource_plus", QUERY: "query", DEPLOYMENTS: "deployments", METADATA: "metadata", MEM_VIEW: "view", USER_FLAG: "flag", AUTOMATION_METADATA: "meta_au" });
 const InternalTables = {
     USER_METADATA: "ta_users",
 };
@@ -229,6 +229,19 @@ exports.getDatasourceParams = (datasourceId = null, otherProps = {}) => {
 exports.generateQueryID = datasourceId => {
     return `${DocumentTypes.QUERY}${SEPARATOR}${datasourceId}${SEPARATOR}${newid()}`;
 };
+/**
+ * Generates a metadata ID for automations, used to track errors in recurring
+ * automations etc.
+ */
+exports.generateAutomationMetadataID = automationId => {
+    return `${DocumentTypes.AUTOMATION_METADATA}${SEPARATOR}${automationId}`;
+};
+/**
+ * Retrieve all automation metadata in an app database.
+ */
+exports.getAutomationMetadataParams = (otherProps = {}) => {
+    return getDocParams(DocumentTypes.AUTOMATION_METADATA, null, otherProps);
+};
 /**
  * Gets parameters for retrieving a query, this is a utility function for the getDocParams function.
  */

package/dist/definitions/automations.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoopStepTypes = void 0;
+var LoopStepTypes;
+(function (LoopStepTypes) {
+    LoopStepTypes["ARRAY"] = "Array";
+    LoopStepTypes["STRING"] = "String";
+})(LoopStepTypes = exports.LoopStepTypes || (exports.LoopStepTypes = {}));

package/dist/integrations/base/sql.js

@@ -125,6 +125,20 @@ class InternalBuilder {
                 }
             }
         }
+        const like = (key, value) => {
+            const fnc = allOr ? "orWhere" : "where";
+            // postgres supports ilike, nothing else does
+            if (this.client === utils_1.SqlClients.POSTGRES) {
+                query = query[fnc](key, "ilike", `%${value}%`);
+            }
+            else {
+                const rawFnc = `${fnc}Raw`;
+                // @ts-ignore
+                query = query[rawFnc](`LOWER(${likeKey(this.client, key)}) LIKE ?`, [
+                    `%${value}%`,
+                ]);
+            }
+        };
         if (!filters) {
             return query;
         }
@@ -152,20 +166,7 @@ class InternalBuilder {
             });
         }
         if (filters.fuzzy) {
-            iterate(filters.fuzzy, (key, value) => {
-                const fnc = allOr ? "orWhere" : "where";
-                // postgres supports ilike, nothing else does
-                if (this.client === utils_1.SqlClients.POSTGRES) {
-                    query = query[fnc](key, "ilike", `%${value}%`);
-                }
-                else {
-                    const rawFnc = `${fnc}Raw`;
-                    // @ts-ignore
-                    query = query[rawFnc](`LOWER(${likeKey(this.client, key)}) LIKE ?`, [
-                        `%${value}%`,
-                    ]);
-                }
-            });
+            iterate(filters.fuzzy, like);
         }
         if (filters.range) {
             iterate(filters.range, (key, value) => {
@@ -210,6 +211,34 @@ class InternalBuilder {
                 query = query[fnc](key);
             });
         }
+        if (filters.contains) {
+            const fnc = allOr ? "orWhere" : "where";
+            const rawFnc = `${fnc}Raw`;
+            if (this.client === utils_1.SqlClients.POSTGRES) {
+                iterate(filters.contains, (key, value) => {
+                    const fieldNames = key.split(/\./g);
+                    const tableName = fieldNames[0];
+                    const columnName = fieldNames[1];
+                    if (typeof value === "string") {
+                        value = `"${value}"`;
+                    }
+                    // @ts-ignore
+                    query = query[rawFnc](`"${tableName}"."${columnName}"::jsonb @> '[${value}]'`);
+                });
+            }
+            else if (this.client === utils_1.SqlClients.MY_SQL) {
+                iterate(filters.contains, (key, value) => {
+                    if (typeof value === "string") {
+                        value = `"${value}"`;
+                    }
+                    // @ts-ignore
+                    query = query[rawFnc](`JSON_CONTAINS(${key}, '${value}')`);
+                });
+            }
+            else {
+                iterate(filters.contains, like);
+            }
+        }
         return query;
     }
     addSorting(query, json) {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.1.28",
+    "version": "1.1.31",
     "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.1.28",
-        "@budibase/client": "^1.1.28",
-        "@budibase/pro": "1.1.28",
-        "@budibase/string-templates": "^1.1.28",
-        "@budibase/types": "^1.1.28",
+        "@budibase/backend-core": "^1.1.31",
+        "@budibase/client": "^1.1.31",
+        "@budibase/pro": "1.1.31",
+        "@budibase/string-templates": "^1.1.31",
+        "@budibase/types": "^1.1.31",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -118,7 +118,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",
@@ -137,7 +137,7 @@
         "redis": "4",
         "server-destroy": "1.0.1",
         "snowflake-promise": "^4.5.0",
-        "svelte": "3.44.1",
+        "svelte": "3.49.0",
         "swagger-parser": "10.0.3",
         "to-json-schema": "0.2.5",
         "uuid": "3.3.2",