From d609ae1edb7830cf18cedd05c375e8ac43088fc5 Mon Sep 17 00:00:00 2001 From: Alireza Date: Thu, 21 Sep 2023 07:30:01 -0400 Subject: [PATCH] docs(url): fix incorrect url param in the doc (#3667) --- platform/app/public/config/default.js | 36 +++++++++++++++++---- platform/app/public/config/e2e.js | 7 +--- platform/app/public/config/local_orthanc.js | 2 +- platform/app/public/config/netlify.js | 30 ++++++++++++++++- platform/docs/docs/configuration/url.md | 4 ++- 5 files changed, 63 insertions(+), 16 deletions(-) diff --git a/platform/app/public/config/default.js b/platform/app/public/config/default.js index 97f506e70..09c0a233f 100644 --- a/platform/app/public/config/default.js +++ b/platform/app/public/config/default.js @@ -39,14 +39,8 @@ window.config = { namespace: '@ohif/extension-default.dataSourcesModule.dicomweb', sourceName: 'dicomweb', configuration: { - friendlyName: 'dcmjs DICOMWeb Server', + friendlyName: 'AWS S3 Static wado server', name: 'aws', - // old server - // wadoUriRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/wado', - // qidoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs', - // wadoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs', - - // new server wadoUriRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', qidoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', wadoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', @@ -69,6 +63,34 @@ window.config = { omitQuotationForMultipartRequest: true, }, }, + { + namespace: '@ohif/extension-default.dataSourcesModule.dicomweb', + sourceName: 'dicomweb2', + configuration: { + friendlyName: 'AWS S3 Static wado secondary server', + name: 'aws', + wadoUriRoot: 'https://d28o5kq0jsoob5.cloudfront.net/dicomweb', + qidoRoot: 'https://d28o5kq0jsoob5.cloudfront.net/dicomweb', + wadoRoot: 'https://d28o5kq0jsoob5.cloudfront.net/dicomweb', + qidoSupportsIncludeField: false, + supportsReject: false, + imageRendering: 'wadors', + thumbnailRendering: 'wadors', + enableStudyLazyLoad: true, + supportsFuzzyMatching: false, + supportsWildcard: true, + staticWado: true, + 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', + }, + omitQuotationForMultipartRequest: true, + }, + }, { namespace: '@ohif/extension-default.dataSourcesModule.dicomwebproxy', sourceName: 'dicomwebproxy', diff --git a/platform/app/public/config/e2e.js b/platform/app/public/config/e2e.js index 86ab4a5db..af48a84cb 100644 --- a/platform/app/public/config/e2e.js +++ b/platform/app/public/config/e2e.js @@ -57,13 +57,8 @@ window.config = { namespace: '@ohif/extension-default.dataSourcesModule.dicomweb', sourceName: 'ohif', configuration: { - friendlyName: 'dcmjs DICOMWeb Server', + friendlyName: 'AWS S3 Static wado server', name: 'aws', - // old server - // wadoUriRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/wado', - // qidoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs', - // wadoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs', - // new server wadoUriRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', qidoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', wadoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', diff --git a/platform/app/public/config/local_orthanc.js b/platform/app/public/config/local_orthanc.js index 6bf1bb5be..eabb22f21 100644 --- a/platform/app/public/config/local_orthanc.js +++ b/platform/app/public/config/local_orthanc.js @@ -19,7 +19,7 @@ window.config = { namespace: '@ohif/extension-default.dataSourcesModule.dicomweb', sourceName: 'dicomweb', configuration: { - friendlyName: 'dcmjs DICOMWeb Server', + friendlyName: 'local Orthanc DICOMWeb Server', name: 'DCM4CHEE', wadoUriRoot: 'http://localhost/dicom-web', qidoRoot: 'http://localhost/dicom-web', diff --git a/platform/app/public/config/netlify.js b/platform/app/public/config/netlify.js index ac8f7be1a..bbb24da90 100644 --- a/platform/app/public/config/netlify.js +++ b/platform/app/public/config/netlify.js @@ -15,7 +15,7 @@ window.config = { namespace: '@ohif/extension-default.dataSourcesModule.dicomweb', sourceName: 'dicomweb', configuration: { - friendlyName: 'dcmjs DICOMWeb Server', + friendlyName: 'AWS S3 Static wado server', name: 'aws', wadoUriRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', qidoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb', @@ -40,6 +40,34 @@ window.config = { omitQuotationForMultipartRequest: true, }, }, + { + namespace: '@ohif/extension-default.dataSourcesModule.dicomweb', + sourceName: 'dicomweb2', + configuration: { + friendlyName: 'AWS S3 Static wado secondary server', + name: 'aws', + wadoUriRoot: 'https://d28o5kq0jsoob5.cloudfront.net/dicomweb', + qidoRoot: 'https://d28o5kq0jsoob5.cloudfront.net/dicomweb', + wadoRoot: 'https://d28o5kq0jsoob5.cloudfront.net/dicomweb', + qidoSupportsIncludeField: false, + supportsReject: false, + imageRendering: 'wadors', + thumbnailRendering: 'wadors', + enableStudyLazyLoad: true, + supportsFuzzyMatching: false, + supportsWildcard: true, + staticWado: true, + 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', + }, + omitQuotationForMultipartRequest: true, + }, + }, { namespace: '@ohif/extension-default.dataSourcesModule.dicomjson', sourceName: 'dicomjson', diff --git a/platform/docs/docs/configuration/url.md b/platform/docs/docs/configuration/url.md index 4382bd04a..fc8eaa2e9 100644 --- a/platform/docs/docs/configuration/url.md +++ b/platform/docs/docs/configuration/url.md @@ -59,9 +59,11 @@ If you happen to have multiple data sources configured, you can filter the WorkList by adding the `dataSources` query parameter. ```js -/?dataSourcename=orthanc +/?dataSources=orthanc ``` +Note: you should pass the `sourceName` of the data source in the configuration file (not the friendly name nor the name) + :::tip You can add `sortBy` and `sortDirection` query parameters to sort the WorkList