@budibase/server 2.2.12-alpha.5 → 2.2.13

package/dist/tests/utilities/structures.js

@@ -0,0 +1,168 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.basicWebhook = exports.basicLayout = exports.basicScreen = exports.basicUser = exports.basicQuery = exports.basicDatasource = exports.basicRole = exports.basicLinkedRow = exports.basicRow = exports.basicAutomation = exports.newAutomation = exports.automationTrigger = exports.automationStep = exports.view = exports.calculationView = exports.filterView = exports.basicView = exports.basicTable = exports.TENANT_ID = void 0;
+const backend_core_1 = require("@budibase/backend-core");
+const screens_1 = require("../../constants/screens");
+const layouts_1 = require("../../constants/layouts");
+const fp_1 = require("lodash/fp");
+const automations_1 = require("../../automations");
+const { v4: uuidv4 } = require("uuid");
+exports.TENANT_ID = "default";
+function basicTable() {
+    return {
+        name: "TestTable",
+        type: "table",
+        key: "name",
+        schema: {
+            name: {
+                type: "string",
+                constraints: {
+                    type: "string",
+                },
+            },
+            description: {
+                type: "string",
+                constraints: {
+                    type: "string",
+                },
+            },
+        },
+    };
+}
+exports.basicTable = basicTable;
+function basicView(tableId) {
+    return {
+        tableId,
+        name: "ViewTest",
+    };
+}
+exports.basicView = basicView;
+function filterView(tableId) {
+    return Object.assign(Object.assign({}, basicView(tableId)), { filters: [
+            {
+                value: 0,
+                condition: "MT",
+                key: "count",
+            },
+        ] });
+}
+exports.filterView = filterView;
+function calculationView(tableId) {
+    return Object.assign(Object.assign({}, basicView(tableId)), { field: "count", calculation: "sum" });
+}
+exports.calculationView = calculationView;
+function view(tableId) {
+    return Object.assign(Object.assign({}, filterView(tableId)), calculationView(tableId));
+}
+exports.view = view;
+function automationStep(actionDefinition = automations_1.ACTION_DEFINITIONS.CREATE_ROW) {
+    return Object.assign({ id: uuidv4() }, actionDefinition);
+}
+exports.automationStep = automationStep;
+function automationTrigger(triggerDefinition = automations_1.TRIGGER_DEFINITIONS.ROW_SAVED) {
+    return Object.assign({ id: uuidv4() }, triggerDefinition);
+}
+exports.automationTrigger = automationTrigger;
+function newAutomation({ steps, trigger } = {}) {
+    const automation = basicAutomation();
+    if (trigger) {
+        automation.definition.trigger = trigger;
+    }
+    else {
+        automation.definition.trigger = automationTrigger();
+    }
+    if (steps) {
+        automation.definition.steps = steps;
+    }
+    else {
+        automation.definition.steps = [automationStep()];
+    }
+    return automation;
+}
+exports.newAutomation = newAutomation;
+function basicAutomation() {
+    return {
+        name: "My Automation",
+        screenId: "kasdkfldsafkl",
+        live: true,
+        uiTree: {},
+        definition: {
+            trigger: {
+                inputs: {},
+            },
+            steps: [],
+        },
+        type: "automation",
+    };
+}
+exports.basicAutomation = basicAutomation;
+function basicRow(tableId) {
+    return {
+        name: "Test Contact",
+        description: "original description",
+        tableId: tableId,
+    };
+}
+exports.basicRow = basicRow;
+function basicLinkedRow(tableId, linkedRowId, linkField = "link") {
+    // this is based on the basic linked tables you get from the test configuration
+    return Object.assign(Object.assign({}, basicRow(tableId)), { [linkField]: [linkedRowId] });
+}
+exports.basicLinkedRow = basicLinkedRow;
+function basicRole() {
+    return {
+        name: "NewRole",
+        inherits: backend_core_1.roles.BUILTIN_ROLE_IDS.BASIC,
+        permissionId: backend_core_1.permissions.BuiltinPermissionID.READ_ONLY,
+    };
+}
+exports.basicRole = basicRole;
+function basicDatasource() {
+    return {
+        datasource: {
+            type: "datasource",
+            name: "Test",
+            source: "POSTGRES",
+            config: {},
+        },
+    };
+}
+exports.basicDatasource = basicDatasource;
+function basicQuery(datasourceId) {
+    return {
+        datasourceId: datasourceId,
+        name: "New Query",
+        parameters: [],
+        fields: {},
+        schema: {},
+        queryVerb: "read",
+    };
+}
+exports.basicQuery = basicQuery;
+function basicUser(role) {
+    return {
+        email: "bill@bill.com",
+        password: "yeeooo",
+        roleId: role,
+    };
+}
+exports.basicUser = basicUser;
+function basicScreen() {
+    return (0, screens_1.createHomeScreen)();
+}
+exports.basicScreen = basicScreen;
+function basicLayout() {
+    return (0, fp_1.cloneDeep)(layouts_1.EMPTY_LAYOUT);
+}
+exports.basicLayout = basicLayout;
+function basicWebhook(automationId) {
+    return {
+        live: true,
+        name: "webhook",
+        action: {
+            type: "automation",
+            target: automationId,
+        },
+    };
+}
+exports.basicWebhook = basicWebhook;

