@budibase/server 1.0.138 → 1.0.141

package/coverage/lcov.info

@@ -4234,12 +4234,14 @@ FN:20,(anonymous_0)
 FN:61,(anonymous_1)
 FN:66,(anonymous_2)
 FN:79,(anonymous_3)
-FNF:4
+FN:90,(anonymous_4)
+FNF:5
 FNH:3
 FNDA:14,(anonymous_0)
 FNDA:8,(anonymous_1)
 FNDA:3,(anonymous_2)
 FNDA:0,(anonymous_3)
+FNDA:0,(anonymous_4)
 DA:1,41
 DA:2,41
 DA:20,41
@@ -4279,8 +4281,15 @@ DA:82,0
 DA:83,0
 DA:84,0
 DA:87,0
-LF:39
-LH:31
+DA:90,41
+DA:91,0
+DA:92,0
+DA:94,0
+DA:95,0
+DA:97,0
+DA:99,0
+LF:46
+LH:32
 BRDA:21,0,0,1
 BRDA:21,0,1,13
 BRDA:26,1,0,6
@@ -4306,7 +4315,11 @@ BRDA:71,10,1,3
 BRDA:71,10,2,3
 BRDA:76,11,0,3
 BRDA:76,11,1,0
-BRF:25
+BRDA:91,12,0,0
+BRDA:91,12,1,0
+BRDA:94,13,0,0
+BRDA:94,13,1,0
+BRF:29
 BRH:21
 end_of_record
 TN:
@@ -6519,10 +6532,11 @@ FN:63,(anonymous_3)
 FN:72,(anonymous_4)
 FN:81,(anonymous_5)
 FN:99,(anonymous_6)
-FN:222,(anonymous_7)
-FN:287,(anonymous_8)
-FN:289,(anonymous_9)
-FNF:10
+FN:213,(anonymous_7)
+FN:249,(anonymous_8)
+FN:314,(anonymous_9)
+FN:316,(anonymous_10)
+FNF:11
 FNH:9
 FNDA:6,(anonymous_0)
 FNDA:6,(anonymous_1)
@@ -6531,9 +6545,10 @@ FNDA:6,(anonymous_3)
 FNDA:11,(anonymous_4)
 FNDA:0,(anonymous_5)
 FNDA:6,(anonymous_6)
-FNDA:5,(anonymous_7)
-FNDA:6,(anonymous_8)
+FNDA:0,(anonymous_7)
+FNDA:5,(anonymous_8)
 FNDA:6,(anonymous_9)
+FNDA:6,(anonymous_10)
 DA:1,3
 DA:2,3
 DA:3,3
@@ -6599,77 +6614,85 @@ DA:114,0
 DA:117,5
 DA:118,0
 DA:120,5
-DA:121,5
-DA:122,5
-DA:123,5
+DA:125,5
 DA:126,5
-DA:129,0
-DA:133,0
-DA:137,0
+DA:127,5
+DA:130,5
+DA:131,0
+DA:135,0
+DA:140,0
 DA:141,0
-DA:142,0
-DA:148,0
+DA:147,0
+DA:151,0
 DA:152,0
 DA:153,0
-DA:154,0
-DA:159,0
-DA:160,0
+DA:157,0
 DA:161,0
-DA:164,0
-DA:165,0
+DA:163,0
+DA:166,0
+DA:172,0
 DA:173,0
 DA:174,0
-DA:182,0
+DA:177,0
+DA:178,0
 DA:186,0
-DA:190,0
-DA:191,0
-DA:192,0
-DA:195,0
-DA:199,0
+DA:187,0
+DA:194,0
+DA:198,0
+DA:202,0
 DA:203,0
 DA:204,0
-DA:205,0
-DA:210,5
+DA:207,0
+DA:208,0
 DA:211,0
-DA:212,0
-DA:216,5
-DA:217,5
-DA:218,5
-DA:219,5
-DA:221,5
-DA:222,5
-DA:223,5
-DA:230,5
-DA:233,5
-DA:234,0
-DA:235,0
+DA:214,0
+DA:220,0
+DA:225,0
+DA:226,0
+DA:230,0
+DA:231,0
+DA:232,0
+DA:237,5
+DA:238,0
 DA:239,0
-DA:241,5
-DA:242,0
+DA:243,5
 DA:244,5
