@budibase/server 2.0.14 → 2.0.16

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

@@ -589,7 +589,7 @@ exports.generateApiKey = <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 Oct 03 2022 09:01:42 GMT+0000 (Coordinated Universal Time)
+                at Tue Oct 04 2022 11:03:26 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -465,43 +465,45 @@ FN:24,(anonymous_1)
 FN:38,(anonymous_2)
 FN:50,(anonymous_3)
 FN:62,(anonymous_4)
-FN:84,(anonymous_5)
-FN:98,(anonymous_6)
-FN:100,(anonymous_7)
-FN:113,(anonymous_8)
-FN:142,(anonymous_9)
-FN:179,(anonymous_10)
-FN:187,(anonymous_11)
-FN:202,(anonymous_12)
-FN:208,(anonymous_13)
-FN:217,getErrorTables
-FN:219,(anonymous_15)
-FN:220,(anonymous_16)
-FN:223,updateError
-FN:234,(anonymous_18)
-FN:247,(anonymous_19)
-FNF:20
+FN:85,(anonymous_5)
+FN:92,(anonymous_6)
+FN:103,(anonymous_7)
+FN:117,(anonymous_8)
+FN:119,(anonymous_9)
+FN:132,(anonymous_10)
+FN:161,(anonymous_11)
+FN:199,(anonymous_12)
+FN:207,(anonymous_13)
+FN:222,(anonymous_14)
+FN:228,(anonymous_15)
+FN:237,getErrorTables
+FN:239,(anonymous_17)
+FN:240,(anonymous_18)
+FN:243,updateError
+FN:254,(anonymous_20)
+FNF:21
 FNH:11
 FNDA:2,(anonymous_0)
 FNDA:2,(anonymous_1)
 FNDA:1,(anonymous_2)
 FNDA:0,(anonymous_3)
 FNDA:0,(anonymous_4)
-FNDA:6,(anonymous_5)
-FNDA:1,(anonymous_6)
-FNDA:0,(anonymous_7)
-FNDA:6,(anonymous_8)
-FNDA:64,(anonymous_9)
-FNDA:1,(anonymous_10)
-FNDA:1,(anonymous_11)
+FNDA:0,(anonymous_5)
+FNDA:0,(anonymous_6)
+FNDA:6,(anonymous_7)
+FNDA:1,(anonymous_8)
+FNDA:0,(anonymous_9)
+FNDA:6,(anonymous_10)
+FNDA:64,(anonymous_11)
 FNDA:1,(anonymous_12)
 FNDA:1,(anonymous_13)
+FNDA:1,(anonymous_14)
+FNDA:1,(anonymous_15)
 FNDA:0,getErrorTables
-FNDA:0,(anonymous_15)
-FNDA:0,(anonymous_16)
-FNDA:0,updateError
+FNDA:0,(anonymous_17)
 FNDA:0,(anonymous_18)
-FNDA:0,(anonymous_19)
+FNDA:0,updateError
+FNDA:0,(anonymous_20)
 DA:8,45
 DA:9,45
 DA:10,45
@@ -535,116 +537,119 @@ DA:64,0
 DA:68,0
 DA:71,0
 DA:72,0
-DA:74,0
+DA:73,0
 DA:75,0
 DA:76,0
-DA:78,0
-DA:84,45
-DA:85,6
-DA:86,6
-DA:87,6
-DA:89,6
-DA:90,5
-DA:93,1
+DA:77,0
+DA:79,0
+DA:85,45
+DA:87,0
+DA:88,0
+DA:89,0
+DA:91,0
+DA:92,0
+DA:94,0
 DA:95,0
-DA:98,1
-DA:99,1
-DA:101,0
-DA:105,1
-DA:106,1
-DA:110,1
-DA:113,45
-DA:114,6
-DA:115,6
-DA:116,6
-DA:117,6
-DA:118,6
-DA:119,6
-DA:120,6
-DA:122,0
-DA:125,6
-DA:126,6
-DA:127,6
-DA:130,6
-DA:131,6
-DA:132,6
-DA:133,0
+DA:103,45
+DA:104,6
+DA:105,6
+DA:106,6
+DA:108,6
+DA:109,5
+DA:112,1
+DA:114,0
+DA:117,1
+DA:118,1
+DA:120,0
+DA:124,1
+DA:125,1
+DA:129,1
+DA:132,45
+DA:133,6
+DA:134,6
+DA:135,6
+DA:136,6
 DA:137,6
 DA:138,6
 DA:139,6
-DA:142,45
-DA:143,64
-DA:144,64
-DA:145,64
-DA:147,64
-DA:153,64
-DA:154,64
-DA:155,0
-DA:156,0
-DA:157,0
-DA:160,64
-DA:161,64
+DA:141,0
+DA:144,6
+DA:145,6
+DA:146,6
+DA:149,6
+DA:150,6
+DA:151,6
+DA:152,0
+DA:156,6
+DA:157,6
+DA:158,6
+DA:161,45
 DA:162,64
