From a22fd67e139c4f275f9f5cef3b6261b5acc8e556 Mon Sep 17 00:00:00 2001
From: Igor <igoroctaviano@gmail.com>
Date: Wed, 11 Dec 2019 06:54:41 -0300
Subject: [PATCH] Fix config check in extension init

---
 extensions/cornerstone/src/init.js       | 24 ++++++++++--------------
 platform/viewer/public/config/default.js |  2 +-
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/extensions/cornerstone/src/init.js b/extensions/cornerstone/src/init.js
index 06ba0a1c5..37d47e5e8 100644
--- a/extensions/cornerstone/src/init.js
+++ b/extensions/cornerstone/src/init.js
@@ -102,7 +102,7 @@ export default function init({ servicesManager, configuration }) {
   ];
 
   /* Add extension tools configuration here. */
-  const extensionToolsConfiguration = {
+  const internalToolsConfig = {
     ArrowAnnotate: {
       configuration: {
         getTextCallback: (callback, eventDetails) =>
@@ -113,19 +113,15 @@ export default function init({ servicesManager, configuration }) {
     },
   };
 
-  const isEmpty = obj => Object.keys(obj).length < 1;
-  if (!isEmpty(configuration.tools) || !isEmpty(extensionToolsConfiguration)) {
-    /* Add tools with its custom props through extension configuration. */
-    tools.forEach(tool => {
-      const toolName = tool.name.replace('Tool', '');
-      const configurationToolProps = configuration.tools[toolName] || {};
-      const extensionToolProps = extensionToolsConfiguration[toolName];
-      let props = merge(extensionToolProps, configurationToolProps);
-      csTools.addTool(tool, props);
-    });
-  } else {
-    tools.forEach(tool => csTools.addTool(tool));
-  }
+  /* Add tools with its custom props through extension configuration. */
+  tools.forEach(tool => {
+    const toolName = tool.name.replace('Tool', '');
+    const externalToolsConfig = configuration.tools || {};
+    const externalToolProps = externalToolsConfig[toolName] || {};
+    const internalToolProps = internalToolsConfig[toolName] || {};
+    const props = merge(internalToolProps, externalToolProps);
+    csTools.addTool(tool, props);
+  });
 
   csTools.setToolActive('Pan', { mouseButtonMask: 4 });
   csTools.setToolActive('Zoom', { mouseButtonMask: 2 });
diff --git a/platform/viewer/public/config/default.js b/platform/viewer/public/config/default.js
index a8d44e7ef..492294bf7 100644
--- a/platform/viewer/public/config/default.js
+++ b/platform/viewer/public/config/default.js
@@ -70,5 +70,5 @@ window.config = {
     // ~ Cornerstone Tools
     { commandName: 'setZoomTool', label: 'Zoom', keys: ['z'] },
   ],
-  cornerstoneExtensionConfig: { tools: {} },
+  cornerstoneExtensionConfig: {},
 };