-DA:252,0
-DA:253,0
-DA:255,5
-DA:256,0
-DA:257,0
-DA:258,0
-DA:259,0
-DA:260,0
-DA:265,5
+DA:245,5
+DA:246,5
+DA:248,5
+DA:249,5
+DA:250,5
+DA:257,5
+DA:260,5
+DA:261,0
+DA:262,0
 DA:266,0
-DA:271,0
-DA:278,0
+DA:268,5
+DA:269,0
+DA:271,5
 DA:279,0
-DA:283,6
-DA:287,3
-DA:288,6
-DA:289,6
-DA:290,6
-DA:294,6
-DA:295,6
-DA:296,6
+DA:280,0
+DA:282,5
+DA:283,0
+DA:284,0
+DA:285,0
+DA:286,0
+DA:287,0
+DA:292,5
+DA:293,0
 DA:298,0
-LF:135
+DA:305,0
+DA:306,0
+DA:310,6
+DA:314,3
+DA:315,6
+DA:316,6
+DA:317,6
+DA:321,6
+DA:322,6
+DA:323,6
+DA:325,0
+LF:143
 LH:82
 BRDA:26,0,0,0
 BRDA:28,1,0,4
@@ -6688,47 +6711,55 @@ BRDA:117,7,0,0
 BRDA:117,7,1,5
 BRDA:120,8,0,0
 BRDA:120,8,1,5
-BRDA:126,9,0,0
-BRDA:126,9,1,5
-BRDA:142,10,0,0
-BRDA:142,10,1,0
-BRDA:143,11,0,0
-BRDA:143,11,1,0
-BRDA:143,11,2,0
-BRDA:143,11,3,0
-BRDA:160,12,0,0
-BRDA:160,12,1,0
-BRDA:164,13,0,0
-BRDA:164,13,1,0
-BRDA:173,14,0,0
-BRDA:173,14,1,0
-BRDA:182,15,0,0
-BRDA:182,15,1,0
-BRDA:183,16,0,0
-BRDA:183,16,1,0
-BRDA:195,17,0,0
-BRDA:195,17,1,0
-BRDA:210,18,0,0
-BRDA:210,18,1,5
-BRDA:221,19,0,5
-BRDA:221,19,1,0
-BRDA:233,20,0,0
-BRDA:233,20,1,5
-BRDA:233,21,0,5
-BRDA:233,21,1,0
-BRDA:241,22,0,0
-BRDA:241,22,1,5
-BRDA:241,23,0,5
-BRDA:241,23,1,0
-BRDA:255,24,0,0
-BRDA:255,24,1,5
-BRDA:257,25,0,0
-BRDA:257,25,1,0
-BRDA:265,26,0,0
-BRDA:265,26,1,5
-BRDA:265,27,0,5
-BRDA:265,27,1,5
-BRF:57
+BRDA:121,9,0,0
+BRDA:121,9,1,0
+BRDA:130,10,0,0
+BRDA:130,10,1,5
+BRDA:141,11,0,0
+BRDA:141,11,1,0
+BRDA:142,12,0,0
+BRDA:142,12,1,0
+BRDA:142,12,2,0
+BRDA:142,12,3,0
+BRDA:157,13,0,0
+BRDA:157,13,1,0
+BRDA:158,14,0,0
+BRDA:158,14,1,0
+BRDA:173,15,0,0
+BRDA:173,15,1,0
+BRDA:177,16,0,0
+BRDA:177,16,1,0
+BRDA:186,17,0,0
+BRDA:186,17,1,0
+BRDA:194,18,0,0
+BRDA:194,18,1,0
+BRDA:195,19,0,0
+BRDA:195,19,1,0
+BRDA:208,20,0,0
+BRDA:208,20,1,0
+BRDA:225,21,0,0
+BRDA:225,21,1,0
+BRDA:237,22,0,0
+BRDA:237,22,1,5
+BRDA:248,23,0,5
+BRDA:248,23,1,0
+BRDA:260,24,0,0
+BRDA:260,24,1,5
+BRDA:260,25,0,5
+BRDA:260,25,1,0
+BRDA:268,26,0,0
+BRDA:268,26,1,5
+BRDA:268,27,0,5
+BRDA:268,27,1,0
+BRDA:282,28,0,0
+BRDA:282,28,1,5
+BRDA:284,29,0,0
+BRDA:284,29,1,0
+BRDA:292,30,0,0
+BRDA:292,30,1,5
+BRDA:292,31,0,5
+BRDA:292,31,1,5
+BRF:65
 BRH:21
 end_of_record
 TN:

