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

Packages/worklist/server/methods/worklistSearch.js

@@ -1,19 +1,22 @@
 Meteor.methods({
     /**
      * Use the specified filter to conduct a search from the DICOM server
+     *
      * @param filter
      */
-    WorklistSearch: function(filter) {
-        if (Meteor.settings.servers.dicomWeb && Meteor.settings.defaultServiceType === 'dicomWeb') {
-            // Get the server data. This is user-defined in the
-            // config.json files used to run the Meteor server
-            var server = Meteor.settings.servers.dicomWeb[0];
+    WorklistSearch(filter) {
+        // Get the server data. This is user-defined in the config.json files or through servers
+        // configuration modal
+        const server = getCurrentServer();
 
-            return Services.QIDO.Studies(server, filter);
-        } else if (Meteor.settings.servers.dimse && Meteor.settings.defaultServiceType === 'dimse') {
-            return Services.DIMSE.Studies(filter);
-        } else {
+        if (!server) {
             throw 'No properly configured server was available over DICOMWeb or DIMSE.';
         }
+
+        if (server.type === 'dicomWeb') {
+            return Services.QIDO.Studies(server, filter);
+        } else if (server.type === 'dimse') {
+            return Services.DIMSE.Studies(filter);
+        }
     }
 });