Fix geosolutions-it#1610. Now the epics are overridable

offtherailz · Mar 20, 2017 · dce3a41 · dce3a41
1 parent 14d6636
commit dce3a41
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/web/client/plugins/Search.jsx b/web/client/plugins/Search.jsx
@@ -192,7 +192,7 @@ module.exports = {
             priority: 1
         }
     }),
-    epics: [searchEpic, searchItemSelected],
+    epics: {searchEpic, searchItemSelected},
     reducers: {
         search: require('../reducers/search'),
         mapInfo: require('../reducers/mapInfo')

diff --git a/web/client/utils/PluginsUtils.js b/web/client/utils/PluginsUtils.js
@@ -120,15 +120,15 @@ const getPluginItems = (state, plugins, pluginsConfig, name, id, isDefault, load
 const getReducers = (plugins) => Object.keys(plugins).map((name) => plugins[name].reducers)
                             .reduce((previous, current) => assign({}, previous, current), {});
 const getEpics = (plugins) => Object.keys(plugins).map((name) => plugins[name].epics)
-                            .reduce((previous = [], current = []) => [ ...previous, ...current], []);
+                            .reduce((previous = [], current = []) => assign({}, previous, current), {});
 const PluginsUtils = {
     combineReducers: (plugins, reducers) => {
         const pluginsReducers = getReducers(plugins);
         return combineReducers(assign({}, reducers, pluginsReducers));
     },
     combineEpics: (plugins, epics = []) => {
         const pluginEpics = getEpics(plugins);
-        return combineEpics(...[ ...pluginEpics, ...epics]);
+        return combineEpics(...[ ...Object.keys(pluginEpics).map(k => pluginEpics[k]), ...epics]);
     },
     getReducers,
     filterState,