othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replacing query-string to querystring

Browse Source
This commit is contained in:
biharck 2019-04-24 09:00:36 -03:00
parent a4dfcaa0dc
commit 2fa8567cd9
1 changed files with 97 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/routes/StandaloneRouting.js
View File

@ -1,7 +1,7 @@
import React, { Component } from "react"; import React, { Component } from 'react';
import PropTypes from "prop-types"; import PropTypes from 'prop-types';
import qs from 'query-string' import qs from 'querystring';
import Viewer from "../connectedComponents/Viewer"; import Viewer from '../connectedComponents/Viewer';
import OHIF from 'ohif-core'; import OHIF from 'ohif-core';
const { createDisplaySets } = OHIF.utils; const { createDisplaySets } = OHIF.utils;
@ -10,7 +10,7 @@ class StandaloneRouting extends Component {
state = { state = {
studies: null, studies: null,
error: null error: null
} };
static propTypes = { static propTypes = {
location: PropTypes.object, location: PropTypes.object,
@ -30,9 +30,9 @@ class StandaloneRouting extends Component {
const oReq = new XMLHttpRequest(); const oReq = new XMLHttpRequest();
// Add event listeners for request failure // Add event listeners for request failure
oReq.addEventListener('error', (error) => { oReq.addEventListener('error', error => {
OHIF.log.warn('An error occurred while retrieving the JSON data'); OHIF.log.warn('An error occurred while retrieving the JSON data');
reject(error) reject(error);
}); });
// When the JSON has been returned, parse it into a JavaScript Object // When the JSON has been returned, parse it into a JavaScript Object
@ -55,11 +55,20 @@ class StandaloneRouting extends Component {
const studyInstanceUids = query.studyInstanceUids.split(';'); const studyInstanceUids = query.studyInstanceUids.split(';');
const seriesInstanceUids = []; const seriesInstanceUids = [];
OHIF.studies.retrieveStudiesMetadata(server, studyInstanceUids, seriesInstanceUids).then(studies => { OHIF.studies
.retrieveStudiesMetadata(
server,
studyInstanceUids,
seriesInstanceUids
)
.then(
studies => {
resolve(studies); resolve(studies);
}, error => { },
error => {
reject(error); reject(error);
}); }
);
} else { } else {
resolve(data.studies); resolve(data.studies);
} }
@ -70,7 +79,7 @@ class StandaloneRouting extends Component {
// which responds to GET requests with the study data // which responds to GET requests with the study data
OHIF.log.info(`Sending Request to: ${url}`); OHIF.log.info(`Sending Request to: ${url}`);
oReq.open('GET', url); oReq.open('GET', url);
oReq.setRequestHeader('Accept', 'application/json') oReq.setRequestHeader('Accept', 'application/json');
// Fire the request to the server // Fire the request to the server
oReq.send(); oReq.send();
@ -79,25 +88,26 @@ class StandaloneRouting extends Component {
componentDidMount() { componentDidMount() {
const query = qs.parse(this.props.location.search); const query = qs.parse(this.props.location.search);
StandaloneRouting.parseQueryAndFetchStudies(query).then(studies => { StandaloneRouting.parseQueryAndFetchStudies(query).then(
studies => {
const updatedStudies = createDisplaySets(studies); const updatedStudies = createDisplaySets(studies);
this.setState({ studies: updatedStudies }); this.setState({ studies: updatedStudies });
}, error => { },
error => {
this.setState({ error }); this.setState({ error });
}); }
);
} }
render() { render() {
if (this.state.error) { if (this.state.error) {
return (<div>Error: {JSON.stringify(this.state.error)}</div>); return <div>Error: {JSON.stringify(this.state.error)}</div>;
} else if (!this.state.studies) { } else if (!this.state.studies) {
return (<div>Loading...</div>); return <div>Loading...</div>;
} }
return ( return <Viewer studies={this.state.studies} />;
<Viewer studies={this.state.studies}/>
);
} }
} }