From 8c32023694f802c2fd4497a75cf2aa81a2ef7325 Mon Sep 17 00:00:00 2001 From: Alireza Date: Mon, 29 May 2023 10:38:19 -0400 Subject: [PATCH] chore(demo): update demo data (#3425) * chore(demo): update demo data * fix sm * fix netlify --- .../src/utils/cleanDenaturalizedDataset.ts | 4 +++- platform/viewer/public/config/demo.js | 6 +++--- platform/viewer/public/config/e2e.js | 6 +++--- platform/viewer/public/config/multiple.js | 6 +++--- platform/viewer/public/config/netlify.js | 16 ++++++++++++---- platform/viewer/public/config/public_dicomweb.js | 6 +++--- 6 files changed, 27 insertions(+), 17 deletions(-) diff --git a/extensions/dicom-microscopy/src/utils/cleanDenaturalizedDataset.ts b/extensions/dicom-microscopy/src/utils/cleanDenaturalizedDataset.ts index 49d1355587d..43abcaf2258 100644 --- a/extensions/dicom-microscopy/src/utils/cleanDenaturalizedDataset.ts +++ b/extensions/dicom-microscopy/src/utils/cleanDenaturalizedDataset.ts @@ -47,12 +47,14 @@ export default function cleanDenaturalizedDataset( delete obj[key].Value; } else if (Array.isArray(obj[key].Value) && obj[key].vr) { if (obj[key].Value.length === 1 && obj[key].Value[0].BulkDataURI) { - obj[key].Value[0] = dicomWebUtils.fixBulkDataURI( + dicomWebUtils.fixBulkDataURI( obj[key].Value[0], options, options.dataSourceConfig ); + obj[key].BulkDataURI = obj[key].Value[0].BulkDataURI; + // prevent mixed-content blockage if ( window.location.protocol === 'https:' && diff --git a/platform/viewer/public/config/demo.js b/platform/viewer/public/config/demo.js index 27f7bc53fd0..b4d43b86195 100644 --- a/platform/viewer/public/config/demo.js +++ b/platform/viewer/public/config/demo.js @@ -16,9 +16,9 @@ window.config = { sourceName: 'dicomweb', configuration: { name: 'DCM4CHEE', - wadoUriRoot: 'https://domvja9iplmyu.cloudfront.net/dicomweb', - qidoRoot: 'https://domvja9iplmyu.cloudfront.net/dicomweb', - wadoRoot: 'https://domvja9iplmyu.cloudfront.net/dicomweb', + wadoUriRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', + qidoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', + wadoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', qidoSupportsIncludeField: true, imageRendering: 'wadors', enableStudyLazyLoad: true, diff --git a/platform/viewer/public/config/e2e.js b/platform/viewer/public/config/e2e.js index a2b9ff8b51c..47903374cb2 100644 --- a/platform/viewer/public/config/e2e.js +++ b/platform/viewer/public/config/e2e.js @@ -64,9 +64,9 @@ window.config = { // qidoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs', // wadoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs', // new server - wadoUriRoot: 'https://domvja9iplmyu.cloudfront.net/dicomweb', - qidoRoot: 'https://domvja9iplmyu.cloudfront.net/dicomweb', - wadoRoot: 'https://domvja9iplmyu.cloudfront.net/dicomweb', + wadoUriRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', + qidoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', + wadoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', qidoSupportsIncludeField: false, supportsReject: false, imageRendering: 'wadors', diff --git a/platform/viewer/public/config/multiple.js b/platform/viewer/public/config/multiple.js index d0e726caf3b..07a28426444 100644 --- a/platform/viewer/public/config/multiple.js +++ b/platform/viewer/public/config/multiple.js @@ -55,9 +55,9 @@ window.config = { // qidoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs', // wadoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs', // new server - wadoUriRoot: 'https://domvja9iplmyu.cloudfront.net/dicomweb', - qidoRoot: 'https://domvja9iplmyu.cloudfront.net/dicomweb', - wadoRoot: 'https://domvja9iplmyu.cloudfront.net/dicomweb', + wadoUriRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', + qidoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', + wadoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', qidoSupportsIncludeField: false, supportsReject: false, imageRendering: 'wadors', diff --git a/platform/viewer/public/config/netlify.js b/platform/viewer/public/config/netlify.js index c2187aca6ac..1bc23c049d9 100644 --- a/platform/viewer/public/config/netlify.js +++ b/platform/viewer/public/config/netlify.js @@ -18,9 +18,10 @@ window.config = { sourceName: 'dicomweb', configuration: { name: 'aws', - wadoUriRoot: 'https://domvja9iplmyu.cloudfront.net/dicomweb', - qidoRoot: 'https://domvja9iplmyu.cloudfront.net/dicomweb', - wadoRoot: 'https://domvja9iplmyu.cloudfront.net/dicomweb', + wadoUriRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', + qidoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', + wadoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', + qidoSupportsIncludeField: false, supportsReject: false, imageRendering: 'wadors', @@ -29,7 +30,14 @@ window.config = { supportsFuzzyMatching: false, supportsWildcard: true, staticWado: true, - singlepart: 'bulkdata,video,pdf', + singlepart: 'bulkdata,video', + // whether the data source should use retrieveBulkData to grab metadata, + // and in case of relative path, what would it be relative to, options + // are in the series level or study level (some servers like series some study) + bulkDataURI: { + enabled: true, + relativeResolution: 'studies', + }, }, }, { diff --git a/platform/viewer/public/config/public_dicomweb.js b/platform/viewer/public/config/public_dicomweb.js index 7d310a330f6..322d8968465 100644 --- a/platform/viewer/public/config/public_dicomweb.js +++ b/platform/viewer/public/config/public_dicomweb.js @@ -11,9 +11,9 @@ window.config = { dicomWeb: [ { name: 'aws', - wadoUriRoot: 'https://domvja9iplmyu.cloudfront.net/dicomweb', - qidoRoot: 'https://domvja9iplmyu.cloudfront.net/dicomweb', - wadoRoot: 'https://domvja9iplmyu.cloudfront.net/dicomweb', + wadoUriRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', + qidoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', + wadoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', qidoSupportsIncludeField: true, imageRendering: 'wadors', thumbnailRendering: 'wadors',