diff --git a/extensions/dicom-html/src/OHIFDicomHtmlSopClassHandler.js b/extensions/dicom-html/src/OHIFDicomHtmlSopClassHandler.js
index c1bc4fc3a6e..94e62d88510 100644
--- a/extensions/dicom-html/src/OHIFDicomHtmlSopClassHandler.js
+++ b/extensions/dicom-html/src/OHIFDicomHtmlSopClassHandler.js
@@ -9,6 +9,7 @@ const SOP_CLASS_UIDS = {
MAMMOGRAPHY_CAD_SR: '1.2.840.10008.5.1.4.1.1.88.50',
CHEST_CAD_SR: '1.2.840.10008.5.1.4.1.1.88.65',
X_RAY_RADIATION_DOSE_SR: '1.2.840.10008.5.1.4.1.1.88.67',
+ ACQUISITION_CONTEXT_SR_STORAGE: '1.2.840.10008.5.1.4.1.1.88.71',
};
const sopClassUIDs = Object.values(SOP_CLASS_UIDS);
diff --git a/platform/core/src/DICOMSR/parseDicomStructuredReport.js b/platform/core/src/DICOMSR/parseDicomStructuredReport.js
index df5770364b9..87e42c6d37b 100644
--- a/platform/core/src/DICOMSR/parseDicomStructuredReport.js
+++ b/platform/core/src/DICOMSR/parseDicomStructuredReport.js
@@ -77,7 +77,6 @@ const parseDicomStructuredReport = (part10SRArrayBuffer, displaySets) => {
/**
* Function to create imagePath with all imageData related
- *
* @param {string} StudyInstanceUID
* @param {string} SeriesInstanceUID
* @param {string} SOPInstanceUID
diff --git a/platform/viewer/src/connectedComponents/ViewerRetrieveStudyData.js b/platform/viewer/src/connectedComponents/ViewerRetrieveStudyData.js
index 7f34b2eb901..0c5ad2248cf 100644
--- a/platform/viewer/src/connectedComponents/ViewerRetrieveStudyData.js
+++ b/platform/viewer/src/connectedComponents/ViewerRetrieveStudyData.js
@@ -259,7 +259,6 @@ function ViewerRetrieveStudyData({
);
setStudies([...studies, study]);
- setIsStudyLoaded(true);
};
/**
@@ -295,6 +294,9 @@ function ViewerRetrieveStudyData({
setError(error);
log.error(error);
}
+ })
+ .finally(() => {
+ setIsStudyLoaded(true);
});
return study;
@@ -323,8 +325,9 @@ function ViewerRetrieveStudyData({
const promises = Array(concurrentRequestsAllowed)
.fill(null)
.map(loadNextSeries);
-
- return await Promise.all(promises);
+ const remainingPromises = await Promise.all(promises);
+ setIsStudyLoaded(true);
+ return remainingPromises;
};
const loadStudies = async () => {