@budibase/server 2.0.30-alpha.7 → 2.0.31

package/dist/api/controllers/application.js

@@ -315,7 +315,7 @@ const appPostCreate = (ctx, app) => __awaiter(void 0, void 0, void 0, function*
     yield creationEvents(ctx.request, app);
     // app import & template creation
     if (ctx.request.body.useTemplate === "true") {
-        const { rows } = yield (0, rows_1.getUniqueRows)([app.appId]);
+        const rows = yield (0, rows_1.getUniqueRows)([app.appId]);
         const rowCount = rows ? rows.length : 0;
         if (rowCount) {
             try {
@@ -440,7 +440,7 @@ const destroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     return result;
 });
 const preDestroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const { rows } = yield (0, rows_1.getUniqueRows)([ctx.params.appId]);
+    const rows = yield (0, rows_1.getUniqueRows)([ctx.params.appId]);
     ctx.rowCount = rows.length;
 });
 const postDestroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/api/controllers/dev.js

@@ -99,7 +99,7 @@ exports.revert = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         target: appId,
     });
     try {
-        if (env.COUCH_DB_URL) {
+        if (!env.isTest()) {
             // in-memory db stalls on rollback
             yield replication.rollback();
         }

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

@@ -61,7 +61,6 @@ const _import = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
             config: {
                 url: info.url,
                 defaultHeaders: [],
-                rejectUnauthorized: true,
             },
             name: info.name,
         };
@@ -150,9 +149,7 @@ function preview(ctx) {
                     auth: Object.assign({}, authConfigCtx),
                 },
             });
-            const { rows, keys, info, extra } = yield pro_1.quotas.addQuery(runFn, {
-                datasourceId: datasource._id,
-            });
+            const { rows, keys, info, extra } = yield pro_1.quotas.addQuery(runFn);
             const schemaFields = {};
             if ((rows === null || rows === void 0 ? void 0 : rows.length) > 0) {
                 for (let key of [...new Set(keys)]) {
@@ -229,9 +226,7 @@ function execute(ctx, opts = { rowsOnly: false, isAutomation: false }) {
                     auth: Object.assign({}, authConfigCtx),
                 },
             });
