Made nested services more generic

Now instead of filterTemplate we have the selected item passed to the nested service. The nested service will use it to generate the new search.
geosolutions-it · Mar 27, 2017 · 66f2ddc · 66f2ddc
1 parent 3d10eb4
commit 66f2ddc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/web/client/api/searchText.js b/web/client/api/searchText.js
@@ -8,6 +8,7 @@
 const WFS = require('./WFS');
 const assign = require('object-assign');
 const GeoCodeUtils = require('../utils/GeoCodeUtils');
+const {generateTemplateString} = require('../utils/TemplateUtils');
 /*
 const toNominatim = (fc) =>
     fc.features && fc.features.map( (f) => ({
@@ -24,8 +25,9 @@ module.exports = {
         require('./Nominatim')
         .geocode(searchText, options)
         .then( res => GeoCodeUtils.nominatimToGeoJson(res.data)),
-    wfs: (searchText, {url, typeName, queriableAttributes, outputFormat="application/json", predicate ="ILIKE", staticFilter="", blacklist = [], ...params }) => {
+    wfs: (searchText, {url, typeName, queriableAttributes, outputFormat="application/json", predicate ="ILIKE", staticFilter="", blacklist = [], item, ...params }) => {
         // split into words and remove blacklisted words
+        const staticFilterParsed = generateTemplateString(staticFilter || "")(item);
         let searchWords = searchText.split(" ").filter(w => w).filter( w => blacklist.indexOf(w.toLowerCase()) < 0 );
 
         // if the searchtext is empty use the full searchText
@@ -39,7 +41,7 @@ module.exports = {
                     typeName,
                     outputFormat,
                     // create a filter like : `(ATTR ilike  '%word1%') AND (ATTR ilike '%word2%')`
-                    cql_filter: "(".concat( searchWords.map( (w) => queriableAttributes.map( attr => `${attr} ${predicate} '%${w.replace("'", "''")}%'`).join(" OR ")).join(') AND (')).concat(")") .concat(staticFilter)
+                    cql_filter: "(".concat( searchWords.map( (w) => queriableAttributes.map( attr => `${attr} ${predicate} '%${w.replace("'", "''")}%'`).join(" OR ")).join(') AND (')).concat(")") .concat(staticFilterParsed)
                 }, params))
             .then( response => response.features );
     }

diff --git a/web/client/epics/search.js b/web/client/epics/search.js
@@ -80,7 +80,7 @@ const searchEpic = action$ =>
  */
 const searchItemSelected = action$ =>
     action$.ofType(TEXT_SEARCH_ITEM_SELECTED)
-    .mergeMap(action => {
+    .switchMap(action => {
         const item = action.item;
 
 
@@ -117,8 +117,8 @@ const searchItemSelected = action$ =>
                 nestedServices.map((nestedService) => ({
                     ...nestedService,
                     options: {
-                        ...nestedService.options,
-                        staticFilter: generateTemplateString(nestedService.filterTemplate || "")(item)
+                        item,
+                        ...nestedService.options
                     }
                 })), {
                     text: generateTemplateString(item.__SERVICE__.displayName || "")(item),