Cleaned up some unused files (OHIF-54)

Packages/lesiontracker/both/collections.js

@@ -1,15 +1,17 @@
-Servers = new Mongo.Collection('servers');
-Timepoints = new Meteor.Collection('timepoints');
-Studies = new Meteor.Collection('studies');
-Measurements = new Meteor.Collection('measurements');
+import { Mongo } from 'meteor/mongo';
+
+Timepoints = new Mongo.Collection('timepoints');
+Studies = new Mongo.Collection('studies');
+Measurements = new Mongo.Collection('measurements');
 
 // ImageMeasurements describe temporary measurements that aren't
 // specifically listed in the Lesion Table
-ImageMeasurements = new Meteor.Collection('imageMeasurements');
+ImageMeasurements = new Mongo.Collection('imageMeasurements');
 
 // Additional Findings stores details from the Additional Findings
 // panel, and represents items such as data quality,
-AdditionalFindings = new Meteor.Collection('additionalFindings');
+AdditionalFindings = new Mongo.Collection('additionalFindings');
 
+Servers = new Mongo.Collection('servers');
 WorklistSubscriptions = ['studies', 'timepoints'];
-Reviewers = new Meteor.Collection('reviewers');
+Reviewers = new Mongo.Collection('reviewers');

Packages/lesiontracker/lib/TrialCriteriaConstraints.js

