Improving new study browser and moving studies services to ohif:studies

Packages/ohif-core/client/components/index.js

@@ -3,3 +3,4 @@ import './bootstrap';
 import './playground/playground.html';
 import './playground/playground.styl';
 import './playground/playground.js';
+import './scrollArea';

Packages/ohif-core/client/components/scrollArea/index.js

@@ -0,0 +1,2 @@
+import './scrollArea.html';
+import './scrollArea.js';

Packages/ohif-core/client/components/scrollArea/scrollArea.html

@@ -0,0 +1,7 @@
+<template name="scrollArea">
+    <div class="scroll-area {{this.class}}">
+        <div class="scrollable {{#if instance.config.scrollX}}scroll-x{{/if}} {{#if instance.config.scrollY}}scroll-y{{/if}}">
+            {{>Template.contentBlock}}
+        </div>
+    </div>
+</template>

Packages/ohif-core/client/components/scrollArea/scrollArea.js

@@ -0,0 +1,29 @@
+import { Template } from 'meteor/templating';
+import { _ } from 'meteor/underscore';
+
+Template.scrollArea.onCreated(() => {
+    const instance = Template.instance();
+    const { data } = instance;
+    const defaultConfig = {
+        hideScrollbar: true,
+        scrollY: true,
+        scrollX: false
+    };
+
+    instance.config = _.defaults(data || {}, defaultConfig);
+});
+
+Template.scrollArea.onRendered(() => {
+    const instance = Template.instance();
+    const { config } = instance;
+    if (config.hideScrollbar) {
+        const $scrollable = instance.$('.scrollable').first();
+        const scrollable = $scrollable[0];
+        const x = config.scrollX ? 1 : 0;
+        const y = config.scrollY ? 1 : 0;
+        $scrollable.css({
+            right: 0 - (scrollable.offsetWidth - scrollable.clientWidth) * y,
+            bottom: 0 - (scrollable.offsetHeight - scrollable.clientHeight) * x
+        });
+    }
+});

Packages/ohif-core/client/ui/dimensional/dimensional.js

