From 9b3be9b0c082c9a5b62f2a40f42e59381860fe73 Mon Sep 17 00:00:00 2001
From: arthur-miller <58273771+arthur-miller@users.noreply.github.com>
Date: Sat, 29 Feb 2020 10:59:47 -0300
Subject: [PATCH 1/6] fix: prevent the native context menu from appearing when
right-clicking on a measurement or angle
(https://github.com/OHIF/Viewers/issues/1406) (#1469)
---
platform/ui/src/components/contextMenu/ContextMenu.js | 5 ++---
.../viewer/src/connectedComponents/ToolContextMenu.js | 9 ++++-----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/platform/ui/src/components/contextMenu/ContextMenu.js b/platform/ui/src/components/contextMenu/ContextMenu.js
index 9dc5a174f..1185a8837 100644
--- a/platform/ui/src/components/contextMenu/ContextMenu.js
+++ b/platform/ui/src/components/contextMenu/ContextMenu.js
@@ -1,11 +1,10 @@
-import React from 'react';
import PropTypes from 'prop-types';
-
+import React from 'react';
import './ContextMenu.css';
const ContextMenu = ({ items, onClick }) => {
return (
-
+
e.preventDefault()}>
{items.map((item, index) => (
-
diff --git a/platform/viewer/src/connectedComponents/ToolContextMenu.js b/platform/viewer/src/connectedComponents/ToolContextMenu.js
index 3974ad396..b45bf3b50 100644
--- a/platform/viewer/src/connectedComponents/ToolContextMenu.js
+++ b/platform/viewer/src/connectedComponents/ToolContextMenu.js
@@ -1,8 +1,7 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { commandsManager } from './../App.js';
-
import { ContextMenu } from '@ohif/ui';
+import PropTypes from 'prop-types';
+import React from 'react';
+import { commandsManager } from './../App.js';
const toolTypes = [
'Angle',
@@ -94,7 +93,7 @@ const ToolContextMenu = ({
return (
- ;
+
);
};
From 9c1112f768ddf7ed0774f4d8f99b584886ce2adc Mon Sep 17 00:00:00 2001
From: ohif-bot
Date: Sat, 29 Feb 2020 14:01:25 +0000
Subject: [PATCH 2/6] chore(release): publish [skip ci]
- @ohif/extension-vtk@1.2.21
- @ohif/ui@1.3.1
- @ohif/viewer@3.7.2
---
extensions/vtk/CHANGELOG.md | 8 ++++++++
extensions/vtk/package.json | 4 ++--
platform/ui/CHANGELOG.md | 11 +++++++++++
platform/ui/package.json | 2 +-
platform/viewer/CHANGELOG.md | 11 +++++++++++
platform/viewer/package.json | 6 +++---
6 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/extensions/vtk/CHANGELOG.md b/extensions/vtk/CHANGELOG.md
index 665b16d90..b2659aad3 100644
--- a/extensions/vtk/CHANGELOG.md
+++ b/extensions/vtk/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.2.21](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.2.20...@ohif/extension-vtk@1.2.21) (2020-02-29)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
## [1.2.20](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.2.19...@ohif/extension-vtk@1.2.20) (2020-02-21)
**Note:** Version bump only for package @ohif/extension-vtk
diff --git a/extensions/vtk/package.json b/extensions/vtk/package.json
index 268bad4bf..870c45cf8 100644
--- a/extensions/vtk/package.json
+++ b/extensions/vtk/package.json
@@ -1,6 +1,6 @@
{
"name": "@ohif/extension-vtk",
- "version": "1.2.20",
+ "version": "1.2.21",
"description": "OHIF extension for VTK.js",
"author": "OHIF",
"license": "MIT",
@@ -53,7 +53,7 @@
},
"devDependencies": {
"@ohif/core": "^2.5.1",
- "@ohif/ui": "^1.3.0",
+ "@ohif/ui": "^1.3.1",
"cornerstone-tools": "^4.12.0",
"cornerstone-wado-image-loader": "^3.0.0",
"dicom-parser": "^1.8.3",
diff --git a/platform/ui/CHANGELOG.md b/platform/ui/CHANGELOG.md
index 6db468ddf..7cdd0b89c 100644
--- a/platform/ui/CHANGELOG.md
+++ b/platform/ui/CHANGELOG.md
@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.3.1](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.3.0...@ohif/ui@1.3.1) (2020-02-29)
+
+
+### Bug Fixes
+
+* prevent the native context menu from appearing when right-clicking on a measurement or angle (https://github.com/OHIF/Viewers/issues/1406) ([#1469](https://github.com/OHIF/Viewers/issues/1469)) ([9b3be9b](https://github.com/OHIF/Viewers/commit/9b3be9b0c082c9a5b62f2a40f42e59381860fe73))
+
+
+
+
+
# [1.3.0](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.2.1...@ohif/ui@1.3.0) (2020-02-20)
diff --git a/platform/ui/package.json b/platform/ui/package.json
index f3d1200ae..4c5298eec 100644
--- a/platform/ui/package.json
+++ b/platform/ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@ohif/ui",
- "version": "1.3.0",
+ "version": "1.3.1",
"description": "A set of React components for Medical Imaging Viewers",
"author": "OHIF Contributors",
"license": "MIT",
diff --git a/platform/viewer/CHANGELOG.md b/platform/viewer/CHANGELOG.md
index efc9a4c63..d5f0f0676 100644
--- a/platform/viewer/CHANGELOG.md
+++ b/platform/viewer/CHANGELOG.md
@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [3.7.2](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.7.1...@ohif/viewer@3.7.2) (2020-02-29)
+
+
+### Bug Fixes
+
+* prevent the native context menu from appearing when right-clicking on a measurement or angle (https://github.com/OHIF/Viewers/issues/1406) ([#1469](https://github.com/OHIF/Viewers/issues/1469)) ([9b3be9b](https://github.com/OHIF/Viewers/commit/9b3be9b0c082c9a5b62f2a40f42e59381860fe73))
+
+
+
+
+
## [3.7.1](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.7.0...@ohif/viewer@3.7.1) (2020-02-21)
**Note:** Version bump only for package @ohif/viewer
diff --git a/platform/viewer/package.json b/platform/viewer/package.json
index 3e12c456f..33c640def 100644
--- a/platform/viewer/package.json
+++ b/platform/viewer/package.json
@@ -1,6 +1,6 @@
{
"name": "@ohif/viewer",
- "version": "3.7.1",
+ "version": "3.7.2",
"description": "OHIF Viewer",
"author": "OHIF Contributors",
"license": "MIT",
@@ -53,9 +53,9 @@
"@ohif/extension-dicom-microscopy": "^0.50.6",
"@ohif/extension-dicom-pdf": "^1.0.1",
"@ohif/extension-lesion-tracker": "^0.2.0",
- "@ohif/extension-vtk": "^1.2.20",
+ "@ohif/extension-vtk": "^1.2.21",
"@ohif/i18n": "^0.52.6",
- "@ohif/ui": "^1.3.0",
+ "@ohif/ui": "^1.3.1",
"@tanem/react-nprogress": "^1.1.25",
"classnames": "^2.2.6",
"core-js": "^3.2.1",
From 64dfbeab7af98277efefadd334df14db79e32a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustavo=20Andr=C3=A9=20Lelis?=
Date: Mon, 2 Mar 2020 17:43:40 -0300
Subject: [PATCH 3/6] fix: GCloud dataset picker dialog broken (#1453)
* Replace class with className
* Start implementing UIDialogService
* Including UIModalService on dicomStorePicker
* Cleanup
* Remove unecessary divs
* Remove props not used
Co-authored-by: Danny Brown
---
.../viewer/src/googleCloud/DatasetPicker.js | 27 +++---
.../viewer/src/googleCloud/DatasetSelector.js | 5 +-
.../src/googleCloud/DicomStorePicker.js | 13 +--
.../src/googleCloud/DicomStorePickerModal.js | 91 +++++++++----------
.../viewer/src/googleCloud/LocationPicker.js | 11 ++-
.../viewer/src/googleCloud/ProjectPicker.js | 11 ++-
6 files changed, 79 insertions(+), 79 deletions(-)
diff --git a/platform/viewer/src/googleCloud/DatasetPicker.js b/platform/viewer/src/googleCloud/DatasetPicker.js
index bfa9cf891..120f021c0 100644
--- a/platform/viewer/src/googleCloud/DatasetPicker.js
+++ b/platform/viewer/src/googleCloud/DatasetPicker.js
@@ -9,7 +9,7 @@ export default class DatasetPicker extends Component {
error: null,
loading: true,
datasets: [],
- filterStr: ""
+ filterStr: '',
};
static propTypes = {
@@ -42,22 +42,23 @@ export default class DatasetPicker extends Component {
}
render() {
- const { datasets, loading, error, filterStr } = this.state;
+ const { datasets, loading, error, filterStr } = this.state;
const { onSelect } = this.props;
return (
- this.setState({ filterStr: e.target.value }) }
+ this.setState({ filterStr: e.target.value })}
+ />
+
-
);
}
diff --git a/platform/viewer/src/googleCloud/DatasetSelector.js b/platform/viewer/src/googleCloud/DatasetSelector.js
index 724a7a33f..f1179c32b 100644
--- a/platform/viewer/src/googleCloud/DatasetSelector.js
+++ b/platform/viewer/src/googleCloud/DatasetSelector.js
@@ -122,10 +122,7 @@ class DatasetSelector extends Component {
<>
{projectBreadcrumbs}
{!project && (
-
+
)}
{project && !location && (
diff --git a/platform/viewer/src/googleCloud/DicomStorePicker.js b/platform/viewer/src/googleCloud/DicomStorePicker.js
index 34a6e1c53..7944d1b93 100644
--- a/platform/viewer/src/googleCloud/DicomStorePicker.js
+++ b/platform/viewer/src/googleCloud/DicomStorePicker.js
@@ -10,13 +10,13 @@ export default class DicomStorePicker extends Component {
loading: true,
stores: [],
locations: [],
- filterStr: ""
+ filterStr: '',
};
static propTypes = {
dataset: PropTypes.object,
onSelect: PropTypes.func,
- accessToken: PropTypes.string.isRequired
+ accessToken: PropTypes.string.isRequired,
};
async componentDidMount() {
@@ -44,10 +44,11 @@ export default class DicomStorePicker extends Component {
return (
-
this.setState({ filterStr: e.target.value }) }
+
this.setState({ filterStr: e.target.value })}
/>
{
+ const handleEvent = data => {
+ const servers = GoogleCloudUtilServers.getServers(data, data.dicomstore);
+ setServers(servers);
+
+ // Force auto close
+ UIModalService.hide();
+ onClose();
+ };
+
+ if (UIModalService) {
+ UIModalService.show({
+ content: DatasetSelector,
+ title: t('Google Cloud Healthcare API'),
+ contentProps: {
+ setServers: handleEvent,
+ user,
+ url,
+ },
+ });
+ }
};
- static defaultProps = {
- isOpen: false,
- };
-
- handleEvent = data => {
- const servers = GoogleCloudUtilServers.getServers(data, data.dicomstore);
- this.props.setServers(servers);
- // Force auto close
- this.props.onClose();
- };
-
- render() {
- return (
-
-
-
- {this.props.t('Google Cloud Healthcare API')}
-
-
-
-
-
-
- );
- }
+ return (
+ {isOpen && showDicomStorePickerModal()}
+ );
}
+DicomStorePickerModal.propTypes = {
+ isOpen: PropTypes.bool.isRequired,
+ setServers: PropTypes.func.isRequired,
+ onClose: PropTypes.func,
+ user: PropTypes.object.isRequired,
+ url: PropTypes.string,
+};
+
export default withTranslation('Common')(DicomStorePickerModal);
diff --git a/platform/viewer/src/googleCloud/LocationPicker.js b/platform/viewer/src/googleCloud/LocationPicker.js
index b61368c5e..0766d5c5f 100644
--- a/platform/viewer/src/googleCloud/LocationPicker.js
+++ b/platform/viewer/src/googleCloud/LocationPicker.js
@@ -9,7 +9,7 @@ export default class LocationPicker extends Component {
error: null,
loading: true,
locations: [],
- filterStr: "",
+ filterStr: '',
};
static propTypes = {
@@ -42,10 +42,11 @@ export default class LocationPicker extends Component {
const { onSelect } = this.props;
return (
-
this.setState({ filterStr: e.target.value }) }
+
this.setState({ filterStr: e.target.value })}
/>
- this.setState({ filterStr: e.target.value }) }
+ this.setState({ filterStr: e.target.value })}
/>
Date: Mon, 2 Mar 2020 20:45:50 +0000
Subject: [PATCH 4/6] chore(release): publish [skip ci]
- @ohif/viewer@3.7.3
---
platform/viewer/CHANGELOG.md | 11 +++++++++++
platform/viewer/package.json | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/platform/viewer/CHANGELOG.md b/platform/viewer/CHANGELOG.md
index d5f0f0676..6772cab62 100644
--- a/platform/viewer/CHANGELOG.md
+++ b/platform/viewer/CHANGELOG.md
@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [3.7.3](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.7.2...@ohif/viewer@3.7.3) (2020-03-02)
+
+
+### Bug Fixes
+
+* GCloud dataset picker dialog broken ([#1453](https://github.com/OHIF/Viewers/issues/1453)) ([64dfbea](https://github.com/OHIF/Viewers/commit/64dfbeab7af98277efefadd334df14db79e32a4f))
+
+
+
+
+
## [3.7.2](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.7.1...@ohif/viewer@3.7.2) (2020-02-29)
diff --git a/platform/viewer/package.json b/platform/viewer/package.json
index 33c640def..a1ae7ee65 100644
--- a/platform/viewer/package.json
+++ b/platform/viewer/package.json
@@ -1,6 +1,6 @@
{
"name": "@ohif/viewer",
- "version": "3.7.2",
+ "version": "3.7.3",
"description": "OHIF Viewer",
"author": "OHIF Contributors",
"license": "MIT",
From ee80e026610442e94caf5e4e3e4d193220cd0ece Mon Sep 17 00:00:00 2001
From: Danny Brown
Date: Tue, 3 Mar 2020 00:42:01 -0500
Subject: [PATCH 5/6] fix: bump react-cornerstone-viewport version to address
critical issue (#1473)
---
extensions/cornerstone/package.json | 2 +-
yarn.lock | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json
index 8311132e9..5f4e119c6 100644
--- a/extensions/cornerstone/package.json
+++ b/extensions/cornerstone/package.json
@@ -52,6 +52,6 @@
"lodash.merge": "^4.6.2",
"lodash.throttle": "^4.1.1",
"query-string": "^6.8.3",
- "react-cornerstone-viewport": "2.x.x"
+ "react-cornerstone-viewport": "^2.3.6"
}
}
diff --git a/yarn.lock b/yarn.lock
index a4dbafd60..1af8e57c0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15202,10 +15202,10 @@ react-codemirror2@^6.0.0:
resolved "https://registry.yarnpkg.com/react-codemirror2/-/react-codemirror2-6.0.0.tgz#180065df57a64026026cde569a9708fdf7656525"
integrity sha512-D7y9qZ05FbUh9blqECaJMdDwKluQiO3A9xB+fssd5jKM7YAXucRuEOlX32mJQumUvHUkHRHqXIPBjm6g0FW0Ag==
-react-cornerstone-viewport@2.x.x:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/react-cornerstone-viewport/-/react-cornerstone-viewport-2.1.0.tgz#1f353e3b0a57c45add70e5040b819290d9f55f4b"
- integrity sha512-HahonGn2ZSud/yMSClWL3YDlh74hE46OMyTeTI7i80EWYPXO1eKeHajwyFvfl2wWXycuotpyhUlwIfQY1h4jRw==
+react-cornerstone-viewport@^2.3.6:
+ version "2.3.6"
+ resolved "https://registry.yarnpkg.com/react-cornerstone-viewport/-/react-cornerstone-viewport-2.3.6.tgz#1c76bd37c95284254767296952845bacd3b810a4"
+ integrity sha512-MBs1Mgl0g0YswkhgoaYlaPoPDVs/HZQ3Z89thHxVytvJsgnQvhc3YrR48iRaUfQj0eYoazh7AL/lLCfd8veFKA==
dependencies:
classnames "^2.2.6"
date-fns "^2.2.1"
From 2f459a0f64af8cc74f285ea2dbaa033cbd9c2e7a Mon Sep 17 00:00:00 2001
From: ohif-bot
Date: Tue, 3 Mar 2020 05:46:36 +0000
Subject: [PATCH 6/6] chore(release): publish [skip ci]
- @ohif/extension-cornerstone@2.4.1
- @ohif/viewer@3.7.4
---
extensions/cornerstone/CHANGELOG.md | 11 +++++++++++
extensions/cornerstone/package.json | 2 +-
platform/viewer/CHANGELOG.md | 8 ++++++++
platform/viewer/package.json | 4 ++--
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/extensions/cornerstone/CHANGELOG.md b/extensions/cornerstone/CHANGELOG.md
index 0d5497e83..65f3011f3 100644
--- a/extensions/cornerstone/CHANGELOG.md
+++ b/extensions/cornerstone/CHANGELOG.md
@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [2.4.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.4.0...@ohif/extension-cornerstone@2.4.1) (2020-03-03)
+
+
+### Bug Fixes
+
+* bump react-cornerstone-viewport version to address critical issue ([#1473](https://github.com/OHIF/Viewers/issues/1473)) ([ee80e02](https://github.com/OHIF/Viewers/commit/ee80e026610442e94caf5e4e3e4d193220cd0ece))
+
+
+
+
+
# [2.4.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.3.1...@ohif/extension-cornerstone@2.4.0) (2020-02-20)
diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json
index 5f4e119c6..128deb357 100644
--- a/extensions/cornerstone/package.json
+++ b/extensions/cornerstone/package.json
@@ -1,6 +1,6 @@
{
"name": "@ohif/extension-cornerstone",
- "version": "2.4.0",
+ "version": "2.4.1",
"description": "OHIF extension for Cornerstone",
"author": "OHIF",
"license": "MIT",
diff --git a/platform/viewer/CHANGELOG.md b/platform/viewer/CHANGELOG.md
index 6772cab62..da09b1211 100644
--- a/platform/viewer/CHANGELOG.md
+++ b/platform/viewer/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [3.7.4](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.7.3...@ohif/viewer@3.7.4) (2020-03-03)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
## [3.7.3](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.7.2...@ohif/viewer@3.7.3) (2020-03-02)
diff --git a/platform/viewer/package.json b/platform/viewer/package.json
index a1ae7ee65..f2d58efd0 100644
--- a/platform/viewer/package.json
+++ b/platform/viewer/package.json
@@ -1,6 +1,6 @@
{
"name": "@ohif/viewer",
- "version": "3.7.3",
+ "version": "3.7.4",
"description": "OHIF Viewer",
"author": "OHIF Contributors",
"license": "MIT",
@@ -48,7 +48,7 @@
"dependencies": {
"@babel/runtime": "^7.5.5",
"@ohif/core": "^2.5.1",
- "@ohif/extension-cornerstone": "^2.4.0",
+ "@ohif/extension-cornerstone": "^2.4.1",
"@ohif/extension-dicom-html": "^1.1.0",
"@ohif/extension-dicom-microscopy": "^0.50.6",
"@ohif/extension-dicom-pdf": "^1.0.1",