Add StandaloneViewer-style routes

OHIFViewer-react/src/App.js

@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import { withRouter } from 'react-router';
 import { Route, Switch } from 'react-router-dom';
 import ViewerRouting from "./ViewerRouting.js";
+import StandaloneRouting from './StandaloneRouting.js';
 import IHEInvokeImageDisplay from './IHEInvokeImageDisplay.js';
 import './App.css';
 import { StudyList } from 'react-viewerbase';
@@ -50,6 +51,13 @@ class App extends Component {
                     /*auth={this.props.auth}*/
                     store={this.props.store}
                 />
+                <Route
+                    exact
+                    path="/viewer"
+                    component={StandaloneRouting}
+                    /*auth={this.props.auth}*/
+                    store={this.props.store}
+                />
                 <Route
                     path="/viewer/:studyInstanceUids"
                     component={ViewerRouting}

OHIFViewer-react/src/StandaloneRouting.js

@@ -0,0 +1,102 @@
+import React, { Component } from "react";
+//import PropTypes from "prop-types";
+import Viewer from "./viewer/viewer";
+import qs from 'query-string'
+import OHIF from 'ohif-core';
+import createDisplaySets from "./lib/createDisplaySets";
+
+function parseQueryAndFetchStudies(query) {
+    return new Promise((resolve, reject) => {
+        const url = query.url;
+
+        if (!url) {
+            reject(new Error('No URL was specified. Use ?url=$yourURL'));
+        }
+
+        // Define a request to the server to retrieve the study data
+        // as JSON, given a URL that was in the Route
+        const oReq = new XMLHttpRequest();
+
+        // Add event listeners for request failure
+        oReq.addEventListener('error', (error) => {
+            OHIF.log.warn('An error occurred while retrieving the JSON data');
+            reject(error)
+        });
+
+        // When the JSON has been returned, parse it into a JavaScript Object
+        // and render the OHIF Viewer with this data
+        oReq.addEventListener('load', () => {
+            // Parse the response content
+            // https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/responseText
+            if (!oReq.responseText) {
+                OHIF.log.warn('Response was undefined');
+                reject(new Error('Response was undefined'));
+            }
+
+            OHIF.log.info(JSON.stringify(oReq.responseText, null, 2));
+
+            const data = JSON.parse(oReq.responseText);
+            if (data.servers && query.studyInstanceUids) {
+                const server = data.servers.dicomWeb[0];
+                server.type = 'dicomWeb';
+
+                const studyInstanceUids = query.studyInstanceUids.split(';');
+                const seriesInstanceUids = [];
+
+                OHIF.studies.retrieveStudiesMetadata(server, studyInstanceUids, seriesInstanceUids).then(studies => {
+                    resolve(studies);
+                }, error => {
+                    reject(error);
+                });
+            } else {
+                resolve(data.studies);
+            }
+        });
+
+        // Open the Request to the server for the JSON data
+        // In this case we have a server-side route called /api/
+        // which responds to GET requests with the study data
+        OHIF.log.info(`Sending Request to: ${url}`);
+        oReq.open('GET', url);
+        oReq.setRequestHeader('Accept', 'application/json')
+
+        // Fire the request to the server
+        oReq.send();
+    });
+}
+
+class StandaloneRouting extends Component {
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            studies: null,
+            error: null
+        };
+    }
+
+    componentDidMount() {
+        const query = qs.parse(this.props.location.search);
+        parseQueryAndFetchStudies(query).then(studies => {
+            const updatedStudies = createDisplaySets(studies);
+
+            this.setState({ studies: updatedStudies });
+        }, 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}/>
+        );
+    }
+}
+
+export default StandaloneRouting;

OHIFViewer-react/src/ViewerFromStudyData.js

@@ -1,50 +1,8 @@
 import React, {Component} from "react";
 import PropTypes from "prop-types";
-import Viewer from "./viewer/viewer.js";
 import OHIF from 'ohif-core';
