From feed2304c124dc2facc7a7371ed9851548c223c5 Mon Sep 17 00:00:00 2001 From: Alireza Date: Mon, 18 Mar 2024 14:27:17 -0400 Subject: [PATCH] fix(SR display): and the token based navigation (#3995) --- extensions/cornerstone-dicom-seg/package.json | 4 +- extensions/cornerstone-dicom-sr/package.json | 6 +-- extensions/cornerstone/package.json | 10 ++-- extensions/measurement-tracking/package.json | 4 +- platform/app/package.json | 2 +- platform/app/src/routes/Mode/Mode.tsx | 2 +- platform/core/package.json | 2 +- yarn.lock | 47 ++++++++++--------- 8 files changed, 39 insertions(+), 38 deletions(-) diff --git a/extensions/cornerstone-dicom-seg/package.json b/extensions/cornerstone-dicom-seg/package.json index 506511f41..bc90d3c68 100644 --- a/extensions/cornerstone-dicom-seg/package.json +++ b/extensions/cornerstone-dicom-seg/package.json @@ -46,8 +46,8 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^1.63.4", - "@cornerstonejs/core": "^1.63.4", + "@cornerstonejs/adapters": "^1.66.7", + "@cornerstonejs/core": "^1.66.7", "@kitware/vtk.js": "29.7.0", "react-color": "^2.19.3" } diff --git a/extensions/cornerstone-dicom-sr/package.json b/extensions/cornerstone-dicom-sr/package.json index cef94db8b..9d6b3e341 100644 --- a/extensions/cornerstone-dicom-sr/package.json +++ b/extensions/cornerstone-dicom-sr/package.json @@ -46,9 +46,9 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^1.63.4", - "@cornerstonejs/core": "^1.63.4", - "@cornerstonejs/tools": "^1.63.4", + "@cornerstonejs/adapters": "^1.66.7", + "@cornerstonejs/core": "^1.66.7", + "@cornerstonejs/tools": "^1.66.7", "classnames": "^2.3.2" } } diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json index 47f2ac25b..314c31ec9 100644 --- a/extensions/cornerstone/package.json +++ b/extensions/cornerstone/package.json @@ -38,7 +38,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.2", "@cornerstonejs/codec-openjph": "^2.4.2", - "@cornerstonejs/dicom-image-loader": "^1.63.4", + "@cornerstonejs/dicom-image-loader": "^1.66.7", "@ohif/core": "3.8.0-beta.60", "@ohif/ui": "3.8.0-beta.60", "dcmjs": "^0.29.12", @@ -54,10 +54,10 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^1.63.4", - "@cornerstonejs/core": "^1.63.4", - "@cornerstonejs/streaming-image-volume-loader": "^1.63.4", - "@cornerstonejs/tools": "^1.63.4", + "@cornerstonejs/adapters": "^1.66.7", + "@cornerstonejs/core": "^1.66.7", + "@cornerstonejs/streaming-image-volume-loader": "^1.66.7", + "@cornerstonejs/tools": "^1.66.7", "@kitware/vtk.js": "29.7.0", "html2canvas": "^1.4.1", "lodash.debounce": "4.0.8", diff --git a/extensions/measurement-tracking/package.json b/extensions/measurement-tracking/package.json index 8a1bb8ba2..93ce73d56 100644 --- a/extensions/measurement-tracking/package.json +++ b/extensions/measurement-tracking/package.json @@ -32,8 +32,8 @@ "start": "yarn run dev" }, "peerDependencies": { - "@cornerstonejs/core": "^1.63.4", - "@cornerstonejs/tools": "^1.63.4", + "@cornerstonejs/core": "^1.66.7", + "@cornerstonejs/tools": "^1.66.7", "@ohif/core": "3.8.0-beta.60", "@ohif/extension-cornerstone-dicom-sr": "3.8.0-beta.60", "@ohif/ui": "3.8.0-beta.60", diff --git a/platform/app/package.json b/platform/app/package.json index c687a8d4c..bbb7fb904 100644 --- a/platform/app/package.json +++ b/platform/app/package.json @@ -53,7 +53,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.2", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/dicom-image-loader": "^1.63.4", + "@cornerstonejs/dicom-image-loader": "^1.66.7", "@emotion/serialize": "^1.1.3", "@ohif/core": "3.8.0-beta.60", "@ohif/extension-cornerstone": "3.8.0-beta.60", diff --git a/platform/app/src/routes/Mode/Mode.tsx b/platform/app/src/routes/Mode/Mode.tsx index ecbe7677a..0b2b65bab 100644 --- a/platform/app/src/routes/Mode/Mode.tsx +++ b/platform/app/src/routes/Mode/Mode.tsx @@ -202,7 +202,7 @@ export default function ModeRoute({ }); // Create a URL object with the current location - const urlObj = new URL(window.location.origin + location.pathname + location.search); + const urlObj = new URL(window.location.origin + window.location.pathname + location.search); // Remove the token from the URL object urlObj.searchParams.delete('token'); diff --git a/platform/core/package.json b/platform/core/package.json index a553cd90b..384853919 100644 --- a/platform/core/package.json +++ b/platform/core/package.json @@ -37,7 +37,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.2", "@cornerstonejs/codec-openjph": "^2.4.2", - "@cornerstonejs/dicom-image-loader": "^1.63.4", + "@cornerstonejs/dicom-image-loader": "^1.66.7", "@ohif/ui": "3.8.0-beta.60", "cornerstone-math": "0.1.9", "dicom-parser": "^1.8.21" diff --git a/yarn.lock b/yarn.lock index 7c0f8ea99..56e93ccba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1485,12 +1485,13 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@cornerstonejs/adapters@^1.63.4": - version "1.63.4" - resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-1.63.4.tgz#c43fcbb5217d09a4aaa3ecdbd5feb58d1283f486" - integrity sha512-HC1OGFEbveAd+Bs7UHDVBSK1XL187EsJqXkuDe5A1tlCUKoA2MCW/lX1sraW/0Z6Gm9GVzGnkVtRMBxYd96ENg== +"@cornerstonejs/adapters@^1.66.7": + version "1.66.7" + resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-1.66.7.tgz#924b9a1f00f56c986d9d175d12a182855e6af70b" + integrity sha512-HGEd39YOAe3jkTSyZhan3VY7QkQhMwMiYhqiREJpqWIyOLhCo25NTuMm8X6VIOpUvBGdE1dKyYlZrkANqF1CJQ== dependencies: "@babel/runtime-corejs2" "^7.17.8" + "@cornerstonejs/tools" "^1.66.7" buffer "^6.0.3" dcmjs "^0.29.8" gl-matrix "^3.4.3" @@ -1537,10 +1538,10 @@ resolved "https://registry.yarnpkg.com/@cornerstonejs/codec-openjph/-/codec-openjph-2.4.5.tgz#8690b61a86fa53ef38a70eee9d665a79229517c0" integrity sha512-MZCUy8VG0VG5Nl1l58+g+kH3LujAzLYTfJqkwpWI2gjSrGXnP6lgwyy4GmPRZWVoS40/B1LDNALK905cNWm+sg== -"@cornerstonejs/core@^1.63.4": - version "1.63.4" - resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-1.63.4.tgz#0d324e0df130854d0f6c24137b8e60053e0af3b4" - integrity sha512-l/7u1THn2pYq97QMBm8uy/kQWUEIlbq7rzdP6u1lSs8yDqK/f6zSQjNrvB/D6vRiVKnHVIlByxbbmEY46JQHmQ== +"@cornerstonejs/core@^1.66.7": + version "1.66.7" + resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-1.66.7.tgz#57d0adcc67d95f93fc86848c2a05b9c57545b287" + integrity sha512-GOhV4fw9c0zm+7oH6q69otPYYEHI90hyMqJ0S/AWLwV7AwDuIRuRts3VELG5mSx4ju7zJalsO0Jfpvg3gPsW5w== dependencies: "@kitware/vtk.js" "29.7.0" comlink "^4.4.1" @@ -1548,34 +1549,34 @@ gl-matrix "^3.4.3" lodash.clonedeep "4.5.0" -"@cornerstonejs/dicom-image-loader@^1.63.4": - version "1.63.4" - resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-1.63.4.tgz#6827cb9d3d840dcd6a798e884a169adcc6bba311" - integrity sha512-agnRjhIBFiYQ6gQTjHmio+DG79OTaNXU3NbEVVxWdahqR1MnJBX39FT+1mi+8AhbN9sH2f+IpB4MoqraNFetLw== +"@cornerstonejs/dicom-image-loader@^1.66.7": + version "1.66.7" + resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-1.66.7.tgz#a35095908554e8e7ad717aab7652be7376d5305d" + integrity sha512-z8Nq3A+h+9oSjTqxPVyUm9Y3GV2PgPZJOGP0yYTyuEUqVnV3A9w5eB0/q84HGDaXF0ZsT4Y1J4Y3oOmKodb9lA== dependencies: "@cornerstonejs/codec-charls" "^1.2.3" "@cornerstonejs/codec-libjpeg-turbo-8bit" "^1.2.2" "@cornerstonejs/codec-openjpeg" "^1.2.2" "@cornerstonejs/codec-openjph" "^2.4.5" - "@cornerstonejs/core" "^1.63.4" + "@cornerstonejs/core" "^1.66.7" dicom-parser "^1.8.9" pako "^2.0.4" uuid "^9.0.0" -"@cornerstonejs/streaming-image-volume-loader@^1.63.4": - version "1.63.4" - resolved "https://registry.yarnpkg.com/@cornerstonejs/streaming-image-volume-loader/-/streaming-image-volume-loader-1.63.4.tgz#37ba9de488d5472c3dd98f85698a854c97b4b29f" - integrity sha512-GoxxmQVeHVZntFFwVwOp/fttgTrzXBwH08gk6JDjhHhmh22Ci7P137hG8o54uA6dv0/W572em60SrIzvjB4Xwg== +"@cornerstonejs/streaming-image-volume-loader@^1.66.7": + version "1.66.7" + resolved "https://registry.yarnpkg.com/@cornerstonejs/streaming-image-volume-loader/-/streaming-image-volume-loader-1.66.7.tgz#6261df726b5400db1785c7378ee2e27018b3574c" + integrity sha512-2Ihz+6sUJ6AzKhF1o4yaDGeS1ZOZdmBlMEztMruJelLWWu/gb42i58chINB7UDmAxS/atvf22UvVNPGvW9cHDw== dependencies: - "@cornerstonejs/core" "^1.63.4" + "@cornerstonejs/core" "^1.66.7" comlink "^4.4.1" -"@cornerstonejs/tools@^1.63.4": - version "1.63.4" - resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-1.63.4.tgz#4f85cf77bda97738ff05ef9184cf68e617f1631c" - integrity sha512-LDoqShwi0b6kEGqnfY3pUrK4nExS9lqhXFvWew6wH9znUyEIVhGexBXNYDb3E2Gy13d4drtjsM+PXFt7c0PecQ== +"@cornerstonejs/tools@^1.66.7": + version "1.66.7" + resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-1.66.7.tgz#bc0bb71b6b33761a91ca116d542e39807de14d82" + integrity sha512-NKTkwWsVzyE62nYa1ljXkzDgVcbqZxsMeRDhtpMaWkVOK06FrClu2xvLfVM8Rz2AXF4Zsqcp0Rg0D6Z4U3g38Q== dependencies: - "@cornerstonejs/core" "^1.63.4" + "@cornerstonejs/core" "^1.66.7" "@icr/polyseg-wasm" "0.4.0" "@types/offscreencanvas" "2019.7.3" comlink "^4.4.1"