#8545 LayerDownload: service selector

web/client/actions/layerdownload.js

@@ -14,6 +14,7 @@ export const DOWNLOAD_OPTIONS_CHANGE = "LAYERDOWNLOAD:FORMAT_SELECTED";
 export const CLEAR_DOWNLOAD_OPTIONS = "LAYERDOWNLOAD:CLEAR_DOWNLOAD_OPTIONS";
 export const FORMAT_OPTIONS_FETCH = "LAYERDOWNLOAD:FORMAT_FETCH";
 export const FORMAT_OPTIONS_UPDATE = "LAYERDOWNLOAD:FORMAT_UPDATE";
+export const SET_WPS_AVAILABILITY = "LAYERDOWNLOAD:SET_WPS_AVAILABLE";
 export const SET_SERVICE = "LAYERDOWNLOAD:SET_SERVICE";
 export const SET_EXPORT_DATA_RESULTS = "LAYERDOWNLOAD:SET_EXPORT_DATA_RESULTS";
 export const ADD_EXPORT_DATA_RESULT = "LAYERDOWNLOAD:ADD_EXPORT_DATA_RESULT";
@@ -33,9 +34,10 @@ export const SET_INFO_BUBBLE_MESSAGE = "LAYERDOWNLOAD:SET_INFO_BUBBLE_MESSAGE";
  * @name layerdownload
  * @type {Object}
  */
