LT-67; OHIF-78: Merging server configuration and CINE dialog changes from downstream (Ascend)

Packages/worklist/both/collections.js

@@ -1,3 +1,9 @@
 import { Mongo } from 'meteor/mongo';
 
-StudyImportStatus = new Mongo.Collection('studyImportStatus');
+StudyImportStatus = new Mongo.Collection('studyImportStatus');
+
+// Servers describe the DICOM servers configurations
+Servers = new Mongo.Collection('servers');
+
+// CurrentServer is a single document collection to describe which of the Servers is being used
+CurrentServer = new Mongo.Collection('currentServer');

Packages/worklist/both/lib/getCurrentServer.js

@@ -0,0 +1,14 @@
+/**
+ * Retrieves the current server configuration used to retrieve studies
+ */
+getCurrentServer = () => {
+    const currentServer = CurrentServer.findOne();
+
+    if (!currentServer) {
+        return;
+    }
+
+    const serverConfiguration = Servers.findOne({ _id: currentServer.serverId });
+
+    return serverConfiguration;
+};

Packages/worklist/both/schema.js

@@ -14,6 +14,12 @@ const serverTypeDefinitions = {
     optional: true
 };
 
+const wadoUriRootDefinitions = {
+    type: String,
+    label: 'WADO URI root',
+    max: 1000
+};
+
 export const DICOMWebRequestOptions = new SimpleSchema({
     auth: {
         type: String,
@@ -40,11 +46,7 @@ export const DICOMWebRequestOptions = new SimpleSchema({
 export const DICOMWebServer = new SimpleSchema({
     name: serverNameDefinitions,
     type: serverTypeDefinitions,
-    wadoUriRoot: {
-        type: String,
-        label: 'WADO URI root',
-        max: 1000
-    },
+    wadoUriRoot: wadoUriRootDefinitions,
     wadoRoot: {
         type: String,
         label: 'WADO root',
@@ -106,7 +108,7 @@ export const DIMSEPeer = new SimpleSchema({
     },
     supportsInstanceRetrievalByStudyUid: {
         type: Boolean,
-        label: 'Supports instance retrieval by StudyUid?',
+        label: 'Supports instance retrieval by StudyUid',
         defaultValue: true
     }
 });
@@ -114,6 +116,7 @@ export const DIMSEPeer = new SimpleSchema({
 export const DIMSEServer = new SimpleSchema({
     name: serverNameDefinitions,
     type: serverTypeDefinitions,
+    wadoUriRoot: wadoUriRootDefinitions,
     peers: {
         type: [DIMSEPeer],
         label: 'Peer List',
@@ -141,6 +144,11 @@ export const UISettings = new SimpleSchema({
         type: Boolean,
         label: 'The UP/DOWN display set navigation buttons will iterate over all the viewports at once?',
         defaultValue: false
+    },
+    showCineDialogOnRendered: {
+        type: Boolean,
+        label: 'The Cine dialog will be displayed by default',
+        defaultValue: false
     }
 });