fixed issue query builder filter with space, fixed issue on search la…

…bel cut under logical operator
g3w-suite · Jun 8, 2021 · b5519cc · b5519cc
1 parent 27515b6
commit b5519cc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/assets/style/less/g3w-search.less b/assets/style/less/g3w-search.less
@@ -10,7 +10,8 @@
     width:100%;
     position: relative;
     display: flex; justify-content: center;
-    margin-bottom: 5px;
+    margin-bottom: 15px;
+    margin-top: 30px;
     border-bottom: 1px solid;
     h4 {
       font-weight: bold;

diff --git a/src/app/core/utils/utils.js b/src/app/core/utils/utils.js
@@ -433,7 +433,7 @@ const utils = {
     return `${field}|${operator.toLowerCase()}|${value}${logicop || ''}`;
   },
   createFilterFromString({layer, search_endpoint='ows', filter=''}){
-    const stringFilter = filter;
+    let stringFilter = filter;
     switch (search_endpoint) {
       case 'ows':
         const layerName = layer.getWMSLayerName();
@@ -445,7 +445,17 @@ const utils = {
          filter.setExpression(expression.get());
         break;
       case 'api':
-        filter = stringFilter.replace(/\s|'|"/g, '');
+        //remove all blank space between operatos
+        Object.values(EXPRESSION_OPERATORS).forEach(operator =>{
+          const splitStringOperator = stringFilter.split(operator);
+          if (splitStringOperator.length > 1) {
+            splitStringOperator.forEach((token,index) =>{
+              splitStringOperator[index] = token.trim();
+            });
+            stringFilter = splitStringOperator.join(operator);
+          }
+        });
+        filter = stringFilter.replace(/'|"/g, '');
         Object.entries(EXPRESSION_OPERATORS).forEach(([key,value]) =>{
           const re = new RegExp(value, "g");
           const replaceValue = value === 'AND' || value === 'OR' ? `|${key},` : `|${key}|`;