From 1871db4cf61c7c5ec44bfafecebb529df36945d5 Mon Sep 17 00:00:00 2001 From: Ibrahim Date: Sun, 26 Jan 2025 20:34:54 -0500 Subject: [PATCH] remove --- extensions/default/src/DicomWebDataSource/index.ts | 4 ---- .../DicomWebDataSource/utils/StaticWadoClient.ts | 14 +++++--------- .../docs/docs/configuration/configurationFiles.md | 9 --------- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/extensions/default/src/DicomWebDataSource/index.ts b/extensions/default/src/DicomWebDataSource/index.ts index 676b54bbb6..6bf6c4e12d 100644 --- a/extensions/default/src/DicomWebDataSource/index.ts +++ b/extensions/default/src/DicomWebDataSource/index.ts @@ -67,8 +67,6 @@ export type DicomWebConfig = { staticWado?: boolean; /** User authentication service */ userAuthenticationService: Record; - /** Case sensitivity configuration */ - caseSensitive?: Record; }; export type BulkDataURIConfig = { @@ -149,7 +147,6 @@ function createDicomWebApi(dicomWebConfig: DicomWebConfig, servicesManager) { qidoConfig = { url: dicomWebConfig.qidoRoot, - caseSensitive: dicomWebConfig.caseSensitive || {}, staticWado: dicomWebConfig.staticWado, singlepart: dicomWebConfig.singlepart, headers: userAuthenticationService.getAuthorizationHeader(), @@ -158,7 +155,6 @@ function createDicomWebApi(dicomWebConfig: DicomWebConfig, servicesManager) { wadoConfig = { url: dicomWebConfig.wadoRoot, - caseSensitive: dicomWebConfig.caseSensitive || {}, staticWado: dicomWebConfig.staticWado, singlepart: dicomWebConfig.singlepart, headers: userAuthenticationService.getAuthorizationHeader(), diff --git a/extensions/default/src/DicomWebDataSource/utils/StaticWadoClient.ts b/extensions/default/src/DicomWebDataSource/utils/StaticWadoClient.ts index 1c9baf8776..c8a1c834bb 100644 --- a/extensions/default/src/DicomWebDataSource/utils/StaticWadoClient.ts +++ b/extensions/default/src/DicomWebDataSource/utils/StaticWadoClient.ts @@ -156,25 +156,22 @@ export default class StaticWadoClient extends api.DICOMwebClient { * * @param {*} desired * @param {*} actual - * @param {boolean} caseSensitive * @returns true if the values match */ compareValues(desired, actual, caseSensitive = true) { if (Array.isArray(desired)) { - return desired.find(item => this.compareValues(item, actual, caseSensitive)); + return desired.find(item => this.compareValues(item, actual)); } if (Array.isArray(actual)) { - return actual.find(actualItem => this.compareValues(desired, actualItem, caseSensitive)); + return actual.find(actualItem => this.compareValues(desired, actualItem)); } if (actual?.Alphabetic) { actual = actual.Alphabetic; } if (typeof actual == 'string') { - if (!caseSensitive) { - desired = desired.toLowerCase(); - actual = actual.toLowerCase(); - } + desired = desired.toLowerCase(); + actual = actual.toLowerCase(); } if (typeof actual == 'string') { @@ -236,9 +233,8 @@ export default class StaticWadoClient extends api.DICOMwebClient { return this.compareDateRange(testValue, valueElem.Value[0]); } const value = valueElem.Value; - const caseSensitive = this.config.caseSensitive[key]; - return this.compareValues(testValue, value, caseSensitive); + return this.compareValues(testValue, value); } /** Converts the query parameters to lower case query parameters */ diff --git a/platform/docs/docs/configuration/configurationFiles.md b/platform/docs/docs/configuration/configurationFiles.md index f7865332d3..db24e8da95 100644 --- a/platform/docs/docs/configuration/configurationFiles.md +++ b/platform/docs/docs/configuration/configurationFiles.md @@ -193,15 +193,6 @@ if auth headers are used, a preflight request is required. - `activateViewportBeforeInteraction`: (default to true), if set to false, tools can be used directly without the need to click and activate the viewport. - `autoPlayCine`: (default to false), if set to true, data sets with the DICOM frame time tag (i.e. (0018,1063)) will auto play when displayed - `addWindowLevelActionMenu`: (default to true), if set to false, the window level action menu item is NOT added to the viewport action corners -- `caseSensitive`: an object with filter keys that should be case sensitive, only works on STATIC-WADO backends. By default, all filters are case sensitive. If you want to set a filter to be case insensitive, you can set it to false. Example: - ```js - caseSensitive: { - patientname: false, - studydescription: false, - accessionnumber: false, - '00100020': false, - } - ``` - `dangerouslyUseDynamicConfig`: Dynamic config allows user to pass `configUrl` query string. This allows to load config without recompiling application. If the `configUrl` query string is passed, the worklist and modes will load from the referenced json rather than the default .env config. If there is no `configUrl` path provided, the default behaviour is used and there should not be any deviation from current user experience.
Points to consider while using `dangerouslyUseDynamicConfig`:
- User have to enable this feature by setting `dangerouslyUseDynamicConfig.enabled:true`. By default it is `false`.