Close #3385 Close missing save button after login (#3757) (#3761)

offtherailz · web-flow · commit abc2cc075f0a · 2019-05-16T17:54:58.000+02:00
diff --git a/web/client/reducers/__tests__/config-test.js b/web/client/reducers/__tests__/config-test.js
@@ -115,4 +115,17 @@ describe('Test the mapConfig reducer', () => {
         });
         expect(mapConfig({}, {type: MAP_CREATED, resourceId: 2})).toEqual({});
     });
+    it('test MAP_INFO_LOADED accepts string or numeric mapId', () => {
+        var state = mapConfig({}, {type: 'MAP_CONFIG_LOADED', mapId: "1", config: { version: 2, map: {center: {x: 1, y: 1}, zoom: 11, layers: [] }}});
+        state = mapConfig(state, {type: "MAP_INFO_LOADED", mapId: 1, info: {canEdit: true, canDelete: true}});
+        expect(state.map).toExist();
+        expect(state.map.info).toExist();
+        expect(state.map.info.canEdit).toBe(true);
+        state = {};
+        state = mapConfig({}, {type: 'MAP_CONFIG_LOADED', mapId: 1, config: { version: 2, map: {center: {x: 1, y: 1}, zoom: 11, layers: [] }}});
+        state = mapConfig(state, {type: "MAP_INFO_LOADED", mapId: "1", info: {canEdit: true, canDelete: true}});
+        expect(state.map).toExist();
+        expect(state.map.info).toExist();
+        expect(state.map.info.canEdit).toBe(true);
+    });
 });
diff --git a/web/client/reducers/config.js b/web/client/reducers/config.js
@@ -54,7 +54,7 @@ function mapConfig(state = null, action) {
     }
     case MAP_INFO_LOADED:
         map = state && state.map && state.map.present ? state.map.present : state && state.map;
-        if (map && map.mapId === action.mapId) {
+        if (map && `${map.mapId}` === `${action.mapId}`) {
             map = assign({}, map, {info: action.info});
             return assign({}, state, {map: map});
         }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ function mapConfig(state = null, action) {`
`54`	`54`	`}`
`55`	`55`	`case MAP_INFO_LOADED:`
`56`	`56`	`map = state && state.map && state.map.present ? state.map.present : state && state.map;`
`57`		`- if (map && map.mapId === action.mapId) {`
	`57`	+ if (map && `${map.mapId}` === `${action.mapId}`) {
`58`	`58`	`map = assign({}, map, {info: action.info});`
`59`	`59`	`return assign({}, state, {map: map});`
`60`	`60`	`}`