[IDC-1939] Debug Dialog part 1 (#2011)

* WIP debug dialog

* Rename the p10 downloader extension to debugger extension, add button to toolbar. Deactivate it by default.

* Fix unit tests
This commit is contained in:
James Petts authored and GitHub committed 2020-09-03 12:58:04 +02:00
1 parent 6a37a2a661
commit a1dee16a3d
29 files changed
+272 -19

No files matched your search

+2
View File
@@ -3,6 +3,7 @@ import init from './init.js';
import commandsModule from './commandsModule.js';
import toolbarModule from './toolbarModule.js';
import CornerstoneViewportDownloadForm from './CornerstoneViewportDownloadForm';
import { version } from '../package.json';
const Component = React.lazy(() => {
return import('./OHIFCornerstoneViewport');
@@ -24,6 +25,7 @@ export default {
* Only required property. Should be a unique value across all extensions.
*/
id: 'cornerstone',
version,
/**
*
File renamed without changes.
File renamed without changes.
@@ -1,7 +1,7 @@
{
"name": "@ohif/extension-dicom-p10-downloader",
"name": "@ohif/extension-debugging",
"version": "0.1.2",
"description": "OHIF extension for downloading DICOM P10 files",
"description": "OHIF extension for debugging.",
"author": "OHIF",
"license": "MIT",
"repository": "OHIF/Viewers",
@@ -35,6 +35,7 @@
"@babel/runtime": "^7.5.5",
"dicomweb-client": "^0.6.0",
"file-saver": "^2.0.2",
"jszip": "^3.2.2"
"jszip": "^3.2.2",
"detect-browser": "5.1.1"
}
}
@@ -0,0 +1,4 @@
.debugReportModalHeader {
padding: 10px 0 10px;
color: var(--active-color);
}
@@ -0,0 +1,161 @@
import React from 'react';
import { detect } from 'detect-browser';
import './DebugReportModal.css';
const DubugReportModal = ({
viewports,
studies,
servers,
extensionManager,
}) => {
return (
<div>
<table>
{getAppVersion()}
{getExtensionVersions(extensionManager)}
{getBrowserInfo()}
{getCurrentStudyUrl()}
{getLayout(viewports)}
</table>
</div>
);
};
const getAppVersion = () => {
return (
<React.Fragment>
<tr>
<th className="debugReportModalHeader">App</th>
</tr>
<tr>
<td>Version</td>
<td>{window.version}</td>
</tr>
</React.Fragment>
);
};
const getCurrentStudyUrl = () => {
return (
<React.Fragment>
<tr>
<th className="debugReportModalHeader">App</th>
</tr>
<tr>
<td>URL</td>
<td>{window.location.href}</td>
</tr>
</React.Fragment>
);
};
const getExtensionVersions = extensionManager => {
const { registeredExtensionVesions } = extensionManager;
const lineItems = Object.keys(registeredExtensionVesions).map(extensionId => {
const version = registeredExtensionVesions[extensionId];
return (
<tr>
<td>{extensionId}</td>
<td>{version}</td>
</tr>
);
});
return (
<React.Fragment>
<th className="debugReportModalHeader">Extensions</th>
{lineItems}
</React.Fragment>
);
};
const getLayout = viewports => {
const { numRows, numColumns } = viewports;
return (
<React.Fragment>
<tr>
<th className="debugReportModalHeader">Viewports</th>
</tr>
<tr>
<th>Layout</th>
</tr>
<tr>
<td>Rows</td>
<td>{numRows}</td>
</tr>
<tr>
<td>Columns</td>
<td>{numColumns}</td>
</tr>
<tr>
<th>SeriesInstanceUIDs</th>
</tr>
{getSeriesInstanceUIDsPerRow(viewports)}
</React.Fragment>
);
};
const getBrowserInfo = () => {
const browser = detect();
const { name, os, type, version } = browser;
return (
<React.Fragment>
<tr>
<th className="debugReportModalHeader">Platform</th>
</tr>
<tr>
<td>name</td>
<td>{name}</td>
</tr>
<tr>
<td>os</td>
<td>{os}</td>
</tr>
<tr>
<td>type</td>
<td>{type}</td>
</tr>
<tr>
<td>version</td>
<td>{version}</td>
</tr>
</React.Fragment>
);
};
const getSeriesInstanceUIDsPerRow = viewports => {
const { viewportSpecificData, numColumns } = viewports;
debugger;
// NOTE viewportSpecificData is actually an object with numerical keys.
return Object.keys(viewportSpecificData).map(viewportIndex => {
const vsd = viewportSpecificData[viewportIndex];
const [row, column] = _viewportIndexToViewportPosition(
viewportIndex,
numColumns
);
return (
<tr>
<td>{`[${row},${column}]`}</td>
<td>{vsd.SeriesInstanceUID}</td>
</tr>
);
});
};
const _viewportIndexToViewportPosition = (viewportIndex, numColumns) => {
const row = Math.floor(viewportIndex / numColumns);
const column = viewportIndex % numColumns;
return [row, column];
};
export default DubugReportModal;
@@ -8,12 +8,14 @@ import {
getSOPInstanceReferencesFromViewports,
} from './utils';
import _downloadAndZip, { downloadInstances } from './downloadAndZip';
import DebugReportModal from './DebugReportModal';
import React from 'react';
const {
utils: { Queue },
} = OHIF;
export function getCommands(context) {
export function getCommands(context, servicesManager, extensionManager) {
const queue = new Queue(1);
const actions = {
/**
@@ -87,9 +89,32 @@ export function getCommands(context) {
serverConfig
);
},
openDebugInfoModal({ viewports, studies, servers }) {
const { UIModalService } = servicesManager.services;
const WrappedDebugReportModal = function() {
return (
<DebugReportModal
viewports={viewports}
studies={studies}
servers={servers}
extensionManager={extensionManager}
/>
);
};
UIModalService.show({
content: WrappedDebugReportModal,
title: `Debugging Information`,
});
},
};
const definitions = {
openDebugInfoModal: {
commandFn: actions.openDebugInfoModal,
storeContexts: ['viewports', 'servers', 'studies'],
},
downloadAndZip: {
commandFn: queue.bindSafe(actions.downloadAndZip, error),
storeContexts: ['servers'],
@@ -1,5 +1,7 @@
import { getDicomWebClientFromConfig } from './utils';
import { getCommands } from './commandsModule';
import { version } from '../package.json';
import toolbarModule from './toolbarModule';
/**
* Constants
@@ -21,6 +23,7 @@ export default {
* Only required property. Should be a unique value across all extensions.
*/
id: 'dicom-p10-downloader',
version,
/**
* LIFECYCLE HOOKS
@@ -37,7 +40,11 @@ export default {
* MODULE GETTERS
*/
getCommandsModule() {
return getCommands(sharedContext);
getCommandsModule({ servicesManager, extensionManager }) {
return getCommands(sharedContext, servicesManager, extensionManager);
},
getToolbarModule() {
return toolbarModule;
},
};
+20
View File
@@ -0,0 +1,20 @@
const TOOLBAR_BUTTON_TYPES = {
COMMAND: 'command',
};
const definitions = [
{
id: 'Debug Info',
label: 'Debug Info',
icon: 'cog',
//
type: TOOLBAR_BUTTON_TYPES.COMMAND,
commandName: 'openDebugInfoModal',
context: 'VIEWER',
},
];
export default {
definitions,
defaultContext: 'VIEWER',
};
+2
View File
@@ -1,5 +1,6 @@
import React from 'react';
import OHIFDicomHtmlSopClassHandler from './OHIFDicomHtmlSopClassHandler.js';
import { version } from '../package.json';
const Component = React.lazy(() => {
return import('./OHIFDicomHtmlViewport');
@@ -18,6 +19,7 @@ export default {
* Only required property. Should be a unique value across all extensions.
*/
id: 'html',
version,
getViewportModule() {
return OHIFDicomHtmlViewport;
+2
View File
@@ -1,5 +1,6 @@
import React from 'react';
import DicomMicroscopySopClassHandler from './DicomMicroscopySopClassHandler.js';
import { version } from '../package.json';
const Component = React.lazy(() => {
return import('./DicomMicroscopyViewport');
@@ -18,6 +19,7 @@ export default {
* Only required property. Should be a unique value across all extensions.
*/
id: 'microscopy',
version,
getViewportModule() {
return DicomMicroscopyViewport;
+2
View File
@@ -1,5 +1,6 @@
import React from 'react';
import OHIFDicomPDFSopClassHandler from './OHIFDicomPDFSopClassHandler.js';
import { version } from '../package.json';
const Component = React.lazy(() => {
return import('./ConnectedOHIFDicomPDFViewer');
@@ -18,6 +19,7 @@ export default {
* Only required property. Should be a unique value across all extensions.
*/
id: 'pdf',
version,
getViewportModule() {
return ConnectedOHIFDicomPDFViewer;
},
+2 -1
View File
@@ -1,15 +1,16 @@
import React from 'react';
import init from './init.js';
import sopClassHandlerModule from './OHIFDicomRTStructSopClassHandler';
import id from './id.js';
import RTPanel from './components/RTPanel/RTPanel';
import { version } from '../package.json';
export default {
/**
* Only required property. Should be a unique value across all extensions.
*/
id,
version,
/**
*
+2 -1
View File
@@ -1,15 +1,16 @@
import React from 'react';
import init from './init.js';
import toolbarModule from './toolbarModule.js';
import getSopClassHandlerModule from './getOHIFDicomSegSopClassHandler.js';
import SegmentationPanel from './components/SegmentationPanel/SegmentationPanel.js';
import { version } from '../package.json';
export default {
/**
* Only required property. Should be a unique value across all extensions.
*/
id: 'com.ohif.dicom-segmentation',
version,
/**
*
+3 -1
View File
@@ -1,10 +1,12 @@
import MeasurementComparisonTable from './components/MeasurementComparisonTable';
import { version } from '../package.json';
export default {
/**
* Only required property. Should be a unique value across all extensions.
*/
id: 'lesion-tracker',
version,
/**
* @param {object} params
@@ -26,7 +28,7 @@ export default {
component: MeasurementComparisonTable,
},
],
defaultContext: ['VIEWER']
defaultContext: ['VIEWER'],
};
},
+2
View File
@@ -3,6 +3,7 @@ import asyncComponent from './asyncComponent.js';
import commandsModule from './commandsModule.js';
import toolbarModule from './toolbarModule.js';
import withCommandsManager from './withCommandsManager.js';
import { version } from '../package.json';
// This feels weird
// import loadLocales from './loadLocales';
@@ -15,6 +16,7 @@ const vtkExtension = {
* Only required property. Should be a unique value across all extensions.
*/
id: 'vtk',
version,
getViewportModule({ commandsManager, servicesManager }) {
const ExtendedVTKViewport = props => (