reorganize packages, start converting overall app to react (very broken at the moment)

legacy/LesionTracker/client/components/viewer/viewer.js

@@ -3,7 +3,7 @@ import { Template } from 'meteor/templating';
 import { Tracker } from 'meteor/tracker';
 import { Session } from 'meteor/session';
 import { ReactiveDict } from 'meteor/reactive-dict';
-import { _ } from 'meteor/underscore';
+import _ from 'underscore';
 import { $ } from 'meteor/jquery';
 import { OHIF } from 'meteor/ohif:core';
 

legacy/LesionTracker/client/lib/customCommands.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { _ } from 'meteor/underscore';
+import _ from 'underscore';
 import { OHIF } from 'meteor/ohif:core';
 
 Meteor.startup(() => {

legacy/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/onImageRendered/drawSelectedMarker.js

@@ -1,4 +1,4 @@
-import { _ } from 'meteor/underscore';
+import _ from 'underscore';
 import { OHIF } from 'meteor/ohif:core';
 import { cornerstone, cornerstoneTools } from 'meteor/ohif:cornerstone';
 

legacy/Packages/ohif-lesiontracker/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.js

@@ -2,8 +2,8 @@ import { Template } from 'meteor/templating';
 import { Session } from 'meteor/session';
 import { Tracker } from 'meteor/tracker';
 import { ReactiveVar } from 'meteor/reactive-var';
-import { _ } from 'meteor/underscore';
-import { moment } from 'meteor/momentjs:moment';
+import _ from 'underscore';
+import moment from 'moment';
 import { OHIF } from 'meteor/ohif:core';
 import { cornerstone } from 'meteor/ohif:cornerstone';
 

legacy/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.js

@@ -2,7 +2,7 @@ import { Template } from 'meteor/templating';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 import { $ } from 'meteor/jquery';
-import { _ } from 'meteor/underscore';
+import _ from 'underscore';
 import { OHIF } from 'meteor/ohif:core';
 
 Template.timepointBrowserItem.onCreated(() => {

legacy/Packages/ohif-lesiontracker/client/components/timepointBrowser/quickSwitch.js

@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
-import { _ } from 'meteor/underscore';
+import _ from 'underscore';
 import { OHIF } from 'meteor/ohif:core';
 
 Template.timepointBrowserQuickSwitch.onCreated(() => {

legacy/Packages/ohif-lesiontracker/client/components/trialOptionsModal/trialOptionsModal.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
 import { ReactiveVar } from 'meteor/reactive-var';
-import { _ } from 'meteor/underscore';
+import _ from 'underscore';
 import { OHIF } from 'meteor/ohif:core';
 import { SimpleSchema } from 'meteor/aldeed:simple-schema';
 

legacy/Packages/ohif-lesiontracker/client/lib/bidirectional/repositionBidirectionalArmHandle.js

@@ -1,4 +1,4 @@
-import { _ } from 'meteor/underscore';
+import _ from 'underscore';
 import { OHIF } from 'meteor/ohif:core';
 
 // Return the newPosition for the handle based on the mmStep and handles

legacy/Packages/ohif-lesiontracker/client/lib/configureTargetToolsHandles.js

@@ -1,4 +1,4 @@
-import { _ } from 'meteor/underscore';
+import _ from 'underscore';
 import { OHIF } from 'meteor/ohif:core';
 
 OHIF.lesiontracker.configureTargetToolsHandles = () => {

legacy/Packages/ohif-lesiontracker/client/lib/removeMeasurementIfInvalid.js

@@ -1,5 +1,5 @@
 import { OHIF } from 'meteor/ohif:core';
-import { _ } from 'meteor/underscore';
+import _ from 'underscore';
 
 OHIF.lesiontracker.removeMeasurementIfInvalid = (measurementData, eventData) => {
     const handles = measurementData.handles;

legacy/Packages/ohif-lesiontracker/client/lib/studylist/studylistModification.js

@@ -1,5 +1,4 @@
 import { Meteor } from 'meteor/meteor';
-import { Router } from 'meteor/clinical:router';
 import { OHIF } from 'meteor/ohif:core';
 
 Meteor.startup(function() {
@@ -22,10 +21,10 @@ const dblClickOnStudy = data => {
         return;
     }
 
-    const timepoint = timepointApi.study(data.studyInstanceUid)[0];
+    /*const timepoint = timepointApi.study(data.studyInstanceUid)[0];
     if (timepoint) {
         Router.go('viewerTimepoint', { timepointId: timepoint.timepointId });
     } else {
         Router.go('viewerStudies', { studyInstanceUids: data.studyInstanceUid });
-    }
+    }*/
 };

legacy/Packages/ohif-lesiontracker/package.js

@@ -8,7 +8,6 @@ Package.onUse(function(api) {
     api.versionsFrom('1.7');
 
     api.use('ecmascript');
-    api.use('standard-app-packages');
     api.use('jquery');
     api.use('stylus');
     api.use('random');
@@ -20,7 +19,6 @@ Package.onUse(function(api) {
     api.use('ohif:design');
     api.use('ohif:cornerstone');
     api.use('ohif:core');
-    api.use('ohif:cornerstone-settings');
     api.use('ohif:studies');
     api.use('ohif:measurements');
 

legacy/Packages/ohif-user-management/package.js

@@ -8,7 +8,7 @@ Package.onUse(function(api) {
     api.versionsFrom('1.7');
 
     api.use('ecmascript');
-    api.use('standard-app-packages');
+    api.use('templating');
     api.use('jquery');
     api.use('stylus');
     api.use('random');