chore(release): publish [skip ci]

- @ohif/extension-cornerstone@2.9.5
 - @ohif/viewer@4.5.13

extensions/cornerstone/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.9.5](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.9.4...@ohif/extension-cornerstone@2.9.5) (2020-09-29)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone
+
+
+
+
+
 ## [2.9.4](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.9.3...@ohif/extension-cornerstone@2.9.4) (2020-09-03)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone

extensions/cornerstone/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone",
-  "version": "2.9.4",
+  "version": "2.9.5",
   "description": "OHIF extension for Cornerstone",
   "author": "OHIF",
   "license": "MIT",
@@ -51,6 +51,6 @@
     "classnames": "^2.2.6",
     "lodash.merge": "^4.6.2",
     "lodash.throttle": "^4.1.1",
-    "react-cornerstone-viewport": "4.0.2"
+    "react-cornerstone-viewport": "4.0.4"
   }
 }

extensions/debugging/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.1.5](https://github.com/OHIF/Viewers/compare/@ohif/extension-debugging@0.1.4...@ohif/extension-debugging@0.1.5) (2020-09-17)
+
+**Note:** Version bump only for package @ohif/extension-debugging
+
+
+
+
+
 ## [0.1.4](https://github.com/OHIF/Viewers/compare/@ohif/extension-debugging@0.1.3...@ohif/extension-debugging@0.1.4) (2020-09-10)
 
 **Note:** Version bump only for package @ohif/extension-debugging

extensions/debugging/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-debugging",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "OHIF extension for debugging.",
   "author": "OHIF",
   "license": "MIT",

extensions/debugging/src/DebugReportModal.css

@@ -2,3 +2,8 @@
   padding: 10px 0 10px;
   color: var(--active-color);
 }
+
+.debug-report-modal-container {
+  display: flex;
+  flex-direction: column;
+}

extensions/debugging/src/DebugReportModal.js

@@ -1,22 +1,108 @@
 import React from 'react';
 import { detect } from 'detect-browser';
 import './DebugReportModal.css';
+import { ToolbarButton } from '@ohif/ui';
 
 const DubugReportModal = ({
   viewports,
   studies,
   servers,
   extensionManager,
+  mailTo,
 }) => {
+  const mailToFunction = () => {
+    const StudyInstanceUID = Object.keys(studies.studyData)[0];
+
+    const subject = encodeURI(`Issue with Study: ${StudyInstanceUID}`);
+
+    let body = `Enter the description of your problem here: \n\n\n`;
+
+    body += `============= SESSION INFO =============\n\n`;
+
+    // App version
+
+    body += '== App ==\n';
+    body += `version\t${window.version}\n\n`;
+
+    // Extensions Versions
+
+    body += '== Extensions Versions ==\n';
+
+    const { registeredExtensionVesions } = extensionManager;
+
+    Object.keys(registeredExtensionVesions).forEach(extensionId => {
+      const version = registeredExtensionVesions[extensionId];
+
+      body += `${extensionId}\t${version}\n`;
+    });
+
+    body += '\n';
+
+    // Browser Info
+
+    const browser = detect();
+
+    const { name, os, type, version } = browser;
+
+    body += '== Browser Info ==\n';
+    body += `name\t ${name}\n`;
+    body += `os\t ${os}\n`;
+    body += `type\t ${type}\n`;
+    body += `version\t ${version}\n\n`;
+
+    // Study URL
+    body += '== URL ==\n';
+    body += `URL\t ${window.location.href}\n\n`;
+
+    // Layout
+
+    const { numRows, numColumns, viewportSpecificData } = viewports;
+
+    body += '== Viewport Layout ==\n';
+    body += `Rows\t${numRows}\n`;
+    body += `Columns\t${numColumns}\n\n`;
+
+    body += '== Viewports ==\n';
+
+    Object.keys(viewportSpecificData).forEach(viewportIndex => {
+      const vsd = viewportSpecificData[viewportIndex];
+
+      const [row, column] = _viewportIndexToViewportPosition(
+        viewportIndex,
+        numColumns
+      );
+
+      body += `[${row},${column}]\t${vsd.SeriesInstanceUID}\n`;
+    });
+
+    // TODO Text dump of rest of stuff.
+
+    body = encodeURI(body);
+
+    window.location.href = `mailto:${mailTo}?subject=${subject}&body=${body}`;
+  };
+
   return (
-    <div>
-      <table>
-        {getAppVersion()}
-        {getExtensionVersions(extensionManager)}
-        {getBrowserInfo()}
-        {getCurrentStudyUrl()}
-        {getLayout(viewports)}
-      </table>
+    <div className="debug-report-modal-container">
+      {mailTo ? (
+        <div>
+          <ToolbarButton
+            label={'Send Bug Report'}
+            onClick={mailToFunction}
+            icon={'envelope-square'}
+            isActive={false}
+          />
+        </div>
+      ) : null}
+      <div>
+        <table>
+          {getAppVersion()}
+          {getExtensionVersions(extensionManager)}
+          {getBrowserInfo()}
+          {getCurrentStudyUrl()}
+          {getLayout(viewports)}
+        </table>
+      </div>
     </div>
   );
 };
