@budibase/server 1.3.13 → 1.3.15

package/coverage/lcov-report/utilities/security.js.html

@@ -283,7 +283,7 @@ exports.CURRENTLY_SUPPORTED_LEVELS = CURRENTLY_SUPPORTED_LEVELS
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Sep 12 2022 08:31:07 GMT+0000 (Coordinated Universal Time)
+                at Mon Sep 12 2022 14:50:25 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/statusCodes.js.html

@@ -91,7 +91,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Sep 12 2022 08:31:07 GMT+0000 (Coordinated Universal Time)
+                at Mon Sep 12 2022 14:50:25 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/index.html

@@ -116,7 +116,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Sep 12 2022 08:31:07 GMT+0000 (Coordinated Universal Time)
+                at Mon Sep 12 2022 14:50:25 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/rows.js.html

@@ -142,7 +142,8 @@
 <a name='L77'></a><a href='#L77'>77</a>
 <a name='L78'></a><a href='#L78'>78</a>
 <a name='L79'></a><a href='#L79'>79</a>
-<a name='L80'></a><a href='#L80'>80</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">44x</span>
+<a name='L80'></a><a href='#L80'>80</a>
+<a name='L81'></a><a href='#L81'>81</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">44x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -216,6 +217,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">28x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -295,7 +297,8 @@ exports.getUniqueRows = async appIds =&gt; {
     // ensure uniqueness on a per app pair basis
     // this can't be done on all rows because app import results in
     // duplicate row ids across apps
-    uniqueRows = uniqueRows.concat(...new Set(appRows))
+    // the array pre-concat is important to avoid stack overflow
+    uniqueRows = uniqueRows.concat([...new Set(appRows)])
   }
 &nbsp;
   return uniqueRows
