Merge branch 'fix-papaparse' into 'master'

Fix query data type issue

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

Author: higorspinto

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

@@ -3577,12 +3577,14 @@ this.recline.View = this.recline.View || {};
         self.model.query({ sort: sort });
       });
 
-      this._slickHandler.subscribe(this.grid.onColumnsReordered, function (
-        e,
-        args
-      ) {
-        self.state.set({ columnsOrder: _.pluck(self.grid.getColumns(), "id") });
-      });
+      this._slickHandler.subscribe(
+        this.grid.onColumnsReordered,
+        function (e, args) {
+          self.state.set({
+            columnsOrder: _.pluck(self.grid.getColumns(), "id"),
+          });
+        }
+      );
 
       this.grid.onColumnsResized.subscribe(function (e, args) {
         var columns = args.grid.getColumns();
@@ -4792,13 +4794,6 @@ this.recline.View = this.recline.View || {};
       var self = this;
       e.preventDefault();
 
-      //preloads Papaparse and caches it
-      var src = "https://unpkg.com/[email protected]/papaparse.min.js";
-      $.getScript(src);
-      $.ajaxSetup({
-        cache: true,
-      });
-
       // var format = this.$el.find(".select-format").val();
       var fields = self.model.queryState.attributes.fields;
       var query = CKAN._normalizeQuery(self.model.queryState.attributes);
@@ -4819,8 +4814,9 @@ this.recline.View = this.recline.View || {};
     },
     extractFile: function (self, sql_query) {
       var base_path = self.model.attributes.endpoint || self.options.site_url;
+      //console.log(base_path);
       var endpoint = `${base_path}/3/action/datastore_search_sql?sql=${sql_query}`; // USE BASE_PATH IN PRODUCTION
-      // var endpoint = `https://ckan.nhs.staging.datopian.com/api/3/action/datastore_search_sql?sql=${sql_query}`;
+      //var endpoint = `https://ckan.nhs.staging.datopian.com/api/3/action/datastore_search_sql?sql=${sql_query}`;
       self.progress();
 
       fetch(endpoint)
@@ -4853,33 +4849,40 @@ this.recline.View = this.recline.View || {};
     },
     exportCSVFile: function (resp_json, filename, self) {
       var exported_filename = filename + ".csv";
-      try {
-        let csv = Papa.unparse(resp_json);
-        var blob = new Blob([csv], {
-          type: "text/csv;charset=utf-8;",
-        });
-        if (navigator.msSaveBlob) {
-          // IE 10+
-          navigator.msSaveBlob(blob, exported_filename);
-        } else {
-          var link = document.createElement("a");
-          if (link.download !== undefined) {
-            // Browsers that support HTML5 download attribute
-            var url = URL.createObjectURL(blob);
-            link.setAttribute("href", url);
-            link.setAttribute("download", exported_filename);
-            link.style.visibility = "hidden";
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
+      var src = "https://unpkg.com/[email protected]/papaparse.min.js";
+      $.getScript(src, function () {
+        try {
+          let csv = Papa.unparse(resp_json);
+          var blob = new Blob([csv], {
+            type: "text/csv;charset=utf-8;",
+          });
+          if (navigator.msSaveBlob) {
+            // IE 10+
+            navigator.msSaveBlob(blob, exported_filename);
+          } else {
+            var link = document.createElement("a");
+            if (link.download !== undefined) {
+              // Browsers that support HTML5 download attribute
+              var url = URL.createObjectURL(blob);
+              link.setAttribute("href", url);
+              link.setAttribute("download", exported_filename);
+              link.style.visibility = "hidden";
+              document.body.appendChild(link);
+              link.click();
+              document.body.removeChild(link);
+            }
           }
+          self.progress(true);
+        } catch (error) {
+          console.warn(error);
+          self.progress(true);
+          self.showErrorModal();
         }
-        self.progress(true);
-      } catch (error) {
-        console.warn(error);
-        self.progress(true);
-        self.showErrorModal();
-      }
+      });
+      //caches Papaparse
+      $.ajaxSetup({
+        cache: true,
+      });
     },
     showErrorModal: function () {
       var modal = document.getElementsByClassName("modal")[0];
@@ -4983,7 +4986,7 @@ this.recline.View = this.recline.View || {};
       }
 
       if (q != "") {
-        let where_q = "";
+        let where_q = " WHERE ";
         for (const [key, value] of Object.entries(filters)) {
           if (this.get_field_type(value) == "string") {
             where_q_str += ` LOWER(${key}) like LOWER("${value.slice(
@@ -5003,15 +5006,13 @@ this.recline.View = this.recline.View || {};
       return where_str;
     },
     get_field_type: function (value) {
-      
-      if (typeof value == "string"){
-        return "string";
-      }
 
-      if (typeof value == "number"){
-        return "num"
+      if (isNaN(Number(value))) {
+        return "string";
+      } else {
+        return "num";
       }
-
+    
     },
   });
 })(jQuery, recline.View);

test.ini

@@ -9,7 +9,7 @@ host = 0.0.0.0
 port = 5000
 
 [app:main]
-use = config:../ckan/test-core.ini
+use = config:../../src/ckan/test-core.ini
 
 # Insert any custom config settings to be used when running your extension's
 # tests here.
@@ -46,4 +46,4 @@ level = NOTSET
 formatter = generic
 
 [formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s
+format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s