@@ -39,7 +125,7 @@ const getCurrentStudyUrl = () => {
   return (
     <React.Fragment>
       <tr>
-        <th className="debugReportModalHeader">App</th>
+        <th className="debugReportModalHeader">URL</th>
       </tr>
       <tr>
         <td>URL</td>

extensions/debugging/src/commandsModule.js

@@ -11,6 +11,8 @@ import _downloadAndZip, { downloadInstances } from './downloadAndZip';
 import DebugReportModal from './DebugReportModal';
 import React from 'react';
 
+import state from './state';
+
 const {
   utils: { Queue },
 } = OHIF;
@@ -99,6 +101,7 @@ export function getCommands(context, servicesManager, extensionManager) {
             studies={studies}
             servers={servers}
             extensionManager={extensionManager}
+            mailTo={state.mailTo}
           />
         );
       };

extensions/debugging/src/index.js

@@ -2,6 +2,7 @@ import { getDicomWebClientFromConfig } from './utils';
 import { getCommands } from './commandsModule';
 import { version } from '../package.json';
 import toolbarModule from './toolbarModule';
+import state from './state';
 
 /**
  * Constants
@@ -29,11 +30,15 @@ export default {
    * LIFECYCLE HOOKS
    */
 
-  preRegistration({ appConfig }) {
+  preRegistration({ appConfig, configuration }) {
     const dicomWebClient = getDicomWebClientFromConfig(appConfig);
     if (dicomWebClient) {
       sharedContext.dicomWebClient = dicomWebClient;
     }
+
+    if (configuration && configuration.mailTo) {
+      state.mailTo = configuration.mailTo;
+    }
   },
 
   /**

extensions/debugging/src/state.js

@@ -0,0 +1,3 @@
+const state = { mailTo: undefined };
+
+export default state;

extensions/dicom-rt/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.4.6](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-rt@0.4.5...@ohif/extension-dicom-rt@0.4.6) (2020-09-17)
+
+**Note:** Version bump only for package @ohif/extension-dicom-rt
+
+
+
+
+
 ## [0.4.5](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-rt@0.4.4...@ohif/extension-dicom-rt@0.4.5) (2020-09-10)
 
 **Note:** Version bump only for package @ohif/extension-dicom-rt

extensions/dicom-rt/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-rt",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "OHIF extension for rendering DICOM RTSTRUCTs on top of cornerstone images.",
   "author": "OHIF",
   "license": "MIT",
@@ -34,7 +34,8 @@
     "dcmjs": "0.16.3",
     "prop-types": "^15.6.2",
     "react": "^16.8.6",
-    "react-dom": "^16.8.6"
+    "react-dom": "^16.8.6",
+    "react-tooltip": "4.2.10"
   },
   "dependencies": {
     "@babel/runtime": "^7.5.5",

extensions/dicom-rt/src/components/StructureSetItem/StructureSetItem.js

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { TableListItem, Icon, Tooltip, OverlayTrigger } from '@ohif/ui';
+import ReactTooltip from 'react-tooltip';
 
 import './StructureSetItem.css';
 
@@ -68,7 +69,18 @@ const StructureSetItem = ({
     >
       <div>
         <div className="item-label" style={{ marginBottom: 4 }}>
-          <span>{label}</span>
+          <a data-tip data-for={`StructureHover${index}`}>
+            <span>{label}</span>
+          </a>
+          <ReactTooltip
+            id={`StructureHover${index}`}
+            delayShow={250}
+            place="right"
+            border={true}
+            type="light"
+          >
+            <span>{label}</span>
+          </ReactTooltip>
           {!isDisabled && (
             <Icon
               className={`eye-icon ${isVisible && '--visible'}`}

extensions/dicom-segmentation/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.4.6](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.4.5...@ohif/extension-dicom-segmentation@0.4.6) (2020-09-17)
+
+**Note:** Version bump only for package @ohif/extension-dicom-segmentation
+
+
+
+
+
 ## [0.4.5](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.4.4...@ohif/extension-dicom-segmentation@0.4.5) (2020-09-10)
 
 **Note:** Version bump only for package @ohif/extension-dicom-segmentation

extensions/dicom-segmentation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-segmentation",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "OHIF extension for viewing segmentations in the 2D MPR view",
   "author": "OHIF",
   "license": "MIT",
@@ -39,6 +39,7 @@
   "dependencies": {
     "@babel/runtime": "^7.5.5",
     "gl-matrix": "^3.3.0",
-    "react-select": "^3.0.8"
+    "react-select": "^3.0.8",
+    "react-tooltip": "4.2.10"
   }
 }

extensions/dicom-segmentation/src/components/SegmentItem/SegmentItem.js

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { TableListItem, Icon } from '@ohif/ui';
+import ReactTooltip from 'react-tooltip';
 
 import './SegmentItem.css';
 
@@ -17,7 +18,15 @@ ColoredCircle.propTypes = {
   color: PropTypes.array.isRequired,
 };
 
-const SegmentItem = ({ index, label, onClick, itemClass, color, visible = true, onVisibilityChange }) => {
+const SegmentItem = ({
+  index,
+  label,
+  onClick,
+  itemClass,
+  color,
+  visible = true,
+  onVisibilityChange,
+}) => {
   const [isVisible, setIsVisible] = useState(visible);
 
   useEffect(() => {
@@ -37,7 +46,18 @@ const SegmentItem = ({ index, label, onClick, itemClass, color, visible = true,
       >
         <div>
           <div className="segment-label" style={{ marginBottom: 4 }}>
-            <span>{label}</span>
+            <a data-tip data-for={`SegmentHover${index}`}>
+              <span>{label}</span>
+            </a>
+            <ReactTooltip
+              id={`SegmentHover${index}`}
+              delayShow={250}
+              place="right"
+              border={true}
+              type="light"
+            >
+              <span>{label}</span>
+            </ReactTooltip>
             <Icon
               className={`eye-icon ${isVisible && '--visible'}`}
               name={isVisible ? 'eye' : 'eye-closed'}
@@ -61,7 +81,7 @@ const SegmentItem = ({ index, label, onClick, itemClass, color, visible = true,
                 <span style={{ marginRight: '4px' }}>
                   <Icon name="edit" width="14px" height="14px" />
                 </span>
-              Relabel
+                Relabel
               </button>
               <button
                 className="btnAction"
@@ -70,7 +90,7 @@ const SegmentItem = ({ index, label, onClick, itemClass, color, visible = true,
                 <span style={{ marginRight: '4px' }}>
                   <Icon name="edit" width="14px" height="14px" />
                 </span>
-              Description
+                Description
               </button>
             </div>
           )}
@@ -90,7 +110,7 @@ SegmentItem.propTypes = {
 
 SegmentItem.defaultProps = {
   itemClass: '',
-  onClick: () => { }
+  onClick: () => {},
 };
 
 export default SegmentItem;

extensions/dicom-tag-browser/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.0.3](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-tag-browser@0.0.2...@ohif/extension-dicom-tag-browser@0.0.3) (2020-09-24)
+
+**Note:** Version bump only for package @ohif/extension-dicom-tag-browser
+
+
+
+
+
 ## 0.0.2 (2020-09-10)
 
 **Note:** Version bump only for package @ohif/extension-dicom-tag-browser

extensions/dicom-tag-browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-tag-browser",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "OHIF extension for checking DICOM headers.",
   "author": "OHIF",
   "license": "MIT",

extensions/dicom-tag-browser/src/components/DicomBrowserSelect.js

@@ -39,6 +39,7 @@ const dicomBrowserSelectStyles = {
   }),
   option: (base, state) => ({
     ...base,
+    width: '100%',
     cursor: 'pointer',
     '&:first-of-type': {
       borderTopLeftRadius: 5,

extensions/dicom-tag-browser/src/components/DicomBrowserSelectItem.css

@@ -2,6 +2,7 @@
   display: flex;
   justify-content: start;
   margin: 0;
+  width: 100%;
 }
 
 .dcmseg-segmentation-item .segmentation-meta {

extensions/dicom-tag-browser/src/components/DicomTagBrowser.css

@@ -3,7 +3,7 @@
   margin-left: auto;
 }
 
-.dicom-tag-browser-table td {
+.dicom-tag-browser-table tr {
   padding-left: 10px;
   padding-right: 10px;
   color: var(--table-text-primary-color);

extensions/dicom-tag-browser/src/components/DicomTagBrowser.js

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { classes } from '@ohif/core';
 import dcmjs from 'dcmjs';
 import DicomBrowserSelect from './DicomBrowserSelect';
@@ -16,73 +16,96 @@ const DicomTagBrowser = ({ displaySets, displaySetInstanceUID }) => {
     setActiveDisplaySetInstanceUID,
   ] = useState(displaySetInstanceUID);
   const [activeInstance, setActiveInstance] = useState(0);
+  const [tags, setTags] = useState([]);
+  const [instanceList, setInstanceList] = useState([]);
+  const [displaySetList, setDisplaySetList] = useState([]);
+  const [isImageStack, setIsImageStack] = useState(false);
 
-  const activeDisplaySet = displaySets.find(
-    ds => ds.displaySetInstanceUID === activeDisplaySetInstanceUID
-  );
+  useEffect(() => {
+    const activeDisplaySet = displaySets.find(
+      ds => ds.displaySetInstanceUID === activeDisplaySetInstanceUID
+    );
 
-  const displaySetList = displaySets.map(displaySet => {
-    const {
-      displaySetInstanceUID,
-      SeriesDate,
-      SeriesTime,
-      SeriesNumber,
-      SeriesDescription,
-      Modality,
-    } = displaySet;
+    const newDisplaySetList = displaySets.map(displaySet => {
+      const {
+        displaySetInstanceUID,
+        SeriesDate,
+        SeriesTime,
+        SeriesNumber,
+        SeriesDescription,
+        Modality,
+      } = displaySet;
 
-    /* Map to display representation */
-    const dateStr = `${SeriesDate}:${SeriesTime}`.split('.')[0];
-    const date = moment(dateStr, 'YYYYMMDD:HHmmss');
-    const displayDate = date.format('ddd, MMM Do YYYY');
-
-    return {
-      value: displaySetInstanceUID,
-      title: `${SeriesNumber} (${Modality}): ${SeriesDescription}`,
-      description: displayDate,
-      onClick: () => {
-        setActiveDisplaySetInstanceUID(displaySetInstanceUID);
-        setActiveInstance(0);
-      },
-    };
-  });
-
-  let metadata;
-  const isImageStack = activeDisplaySet instanceof ImageSet;
-
-  let selectedInstanceValue;
-  let instanceList;
-
-  if (isImageStack) {
-    const { images } = activeDisplaySet;
-    const image = images[activeInstance];
-
-    instanceList = images.map((image, index) => {
-      const metadata = image.getData().metadata;
-
-      const { InstanceNumber } = metadata;
+      /* Map to display representation */
+      const dateStr = `${SeriesDate}:${SeriesTime}`.split('.')[0];
+      const date = moment(dateStr, 'YYYYMMDD:HHmmss');
+      const displayDate = date.format('ddd, MMM Do YYYY');
 
       return {
-        value: index,
-        title: `Instance Number: ${InstanceNumber}`,
-        description: '',
+        value: displaySetInstanceUID,
+        title: `${SeriesNumber} (${Modality}): ${SeriesDescription}`,
+        description: displayDate,
         onClick: () => {
-          setActiveInstance(index);
+          setActiveDisplaySetInstanceUID(displaySetInstanceUID);
+          setActiveInstance(0);
         },
       };
     });
 
-    selectedInstanceValue = instanceList[activeInstance];
+    let metadata;
+    const isImageStack = activeDisplaySet instanceof ImageSet;
 
-    metadata = image.getData().metadata;
-  } else {
-    metadata = activeDisplaySet.metadata;
-  }
+    let selectedInstanceValue;
+    let instanceList;
+
+    if (isImageStack) {
+      const { images } = activeDisplaySet;
+      const image = images[activeInstance];
+
+      instanceList = images.map((image, index) => {
+        const metadata = image.getData().metadata;
+
+        const { InstanceNumber } = metadata;
+
+        return {
+          value: index,
+          title: `Instance Number: ${InstanceNumber}`,
+          description: '',
+          onClick: () => {
+            setActiveInstance(index);
+          },
+        };
+      });
+
+      metadata = image.getData().metadata;
+    } else {
+      metadata = activeDisplaySet.metadata;
+    }
+
+    setTags(getSortedTags(metadata));
+    setInstanceList(instanceList);
+    setDisplaySetList(newDisplaySetList);
+    setIsImageStack(isImageStack);
+  }, [activeDisplaySetInstanceUID, activeInstance]);
 
   const selectedDisplaySetValue = displaySetList.find(
     ds => ds.value === activeDisplaySetInstanceUID
   );
 