-            const { rows, pagination, extra } = yield pro_1.quotas.addQuery(runFn, {
-                datasourceId: datasource._id,
-            });
+            const { rows, pagination, extra } = yield pro_1.quotas.addQuery(runFn);
             // remove the raw from execution incase transformer being used to hide data
             if (extra === null || extra === void 0 ? void 0 : extra.raw) {
                 delete extra.raw;

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

@@ -44,9 +44,7 @@ function patch(ctx) {
             return (0, exports.save)(ctx);
         }
         try {
-            const { row, table } = yield pro_1.quotas.addQuery(() => pickApi(tableId).patch(ctx), {
-                datasourceId: tableId,
-            });
+            const { row, table } = yield pro_1.quotas.addQuery(() => pickApi(tableId).patch(ctx));
             ctx.status = 200;
             ctx.eventEmitter &&
                 ctx.eventEmitter.emitRow(`row:update`, appId, row, table);
@@ -68,9 +66,7 @@ const save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         return patch(ctx);
     }
     try {
-        const { row, table } = yield pro_1.quotas.addRow(() => pro_1.quotas.addQuery(() => pickApi(tableId).save(ctx), {
-            datasourceId: tableId,
-        }));
+        const { row, table } = yield pro_1.quotas.addRow(() => pro_1.quotas.addQuery(() => pickApi(tableId).save(ctx)));
         ctx.status = 200;
         ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:save`, appId, row, table);
         ctx.message = `${table.name} saved successfully`;
@@ -85,9 +81,7 @@ function fetchView(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = getTableId(ctx);
         try {
-            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetchView(ctx), {
-                datasourceId: tableId,
-            });
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetchView(ctx));
         }
         catch (err) {
             ctx.throw(400, err);
@@ -99,9 +93,7 @@ function fetch(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = getTableId(ctx);
         try {
-            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetch(ctx), {
-                datasourceId: tableId,
-            });
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetch(ctx));
         }
         catch (err) {
             ctx.throw(400, err);
@@ -113,9 +105,7 @@ function find(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = getTableId(ctx);
         try {
-            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).find(ctx), {
-                datasourceId: tableId,
-            });
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).find(ctx));
         }
         catch (err) {
             ctx.throw(400, err);
@@ -130,9 +120,7 @@ function destroy(ctx) {
         const tableId = getTableId(ctx);
         let response, row;
         if (inputs.rows) {
-            let { rows } = yield pro_1.quotas.addQuery(() => pickApi(tableId).bulkDestroy(ctx), {
-                datasourceId: tableId,
-            });
+            let { rows } = yield pro_1.quotas.addQuery(() => pickApi(tableId).bulkDestroy(ctx));
             yield pro_1.quotas.removeRows(rows.length);
             response = rows;
             for (let row of rows) {
@@ -140,9 +128,7 @@ function destroy(ctx) {
             }
         }
         else {
-            let resp = yield pro_1.quotas.addQuery(() => pickApi(tableId).destroy(ctx), {
-                datasourceId: tableId,
-            });
+            let resp = yield pro_1.quotas.addQuery(() => pickApi(tableId).destroy(ctx));
             yield pro_1.quotas.removeRow();
             response = resp.response;
             row = resp.row;
@@ -160,9 +146,7 @@ function search(ctx) {
         const tableId = getTableId(ctx);
         try {
             ctx.status = 200;
-            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).search(ctx), {
-                datasourceId: tableId,
-            });
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).search(ctx));
         }
         catch (err) {
             ctx.throw(400, err);
@@ -186,9 +170,7 @@ function fetchEnrichedRow(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = getTableId(ctx);
         try {
-            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetchEnrichedRow(ctx), {
-                datasourceId: tableId,
-            });
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetchEnrichedRow(ctx));
         }
         catch (err) {
             ctx.throw(400, err);
@@ -199,9 +181,7 @@ exports.fetchEnrichedRow = fetchEnrichedRow;
 const exportRows = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const tableId = getTableId(ctx);
     try {
-        ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).exportRows(ctx), {
-            datasourceId: tableId,
-        });
+        ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).exportRows(ctx));
     }
     catch (err) {
         ctx.throw(400, err);

package/dist/api/controllers/static/templates/preview.hbs

@@ -56,16 +56,6 @@
         return
       }
 
-      // If this is a custom event, try and handle it
-      if (parsed.runtimeEvent) {
-        const { name, payload } = parsed
-        if (window.handleBuilderRuntimeEvent) {
-          window.handleBuilderRuntimeEvent(name, payload)
-        }
-        return
-      }
-
-      // Otherwise this is a full reload message
       // Extract data from message
       const {
         selectedComponentId,

package/dist/api/controllers/table/internal.js

@@ -19,9 +19,6 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bulkImport = exports.destroy = exports.save = void 0;
 const linkedRows_1 = require("../../../db/linkedRows");
@@ -35,7 +32,6 @@ const bulkFormula_1 = require("./bulkFormula");
 const pro_1 = require("@budibase/pro");
 const lodash_1 = require("lodash");
 const fp_1 = require("lodash/fp");
-const environment_2 = __importDefault(require("../../../environment"));
 function checkAutoColumns(table, oldTable) {
     if (!table.schema) {
         return table;
@@ -154,9 +150,7 @@ function destroy(ctx) {
             include_docs: true,
         }));
         yield db.bulkDocs(rows.rows.map((row) => (Object.assign(Object.assign({}, row.doc), { _deleted: true }))));
-        yield pro_1.quotas.removeRows(rows.rows.length, {
-            tableId: ctx.params.tableId,
-        });
+        yield pro_1.quotas.removeRows(rows.rows.length);
         // update linked rows
         yield (0, linkedRows_1.updateLinks)({
             eventType: linkedRows_1.EventType.TABLE_DELETE,
@@ -165,7 +159,7 @@ function destroy(ctx) {
         // don't remove the table itself until very end
         yield db.remove(tableToDelete);
         // remove table search index
-        if (!(0, environment_1.isTest)() || environment_2.default.COUCH_DB_URL) {
+        if (!(0, environment_1.isTest)()) {
             const currentIndexes = yield db.getIndexes();
             const existingIndex = currentIndexes.indexes.find((existing) => existing.name === `search:${ctx.params.tableId}`);
             if (existingIndex) {

package/dist/api/controllers/table/utils.js

@@ -130,9 +130,7 @@ function handleDataImport(user, table, dataImport) {
             }
             finalData.push(row);
         }
-        yield pro_1.quotas.addRows(finalData.length, () => db.bulkDocs(finalData), {
-            tableId: table._id,
-        });
+        yield pro_1.quotas.addRows(finalData.length, () => db.bulkDocs(finalData));
         yield backend_core_1.events.rows.imported(table, "csv", finalData.length);
         return table;
     });

package/dist/automations/steps/updateRow.js

@@ -74,9 +74,9 @@ exports.run = function ({ inputs, appId, emitter }) {
             };
         }
         const tableId = inputs.row.tableId;
-        // clear any undefined, null or empty string properties so that they aren't updated
+        // clear any falsy properties so that they aren't updated
         for (let propKey of Object.keys(inputs.row)) {
-            if (inputs.row[propKey] == null || inputs.row[propKey] === "") {
+            if (!inputs.row[propKey] || inputs.row[propKey] === "") {
                 delete inputs.row[propKey];
             }
         }

package/dist/automations/utils.js

@@ -59,14 +59,12 @@ const jobMessage = (job, message) => {
 function processEvent(job) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const automationId = job.data.automation._id;
             console.log(jobMessage(job, "running"));
             // need to actually await these so that an error can be captured properly
-            return yield backend_core_1.context.doInContext(job.data.event.appId, () => __awaiter(this, void 0, void 0, function* () {
+            const tenantId = backend_core_1.tenancy.getTenantIDFromAppID(job.data.event.appId);
+            return yield backend_core_1.tenancy.doInTenant(tenantId, () => __awaiter(this, void 0, void 0, function* () {
                 const runFn = () => Runner.run(job);
-                return pro_1.quotas.addAutomation(runFn, {
-                    automationId,
-                });
+                return pro_1.quotas.addAutomation(runFn);
             }));
         }
         catch (err) {

package/dist/constants/index.js

@@ -28,7 +28,6 @@ exports.NoEmptyFilterStrings = [
 ];
 exports.FieldTypes = {
     STRING: "string",
-    BARCODEQR: "barcodeqr",
     LONGFORM: "longform",
     OPTIONS: "options",
     NUMBER: "number",
@@ -48,7 +47,6 @@ exports.CanSwitchTypes = [
         exports.FieldTypes.STRING,
         exports.FieldTypes.OPTIONS,
         exports.FieldTypes.LONGFORM,
-        exports.FieldTypes.BARCODEQR,
     ],
     [exports.FieldTypes.BOOLEAN, exports.FieldTypes.NUMBER],
 ];

package/dist/db/utils.js

@@ -7,7 +7,7 @@ const AppStatus = {
     ALL: "all",
     DEPLOYED: "published",
 };
-const DocumentType = Object.assign(Object.assign({}, CoreDocTypes), { TABLE: "ta", ROW: "ro", USER: "us", AUTOMATION: "au", LINK: "li", WEBHOOK: "wh", INSTANCE: "inst", LAYOUT: "layout", SCREEN: "screen", QUERY: "query", DEPLOYMENTS: "deployments", METADATA: "metadata", MEM_VIEW: "view", USER_FLAG: "flag", AUTOMATION_METADATA: "meta_au" });
+const DocumentType = 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",
 };

package/dist/index.js

@@ -9,7 +9,6 @@ function runServer() {
     checkDevelopmentEnvironment();
     fixPath();
     // this will setup http and https proxies form env variables
-    process.env.GLOBAL_AGENT_FORCE_GLOBAL_AGENT = "false";
     (0, global_agent_1.bootstrap)();
     require("./app");
 }

package/dist/integrations/base/sqlTable.js

@@ -31,7 +31,6 @@ function generateSchema(schema, table, tables, oldTable = null, renamed) {
             case FieldTypes.STRING:
             case FieldTypes.OPTIONS:
             case FieldTypes.LONGFORM:
-            case FieldTypes.BARCODEQR:
                 schema.text(key);
                 break;
             case FieldTypes.NUMBER: