@budibase/server 2.1.40-alpha.4 → 2.1.41

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

@@ -8,74 +8,50 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.actions = exports.apiKey = exports.runStep = exports.runInProd = exports.afterAll = exports.getConfig = void 0;
-const TestConfiguration_1 = __importDefault(require("../../../tests/utilities/TestConfiguration"));
-const backend_core_1 = require("@budibase/backend-core");
-const actions_1 = require("../../actions");
-const index_1 = __importDefault(require("../../../events/index"));
-const environment_1 = __importDefault(require("../../../environment"));
+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");
 let config;
-function getConfig() {
+exports.getConfig = () => {
     if (!config) {
-        config = new TestConfiguration_1.default(false);
+        config = new TestConfig(false);
     }
     return config;
-}
-exports.getConfig = getConfig;
-function afterAll() {
+};
+exports.afterAll = () => {
     config.end();
-}
-exports.afterAll = afterAll;
-function runInProd(fn) {
-    return __awaiter(this, void 0, void 0, function* () {
-        environment_1.default._set("NODE_ENV", "production");
-        let error;
-        try {
-            yield fn();
-        }
-        catch (err) {
-            error = err;
-        }
-        environment_1.default._set("NODE_ENV", "jest");
-        if (error) {
-            throw error;
-        }
-    });
-}
-exports.runInProd = runInProd;
-function runStep(stepId, inputs) {
+};
+exports.runInProd = (fn) => __awaiter(void 0, void 0, void 0, function* () {
+    env._set("NODE_ENV", "production");
+    let error;
+    try {
+        yield fn();
+    }
+    catch (err) {
+        error = err;
+    }
+    env._set("NODE_ENV", "jest");
+    if (error) {
+        throw error;
+    }
+});
+exports.runStep = function runStep(stepId, inputs) {
     return __awaiter(this, void 0, void 0, function* () {
-        function run() {
-            return __awaiter(this, void 0, void 0, function* () {
-                let step = yield (0, actions_1.getAction)(stepId);
-                expect(step).toBeDefined();
-                if (!step) {
-                    throw new Error("No step found");
-                }
-                return step({
-                    context: {},
-                    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: index_1.default,
-                });
+        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,
             });
-        }
-        if (config === null || config === void 0 ? void 0 : config.appId) {
-            return backend_core_1.context.doInContext(config === null || config === void 0 ? void 0 : config.appId, () => __awaiter(this, void 0, void 0, function* () {
-                return run();
-            }));
-        }
-        else {
-            return run();
-        }
+        }));
     });
-}
-exports.runStep = runStep;
+};
 exports.apiKey = "test";
-exports.actions = actions_1.ACTION_DEFINITIONS;
+exports.actions = actions.ACTION_DEFINITIONS;

package/dist/automations/triggerInfo/app.js

