@budibase/server 1.0.123-alpha.0 → 1.0.123

package/dist/api/routes/tests/utilities/TestFunctions.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -31,60 +8,50 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runInProd = exports.testAutomation = exports.getDB = exports.checkPermissionsEndpoint = exports.checkBuilderEndpoint = exports.createRequest = exports.clearAllAutomations = exports.clearAllApps = exports.getAllTableRows = void 0;
-const rowController = __importStar(require("../../../controllers/row"));
-const appController = __importStar(require("../../../controllers/application"));
-const utils_1 = require("../../../../db/utils");
-const roles_1 = require("@budibase/backend-core/roles");
-const tenancy_1 = require("@budibase/backend-core/tenancy");
-const structures_1 = require("../../../../tests/utilities/structures");
-const context_1 = require("@budibase/backend-core/context");
-const env = __importStar(require("../../../../environment"));
-class Request {
-    constructor(appId, params) {
-        this.appId = appId;
-        this.params = params;
-        this.request = {};
-    }
+const rowController = require("../../../controllers/row");
+const appController = require("../../../controllers/application");
+const { AppStatus } = require("../../../../db/utils");
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
+const { TENANT_ID } = require("../../../../tests/utilities/structures");
+const { doInAppContext } = require("@budibase/backend-core/context");
+const env = require("../../../../environment");
+function Request(appId, params) {
+    this.appId = appId;
+    this.params = params;
+    this.request = {};
 }
 function runRequest(appId, controlFunc, request) {
-    return (0, context_1.doInAppContext)(appId, () => __awaiter(this, void 0, void 0, function* () {
+    return doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
         return controlFunc(request);
     }));
 }
-const getAllTableRows = (config) => __awaiter(void 0, void 0, void 0, function* () {
+exports.getAllTableRows = (config) => __awaiter(void 0, void 0, void 0, function* () {
     const req = new Request(config.appId, { tableId: config.table._id });
     yield runRequest(config.appId, rowController.fetch, req);
     return req.body;
 });
-exports.getAllTableRows = getAllTableRows;
-const clearAllApps = (tenantId = structures_1.TENANT_ID) => __awaiter(void 0, void 0, void 0, function* () {
-    yield (0, tenancy_1.doInTenant)(tenantId, () => __awaiter(void 0, void 0, void 0, function* () {
-        const req = { query: { status: utils_1.AppStatus.DEV }, user: { tenantId } };
-        yield appController.fetch(req);
-        const apps = req.body;
-        if (!apps || apps.length <= 0) {
-            return;
-        }
-        for (let app of apps) {
-            const { appId } = app;
-            const req = new Request(null, { appId });
-            yield runRequest(appId, appController.destroy, req);
-        }
-    }));
+exports.clearAllApps = (tenantId = TENANT_ID) => __awaiter(void 0, void 0, void 0, function* () {
+    const req = { query: { status: AppStatus.DEV }, user: { tenantId } };
+    yield appController.fetch(req);
+    const apps = req.body;
+    if (!apps || apps.length <= 0) {
+        return;
+    }
+    for (let app of apps) {
+        const { appId } = app;
+        const req = new Request(null, { appId });
+        yield runRequest(appId, appController.delete, req);
+    }
 });
-exports.clearAllApps = clearAllApps;
-const clearAllAutomations = (config) => __awaiter(void 0, void 0, void 0, function* () {
+exports.clearAllAutomations = (config) => __awaiter(void 0, void 0, void 0, function* () {
     const automations = yield config.getAllAutomations();
     for (let auto of automations) {
-        yield (0, context_1.doInAppContext)(config.appId, () => __awaiter(void 0, void 0, void 0, function* () {
+        yield doInAppContext(config.appId, () => __awaiter(void 0, void 0, void 0, function* () {
             yield config.deleteAutomation(auto);
         }));
     }
 });
-exports.clearAllAutomations = clearAllAutomations;
-const createRequest = (request, method, url, body) => {
+exports.createRequest = (request, method, url, body) => {
     let req;
     if (method === "POST")
         req = request.post(url).send(body);
@@ -98,8 +65,7 @@ const createRequest = (request, method, url, body) => {
         req = request.put(url).send(body);
     return req;
 };
-exports.createRequest = createRequest;
-const checkBuilderEndpoint = ({ config, method, url, body, }) => __awaiter(void 0, void 0, void 0, function* () {
+exports.checkBuilderEndpoint = ({ config, method, url, body }) => __awaiter(void 0, void 0, void 0, function* () {
     const headers = yield config.login({
         userId: "us_fail",
         builder: false,
@@ -110,8 +76,7 @@ const checkBuilderEndpoint = ({ config, method, url, body, }) => __awaiter(void
         .set(headers)
         .expect(403);
 });
-exports.checkBuilderEndpoint = checkBuilderEndpoint;
-const checkPermissionsEndpoint = ({ config, method, url, body, passRole, failRole, }) => __awaiter(void 0, void 0, void 0, function* () {
+exports.checkPermissionsEndpoint = ({ config, method, url, body, passRole, failRole, }) => __awaiter(void 0, void 0, void 0, function* () {
     const passHeader = yield config.login({
         roleId: passRole,
         prodApp: true,
@@ -121,7 +86,7 @@ const checkPermissionsEndpoint = ({ config, method, url, body, passRole, failRol
         .set(passHeader)
         .expect(200);
     let failHeader;
-    if (failRole === roles_1.BUILTIN_ROLE_IDS.PUBLIC) {
+    if (failRole === BUILTIN_ROLE_IDS.PUBLIC) {
         failHeader = config.publicHeaders({ prodApp: true });
     }
     else {
@@ -136,12 +101,7 @@ const checkPermissionsEndpoint = ({ config, method, url, body, passRole, failRol
         .set(failHeader)
         .expect(403);
 });
-exports.checkPermissionsEndpoint = checkPermissionsEndpoint;
-const getDB = () => {
-    return (0, context_1.getAppDB)();
-};
-exports.getDB = getDB;
-const testAutomation = (config, automation) => __awaiter(void 0, void 0, void 0, function* () {
+exports.testAutomation = (config, automation) => __awaiter(void 0, void 0, void 0, function* () {
     return runRequest(automation.appId, () => __awaiter(void 0, void 0, void 0, function* () {
         return yield config.request
             .post(`/api/automations/${automation._id}/test`)
@@ -156,8 +116,7 @@ const testAutomation = (config, automation) => __awaiter(void 0, void 0, void 0,
             .expect(200);
     }));
 });
-exports.testAutomation = testAutomation;
-const runInProd = (func) => __awaiter(void 0, void 0, void 0, function* () {
+exports.runInProd = (func) => __awaiter(void 0, void 0, void 0, function* () {
     const nodeEnv = env.NODE_ENV;
     const workerId = env.JEST_WORKER_ID;
     env._set("NODE_ENV", "PRODUCTION");
@@ -166,4 +125,3 @@ const runInProd = (func) => __awaiter(void 0, void 0, void 0, function* () {
     env._set("NODE_ENV", nodeEnv);
     env._set("JEST_WORKER_ID", workerId);
 });
-exports.runInProd = runInProd;

package/dist/app.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -49,7 +45,7 @@ const automations = require("./automations/index");
 const Sentry = require("@sentry/node");
 const fileSystem = require("./utilities/fileSystem");
 const bullboard = require("./automations/bullboard");
-const redis_1 = __importDefault(require("./utilities/redis"));
+const redis = require("./utilities/redis");
 const migrations = __importStar(require("./migrations"));
 const app = new Koa();
 // set up top level koa middleware
@@ -93,14 +89,14 @@ server.on("close", () => __awaiter(void 0, void 0, void 0, function* () {
     if (env.NODE_ENV !== "jest") {
         console.log("Server Closed");
     }
-    yield redis_1.default.shutdown();
+    yield redis.shutdown();
 }));
 module.exports = server.listen(env.PORT || 0, () => __awaiter(void 0, void 0, void 0, function* () {
     console.log(`Budibase running on ${JSON.stringify(server.address())}`);
     env._set("PORT", server.address().port);
     eventEmitter.emitPort(env.PORT);
     fileSystem.init();
-    yield redis_1.default.init();
+    yield redis.init();
     yield automations.init();
 }));
 const shutdown = () => {

package/dist/automations/actions.js

@@ -23,7 +23,6 @@ const integromat = require("./steps/integromat");
 let filter = require("./steps/filter");
 let delay = require("./steps/delay");
 let queryRow = require("./steps/queryRows");
-let loop = require("./steps/loop");
 const env = require("../environment");
 const ACTION_IMPLS = {
     SEND_EMAIL_SMTP: sendSmtpEmail.run,
@@ -37,7 +36,6 @@ const ACTION_IMPLS = {
     DELAY: delay.run,
     FILTER: filter.run,
     QUERY_ROWS: queryRow.run,
-    LOOP: loop.run,
     // these used to be lowercase step IDs, maintain for backwards compat
     discord: discord.run,
     slack: slack.run,
@@ -56,7 +54,6 @@ const ACTION_DEFINITIONS = {
     DELAY: delay.definition,
     FILTER: filter.definition,
     QUERY_ROWS: queryRow.definition,
-    LOOP: loop.definition,
     // these used to be lowercase step IDs, maintain for backwards compat
     discord: discord.definition,
     slack: slack.definition,

package/dist/automations/automationUtils.js

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { getTable } = require("../api/controllers/table/utils");
-const { findHBSBlocks } = 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
@@ -80,12 +79,3 @@ exports.getError = err => {
     }
     return typeof err !== "string" ? err.toString() : err;
 };
-exports.substituteLoopStep = (hbsString, substitute) => {
-    let blocks = findHBSBlocks(hbsString);
-    for (let block of blocks) {
-        let oldBlock = block;
-        block = block.replace(/loop/, substitute);
-        hbsString = hbsString.replace(new RegExp(oldBlock, "g"), block);
-    }
-    return hbsString;
-};

package/dist/automations/steps/createRow.js

@@ -8,11 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.run = exports.definition = void 0;
-const row_1 = require("../../api/controllers/row");
-const automationUtils_1 = require("../automationUtils");
-const utils_1 = require("./utils");
+const rowController = require("../../api/controllers/row");
+const automationUtils = require("../automationUtils");
+const usage = require("../../utilities/usageQuota");
+const { buildCtx } = require("./utils");
 exports.definition = {
     name: "Create Row",
     tagline: "Create a {{inputs.enriched.table.name}} row",
@@ -68,7 +67,7 @@ exports.definition = {
         },
     },
 };
-function run({ inputs, appId, emitter }) {
+exports.run = function ({ inputs, appId, emitter }) {
     return __awaiter(this, void 0, void 0, function* () {
         if (inputs.row == null || inputs.row.tableId == null) {
             return {
@@ -79,15 +78,17 @@ function run({ inputs, appId, emitter }) {
             };
         }
         // have to clean up the row, remove the table from it
-        const ctx = (0, utils_1.buildCtx)(appId, emitter, {
+        const ctx = buildCtx(appId, emitter, {
             body: inputs.row,
             params: {
                 tableId: inputs.row.tableId,
             },
         });
         try {
-            inputs.row = yield (0, automationUtils_1.cleanUpRow)(inputs.row.tableId, inputs.row);
-            yield (0, row_1.save)(ctx);
+            inputs.row = yield automationUtils.cleanUpRow(inputs.row.tableId, inputs.row);
+            yield usage.update(usage.Properties.ROW, 1, { dryRun: true });
+            yield rowController.save(ctx);
+            yield usage.update(usage.Properties.ROW, 1);
             return {
                 row: inputs.row,
                 response: ctx.body,
@@ -99,9 +100,8 @@ function run({ inputs, appId, emitter }) {
         catch (err) {
             return {
                 success: false,
-                response: (0, automationUtils_1.getError)(err),
+                response: automationUtils.getError(err),
             };
         }
     });
-}
-exports.run = run;
+};

package/dist/automations/steps/deleteRow.js

@@ -8,11 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.run = exports.definition = void 0;
-const row_1 = require("../../api/controllers/row");
-const utils_1 = require("./utils");
-const automationUtils_1 = require("../automationUtils");
+const rowController = require("../../api/controllers/row");
+const usage = require("../../utilities/usageQuota");
+const { buildCtx } = require("./utils");
+const automationUtils = require("../automationUtils");
 exports.definition = {
     description: "Delete a row from your database",
     icon: "TableRowRemoveCenter",
@@ -34,8 +33,12 @@ exports.definition = {
                     type: "string",
                     title: "Row ID",
                 },
+                revision: {
+                    type: "string",
+                    title: "Row Revision",
+                },
             },
-            required: ["tableId", "id"],
+            required: ["tableId", "id", "revision"],
         },
         outputs: {
             properties: {
@@ -57,9 +60,9 @@ exports.definition = {
         },
     },
 };
-function run({ inputs, appId, emitter }) {
+exports.run = function ({ inputs, appId, emitter }) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (inputs.id == null) {
+        if (inputs.id == null || inputs.revision == null) {
             return {
                 success: false,
                 response: {
@@ -67,7 +70,7 @@ function run({ inputs, appId, emitter }) {
                 },
             };
         }
-        let ctx = (0, utils_1.buildCtx)(appId, emitter, {
+        let ctx = buildCtx(appId, emitter, {
             body: {
                 _id: inputs.id,
                 _rev: inputs.revision,
@@ -77,7 +80,8 @@ function run({ inputs, appId, emitter }) {
             },
         });
         try {
-            yield (0, row_1.destroy)(ctx);
+            yield usage.update(usage.Properties.ROW, -1);
+            yield rowController.destroy(ctx);
             return {
                 response: ctx.body,
                 row: ctx.row,
@@ -87,9 +91,8 @@ function run({ inputs, appId, emitter }) {
         catch (err) {
             return {
                 success: false,
-                response: (0, automationUtils_1.getError)(err),
+                response: automationUtils.getError(err),
             };
         }
     });
-}
-exports.run = run;
+};

package/dist/automations/tests/utilities/index.js

@@ -9,8 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const TestConfig = require("../../../tests/utilities/TestConfiguration");
-const { TENANT_ID } = require("../../../tests/utilities/structures");
-const { doInTenant } = require("@budibase/backend-core/tenancy");
 const actions = require("../../actions");
 const emitter = require("../../../events/index");
 const env = require("../../../environment");
@@ -26,6 +24,7 @@ exports.afterAll = () => {
 };
 exports.runInProd = (fn) => __awaiter(void 0, void 0, void 0, function* () {
     env._set("NODE_ENV", "production");
+    env._set("USE_QUOTAS", 1);
     let error;
     try {
         yield fn();
@@ -34,23 +33,22 @@ exports.runInProd = (fn) => __awaiter(void 0, void 0, void 0, function* () {
         error = err;
     }
     env._set("NODE_ENV", "jest");
+    env._set("USE_QUOTAS", null);
     if (error) {
         throw error;
     }
 });
 exports.runStep = function runStep(stepId, inputs) {
     return __awaiter(this, void 0, void 0, function* () {
-        return doInTenant(TENANT_ID, () => __awaiter(this, void 0, void 0, function* () {
-            let step = yield actions.getAction(stepId);
-            expect(step).toBeDefined();
-            return step({
-                inputs,
-                appId: config ? config.getAppId() : null,
-                // don't really need an API key, mocked out usage quota, not being tested here
-                apiKey: exports.apiKey,
-                emitter,
-            });
-        }));
+        let step = yield actions.getAction(stepId);
+        expect(step).toBeDefined();
+        return step({
+            inputs,
+            appId: config ? config.getAppId() : null,
+            // don't really need an API key, mocked out usage quota, not being tested here
+            apiKey: exports.apiKey,
+            emitter,
+        });
     });
 };
 exports.apiKey = "test";