continue consolidating packages, converting various pieces to react

This commit is contained in:
Erik Ziegler committed 2018-12-13 23:24:39 +01:00
1 parent 5f30f7bd35
commit 7b66dec163
90 files changed
+350 -485

No files matched your search

+17 -4
View File
@@ -2,7 +2,8 @@ import React, { Component } from 'react';
import { withRouter } from 'react-router';
import { Route, Switch } from 'react-router-dom';
import { OHIF } from 'meteor/ohif:core';
import Viewer from "./viewer/viewer";
import ViewerRouting from "./ViewerRouting.js";
import IHEInvokeImageDisplay from './IHEInvokeImageDisplay.js';
import './App.css';
const reload = () => window.location.reload();
@@ -46,12 +47,24 @@ class App extends Component {
store={this.props.store}
/>
<Route
exact
path="/viewer"
component={Viewer}
path="/viewer/:studyInstanceUids"
component={ViewerRouting}
/*auth={this.props.auth}*/
store={this.props.store}
/>
<Route
path="/study/:studyInstanceUid/series/:seriesInstanceUids"
component={ViewerRouting}
/*auth={this.props.auth}*/
store={this.props.store}
/>
<Route
path="/IHEInvokeImageDisplay"
component={IHEInvokeImageDisplay}
/*auth={this.props.auth}*/
store={this.props.store}
/>
{/*<Route path="/silent-refresh.html" onEnter={reload} />
<Route path="/logout-redirect.html" onEnter={reload} />*/}
<Route render={() =>
@@ -0,0 +1,32 @@
import React, { Component } from "react";
import PropTypes from "prop-types";
import Viewer from "./viewer/viewer.js";
function IHEInvokeImageDisplay({ match }) {
const requestType = match.params.query.requestType;
let studyInstanceUids;
let displayStudyList = false;
if (requestType === "STUDY") {
studyInstanceUids = match.params.query.studyUID.split(';');
} else if (requestType === "STUDYBASE64") {
const uids = this.params.query.studyUID;
const decodedData = window.atob(uids);
studyInstanceUids = decodedData.split(';');
} else if (requestType === "PATIENT") {
const patientUids = this.params.query.patientID.split(';');
displayStudyList = true
} else {
displayStudyList = true
}
if (displayStudyList) {
return (<StudyList/>);
}
return (
<ViewerFromStudyData studyInstanceUids={studyInstanceUids}/>
);
}
export default IHEInvokeImageDisplay;
@@ -0,0 +1,57 @@
import React, {Component} from "react";
import PropTypes from "prop-types";
import Viewer from "./viewer/viewer.js";
import { OHIF } from 'meteor/ohif:core';
class ViewerFromStudyData extends Component {
constructor(props) {
super(props);
this.state = {
studies: null,
error: null
};
}
componentDidMount() {
// TODO: Avoid using timepoints here
//const params = { studyInstanceUids, seriesInstanceUids, timepointId, timepointsFilter={} };
const params = {
studyInstanceUids: this.props.studyInstanceUids,
seriesInstanceUids: this.props.seriesInstanceUids,
}
const promise = OHIF.viewerbase.prepareViewerData(params);
// Render the viewer when the data is ready
promise.then(({ studies, viewerData }) => {
OHIF.viewer.data = viewerData;
this.setState({
studies,
});
}).catch(error => {
this.setState({
error,
});
});
}
render() {
if (this.state.error) {
return (<div>Error: {JSON.stringify(this.state.error)}</div>);
} else if (!this.state.studies) {
return (<div>Loading...</div>);
}
return (
<Viewer studies={this.state.studies}/>
);
}
}
ViewerFromStudyData.propTypes = {
studyInstanceUids: PropTypes.array,
seriesInstanceUids: PropTypes.array
};
export default ViewerFromStudyData;
@@ -0,0 +1,23 @@
import React, {Component} from "react";
import PropTypes from "prop-types";
import ViewerFromStudyData from "./ViewerFromStudyData.js";
function ViewerRouting({ match }) {
const { studyInstanceUids, seriesInstanceUids } = match.params;
let studyUIDs;
let seriesUIDs;
if (studyInstanceUids && !seriesInstanceUids) {
studyUIDs = studyInstanceUids.split(';');
} else if (studyInstanceUids && seriesInstanceUids) {
studyUIDs = [match.params.studyInstanceUid];
seriesUIDs = match.params.seriesInstanceUids.split(';');
}
return (
<ViewerFromStudyData studyInstanceUids={studyUIDs} seriesInstanceUids={seriesUIDs}/>
);
}
export default ViewerRouting;
@@ -1,7 +1,6 @@
import { Component } from 'react';
import React from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { OHIF } from 'meteor/ohif:core';
import { Viewerbase } from 'meteor/ohif:viewerbase';
import { StudyBrowser } from 'react-viewerbase';
@@ -91,7 +91,7 @@ class Viewer extends Component {
OHIF.viewer.StudyMetadataList.removeAll();
OHIF.viewer.data.studyInstanceUids = [];
const studies = this.props.studies;
studies.forEach(study => {
const studyMetadata = new OHIF.metadata.StudyMetadata(study, study.studyInstanceUid);