@@ -307,7 +310,7 @@ exports.getUniqueRows = async appIds =&gt; {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Sep 12 2022 08:31:07 GMT+0000 (Coordinated Universal Time)
+                at Mon Sep 12 2022 14:50:25 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/usageQuoteReset.js.html

@@ -124,7 +124,7 @@ function <span class="fstat-no" title="function not covered" >resetQuotasIfRequi
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Sep 12 2022 08:31:07 GMT+0000 (Coordinated Universal Time)
+                at Mon Sep 12 2022 14:50:25 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/users.js.html

@@ -205,7 +205,7 @@ exports.publicApiUserFix = ctx => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Sep 12 2022 08:31:07 GMT+0000 (Coordinated Universal Time)
+                at Mon Sep 12 2022 14:50:25 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/workerRequests.js.html

@@ -535,7 +535,7 @@ exports.getChecklist = <span class="fstat-no" title="function not covered" >as</
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Sep 12 2022 08:31:07 GMT+0000 (Coordinated Universal Time)
+                at Mon Sep 12 2022 14:50:25 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -377,8 +377,8 @@ BRH:25
 end_of_record
 TN:
 SF:src/api/controllers/backup.js
-FN:5,(anonymous_0)
-FN:13,(anonymous_1)
+FN:6,(anonymous_0)
+FN:14,(anonymous_1)
 FNF:2
 FNH:2
 FNDA:1,(anonymous_0)
@@ -386,19 +386,20 @@ FNDA:1,(anonymous_1)
 DA:1,28
 DA:2,28
 DA:3,28
-DA:5,28
-DA:6,1
+DA:4,28
+DA:6,28
 DA:7,1
 DA:8,1
 DA:9,1
 DA:10,1
 DA:11,1
-DA:13,1
+DA:12,1
 DA:14,1
 DA:15,1
 DA:16,1
-LF:14
-LH:14
+DA:17,1
+LF:15
+LH:15
 BRF:0
 BRH:0
 end_of_record
@@ -4724,8 +4725,8 @@ TN:
 SF:src/automations/index.js
 FN:9,(anonymous_0)
 FN:11,(anonymous_1)
-FN:16,(anonymous_2)
-FN:20,(anonymous_3)
+FN:19,(anonymous_2)
+FN:23,(anonymous_3)
 FNF:4
 FNH:2
 FNDA:32,(anonymous_0)
@@ -4739,38 +4740,46 @@ DA:4,44
 DA:9,44
 DA:11,32
 DA:12,8
-DA:16,44
-DA:17,0
-DA:20,44
-DA:21,0
-DA:24,44
-DA:25,44
-DA:26,44
-LF:14
-LH:12
+DA:15,32
+DA:16,32
+DA:19,44
+DA:20,0
+DA:23,44
+DA:24,0
+DA:27,44
+DA:28,44
+DA:29,44
+LF:16
+LH:14
 BRF:0
 BRH:0
 end_of_record
 TN:
 SF:src/automations/triggers.js
-FN:19,queueRelevantRowAutomations
-FN:24,(anonymous_1)
-FN:32,(anonymous_2)
+FN:20,getAllAutomations
+FN:25,(anonymous_1)
+FN:28,queueRelevantRowAutomations
 FN:33,(anonymous_3)
-FN:61,(anonymous_4)
-FN:69,(anonymous_5)
-FN:77,(anonymous_6)
-FN:85,(anonymous_7)
-FNF:8
-FNH:8
+FN:37,(anonymous_4)
+FN:65,(anonymous_5)
+FN:73,(anonymous_6)
+FN:81,(anonymous_7)
+FN:89,(anonymous_8)
+FN:117,(anonymous_9)
+FN:127,(anonymous_10)
+FNF:11
+FNH:11
+FNDA:23,getAllAutomations
+FNDA:4,(anonymous_1)
 FNDA:17,queueRelevantRowAutomations
-FNDA:17,(anonymous_1)
-FNDA:4,(anonymous_2)
-FNDA:4,(anonymous_3)
-FNDA:7,(anonymous_4)
-FNDA:4,(anonymous_5)
-FNDA:6,(anonymous_6)
+FNDA:17,(anonymous_3)
+FNDA:4,(anonymous_4)
+FNDA:7,(anonymous_5)
+FNDA:4,(anonymous_6)
 FNDA:6,(anonymous_7)
+FNDA:6,(anonymous_8)
+FNDA:32,(anonymous_9)
+FNDA:6,(anonymous_10)
 DA:1,45
 DA:2,45
 DA:3,45
@@ -4781,73 +4790,94 @@ DA:8,45
 DA:9,45
 DA:10,45
 DA:11,45
-DA:13,45
+DA:12,45
 DA:14,45
-DA:20,17
-DA:21,0
-DA:24,17
-DA:25,17
-DA:26,17
-DA:31,17
-DA:32,4
-DA:34,4
-DA:35,4
-DA:38,17
+DA:15,45
+DA:21,23
+DA:22,23
+DA:25,23
+DA:29,17
+DA:30,0
+DA:33,17
+DA:34,17
+DA:37,17
+DA:38,4
 DA:39,4
-DA:40,4
+DA:42,17
+DA:43,4
 DA:44,4
-DA:49,0
-DA:51,4
+DA:48,4
+DA:53,0
 DA:55,4
-DA:61,45
-DA:66,7
-DA:69,45
-DA:74,4
-DA:77,45
-DA:82,6
-DA:85,45
-DA:90,6
-DA:98,1
-DA:99,1
-DA:100,1
-DA:101,1
+DA:59,4
+DA:65,45
+DA:70,7
+DA:73,45
+DA:78,4
+DA:81,45
+DA:86,6
+DA:89,45
+DA:94,6
+DA:102,1
 DA:103,1
-DA:105,6
-DA:106,6
-DA:107,2
-DA:109,4
-DA:113,45
-LF:46
-LH:44
-BRDA:20,0,0,0
-BRDA:20,0,1,17
-BRDA:35,1,0,4
-BRDA:35,1,1,4
-BRDA:40,2,0,4
-BRDA:40,2,1,0
-BRDA:44,3,0,0
-BRDA:44,3,1,4
-BRDA:45,4,0,4
-BRDA:45,4,1,4
-BRDA:45,4,2,4
-BRDA:51,5,0,4
-BRDA:51,5,1,0
-BRDA:52,6,0,4
-BRDA:52,6,1,4
-BRDA:88,7,0,4
-BRDA:90,8,0,1
-BRDA:90,8,1,5
-BRDA:91,9,0,6
-BRDA:91,9,1,6
-BRDA:91,9,2,6
-BRDA:91,9,3,1
-BRDA:91,9,4,1
-BRDA:100,10,0,1
-BRDA:100,10,1,0
-BRDA:106,11,0,2
-BRDA:106,11,1,4
-BRF:27
-BRH:22
+DA:104,1
+DA:105,1
+DA:107,1
+DA:109,6
+DA:110,6
+DA:111,2
+DA:113,4
+DA:117,45
+DA:120,32
+DA:121,0
+DA:125,32
+DA:126,32
+DA:127,6
+DA:128,6
+DA:129,6
+DA:130,6
+DA:131,0
+DA:132,0
+DA:139,0
+DA:142,6
+DA:147,45
+LF:61
+LH:55
+BRDA:29,0,0,0
+BRDA:29,0,1,17
+BRDA:39,1,0,4
+BRDA:39,1,1,4
+BRDA:44,2,0,4
+BRDA:44,2,1,0
+BRDA:48,3,0,0
+BRDA:48,3,1,4
+BRDA:49,4,0,4
+BRDA:49,4,1,4
+BRDA:49,4,2,4
+BRDA:55,5,0,4
+BRDA:55,5,1,0
+BRDA:56,6,0,4
+BRDA:56,6,1,4
+BRDA:92,7,0,4
+BRDA:94,8,0,1
+BRDA:94,8,1,5
+BRDA:95,9,0,6
+BRDA:95,9,1,6
+BRDA:95,9,2,6
+BRDA:95,9,3,1
+BRDA:95,9,4,1
+BRDA:104,10,0,1
+BRDA:104,10,1,0
+BRDA:110,11,0,2
+BRDA:110,11,1,4
+BRDA:120,12,0,0
+BRDA:120,12,1,32
+BRDA:120,13,0,32
+BRDA:120,13,1,32
+BRDA:131,14,0,0
+BRDA:131,14,1,0
+BRF:33
+BRH:25
 end_of_record
 TN:
 SF:src/automations/steps/bash.js
@@ -5645,7 +5675,7 @@ FN:369,(anonymous_29)
 FN:376,(anonymous_30)
 FNF:31
 FNH:25
-FNDA:875,getDocParams
+FNDA:881,getDocParams
 FNDA:271,(anonymous_1)
 FNDA:130,(anonymous_2)
 FNDA:44,(anonymous_3)
@@ -5654,7 +5684,7 @@ FNDA:323,(anonymous_5)
 FNDA:3,(anonymous_6)
 FNDA:244,(anonymous_7)
 FNDA:3,(anonymous_8)
-FNDA:274,(anonymous_9)
+FNDA:280,(anonymous_9)
 FNDA:27,(anonymous_10)
 FNDA:9,(anonymous_11)
 FNDA:0,(anonymous_12)
@@ -5705,9 +5735,9 @@ DA:81,59
 DA:83,59
 DA:84,59
 DA:86,59
-DA:101,875
-DA:102,858
-DA:104,875
+DA:101,881
+DA:102,864
+DA:104,881
 DA:111,59
 DA:116,59
 DA:117,271
@@ -5734,7 +5764,7 @@ DA:190,3
 DA:191,1
 DA:193,2
 DA:199,59
-DA:200,274
+DA:200,280
 DA:207,59
 DA:208,27
 DA:222,59
@@ -5789,7 +5819,7 @@ LF:109
 LH:99
 BRDA:100,0,0,0
 BRDA:100,1,0,0
-BRDA:101,2,0,858
+BRDA:101,2,0,864
 BRDA:101,2,1,17
 BRDA:116,3,0,0
 BRDA:116,4,0,0
@@ -7300,8 +7330,9 @@ FN:138,(anonymous_12)
 FN:140,(anonymous_13)
 FN:147,(anonymous_14)
 FN:158,(anonymous_15)
-FNF:16
-FNH:15
+FN:166,(anonymous_16)
+FNF:17
+FNH:16
 FNDA:4,(anonymous_0)
 FNDA:4,(anonymous_1)
 FNDA:1,(anonymous_2)
@@ -7316,8 +7347,9 @@ FNDA:4,(anonymous_10)
 FNDA:0,(anonymous_11)
 FNDA:1,(anonymous_12)
 FNDA:1,(anonymous_13)
-FNDA:36,(anonymous_14)
+FNDA:38,(anonymous_14)
 FNDA:1,(anonymous_15)
+FNDA:1,(anonymous_16)
 DA:1,49
 DA:2,49
 DA:3,49
@@ -7382,20 +7414,24 @@ DA:139,1
 DA:141,1
 DA:142,1
 DA:147,49
-DA:148,36
-DA:149,36
-DA:150,36
-DA:151,36
-DA:152,36
+DA:148,38
+DA:149,38
+DA:150,38
+DA:151,38
+DA:152,38
 DA:153,0
-DA:155,36
+DA:155,38
 DA:158,49
 DA:159,1
 DA:160,1
 DA:161,0
 DA:163,1
-LF:76
-LH:62
+DA:166,49
+DA:167,1
+DA:168,0
+DA:170,1
+LF:80
+LH:65
 BRDA:18,0,0,1
 BRDA:18,0,1,0
 BRDA:39,1,0,2
@@ -7414,20 +7450,22 @@ BRDA:123,7,0,0
 BRDA:123,7,1,4
 BRDA:123,8,0,4
 BRDA:123,8,1,4
-BRDA:151,9,0,36
-BRDA:151,9,1,33
-BRDA:152,10,0,36
+BRDA:151,9,0,38
+BRDA:151,9,1,35
+BRDA:152,10,0,38
 BRDA:152,10,1,0
 BRDA:155,11,0,0
-BRDA:155,11,1,36
-BRDA:155,12,0,36
-BRDA:155,12,1,33
+BRDA:155,11,1,38
+BRDA:155,12,0,38
+BRDA:155,12,1,35
 BRDA:160,13,0,0
 BRDA:160,13,1,1
 BRDA:160,14,0,1
 BRDA:160,14,1,0
-BRF:30
-BRH:16
+BRDA:167,15,0,0
+BRDA:167,15,1,1
+BRF:32
+BRH:17
 end_of_record
 TN:
 SF:src/utilities/scriptRunner.js
@@ -8146,12 +8184,14 @@ BRDA:76,15,0,0
 BRDA:76,15,1,0
 BRDA:79,16,0,0
 BRDA:79,16,1,0
-BRDA:86,17,0,0
-BRDA:86,17,1,0
+BRDA:79,17,0,0
+BRDA:79,17,1,0
 BRDA:86,18,0,0
 BRDA:86,18,1,0
-BRDA:86,18,2,0
-BRF:42
+BRDA:86,19,0,0
+BRDA:86,19,1,0
+BRDA:86,19,2,0
+BRF:44
 BRH:18
 end_of_record
 TN:
@@ -8203,8 +8243,8 @@ DA:62,26
 DA:64,30
 DA:65,30
 DA:67,0
-DA:75,28
-DA:78,27
+DA:76,28
+DA:79,27
 LF:35
 LH:33
 BRDA:16,0,0,28

package/dist/api/controllers/application.js

@@ -490,11 +490,7 @@ const sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     });
     let error;
     try {
-        yield replication.replicate({
-            filter: function (doc) {
-                return doc._id !== utils_1.DocumentType.APP_METADATA;
-            },
-        });
+        yield replication.replicate(replication.appReplicateOpts());
     }
     catch (err) {
         error = err;

package/dist/api/controllers/backup.js

@@ -11,11 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const { streamBackup } = require("../../utilities/fileSystem");
 const { events, context } = require("@budibase/backend-core");
 const { DocumentType } = require("../../db/utils");
+const { isQsTrue } = require("../../utilities");
 exports.exportAppDump = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         let { appId, excludeRows } = ctx.query;
         const appName = decodeURI(ctx.query.appname);
-        excludeRows = excludeRows === "true";
+        excludeRows = isQsTrue(excludeRows);
         const backupIdentifier = `${appName}-export-${new Date().getTime()}.txt`;
         ctx.attachment(backupIdentifier);
         ctx.body = yield streamBackup(appId, excludeRows);

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

@@ -100,14 +100,29 @@ function deployApp(deployment) {
                 target: productionAppId,
             };
             replication = new db_1.Replication(config);
+            const devDb = (0, context_1.getDevAppDB)();
+            console.log("Compacting development DB");
+            yield devDb.compact();
             console.log("Replication object created");
-            yield replication.replicate();
+            yield replication.replicate(replication.appReplicateOpts());
             console.log("replication complete.. replacing app meta doc");
+            // app metadata is excluded as it is likely to be in conflict
+            // replicate the app metadata document manually
             const db = (0, context_1.getProdAppDB)();
-            const appDoc = yield db.get(utils_1.DocumentType.APP_METADATA);
+            const appDoc = yield devDb.get(utils_1.DocumentType.APP_METADATA);
+            try {
+                const prodAppDoc = yield db.get(utils_1.DocumentType.APP_METADATA);
+                appDoc._rev = prodAppDoc._rev;
+            }
+            catch (err) {
+                delete appDoc._rev;
+            }
+            // switch to production app ID
             deployment.appUrl = appDoc.url;
             appDoc.appId = productionAppId;
             appDoc.instance._id = productionAppId;
+            // remove automation errors if they exist
+            delete appDoc.automationErrors;
             yield db.put(appDoc);
             yield cache_1.app.invalidateAppMetadata(productionAppId);
             console.log("New app doc written successfully.");

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

@@ -446,7 +446,7 @@ var External;
                     });
                     // this is the response from knex if no rows found
                     const rows = !response[0].read ? response : [];
