Filter plugins direct rendering when disabled, get current state duri…

…ng loading phase
geosolutions-it · May 15, 2017 · 5b4e101 · 5b4e101
1 parent c4112e5
commit 5b4e101
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/web/client/components/plugins/PluginsContainer.jsx b/web/client/components/plugins/PluginsContainer.jsx
@@ -65,10 +65,11 @@ const PluginsContainer = React.createClass({
         this.loadPlugins(this.props.pluginsState);
     },
     componentWillReceiveProps(newProps) {
-        this.loadPlugins(newProps.pluginsState);
+        this.loadPlugins(newProps.pluginsState, newProps);
     },
-    getState(path) {
-        return get(this.props.monitoredState, path) || get(this.props.params, path) || this.context[path];
+    getState(path, newProps) {
+        let props = newProps || this.props;
+        return get(props.monitoredState, path) || get(this.props.params, path) || this.context[path];
     },
     getPluginDescriptor(plugin) {
         return PluginsUtils.getPluginDescriptor(this.getState, this.props.plugins,
@@ -79,6 +80,7 @@ const PluginsContainer = React.createClass({
             .filter((Plugin) => !PluginsUtils.handleExpression(this.getState, this.props.plugins && this.props.plugins.requires, Plugin.hide))
             .map(this.getPluginDescriptor)
             .filter((Plugin) => Plugin && !Plugin.impl.loadPlugin)
+            .filter(plugin => PluginsUtils.filterDisabledPlugins({plugin: plugin && plugin.impl || plugin}, this.getState))
             .filter(this.filterPlugins)
             .map((Plugin) => <Plugin.impl key={Plugin.id}
                 {...this.props.params} {...Plugin.cfg} pluginCfg={Plugin.cfg} items={Plugin.items}/>);
@@ -99,11 +101,12 @@ const PluginsContainer = React.createClass({
         const container = PluginsUtils.getMorePrioritizedContainer(Plugin.impl, this.props.pluginsConfig[this.props.mode], 0);
         return !container.plugin || !container.plugin.impl || container.plugin.impl.doNotHide;
     },
-    loadPlugins(state) {
+    loadPlugins(state, newProps) {
+        const getState = (path) => this.getState(path, newProps);
         (this.props.pluginsConfig && this.props.pluginsConfig[this.props.mode] || [])
-            .map((plugin) => PluginsUtils.getPluginDescriptor(this.getState, this.props.plugins,
+            .map((plugin) => PluginsUtils.getPluginDescriptor(getState, this.props.plugins,
                 this.props.pluginsConfig[this.props.mode], plugin, this.state.loadedPlugins))
-            .filter(plugin => PluginsUtils.filterDisabledPlugins({plugin: plugin && plugin.impl || plugin}, this.getState))
+            .filter(plugin => PluginsUtils.filterDisabledPlugins({plugin: plugin && plugin.impl || plugin}, getState))
             .filter((plugin) => plugin && plugin.impl.loadPlugin).forEach((plugin) => {
                 if (!this.state.loadedPlugins[plugin.name]) {
                     if (!plugin.impl.enabler || plugin.impl.enabler(state)) {