Chore/kill yalc with fire (#629)

* init * more shifting * Move @babel dependencies up to workspace root * Begin updating dependent libraries to use sync'd webpack builds w/ watches * Commit changes before a long weekend * Split packages into platform and extensions * Consolidate how/where we specify file/module type entrypoints * Make it possible to pass in extensions as App props * Resolve viewer's modules * Target for UMD bundle * Add Webpack Stylus loader * Provide WebPack build options for microscopy, vtk, and ui * Better entrypoint for extensions * Push changes up to switch PCs * Fix ESM symlink build for Viewers * Shift docs to root * Specify additional lerna config props * Begin providing basic readme info * Rename example extension folder * Shift links to bottom of doc * First attempt at a netlify deploy preview * Attempt to fix deploy preview build * push workspace enabled to initial command; remove second yarn install; use npx to call gitbook cli commands * Try to use global gitbook-cli * Export node_modules path * More agressive with modifying PATH * Follow deploy log output advice * try again to set bin path * Try swapping bash with a new shell * Try bash -l instead of exec bash * Annd let's try again * and again * We may have figured it out johnny, boy * We need to pull cornerstone-wado-image-loader files from hoisted node_modules * Attempt to fix ticks/escapes * Change copy syntax; try running tests on viewers from root for circleci * Lower version to match circleci image * Try alternative jest-canvas-mock location and version file syntax * Run version command instead of calling node directly * Try alternative jest transform * Set path and enable workspaces * Add codecov flags * Use cpx so our copying finishes? * Get all platform unit tests to run * Run and report individually and in parallel * Try once relying on codecov yaml to split w/ flags * Add projects to split by flags * Generate separate reports * Trigger codecov after everything has finished running; these may not support flags * Use recommended flags from issue comments for codecov * Fix typo * Remove clear flag * Shift back to calling codecov from root * Generate example for codecov issue * Try fixing paths * Simplify * Try using codecov orb * Bump circleci version * Upload core and viewer * Use full string paths * Remove individual codecov calls * Fix dir * Combine files before upload * Escape anchors * tryfix syntax * Escape string literal * Combine lines to reduce path * long paths * Use home alias * Fix filename * Try to see the contents of our cat'd file * Also upload `core` * Try running with aliased folder * Fix path; split PR and Merge unit tests into separate jobs * Set default threshold * Fix typo * Changing to scoped package names * Adding note * Catch more updates * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.0 - @ohif/extension-dicom-html@0.0.4-alpha.0 - @ohif/extension-dicom-microscopy@0.0.9-alpha.0 - @ohif/extension-dicom-pdf@0.0.8-alpha.0 - @ohif/extension-vtk@0.1.4-alpha.0 - @ohif/core@0.11.1-alpha.0 - @ohif/i18n@0.2.3-alpha.0 - @ohif/ui@0.2.18-alpha.0 - @ohif/viewer@0.0.22-alpha.0 * Clean up primary readme * Support for dev and dev:* commands * Shift build command; satisfy default PWA build * Remove old scripts * Clean up UI to set webpack scripts * Tidy up project links * Clean duplicate code in UI project * Update UI project's docs * Clean up ui and i18n config * Reduce duplicate code in `@ohif/core` * Fix @ohif/ui versions * bump @ohif/core versions * Redux testkit dep * Remove unused/duplicate config files for projects/packages * ohif-core --> @ohif/core * Safer publish command * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.1 - @ohif/extension-dicom-html@0.0.4-alpha.1 - @ohif/extension-dicom-microscopy@0.0.9-alpha.1 - @ohif/extension-dicom-pdf@0.0.8-alpha.1 - @ohif/extension-vtk@0.1.4-alpha.1 - @ohif/core@0.11.1-alpha.1 - @ohif/i18n@0.2.3-alpha.1 - @ohif/ui@0.2.18-alpha.1 - @ohif/viewer@0.0.22-alpha.1 * test version bump * Add global prettier config * chore(release): publish %s [skip ci] - @ohif/viewer@0.0.22-alpha.2 * test lerna publish * Update package.jsons * Fix build scripts * catch changes * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.2 - @ohif/extension-dicom-html@0.0.4-alpha.2 - @ohif/extension-dicom-microscopy@0.0.9-alpha.2 - @ohif/extension-dicom-pdf@0.0.8-alpha.2 - @ohif/extension-vtk@0.1.4-alpha.2 - @ohif/core@0.11.1-alpha.2 - @ohif/i18n@0.2.3-alpha.2 - @ohif/ui@0.2.18-alpha.2 - @ohif/viewer@0.0.22-alpha.3 * fix eslint issues caused by eslint 6 and our react-app config * Publish with canary tag * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.3 - @ohif/extension-dicom-html@0.0.4-alpha.3 - @ohif/extension-dicom-microscopy@0.0.9-alpha.3 - @ohif/extension-dicom-pdf@0.0.8-alpha.3 - @ohif/extension-vtk@0.1.4-alpha.3 - @ohif/core@0.11.1-alpha.3 - @ohif/i18n@0.2.3-alpha.3 - @ohif/ui@0.2.18-alpha.3 - @ohif/viewer@0.0.22-alpha.4 * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.4 - @ohif/extension-dicom-html@0.0.4-alpha.4 - @ohif/extension-dicom-microscopy@0.0.9-alpha.4 - @ohif/extension-dicom-pdf@0.0.8-alpha.4 - @ohif/extension-vtk@0.1.4-alpha.4 - @ohif/core@0.11.1-alpha.4 - @ohif/i18n@0.2.3-alpha.4 - @ohif/ui@0.2.18-alpha.4 - @ohif/viewer@0.0.22-alpha.5 * Simplify build * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.5 - @ohif/extension-dicom-html@0.0.4-alpha.5 - @ohif/extension-dicom-microscopy@0.0.9-alpha.5 - @ohif/extension-dicom-pdf@0.0.8-alpha.5 - @ohif/extension-vtk@0.1.4-alpha.5 - @ohif/core@0.11.1-alpha.5 - @ohif/i18n@0.2.3-alpha.5 - @ohif/ui@0.2.18-alpha.5 - @ohif/viewer@0.0.22-alpha.6 * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.6 - @ohif/extension-dicom-html@0.0.4-alpha.6 - @ohif/extension-dicom-microscopy@0.0.9-alpha.6 - @ohif/extension-dicom-pdf@0.0.8-alpha.6 - @ohif/extension-vtk@0.1.4-alpha.6 - @ohif/core@0.11.1-alpha.6 - @ohif/i18n@0.2.3-alpha.6 - @ohif/ui@0.2.18-alpha.6 - @ohif/viewer@0.0.22-alpha.7 * Split version and publish * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.7 - @ohif/extension-dicom-html@0.0.4-alpha.7 - @ohif/extension-dicom-microscopy@0.0.9-alpha.7 - @ohif/extension-dicom-pdf@0.0.8-alpha.7 - @ohif/extension-vtk@0.1.4-alpha.7 - @ohif/core@0.11.1-alpha.7 - @ohif/i18n@0.2.3-alpha.7 - @ohif/ui@0.2.18-alpha.7 - @ohif/viewer@0.0.22-alpha.8 * Try simplify netlify build * react-viewerbase --> @ohif/ui * add test for stylus loader * Try new way to specify publish path * Use an output folder that won't be ignored * Try move command * fiddle with paths * Dig for some information * Make sure we're in root for our commands * Remove discovery * Setup script-tag example * Fix typo * Move config folder * Update cornerstone extension to use shared/root webpack configs * capture changes * Update extension webpack configs * Don't check in docz output * Fix babel runtime resolution issue * Simplify ui build steps * Push in progress * Shift directories * Get viewer dev path to work * Fix viewer commonjs build * Fix build pwa config for viewers * Make sure our package specific command can be called from root * Update notes * Fix imports and misc. merge notes * Bump wado-image-loader version * Switch up commands to remove webworkers copy * Fix CI config * Fix more broken package references * Add react-dropzone * Persist so e2e test can use * Fix lockfile * Use cypress orb to simplify CI * Fix config * Try again * Install yarn latest for orb * Install yarn a different way * Wait on correct port * Run tests in viewer project * Fix cypress config * Make Cypress happier - use default location * Simplify e2e testing * Capture UI changes since fork * Catch core up * Grab latest deps after merge * Fix broken import * Make sure cornerstone-wado-image-loader resolves to 3+ * Note regarding orbs * Fix refresh on 404 routes * Fix odd error for cornerstone-wado-image-loader * Different target for UMD * Simplify dev script * Try to get fancy with netlify output * Let's do it again * Try to fix measurementTools issue * See if we can get our lerna magic to work on merge to monorepo branch
2019-08-13 15:36:46 -04:00
1 parent cac911f08e
commit 08ff214ea6
@@ -0,0 +1,32 @@
+import React, { Component } from 'react';
+import { withRouter } from 'react-router-dom';
+import PropTypes from 'prop-types';
+import { CallbackComponent } from 'redux-oidc';
+
+class CallbackPage extends Component {
+  static propTypes = {
+    userManager: PropTypes.object.isRequired,
+    history: PropTypes.object.isRequired,
+  };
+
+  render() {
+    return (
+      <CallbackComponent
+        userManager={this.props.userManager}
+        successCallback={() => {
+          const pathname = sessionStorage.getItem('ohif-redirect-to');
+
+          this.props.history.push(pathname);
+        }}
+        errorCallback={error => {
+          //this.props.history.push("/");
+          throw new Error(error);
+        }}
+      >
+        <div>Redirecting...</div>
+      </CallbackComponent>
+    );
+  }
+}
+
+export default withRouter(CallbackPage);
@@ -0,0 +1,61 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { withRouter } from 'react-router-dom';
+import queryString from 'query-string';
+import ConnectedViewerRetrieveStudyData from '../connectedComponents/ConnectedViewerRetrieveStudyData.js';
+
+function decodeStudyUids(studyUids) {
+  const decodedData = window.atob(studyUids);
+
+  return decodedData.split(';');
+}
+
+function getQueryParameters(location) {
+  if (location) {
+    return queryString.parse(location.search);
+  }
+
+  return {};
+}
+
+function IHEInvokeImageDisplay({ location }) {
+  const {
+    // patientID,
+    requestType,
+    studyUID,
+  } = getQueryParameters(location);
+
+  switch (requestType) {
+    case 'STUDY':
+      return (
+        <ConnectedViewerRetrieveStudyData
+          studyInstanceUids={studyUID.split(';')}
+        />
+      );
+
+    case 'STUDYBASE64':
+      return (
+        <ConnectedViewerRetrieveStudyData
+          studyInstanceUids={decodeStudyUids(studyUID)}
+        />
+      );
+
+    case 'PATIENT':
+      // TODO: connect this to the StudyList when we have the filter parameters set up
+      // return <StudyList patientUids={patientID.split(';')} />;
+      return '';
+
+    default:
+      // TODO: Figure out what to do here, this won't work because StudyList expects studies
+      // return <StudyList />;
+      return '';
+  }
+}
+
+IHEInvokeImageDisplay.propTypes = {
+  location: PropTypes.shape({
+    search: PropTypes.string,
+  }).isRequired,
+};
+
+export default withRouter(IHEInvokeImageDisplay);
@@ -0,0 +1,9 @@
+.not-found {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  color: white;
+}
@@ -0,0 +1,16 @@
+import React from 'react';
+import './NotFound.css';
+import { Link } from 'react-router-dom';
+
+export default function NotFound() {
+  return (
+    <div className={'not-found'}>
+      <div>
+        <h4>Sorry, this page does not exist.</h4>
+        <h5>
+          <Link to={'/'}>Go back to the Study List</Link>
+        </h5>
+      </div>
+    </div>
+  );
+}
@@ -0,0 +1,142 @@
+import React, { Component } from "react";
+import { log, metadata, studies, utils } from "@ohif/core";
+
+import PropTypes from "prop-types";
+import Viewer from "../connectedComponents/Viewer";
+import { extensionManager } from "./../App.js";
+import qs from "querystring";
+
+const { OHIFStudyMetadata } = metadata;
+const { retrieveStudiesMetadata } = studies;
+const { studyMetadataManager, updateMetaDataManager } = utils;
+
+class StandaloneRouting extends Component {
+  state = {
+    studies: null,
+    error: null
+  };
+
+  static propTypes = {
+    location: PropTypes.object,
+    store: PropTypes.object
+  };
+
+  static 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 => {
+        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) {
+          log.warn("Response was undefined");
+          reject(new Error("Response was undefined"));
+        }
+
+        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 = [];
+
+          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
+      log.info(`Sending Request to: ${url}`);
+      oReq.open("GET", url);
+      oReq.setRequestHeader("Accept", "application/json");
+
+      // Fire the request to the server
+      oReq.send();
+    });
+  }
+
+  async componentDidMount() {
+    try {
+      let { search } = this.props.location;
+
+      // Remove ? prefix which is included for some reason
+      search = search.slice(1, search.length);
+
+      const query = qs.parse(search);
+      const studies = await StandaloneRouting.parseQueryAndFetchStudies(query);
+
+      studyMetadataManager.purge();
+
+      // Map studies to new format, update metadata manager?
+      const updatedStudies = studies.map(study => {
+        const studyMetadata = new OHIFStudyMetadata(
+          study,
+          study.studyInstanceUid
+        );
+        const sopClassHandlerModules =
+          extensionManager.modules["sopClassHandlerModule"];
+
+        study.displaySets =
+          study.displaySets ||
+          studyMetadata.createDisplaySets(sopClassHandlerModules);
+        studyMetadata.setDisplaySets(study.displaySets);
+
+        // Updates WADO-RS metaDataManager
+        updateMetaDataManager(study);
+
+        studyMetadataManager.add(studyMetadata);
+
+        return study;
+      });
+
+      this.setState({ studies: updatedStudies });
+    } 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} />;
+  }
+}
+
+export default StandaloneRouting;
@@ -0,0 +1,35 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ConnectedViewerRetrieveStudyData from '../connectedComponents/ConnectedViewerRetrieveStudyData';
+
+function ViewerRouting({ match }) {
+  const { studyInstanceUids, seriesInstanceUids } = match.params;
+
+  let studyUIDs;
+  let seriesUIDs;
+
+  if (studyInstanceUids && !seriesInstanceUids) {
+    studyUIDs = studyInstanceUids.split(';');
+  } else if (studyInstanceUids && seriesInstanceUids) {
+    studyUIDs = [studyInstanceUids];
+    seriesUIDs = match.params.seriesInstanceUids.split(';');
+  }
+
+  return (
+    <ConnectedViewerRetrieveStudyData
+      studyInstanceUids={studyUIDs}
+      seriesInstanceUids={seriesUIDs}
+    />
+  );
+}
+
+ViewerRouting.propTypes = {
+  match: PropTypes.shape({
+    params: PropTypes.shape({
+      studyInstanceUids: PropTypes.string.isRequired,
+      seriesInstanceUids: PropTypes.string,
+    }),
+  }),
+};
+
+export default ViewerRouting;