Assigned old state on add layer action

allyoucanmap · allyoucanmap · commit 46ae17131101 · 2019-01-08T10:25:26.000+01:00
diff --git a/web/client/reducers/__tests__/layers-test.js b/web/client/reducers/__tests__/layers-test.js
@@ -7,7 +7,7 @@
  */
 var expect = require('expect');
 var layers = require('../layers');
-const { changeLayerParams } = require('../../actions/layers');
+const { changeLayerParams, addLayer } = require('../../actions/layers');
 
 
 describe('Test the layers reducer', () => {
@@ -490,6 +490,33 @@ describe('Test the layers reducer', () => {
         expect(state.groups[0].nodes[1]).toBe("test_id1");
     });
 
+    it('add new layer and verify old state', () => {
+        const testAction = addLayer({ group: "test", id: "test_id1" });
+
+        const state = layers(
+            {
+                flat: [
+                    {
+                        id: "layer"
+                    }
+                ],
+                settings: {
+                    options: {
+                        opacity: 0.8
+                    }
+                },
+                selected: [
+                    "layer"
+                ]
+            },
+            testAction
+        );
+
+        expect(state.settings).toExist();
+        expect(state.selected).toExist();
+
+    });
+
     it('remove layer', () => {
         let addAction = {
             type: "ADD_LAYER",
diff --git a/web/client/reducers/layers.js b/web/client/reducers/layers.js
@@ -228,10 +228,10 @@ function layers(state = { flat: [] }, action) {
                 newGroups = moveNode(newGroups, newLayer.id, groupId, newLayers, action.foreground);
             }
             let orderedNewLayers = LayersUtils.sortLayers ? LayersUtils.sortLayers(newGroups, newLayers) : newLayers;
-            return {
-                    flat: orderedNewLayers,
-                    groups: newGroups
-            };
+            return assign({}, state, {
+                flat: orderedNewLayers,
+                groups: newGroups
+            });
         }
         case REMOVE_LAYER: {
             const newGroups = deepRemove(state.groups, action.layerId);
