@budibase/server 0.9.148-alpha.1 → 0.9.148-alpha.5

package/coverage/lcov-report/middleware/usageQuota.js.html

@@ -23,16 +23,16 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">93.94% </span>
+                <span class="strong">94.12% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>31/33</span>
+                <span class='fraction'>32/34</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">90% </span>
+                <span class="strong">86.36% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>18/20</span>
+                <span class='fraction'>19/22</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">93.55% </span>
+                <span class="strong">93.75% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>29/31</span>
+                <span class='fraction'>30/32</span>
             </div>
         
             
@@ -129,7 +129,9 @@
 <a name='L70'></a><a href='#L70'>70</a>
 <a name='L71'></a><a href='#L71'>71</a>
 <a name='L72'></a><a href='#L72'>72</a>
-<a name='L73'></a><a href='#L73'>73</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">24x</span>
+<a name='L73'></a><a href='#L73'>73</a>
+<a name='L74'></a><a href='#L74'>74</a>
+<a name='L75'></a><a href='#L75'>75</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">24x</span>
 <span class="cline-any cline-yes">24x</span>
 <span class="cline-any cline-yes">24x</span>
 <span class="cline-any cline-yes">24x</span>
@@ -173,13 +175,15 @@
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
@@ -242,7 +246,6 @@ module.exports = async (ctx, next) =&gt; {
     return next()
   }
 &nbsp;
