Added appEpics that eanble to pass an object with app specific Epics.…

… If Epic's name is the same the one in plugins this will override plugin's one

web/client/jsapi/MapStore2.js

@@ -284,7 +284,7 @@ const MapStore2 = {
             pages
         }))(require('../components/app/StandardRouter'));
 
-        const appStore = require('../stores/StandardStore').bind(null, initialState || {}, {});
+        const appStore = require('../stores/StandardStore').bind(null, initialState || {}, {}, {});
         const initialActions = getInitialActions(options);
         const appConfig = {
             storeOpts: assign({}, storeOpts, {notify: true}),

web/client/product/app.jsx

@@ -27,7 +27,7 @@ const startApp = () => {
     const appStore = require('../stores/StandardStore').bind(null, initialState, {
         home: require('./reducers/home'),
         maps: require('../reducers/maps')
-    });
+    }, {});
 
     const initialActions = [
         () => loadMaps(ConfigUtils.getDefaults().geoStoreUrl, ConfigUtils.getDefaults().initialMapFilter || "*")

web/client/stores/StandardStore.js

@@ -26,7 +26,7 @@ const {createEpicMiddleware} = require('redux-observable');
 const SecurityUtils = require('../utils/SecurityUtils');
 const ListenerEnhancer = require('@carnesen/redux-add-action-listener-enhancer').default;
 
-module.exports = (initialState = {defaultState: {}, mobile: {}}, appReducers = {}, plugins, storeOpts) => {
+module.exports = (initialState = {defaultState: {}, mobile: {}}, appReducers = {}, appEpics = {}, plugins, storeOpts) => {
     const allReducers = combineReducers(plugins, {
         ...appReducers,
         localConfig: require('../reducers/localConfig'),
@@ -39,7 +39,7 @@ module.exports = (initialState = {defaultState: {}, mobile: {}}, appReducers = {
         mapInitialConfig: () => {return null; },
         layers: () => {return null; }
     });
-    const rootEpic = combineEpics(plugins);
+    const rootEpic = combineEpics(plugins, appEpics);
     const defaultState = initialState.defaultState;
     const mobileOverride = initialState.mobile;
     const epicMiddleware = createEpicMiddleware(rootEpic);

web/client/utils/PluginsUtils.js

@@ -144,9 +144,9 @@ const PluginsUtils = {
      * @param {function[]} [epics] the epics to add to the plugins' ones
      * @return {function} the rootEpic, obtained combining plugins' epics and the other epics passed as argument.
      */
-    combineEpics: (plugins, epics = []) => {
-        const pluginEpics = getEpics(plugins);
-        return combineEpics(...[ ...Object.keys(pluginEpics).map(k => pluginEpics[k]), ...epics]);
+    combineEpics: (plugins, epics = {}) => {
+        const pluginEpics = assign({}, getEpics(plugins), epics);
+        return combineEpics( ...Object.keys(pluginEpics).map(k => pluginEpics[k]));
     },
     getReducers,
     filterState,

web/client/utils/__tests__/PluginUtils-test.js

@@ -8,6 +8,7 @@
 const expect = require('expect');
 const PluginsUtils = require('../PluginsUtils');
 const assign = require('object-assign');
+const MapSearchPlugin = require('../../plugins/MapSearch')
 
 describe('PluginsUtils', () => {
     beforeEach( () => {
@@ -72,5 +73,11 @@ describe('PluginsUtils', () => {
         expect(desc1.items[0].cfg).toExist();
 
     });
+    it('combineEpics', () => {
+        const plugins = {MapSearchPlugin: MapSearchPlugin};
+        const appEpics = {appEpics: (actions$) => actions$};
+        const epics = PluginsUtils.combineEpics(plugins, appEpics);
+        expect(typeof epics ).toEqual('function');
+    });
 
 });