-export const checkWPSAvailability = (url) => ({
+export const checkWPSAvailability = (url, selectedService) => ({
     type: CHECK_WPS_AVAILABILITY,
-    url
+    url,
+    selectedService
 });
 export const checkingWPSAvailability = (checking) => ({
     type: CHECKING_WPS_AVAILABILITY,
@@ -104,6 +106,11 @@ export const onDownloadFinished = () => ({
     type: DOWNLOAD_FINISHED
 });
 
+export const setWPSAvailability = (value) => ({
+    type: SET_WPS_AVAILABILITY,
+    value
+});
+
 /**
  * set service to use for layer download(wfs or wps)
  * @memberof actions.layerdownload

web/client/components/data/download/DownloadDialog.jsx

@@ -27,13 +27,15 @@ class DownloadDialog extends React.Component {
         filterObj: PropTypes.object,
         closeGlyph: PropTypes.string,
         url: PropTypes.string,
+        wpsAvailable: PropTypes.bool,
         service: PropTypes.string,
         enabled: PropTypes.bool,
         loading: PropTypes.bool,
         checkingWPSAvailability: PropTypes.bool,
         onClose: PropTypes.func,
         onExport: PropTypes.func,
         onCheckWPSAvailability: PropTypes.func,
+        setService: PropTypes.func,
         onDownloadOptionChange: PropTypes.func,
         onClearDownloadOptions: PropTypes.func,
         onFormatOptionsFetch: PropTypes.func,
@@ -53,12 +55,14 @@ class DownloadDialog extends React.Component {
         onExport: () => {},
         onClose: () => {},
         onCheckWPSAvailability: () => {},
+        setService: () => {},
         onDownloadOptionChange: () => {},
         onClearDownloadOptions: () => {},
         onFormatOptionsFetch: () => {},
         checkingWPSAvailability: false,
         layer: {},
         closeGlyph: "1-close",
+        wpsAvailable: false,
         service: 'wfs',
         wfsFormats: [],
         formats: [
@@ -85,7 +89,10 @@ class DownloadDialog extends React.Component {
         if (this.props.enabled !== oldProps.enabled && this.props.enabled) {
             this.props.onClearDownloadOptions();
             if (this.props.layer.type === 'wms') {
-                this.props.onCheckWPSAvailability(this.props.url || this.props.layer.url);
+                this.props.onCheckWPSAvailability(
+                    this.props.url || this.props.layer.url,
+                    this.props.defaultSelectedService || 'wps'
+                );
             }
         }
     }
@@ -119,7 +126,10 @@ class DownloadDialog extends React.Component {
                     this.props.service === 'wfs' && !this.props.layer.search?.url ?
                         <EmptyView title={<Message msgId="layerdownload.noSupportedServiceFound"/>}/> :
                         <DownloadOptions
+                            wpsAvailable={this.props.wpsAvailable}
+                            service={this.props.service}
                             downloadOptions={this.props.downloadOptions}
+                            setService={this.props.setService}
                             onChange={this.props.onDownloadOptionChange}
                             formatOptionsFetch={this.props.service === 'wfs' ? this.props.onFormatOptionsFetch : () => {}}
                             formatsLoading={this.props.formatsLoading}

web/client/components/data/download/DownloadOptions.jsx

@@ -26,31 +26,45 @@ import DownloadWPSOptions from './DownloadWPSOptions';
  */
 class DownloadOptions extends React.Component {
     static propTypes = {
+        wpsAvailable: PropTypes.bool,
+        service: PropTypes.string,
         downloadOptions: PropTypes.object,
         formatOptionsFetch: PropTypes.func,
         formats: PropTypes.array,
         srsList: PropTypes.array,
+        setService: PropTypes.func,
         onChange: PropTypes.func,
         defaultSrs: PropTypes.string,
         wpsOptionsVisible: PropTypes.bool,
         wpsAdvancedOptionsVisible: PropTypes.bool,
         downloadFilteredVisible: PropTypes.bool,
         layer: PropTypes.object,
         formatsLoading: PropTypes.bool,
-        virtualScroll: PropTypes.bool
+        virtualScroll: PropTypes.bool,
+        services: PropTypes.arrayOf(PropTypes.object)
     };
 
     static defaultProps = {
+        wpsAvailable: false,
+        service: 'wps',
         downloadOptions: {},
         formatsLoading: false,
         formats: [],
         srsList: [],
         wpsOptionsVisible: false,
         wpsAdvancedOptionsVisible: false,
         downloadFilteredVisible: false,
-        virtualScroll: true
+        virtualScroll: true,
+        services: [
+            { value: "wps", label: "WPS" },
+            { value: "wfs", label: "WFS" }
+        ]
     };
 
+    constructor(props) {
+        super(props);
+    }
+
     getSelectedFormat = () => {
         return get(this.props, "downloadOptions.selectedFormat");
     };
@@ -60,6 +74,16 @@ class DownloadOptions extends React.Component {
 
     render() {
         return (<form>
+            {this.props.wpsAvailable &&
+                <>
+                    <label><Message msgId="layerdownload.service" /></label>
+                    <Select
+                        clearable={false}
+                        value={this.props.service}
+                        onChange={(sel) => this.props.setService(sel.value)}
+                        options={this.props.services} />
+                </>
+            }
             <label><Message msgId="layerdownload.format" /></label>
             <Select
                 clearable={false}

web/client/configs/localConfig.json

@@ -358,7 +358,12 @@
                     }
                 }
             }, "Home", "FeatureEditor",
-            "LayerDownload",
+            {
+              "name": "LayerDownload",
+              "cfg": {
+                "defaultSelectedService": "wps"
+              }
+            },
             {
               "name": "QueryPanel",
               "cfg": {

web/client/epics/layerdownload.js

@@ -37,7 +37,8 @@ import {
     serializeCookie,
     addExportDataResult,
     updateExportDataResult,
-    showInfoBubbleMessage
+    showInfoBubbleMessage,
+    setWPSAvailability
 } from '../actions/layerdownload';
 import { TOGGLE_CONTROL, toggleControl } from '../actions/controls';
 import { DOWNLOAD } from '../actions/layers';
@@ -199,20 +200,22 @@ const str2bytes = (str) => {
 */
 export const checkWPSAvailabilityEpic = (action$) => action$
     .ofType(CHECK_WPS_AVAILABILITY)
-    .switchMap(({url}) => {
+    .switchMap(({url, selectedService}) => {
         return describeProcess(url, 'gs:DownloadEstimator,gs:Download')
             .switchMap(response => Rx.Observable.defer(() => new Promise((resolve, reject) => parseString(response.data, {tagNameProcessors: [stripPrefix]}, (err, res) => err ? reject(err) : resolve(res)))))
             .flatMap(xmlObj => {
                 const ids = [
                     xmlObj?.ProcessDescriptions?.ProcessDescription?.[0]?.Identifier?.[0],
                     xmlObj?.ProcessDescriptions?.ProcessDescription?.[1]?.Identifier?.[0]
                 ];
+                const isWpsAvailable = findIndex(ids, x => x === 'gs:DownloadEstimator') > -1 && findIndex(ids, x => x === 'gs:Download') > -1;
                 return Rx.Observable.of(
-                    setService(findIndex(ids, x => x === 'gs:DownloadEstimator') > -1 && findIndex(ids, x => x === 'gs:Download') > -1 ? 'wps' : 'wfs'),
+                    setService(isWpsAvailable ? selectedService || 'wps' : 'wfs'),
+                    setWPSAvailability(isWpsAvailable),
                     checkingWPSAvailability(false)
                 );
             })
-            .catch(() => Rx.Observable.of(setService('wfs'), checkingWPSAvailability(false)))
+            .catch(() => Rx.Observable.of(setService('wfs'), setWPSAvailability(false), checkingWPSAvailability(false)))
             .startWith(checkingWPSAvailability(true));
     });
 export const openDownloadTool = (action$) =>

web/client/plugins/LayerDownload.jsx

@@ -12,6 +12,7 @@ import { createStructuredSelector } from 'reselect';
 import {
     downloadFeatures,
     checkWPSAvailability,
+    setService,
     onDownloadOptionChange,
     onFormatOptionsFetch,
     clearDownloadOptions,
@@ -26,6 +27,7 @@ import {
     loadingSelector,
     wfsFormatsSelector,
     formatsLoadingSelector,
+    wpsAvailableSelector,
     serviceSelector,
     checkingWPSAvailabilitySelector,
     wfsFilterSelector,
@@ -58,6 +60,7 @@ import { createPlugin } from '../utils/PluginsUtils';
  * @prop {object[]} srsList An array of name-label objects for the allowed srs available. Use name:'native' to omit srsName param in wfs filter
  * @prop {string} defaultSrs Default selected srs
  * @prop {string} closeGlyph The icon to use for close the dialog
+ * @prop {string} defaultSelectedService The service that should be used by default for donwloading. Valid values: "wfs", "wps"
  * @example
  * {
  *  "name": "LayerDownload",
@@ -69,11 +72,12 @@ import { createPlugin } from '../utils/PluginsUtils';
  *            {"name": "excel2007", "label": "excel2007"},
  *            {"name": "dxf-zip", "label": "dxf-zip"}
  *    ],
- *     "srsList": [
+ *    "srsList": [
  *            {"name": "native", "label": "Native"},
  *            {"name": "EPSG:4326", "label": "WGS84"}
  *    ],
- *     "defaultSrs": "native"
+ *    "defaultSrs": "native",
+ *    "defaultSelectedService": "wfs"
  *  }
  * }
  * // it is possible to support GeoPackage format when the targeted GeoServer uses wps download extensions
@@ -109,13 +113,15 @@ const LayerDownloadPlugin = createPlugin('LayerDownload', {
         wfsFormats: wfsFormatsSelector,
         formatsLoading: formatsLoadingSelector,
         layer: getSelectedLayer,
+        wpsAvailable: wpsAvailableSelector,
         service: serviceSelector,
         checkingWPSAvailability: checkingWPSAvailabilitySelector,
         virtualScroll: state => state && state.featuregrid && state.featuregrid.virtualScroll,
         customAttributeSettings: customAttributesSettingsSelector,
         attributes: attributesSelector
     }), {
         onExport: downloadFeatures,
+        setService,
         onDownloadOptionChange,
         onClearDownloadOptions: clearDownloadOptions,
         onFormatOptionsFetch,

web/client/reducers/layerdownload.js

@@ -23,7 +23,8 @@ import {
     REMOVE_EXPORT_DATA_RESULTS,
     SHOW_INFO_BUBBLE,
     SET_INFO_BUBBLE_MESSAGE,
-    CHECKING_EXPORT_DATA_ENTRIES
+    CHECKING_EXPORT_DATA_ENTRIES,
+    SET_WPS_AVAILABILITY
 } from '../actions/layerdownload';
 
 /**
@@ -85,6 +86,12 @@ function layerdownload( state = {downloadOptions: {singlePage: true}}, action) {
             service: action.service
         };
     }
+    case SET_WPS_AVAILABILITY: {
+        return {
+            ...state,
+            wpsAvailable: action.value
+        };
+    }
     case CHECKING_WPS_AVAILABILITY: {
         return {
             ...state,

web/client/selectors/layerdownload.js

@@ -18,6 +18,7 @@ export const loadingSelector = state => state?.layerdownload?.loading;
 export const checkingWPSAvailabilitySelector = state => state?.layerdownload?.checkingWPSAvailability;
 export const wfsFormatsSelector = state => state?.layerdownload?.wfsFormats;
 export const formatsLoadingSelector = state => state?.layerdownload?.formatsLoading;
+export const wpsAvailableSelector = state => state?.layerdownload?.wpsAvailable;
 export const serviceSelector = state => state?.layerdownload?.service;
 export const wfsFilterSelector = createSelector(
     isFeatureGridOpen, wfsFilter, getSelectedLayer,

web/client/translations/data.de-DE.json

@@ -1770,6 +1770,7 @@
         },
         "layerdownload": {
             "title": "Daten exportieren",
+            "service": "Service",
             "format": "Dateiformat",
             "srs": "Räumliches Bezugssystem",
             "export": "Export",

web/client/translations/data.en-US.json

@@ -1732,6 +1732,7 @@
         },
         "layerdownload": {
             "title": "Export Data",
+            "service": "Service",
             "format": "File Format",
             "srs":  "Spatial Reference System",
             "export": "Export",

web/client/translations/data.es-ES.json

@@ -1732,6 +1732,7 @@
         },
         "layerdownload": {
             "title": "Exportar los datos",
+            "service": "Servicio",
             "format": "Formato de fichero",
             "srs": "Sistema de referencia espacial",
             "export": "Exportar",

web/client/translations/data.fi-FI.json

@@ -1430,6 +1430,7 @@
     },
     "layerdownload": {
       "title": "Vie tietoja",
+      "service": "Service",
       "format": "Tiedostomuoto",
       "srs": "SRS",
       "export": "Vie",

web/client/translations/data.fr-FR.json

@@ -1733,6 +1733,7 @@
         },
         "layerdownload": {
             "title": "Exporter des données",
+            "service": "Service",
             "format": "Format de fichier",
             "srs": "Système de référence spatiale",
             "export": "Exporter",

web/client/translations/data.hr-HR.json

@@ -1387,6 +1387,7 @@
         },
         "layerdownload": {
             "title": "Izvezi podatke",
+            "service": "Service",
             "format": "Format datoteke",
             "srs":  "Koordinatni sustav",
             "export": "Izvoz",

web/client/translations/data.it-IT.json

@@ -1732,6 +1732,7 @@
         },
         "layerdownload": {
             "title": "Esporta dati",
+            "service": "Servizio",
             "format": "Formato file",
             "srs": "Sistema di riferimento",
             "export": "Esporta",

web/client/translations/data.nl-NL.json

@@ -1655,6 +1655,7 @@
         },
         "layerdownload": {
             "title": "Exporteer Data",
+            "service": "Service",
             "format": "Bestandsformaat",
             "srs":  "Coördinaten ReferentieSysteem",
             "export": "Exporteer",

web/client/translations/data.pt-PT.json

@@ -1361,6 +1361,7 @@
         },
         "layerdownload": {
             "title": "Export Data",
+            "service": "Service",
             "format": "File Format",
             "srs":  "Spatial Reference System",
             "export": "Export",

web/client/translations/data.sk-SK.json

@@ -1670,6 +1670,7 @@
         },
         "layerdownload": {
             "title": "Exportovať dáta",
+            "service": "Service",
             "format": "Formát súboru",
             "srs":  "Spatial Reference System",
             "export": "Exportovať",

web/client/translations/data.sv-SE.json

@@ -1650,6 +1650,7 @@
         },
         "layerdownload": {
             "title": "Exportera data",
+            "service": "Service",
             "format": "Filformat",
             "srs": "Geodetiskt referenssystem",
             "export": "Exportera",

web/client/translations/data.vi-VN.json

@@ -1773,6 +1773,7 @@
         },
         "warning": "Cảnh báo",
         "layerdownload": {
+            "service": "Service",
             "downloadonlycurrentpage": "Chỉ tải xuống trang hiện tại",
             "error": {
                 "invalidOutputFormat": "Định dạng xuất đã chọn không khả dụng",

web/client/translations/data.zh-ZH.json

@@ -1337,6 +1337,7 @@
         },
         "layerdownload": {
             "title": "Export Data",
+            "service": "Service",
             "format": "File Format",
             "srs":  "Spatial Reference System",
             "export": "Export",