@budibase/server 1.0.145 → 1.0.148

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 Thu May 05 2022 23:48:40 GMT+0000 (Coordinated Universal Time)
+                at Mon May 09 2022 13:23:15 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 Thu May 05 2022 23:48:40 GMT+0000 (Coordinated Universal Time)
+                at Mon May 09 2022 13:23:15 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -307,7 +307,7 @@ exports.getUniqueRows = async appIds => {
             <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 Thu May 05 2022 23:48:40 GMT+0000 (Coordinated Universal Time)
+                at Mon May 09 2022 13:23:15 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 Thu May 05 2022 23:48:40 GMT+0000 (Coordinated Universal Time)
+                at Mon May 09 2022 13:23:15 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -142,7 +142,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" rel="noopener noreferrer">istanbul</a>
-                at Thu May 05 2022 23:48:40 GMT+0000 (Coordinated Universal Time)
+                at Mon May 09 2022 13:23:15 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

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

@@ -487,7 +487,7 @@ exports.readGlobalUser = <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 Thu May 05 2022 23:48:40 GMT+0000 (Coordinated Universal Time)
+                at Mon May 09 2022 13:23:15 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -5173,10 +5173,10 @@ SF:src/db/newid.js
 FN:3,(anonymous_0)
 FNF:1
 FNH:1
-FNDA:996,(anonymous_0)
+FNDA:797,(anonymous_0)
 DA:1,54
 DA:3,54
-DA:4,996
+DA:4,797
 LF:3
 LH:3
 BRF:0
@@ -5184,40 +5184,38 @@ BRH:0
 end_of_record
 TN:
 SF:src/db/utils.js
-FN:87,(anonymous_0)
-FN:103,getDocParams
-FN:119,(anonymous_2)
-FN:127,(anonymous_3)
-FN:139,(anonymous_4)
-FN:154,(anonymous_5)
-FN:167,(anonymous_6)
-FN:175,(anonymous_7)
-FN:184,(anonymous_8)
-FN:191,(anonymous_9)
-FN:202,(anonymous_10)
-FN:210,(anonymous_11)
-FN:225,(anonymous_12)
-FN:242,(anonymous_13)
-FN:250,(anonymous_14)
-FN:262,(anonymous_15)
-FN:272,(anonymous_16)
-FN:279,(anonymous_17)
-FN:287,(anonymous_18)
-FN:294,(anonymous_19)
-FN:302,(anonymous_20)
-FN:309,(anonymous_21)
-FN:317,(anonymous_22)
-FN:326,(anonymous_23)
-FN:334,(anonymous_24)
-FN:343,(anonymous_25)
-FN:359,(anonymous_26)
-FN:363,(anonymous_27)
-FN:367,(anonymous_28)
-FN:375,(anonymous_29)
-FN:379,(anonymous_30)
-FN:386,(anonymous_31)
-FNF:32
-FNH:27
+FN:91,(anonymous_0)
+FN:107,getDocParams
+FN:123,(anonymous_2)
+FN:131,(anonymous_3)
+FN:143,(anonymous_4)
+FN:158,(anonymous_5)
+FN:171,(anonymous_6)
+FN:179,(anonymous_7)
+FN:188,(anonymous_8)
+FN:195,(anonymous_9)
+FN:206,(anonymous_10)
+FN:214,(anonymous_11)
+FN:229,(anonymous_12)
+FN:246,(anonymous_13)
+FN:254,(anonymous_14)
+FN:261,(anonymous_15)
+FN:269,(anonymous_16)
+FN:276,(anonymous_17)
+FN:284,(anonymous_18)
+FN:291,(anonymous_19)
+FN:299,(anonymous_20)
+FN:308,(anonymous_21)
+FN:316,(anonymous_22)
+FN:325,(anonymous_23)
+FN:341,(anonymous_24)
+FN:345,(anonymous_25)
+FN:349,(anonymous_26)
+FN:357,(anonymous_27)
+FN:361,(anonymous_28)
+FN:368,(anonymous_29)
+FNF:30
+FNH:25
 FNDA:74,(anonymous_0)
 FNDA:908,getDocParams
 FNDA:220,(anonymous_2)
@@ -5232,36 +5230,32 @@ FNDA:225,(anonymous_10)
 FNDA:20,(anonymous_11)
 FNDA:9,(anonymous_12)
 FNDA:0,(anonymous_13)
-FNDA:199,(anonymous_14)
-FNDA:199,(anonymous_15)
-FNDA:5,(anonymous_16)
-FNDA:212,(anonymous_17)
-FNDA:19,(anonymous_18)
-FNDA:214,(anonymous_19)
-FNDA:10,(anonymous_20)
-FNDA:2,(anonymous_21)
-FNDA:39,(anonymous_22)
+FNDA:5,(anonymous_14)
+FNDA:212,(anonymous_15)
+FNDA:19,(anonymous_16)
+FNDA:214,(anonymous_17)
+FNDA:10,(anonymous_18)
+FNDA:2,(anonymous_19)
+FNDA:39,(anonymous_20)
+FNDA:4,(anonymous_21)
+FNDA:131,(anonymous_22)
 FNDA:4,(anonymous_23)
-FNDA:131,(anonymous_24)
-FNDA:4,(anonymous_25)
+FNDA:0,(anonymous_24)
+FNDA:10,(anonymous_25)
 FNDA:0,(anonymous_26)
-FNDA:10,(anonymous_27)
+FNDA:1,(anonymous_27)
 FNDA:0,(anonymous_28)
-FNDA:1,(anonymous_29)
-FNDA:0,(anonymous_30)
-FNDA:60,(anonymous_31)
+FNDA:60,(anonymous_29)
 DA:1,54
-DA:12,54
 DA:14,54
 DA:16,54
-DA:22,54
-DA:46,54
-DA:51,54
-DA:55,54
-DA:59,54
+DA:18,54
+DA:24,54
+DA:48,54
+DA:53,54
+DA:57,54
 DA:61,54
-DA:69,54
-DA:70,54
+DA:63,54
 DA:71,54
 DA:72,54
 DA:73,54
@@ -5274,150 +5268,142 @@ DA:79,54
 DA:80,54
 DA:81,54
 DA:82,54
+DA:83,54
 DA:84,54
 DA:85,54
-DA:87,54
-DA:88,74
-DA:104,908
-DA:105,893
-DA:107,908
-DA:114,54
-DA:119,54
-DA:120,220
-DA:127,54
-DA:128,105
-DA:139,54
-DA:140,27
-DA:141,15
-DA:144,12
-DA:146,12
-DA:154,54
-DA:155,0
-DA:158,0
-DA:167,54
-DA:168,264
-DA:169,264
-DA:175,54
-DA:176,3
-DA:184,54
-DA:185,193
-DA:191,54
-DA:192,2
-DA:193,2
-DA:194,1
-DA:196,1
-DA:202,54
-DA:203,225
-DA:210,54
-DA:211,20
-DA:225,54
-DA:233,9
-DA:234,9
-DA:235,9
-DA:236,9
-DA:242,54
-DA:243,0
-DA:250,54
-DA:251,199
-DA:252,199
-DA:253,0
-DA:255,199
-DA:262,54
-DA:263,199
-DA:264,199
-DA:265,199
-DA:272,54
-DA:273,5
-DA:279,54
-DA:280,212
-DA:287,54
-DA:288,19
-DA:294,54
-DA:295,214
-DA:302,54
-DA:303,10
-DA:309,54
-DA:310,2
-DA:317,54
-DA:318,39
-DA:326,54
-DA:327,4
-DA:334,54
-DA:335,131
-DA:343,54
-DA:344,4
-DA:345,3
-DA:348,1
-DA:359,54
-DA:360,0
-DA:363,54
-DA:364,10
-DA:367,54
-DA:368,0
-DA:369,0
-DA:370,0
-DA:372,0
-DA:375,54
-DA:376,1
-DA:379,54
-DA:380,0
-DA:386,54
-DA:387,60
-LF:113
-LH:103
-BRDA:103,0,0,0
-BRDA:103,1,0,0
-BRDA:104,2,0,893
-BRDA:104,2,1,15
-BRDA:119,3,0,0
-BRDA:119,4,0,0
-BRDA:139,5,0,0
-BRDA:139,6,0,0
-BRDA:139,7,0,0
-BRDA:140,8,0,15
-BRDA:140,8,1,12
-BRDA:144,9,0,12
-BRDA:144,9,1,0
-BRDA:167,10,0,71
-BRDA:168,11,0,264
-BRDA:168,11,1,71
-BRDA:175,12,0,0
-BRDA:175,13,0,0
-BRDA:193,14,0,1
-BRDA:193,14,1,1
-BRDA:193,15,0,2
-BRDA:193,15,1,2
-BRDA:202,16,0,0
-BRDA:202,17,0,0
-BRDA:242,18,0,0
-BRDA:250,19,0,0
-BRDA:252,20,0,0
-BRDA:252,20,1,199
-BRDA:273,21,0,5
-BRDA:273,21,1,5
-BRDA:279,22,0,0
-BRDA:279,23,0,0
-BRDA:294,24,0,0
-BRDA:294,25,0,0
-BRDA:309,26,0,0
-BRDA:309,27,0,0
-BRDA:317,28,0,0
-BRDA:317,29,0,39
-BRDA:319,30,0,0
-BRDA:319,30,1,39
-BRDA:326,31,0,0
-BRDA:326,32,0,0
-BRDA:343,33,0,0
-BRDA:343,34,0,0
-BRDA:344,35,0,3
-BRDA:344,35,1,1
-BRDA:367,36,0,0
-BRDA:367,37,0,0
-BRDA:369,38,0,0
-BRDA:369,38,1,0
-BRDA:379,39,0,0
-BRF:51
-BRH:19
+DA:86,54
+DA:88,54
+DA:89,54
+DA:91,54
+DA:92,74
+DA:108,908
+DA:109,893
+DA:111,908
+DA:118,54
+DA:123,54
+DA:124,220
+DA:131,54
+DA:132,105
+DA:143,54
+DA:144,27
+DA:145,15
+DA:148,12
+DA:150,12
+DA:158,54
+DA:159,0
+DA:162,0
+DA:171,54
+DA:172,264
+DA:173,264
+DA:179,54
+DA:180,3
+DA:188,54
+DA:189,193
+DA:195,54
+DA:196,2
+DA:197,2
+DA:198,1
+DA:200,1
+DA:206,54
+DA:207,225
+DA:214,54
+DA:215,20
+DA:229,54
+DA:237,9
+DA:238,9
+DA:239,9
+DA:240,9
+DA:246,54
+DA:247,0
+DA:254,54
+DA:255,5
+DA:261,54
+DA:262,212
+DA:269,54
+DA:270,19
+DA:276,54
+DA:277,214
+DA:284,54
+DA:285,10
+DA:291,54
+DA:292,2
+DA:299,54
+DA:300,39
+DA:308,54
+DA:309,4
+DA:316,54
+DA:317,131
+DA:325,54
+DA:326,4
+DA:327,3
+DA:330,1
+DA:341,54
+DA:342,0
+DA:345,54
+DA:346,10
+DA:349,54
+DA:350,0
+DA:351,0
+DA:352,0
+DA:354,0
+DA:357,54
+DA:358,1
+DA:361,54
+DA:362,0
+DA:368,54
+DA:369,60
+LF:106
+LH:97
+BRDA:107,0,0,0
+BRDA:107,1,0,0
+BRDA:108,2,0,893
+BRDA:108,2,1,15
+BRDA:123,3,0,0
+BRDA:123,4,0,0
+BRDA:143,5,0,0
+BRDA:143,6,0,0
+BRDA:143,7,0,0
+BRDA:144,8,0,15
+BRDA:144,8,1,12
+BRDA:148,9,0,12
+BRDA:148,9,1,0
+BRDA:171,10,0,71
+BRDA:172,11,0,264
+BRDA:172,11,1,71
+BRDA:179,12,0,0
+BRDA:179,13,0,0
+BRDA:197,14,0,1
+BRDA:197,14,1,1
+BRDA:197,15,0,2
+BRDA:197,15,1,2
+BRDA:206,16,0,0
+BRDA:206,17,0,0
+BRDA:246,18,0,0
+BRDA:255,19,0,5
+BRDA:255,19,1,5
+BRDA:261,20,0,0
+BRDA:261,21,0,0
+BRDA:276,22,0,0
+BRDA:276,23,0,0
+BRDA:291,24,0,0
+BRDA:291,25,0,0
+BRDA:299,26,0,0
+BRDA:299,27,0,39
+BRDA:301,28,0,0
+BRDA:301,28,1,39
+BRDA:308,29,0,0
+BRDA:308,30,0,0
+BRDA:325,31,0,0
+BRDA:325,32,0,0
+BRDA:326,33,0,3
+BRDA:326,33,1,1
+BRDA:349,34,0,0
+BRDA:349,35,0,0
+BRDA:351,36,0,0
+BRDA:351,36,1,0
+BRDA:361,37,0,0
+BRF:48
+BRH:18
 end_of_record
 TN:
 SF:src/db/linkedRows/LinkController.js

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

@@ -146,9 +146,10 @@ var External;
         const thisRow = {};
         // filter the row down to what is actually the row (not joined)
         for (let fieldName of Object.keys(table.schema)) {
-            const value = row[`${table.name}.${fieldName}`] || row[fieldName];
+            const pathValue = row[`${table.name}.${fieldName}`];
+            const value = pathValue != null ? pathValue : row[fieldName];
             // all responses include "select col as table.col" so that overlaps are handled
-            if (value) {
+            if (value != null) {
                 thisRow[fieldName] = value;
             }
         }

package/dist/db/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 const newid = require("./newid");
-const { DocumentTypes: CoreDocTypes, getRoleParams, generateRoleID, APP_DEV_PREFIX, APP_PREFIX, SEPARATOR, StaticDatabases, isDevAppID, isProdAppID, } = require("@budibase/backend-core/db");
+const { DocumentTypes: CoreDocTypes, getRoleParams, generateRoleID, APP_DEV_PREFIX, APP_PREFIX, SEPARATOR, StaticDatabases, isDevAppID, isProdAppID, getDevelopmentAppID, generateAppID, } = require("@budibase/backend-core/db");
 const UNICODE_MAX = "\ufff0";
 const AppStatus = {
     DEV: "development",
@@ -62,6 +62,8 @@ exports.UNICODE_MAX = UNICODE_MAX;
 exports.SearchIndexes = SearchIndexes;
 exports.AppStatus = AppStatus;
 exports.BudibaseInternalDB = BudibaseInternalDB;
+exports.generateAppID = generateAppID;
+exports.generateDevAppID = getDevelopmentAppID;
 exports.generateRoleID = generateRoleID;
 exports.getRoleParams = getRoleParams;
 exports.getQueryIndex = viewName => {
@@ -195,26 +197,6 @@ exports.generateLinkID = (tableId1, tableId2, rowId1, rowId2, fieldName1, fieldN
 exports.getLinkParams = (otherProps = {}) => {
     return getDocParams(DocumentTypes.LINK, null, otherProps);
 };
-/**
- * Generates a new app ID.
- * @returns {string} The new app ID which the app doc can be stored under.
- */
-exports.generateAppID = (tenantId = null) => {
-    let id = `${DocumentTypes.APP}${SEPARATOR}`;
-    if (tenantId) {
-        id += `${tenantId}${SEPARATOR}`;
-    }
-    return `${id}${newid()}`;
-};
-/**
- * Generates a development app ID from a real app ID.
- * @returns {string} the dev app ID which can be used for dev database.
- */
-exports.generateDevAppID = appId => {
-    const prefix = `${DocumentTypes.APP}${SEPARATOR}`;
-    const rest = appId.split(prefix)[1];
-    return `${DocumentTypes.APP_DEV}${SEPARATOR}${rest}`;
-};
 /**
  * Generates a new layout ID.
  * @returns {string} The new layout ID which the layout doc can be stored under.

package/dist/integrations/firebase.js

@@ -92,7 +92,7 @@ var Firebase;
             this.config = config;
             if (config.serviceAccount) {
                 const serviceAccount = JSON.parse(config.serviceAccount);
-                this.db = new firestore_1.Firestore({
+                this.client = new firestore_1.Firestore({
                     projectId: serviceAccount.project_id,
                     credentials: {
                         client_email: serviceAccount.client_email,
@@ -101,7 +101,7 @@ var Firebase;
                 });
             }
             else {
-                this.db = new firestore_1.Firestore({
+                this.client = new firestore_1.Firestore({
                     projectId: config.projectId,
                     credentials: {
                         client_email: config.email,
@@ -113,7 +113,7 @@ var Firebase;
         create(query) {
             return __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const documentReference = this.db
+                    const documentReference = this.client
                         .collection(query.extra.collection)
                         .doc();
                     yield documentReference.set(Object.assign(Object.assign({}, query.json), { id: documentReference.id }));
@@ -130,7 +130,7 @@ var Firebase;
             return __awaiter(this, void 0, void 0, function* () {
                 try {
                     let snapshot;
-                    const collectionRef = this.db.collection(query.extra.collection);
+                    const collectionRef = this.client.collection(query.extra.collection);
                     if (query.extra.filterField &&
                         query.extra.filter &&
                         query.extra.filterValue) {
@@ -154,17 +154,17 @@ var Firebase;
         update(query) {
             return __awaiter(this, void 0, void 0, function* () {
                 try {
-                    yield this.db
+                    yield this.client
                         .collection(query.extra.collection)
                         .doc(query.json.id)
                         .update(query.json);
-                    return (yield this.db
+                    return (yield this.client
                         .collection(query.extra.collection)
                         .doc(query.json.id)
                         .get()).data();
                 }
                 catch (err) {
-                    console.error("Error writing to firebase", err);
+                    console.error("Error writing to Firestore", err);
                     throw err;
                 }
             });
@@ -172,14 +172,14 @@ var Firebase;
         delete(query) {
             return __awaiter(this, void 0, void 0, function* () {
                 try {
-                    yield this.db
+                    yield this.client
                         .collection(query.extra.collection)
                         .doc(query.json.id)
                         .delete();
                     return true;
                 }
                 catch (err) {
-                    console.error("Error writing to mongodb", err);
+                    console.error("Error deleting from Firestore", err);
                     throw err;
                 }
             });

package/dist/integrations/index.js

@@ -45,6 +45,7 @@ const INTEGRATIONS = {
     [SourceNames.FIREBASE]: firebase.integration,
     [SourceNames.GOOGLE_SHEETS]: googlesheets.integration,
     [SourceNames.REDIS]: redis.integration,
+    [SourceNames.FIREBASE]: firebase.integration,
 };
 // optionally add oracle integration if the oracle binary can be installed
 if (!(process.arch === "arm64" && process.platform === "darwin")) {