Update to use beta 5.0 of CS3D (#5904)

* Update to use beta 5.0

* fix: unit tests

* fix: Allow slow server/test rendering to still work

* Update tests to use viewport grid compare

* Fix storage of stale retries actual/diff files

* cs3d linking fixees

* Linking for cs3d metadata

* Use metadata import for suv scaling

* Fix suv import

* Use type for import

* fix: Metadata registration ordering

* Use beta for upstream

* Merge from origin/master

* Revert tests to master

* Undo beta version changes

* Revert bun.lock file to that of master.

* Reduce test failure retries to one per test. Cap the number of failed total tests to 10. Replace the JSON reporter with the HTML reporter.

* Add generic provider back in

* Deprecate OHIF versions of cs3d utils

* fix

* Undo some cs3d beta dependencies so this PR could be merged

* Build fix

* Fixing build issues

* build issue

* bun lock

* Temporary cache clear to resolve build issue

* Cache bust

* Remove the babel hoist fix attempt

* Cache netlify toml issue

* Fix netlify cache issue

* Try to fix cache dependency issue

* Try update resolutions

* babel hoist fix

* fix: Remove netlify cache bust

* Revert pinned versions

* PR comments on duplicated suv-factors

* Undo lock changes and isEqual add

---------

Co-authored-by: Joe Boccanfuso <joe.boccanfuso@radicalimaging.com>
Co-authored-by: Alireza <ar.sedghi@gmail.com>

extensions/cornerstone/jest.config.js

@@ -5,8 +5,6 @@ module.exports = {
   moduleNameMapper: {
     ...base.moduleNameMapper,
     '@ohif/(.*)': '<rootDir>/../../platform/$1/src',
-    '^@cornerstonejs/([^/]+)/(.*)$': '<rootDir>/../../node_modules/@cornerstonejs/$1/dist/esm/$2',
-    '^@cornerstonejs/([^/]+)$': '<rootDir>/../../node_modules/@cornerstonejs/$1/dist/esm',
   },
   // rootDir: "../.."
   // testMatch: [

extensions/cornerstone/src/init.tsx

@@ -178,14 +178,6 @@ export default async function init({
     );
   });
 
-  // add metadata providers
-  metaData.addProvider(
-    csUtilities.calibratedPixelSpacingMetadataProvider.get.bind(
-      csUtilities.calibratedPixelSpacingMetadataProvider
-    )
-  ); // this provider is required for Calibration tool
-  metaData.addProvider(metadataProvider.get.bind(metadataProvider), 9999);
-
   // These are set reasonably low to allow for interleaved retrieves and slower
   // connections.
   imageLoadPoolManager.maxNumRequests = {
@@ -197,6 +189,16 @@ export default async function init({
 
   initWADOImageLoader(userAuthenticationService, appConfig, extensionManager);
 
+  // Add OHIF metadata providers after dicomImageLoader.init().
+  // The linked metadata branch clears providers during loader init.
+  metaData.addProvider(csUtilities.genericMetadataProvider.get, 9998);
+  metaData.addProvider(
+    csUtilities.calibratedPixelSpacingMetadataProvider.get.bind(
+      csUtilities.calibratedPixelSpacingMetadataProvider
+    )
+  ); // this provider is required for Calibration tool
+  metaData.addProvider(metadataProvider.get.bind(metadataProvider), 9999);
+
   /* Measurement Service */
   this.measurementServiceSource = connectToolsToMeasurementService({
     servicesManager,

extensions/default/jest.config.js

@@ -5,7 +5,6 @@ module.exports = {
   moduleNameMapper: {
     ...base.moduleNameMapper,
     '@ohif/(.*)': '<rootDir>/../../platform/$1/src',
-    '^@cornerstonejs/(.*)$': '<rootDir>/../../node_modules/@cornerstonejs/$1/dist/esm',
   },
   // rootDir: "../.."
   // testMatch: [

extensions/default/src/getPTImageIdInstanceMetadata.ts

@@ -1,6 +1,6 @@
 import OHIF from '@ohif/core';
 
-import { InstanceMetadata, PhilipsPETPrivateGroup } from '@cornerstonejs/calculate-suv/src/types';
+import type { InstanceMetadata, PhilipsPETPrivateGroup } from '@cornerstonejs/calculate-suv/src/types';
 
 const metadataProvider = OHIF.classes.MetadataProvider;