fix(routing): Switch from iron:router to clinical:router so we respect ROOT_URL (#115)

LesionTracker/.meteor/versions

@@ -26,6 +26,10 @@ clinical:auto-resizing@0.2.0
 clinical:fonts@1.1.6
 clinical:hipaa-audit-log@2.4.2
 clinical:hipaa-logger@1.3.0
+clinical:router@2.0.19
+clinical:router-location@2.1.0
+clinical:router-middleware-stack@2.1.2
+clinical:router-url@2.1.0
 clinical:theming@0.4.10
 cultofcoders:persistent-session@0.4.5
 ddp@1.4.0
@@ -56,10 +60,6 @@ iron:controller@1.0.12
 iron:core@1.0.11
 iron:dynamic-template@1.0.12
 iron:layout@1.0.12
-iron:location@1.0.11
-iron:middleware-stack@1.1.0
-iron:router@1.0.13
-iron:url@1.0.11
 johdirr:meteor-git-rev@0.0.4
 jquery@1.11.11
 launch-screen@1.1.1
@@ -93,6 +93,7 @@ ohif:cornerstone@0.0.1
 ohif:cornerstone-settings@0.0.1
 ohif:design@0.0.1
 ohif:dicom-services@0.0.1
+ohif:dicomweb-client@0.0.1
 ohif:hanging-protocols@0.0.1
 ohif:header@0.0.1
 ohif:hotkeys@0.0.1

LesionTracker/client/components/app/app.js

@@ -1,6 +1,6 @@
 import { Template } from 'meteor/templating';
 import { Session } from 'meteor/session';
-import { Router } from 'meteor/iron:router';
+import { Router } from 'meteor/clinical:router';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { OHIF } from 'meteor/ohif:core';
 

LesionTracker/client/routes.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Router } from 'meteor/iron:router';
+import { Router } from 'meteor/clinical:router';
 import { OHIF } from 'meteor/ohif:core';
 
 Router.configure({
@@ -59,4 +59,4 @@ Router.route('/study/:studyInstanceUid/series/:seriesInstanceUids', function ()
     const studyInstanceUid = this.params.studyInstanceUid;
     const seriesInstanceUids = this.params.seriesInstanceUids.split(';');
     OHIF.viewerbase.renderViewer(this, { studyInstanceUids: [studyInstanceUid], seriesInstanceUids });
-}, { name: 'viewerSeries' });
+}, { name: 'viewerSeries' });

LesionTracker/package-lock.json

