Instance metadata/metadata providers overhaul (#1481)

* Instance metadata plus metadata provider overhaul.

Fix consumption of wado-uri urls

fallbacks + datatype agnosticism.

WIP DICOMify things.

fix various issues with naturalized variable naming migration.

Remove metadata provider.

Fix consumption of multiframe images and addition of CWIL metadata.

Fix strange build issues.

Fix CWIL style windowWidth to array from naturalized DICOM.

Fix PT, CT, CR and DX issues for cornerstone + DX issues for vtkjs.

Move color palette fetching down to the natuaralized JSON level.

Remove unused StudyMetadataSummary

Remove redundant dicom metadata dictionary.

Working local + json routes.

Fix SR read.

Finished first round of testing + cleaned up debugging etc.

* data => metadata for instance naturalizedJSON

* Update dcmjs version

* Correct github isssues.

* Fix erroneously replaced files.

* Danny's recommended changes.

* Instance metadata plus metadata provider overhaul.

Fix consumption of wado-uri urls

fallbacks + datatype agnosticism.

WIP DICOMify things.

fix various issues with naturalized variable naming migration.

Remove metadata provider.

Fix consumption of multiframe images and addition of CWIL metadata.

Fix strange build issues.

Fix CWIL style windowWidth to array from naturalized DICOM.

Fix PT, CT, CR and DX issues for cornerstone + DX issues for vtkjs.

Move color palette fetching down to the natuaralized JSON level.

Remove unused StudyMetadataSummary

Remove redundant dicom metadata dictionary.

Working local + json routes.

Fix SR read.

Finished first round of testing + cleaned up debugging etc.

* data => metadata for instance naturalizedJSON

* Update dcmjs version

* Correct github isssues.

* Fix erroneously replaced files.

* Danny's recommended changes.

* Update JSON CI

* Update casing of import.

* Fix jump for SR.

* Fix unit tests for measurements service

* Fix json CI test.

* fix: update yarn lock

* Fix local non-encapsulated pdf view

* CI updated to new sucess message.

Co-authored-by: Danny <danny.ri.brown@gmail.com>

platform/ui/src/components/studyList/StudyList.js

@@ -43,25 +43,25 @@ function StudyList(props) {
   const largeTableMeta = [
     {
       displayText: t('PatientName'),
-      fieldName: 'patientName',
+      fieldName: 'PatientName',
       inputType: 'text',
       size: 330,
     },
     {
       displayText: t('MRN'),
-      fieldName: 'patientId',
+      fieldName: 'PatientID',
       inputType: 'text',
       size: 378,
     },
     {
       displayText: t('AccessionNumber'),
-      fieldName: 'accessionNumber',
+      fieldName: 'AccessionNumber',
       inputType: 'text',
       size: 180,
     },
     {
       displayText: t('StudyDate'),
-      fieldName: 'studyDate',
+      fieldName: 'StudyDate',
       inputType: 'date-range',
       size: 300,
     },
@@ -73,7 +73,7 @@ function StudyList(props) {
     },
     {
       displayText: t('StudyDescription'),
-      fieldName: 'studyDescription',
+      fieldName: 'StudyDescription',
       inputType: 'text',
       size: 335,
     },
@@ -94,7 +94,7 @@ function StudyList(props) {
     },
     {
       displayText: t('StudyDate'),
-      fieldName: 'studyDate',
+      fieldName: 'StudyDate',
       inputType: 'date-range',
       size: 300,
     },
@@ -178,15 +178,15 @@ function StudyList(props) {
         {!isLoading &&
           studies.map((study, index) => (
             <TableRow
-              key={`${study.studyInstanceUid}-${index}`}
-              onClick={studyInstanceUid => handleSelectItem(studyInstanceUid)}
-              accessionNumber={study.accessionNumber || ''}
+              key={`${study.StudyInstanceUID}-${index}`}
+              onClick={StudyInstanceUID => handleSelectItem(StudyInstanceUID)}
+              AccessionNumber={study.AccessionNumber || ''}
               modalities={study.modalities}
-              patientId={study.patientId || ''}
-              patientName={study.patientName || ''}
-              studyDate={study.studyDate}
-              studyDescription={study.studyDescription || ''}
-              studyInstanceUid={study.studyInstanceUid}
+              PatientID={study.PatientID || ''}
+              PatientName={study.PatientName || ''}
+              StudyDate={study.StudyDate}
+              StudyDescription={study.StudyDescription || ''}
+              StudyInstanceUID={study.StudyInstanceUID}
               displaySize={displaySize}
             />
           ))}
@@ -208,12 +208,12 @@ StudyList.propTypes = {
   onSort: PropTypes.func.isRequired,
   // ~~ FILTERS
   filterValues: PropTypes.shape({
-    patientName: PropTypes.string.isRequired,
-    patientId: PropTypes.string.isRequired,
-    accessionNumber: PropTypes.string.isRequired,
-    studyDate: PropTypes.string.isRequired,
+    PatientName: PropTypes.string.isRequired,
+    PatientID: PropTypes.string.isRequired,
+    AccessionNumber: PropTypes.string.isRequired,
+    StudyDate: PropTypes.string.isRequired,
     modalities: PropTypes.string.isRequired,
-    studyDescription: PropTypes.string.isRequired,
+    StudyDescription: PropTypes.string.isRequired,
     patientNameOrId: PropTypes.string.isRequired,
     accessionOrModalityOrDescription: PropTypes.string.isRequired,
     allFields: PropTypes.string.isRequired,
@@ -229,14 +229,14 @@ StudyList.defaultProps = {};
 
 function TableRow(props) {
   const {
-    accessionNumber,
+    AccessionNumber,
     isHighlighted,
     modalities,
-    patientId,
-    patientName,
-    studyDate,
-    studyDescription,
-    studyInstanceUid,
+    PatientID,
+    PatientName,
+    StudyDate,
+    StudyDescription,
+    StudyInstanceUID,
     onClick: handleClick,
     displaySize,
   } = props;
@@ -245,30 +245,30 @@ function TableRow(props) {
 
   const largeRowTemplate = (
     <tr
-      onClick={() => handleClick(studyInstanceUid)}
+      onClick={() => handleClick(StudyInstanceUID)}
       className={classNames({ active: isHighlighted })}
     >
-      <td className={classNames({ 'empty-value': !patientName })}>
-        {patientName || `(${t('Empty')})`}
+      <td className={classNames({ 'empty-value': !PatientName })}>
+        {PatientName || `(${t('Empty')})`}
       </td>
-      <td>{patientId}</td>
-      <td>{accessionNumber}</td>
-      <td>{studyDate}</td>
+      <td>{PatientID}</td>
+      <td>{AccessionNumber}</td>
+      <td>{StudyDate}</td>
       <td className={classNames({ 'empty-value': !modalities })}>
         {modalities || `(${t('Empty')})`}
       </td>
-      <td>{studyDescription}</td>
+      <td>{StudyDescription}</td>
     </tr>
   );
 
   const mediumRowTemplate = (
     <tr
-      onClick={() => handleClick(studyInstanceUid)}
+      onClick={() => handleClick(StudyInstanceUID)}
       className={classNames({ active: isHighlighted })}
     >
-      <td className={classNames({ 'empty-value': !patientName })}>
-        {patientName || `(${t('Empty')})`}
-        <div style={{ color: '#60656f' }}>{patientId}</div>
+      <td className={classNames({ 'empty-value': !PatientName })}>
+        {PatientName || `(${t('Empty')})`}
+        <div style={{ color: '#60656f' }}>{PatientID}</div>
       </td>
       <td>
         <div style={{ display: 'flex', justifyContent: 'space-between' }}>
@@ -280,7 +280,7 @@ function TableRow(props) {
               flexGrow: 1,
             }}
           >
-            {studyDescription}
+            {StudyDescription}
           </div>
 
           {/* MODALITY & ACCESSION */}
@@ -308,35 +308,35 @@ function TableRow(props) {
                 whiteSpace: 'nowrap',
                 overflow: 'hidden',
               }}
-              aria-label={accessionNumber}
-              title={accessionNumber}
+              aria-label={AccessionNumber}
+              title={AccessionNumber}
             >
-              {accessionNumber}
+              {AccessionNumber}
             </div>
           </div>
         </div>
       </td>
       {/* DATE */}
-      <td style={{ textAlign: 'center' }}>{studyDate}</td>
+      <td style={{ textAlign: 'center' }}>{StudyDate}</td>
     </tr>
   );
 
   const smallRowTemplate = (
     <tr
-      onClick={() => handleClick(studyInstanceUid)}
+      onClick={() => handleClick(StudyInstanceUID)}
       className={classNames({ active: isHighlighted })}
     >
       <td style={{ position: 'relative', overflow: 'hidden' }}>
         <div style={{ display: 'flex', justifyContent: 'space-between' }}>
           {/* NAME AND ID */}
           <div
-            className={classNames({ 'empty-value': !patientName })}
+            className={classNames({ 'empty-value': !PatientName })}
             style={{ width: '150px', minWidth: '150px' }}
           >
             <div style={{ fontWeight: 500, paddingTop: '3px' }}>
-              {patientName || `(${t('Empty')})`}
+              {PatientName || `(${t('Empty')})`}
             </div>
-            <div style={{ color: '#60656f' }}>{patientId}</div>
+            <div style={{ color: '#60656f' }}>{PatientID}</div>
           </div>
 
           {/* DESCRIPTION */}
@@ -348,7 +348,7 @@ function TableRow(props) {
               paddingLeft: '35px',
             }}
           >
-            {studyDescription}
+            {StudyDescription}
           </div>
 
           {/* MODALITY & DATE */}
@@ -370,7 +370,7 @@ function TableRow(props) {
             >
               {modalities || `(${t('Empty')})`}
             </div>
-            <div>{studyDate}</div>
+            <div>{StudyDate}</div>
           </div>
         </div>
       </td>
@@ -391,14 +391,14 @@ function TableRow(props) {
 }
 
 TableRow.propTypes = {
-  accessionNumber: PropTypes.string.isRequired,
+  AccessionNumber: PropTypes.string.isRequired,
   isHighlighted: PropTypes.bool,
   modalities: PropTypes.string,
-  patientId: PropTypes.string.isRequired,
-  patientName: PropTypes.string.isRequired,
-  studyDate: PropTypes.string.isRequired,
-  studyDescription: PropTypes.string.isRequired,
-  studyInstanceUid: PropTypes.string.isRequired,
+  PatientID: PropTypes.string.isRequired,
+  PatientName: PropTypes.string.isRequired,
+  StudyDate: PropTypes.string.isRequired,
+  StudyDescription: PropTypes.string.isRequired,
+  StudyInstanceUID: PropTypes.string.isRequired,
   displaySize: PropTypes.string,
 };
 

platform/ui/src/components/studyList/StudyList.styl

@@ -156,7 +156,7 @@ table.table
   text-align: left;
   border-top: 0;
 
-.study-list-container > table.table > thead > tr > th.studyDate
+.study-list-container > table.table > thead > tr > th.StudyDate
   min-width: 230px
 .study-list-container > table.table .modalities
   font-weight: 500;

platform/ui/src/components/studyList/TablePagination.js

@@ -11,7 +11,7 @@ class TablePagination extends PureComponent {
   };
 
   static propTypes = {
-    /* Values to show in "rows per page" select dropdown */
+    /* Values to show in "Rows per page" select dropdown */
     pageOptions: PropTypes.array,
     rowsPerPage: PropTypes.number.isRequired,
     currentPage: PropTypes.number.isRequired,

platform/ui/src/components/studyList/__docs__/onSearch.js

@@ -4,9 +4,9 @@ export default function(searchData) {
   this.setState({ searchData });
 
   const filter = (key, searchData, study) => {
-    if (key === 'studyDateFrom' && searchData[key] && study['studyDate']) {
-      const studyDate = moment(study['studyDate'], 'YYYYMMDD');
-      return studyDate.isBetween(
+    if (key === 'studyDateFrom' && searchData[key] && study['StudyDate']) {
+      const StudyDate = moment(study['StudyDate'], 'YYYYMMDD');
+      return StudyDate.isBetween(
         searchData['studyDateFrom'],
         searchData['studyDateTo'],
         'days',
@@ -25,11 +25,11 @@ export default function(searchData) {
   let filteredStudies = this.defaultStudies
     .filter(function(study) {
       const all = [
-        'patientName',
-        'patientId',
-        'accessionNumber',
+        'PatientName',
+        'PatientID',
+        'AccessionNumber',
         'modalities',
-        'studyDescription',
+        'StudyDescription',
         'studyDateFrom',
       ].every(key => {
         return filter(key, searchData, study);

platform/ui/src/components/studyList/__docs__/studies.js

@@ -2,83 +2,83 @@ import moment from 'moment';
 
 const studies = [
   {
-    studyInstanceUid: '11111.111111.111111.11111',
-    patientName: 'John Doe',
-    patientId: '1',
-    accessionNumber: '1234567',
-    studyDate: '19930201',
+    StudyInstanceUID: '11111.111111.111111.11111',
+    PatientName: 'John Doe',
+    PatientID: '1',
+    AccessionNumber: '1234567',
+    StudyDate: '19930201',
     modalities: 'MR',
-    studyDescription: 'BRAIN',
+    StudyDescription: 'BRAIN',
   },
   {
-    studyInstanceUid: '2222.222222.22222.22222',
-    patientName: 'José Silva',
-    patientId: '2',
-    accessionNumber: '7654321',
-    studyDate: moment().format('YYYYMMDD'),
+    StudyInstanceUID: '2222.222222.22222.22222',
+    PatientName: 'José Silva',
+    PatientID: '2',
+    AccessionNumber: '7654321',
+    StudyDate: moment().format('YYYYMMDD'),
     modalities: 'CT',
-    studyDescription: 'PET CT STANDARD',
+    StudyDescription: 'PET CT STANDARD',
   },
   {
-    studyInstanceUid: '3333.333333.33333.33333',
-    patientName: 'Antônio Jefferson',
-    patientId: '3',
-    accessionNumber: '732311',
-    studyDate: moment()
+    StudyInstanceUID: '3333.333333.33333.33333',
+    PatientName: 'Antônio Jefferson',
+    PatientID: '3',
+    AccessionNumber: '732311',
+    StudyDate: moment()
       .subtract(14, 'days')
       .format('YYYYMMDD'),
     modalities: 'US',
-    studyDescription: '0',
+    StudyDescription: '0',
   },
   {
-    studyInstanceUid: '444444.44444.44444.4444',
-    patientName: 'Antonio da Silva',
-    patientId: '4',
-    accessionNumber: '732311',
-    studyDate: moment()
+    StudyInstanceUID: '444444.44444.44444.4444',
+    PatientName: 'Antonio da Silva',
+    PatientID: '4',
+    AccessionNumber: '732311',
+    StudyDate: moment()
       .subtract(1, 'months')
       .format('YYYYMMDD'),
     modalities: 'US',
-    studyDescription: '0',
+    StudyDescription: '0',
   },
   {
-    studyInstanceUid: '55555.55555.55555.55555',
-    patientName: 'Bezerra Souza',
-    patientId: '5',
-    accessionNumber: '5134543',
-    studyDate: moment()
+    StudyInstanceUID: '55555.55555.55555.55555',
+    PatientName: 'Bezerra Souza',
+    PatientID: '5',
+    AccessionNumber: '5134543',
+    StudyDate: moment()
       .subtract(6, 'days')
       .format('YYYYMMDD'),
     modalities: 'US',
-    studyDescription: '0',
+    StudyDescription: '0',
   },
   {
-    studyInstanceUid: '66666.66666.66666.6666',
-    patientName: 'Geraldo Roger',
-    patientId: '6',
-    accessionNumber: '5315135',
-    studyDate: moment()
+    StudyInstanceUID: '66666.66666.66666.6666',
+    PatientName: 'Geraldo Roger',
+    PatientID: '6',
+    AccessionNumber: '5315135',
+    StudyDate: moment()
       .subtract(7, 'days')
       .format('YYYYMMDD'),
     modalities: 'US',
-    studyDescription: 'US',
+    StudyDescription: 'US',
   },
   {
-    studyInstanceUid: '77777.77777.77777.77777',
-    patientName: '',
-    patientId: '7',
-    accessionNumber: '5315136',
-    studyDate: moment()
+    StudyInstanceUID: '77777.77777.77777.77777',
+    PatientName: '',
+    PatientID: '7',
+    AccessionNumber: '5315136',
+    StudyDate: moment()
       .subtract(5, 'days')
       .format('YYYYMMDD'),
     modalities: 'US',
-    studyDescription: 'US',
+    StudyDescription: 'US',
   },
 ].sort(function(a, b) {
-  if (a.patientName < b.patientName) {
+  if (a.PatientName < b.PatientName) {
     return -1;
   }
-  if (a.patientName > b.patientName) {
+  if (a.PatientName > b.PatientName) {
     return 1;
   }
   return 0;

platform/ui/src/components/studyList/__docs__/studyList.mdx

@@ -20,11 +20,11 @@ import moment from 'moment'
     <State initial={{
         searchData: {},
         studies: defaultStudies.filter(study => {
-            const studyDate = moment(study['studyDate'], 'YYYYMMDD');
+            const StudyDate = moment(study['StudyDate'], 'YYYYMMDD');
             const startDate = moment().subtract(5, 'days');
             const endDate = moment();
 
-            return studyDate.isBetween(startDate, endDate, 'days', '[]');
+            return StudyDate.isBetween(startDate, endDate, 'days', '[]');
         }).slice(0, 5)
     }}>
         {({ state, setState }) => (
@@ -35,9 +35,9 @@ import moment from 'moment'
                     pageOptions={[1, 2, 3, 5, 10, 15, 20, 25, 50, 100]}
                     studyListFunctionsEnabled={true}
                     onImport={(e) => alert('Import study mock ' + e)}
-                    onSelectItem={(studyInstanceUid) => { alert(studyInstanceUid + ' has selected! Now you can open your study.'); }}
+                    onSelectItem={(StudyInstanceUID) => { alert(StudyInstanceUID + ' has selected! Now you can open your study.'); }}
                     rowsPerPage={5}
-                    defaultSort={{ field: 'patientName', order: 'desc', }}
+                    defaultSort={{ field: 'PatientName', order: 'desc', }}
                     studyListDateFilterNumDays={7}
                     onSearch={onSearch.bind({ setState, defaultStudies })}
                 />