-                    const storeTo = isMany ? field.throughFrom || linkPrimaryKey : manyKey;
+                    const storeTo = isMany ? field.throughFrom || linkPrimaryKey : fieldName;
                     related[storeTo] = { rows, isMany, tableId };
                 }
                 return related;

package/dist/automations/index.js

@@ -10,16 +10,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const { processEvent } = require("./utils");
 const { queue, shutdown } = require("./bullboard");
-const { TRIGGER_DEFINITIONS } = require("./triggers");
+const { TRIGGER_DEFINITIONS, rebootTrigger } = require("./triggers");
 const { ACTION_DEFINITIONS } = require("./actions");
 /**
  * This module is built purely to kick off the worker farm and manage the inputs/outputs
  */
 exports.init = function () {
-    // this promise will not complete
-    return queue.process((job) => __awaiter(this, void 0, void 0, function* () {
-        yield processEvent(job);
-    }));
+    return __awaiter(this, void 0, void 0, function* () {
+        // this promise will not complete
+        const promise = queue.process((job) => __awaiter(this, void 0, void 0, function* () {
+            yield processEvent(job);
+        }));
+        // on init we need to trigger any reboot automations
+        yield rebootTrigger();
+        return promise;
+    });
 };
 exports.getQueues = () => {
     return [queue];