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,21 @@
+import { connect } from 'react-redux';
+
+import StudyListWithData from './StudyListWithData.js';
+
+const isActive = a => a.active === true;
+
+const mapStateToProps = state => {
+  const activeServer = state.servers.servers.find(isActive);
+
+  return {
+    server: activeServer,
+    user: state.oidc.user,
+  };
+};
+
+const ConnectedStudyList = connect(
+  mapStateToProps,
+  null
+)(StudyListWithData);
+
+export default ConnectedStudyList;
@@ -0,0 +1,43 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { withRouter } from 'react-router-dom';
+import queryString from 'query-string';
+import ConnectedStudyList from './ConnectedStudyList';
+
+// TODO: Move to @ohif/ui
+
+function toLowerCaseFirstLetter(word) {
+  return word[0].toLowerCase() + word.slice(1);
+}
+
+function getFilters({ search }) {
+  const searchParameters = queryString.parse(search);
+  const filters = {};
+
+  Object.entries(searchParameters).forEach(([key, value]) => {
+    filters[toLowerCaseFirstLetter(key)] = value;
+  });
+
+  return filters;
+}
+
+function StudyListRouting({ location }) {
+  const filters = location ? getFilters(location) : undefined;
+
+  let studyListFunctionsEnabled = false;
+  if (window.config && window.config.studyListFunctionsEnabled) {
+    studyListFunctionsEnabled = window.config.studyListFunctionsEnabled;
+  }
+  return <ConnectedStudyList
+    filters={filters}
+    studyListFunctionsEnabled={studyListFunctionsEnabled}
+  />;
+}
+
+StudyListRouting.propTypes = {
+  location: PropTypes.shape({
+    search: PropTypes.string,
+  }).isRequired,
+};
+
+export default withRouter(StudyListRouting);
@@ -0,0 +1,296 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import Dropzone from 'react-dropzone';
+import OHIF from '@ohif/core';
+import { withRouter } from 'react-router-dom';
+import { withTranslation } from 'react-i18next';
+import { StudyList } from '@ohif/ui';
+import ConnectedHeader from '../connectedComponents/ConnectedHeader.js';
+import moment from 'moment';
+import ConnectedDicomFilesUploader from '../googleCloud/ConnectedDicomFilesUploader';
+import ConnectedDicomStorePicker from '../googleCloud/ConnectedDicomStorePicker';
+import filesToStudies from '../lib/filesToStudies.js';
+import UserManagerContext from '../UserManagerContext';
+import WhiteLabellingContext from '../WhiteLabellingContext';
+
+class StudyListWithData extends Component {
+  state = {
+    searchData: {},
+    studies: [],
+    error: null,
+    modalComponentId: null,
+  };
+
+  static propTypes = {
+    filters: PropTypes.object,
+    patientId: PropTypes.string,
+    server: PropTypes.object,
+    user: PropTypes.object,
+    history: PropTypes.object,
+    studyListFunctionsEnabled: PropTypes.bool,
+  };
+
+  static defaultProps = {
+    studyListFunctionsEnabled: true,
+  };
+
+  static rowsPerPage = 25;
+  static defaultSort = { field: 'patientName', order: 'desc' };
+
+  static studyListDateFilterNumDays = 25000; // TODO: put this in the settings
+  static defaultStudyDateFrom = moment()
+    .subtract(StudyListWithData.studyListDateFilterNumDays, 'days')
+    .toDate();
+  static defaultStudyDateTo = new Date();
+  static defaultSearchData = {
+    currentPage: 0,
+    rowsPerPage: StudyListWithData.rowsPerPage,
+    studyDateFrom: StudyListWithData.defaultStudyDateFrom,
+    studyDateTo: StudyListWithData.defaultStudyDateTo,
+    sortData: StudyListWithData.defaultSort,
+  };
+
+  componentDidMount() {
+    // TODO: Avoid using timepoints here
+    //const params = { studyInstanceUids, seriesInstanceUids, timepointId, timepointsFilter={} };
+    if (!this.props.server && window.config.enableGoogleCloudAdapter) {
+      this.setState({
+        modalComponentId: 'DicomStorePicker',
+      });
+    } else {
+      this.searchForStudies({
+        ...StudyListWithData.defaultSearchData,
+        ...(this.props.filters || {}),
+      });
+    }
+  }
+
+  componentDidUpdate(prevProps) {
+    if (!this.state.searchData && !this.state.studies) {
+      this.searchForStudies();
+    }
+    if (this.props.server !== prevProps.server) {
+      this.setState({
+        modalComponentId: null,
+        searchData: null,
+        studies: null,
+      });
+    }
+  }
+
+  searchForStudies = (searchData = StudyListWithData.defaultSearchData) => {
+    const { server } = this.props;
+    const filter = {
+      patientId: searchData.patientId,
+      patientName: searchData.patientName,
+      accessionNumber: searchData.accessionNumber,
+      studyDescription: searchData.studyDescription,
+      modalitiesInStudy: searchData.modalities,
+      studyDateFrom: searchData.studyDateFrom,
+      studyDateTo: searchData.studyDateTo,
+      limit: searchData.rowsPerPage,
+      offset: searchData.currentPage * searchData.rowsPerPage,
+    };
+
+    if (server.supportsFuzzyMatching) {
+      filter.fuzzymatching = true;
+    }
+
+    // TODO: add sorting
+    const promise = OHIF.studies.searchStudies(server, filter);
+
+    // Render the viewer when the data is ready
+    promise
+      .then(studies => {
+        if (!studies) {
+          studies = [];
+        }
+
+        const { field, order } = searchData.sortData;
+        let sortedStudies = studies.map(study => {
+          if (!moment(study.studyDate, 'MMM DD, YYYY', true).isValid()) {
+            study.studyDate = moment(study.studyDate, 'YYYYMMDD').format(
+              'MMM DD, YYYY'
+            );
+          }
+          return study;
+        });
+
+        sortedStudies.sort(function(a, b) {
+          let fieldA = a[field];
+          let fieldB = b[field];
+          if (field === 'studyDate') {
+            fieldA = moment(fieldA).toISOString();
+            fieldB = moment(fieldB).toISOString();
+          }
+          if (order === 'desc') {
+            if (fieldA < fieldB) {
+              return -1;
+            }
+            if (fieldA > fieldB) {
+              return 1;
+            }
+            return 0;
+          } else {
+            if (fieldA > fieldB) {
+              return -1;
+            }
+            if (fieldA < fieldB) {
+              return 1;
+            }
+            return 0;
+          }
+        });
+
+        this.setState({
+          studies: sortedStudies,
+        });
+      })
+      .catch(error => {
+        this.setState({
+          error: true,
+        });
+
+        throw new Error(error);
+      });
+  };
+
+  onImport = () => {
+    this.openModal('DicomFilesUploader');
+  };
+
+  openModal = modalComponentId => {
+    this.setState({
+      modalComponentId,
+    });
+  };
+
+  closeModal = () => {
+    this.setState({ modalComponentId: null });
+  };
+
+  onSelectItem = studyInstanceUID => {
+    this.props.history.push(`/viewer/${studyInstanceUID}`);
+  };
+
+  onSearch = searchData => {
+    this.searchForStudies(searchData);
+  };
+
+  closeModals = () => {
+    this.setState({
+      modalComponentId: null,
+    });
+  };
+
+  render() {
+    const onDrop = async acceptedFiles => {
+      try {
+        const studies = await filesToStudies(acceptedFiles);
+
+        this.setState({ studies });
+      } catch (error) {
+        this.setState({ error });
+      }
+    };
+
+    if (this.state.error) {
+      return <div>Error: {JSON.stringify(this.state.error)}</div>;
+    } else if (this.state.studies === null && !this.state.modalComponentId) {
+      return <div>Loading...</div>;
+    }
+
+    let healthCareApiButtons = null;
+    let healthCareApiWindows = null;
+
+    // TODO: This should probably be a prop
+    if (window.config.enableGoogleCloudAdapter) {
+      healthCareApiWindows = (
+        <ConnectedDicomStorePicker
+          isOpen={this.state.modalComponentId === 'DicomStorePicker'}
+          onClose={this.closeModals}
+        />
+      );
+
+      healthCareApiButtons = (
+        <div
+          className="form-inline btn-group pull-right"
+          style={{ padding: '20px' }}
+        >
+          <button
+            className="btn btn-primary"
+            onClick={() => this.openModal('DicomStorePicker')}
+          >
+            {this.props.t('Change DICOM Store')}
+          </button>
+        </div>
+      );
+    }
+
+    const studyList = (
+      <div className="paginationArea">
+        {this.state.studies ? (
+          <StudyList
+            studies={this.state.studies}
+            studyListFunctionsEnabled={this.props.studyListFunctionsEnabled}
+            onImport={this.onImport}
+            onSelectItem={this.onSelectItem}
+            pageSize={this.rowsPerPage}
+            defaultSort={StudyListWithData.defaultSort}
+            studyListDateFilterNumDays={
+              StudyListWithData.studyListDateFilterNumDays
+            }
+            onSearch={this.onSearch}
+          >
+            {this.props.studyListFunctionsEnabled ? (
+              <ConnectedDicomFilesUploader
+                isOpen={this.state.modalComponentId === 'DicomFilesUploader'}
+                onClose={this.closeModals}
+              />
+            ) : null}
+            {healthCareApiButtons}
+            {healthCareApiWindows}
+          </StudyList>
+        ) : (
+          <Dropzone onDrop={onDrop}>
+            {({ getRootProps, getInputProps }) => (
+              <div {...getRootProps()} className={'drag-drop-instructions'}>
+                <h3>
+                  {this.props.t(
+                    'Drag and Drop DICOM files here to load them in the Viewer'
+                  )}
+                </h3>
+                <h4>
+                  {this.props.t("Or click to load the browser's file selector")}
+                </h4>
+                <input {...getInputProps()} style={{ display: 'none' }} />
+              </div>
+            )}
+          </Dropzone>
+        )}
+      </div>
+    );
+    return (
+      <>
+        <WhiteLabellingContext.Consumer>
+          {whiteLabelling => (
+            <UserManagerContext.Consumer>
+              {userManager => (
+                <ConnectedHeader
+                  home={true}
+                  user={this.props.user}
+                  userManager={userManager}
+                >
+                  {whiteLabelling.logoComponent}
+                </ConnectedHeader>
+              )}
+            </UserManagerContext.Consumer>
+          )}
+        </WhiteLabellingContext.Consumer>
+        {studyList}
+      </>
+    );
+  }
+}
+
+export default withRouter(withTranslation('Common')(StudyListWithData));