Merge branch 'fix/extract-with-filters' into 'master'

Fix extract CSV file with filters applied.

See merge request datopian/clients/nhs-dataexplorer!21

Author: higorspinto

ckanext/dataexplorer/public/vendor/recline/recline.js

@@ -4970,7 +4970,7 @@ this.recline.View = this.recline.View || {};
         for (const [key, value] of Object.entries(filters)) {
           let single_where_statament = "";
           value.forEach((value_item) => {
-            if (this.get_field_type(fields, key) == "num") {
+            if (this.get_field_type(value_item) == "num") {
               single_where_statament += `${key} = ${value_item} OR `;
             } else {
               single_where_statament += `${key} = "${value_item}" OR `;
@@ -4985,7 +4985,7 @@ this.recline.View = this.recline.View || {};
       if (q != "") {
         let where_q = "";
         for (const [key, value] of Object.entries(filters)) {
-          if (this.get_field_type(fields, key) == "string") {
+          if (this.get_field_type(value) == "string") {
             where_q_str += ` LOWER(${key}) like LOWER("${value.slice(
               0,
               -2
@@ -5002,20 +5002,16 @@ this.recline.View = this.recline.View || {};
       }
       return where_str;
     },
-    get_field_type: function (fields, key) {
-      let string_types = ["STRING"];
-      let field_type = [];
-      fields.forEach((lfield) => {
-        if (lfield["id"] === key) {
-          field_type = lfield["type"];
-        }
-      });
-
-      if (field_type[0] in string_types) {
+    get_field_type: function (value) {
+      
+      if (typeof value == "string"){
         return "string";
-      } else {
-        return "num";
       }
+
+      if (typeof value == "number"){
+        return "num"
+      }
+
     },
   });
 })(jQuery, recline.View);