fix(multiframe): metadata handling of NM studies and loading order (#4554)

platform/app/.recipes/Nginx-Dcm4chee-Keycloak/config/nginx.conf

@@ -221,8 +221,6 @@ http {
 
         location / {
             add_header Cache-Control "no-store, no-cache, must-revalidate";
-            add_header 'Cross-Origin-Opener-Policy' 'same-origin' always;
-            add_header 'Cross-Origin-Embedder-Policy' 'require-corp' always;
         }
 
         location /keycloak/ {

platform/app/.recipes/Nginx-Dcm4chee/config/nginx.conf

@@ -79,8 +79,6 @@ http {
       index index.html;
       try_files $uri $uri/ /index.html;
       add_header Cache-Control "no-store, no-cache, must-revalidate";
-      add_header Cross-Origin-Opener-Policy 'same-origin' always;
-      add_header Cross-Origin-Embedder-Policy 'require-corp' always;
     }
   }
 }

platform/app/.recipes/Nginx-Orthanc-Keycloak/config/nginx.conf

@@ -191,8 +191,6 @@ http {
 
         location / {
             add_header Cache-Control "no-store, no-cache, must-revalidate";
-            add_header 'Cross-Origin-Opener-Policy' 'same-origin' always;
-            add_header 'Cross-Origin-Embedder-Policy' 'require-corp' always;
         }
 
         location /keycloak/ {

platform/app/.recipes/Nginx-Orthanc/config/nginx.conf

@@ -78,8 +78,6 @@ http {
       index index.html;
       try_files $uri $uri/ /index.html;
       add_header Cache-Control "no-store, no-cache, must-revalidate";
-      add_header 'Cross-Origin-Opener-Policy' 'same-origin' always;
-      add_header 'Cross-Origin-Embedder-Policy' 'require-corp' always;
     }
 
   }

platform/app/.webpack/webpack.pwa.js

@@ -133,8 +133,6 @@ module.exports = (env, argv) => {
       new InjectManifest({
         swDest: 'sw.js',
         swSrc: path.join(SRC_DIR, 'service-worker.js'),
-        // Increase the limit to 4mb:
-        maximumFileSizeToCacheInBytes: 5 * 1024 * 1024,
         // Need to exclude the theme as it is updated independently
         exclude: [/theme/],
         // Cache large files for the manifests to avoid warning messages
@@ -174,10 +172,6 @@ module.exports = (env, argv) => {
         disableDotRule: true,
         index: PUBLIC_URL + 'index.html',
       },
-      headers: {
-        'Cross-Origin-Embedder-Policy': 'require-corp',
-        'Cross-Origin-Opener-Policy': 'same-origin',
-      },
       devMiddleware: {
         writeToDisk: true,
       },
@@ -206,5 +200,9 @@ module.exports = (env, argv) => {
     );
   }
 
+  mergedConfig.watchOptions = {
+    ignored: /node_modules\/@cornerstonejs/,
+  };
+
   return mergedConfig;
 };

platform/app/.webpack/writePluginImportsFile.js

@@ -73,7 +73,10 @@ function getRuntimeLoadModesExtensions(modules) {
       dynamicLoad.push(
         `  if( module==="${packageName}") {`,
         `    const imported = await window.browserImportFunction('${module.importPath}');`,
-        '    return ' + (module.globalName ? `window["${module.globalName}"];` : `imported["${module.importName || 'default'}"];`),
+        '    return ' +
+          (module.globalName
+            ? `window["${module.globalName}"];`
+            : `imported["${module.importName || 'default'}"];`),
         '  }'
       );
       return;
@@ -201,12 +204,6 @@ function writePluginImportsFile(SRC_DIR, DIST_DIR) {
     'dist'
   );
 
-  console.warn('copy plugins', [
-    ...copyPluginPublicToDistBuild,
-    ...copyPluginPublicToDistLink,
-    ...copyPluginDistToDistBuild,
-    ...copyPluginDistToDistLink,
-  ]);
   return [
     ...copyPluginPublicToDistBuild,
     ...copyPluginPublicToDistLink,

platform/app/package.json

@@ -53,7 +53,7 @@
     "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
     "@cornerstonejs/codec-openjpeg": "^1.2.4",
     "@cornerstonejs/codec-openjph": "^2.4.5",
-    "@cornerstonejs/dicom-image-loader": "^2.2.13",
+    "@cornerstonejs/dicom-image-loader": "^2.2.20",
     "@emotion/serialize": "^1.1.3",
     "@ohif/core": "3.10.0-beta.10",
     "@ohif/extension-cornerstone": "3.10.0-beta.10",

platform/app/public/serve.json

@@ -1,12 +1,3 @@
 {
-  "rewrites": [{ "source": "*", "destination": "index.html" }],
-  "headers": [
-    {
-      "source": "**/*",
-      "headers": [
-        { "key": "Cross-Origin-Embedder-Policy", "value": "require-corp" },
-        { "key": "Cross-Origin-Opener-Policy", "value": "same-origin" }
-      ]
-    }
-  ]
+  "rewrites": [{ "source": "*", "destination": "index.html" }]
 }

platform/app/tailwind.css

@@ -2,7 +2,3 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
-
-* {
-  min-height: 0 !important;
-}