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

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';