fix(typescript): rename services to fix typescript (#3165)

* fix: Rename services to lower camel case, hp, measure

* fix: Rename DisplaySetService instances to displaySetService

* fix: Rename CornerstoneViewportService to lower camel case

* fix: Added lower case segmentationService rename

* rename other services (#3166)

* rename uiDialogService

* rename toolGroupService

* rename uiNotificationService

* rename viewportGridService

* rename syncGroupService

* rename CornerstoneCacheService

* Fix a syntax error in hotkeys

* Fix a couple of rename issues that were missed

---------

Co-authored-by: Alireza <ar.sedghi@gmail.com>

platform/core/package.json

@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@babel/runtime": "7.16.3",
-    "dcmjs": "^0.28.3",
+    "dcmjs": "0.29.4",
     "dicomweb-client": "^0.6.0",
     "isomorphic-base64": "^1.0.2",
     "lodash.merge": "^4.6.1",

platform/core/src/classes/HotkeysManager.ts

@@ -76,8 +76,8 @@ export class HotkeysManager {
       }
       definitions.forEach(definition => this.registerHotkeys(definition));
     } catch (error) {
-      const { UINotificationService } = this._servicesManager.services;
-      UINotificationService.show({
+      const { uiNotificationService, } = this._servicesManager.services;
+      uiNotificationService.show({
         title: 'Hotkeys Manager',
         message: 'Error while setting hotkeys',
         type: 'error',

platform/core/src/extensions/ExtensionManager.ts

@@ -347,11 +347,11 @@ export default class ExtensionManager {
   };
 
   _initHangingProtocolsModule = (extensionModule, extensionId) => {
-    const { HangingProtocolService } = this._servicesManager.services;
+    const { hangingProtocolService } = this._servicesManager.services;
     extensionModule.forEach(({ id, protocol }) => {
       if (protocol) {
         // Only auto-register if protocol specified, otherwise let mode register
-        HangingProtocolService.addProtocol(id, protocol);
+        hangingProtocolService.addProtocol(id, protocol);
       }
     });
   };

platform/core/src/services/HangingProtocolService/HangingProtocolService.test.js

@@ -1,4 +1,4 @@
-import HangingProtocolServiceClass from './HangingProtocolService';
+import HangingProtocolService from './HangingProtocolService';
 
 const testProtocol = {
   id: 'test',
@@ -149,7 +149,10 @@ describe('HangingProtocolService', () => {
       },
     },
   };
-  const hps = new HangingProtocolServiceClass(commandsManager, servicesManager);
+  const hangingProtocolService = new HangingProtocolService(
+    commandsManager,
+    servicesManager
+  );
   let initialScaling;
 
   afterEach(() => {
@@ -158,36 +161,42 @@ describe('HangingProtocolService', () => {
 
   describe('with a static protocol', () => {
     beforeAll(() => {
-      hps.addProtocol(testProtocol.id, testProtocol);
+      hangingProtocolService.addProtocol(testProtocol.id, testProtocol);
     });
 
     it('has one protocol', () => {
-      expect(hps.getProtocols().length).toBe(1);
+      expect(hangingProtocolService.getProtocols().length).toBe(1);
     });
 
     describe('run', () => {
       it('matches best image match', () => {
-        checkHpsBestMatch(hps);
+        checkHpsBestMatch(hangingProtocolService);
       });
     });
   });
 
   describe('with protocol generator', () => {
     beforeAll(() => {
-      hps.addProtocol(testProtocol.id, testProtocolGenerator);
+      hangingProtocolService.addProtocol(
+        testProtocol.id,
+        testProtocolGenerator
+      );
     });
 
     it('has one protocol', () => {
-      expect(hps.getProtocols().length).toBe(1);
+      expect(hangingProtocolService.getProtocols().length).toBe(1);
     });
 
     describe('run', () => {
       it('matches best image match', () => {
-        checkHpsBestMatch(hps);
+        checkHpsBestMatch(hangingProtocolService);
       });
 
       it('uses services manager', () => {
-        hps.run({ studies: [studyMatch], displaySets: studyMatchDisplaySets });
+        hangingProtocolService.run({
+          studies: [studyMatch],
+          displaySets: studyMatchDisplaySets,
+        });
         expect(mockedFunction).toHaveBeenCalledTimes(1);
       });
     });

platform/core/src/services/HangingProtocolService/HangingProtocolService.ts

@@ -866,13 +866,13 @@ class HangingProtocolService {
     protocol: Protocol,
     options: HangingProtocol.SetProtocolOptions
   ) {
-    const { DisplaySetService } = this._servicesManager.services;
+    const { displaySetService } = this._servicesManager.services;
 
     if (options.displaySetInstanceUIDs) {
       this._updateGlobalMatchByOptions(
         options as HangingProtocol.GlobalProtocolOptions,
         protocol,
-        DisplaySetService
+        displaySetService
       );
       return;
     }
@@ -893,7 +893,7 @@ class HangingProtocolService {
     options: HangingProtocol.ViewportSpecificProtocolOptions,
     protocol: HangingProtocol.Protocol
   ) {
-    const { DisplaySetService } = this._servicesManager.services;
+    const { displaySetService } = this._servicesManager.services;
     const { displaySetSelectors = {} } = protocol;
     const protocolViewports = protocol.stages[this.stage].viewports;
 
@@ -914,7 +914,7 @@ class HangingProtocolService {
 
         displaySetAndViewportOptions.displaySetInstanceUIDs.forEach(
           (displaySetInstanceUID, index) => {
-            const displaySet = DisplaySetService.getDisplaySetByUID(
+            const displaySet = displaySetService.getDisplaySetByUID(
               displaySetInstanceUID
             );
 
@@ -968,7 +968,7 @@ class HangingProtocolService {
 
         displaySetAndViewportOptions?.displaySetInstanceUIDs?.forEach(
           (displaySetInstanceUID, index) => {
-            const displaySet = DisplaySetService.getDisplaySetByUID(
+            const displaySet = displaySetService.getDisplaySetByUID(
               displaySetInstanceUID
             );
 
@@ -999,7 +999,7 @@ class HangingProtocolService {
     protocolViewport: HangingProtocol.Viewport,
     displaySetSelectors: Record<string, HangingProtocol.DisplaySetSelector>
   ) {
-    const { DisplaySetService } = this._servicesManager.services;
+    const { displaySetService } = this._servicesManager.services;
     const protocolViewportDisplaySets = protocolViewport.displaySets;
     const numDisplaySetsToSet =
       displaySetAndViewportOptions.displaySetInstanceUIDs.length;
@@ -1015,7 +1015,7 @@ class HangingProtocolService {
 
     displaySetAndViewportOptions.displaySetInstanceUIDs.forEach(
       displaySetInstanceUID => {
-        const displaySet = DisplaySetService.getDisplaySetByUID(
+        const displaySet = displaySetService.getDisplaySetByUID(
           displaySetInstanceUID
         );
 
@@ -1036,7 +1036,7 @@ class HangingProtocolService {
   private _updateGlobalMatchByOptions(
     options: HangingProtocol.GlobalProtocolOptions,
     protocol: Protocol,
-    DisplaySetService: any
+    displaySetService: any
   ) {
     const { displaySetSelectors = {} } = protocol;
     const protocolViewports = protocol.stages[this.stage].viewports;
@@ -1045,7 +1045,7 @@ class HangingProtocolService {
     // we need to check each displaySetInstanceUIDs to see if it satisfies the
     // seriesMatching criteria
     options.displaySetInstanceUIDs.forEach(displaySetInstanceUID => {
-      const displaySet = DisplaySetService.getDisplaySetByUID(
+      const displaySet = displaySetService.getDisplaySetByUID(
         displaySetInstanceUID
       );
 
@@ -1076,7 +1076,7 @@ class HangingProtocolService {
     Array.from(newDisplaySetIds).forEach((displaySetId, index) => {
       const displaySetInstanceUID = options.displaySetInstanceUIDs[index];
 
-      const displaySet = DisplaySetService.getDisplaySetByUID(
+      const displaySet = displaySetService.getDisplaySetByUID(
         displaySetInstanceUID
       );
 
@@ -1115,7 +1115,7 @@ class HangingProtocolService {
         });
 
         remainingDisplaySetMatches.forEach(({ displaySetInstanceUID }) => {
-          const displaySet = DisplaySetService.getDisplaySetByUID(
+          const displaySet = displaySetService.getDisplaySetByUID(
             displaySetInstanceUID
           );
 
@@ -1157,13 +1157,13 @@ class HangingProtocolService {
   }
 
   _validateOptions(options: HangingProtocol.SetProtocolOptions) {
-    const { DisplaySetService } = this._servicesManager.services;
+    const { displaySetService } = this._servicesManager.services;
 
     if (options.displaySetInstanceUIDs) {
       options = options as HangingProtocol.GlobalProtocolOptions;
 
       options.displaySetInstanceUIDs.forEach(displaySetInstanceUID => {
-        const displaySet = DisplaySetService.getDisplaySetByUID(
+        const displaySet = displaySetService.getDisplaySetByUID(
           displaySetInstanceUID
         );