-import { sortingManager } from './lib/sortingManager.js';
-import { updateMetaDataManager } from './lib/updateMetaDataManager.js';
-
-// TODO: Move to react-viewerbase
-function createDisplaySets(studies) {
-    // Define the OHIF.viewer.data global object
-    // TODO: Save all data that is currently in OHIF.viewer in redux instead
-    //OHIF.viewer.data = OHIF.viewer.data || {};
-
-    // @TypeSafeStudies
-    // Clears OHIF.viewer.Studies collection
-    //OHIF.viewer.Studies.removeAll();
-
-    // @TypeSafeStudies
-    // Clears OHIF.viewer.StudyMetadataList collection
-    //OHIF.viewer.StudyMetadataList.removeAll();
-
-    //OHIF.viewer.data.studyInstanceUids = [];
-
-    const updatedStudies = studies.map(study => {
-        const studyMetadata = new OHIF.metadata.OHIFStudyMetadata(study, study.studyInstanceUid);
-        let displaySets = study.displaySets;
-
-        if (!study.displaySets) {
-            displaySets = sortingManager.getDisplaySets(studyMetadata);
-            study.displaySets = displaySets;
-        }
-
-        studyMetadata.setDisplaySets(displaySets);
-
-        study.selected = true;
-        //OHIF.viewer.Studies.insert(study);
-        //OHIF.viewer.StudyMetadataList.insert(studyMetadata);
-        //OHIF.viewer.data.studyInstanceUids.push(study.studyInstanceUid);
-
-        // Updates WADO-RS metaDataManager
-        updateMetaDataManager(study);
-
-        return study;
-    });
-
-    return updatedStudies;
-}
+import Viewer from "./viewer/viewer.js";
+import createDisplaySets from './lib/createDisplaySets.js';
 
 class ViewerFromStudyData extends Component {
     constructor(props) {

OHIFViewer-react/src/lib/createDisplaySets.js

@@ -0,0 +1,44 @@
+import OHIF from 'ohif-core';
+import { sortingManager } from './sortingManager.js';
+import { updateMetaDataManager } from './updateMetaDataManager.js';
+
+// TODO: Move to react-viewerbase
+export default function createDisplaySets(studies) {
+    // Define the OHIF.viewer.data global object
+    // TODO: Save all data that is currently in OHIF.viewer in redux instead
+    //OHIF.viewer.data = OHIF.viewer.data || {};
+
+    // @TypeSafeStudies
+    // Clears OHIF.viewer.Studies collection
+    //OHIF.viewer.Studies.removeAll();
+
+    // @TypeSafeStudies
+    // Clears OHIF.viewer.StudyMetadataList collection
+    //OHIF.viewer.StudyMetadataList.removeAll();
+
+    //OHIF.viewer.data.studyInstanceUids = [];
+
+    const updatedStudies = studies.map(study => {
+        const studyMetadata = new OHIF.metadata.OHIFStudyMetadata(study, study.studyInstanceUid);
+        let displaySets = study.displaySets;
+
+        if (!study.displaySets) {
+            displaySets = sortingManager.getDisplaySets(studyMetadata);
+            study.displaySets = displaySets;
+        }
+
+        studyMetadata.setDisplaySets(displaySets);
+
+        study.selected = true;
+        //OHIF.viewer.Studies.insert(study);
+        //OHIF.viewer.StudyMetadataList.insert(studyMetadata);
+        //OHIF.viewer.data.studyInstanceUids.push(study.studyInstanceUid);
+
+        // Updates WADO-RS metaDataManager
+        updateMetaDataManager(study);
+
+        return study;
+    });
+
+    return updatedStudies;
+}

OHIFViewer-react/src/sha.js

@@ -1 +1 @@
-export default 'fc5bd73c1ed247b233bfc7ebed1fb00c990f98d5';
+export default 'cd6f177bca2cf2258d3cd5a148500715ac759b04';