From 8b636b53beca88952d533a4ac8d33b02ddda27b3 Mon Sep 17 00:00:00 2001
From: dannyrb <danny.ri.brown@gmail.com>
Date: Mon, 17 Jun 2019 14:45:53 -0400
Subject: [PATCH] Make sure plugin is set for cornerstone viewports before a
 layout change is triggered

---
 .../src/ConnectedCornerstoneViewport.js                   | 8 +++-----
 src/connectedComponents/ToolbarRow.js                     | 4 ----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/extensions/ohif-cornerstone-extension/src/ConnectedCornerstoneViewport.js b/extensions/ohif-cornerstone-extension/src/ConnectedCornerstoneViewport.js
index f1e91e28b..2eeb557bf 100644
--- a/extensions/ohif-cornerstone-extension/src/ConnectedCornerstoneViewport.js
+++ b/extensions/ohif-cornerstone-extension/src/ConnectedCornerstoneViewport.js
@@ -3,11 +3,7 @@ import OHIF from 'ohif-core';
 import { connect } from 'react-redux';
 import throttle from 'lodash.throttle';
 
-const {
-  setViewportActive,
-  setViewportSpecificData,
-  clearViewportSpecificData
-} = OHIF.redux.actions;
+const { setViewportActive, setViewportSpecificData } = OHIF.redux.actions;
 
 const mapStateToProps = (state, ownProps) => {
   let dataFromStore;
@@ -58,6 +54,8 @@ const mapDispatchToProps = (dispatch, ownProps) => {
       const enabledElement = event.detail.element;
       dispatch(
         setViewportSpecificData(viewportIndex, {
+          // TODO: Hack to make sure our plugin info is available from the outset
+          plugin: 'cornerstone',
           dom: enabledElement
         })
       );
diff --git a/src/connectedComponents/ToolbarRow.js b/src/connectedComponents/ToolbarRow.js
index 36c0ba77d..dc9cf7dc3 100644
--- a/src/connectedComponents/ToolbarRow.js
+++ b/src/connectedComponents/ToolbarRow.js
@@ -159,14 +159,10 @@ function _getVisibleToolbarButtons() {
     definitions.forEach(definition => {
       const context = definition.context || defaultContext;
 
-      console.log(context);
       if (this.props.activeContexts.includes(context)) {
-        console.log('includes: ', definition.commandName);
         toolbarButtonDefinitions.push(definition);
       }
     });
-
-    console.log(extension);
   });
 
   return toolbarButtonDefinitions;