Merge pull request #988 from dbauszus-glx/sqlfilter-encoding

sqlfilter / json url parameter encoding
GEOLYTIX · Nov 2, 2023 · b48454b · b48454b
2 parents 952a878 + 1b610d6
commit b48454b
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 37 deletions.
diff --git a/api/api.js b/api/api.js
@@ -111,13 +111,6 @@ module.exports = async (req, res) => {
 
   req.params.template = req.params._template || req.params.template
 
-  // Decode string params.
-  Object.entries(req.params)
-    .filter(entry => typeof entry[1] === 'string')
-    .forEach(entry => {
-      req.params[entry[0]] = decodeURIComponent(entry[1])
-    })
-
   // Short circuit login view or post request.
   if (req.params.login || req.body && req.body.login) return login(req, res)
 

diff --git a/lib/ui/elements/dropdown.mjs b/lib/ui/elements/dropdown.mjs
@@ -31,7 +31,7 @@ export default (params) => {
 
         // Set btn text to reflect selection or show placeholder.
         btn.querySelector('[data-id=header-span]')
-          .textContent = params.selectedTitles.size && Array.from(params.selectedTitles).map(v => decodeURIComponent(v)).join(', ')
+          .textContent = params.selectedTitles.size && Array.from(params.selectedTitles).map(v => v).join(', ')
           || params.span || params.placeholder
 
         // Execute callback method and pass array of current selection.

diff --git a/lib/ui/layers/filters.mjs b/lib/ui/layers/filters.mjs
@@ -13,16 +13,12 @@ export default {
 
 let timeout;
 
-function applyFilter(layer, zoom) {
-  clearTimeout(timeout);
+function applyFilter(layer) {
 
-  // enable zoomToExtent button.
-  let btn = layer.view.querySelector('[data-id=zoomToExtent]')
-  if (btn) btn.disabled = false;
+  clearTimeout(timeout);
 
   // Debounce layer reload by 500
   timeout = setTimeout(() => {
-    timeout = null;
     layer.reload();
     layer.mapview.Map.getTargetElement().dispatchEvent(new Event('changeEnd'))
   }, 500);
@@ -186,26 +182,35 @@ async function filter_in(layer, filter) {
       multi: true,
       placeholder: 'Select Multiple',
       entries: filter[filter.type].map(val => ({
-        title: decodeURIComponent(val),
-        option: encodeURIComponent(val),
+        title: val,
+        option: val,
         selected: chkSet.has(val)
       })),
       callback: async (e, options) => {
 
-        Object.assign(layer.filter.current, {
-          [filter.field]:{
-            [filter.type]: options
-          }
-        })
+        if (!options.length) {
+
+          // Remove empty array filter.
+          delete layer.filter.current[filter.field]
+        } else {
+
+          // Set filter values array from options.
+          Object.assign(layer.filter.current, {
+            [filter.field]:{
+              [filter.type]: options
+            }
+          })
+        }
+
         layer.reload()
         layer.mapview.Map.getTargetElement().dispatchEvent(new Event('changeEnd'))
       }
     })
   }
 
   return filter[filter.type].map(val => mapp.ui.elements.chkbox({
-    val: encodeURIComponent(val),
-    label: decodeURIComponent(val),
+    val: val,
+    label: val,
     checked: chkSet.has(val),
     onchange: (checked, val) => {
 

diff --git a/lib/ui/utils/tabulatorUtils.mjs b/lib/ui/utils/tabulatorUtils.mjs
@@ -62,7 +62,7 @@ function like(_this) {
 
           // Set filter
           _this.layer.filter.current[field] = {
-            [headerFilterParams.type || 'like']: encodeURIComponent(e.target.value)
+            [headerFilterParams.type || 'like']: e.target.value
           }
 
         } else { 

diff --git a/lib/utils/paramString.mjs b/lib/utils/paramString.mjs
@@ -1,6 +1,10 @@
 // Create param string for XHR request.
 export default params => Object.entries(params)
+
+  // Value should be 0 or truthy
   .filter(entry => entry[1] === 0 || !!entry[1])
+
+  // Value must not be empty functional brackets.
   .filter(entry => entry[1] !== '{}')
 
   // Filter out zero length array and objects with empty object values.
@@ -10,16 +14,10 @@ export default params => Object.entries(params)
 
   .map(entry => {
 
-    // if (Array.isArray(entry[1])) {
-
-    //   return entry[1].map(val => `${entry[0]}=${val}`).join('&')
-    // }
-
     // Stringify non array objects.
     if (typeof entry[1] === 'object' && !Array.isArray(entry[1])) {
 
-      entry[1] = JSON.stringify(entry[1])
-
+      return `${entry[0]}=${encodeURIComponent(JSON.stringify(entry[1]))}`
     }
 
     return encodeURI(`${entry[0]}=${entry[1]}`)

diff --git a/mod/utils/sqlFilter.js b/mod/utils/sqlFilter.js
@@ -21,20 +21,17 @@ const filterTypes = {
     `(${val
       .split(',')
       .filter((val) => val.length > 0)
-      .map((val) => `"${col}" ILIKE \$${addValues(`${val}%`, true)}`)
+      .map((val) => `"${col}" ILIKE \$${addValues(`${val}%`)}`)
       .join(' OR ')})`,
 
   match: (col, val) => `"${col}"::text ILIKE \$${addValues(val)}`
 }
 
 let SQLparams
 
-function addValues(val, skip) {
+function addValues(val) {
 
-  SQLparams.push(Array.isArray(val)
-    && val[0].map(v=>decodeURIComponent(v))
-    || skip && val
-    || decodeURIComponent(val))
+  SQLparams.push(val)
 
   return SQLparams.length
 }