-DA:165,64
+DA:163,64
+DA:164,64
 DA:166,64
-DA:167,63
-DA:168,0
-DA:172,63
-DA:173,63
+DA:172,64
+DA:173,64
 DA:174,0
-DA:176,63
-DA:179,45
-DA:180,1
-DA:181,1
-DA:183,1
-DA:185,1
-DA:186,1
-DA:187,1
-DA:195,1
-DA:196,1
-DA:198,1
-DA:199,1
-DA:202,45
+DA:175,0
+DA:176,0
+DA:177,0
+DA:180,64
+DA:181,64
+DA:182,64
+DA:185,64
+DA:186,64
+DA:187,63
+DA:188,0
+DA:192,63
+DA:193,63
+DA:194,0
+DA:196,63
+DA:199,45
+DA:200,1
+DA:201,1
 DA:203,1
-DA:204,1
-DA:208,45
-DA:209,1
-DA:210,1
-DA:211,1
-DA:213,0
-DA:218,0
-DA:219,0
-DA:220,0
-DA:224,0
-DA:225,0
-DA:227,0
-DA:228,0
-DA:230,0
-DA:231,0
-DA:234,45
-DA:235,0
+DA:205,1
+DA:206,1
+DA:207,1
+DA:215,1
+DA:216,1
+DA:218,1
+DA:219,1
+DA:222,45
+DA:223,1
+DA:224,1
+DA:228,45
+DA:229,1
+DA:230,1
+DA:231,1
+DA:233,0
 DA:238,0
 DA:239,0
-DA:242,0
-DA:243,0
+DA:240,0
 DA:244,0
-DA:246,0
+DA:245,0
 DA:247,0
-DA:249,0
+DA:248,0
 DA:250,0
-DA:254,0
+DA:251,0
+DA:254,45
 DA:255,0
-DA:256,0
-DA:257,0
 DA:258,0
 DA:259,0
-DA:260,0
+DA:261,0
+DA:262,0
+DA:263,0
+DA:264,0
+DA:265,0
 DA:266,0
 DA:267,0
-DA:268,0
+DA:273,0
+DA:274,0
 DA:275,0
-LF:141
-LH:82
+DA:282,0
+LF:144
+LH:83
 BRDA:41,0,0,0
 BRDA:41,0,1,1
 BRDA:41,1,0,1
@@ -655,58 +660,56 @@ BRDA:57,3,0,0
 BRDA:57,3,1,0
 BRDA:61,4,0,0
 BRDA:61,4,1,0
-BRDA:75,5,0,0
-BRDA:75,5,1,0
-BRDA:89,6,0,5
-BRDA:89,6,1,1
-BRDA:93,7,0,0
-BRDA:93,7,1,1
-BRDA:101,8,0,0
-BRDA:101,8,1,0
-BRDA:101,8,2,0
-BRDA:105,9,0,1
-BRDA:105,9,1,0
+BRDA:76,5,0,0
+BRDA:76,5,1,0
+BRDA:88,6,0,0
+BRDA:88,6,1,0
+BRDA:94,7,0,0
+BRDA:94,7,1,0
+BRDA:108,8,0,5
+BRDA:108,8,1,1
+BRDA:112,9,0,0
+BRDA:112,9,1,1
 BRDA:120,10,0,0
-BRDA:120,10,1,6
-BRDA:120,11,0,6
-BRDA:120,11,1,0
-BRDA:130,12,0,6
-BRDA:130,12,1,0
-BRDA:132,13,0,0
-BRDA:132,13,1,6
-BRDA:132,14,0,6
-BRDA:132,14,1,6
-BRDA:149,15,0,0
-BRDA:149,15,1,64
-BRDA:154,16,0,0
-BRDA:154,16,1,64
-BRDA:165,17,0,64
-BRDA:165,17,1,0
-BRDA:167,18,0,0
-BRDA:167,18,1,63
-BRDA:167,19,0,63
-BRDA:167,19,1,63
-BRDA:173,20,0,0
-BRDA:173,20,1,63
-BRDA:224,21,0,0
-BRDA:224,21,1,0
-BRDA:227,22,0,0
-BRDA:227,22,1,0
-BRDA:242,23,0,0
-BRDA:242,23,1,0
-BRDA:243,24,0,0
-BRDA:243,24,1,0
-BRDA:249,25,0,0
-BRDA:249,25,1,0
-BRDA:256,26,0,0
-BRDA:256,26,1,0
-BRDA:256,27,0,0
-BRDA:256,27,1,0
-BRDA:259,28,0,0
-BRDA:259,28,1,0
-BRDA:266,29,0,0
-BRDA:266,29,1,0
-BRF:61
+BRDA:120,10,1,0
+BRDA:120,10,2,0
+BRDA:124,11,0,1
+BRDA:124,11,1,0
+BRDA:139,12,0,0
+BRDA:139,12,1,6
+BRDA:139,13,0,6
+BRDA:139,13,1,0
+BRDA:149,14,0,6
+BRDA:149,14,1,0
+BRDA:151,15,0,0
+BRDA:151,15,1,6
+BRDA:151,16,0,6
+BRDA:151,16,1,6
+BRDA:168,17,0,0
+BRDA:168,17,1,64
+BRDA:173,18,0,0
+BRDA:173,18,1,64
+BRDA:185,19,0,64
+BRDA:185,19,1,0
+BRDA:187,20,0,0
+BRDA:187,20,1,63
+BRDA:187,21,0,63
+BRDA:187,21,1,63
+BRDA:193,22,0,0
+BRDA:193,22,1,63
+BRDA:244,23,0,0
+BRDA:244,23,1,0
+BRDA:247,24,0,0
+BRDA:247,24,1,0
+BRDA:263,25,0,0
+BRDA:263,25,1,0
+BRDA:263,26,0,0
+BRDA:263,26,1,0
+BRDA:266,27,0,0
+BRDA:266,27,1,0
+BRDA:273,28,0,0
+BRDA:273,28,1,0
+BRF:59
 BRH:20
 end_of_record
 TN:

