From b05293012360260db7f8e8786cc6ec4d2150b363 Mon Sep 17 00:00:00 2001
From: dannyrb <danny.ri.brown@gmail.com>
Date: Wed, 12 Jun 2019 16:37:45 -0400
Subject: [PATCH] fix connected layout manager to use extensionManager

---
 .../ConnectedLayoutManager.js                 | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

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