package/dist/automations/automationUtils.js

@@ -89,3 +89,15 @@ exports.substituteLoopStep = (hbsString, substitute) => {
     }
     return hbsString;
 };
+exports.stringSplit = value => {
+    if (value == null) {
+        return [];
+    }
+    if (value.split("\n").length > 1) {
+        value = value.split("\n");
+    }
+    else {
+        value = value.split(",");
+    }
+    return value;
+};

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.137",
+    "version": "1.0.140",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -68,10 +68,10 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.137",
-        "@budibase/client": "^1.0.137",
-        "@budibase/pro": "1.0.137",
-        "@budibase/string-templates": "^1.0.137",
+        "@budibase/backend-core": "^1.0.140",
+        "@budibase/client": "^1.0.140",
+        "@budibase/pro": "1.0.140",
+        "@budibase/string-templates": "^1.0.140",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",

package/dist/threads/automation.js

@@ -95,7 +95,7 @@ class Orchestrator {
         this._context.steps.splice(loopStepNumber, 0, Object.assign(Object.assign({}, output), { success: result.success, status: result.status }));
     }
     execute() {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             let automation = this._automation;
             const app = yield this.getApp();
@@ -115,19 +115,18 @@ class Orchestrator {
                 if (loopStep) {
                     input = yield processObject(loopStep.inputs, this._context);
                 }
-                let iterations = loopStep ? input.binding.length : 1;
+                let iterations = loopStep
+                    ? Array.isArray(input.binding)
+                        ? input.binding.length
+                        : automationUtils.stringSplit(input.binding).length
+                    : 1;
                 let iterationCount = 0;
                 for (let index = 0; index < iterations; index++) {
                     let originalStepInput = cloneDeep(step.inputs);
                     // Handle if the user has set a max iteration count or if it reaches the max limit set by us
                     if (loopStep) {
-                        // lets first of all handle the input
-                        // if the input is array then use it, if it is a string then split it on every new line
                         let newInput = yield processObject(loopStep.inputs, cloneDeep(this._context));
                         newInput = automationUtils.cleanInputValues(newInput, loopStep.schema.inputs);
-                        this._context.steps[loopStepNumber] = {
-                            currentItem: newInput.binding[index],
-                        };
                         let tempOutput = { items: loopSteps, iterations: iterationCount };
                         if ((loopStep.inputs.option === "Array" &&
                             !Array.isArray(newInput.binding)) ||
@@ -141,6 +140,17 @@ class Orchestrator {
                             loopStep = null;
                             break;
                         }
+                        let item;
+                        if (typeof loopStep.inputs.binding === "string" &&
+                            loopStep.inputs.option === "String") {
+                            item = automationUtils.stringSplit(newInput.binding);
+                        }
+                        else {
+                            item = loopStep.inputs.binding;
+                        }
+                        this._context.steps[loopStepNumber] = {
+                            currentItem: item[index],
+                        };
                         // The "Loop" binding in the front end is "fake", so replace it here so the context can understand it
                         // Pretty hacky because we need to account for the row object
                         for (let [key, value] of Object.entries(originalStepInput)) {
@@ -168,8 +178,19 @@ class Orchestrator {
                             loopStep = null;
                             break;
                         }
-                        if (((_a = this._context.steps[loopStepNumber]) === null || _a === void 0 ? void 0 : _a.currentItem) ===
-                            loopStep.inputs.failure) {
+                        let isFailure = false;
+                        if (typeof ((_a = this._context.steps[loopStepNumber]) === null || _a === void 0 ? void 0 : _a.currentItem) === "object") {
+                            isFailure = Object.keys(this._context.steps[loopStepNumber].currentItem).some(value => {
+                                return (this._context.steps[loopStepNumber].currentItem[value] ===
+                                    loopStep.inputs.failure);
+                            });
+                        }
+                        else {
+                            isFailure =
+                                ((_b = this._context.steps[loopStepNumber]) === null || _b === void 0 ? void 0 : _b.currentItem) ===
+                                    loopStep.inputs.failure;
+                        }
+                        if (isFailure) {
                             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
                                 status: AutomationErrors.FAILURE_CONDITION,
                                 success: false,