From ecfdc9a6877a9c5dbd44740d809b7a6f695b7d16 Mon Sep 17 00:00:00 2001 From: Bill Wallace Date: Mon, 13 Feb 2023 08:55:55 -0500 Subject: [PATCH] fix(typescript): Missed renames UIModalService and UserAuthenticationService (#3171) --- extensions/cornerstone/src/commandsModule.ts | 8 ++++---- extensions/cornerstone/src/init.tsx | 12 ++++++------ .../cornerstone/src/initWADOImageLoader.js | 4 ++-- .../CornerstoneCacheService.ts | 4 ++-- .../default/src/DicomWebDataSource/index.js | 16 ++++++++-------- extensions/default/src/commandsModule.js | 6 +++--- platform/core/src/extensions/ExtensionManager.ts | 4 ++-- platform/core/src/types/Services.ts | 2 ++ platform/viewer/src/App.tsx | 10 +++++----- platform/viewer/src/routes/index.tsx | 4 ++-- .../viewer/src/utils/OpenIdConnectRoutes.tsx | 10 +++++----- 11 files changed, 41 insertions(+), 39 deletions(-) diff --git a/extensions/cornerstone/src/commandsModule.ts b/extensions/cornerstone/src/commandsModule.ts index c0462af51..b57e07d77 100644 --- a/extensions/cornerstone/src/commandsModule.ts +++ b/extensions/cornerstone/src/commandsModule.ts @@ -196,15 +196,15 @@ const commandsModule = ({ servicesManager }) => { }, showDownloadViewportModal: () => { const { activeViewportIndex } = viewportGridService.getState(); - const { UIModalService } = servicesManager.services; + const { uiModalService } = servicesManager.services; - if (UIModalService) { - UIModalService.show({ + if (uiModalService) { + uiModalService.show({ content: CornerstoneViewportDownloadForm, title: 'Download High Quality Image', contentProps: { activeViewportIndex, - onClose: UIModalService.hide, + onClose: uiModalService.hide, cornerstoneViewportService, }, }); diff --git a/extensions/cornerstone/src/init.tsx b/extensions/cornerstone/src/init.tsx index a374935ef..a44bee43a 100644 --- a/extensions/cornerstone/src/init.tsx +++ b/extensions/cornerstone/src/init.tsx @@ -62,11 +62,11 @@ export default async function init({ ); const { - UserAuthenticationService, + userAuthenticationService, measurementService, displaySetService, uiDialogService, - UIModalService, + uiModalService, uiNotificationService, cineService, cornerstoneViewportService, @@ -87,7 +87,7 @@ export default async function init({ } if (cornerstone.getShouldUseCPURendering()) { - _showCPURenderingModal(UIModalService, hangingProtocolService); + _showCPURenderingModal(uiModalService, hangingProtocolService); } const labelmapRepresentation = @@ -128,7 +128,7 @@ export default async function init({ prefetch: appConfig?.maxNumRequests?.prefetch || 10, }; - initWADOImageLoader(UserAuthenticationService, appConfig); + initWADOImageLoader(userAuthenticationService, appConfig); /* Measurement Service */ const measurementServiceSource = connectToolsToMeasurementService( @@ -403,10 +403,10 @@ function CPUModal() { ); } -function _showCPURenderingModal(UIModalService, hangingProtocolService) { +function _showCPURenderingModal(uiModalService, hangingProtocolService) { const callback = progress => { if (progress === 100) { - UIModalService.show({ + uiModalService.show({ content: CPUModal, title: 'OHIF Fell Back to CPU Rendering', }); diff --git a/extensions/cornerstone/src/initWADOImageLoader.js b/extensions/cornerstone/src/initWADOImageLoader.js index a7a8ec0f8..c072184ee 100644 --- a/extensions/cornerstone/src/initWADOImageLoader.js +++ b/extensions/cornerstone/src/initWADOImageLoader.js @@ -34,7 +34,7 @@ function initWebWorkers(appConfig) { } export default function initWADOImageLoader( - UserAuthenticationService, + userAuthenticationService, appConfig ) { cornerstoneWADOImageLoader.external.cornerstone = cornerstone; @@ -55,7 +55,7 @@ export default function initWADOImageLoader( convertFloatPixelDataToInt: false, }, beforeSend: function(xhr) { - const headers = UserAuthenticationService.getAuthorizationHeader(); + const headers = userAuthenticationService.getAuthorizationHeader(); // Request: // JPEG-LS Lossless (1.2.840.10008.1.2.4.80) if available, otherwise accept diff --git a/extensions/cornerstone/src/services/CornerstoneCacheService/CornerstoneCacheService.ts b/extensions/cornerstone/src/services/CornerstoneCacheService/CornerstoneCacheService.ts index c3475491d..01a359368 100644 --- a/extensions/cornerstone/src/services/CornerstoneCacheService/CornerstoneCacheService.ts +++ b/extensions/cornerstone/src/services/CornerstoneCacheService/CornerstoneCacheService.ts @@ -157,8 +157,8 @@ class CornerstoneCacheService { // getSOPClassHandler method if (displaySet.load && displaySet.load instanceof Function) { - const { UserAuthenticationService } = this.servicesManager.services; - const headers = UserAuthenticationService.getAuthorizationHeader(); + const { userAuthenticationService } = this.servicesManager.services; + const headers = userAuthenticationService.getAuthorizationHeader(); await displaySet.load({ headers }); volumeData.push({ diff --git a/extensions/default/src/DicomWebDataSource/index.js b/extensions/default/src/DicomWebDataSource/index.js index e51c7fd01..ccb61f620 100644 --- a/extensions/default/src/DicomWebDataSource/index.js +++ b/extensions/default/src/DicomWebDataSource/index.js @@ -49,7 +49,7 @@ const metadataProvider = classes.MetadataProvider; * @param {bool} lazyLoadStudy - "enableStudyLazyLoad"; Request series meta async instead of blocking * @param {string|bool} singlepart - indicates of the retrieves can fetch singlepart. Options are bulkdata, video, image or boolean true */ -function createDicomWebApi(dicomWebConfig, UserAuthenticationService) { +function createDicomWebApi(dicomWebConfig, userAuthenticationService) { const { qidoRoot, wadoRoot, @@ -65,7 +65,7 @@ function createDicomWebApi(dicomWebConfig, UserAuthenticationService) { url: qidoRoot, staticWado, singlepart, - headers: UserAuthenticationService.getAuthorizationHeader(), + headers: userAuthenticationService.getAuthorizationHeader(), errorInterceptor: errorHandler.getHTTPErrorHandler(), }; @@ -73,7 +73,7 @@ function createDicomWebApi(dicomWebConfig, UserAuthenticationService) { url: wadoRoot, staticWado, singlepart, - headers: UserAuthenticationService.getAuthorizationHeader(), + headers: userAuthenticationService.getAuthorizationHeader(), errorInterceptor: errorHandler.getHTTPErrorHandler(), }; @@ -105,7 +105,7 @@ function createDicomWebApi(dicomWebConfig, UserAuthenticationService) { studies: { mapParams: mapParams.bind(), search: async function (origParams) { - const headers = UserAuthenticationService.getAuthorizationHeader(); + const headers = userAuthenticationService.getAuthorizationHeader(); if (headers) { qidoDicomWebClient.headers = headers; } @@ -130,7 +130,7 @@ function createDicomWebApi(dicomWebConfig, UserAuthenticationService) { series: { // mapParams: mapParams.bind(), search: async function (studyInstanceUid) { - const headers = UserAuthenticationService.getAuthorizationHeader(); + const headers = userAuthenticationService.getAuthorizationHeader(); if (headers) { qidoDicomWebClient.headers = headers; } @@ -146,7 +146,7 @@ function createDicomWebApi(dicomWebConfig, UserAuthenticationService) { }, instances: { search: (studyInstanceUid, queryParameters) => { - const headers = UserAuthenticationService.getAuthorizationHeader(); + const headers = userAuthenticationService.getAuthorizationHeader(); if (headers) { qidoDicomWebClient.headers = headers; } @@ -184,7 +184,7 @@ function createDicomWebApi(dicomWebConfig, UserAuthenticationService) { sortFunction, madeInClient = false, } = {}) => { - const headers = UserAuthenticationService.getAuthorizationHeader(); + const headers = userAuthenticationService.getAuthorizationHeader(); if (headers) { wadoDicomWebClient.headers = headers; } @@ -218,7 +218,7 @@ function createDicomWebApi(dicomWebConfig, UserAuthenticationService) { store: { dicom: async dataset => { - const headers = UserAuthenticationService.getAuthorizationHeader(); + const headers = userAuthenticationService.getAuthorizationHeader(); if (headers) { wadoDicomWebClient.headers = headers; } diff --git a/extensions/default/src/commandsModule.js b/extensions/default/src/commandsModule.js index deb413f98..ba4e89de9 100644 --- a/extensions/default/src/commandsModule.js +++ b/extensions/default/src/commandsModule.js @@ -34,15 +34,15 @@ const commandsModule = ({ servicesManager, commandsManager }) => { const { displaySetInstanceUIDs } = activeViewportSpecificData; const displaySets = displaySetService.activeDisplaySets; - const { UIModalService } = servicesManager.services; + const { uiModalService } = servicesManager.services; const displaySetInstanceUID = displaySetInstanceUIDs[0]; - UIModalService.show({ + uiModalService.show({ content: DicomTagBrowser, contentProps: { displaySets, displaySetInstanceUID, - onClose: UIModalService.hide, + onClose: uiModalService.hide, }, title: 'DICOM Tag Browser', }); diff --git a/platform/core/src/extensions/ExtensionManager.ts b/platform/core/src/extensions/ExtensionManager.ts index 8a3f1ebdf..9906a3e87 100644 --- a/platform/core/src/extensions/ExtensionManager.ts +++ b/platform/core/src/extensions/ExtensionManager.ts @@ -357,7 +357,7 @@ export default class ExtensionManager { }; _initDataSourcesModule(extensionModule, extensionId, dataSources = []) { - const { UserAuthenticationService } = this._servicesManager.services; + const { userAuthenticationService } = this._servicesManager.services; dataSources.forEach(dataSource => { this.dataSourceDefs[dataSource.sourceName] = dataSource; }); @@ -369,7 +369,7 @@ export default class ExtensionManager { if (dataSource.namespace === namespace) { const dataSourceInstance = element.createDataSource( dataSource.configuration, - UserAuthenticationService + userAuthenticationService ); if (this.dataSourceMap[dataSource.sourceName]) { diff --git a/platform/core/src/types/Services.ts b/platform/core/src/types/Services.ts index d906d17b5..aed77fbff 100644 --- a/platform/core/src/types/Services.ts +++ b/platform/core/src/types/Services.ts @@ -11,6 +11,7 @@ import { * The interface for the services object */ export default interface Services { + userAuthenticationService?: Record; hangingProtocolService?: HangingProtocolService; customizationService?: CustomizationService; measurementService?: MeasurementService; @@ -21,6 +22,7 @@ export default interface Services { uiDialogService?: Record; toolGroupService?: Record; uiNotificationService?: Record; + uiModalService?: Record; viewportGridService?: ViewportGridService; syncGroupService?: Record; cornerstoneCacheService?: Record; diff --git a/platform/viewer/src/App.tsx b/platform/viewer/src/App.tsx index 4da997d39..f0f6d669d 100644 --- a/platform/viewer/src/App.tsx +++ b/platform/viewer/src/App.tsx @@ -60,18 +60,18 @@ function App({ config, defaultExtensions, defaultModes }) { const { UIDialogService, - UIModalService, + uiModalService, UINotificationService, UIViewportDialogService, ViewportGridService, CineService, - UserAuthenticationService, + userAuthenticationService, customizationService, } = servicesManager.services; const providers = [ [AppConfigProvider, { value: appConfigState }], - [UserAuthenticationProvider, { service: UserAuthenticationService }], + [UserAuthenticationProvider, { service: userAuthenticationService }], [I18nextProvider, { i18n }], [ThemeWrapper], [ViewportGridProvider, { service: ViewportGridService }], @@ -79,7 +79,7 @@ function App({ config, defaultExtensions, defaultModes }) { [CineProvider, { service: CineService }], [SnackbarProvider, { service: UINotificationService }], [DialogProvider, { service: UIDialogService }], - [ModalProvider, { service: UIModalService, modal: Modal }], + [ModalProvider, { service: uiModalService, modal: Modal }], ]; const CombinedProviders = ({ children }) => Compose({ components: providers, children }); @@ -106,7 +106,7 @@ function App({ config, defaultExtensions, defaultModes }) { ); } diff --git a/platform/viewer/src/routes/index.tsx b/platform/viewer/src/routes/index.tsx index aee16bd2a..ab5a605a5 100644 --- a/platform/viewer/src/routes/index.tsx +++ b/platform/viewer/src/routes/index.tsx @@ -81,7 +81,7 @@ const createRoutes = ({ ); } - const { UserAuthenticationService } = servicesManager.services; + const { userAuthenticationService } = servicesManager.services; // Note: PrivateRoutes in react-router-dom 6.x should be defined within // a Route element @@ -96,7 +96,7 @@ const createRoutes = ({ element={ diff --git a/platform/viewer/src/utils/OpenIdConnectRoutes.tsx b/platform/viewer/src/utils/OpenIdConnectRoutes.tsx index bab8c4b2b..861bd770b 100644 --- a/platform/viewer/src/utils/OpenIdConnectRoutes.tsx +++ b/platform/viewer/src/utils/OpenIdConnectRoutes.tsx @@ -104,12 +104,12 @@ function LoginComponent(userManager) { function OpenIdConnectRoutes({ oidc, routerBasename, - UserAuthenticationService, + userAuthenticationService, }) { const userManager = initUserManager(oidc, routerBasename); const getAuthorizationHeader = () => { - const user = UserAuthenticationService.getUser(); + const user = userAuthenticationService.getUser(); return { Authorization: `Bearer ${user.access_token}`, @@ -145,9 +145,9 @@ function OpenIdConnectRoutes({ }, []); useEffect(() => { - UserAuthenticationService.set({ enabled: true }); + userAuthenticationService.set({ enabled: true }); - UserAuthenticationService.setServiceImplementation({ + userAuthenticationService.setServiceImplementation({ getAuthorizationHeader, handleUnauthenticated, }); @@ -200,7 +200,7 @@ function OpenIdConnectRoutes({ sessionStorage.getItem('ohif-redirect-to') ); - UserAuthenticationService.setUser(user); + userAuthenticationService.setUser(user); navigate({ pathname,