fix(client-only): Fix client-only Server & CurrentServer usage (#276)

OHIFViewer/client/config.js

@@ -30,3 +30,9 @@ Meteor.startup(function() {
         }
     });
 });
+
+if (Meteor.settings &&
+    Meteor.settings.public &&
+    Meteor.settings.public.clientOnly === true) {
+    Meteor.disconnect();
+}

OHIFViewer/client/routes.js

@@ -1,3 +1,4 @@
+import { Meteor } from "meteor/meteor";
 import { Router } from 'meteor/clinical:router';
 import { OHIF } from 'meteor/ohif:core';
 
@@ -12,7 +13,9 @@ Router.configure({
 //
 // In this case, the developer is required to add Servers and specify
 // a CurrentServer with some other approach (e.g. a separate script).
-if (Meteor.settings.public && Meteor.settings.public.clientOnly !== true) {
+if (Meteor.settings &&
+    Meteor.settings.public &&
+    Meteor.settings.public.clientOnly !== true) {
     Router.waitOn(function() {
         return [
             Meteor.subscribe('servers'),

Packages/ohif-hanging-protocols/client/protocolStore/defaultStrategy.js

@@ -1,3 +1,4 @@
+import { Meteor } from "meteor/meteor";
 // The ProtocolStore default strategy is used to persist hanging protocols in
 // the MongoDB collection 'HangingProtocols' in the application server.
 
@@ -9,11 +10,6 @@ var defaultStrategy = (function () {
         console.log('Inserting default protocols');
 
         addProtocol(HP.defaultProtocol);
-
-        //addProtocol(HP.testProtocol);
-        /* HP.demoProtocols.forEach(protocol => {
-            addProtocol(protocol);
-        });*/
     }
 
     function getDatabaseIdByProtocolId(protocolId) {
@@ -303,7 +299,9 @@ var clientOnlyStrategy = (function () {
 // If we are running a disconnect client similar to the StandaloneViewer
 // (see https://docs.ohif.org/standalone-viewer/usage.html) we don't want
 // our HangingProtocol strategy to try to use Meteor methods or Pub / Sub
-if (Meteor.settings.public && Meteor.settings.public.clientOnly === true) {
+if (Meteor.settings &&
+    Meteor.settings.public &&
+    Meteor.settings.public.clientOnly === true) {
     HP.ProtocolStore.setStrategy(clientOnlyStrategy);
 } else {
     HP.ProtocolStore.setStrategy(defaultStrategy);

Packages/ohif-servers/both/collections/currentServer.js

@@ -2,7 +2,12 @@ import { Mongo } from 'meteor/mongo';
 import { OHIF } from 'meteor/ohif:core';
 
 // CurrentServer is a single document collection to describe which of the Servers is being used
-const CurrentServer = new Mongo.Collection('currentServer');
+let collectionName = 'currentServer';
+if (Meteor.settings && Meteor.settings.public && Meteor.settings.public.clientOnly === true) {
+    collectionName = null;
+}
+
+const CurrentServer = new Mongo.Collection(collectionName);
 CurrentServer._debugName = 'CurrentServer';
 OHIF.servers.collections.currentServer = CurrentServer;
 

Packages/ohif-servers/both/collections/servers.js

@@ -2,8 +2,13 @@ import { Mongo } from 'meteor/mongo';
 import { OHIF } from 'meteor/ohif:core';
 // import { Servers as ServerSchema } from 'meteor/ohif:servers/both/schema/servers.js';
 
+let collectionName = 'servers';
+if (Meteor.settings && Meteor.settings.public && Meteor.settings.public.clientOnly === true) {
+    collectionName = null;
+}
+
 // Servers describe the DICOM servers configurations
-const Servers = new Mongo.Collection('servers');
+const Servers = new Mongo.Collection(collectionName);
 // TODO: Make the Schema match what we are currently sticking into the Collection
 //Servers.attachSchema(ServerSchema);
 Servers._debugName = 'Servers';

Packages/ohif-servers/client/collections/index.js

@@ -1 +0,0 @@
-import './subscriptions.js';

Packages/ohif-servers/client/collections/subscriptions.js

@@ -1,4 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-Meteor.subscribe('servers');
-Meteor.subscribe('currentServer');

Packages/ohif-servers/client/index.js

@@ -1,2 +1,2 @@
-import './collections';
+import './startup.js';
 import './components';

Packages/ohif-servers/client/startup.js

@@ -0,0 +1,32 @@
+// Check the servers on meteor startup
+import { Meteor } from "meteor/meteor";
+import { Servers, CurrentServer } from 'meteor/ohif:servers/both/collections';
+
+if (Meteor.settings &&
+    Meteor.settings.public &&
+    Meteor.settings.public.clientOnly === true &&
+    Meteor.settings.public.servers) {
+    OHIF.log.info('Updating servers information from JSON configuration');
+
+    const servers = Meteor.settings.public.servers;
+
+    Object.keys(servers).forEach((serverType) => {
+        const endpoints = servers[serverType];
+        endpoints.forEach((endpoint) => {
+            const server = Object.assign({}, endpoint);
+            server.origin = 'json';
+            server.type = serverType;
+
+            Servers.insert(server);
+        });
+    });
+
+    const newServer = Servers.findOne();
+
+    CurrentServer.insert({
+        serverId: newServer._id
+    });
+
+    console.log('test');
+}
+

Packages/ohif-servers/server/startup.js

@@ -5,30 +5,35 @@ import { Servers } from 'meteor/ohif:servers/both/collections';
 import { ServerConfiguration } from 'meteor/ohif:servers/both/schema/servers.js';
 
 // Check the servers on meteor startup
-Meteor.startup(function() {
+if (Meteor.settings &&
-    OHIF.log.info('Updating servers information from JSON configuration');
+    Meteor.settings.public &&
+    Meteor.settings.public.clientOnly !== true) {
 
-    _.each(Meteor.settings.servers, function(endpoints, serverType) {
+    Meteor.startup(function() {
-        _.each(endpoints, function(endpoint) {
+        OHIF.log.info('Updating servers information from JSON configuration');
-            const server = _.clone(endpoint);
-            server.origin = 'json';
-            server.type = serverType;
 
-            // Try to find a server with the same name/type/origin combination
+        _.each(Meteor.settings.servers, function(endpoints, serverType) {
-            const existingServer = Servers.findOne({
+            _.each(endpoints, function(endpoint) {
-                name: server.name,
+                const server = _.clone(endpoint);
-                type: server.type,
+                server.origin = 'json';
-                origin: server.origin
+                server.type = serverType;
+
+                // Try to find a server with the same name/type/origin combination
+                const existingServer = Servers.findOne({
+                    name: server.name,
+                    type: server.type,
+                    origin: server.origin
+                });
+
+                // Check if server was already added. Update it if so and insert if not
+                if (existingServer) {
+                    Servers.update(existingServer._id, { $set: server });
+                } else {
+                    Servers.insert(server);
+                }
             });
-
-            // Check if server was already added. Update it if so and insert if not
-            if (existingServer) {
-                Servers.update(existingServer._id, { $set: server });
-            } else {
-                Servers.insert(server);
-            }
         });
-    });
 
-    OHIF.servers.control.resetCurrentServer();
+        OHIF.servers.control.resetCurrentServer();
-});
+    });
+}