Porting of minor fixes (#2076)

Porting of minor fixes/improvements: - Authkey with custom parameter name (c040) - MultiGeom support for search geometry service (c028) - Export resilient to natural order errors (040) - Disable pinch scale on mobile devices (c040)
geosolutions-it · Aug 2, 2017 · fc27b58 · fc27b58
1 parent dfa6989
commit fc27b58
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 29 deletions.
diff --git a/web/client/components/mapcontrols/search/SearchResult.jsx b/web/client/components/mapcontrols/search/SearchResult.jsx
@@ -47,7 +47,7 @@ class SearchResult extends React.Component {
         }
         let item = this.props.item;
         return (
-            <div key={item.osm_id} className="search-result" onClick={this.onClick}>
+            <div key={item.osm_id} className="search-result" style={item.resultCssStyle} onClick={this.onClick}>
                 <div className="icon"> <img src={item.icon} /></div>
                 <div className="text-result-title">{get(item, this.props.displayName) || generateTemplateString(this.props.displayName || "")(item) }</div>
                 <small className="text-info">{this.props.subTitle && get(item, this.props.subTitle) || generateTemplateString(this.props.subTitle || "")(item) }</small>

diff --git a/web/client/epics/search.js b/web/client/epics/search.js
@@ -93,7 +93,7 @@ const searchItemSelected = action$ =>
                     // retrieve geometry from geomService or pass the item directly
                     return Rx.Observable.fromPromise(
                         API.Utils.getService(item.__SERVICE__.geomService.type)("", assign( {}, item.__SERVICE__.geomService.options, { staticFilter } ))
-                            .then(res => assign({}, item, {geometry: res[0].geometry} ) )
+                            .then(res => assign({}, item, {geometry: CoordinatesUtils.mergeToPolyGeom(res)} ) )
                     );
                 }
                 return Rx.Observable.of(action.item);

diff --git a/web/client/epics/wfsdownload.js b/web/client/epics/wfsdownload.js
@@ -9,7 +9,7 @@ const FilterUtils = require('../utils/FilterUtils');
 const {getByOutputFormat} = require('../utils/FileFormatUtils');
 
 const getWFSFeature = ({url, filterObj = {}, downloadOptions= {}} = {}) => {
-    const data = FilterUtils.toOGCFilter(filterObj.featureTypeName, filterObj, filterObj.ogcVersion);
+    const data = FilterUtils.toOGCFilter(filterObj.featureTypeName, filterObj, filterObj.ogcVersion, filterObj.sortOptions);
     return Rx.Observable.defer( () =>
         axios.post(url + `?service=WFS&outputFormat=${downloadOptions.selectedFormat}`, data, {
           timeout: 60000,
@@ -25,6 +25,12 @@ const getFileName = action => {
     }
     return name;
 };
+const getDefaultSortOptions = (attribute) => {
+    return attribute ? { sortBy: attribute, sortOrder: 'A'} : {};
+};
+const getFirstAttribute = (state)=> {
+    return state.query && state.query.featureTypes && state.query.featureTypes[state.query.typeName] && state.query.featureTypes[state.query.typeName].attributes && state.query.featureTypes[state.query.typeName].attributes[0] && state.query.featureTypes[state.query.typeName].attributes[0].attribute || null;
+};
 /*
 const str2bytes = (str) => {
     var bytes = new Uint8Array(str.length);
@@ -35,7 +41,7 @@ const str2bytes = (str) => {
 };
 */
 module.exports = {
-    startFeatureExportDownload: action$ =>
+    startFeatureExportDownload: (action$, store) =>
         action$.ofType(DOWNLOAD_FEATURES).switchMap(action =>
             getWFSFeature({
                     url: action.url,
@@ -52,6 +58,26 @@ module.exports = {
                             throw xml;
                         }
                     }
+                })
+                .catch( () => {
+                    return getWFSFeature({
+                            url: action.url,
+                            downloadOptions: action.downloadOptions,
+                            filterObj: {
+                                ...action.filterObj,
+                                pagination: get(action, "downloadOptions.singlePage") ? action.filterObj.pagination : null,
+                                sortOptions: getDefaultSortOptions(getFirstAttribute(store.getState()))
+                            }
+                        }).do(({data, headers}) => {
+                            if (headers["content-type"] === "application/xml") { // TODO add expected mimetypes in the case you want application/dxf
+                                let xml = String.fromCharCode.apply(null, new Uint8Array(data));
+                                if (xml.indexOf("<ows:ExceptionReport") === 0 ) {
+                                    throw xml;
+                                }
+                            }
+                            saveAs(new Blob([data], {type: headers && headers["content-type"]}), getFileName(action));
+                        });
+                }).do(({data, headers}) => {
                     saveAs(new Blob([data], {type: headers && headers["content-type"]}), getFileName(action));
                 })
                 .map( () => onDownloadFinished() )

diff --git a/web/client/index.html b/web/client/index.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="UTF-8">
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
         <title>MapStore 2 HomePage</title>
         <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway" type='text/css'>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.css" />

diff --git a/web/client/libs/__tests__/ajax-test.js b/web/client/libs/__tests__/ajax-test.js
@@ -50,10 +50,8 @@ const authenticationRules = [
     },
     {
       "urlPattern": ".*youhavetouseacustomone.*",
-      "method": {
-          "method": "authkey-param",
-          "param": "mario"
-      }
+      "authkeyParamName": "mario",
+      "method": "authkey"
     },
     {
       "urlPattern": ".*thisismissingtheparam.*",
@@ -268,20 +266,6 @@ describe('Tests ajax library', () => {
         });
     });
 
-    it('falls back to standard authkey if the custom one is misconfigured', (done) => {
-        // mocking the authentication rules and user info
-        expect.spyOn(SecurityUtils, 'isAuthenticationActivated').andReturn(true);
-        expect.spyOn(SecurityUtils, 'getAuthenticationRules').andReturn(authenticationRules);
-        expect.spyOn(SecurityUtils, 'getSecurityInfo').andReturn(securityInfoB);
-        const theExpectedString = 'authkey%3D' + securityInfoB.token;
-        axios.get('http://non-existent.mapstore2/thisismissingtheparam?parameter1=value1&par2=v2').then(() => {
-            done("Axios actually reached the fake url");
-        }).catch((exception) => {
-            expect(exception.config).toExist().toIncludeKey('url');
-            expect(exception.config.url.indexOf(theExpectedString)).toBeGreaterThan(-1);
-            done();
-        });
-    });
 
     it('does not add autkeys if the configuration is wrong', (done) => {
         // mocking the authentication rules and user info

diff --git a/web/client/libs/ajax.js b/web/client/libs/ajax.js
@@ -11,7 +11,7 @@ const ConfigUtils = require('../utils/ConfigUtils');
 
 const SecurityUtils = require('../utils/SecurityUtils');
 const assign = require('object-assign');
-const {has, isObject} = require('lodash');
+const {isObject} = require('lodash');
 const urlUtil = require('url');
 
 /**
@@ -38,17 +38,15 @@ function addAuthenticationToAxios(axiosConfig) {
         return axiosConfig;
     }
     const rule = SecurityUtils.getAuthenticationRule(axiosConfig.url);
-    const method = rule && (has(rule, "method.method") ? rule.method : assign({}, {method: rule.method}));
-    const methodType = rule && (has(rule, "method.method") ? rule.method.method : rule.method);
-    switch (methodType) {
+
+    switch (rule && rule.method) {
         case 'authkey':
-        case 'authkey-param':
         {
             const token = SecurityUtils.getToken();
             if (!token) {
                 return axiosConfig;
             }
-            addParameterToAxiosConfig(axiosConfig, method.param || 'authkey', token);
+            addParameterToAxiosConfig(axiosConfig, rule.authkeyParamName || 'authkey', token);
             return axiosConfig;
         }
         case 'basic':

diff --git a/web/client/utils/CoordinatesUtils.js b/web/client/utils/CoordinatesUtils.js
@@ -389,6 +389,15 @@ const CoordinatesUtils = {
             }
             default: return [];
         }
+    },
+    mergeToPolyGeom(features) {
+        if (features.length === 1) {
+            return features[0].geometry;
+        }
+        return {
+            type: "GeometryCollection",
+            geometries: features.map( ({geometry}) => geometry)
+        };
     }
 };