@budibase/server 0.9.169-alpha.9 → 0.9.172

package/dist/automations/steps/executeScript.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const scriptController = require("../../api/controllers/script");
 const { buildCtx } = require("./utils");
-const automationUtils = require("../automationUtils");
 exports.definition = {
     name: "JS Scripting",
     tagline: "Execute JavaScript Code",
@@ -72,7 +71,7 @@ exports.run = function ({ inputs, appId, context, emitter }) {
         catch (err) {
             return {
                 success: false,
-                response: automationUtils.getError(err),
+                response: err,
             };
         }
     });

package/dist/automations/steps/outgoingWebhook.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const fetch = require("node-fetch");
 const { getFetchResponse } = require("./utils");
-const automationUtils = require("../automationUtils");
 const RequestType = {
     POST: "POST",
     GET: "GET",
@@ -131,7 +130,7 @@ exports.run = function ({ inputs }) {
             /* istanbul ignore next */
             return {
                 success: false,
-                response: automationUtils.getError(err),
+                response: err,
             };
         }
     });

package/dist/automations/steps/queryRows.js

@@ -12,7 +12,6 @@ const rowController = require("../../api/controllers/row");
 const tableController = require("../../api/controllers/table");
 const { FieldTypes } = require("../../constants");
 const { buildCtx } = require("./utils");
-const automationUtils = require("../automationUtils");
 const SortOrders = {
     ASCENDING: "ascending",
     DESCENDING: "descending",
@@ -120,7 +119,7 @@ exports.run = function ({ inputs, appId }) {
         catch (err) {
             return {
                 success: false,
-                response: automationUtils.getError(err),
+                response: err,
             };
         }
     });

package/dist/automations/steps/sendSmtpEmail.js

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { sendSmtpEmail } = require("../../utilities/workerRequests");
-const automationUtils = require("../automationUtils");
 exports.definition = {
     description: "Send an email using SMTP",
     tagline: "Send SMTP email to {{inputs.to}}",
@@ -72,7 +71,7 @@ exports.run = function ({ inputs }) {
         catch (err) {
             return {
                 success: false,
-                response: automationUtils.getError(err),
+                response: err,
             };
         }
     });

package/dist/automations/steps/updateRow.js

@@ -73,7 +73,6 @@ exports.run = function ({ inputs, appId, emitter }) {
                 },
             };
         }