+  let instanceSelectList = null;
+
+  if (isImageStack) {
+    const selectedInstanceValue = instanceList[activeInstance];
+
+    instanceSelectList = (
+      <DicomBrowserSelect
+        value={selectedInstanceValue}
+        formatOptionLabel={DicomBrowserSelectItem}
+        options={instanceList}
+      />
+    );
+  }
+
   return (
     <div>
       <DicomBrowserSelect
@@ -90,20 +113,14 @@ const DicomTagBrowser = ({ displaySets, displaySetInstanceUID }) => {
         formatOptionLabel={DicomBrowserSelectItem}
         options={displaySetList}
       />
-      {isImageStack ? (
-        <DicomBrowserSelect
-          value={selectedInstanceValue}
-          formatOptionLabel={DicomBrowserSelectItem}
-          options={instanceList}
-        />
-      ) : null}
-      <DicomTagTable instanceMetadata={metadata}></DicomTagTable>
+      {instanceSelectList}
+      <DicomTagTable tags={tags}></DicomTagTable>
     </div>
   );
 };
 
-function DicomTagTable({ instanceMetadata }) {
-  const rows = getRows(instanceMetadata);
+function DicomTagTable({ tags }) {
+  const rows = getFormattedRowsFromTags(tags);
 
   return (
     <div>
@@ -114,19 +131,71 @@ function DicomTagTable({ instanceMetadata }) {
           <th className="dicom-tag-browser-table-left">Keyword</th>
           <th className="dicom-tag-browser-table-left">Value</th>
         </tr>
-        {rows.map(row => (
-          <tr>
-            <td>{row[0]}</td>
-            <td>{row[1]}</td>
-            <td>{row[2]}</td>
-            <td>{row[3]}</td>
-          </tr>
-        ))}
+        {rows.map(row => {
+          const className = row.className ? row.className : null;
+
+          return (
+            <tr className={className}>
+              <td>{row[0]}</td>
+              <td className="dicom-tag-browser-table-center">{row[1]}</td>
+              <td>{row[2]}</td>
+              <td>{row[3]}</td>
+            </tr>
+          );
+        })}
       </table>
     </div>
   );
 }
 
+function getFormattedRowsFromTags(tags) {
+  const rows = [];
+
+  tags.forEach(tagInfo => {
+    if (tagInfo.vr === 'SQ') {
+      rows.push([
+        `${tagInfo.tagIndent}${tagInfo.tag}`,
+        tagInfo.vr,
+        tagInfo.keyword,
+        '',
+      ]);
+
+      const { values } = tagInfo;
+
+      values.forEach((item, index) => {
+        const formatedRowsFromTags = getFormattedRowsFromTags(item);
+
+        rows.push([
+          `${item[0].tagIndent}(FFFE,E000)`,
+          '',
+          `Item #${index}`,
+          '',
+        ]);
+
+        rows.push(...formatedRowsFromTags);
+      });
+    } else {
+      rows.push([
+        `${tagInfo.tagIndent}${tagInfo.tag}`,
+        tagInfo.vr,
+        tagInfo.keyword,
+        tagInfo.value,
+      ]);
+    }
+  });
+
+  return rows;
+}
+
+function getSortedTags(metadata) {
+  const tagList = getRows(metadata);
+
+  // Sort top level tags, sequence groups are sorted when created.
+  _sortTagList(tagList);
+
+  return tagList;
+}
+
 function getRows(metadata, depth = 0) {
   // Tag, Type, Value, Keyword
 
@@ -138,6 +207,10 @@ function getRows(metadata, depth = 0) {
     tagIndent += '>';
   }
 
+  if (depth > 0) {
+    tagIndent += ' '; // If indented, add a space after the indents.
+  }
+
   const rows = [];
 
   for (let i = 0; i < keywords.length; i++) {
@@ -155,7 +228,16 @@ function getRows(metadata, depth = 0) {
       const sequenceAsArray = toArray(value);
 
       // Push line defining the sequence
-      rows.push([`${tagIndent}${tagInfo.tag}`, tagInfo.vr, keyword, '']);
+
+      const sequence = {
+        tag: tagInfo.tag,
+        tagIndent,
+        vr: tagInfo.vr,
+        keyword,
+        values: [],
+      };
+
+      rows.push(sequence);
 
       if (value === null) {
         // Type 2 Sequence
@@ -165,9 +247,10 @@ function getRows(metadata, depth = 0) {
       sequenceAsArray.forEach(item => {
         const sequenceRows = getRows(item, depth + 1);
 
-        sequenceRows.forEach(row => {
-          rows.push(row);
-        });
+        // Sort the sequence group.
+        _sortTagList(sequenceRows);
+
+        sequence.values.push(sequenceRows);
       });
 
       continue;
@@ -205,16 +288,30 @@ function getRows(metadata, depth = 0) {
       }
     }
 
+    // tag / vr/ keyword/ value
+
     // Remove retired tags
     keyword = keyword.replace('RETIRED_', '');
 
     if (tagInfo) {
-      rows.push([`${tagIndent}${tagInfo.tag}`, tagInfo.vr, keyword, value]);
+      rows.push({
+        tag: tagInfo.tag,
+        tagIndent,
+        vr: tagInfo.vr,
+        keyword,
+        value,
+      });
     } else {
       // Private tag
       const tag = `(${keyword.substring(0, 4)},${keyword.substring(4, 8)})`;
 
-      rows.push([`${tagIndent}${tag}`, '', 'Private Tag', value]);
+      rows.push({
+        tag,
+        tagIndent,
+        vr: '',
+        keyword: 'Private Tag',
+        value,
+      });
     }
   }
 
@@ -225,4 +322,14 @@ function toArray(objectOrArray) {
   return Array.isArray(objectOrArray) ? objectOrArray : [objectOrArray];
 }
 
+function _sortTagList(tagList) {
+  tagList.sort((a, b) => {
+    if (a.tag < b.tag) {
+      return -1;
+    }
+
+    return 1;
+  });
+}
+
 export default DicomTagBrowser;

extensions/vtk/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.7.7](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.7.6...@ohif/extension-vtk@1.7.7) (2020-09-17)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
 ## [1.7.6](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.7.5...@ohif/extension-vtk@1.7.6) (2020-09-10)
 
 **Note:** Version bump only for package @ohif/extension-vtk

extensions/vtk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-vtk",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "description": "OHIF extension for VTK.js",
   "author": "OHIF",
   "license": "MIT",
@@ -54,7 +54,7 @@
   },
   "devDependencies": {
     "@ohif/core": "^2.10.5",
-    "@ohif/ui": "^1.5.4",
+    "@ohif/ui": "^1.5.5",
     "cornerstone-tools": "^4.20.1",
     "cornerstone-wado-image-loader": "^3.1.0",
     "dicom-parser": "^1.8.3",

platform/ui/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.5.5](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.5.4...@ohif/ui@1.5.5) (2020-09-17)
+
+**Note:** Version bump only for package @ohif/ui
+
+
+
+
+
 ## [1.5.4](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.5.3...@ohif/ui@1.5.4) (2020-09-10)
 
 **Note:** Version bump only for package @ohif/ui

platform/ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/ui",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "description": "A set of React components for Medical Imaging Viewers",
   "author": "OHIF Contributors",
   "license": "MIT",

platform/ui/src/elements/Icon/getIcon.js

@@ -87,6 +87,7 @@ import user from './icons/user.svg';
 import youtube from './icons/youtube.svg';
 import eye from './icons/eye.svg';
 import eyeClosed from './icons/eye-closed.svg';
+import envelopeSquare from './icons/envelope-square.svg';
 
 const ICONS = {
   eye,
@@ -176,6 +177,7 @@ const ICONS = {
   lung,
   liver,
   save: saveRegular,
+  'envelope-square': envelopeSquare,
 };
 
 /**

platform/ui/src/elements/Icon/icons/envelope-square.svg

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+  xmlns="http://www.w3.org/2000/svg"
+  viewBox="0 0 448 512"
+  aria-labelledby="envelope-square"
+  width="1em"
+  height="1em"
+  fill="currentColor"
+>
+  <path d="M400 32H48C21.49 32 0 53.49 0 80v352c0 26.51 21.49 48 48 48h352c26.51 0 48-21.49 48-48V80c0-26.51-21.49-48-48-48zM178.117 262.104C87.429 196.287 88.353 196.121 64 177.167V152c0-13.255 10.745-24 24-24h272c13.255 0 24 10.745 24 24v25.167c-24.371 18.969-23.434 19.124-114.117 84.938-10.5 7.655-31.392 26.12-45.883 25.894-14.503.218-35.367-18.227-45.883-25.895zM384 217.775V360c0 13.255-10.745 24-24 24H88c-13.255 0-24-10.745-24-24V217.775c13.958 10.794 33.329 25.236 95.303 70.214 14.162 10.341 37.975 32.145 64.694 32.01 26.887.134 51.037-22.041 64.72-32.025 61.958-44.965 81.325-59.406 95.283-70.199z"/>
+</svg>

platform/viewer/CHANGELOG.md

@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.5.13](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.5.12...@ohif/viewer@4.5.13) (2020-09-29)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.5.12](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.5.11...@ohif/viewer@4.5.12) (2020-09-24)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.5.11](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.5.10...@ohif/viewer@4.5.11) (2020-09-17)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.5.10](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.5.9...@ohif/viewer@4.5.10) (2020-09-17)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
 ## [4.5.9](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.5.8...@ohif/viewer@4.5.9) (2020-09-10)
 
 **Note:** Version bump only for package @ohif/viewer

platform/viewer/cypress/integration/pwa/OHIFExtensionHTMLPDF.spec.js

@@ -6,6 +6,9 @@ describe('OHIF HTML Extension', () => {
     cy.expectMinimumThumbnails(5);
   });
 
+  // TODO -> Commented these out until we get a seperate temporary PACS running on the CI.
+  // As pointing these tests at a public PACS with public STOW functionality means this always breaks.
+
   it('checks if series thumbnails are being displayed', () => {
     cy.get('[data-cy="thumbnail-list"]')
       .contains('SR')
@@ -13,66 +16,66 @@ describe('OHIF HTML Extension', () => {
       .should('to.be.at.least', 1);
   });
 
-  it('drags and drop a SR thumbnail into viewport', () => {
-    cy.get('[data-cy="thumbnail-list"]')
-      .contains('SR')
-      .first()
-      .drag('.viewport-drop-target');
+  // it('drags and drop a SR thumbnail into viewport', () => {
+  //   cy.get('[data-cy="thumbnail-list"]')
+  //     .contains('SR')
+  //     .first()
+  //     .drag('.viewport-drop-target');
 
-    cy.get(':nth-child(2) > h1').should(
-      'contain.text',
-      'Imaging Measurement Report'
-    );
-  });
+  //   cy.get(':nth-child(2) > h1').should(
+  //     'contain.text',
+  //     'Imaging Measurement Report'
+  //   );
+  // });
 
-  it('checks if the HTML viewport has been set to active by interaction', () => {
-    cy.setLayout('3', '3');
+  // it('checks if the HTML viewport has been set to active by interaction', () => {
+  //   cy.setLayout('3', '3');
 
-    // check if viewport has been set as active by CLICKING
-    cy.get('[data-cy=viewprt-grid] > :nth-child(4)')
-      .click()
-      .then($viewport => {
-        cy.wrap($viewport).should('have.class', 'active');
-      });
+  //   // check if viewport has been set as active by CLICKING
+  //   cy.get('[data-cy=viewprt-grid] > :nth-child(4)')
+  //     .click()
+  //     .then($viewport => {
+  //       cy.wrap($viewport).should('have.class', 'active');
+  //     });
 
-    // check if viewport has been set as active by SCROLLING
-    cy.get('[data-cy=viewprt-grid] > :nth-child(7)').then($viewport => {
-      cy.wrap($viewport)
-        .find('[data-cy=dicom-html-viewport]')
-        .scrollTo('bottom');
-      cy.wrap($viewport).should('have.class', 'active');
-    });
+  //   // check if viewport has been set as active by SCROLLING
+  //   cy.get('[data-cy=viewprt-grid] > :nth-child(7)').then($viewport => {
+  //     cy.wrap($viewport)
+  //       .find('[data-cy=dicom-html-viewport]')
+  //       .scrollTo('bottom');
+  //     cy.wrap($viewport).should('have.class', 'active');
+  //   });
 
-    cy.setLayout('1', '1');
-  });
+  //   cy.setLayout('1', '1');
+  // });
 });
 
-describe('OHIF PDF Extension', () => {
-  before(() => {
-    cy.checkStudyRouteInViewer(
-      '1.2.826.0.13854362241694438965858641723883466450351448'
-    );
-    cy.expectMinimumThumbnails(5);
-  });
+// describe('OHIF PDF Extension', () => {
+//   before(() => {
+//     cy.checkStudyRouteInViewer(
+//       '1.2.826.0.13854362241694438965858641723883466450351448'
+//     );
+//     cy.expectMinimumThumbnails(5);
+//   });
 
-  it('checks if series thumbnails are being displayed', () => {
-    cy.get('[data-cy="thumbnail-list"]')
-      .contains('DOC')
-      .its('length')
-      .should('to.be.at.least', 1);
-  });
+//   it('checks if series thumbnails are being displayed', () => {
+//     cy.get('[data-cy="thumbnail-list"]')
+//       .contains('DOC')
+//       .its('length')
+//       .should('to.be.at.least', 1);
+//   });
 
-  it('drags and drop a PDF thumbnail into viewport', () => {
-    cy.get('[data-cy="thumbnail-list"]')
-      .contains('DOC')
-      .scrollIntoView()
-      .drag('.viewport-drop-target');
+//   it('drags and drop a PDF thumbnail into viewport', () => {
+//     cy.get('[data-cy="thumbnail-list"]')
+//       .contains('DOC')
+//       .scrollIntoView()
+//       .drag('.viewport-drop-target');
 
-    cy.get('.DicomPDFViewport')
-      .its('length')
-      .should('be.eq', 1);
+//     cy.get('.DicomPDFViewport')
+//       .its('length')
+//       .should('to.be.at.least', 1);
 
-    //Take Screenshot
-    cy.screenshot('PDF Extension - Should load PDF file');
-  });
-});
+//     //Take Screenshot
+//     cy.screenshot('PDF Extension - Should load PDF file');
+//   });
+// });

platform/viewer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/viewer",
-  "version": "4.5.9",
+  "version": "4.5.13",
   "description": "OHIF Viewer",
   "author": "OHIF Contributors",
   "license": "MIT",
@@ -49,17 +49,17 @@
   "dependencies": {
     "@babel/runtime": "^7.5.5",
     "@ohif/core": "^2.10.5",
-    "@ohif/extension-cornerstone": "^2.9.4",
-    "@ohif/extension-debugging": "^0.1.4",
+    "@ohif/extension-cornerstone": "^2.9.5",
+    "@ohif/extension-debugging": "^0.1.5",
     "@ohif/extension-dicom-html": "^1.2.8",
     "@ohif/extension-dicom-microscopy": "^0.51.3",
     "@ohif/extension-dicom-pdf": "^1.0.6",
-    "@ohif/extension-dicom-rt": "^0.4.5",
-    "@ohif/extension-dicom-segmentation": "^0.4.5",
+    "@ohif/extension-dicom-rt": "^0.4.6",
+    "@ohif/extension-dicom-segmentation": "^0.4.6",
     "@ohif/extension-lesion-tracker": "^0.2.1",
-    "@ohif/extension-vtk": "^1.7.6",
+    "@ohif/extension-vtk": "^1.7.7",
     "@ohif/i18n": "^0.52.8",
-    "@ohif/ui": "^1.5.4",
+    "@ohif/ui": "^1.5.5",
     "@tanem/react-nprogress": "^1.1.25",
     "classnames": "^2.2.6",
     "core-js": "^3.2.1",

platform/viewer/src/index.js

@@ -54,8 +54,8 @@ const appProps = {
     OHIFDicomPDFExtension,
     OHIFDicomSegmentationExtension,
     OHIFDicomRtExtension,
+    //[OHIFDebuggingExtension, { mailTo: 'support@canceridc.dev' }],
     OHIFDicomTagBrowserExtension,
-    //OHIFDebuggingExtension,
   ],
 };
 

yarn.lock

@@ -16020,6 +16020,14 @@ react-simple-code-editor@^0.9.0:
   resolved "https://registry.yarnpkg.com/react-simple-code-editor/-/react-simple-code-editor-0.9.15.tgz#59e3583832e9e98992d3674b2d7673b4cd1c5709"
   integrity sha512-M8iKgjBTBZK92tZYgOEfMuR7c3zZ0q0v3QYllSxIPx3SU+w003VofH50txXQSBTu92pSOm2tidON1HbQ1l8BDA==
 
+react-tooltip@4.2.10:
+  version "4.2.10"
+  resolved "https://registry.yarnpkg.com/react-tooltip/-/react-tooltip-4.2.10.tgz#ed1a1acd388940c96f4b6309f4fd4dcce5e01bdc"
+  integrity sha512-D7ZLx6/QwpUl0SZRek3IZy/HWpsEEp0v3562tcT8IwZgu8IgV7hY5ZzniTkHyRcuL+IQnljpjj7A7zCgl2+T3w==
+  dependencies:
+    prop-types "^15.7.2"
+    uuid "^7.0.3"
+
 react-transition-group@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.0.0.tgz#e882e61fce8622ed981b6e31fc7ef52d43a1a06a"
@@ -19557,6 +19565,11 @@ uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
   integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==
 
+uuid@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
+  integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
+
 v8-compile-cache@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"