This commit is contained in:
okbel
2018-03-20 13:50:28 -03:00
parent b6ba59ac51
commit 6c35f02e6b
2 changed files with 16 additions and 6 deletions
+7 -3
View File
@@ -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(
+9 -3
View File
@@ -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
? {