Added map version to state

web/client/actions/__tests__/map-test.js

@@ -17,6 +17,7 @@ var {
     CHANGE_MAP_STYLE,
     CHANGE_ROTATION,
     CREATION_ERROR_LAYER,
+    UPDATE_VERSION,
     creationError,
     changeMapView,
     clickOnMap,
@@ -25,7 +26,8 @@ var {
     changeMapCrs,
     changeMapScales,
     changeMapStyle,
-    changeRotation
+    changeRotation,
+    updateVersion
 } = require('../map');
 
 describe('Test correctness of the map actions', () => {
@@ -121,4 +123,12 @@ describe('Test correctness of the map actions', () => {
         expect(retval.rotation).toEqual(angle);
         expect(retval.mapStateSource).toEqual(mapStateSource);
     });
+
+    it('updateVersion', () => {
+        const version = 2;
+        const retval = updateVersion(version);
+        expect(retval).toExist();
+        expect(retval.type).toEqual(UPDATE_VERSION);
+        expect(retval.version).toEqual(2);
+    });
 });

web/client/actions/map.js

@@ -18,6 +18,7 @@ const CHANGE_MAP_SCALES = 'CHANGE_MAP_SCALES';
 const CHANGE_MAP_STYLE = 'CHANGE_MAP_STYLE';
 const CHANGE_ROTATION = 'CHANGE_ROTATION';
 const CREATION_ERROR_LAYER = 'CREATION_ERROR_LAYER';
+const UPDATE_VERSION = 'UPDATE_VERSION';
 
 function creationError(options) {
     return {
@@ -113,6 +114,13 @@ function changeMapStyle(style, mapStateSource) {
         mapStateSource
     };
 }
+function updateVersion(version) {
+    return {
+        type: UPDATE_VERSION,
+        version
+    };
+}
+
 module.exports = {
     CHANGE_MAP_VIEW,
     CLICK_ON_MAP,
@@ -126,6 +134,7 @@ module.exports = {
     CHANGE_ROTATION,
     ZOOM_TO_POINT,
     CREATION_ERROR_LAYER,
+    UPDATE_VERSION,
     changeMapView,
     clickOnMap,
     changeMousePointer,
@@ -137,5 +146,6 @@ module.exports = {
     changeMapStyle,
     changeRotation,
     zoomToPoint,
-    creationError
+    creationError,
+    updateVersion
 };

web/client/epics/__tests__/automapupdate-test.js

@@ -53,31 +53,6 @@ describe('automapupdate Epics', () => {
 
     });
 
-    it('update map without login', (done) => {
-
-        let configuration = configureMap({
-            version: 2
-        }, "id");
-
-        let information = mapInfoLoaded({
-            canEdit: true
-        }, "id");
-
-        store.dispatch(configuration);
-        store.dispatch(information);
-
-        setTimeout( () => {
-            try {
-                const actions = store.getActions();
-                expect(actions.length).toBe(2);
-            } catch (e) {
-                return done(e);
-            }
-            done();
-        }, 500);
-
-    });
-
     it('update map info on login success no id', (done) => {
 
         let login = loginSuccess("userDetails", "username", "password", "authProvider");

web/client/epics/automapupdate.js

@@ -12,8 +12,9 @@ const {warning, success} = require('../actions/notifications');
 const {toggleControl} = require('../actions/controls');
 const {loadMapInfo} = require('../actions/config');
 const {LOGIN_SUCCESS} = require('../actions/security');
+const {updateVersion} = require('../actions/map');
 const ConfigUtils = require('../utils/ConfigUtils');
-const {mapIdSelector} = require('../selectors/map');
+const {mapIdSelector, mapVersionSelector} = require('../selectors/map');
 const { LOCATION_CHANGE } = require('react-router-redux');
 
 /**
@@ -23,12 +24,12 @@ const { LOCATION_CHANGE } = require('react-router-redux');
  * @return {external:Observable}
  */
 
-const manageAutoMapUpdate = action$ =>
+const manageAutoMapUpdate = (action$, store) =>
     action$.ofType(MAP_CONFIG_LOADED)
         .switchMap((mapConfigLoaded) =>
             action$.ofType(MAP_INFO_LOADED)
                 .switchMap((mapInfoLoaded) => {
-                    const version = mapConfigLoaded.config && mapConfigLoaded.config.version || 1;
+                    const version = mapVersionSelector(store.getState());
                     const canEdit = mapInfoLoaded.info && mapInfoLoaded.info.canEdit || false;
                     let layers = mapConfigLoaded.config && mapConfigLoaded.config.map && mapConfigLoaded.config.map.layers && mapConfigLoaded.config.map.layers.filter((l) => l.type === 'wms' && l.group !== 'background') || [];
                     const options = {bbox: true, search: true, dimensions: true, title: false};
@@ -61,7 +62,7 @@ const manageAutoMapUpdate = action$ =>
                                             autoDismiss: 6,
                                             position: "tc"
                                         });
-                                    return Rx.Observable.of(notification, toggleControl('save'));
+                                    return Rx.Observable.of(notification, toggleControl('save'), updateVersion(2));
                                 }))
                     : Rx.Observable.empty();
                 }).takeUntil(action$.ofType(LOCATION_CHANGE)));

web/client/reducers/__tests__/map-test.js

@@ -212,4 +212,14 @@ describe('Test the map reducer', () => {
         expect(state.bbox.rotation).toEqual(rotation);
         expect(state.mapStateSource).toBe("test");
     });
+
+    it('change map version', () => {
+        let version = 2;
+        const action = {
+            type: 'UPDATE_VERSION',
+            version
+        };
+        let state = mapConfig({}, action);
+        expect(state.version).toEqual(version);
+    });
 });