package/dist/api/controllers/datasource.js

@@ -56,6 +56,7 @@ exports.buildSchemaFromDb = function (ctx) {
         else {
             datasource.entities = tables;
         }
+        setDefaultDisplayColumns(datasource);
         const dbResp = yield db.put(datasource);
         datasource._rev = dbResp.rev;
         const response = { datasource };
@@ -65,6 +66,21 @@ exports.buildSchemaFromDb = function (ctx) {
         ctx.body = response;
     });
 };
+/**
+ * Make sure all datasource entities have a display name selected
+ */
+const setDefaultDisplayColumns = datasource => {
+    //
+    for (let entity of Object.values(datasource.entities)) {
+        if (entity.primaryDisplay) {
+            continue;
+        }
+        const notAutoColumn = Object.values(entity.schema).find(schema => !schema.autocolumn);
+        if (notAutoColumn) {
+            entity.primaryDisplay = notAutoColumn.name;
+        }
+    }
+};
 /**
  * Check for variables that have been updated or removed and invalidate them.
  */
@@ -130,6 +146,7 @@ exports.save = function (ctx) {
             const { tables, error } = yield buildSchemaHelper(datasource);
             schemaError = error;
             datasource.entities = tables;
+            setDefaultDisplayColumns(datasource);
         }
         const dbResp = yield db.put(datasource);
         yield events.datasource.created(datasource);
@@ -201,21 +218,10 @@ function updateError(error, newError, tables) {
     return error;
 }
 const buildSchemaHelper = (datasource) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
     const Connector = yield getIntegration(datasource.source);
     // Connect to the DB and build the schema
     const connector = new Connector(datasource.config);
     yield connector.buildSchema(datasource._id, datasource.entities);
-    // make sure they all have a display name selected
-    for (let entity of Object.values((_a = datasource.entities) !== null && _a !== void 0 ? _a : {})) {
-        if (entity.primaryDisplay) {
-            continue;
-        }
-        const notAutoColumn = Object.values(entity.schema).find(schema => !schema.autocolumn);
-        if (notAutoColumn) {
-            entity.primaryDisplay = notAutoColumn.name;
-        }
-    }
     const errors = connector.schemaErrors;
     let error = null;
     if (errors && Object.keys(errors).length > 0) {

package/dist/api/controllers/public/rows.js

@@ -91,7 +91,8 @@ function read(ctx, next) {
 exports.read = read;
 function update(ctx, next) {
     return __awaiter(this, void 0, void 0, function* () {
-        ctx.request.body = yield (0, utils_1.addRev)(fixRow(ctx.request.body, ctx.params));
+        const { tableId } = ctx.params;
+        ctx.request.body = yield (0, utils_1.addRev)(fixRow(ctx.request.body, ctx.params), tableId);
         yield rowController.save(ctx);
         yield next();
     });
@@ -99,8 +100,9 @@ function update(ctx, next) {
 exports.update = update;
 function destroy(ctx, next) {
     return __awaiter(this, void 0, void 0, function* () {
+        const { tableId } = ctx.params;
         // set the body as expected, with the _id and _rev fields
-        ctx.request.body = yield (0, utils_1.addRev)(fixRow({ _id: ctx.params.rowId }, ctx.params));
+        ctx.request.body = yield (0, utils_1.addRev)(fixRow({ _id: ctx.params.rowId }, ctx.params), tableId);
         yield rowController.destroy(ctx);
         // destroy controller doesn't currently return the row as the body, need to adjust this
         // in the public API to be correct

package/dist/package.json

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