-  const db = new CouchDB(ctx.appId)
   let usage = METHOD_MAP[ctx.req.method]
   const property = getProperty(ctx.req.url)
   <span class="missing-if-branch" title="if path not taken" >I</span>if (usage == null || property == null) {
@@ -251,7 +254,10 @@ module.exports = async (ctx, next) =&gt; {
   // post request could be a save of a pre-existing entry
   if (ctx.request.body &amp;&amp; ctx.request.body._id &amp;&amp; ctx.request.body._rev) {
     try {
-      await db.get(ctx.request.body._id)
+      <span class="missing-if-branch" title="else path not taken" >E</span>if (ctx.appId) {
+        const db = new CouchDB(ctx.appId)
+        await db.get(ctx.request.body._id)
+      }
       return next()
     } catch (err) {
       ctx.throw(404, `${ctx.request.body._id} does not exist`)
@@ -280,7 +286,7 @@ module.exports = async (ctx, next) =&gt; {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Sep 30 2021 16:12:28 GMT+0000 (Coordinated Universal Time)
+                at Fri Oct 01 2021 11:42:18 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -109,7 +109,7 @@ const SALT_ROUNDS = <span class="cstat-no" title="statement not covered" >env.SA
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Sep 30 2021 16:12:28 GMT+0000 (Coordinated Universal Time)
+                at Fri Oct 01 2021 11:42:18 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -94,7 +94,7 @@ module.exports.budibaseTempDir = budibaseTempDir
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Sep 30 2021 16:12:28 GMT+0000 (Coordinated Universal Time)
+                at Fri Oct 01 2021 11:42:18 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -130,7 +130,7 @@ exports.resolve = <span class="fstat-no" title="function not covered" >fu</span>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Sep 30 2021 16:12:28 GMT+0000 (Coordinated Universal Time)
+                at Fri Oct 01 2021 11:42:18 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -358,7 +358,7 @@ module.exports = {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Sep 30 2021 16:12:28 GMT+0000 (Coordinated Universal Time)
+                at Fri Oct 01 2021 11:42:18 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -331,7 +331,7 @@ exports.getGlobalUsersFromMetadata = async (appId, users) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Sep 30 2021 16:12:28 GMT+0000 (Coordinated Universal Time)
+                at Fri Oct 01 2021 11:42:18 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -230,7 +230,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Sep 30 2021 16:12:28 GMT+0000 (Coordinated Universal Time)
+                at Fri Oct 01 2021 11:42:18 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -472,7 +472,7 @@ exports.stringToReadStream = <span class="fstat-no" title="function not covered"
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Sep 30 2021 16:12:28 GMT+0000 (Coordinated Universal Time)
+                at Fri Oct 01 2021 11:42:18 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/utilities/queue/inMemoryQueue.js.html

@@ -325,7 +325,7 @@ module.exports = InMemoryQueue
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Sep 30 2021 16:12:28 GMT+0000 (Coordinated Universal Time)
+                at Fri Oct 01 2021 11:42:18 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -95,7 +95,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Sep 30 2021 16:12:28 GMT+0000 (Coordinated Universal Time)
+                at Fri Oct 01 2021 11:42:18 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -95,7 +95,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Sep 30 2021 16:12:28 GMT+0000 (Coordinated Universal Time)
+                at Fri Oct 01 2021 11:42:18 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/routing/index.js.html

@@ -139,7 +139,7 @@ exports.createRoutingView = createRoutingView
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Sep 30 2021 16:12:28 GMT+0000 (Coordinated Universal Time)
+                at Fri Oct 01 2021 11:42:18 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -110,7 +110,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Sep 30 2021 16:12:28 GMT+0000 (Coordinated Universal Time)
+                at Fri Oct 01 2021 11:42:18 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/rowProcessor/index.js.html

@@ -802,7 +802,7 @@ exports.outputProcessing = async (
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Sep 30 2021 16:12:28 GMT+0000 (Coordinated Universal Time)
+                at Fri Oct 01 2021 11:42:18 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/rowProcessor/utils.js.html

@@ -133,7 +133,7 @@ exports.processFormulas = (table, rows) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Sep 30 2021 16:12:28 GMT+0000 (Coordinated Universal Time)
+                at Fri Oct 01 2021 11:42:18 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -265,7 +265,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">istanbul</a>
-                at Thu Sep 30 2021 16:12:28 GMT+0000 (Coordinated Universal Time)
+                at Fri Oct 01 2021 11:42:18 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -85,7 +85,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Sep 30 2021 16:12:28 GMT+0000 (Coordinated Universal Time)
+                at Fri Oct 01 2021 11:42:18 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -136,7 +136,7 @@ exports.getFullUser = async (ctx, userId) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Sep 30 2021 16:12:28 GMT+0000 (Coordinated Universal Time)
+                at Fri Oct 01 2021 11:42:18 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -496,7 +496,7 @@ exports.removeAppFromUserRoles = async (ctx, appId) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Sep 30 2021 16:12:28 GMT+0000 (Coordinated Universal Time)
+                at Fri Oct 01 2021 11:42:18 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov.info

@@ -2114,11 +2114,11 @@ FN:342,(anonymous_16)
 FN:348,(anonymous_17)
 FN:381,(anonymous_18)
 FN:389,(anonymous_19)
-FN:408,(anonymous_20)
-FN:414,(anonymous_21)
-FN:422,(anonymous_22)
-FN:423,(anonymous_23)
-FN:425,(anonymous_24)
+FN:409,(anonymous_20)
+FN:411,(anonymous_21)
+FN:438,(anonymous_22)
+FN:439,(anonymous_23)
+FN:441,(anonymous_24)
 FNF:25
 FNH:23
 FNDA:70,storeResponse
@@ -2333,20 +2333,30 @@ DA:393,1
 DA:395,1
 DA:400,1
 DA:406,1
-DA:408,1
+DA:409,1
 DA:411,1
+DA:413,1
 DA:414,1
+DA:415,1
+DA:416,1
 DA:417,1
-DA:418,3
-DA:419,3
-DA:421,1
-DA:422,1
-DA:423,1
+DA:418,1
+DA:419,1
+DA:421,0
+DA:424,1
 DA:425,1
-DA:426,1
-DA:430,1
-LF:199
-LH:164
+DA:427,1
+DA:433,1
+DA:434,3
+DA:435,3
+DA:437,1
+DA:438,1
+DA:439,1
+DA:441,1
+DA:442,1
+DA:446,1
+LF:209
+LH:173
 BRDA:40,0,0,0
 BRDA:40,0,1,70
 BRDA:44,1,0,0
@@ -2407,10 +2417,12 @@ BRDA:369,28,0,1
 BRDA:369,28,1,1
 BRDA:371,29,0,0
 BRDA:371,29,1,1
-BRDA:419,30,0,1
-BRDA:419,30,1,2
-BRF:62
-BRH:38
+BRDA:417,30,0,1
+BRDA:417,30,1,0
+BRDA:435,31,0,1
+BRDA:435,31,1,2
+BRF:64
+BRH:39
 end_of_record
 TN:
 SF:src/api/controllers/row/internalSearch.js
@@ -6531,8 +6543,8 @@ TN:
 SF:src/middleware/usageQuota.js
 FN:26,getProperty
 FN:34,(anonymous_1)
-FN:64,(anonymous_2)
-FN:64,(anonymous_3)
+FN:66,(anonymous_2)
+FN:66,(anonymous_3)
 FNF:4
 FNH:4
 FNDA:4,getProperty
@@ -6556,22 +6568,23 @@ DA:39,7
 DA:42,4
 DA:43,4
 DA:44,4
-DA:45,4
-DA:46,0
-DA:49,4
+DA:45,0
+DA:48,4
+DA:49,2
 DA:50,2
 DA:51,2
-DA:52,1
+DA:52,2
 DA:54,1
-DA:59,3
-DA:61,1
-DA:64,2
-DA:66,3
-DA:67,3
+DA:56,1
+DA:61,3
+DA:63,1
+DA:66,2
 DA:68,3
-DA:70,0
-LF:31
-LH:29
+DA:69,3
+DA:70,3
+DA:72,0
+LF:32
+LH:30
 BRDA:28,0,0,4
 BRDA:28,0,1,1
 BRDA:38,1,0,7
@@ -6579,21 +6592,23 @@ BRDA:38,1,1,4
 BRDA:38,2,0,11
 BRDA:38,2,1,4
 BRDA:38,2,2,4
-BRDA:45,3,0,0
-BRDA:45,3,1,4
-BRDA:45,4,0,4
-BRDA:45,4,1,4
-BRDA:49,5,0,2
-BRDA:49,5,1,2
-BRDA:49,6,0,4
-BRDA:49,6,1,4
-BRDA:49,6,2,2
-BRDA:59,7,0,1
-BRDA:59,7,1,2
+BRDA:44,3,0,0
+BRDA:44,3,1,4
+BRDA:44,4,0,4
+BRDA:44,4,1,4
+BRDA:48,5,0,2
+BRDA:48,5,1,2
+BRDA:48,6,0,4
+BRDA:48,6,1,4
+BRDA:48,6,2,2
+BRDA:50,7,0,2
+BRDA:50,7,1,0
 BRDA:61,8,0,1
-BRDA:61,8,1,0
-BRF:20
-BRH:18
+BRDA:61,8,1,2
+BRDA:63,9,0,1
+BRDA:63,9,1,0
+BRF:22
+BRH:19
 end_of_record
 TN:
 SF:src/utilities/bcrypt.js

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

@@ -381,12 +381,27 @@ exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function*
         rowId,
     });
     // look up the actual rows based on the ids
-    const response = yield db.allDocs({
+    let response = (yield db.allDocs({
         include_docs: true,
         keys: linkVals.map(linkVal => linkVal.id),
-    });
-    // need to include the IDs in these rows for any links they may have
-    let linkedRows = yield outputProcessing(ctx, table, response.rows.map(row => row.doc));
+    })).rows.map(row => row.doc);
+    // group responses by table
+    let groups = {}, tables = {};
+    for (let row of response) {
+        const linkedTableId = row.tableId;
+        if (groups[linkedTableId] == null) {
+            groups[linkedTableId] = [row];
+            tables[linkedTableId] = yield db.get(linkedTableId);
+        }
+        else {
+            groups[linkedTableId].push(row);
+        }
+    }
+    let linkedRows = [];
+    for (let [tableId, rows] of Object.entries(groups)) {
+        // need to include the IDs in these rows for any links they may have
+        linkedRows = linkedRows.concat(yield outputProcessing(ctx, tables[tableId], rows));
+    }
     // insert the link rows in the correct place throughout the main row
     for (let fieldName of Object.keys(table.schema)) {
         let field = table.schema[fieldName];

package/dist/middleware/usageQuota.js

@@ -42,7 +42,6 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     if (env.isDev() || env.SELF_HOSTED || EXCLUDED_TENANTS.includes(tenantId)) {
         return next();
     }
-    const db = new CouchDB(ctx.appId);
     let usage = METHOD_MAP[ctx.req.method];
     const property = getProperty(ctx.req.url);
     if (usage == null || property == null) {
@@ -51,7 +50,10 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     // post request could be a save of a pre-existing entry
     if (ctx.request.body && ctx.request.body._id && ctx.request.body._rev) {
         try {
-            yield db.get(ctx.request.body._id);
+            if (ctx.appId) {
+                const db = new CouchDB(ctx.appId);
+                yield db.get(ctx.request.body._id);
+            }
             return next();
         }
         catch (err) {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "0.9.148-alpha.0",
+    "version": "0.9.148-alpha.4",
     "description": "Budibase Web Server",
     "main": "src/index.js",
     "repository": {
@@ -64,9 +64,9 @@
     "author": "Budibase",
     "license": "AGPL-3.0-or-later",
     "dependencies": {
-        "@budibase/auth": "^0.9.148-alpha.0",
-        "@budibase/client": "^0.9.148-alpha.0",
-        "@budibase/string-templates": "^0.9.148-alpha.0",
+        "@budibase/auth": "^0.9.148-alpha.4",
+        "@budibase/client": "^0.9.148-alpha.4",
+        "@budibase/string-templates": "^0.9.148-alpha.4",
         "@elastic/elasticsearch": "7.10.0",
         "@koa/router": "8.0.0",
         "@sendgrid/mail": "7.1.1",