Merge branch 'fixing-api-calls' into 'master'

Fixing api calls

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

Author: ismail-shahzad

ckanext/dataexplorer/public/resource-view-filters-override.js

@@ -95,7 +95,6 @@ this.ckan.module('resource-view-filters-override', function (jQuery) {
     }
 
     function _appendDropdowns(dropdowns, resourceId, template, fields, filters) {
-      
       $.each(fields, function (i, field) {
         if (filters.hasOwnProperty(field)) {
           dropdowns.append(_buildDropdown(self.el, template, field));
@@ -144,7 +143,8 @@ this.ckan.module('resource-view-filters-override', function (jQuery) {
                 fields: filterName,
                 distinct: true,
                 sort: filterName,
-                include_total: false
+                include_total: false,
+                api_call_type: 'browser-data-explorer-filter',
               };
 
               if (term !== '') {

ckanext/dataexplorer/public/vendor/ckan.js/ckan.js

@@ -154,7 +154,8 @@ if (isNodeModule) {
       q: queryObj.q,
       filters: {},
       limit: queryObj.size || 10,
-      offset: queryObj.from || 0
+      offset: queryObj.from || 0,
+      api_call_type: 'browser-data-explorer'
     };
 
     if (queryObj.sort && queryObj.sort.length > 0) {
@@ -250,6 +251,7 @@ recline.Backend.Ckan = recline.Backend.Ckan || {};
       wrapper = new CKAN.Client(out.endpoint);
     }
     queryObj.resource_id = dataset.bq_table_name //dataset.id;
+    queryObj.resource_details = dataset
     wrapper.datastoreQuery(queryObj, function(err, out) {
       if (err) {
         dfd.reject(err);

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

@@ -441,7 +441,7 @@ this.recline.Model = this.recline.Model || {};
       this.recordCount = null;
       this.queryState = new my.Query();
       this.queryState.bind("change facet:add", function () {
-        self.query(); // We want to call query() without any arguments.
+        // self.query(); // We want to call query() without any arguments.
       });
       // store is what we query and save against
       // store will either be the backend or be a memory store if Backend fetch
@@ -4826,11 +4826,11 @@ this.recline.View = this.recline.View || {};
 
       var model_fields = self.model.fields;
       var sql_query = this.jsQueryToSQL(query, model_fields);
-      this.extractFile(self, sql_query, format);
+      this.extractFile(self, sql_query, format, query);
     },
-    extractFile: function (self, sql_query, format) {
+    extractFile: function (self, sql_query, format, query={}) {
       var base_path = self.model.attributes.endpoint || self.options.site_url;
-      var endpoint = `${base_path}/3/action/datastore_search_sql?sql=${escape(sql_query)}`; // USE BASE_PATH IN PRODUCTION
+      var endpoint = `${base_path}/3/action/datastore_search_sql?sql=${escape(sql_query)}&resource_id=${query.resource_id}`; // USE BASE_PATH IN PRODUCTION
       self.progress();
 
       fetch(endpoint)