-        const tableId = inputs.row.tableId;
         // clear any falsy properties so that they aren't updated
         for (let propKey of Object.keys(inputs.row)) {
             if (!inputs.row[propKey] || inputs.row[propKey] === "") {
@@ -85,13 +84,10 @@ exports.run = function ({ inputs, appId, emitter }) {
             body: Object.assign(Object.assign({}, inputs.row), { _id: inputs.rowId }),
             params: {
                 rowId: inputs.rowId,
-                tableId: tableId,
             },
         });
         try {
-            if (tableId) {
-                inputs.row = yield automationUtils.cleanUpRow(appId, tableId, inputs.row);
-            }
+            inputs.row = yield automationUtils.cleanUpRowById(appId, inputs.rowId, inputs.row);
             yield rowController.patch(ctx);
             return {
                 row: ctx.body,
@@ -104,7 +100,7 @@ exports.run = function ({ inputs, appId, emitter }) {
         catch (err) {
             return {
                 success: false,
-                response: automationUtils.getError(err),
+                response: err,
             };
         }
     });

package/dist/automations/thread.js

@@ -19,7 +19,6 @@ const { doInTenant } = require("@budibase/auth/tenancy");
 const env = require("../environment");
 const usage = require("../utilities/usageQuota");
 const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;
-const STOPPED_STATUS = { success: false, status: "STOPPED" };
 /**
  * The automation orchestrator is a class responsible for executing automations.
  * It handles the context of the automation and makes sure each step gets the correct
@@ -78,13 +77,7 @@ class Orchestrator {
         return __awaiter(this, void 0, void 0, function* () {
             let automation = this._automation;
             const app = yield this.getApp();
-            let stopped = false;
             for (let step of automation.definition.steps) {
-                // execution stopped, record state for that
-                if (stopped) {
-                    this.updateExecutionOutput(step.id, step.stepId, {}, STOPPED_STATUS);
-                    continue;
-                }
                 let stepFn = yield this.getStepFunctionality(step.stepId);
                 step.inputs = yield processObject(step.inputs, this._context);
                 step.inputs = automationUtils.cleanInputValues(step.inputs, step.schema.inputs);
@@ -99,14 +92,10 @@ class Orchestrator {
                             context: this._context,
                         });
                     });
-                    this._context.steps.push(outputs);
-                    // if filter causes us to stop execution don't break the loop, set a var
-                    // so that we can finish iterating through the steps and record that it stopped
                     if (step.stepId === FILTER_STEP_ID && !outputs.success) {
-                        stopped = true;
-                        this.updateExecutionOutput(step.id, step.stepId, step.inputs, Object.assign(Object.assign({}, outputs), STOPPED_STATUS));
-                        continue;
+                        break;
                     }
+                    this._context.steps.push(outputs);
                     this.updateExecutionOutput(step.id, step.stepId, step.inputs, outputs);
                 }
                 catch (err) {
@@ -116,7 +105,7 @@ class Orchestrator {
             }
             // Increment quota for automation runs
             if (!env.SELF_HOSTED && !isDevAppID(this._appId)) {
-                yield usage.update(usage.Properties.AUTOMATION, 1);
+                usage.update(usage.Properties.AUTOMATION, 1);
             }
             return this.executionOutput;
         });

package/dist/constants/index.js

@@ -39,7 +39,6 @@ exports.FieldTypes = {
     FORMULA: "formula",
     AUTO: "auto",
     JSON: "json",
-    INTERNAL: "internal",
 };
 exports.RelationshipTypes = {
     ONE_TO_MANY: "one-to-many",

package/dist/integrations/base/sql.js

@@ -80,7 +80,7 @@ function addFilters(tableName, query, filters) {
     }
     return query;
 }
-function addRelationships(knex, query, fields, fromTable, relationships) {
+function addRelationships(query, fromTable, relationships) {
     if (!relationships) {
         return query;
     }
@@ -88,7 +88,7 @@ function addRelationships(knex, query, fields, fromTable, relationships) {
         const from = relationship.from, to = relationship.to, toTable = relationship.tableName;
         if (!relationship.through) {
             // @ts-ignore
-            query = query.leftJoin(toTable, `${fromTable}.${from}`, `${toTable}.${to}`);
+            query = query.leftJoin(toTable, `${fromTable}.${from}`, `${relationship.tableName}.${to}`);
         }
         else {
             const throughTable = relationship.through;
@@ -100,7 +100,7 @@ function addRelationships(knex, query, fields, fromTable, relationships) {
                 .leftJoin(toTable, `${toTable}.${toPrimary}`, `${throughTable}.${to}`);
         }
     }
-    return query.limit(BASE_LIMIT);
+    return query;
 }
 function buildCreate(knex, json, opts) {
     const { endpoint, body } = json;
@@ -165,7 +165,7 @@ function buildRead(knex, json, limit) {
         [tableName]: query,
     }).select(selectStatement);
     // handle joins
-    return addRelationships(knex, preQuery, selectStatement, tableName, relationships);
+    return addRelationships(preQuery, tableName, relationships);
 }
 function buildUpdate(knex, json, opts) {
     const { endpoint, body, filters } = json;

package/dist/integrations/utils.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.copyExistingPropsOver = exports.isIsoDateString = exports.isSQL = exports.getSqlQuery = exports.convertType = exports.breakRowIdField = exports.convertRowId = exports.isRowId = exports.generateRowIdField = exports.breakExternalTableId = exports.buildExternalTableId = exports.isExternalTable = void 0;
+exports.copyExistingPropsOver = exports.isIsoDateString = exports.isSQL = exports.getSqlQuery = exports.convertType = exports.breakRowIdField = exports.generateRowIdField = exports.breakExternalTableId = exports.buildExternalTableId = exports.isExternalTable = void 0;
 const datasource_1 = require("../definitions/datasource");
 const { DocumentTypes, SEPARATOR } = require("../db/utils");
 const { FieldTypes } = require("../constants");
 const DOUBLE_SEPARATOR = `${SEPARATOR}${SEPARATOR}`;
-const ROW_ID_REGEX = /^\[.*]$/g;
 function isExternalTable(tableId) {
     return tableId.includes(DocumentTypes.DATASOURCE);
 }
@@ -32,20 +31,6 @@ function generateRowIdField(keyProps = []) {
     return encodeURIComponent(JSON.stringify(keyProps).replace(/"/g, "'"));
 }
 exports.generateRowIdField = generateRowIdField;
-function isRowId(field) {
-    return Array.isArray(field) || (typeof field === "string" && field.match(ROW_ID_REGEX) != null);
-}
-exports.isRowId = isRowId;
-function convertRowId(field) {
-    if (Array.isArray(field)) {
-        return field[0];
-    }
-    if (typeof field === "string" && field.match(ROW_ID_REGEX) != null) {
-        return field.substring(1, field.length - 1);
-    }
-    return field;
-}
-exports.convertRowId = convertRowId;
 // should always return an array
 function breakRowIdField(_id) {
     if (!_id) {

package/dist/middleware/currentapp.js

@@ -53,7 +53,7 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         const globalUser = yield getCachedSelf(ctx, requestAppId);
         appId = requestAppId;
         // retrieving global user gets the right role
-        roleId = globalUser.roleId || roleId;
+        roleId = globalUser.roleId || BUILTIN_ROLE_IDS.BASIC;
     }
     // nothing more to do
     if (!appId) {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "0.9.169-alpha.8",
+    "version": "0.9.171",
     "description": "Budibase Web Server",
     "main": "src/index.js",
     "repository": {
@@ -68,13 +68,13 @@
     "author": "Budibase",
     "license": "AGPL-3.0-or-later",
     "dependencies": {
-        "@budibase/auth": "^0.9.169-alpha.8",
-        "@budibase/client": "^0.9.169-alpha.8",
-        "@budibase/string-templates": "^0.9.169-alpha.8",
+        "@budibase/auth": "^0.9.171",
+        "@budibase/client": "^0.9.171",
+        "@budibase/string-templates": "^0.9.171",
         "@elastic/elasticsearch": "7.10.0",
         "@koa/router": "8.0.0",
         "@sendgrid/mail": "7.1.1",
-        "@sentry/node": "^6.0.0",
+        "@sentry/node": "5.19.2",
         "airtable": "0.10.1",
         "arangojs": "7.2.0",
         "aws-sdk": "^2.767.0",
@@ -119,7 +119,6 @@
         "to-json-schema": "0.2.5",
         "uuid": "3.3.2",
         "validate.js": "0.13.1",
-        "vm2": "^3.9.3",
         "yargs": "13.2.4",
         "zlib": "1.0.5"
     },