diff --git a/extensions/default/src/Panels/PanelStudyBrowser.jsx b/extensions/default/src/Panels/PanelStudyBrowser.jsx index 43df658a2..a37260cec 100644 --- a/extensions/default/src/Panels/PanelStudyBrowser.jsx +++ b/extensions/default/src/Panels/PanelStudyBrowser.jsx @@ -187,7 +187,6 @@ PanelStudyBrowser.propTypes = { EVENTS: PropTypes.object.isRequired, activeDisplaySets: PropTypes.arrayOf(PropTypes.object).isRequired, getDisplaySetByUID: PropTypes.func.isRequired, - hasDisplaySetsForStudy: PropTypes.func.isRequired, subscribe: PropTypes.func.isRequired, }).isRequired, dataSource: PropTypes.shape({ diff --git a/extensions/default/src/Panels/requestDisplaySetCreationForStudy.js b/extensions/default/src/Panels/requestDisplaySetCreationForStudy.js index 2cf412f3e..a87184a8e 100644 --- a/extensions/default/src/Panels/requestDisplaySetCreationForStudy.js +++ b/extensions/default/src/Panels/requestDisplaySetCreationForStudy.js @@ -4,7 +4,11 @@ function requestDisplaySetCreationForStudy( StudyInstanceUID ) { // TODO: is this already short-circuited by the map of Retrieve promises? - if (DisplaySetService.hasDisplaySetsForStudy(StudyInstanceUID)) { + if ( + DisplaySetService.activeDisplaySets.some( + displaySet => displaySet.StudyInstanceUID === StudyInstanceUID + ) + ) { return; } diff --git a/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.jsx b/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.jsx index 461019042..9acb0dd99 100644 --- a/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.jsx +++ b/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.jsx @@ -227,10 +227,10 @@ function PanelStudyBrowserTracking({ ); const updatedExpandedStudyInstanceUIDs = shouldCollapseStudy ? [ - ...expandedStudyInstanceUIDs.filter( - stdyUid => stdyUid !== StudyInstanceUID - ), - ] + ...expandedStudyInstanceUIDs.filter( + stdyUid => stdyUid !== StudyInstanceUID + ), + ] : [...expandedStudyInstanceUIDs, StudyInstanceUID]; setExpandedStudyInstanceUIDs(updatedExpandedStudyInstanceUIDs); @@ -304,7 +304,7 @@ function PanelStudyBrowserTracking({ SeriesInstanceUID: displaySet.SeriesInstanceUID, }); }} - onClickThumbnail={() => { }} + onClickThumbnail={() => {}} onDoubleClickThumbnail={onDoubleClickThumbnailHandler} activeDisplaySetInstanceUID={activeDisplaySetInstanceUID} /> @@ -320,7 +320,6 @@ PanelStudyBrowserTracking.propTypes = { EVENTS: PropTypes.object.isRequired, activeDisplaySets: PropTypes.arrayOf(PropTypes.object).isRequired, getDisplaySetByUID: PropTypes.func.isRequired, - hasDisplaySetsForStudy: PropTypes.func.isRequired, subscribe: PropTypes.func.isRequired, }).isRequired, dataSource: PropTypes.shape({ @@ -370,11 +369,11 @@ function _mapDisplaySets( const viewportIdentificator = isSingleViewport ? [] : viewports.reduce((acc, viewportData, index) => { - if (viewportData.displaySetInstanceUID === ds.displaySetInstanceUID) { - acc.push(_viewportLabels[index]); - } - return acc; - }, []); + if (viewportData.displaySetInstanceUID === ds.displaySetInstanceUID) { + acc.push(_viewportLabels[index]); + } + return acc; + }, []); const array = componentType === 'thumbnailTracked' diff --git a/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/requestDisplaySetCreationForStudy.js b/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/requestDisplaySetCreationForStudy.js index 2cf412f3e..86e63213d 100644 --- a/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/requestDisplaySetCreationForStudy.js +++ b/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/requestDisplaySetCreationForStudy.js @@ -3,8 +3,11 @@ function requestDisplaySetCreationForStudy( DisplaySetService, StudyInstanceUID ) { - // TODO: is this already short-circuited by the map of Retrieve promises? - if (DisplaySetService.hasDisplaySetsForStudy(StudyInstanceUID)) { + if ( + DisplaySetService.activeDisplaySets.some( + displaySet => displaySet.StudyInstanceUID === StudyInstanceUID + ) + ) { return; } diff --git a/platform/core/src/services/DisplaySetService/DisplaySetService.js b/platform/core/src/services/DisplaySetService/DisplaySetService.js index 6db68a128..1313e09a4 100644 --- a/platform/core/src/services/DisplaySetService/DisplaySetService.js +++ b/platform/core/src/services/DisplaySetService/DisplaySetService.js @@ -125,12 +125,6 @@ export default class DisplaySetService { } }; - hasDisplaySetsForStudy(StudyInstanceUID) { - return displaySetCache.some( - displaySet => displaySet.StudyInstanceUID === StudyInstanceUID - ); - } - makeDisplaySetForInstances(instances) { const instance = instances[0];