Fix #3958 hide layer related buttons when removing a layer from the m…

…ap (#3980)

web/client/plugins/widgetbuilder/MapBuilder.jsx

@@ -100,6 +100,7 @@ module.exports = mapBuilder(({
             selectedNodes={selectedNodes}
             selectedLayers={selectedLayers}
             selectedGroups={selectedGroups}
+            onNodeSelect={onNodeSelect}
             toggleLayerSelector={toggleLayerSelector}/></BuilderHeader>)}
         >
         {enabled ? <Builder

web/client/plugins/widgetbuilder/enhancers/__tests__/handleMapRemoveLayer-test.js

@@ -0,0 +1,41 @@
+
+
+/*
+ * Copyright 2019, GeoSolutions Sas.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+// dependencies
+const React = require('react');
+const ReactDOM = require('react-dom');
+const expect = require('expect');
+const ReactTestUtils = require('react-dom/test-utils');
+const handleMapRemoveLayer = require('../handleMapRemoveLayer');
+const CMP = handleMapRemoveLayer((props) => <button id="CMP" onClick={() => props.onRemoveSelected()} />);
+
+describe('handleMapRemoveLayer enhancer', function() {
+    beforeEach((done) => {
+        document.body.innerHTML = '<div id="container"></div>';
+        setTimeout(done);
+    });
+
+    afterEach((done) => {
+        ReactDOM.unmountComponentAtNode(document.getElementById("container"));
+        document.body.innerHTML = '';
+        setTimeout(done);
+    });
+
+    it('layer remove must also unselect the layers by triggering onNodeSelect', () => {
+        const lib = {
+            onNodeSelect() { }
+        };
+        const spyReset = expect.spyOn(lib, 'onNodeSelect');
+        ReactDOM.render(<CMP selectedLayers={['layer 1']} onNodeSelect={lib.onNodeSelect} />, document.getElementById("container"));
+        const el = document.querySelector('#CMP');
+        ReactTestUtils.Simulate.click(el);
+        expect(spyReset).toHaveBeenCalled();
+    });
+});

web/client/plugins/widgetbuilder/enhancers/handleMapRemoveLayer.js

@@ -0,0 +1,18 @@
+/*
+ * Copyright 2019, GeoSolutions Sas.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+const { withHandlers } = require('recompose');
+
+const enhancer = withHandlers({
+    onRemoveSelected: ({ selectedLayers = [], removeLayersById = () => { }, onNodeSelect = () => { } }) => () => {
+        removeLayersById(selectedLayers);
+        selectedLayers.forEach(layer => onNodeSelect(layer, 'layer', false));
+    }
+});
+
+module.exports = enhancer;

web/client/plugins/widgetbuilder/enhancers/mapToolbar.js

@@ -5,11 +5,12 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
  */
-const { compose, branch, withProps, withHandlers} = require('recompose');
+const { compose, branch, withProps } = require('recompose');
 const {connect} = require('react-redux');
 const { insertWidget, setPage, onEditorChange} = require('../../../actions/widgets');
 const manageLayers = require('./manageLayers');
 const handleNodeEditing = require('./handleNodeEditing');
+const handleRemoveLayer = require('./handleMapRemoveLayer');
 const { wizardSelector, wizardStateToProps } = require('../commons');
 
 const mapBuilderConnect = require('./connection/mapBuilderConnect');
@@ -25,11 +26,7 @@ module.exports = compose(
     ),
     manageLayers,
     handleNodeEditing,
-    withHandlers({
-        onRemoveSelected: ({selectedLayers = [], removeLayersById = () => { } }) => () => {
-            removeLayersById(selectedLayers);
-        }
-    }),
+    handleRemoveLayer,
     branch(
         ({editNode}) => !!editNode,
         withProps(({ selectedNodes = [], setEditNode = () => { } }) => ({