@@ -19,11 +19,13 @@ TrialCriteriaConstraints = {
  */
 function RECIST(image) {
     var acquisitionSliceThickness;
+
+    var isChestXray;
     if (image) {
         acquisitionSliceThickness = image.acquisitionSliceThickness;
 
         // TODO: Use metaData to determine if this is a chest X-ray
-        var isChestXray = false;
+        isChestXray = false;
     }
 
     // Define the RECIST 1.1 structure

Packages/lesiontracker/lib/activateLesion.js

@@ -109,7 +109,7 @@ activateLesion = function(measurementId, templateData) {
 
         // Otherwise, re-render the viewport with the required study/series, then
         // add an onRendered callback to activate the measurements
-        rerenderViewportWithNewSeries(element, requiredSeriesData, function(element) {
+        layoutManager.rerenderViewportWithNewDisplaySet(element, requiredSeriesData, function(element) {
             activateMeasurements(element, measurementId, templateData, viewportIndex);
         });
     });

Packages/lesiontracker/package.js

@@ -5,7 +5,7 @@ Package.describe({
 });
 
 Package.onUse(function(api) {
-    api.versionsFrom('1.3.5.1');
+    api.versionsFrom('1.4');
 
     api.use('ecmascript');
     api.use('standard-app-packages');
@@ -189,19 +189,6 @@ Package.onUse(function(api) {
     api.addFiles('client/components/lesionTrackerViewportOverlay/lesionTrackerViewportOverlay.html', 'client');
     api.addFiles('client/components/lesionTrackerViewportOverlay/lesionTrackerViewportOverlay.js', 'client');
 
-    api.addFiles('client/components/serverInformationModal/serverInformationDicomWeb.html', 'client');
-    api.addFiles('client/components/serverInformationModal/serverInformationDicomWeb.js', 'client');
-    api.addFiles('client/components/serverInformationModal/serverInformationDimse.html', 'client');
-    api.addFiles('client/components/serverInformationModal/serverInformationDimse.js', 'client');
-    api.addFiles('client/components/serverInformationModal/serverInformationForm.html', 'client');
-    api.addFiles('client/components/serverInformationModal/serverInformationForm.js', 'client');
-    api.addFiles('client/components/serverInformationModal/serverInformationFormField.html', 'client');
-    api.addFiles('client/components/serverInformationModal/serverInformationList.html', 'client');
-    api.addFiles('client/components/serverInformationModal/serverInformationList.js', 'client');
-    api.addFiles('client/components/serverInformationModal/serverInformationModal.html', 'client');
-    api.addFiles('client/components/serverInformationModal/serverInformationModal.styl', 'client');
-    api.addFiles('client/components/serverInformationModal/serverInformationModal.js', 'client');
-
     api.addFiles('client/components/userAccountMenu/userAccountMenu.html', 'client');
     api.addFiles('client/components/userAccountMenu/userAccountMenu.styl', 'client');
     api.addFiles('client/components/userAccountMenu/userAccountMenu.js', 'client');
@@ -213,10 +200,10 @@ Package.onUse(function(api) {
     api.addFiles('client/components/lastLoginModal/lastLoginModal.js', 'client');
 
     // Server functions
-    api.addFiles('server/collections.js', 'server');
-    api.addFiles('server/removeCollections.js', [ 'server' ]);
-    api.addFiles('server/reviewers.js', [ 'server' ]);
     api.addFiles('server/servers.js', 'server');
+    api.addFiles('server/publications.js', 'server');
+    api.addFiles('server/methods.js', [ 'server' ]);
+    api.addFiles('server/reviewers.js', [ 'server' ]);
 
     // Both client and server functions
     api.addFiles('both/collections.js', [ 'client', 'server' ]);
@@ -252,6 +239,23 @@ Package.onUse(function(api) {
     api.addFiles('lib/handleMeasurementModified.js', 'client');
     api.addFiles('lib/handleMeasurementRemoved.js', 'client');
 
+    api.addFiles('client/components/serverInformation/serverInformationDicomWeb/serverInformationDicomWeb.html', 'client');
+    api.addFiles('client/components/serverInformation/serverInformationDicomWeb/serverInformationDicomWeb.js', 'client');
+
+    api.addFiles('client/components/serverInformation/serverInformationDimse/serverInformationDimse.html', 'client');
+    api.addFiles('client/components/serverInformation/serverInformationDimse/serverInformationDimse.js', 'client');
+
+    api.addFiles('client/components/serverInformation/serverInformationForm/serverInformationForm.html', 'client');
+    api.addFiles('client/components/serverInformation/serverInformationForm/serverInformationForm.js', 'client');
+    api.addFiles('client/components/serverInformation/serverInformationForm/serverInformationFormField.html', 'client');
+
+    api.addFiles('client/components/serverInformation/serverInformationList/serverInformationList.html', 'client');
+    api.addFiles('client/components/serverInformation/serverInformationList/serverInformationList.js', 'client');
+
+    api.addFiles('client/components/serverInformation/serverInformationModal/serverInformationModal.html', 'client');
+    api.addFiles('client/components/serverInformation/serverInformationModal/serverInformationModal.styl', 'client');
+    api.addFiles('client/components/serverInformation/serverInformationModal/serverInformationModal.js', 'client');
+
     // API classes
     api.addFiles('lib/api/timepoint.js');
 
@@ -291,8 +295,8 @@ Package.onUse(function(api) {
     api.export('TrialCriteriaTypes', 'client');
 
     // Export collections spanning both client and server
-    api.export('AdditionalFindings', [ 'client', 'server' ]);
     api.export('Servers', [ 'client', 'server' ]);
+    api.export('AdditionalFindings', [ 'client', 'server' ]);
     api.export('ImageMeasurements', [ 'client', 'server' ]);
     api.export('Measurements', [ 'client', 'server' ]);
     api.export('Studies', [ 'client', 'server' ]);

Packages/lesiontracker/server/publications.js

@@ -46,7 +46,7 @@ Meteor.publish('reviewers', function() {
     return Reviewers.find();
 });
 
-Meteor.publish('servers', function() {
+Meteor.publish('servers', () => {
     return Servers.find();
 });
 

Packages/lesiontracker/server/servers.js

@@ -1,5 +1,7 @@
-Meteor.startup(function() {
+import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 
+Meteor.startup(function() {
     _.each(Meteor.settings.servers, function(endpoints, serverType) {
         _.each(endpoints, function(endpoint) {
             var server = _.clone(endpoint);
@@ -8,7 +10,6 @@ Meteor.startup(function() {
             Servers.insert(server);
         });
     });
-
 });
 
 class ServersControl {
@@ -68,4 +69,4 @@ Meteor.methods({
     serverSave: serverSettings => ServersControl.save(serverSettings),
     serverSetActive: serverId => ServersControl.setActive(serverId),
     serverRemove: serverId => ServersControl.remove(serverId)
-});
+});