Merge pull request #66 from bcgsc/release/v3.14.6

Release/v3.14.6
bcgsc · Dec 19, 2023 · d161ebb · d161ebb
2 parents 0274e6a + 36a6900
commit d161ebb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bcgsc-pori/graphkb-api",
   "main": "server.js",
-  "version": "3.14.5",
+  "version": "3.14.6",
   "private": true,
   "repository": {
     "type": "git",

diff --git a/src/repo/commands/select.js b/src/repo/commands/select.js
@@ -244,6 +244,8 @@ const fetchDisplayName = async (db, modelName, content) => {
             subject: recordsById[recId(content.subject)],
         };
         return sentenceTemplates.chooseDefaultTemplate(templateContent);
+    } if (model.name === 'Feature' && content.displayName) {
+        return content.displayName;
     }
     return content.name;
 };

diff --git a/test/db_integration/service_routes.test.js b/test/db_integration/service_routes.test.js
@@ -15,7 +15,7 @@ const { createEmptyDb, tearDownDb } = require('./util');
 const request = async (opt) => requestPromise({ json: true, resolveWithFullResponse: true, ...opt });
 
 const REALLY_LONG_TIME = 10000000000;
-const TEST_TIMEOUT_MS = 100000;
+const TEST_TIMEOUT_MS = 1000000;
 jest.setTimeout(TEST_TIMEOUT_MS);
 
 const describeWithAuth = process.env.GKB_DBS_PASS