Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump: dependency versions to fix hydration bugs #2848

Merged
merged 3 commits into from
Jul 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions extensions/cornerstone-dicom-sr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"peerDependencies": {
"@ohif/core": "^3.0.0",
"@ohif/ui": "^2.0.0",
"dcmjs": "^0.22.1",
"dcmjs": "^0.24.5",
"dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8",
"prop-types": "^15.6.2",
Expand All @@ -45,7 +45,7 @@
"dependencies": {
"@babel/runtime": "7.16.3",
"classnames": "^2.2.6",
"@cornerstonejs/core": "^0.13.7",
"@cornerstonejs/tools": "^0.20.9"
"@cornerstonejs/core": "^0.13.11",
"@cornerstonejs/tools": "^0.20.15"
}
}
10 changes: 5 additions & 5 deletions extensions/cornerstone/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"peerDependencies": {
"@ohif/core": "^3.0.0",
"@ohif/ui": "^2.0.0",
"cornerstone-wado-image-loader": "^4.1.2",
"dcmjs": "^0.22.1",
"cornerstone-wado-image-loader": "^4.2.0",
"dcmjs": "^0.24.5",
"dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8",
"prop-types": "^15.6.2",
Expand All @@ -43,9 +43,9 @@
},
"dependencies": {
"@babel/runtime": "7.17.9",
"@cornerstonejs/core": "^0.13.7",
"@cornerstonejs/streaming-image-volume-loader": "^0.4.7",
"@cornerstonejs/tools": "^0.20.9",
"@cornerstonejs/core": "^0.13.11",
"@cornerstonejs/streaming-image-volume-loader": "^0.4.10",
"@cornerstonejs/tools": "^0.20.15",
"@kitware/vtk.js": "^24.18.7",
"dom-to-image": "^2.6.0",
"lodash.debounce": "4.0.8",
Expand Down
2 changes: 1 addition & 1 deletion extensions/default/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"peerDependencies": {
"@ohif/core": "^3.0.0",
"@ohif/i18n": "^1.0.0",
"dcmjs": "^0.22.1",
"dcmjs": "^0.24.5",
"dicomweb-client": "^0.6.0",
"prop-types": "^15.6.2",
"react": "^17.0.2",
Expand Down
2 changes: 1 addition & 1 deletion extensions/dicom-pdf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"peerDependencies": {
"@ohif/core": "^3.0.0",
"@ohif/ui": "^2.0.0",
"dcmjs": "^0.22.1",
"dcmjs": "^0.24.5",
"dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8",
"prop-types": "^15.6.2",
Expand Down
2 changes: 1 addition & 1 deletion extensions/dicom-video/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"peerDependencies": {
"@ohif/core": "^3.0.0",
"@ohif/ui": "^2.0.0",
"dcmjs": "^0.22.1",
"dcmjs": "^0.24.5",
"dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8",
"prop-types": "^15.6.2",
Expand Down
6 changes: 3 additions & 3 deletions extensions/measurement-tracking/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
"peerDependencies": {
"@ohif/core": "^3.0.0",
"classnames": "^2.2.6",
"@cornerstonejs/core": "^0.13.7",
"@cornerstonejs/tools": "^0.20.9",
"@cornerstonejs/core": "^0.13.11",
"@cornerstonejs/tools": "^0.20.15",
"@ohif/extension-cornerstone-dicom-sr": "^3.0.0",
"dcmjs": "^0.22.1",
"dcmjs": "^0.24.5",
"prop-types": "^15.6.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand Down
4 changes: 2 additions & 2 deletions platform/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
},
"peerDependencies": {
"cornerstone-math": "0.1.9",
"cornerstone-wado-image-loader": "^4.1.2",
"cornerstone-wado-image-loader": "^4.2.0",
"dicom-parser": "^1.8.9",
"@ohif/ui": "^2.0.0"
},
"dependencies": {
"@babel/runtime": "7.16.3",
"dcmjs": "^0.22.1",
"dcmjs": "^0.24.5",
"dicomweb-client": "^0.6.0",
"isomorphic-base64": "^1.0.2",
"lodash.merge": "^4.6.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,18 +140,6 @@ class HangingProtocolService {
this.hpAlreadyApplied[i] = true;
}

/**
* Adds a custom setting that can be chosen in the HangingProtocol UI and applied to a Viewport
*
* @param settingId The ID used to refer to the setting (e.g. 'displayCADMarkers')
* @param settingName The name of the setting to be displayed (e.g. 'Display CAD Markers')
* @param options
* @param callback A function to be run after a viewport is rendered with a series
*/
addCustomViewportSetting(...params) {
this.customViewportSettings.push(...params);
}

/**
* Adds a custom attribute to be used in the HangingProtocol UI and matching rules, including a
* callback that will be used to calculate the attribute value.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,6 @@ There are two events that get publish in `HangingProtocolService`:

- `addCustomAttribute`: adding a custom attribute for matching. (see below)

- `addCustomViewportSetting`: adding a custom setting to a viewport (initial
`voi`). Below, we explain in detail how to add custom viewport settings via
protocol definitions. `addCustomViewportSetting` is another way to set these
settings which is exposed by API

-

Default initialization of the modes handles running the `HangingProtocolService`

## Custom Attribute
Expand Down
26 changes: 13 additions & 13 deletions platform/ui/src/contextProviders/DialogProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,6 @@ const DialogProvider = ({ children, service }) => {
};
};

/**
* Sets the implementation of a dialog service that can be used by extensions.
*
* @returns void
*/
useEffect(() => {
if (service) {
service.setServiceImplementation({ create, dismiss, dismissAll });
}
}, [create, dismiss, service]);

/**
* UI Dialog
*
Expand All @@ -80,8 +69,6 @@ const DialogProvider = ({ children, service }) => {
* @property {Function} onDrag Called while dragging.
*/

useEffect(() => _bringToFront(lastDialogId), [_bringToFront, lastDialogId]);

/**
* Creates a new dialog and return its id.
*
Expand Down Expand Up @@ -146,6 +133,19 @@ const DialogProvider = ({ children, service }) => {
});
}, []);

/**
* Sets the implementation of a dialog service that can be used by extensions.
*
* @returns void
*/
useEffect(() => {
if (service) {
service.setServiceImplementation({ create, dismiss, dismissAll });
}
}, [create, dismiss, service]);

useEffect(() => _bringToFront(lastDialogId), [_bringToFront, lastDialogId]);

const renderDialogs = () =>
dialogs.map(dialog => {
const {
Expand Down
22 changes: 11 additions & 11 deletions platform/ui/src/contextProviders/SnackbarProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,6 @@ const SnackbarProvider = ({ children, service }) => {
const [count, setCount] = useState(1);
const [snackbarItems, setSnackbarItems] = useState([]);

/**
* Sets the implementation of a notification service that can be used by extensions.
*
* @returns void
*/
useEffect(() => {
if (service) {
service.setServiceImplementation({ hide, show });
}
}, [service, hide, show]);

const show = useCallback(
options => {
if (!options || (!options.title && !options.message)) {
Expand Down Expand Up @@ -104,6 +93,17 @@ const SnackbarProvider = ({ children, service }) => {
};
}

/**
* Sets the implementation of a notification service that can be used by extensions.
*
* @returns void
*/
useEffect(() => {
if (service) {
service.setServiceImplementation({ hide, show });
}
}, [service, hide, show]);

return (
<SnackbarContext.Provider value={{ show, hide, hideAll, snackbarItems }}>
{!!snackbarItems && <SnackbarContainer />}
Expand Down
4 changes: 2 additions & 2 deletions platform/viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
"config-point": "^0.4.8",
"core-js": "^3.16.1",
"cornerstone-math": "^0.1.9",
"cornerstone-wado-image-loader": "^4.1.2",
"dcmjs": "^0.22.1",
"cornerstone-wado-image-loader": "^4.2.0",
"dcmjs": "^0.24.5",
"detect-gpu": "^4.0.16",
"dicom-parser": "^1.8.9",
"dotenv-webpack": "^1.7.0",
Expand Down
66 changes: 43 additions & 23 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1314,29 +1314,38 @@
resolved "https://registry.yarnpkg.com/@cornerstonejs/codec-openjpeg/-/codec-openjpeg-0.1.1.tgz#5bd1c52a33a425299299e970312731fa0cc2711b"
integrity sha512-HOMMOLV6xy8O/agNGGvrl0a8DwShpBvWxAzEzv2pqq12d3r5z/3MyIgNA3Oj/8bIBVvvVXxh9RX7rMDRHJdowg==

"@cornerstonejs/core@^0.13.7":
version "0.13.7"
resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-0.13.7.tgz#e6752459f063f475b82789d8a3b73516560d17f5"
integrity sha512-Mt4NyACOl2Dootb0NtNji/z+wAtHqwkrnUS6HR+4guFZ+yjzq1uCQu/I5iWnxXuEhboqo9pSAKwRLwKpK6pTSw==
"@cornerstonejs/core@^0.13.10":
version "0.13.10"
resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-0.13.10.tgz#d2aa3a9ba4951b6b6937a310548a5fe517a29d49"
integrity sha512-y5nCz4nvgg86Er3NovKK/1DikK1F+zye2gsYnMFE3YJVYcCeCcgFj/rdQxj2IYZc0E/gpyjyaKDMh0zAmuoPoQ==
dependencies:
detect-gpu "^4.0.7"
lodash.clonedeep "4.5.0"

"@cornerstonejs/streaming-image-volume-loader@^0.4.7":
version "0.4.7"
resolved "https://registry.yarnpkg.com/@cornerstonejs/streaming-image-volume-loader/-/streaming-image-volume-loader-0.4.7.tgz#f7a95ce3d40a315de77a10a890be6180bce6e4ae"
integrity sha512-2bAmaCugXmMAWWnjnXJLU4+CYf3AlHj8prSh+1KFk5/Gvv2ilMnzVZRvzv/re86rWb6lWD5B3UM9I7Q7GfElcQ==
"@cornerstonejs/core@^0.13.11":
version "0.13.11"
resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-0.13.11.tgz#94a17a769e4fe7b5edcc69754bbf73135393931f"
integrity sha512-jNZmqFAVc9bpaor36pXNma06DqP+2NOj2EiZfO3fngR+t7vPOOhNz9axy8rFSXGIKZEOxGKLnnW8cL56lhSJ8A==
dependencies:
"@cornerstonejs/core" "^0.13.7"
cornerstone-wado-image-loader "^4.1.2"
detect-gpu "^4.0.7"
lodash.clonedeep "4.5.0"

"@cornerstonejs/streaming-image-volume-loader@^0.4.10":
version "0.4.10"
resolved "https://registry.yarnpkg.com/@cornerstonejs/streaming-image-volume-loader/-/streaming-image-volume-loader-0.4.10.tgz#7f9ac1a0575c13af059f6cb18a578f1ee89d3cde"
integrity sha512-mcu/GaFDSz3xHWm5kfeLB8rr4UssJhkXgjH9bnRkJ0/qq+t64rRegZJafQz5XpAyoVOXyW7mb3oJuOh3J0HTZQ==
dependencies:
"@cornerstonejs/core" "^0.13.10"
cornerstone-wado-image-loader "^4.1.5"

"@cornerstonejs/tools@^0.20.9":
version "0.20.9"
resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-0.20.9.tgz#8c9780c1f6fbb2fb247c4e0b75bf4f1a9535227c"
integrity sha512-JyRFw8qX8Cp1qjgn85V6EPsx8iTU/txJxCcPd2DWJXC3uscMX+cDf8vv3zld35yXx6Sj2h4ybc1T0gkkMR9v2Q==
"@cornerstonejs/tools@^0.20.15":
version "0.20.15"
resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-0.20.15.tgz#493bd2d136e061b88cc2c66b63ef02cba791e55b"
integrity sha512-+NaNluG4xKIOXP4VOpU3LeibFncRoiWmQkAUKq0OuPpU+W0HR5krThlZ0OM6RQduOHChRMXOfvcnAtEu2AbzIQ==
dependencies:
"@cornerstonejs/core" "^0.13.7"
"@cornerstonejs/core" "^0.13.11"
lodash.clonedeep "4.5.0"
lodash.get "^4.4.2"

"@csstools/postcss-cascade-layers@^1.0.2":
version "1.0.2"
Expand Down Expand Up @@ -8271,10 +8280,21 @@ cornerstone-math@^0.1.9:
resolved "https://registry.yarnpkg.com/cornerstone-math/-/cornerstone-math-0.1.9.tgz#7ce5509e8b9f465b01f7c548470725e7569859fc"
integrity sha512-NxdooV73asEQgav1S+0e+a4K+W3CXJdLXyFkVN24qqCtmIpzZzwtw3F9KWPCekzSAJmbhtQ3HicOQj3d4vRtuw==

cornerstone-wado-image-loader@^4.1.2:
version "4.1.3"
resolved "https://registry.yarnpkg.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-4.1.3.tgz#6053606ca6dd588d341f1117bb205822000192d1"
integrity sha512-1JOI1IFrpDNK96Z7Qmi50fmIlx81Ur67WfjmD371jtsbygIeh+K7p3pvate722IcLUwJZ3dbBEDY/voaD+HUXQ==
cornerstone-wado-image-loader@^4.1.5:
version "4.1.5"
resolved "https://registry.yarnpkg.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-4.1.5.tgz#1e120564e887bf85b03d4a7f90c6aaea5fd5acf2"
integrity sha512-N+CqivL+KNnVzftUqhwtKa7ULvdO96Bo3sTd4dBu05b57FSKoyAjFQ40md/UzbwzC3hEdVy94rh1TVMPRdMN4w==
dependencies:
"@cornerstonejs/codec-charls" "^0.1.1"
"@cornerstonejs/codec-libjpeg-turbo-8bit" "^0.0.7"
"@cornerstonejs/codec-openjpeg" "^0.1.0"
dicom-parser "^1.8.9"
pako "^2.0.4"

cornerstone-wado-image-loader@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-4.2.0.tgz#c2fd715d20c69310c6d9434d6673aa1ccab1f77a"
integrity sha512-J7FQcJlBaLHcbc8qj9sHW5w039w3s+i2kU8wK2Yghn1rnLcOay8N8pr+aEYua3XT04iD9GOj5NyikSiplITZWQ==
dependencies:
"@cornerstonejs/codec-charls" "^0.1.1"
"@cornerstonejs/codec-libjpeg-turbo-8bit" "^0.0.7"
Expand Down Expand Up @@ -8980,10 +9000,10 @@ dayjs@^1.10.4:
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.2.tgz#fa0f5223ef0d6724b3d8327134890cfe3d72fbe5"
integrity sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw==

dcmjs@^0.22.1:
version "0.22.1"
resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.22.1.tgz#45c845f228e5cf00415a5d3470715060bdcb23ae"
integrity sha512-pLYxMPx83fChiZrP3XER1ui2a6rKwZFFdlrkO6hdXUvfpossAdkeMuhTJ938usr/O2RZtWqPMBMGKW8YXzG2PA==
dcmjs@^0.24.5:
version "0.24.6"
resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.24.6.tgz#436d00361fb8d4286e68e2b0cab15939fa3acafb"
integrity sha512-ts/DigszrYXMOmYLRVlik4Z6Oq0fb4ykrveFkcIPclTk/uoND0uwbhO4IPMNnuhGGwaVFF6uXQISY+kgbpjn2g==
dependencies:
"@babel/runtime-corejs2" "^7.17.8"
gl-matrix "^3.1.0"
Expand Down