* 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
429 lines
13 KiB
JavaScript
429 lines
13 KiB
JavaScript
import './StudyList.styl';
|
|
|
|
import React, { Component } from 'react';
|
|
|
|
import CustomDateRangePicker from './CustomDateRangePicker.js';
|
|
import { Icon } from './../../elements/Icon';
|
|
import { PaginationArea } from './PaginationArea.js';
|
|
import PropTypes from 'prop-types';
|
|
import { StudyListLoadingText } from './StudyListLoadingText.js';
|
|
import { StudylistToolbar } from './StudyListToolbar.js';
|
|
import { isInclusivelyBeforeDay } from 'react-dates';
|
|
import moment from 'moment';
|
|
import debounce from 'lodash.debounce';
|
|
import { withTranslation } from '../../utils/LanguageProvider';
|
|
|
|
const today = moment();
|
|
const lastWeek = moment().subtract(7, 'day');
|
|
const lastMonth = moment().subtract(1, 'month');
|
|
|
|
class StudyList extends Component {
|
|
static propTypes = {
|
|
studies: PropTypes.array.isRequired,
|
|
onSelectItem: PropTypes.func.isRequired,
|
|
onSearch: PropTypes.func.isRequired,
|
|
currentPage: PropTypes.number,
|
|
rowsPerPage: PropTypes.number,
|
|
studyListDateFilterNumDays: PropTypes.number,
|
|
studyListFunctionsEnabled: PropTypes.bool,
|
|
defaultSort: PropTypes.shape({
|
|
field: PropTypes.string.isRequired,
|
|
order: PropTypes.oneOf(['desc', 'asc']).isRequired,
|
|
}),
|
|
onImport: PropTypes.func,
|
|
pageOptions: PropTypes.array,
|
|
};
|
|
|
|
static defaultProps = {
|
|
currentPage: 0,
|
|
rowsPerPage: 25,
|
|
studyListDateFilterNumDays: 7,
|
|
};
|
|
|
|
static studyDatePresets = [
|
|
{
|
|
text: 'Today',
|
|
start: today,
|
|
end: today,
|
|
},
|
|
{
|
|
text: 'Last 7 days',
|
|
start: lastWeek,
|
|
end: today,
|
|
},
|
|
{
|
|
text: 'Last 30 days',
|
|
start: lastMonth,
|
|
end: today,
|
|
},
|
|
];
|
|
|
|
constructor(props) {
|
|
super(props);
|
|
|
|
const sortData = {
|
|
field: undefined,
|
|
order: undefined,
|
|
};
|
|
|
|
// init from props
|
|
if (props.defaultSort) {
|
|
sortData.field = props.defaultSort.field;
|
|
// todo: -1, 0, 1?
|
|
sortData.order = props.defaultSort.order; // asc, desc
|
|
}
|
|
|
|
this.defaultStartDate = moment().subtract(
|
|
this.props.studyListDateFilterNumDays,
|
|
'days'
|
|
);
|
|
this.defaultEndDate = moment();
|
|
|
|
this.state = {
|
|
loading: false,
|
|
error: false,
|
|
searchData: {
|
|
sortData,
|
|
currentPage: this.props.currentPage,
|
|
rowsPerPage: this.props.rowsPerPage,
|
|
studyDateFrom: this.defaultStartDate,
|
|
studyDateTo: this.defaultEndDate,
|
|
},
|
|
highlightedItem: '',
|
|
};
|
|
|
|
this.getChangeHandler = this.getChangeHandler.bind(this);
|
|
this.getBlurHandler = this.getBlurHandler.bind(this);
|
|
this.onInputKeydown = this.onInputKeydown.bind(this);
|
|
this.nextPage = this.nextPage.bind(this);
|
|
this.prevPage = this.prevPage.bind(this);
|
|
this.onRowsPerPageChange = this.onRowsPerPageChange.bind(this);
|
|
this.delayedSearch = debounce(this.search, 250);
|
|
}
|
|
|
|
getChangeHandler(key) {
|
|
return event => {
|
|
this.delayedSearch.cancel();
|
|
this.setSearchData(key, event.target.value, this.delayedSearch);
|
|
};
|
|
}
|
|
|
|
getBlurHandler(key) {
|
|
return event => {
|
|
this.delayedSearch.cancel();
|
|
this.setSearchData(key, event.target.value, this.search);
|
|
};
|
|
}
|
|
|
|
setSearchData(key, value, callback) {
|
|
const searchData = this.state.searchData;
|
|
searchData[key] = value;
|
|
this.setState({ searchData }, callback);
|
|
}
|
|
|
|
setSearchDataBatch(keyValues, callback) {
|
|
const searchData = this.state.searchData;
|
|
|
|
Object.keys(keyValues).forEach(key => {
|
|
searchData[key] = keyValues[key];
|
|
});
|
|
|
|
this.setState({ searchData }, callback);
|
|
}
|
|
|
|
async onInputKeydown(event) {
|
|
if (event.key === 'Enter') {
|
|
event.preventDefault();
|
|
event.stopPropagation();
|
|
|
|
this.delayedSearch.cancel();
|
|
// reset the page because user is doing a new search
|
|
this.setSearchData('currentPage', 0, this.search);
|
|
}
|
|
}
|
|
|
|
async search() {
|
|
try {
|
|
this.setState({ loading: true, error: false });
|
|
await this.props.onSearch(this.state.searchData);
|
|
} catch (error) {
|
|
this.setState({ error: true });
|
|
throw new Error(error);
|
|
} finally {
|
|
this.setState({ loading: false });
|
|
}
|
|
}
|
|
|
|
renderNoMachingResults() {
|
|
if (!this.props.studies.length && !this.state.error) {
|
|
return <div className="notFound">No matching results</div>;
|
|
}
|
|
}
|
|
|
|
renderHasError() {
|
|
if (this.state.error) {
|
|
return (
|
|
<div className="notFound">There was an error fetching studies</div>
|
|
);
|
|
}
|
|
}
|
|
|
|
renderIsLoading() {
|
|
if (this.state.loading) {
|
|
return (
|
|
<div className="loading">
|
|
<StudyListLoadingText />
|
|
</div>
|
|
);
|
|
}
|
|
}
|
|
|
|
nextPage(currentPage) {
|
|
currentPage = currentPage + 1;
|
|
this.delayedSearch.cancel();
|
|
this.setSearchData('currentPage', currentPage, this.search);
|
|
}
|
|
|
|
prevPage(currentPage) {
|
|
currentPage = currentPage - 1;
|
|
this.delayedSearch.cancel();
|
|
this.setSearchData('currentPage', currentPage, this.search);
|
|
}
|
|
|
|
onRowsPerPageChange(rowsPerPage) {
|
|
this.delayedSearch.cancel();
|
|
this.setSearchDataBatch({ rowsPerPage, currentPage: 0 }, this.search);
|
|
}
|
|
|
|
onSortClick(field) {
|
|
return () => {
|
|
let order;
|
|
const sort = this.state.searchData.sortData;
|
|
const isSortedField = sort.field === field;
|
|
|
|
if (isSortedField) {
|
|
if (sort.order === 'asc') {
|
|
order = 'desc';
|
|
} else {
|
|
order = undefined;
|
|
field = undefined;
|
|
}
|
|
} else {
|
|
order = 'asc';
|
|
}
|
|
|
|
this.delayedSearch.cancel();
|
|
this.setSearchData('sortData', { field, order }, this.search);
|
|
};
|
|
}
|
|
|
|
onHighlightItem(studyItemUid) {
|
|
this.setState({ highlightedItem: studyItemUid });
|
|
}
|
|
|
|
renderTableRow(study) {
|
|
return (
|
|
<tr
|
|
key={study.studyInstanceUid}
|
|
className={
|
|
this.state.highlightedItem === study.studyInstanceUid
|
|
? 'studylistStudy noselect active'
|
|
: 'studylistStudy noselect'
|
|
}
|
|
onMouseDown={event => {
|
|
// middle/wheel click
|
|
if (event.button === 1) {
|
|
this.props.onSelectItem(study.studyInstanceUid);
|
|
}
|
|
}}
|
|
onClick={() => {
|
|
this.onHighlightItem(study.studyInstanceUid);
|
|
this.props.onSelectItem(study.studyInstanceUid);
|
|
}}
|
|
>
|
|
<td className={study.patientName ? 'patientName' : 'emptyCell'}>
|
|
{study.patientName || `(${this.props.t('Empty')})`}
|
|
</td>
|
|
|
|
<td className="patientId">{study.patientId}</td>
|
|
<td className="accessionNumber">{study.accessionNumber}</td>
|
|
<td className="studyDate">{study.studyDate}</td>
|
|
<td className="modalities">{study.modalities}</td>
|
|
<td className="studyDescription">{study.studyDescription}</td>
|
|
</tr>
|
|
);
|
|
}
|
|
|
|
render() {
|
|
const tableMeta = {
|
|
patientName: {
|
|
displayText: this.props.t('PatientName'),
|
|
sort: 0,
|
|
},
|
|
patientId: {
|
|
displayText: this.props.t('MRN'),
|
|
sort: 0,
|
|
},
|
|
accessionNumber: {
|
|
displayText: this.props.t('AccessionNumber'),
|
|
sort: 0,
|
|
},
|
|
studyDate: {
|
|
displayText: this.props.t('StudyDate'),
|
|
inputType: 'date-range',
|
|
sort: 0,
|
|
},
|
|
modalities: {
|
|
displayText: this.props.t('Modality'),
|
|
sort: 0,
|
|
},
|
|
studyDescription: {
|
|
displayText: this.props.t('StudyDescription'),
|
|
sort: 0,
|
|
},
|
|
};
|
|
|
|
// Apply sort
|
|
const sortedFieldName = this.state.searchData.sortData.field;
|
|
const sortedField = tableMeta[sortedFieldName];
|
|
|
|
if (sortedField) {
|
|
const sortOrder = this.state.searchData.sortData.order;
|
|
sortedField.sort = sortOrder === 'asc' ? 1 : 2;
|
|
}
|
|
|
|
// Sort Icons
|
|
const sortIcons = ['sort', 'sort-up', 'sort-down'];
|
|
|
|
return (
|
|
<div className="StudyList">
|
|
<div className="studyListToolbar clearfix">
|
|
<div className="header pull-left">{this.props.t('StudyList')}</div>
|
|
<div className="studyCount pull-right">
|
|
{this.props.studies.length}
|
|
</div>
|
|
<div className="pull-right">
|
|
{this.props.studyListFunctionsEnabled ? (
|
|
<StudylistToolbar onImport={this.props.onImport} />
|
|
) : null}
|
|
</div>
|
|
{this.props.children}
|
|
</div>
|
|
<div className="theadBackground" />
|
|
<div id="studyListContainer">
|
|
<table id="tblStudyList" className="studylistResult table noselect">
|
|
<thead>
|
|
<tr>
|
|
{Object.keys(tableMeta).map((fieldName, i) => {
|
|
const field = tableMeta[fieldName];
|
|
|
|
return (
|
|
<React.Fragment key={i}>
|
|
<th className={fieldName}>
|
|
<div
|
|
id={`_${fieldName}`}
|
|
className="display-text"
|
|
onClick={this.onSortClick(fieldName)}
|
|
>
|
|
<span>{field.displayText}</span>
|
|
<Icon
|
|
name={sortIcons[field.sort]}
|
|
style={{ fontSize: '12px' }}
|
|
/>
|
|
</div>
|
|
{!field.inputType && (
|
|
<input
|
|
type="text"
|
|
className="form-control studylist-search"
|
|
id={fieldName}
|
|
value={this.state[fieldName]}
|
|
onKeyDown={this.onInputKeydown}
|
|
onChange={this.getChangeHandler(fieldName)}
|
|
onBlur={this.getBlurHandler(fieldName)}
|
|
/>
|
|
)}
|
|
{field.inputType === 'date-range' && (
|
|
<div style={{ display: 'block' }}>
|
|
<CustomDateRangePicker
|
|
presets={StudyList.studyDatePresets}
|
|
showClearDates={true}
|
|
startDateId="studyListStartDate"
|
|
endDateId="studyListEndDate"
|
|
startDate={this.defaultStartDate}
|
|
endDate={this.defaultEndDate}
|
|
hideKeyboardShortcutsPanel={true}
|
|
anchorDirection="left"
|
|
isOutsideRange={day =>
|
|
!isInclusivelyBeforeDay(day, moment())
|
|
}
|
|
onDatesChange={({
|
|
startDate,
|
|
endDate,
|
|
preset = false,
|
|
}) => {
|
|
if (
|
|
startDate &&
|
|
endDate &&
|
|
(this.state.focusedInput === 'endDate' ||
|
|
preset)
|
|
) {
|
|
this.setSearchDataBatch(
|
|
{
|
|
studyDateFrom: startDate.toDate(),
|
|
studyDateTo: endDate.toDate(),
|
|
},
|
|
this.search
|
|
);
|
|
this.setState({ focusedInput: false });
|
|
} else if (!startDate && !endDate) {
|
|
this.setSearchDataBatch(
|
|
{
|
|
studyDateFrom: null,
|
|
studyDateTo: null,
|
|
},
|
|
this.search
|
|
);
|
|
}
|
|
}}
|
|
focusedInput={this.state.focusedInput}
|
|
onFocusChange={focusedInput => {
|
|
this.setState({ focusedInput });
|
|
}}
|
|
/>
|
|
</div>
|
|
)}
|
|
</th>
|
|
</React.Fragment>
|
|
);
|
|
})}
|
|
</tr>
|
|
</thead>
|
|
<tbody id="studyListData">
|
|
{this.props.studies.map(study => {
|
|
return this.renderTableRow(study);
|
|
})}
|
|
</tbody>
|
|
</table>
|
|
|
|
{this.renderIsLoading()}
|
|
{this.renderHasError()}
|
|
{this.renderNoMachingResults()}
|
|
|
|
<PaginationArea
|
|
pageOptions={this.props.pageOptions}
|
|
currentPage={this.state.searchData.currentPage}
|
|
nextPageFunc={this.nextPage}
|
|
prevPageFunc={this.prevPage}
|
|
onRowsPerPageChange={this.onRowsPerPageChange}
|
|
rowsPerPage={this.state.searchData.rowsPerPage}
|
|
recordCount={this.props.studies.length}
|
|
/>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
}
|
|
|
|
const connectedComponent = withTranslation('StudyList')(StudyList);
|
|
export { connectedComponent as StudyList };
|