web/client/reducers/config.js

@@ -22,7 +22,7 @@ function mapConfig(state = null, action) {
             // we get from the configuration what will be used as the initial state
         let mapState = action.legacy && !hasVersion ? ConfigUtils.convertFromLegacy(action.config) : ConfigUtils.normalizeConfig(action.config.map);
 
-        mapState.map = assign({}, mapState.map, {mapId: action.mapId, size});
+        mapState.map = assign({}, mapState.map, {mapId: action.mapId, size, version: hasVersion ? action.config.version : 1});
             // we store the map initial state for future usage
         return assign({}, mapState, {mapInitialConfig: mapState.map});
     case MAP_CONFIG_LOAD_ERROR:

web/client/reducers/map.js

@@ -8,7 +8,7 @@
 
 var {CHANGE_MAP_VIEW, CHANGE_MOUSE_POINTER,
     CHANGE_ZOOM_LVL, CHANGE_MAP_CRS, CHANGE_MAP_SCALES, ZOOM_TO_EXTENT, PAN_TO,
-    CHANGE_MAP_STYLE, CHANGE_ROTATION, ZOOM_TO_POINT} = require('../actions/map');
+    CHANGE_MAP_STYLE, CHANGE_ROTATION, UPDATE_VERSION, ZOOM_TO_POINT} = require('../actions/map');
 const {isArray} = require('lodash');
 
 
@@ -134,6 +134,9 @@ function mapConfig(state = null, action) {
         let newBbox = assign({}, state.bbox, {rotation: action.rotation});
         return assign({}, state, {bbox: newBbox, mapStateSource: action.mapStateSource});
     }
+    case UPDATE_VERSION: {
+        return assign({}, state, {version: action.version});
+    }
     default:
         return state;
     }

web/client/selectors/__tests__/map-test.js

@@ -7,7 +7,7 @@
 */
 
 const expect = require('expect');
-const {mapSelector, mapIdSelector} = require('../map');
+const {mapSelector, mapIdSelector, mapVersionSelector} = require('../map');
 
 describe('Test map selectors', () => {
     it('test mapSelector from config', () => {
@@ -41,4 +41,9 @@ describe('Test map selectors', () => {
         const props = mapIdSelector({map: {present: {mapId: "id"}}});
         expect(props).toBe("id");
     });
+
+    it('test mapVersionSelector', () => {
+        const props = mapVersionSelector({map: {present: {version: 2}}});
+        expect(props).toBe(2);
+    });
 });

web/client/selectors/map.js

@@ -42,9 +42,11 @@ const scalesSelector = createSelector(
 );
 
 const mapIdSelector = (state) => state.map && state.map.present && state.map.present.mapId || null;
+const mapVersionSelector = (state) => state.map && state.map.present && state.map.present.version || 1;
 
 module.exports = {
     mapSelector,
     scalesSelector,
-    mapIdSelector
+    mapIdSelector,
+    mapVersionSelector
 };