package/dist/threads/automation.js

@@ -47,6 +47,7 @@ const triggerInfo_1 = require("../automations/triggerInfo");
 const constants_1 = require("../constants");
 const logging_1 = require("../automations/logging");
 const types_1 = require("@budibase/types");
+const automations_1 = require("../definitions/automations");
 const backend_core_1 = require("@budibase/backend-core");
 const string_templates_1 = require("@budibase/string-templates");
 const fp_1 = require("lodash/fp");
@@ -55,8 +56,31 @@ const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;
 const LOOP_STEP_ID = actions.ACTION_DEFINITIONS.LOOP.stepId;
 const CRON_STEP_ID = triggerInfo_1.definitions.CRON.stepId;
 const STOPPED_STATUS = { success: true, status: types_1.AutomationStatus.STOPPED };
+function typecastForLooping(loopStep, input) {
+    if (!input || !input.binding) {
+        return null;
+    }
+    try {
+        switch (loopStep.inputs.option) {
+            case automations_1.LoopStepType.ARRAY:
+                if (typeof input.binding === "string") {
+                    return JSON.parse(input.binding);
+                }
+                break;
+            case automations_1.LoopStepType.STRING:
+                if (Array.isArray(input.binding)) {
+                    return input.binding.join(",");
+                }
+                break;
+        }
+    }
+    catch (err) {
+        throw new Error("Unable to cast to correct type");
+    }
+    return input.binding;
+}
 function getLoopIterations(loopStep, input) {
-    const binding = automationUtils.typecastForLooping(loopStep, input);
+    const binding = typecastForLooping(loopStep, input);
     if (!loopStep || !binding) {
         return 1;
     }
@@ -245,7 +269,7 @@ class Orchestrator {
                         let newInput = yield (0, string_templates_1.processObject)(loopStep.inputs, (0, fp_1.cloneDeep)(this._context));
                         let tempOutput = { items: loopSteps, iterations: iterationCount };
                         try {
-                            newInput.binding = automationUtils.typecastForLooping(loopStep, newInput);
+                            newInput.binding = typecastForLooping(loopStep, newInput);
                         }
                         catch (err) {
                             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
@@ -367,7 +391,7 @@ class Orchestrator {
                 }
                 // Delete the step after the loop step as it's irrelevant, since information is included
                 // in the loop step
-                if (wasLoopStep && !loopStep) {
+                if (wasLoopStep) {
                     this._context.steps.splice(loopStepNumber + 1, 1);
                     wasLoopStep = false;
                 }
@@ -384,8 +408,8 @@ class Orchestrator {
                         inputs: step.inputs,
                     });
                     this._context.steps[loopStepNumber] = tempOutput;
+                    loopSteps = undefined;
                     wasLoopStep = true;
-                    loopSteps = [];
                 }
             }
             // store the logs for the automation run