From 6c35f02e6b722506fc89c902119d63a543977f15 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Tue, 20 Mar 2018 13:50:28 -0300
Subject: [PATCH] changes

---
 client/coral-framework/components/Slot.js  | 10 +++++++---
 client/coral-framework/services/plugins.js | 12 +++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/client/coral-framework/components/Slot.js b/client/coral-framework/components/Slot.js
index 049d075ab..e6a3eda2d 100644
--- a/client/coral-framework/components/Slot.js
+++ b/client/coral-framework/components/Slot.js
@@ -8,6 +8,7 @@ import isEqual from 'lodash/isEqual';
 import get from 'lodash/get';
 import { getShallowChanges } from 'coral-framework/utils';
 import omit from 'lodash/omit';
+import merge from 'lodash/merge';
 
 const emptyConfig = {};
 
@@ -75,9 +76,10 @@ class Slot extends React.Component {
 
     // @Deprecated plugin_config
     const pluginsConfig =
-      get(reduxState, 'config.plugins_config') ||
-      get(reduxState, 'config.plugin_config') ||
-      emptyConfig;
+      merge(
+        get(reduxState, 'config.plugins_config'),
+        get(reduxState, 'config.plugin_config')
+      ) || emptyConfig;
 
     if (children.length === 0 && DefaultComponent) {
       const props = plugins.getSlotComponentProps(
@@ -93,6 +95,8 @@ class Slot extends React.Component {
       children = children.map(childFactory);
     }
 
+    // console.log('pluginsConfig', pluginsConfig);
+
     return (
       <Component
         className={cn(
diff --git a/client/coral-framework/services/plugins.js b/client/coral-framework/services/plugins.js
index 8f9ad5b41..c411cca98 100644
--- a/client/coral-framework/services/plugins.js
+++ b/client/coral-framework/services/plugins.js
@@ -97,11 +97,17 @@ class PluginsService {
       this.showPluginsConfigWarning = false;
     }
 
+    console.log(
+      'slot plugins_config',
+      get(reduxState, 'config.plugins_config')
+    );
+
     // @Deprecated plugin_config
     const pluginsConfig =
-      get(reduxState, 'config.plugins_config') ||
-      get(reduxState, 'config.plugin_config') ||
-      emptyConfig;
+      merge(
+        get(reduxState, 'config.plugins_config'),
+        get(reduxState, 'config.plugin_config')
+      ) || emptyConfig;
 
     const debugProps = pluginsConfig.debug
       ? {