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 <danny.ri.brown@gmail.com>
This commit is contained in:
Gustavo André LelisandDanny Brown authored and GitHub committed 2020-03-02 15:43:39 -05:00
1 parent 9c1112f768
commit 64dfbeab7a
6 files changed
+79 -79

No files matched your search

@@ -9,7 +9,7 @@ export default class DatasetPicker extends Component {
error: null, error: null,
loading: true, loading: true,
datasets: [], datasets: [],
filterStr: "" filterStr: '',
}; };
static propTypes = { static propTypes = {
@@ -42,22 +42,23 @@ export default class DatasetPicker extends Component {
} }
render() { render() {
const { datasets, loading, error, filterStr } = this.state; const { datasets, loading, error, filterStr } = this.state;
const { onSelect } = this.props; const { onSelect } = this.props;
return ( return (
<div> <div>
<input class="form-control gcp-input" <input
type="text" className="form-control gcp-input"
value={ filterStr } type="text"
onChange={ e => this.setState({ filterStr: e.target.value }) } value={filterStr}
onChange={e => this.setState({ filterStr: e.target.value })}
/>
<DatasetsList
datasets={datasets}
loading={loading}
error={error}
filter={filterStr}
onSelect={onSelect}
/> />
<DatasetsList
datasets={datasets}
loading={loading}
error={error}
filter={filterStr}
onSelect={onSelect}
/>
</div> </div>
); );
} }
@@ -122,10 +122,7 @@ class DatasetSelector extends Component {
<> <>
{projectBreadcrumbs} {projectBreadcrumbs}
{!project && ( {!project && (
<ProjectPicker <ProjectPicker accessToken={accessToken} onSelect={onProjectSelect} />
accessToken={accessToken}
onSelect={onProjectSelect}
/>
)} )}
{project && !location && ( {project && !location && (
@@ -10,13 +10,13 @@ export default class DicomStorePicker extends Component {
loading: true, loading: true,
stores: [], stores: [],
locations: [], locations: [],
filterStr: "" filterStr: '',
}; };
static propTypes = { static propTypes = {
dataset: PropTypes.object, dataset: PropTypes.object,
onSelect: PropTypes.func, onSelect: PropTypes.func,
accessToken: PropTypes.string.isRequired accessToken: PropTypes.string.isRequired,
}; };
async componentDidMount() { async componentDidMount() {
@@ -44,10 +44,11 @@ export default class DicomStorePicker extends Component {
return ( return (
<div> <div>
<input class="form-control gcp-input" <input
type="text" className="form-control gcp-input"
value={ filterStr } type="text"
onChange={ e => this.setState({ filterStr: e.target.value }) } value={filterStr}
onChange={e => this.setState({ filterStr: e.target.value })}
/> />
<DicomStoreList <DicomStoreList
stores={stores} stores={stores}
@@ -1,57 +1,56 @@
import React, { Component } from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import Modal from 'react-bootstrap-modal';
import DatasetSelector from './DatasetSelector'; import DatasetSelector from './DatasetSelector';
import './googleCloud.css'; import './googleCloud.css';
import { withTranslation } from 'react-i18next'; import { withTranslation } from 'react-i18next';
import * as GoogleCloudUtilServers from './utils/getServers'; import * as GoogleCloudUtilServers from './utils/getServers';
class DicomStorePickerModal extends Component { import { servicesManager } from './../App.js';
static propTypes = {
url: PropTypes.string, function DicomStorePickerModal({
user: PropTypes.object.isRequired, isOpen = false,
setServers: PropTypes.func.isRequired, setServers,
isOpen: PropTypes.bool.isRequired, onClose,
onClose: PropTypes.func, user,
url,
t,
}) {
const { UIModalService } = servicesManager.services;
const showDicomStorePickerModal = () => {
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 = { return (
isOpen: false, <React.Fragment>{isOpen && showDicomStorePickerModal()}</React.Fragment>
}; );
handleEvent = data => {
const servers = GoogleCloudUtilServers.getServers(data, data.dicomstore);
this.props.setServers(servers);
// Force auto close
this.props.onClose();
};
render() {
return (
<Modal
show={this.props.isOpen}
onHide={this.props.onClose}
aria-labelledby="ModalHeader"
className="modal fade themed in"
backdrop={false}
size={'md'}
keyboard={true}
>
<Modal.Header closeButton>
<Modal.Title>
{this.props.t('Google Cloud Healthcare API')}
</Modal.Title>
</Modal.Header>
<Modal.Body>
<DatasetSelector
setServers={this.handleEvent}
user={this.props.user}
url={this.props.url}
/>
</Modal.Body>
</Modal>
);
}
} }
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); export default withTranslation('Common')(DicomStorePickerModal);
@@ -9,7 +9,7 @@ export default class LocationPicker extends Component {
error: null, error: null,
loading: true, loading: true,
locations: [], locations: [],
filterStr: "", filterStr: '',
}; };
static propTypes = { static propTypes = {
@@ -42,10 +42,11 @@ export default class LocationPicker extends Component {
const { onSelect } = this.props; const { onSelect } = this.props;
return ( return (
<div> <div>
<input class="form-control gcp-input" <input
type="text" className="form-control gcp-input"
value={ filterStr } type="text"
onChange={ e => this.setState({ filterStr: e.target.value }) } value={filterStr}
onChange={e => this.setState({ filterStr: e.target.value })}
/> />
<LocationsList <LocationsList
locations={locations} locations={locations}
@@ -30,7 +30,7 @@ export default class ProjectPicker extends Component {
this.setState({ this.setState({
projects: response.data.projects || [], projects: response.data.projects || [],
filterStr: "", filterStr: '',
loading: false, loading: false,
}); });
} }
@@ -40,10 +40,11 @@ export default class ProjectPicker extends Component {
const { onSelect } = this.props; const { onSelect } = this.props;
return ( return (
<div> <div>
<input class="form-control gcp-input" <input
type="text" className="form-control gcp-input"
value={ filterStr } type="text"
onChange={ e => this.setState({ filterStr: e.target.value }) } value={filterStr}
onChange={e => this.setState({ filterStr: e.target.value })}
/> />
<ProjectsList <ProjectsList
projects={projects} projects={projects}