Fixes #1686: warning when no queryable layer is available during identify click (#1700)

mbarto · web-flow · commit f448fbfb973e · 2017-04-07T11:54:13.000+02:00
diff --git a/web/client/actions/mapInfo.js b/web/client/actions/mapInfo.js
@@ -23,6 +23,8 @@ const HIDE_MAPINFO_MARKER = 'HIDE_MAPINFO_MARKER';
 const SHOW_REVERSE_GEOCODE = 'SHOW_REVERSE_GEOCODE';
 const HIDE_REVERSE_GEOCODE = 'HIDE_REVERSE_GEOCODE';
 const GET_VECTOR_INFO = 'GET_VECTOR_INFO';
+const NO_QUERYABLE_LAYERS = 'NO_QUERYABLE_LAYERS';
+const CLEAR_WARNING = 'CLEAR_WARNING';
 
 /**
  * Private
@@ -67,6 +69,18 @@ function exceptionsFeatureInfo(reqId, exceptions, rParams, lMetaData) {
     };
 }
 
+function noQueryableLayers() {
+    return {
+        type: NO_QUERYABLE_LAYERS
+    };
+}
+
+function clearWarning() {
+    return {
+        type: CLEAR_WARNING
+    };
+}
+
 function newMapInfoRequest(reqId, reqConfig) {
     return {
         type: NEW_MAPINFO_REQUEST,
@@ -197,6 +211,8 @@ module.exports = {
     SHOW_REVERSE_GEOCODE,
     HIDE_REVERSE_GEOCODE,
     GET_VECTOR_INFO,
+    NO_QUERYABLE_LAYERS,
+    CLEAR_WARNING,
     getFeatureInfo,
     changeMapInfoState,
     newMapInfoRequest,
@@ -207,5 +223,7 @@ module.exports = {
     revGeocodeInfo,
     hideMapinfoRevGeocode,
     showMapinfoRevGeocode,
-    getVectorInfo
+    getVectorInfo,
+    noQueryableLayers,
+    clearWarning
 };
diff --git a/web/client/components/data/identify/Identify.jsx b/web/client/components/data/identify/Identify.jsx
@@ -7,7 +7,7 @@
  */
 
 const React = require('react');
-const {Panel, Glyphicon} = require('react-bootstrap');
+const {Panel, Glyphicon, Modal} = require('react-bootstrap');
 const {findIndex} = require('lodash');
 
 require('./css/identify.css');