@@ -1,14 +1,11 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.definition = void 0;
-const types_1 = require("@budibase/types");
 exports.definition = {
     name: "App Action",
     event: "app:trigger",
     icon: "Apps",
     tagline: "Automation fired from the frontend",
     description: "Trigger an automation from an action inside your app",
-    stepId: types_1.AutomationTriggerStepId.APP,
+    stepId: "APP",
     inputs: {},
     schema: {
         inputs: {

package/dist/automations/triggerInfo/cron.js

@@ -1,14 +1,11 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.definition = void 0;
-const types_1 = require("@budibase/types");
 exports.definition = {
     name: "Cron Trigger",
     event: "cron:trigger",
     icon: "Clock",
     tagline: "Cron Trigger (<b>{{inputs.cron}}</b>)",
     description: "Triggers automation on a cron schedule.",
-    stepId: types_1.AutomationTriggerStepId.CRON,
+    stepId: "CRON",
     inputs: {},
     schema: {
         inputs: {

package/dist/automations/triggerInfo/index.js

@@ -1,35 +1,10 @@
 "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;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.definitions = void 0;
-const app = __importStar(require("./app"));
-const cron = __importStar(require("./cron"));
-const rowDeleted = __importStar(require("./rowDeleted"));
-const rowSaved = __importStar(require("./rowSaved"));
-const rowUpdated = __importStar(require("./rowUpdated"));
-const webhook = __importStar(require("./webhook"));
+const app = require("./app");
+const cron = require("./cron");
+const rowDeleted = require("./rowDeleted");
+const rowSaved = require("./rowSaved");
+const rowUpdated = require("./rowUpdated");
+const webhook = require("./webhook");
 exports.definitions = {
     ROW_SAVED: rowSaved.definition,
     ROW_UPDATED: rowUpdated.definition,

package/dist/automations/triggerInfo/rowDeleted.js

@@ -1,14 +1,11 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.definition = void 0;
-const types_1 = require("@budibase/types");
 exports.definition = {
     name: "Row Deleted",
     event: "row:delete",
     icon: "TableRowRemoveCenter",
     tagline: "Row is deleted from {{inputs.enriched.table.name}}",
     description: "Fired when a row is deleted from your database",
-    stepId: types_1.AutomationTriggerStepId.ROW_DELETED,
+    stepId: "ROW_DELETED",
     inputs: {},
     schema: {
         inputs: {

package/dist/automations/triggerInfo/rowSaved.js

@@ -1,14 +1,11 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.definition = void 0;
-const types_1 = require("@budibase/types");
 exports.definition = {
     name: "Row Created",
     event: "row:save",
     icon: "TableRowAddBottom",
     tagline: "Row is added to {{inputs.enriched.table.name}}",
     description: "Fired when a row is added to your database",
-    stepId: types_1.AutomationTriggerStepId.ROW_SAVED,
+    stepId: "ROW_SAVED",
     inputs: {},
     schema: {
         inputs: {

package/dist/automations/triggerInfo/rowUpdated.js

@@ -1,14 +1,11 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.definition = void 0;
-const types_1 = require("@budibase/types");
 exports.definition = {
     name: "Row Updated",
     event: "row:update",
     icon: "Refresh",
     tagline: "Row is updated in {{inputs.enriched.table.name}}",
     description: "Fired when a row is updated in your database",
-    stepId: types_1.AutomationTriggerStepId.ROW_UPDATED,
+    stepId: "ROW_UPDATED",
     inputs: {},
     schema: {
         inputs: {

package/dist/automations/triggerInfo/webhook.js

@@ -1,14 +1,11 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.definition = void 0;
-const types_1 = require("@budibase/types");
 exports.definition = {
     name: "Webhook",
     event: "web:trigger",
     icon: "Send",
     tagline: "Webhook endpoint is hit",
     description: "Trigger an automation when a HTTP POST webhook is hit",
-    stepId: types_1.AutomationTriggerStepId.WEBHOOK,
+    stepId: "WEBHOOK",
     inputs: {},
     schema: {
         inputs: {

package/dist/automations/triggers.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,31 +8,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rebootTrigger = exports.externalTrigger = exports.TRIGGER_DEFINITIONS = void 0;
-const index_1 = __importDefault(require("../events/index"));
-const utils_1 = require("../db/utils");
-const rowProcessor_1 = require("../utilities/rowProcessor");
-const triggerInfo_1 = require("./triggerInfo");
-const utils_2 = require("../db/utils");
+const emitter = require("../events/index");
+const { getAutomationParams } = require("../db/utils");
+const { coerce } = require("../utilities/rowProcessor");
+const { definitions } = require("./triggerInfo");
+const { isDevAppID } = require("../db/utils");
 // need this to call directly, so we can get a response
-const bullboard_1 = require("./bullboard");
-const redis_1 = require("../utilities/redis");
-const utils = __importStar(require("./utils"));
-const environment_1 = __importDefault(require("../environment"));
-const backend_core_1 = require("@budibase/backend-core");
-exports.TRIGGER_DEFINITIONS = triggerInfo_1.definitions;
+const { automationQueue } = require("./bullboard");
+const { checkTestFlag } = require("../utilities/redis");
+const utils = require("./utils");
+const env = require("../environment");
+const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
+const { getAllApps } = require("@budibase/backend-core/db");
+const TRIGGER_DEFINITIONS = definitions;
 const JOB_OPTS = {
     removeOnComplete: true,
     removeOnFail: true,
 };
 function getAllAutomations() {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
-        let automations = yield db.allDocs((0, utils_1.getAutomationParams)(null, { include_docs: true }));
+        const db = getAppDB();
+        let automations = yield db.allDocs(getAutomationParams(null, { include_docs: true }));
         return automations.rows.map(row => row.doc);
     });
 }
@@ -64,7 +37,7 @@ function queueRelevantRowAutomations(event, eventType) {
         if (event.appId == null) {
             throw `No appId specified for ${eventType} - check event emitters.`;
         }
-        yield backend_core_1.context.doInAppContext(event.appId, () => __awaiter(this, void 0, void 0, function* () {
+        doInAppContext(event.appId, () => __awaiter(this, void 0, void 0, function* () {
             let automations = yield getAllAutomations();
             // filter down to the correct event type
             automations = automations.filter(automation => {
@@ -77,20 +50,20 @@ function queueRelevantRowAutomations(event, eventType) {
                 // don't queue events which are for dev apps, only way to test automations is
                 // running tests on them, in production the test flag will never
                 // be checked due to lazy evaluation (first always false)
-                if (!environment_1.default.ALLOW_DEV_AUTOMATIONS &&
-                    (0, utils_2.isDevAppID)(event.appId) &&
-                    !(yield (0, redis_1.checkTestFlag)(automation._id))) {
+                if (!env.ALLOW_DEV_AUTOMATIONS &&
+                    isDevAppID(event.appId) &&
+                    !(yield checkTestFlag(automation._id))) {
                     continue;
                 }
                 if (automationTrigger.inputs &&
                     automationTrigger.inputs.tableId === event.row.tableId) {
-                    yield bullboard_1.automationQueue.add({ automation, event }, JOB_OPTS);
+                    yield automationQueue.add({ automation, event }, JOB_OPTS);
                 }
             }
         }));
     });
 }
-index_1.default.on("row:save", function (event) {
+emitter.on("row:save", function (event) {
     return __awaiter(this, void 0, void 0, function* () {
         /* istanbul ignore next */
         if (!event || !event.row || !event.row.tableId) {
@@ -99,7 +72,7 @@ index_1.default.on("row:save", function (event) {
         yield queueRelevantRowAutomations(event, "row:save");
     });
 });
-index_1.default.on("row:update", function (event) {
+emitter.on("row:update", function (event) {
     return __awaiter(this, void 0, void 0, function* () {
         /* istanbul ignore next */
         if (!event || !event.row || !event.row.tableId) {
@@ -108,7 +81,7 @@ index_1.default.on("row:update", function (event) {
         yield queueRelevantRowAutomations(event, "row:update");
     });
 });
-index_1.default.on("row:delete", function (event) {
+emitter.on("row:delete", function (event) {
     return __awaiter(this, void 0, void 0, function* () {
         /* istanbul ignore next */
         if (!event || !event.row || !event.row.tableId) {
@@ -117,18 +90,18 @@ index_1.default.on("row:delete", function (event) {
         yield queueRelevantRowAutomations(event, "row:delete");
     });
 });
-function externalTrigger(automation, params, { getResponses } = {}) {
+exports.externalTrigger = function (automation, params, { getResponses } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         if (automation.definition != null &&
             automation.definition.trigger != null &&
-            automation.definition.trigger.stepId === triggerInfo_1.definitions.APP.stepId &&
+            automation.definition.trigger.stepId === definitions.APP.stepId &&
             automation.definition.trigger.stepId === "APP" &&
-            !(yield (0, redis_1.checkTestFlag)(automation._id))) {
+            !(yield checkTestFlag(automation._id))) {
             // values are likely to be submitted as strings, so we shall convert to correct type
             const coercedFields = {};
             const fields = automation.definition.trigger.inputs.fields;
             for (let key of Object.keys(fields || {})) {
-                coercedFields[key] = (0, rowProcessor_1.coerce)(params.fields[key], fields[key]);
+                coercedFields[key] = coerce(params.fields[key], fields[key]);
             }
             params.fields = coercedFields;
         }
@@ -137,43 +110,37 @@ function externalTrigger(automation, params, { getResponses } = {}) {
             return utils.processEvent({ data });
         }
         else {
-            return bullboard_1.automationQueue.add(data, JOB_OPTS);
+            return automationQueue.add(data, JOB_OPTS);
         }
     });
-}
-exports.externalTrigger = externalTrigger;
-function rebootTrigger() {
-    return __awaiter(this, void 0, void 0, function* () {
-        // reboot cron option is only available on the main thread at
-        // startup and only usable in self host and single tenant environments
-        if (environment_1.default.isInThread() || !environment_1.default.SELF_HOSTED || environment_1.default.MULTI_TENANCY) {
-            return;
-        }
-        // iterate through all production apps, find the reboot crons
-        // and trigger events for them
-        const appIds = (yield backend_core_1.db.getAllApps({
-            dev: false,
-            idsOnly: true,
-        }));
-        for (let prodAppId of appIds) {
-            yield backend_core_1.context.doInAppContext(prodAppId, () => __awaiter(this, void 0, void 0, function* () {
-                let automations = yield getAllAutomations();
-                let rebootEvents = [];
-                for (let automation of automations) {
-                    if (utils.isRebootTrigger(automation)) {
-                        const job = {
-                            automation,
-                            event: {
-                                appId: prodAppId,
-                                timestamp: Date.now(),
-                            },
-                        };
-                        rebootEvents.push(bullboard_1.automationQueue.add(job, JOB_OPTS));
-                    }
+};
+exports.rebootTrigger = () => __awaiter(void 0, void 0, void 0, function* () {
+    // reboot cron option is only available on the main thread at
+    // startup and only usable in self host and single tenant environments
+    if (env.isInThread() || !env.SELF_HOSTED || env.MULTI_TENANCY) {
+        return;
+    }
+    // iterate through all production apps, find the reboot crons
+    // and trigger events for them
+    const appIds = yield getAllApps({ dev: false, idsOnly: true });
+    for (let prodAppId of appIds) {
+        yield doInAppContext(prodAppId, () => __awaiter(void 0, void 0, void 0, function* () {
+            let automations = yield getAllAutomations();
+            let rebootEvents = [];
+            for (let automation of automations) {
+                if (utils.isRebootTrigger(automation)) {
+                    const job = {
+                        automation,
+                        event: {
+                            appId: prodAppId,
+                            timestamp: Date.now(),
+                        },
+                    };
+                    rebootEvents.push(automationQueue.add(job, JOB_OPTS));
                 }
-                yield Promise.all(rebootEvents);
-            }));
-        }
-    });
-}
-exports.rebootTrigger = rebootTrigger;
+            }
+            yield Promise.all(rebootEvents);
+        }));
+    }
+});
+exports.TRIGGER_DEFINITIONS = TRIGGER_DEFINITIONS;

package/dist/automations/utils.js

@@ -19,9 +19,11 @@ const bullboard_1 = require("./bullboard");
 const newid_1 = __importDefault(require("../db/newid"));
 const utilities_1 = require("../utilities");
 const constants_1 = require("../constants");
-const backend_core_1 = require("@budibase/backend-core");
+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");
 const pro_1 = require("@budibase/pro");
 const types_1 = require("@budibase/types");
 const sdk_1 = __importDefault(require("../sdk"));
@@ -111,7 +113,7 @@ function disableCronById(jobId) {
 exports.disableCronById = disableCronById;
 function clearMetadata() {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getProdAppDB();
+        const db = (0, context_1.getProdAppDB)();
         const automationMetadata = (yield db.allDocs((0, utils_1.getAutomationMetadataParams)({
             include_docs: true,
         }))).rows.map((row) => row.doc);
@@ -156,7 +158,7 @@ function enableCronTrigger(appId, automation) {
             // can't use getAppDB here as this is likely to be called from dev app,
             // but this call could be for dev app or prod app, need to just use what
             // was passed in
-            yield backend_core_1.db.doWithDB(appId, (db) => __awaiter(this, void 0, void 0, function* () {
+            yield (0, db_1.doWithDB)(appId, (db) => __awaiter(this, void 0, void 0, function* () {
                 const response = yield db.put(automation);
                 automation._id = response.id;
                 automation._rev = response.rev;
@@ -176,10 +178,7 @@ exports.enableCronTrigger = enableCronTrigger;
  */
 function checkForWebhooks({ oldAuto, newAuto }) {
     return __awaiter(this, void 0, void 0, function* () {
-        const appId = backend_core_1.context.getAppId();
-        if (!appId) {
-            throw new Error("Unable to check webhooks - no app ID in context.");
-        }
+        const appId = (0, context_1.getAppId)();
         const oldTrigger = oldAuto ? oldAuto.definition.trigger : null;
         const newTrigger = newAuto ? newAuto.definition.trigger : null;
         const triggerChanged = oldTrigger && newTrigger && oldTrigger.id !== newTrigger.id;
@@ -193,7 +192,7 @@ function checkForWebhooks({ oldAuto, newAuto }) {
             (!isWebhookTrigger(newAuto) || triggerChanged) &&
             oldTrigger.webhookId) {
             try {
-                let db = backend_core_1.context.getAppDB();
+                let db = (0, context_1.getAppDB)();
                 // need to get the webhook to get the rev
                 const webhook = yield db.get(oldTrigger.webhookId);
                 // might be updating - reset the inputs to remove the URLs
@@ -216,7 +215,7 @@ function checkForWebhooks({ oldAuto, newAuto }) {
             // the app ID has to be development for this endpoint
             // it can only be used when building the app
             // but the trigger endpoint will always be used in production
-            const prodAppId = backend_core_1.db.getProdAppID(appId);
+            const prodAppId = (0, db_1.getProdAppID)(appId);
             newTrigger.inputs = {
                 schemaUrl: `api/webhooks/schema/${appId}/${id}`,
                 triggerUrl: `api/webhooks/trigger/${prodAppId}/${id}`,