@@ -5,12 +5,12 @@
   "requires": true,
   "dependencies": {
     "@babel/runtime": {
-      "version": "7.0.0-beta.53",
+      "version": "7.0.0-beta.54",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.53.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.54.tgz",
-      "integrity": "sha1-nfIq40gjzon3kAYFlLg+5XLixdI=",
+      "integrity": "sha1-Oeu0JyP+fKSz4bAOln6AE41Hyt8=",
       "requires": {
-        "core-js": "2.5.7",
+        "core-js": "^2.5.7",
-        "regenerator-runtime": "0.12.0"
+        "regenerator-runtime": "^0.12.0"
       }
     },
     "acorn": {
@@ -817,7 +817,7 @@
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
       "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
@@ -831,7 +831,7 @@
     "globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+      "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=",
       "dev": true
     },
     "globby": {
@@ -1151,7 +1151,7 @@
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
       "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"

LesionTracker/package.json

@@ -9,7 +9,7 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.53",
+    "@babel/runtime": "^7.0.0-beta.54",
     "bcrypt": "^0.8.7",
     "loglevel": "^1.6.1",
     "url": "^0.11.0"

OHIFViewer/.meteor/versions

@@ -20,6 +20,10 @@ caching-compiler@1.1.12
 caching-html-compiler@1.1.3
 callback-hook@1.1.0
 check@1.3.1
+clinical:router@2.0.19
+clinical:router-location@2.1.0
+clinical:router-middleware-stack@2.1.2
+clinical:router-url@2.1.0
 cultofcoders:persistent-session@0.4.5
 ddp@1.4.0
 ddp-client@2.3.3
@@ -47,10 +51,6 @@ iron:controller@1.0.12
 iron:core@1.0.11
 iron:dynamic-template@1.0.12
 iron:layout@1.0.12
-iron:location@1.0.11
-iron:middleware-stack@1.1.0
-iron:router@1.0.13
-iron:url@1.0.11
 johdirr:meteor-git-rev@0.0.4
 jquery@1.11.11
 launch-screen@1.1.1

OHIFViewer/client/components/ohifViewer/ohifViewer.js

@@ -1,6 +1,6 @@
 import { Template } from 'meteor/templating';
 import { Session } from 'meteor/session';
-import { Router } from 'meteor/iron:router';
+import { Router } from 'meteor/clinical:router';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { OHIF } from 'meteor/ohif:core';
 

OHIFViewer/client/routes.js

@@ -1,4 +1,4 @@
-import { Router } from 'meteor/iron:router';
+import { Router } from 'meteor/clinical:router';
 import { OHIF } from 'meteor/ohif:core';
 
 Router.configure({

Packages/active-entry/package.js

@@ -12,7 +12,7 @@ Package.onUse(function (api) {
   api.use([
     'meteor-platform',
     'templating',
-    'iron:router@1.0.13',
+    'clinical:router@2.0.19',
     'grove:less@0.1.1',
     'session',
     'reactive-dict'
@@ -77,7 +77,7 @@ Package.onUse(function (api) {
 Package.onTest(function (api) {
   api.use([
     'templating',
-    'iron:router@1.0.13',
+    'clinical:router@2.0.19',
     'grove:less@0.1.1',
     'standard-app-packages'
   ], ['client']);

Packages/hipaa-audit-log/package.js

@@ -13,7 +13,7 @@ Package.on_use(function (api) {
   api.use('mrt:moment@2.8.1', 'client');
   api.use('grove:less@0.1.1', 'client');
 
-  api.use('iron:router@1.0.13');
+  api.use('clinical:router@2.0.19');
   api.use('clinical:fonts@1.0.0', 'client');
   api.use('clinical:auto-resizing@0.1.2', 'client');
   api.use('clinical:hipaa-logger@1.0.0');
@@ -50,7 +50,7 @@ Package.onTest(function (api) {
   api.use('tinytest');
 
   api.use('meteor-platform');
-  api.use('iron:router@1.0.4', 'client');
+  api.use('clinical:router@2.0.19', 'client');
   api.use('mrt:moment@2.8.1', 'client');
   api.use('grove:less@0.1.1', 'client');
 

Packages/ohif-core/client/routes.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { $ } from 'meteor/jquery';
-import { Router } from 'meteor/iron:router';
+import { Router } from 'meteor/clinical:router';
 
 Router.onRun(function() {
     $(document.body).trigger('ohif.navigated');

Packages/ohif-core/package.js

@@ -20,7 +20,7 @@ Package.onUse(function(api) {
     api.use('reactive-var');
 
     // Router dependencies
-    api.use('iron:router@1.0.13', 'client');
+    api.use('clinical:router@2.0.19', 'client');
 
     // Component's library dependencies
     api.use('natestrauser:select2@4.0.1', 'client');

Packages/ohif-dicomweb-client/src/makeRequest.js

@@ -30,7 +30,7 @@ async function makeRequest(url, options) {
 
     return new Promise((resolve, reject) => {
         // TODO: Kept getting weird build errors from RegExp
-        const isAbsolute = parsed.href.indexOf('http://') === 0 || parsed.href.indexOf('https://');
+        const isAbsolute = parsed.href.indexOf('http://') === 0 || parsed.href.indexOf('https://') === 0;
 
         let url = parsed.href;
 
@@ -38,6 +38,8 @@ async function makeRequest(url, options) {
             url = Meteor.absoluteUrl(parsed.href);
         }
 
+        console.warn(url);
+
         fetch(url, requestOpt).then((response) => {
             if (response.status >= 400) {
                 reject(new Error(response.status));

Packages/ohif-hanging-protocols/package.js

@@ -14,7 +14,7 @@ Package.onUse(function(api) {
     api.use('random');
     api.use('templating');
     api.use('natestrauser:select2@4.0.1', 'client');
-    api.use('iron:router@1.0.13');
+    api.use('clinical:router@2.0.19');
     api.use('momentjs:moment');
     api.use('validatejs');
 

Packages/ohif-hotkeys/client/lib/routes.js

@@ -1,4 +1,4 @@
-import { Router } from 'meteor/iron:router';
+import { Router } from 'meteor/clinical:router';
 import { Session } from 'meteor/session';
 import { hotkeys } from 'meteor/ohif:hotkeys';
 

Packages/ohif-hotkeys/package.js

@@ -18,7 +18,7 @@ Package.onUse(function(api) {
         'stylus',
         'reactive-var',
         'session',
-        'iron:router',
+        'clinical:router',
         'cultofcoders:persistent-session'
     ]);
 

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

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Router } from 'meteor/iron:router';
+import { Router } from 'meteor/clinical:router';
 import { OHIF } from 'meteor/ohif:core';
 
 Meteor.startup(function() {

Packages/ohif-study-list/client/lib/studylist.js

@@ -1,5 +1,5 @@
 import { OHIF } from 'meteor/ohif:core';
-import { Router } from 'meteor/iron:router';
+import { Router } from 'meteor/clinical:router';
 
 // Functions
 import { getStudyPriors } from './getStudyPriors';

Packages/ohif-study-list/client/lib/viewStudies.js

@@ -1,5 +1,5 @@
 import { OHIF } from 'meteor/ohif:core';
-import { Router } from 'meteor/iron:router';
+import { Router } from 'meteor/clinical:router';
 
 /**
  * Loads multiple unassociated studies in the Viewer

Packages/ohif-user-management/client/handlers.js

@@ -1,5 +1,5 @@
 import { Accounts } from 'meteor/accounts-base';
-import { Router } from 'meteor/iron:router';
+import { Router } from 'meteor/clinical:router';
 
 Accounts.onLogout(() => {
     Router.go('/entrySignIn');

Packages/ohif-user-management/client/lib/audit.js

@@ -1,4 +1,4 @@
-import { Router } from 'meteor/iron:router';
+import { Router } from 'meteor/clinical:router';
 import { OHIF } from 'meteor/ohif:core';
 
 OHIF.user.audit = () => {

Packages/ohif-user-management/client/lib/changePassword.js

@@ -1,4 +1,4 @@
-import { Router } from 'meteor/iron:router';
+import { Router } from 'meteor/clinical:router';
 import { OHIF } from 'meteor/ohif:core';
 
 OHIF.user.changePassword = () => {

Packages/ohif-user/client/components/login/userLogin.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
-import { Router } from 'meteor/iron:router';
+import { Router } from 'meteor/clinical:router';
 import { OHIF } from 'meteor/ohif:core';
 
 Template.userLogin.onCreated(() => {

Packages/ohif-user/client/routes.js

@@ -1,4 +1,4 @@
-import { Router } from 'meteor/iron:router';
+import { Router } from 'meteor/clinical:router';
 
 Router.route('/login', function() {
     this.layout('mainLayout', { data: {} });

Packages/ohif-user/package.js

@@ -18,7 +18,7 @@ Package.onUse(function(api) {
     api.use([
         'templating',
         'stylus',
-        'iron:router'
+        'clinical:router'
     ], 'client');
 
     // OHIF dependencies

Packages/ohif-wadoproxy/package.js

@@ -13,7 +13,7 @@ Package.onUse(function(api) {
 
     api.use('ecmascript');
     api.use('standard-app-packages');
-    api.use('iron:router@1.0.13');
+    api.use('clinical:router@2.0.19');
 
     api.use('ohif:core');
     api.use('ohif:servers');

Packages/ohif-wadoproxy/server/routes.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Router } from 'meteor/iron:router';
+import { Router } from 'meteor/clinical:router';
 import { Accounts } from 'meteor/accounts-base';
 import { OHIF } from 'meteor/ohif:core';
 import { Servers } from 'meteor/ohif:servers/both/collections';

StandaloneViewer/StandaloneViewer/.meteor/packages

@@ -27,12 +27,12 @@ ohif:cornerstone-settings
 ohif:viewerbase
 ohif:metadata
 ohif:study-list
-ohif:dicom-services
+ohif:dicomweb-client
 
 aldeed:template-extension
 aldeed:simple-schema@1.5.3
 stylus@2.513.9
-iron:router
+clinical:router
 session@1.1.7
 cultofcoders:persistent-session
 reactive-dict@1.2.0

StandaloneViewer/StandaloneViewer/.meteor/versions

@@ -20,6 +20,10 @@ caching-compiler@1.1.12
 caching-html-compiler@1.1.3
 callback-hook@1.1.0
 check@1.3.1
+clinical:router@2.0.19
+clinical:router-location@2.1.0
+clinical:router-middleware-stack@2.1.2
+clinical:router-url@2.1.0
 cultofcoders:persistent-session@0.4.5
 ddp@1.4.0
 ddp-client@2.3.3
@@ -47,10 +51,6 @@ iron:controller@1.0.12
 iron:core@1.0.11
 iron:dynamic-template@1.0.12
 iron:layout@1.0.12
-iron:location@1.0.11
-iron:middleware-stack@1.1.0
-iron:router@1.1.2
-iron:url@1.1.0
 jquery@1.11.11
 launch-screen@1.1.1
 livedata@1.0.18
@@ -82,6 +82,7 @@ ohif:cornerstone@0.0.1
 ohif:cornerstone-settings@0.0.1
 ohif:design@0.0.1
 ohif:dicom-services@0.0.1
+ohif:dicomweb-client@0.0.1
 ohif:header@0.0.1
 ohif:hotkeys@0.0.1
 ohif:log@0.0.1

StandaloneViewer/StandaloneViewer/routes.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Router } from 'meteor/iron:router';
+import { Router } from 'meteor/clinical:router';
 import { OHIF } from 'meteor/ohif:core';
 
 if (Meteor.isClient) {