TrizTech/ohif-viewer
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix connected layout manager to use extensionManager

Browse Source
This commit is contained in:
dannyrb 2019-06-12 16:37:45 -04:00
parent 4f6cee8960
commit b052930123
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/connectedComponents/ConnectedLayoutManager.js
View File

@ -1,32 +1,29 @@
import { LayoutManager } from 'react-viewerbase'; import { LayoutManager } from 'react-viewerbase';
import { MODULE_TYPES } from 'ohif-core'; import { MODULE_TYPES } from 'ohif-core';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { extensionManager } from './../App.js';
const mapStateToProps = state => { const mapStateToProps = state => {
const viewportPluginIds = state.plugins.availablePlugins const availableViewportModules = {};
.filter(plugin => plugin.type === MODULE_TYPES.VIEWPORT) const viewportModules = extensionManager.modules[MODULE_TYPES.VIEWPORT];
.map(plugin => plugin.id);
const availablePlugins = {}; viewportModules.forEach(moduleDefinition => {
viewportPluginIds.forEach(id => { availableViewportModules[moduleDefinition.extensionId] =
const plugin = OHIF.plugins.availablePlugins.find( moduleDefinition.module;
plugin => plugin.id === id
);
if (plugin) {
availablePlugins[id] = plugin.component;
}
}); });
// TODO Use something like state.plugins.defaultPlugin[MODULE_TYPES.VIEWPORT] // TODO: Use something like state.plugins.defaultPlugin[MODULE_TYPES.VIEWPORT]
let defaultPlugin; let defaultPlugin;
if (viewportPluginIds && viewportPluginIds.length) { if (viewportModules.length) {
defaultPlugin = viewportPluginIds[0]; defaultPlugin = viewportModules[0].extensionId;
} }
return { return {
layout: state.viewports.layout, layout: state.viewports.layout,
activeViewportIndex: state.viewports.activeViewportIndex, activeViewportIndex: state.viewports.activeViewportIndex,
availablePlugins, // TODO: rename `availableViewportModules`
availablePlugins: availableViewportModules,
// TODO: rename `defaultViewportModule`
defaultPlugin, defaultPlugin,
}; };
}; };