From 46828dc5cec751073c34b0e0bfe99b7833200b51 Mon Sep 17 00:00:00 2001 From: Erik Ziegler Date: Fri, 22 Mar 2019 16:16:02 +0100 Subject: [PATCH] fix(google-cloud): Minor cleanup to prevent Google Cloud packages from being added unnecessarily --- .../client/components/ohifViewer/ohifViewer.js | 9 +++++---- Packages/ohif-demo-mode/client/index.js | 2 -- .../client/components/demoSignin/demoSignin.html | 0 .../client/components/demoSignin/demoSignin.js | 0 .../client/components/demoSignin/demoSignin.styl | 0 .../{ => imports}/client/components/index.js | 0 .../{ => imports}/client/demoModeMediator.js | 0 Packages/ohif-demo-mode/imports/client/index.js | 7 +++++++ .../ohif-demo-mode/{ => imports}/client/routes.js | 0 Packages/ohif-demo-mode/main.js | 12 +++--------- Packages/ohif-demo-mode/package.js | 1 - Packages/ohif-google-cloud/client/main.js | 6 ++++++ .../client/components/dialogs/gcloudDialog.html | 0 .../client/components/dialogs/gcloudDialog.js | 0 .../client/components/dialogs/gcloudDialog.styl | 0 .../dicomStorePicker/dicomStorePicker.html | 0 .../dicomStorePicker/dicomStorePicker.js | 0 .../dicomStorePicker/dicomStorePicker.styl | 0 .../{ => imports}/client/components/index.js | 0 .../uploadStudiesDialog/uploadStudiesDialog.html | 0 .../uploadStudiesDialog/uploadStudiesDialog.js | 0 .../uploadStudiesDialog/uploadStudiesDialog.styl | 0 .../{ => imports}/client/index.js | 0 Packages/ohif-google-cloud/imports/index.js | 8 ++++++++ .../{ => imports}/lib/GCloudAdapter.js | 6 +++++- .../ohif-google-cloud/{ => imports}/lib/utils.js | 5 ++--- Packages/ohif-google-cloud/main.js | 9 --------- Packages/ohif-google-cloud/package.js | 7 ++----- Packages/ohif-servers/client/startup.js | 3 +++ .../imports/server/methods/getStudyMetadata.js | 3 +-- .../studylist/studylistResult/studylistResult.js | 15 ++++++--------- 31 files changed, 48 insertions(+), 45 deletions(-) delete mode 100644 Packages/ohif-demo-mode/client/index.js rename Packages/ohif-demo-mode/{ => imports}/client/components/demoSignin/demoSignin.html (100%) rename Packages/ohif-demo-mode/{ => imports}/client/components/demoSignin/demoSignin.js (100%) rename Packages/ohif-demo-mode/{ => imports}/client/components/demoSignin/demoSignin.styl (100%) rename Packages/ohif-demo-mode/{ => imports}/client/components/index.js (100%) rename Packages/ohif-demo-mode/{ => imports}/client/demoModeMediator.js (100%) create mode 100644 Packages/ohif-demo-mode/imports/client/index.js rename Packages/ohif-demo-mode/{ => imports}/client/routes.js (100%) create mode 100644 Packages/ohif-google-cloud/client/main.js rename Packages/ohif-google-cloud/{ => imports}/client/components/dialogs/gcloudDialog.html (100%) rename Packages/ohif-google-cloud/{ => imports}/client/components/dialogs/gcloudDialog.js (100%) rename Packages/ohif-google-cloud/{ => imports}/client/components/dialogs/gcloudDialog.styl (100%) rename Packages/ohif-google-cloud/{ => imports}/client/components/dicomStorePicker/dicomStorePicker.html (100%) rename Packages/ohif-google-cloud/{ => imports}/client/components/dicomStorePicker/dicomStorePicker.js (100%) rename Packages/ohif-google-cloud/{ => imports}/client/components/dicomStorePicker/dicomStorePicker.styl (100%) rename Packages/ohif-google-cloud/{ => imports}/client/components/index.js (100%) rename Packages/ohif-google-cloud/{ => imports}/client/components/uploadStudiesDialog/uploadStudiesDialog.html (100%) rename Packages/ohif-google-cloud/{ => imports}/client/components/uploadStudiesDialog/uploadStudiesDialog.js (100%) rename Packages/ohif-google-cloud/{ => imports}/client/components/uploadStudiesDialog/uploadStudiesDialog.styl (100%) rename Packages/ohif-google-cloud/{ => imports}/client/index.js (100%) create mode 100644 Packages/ohif-google-cloud/imports/index.js rename Packages/ohif-google-cloud/{ => imports}/lib/GCloudAdapter.js (90%) rename Packages/ohif-google-cloud/{ => imports}/lib/utils.js (83%) delete mode 100644 Packages/ohif-google-cloud/main.js diff --git a/OHIFViewer/client/components/ohifViewer/ohifViewer.js b/OHIFViewer/client/components/ohifViewer/ohifViewer.js index ce9eb71e5..4e8d7e961 100644 --- a/OHIFViewer/client/components/ohifViewer/ohifViewer.js +++ b/OHIFViewer/client/components/ohifViewer/ohifViewer.js @@ -61,10 +61,11 @@ Template.ohifViewer.onCreated(() => { Session.set('ViewerOpened', isViewer); }); - if (OHIF.demoMode && OHIF.demoMode.userLoggedIn()) - OHIF.demoMode.setDemoServerConfig(); - else if (OHIF.gcloud && OHIF.gcloud.isEnabled()) { + if (OHIF.demoMode && OHIF.demoMode.userLoggedIn()) { + OHIF.demoMode.setDemoServerConfig(); + } else if (OHIF.gcloud && OHIF.gcloud.isEnabled()) { const server = OHIF.servers.getCurrentServer(); + if (!server || !server.isCloud) { Session.set("IsStudyListReady", false); OHIF.gcloud.showDicomStorePicker({canClose: OHIF.demoMode}).then(config => { @@ -94,7 +95,7 @@ Template.ohifViewer.events({ } } }, - + }); Template.ohifViewer.helpers({ diff --git a/Packages/ohif-demo-mode/client/index.js b/Packages/ohif-demo-mode/client/index.js deleted file mode 100644 index b561f9934..000000000 --- a/Packages/ohif-demo-mode/client/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import './components'; -import './routes.js'; diff --git a/Packages/ohif-demo-mode/client/components/demoSignin/demoSignin.html b/Packages/ohif-demo-mode/imports/client/components/demoSignin/demoSignin.html similarity index 100% rename from Packages/ohif-demo-mode/client/components/demoSignin/demoSignin.html rename to Packages/ohif-demo-mode/imports/client/components/demoSignin/demoSignin.html diff --git a/Packages/ohif-demo-mode/client/components/demoSignin/demoSignin.js b/Packages/ohif-demo-mode/imports/client/components/demoSignin/demoSignin.js similarity index 100% rename from Packages/ohif-demo-mode/client/components/demoSignin/demoSignin.js rename to Packages/ohif-demo-mode/imports/client/components/demoSignin/demoSignin.js diff --git a/Packages/ohif-demo-mode/client/components/demoSignin/demoSignin.styl b/Packages/ohif-demo-mode/imports/client/components/demoSignin/demoSignin.styl similarity index 100% rename from Packages/ohif-demo-mode/client/components/demoSignin/demoSignin.styl rename to Packages/ohif-demo-mode/imports/client/components/demoSignin/demoSignin.styl diff --git a/Packages/ohif-demo-mode/client/components/index.js b/Packages/ohif-demo-mode/imports/client/components/index.js similarity index 100% rename from Packages/ohif-demo-mode/client/components/index.js rename to Packages/ohif-demo-mode/imports/client/components/index.js diff --git a/Packages/ohif-demo-mode/client/demoModeMediator.js b/Packages/ohif-demo-mode/imports/client/demoModeMediator.js similarity index 100% rename from Packages/ohif-demo-mode/client/demoModeMediator.js rename to Packages/ohif-demo-mode/imports/client/demoModeMediator.js diff --git a/Packages/ohif-demo-mode/imports/client/index.js b/Packages/ohif-demo-mode/imports/client/index.js new file mode 100644 index 000000000..0dc08b954 --- /dev/null +++ b/Packages/ohif-demo-mode/imports/client/index.js @@ -0,0 +1,7 @@ +import { OHIF } from 'meteor/ohif:core'; +import devModeMediator from './demoModeMediator.js'; +import './components'; +import './routes.js'; + +OHIF.demoMode = devModeMediator; + diff --git a/Packages/ohif-demo-mode/client/routes.js b/Packages/ohif-demo-mode/imports/client/routes.js similarity index 100% rename from Packages/ohif-demo-mode/client/routes.js rename to Packages/ohif-demo-mode/imports/client/routes.js diff --git a/Packages/ohif-demo-mode/main.js b/Packages/ohif-demo-mode/main.js index 6f891fbb2..6e8e8f5a6 100644 --- a/Packages/ohif-demo-mode/main.js +++ b/Packages/ohif-demo-mode/main.js @@ -1,9 +1,3 @@ -import { OHIF } from 'meteor/ohif:core'; -import './client'; -import devModeMediator from './client/demoModeMediator.js'; - -const demoMode = Meteor.settings && Meteor.settings.public && Meteor.settings.public.demoMode; - -if (demoMode) { - OHIF.demoMode = devModeMediator; -} \ No newline at end of file +if (Meteor.settings.public.demoMode) { + import './imports/client/index.js'; +} diff --git a/Packages/ohif-demo-mode/package.js b/Packages/ohif-demo-mode/package.js index b9013a37b..2626bf1da 100644 --- a/Packages/ohif-demo-mode/package.js +++ b/Packages/ohif-demo-mode/package.js @@ -16,5 +16,4 @@ Package.onUse(function(api) { // Main module api.mainModule('main.js', 'client'); - }); diff --git a/Packages/ohif-google-cloud/client/main.js b/Packages/ohif-google-cloud/client/main.js new file mode 100644 index 000000000..9b559f487 --- /dev/null +++ b/Packages/ohif-google-cloud/client/main.js @@ -0,0 +1,6 @@ +import { Meteor } from 'meteor/meteor'; + +if (Meteor.settings.public.googleCloud) { + import '../imports/index.js'; + import '../imports/client/index.js'; +} diff --git a/Packages/ohif-google-cloud/client/components/dialogs/gcloudDialog.html b/Packages/ohif-google-cloud/imports/client/components/dialogs/gcloudDialog.html similarity index 100% rename from Packages/ohif-google-cloud/client/components/dialogs/gcloudDialog.html rename to Packages/ohif-google-cloud/imports/client/components/dialogs/gcloudDialog.html diff --git a/Packages/ohif-google-cloud/client/components/dialogs/gcloudDialog.js b/Packages/ohif-google-cloud/imports/client/components/dialogs/gcloudDialog.js similarity index 100% rename from Packages/ohif-google-cloud/client/components/dialogs/gcloudDialog.js rename to Packages/ohif-google-cloud/imports/client/components/dialogs/gcloudDialog.js diff --git a/Packages/ohif-google-cloud/client/components/dialogs/gcloudDialog.styl b/Packages/ohif-google-cloud/imports/client/components/dialogs/gcloudDialog.styl similarity index 100% rename from Packages/ohif-google-cloud/client/components/dialogs/gcloudDialog.styl rename to Packages/ohif-google-cloud/imports/client/components/dialogs/gcloudDialog.styl diff --git a/Packages/ohif-google-cloud/client/components/dicomStorePicker/dicomStorePicker.html b/Packages/ohif-google-cloud/imports/client/components/dicomStorePicker/dicomStorePicker.html similarity index 100% rename from Packages/ohif-google-cloud/client/components/dicomStorePicker/dicomStorePicker.html rename to Packages/ohif-google-cloud/imports/client/components/dicomStorePicker/dicomStorePicker.html diff --git a/Packages/ohif-google-cloud/client/components/dicomStorePicker/dicomStorePicker.js b/Packages/ohif-google-cloud/imports/client/components/dicomStorePicker/dicomStorePicker.js similarity index 100% rename from Packages/ohif-google-cloud/client/components/dicomStorePicker/dicomStorePicker.js rename to Packages/ohif-google-cloud/imports/client/components/dicomStorePicker/dicomStorePicker.js diff --git a/Packages/ohif-google-cloud/client/components/dicomStorePicker/dicomStorePicker.styl b/Packages/ohif-google-cloud/imports/client/components/dicomStorePicker/dicomStorePicker.styl similarity index 100% rename from Packages/ohif-google-cloud/client/components/dicomStorePicker/dicomStorePicker.styl rename to Packages/ohif-google-cloud/imports/client/components/dicomStorePicker/dicomStorePicker.styl diff --git a/Packages/ohif-google-cloud/client/components/index.js b/Packages/ohif-google-cloud/imports/client/components/index.js similarity index 100% rename from Packages/ohif-google-cloud/client/components/index.js rename to Packages/ohif-google-cloud/imports/client/components/index.js diff --git a/Packages/ohif-google-cloud/client/components/uploadStudiesDialog/uploadStudiesDialog.html b/Packages/ohif-google-cloud/imports/client/components/uploadStudiesDialog/uploadStudiesDialog.html similarity index 100% rename from Packages/ohif-google-cloud/client/components/uploadStudiesDialog/uploadStudiesDialog.html rename to Packages/ohif-google-cloud/imports/client/components/uploadStudiesDialog/uploadStudiesDialog.html diff --git a/Packages/ohif-google-cloud/client/components/uploadStudiesDialog/uploadStudiesDialog.js b/Packages/ohif-google-cloud/imports/client/components/uploadStudiesDialog/uploadStudiesDialog.js similarity index 100% rename from Packages/ohif-google-cloud/client/components/uploadStudiesDialog/uploadStudiesDialog.js rename to Packages/ohif-google-cloud/imports/client/components/uploadStudiesDialog/uploadStudiesDialog.js diff --git a/Packages/ohif-google-cloud/client/components/uploadStudiesDialog/uploadStudiesDialog.styl b/Packages/ohif-google-cloud/imports/client/components/uploadStudiesDialog/uploadStudiesDialog.styl similarity index 100% rename from Packages/ohif-google-cloud/client/components/uploadStudiesDialog/uploadStudiesDialog.styl rename to Packages/ohif-google-cloud/imports/client/components/uploadStudiesDialog/uploadStudiesDialog.styl diff --git a/Packages/ohif-google-cloud/client/index.js b/Packages/ohif-google-cloud/imports/client/index.js similarity index 100% rename from Packages/ohif-google-cloud/client/index.js rename to Packages/ohif-google-cloud/imports/client/index.js diff --git a/Packages/ohif-google-cloud/imports/index.js b/Packages/ohif-google-cloud/imports/index.js new file mode 100644 index 000000000..9949a65aa --- /dev/null +++ b/Packages/ohif-google-cloud/imports/index.js @@ -0,0 +1,8 @@ +import { OHIF } from 'meteor/ohif:core'; +import GCloudAdapter from './lib/GCloudAdapter'; + +const gcloud = GCloudAdapter; + +OHIF.gcloud = gcloud; + + diff --git a/Packages/ohif-google-cloud/lib/GCloudAdapter.js b/Packages/ohif-google-cloud/imports/lib/GCloudAdapter.js similarity index 90% rename from Packages/ohif-google-cloud/lib/GCloudAdapter.js rename to Packages/ohif-google-cloud/imports/lib/GCloudAdapter.js index 17aab1a38..c7373621b 100644 --- a/Packages/ohif-google-cloud/lib/GCloudAdapter.js +++ b/Packages/ohif-google-cloud/imports/lib/GCloudAdapter.js @@ -1,3 +1,5 @@ +import { OHIF } from 'meteor/ohif:core'; + const GCloudAdapter = {}; const GCP_HEALTHCARE_CONFIG = 'GCP_HEALTHCARE_CONFIG'; @@ -16,7 +18,9 @@ GCloudAdapter.setConfig = function(config) { GCloudAdapter.showDicomStorePicker = function(options) { return OHIF.ui.showDialog('dicomStorePicker', options).then(config => { - if (config) OHIF.gcloud.setConfig(config); + if (config) { + OHIF.gcloud.setConfig(config); + } return config; }); }; diff --git a/Packages/ohif-google-cloud/lib/utils.js b/Packages/ohif-google-cloud/imports/lib/utils.js similarity index 83% rename from Packages/ohif-google-cloud/lib/utils.js rename to Packages/ohif-google-cloud/imports/lib/utils.js index a6084eb99..b75523691 100644 --- a/Packages/ohif-google-cloud/lib/utils.js +++ b/Packages/ohif-google-cloud/imports/lib/utils.js @@ -1,5 +1,4 @@ -export function loadScript(url, callback=undefined) -{ +export function loadScript(url, callback) { var head = document.getElementsByTagName('head')[0]; var script = document.createElement('script'); script.type = 'text/javascript'; @@ -7,4 +6,4 @@ export function loadScript(url, callback=undefined) script.onreadystatechange = callback; script.onload = callback; head.appendChild(script); -} \ No newline at end of file +} diff --git a/Packages/ohif-google-cloud/main.js b/Packages/ohif-google-cloud/main.js deleted file mode 100644 index 937a20b37..000000000 --- a/Packages/ohif-google-cloud/main.js +++ /dev/null @@ -1,9 +0,0 @@ -import { OHIF } from 'meteor/ohif:core'; -import GCloudAdapter from './lib/GCloudAdapter'; - -if (Meteor.settings.public.googleCloud) { - const gcloud = GCloudAdapter; - OHIF.gcloud = gcloud; -} - - diff --git a/Packages/ohif-google-cloud/package.js b/Packages/ohif-google-cloud/package.js index 3a3b34177..6ba8daed6 100644 --- a/Packages/ohif-google-cloud/package.js +++ b/Packages/ohif-google-cloud/package.js @@ -19,12 +19,9 @@ Package.onUse(function(api) { api.use(['templating', 'stylus'], 'client'); // Main module - api.mainModule('main.js', ['client']); + api.mainModule('client/main.js', ['client']); - // Client imports and routes - api.addFiles('client/index.js', 'client'); - - var assets = [ + const assets = [ '.npm/package/node_modules/healthcare-api-adapter/dist/gcp.min.js', '.npm/package/node_modules/healthcare-api-adapter/dist/gcp.0.min.js', '.npm/package/node_modules/healthcare-api-adapter/dist/gcp.2.min.js', diff --git a/Packages/ohif-servers/client/startup.js b/Packages/ohif-servers/client/startup.js index d8c3d2f47..437668c8a 100644 --- a/Packages/ohif-servers/client/startup.js +++ b/Packages/ohif-servers/client/startup.js @@ -21,6 +21,9 @@ if (Meteor.settings && }); const newServer = Servers.findOne(); + if (!newServer) { + return; + } CurrentServer.insert({ serverId: newServer._id diff --git a/Packages/ohif-studies/imports/server/methods/getStudyMetadata.js b/Packages/ohif-studies/imports/server/methods/getStudyMetadata.js index e22323453..95afe37ee 100644 --- a/Packages/ohif-studies/imports/server/methods/getStudyMetadata.js +++ b/Packages/ohif-studies/imports/server/methods/getStudyMetadata.js @@ -20,8 +20,7 @@ Meteor.methods({ if (server.type === 'dicomWeb') { if(server.metadataSource ==='qido') { return OHIF.studies.services.QIDO.RetrieveMetadata(server, studyInstanceUid); - } - else{ + } else { return OHIF.studies.services.WADO.RetrieveMetadata(server, studyInstanceUid); } } else if (server.type === 'dimse') { diff --git a/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.js b/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.js index b4cd83ccf..680f0cf6a 100644 --- a/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.js +++ b/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.js @@ -84,10 +84,8 @@ let filter; */ function getFilter(filter) { const server = OHIF.servers.getCurrentServer(); - if (!server.isCloud) { - if (filter && filter.length && filter.substr(filter.length - 1) !== '*') { - filter += '*'; - } + if (filter && filter.length && filter.substr(filter.length - 1) !== '*') { + filter += '*'; } return filter; @@ -133,13 +131,12 @@ function search(instance) { studyDescription: getFilter($('input#studyDescription').val()), studyDateFrom, studyDateTo, - modalitiesInStudy: $('input#modality').val() ? $('input#modality').val() : '' + modalitiesInStudy: $('input#modality').val() ? $('input#modality').val() : '', + offset: rowsPerPage * currentPage, + limit: rowsPerPage }; const server = OHIF.servers.getCurrentServer(); - if (!server.isCloud) { - filter.offset=rowsPerPage * currentPage; - filter.limit=rowsPerPage; - } + // Make sure that modality has a reasonable value, since it is occasionally // returned as 'undefined' const modality = replaceUndefinedColumnValue($('input#modality').val());