@budibase/server 2.0.15 → 2.0.16

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.15",
+  "version": "2.0.16",
   "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.15",
-    "@budibase/client": "^2.0.15",
-    "@budibase/pro": "2.0.14",
-    "@budibase/string-templates": "^2.0.15",
-    "@budibase/types": "^2.0.15",
+    "@budibase/backend-core": "^2.0.16",
+    "@budibase/client": "^2.0.16",
+    "@budibase/pro": "2.0.15",
+    "@budibase/string-templates": "^2.0.16",
+    "@budibase/types": "^2.0.16",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -199,5 +199,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "ca0f857dbedcad51fc2bc90cf16b9667afc08bc6"
+  "gitHead": "4a652e173ae6861d7a8193ab69a54dc5b6fa41e5"
 }

package/src/api/controllers/datasource.js

@@ -68,6 +68,7 @@ exports.buildSchemaFromDb = async function (ctx) {
     datasource.entities = tables
   }
 
+  setDefaultDisplayColumns(datasource)
   const dbResp = await db.put(datasource)
   datasource._rev = dbResp.rev
 
@@ -78,6 +79,24 @@ exports.buildSchemaFromDb = async 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.
  */
@@ -155,6 +174,7 @@ exports.save = async function (ctx) {
     const { tables, error } = await buildSchemaHelper(datasource)
     schemaError = error
     datasource.entities = tables
+    setDefaultDisplayColumns(datasource)
   }
 
   const dbResp = await db.put(datasource)
@@ -238,19 +258,6 @@ const buildSchemaHelper = async datasource => {
   const connector = new Connector(datasource.config)
   await connector.buildSchema(datasource._id, datasource.entities)
 
-  // make sure they all have a display name selected
-  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
-    }
-  }
-
   const errors = connector.schemaErrors
   let error = null
   if (errors && Object.keys(errors).length > 0) {