@@ -37,6 +37,8 @@ const Identify = React.createClass({
         viewerOptions: React.PropTypes.object,
         viewer: React.PropTypes.oneOfType([React.PropTypes.object, React.PropTypes.func]),
         purgeResults: React.PropTypes.func,
+        noQueryableLayers: React.PropTypes.func,
+        clearWarning: React.PropTypes.func,
         queryableLayersFilter: React.PropTypes.func,
         buildRequest: React.PropTypes.func,
         sendRequest: React.PropTypes.func,
@@ -59,7 +61,8 @@ const Identify = React.createClass({
         asPanel: React.PropTypes.bool,
         headerGlyph: React.PropTypes.string,
         closeGlyph: React.PropTypes.string,
-        allowMultiselection: React.PropTypes.bool
+        allowMultiselection: React.PropTypes.bool,
+        warning: React.PropTypes.string
     },
     getDefaultProps() {
         return {
@@ -78,6 +81,8 @@ const Identify = React.createClass({
             sendRequest: () => {},
             showMarker: () => {},
             hideMarker: () => {},
+            noQueryableLayers: () => {},
+            clearWarning: () => {},
             changeMousePointer: () => {},
             showRevGeocode: () => {},
             hideRevGeocode: () => {},
@@ -133,7 +138,12 @@ const Identify = React.createClass({
                 }
 
             });
-            this.props.showMarker();
+            if (queryableLayers.length === 0) {
+                this.props.noQueryableLayers();
+            } else {
+                this.props.showMarker();
+            }
+
         }
 
         if (newProps.enabled && !this.props.enabled) {
@@ -222,6 +232,20 @@ const Identify = React.createClass({
                     </Draggable>
                 ) : this.renderContent();
         }
+        if (this.props.warning) {
+            return (<Modal show={true} bsSize="small" onHide={() => {
+                this.props.clearWarning();
+            }}>
+                <Modal.Header className="dialog-error-header-side" closeButton>
+                    <Modal.Title><Message msgId="warning"/></Modal.Title>
+                </Modal.Header>
+                <Modal.Body>
+                    <div className="mapstore-error"><Message msgId="identifyNoQueryableLayers"/></div>
+                </Modal.Body>
+                <Modal.Footer>
+                </Modal.Footer>
+            </Modal>);
+        }
         return null;
     },
     needsRefresh(props) {
diff --git a/web/client/components/data/identify/__tests__/Identify-test.jsx b/web/client/components/data/identify/__tests__/Identify-test.jsx
@@ -227,6 +227,31 @@ describe('Identify', () => {
         expect(spyHideMarker.calls.length).toEqual(1);
     });
 
+    it('creates the Identify component no queryable layer', () => {
+        const testHandlers = {
+            noQueryableLayers: () => {}
+        };
+
+        const spyNoQueryableLayers = expect.spyOn(testHandlers, 'noQueryableLayers');
+
+        ReactDOM.render(
+            <Identify
+                queryableLayersFilter={() => false}
+                enabled={true} layers={[{}, {}]} {...testHandlers} buildRequest={() => ({})}
+                />,
+            document.getElementById("container")
+        );
+        ReactDOM.render(
+            <Identify
+                queryableLayersFilter={() => false}
+                point={{pixel: {x: 1, y: 1}}}
+                enabled={true} layers={[{}, {}]} {...testHandlers} buildRequest={() => ({})}
+                />,
+            document.getElementById("container")
+        );
+        expect(spyNoQueryableLayers.calls.length).toEqual(1);
+    });
+
     it('creates the Identify component purge results on point', () => {
         const testHandlers = {
             purgeResults: () => {}
diff --git a/web/client/plugins/Identify.jsx b/web/client/plugins/Identify.jsx
@@ -13,7 +13,7 @@ const {createSelector} = require('reselect');
 const {mapSelector} = require('../selectors/map');
 const {layersSelector} = require('../selectors/layers');
 
-const {getFeatureInfo, getVectorInfo, purgeMapInfoResults, showMapinfoMarker, hideMapinfoMarker, showMapinfoRevGeocode, hideMapinfoRevGeocode} = require('../actions/mapInfo');
+const {getFeatureInfo, getVectorInfo, purgeMapInfoResults, showMapinfoMarker, hideMapinfoMarker, showMapinfoRevGeocode, hideMapinfoRevGeocode, noQueryableLayers, clearWarning} = require('../actions/mapInfo');
 const {changeMousePointer} = require('../actions/map');
 const {changeMapInfoFormat} = require('../actions/mapInfo');
 
@@ -34,10 +34,11 @@ const selector = createSelector([
     layersSelector,
     (state) => state.mapInfo && state.mapInfo.clickPoint,
     (state) => state.mapInfo && state.mapInfo.showModalReverse,
-    (state) => state.mapInfo && state.mapInfo.reverseGeocodeData
+    (state) => state.mapInfo && state.mapInfo.reverseGeocodeData,
+    (state) => state.mapInfo && state.mapInfo.warning
 
-], (enabled, responses, requests, format, map, layers, point, showModalReverse, reverseGeocodeData) => ({
-    enabled, responses, requests, format, map, layers, point, showModalReverse, reverseGeocodeData
+], (enabled, responses, requests, format, map, layers, point, showModalReverse, reverseGeocodeData, warning) => ({
+    enabled, responses, requests, format, map, layers, point, showModalReverse, reverseGeocodeData, warning
 }));
 // result panel
 
@@ -89,6 +90,8 @@ const IdentifyPlugin = connect(selector, {
     purgeResults: purgeMapInfoResults,
     changeMousePointer,
     showMarker: showMapinfoMarker,
+    noQueryableLayers,
+    clearWarning,
     hideMarker: hideMapinfoMarker,
     showRevGeocode: showMapinfoRevGeocode,
     hideRevGeocode: hideMapinfoRevGeocode
diff --git a/web/client/reducers/mapInfo.js b/web/client/reducers/mapInfo.js
@@ -20,7 +20,9 @@ const {
     HIDE_MAPINFO_MARKER,
     SHOW_REVERSE_GEOCODE,
     HIDE_REVERSE_GEOCODE,
-    GET_VECTOR_INFO
+    GET_VECTOR_INFO,
+    NO_QUERYABLE_LAYERS,
+    CLEAR_WARNING
 } = require('../actions/mapInfo');
 
 const {RESET_CONTROLS} = require('../actions/controls');
@@ -45,6 +47,14 @@ function receiveResponse(state, action, type) {
 
 function mapInfo(state = {}, action) {
     switch (action.type) {
+        case NO_QUERYABLE_LAYERS:
+            return assign({}, state, {
+                warning: 'NO_QUERYABLE_LAYERS'
+            });
+        case CLEAR_WARNING:
+            return assign({}, state, {
+                warning: null
+            });
         case CHANGE_MAPINFO_STATE:
             return assign({}, state, {
                 enabled: action.enabled
diff --git a/web/client/translations/data.de-DE b/web/client/translations/data.de-DE
@@ -20,6 +20,7 @@
         "about_p6": "MapStore2 ist entwickelt von:",
         "enable": "Aktiviere",
         "layers": "Ebenen",
+        "warning": "Warnung",
         "layerProperties": {
             "windowTitle": "Ebenen Eigenschaften",
             "title": "Titel",
@@ -218,6 +219,7 @@
         },
         "getFeatureInfoTitle": "Feature Info",
         "identifyTitle": "Feature Info",
+        "identifyNoQueryableLayers": "Keine aktive abrufbare Ebene",
         "identifyRevGeocodeHeader": "Koordinaten",
         "identifyRevGeocodeModalTitle": "Addresse",
         "identifyRevGeocodeSubmitText": "Mehr Informationen",
diff --git a/web/client/translations/data.en-US b/web/client/translations/data.en-US
@@ -20,6 +20,7 @@
         "about_p6": "MapStore2 is made by:",
         "enable": "Enable",
         "layers": "Layers",
+        "warning": "Warning",
         "layerProperties": {
             "windowTitle": "Layer Properties",
             "title": "Title",
@@ -218,6 +219,7 @@
         },
         "getFeatureInfoTitle": "Feature Info",
         "identifyTitle": "Feature Info",
+        "identifyNoQueryableLayers": "No active queryable layer",
         "identifyRevGeocodeHeader": "Coordinates",
         "identifyRevGeocodeModalTitle": "Address",
         "identifyRevGeocodeSubmitText": "More Info",
diff --git a/web/client/translations/data.fr-FR b/web/client/translations/data.fr-FR
@@ -20,6 +20,7 @@
         "about_p6": "MapStore2 est développé par:",
         "enable": "Activer",
         "layers": "Couches",
+        "warning": "Attention",
         "layerProperties": {
             "windowTitle": "Propriétés de la couche",
             "title": "Titre",
@@ -219,6 +220,7 @@
         },
         "getFeatureInfoTitle": "Informations de l'objet",
         "identifyTitle": "Informations de l'objet",
+        "identifyNoQueryableLayers": "Aucune couche active requise",
         "identifyRevGeocodeHeader": "Coordonnées",
         "identifyRevGeocodeModalTitle": "Adresse",
         "identifyRevGeocodeSubmitText": "Plus d'Informations",
diff --git a/web/client/translations/data.it-IT b/web/client/translations/data.it-IT
@@ -20,6 +20,7 @@
         "about_p6": "MapStore2 è sviluppato da:",
         "enable": "Abilita",
         "layers": "Livelli",
+        "warning": "Attenzione",
         "layerProperties": {
             "windowTitle": "Proprietà del livello",
             "title": "Titolo",
@@ -218,6 +219,7 @@
         },
         "getFeatureInfoTitle": "Informazioni Sulle Feature",
         "identifyTitle": "Informazioni Sulle Feature",
+        "identifyNoQueryableLayers": "Nessun livello interrogabile attivo",
         "identifyRevGeocodeHeader": "Coordinate",
         "identifyRevGeocodeModalTitle": "Indirizzo",
         "identifyRevGeocodeSubmitText": "Più informazioni",