@@ -30,16 +30,19 @@ $.fn.tempShow = function(callback) {
 $.fn.adjustMax = function(dimension) {
     const $element = $(this);
     $element.tempShow(() => {
-        // Add a class to remove the max restriction
+        const maxProperty = `max-${dimension}`;
-        const maxClass = `no-max-${dimension}`;
+
-        $element.addClass(maxClass);
+        // Remove the current max restriction
+        $element.each((i, e) => e.style.setProperty(maxProperty, 'none', 'important'));
 
         // Get the dimension function to obtain the outer dimension
         const dimensionFn = 'outer' + dimension.charAt(0).toUpperCase() + dimension.slice(1);
         const value = $element[dimensionFn]();
 
-        // Remove the max restriction class and set the new max
+        // Remove the property (needed for IE)
-        const maxProperty = `max-${dimension}`;
+        $element.each((i, e) => e.style.removeProperty(maxProperty));
-        $element.removeClass(maxClass).css(maxProperty, value);
+
+        // Set the new max restriction
+        $element.css(maxProperty, value);
     });
 };

Packages/ohif-core/client/ui/dimensional/dimensional.styl

@@ -1,8 +1,2 @@
 body *.visible
     display: block !important
-
-body *.no-max-height:not(.bypassNot)
-    max-height: none !important
-
-body *.no-max-width:not(.bypassNot)
-    max-width: none !important

Packages/ohif-design/styles/common/global.styl

@@ -79,9 +79,6 @@ body .select2-container--default .select2-results>.select2-results__options
 .height-auto
   height: auto !important
 
-.full-width
-  width: 100%
-
 .caret-down
   display: inline-block
   width: 0
@@ -126,3 +123,38 @@ body .select2-container--default .select2-results>.select2-results__options
 
     &:hover span
       transform(rotate(180deg))
+
+.full-width
+  width: 100%
+
+.full-height
+  height: 100%
+
+.flex-h
+  display: flex
+  flex-direction: row
+
+.flex-v
+  display: flex
+  flex-direction: column
+
+.flex-grow
+  flex-grow: 1
+
+.scroll-area
+  overflow: hidden
+  position: relative
+
+  .scrollable
+    bottom: 0
+    left: 0
+    overflow: hidden
+    position: absolute
+    right: 0
+    top: 0
+
+    &.scroll-x
+      overflow-x: scroll
+
+    &.scroll-y
+      overflow-y: scroll

Packages/ohif-measurements/client/conformance/ConformanceCriteria.js

@@ -161,7 +161,7 @@ class ConformanceCriteria {
                         return;
                     }
 
-                    const promise = OHIF.studylist.retrieveStudyMetadata(studyInstanceUid);
+                    const promise = OHIF.studies.retrieveStudyMetadata(studyInstanceUid);
                     promise.then(study => {
                         const studyMetadata = OHIF.viewerbase.getStudyMetadata(study);
 

Packages/ohif-measurements/client/lib/jumpToRowItem.js

@@ -46,7 +46,7 @@ function renderIntoViewport(viewportIndex, studyInstanceUid, seriesInstanceUid,
         const element = $viewports.get(viewportIndex);
         const startLoadingHandler = cornerstoneTools.loadHandlerManager.getStartLoadHandler();
         startLoadingHandler(element);
-        OHIF.studylist.retrieveStudyMetadata(studyInstanceUid).then(study => {
+        OHIF.studies.retrieveStudyMetadata(studyInstanceUid).then(study => {
             OHIF.log.warn('renderIntoViewport');
 
             // Double check to make sure this study wasn't already inserted

Packages/ohif-studies/imports/client/components/browser/index.js

@@ -1,5 +1,6 @@
 import './list.html';
-import './list.js';
 import './item.html';
 import './item.js';
 import './item.styl';
+import './series.html';
+import './series.js';

Packages/ohif-studies/imports/client/components/browser/item.html

@@ -1,5 +1,5 @@
 <template name="studyBrowserItem">
-    <div class="study-browser-item {{this.settings.studyItemClass}} {{#if isActive}}active{{/if}} {{#if isLoading}}loading{{/if}}" data-uid="{{this.studyInformation.studyInstanceUid}}">
+    <div class="study-browser-item {{this.studyItemClass}} {{#if isActive}}active{{/if}} {{#if isLoading}}loading{{/if}}" data-uid="{{this.studyInformation.studyInstanceUid}}">
         <div class="study-item">
             {{#if isLoading}}
                 {{>loadingText}}
@@ -14,8 +14,8 @@
                 </div>
             </div>
         </div>
-        {{#if this.settings.studyTemplate}}
+        {{#if this.studyChildTemplate}}
-            {{>Template.dynamic template=this.settings.studyTemplate data=(clone this)}}
+            {{>Template.dynamic template=this.studyChildTemplate data=(clone this)}}
         {{/if}}
     </div>
 </template>

Packages/ohif-studies/imports/client/components/browser/item.js

@@ -1,26 +1,52 @@
 import { Template } from 'meteor/templating';
+import { ReactiveVar } from 'meteor/reactive-var';
 import { $ } from 'meteor/jquery';
+import { OHIF } from 'meteor/ohif:core';
 
 Template.studyBrowserItem.onCreated(() => {
     const instance = Template.instance();
 
+    instance.loaded = false;
+    instance.loading = new ReactiveVar(false);
+
     const modality = instance.data.studyInformation.modality || 'UN';
     instance.modalities = modality.replace(/\\/g, ' ');
 });
 
 Template.studyBrowserItem.events({
-    'click .study-browser-item'(event, instance) {
+    'click .study-item'(event, instance) {
-        const element = event.currentTarget;
+        if (instance.loading.get()) return;
+
+        const { studyClickCallback, studyInformation } = instance.data;
+        const element = event.currentTarget.parentElement;
         const $element = $(element);
-        $element.trigger('ohif.studies.study.click', instance.data.studyInformation);
+        $element.trigger('ohif.studies.study.click', studyInformation);
-        const { settings, studyInformation } = instance.data;
+
-        if (settings && typeof settings.studyClickCallback) {
+        const triggerClickCallback = () => {
-            settings.studyClickCallback(studyInformation, element);
+            if (typeof studyClickCallback === 'function') {
+                studyClickCallback(studyInformation, element);
+            }
+        };
+
+        if (instance.loaded) {
+            triggerClickCallback();
+        } else {
+            instance.loading.set(true);
+            OHIF.studies.retrieveStudyMetadata(studyInformation.studyInstanceUid).then(() => {
+                instance.loaded = true;
+                instance.loading.set(false);
+                $element.trigger('ohif.studies.study.load', studyInformation);
+                triggerClickCallback();
+            });
         }
     }
 });
 
 Template.studyBrowserItem.helpers({
+    isLoading() {
+        return Template.instance().loading.get();
+    },
+
     modalityStyle() {
         // Responsively styles the Modality Acronyms for studies
         // with more than one modality

Packages/ohif-studies/imports/client/components/browser/item.styl

@@ -46,13 +46,25 @@ $spacerY = 12px
           theme('background-color', '$activeColor')
           border-color: $boxActiveBorderColor
 
-  &:not(.active) .studyTimepointThumbnails
+  &:not(.active) .study-browser-series
     max-height: 0 !important
 
-  .studyTimepointThumbnails
+    .study-series-container
+      opacity: 0
+      transform(translateY(-100%))
+
+  .study-browser-series
     overflow: hidden
+    transform(translateY(0))
+    transform-origin(50% 0%)
     transition($sidebarTransition)
 
+    .study-series-container
+      opacity: 1
+      transition($sidebarTransition)
+      transform(translateY(0))
+      transform-origin(50% 0%)
+
 .study-item-box
   border: 1px solid $boxBorderColor
   border-radius: 12px

Packages/ohif-studies/imports/client/components/browser/list.html

@@ -1,5 +1,5 @@
 <template name="studyBrowserList">
-    <div class="study-browser-list {{this.settings.studyListClass}}">
+    <div class="study-browser-list {{this.class}}">
         {{#each studyInformation in studiesInformation}}
             {{>studyBrowserItem (clone this studyInformation=studyInformation)}}
         {{/each}}

Packages/ohif-studies/imports/client/components/browser/series.html

@@ -0,0 +1,9 @@
+<template name="studyBrowserSeries">
+    <div class="study-browser-series">
+        <div class="study-series-container">
+            {{#each thumbnail in instance.thumbnails.get}}
+                {{>thumbnailEntry (clone '' thumbnail=thumbnail)}}
+            {{/each}}
+        </div>
+    </div>
+</template>

Packages/ohif-studies/imports/client/components/browser/series.js

@@ -0,0 +1,40 @@
+import { Template } from 'meteor/templating';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Tracker } from 'meteor/tracker';
+import { OHIF } from 'meteor/ohif:core';
+
+Template.studyBrowserSeries.onCreated(() => {
+    const instance = Template.instance();
+    const { studyInformation } = instance.data;
+    const { studyInstanceUid } = studyInformation;
+
+    instance.thumbnails = new ReactiveVar([]);
+
+    // Get the study metadata and update the study thumbnails
+    instance.autorun(() => {
+        const studyMetadata = OHIF.viewer.Studies.findBy({ studyInstanceUid });
+
+        // Defines the resulting thumbnails list
+        const thumbnails = [];
+        studyMetadata.displaySets.forEach((stack, thumbnailIndex) => {
+            thumbnails.push({
+                thumbnailIndex,
+                stack
+            });
+        });
+
+        instance.thumbnails.set(thumbnails);
+    });
+});
+
+Template.studyBrowserSeries.onRendered(() => {
+    const instance = Template.instance();
+
+    // Run this computation every time the thumbnails are changed
+    instance.autorun(() => {
+        instance.thumbnails.get();
+        Tracker.afterFlush(() => {
+            instance.$('.study-browser-series').adjustMax('height');
+        });
+    });
+});

Packages/ohif-studies/imports/client/lib/index.js

@@ -0,0 +1,2 @@
+import './retrieveStudiesMetadata';
+import './retrieveStudyMetadata';

Packages/ohif-studies/imports/client/lib/retrieveStudiesMetadata.js

@@ -0,0 +1,32 @@
+import { OHIF } from 'meteor/ohif:core';
+
+/**
+ * Retrieves metaData for multiple studies at once.
+ *
+ * This function calls retrieveStudyMetadata several times, asynchronously,
+ * and waits for all of the results to be returned.
+ *
+ * @param studyInstanceUids The UIDs of the Studies to be retrieved
+ * @return Promise
+ */
+OHIF.studies.retrieveStudiesMetadata = (studyInstanceUids, seriesInstanceUids) => {
+    // Create an empty array to store the Promises for each metaData retrieval call
+    const promises = [];
+
+    // Loop through the array of studyInstanceUids
+    studyInstanceUids.forEach(function(studyInstanceUid) {
+        // Send the call and resolve or reject the related promise based on its outcome
+        const promise = OHIF.studies.retrieveStudyMetadata(studyInstanceUid, seriesInstanceUids);
+
+        // Add the current promise to the array of promises
+        promises.push(promise);
+    });
+
+    // When all of the promises are complete, this callback runs
+    const promise = Promise.all(promises);
+
+    // Warn the error on console if some retrieval failed
+    promise.catch(error => OHIF.log.warn(error));
+
+    return promise;
+};

Packages/ohif-studies/imports/server/index.js

@@ -0,0 +1,3 @@
+import './lib';
+import './methods';
+import './services';

Packages/ohif-studies/imports/server/methods/getStudyMetadata.js

@@ -19,9 +19,9 @@ Meteor.methods({
 
         try {
             if (server.type === 'dicomWeb') {
-                return Services.WADO.RetrieveMetadata(server, studyInstanceUid);
+                return OHIF.studies.services.WADO.RetrieveMetadata(server, studyInstanceUid);
             } else if (server.type === 'dimse') {
-                return Services.DIMSE.RetrieveMetadata(studyInstanceUid);
+                return OHIF.studies.services.DIMSE.RetrieveMetadata(studyInstanceUid);
             }
         } catch (error) {
             OHIF.log.trace();

Packages/ohif-studies/imports/server/methods/index.js

@@ -0,0 +1 @@
+import './getStudyMetadata.js';

Packages/ohif-studies/imports/server/services/dimse/instances.js

@@ -57,7 +57,7 @@ function resultDataToStudyMetadata(resultData, studyInstanceUid) {
  * @param studyInstanceUid
  * @returns {{wadoUriRoot: String, studyInstanceUid: String, seriesList: Array}}
  */
-Services.DIMSE.Instances = function(studyInstanceUid) {
+OHIF.studies.services.DIMSE.Instances = function(studyInstanceUid) {
     //var url = buildUrl(server, studyInstanceUid);
     const result = DIMSE.retrieveInstances(studyInstanceUid);
 

Packages/ohif-studies/imports/server/services/dimse/retrieveMetadata.js

@@ -1,5 +1,5 @@
 import { OHIF } from 'meteor/ohif:core';
-import { parseFloatArray } from 'meteor/ohif:study-list/server/lib/parseFloatArray';
+import { parseFloatArray } from 'meteor/ohif:studies/imports/server/lib/parseFloatArray';
 
 /**
  * Returns the value of the element (e.g. '00280009')
@@ -151,7 +151,7 @@ function resultDataToStudyMetadata(studyInstanceUid, resultData) {
  * @param studyInstanceUid
  * @returns {{seriesList: Array, patientName: *, patientId: *, accessionNumber: *, studyDate: *, modalities: *, studyDescription: *, imageCount: *, studyInstanceUid: *}}
  */
-Services.DIMSE.RetrieveMetadata = function(studyInstanceUid) {
+OHIF.studies.services.DIMSE.RetrieveMetadata = function(studyInstanceUid) {
     // TODO: Check which peer it should point to
     const activeServer = OHIF.servers.getCurrentServer().peers[0];
     const supportsInstanceRetrievalByStudyUid = activeServer.supportsInstanceRetrievalByStudyUid;

Packages/ohif-studies/imports/server/services/dimse/studies.js

@@ -32,7 +32,7 @@ function resultDataToStudies(resultData) {
     return studies;
 }
 
-Services.DIMSE.Studies = function(filter) {
+OHIF.studies.services.DIMSE.Studies = function(filter) {
     OHIF.log.info('Services.DIMSE.Studies');
 
     let filterStudyDate = '';

Packages/ohif-studies/imports/server/services/namespace.js

@@ -0,0 +1,13 @@
+import { OHIF } from 'meteor/ohif:core';
+
+const Services = {};
+Services.QIDO = {};
+Services.WADO = {};
+Services.DIMSE = {};
+Services.REMOTE = {};
+
+OHIF.studies.services = Services;
+
+remoteGetValue = function(obj) {
+    return obj ? obj.Value : null;
+};

Packages/ohif-studies/imports/server/services/qido/instances.js

@@ -74,7 +74,7 @@ function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
  * @throws ECONNREFUSED
  * @returns {{wadoUriRoot: String, studyInstanceUid: String, seriesList: Array}}
  */
-Services.QIDO.Instances = function(server, studyInstanceUid) {
+OHIF.studies.services.QIDO.Instances = function(server, studyInstanceUid) {
     var url = buildUrl(server, studyInstanceUid);
 
     try {

Packages/ohif-studies/imports/server/services/qido/studies.js

@@ -91,7 +91,7 @@ function resultDataToStudies(resultData) {
     return studies;
 }
 
-Services.QIDO.Studies = function(server, filter) {
+OHIF.studies.services.QIDO.Studies = function(server, filter) {
     var url = filterToQIDOURL(server, filter);
 
     try {

Packages/ohif-studies/imports/server/services/remote/instances.js

@@ -1,3 +1,4 @@
+import { OHIF } from 'meteor/ohif:core';
 import { remoteGetValue } from '../../lib/remoteGetValue';
 
 /**
@@ -63,7 +64,7 @@ function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
  * @param studyInstanceUid
  * @returns {{wadoUriRoot: String, studyInstanceUid: String, seriesList: Array}}
  */
-Services.REMOTE.Instances = function(server, studyInstanceUid) {
+OHIF.studies.services.REMOTE.Instances = function(server, studyInstanceUid) {
     var parameters = {
         PatientName: "",
         PatientID: "",

Packages/ohif-studies/imports/server/services/remote/retrieveMetadata.js

@@ -1,3 +1,4 @@
+import { OHIF } from 'meteor/ohif:core';
 import { remoteGetValue } from '../../lib/remoteGetValue';
 import { parseFloatArray } from '../../lib/parseFloatArray';
 
@@ -126,7 +127,7 @@ console.log(studyData.seriesList[0].instances);
  * @param studyInstanceUid
  * @returns {{seriesList: Array, patientName: *, patientId: *, accessionNumber: *, studyDate: *, modalities: *, studyDescription: *, imageCount: *, studyInstanceUid: *}}
  */
-Services.REMOTE.RetrieveMetadata = function(server, studyInstanceUid) {
+OHIF.studies.services.REMOTE.RetrieveMetadata = function(server, studyInstanceUid) {
     var remote = new OrthancRemote(server.root, server.sourceAE);
 
     var study = resultDataToStudyMetadata(server, studyInstanceUid, remote.retrieveMetadata(server.modality, studyInstanceUid));

Packages/ohif-studies/imports/server/services/remote/studies.js

@@ -1,3 +1,4 @@
+import { OHIF } from 'meteor/ohif:core';
 import { remoteGetValue } from '../../lib/remoteGetValue';
 
 function resultDataToStudies(resultData) {
@@ -26,7 +27,7 @@ function resultDataToStudies(resultData) {
   return studies;
 }
 
-Services.REMOTE.Studies = function(server, filter) {
+OHIF.studies.services.REMOTE.Studies = function(server, filter) {
     var parameters = {
         PatientName: filter.patientName ? filter.patientName : "",
         PatientID: filter.patientId,

Packages/ohif-studies/imports/server/services/wado/retrieveMetadata.js

@@ -337,7 +337,7 @@ function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
  * @param studyInstanceUid
  * @returns {{seriesList: Array, patientName: *, patientId: *, accessionNumber: *, studyDate: *, modalities: *, studyDescription: *, imageCount: *, studyInstanceUid: *}}
  */
-Services.WADO.RetrieveMetadata = function(server, studyInstanceUid) {
+OHIF.studies.services.WADO.RetrieveMetadata = function(server, studyInstanceUid) {
     var url = buildUrl(server, studyInstanceUid);
 
     try {

Packages/ohif-study-list/client/components/seriesDetailsModal/seriesDetailsTable/seriesDetailsTable.js

@@ -36,7 +36,7 @@ Template.seriesDetailsTable.onRendered(() => {
     // Get series list for the study
     _.map(studies, (selectedStudy, index) => {
         studies[index].seriesList = [];
-        OHIF.studylist.retrieveStudyMetadata(study => {
+        OHIF.studies.retrieveStudyMetadata(study => {
             // Set series list
             studies[index].seriesList = study.seriesList;
             studies[index].displaySeriesLoadingText = false;

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

@@ -13,7 +13,7 @@ export class OHIFStudyMetadataSource extends OHIF.viewerbase.StudyMetadataSource
      * @return {Promise} A Promise object
      */
     getByInstanceUID(studyInstanceUID) {
-        return OHIF.studylist.retrieveStudyMetadata(studyInstanceUID);
+        return OHIF.studies.retrieveStudyMetadata(studyInstanceUID);
     }
 
     /**

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

@@ -12,7 +12,7 @@ queryStudies = function(studiesToQuery, options) {
     const promises = [];
 
     studiesToQuery.forEach(studyToQuery => {
-        const promise = OHIF.studylist.retrieveStudyMetadata(studyToQuery.studyInstanceUid);
+        const promise = OHIF.studies.retrieveStudyMetadata(studyToQuery.studyInstanceUid);
         promise.then(study => {
             studiesQueried++;
             notify({

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

@@ -1,42 +1,12 @@
 import { OHIF } from 'meteor/ohif:core';
 
+const note = 'OHIF.studylist.retrieveStudiesMetadata is deprecated.';
+const instructions = 'Please use OHIF.studies.retrieveStudiesMetadata instead.';
+
 /**
- * Retrieves metaData for multiple studies at once.
+ * @deprecated Please use OHIF.studies.retrieveStudiesMetadata instead
- *
- * This function calls retrieveStudyMetadata several times, asynchronously,
- * and waits for all of the results to be returned.
- *
- * @param studyInstanceUids The UIDs of the Studies to be retrieved
- * @return Promise
  */
-OHIF.studylist.retrieveStudiesMetadata = (studyInstanceUids, seriesInstanceUids, doneCallback, failCallback) => {
+OHIF.studylist.retrieveStudiesMetadata = function() {
-    // // Check to make sure studyInstanceUids were actually input
+    OHIF.log.warn(`${note}\n${instructions}`);
-    // if (!studyInstanceUids || !studyInstanceUids.length) {
+    OHIF.studies.retrieveStudiesMetadata.apply(this, arguments);
-    //     if (failCallback && typeof failCallback === 'function') {
-    //         failCallback('No studyInstanceUids were input');
-    //     }
-    //
-    //     return;
-    // }
-
-    // Create an empty array to store the Promises for each metaData retrieval call
-    const promises = [];
-
-    // Loop through the array of studyInstanceUids
-    studyInstanceUids.forEach(function(studyInstanceUid) {
-        // Send the call, and attach doneCallbacks and failCallbacks
-        // which can resolve or reject the related promise based on its outcome
-        const promise = OHIF.studylist.retrieveStudyMetadata(studyInstanceUid, seriesInstanceUids);
-
-        // Add the current promise to the array of promises
-        promises.push(promise);
-    });
-
-    // When all of the promises are complete, this callback runs
-    const promise = Promise.all(promises);
-
-    // Warn the error on console if some retrieval failed
-    promise.catch(error => OHIF.log.warn(error));
-
-    return promise;
 };

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

@@ -1,110 +1,12 @@
-import { Meteor } from 'meteor/meteor';
 import { OHIF } from 'meteor/ohif:core';
-import 'meteor/ohif:viewerbase';
 
-// Define the StudyMetaDataPromises object. This is used as a cache to store study meta data
+const note = 'OHIF.studylist.retrieveStudyMetadata is deprecated.';
-// promises and prevent unnecessary subsequent calls to the server
+const instructions = 'Please use OHIF.studies.retrieveStudyMetadata instead.';
-const StudyMetaDataPromises = new Map();
 
 /**
- * Retrieves study metadata using a server call
+ * @deprecated Please use OHIF.studies.retrieveStudyMetadata instead
- *
- * @param {String} studyInstanceUid The UID of the Study to be retrieved
- * @returns {Promise} that will be resolved with the metadata or rejected with the error
  */
-OHIF.studylist.retrieveStudyMetadata = (studyInstanceUid, seriesInstanceUids) => {
+OHIF.studylist.retrieveStudyMetadata = function() {
-
+    OHIF.log.warn(`${note}\n${instructions}`);
-    // @TODO: Whenever a study metadata request has failed, its related promise will be rejected once and for all
+    OHIF.studies.retrieveStudyMetadata.apply(this, arguments);
-    // and further requests for that metadata will always fail. On failure, we probably need to remove the
-    // corresponding promise from the "StudyMetaDataPromises" map...
-
-    // If the StudyMetaDataPromises cache already has a pending or resolved promise related to the
-    // given studyInstanceUid, then that promise is returned
-    if (StudyMetaDataPromises.has(studyInstanceUid)) {
-        return StudyMetaDataPromises.get(studyInstanceUid);
-    }
-
-    console.time('retrieveStudyMetadata');
-
-    // Create a promise to handle the data retrieval
-    const promise = new Promise((resolve, reject) => {
-        // If no study metadata is in the cache variable, we need to retrieve it from
-        // the server with a call.
-        Meteor.call('GetStudyMetadata', studyInstanceUid, function(error, study) {
-            console.timeEnd('retrieveStudyMetadata');
-
-            if (error) {
-                const errorType = error.error;
-                let errorMessage = '';
-                
-                if (errorType === 'server-connection-error') {
-                    errorMessage = 'There was an error connecting to the DICOM server, please verify if it is up and running.'
-                } else if (errorType === 'server-internal-error') {
-                    errorMessage = `There was an internal error with the DICOM server getting metadeta for ${studyInstanceUid}`;
-                } else {
-                    errorMessage = `For some reason we could not retrieve the study\'s metadata for ${studyInstanceUid}.`;
-                }
-
-                OHIF.log.error(errorMessage);
-                OHIF.log.error(error.stack);
-                reject(`GetStudyMetadata: ${errorMessage}`);
-                return;
-            }
-
-            // Filter series if seriesInstanceUid exists
-            if (seriesInstanceUids && seriesInstanceUids.length) {
-                study.seriesList = study.seriesList.filter(series => seriesInstanceUids.indexOf(series.seriesInstanceUid) > -1);
-            }
-
-            if (!study) {
-                reject(`GetStudyMetadata: No study data returned from server: ${studyInstanceUid}`);
-                return;
-            }
-
-            if (window.HipaaLogger && Meteor.user && Meteor.user()) {
-                window.HipaaLogger.logEvent({
-                    eventType: 'viewed',
-                    userId: Meteor.userId(),
-                    userName: Meteor.user().profile.fullName,
-                    collectionName: 'Study',
-                    recordId: studyInstanceUid,
-                    patientId: study.patientId,
-                    patientName: study.patientName
-                });
-            }
-
-            // Once the data was retrieved, the series are sorted by series and instance number
-            OHIF.viewerbase.sortStudy(study);
-
-            // Updates WADO-RS metaDataManager
-            OHIF.viewerbase.updateMetaDataManager(study);
-
-            // Add additional metadata to our study from the studylist
-            const studylistStudy = OHIF.studylist.collections.Studies.findOne({
-                studyInstanceUid: study.studyInstanceUid,
-                'seriesList.seriesInstanceUid': '123456',
-            });
-
-            if (studylistStudy) {
-                Object.assign(study, studylistStudy);
-            }
-
-            // Transform the study in a StudyMetadata object
-            const studyMetadata = new OHIF.metadata.StudyMetadata(study);
-
-            // Add the display sets to the study
-            study.displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata);
-            study.displaySets.forEach(displaySet => {
-                OHIF.viewerbase.stackManager.makeAndAddStack(study, displaySet);
-            });
-
-            // Resolve the promise with the final study metadata object
-            resolve(study);
-        });
-    });
-
-    // Store the promise in cache
-    StudyMetaDataPromises.set(studyInstanceUid, promise);
-
-    return promise;
 };

Packages/ohif-study-list/package.js

@@ -44,6 +44,4 @@ Package.onUse(function(api) {
 
     // Client imports
     api.addFiles('client/index.js', 'client');
-
-    api.export('Services', 'server');
 });

Packages/ohif-study-list/server/index.js

@@ -1,5 +1 @@
 import './publications.js';
-
-import './lib';
-import './methods';
-import './services';

Packages/ohif-study-list/server/methods/index.js

@@ -1,3 +1,2 @@
-import './getStudyMetadata.js';
 import './importStudies.js';
 import './studylistSearch.js';

Packages/ohif-study-list/server/methods/studylistSearch.js

@@ -18,9 +18,9 @@ Meteor.methods({
 
         try {
             if (server.type === 'dicomWeb') {
-                return Services.QIDO.Studies(server, filter);
+                return OHIF.studies.services.QIDO.Studies(server, filter);
             } else if (server.type === 'dimse') {
-                return Services.DIMSE.Studies(filter);
+                return OHIF.studies.services.DIMSE.Studies(filter);
             }
         } catch (error) {
             OHIF.log.trace();

Packages/ohif-study-list/server/services/namespace.js

@@ -1,9 +0,0 @@
-Services = {};
-Services.QIDO = {};
-Services.WADO = {};
-Services.DIMSE = {};
-Services.REMOTE = {};
-
-remoteGetValue = function(obj) {
-  return obj ? obj.Value : null;
-};

Packages/ohif-viewerbase/client/components/studyBrowser/thumbnailEntry/thumbnailEntry.html

@@ -4,8 +4,8 @@
             <div class="p-x-1">
                 {{>imageThumbnail (clone this)}}
             </div>
-            <div class="seriesDetails clearfix m-x-1 {{#unless stack.seriesDescription}}info-only{{/unless}}">
+            <div class="seriesDetails flex-h m-x-1 {{#unless stack.seriesDescription}}info-only{{/unless}}">
-                <div class="seriesDescription">
+                <div class="seriesDescription flex-grow">
                     {{stack.seriesDescription}}
                 </div>
                 <div class="seriesInformation">

Packages/ohif-viewerbase/client/components/studyBrowser/thumbnailEntry/thumbnailEntry.styl

@@ -47,13 +47,7 @@ $seriesCountBackgroundColor = #678696
             margin-left: 0
             width: auto
 
-  .seriesDescription
-    float: left
-    width: calc(100% - 50px)
-
   .seriesInformation
-    display: table
-    float: right
     padding-right: 4px
     max-width: 50px
 
@@ -66,6 +60,9 @@ $seriesCountBackgroundColor = #678696
       float: right
       font-size: 12px
       margin-left: 4px
+      overflow: hidden
+      text-overflow: ellipsis
+      white-space: nowrap
       width: calc(100% - 15px)
 
     .icon

Packages/ohif-viewerbase/client/components/viewer/studyTimepointBrowser/studyTimepoint.js

@@ -68,7 +68,7 @@ Template.studyTimepoint.events({
             $selection.removeClass('loading');
             $selection.toggleClass('active');
             // Recalculates the timepoint height to make CSS transition smoother
-            const $thumbnails = $selection.find('.studyTimepointThumbnails');
+            const $thumbnails = $selection.find('.study-browser-series');
             $thumbnails.one('transitionend', () => $timepoint.trigger('displayStateChanged'));
         }
 

Packages/ohif-viewerbase/client/components/viewer/studyTimepointBrowser/studyTimepointStudy.html

@@ -18,10 +18,12 @@
                 </div>
             </div>
             {{#if isSidebar}}
-                <div class="studyTimepointThumbnails">
+                <div class="study-browser-series">
-                    {{#each thumbnail in (studyThumbnails this.study)}}
+                    <div class="study-series-container">
-                        {{>thumbnailEntry (clone this thumbnail=thumbnail)}}
+                        {{#each thumbnail in (studyThumbnails this.study)}}
-                    {{/each}}
+                            {{>thumbnailEntry (clone this thumbnail=thumbnail)}}
+                        {{/each}}
+                    </div>
                 </div>
             {{/if}}
         </div>

Packages/ohif-viewerbase/client/components/viewer/studyTimepointBrowser/studyTimepointStudy.js

@@ -52,7 +52,7 @@ Template.studyTimepointStudy.onCreated(() => {
         }
 
         const $study = instance.getStudyElement();
-        const $thumbnails = $study.find('.studyTimepointThumbnails');
+        const $thumbnails = $study.find('.study-browser-series');
         $study.addClass('active');
         // If element already has max-height property set, .height()
         // will return that value, so remove it to recalculate
@@ -80,7 +80,7 @@ Template.studyTimepointStudy.onRendered(() => {
 
 Template.studyTimepointStudy.events({
     // Recalculates the timepoint height to make CSS transition smoother
-    'transitionend .studyTimepointThumbnails'(event, instance) {
+    'transitionend .study-browser-series'(event, instance) {
         if (event.target === event.currentTarget) {
             $(event.currentTarget).closest('.studyTimepoint').trigger('displayStateChanged');
         }
@@ -117,7 +117,7 @@ Template.studyTimepointStudy.events({
             if (!alreadyLoaded) {
                 const $studies = instance.getStudyElement(true);
                 $studies.trigger('loadStarted');
-                OHIF.studylist.retrieveStudyMetadata(studyInstanceUid).then(study => {
+                OHIF.studies.retrieveStudyMetadata(studyInstanceUid).then(study => {
                     instance.data.study = study;
                     OHIF.viewer.Studies.insert(study);
 

Packages/ohif-viewerbase/client/lib/prepareViewerData.js

@@ -17,7 +17,7 @@ export const prepareViewerData = ({ studyInstanceUids, seriesInstanceUids, timep
     // Retrieve the studies metadata
     const promise = new Promise((resolve, reject) => {
         const processData = viewerData => {
-            OHIF.studylist.retrieveStudiesMetadata(viewerData.studyInstanceUids, viewerData.seriesInstanceUids).then(studies => {
+            OHIF.studies.retrieveStudiesMetadata(viewerData.studyInstanceUids, viewerData.seriesInstanceUids).then(studies => {
                 // Add additional metadata to our study from the studylist
                 studies.forEach(study => {
                     const studylistStudy = OHIF.studylist.collections.Studies.findOne({