From 9b7b0fec85b9887714e8f0e0d289b59b10358f95 Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Mon, 20 Apr 2020 17:20:09 +0100
Subject: [PATCH 01/21] Configurable ES Leaflet map base layers

Includes support for Google and WMS base layers.
---
 .../jquery.idc.leafletMap.js                  | 74 ++++++++++++++++---
 1 file changed, 62 insertions(+), 12 deletions(-)

diff --git a/js/indicia.datacomponents/jquery.idc.leafletMap.js b/js/indicia.datacomponents/jquery.idc.leafletMap.js
index 67e4260f..773ddc34 100644
--- a/js/indicia.datacomponents/jquery.idc.leafletMap.js
+++ b/js/indicia.datacomponents/jquery.idc.leafletMap.js
@@ -43,6 +43,16 @@
     initialLng: -2.89479,
     initialZoom: 5,
     baseLayer: 'OpenStreetMap',
+    baseLayerConfig: {
+      OpenStreetMap: {
+        title: 'Open Street Map',
+        type: 'OpenStreetMap'
+      },
+      OpenTopoMap: {
+        title: 'Open Topo Map',
+        type: 'OpenTopoMap'
+      }
+    },
     cookies: true
   };
 
@@ -405,6 +415,48 @@
     }
   }
 
+  /**
+   * Build the list of base map layers.
+   */
+  function getBaseMaps(el) {
+    var baseLayers = {};
+    var subType;
+    var wmsOptions;
+    $.each(el.settings.baseLayerConfig, function eachLayer(title) {
+      if (this.type === 'OpenStreetMap') {
+        baseLayers[title] = L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+          attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+        });
+      } else if (this.type === 'OpenTopoMap') {
+        baseLayers[title] = L.tileLayer('https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png', {
+          maxZoom: 17,
+          attribution: 'Map data: &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, ' +
+            '<a href="http://viewfinderpanoramas.org">SRTM</a> | Map style: &copy; <a href="https://opentopomap.org">OpenTopoMap</a> ' +
+            '(<a href="https://creativecommons.org/licenses/by-sa/3.0/">CC BY-SA</a>)'
+        });
+      } else if (this.type === 'Google') {
+        subType = this.config && this.config.subType;
+        if ($.inArray(subType, ['roadmap', 'satellite', 'terrain', 'hybrid']) === -1) {
+          indiciaFns.controlFail(el, 'Unknown Google layer subtype ' + subType);
+        }
+        baseLayers[title] = L.gridLayer.googleMutant({
+          type: subType
+        });
+      } else if (this.type === 'WMS') {
+        wmsOptions = {
+          format: 'image/png'
+        };
+        if (typeof this.config.wmsOptions !== 'undefined') {
+          $.extend(wmsOptions, this.config.wmsOptions);
+        }
+        baseLayers[title] = L.tileLayer.wms(this.config.sourceUrl, wmsOptions);
+      } else {
+        indiciaFns.controlFail(el, 'Unknown baseLayerConfig type ' + this.type);
+      }
+    });
+    return baseLayers;
+  }
+
   /**
    * Declare public methods.
    */
@@ -470,19 +522,17 @@
           }
           justClickedOnFeature = false;
         });
-      baseMaps = {
-        OpenStreetMap: L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-          attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
-        }),
-        OpenTopoMap: L.tileLayer('https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png', {
-          maxZoom: 17,
-          attribution: 'Map data: &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, ' +
-            '<a href="http://viewfinderpanoramas.org">SRTM</a> | Map style: &copy; <a href="https://opentopomap.org">OpenTopoMap</a> ' +
-            '(<a href="https://creativecommons.org/licenses/by-sa/3.0/">CC BY-SA</a>)'
-        })
-      };
+      baseMaps = getBaseMaps(el);
+      if (baseMaps.length === 0) {
+        indiciaFns.controlFail(el, 'No base maps configured for map');
+      }
       // Add the active base layer to the map.
-      baseMaps[el.settings.baseLayer].addTo(el.map);
+      if (baseMaps[el.settings.baseLayer]) {
+        baseMaps[el.settings.baseLayer].addTo(el.map);
+      } else {
+        // Fallback if layer missing, e.g. due to out of date cookie.
+        baseMaps[Object.keys(baseMaps)[0]].addTo(el.map);
+      }
       $.each(el.settings.layerConfig, function eachLayer(id, layer) {
         var group;
         var wmsOptions;

From feafb05ba7ba11345acfeb75a07719c2c4422b20 Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Tue, 21 Apr 2020 10:03:46 +0100
Subject: [PATCH 02/21] Standardise the way that sort settings are provided

autoAggregationTable sorts now just have a key/value pair (field +
asc|desc), removing the order sub-key which was inconsistent with how
sorts are specified on normal data sources.
---
 js/indicia.datacomponents/idc.esDataSource.js | 21 +++++++------------
 .../jquery.idc.dataGrid.js                    |  4 +---
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/js/indicia.datacomponents/idc.esDataSource.js b/js/indicia.datacomponents/idc.esDataSource.js
index b35d0d6c..e6422e0f 100644
--- a/js/indicia.datacomponents/idc.esDataSource.js
+++ b/js/indicia.datacomponents/idc.esDataSource.js
@@ -32,27 +32,20 @@ var IdcEsDataSource;
    * For autoAggregationTable mode. Sets default to the unique field if not
    * set.
    */
-  function getSortInfo(source) {
+  function getAutoAggSortInfo(source) {
     var sortField;
     var sortDir;
     var settings = source.settings;
     // Default source config to sort by the unique field unless otherwise specified.
     if (!settings.sort || settings.sort.length === 0) {
       settings.sort = {};
-      settings.sort[settings.autoAggregationTable.unique_field] = {
-        order: 'asc'
-      };
+      settings.sort[settings.autoAggregationTable.unique_field] = 'asc';
     }
-    // Find the sort field and direction from the source config.
-    $.each(settings.sort, function eachSortField(field) {
-      sortField = field;
-      sortDir = this.order;
-      // Only support a single sort field.
-      return false;
-    });
+    // Find the sort field and direction from the source config. Only single
+    // supported in autoAggregationTable mode at present.
     return {
-      field: sortField,
-      dir: sortDir
+      field: Object.keys(settings.sort)[0],
+      dir: settings.sort[Object.keys(settings.sort)[0]]
     };
   }
 
@@ -66,7 +59,7 @@ var IdcEsDataSource;
     var settings = source.settings;
     if (settings.autoAggregationTable) {
       settings.size = 0;
-      sort = getSortInfo(source);
+      sort = getAutoAggSortInfo(source);
       // List of sub-aggregations within the outer terms agg for the unique field must
       // always contain a top_hits agg to retrieve field values.
       subAggs = {
diff --git a/js/indicia.datacomponents/jquery.idc.dataGrid.js b/js/indicia.datacomponents/jquery.idc.dataGrid.js
index 00c9f63a..b7bf417e 100644
--- a/js/indicia.datacomponents/jquery.idc.dataGrid.js
+++ b/js/indicia.datacomponents/jquery.idc.dataGrid.js
@@ -316,9 +316,7 @@
     } else {
       sortFields = [fieldName];
     }
-    source.settings.sort[sortFields[0]] = {
-      order: sortDesc ? 'desc' : 'asc'
-    };
+    source.settings.sort[sortFields[0]] = sortDesc ? 'desc' : 'asc';
   }
 
   /**

From ab4aa1b981c22a1c60a49a209748dbf5c2eac7de Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Tue, 21 Apr 2020 10:33:17 +0100
Subject: [PATCH 03/21] Allow doc_count use in autoAggregationTable

---
 js/indicia.datacomponents/idc.esDataSource.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/js/indicia.datacomponents/idc.esDataSource.js b/js/indicia.datacomponents/idc.esDataSource.js
index e6422e0f..ea5aa3ec 100644
--- a/js/indicia.datacomponents/idc.esDataSource.js
+++ b/js/indicia.datacomponents/idc.esDataSource.js
@@ -33,8 +33,6 @@ var IdcEsDataSource;
    * set.
    */
   function getAutoAggSortInfo(source) {
-    var sortField;
-    var sortDir;
     var settings = source.settings;
     // Default source config to sort by the unique field unless otherwise specified.
     if (!settings.sort || settings.sort.length === 0) {
@@ -42,9 +40,10 @@ var IdcEsDataSource;
       settings.sort[settings.autoAggregationTable.unique_field] = 'asc';
     }
     // Find the sort field and direction from the source config. Only single
-    // supported in autoAggregationTable mode at present.
+    // supported in autoAggregationTable mode at present. Doc_count is a
+    // special value that sorts by _count.
     return {
-      field: Object.keys(settings.sort)[0],
+      field: Object.keys(settings.sort)[0] === 'doc_count' ? '_count' : Object.keys(settings.sort)[0],
       dir: settings.sort[Object.keys(settings.sort)[0]]
     };
   }

From a9f357f6be176b5f05065c5865f8d020ae69ccde Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Tue, 21 Apr 2020 14:56:57 +0100
Subject: [PATCH 04/21] Option to set esLeafletMap selectedfeaturestyle

---
 .../jquery.idc.leafletMap.js                  | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/js/indicia.datacomponents/jquery.idc.leafletMap.js b/js/indicia.datacomponents/jquery.idc.leafletMap.js
index 773ddc34..2328ed0a 100644
--- a/js/indicia.datacomponents/jquery.idc.leafletMap.js
+++ b/js/indicia.datacomponents/jquery.idc.leafletMap.js
@@ -53,7 +53,11 @@
         type: 'OpenTopoMap'
       }
     },
-    cookies: true
+    cookies: true,
+    selectedFeatureStyle: {
+      color: '#FF0000',
+      fillColor: '#FF0000',
+    }
   };
 
   /**
@@ -186,7 +190,6 @@
           circle.removeFrom(el.map);
           break;
         case 'geom':
-
           wkt = new Wkt.Wkt();
           wkt.read(geom);
           obj = wkt.toObject(config.options);
@@ -203,13 +206,16 @@
    * Thicken the borders of selected features when zoomed out to aid visibility.
    */
   function ensureFeatureClear(el, feature) {
-    var weight = Math.min(20, Math.max(1, 20 - (el.map.getZoom())));
-    var opacity = Math.min(1, Math.max(0.6, el.map.getZoom() / 18));
+    var style;
     if (typeof feature.setStyle !== 'undefined') {
-      feature.setStyle({
-        weight: weight,
-        opacity: opacity
-      });
+      style = $.extend({}, el.settings.selectedFeatureStyle);
+      if (!style.weight) {
+        style.weight = Math.min(20, Math.max(1, 20 - (el.map.getZoom())));
+      }
+      if (!style.opacity) {
+        style.opacity = Math.min(1, Math.max(0.6, el.map.getZoom() / 18));
+      }
+      feature.setStyle(style);
     }
   }
 
@@ -654,7 +660,7 @@
         }
       });
       // Are there document hits to map?
-      $.each(response.hits.hits, function eachHit() {
+      $.each(response.hits.hits, function eachHit(i) {
         var latlon = this._source.location.point.split(',');
         addFeature(el, sourceSettings.id, latlon, this._source.location.geom,
           this._source.location.coordinate_uncertainty_in_meters, '_id', this._id);

From 79e3dd4c376feafb6d0b30eaf202947f1c7edb0c Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Mon, 27 Apr 2020 14:28:31 +0100
Subject: [PATCH 05/21] Add EPSG:3109 (Jersey TM)

---
 js/proj4defs.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/proj4defs.js b/js/proj4defs.js
index ef5cc26e..8e1065f4 100644
--- a/js/proj4defs.js
+++ b/js/proj4defs.js
@@ -12,4 +12,5 @@ Proj4js.defs["EPSG:31464"] = "+proj=tmerc +lat_0=0 +lon_0=12 +k=1 +x_0=4500000 +
 Proj4js.defs['EPSG:23030'] = "+proj=utm +zone=30 +ellps=intl +units=m +no_defs +towgs84=-87,-98,-121";
 Proj4js.defs["EPSG:31466"] = "+proj=tmerc +lat_0=0 +lon_0=6 +k=1 +x_0=2500000 +y_0=0 +ellps=bessel +datum=potsdam +units=m +no_defs";
 Proj4js.defs["EPSG:31467"] = "+proj=tmerc +lat_0=0 +lon_0=9 +k=1 +x_0=3500000 +y_0=0 +ellps=bessel +datum=potsdam +units=m +no_defs";
-Proj4js.defs["EPSG:31468"] = "+proj=tmerc +lat_0=0 +lon_0=12 +k=1 +x_0=4500000 +y_0=0 +ellps=bessel +datum=potsdam +units=m +no_defs";
\ No newline at end of file
+Proj4js.defs["EPSG:31468"] = "+proj=tmerc +lat_0=0 +lon_0=12 +k=1 +x_0=4500000 +y_0=0 +ellps=bessel +datum=potsdam +units=m +no_defs";
+Proj4js.defs["EPSG:3109"] = "+proj=tmerc +lat_0=49.225 +lon_0=-2.135 +k=0.9999999000000001 +x_0=40000 +y_0=70000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs";
\ No newline at end of file

From e89804f979bdaa1b62ed41149743c6374156aaba Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Mon, 27 Apr 2020 14:37:11 +0100
Subject: [PATCH 06/21] Some fixes relating to autoAggregationTables and
 keyword mappings.

The request source filtering must refer to the fieldname without the
.keyword suffix.
---
 js/indicia.datacomponents/idc.esDataSource.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/js/indicia.datacomponents/idc.esDataSource.js b/js/indicia.datacomponents/idc.esDataSource.js
index ea5aa3ec..e8ae680f 100644
--- a/js/indicia.datacomponents/idc.esDataSource.js
+++ b/js/indicia.datacomponents/idc.esDataSource.js
@@ -56,6 +56,8 @@ var IdcEsDataSource;
     var sort;
     var orderBy;
     var settings = source.settings;
+    var uniqueFieldWithoutSuffix;
+    var sortFieldWithoutSuffix;
     if (settings.autoAggregationTable) {
       settings.size = 0;
       sort = getAutoAggSortInfo(source);
@@ -83,12 +85,15 @@ var IdcEsDataSource;
         }
       });
       // Include the unique field in the list of fields request even if not specified.
-      if ($.inArray(settings.autoAggregationTable.unique_field, settings.autoAggregationTable.fields) === -1) {
-        settings.autoAggregationTable.fields.push(settings.autoAggregationTable.unique_field);
+      // Don't include .keyword suffix for source filtering.
+      uniqueFieldWithoutSuffix = settings.autoAggregationTable.unique_field.replace(/\.keyword$/, '');
+      if ($.inArray(uniqueFieldWithoutSuffix, settings.autoAggregationTable.fields) === -1) {
+        settings.autoAggregationTable.fields.push(uniqueFieldWithoutSuffix);
       }
-      if ($.inArray(sort.field, settings.autoAggregationTable.fields) > -1) {
+      sortFieldWithoutSuffix = sort.field.replace(/\.keyword$/, '');
+      if ($.inArray(sortFieldWithoutSuffix, settings.autoAggregationTable.fields) > -1) {
         // Sorting by a standard field.
-        if (sort.field === settings.autoAggregationTable.unique_field) {
+        if (sortFieldWithoutSuffix === uniqueFieldWithoutSuffix) {
           // Using the outer agg to sort, so simple use of _key.
           orderBy = '_key';
         } else {

From 7861a789d121e48395dfe3640285d370b929fcf6 Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Tue, 5 May 2020 09:36:59 +0100
Subject: [PATCH 07/21] Significant rewrite to simplify config

Still needs further testing and refactoring
---
 js/indicia.datacomponents/idc.core.js         | 249 ++++++-
 js/indicia.datacomponents/idc.esDataSource.js | 646 +++++++++---------
 .../jquery.idc.dataGrid.js                    | 258 ++++---
 .../jquery.idc.esDownload.js                  |  74 +-
 .../jquery.idc.leafletMap.js                  |   7 +-
 5 files changed, 749 insertions(+), 485 deletions(-)

diff --git a/js/indicia.datacomponents/idc.core.js b/js/indicia.datacomponents/idc.core.js
index f0f91d40..983c94dc 100644
--- a/js/indicia.datacomponents/idc.core.js
+++ b/js/indicia.datacomponents/idc.core.js
@@ -110,14 +110,33 @@
   };
 
   /**
-   * Initially populate the data sources.
+   * Instantiate the data sources.
    */
-  indiciaFns.populateDataSources = function populateDataSources() {
+  indiciaFns.initDataSources = function initDataSources() {
     // Build the Elasticsearch source objects and run initial population.
     $.each(indiciaData.esSources, function eachSource() {
       var sourceObject = new IdcEsDataSource(this);
       indiciaData.esSourceObjects[this.id] = sourceObject;
-      sourceObject.populate();
+    });
+  };
+
+  /**
+   * Hookup datasources to their controls.
+   */
+  indiciaFns.hookupDataSources = function hookupDataSources() {
+    // Build the Elasticsearch source objects and run initial population.
+    $.each(indiciaData.esSourceObjects, function eachSource() {
+      this.hookup();
+    });
+  };
+
+  /**
+   * Initially populate the data sources.
+   */
+  indiciaFns.populateDataSources = function populateDataSources() {
+    // Build the Elasticsearch source objects and run initial population.
+    $.each(indiciaData.esSourceObjects, function eachSource() {
+      this.populate();
     });
   };
 
@@ -147,6 +166,74 @@
     throw new Error(msg);
   };
 
+  /**
+   * Auto-add keyword suffix for aggregating/sorting on fields with keywords.
+   *
+   * Allows the configuration to not care about keyword sub-fields.
+   */
+  indiciaFns.esFieldWithKeywordSuffix = function esFieldWithKeywordSuffix(field) {
+    var keywordFields = [
+      'event.attributes.id',
+      'event.attributes.value',
+      'event.habitat',
+      'event.recorded_by',
+      'event.sampling_protocol',
+      'identification.auto_checks.output.message',
+      'identification.auto_checks.output.rule_type',
+      'identification.identified_by',
+      'identification.query',
+      'identification.recorder_certainty',
+      'identification.verification_decision_source',
+      'identification.verifier.name',
+      'indexed_location_ids',
+      'location.name',
+      'location.output_sref',
+      'location.output_sref_system',
+      'location.parent.name',
+      'location.verbatim_locality',
+      'message',
+      'metadata.group.title',
+      'metadata.input_form',
+      'metadata.licence_code',
+      'metadata.sensitivity_blur',
+      'metadata.survey.title',
+      'metadata.website.title',
+      'occurrence.associated_media',
+      'occurrence.attributes.id',
+      'occurrence.attributes.value',
+      'occurrence.life_stage',
+      'occurrence.media.caption',
+      'occurrence.media.licence',
+      'occurrence.media.path',
+      'occurrence.media.path2',
+      'occurrence.media.type',
+      'occurrence.organism_quantity',
+      'occurrence.sex',
+      'output_sref',
+      'tags',
+      'taxon.accepted_name',
+      'taxon.accepted_name_authorship',
+      'taxon.class',
+      'taxon.family',
+      'taxon.genus',
+      'taxon.group',
+      'taxon.kingdom',
+      'taxon.order',
+      'taxon.phylum',
+      'taxon.species',
+      'taxon.subfamily',
+      'taxon.taxon_name',
+      'taxon.taxon_name_authorship',
+      'taxon.taxon_rank',
+      'taxon.vernacular_name',
+      'warehouse'
+    ];
+    if ($.inArray(field, keywordFields) > -1) {
+      return field + '.keyword';
+    }
+    return field;
+  };
+
   /**
    * Convert an ES (ISO) date to local display format.
    *
@@ -175,6 +262,59 @@
       .replace('Y', date.getFullYear());
   };
 
+  /**
+   * Convert an ES media file to thumbnail HTML.
+   *
+   * @param integer id
+   *   Document ID.
+   * @param object file
+   *   Nested file object from ES document.
+   * @param string sizeClass
+   *   Class to attach to <img>, either single or multi depending on number of
+   *   thumbnails.
+   */
+  indiciaFns.drawMediaFile = function drawMediaFile(id, file, sizeClass) {
+    // Check if an extenral URL.
+    var match = file.path.match(/^http(s)?:\/\/(www\.)?([a-z(\.kr)]+)/);
+    var captionItems = [];
+    var captionAttr;
+    var html = '';
+    if (file.caption) {
+      captionItems.push(file.caption);
+    }
+    if (file.licence) {
+      captionItems.push('Licence is ' + file.licence);
+    }
+    captionAttr = captionItems.length ? ' title="' + captionItems.join(' | ').replace('"', '&quot;') + '"' : '';
+    if (match !== null) {
+      // If so, is it iNat? We can work out the image file names if so.
+      if (file.path.match(/^https:\/\/static\.inaturalist\.org/)) {
+        html += '<a ' + captionAttr +
+          'href="' + file.path.replace('/square.', '/large.') + '" ' +
+          'class="inaturalist fancybox" rel="group-' + id + '">' +
+          '<img class="' + sizeClass + '" src="' + file.path + '" /></a>';
+      } else {
+        html += '<a ' +
+          'href="' + file.path + '" class="social-icon ' + match[3].replace('.', '') + '"></a>';
+        if (captionItems.length) {
+          html += '<p>' + captionItems.join(' | ').replace('"', '&quot;') + '</p>';
+        }
+      }
+    } else if ($.inArray(file.path.split('.').pop(), ['mp3', 'wav']) > -1) {
+      // Audio files can have a player control.
+      html += '<audio controls ' +
+        'src="' + indiciaData.warehouseUrl + 'upload/' + file.path + '" type="audio/mpeg"/>';
+    } else {
+      // Standard link to Indicia image.
+      html += '<a ' + captionAttr +
+        'href="' + indiciaData.warehouseUrl + 'upload/' + file.path + '" ' +
+        'class="fancybox" rel="group-' + id + '">' +
+        '<img class="' + sizeClass + '" src="' + indiciaData.warehouseUrl + 'upload/thumb-' + file.path + '" />' +
+        '</a>';
+    }
+    return html;
+  };
+
   /**
    * Detect date/time patterns and convert to a suitable ES query string.
    */
@@ -350,9 +490,9 @@
       var output = [];
       if (doc.occurrence.associations) {
         $.each(doc.occurrence.associations, function eachAssociation() {
-          var label = '<em>' + this.accepted_name + '</a>';
+          var label = '<em>' + this.accepted_name + '</em>';
           if (this.vernacular_name) {
-            label = this.vernacular_name + '(' + label + ')';
+            label = this.vernacular_name + ' (' + label + ')';
           }
           output.push(label);
         });
@@ -427,13 +567,36 @@
       return icons.join('');
     },
 
+    /**
+     * A simple output of website and survey ID.
+     *
+     * Has a hint to show the underlying titles.
+     */
+    datasource_code: function datasourceCode(doc) {
+      return '<abbr title="' + doc.metadata.website.title + ' | ' + doc.metadata.survey.title + '">' +
+        doc.metadata.website.id + '|' + doc.metadata.survey.id +
+        '</abbr>';
+    },
+
     /**
      * Output the event date or date range.
+     *
+     * Can also cope if date fields are embedded in key (e.g. in composite
+     * agg response).
      */
     event_date: function eventDate(doc) {
-      var root = doc.event || doc.key;
+      var root = doc.event || doc.key || doc;
       var start = root.date_start ? indiciaFns.formatDate(root.date_start) : '';
       var end = root.date_end ? indiciaFns.formatDate(root.date_end) : '';
+      if (!start && !end) {
+        return 'Unknown';
+      }
+      if (!start) {
+        return 'Before ' + end;
+      }
+      if (!end) {
+        return 'After ' + start;
+      }
       if (start !== end) {
         return start + ' - ' + end;
       }
@@ -450,16 +613,34 @@
      */
     higher_geography: function higherGeography(doc, params) {
       var output = [];
+      var text = []
       if (doc.location.higher_geography) {
-        $.each(doc.location.higher_geography, function eachGeography() {
-          // If the correct type and not a combined geo-area (indicated by + in the code).
-          // See https://github.com/BiologicalRecordsCentre/iRecord/issues/606
-          if (this.type === params[0] && !this.code.match(/\+/)) {
-            output.push(this[params[1]]);
-          }
-        });
+        if (params.length === 0 || !params[0]) {
+          output = doc.location.higher_geography;
+        } else {
+          $.each(doc.location.higher_geography, function eachGeography() {
+            // If the correct type and not a combined geo-area (indicated by + in the code).
+            // See https://github.com/BiologicalRecordsCentre/iRecord/issues/606
+            if (this.type === params[0] && !this.code.match(/\+/)) {
+              if (params.length >= 2 && params[1]) {
+                // Limiting to one field.
+                output.push(this[params[1]]);
+              } else {
+                // Include whole location object.
+                output.push(this);
+              }
+            }
+          });
+        }
       }
-      return output.join('; ');
+      if (params.length >= 3 && params[2] === 'json') {
+        return JSON.stringify(output);
+      }
+      // Convert response to a string.
+      $.each(output, function eachRow() {
+        text.push(typeof this === 'string' ? this : Object.values(this).join('; '));
+      });
+      return text.join(' | ');
     },
 
     /**
@@ -487,21 +668,45 @@
      * A formatted lat long.
      */
     lat_lon: function latLon(doc) {
-      var coords = doc.location.point.split(',');
+      var point = doc.location.point || doc.point;
+      var coords = point.split(',') || doc.p;
       var lat = parseFloat(coords[0]);
       var lon = parseFloat(coords[1]);
       return Math.abs(lat).toFixed(3) + (lat >= 0 ? 'N' : 'S') + ' ' + Math.abs(lon).toFixed(3) + (lon >= 0 ? 'E' : 'W');
     },
 
     /**
-     * A simple output of website and survey ID.
+     * Retrieve a field value, or null if value is '0'.
      *
-     * Has a hint to show the underlying titles.
+     * The first parameter provided should be the field name from the ES document.
      */
-    datasource_code: function datasourceCode(doc) {
-      return '<abbr title="' + doc.metadata.website.title + ' | ' + doc.metadata.survey.title + '">' +
-        doc.metadata.website.id + '|' + doc.metadata.survey.id +
-        '</abbr>';
+    null_if_zero: function nullIfZero(doc, params) {
+      var value;
+      if (params.length !== 1) {
+        return 'Incorrect parameters for null_if_zero column configuration';
+      }
+      value = indiciaFns.getValueForField(doc, params[0]);
+      if (value === '0') {
+        return '';
+      }
+      return value;
+    },
+
+    /**
+     * Retrieve HTML representing media thumbnails.
+     */
+    occurrence_media: function occurrenceMedia(doc) {
+      var value = doc.occurrence.media;
+      // Tweak image sizes if more than 1.
+      var sizeClass = value && value.length === 1 ? 'single' : 'multi';
+      var media = [];
+      if (value) {
+        // Build media HTML.
+        $.each(value, function eachFile() {
+          media.push(indiciaFns.drawMediaFile(doc.id, this, sizeClass));
+        });
+      }
+      return media.join('');
     }
   };
 
@@ -746,7 +951,7 @@
     }
     // Path might be to an aggregation response object, in which case we just
     // want the value.
-    if (typeof valuePath === 'object' && colDef && colDef.agg) {
+    if (typeof valuePath === 'object' && typeof valuePath.value !== 'undefined') {
       return valuePath.value;
     }
     return valuePath;
diff --git a/js/indicia.datacomponents/idc.esDataSource.js b/js/indicia.datacomponents/idc.esDataSource.js
index e8ae680f..8209c48d 100644
--- a/js/indicia.datacomponents/idc.esDataSource.js
+++ b/js/indicia.datacomponents/idc.esDataSource.js
@@ -27,40 +27,60 @@ var IdcEsDataSource;
   var $ = jQuery;
 
   /**
-   * Finds the sort field and direction from the source config.
+   * Constructor for an IdcEsDataSource.
    *
-   * For autoAggregationTable mode. Sets default to the unique field if not
-   * set.
+   * @param object settings
+   *   Datasource settings.
    */
-  function getAutoAggSortInfo(source) {
-    var settings = source.settings;
-    // Default source config to sort by the unique field unless otherwise specified.
-    if (!settings.sort || settings.sort.length === 0) {
-      settings.sort = {};
-      settings.sort[settings.autoAggregationTable.unique_field] = 'asc';
+  IdcEsDataSource = function dataSource(providedSettings) {
+    /**
+     * Track the last request so we avoid duplicate requests.
+     */
+    var lastRequestStr = '';
+
+    /**
+     * Track the last count request so we avoid duplicate requests.
+     */
+    var lastCountRequestStr = '';
+
+    /**
+     * A list of additional setup functions depending on the mode.
+     * */
+    var modeSpecificSetupFns = {};
+
+    /**
+     * Finds the sort field and direction from the source config.
+     *
+     * For termAggregation mode. Sets default to the unique field if not set.
+     */
+    function getTermAggregationSortInfo(settings) {
+      // Find the sort field and direction from the source config. Only single
+      // supported in termAggregation mode at present. Doc_count is a special
+      // value that sorts by _count.
+      return {
+        field: Object.keys(settings.sort)[0] === 'doc_count' ? '_count' : Object.keys(settings.sort)[0],
+        dir: settings.sort[Object.keys(settings.sort)[0]]
+      };
     }
-    // Find the sort field and direction from the source config. Only single
-    // supported in autoAggregationTable mode at present. Doc_count is a
-    // special value that sorts by _count.
-    return {
-      field: Object.keys(settings.sort)[0] === 'doc_count' ? '_count' : Object.keys(settings.sort)[0],
-      dir: settings.sort[Object.keys(settings.sort)[0]]
-    };
-  }
 
-  /**
-   * Auto-build the aggregation if this mode enabled.
-   */
-  function buildAutoAggregationTable(source) {
-    var subAggs;
-    var sort;
-    var orderBy;
-    var settings = source.settings;
-    var uniqueFieldWithoutSuffix;
-    var sortFieldWithoutSuffix;
-    if (settings.autoAggregationTable) {
+    /** Private methods for specific setup for each source mode. */
+
+    /**
+     * Auto-build the term aggregation if this mode enabled.
+     */
+    modeSpecificSetupFns.initTermAggregation = function initTermAggregation() {
+      var subAggs;
+      var sort;
+      var orderBy;
+      var settings = this.settings;
+      var uniqueFieldWithSuffix = indiciaFns.esFieldWithKeywordSuffix(settings.uniqueField);
+      var sortFieldWithoutSuffix;
+      // Use the specified size to limit aggregation buckets, not docs.
+      settings.aggregationSize = settings.size || 10000;
       settings.size = 0;
-      sort = getAutoAggSortInfo(source);
+      sort = getTermAggregationSortInfo(this.settings);
+      // Capture supplied aggregation so we can rebuild each time.
+      settings.suppliedAggregation = settings.suppliedAggregation || settings.aggregation;
       // List of sub-aggregations within the outer terms agg for the unique field must
       // always contain a top_hits agg to retrieve field values.
       subAggs = {
@@ -68,32 +88,30 @@ var IdcEsDataSource;
           top_hits: {
             size: 1,
             _source: {
-              includes: source.settings.autoAggregationTable.fields
+              includes: this.settings.fields
             }
           }
         }
       };
-      // Add the additional aggs for column data output values.
-      $.each(settings.autoAggregationTable.aggs, function eachAgg(name) {
+      // Add the additional aggs for the aggregations requested in config.
+      $.each(settings.suppliedAggregation, function eachAgg(name) {
         subAggs[name] = this;
-        if (name === sort.field && settings.autoAggregationTable.orderby_aggs &&
-            settings.autoAggregationTable.orderby_aggs[sort.field]) {
+        if (name === sort.field && settings.sortAggregation &&
+            settings.sortAggregation[sort.field]) {
           // Aggregation has a different aggregation to simplify the sort
           // e.g. where agg is costly.
           sort.field = 'orderby_' + name;
-          subAggs[sort.field] = settings.autoAggregationTable.orderby_aggs[name];
+          subAggs[sort.field] = settings.sortAggregation[name];
         }
       });
       // Include the unique field in the list of fields request even if not specified.
-      // Don't include .keyword suffix for source filtering.
-      uniqueFieldWithoutSuffix = settings.autoAggregationTable.unique_field.replace(/\.keyword$/, '');
-      if ($.inArray(uniqueFieldWithoutSuffix, settings.autoAggregationTable.fields) === -1) {
-        settings.autoAggregationTable.fields.push(uniqueFieldWithoutSuffix);
+      if ($.inArray(settings.uniqueField, settings.fields) === -1) {
+        settings.fields.push(settings.uniqueField);
       }
       sortFieldWithoutSuffix = sort.field.replace(/\.keyword$/, '');
-      if ($.inArray(sortFieldWithoutSuffix, settings.autoAggregationTable.fields) > -1) {
+      if ($.inArray(sortFieldWithoutSuffix, settings.fields) > -1) {
         // Sorting by a standard field.
-        if (sortFieldWithoutSuffix === uniqueFieldWithoutSuffix) {
+        if (sortFieldWithoutSuffix === settings.uniqueField) {
           // Using the outer agg to sort, so simple use of _key.
           orderBy = '_key';
         } else {
@@ -114,8 +132,8 @@ var IdcEsDataSource;
       settings.aggregation = {
         idfield: {
           terms: {
-            size: settings.autoAggregationTable.size,
-            field: settings.autoAggregationTable.unique_field,
+            size: settings.aggregationSize,
+            field: uniqueFieldWithSuffix,
             order: {
               // Will be filled in.
             }
@@ -124,296 +142,312 @@ var IdcEsDataSource;
         },
         count: {
           cardinality: {
-            field: settings.autoAggregationTable.unique_field
+            field: uniqueFieldWithSuffix
           }
         }
       };
       settings.aggregation.idfield.terms.order[orderBy] = sort.dir;
+    };
+
+    /** Private methods **/
+
+    /**
+     * Hides spinners for all outputs associated with this source.
+     *
+     * @param IdcEsDataSource source
+     *   Source object to hide spinners for.
+     */
+    function hideAllSpinners() {
+      var source = this;
+      $.each(indiciaData.outputPluginClasses, function eachPluginClass(i, pluginClass) {
+        $.each(source.outputs[pluginClass], function eachOutput() {
+          $(this).find('.loading-spinner').hide();
+        });
+      });
     }
-  }
 
-  /**
-   * Constructor for an IdcEsDataSource.
-   *
-   * @param object settings
-   *   Datasource settings.
-   */
-  IdcEsDataSource = function (settings) {
-    var ds = this;
-    ds.settings = settings;
-    // Prepare a structure to store the output plugins linked to this source.
-    ds.outputs = {};
-    $.each(indiciaData.outputPluginClasses, function eachPluginClass() {
-      ds.outputs[this] = [];
-    });
-    // Make a collection of the output controls linked to this data source.
-    $.each($('.idc-output'), function eachOutput() {
-      var el = this;
-      if (Object.prototype.hasOwnProperty.call(el.settings.source, ds.settings.id)) {
+    /**
+     * AJAX success handler for the population call.
+     */
+    function handlePopulationResponse(url, request, response, force, onlyForControl) {
+      var countAggregateControls = [];
+      var countRequest;
+      var pageSize;
+      var source = this;
+      if (response.error || (response.code && response.code !== 200)) {
+        hideAllSpinners.call(this);
+        alert('Elasticsearch query failed');
+      } else {
+        // Convert hits.total to Elasticsearch 7 style.
+        if (response.hits.total && indiciaData.esVersion === 6) {
+          response.hits.total = { value: response.hits.total, relation: 'eq' };
+        }
+        // Build any configured output tables.
+        this.buildTableXY(response);
         $.each(indiciaData.outputPluginClasses, function eachPluginClass(i, pluginClass) {
-          var controlName = pluginClass.replace(/^idc/, '');
-          controlName = controlName.charAt(0).toLowerCase() + controlName.substr(1);
-          if ($(el).hasClass('idc-output-' + controlName)) {
-            ds.outputs[pluginClass].push(el);
-          }
+          $.each(source.outputs[pluginClass], function eachOutput() {
+            if (!onlyForControl || onlyForControl === this) {
+              $(this)[pluginClass]('populate', this.settings, response, request);
+              if (pluginClass === 'idcDataGrid' && source.settings.countAggregation) {
+                // For composite aggregations we may specify a separate
+                // aggregation to provide the count for grid pager.
+                countAggregateControls.push(this);
+              }
+            }
+          });
         });
+        if (countAggregateControls.length > 0) {
+          // Separate aggregation to get total record count, e.g. where
+          // composite aggregation doesn't return total hit count.
+          countRequest = indiciaFns.getFormQueryData(source, true);
+          pageSize = indiciaFns.findValue(source.settings.aggregation, 'composite').size;
+          // Only need to count on initial population or when filter changes.
+          if (countRequest && (JSON.stringify(countRequest) !== lastCountRequestStr || force)) {
+            lastCountRequestStr = JSON.stringify(countRequest);
+            $.ajax({
+              url: url,
+              type: 'post',
+              data: countRequest,
+              success: function countSuccess(countResponse) {
+                // Update the grid pager data.
+                $.each(countAggregateControls, function eachGrid() {
+                  var grid = this;
+                  $.each(countResponse.aggregations, function eachAgg() {
+                    $(grid).idcDataGrid('updatePagerForCountAgg', pageSize, this.value);
+                  });
+                });
+              }
+            });
+          } else {
+            $.each(countAggregateControls, function eachGrid() {
+              // Update the grid pager data. Use the old count but new page
+              // location info.
+              $(this).idcDataGrid('updatePagerForCountAgg', pageSize);
+            });
+          }
+        }
+        hideAllSpinners.call(source);
       }
-    });
-    // Does this datasource get a filter setting from a selected row in any grid(s)?
-    if (ds.settings.filterSourceGrid && ds.settings.filterSourceField && ds.settings.filterField) {
-      // Can be a single string or an array if several grids.
-      if (typeof ds.settings.filterSourceGrid === 'string') {
-        ds.settings.filterSourceGrid = [ds.settings.filterSourceGrid];
-      }
-      if (typeof ds.settings.filterSourceField === 'string') {
-        ds.settings.filterSourceField = [ds.settings.filterSourceField];
+    }
+
+    /**
+     * Fetch data and populate appropriate output plugins.
+     *
+     * @param bool force
+     *   Set to true to force even if request same as before.
+     * @param obj onlyForControl
+     *   jQuery plugin to populate into. If not supplied, all plugins linked to
+     *   source are populated.
+     */
+    function doPopulation(force, onlyForControl) {
+      var source = this;
+      var request;
+      var url;
+      // Call any special initialisation for this source mode.
+      var initMethodFn = 'init' + source.settings.mode.charAt(0).toUpperCase() + source.settings.mode.slice(1);
+      if (typeof modeSpecificSetupFns[initMethodFn] !== 'undefined') {
+        modeSpecificSetupFns[initMethodFn].call(this);
       }
-      if (typeof ds.settings.filterField === 'string') {
-        ds.settings.filterField = [ds.settings.filterField];
+      request = indiciaFns.getFormQueryData(source);
+      // Pagination support for composite aggregations.
+      if (source.settings.after_key) {
+        indiciaFns.findValue(request, 'composite').after = source.settings.after_key;
       }
-      // Hook up row select event handlers to filter the source.
-      $.each(ds.settings.filterSourceGrid, function eachGrid(idx) {
-        $('#' + this).idcDataGrid('on', 'rowSelect', function onRowSelect(tr) {
-          var thisDoc;
-          if (tr) {
-            thisDoc = JSON.parse($(tr).attr('data-doc-source'));
-            ds.settings.rowFilterField = ds.settings.filterField[idx];
-            ds.settings.rowFilterValue = indiciaFns.getValueForField(thisDoc, ds.settings.filterSourceField[idx]);
-            ds.populate();
-          }
+      // Don't repopulate if exactly the same request as already loaded.
+      if (request && (JSON.stringify(request) !== lastRequestStr || force)) {
+        lastRequestStr = JSON.stringify(request);
+        url = indiciaData.esProxyAjaxUrl + '/searchbyparams/' + (indiciaData.nid || '0');
+        // Pass through additional parameters to the request.
+        if (source.settings.filterPath) {
+          // Filter path allows limiting of content in the response.
+          url += url.indexOf('?') === false ? '?' : '&';
+          url += 'filter_path=' + source.settings.filterPath;
+        }
+        $.ajax({
+          url: url,
+          type: 'post',
+          data: request,
+          success: function onSuccess(response) {
+            handlePopulationResponse.call(source, url, request, response, force, onlyForControl);
+          },
+          error: function error(jqXHR) {
+            hideAllSpinners.call(source);
+            if (jqXHR.readyState === 4) {
+              // Don't bother if not done - i.e. error because user navigated away.
+              alert('Elasticsearch query failed');
+            }
+          },
+          dataType: 'json'
         });
-      });
-    }
-    // If limited to a map's bounds, redraw when the map is zoomed or panned.
-    if (ds.settings.filterBoundsUsingMap) {
-      $('#' + ds.settings.filterBoundsUsingMap).idcLeafletMap('on', 'moveend', function onMoveEnd() {
-        ds.populate();
-      });
+      } else {
+        hideAllSpinners.call(source);
+      }
     }
-  };
 
-  /**
-   * Track the last request so we avoid duplicate requests.
-   */
-  IdcEsDataSource.prototype.lastRequestStr = '';
+    /** Public methods **/
 
-  /**
-   * Track the last count request so we avoid duplicate requests.
-   */
-  IdcEsDataSource.prototype.lastCountRequestStr = '';
-
-  /**
-   * If any source's outputs are on a hidden tab, the population may be delayed.
-   */
-  IdcEsDataSource.prototype.hiddenTabDelayedSources = [];
-
-  /**
-   * Hides spinners for all outputs associated with this source.
-   *
-   * @param IdcEsDataSource source
-   *   Source object to hide spinners for.
-   */
-  IdcEsDataSource.prototype.hideAllSpinners = function hideAllSpinners(source) {
-    $.each(indiciaData.outputPluginClasses, function eachPluginClass(i, pluginClass) {
-      $.each(source.outputs[pluginClass], function eachOutput() {
-        $(this).find('.loading-spinner').hide();
+    /**
+     * Creates links between the source and the controls which use it.
+     */
+    IdcEsDataSource.prototype.hookup = function hookup() {
+      var ds = this;
+      // Prepare a structure to store the output plugins linked to this ds.
+      ds.outputs = {};
+      $.each(indiciaData.outputPluginClasses, function eachPluginClass() {
+        ds.outputs[this] = [];
       });
-    });
-  };
-
-  /**
-   * Fetch data and populate appropriate output plugins.
-   *
-   * @param bool force
-   *   Set to true to force even if request same as before.
-   * @param obj onlyForControl
-   *   jQuery plugin to populate into. If not supplied, all plugins linked to
-   *   source are populated.
-   */
-  IdcEsDataSource.prototype.doPopulation = function doPopulation(force, onlyForControl) {
-    var source = this;
-    var request;
-    var url;
-    var countRequest;
-    buildAutoAggregationTable(source);
-    request = indiciaFns.getFormQueryData(source);
-    // Pagination support for composite aggregations.
-    if (source.settings.after_key) {
-      indiciaFns.findValue(request, 'composite').after = source.settings.after_key;
-    }
-    // Don't repopulate if exactly the same request as already loaded.
-    if (request && (JSON.stringify(request) !== this.lastRequestStr || force)) {
-      this.lastRequestStr = JSON.stringify(request);
-      url = indiciaData.esProxyAjaxUrl + '/searchbyparams/' + (indiciaData.nid || '0');
-      // Pass through additional parameters to the request.
-      if (source.settings.filterPath) {
-        // Filter path allows limiting of content in the response.
-        url += url.indexOf('?') === false ? '?' : '&';
-        url += 'filter_path=' + source.settings.filterPath;
+      // Make a collection of the output controls linked to this data ds.
+      $.each($('.idc-output'), function eachOutput() {
+        var el = this;
+        if (el.settings.source && Object.prototype.hasOwnProperty.call(el.settings.source, ds.settings.id)) {
+          $.each(indiciaData.outputPluginClasses, function eachPluginClass(i, pluginClass) {
+            var controlName = pluginClass.replace(/^idc/, '');
+            controlName = controlName.charAt(0).toLowerCase() + controlName.substr(1);
+            if ($(el).hasClass('idc-output-' + controlName)) {
+              ds.outputs[pluginClass].push(el);
+            }
+          });
+        }
+      });
+      // If datasource mode for mapping, use the map to limit the bounds retrieved.
+      if (ds.settings.mode.match(/^map/) && !ds.settings.filterBoundsUsingMap) {
+        if (!ds.outputs.idcLeafletMap) {
+          throw new Error('Source using a mapping mode without a linked map.');
+        }
+        ds.settings.filterBoundsUsingMap = ds.outputs.idcLeafletMap[0].id;
       }
-      $.ajax({
-        url: url,
-        type: 'post',
-        data: request,
-        success: function success(response) {
-          var countAggregateControls = [];
-          var pageSize;
-          if (response.error || (response.code && response.code !== 200)) {
-            source.hideAllSpinners(source);
-            alert('Elasticsearch query failed');
-          } else {
-            // Convert hits.total to Elasticsearch 7 style.
-            if (response.hits.total && indiciaData.esVersion === 6) {
-              response.hits.total = { value: response.hits.total, relation: 'eq' };
+      // Does this datasource get a filter setting from a selected row in any grid(s)?
+      if (ds.settings.filterSourceGrid && ds.settings.filterSourceField && ds.settings.filterField) {
+        // Hook up row select event handlers to filter the ds.
+        $.each(ds.settings.filterSourceGrid, function eachGrid(idx) {
+          $('#' + this).idcDataGrid('on', 'rowSelect', function onRowSelect(tr) {
+            var thisDoc;
+            if (tr) {
+              thisDoc = JSON.parse($(tr).attr('data-doc-source'));
+              ds.settings.rowFilterField = ds.settings.filterField[idx];
+              ds.settings.rowFilterValue = indiciaFns.getValueForField(thisDoc, ds.settings.filterSourceField[idx]);
+              ds.populate();
             }
-            // Build any configured output tables.
-            source.buildTableXY(response);
-            $.each(indiciaData.outputPluginClasses, function eachPluginClass(i, pluginClass) {
-              $.each(source.outputs[pluginClass], function eachOutput() {
-                if (!onlyForControl || onlyForControl === this) {
-                  $(this)[pluginClass]('populate', source.settings, response, request);
-                  if (pluginClass === 'idcDataGrid' && source.settings.countAggregation) {
-                    // For composite aggregations we may specify a separate
-                    // aggregation to provide the count for grid pager.
-                    countAggregateControls.push(this);
-                  }
+          });
+        });
+      }
+      // If limited to a map's bounds, redraw when the map is zoomed or panned.
+      if (ds.settings.filterBoundsUsingMap) {
+        $('#' + ds.settings.filterBoundsUsingMap).idcLeafletMap('on', 'moveend', function onMoveEnd() {
+          ds.populate();
+        });
+      }
+    };
+
+    /**
+     * Request a datasource to repopulate from current parameters.
+     *
+     * @param bool force
+     *   Set to true to force even if request same as before.
+     * @param obj onlyForControl
+     *   jQuery plugin to populate into. If not supplied, all plugins linked to
+     *   source are populated.
+     */
+    IdcEsDataSource.prototype.populate = function datasourcePopulate(force, onlyForControl) {
+      var source = this;
+      var needsPopulation = false;
+      if (!source.outputs) {
+        // Not initialised yet, so don't populate.
+        return;
+      }
+      // Check we have an output other than the download plugin, which only
+      // outputs when you click Download.
+      $.each(indiciaData.outputPluginClasses, function eachPluginClass(i, pluginClass) {
+        $.each(source.outputs[pluginClass], function eachOutput() {
+          var output = this;
+          var populateThis = $(output)[pluginClass]('getNeedsPopulation', source);
+          if ($(output).parents('.ui-tabs-panel:hidden').length > 0) {
+            // Don't bother if on a hidden tab.
+            populateThis = false;
+            $.each($(output).parents('.ui-tabs-panel:hidden'), function eachHiddenTab() {
+              var tab = this;
+              var tabSelectFn = function eachTabSet() {
+                if ($(tab).filter(':visible').length > 0) {
+                  $(output).find('.loading-spinner').show();
+                  doPopulation.call(this, force, onlyForControl);
+                  indiciaFns.unbindTabsActivate($(tab).closest('.ui-tabs'), tabSelectFn);
                 }
-              });
+              };
+              indiciaFns.bindTabsActivate($(tab).closest('.ui-tabs'), tabSelectFn);
             });
-            if (countAggregateControls.length > 0) {
-              // Separate aggregation to get total record count, e.g. where
-              // composite aggregation doesn't return total hit count.
-              countRequest = indiciaFns.getFormQueryData(source, true);
-              pageSize = indiciaFns.findValue(source.settings.aggregation, 'composite').size;
-              // Only need to count on initial population or when filter changes.
-              if (countRequest && (JSON.stringify(countRequest) !== source.lastCountRequestStr || force)) {
-                source.lastCountRequestStr = JSON.stringify(countRequest);
-                $.ajax({
-                  url: url,
-                  type: 'post',
-                  data: countRequest,
-                  success: function success(countResponse) {
-                    // Update the grid pager data.
-                    $.each(countAggregateControls, function eachGrid() {
-                      var grid = this;
-                      $.each(countResponse.aggregations, function() {
-                        $(grid).idcDataGrid('updatePagerForCountAgg', pageSize, this.value);
-                      });
-                    });
-                  }
-                });
-              } else {
-                $.each(countAggregateControls, function eachGrid() {
-                  // Update the grid pager data. Use the old count but new page
-                  // location info.
-                  $(this).idcDataGrid('updatePagerForCountAgg', pageSize);
-                });
-              }
-            }
-            source.hideAllSpinners(source);
           }
-        },
-        error: function error(jqXHR) {
-          source.hideAllSpinners(source);
-          if (jqXHR.readyState === 4) {
-            // Don't bother if not done - i.e. error because user navigated away.
-            alert('Elasticsearch query failed');
+          needsPopulation = needsPopulation || populateThis;
+          if (populateThis) {
+            $(output).find('.loading-spinner').show();
           }
-        },
-        dataType: 'json'
-      });
-    } else {
-      source.hideAllSpinners(source);
-    }
-  }
-
-  /**
-   * Request a datasource to repopulate from current parameters.
-   *
-   * @param bool force
-   *   Set to true to force even if request same as before.
-   * @param obj onlyForControl
-   *   jQuery plugin to populate into. If not supplied, all plugins linked to
-   *   source are populated.
-   */
-  IdcEsDataSource.prototype.populate = function datasourcePopulate(force, onlyForControl) {
-    var source = this;
-    var needsPopulation = false;
-
-    // Check we have an output other than the download plugin, which only
-    // outputs when you click Download.
-    $.each(indiciaData.outputPluginClasses, function eachPluginClass(i, pluginClass) {
-      $.each(source.outputs[pluginClass], function eachOutput() {
-        var output = this;
-        var populateThis = $(output)[pluginClass]('getNeedsPopulation', source);
-        if ($(output).parents('.ui-tabs-panel:hidden').length > 0) {
-          // Don't bother if on a hidden tab.
-          populateThis = false;
-          $.each($(output).parents('.ui-tabs-panel:hidden'), function eachHiddenTab() {
-            var tab = this;
-            var tabSelectFn = function eachTabSet() {
-              if ($(tab).filter(':visible').length > 0) {
-                $(output).find('.loading-spinner').show();
-                source.doPopulation(force, onlyForControl);
-                indiciaFns.unbindTabsActivate($(tab).closest('.ui-tabs'), tabSelectFn);
-              }
-            };
-            indiciaFns.bindTabsActivate($(tab).closest('.ui-tabs'), tabSelectFn);
-          });
-        }
-        needsPopulation = needsPopulation || populateThis;
-        if (populateThis) {
-          $(output).find('.loading-spinner').show();
-        }
+        });
       });
-    });
-    if (needsPopulation) {
-      source.doPopulation(force, onlyForControl);
-    }
-  };
+      if (needsPopulation) {
+        doPopulation.call(this, force, onlyForControl);
+      }
+    };
 
-  /**
-   * IdcEsDataSource function to tablify 2 tier aggregation responses.
-   *
-   * Use this method if there is an outer aggregation which corresponds to the
-   * table columns (X) and an inner aggregation which corresponds to the table
-   * rows (Y).
-   *
-   * @param object response
-   *   Response from an ES aggregation search request.
-   */
-  IdcEsDataSource.prototype.buildTableXY = function buildTableXY(response) {
-    var source = this;
-    if (source.settings.buildTableXY) {
-      $.each(source.settings.buildTableXY, function eachTable(name, aggs) {
-        var data = {};
-        var colsTemplate = {
-          key: ''
-        };
-        // Collect the list of columns
-        $.each(response.aggregations[aggs[0]].buckets, function eachOuterBucket() {
-          colsTemplate[this.key] = 0;
-        });
-        // Now for each column, collect the rows.
-        $.each(response.aggregations[aggs[0]].buckets, function eachOuterBucket() {
-          var thisCol = this.key;
-          var aggsPath = aggs[1].split(',');
-          var obj = this;
-          // Drill down the required level of nesting.
-          $.each(aggsPath, function eachPathLevel() {
-            obj = obj[this];
+    /**
+     * IdcEsDataSource function to tablify 2 tier aggregation responses.
+     *
+     * Use this method if there is an outer aggregation which corresponds to the
+     * table columns (X) and an inner aggregation which corresponds to the table
+     * rows (Y).
+     *
+     * @param object response
+     *   Response from an ES aggregation search request.
+     */
+    IdcEsDataSource.prototype.buildTableXY = function buildTableXY(response) {
+      var source = this;
+      if (source.settings.buildTableXY) {
+        $.each(source.settings.buildTableXY, function eachTable(name, aggs) {
+          var data = {};
+          var colsTemplate = {
+            key: ''
+          };
+          // Collect the list of columns
+          $.each(response.aggregations[aggs[0]].buckets, function eachOuterBucket() {
+            colsTemplate[this.key] = 0;
           });
-          $.each(obj.buckets, function eachInnerBucket() {
-            if (typeof data[this.key] === 'undefined') {
-              data[this.key] = $.extend({}, colsTemplate);
-              data[this.key].key = this.key;
-            }
-            data[this.key][thisCol] = this.doc_count;
+          // Now for each column, collect the rows.
+          $.each(response.aggregations[aggs[0]].buckets, function eachOuterBucket() {
+            var thisCol = this.key;
+            var aggsPath = aggs[1].split(',');
+            var obj = this;
+            // Drill down the required level of nesting.
+            $.each(aggsPath, function eachPathLevel() {
+              obj = obj[this];
+            });
+            $.each(obj.buckets, function eachInnerBucket() {
+              if (typeof data[this.key] === 'undefined') {
+                data[this.key] = $.extend({}, colsTemplate);
+                data[this.key].key = this.key;
+              }
+              data[this.key][thisCol] = this.doc_count;
+            });
           });
+          // Attach the data table to the response.
+          response[name] = data;
         });
-        // Attach the data table to the response.
-        response[name] = data;
-      });
+      }
+    };
+
+    // idcEsDataSource initialisation code.
+    this.settings = providedSettings;
+    // Does this datasource get a filter setting from a selected row in any grid(s)?
+    if (this.settings.filterSourceGrid && this.settings.filterSourceField && this.settings.filterField) {
+      // Can be a single string or an array if several grids.
+      if (typeof this.settings.filterSourceGrid === 'string') {
+        this.settings.filterSourceGrid = [this.settings.filterSourceGrid];
+      }
+      if (typeof this.settings.filterSourceField === 'string') {
+        this.settings.filterSourceField = [this.settings.filterSourceField];
+      }
+      if (typeof this.settings.filterField === 'string') {
+        this.settings.filterField = [this.settings.filterField];
+      }
     }
+    return this;
   };
+
 }());
diff --git a/js/indicia.datacomponents/jquery.idc.dataGrid.js b/js/indicia.datacomponents/jquery.idc.dataGrid.js
index b7bf417e..cbe9c3fd 100644
--- a/js/indicia.datacomponents/jquery.idc.dataGrid.js
+++ b/js/indicia.datacomponents/jquery.idc.dataGrid.js
@@ -139,7 +139,7 @@
       sortableField = sortableField
         || indiciaData.fieldConvertorSortFields[this.simpleFieldName()]
         || (el.settings.aggregation && el.settings.aggregation === 'composite')
-        || (el.settings.aggregation && el.settings.aggregation === 'autoAggregationTable');
+        || (el.settings.sourceObject.settings.mode === 'termAggregation');
       if (el.settings.sortable !== false && sortableField) {
         heading += '<span class="sort fas fa-sort"></span>';
       }
@@ -212,34 +212,41 @@
     });
   }
 
+  function applySourceModeSettings(el) {
+    var sourceSettings = el.settings.sourceObject.settings;
+    if (sourceSettings.mode === 'termAggregation') {
+      $.each(el.settings.availableColumnInfo, function eachCol(field, colDef) {
+        if ($.inArray(field, sourceSettings.fields) > -1) {
+          colDef.path = 'fieldlist.hits.hits.0._source';
+        }
+      });
+    }
+  }
+
   function movePage(el, forward) {
+    var sourceSettings = indiciaData.sourceObject.settings;
     if (el.settings.aggregation === 'composite') {
       el.settings.compositeInfo.page += (forward ? 1 : -1);
-    }
-    $.each(el.settings.source, function eachSource(sourceId) {
-      var source = indiciaData.esSourceObjects[sourceId];
-      if (el.settings.aggregation === 'composite') {
-        // Composite aggregations use after_key to find next page.
-        if (el.settings.compositeInfo.pageAfterKeys[el.settings.compositeInfo.page]) {
-          source.settings.after_key = el.settings.compositeInfo.pageAfterKeys[el.settings.compositeInfo.page];
-        } else {
-          delete source.settings.after_key;
-        }
+      // Composite aggregations use after_key to find next page.
+      if (el.settings.compositeInfo.pageAfterKeys[el.settings.compositeInfo.page]) {
+        sourceSettings.after_key = el.settings.compositeInfo.pageAfterKeys[el.settings.compositeInfo.page];
       } else {
-        if (typeof source.settings.from === 'undefined') {
-          source.settings.from = 0;
-        }
-        if (forward) {
-          // Move to next page based on currently visible row count, in case some
-          // have been removed.
-          source.settings.from += $(el).find('tbody tr.data-row').length;
-        } else {
-          source.settings.from -= source.settings.size;
-        }
-        source.settings.from = Math.max(0, source.settings.from);
+        delete sourceSettings.after_key;
       }
-      source.populate();
-    });
+    } else {
+      if (typeof sourceSettings.from === 'undefined') {
+        sourceSettings.from = 0;
+      }
+      if (forward) {
+        // Move to next page based on currently visible row count, in case some
+        // have been removed.
+        sourceSettings.from += $(el).find('tbody tr.data-row').length;
+      } else {
+        sourceSettings.from -= sourceSettings.size;
+      }
+      sourceSettings.from = Math.max(0, sourceSettings.from);
+    }
+    indiciaData.sourceObject.populate();
   }
 
   /**
@@ -307,16 +314,19 @@
   }
 
   /**
-   * Apply changes to a source when sorting for an auto aggregation table.
+   * Apply changes to a source when sorting in a term aggregation table.
    */
-  function handleSortForAutoAggregationTable(source, fieldName, sortDesc) {
-    var sortFields;
+  function handleSortForTermAggregation(source, fieldName, sortDesc) {
+    var sortFieldName;
     if (indiciaData.fieldConvertorSortFields[fieldName] && $.isArray(indiciaData.fieldConvertorSortFields[fieldName])) {
-      sortFields = indiciaData.fieldConvertorSortFields[fieldName];
+      // The terms we aggregate on can be special fields with underlying
+      // mappings, but we only support sort by the first field not nested
+      // sort.
+      sortFieldName = indiciaData.fieldConvertorSortFields[fieldName][0];
     } else {
-      sortFields = [fieldName];
+      sortFieldName = fieldName;
     }
-    source.settings.sort[sortFields[0]] = sortDesc ? 'desc' : 'asc';
+    source.settings.sort[sortFieldName] = sortDesc ? 'desc' : 'asc';
   }
 
   /**
@@ -326,11 +336,13 @@
     var sortFields = indiciaData.fieldConvertorSortFields[fieldName];
     if ($.isArray(sortFields)) {
       $.each(sortFields, function eachField() {
+        // A simple list of fields to sort on, so set the direction on each.
         source.settings.sort[this] = {
           order: sortDesc ? 'desc' : 'asc'
         };
       });
     } else if (typeof sortFields === 'object') {
+      // A complex sort object (e.g. lat_lon distance).
       source.settings.sort = sortFields;
       indiciaFns.findAndSetValue(source.settings.sort, 'order', sortDesc ? 'desc' : 'asc');
     }
@@ -385,25 +397,26 @@
     indiciaFns.on('click', '#' + el.id + ' .sort', {}, function clickSort() {
       var fieldName = $(this).closest('th').attr('data-field').simpleFieldName();
       var sortDesc = $(this).hasClass('fa-sort-up');
+      var sourceObj = el.settings.sourceObject;
       showHeaderSortInfo(this, sortDesc);
-      $.each(el.settings.source, function eachSource(sourceId) {
-        var source = indiciaData.esSourceObjects[sourceId];
-        source.settings.sort = {};
-        if (el.settings.aggregation && el.settings.aggregation === 'composite') {
-          handleSortForCompositeAgg(source, fieldName, sortDesc);
-        } else if (el.settings.aggregation && el.settings.aggregation === 'autoAggregationTable') {
-          handleSortForAutoAggregationTable(source, fieldName, sortDesc);
-        } else if (indiciaData.esMappings[fieldName]) {
-          source.settings.sort[indiciaData.esMappings[fieldName].sort_field] = {
-            order: sortDesc ? 'desc' : 'asc'
-          };
-        } else if (indiciaData.fieldConvertorSortFields[fieldName]) {
-          handleSortForSpecialField(source, fieldName, sortDesc);
-        }
-        source.populate();
-      });
+      el.settings.sourceObject.settings.sort = {};
+      if (el.settings.aggregation && el.settings.aggregation === 'composite') {
+        handleSortForCompositeAgg(sourceObj, fieldName, sortDesc);
+      } else if (sourceObj.settings.mode === 'termAggregation') {
+        handleSortForTermAggregation(sourceObj, fieldName, sortDesc);
+      } else if (indiciaData.esMappings[fieldName]) {
+        sourceObj.settings.sort[indiciaData.esMappings[fieldName].sort_field] = {
+          order: sortDesc ? 'desc' : 'asc'
+        };
+      } else if (indiciaData.fieldConvertorSortFields[fieldName]) {
+        handleSortForSpecialField(sourceObj, fieldName, sortDesc);
+      }
+      sourceObj.populate();
     });
 
+    /**
+     * Filter row input change handler.
+     */
     indiciaFns.on('change', '#' + el.id + ' .es-filter-row input', {}, function changeFilterInput() {
       var sources = Object.keys(el.settings.source);
       if (el.settings.applyFilterRowToSources) {
@@ -417,6 +430,9 @@
       });
     });
 
+    /**
+     * Multi-select switch toggle handler.
+     */
     $(el).find('.multiselect-switch').click(function clickMultiselectSwitch() {
       var table = $(el).find('table');
       if ($(el).hasClass('multiselect-mode')) {
@@ -525,10 +541,7 @@
       if (el.settings.includeFilterRow !== false) {
         addFilterRow(el, header);
       }
-      $.each(el.settings.source, function eachSource(sourceId) {
-        var source = indiciaData.esSourceObjects[sourceId];
-        source.populate(true);
-      });
+      el.settings.sourceObject.populate(true);
       removeConfigPane(el);
     });
 
@@ -639,10 +652,14 @@
    * documents), the buckets of an aggregation, or a custom built source table.
    */
   function getSourceDataList(el, response) {
+    if (el.settings.sourceObject.settings.mode === 'termAggregation') {
+      return indiciaFns.findValue(response.aggregations, 'buckets');
+    }
     if (el.settings.sourceTable) {
       // A custom table built from an aggregation by the source.
       return response[$(el)[0].settings.sourceTable];
-    } else if (el.settings.aggregation && typeof response.aggregations !== 'undefined') {
+    }
+    if (el.settings.aggregation && typeof response.aggregations !== 'undefined') {
       // A standard aggregation.
       return indiciaFns.findValue(response.aggregations, 'buckets');
     }
@@ -650,48 +667,6 @@
     return response.hits.hits;
   }
 
-  function drawMediaFile(i, doc, file, sizeClass) {
-    // Check if an extenral URL.
-    var match = file.path.match(/^http(s)?:\/\/(www\.)?([a-z(\.kr)]+)/);
-    var captionItems = [];
-    var captionAttr;
-    var html = '';
-    if (file.caption) {
-      captionItems.push(file.caption);
-    }
-    if (file.licence) {
-      captionItems.push('Licence is ' + file.licence);
-    }
-    captionAttr = captionItems.length ? ' title="' + captionItems.join(' | ').replace('"', '&quot;') + '"' : '';
-    if (match !== null) {
-      // If so, is it iNat? We can work out the image file names if so.
-      if (file.path.match(/^https:\/\/static\.inaturalist\.org/)) {
-        html += '<a ' + captionAttr +
-          'href="' + file.path.replace('/square.', '/large.') + '" ' +
-          'class="inaturalist fancybox" rel="group-' + doc.id + '">' +
-          '<img class="' + sizeClass + '" src="' + file.path + '" /></a>';
-      } else {
-        html += '<a ' +
-          'href="' + file.path + '" class="social-icon ' + match[3].replace('.', '') + '"></a>';
-        if (captionItems.length) {
-          html += '<p>' + captionItems.join(' | ').replace('"', '&quot;') + '</p>';
-        }
-      }
-    } else if ($.inArray(file.path.split('.').pop(), ['mp3', 'wav']) > -1) {
-      // Audio files can have a player control.
-      html += '<audio controls ' +
-        'src="' + indiciaData.warehouseUrl + 'upload/' + file.path + '" type="audio/mpeg"/>';
-    } else {
-      // Standard link to Indicia image.
-      html += '<a ' + captionAttr +
-        'href="' + indiciaData.warehouseUrl + 'upload/' + file.path + '" ' +
-        'class="fancybox" rel="group-' + doc.id + '">' +
-        '<img class="' + sizeClass + '" src="' + indiciaData.warehouseUrl + 'upload/thumb-' + file.path + '" />' +
-        '</a>';
-    }
-    return html;
-  }
-
   function addHeader(el, table) {
     var header;
     // If we need any sort of header, add <thead>.
@@ -730,7 +705,7 @@
       $(el).find('.pager-row .next').prop('disabled', !afterKey);
       $(el).find('.pager-row .prev').prop('disabled', el.settings.compositeInfo.page === 0);
     } else {
-      if (el.settings.aggregation && el.settings.aggregation === 'autoAggregationTable') {
+      if (el.settings.sourceObject.settings.mode === 'termAggregation') {
         // The count agg is always added in this mode.
         total = response.aggregations.count.value;
         // Can't page through a standard aggregation.
@@ -776,17 +751,17 @@
    */
   function getDataCells(el, doc, maxCharsPerCol) {
     var cells = [];
+    var sourceSettings = el.settings.sourceObject.settings;
     $.each(el.settings.columns, function eachColumn(idx) {
       var value;
       var rangeValue;
-      var sizeClass;
       var classes = ['col-' + idx];
       var style = '';
       var colDef = el.settings.availableColumnInfo[this];
-      var media = '';
       var date;
       // Extra space in last col to account for tool icons.
       var extraSpace = idx === el.settings.columns.length - 1 && !el.settings.actions.length ? 2 : 0;
+      var charWidth;
       value = indiciaFns.getValueForField(doc, this, colDef);
       if (colDef.rangeField) {
         rangeValue = indiciaFns.getValueForField(doc, colDef.rangeField);
@@ -801,16 +776,10 @@
         date = new Date(value);
         value = date.toLocaleString();
       }
-      if (value && colDef.handler && colDef.handler === 'media') {
-        // Tweak image sizes if more than 1.
-        sizeClass = value.length === 1 ? 'single' : 'multi';
-        // Build media HTML.
-        $.each(value, function eachFile(i, file) {
-          media += drawMediaFile(i, doc, file, sizeClass);
-        });
-        value = media;
-        // Approximate a column size to accomodate the thumbnails.
-        maxCharsPerCol['col-' + idx] = Math.max(maxCharsPerCol['col-' + idx], extraSpace + value.length === 1 ? 8 : 14);
+      if (value && typeof value === 'string' && value.match(/class="(single|multi)"/)) {
+        // Thumbnail(s) so give approx column size.
+        charWidth = value.match(/class="single"/) ? 8 : 14;
+        maxCharsPerCol['col-' + idx] = Math.max(maxCharsPerCol['col-' + idx], extraSpace + charWidth);
       } else {
         maxCharsPerCol['col-' + idx] =
           Math.max(maxCharsPerCol['col-' + idx], $('<p>' + value + '</p>').text().length + extraSpace);
@@ -917,6 +886,7 @@
       var tableClasses = ['table', 'es-data-grid'];
       var savedCols;
       var tools;
+
       indiciaFns.registerOutputPluginClass('idcDataGrid');
       el.settings = $.extend(true, {}, defaults);
       // Apply settings passed in the HTML data-* attribute.
@@ -927,6 +897,8 @@
       if (typeof options !== 'undefined') {
         $.extend(el.settings, options);
       }
+      // dataGrid does not make use of multiple sources.
+      el.settings.sourceObject = indiciaData.esSourceObjects[Object.keys(el.settings.source)[0]];
       // Disable cookies unless id specified.
       if (!el.id || !$.cookie) {
         el.settings.cookies = false;
@@ -1012,6 +984,7 @@
       var dataList = getSourceDataList(el, response);
       var maxCharsPerCol = {};
       var afterKey = indiciaFns.findValue(response, 'after_key');
+      applySourceModeSettings(el);
       if (el.settings.aggregation === 'composite' && !afterKey && el.settings.compositeInfo.page > 0) {
         // Moved past last page, so abort.
         $(el).find('.next').prop('disabled', true);
@@ -1130,7 +1103,7 @@
       var newSelectedId;
       var showingLabel = $(el).find('.showing');
       var selectedIds = [];
-
+      var sourceSettings = el.settings.sourceObject.settings;
       if ($(el).find('table.multiselect-mode').length > 0) {
         $.each($(el).find('input.multiselect:checked'), function eachRow() {
           var tr = $(this).closest('tr');
@@ -1146,44 +1119,41 @@
         selectedIds.push($(oldSelected).attr('data-row-id'));
         $(oldSelected).remove();
       }
-      $.each(el.settings.source, function eachSource(sourceId) {
-        var source = indiciaData.esSourceObjects[sourceId];
-        // If the number of rows below 75% of page size, reresh the grid.
-        if ($(el).find('table tbody tr.data-row').length < source.settings.size * 0.75) {
-          // As ES updates are not instant, we need a temporary must_not match
-          // filter to prevent the verified records reappearing.
-          if (!source.settings.filterBoolClauses) {
-            source.settings.filterBoolClauses = {};
-          }
-          if (!source.settings.filterBoolClauses.must_not) {
-            source.settings.filterBoolClauses.must_not = [];
-          }
-          source.settings.filterBoolClauses.must_not.push({
-            query_type: 'terms',
-            field: '_id',
-            value: JSON.stringify(selectedIds)
-          });
-          $(el)[0].settings.selectIdsOnNextLoad = [newSelectedId];
-          // Reload the grid page.
-          source.populate(true);
-          // Clean up the temporary exclusion filter.
-          source.settings.filterBoolClauses.must_not.pop();
-          if (!source.settings.filterBoolClauses.must_not.length) {
-            delete source.settings.filterBoolClauses.must_not;
-          }
-        } else {
-          // Update the paging info if some rows left.
-          showingLabel.html(showingLabel.html().replace(/\d+ of /, $(el).find('tbody tr.data-row').length + ' of '));
-          // Immediately select the next row.
-          if (typeof newSelectedId !== 'undefined') {
-            $(el).find('table tbody tr.data-row[data-row-id="' + newSelectedId + '"]').addClass('selected');
-          }
-          // Fire callbacks for selected row.
-          $.each(el.settings.callbacks.rowSelect, function eachCallback() {
-            this($(el).find('tr.selected').length === 0 ? null : $(el).find('tr.selected')[0]);
-          });
+      // If the number of rows below 75% of page size, refresh the grid.
+      if ($(el).find('table tbody tr.data-row').length < sourceSettings.size * 0.75) {
+        // As ES updates are not instant, we need a temporary must_not match
+        // filter to prevent the verified records reappearing.
+        if (!sourceSettings.filterBoolClauses) {
+          sourceSettings.filterBoolClauses = {};
         }
-      });
+        if (!sourceSettings.filterBoolClauses.must_not) {
+          sourceSettings.filterBoolClauses.must_not = [];
+        }
+        sourceSettings.filterBoolClauses.must_not.push({
+          query_type: 'terms',
+          field: '_id',
+          value: JSON.stringify(selectedIds)
+        });
+        $(el)[0].settings.selectIdsOnNextLoad = [newSelectedId];
+        // Reload the grid page.
+        el.settings.sourceObject.populate(true);
+        // Clean up the temporary exclusion filter.
+        sourceSettings.filterBoolClauses.must_not.pop();
+        if (!sourceSettings.filterBoolClauses.must_not.length) {
+          delete sourceSettings.filterBoolClauses.must_not;
+        }
+      } else {
+        // Update the paging info if some rows left.
+        showingLabel.html(showingLabel.html().replace(/\d+ of /, $(el).find('tbody tr.data-row').length + ' of '));
+        // Immediately select the next row.
+        if (typeof newSelectedId !== 'undefined') {
+          $(el).find('table tbody tr.data-row[data-row-id="' + newSelectedId + '"]').addClass('selected');
+        }
+        // Fire callbacks for selected row.
+        $.each(el.settings.callbacks.rowSelect, function eachCallback() {
+          this($(el).find('tr.selected').length === 0 ? null : $(el).find('tr.selected')[0]);
+        });
+      }
     },
 
     /**
diff --git a/js/indicia.datacomponents/jquery.idc.esDownload.js b/js/indicia.datacomponents/jquery.idc.esDownload.js
index 1251c064..2d7309e0 100644
--- a/js/indicia.datacomponents/jquery.idc.esDownload.js
+++ b/js/indicia.datacomponents/jquery.idc.esDownload.js
@@ -95,12 +95,40 @@
    */
   function getColumnSettings(el) {
     var data = {};
+    var source = indiciaData.esSourceObjects[el.settings.sourceId];
+    var agg;
     // Note, columnsTemplate can be blank.
     if (typeof el.settings.columnsTemplate !== 'undefined') {
       data.columnsTemplate = el.settings.columnsTemplate;
+    } else if (el.settings.aggregation && el.settings.aggregation === 'composite') {
+      data.columnsTemplate = '';
     }
     if (el.settings.addColumns) {
       data.addColumns = el.settings.addColumns;
+    } else if (el.settings.aggregation && el.settings.aggregation === 'composite' && data.columnsTemplate === '') {
+      // Find the first aggregation defined for this source.
+      agg = source.settings.aggregation[Object.keys(source.settings.aggregation)[0]];
+      data.addColumns = [];
+      // The agg should contain sources (which are the columns aggregated on).
+      $.each(agg.composite.sources, function eachSource() {
+        $.each(this, function eachField(key) {
+          data.addColumns.push({
+            field: 'key.' + key,
+            caption: key
+          });
+        });
+      });
+      // The agg should also contain aggregation for calculated columns.
+      $.each(agg.aggs, function eachAgg(key) {
+        data.addColumns.push({
+          agg: key,
+          caption: key
+        });
+      });
+
+
+      // Ensure dates are formatted correctly.
+
     }
     if (el.settings.removeColumns) {
       data.removeColumns = el.settings.removeColumns;
@@ -108,13 +136,36 @@
     return data;
   }
 
+  function initSource(el) {
+    var settings = el.settings;
+    var gridSettings;
+    if (settings.linkToDataGrid) {
+      if ($('#' + settings.linkToDataGrid).length !== 1) {
+        throw new Error('Failed to find dataGrid ' + settings.linkToDataGrid + ' linked to download');
+      }
+      // Refresh the columns according to those currently in the dataGrid.
+      gridSettings = $('#' + settings.linkToDataGrid)[0].settings;
+      settings.source = gridSettings.source;
+      settings.columnsTemplate = '';
+      settings.addColumns = [];
+      $.each(gridSettings.columns, function() {
+        settings.addColumns.push({
+          caption: gridSettings.availableColumnInfo[this].caption,
+          field: this
+        });
+      });
+    }
+    // Only allow a single source for download, so simplify the sources.
+    settings.sourceId = Object.keys(settings.source)[0];
+  }
+
   /**
    * Recurse until all the pages of a chunked download are received.
    *
    * @param obj lastResponse
    *   Response body from the ES proxy containing progress data.
    */
-  function doPages(el, lastResponse) {
+  function doPages(el, lastResponse, columnSettings) {
     var date;
     var hours;
     var minutes;
@@ -133,7 +184,7 @@
       query += '&aggregation_type=composite';
     }
     if (lastResponse.state === 'nextPage') {
-      $.extend(data, getColumnSettings(el));
+      $.extend(data, columnSettings);
       // Post to the ES proxy. Pass scroll_id (docs) or after_key (composite aggregations)
       // parameter to request the next chunk of the dataset.
       $.ajax({
@@ -143,7 +194,7 @@
         data: data,
         success: function success(response) {
           updateProgress(el, response);
-          doPages(el, response);
+          doPages(el, response, columnSettings);
         }
       });
     } else {
@@ -177,9 +228,13 @@
      */
     $(el).find('.do-download').click(function doDownload() {
       var data;
-      var source = indiciaData.esSourceObjects[el.settings.sourceId];
+      var source;
       var sep = indiciaData.esProxyAjaxUrl.match(/\?/) ? '&' : '?';
       var query = sep + 'state=initial';
+      var columnSettings;
+      initSource(el);
+      source = indiciaData.esSourceObjects[el.settings.sourceId];
+      columnSettings = getColumnSettings(el);
       $(el).find('.progress-circle-container').removeClass('download-done');
       $(el).find('.progress-circle-container').show();
       done = false;
@@ -189,7 +244,7 @@
       if (el.settings.aggregation && el.settings.aggregation === 'composite') {
         query += '&aggregation_type=composite';
       }
-      $.extend(data, getColumnSettings(el));
+      $.extend(data, columnSettings);
       // Post to the ES proxy.
       $.ajax({
         url: indiciaData.esProxyAjaxUrl + '/download/' + indiciaData.nid + query,
@@ -202,7 +257,7 @@
             $('.progress-circle-container').hide();
           } else {
             updateProgress(el, response);
-            doPages(el, response);
+            doPages(el, response, columnSettings);
           }
         }
       });
@@ -232,11 +287,8 @@
       if (typeof options !== 'undefined') {
         $.extend(el.settings, options);
       }
-      // Only allow a single source for download, so simplify the sources.
-      $.each(el.settings.source, function eachSource(sourceId) {
-        el.settings.sourceId = sourceId;
-        return false;
-      });
+      // Don't do any more init at this point, as might be using a not-yet
+      // instantiated dataGrid for config.
       initHandlers(el);
     },
 
diff --git a/js/indicia.datacomponents/jquery.idc.leafletMap.js b/js/indicia.datacomponents/jquery.idc.leafletMap.js
index 2328ed0a..bdb4d7ae 100644
--- a/js/indicia.datacomponents/jquery.idc.leafletMap.js
+++ b/js/indicia.datacomponents/jquery.idc.leafletMap.js
@@ -145,6 +145,9 @@
       }
       if (config.type === 'circle' || config.type === 'square' || config.type === 'geom') {
         config.options = $.extend({ radius: 'metric', fillOpacity: 0.5 }, config.options);
+        if (!config.options.size && indiciaData.esSourceObjects[sourceId].settings.mapGridSquareSize) {
+          config.options.size = indiciaData.esSourceObjects[sourceId].settings.mapGridSquareSize;
+        }
         indiciaFns.findAndSetValue(config.options, 'size', $(el).idcLeafletMap('getAutoSquareSize'), 'autoGridSquareSize');
         // Apply metric to any options that are supposed to use it.
         $.each(config.options, function eachOption(key, value) {
@@ -667,9 +670,9 @@
       });
       // Are there aggregations to map?
       if (typeof response.aggregations !== 'undefined') {
-        if (sourceSettings.aggregationMapMode === 'geoHash') {
+        if (sourceSettings.mode === 'mapGeoHash') {
           mapGeoHashAggregation(el, response, sourceSettings);
-        } else if (sourceSettings.aggregationMapMode === 'gridSquare') {
+        } else if (sourceSettings.mode === 'mapGridSquare') {
           mapGridSquareAggregation(el, response, sourceSettings);
         }
       }

From 6825ab5377bf27c8a8fd206ee6c45aa5d32054f6 Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Tue, 5 May 2020 10:54:59 +0100
Subject: [PATCH 08/21] Support for filters on bucket sets in field paths

---
 js/indicia.datacomponents/idc.core.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/js/indicia.datacomponents/idc.core.js b/js/indicia.datacomponents/idc.core.js
index 983c94dc..7afe1f38 100644
--- a/js/indicia.datacomponents/idc.core.js
+++ b/js/indicia.datacomponents/idc.core.js
@@ -906,7 +906,19 @@
     var pathArray = path.split('.');
     var i;
     var thisPath = doc;
+    var filterInfo;
     for (i = 0; i < pathArray.length; i++) {
+      // Special case when the path element is [...] as this is a filter on an
+      // array of buckets.
+      filterInfo = pathArray[i].match(/^\[(.+)=(.+)\]$/);
+      if (filterInfo) {
+        $.each(thisPath, function(idx) {
+          if (this[filterInfo[1]] === filterInfo[2]) {
+            pathArray[i] = idx;
+            return false;
+          }
+        });
+      }
       if (typeof thisPath[pathArray[i]] === 'undefined') {
         thisPath = '';
         break;

From 4171ee5d7a52af1a1823dd9e926bd31b578e6f5f Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Tue, 5 May 2020 11:04:14 +0100
Subject: [PATCH 09/21] Remove buildTableXY/sourceTable options

Experimental features which are now better implemented using
termAggregation mode with sub-aggregations referred to in column field
paths.
---
 js/indicia.datacomponents/idc.esDataSource.js | 47 -------------------
 .../jquery.idc.dataGrid.js                    | 15 ++----
 2 files changed, 4 insertions(+), 58 deletions(-)

diff --git a/js/indicia.datacomponents/idc.esDataSource.js b/js/indicia.datacomponents/idc.esDataSource.js
index 8209c48d..f72b0aa0 100644
--- a/js/indicia.datacomponents/idc.esDataSource.js
+++ b/js/indicia.datacomponents/idc.esDataSource.js
@@ -182,8 +182,6 @@ var IdcEsDataSource;
         if (response.hits.total && indiciaData.esVersion === 6) {
           response.hits.total = { value: response.hits.total, relation: 'eq' };
         }
-        // Build any configured output tables.
-        this.buildTableXY(response);
         $.each(indiciaData.outputPluginClasses, function eachPluginClass(i, pluginClass) {
           $.each(source.outputs[pluginClass], function eachOutput() {
             if (!onlyForControl || onlyForControl === this) {
@@ -387,51 +385,6 @@ var IdcEsDataSource;
       }
     };
 
-    /**
-     * IdcEsDataSource function to tablify 2 tier aggregation responses.
-     *
-     * Use this method if there is an outer aggregation which corresponds to the
-     * table columns (X) and an inner aggregation which corresponds to the table
-     * rows (Y).
-     *
-     * @param object response
-     *   Response from an ES aggregation search request.
-     */
-    IdcEsDataSource.prototype.buildTableXY = function buildTableXY(response) {
-      var source = this;
-      if (source.settings.buildTableXY) {
-        $.each(source.settings.buildTableXY, function eachTable(name, aggs) {
-          var data = {};
-          var colsTemplate = {
-            key: ''
-          };
-          // Collect the list of columns
-          $.each(response.aggregations[aggs[0]].buckets, function eachOuterBucket() {
-            colsTemplate[this.key] = 0;
-          });
-          // Now for each column, collect the rows.
-          $.each(response.aggregations[aggs[0]].buckets, function eachOuterBucket() {
-            var thisCol = this.key;
-            var aggsPath = aggs[1].split(',');
-            var obj = this;
-            // Drill down the required level of nesting.
-            $.each(aggsPath, function eachPathLevel() {
-              obj = obj[this];
-            });
-            $.each(obj.buckets, function eachInnerBucket() {
-              if (typeof data[this.key] === 'undefined') {
-                data[this.key] = $.extend({}, colsTemplate);
-                data[this.key].key = this.key;
-              }
-              data[this.key][thisCol] = this.doc_count;
-            });
-          });
-          // Attach the data table to the response.
-          response[name] = data;
-        });
-      }
-    };
-
     // idcEsDataSource initialisation code.
     this.settings = providedSettings;
     // Does this datasource get a filter setting from a selected row in any grid(s)?
diff --git a/js/indicia.datacomponents/jquery.idc.dataGrid.js b/js/indicia.datacomponents/jquery.idc.dataGrid.js
index cbe9c3fd..4b95facd 100644
--- a/js/indicia.datacomponents/jquery.idc.dataGrid.js
+++ b/js/indicia.datacomponents/jquery.idc.dataGrid.js
@@ -520,7 +520,6 @@
      */
     indiciaFns.on('click', '#' + el.id + ' .data-grid-settings .save', {}, function onClick() {
       var header = $(el).find('thead');
-      var showingAggregation = el.settings.aggregation || el.settings.sourceTable;
       var colsList = [];
       $.each($(el).find('.data-grid-settings ol :checkbox:checked'), function eachCheckedCol() {
         colsList.push($(this).val());
@@ -536,7 +535,7 @@
         addColumnHeadings(el, header);
       }
       // Disable filter row for aggregations.
-      el.settings.includeFilterRow = el.settings.includeFilterRow && !showingAggregation;
+      el.settings.includeFilterRow = el.settings.includeFilterRow && !el.settings.aggregation;
       // Output header row for filtering.
       if (el.settings.includeFilterRow !== false) {
         addFilterRow(el, header);
@@ -655,10 +654,6 @@
     if (el.settings.sourceObject.settings.mode === 'termAggregation') {
       return indiciaFns.findValue(response.aggregations, 'buckets');
     }
-    if (el.settings.sourceTable) {
-      // A custom table built from an aggregation by the source.
-      return response[$(el)[0].settings.sourceTable];
-    }
     if (el.settings.aggregation && typeof response.aggregations !== 'undefined') {
       // A standard aggregation.
       return indiciaFns.findValue(response.aggregations, 'buckets');
@@ -881,7 +876,6 @@
       var el = this;
       var table;
       var totalCols;
-      var showingAggregation;
       var footableSort;
       var tableClasses = ['table', 'es-data-grid'];
       var savedCols;
@@ -919,20 +913,19 @@
       if (el.settings.columns.length === 0) {
         el.settings.columns = el.settings.defaultColumns.slice();
       }
-      showingAggregation = el.settings.aggregation || el.settings.sourceTable;
-      footableSort = showingAggregation && el.settings.sortable ? 'true' : 'false';
+      footableSort = el.settings.aggregation && el.settings.sortable ? 'true' : 'false';
       if (el.settings.scrollY) {
         tableClasses.push('fixed-header');
       }
       // Disable filter row for aggregations.
-      el.settings.includeFilterRow = el.settings.includeFilterRow && !showingAggregation;
+      el.settings.includeFilterRow = el.settings.includeFilterRow && !el.settings.aggregation;
       // Build the elements required for the table.
       table = $('<table class="' + tableClasses.join(' ') + '" data-sort="' + footableSort + '" />').appendTo(el);
       addHeader(el, table);
       // We always want a table body for the data.
       $('<tbody />').appendTo(table);
       // Output a footer if we want a pager.
-      if (el.settings.includePager && !(el.settings.sourceTable || el.settings.aggregation === 'simple')) {
+      if (el.settings.includePager && !(el.settings.aggregation === 'simple')) {
         totalCols = el.settings.columns.length
           + (el.settings.responsive ? 1 : 0)
           + (el.settings.actions.length > 0 ? 1 : 0);

From 36670eefc21142748d3a50b32552cc50722aea9d Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Tue, 5 May 2020 14:05:36 +0100
Subject: [PATCH 10/21] Bug fixes

---
 js/indicia.datacomponents/idc.core.js              | 2 +-
 js/indicia.datacomponents/idc.esDataSource.js      | 8 ++++----
 js/indicia.datacomponents/jquery.idc.dataGrid.js   | 4 ++--
 js/indicia.datacomponents/jquery.idc.esDownload.js | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/js/indicia.datacomponents/idc.core.js b/js/indicia.datacomponents/idc.core.js
index 7afe1f38..11ae43f9 100644
--- a/js/indicia.datacomponents/idc.core.js
+++ b/js/indicia.datacomponents/idc.core.js
@@ -963,7 +963,7 @@
     }
     // Path might be to an aggregation response object, in which case we just
     // want the value.
-    if (typeof valuePath === 'object' && typeof valuePath.value !== 'undefined') {
+    if (valuePath && typeof valuePath === 'object' && typeof valuePath.value !== 'undefined') {
       return valuePath.value;
     }
     return valuePath;
diff --git a/js/indicia.datacomponents/idc.esDataSource.js b/js/indicia.datacomponents/idc.esDataSource.js
index f72b0aa0..be3251d6 100644
--- a/js/indicia.datacomponents/idc.esDataSource.js
+++ b/js/indicia.datacomponents/idc.esDataSource.js
@@ -185,7 +185,7 @@ var IdcEsDataSource;
         $.each(indiciaData.outputPluginClasses, function eachPluginClass(i, pluginClass) {
           $.each(source.outputs[pluginClass], function eachOutput() {
             if (!onlyForControl || onlyForControl === this) {
-              $(this)[pluginClass]('populate', this.settings, response, request);
+              $(this)[pluginClass]('populate', source.settings, response, request);
               if (pluginClass === 'idcDataGrid' && source.settings.countAggregation) {
                 // For composite aggregations we may specify a separate
                 // aggregation to provide the count for grid pager.
@@ -309,8 +309,8 @@ var IdcEsDataSource;
       });
       // If datasource mode for mapping, use the map to limit the bounds retrieved.
       if (ds.settings.mode.match(/^map/) && !ds.settings.filterBoundsUsingMap) {
-        if (!ds.outputs.idcLeafletMap) {
-          throw new Error('Source using a mapping mode without a linked map.');
+        if (!ds.outputs.idcLeafletMap || ds.outputs.idcLeafletMap.length === 0) {
+          throw new Error('Source ' + ds.settings.id + ' using a mapping mode without a linked map.');
         }
         ds.settings.filterBoundsUsingMap = ds.outputs.idcLeafletMap[0].id;
       }
@@ -367,7 +367,7 @@ var IdcEsDataSource;
               var tabSelectFn = function eachTabSet() {
                 if ($(tab).filter(':visible').length > 0) {
                   $(output).find('.loading-spinner').show();
-                  doPopulation.call(this, force, onlyForControl);
+                  doPopulation.call(source, force, onlyForControl);
                   indiciaFns.unbindTabsActivate($(tab).closest('.ui-tabs'), tabSelectFn);
                 }
               };
diff --git a/js/indicia.datacomponents/jquery.idc.dataGrid.js b/js/indicia.datacomponents/jquery.idc.dataGrid.js
index 4b95facd..5ca0a948 100644
--- a/js/indicia.datacomponents/jquery.idc.dataGrid.js
+++ b/js/indicia.datacomponents/jquery.idc.dataGrid.js
@@ -224,7 +224,7 @@
   }
 
   function movePage(el, forward) {
-    var sourceSettings = indiciaData.sourceObject.settings;
+    var sourceSettings = el.settings.sourceObject.settings;
     if (el.settings.aggregation === 'composite') {
       el.settings.compositeInfo.page += (forward ? 1 : -1);
       // Composite aggregations use after_key to find next page.
@@ -246,7 +246,7 @@
       }
       sourceSettings.from = Math.max(0, sourceSettings.from);
     }
-    indiciaData.sourceObject.populate();
+    el.settings.sourceObject.populate();
   }
 
   /**
diff --git a/js/indicia.datacomponents/jquery.idc.esDownload.js b/js/indicia.datacomponents/jquery.idc.esDownload.js
index 2d7309e0..c0d6e2c6 100644
--- a/js/indicia.datacomponents/jquery.idc.esDownload.js
+++ b/js/indicia.datacomponents/jquery.idc.esDownload.js
@@ -141,14 +141,14 @@
     var gridSettings;
     if (settings.linkToDataGrid) {
       if ($('#' + settings.linkToDataGrid).length !== 1) {
-        throw new Error('Failed to find dataGrid ' + settings.linkToDataGrid + ' linked to download');
+        indiciaFns.controlFail(el, 'Failed to find dataGrid ' + settings.linkToDataGrid + ' linked to download');
       }
       // Refresh the columns according to those currently in the dataGrid.
       gridSettings = $('#' + settings.linkToDataGrid)[0].settings;
       settings.source = gridSettings.source;
       settings.columnsTemplate = '';
       settings.addColumns = [];
-      $.each(gridSettings.columns, function() {
+      $.each(gridSettings.columns, function eachCol() {
         settings.addColumns.push({
           caption: gridSettings.availableColumnInfo[this].caption,
           field: this

From bfd9af392219a397807ba81ea1e15ed70ed8b2c5 Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Thu, 7 May 2020 07:45:40 +0100
Subject: [PATCH 11/21] New compositeAggregation source mode

Automatically configures tabular data using composite aggregations.
---
 js/indicia.datacomponents/idc.core.js         | 13 ++++-
 js/indicia.datacomponents/idc.esDataSource.js | 51 +++++++++++++++++--
 .../jquery.idc.dataGrid.js                    | 48 +++++++++--------
 .../jquery.idc.esDownload.js                  | 23 ++++++---
 .../jquery.idc.templatedOutput.js             |  8 +--
 .../jquery.idc.verificationButtons.js         |  2 +-
 6 files changed, 109 insertions(+), 36 deletions(-)

diff --git a/js/indicia.datacomponents/idc.core.js b/js/indicia.datacomponents/idc.core.js
index 11ae43f9..7a2d5f98 100644
--- a/js/indicia.datacomponents/idc.core.js
+++ b/js/indicia.datacomponents/idc.core.js
@@ -40,6 +40,17 @@
     return this.replace(/#/g, '').split(':')[0];
   };
 
+  /**
+   * Convert an ES field to a name suitable for composite aggregation keys.
+   *
+   * When auto-generating a composite aggregation we want the name given to
+   * each field's key to have hyphens instead of full stops, so the names are
+   * not confused with paths in the document.
+   */
+  String.prototype.asCompositeKeyName = function simpleFieldName() {
+    return this.replace(/\./g, '-');
+  };
+
   /**
    * Keep track of a list of all the plugin instances that output something.
    */
@@ -912,7 +923,7 @@
       // array of buckets.
       filterInfo = pathArray[i].match(/^\[(.+)=(.+)\]$/);
       if (filterInfo) {
-        $.each(thisPath, function(idx) {
+        $.each(thisPath, function eachPathEntry(idx) {
           if (this[filterInfo[1]] === filterInfo[2]) {
             pathArray[i] = idx;
             return false;
diff --git a/js/indicia.datacomponents/idc.esDataSource.js b/js/indicia.datacomponents/idc.esDataSource.js
index be3251d6..04e41c2e 100644
--- a/js/indicia.datacomponents/idc.esDataSource.js
+++ b/js/indicia.datacomponents/idc.esDataSource.js
@@ -65,6 +65,52 @@ var IdcEsDataSource;
 
     /** Private methods for specific setup for each source mode. */
 
+    /**
+     * Auto-build the composite aggregation if this mode enabled.
+     */
+    modeSpecificSetupFns.initCompositeAggregation = function initCompositeAggregation() {
+      var subAggs = {};
+      var settings = this.settings;
+      var compositeSources = [];
+      settings.aggregationSize = settings.aggregationSize || settings.size || 10000;
+      settings.size = 0;
+      // Capture supplied aggregation so we can rebuild each time.
+      settings.suppliedAggregation = settings.suppliedAggregation || settings.aggregation;
+      // Include the unique field in the list of fields request even if not specified.
+      if ($.inArray(settings.uniqueField, settings.fields) === -1) {
+        settings.fields.push(settings.uniqueField);
+      }
+      // Convert the fields list to the sources format required for composite agg.
+      $.each(settings.fields, function eachField() {
+        var srcObj = {};
+        srcObj[this.asCompositeKeyName()] = { terms: { field: indiciaFns.esFieldWithKeywordSuffix(this) } };
+        compositeSources.push(srcObj);
+      });
+      // Add the additional aggs for the aggregations requested in config.
+      $.each(settings.suppliedAggregation, function eachAgg(name) {
+        subAggs[name] = this;
+      });
+      // @todo handle sort
+      settings.aggregation = {
+        rows: {
+          composite: {
+            size: settings.aggregationSize,
+            sources: compositeSources
+          },
+          aggs: subAggs
+        }
+      };
+      if (settings.uniqueField) {
+        settings.countAggregation = {
+          count: {
+            cardinality: {
+              field: indiciaFns.esFieldWithKeywordSuffix(settings.uniqueField)
+            }
+          }
+        };
+      }
+    };
+
     /**
      * Auto-build the term aggregation if this mode enabled.
      */
@@ -76,7 +122,7 @@ var IdcEsDataSource;
       var uniqueFieldWithSuffix = indiciaFns.esFieldWithKeywordSuffix(settings.uniqueField);
       var sortFieldWithoutSuffix;
       // Use the specified size to limit aggregation buckets, not docs.
-      settings.aggregationSize = settings.size || 10000;
+      settings.aggregationSize = settings.aggregationSize || settings.size || 10000;
       settings.size = 0;
       sort = getTermAggregationSortInfo(this.settings);
       // Capture supplied aggregation so we can rebuild each time.
@@ -294,7 +340,7 @@ var IdcEsDataSource;
       $.each(indiciaData.outputPluginClasses, function eachPluginClass() {
         ds.outputs[this] = [];
       });
-      // Make a collection of the output controls linked to this data ds.
+      // Make a collection of the output controls linked to this data source.
       $.each($('.idc-output'), function eachOutput() {
         var el = this;
         if (el.settings.source && Object.prototype.hasOwnProperty.call(el.settings.source, ds.settings.id)) {
@@ -402,5 +448,4 @@ var IdcEsDataSource;
     }
     return this;
   };
-
 }());
diff --git a/js/indicia.datacomponents/jquery.idc.dataGrid.js b/js/indicia.datacomponents/jquery.idc.dataGrid.js
index 5ca0a948..27c73e08 100644
--- a/js/indicia.datacomponents/jquery.idc.dataGrid.js
+++ b/js/indicia.datacomponents/jquery.idc.dataGrid.js
@@ -138,8 +138,7 @@
       var dataType = colDef.dataType || colDef['data-type'];
       sortableField = sortableField
         || indiciaData.fieldConvertorSortFields[this.simpleFieldName()]
-        || (el.settings.aggregation && el.settings.aggregation === 'composite')
-        || (el.settings.sourceObject.settings.mode === 'termAggregation');
+        || (el.settings.sourceObject.settings.aggregation);
       if (el.settings.sortable !== false && sortableField) {
         heading += '<span class="sort fas fa-sort"></span>';
       }
@@ -214,10 +213,14 @@
 
   function applySourceModeSettings(el) {
     var sourceSettings = el.settings.sourceObject.settings;
-    if (sourceSettings.mode === 'termAggregation') {
+    if (sourceSettings.mode.match(/Aggregation$/)) {
       $.each(el.settings.availableColumnInfo, function eachCol(field, colDef) {
         if ($.inArray(field, sourceSettings.fields) > -1) {
-          colDef.path = 'fieldlist.hits.hits.0._source';
+          if (sourceSettings.mode === 'termAggregation') {
+            colDef.path = 'fieldlist.hits.hits.0._source';
+          } else if (sourceSettings.mode === 'compositeAggregation') {
+            colDef.path = 'key';
+          }
         }
       });
     }
@@ -225,7 +228,7 @@
 
   function movePage(el, forward) {
     var sourceSettings = el.settings.sourceObject.settings;
-    if (el.settings.aggregation === 'composite') {
+    if (el.settings.sourceObject.settings.mode === 'compositeAggregation') {
       el.settings.compositeInfo.page += (forward ? 1 : -1);
       // Composite aggregations use after_key to find next page.
       if (el.settings.compositeInfo.pageAfterKeys[el.settings.compositeInfo.page]) {
@@ -302,7 +305,7 @@
       });
     } else {
       $.each(aggSources, function eachAggSource() {
-        if ($(this).prop(fieldName.replace(/^key\./, ''))) {
+        if ($(this).prop(fieldName.asCompositeKeyName())) {
           indiciaFns.findValue(this, 'terms').order = sortDesc ? 'desc' : 'asc';
           newAggSources.splice(0, 0, this);
         } else {
@@ -399,8 +402,8 @@
       var sortDesc = $(this).hasClass('fa-sort-up');
       var sourceObj = el.settings.sourceObject;
       showHeaderSortInfo(this, sortDesc);
-      el.settings.sourceObject.settings.sort = {};
-      if (el.settings.aggregation && el.settings.aggregation === 'composite') {
+      sourceObj.settings.sort = {};
+      if (sourceObj.settings.mode === 'compositeAggregation') {
         handleSortForCompositeAgg(sourceObj, fieldName, sortDesc);
       } else if (sourceObj.settings.mode === 'termAggregation') {
         handleSortForTermAggregation(sourceObj, fieldName, sortDesc);
@@ -535,7 +538,8 @@
         addColumnHeadings(el, header);
       }
       // Disable filter row for aggregations.
-      el.settings.includeFilterRow = el.settings.includeFilterRow && !el.settings.aggregation;
+      el.settings.includeFilterRow =
+        el.settings.includeFilterRow && !el.settings.sourceObject.settings.mode.match(/aggregation$/);
       // Output header row for filtering.
       if (el.settings.includeFilterRow !== false) {
         addFilterRow(el, header);
@@ -651,11 +655,8 @@
    * documents), the buckets of an aggregation, or a custom built source table.
    */
   function getSourceDataList(el, response) {
-    if (el.settings.sourceObject.settings.mode === 'termAggregation') {
-      return indiciaFns.findValue(response.aggregations, 'buckets');
-    }
-    if (el.settings.aggregation && typeof response.aggregations !== 'undefined') {
-      // A standard aggregation.
+    if (el.settings.sourceObject.settings.mode.match(/Aggregation$/)) {
+      // Aggregated data so use the buckets.
       return indiciaFns.findValue(response.aggregations, 'buckets');
     }
     // A standard list of records.
@@ -692,7 +693,7 @@
     var total;
     var pageSize = $(el).find('tbody tr').length;
     // Set up the count info in the footer.
-    if (el.settings.aggregation && el.settings.aggregation === 'composite') {
+    if (el.settings.sourceObject.settings.mode === 'compositeAggregation') {
       // Composite aggs use after_key for simple paging.
       if (afterKey) {
         el.settings.compositeInfo.pageAfterKeys[el.settings.compositeInfo.page + 1] = afterKey;
@@ -757,7 +758,11 @@
       // Extra space in last col to account for tool icons.
       var extraSpace = idx === el.settings.columns.length - 1 && !el.settings.actions.length ? 2 : 0;
       var charWidth;
-      value = indiciaFns.getValueForField(doc, this, colDef);
+      // In compositeAggregation mode, fields are replaced by key names. We replace
+      // . with - to avoid confusion when iterating down paths.
+      var field = sourceSettings.mode === 'compositeAggregation' && $.inArray(this, sourceSettings.fields) > -1
+        ? this.asCompositeKeyName() : this;
+      value = indiciaFns.getValueForField(doc, field, colDef);
       if (colDef.rangeField) {
         rangeValue = indiciaFns.getValueForField(doc, colDef.rangeField);
         if (value !== rangeValue) {
@@ -913,19 +918,20 @@
       if (el.settings.columns.length === 0) {
         el.settings.columns = el.settings.defaultColumns.slice();
       }
-      footableSort = el.settings.aggregation && el.settings.sortable ? 'true' : 'false';
+      footableSort = el.settings.sourceObject.settings.mode === 'compositeAggregation' && el.settings.sortable
+        ? 'true' : 'false';
       if (el.settings.scrollY) {
         tableClasses.push('fixed-header');
       }
       // Disable filter row for aggregations.
-      el.settings.includeFilterRow = el.settings.includeFilterRow && !el.settings.aggregation;
+      el.settings.includeFilterRow = el.settings.includeFilterRow && !el.settings.sourceObject.settings.mode.match(/Aggregation$/);
       // Build the elements required for the table.
       table = $('<table class="' + tableClasses.join(' ') + '" data-sort="' + footableSort + '" />').appendTo(el);
       addHeader(el, table);
       // We always want a table body for the data.
       $('<tbody />').appendTo(table);
       // Output a footer if we want a pager.
-      if (el.settings.includePager && !(el.settings.aggregation === 'simple')) {
+      if (el.settings.includePager) {
         totalCols = el.settings.columns.length
           + (el.settings.responsive ? 1 : 0)
           + (el.settings.actions.length > 0 ? 1 : 0);
@@ -978,7 +984,7 @@
       var maxCharsPerCol = {};
       var afterKey = indiciaFns.findValue(response, 'after_key');
       applySourceModeSettings(el);
-      if (el.settings.aggregation === 'composite' && !afterKey && el.settings.compositeInfo.page > 0) {
+      if (sourceSettings.mode === 'compositeAggregation' && !afterKey && el.settings.compositeInfo.page > 0) {
         // Moved past last page, so abort.
         $(el).find('.next').prop('disabled', true);
         el.settings.compositeInfo.page--;
@@ -1044,7 +1050,7 @@
       if (el.settings.responsive) {
         $(el).find('table').trigger('footable_redraw');
       }
-      if (!el.settings.aggregation) {
+      if (el.settings.sourceObject.settings.mode === 'docs') {
         el.settings.totalRowCount = response.hits.total.value;
       }
       drawTableFooter(el, response, data, afterKey);
diff --git a/js/indicia.datacomponents/jquery.idc.esDownload.js b/js/indicia.datacomponents/jquery.idc.esDownload.js
index c0d6e2c6..7f54e950 100644
--- a/js/indicia.datacomponents/jquery.idc.esDownload.js
+++ b/js/indicia.datacomponents/jquery.idc.esDownload.js
@@ -95,8 +95,8 @@
    */
   function getColumnSettings(el) {
     var data = {};
-    var source = indiciaData.esSourceObjects[el.settings.sourceId];
     var agg;
+    var sourceSettings = el.settings.sourceObject.settings;
     // Note, columnsTemplate can be blank.
     if (typeof el.settings.columnsTemplate !== 'undefined') {
       data.columnsTemplate = el.settings.columnsTemplate;
@@ -107,7 +107,7 @@
       data.addColumns = el.settings.addColumns;
     } else if (el.settings.aggregation && el.settings.aggregation === 'composite' && data.columnsTemplate === '') {
       // Find the first aggregation defined for this source.
-      agg = source.settings.aggregation[Object.keys(source.settings.aggregation)[0]];
+      agg = sourceSettings.aggregation[Object.keys(sourceSettings.aggregation)[0]];
       data.addColumns = [];
       // The agg should contain sources (which are the columns aggregated on).
       $.each(agg.composite.sources, function eachSource() {
@@ -156,7 +156,18 @@
       });
     }
     // Only allow a single source for download, so simplify the sources.
-    settings.sourceId = Object.keys(settings.source)[0];
+    settings.sourceObject = indiciaData.esSourceObjects[Object.keys(settings.source)[0]];
+    if (!settings.columnsTemplate && !settings.addColumns && !settings.removeColumns) {
+      settings.columnsTemplate = '';
+      settings.addColumns = [];
+      // No column specification given, so use the source to work this out.
+      $.each(settings.sourceObject.settings.fields, function eachField() {
+        settings.addColumns.push({
+          caption: this,
+          field: this
+        });
+      });
+    }
   }
 
   /**
@@ -178,7 +189,7 @@
       query += '&scroll_id=' + lastResponse.scroll_id;
     } else if (el.settings.aggregation && el.settings.aggregation === 'composite') {
       // Paging composite aggregations requires the full search query.
-      data = indiciaFns.getFormQueryData(indiciaData.esSourceObjects[el.settings.sourceId]);
+      data = indiciaFns.getFormQueryData(el.settings.sourceObject);
       // Inform the warehouse as composite paging behaviour different. The
       // uniq_id allows the warehouse to relocate the last request's after_key.
       query += '&aggregation_type=composite';
@@ -228,19 +239,17 @@
      */
     $(el).find('.do-download').click(function doDownload() {
       var data;
-      var source;
       var sep = indiciaData.esProxyAjaxUrl.match(/\?/) ? '&' : '?';
       var query = sep + 'state=initial';
       var columnSettings;
       initSource(el);
-      source = indiciaData.esSourceObjects[el.settings.sourceId];
       columnSettings = getColumnSettings(el);
       $(el).find('.progress-circle-container').removeClass('download-done');
       $(el).find('.progress-circle-container').show();
       done = false;
       $(el).find('.circle').attr('style', 'stroke-dashoffset: 503px');
       $(el).find('.progress-text').text('Loading...');
-      data = indiciaFns.getFormQueryData(source);
+      data = indiciaFns.getFormQueryData(el.settings.sourceObject);
       if (el.settings.aggregation && el.settings.aggregation === 'composite') {
         query += '&aggregation_type=composite';
       }
diff --git a/js/indicia.datacomponents/jquery.idc.templatedOutput.js b/js/indicia.datacomponents/jquery.idc.templatedOutput.js
index 47a52a41..3bba2e54 100644
--- a/js/indicia.datacomponents/jquery.idc.templatedOutput.js
+++ b/js/indicia.datacomponents/jquery.idc.templatedOutput.js
@@ -78,6 +78,7 @@
       var tokenRegex = /{{ ([a-z_\.]+) }}/g;
       var tokens = [];
       var matches;
+      var rows = [];
       while (matches = tokenRegex.exec(el.settings.content)) {
         tokens.push(matches[1]);
       }
@@ -90,15 +91,16 @@
       }
 
       $.each(outputRows, function eachRow() {
-        var outputContent = el.settings.content;
+        var rowContent = el.settings.content;
         var rowData = this;
         var value;
         $.each(tokens, function eachToken() {
           value = indiciaFns.getValueForField(rowData, this);
-          outputContent = outputContent.replace('{{ ' + this + ' }}', value);
+          rowContent = rowContent.replace('{{ ' + this + ' }}', value);
         });
-        $(outputContent).appendTo(el);
+        rows.push(rowContent);
       });
+      $(el).html(rows.join(''));
       if (el.settings.footer) {
         $('<div class="idcTemplatedOutput-footer">' + el.settings.footer + '</div>').appendTo(el);
       }
diff --git a/js/indicia.datacomponents/jquery.idc.verificationButtons.js b/js/indicia.datacomponents/jquery.idc.verificationButtons.js
index e076f126..9c32f08d 100644
--- a/js/indicia.datacomponents/jquery.idc.verificationButtons.js
+++ b/js/indicia.datacomponents/jquery.idc.verificationButtons.js
@@ -545,7 +545,7 @@
     var popup = $(e.currentTarget).closest('.query-popup');
     var occurrenceId = $(popup).attr('data-id');
     var sampleId = $(popup).attr('data-sample-id');
-    var urlSep = indiciaData.ajaxUrl.indexOf('?') === -1 ? '?' : '&';
+    var urlSep = indiciaData.esProxyAjaxUrl.indexOf('?') === -1 ? '?' : '&';
     // Setup the quick reply page link and get an authorisation number.
     // Note: The quick reply page does actually support supplying a user_id parameter to it, however we don't do that in practice here as
     // we don't actually know if the user has an account (we would also have to collect the user_id for the entered email)

From 49969ef9642266857465ef9617c7259adba2689b Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Thu, 7 May 2020 12:40:40 +0100
Subject: [PATCH 12/21] Support for counts in new aggregation modes

Also compositeAggregation mode sorting.
---
 js/indicia.datacomponents/idc.core.js         |  16 +-
 js/indicia.datacomponents/idc.esDataSource.js | 181 +++++++++---------
 .../jquery.idc.dataGrid.js                    | 148 +++++---------
 3 files changed, 140 insertions(+), 205 deletions(-)

diff --git a/js/indicia.datacomponents/idc.core.js b/js/indicia.datacomponents/idc.core.js
index 7a2d5f98..6ac23c18 100644
--- a/js/indicia.datacomponents/idc.core.js
+++ b/js/indicia.datacomponents/idc.core.js
@@ -1092,8 +1092,8 @@
    *   The source object.
    * @param bool doingCount
    *   Set to true if getting query data for a request intended to count a
-   *   dataset rather than retrieve data. Disables from, sort options and
-   *   uses the countAggregation if specified.
+   *   dataset rather than retrieve data. Disables from and sort options,
+   *   allowing unnecessary recounts to be avoided.
    */
   indiciaFns.getFormQueryData = function getFormQueryData(source, doingCount) {
     var data = {
@@ -1205,15 +1205,13 @@
       }
     }
     if (source.settings.aggregation) {
-      // Copy to avoid changing original. Use count aggregation where a
-      // separate agg needed to count against.
-      if (doingCount && source.settings.countAggregation) {
-        $.extend(true, agg, source.settings.countAggregation);
-      } else {
-        $.extend(true, agg, source.settings.aggregation);
+      // Copy to avoid changing original.
+      $.extend(true, agg, source.settings.aggregation);
+      if (doingCount && source.settings.mode === 'termAggregation' && agg.idfield) {
+        delete agg.idfield.terms.order;
       }
       // Find the map bounds if limited to the viewport of a map and not counting total.
-      if (source.settings.filterBoundsUsingMap && !doingCount) {
+      if (!doingCount && source.settings.filterBoundsUsingMap) {
         mapToFilterTo = $('#' + source.settings.filterBoundsUsingMap);
         if (mapToFilterTo.length === 0 || !mapToFilterTo[0].map) {
           alert('Data source incorrectly configured. @filterBoundsUsingMap does not point to a valid map.');
diff --git a/js/indicia.datacomponents/idc.esDataSource.js b/js/indicia.datacomponents/idc.esDataSource.js
index 04e41c2e..8dc25de4 100644
--- a/js/indicia.datacomponents/idc.esDataSource.js
+++ b/js/indicia.datacomponents/idc.esDataSource.js
@@ -49,20 +49,49 @@ var IdcEsDataSource;
     var modeSpecificSetupFns = {};
 
     /**
-     * Finds the sort field and direction from the source config.
+     * Converts sort info in settings into a list of actual field/direction pairs.
      *
-     * For termAggregation mode. Sets default to the unique field if not set.
+     * Expands special fields into their constituent field list to sort on.
      */
-    function getTermAggregationSortInfo(settings) {
-      // Find the sort field and direction from the source config. Only single
-      // supported in termAggregation mode at present. Doc_count is a special
-      // value that sorts by _count.
-      return {
-        field: Object.keys(settings.sort)[0] === 'doc_count' ? '_count' : Object.keys(settings.sort)[0],
-        dir: settings.sort[Object.keys(settings.sort)[0]]
-      };
+    function expandSpecialFieldSortInfo(settings) {
+      var sortInfo = {};
+      $.each(settings.sort, function eachSortField(field, dir) {
+        if (indiciaData.fieldConvertorSortFields[field] && $.isArray(indiciaData.fieldConvertorSortFields[field])) {
+          $.each(indiciaData.fieldConvertorSortFields[field], function eachUnderlyingField() {
+            sortInfo[this] = dir;
+          });
+        } else {
+          // For consistency, don't want keyword version of field, we'll add
+          // it in when required.
+          sortInfo[field.replace(/\.keyword$/, '')] = dir;
+        }
+      });
+      return sortInfo;
+    }
+
+    /**
+     * Some generic preparation for modes that aggregate data.
+     */
+    function prepareAggregationMode() {
+      var settings = this.settings;
+      var countingRequest;
+      // Include the unique field in the list of fields request even if not specified.
+      if ($.inArray(settings.uniqueField, settings.fields) === -1) {
+        settings.fields.unshift(settings.uniqueField);
+      }
+      // Output aggregated, so size applies to agg not the docs list.
+      settings.aggregationSize = settings.aggregationSize || settings.size || 10000;
+      settings.size = 0;
+      // Capture supplied aggregation so we can rebuild each time.
+      settings.suppliedAggregation = settings.suppliedAggregation || settings.aggregation;
+      settings.aggregation = settings.suppliedAggregation;
+      // Work out if the request required to count the data has changed.
+      countingRequest = indiciaFns.getFormQueryData(this, true);
+      settings.needsRecount = JSON.stringify(countingRequest) !== lastCountRequestStr;
+      lastCountRequestStr = JSON.stringify(countingRequest);
     }
 
+
     /** Private methods for specific setup for each source mode. */
 
     /**
@@ -70,27 +99,39 @@ var IdcEsDataSource;
      */
     modeSpecificSetupFns.initCompositeAggregation = function initCompositeAggregation() {
       var subAggs = {};
+      var sortInfo = expandSpecialFieldSortInfo(this.settings);
       var settings = this.settings;
       var compositeSources = [];
-      settings.aggregationSize = settings.aggregationSize || settings.size || 10000;
-      settings.size = 0;
+      var uniqueFieldWithSuffix = indiciaFns.esFieldWithKeywordSuffix(settings.uniqueField);
+      prepareAggregationMode.call(this);
       // Capture supplied aggregation so we can rebuild each time.
       settings.suppliedAggregation = settings.suppliedAggregation || settings.aggregation;
-      // Include the unique field in the list of fields request even if not specified.
-      if ($.inArray(settings.uniqueField, settings.fields) === -1) {
-        settings.fields.push(settings.uniqueField);
-      }
       // Convert the fields list to the sources format required for composite agg.
+      // Sorted fields must go first.
+      $.each(sortInfo, function eachSortField(field, dir) {
+        var srcObj = {};
+        if ($.inArray(field, settings.fields) > -1) {
+          srcObj[field.asCompositeKeyName()] = { terms: {
+            field: indiciaFns.esFieldWithKeywordSuffix(field),
+            order: dir
+          } };
+          compositeSources.push(srcObj);
+        }
+      });
       $.each(settings.fields, function eachField() {
         var srcObj = {};
-        srcObj[this.asCompositeKeyName()] = { terms: { field: indiciaFns.esFieldWithKeywordSuffix(this) } };
-        compositeSources.push(srcObj);
+        // Only the ones we haven't already added to sort on.
+        if ($.inArray(this, Object.keys(sortInfo)) === -1) {
+          srcObj[this.asCompositeKeyName()] = { terms: { field: indiciaFns.esFieldWithKeywordSuffix(this) } };
+          compositeSources.push(srcObj);
+        }
       });
       // Add the additional aggs for the aggregations requested in config.
       $.each(settings.suppliedAggregation, function eachAgg(name) {
         subAggs[name] = this;
       });
       // @todo handle sort
+      // @todo optimise - only recount if filter changed.
       settings.aggregation = {
         rows: {
           composite: {
@@ -100,12 +141,11 @@ var IdcEsDataSource;
           aggs: subAggs
         }
       };
-      if (settings.uniqueField) {
-        settings.countAggregation = {
-          count: {
-            cardinality: {
-              field: indiciaFns.esFieldWithKeywordSuffix(settings.uniqueField)
-            }
+      // Add a count agg only if filter changed.
+      if (this.settings.needsRecount) {
+        settings.aggregation.count = {
+          cardinality: {
+            field: uniqueFieldWithSuffix
           }
         };
       }
@@ -116,17 +156,13 @@ var IdcEsDataSource;
      */
     modeSpecificSetupFns.initTermAggregation = function initTermAggregation() {
       var subAggs;
-      var sort;
-      var orderBy;
+      var sortInfo = expandSpecialFieldSortInfo(this.settings);
+      // Term aggregation sorts by single field only.
+      var sortField = Object.keys(sortInfo)[0];
+      var sortDir = sortInfo[sortField];
       var settings = this.settings;
       var uniqueFieldWithSuffix = indiciaFns.esFieldWithKeywordSuffix(settings.uniqueField);
-      var sortFieldWithoutSuffix;
-      // Use the specified size to limit aggregation buckets, not docs.
-      settings.aggregationSize = settings.aggregationSize || settings.size || 10000;
-      settings.size = 0;
-      sort = getTermAggregationSortInfo(this.settings);
-      // Capture supplied aggregation so we can rebuild each time.
-      settings.suppliedAggregation = settings.suppliedAggregation || settings.aggregation;
+      prepareAggregationMode.call(this);
       // List of sub-aggregations within the outer terms agg for the unique field must
       // always contain a top_hits agg to retrieve field values.
       subAggs = {
@@ -142,39 +178,35 @@ var IdcEsDataSource;
       // Add the additional aggs for the aggregations requested in config.
       $.each(settings.suppliedAggregation, function eachAgg(name) {
         subAggs[name] = this;
-        if (name === sort.field && settings.sortAggregation &&
-            settings.sortAggregation[sort.field]) {
+        if (name === sortField && settings.sortAggregation &&
+            settings.sortAggregation[sortField]) {
           // Aggregation has a different aggregation to simplify the sort
           // e.g. where agg is costly.
-          sort.field = 'orderby_' + name;
-          subAggs[sort.field] = settings.sortAggregation[name];
+          sortField = 'orderby_' + name;
+          subAggs[sortField] = settings.sortAggregation[name];
         }
       });
-      // Include the unique field in the list of fields request even if not specified.
-      if ($.inArray(settings.uniqueField, settings.fields) === -1) {
-        settings.fields.push(settings.uniqueField);
-      }
-      sortFieldWithoutSuffix = sort.field.replace(/\.keyword$/, '');
-      if ($.inArray(sortFieldWithoutSuffix, settings.fields) > -1) {
+      if ($.inArray(sortField, settings.fields) > -1) {
         // Sorting by a standard field.
-        if (sortFieldWithoutSuffix === settings.uniqueField) {
+        if (sortField === settings.uniqueField) {
           // Using the outer agg to sort, so simple use of _key.
-          orderBy = '_key';
+          sortField = '_key';
         } else {
           // Using another field to sort, so add an aggregation to get a single
           // bucket value which we can sort on.
           subAggs.sortfield = {
             max: {
-              field: sort.field
+              field: indiciaFns.esFieldWithKeywordSuffix(sortField)
             }
           };
-          orderBy = 'sortfield';
+          sortField = 'sortfield';
         }
       } else {
-        // Sorting by a named aggregation.
-        orderBy = sort.field;
+        // Sorting by a named aggregation. Special case - sort by _count not doc_count.
+        sortField = sortField === 'doc_count' ? '_count' : sortField;
       }
       // Create the final aggregation object for the request.
+      // @todo optimise - only recount if filter changed.
       settings.aggregation = {
         idfield: {
           terms: {
@@ -185,14 +217,17 @@ var IdcEsDataSource;
             }
           },
           aggs: subAggs
-        },
-        count: {
+        }
+      };
+      settings.aggregation.idfield.terms.order[sortField] = sortDir;
+      // Add a count agg only if filter changed.
+      if (this.settings.needsRecount) {
+        settings.aggregation.count = {
           cardinality: {
             field: uniqueFieldWithSuffix
           }
-        }
-      };
-      settings.aggregation.idfield.terms.order[orderBy] = sort.dir;
+        };
+      }
     };
 
     /** Private methods **/
@@ -216,9 +251,6 @@ var IdcEsDataSource;
      * AJAX success handler for the population call.
      */
     function handlePopulationResponse(url, request, response, force, onlyForControl) {
-      var countAggregateControls = [];
-      var countRequest;
-      var pageSize;
       var source = this;
       if (response.error || (response.code && response.code !== 200)) {
         hideAllSpinners.call(this);
@@ -232,44 +264,9 @@ var IdcEsDataSource;
           $.each(source.outputs[pluginClass], function eachOutput() {
             if (!onlyForControl || onlyForControl === this) {
               $(this)[pluginClass]('populate', source.settings, response, request);
-              if (pluginClass === 'idcDataGrid' && source.settings.countAggregation) {
-                // For composite aggregations we may specify a separate
-                // aggregation to provide the count for grid pager.
-                countAggregateControls.push(this);
-              }
             }
           });
         });
-        if (countAggregateControls.length > 0) {
-          // Separate aggregation to get total record count, e.g. where
-          // composite aggregation doesn't return total hit count.
-          countRequest = indiciaFns.getFormQueryData(source, true);
-          pageSize = indiciaFns.findValue(source.settings.aggregation, 'composite').size;
-          // Only need to count on initial population or when filter changes.
-          if (countRequest && (JSON.stringify(countRequest) !== lastCountRequestStr || force)) {
-            lastCountRequestStr = JSON.stringify(countRequest);
-            $.ajax({
-              url: url,
-              type: 'post',
-              data: countRequest,
-              success: function countSuccess(countResponse) {
-                // Update the grid pager data.
-                $.each(countAggregateControls, function eachGrid() {
-                  var grid = this;
-                  $.each(countResponse.aggregations, function eachAgg() {
-                    $(grid).idcDataGrid('updatePagerForCountAgg', pageSize, this.value);
-                  });
-                });
-              }
-            });
-          } else {
-            $.each(countAggregateControls, function eachGrid() {
-              // Update the grid pager data. Use the old count but new page
-              // location info.
-              $(this).idcDataGrid('updatePagerForCountAgg', pageSize);
-            });
-          }
-        }
         hideAllSpinners.call(source);
       }
     }
diff --git a/js/indicia.datacomponents/jquery.idc.dataGrid.js b/js/indicia.datacomponents/jquery.idc.dataGrid.js
index 27c73e08..c2455ceb 100644
--- a/js/indicia.datacomponents/jquery.idc.dataGrid.js
+++ b/js/indicia.datacomponents/jquery.idc.dataGrid.js
@@ -72,6 +72,11 @@
     totalRowCount: null
   };
 
+  /**
+   * Somewhere to keep the count if not bothering to
+   */
+  var lastCount;
+
   /**
    * Removes the configuration overlay pane.
    */
@@ -138,7 +143,9 @@
       var dataType = colDef.dataType || colDef['data-type'];
       sortableField = sortableField
         || indiciaData.fieldConvertorSortFields[this.simpleFieldName()]
-        || (el.settings.sourceObject.settings.aggregation);
+        // Composite aggregation mode disables sort on aggregation columns. Assume
+        // other aggregation modes allow sort (hopefully).
+        || (el.settings.sourceObject.settings.aggregation && el.settings.sourceObject.settings.mode !== 'compositeAggregation');
       if (el.settings.sortable !== false && sortableField) {
         heading += '<span class="sort fas fa-sort"></span>';
       }
@@ -279,59 +286,6 @@
     $(sortButton).addClass('fa-sort-' + (sortDesc ? 'down' : 'up'));
   }
 
-  /**
-   * Apply changes to a source when sorting for a composite aggregation.
-   */
-  function handleSortForCompositeAgg(source, fieldName, sortDesc) {
-    var aggSources;
-    var newAggSources = [];
-    var sortFields;
-    if (source.settings.originalCompositeSources) {
-      aggSources = $.extend({}, source.settings.originalCompositeSources);
-    } else {
-      aggSources = $.extend({}, indiciaFns.findValue(source.settings.aggregation, 'composite').sources);
-      source.settings.originalCompositeSources = $.extend({}, aggSources);
-    }
-    if (indiciaData.fieldConvertorSortFields[fieldName] && $.isArray(indiciaData.fieldConvertorSortFields[fieldName])) {
-      sortFields = indiciaData.fieldConvertorSortFields[fieldName];
-      $.each(aggSources, function eachAggSource() {
-        var pos = $.inArray(indiciaFns.findValue(this, 'field'), sortFields);
-        if (pos === -1) {
-          newAggSources.push(this);
-        } else {
-          indiciaFns.findValue(this, 'terms').order = sortDesc ? 'desc' : 'asc';
-          newAggSources.splice(pos, 0, this);
-        }
-      });
-    } else {
-      $.each(aggSources, function eachAggSource() {
-        if ($(this).prop(fieldName.asCompositeKeyName())) {
-          indiciaFns.findValue(this, 'terms').order = sortDesc ? 'desc' : 'asc';
-          newAggSources.splice(0, 0, this);
-        } else {
-          newAggSources.push(this);
-        }
-      });
-    }
-    indiciaFns.findValue(source.settings.aggregation, 'composite').sources = newAggSources;
-  }
-
-  /**
-   * Apply changes to a source when sorting in a term aggregation table.
-   */
-  function handleSortForTermAggregation(source, fieldName, sortDesc) {
-    var sortFieldName;
-    if (indiciaData.fieldConvertorSortFields[fieldName] && $.isArray(indiciaData.fieldConvertorSortFields[fieldName])) {
-      // The terms we aggregate on can be special fields with underlying
-      // mappings, but we only support sort by the first field not nested
-      // sort.
-      sortFieldName = indiciaData.fieldConvertorSortFields[fieldName][0];
-    } else {
-      sortFieldName = fieldName;
-    }
-    source.settings.sort[sortFieldName] = sortDesc ? 'desc' : 'asc';
-  }
-
   /**
    * Apply changes to a source when sorting on a special field column.
    */
@@ -398,22 +352,17 @@
      * Sort column headers click handler.
      */
     indiciaFns.on('click', '#' + el.id + ' .sort', {}, function clickSort() {
-      var fieldName = $(this).closest('th').attr('data-field').simpleFieldName();
+      var fieldName = $(this).closest('th').attr('data-field');
       var sortDesc = $(this).hasClass('fa-sort-up');
       var sourceObj = el.settings.sourceObject;
       showHeaderSortInfo(this, sortDesc);
       sourceObj.settings.sort = {};
-      if (sourceObj.settings.mode === 'compositeAggregation') {
-        handleSortForCompositeAgg(sourceObj, fieldName, sortDesc);
-      } else if (sourceObj.settings.mode === 'termAggregation') {
-        handleSortForTermAggregation(sourceObj, fieldName, sortDesc);
-      } else if (indiciaData.esMappings[fieldName]) {
-        sourceObj.settings.sort[indiciaData.esMappings[fieldName].sort_field] = {
-          order: sortDesc ? 'desc' : 'asc'
-        };
+      sourceObj.settings.sort[fieldName] = sortDesc ? 'desc' : 'asc';
+      /*
+
       } else if (indiciaData.fieldConvertorSortFields[fieldName]) {
         handleSortForSpecialField(sourceObj, fieldName, sortDesc);
-      }
+      }*/
       sourceObj.populate();
     });
 
@@ -687,42 +636,50 @@
    *   Data sent in request.
    */
   function drawTableFooter(el, response, data, afterKey) {
-    var fromRowIndex = typeof data.from === 'undefined' ? 1 : (data.from + 1);
+    var fromRowIndex;
     var ofLabel = '';
     var toLabel;
-    var total;
     var pageSize = $(el).find('tbody tr').length;
+    var sourceSettings = el.settings.sourceObject.settings;
+    var total;
+    if (sourceSettings.mode === 'docs') {
+      total = response.hits.total.value;
+    } else if (response.aggregations.count) {
+      // Aggregation modes use a separate agg to count only when the filter changes.
+      total = response.aggregations.count.value;
+      lastCount = total;
+    } else if (lastCount) {
+      total = lastCount;
+    }
     // Set up the count info in the footer.
-    if (el.settings.sourceObject.settings.mode === 'compositeAggregation') {
+    if (sourceSettings.mode === 'compositeAggregation') {
       // Composite aggs use after_key for simple paging.
       if (afterKey) {
         el.settings.compositeInfo.pageAfterKeys[el.settings.compositeInfo.page + 1] = afterKey;
       }
       $(el).find('.pager-row .next').prop('disabled', !afterKey);
       $(el).find('.pager-row .prev').prop('disabled', el.settings.compositeInfo.page === 0);
+      fromRowIndex = (el.settings.compositeInfo.page * sourceSettings.aggregationSize) + 1;
+    } else if (sourceSettings.mode === 'termAggregation') {
+      // Can't page through a standard terms aggregation.
+      $(el).find('.pager-row .buttons').hide();
+      fromRowIndex = 1;
     } else {
-      if (el.settings.sourceObject.settings.mode === 'termAggregation') {
-        // The count agg is always added in this mode.
-        total = response.aggregations.count.value;
-        // Can't page through a standard aggregation.
-        $(el).find('.pager-row .buttons').hide();
-      } else {
-        total = response.hits.total.value;
-        // Enable or disable the paging buttons.
-        $(el).find('.pager-row .prev').prop('disabled', fromRowIndex <= 1);
-        $(el).find('.pager-row .next').prop('disabled', fromRowIndex + response.hits.hits.length >= response.hits.total.value);
-      }
-      // Output text describing loaded hits.
-      if (pageSize > 0) {
-        if (fromRowIndex === 1 && pageSize === total) {
-          $(el).find('tfoot .showing').html('Showing all ' + total + ' hits');
-        } else {
-          toLabel = fromRowIndex === 1 ? 'first ' : fromRowIndex + ' to ';
-          $(el).find('tfoot .showing').html('Showing ' + toLabel + (fromRowIndex + (pageSize - 1)) + ' of ' + ofLabel + total);
-        }
+      fromRowIndex = typeof data.from === 'undefined' ? 1 : (data.from + 1);
+      // Enable or disable the paging buttons.
+      $(el).find('.pager-row .prev').prop('disabled', fromRowIndex <= 1);
+      $(el).find('.pager-row .next').prop('disabled', fromRowIndex + response.hits.hits.length >= response.hits.total.value);
+    }
+    // Output text describing loaded hits.
+    if (pageSize > 0) {
+      if (fromRowIndex === 1 && pageSize === total) {
+        $(el).find('tfoot .showing').html('Showing all ' + total + ' hits');
       } else {
-        $(el).find('tfoot .showing').html('No hits');
+        toLabel = fromRowIndex === 1 ? 'first ' : fromRowIndex + ' to ';
+        $(el).find('tfoot .showing').html('Showing ' + toLabel + (fromRowIndex + (pageSize - 1)) + ' of ' + ofLabel + total);
       }
+    } else {
+      $(el).find('tfoot .showing').html('No hits');
     }
   }
 
@@ -1058,23 +1015,6 @@
       setColWidths(el, maxCharsPerCol);
     },
 
-    /**
-     * Special handling for pager information when using countAggregation.
-     *
-     * @param int count
-     *   Optional new total row count.
-     */
-    updatePagerForCountAgg: function updatePagerForCountAgg(pageSize, count) {
-      var pageInfo = this.settings.compositeInfo;
-      // Optionally update the total count.
-      if (count) {
-        this.totalRowCount = count;
-      }
-      $(this).find('tfoot .showing').html('Showing ' + (pageInfo.page * pageSize + 1) +
-          ' to ' + Math.min(this.totalRowCount, (pageInfo.page + 1) * pageSize) +
-          ' of ' + this.totalRowCount);
-    },
-
     /**
      * Register an event handler.
      * @param string event

From b50d969c199d2c927dfbfda5d8777c56de9e27fa Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Thu, 7 May 2020 15:20:25 +0100
Subject: [PATCH 13/21] Various fixes around columns/sort behaviour.

---
 js/indicia.datacomponents/idc.core.js         | 37 +++++++-
 js/indicia.datacomponents/idc.esDataSource.js | 25 +-----
 .../jquery.idc.dataGrid.js                    | 84 +++++++++++++------
 3 files changed, 94 insertions(+), 52 deletions(-)

diff --git a/js/indicia.datacomponents/idc.core.js b/js/indicia.datacomponents/idc.core.js
index 6ac23c18..9f90e793 100644
--- a/js/indicia.datacomponents/idc.core.js
+++ b/js/indicia.datacomponents/idc.core.js
@@ -486,6 +486,33 @@
     return value;
   };
 
+  /**
+   * Converts sort info in settings into a list of actual field/direction pairs.
+   *
+   * Expands special fields into their constituent field list to sort on.
+   */
+  indiciaFns.expandSpecialFieldSortInfo = function expandSpecialFieldSortInfo(sort, withKeyword) {
+    var sortInfo = {};
+    $.each(sort, function eachSortField(field, dir) {
+      if (indiciaData.fieldConvertorSortFields[field.simpleFieldName()] &&
+          $.isArray(indiciaData.fieldConvertorSortFields[field.simpleFieldName()])) {
+        $.each(indiciaData.fieldConvertorSortFields[field.simpleFieldName()], function eachUnderlyingField() {
+          sortInfo[this] = dir;
+        });
+      } else if (indiciaData.fieldConvertorSortFields[field.simpleFieldName()]) {
+        sortInfo = indiciaData.fieldConvertorSortFields[field.simpleFieldName()];
+      } else if (withKeyword) {
+        // Normal field with keyword ready to send to ES.
+        sortInfo[indiciaFns.esFieldWithKeywordSuffix(field)] = dir;
+      } else {
+        // If just getting sort info, not sending to ES, then easier without keyword
+        // for comparison with field names.
+        sortInfo[field.replace(/\.keyword$/, '')] = dir;
+      }
+    });
+    return sortInfo;
+  };
+
   /**
    * A list of functions which provide HTML generation for special fields.
    *
@@ -855,6 +882,10 @@
     lat_lon: function latLon(text) {
       var coords = text.split(/[, ]/);
       var query;
+      if (coords.length !== 2) {
+        // Invalid format.
+        return false;
+      }
       coords[0] = coords[0].match(/S$/) ? 0 - coords[0].replace(/S$/, '') : parseFloat(coords[0].replace(/[^\d\.]$/, ''))
       coords[1] = coords[1].match(/W$/) ? 0 - coords[1].replace(/[^\d\.]$/, '') : parseFloat(coords[1].replace(/[^\d\.]$/, ''));
       query = {
@@ -1107,6 +1138,7 @@
     var bounds;
     var agg = {};
     var filterRows = [];
+    var sortInfo;
     if (typeof source.settings.size !== 'undefined') {
       data.size = source.settings.size;
     }
@@ -1114,9 +1146,10 @@
       if (source.settings.from) {
         data.from = source.settings.from;
       }
-      // Sort order of returned documents - only useful for non-aggregated data.
+      // Sort order of returned documents - only useful for non-aggregated data which have to store
+      // sort info in the aggregation itself.
       if (source.settings.sort && !source.settings.aggregation) {
-        data.sort = source.settings.sort;
+        data.sort = indiciaFns.expandSpecialFieldSortInfo(source.settings.sort, true);
       }
     }
     if (source.settings.filterBoolClauses) {
diff --git a/js/indicia.datacomponents/idc.esDataSource.js b/js/indicia.datacomponents/idc.esDataSource.js
index 8dc25de4..55a0bf05 100644
--- a/js/indicia.datacomponents/idc.esDataSource.js
+++ b/js/indicia.datacomponents/idc.esDataSource.js
@@ -48,27 +48,6 @@ var IdcEsDataSource;
      * */
     var modeSpecificSetupFns = {};
 
-    /**
-     * Converts sort info in settings into a list of actual field/direction pairs.
-     *
-     * Expands special fields into their constituent field list to sort on.
-     */
-    function expandSpecialFieldSortInfo(settings) {
-      var sortInfo = {};
-      $.each(settings.sort, function eachSortField(field, dir) {
-        if (indiciaData.fieldConvertorSortFields[field] && $.isArray(indiciaData.fieldConvertorSortFields[field])) {
-          $.each(indiciaData.fieldConvertorSortFields[field], function eachUnderlyingField() {
-            sortInfo[this] = dir;
-          });
-        } else {
-          // For consistency, don't want keyword version of field, we'll add
-          // it in when required.
-          sortInfo[field.replace(/\.keyword$/, '')] = dir;
-        }
-      });
-      return sortInfo;
-    }
-
     /**
      * Some generic preparation for modes that aggregate data.
      */
@@ -99,7 +78,7 @@ var IdcEsDataSource;
      */
     modeSpecificSetupFns.initCompositeAggregation = function initCompositeAggregation() {
       var subAggs = {};
-      var sortInfo = expandSpecialFieldSortInfo(this.settings);
+      var sortInfo = indiciaFns.expandSpecialFieldSortInfo(this.settings.sort);
       var settings = this.settings;
       var compositeSources = [];
       var uniqueFieldWithSuffix = indiciaFns.esFieldWithKeywordSuffix(settings.uniqueField);
@@ -156,7 +135,7 @@ var IdcEsDataSource;
      */
     modeSpecificSetupFns.initTermAggregation = function initTermAggregation() {
       var subAggs;
-      var sortInfo = expandSpecialFieldSortInfo(this.settings);
+      var sortInfo = indiciaFns.expandSpecialFieldSortInfo(this.settings.sort);
       // Term aggregation sorts by single field only.
       var sortField = Object.keys(sortInfo)[0];
       var sortDir = sortInfo[sortField];
diff --git a/js/indicia.datacomponents/jquery.idc.dataGrid.js b/js/indicia.datacomponents/jquery.idc.dataGrid.js
index c2455ceb..8ee8398d 100644
--- a/js/indicia.datacomponents/jquery.idc.dataGrid.js
+++ b/js/indicia.datacomponents/jquery.idc.dataGrid.js
@@ -91,13 +91,13 @@
     var done = [];
     var ol = $(el).find('.data-grid-settings ol');
     $.each(columns, function eachColumn() {
-      var colInfo = el.settings.availableColumnInfo[this];
+      var colInfo = el.settings.availableColumnInfo[this.field];
       var caption = colInfo.caption ? colInfo.caption : '<em>no heading</em>';
       var description = colInfo.description ? colInfo.description : '';
-      done.push(this);
+      done.push(this.field);
       $('<li>' +
         '<div class="checkbox">' +
-        '<label><input type="checkbox" checked="checked" value="' + this + '">' + caption + '</label>' +
+        '<label><input type="checkbox" checked="checked" value="' + this.field + '">' + caption + '</label>' +
         '</div>' + description +
         '</li>').appendTo(ol);
     });
@@ -117,6 +117,7 @@
   function addColumnHeadings(el, header) {
     var headerRow = $('<tr/>').appendTo(header);
     var breakpointsByIdx = [];
+    var aggInfo = el.settings.sourceObject.settings.aggregation;
     if (el.settings.autoResponsiveCols) {
       // Build list of breakpoints to use by column position.
       $.each(el.settings.responsiveOptions.breakpoints, function eachPoint(name, point) {
@@ -133,19 +134,20 @@
       $('<th class="footable-toggle-col" data-sort-ignore="true"></th>').appendTo(headerRow);
     }
     $.each(el.settings.columns, function eachColumn(idx) {
-      var colDef = el.settings.availableColumnInfo[this];
+      var colDef = el.settings.availableColumnInfo[this.field];
       var heading = colDef.caption;
       var footableExtras = '';
-      var sortableField = typeof indiciaData.esMappings[this] !== 'undefined'
-        && indiciaData.esMappings[this].sort_field;
+      var sortableField = typeof indiciaData.esMappings[this.field] !== 'undefined'
+        && indiciaData.esMappings[this.field].sort_field;
       // Tolerate hyphen or camelCase.
       var hideBreakpoints = colDef.hideBreakpoints || colDef['hide-breakpoints'];
       var dataType = colDef.dataType || colDef['data-type'];
       sortableField = sortableField
-        || indiciaData.fieldConvertorSortFields[this.simpleFieldName()]
-        // Composite aggregation mode disables sort on aggregation columns. Assume
-        // other aggregation modes allow sort (hopefully).
-        || (el.settings.sourceObject.settings.aggregation && el.settings.sourceObject.settings.mode !== 'compositeAggregation');
+        || indiciaData.fieldConvertorSortFields[this.field.simpleFieldName()]
+        // Simple top level terms agg columns should sort OK.
+        || (aggInfo && aggInfo[this.field])
+        // Doc_count treated like a special agg - supports sort.
+        || (aggInfo && this.field === 'doc_count');
       if (el.settings.sortable !== false && sortableField) {
         heading += '<span class="sort fas fa-sort"></span>';
       }
@@ -158,7 +160,7 @@
       if (dataType) {
         footableExtras += ' data-type="' + dataType + '"';
       }
-      $('<th class="col-' + idx + '" data-field="' + this + '"' + footableExtras + '>' + heading + '</th>')
+      $('<th class="col-' + idx + '" data-field="' + this.field + '"' + footableExtras + '>' + heading + '</th>')
         .appendTo(headerRow);
     });
     if (el.settings.actions.length) {
@@ -179,25 +181,25 @@
       $('<td class="footable-toggle-col"></td>').appendTo(filterRow);
     }
     $.each(el.settings.columns, function eachColumn(idx) {
-      var td = $('<td class="col-' + idx + '" data-field="' + this + '"></td>').appendTo(filterRow);
+      var td = $('<td class="col-' + idx + '" data-field="' + this.field + '"></td>').appendTo(filterRow);
       var title;
-      var caption = el.settings.availableColumnInfo[this].caption;
+      var caption = el.settings.availableColumnInfo[this.field].caption;
       // No filter input if this column has no mapping unless there is a
       // special field function that can work out the query.
-      if (typeof indiciaData.esMappings[this] !== 'undefined'
-          || typeof indiciaFns.fieldConvertorQueryBuilders[this.simpleFieldName()] !== 'undefined') {
-        if (indiciaFns.fieldConvertorQueryBuilders[this.simpleFieldName()]) {
-          if (indiciaFns.fieldConvertorQueryDescriptions[this.simpleFieldName()]) {
-            title = indiciaFns.fieldConvertorQueryDescriptions[this.simpleFieldName()];
+      if (typeof indiciaData.esMappings[this.field] !== 'undefined'
+          || typeof indiciaFns.fieldConvertorQueryBuilders[this.field.simpleFieldName()] !== 'undefined') {
+        if (indiciaFns.fieldConvertorQueryBuilders[this.field.simpleFieldName()]) {
+          if (indiciaFns.fieldConvertorQueryDescriptions[this.field.simpleFieldName()]) {
+            title = indiciaFns.fieldConvertorQueryDescriptions[this.field.simpleFieldName()];
           } else {
             title = 'Enter a value to find matches in the ' + caption + ' column.';
           }
-        } else if (indiciaData.esMappings[this].type === 'text' || indiciaData.esMappings[this].type === 'keyword') {
+        } else if (indiciaData.esMappings[this.field].type === 'text' || indiciaData.esMappings[this.field].type === 'keyword') {
           title = 'Search for words in the ' + caption + ' column. Prefix with ! to exclude rows which contain words ' +
             'beginning with the text you enter. Use * at the end of words to find words starting with. Use ' +
             '&quot;&quot; to group words into phrases and | between words to request either/or searches. Use - ' +
             'before a word to exclude that word from the search results.';
-        } else if (indiciaData.esMappings[this].type === 'date') {
+        } else if (indiciaData.esMappings[this.field].type === 'date') {
           title = 'Search for dates in the ' + caption + ' column. Searches can be in the format yyyy, yyyy-yyyy, ' +
             'dd/mm/yyyy or dd/mm/yyyy hh:mm.';
         } else {
@@ -213,7 +215,7 @@
     el.settings.columns = [];
     $.each(colsList, function eachCol() {
       if (el.settings.availableColumnInfo[this]) {
-        el.settings.columns.push(this);
+        el.settings.columns.push(el.settings.availableColumnInfo[this]);
       }
     });
   }
@@ -710,15 +712,15 @@
       var rangeValue;
       var classes = ['col-' + idx];
       var style = '';
-      var colDef = el.settings.availableColumnInfo[this];
+      var colDef = el.settings.availableColumnInfo[this.field];
       var date;
       // Extra space in last col to account for tool icons.
       var extraSpace = idx === el.settings.columns.length - 1 && !el.settings.actions.length ? 2 : 0;
       var charWidth;
       // In compositeAggregation mode, fields are replaced by key names. We replace
       // . with - to avoid confusion when iterating down paths.
-      var field = sourceSettings.mode === 'compositeAggregation' && $.inArray(this, sourceSettings.fields) > -1
-        ? this.asCompositeKeyName() : this;
+      var field = sourceSettings.mode === 'compositeAggregation' && $.inArray(this.field, sourceSettings.fields) > -1
+        ? this.field.asCompositeKeyName() : this.field;
       value = indiciaFns.getValueForField(doc, field, colDef);
       if (colDef.rangeField) {
         rangeValue = indiciaFns.getValueForField(doc, colDef.rangeField);
@@ -741,7 +743,7 @@
         maxCharsPerCol['col-' + idx] =
           Math.max(maxCharsPerCol['col-' + idx], $('<p>' + value + '</p>').text().length + extraSpace);
       }
-      classes.push('field-' + this.replace(/\./g, '--').replace(/_/g, '-'));
+      classes.push('field-' + this.field.replace(/\./g, '--').replace(/_/g, '-'));
       // Copy across responsive hidden cols.
       if ($(el).find('table th.col-' + idx).css('display') === 'none') {
         style = ' style="display: none"';
@@ -825,6 +827,31 @@
     return longestWord;
   }
 
+  function setupColumnInfo(el) {
+    el.settings.availableColumnInfo = {};
+    // Keep the list of names in order.
+    el.settings.availableColumnNames = [];
+    // Specified columns must appear first.
+    $.each(el.settings.columns, function eachCol() {
+      el.settings.availableColumnInfo[this.field] = {
+        field: this.field,
+        caption: this.caption
+      };
+      el.settings.availableColumnNames.push(this.field);
+    });
+    // Add other mappings if in docs mode, unless overridden by availableColumns
+    // setting.
+    if (el.settings.sourceObject.settings.mode === 'docs') {
+      $.each(indiciaData.gridMappingFields, function eachMapping(key, obj) {
+        if ($.inArray(key, el.settings.availableColumnInfo) === -1 &&
+            (!el.settings.availableColumns || $.inArray(key, el.settings.availableColumns) > -1)) {
+          el.settings.availableColumnInfo[key] = $.extend({}, obj, {field: key});
+          el.settings.availableColumnNames.push(key);
+        }
+      });
+    }
+  }
+
   /**
    * Declare public methods.
    */
@@ -863,8 +890,10 @@
       if (typeof el.settings.columns === 'undefined') {
         indiciaFns.controlFail(el, 'Missing columns config for table.');
       }
+      setupColumnInfo(el);
       // Store original column settings.
       el.settings.defaultColumns = el.settings.columns.slice();
+      // Load from cookie.
       if (el.settings.cookies) {
         savedCols = $.cookie('cols-' + el.id);
         // Don't recall cookie if empty, as this is unlikely to be deliberate.
@@ -872,6 +901,7 @@
           applyColumnsList(el, JSON.parse(savedCols));
         }
       }
+      // Revert to default in case of broken cookie.
       if (el.settings.columns.length === 0) {
         el.settings.columns = el.settings.defaultColumns.slice();
       }
@@ -958,8 +988,8 @@
       $.each(el.settings.columns, function eachColumn(idx) {
         // Only use the longest word in the caption as we'd rather break the
         // heading than the data rows.
-        maxCharsPerCol['col-' + idx] = Math.max(longestWordLength(el.settings.availableColumnInfo[this].caption), 3);
-        if (typeof indiciaData.esMappings[this] !== 'undefined' && indiciaData.esMappings[this].sort_field) {
+        maxCharsPerCol['col-' + idx] = Math.max(longestWordLength(el.settings.availableColumnInfo[this.field].caption), 3);
+        if (typeof indiciaData.esMappings[this] !== 'undefined' && indiciaData.esMappings[this.field].sort_field) {
           // Add 2 chars to allow for the sort icon.
           maxCharsPerCol['col-' + idx] += 2;
         }

From 977b5ec99949f12dd0365c08431bb8070c402e92 Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Fri, 8 May 2020 11:19:34 +0100
Subject: [PATCH 14/21] Downloads in composite or termAggregation mode working.

---
 js/indicia.datacomponents/idc.core.js         |  13 +-
 js/indicia.datacomponents/idc.esDataSource.js |  20 ++-
 .../jquery.idc.esDownload.js                  | 125 ++++++++++--------
 3 files changed, 98 insertions(+), 60 deletions(-)

diff --git a/js/indicia.datacomponents/idc.core.js b/js/indicia.datacomponents/idc.core.js
index 9f90e793..8cf41627 100644
--- a/js/indicia.datacomponents/idc.core.js
+++ b/js/indicia.datacomponents/idc.core.js
@@ -47,10 +47,20 @@
    * each field's key to have hyphens instead of full stops, so the names are
    * not confused with paths in the document.
    */
-  String.prototype.asCompositeKeyName = function simpleFieldName() {
+  String.prototype.asCompositeKeyName = function asCompositeKeyName() {
     return this.replace(/\./g, '-');
   };
 
+  /**
+   * String function to make a field name readable.
+   */
+  String.prototype.asReadableKeyName = function asReadableKeyName() {
+    // Spaces instead of .-_
+    var name = this.replace(/[\.-_]/g, ' ');
+    // Leading caps.
+    return name.charAt(0).toUpperCase() + name.slice(1);
+  };
+
   /**
    * Keep track of a list of all the plugin instances that output something.
    */
@@ -1138,7 +1148,6 @@
     var bounds;
     var agg = {};
     var filterRows = [];
-    var sortInfo;
     if (typeof source.settings.size !== 'undefined') {
       data.size = source.settings.size;
     }
diff --git a/js/indicia.datacomponents/idc.esDataSource.js b/js/indicia.datacomponents/idc.esDataSource.js
index 55a0bf05..932a734e 100644
--- a/js/indicia.datacomponents/idc.esDataSource.js
+++ b/js/indicia.datacomponents/idc.esDataSource.js
@@ -54,6 +54,7 @@ var IdcEsDataSource;
     function prepareAggregationMode() {
       var settings = this.settings;
       var countingRequest;
+      $.extend(settings, { fields: [] });
       // Include the unique field in the list of fields request even if not specified.
       if ($.inArray(settings.uniqueField, settings.fields) === -1) {
         settings.fields.unshift(settings.uniqueField);
@@ -263,11 +264,6 @@ var IdcEsDataSource;
       var source = this;
       var request;
       var url;
-      // Call any special initialisation for this source mode.
-      var initMethodFn = 'init' + source.settings.mode.charAt(0).toUpperCase() + source.settings.mode.slice(1);
-      if (typeof modeSpecificSetupFns[initMethodFn] !== 'undefined') {
-        modeSpecificSetupFns[initMethodFn].call(this);
-      }
       request = indiciaFns.getFormQueryData(source);
       // Pagination support for composite aggregations.
       if (source.settings.after_key) {
@@ -359,6 +355,18 @@ var IdcEsDataSource;
       }
     };
 
+    /**
+     * Prepares the aggregations for this source if in an automatic aggregation mode.
+     */
+    IdcEsDataSource.prototype.prepare = function prepare(forceMode) {
+      var mode = forceMode || this.settings.mode;
+      // Call any special initialisation for this source mode.
+      var initMethodFn = 'init' + mode.charAt(0).toUpperCase() + mode.slice(1);
+      if (typeof modeSpecificSetupFns[initMethodFn] !== 'undefined') {
+        modeSpecificSetupFns[initMethodFn].call(this);
+      }
+    };
+
     /**
      * Request a datasource to repopulate from current parameters.
      *
@@ -389,6 +397,7 @@ var IdcEsDataSource;
               var tabSelectFn = function eachTabSet() {
                 if ($(tab).filter(':visible').length > 0) {
                   $(output).find('.loading-spinner').show();
+                  this.prepare();
                   doPopulation.call(source, force, onlyForControl);
                   indiciaFns.unbindTabsActivate($(tab).closest('.ui-tabs'), tabSelectFn);
                 }
@@ -403,6 +412,7 @@ var IdcEsDataSource;
         });
       });
       if (needsPopulation) {
+        this.prepare();
         doPopulation.call(this, force, onlyForControl);
       }
     };
diff --git a/js/indicia.datacomponents/jquery.idc.esDownload.js b/js/indicia.datacomponents/jquery.idc.esDownload.js
index 7f54e950..2bc9d231 100644
--- a/js/indicia.datacomponents/jquery.idc.esDownload.js
+++ b/js/indicia.datacomponents/jquery.idc.esDownload.js
@@ -43,6 +43,16 @@
   var defaults = {
   };
 
+  /**
+   * Save rebuilding request data for each page
+   */
+  var currentRequestData;
+
+  /**
+   * Total rows to download. In some settings we only get this on first page.
+   */
+  var rowsToDownload;
+
   /**
    * Wind the progress spinner forward to a certain percentage.
    *
@@ -72,16 +82,14 @@
    *   Response body from the ES proxy containing progress data.
    */
   function updateProgress(el, response) {
-    var done;
-    if (el.settings.aggregation === 'composite') {
-      // Can't get progress, but show something happening.
-      $(el).find('.progress-text').text(response.done + ' items');
-    } else {
-      // ES V7 seems to overshoot, reporting whole rather than partial last page size.
-      done = Math.min(response.done, response.total);
-      $(el).find('.progress-text').text(done + ' of ' + response.total);
-      animateTo(el, done / response.total);
+    var rowsDone = response.done;
+    if (response.total) {
+      rowsToDownload = response.total;
     }
+    // ES V7 seems to overshoot, reporting whole rather than partial last page size.
+    rowsDone = Math.min(rowsDone, rowsToDownload);
+    $(el).find('.progress-text').text(rowsDone + ' of ' + rowsToDownload);
+    animateTo(el, rowsDone / rowsToDownload);
   }
 
   /**
@@ -100,29 +108,26 @@
     // Note, columnsTemplate can be blank.
     if (typeof el.settings.columnsTemplate !== 'undefined') {
       data.columnsTemplate = el.settings.columnsTemplate;
-    } else if (el.settings.aggregation && el.settings.aggregation === 'composite') {
+    } else if (el.settings.sourceObject.settings.mode.match(/Aggregation$/)) {
       data.columnsTemplate = '';
     }
-    if (el.settings.addColumns) {
+    if (el.settings.addColumns && el.settings.addColumns.length !== 0) {
       data.addColumns = el.settings.addColumns;
-    } else if (el.settings.aggregation && el.settings.aggregation === 'composite' && data.columnsTemplate === '') {
+    } else if (el.settings.sourceObject.settings.mode.match(/Aggregation$/) && data.columnsTemplate === '') {
       // Find the first aggregation defined for this source.
       agg = sourceSettings.aggregation[Object.keys(sourceSettings.aggregation)[0]];
       data.addColumns = [];
-      // The agg should contain sources (which are the columns aggregated on).
-      $.each(agg.composite.sources, function eachSource() {
-        $.each(this, function eachField(key) {
-          data.addColumns.push({
-            field: 'key.' + key,
-            caption: key
-          });
+      $.each(sourceSettings.fields, function eachField() {
+        data.addColumns.push({
+          field: 'key.' + this.asCompositeKeyName(),
+          caption: this.asReadableKeyName(),
         });
       });
       // The agg should also contain aggregation for calculated columns.
       $.each(agg.aggs, function eachAgg(key) {
         data.addColumns.push({
-          agg: key,
-          caption: key
+          field: key,
+          caption: key.asReadableKeyName()
         });
       });
 
@@ -139,6 +144,7 @@
   function initSource(el) {
     var settings = el.settings;
     var gridSettings;
+    var sourceSettings;
     if (settings.linkToDataGrid) {
       if ($('#' + settings.linkToDataGrid).length !== 1) {
         indiciaFns.controlFail(el, 'Failed to find dataGrid ' + settings.linkToDataGrid + ' linked to download');
@@ -146,28 +152,24 @@
       // Refresh the columns according to those currently in the dataGrid.
       gridSettings = $('#' + settings.linkToDataGrid)[0].settings;
       settings.source = gridSettings.source;
+      sourceSettings = indiciaData.esSourceObjects[Object.keys(settings.source)[0]].settings;
       settings.columnsTemplate = '';
       settings.addColumns = [];
       $.each(gridSettings.columns, function eachCol() {
+        var field;
+        if (sourceSettings.mode.match(/Aggregation$/) && $.inArray(this.field, sourceSettings.fields) > -1) {
+          field = 'key.' + this.field.asCompositeKeyName();
+        } else {
+          field = this.field;
+        }
         settings.addColumns.push({
-          caption: gridSettings.availableColumnInfo[this].caption,
-          field: this
+          caption: gridSettings.availableColumnInfo[this.field].caption,
+          field: field
         });
       });
     }
     // Only allow a single source for download, so simplify the sources.
     settings.sourceObject = indiciaData.esSourceObjects[Object.keys(settings.source)[0]];
-    if (!settings.columnsTemplate && !settings.addColumns && !settings.removeColumns) {
-      settings.columnsTemplate = '';
-      settings.addColumns = [];
-      // No column specification given, so use the source to work this out.
-      $.each(settings.sourceObject.settings.fields, function eachField() {
-        settings.addColumns.push({
-          caption: this,
-          field: this
-        });
-      });
-    }
   }
 
   /**
@@ -180,32 +182,36 @@
     var date;
     var hours;
     var minutes;
-    var data = {};
     var description = '';
     var sep = indiciaData.esProxyAjaxUrl.match(/\?/) ? '&' : '?';
     var query = sep + 'state=nextPage&uniq_id=' + lastResponse.uniq_id;
-    if (lastResponse.scroll_id) {
-      // Scrolls remember the search query so only need the scroll ID.
-      query += '&scroll_id=' + lastResponse.scroll_id;
-    } else if (el.settings.aggregation && el.settings.aggregation === 'composite') {
-      // Paging composite aggregations requires the full search query.
-      data = indiciaFns.getFormQueryData(el.settings.sourceObject);
-      // Inform the warehouse as composite paging behaviour different. The
-      // uniq_id allows the warehouse to relocate the last request's after_key.
-      query += '&aggregation_type=composite';
-    }
     if (lastResponse.state === 'nextPage') {
-      $.extend(data, columnSettings);
+      if (lastResponse.scroll_id) {
+        // Scrolls remember the search query so only need the scroll ID.
+        query += '&scroll_id=' + lastResponse.scroll_id;
+        // Scrolling remembers all the settings server-side.
+        currentRequestData = {};
+      } else if (el.settings.sourceObject.settings.mode.match(/Aggregation$/)) {
+        // Inform the warehouse as composite paging behaviour different. The
+        // uniq_id allows the warehouse to relocate the last request's after_key.
+        query += '&aggregation_type=composite';
+        // No need to recount!
+        delete currentRequestData.aggs.count;
+      }
       // Post to the ES proxy. Pass scroll_id (docs) or after_key (composite aggregations)
       // parameter to request the next chunk of the dataset.
       $.ajax({
         url: indiciaData.esProxyAjaxUrl + '/download/' + indiciaData.nid + query,
         type: 'POST',
         dataType: 'json',
-        data: data,
+        data: currentRequestData,
         success: function success(response) {
           updateProgress(el, response);
           doPages(el, response, columnSettings);
+        },
+        error: function error(jqXHR, textStatus, errorThrown) {
+          alert('An error occurred with the request to download data.');
+          console.log(errorThrown);
         }
       });
     } else {
@@ -219,7 +225,7 @@
       minutes = '0' + date.getMinutes();
       minutes = minutes.substr(minutes.length - 2);
       description = 'File containing ' + lastResponse.done +
-        (el.settings.aggregation && el.settings.aggregation === 'composite' ? ' items. ' : ' occurrences. ');
+        (el.settings.sourceObject.settings.mode === 'compositeAggregation' ? ' items. ' : ' occurrences. ');
 
       $(el).find('.progress-circle-container').addClass('download-done');
       $(el).find('.idc-download-files').append('<div><a href="' + lastResponse.filename + '">' +
@@ -238,28 +244,36 @@
      * Download button click handler.
      */
     $(el).find('.do-download').click(function doDownload() {
-      var data;
       var sep = indiciaData.esProxyAjaxUrl.match(/\?/) ? '&' : '?';
       var query = sep + 'state=initial';
       var columnSettings;
+      var srcSettings = el.settings.sourceObject.settings;
       initSource(el);
+      // Prepare the source aggregations in composite mode if using automatic
+      // aggregation as it supports scrolling and is faster.
+      el.settings.sourceObject.prepare(srcSettings.mode.match(/Aggregation$/)
+        ? 'compositeAggregation' : srcSettings.mode);
       columnSettings = getColumnSettings(el);
       $(el).find('.progress-circle-container').removeClass('download-done');
       $(el).find('.progress-circle-container').show();
       done = false;
       $(el).find('.circle').attr('style', 'stroke-dashoffset: 503px');
       $(el).find('.progress-text').text('Loading...');
-      data = indiciaFns.getFormQueryData(el.settings.sourceObject);
-      if (el.settings.aggregation && el.settings.aggregation === 'composite') {
+      currentRequestData = indiciaFns.getFormQueryData(el.settings.sourceObject);
+      if (srcSettings.mode.match(/Aggregation$/)) {
         query += '&aggregation_type=composite';
+        // Arbitrary choice of page size.
+        currentRequestData.aggs.rows.composite.size = 500;
       }
-      $.extend(data, columnSettings);
+      $.extend(currentRequestData, columnSettings);
+      // Reset.
+      rowsToDownload = null;
       // Post to the ES proxy.
       $.ajax({
         url: indiciaData.esProxyAjaxUrl + '/download/' + indiciaData.nid + query,
         type: 'POST',
         dataType: 'json',
-        data: data,
+        data: currentRequestData,
         success: function success(response) {
           if (typeof response.code !== 'undefined' && response.code === 401) {
             alert('Elasticsearch alias configuration user or secret incorrect in the form configuration.');
@@ -268,6 +282,10 @@
             updateProgress(el, response);
             doPages(el, response, columnSettings);
           }
+        },
+        error: function error(jqXHR, textStatus, errorThrown) {
+          alert('An error occurred with the request to download data.');
+          console.log(errorThrown);
         }
       });
     });
@@ -296,6 +314,7 @@
       if (typeof options !== 'undefined') {
         $.extend(el.settings, options);
       }
+      el.settings.sourceObject = indiciaData.esSourceObjects[Object.keys(el.settings.source)[0]];
       // Don't do any more init at this point, as might be using a not-yet
       // instantiated dataGrid for config.
       initHandlers(el);

From 6ba2b4273027a5d72bf72bb0aa5363f14ed607c4 Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Fri, 8 May 2020 12:11:51 +0100
Subject: [PATCH 15/21] Bugfixes

Includes ensuring all agg downloads get count info for progress.
---
 js/indicia.datacomponents/idc.esDataSource.js | 23 ++++++++++++-------
 .../jquery.idc.dataGrid.js                    | 10 +++++++-
 .../jquery.idc.esDownload.js                  | 10 ++++++--
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/js/indicia.datacomponents/idc.esDataSource.js b/js/indicia.datacomponents/idc.esDataSource.js
index 932a734e..c4a03031 100644
--- a/js/indicia.datacomponents/idc.esDataSource.js
+++ b/js/indicia.datacomponents/idc.esDataSource.js
@@ -367,6 +367,13 @@ var IdcEsDataSource;
       }
     };
 
+    /**
+     * Ensure next request includes a count.
+     */
+    IdcEsDataSource.prototype.forceRecount = function forceRecount() {
+      lastCountRequestStr = '';
+    };
+
     /**
      * Request a datasource to repopulate from current parameters.
      *
@@ -377,18 +384,18 @@ var IdcEsDataSource;
      *   source are populated.
      */
     IdcEsDataSource.prototype.populate = function datasourcePopulate(force, onlyForControl) {
-      var source = this;
+      var src = this;
       var needsPopulation = false;
-      if (!source.outputs) {
+      if (!src.outputs) {
         // Not initialised yet, so don't populate.
         return;
       }
       // Check we have an output other than the download plugin, which only
       // outputs when you click Download.
       $.each(indiciaData.outputPluginClasses, function eachPluginClass(i, pluginClass) {
-        $.each(source.outputs[pluginClass], function eachOutput() {
+        $.each(src.outputs[pluginClass], function eachOutput() {
           var output = this;
-          var populateThis = $(output)[pluginClass]('getNeedsPopulation', source);
+          var populateThis = $(output)[pluginClass]('getNeedsPopulation', src);
           if ($(output).parents('.ui-tabs-panel:hidden').length > 0) {
             // Don't bother if on a hidden tab.
             populateThis = false;
@@ -397,8 +404,8 @@ var IdcEsDataSource;
               var tabSelectFn = function eachTabSet() {
                 if ($(tab).filter(':visible').length > 0) {
                   $(output).find('.loading-spinner').show();
-                  this.prepare();
-                  doPopulation.call(source, force, onlyForControl);
+                  src.prepare();
+                  doPopulation.call(src, force, onlyForControl);
                   indiciaFns.unbindTabsActivate($(tab).closest('.ui-tabs'), tabSelectFn);
                 }
               };
@@ -412,8 +419,8 @@ var IdcEsDataSource;
         });
       });
       if (needsPopulation) {
-        this.prepare();
-        doPopulation.call(this, force, onlyForControl);
+        src.prepare();
+        doPopulation.call(src, force, onlyForControl);
       }
     };
 
diff --git a/js/indicia.datacomponents/jquery.idc.dataGrid.js b/js/indicia.datacomponents/jquery.idc.dataGrid.js
index 8ee8398d..7ba62f05 100644
--- a/js/indicia.datacomponents/jquery.idc.dataGrid.js
+++ b/js/indicia.datacomponents/jquery.idc.dataGrid.js
@@ -606,7 +606,7 @@
    * documents), the buckets of an aggregation, or a custom built source table.
    */
   function getSourceDataList(el, response) {
-    if (el.settings.sourceObject.settings.mode.match(/Aggregation$/)) {
+    if (el.settings.sourceObject.settings.aggregation) {
       // Aggregated data so use the buckets.
       return indiciaFns.findValue(response.aggregations, 'buckets');
     }
@@ -1130,7 +1130,15 @@
      */
     getNeedsPopulation: function getNeedsPopulation() {
       return true;
+    },
+
+    /**
+     * Return the count of the entire table.
+     */
+    getDatasetCount: function getDatasetCount() {
+      return lastCount;
     }
+
   };
 
   /**
diff --git a/js/indicia.datacomponents/jquery.idc.esDownload.js b/js/indicia.datacomponents/jquery.idc.esDownload.js
index 2bc9d231..aa377f65 100644
--- a/js/indicia.datacomponents/jquery.idc.esDownload.js
+++ b/js/indicia.datacomponents/jquery.idc.esDownload.js
@@ -85,6 +85,8 @@
     var rowsDone = response.done;
     if (response.total) {
       rowsToDownload = response.total;
+    } else if (el.settings.linkToDataGrid) {
+      rowsToDownload = $('#' + el.settings.linkToDataGrid).idcDataGrid('getDatasetCount');
     }
     // ES V7 seems to overshoot, reporting whole rather than partial last page size.
     rowsDone = Math.min(rowsDone, rowsToDownload);
@@ -170,6 +172,10 @@
     }
     // Only allow a single source for download, so simplify the sources.
     settings.sourceObject = indiciaData.esSourceObjects[Object.keys(settings.source)[0]];
+    if (!settings.linkToDataGrid) {
+      // Ensure we get count data, in case source has already done a count for another control.
+      settings.sourceObject.forceRecount();
+    }
   }
 
   /**
@@ -247,8 +253,9 @@
       var sep = indiciaData.esProxyAjaxUrl.match(/\?/) ? '&' : '?';
       var query = sep + 'state=initial';
       var columnSettings;
-      var srcSettings = el.settings.sourceObject.settings;
+      var srcSettings;
       initSource(el);
+      srcSettings = el.settings.sourceObject.settings;
       // Prepare the source aggregations in composite mode if using automatic
       // aggregation as it supports scrolling and is faster.
       el.settings.sourceObject.prepare(srcSettings.mode.match(/Aggregation$/)
@@ -314,7 +321,6 @@
       if (typeof options !== 'undefined') {
         $.extend(el.settings, options);
       }
-      el.settings.sourceObject = indiciaData.esSourceObjects[Object.keys(el.settings.source)[0]];
       // Don't do any more init at this point, as might be using a not-yet
       // instantiated dataGrid for config.
       initHandlers(el);

From d3aa9758ae30a66c70c586e52026b38b0b817ab1 Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Fri, 8 May 2020 15:18:15 +0100
Subject: [PATCH 16/21] rowsPerPageOptions for data grid

---
 .../jquery.idc.dataGrid.js                    | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/js/indicia.datacomponents/jquery.idc.dataGrid.js b/js/indicia.datacomponents/jquery.idc.dataGrid.js
index 7ba62f05..fbd9fcc6 100644
--- a/js/indicia.datacomponents/jquery.idc.dataGrid.js
+++ b/js/indicia.datacomponents/jquery.idc.dataGrid.js
@@ -350,6 +350,19 @@
       movePage(el, false);
     });
 
+    /**
+     * Rows per page change.
+     */
+    $(el).find('.rows-per-page select').change(function rowsPerPageChange() {
+      var newRowsPerPage = $(el).find('.rows-per-page select option:selected').val();
+      if (el.settings.sourceObject.settings.mode.match(/Aggregation$/)) {
+        el.settings.sourceObject.settings.aggregationSize = newRowsPerPage;
+      } else {
+        el.settings.sourceObject.settings.size = newRowsPerPage;
+      }
+      el.settings.sourceObject.populate();
+    });
+
     /**
      * Sort column headers click handler.
      */
@@ -845,13 +858,39 @@
       $.each(indiciaData.gridMappingFields, function eachMapping(key, obj) {
         if ($.inArray(key, el.settings.availableColumnInfo) === -1 &&
             (!el.settings.availableColumns || $.inArray(key, el.settings.availableColumns) > -1)) {
-          el.settings.availableColumnInfo[key] = $.extend({}, obj, {field: key});
+          el.settings.availableColumnInfo[key] = $.extend({}, obj, { field: key });
           el.settings.availableColumnNames.push(key);
         }
       });
     }
   }
 
+  /**
+   * A select box for changing the rows per grid page.
+   */
+  function getRowsPerPageControl(el) {
+    var opts = [];
+    var sourceSize = el.settings.sourceObject.settings.aggregationSize || el.settings.sourceObject.settings.size;
+    // Set default rowsPerPageOptions unless explicitly empty.
+    if (!el.settings.rowsPerPageOptions) {
+      el.settings.rowsPerPageOptions = [];
+      if (sourceSize >= 40) {
+        el.settings.rowsPerPageOptions.push(sourceSize % 2);
+      }
+      el.settings.rowsPerPageOptions.push(sourceSize);
+      el.settings.rowsPerPageOptions.push(sourceSize * 2);
+      if (sourceSize < 40) {
+        el.settings.rowsPerPageOptions.push(sourceSize * 4);
+      }
+    }
+    if (el.settings.rowsPerPageOptions.length > 0) {
+      $.each(el.settings.rowsPerPageOptions, function eachOpt() {
+        opts.push('<option value="' + this + '">' + this + '</option>');
+      });
+      return '<span class="rows-per-page">Rows per page: <select>' + opts.join('') + '</select>';
+    }
+    return '';
+  }
   /**
    * Declare public methods.
    */
@@ -924,6 +963,7 @@
           + (el.settings.actions.length > 0 ? 1 : 0);
         $('<tfoot><tr class="pager-row"><td colspan="' + totalCols + '"><span class="showing"></span>' +
           '<span class="buttons"><button class="prev">Previous</button><button class="next">Next</button></span>' +
+          getRowsPerPageControl(el) +
           '</td></tr></tfoot>').appendTo(table);
       }
       setTableHeight(el);

From 1a86e8f01c542f836240e04c1bfd99ca34dd51a8 Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Mon, 11 May 2020 11:22:05 +0100
Subject: [PATCH 17/21] Columns auto-populates from source if not set

No need to set dataGrid columns to use defaults.
Also bug fixes to rows-per-page control.
---
 js/indicia.datacomponents/idc.esDataSource.js |  1 -
 .../jquery.idc.dataGrid.js                    | 53 ++++++++++++++-----
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/js/indicia.datacomponents/idc.esDataSource.js b/js/indicia.datacomponents/idc.esDataSource.js
index c4a03031..05016f28 100644
--- a/js/indicia.datacomponents/idc.esDataSource.js
+++ b/js/indicia.datacomponents/idc.esDataSource.js
@@ -54,7 +54,6 @@ var IdcEsDataSource;
     function prepareAggregationMode() {
       var settings = this.settings;
       var countingRequest;
-      $.extend(settings, { fields: [] });
       // Include the unique field in the list of fields request even if not specified.
       if ($.inArray(settings.uniqueField, settings.fields) === -1) {
         settings.fields.unshift(settings.uniqueField);
diff --git a/js/indicia.datacomponents/jquery.idc.dataGrid.js b/js/indicia.datacomponents/jquery.idc.dataGrid.js
index fbd9fcc6..1a02a3c8 100644
--- a/js/indicia.datacomponents/jquery.idc.dataGrid.js
+++ b/js/indicia.datacomponents/jquery.idc.dataGrid.js
@@ -841,6 +841,28 @@
   }
 
   function setupColumnInfo(el) {
+    var srcSettings = el.settings.sourceObject.settings;
+    if (!el.settings.columns && srcSettings.mode.match(/Aggregation$/)) {
+      el.settings.columns = [];
+      el.settings.columns.push({
+        field: srcSettings.uniqueField,
+        caption: srcSettings.uniqueField.asReadableKeyName()
+      });
+      $.each(srcSettings.fields, function eachField() {
+        if (this !== srcSettings.uniqueField) {
+          el.settings.columns.push({
+            field: this,
+            caption: this.asReadableKeyName()
+          });
+        }
+      });
+      $.each(srcSettings.aggregation, function eachAgg(key) {
+        el.settings.columns.push({
+          field: key,
+          caption: key.asReadableKeyName()
+        });
+      });
+    }
     el.settings.availableColumnInfo = {};
     // Keep the list of names in order.
     el.settings.availableColumnNames = [];
@@ -854,7 +876,7 @@
     });
     // Add other mappings if in docs mode, unless overridden by availableColumns
     // setting.
-    if (el.settings.sourceObject.settings.mode === 'docs') {
+    if (srcSettings.mode === 'docs') {
       $.each(indiciaData.gridMappingFields, function eachMapping(key, obj) {
         if ($.inArray(key, el.settings.availableColumnInfo) === -1 &&
             (!el.settings.availableColumns || $.inArray(key, el.settings.availableColumns) > -1)) {
@@ -871,21 +893,28 @@
   function getRowsPerPageControl(el) {
     var opts = [];
     var sourceSize = el.settings.sourceObject.settings.aggregationSize || el.settings.sourceObject.settings.size;
+    var buildPageSizeOptionsFrom = sourceSize || 30;
     // Set default rowsPerPageOptions unless explicitly empty.
     if (!el.settings.rowsPerPageOptions) {
       el.settings.rowsPerPageOptions = [];
-      if (sourceSize >= 40) {
-        el.settings.rowsPerPageOptions.push(sourceSize % 2);
+      if (buildPageSizeOptionsFrom >= 40) {
+        el.settings.rowsPerPageOptions.push(buildPageSizeOptionsFrom % 2);
       }
-      el.settings.rowsPerPageOptions.push(sourceSize);
-      el.settings.rowsPerPageOptions.push(sourceSize * 2);
-      if (sourceSize < 40) {
-        el.settings.rowsPerPageOptions.push(sourceSize * 4);
+      el.settings.rowsPerPageOptions.push(buildPageSizeOptionsFrom);
+      el.settings.rowsPerPageOptions.push(buildPageSizeOptionsFrom * 2);
+      if (buildPageSizeOptionsFrom < 40) {
+        el.settings.rowsPerPageOptions.push(buildPageSizeOptionsFrom * 4);
       }
     }
+    // If no size specified, we are showing some arbitrary ES limit on row count.
+    if ($.inArray(sourceSize, el.settings.rowsPerPageOptions) === -1) {
+      // Add a non-visible default option to represent initial state.
+      opts.push('<option selected disabled hidden style="display: none"></option>');
+    }
     if (el.settings.rowsPerPageOptions.length > 0) {
       $.each(el.settings.rowsPerPageOptions, function eachOpt() {
-        opts.push('<option value="' + this + '">' + this + '</option>');
+        var selected = this === sourceSize ? ' selected="selected"' : '';
+        opts.push('<option value="' + this + '"' + selected + '>' + this + '</option>');
       });
       return '<span class="rows-per-page">Rows per page: <select>' + opts.join('') + '</select>';
     }
@@ -925,10 +954,6 @@
       if (!el.id || !$.cookie) {
         el.settings.cookies = false;
       }
-      // Validate settings.
-      if (typeof el.settings.columns === 'undefined') {
-        indiciaFns.controlFail(el, 'Missing columns config for table.');
-      }
       setupColumnInfo(el);
       // Store original column settings.
       el.settings.defaultColumns = el.settings.columns.slice();
@@ -961,8 +986,8 @@
         totalCols = el.settings.columns.length
           + (el.settings.responsive ? 1 : 0)
           + (el.settings.actions.length > 0 ? 1 : 0);
-        $('<tfoot><tr class="pager-row"><td colspan="' + totalCols + '"><span class="showing"></span>' +
-          '<span class="buttons"><button class="prev">Previous</button><button class="next">Next</button></span>' +
+        $('<tfoot><tr class="pager-row"><td colspan="' + totalCols + '"><span class="showing"></span> ' +
+          '<span class="buttons"><button class="prev">Previous</button><button class="next">Next</button></span> ' +
           getRowsPerPageControl(el) +
           '</td></tr></tfoot>').appendTo(table);
       }

From dadc880e3fdba6cab3cd81106aa19901633e7b40 Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Mon, 11 May 2020 11:25:09 +0100
Subject: [PATCH 18/21] ES dataGrid footer spacing

---
 css/theme-bootstrap-3.css                | 2 ++
 css/theme-bootstrap-3.css.map            | 2 +-
 css/theme-generic.css                    | 2 ++
 css/theme-generic.css.map                | 2 +-
 scss/common/_indicia-datacomponents.scss | 5 +++++
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/css/theme-bootstrap-3.css b/css/theme-bootstrap-3.css
index dac23649..8f535b23 100644
--- a/css/theme-bootstrap-3.css
+++ b/css/theme-bootstrap-3.css
@@ -360,6 +360,8 @@ table.es-data-grid {
   table.es-data-grid.fixed-header .multiselect-cell {
     padding: 0;
     width: 12px; }
+  table.es-data-grid tfoot span {
+    margin: 0 1em; }
 
 /* idcLeafletMap plugin */
 .idc-output-leafletMap {
diff --git a/css/theme-bootstrap-3.css.map b/css/theme-bootstrap-3.css.map
index 72f5fd3f..8e12c33e 100644
--- a/css/theme-bootstrap-3.css.map
+++ b/css/theme-bootstrap-3.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../scss/theme-bootstrap-3.scss","../scss/common/_variables.scss","../scss/common/_form-controls.scss","../scss/common/_map-controls.scss","../scss/common/_report-grid.scss","../scss/common/_uploader.scss","../scss/common/_media.scss","../scss/common/_status-icons.scss","../scss/common/_tooltip.scss","../scss/common/_licence-icons.scss","../scss/common/_indicia-datacomponents.scss","../scss/common/_progress-circle.scss","../scss/bootstrap-3/_form-controls.scss","../scss/bootstrap-3/_variables.scss","../scss/common/_loading-spinner.scss","../scss/common/_ol2-map.scss"],
 "names": [],
 "file": "theme-bootstrap-3.css"
diff --git a/css/theme-generic.css b/css/theme-generic.css
index 77fa3d5e..2073dce3 100644
--- a/css/theme-generic.css
+++ b/css/theme-generic.css
@@ -360,6 +360,8 @@ table.es-data-grid {
   table.es-data-grid.fixed-header .multiselect-cell {
     padding: 0;
     width: 12px; }
+  table.es-data-grid tfoot span {
+    margin: 0 1em; }
 
 /* idcLeafletMap plugin */
 .idc-output-leafletMap {
diff --git a/css/theme-generic.css.map b/css/theme-generic.css.map
index c1105c8d..9cdaf3a7 100644
--- a/css/theme-generic.css.map
+++ b/css/theme-generic.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../scss/theme-generic.scss","../scss/common/_variables.scss","../scss/common/_form-controls.scss","../scss/common/_map-controls.scss","../scss/common/_report-grid.scss","../scss/common/_uploader.scss","../scss/common/_media.scss","../scss/common/_status-icons.scss","../scss/common/_tooltip.scss","../scss/common/_licence-icons.scss","../scss/common/_indicia-datacomponents.scss","../scss/common/_progress-circle.scss","../scss/generic/_form-controls.scss","../scss/generic/_variables.scss","../scss/common/_loading-spinner.scss","../scss/common/_ol2-map.scss","../scss/generic/_bootstrapify.scss"],
 "names": [],
 "file": "theme-generic.css"
diff --git a/scss/common/_indicia-datacomponents.scss b/scss/common/_indicia-datacomponents.scss
index e2bcb21a..5192e300 100644
--- a/scss/common/_indicia-datacomponents.scss
+++ b/scss/common/_indicia-datacomponents.scss
@@ -145,6 +145,11 @@ table.es-data-grid {
       width: 12px;
     }
   }
+  tfoot {
+    span {
+      margin: 0 1em;
+    }
+  }
 }
 
 

From 197661566c9ab346a2e5aa6d635cd0ad4c198714 Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Mon, 11 May 2020 16:50:30 +0100
Subject: [PATCH 19/21] Bug fixes around mapGridSquare size mode options.

---
 js/indicia.datacomponents/idc.core.js         | 15 +++---
 .../jquery.idc.dataGrid.js                    | 53 +++++++++++++------
 .../jquery.idc.leafletMap.js                  |  5 ++
 3 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/js/indicia.datacomponents/idc.core.js b/js/indicia.datacomponents/idc.core.js
index 8cf41627..d79697d8 100644
--- a/js/indicia.datacomponents/idc.core.js
+++ b/js/indicia.datacomponents/idc.core.js
@@ -1272,14 +1272,17 @@
               }
             }
           });
-          indiciaFns.findAndSetValue(agg, 'geohash_grid', {
-            field: 'location.point',
-            precision: Math.min(Math.max(mapToFilterTo[0].map.getZoom() - 3, 4), 10)
-          });
-          indiciaFns.findAndSetValue(agg, 'field', $(mapToFilterTo).idcLeafletMap('getAutoSquareField'), 'autoGridSquareField');
-          data.numericFilters['location.coordinate_uncertainty_in_meters'] = '0-' + $(mapToFilterTo).idcLeafletMap('getAutoSquareSize');
         }
       }
+      if (source.settings.mode === 'mapGridSquare') {
+        // Set grid square size if auto.
+        indiciaFns.findAndSetValue(agg, 'field', $(mapToFilterTo).idcLeafletMap('getAutoSquareField'), 'autoGridSquareField');
+        // Don't display unsuitably imprecise data.
+        data.numericFilters['location.coordinate_uncertainty_in_meters'] = '0-' + $(mapToFilterTo).idcLeafletMap('getAutoSquareSize');
+      } else if (source.settings.mode === 'mapGeoHash') {
+        // Set geohash_grid precision.
+        indiciaFns.findAndSetValue(agg, 'precision', Math.min(Math.max(mapToFilterTo[0].map.getZoom() - 3, 4), 10));
+      }
       data.aggs = agg;
     }
     return data;
diff --git a/js/indicia.datacomponents/jquery.idc.dataGrid.js b/js/indicia.datacomponents/jquery.idc.dataGrid.js
index 1a02a3c8..6cc00b58 100644
--- a/js/indicia.datacomponents/jquery.idc.dataGrid.js
+++ b/js/indicia.datacomponents/jquery.idc.dataGrid.js
@@ -840,28 +840,51 @@
     return longestWord;
   }
 
+  /**
+   * Column setup.
+   *
+   * * Applies default list of columns if not specified.
+   * * Defines the list of available columns for selection.
+   */
   function setupColumnInfo(el) {
     var srcSettings = el.settings.sourceObject.settings;
-    if (!el.settings.columns && srcSettings.mode.match(/Aggregation$/)) {
+    if (!el.settings.columns) {
       el.settings.columns = [];
-      el.settings.columns.push({
-        field: srcSettings.uniqueField,
-        caption: srcSettings.uniqueField.asReadableKeyName()
-      });
-      $.each(srcSettings.fields, function eachField() {
-        if (this !== srcSettings.uniqueField) {
+      // In aggregation mode, defaults are the field list + aggs list.
+      if (srcSettings.mode.match(/Aggregation$/)) {
+        el.settings.columns.push({
+          field: srcSettings.uniqueField,
+          caption: srcSettings.uniqueField.asReadableKeyName()
+        });
+        $.each(srcSettings.fields, function eachField() {
+          if (this !== srcSettings.uniqueField) {
+            el.settings.columns.push({
+              field: this,
+              caption: this.asReadableKeyName()
+            });
+          }
+        });
+        $.each(srcSettings.aggregation, function eachAgg(key) {
           el.settings.columns.push({
-            field: this,
-            caption: this.asReadableKeyName()
+            field: key,
+            caption: key.asReadableKeyName()
           });
-        }
-      });
-      $.each(srcSettings.aggregation, function eachAgg(key) {
+        });
+      } else {
+        // Docs mode.
         el.settings.columns.push({
-          field: key,
-          caption: key.asReadableKeyName()
+          field: 'taxon.accepted_name',
+          caption: indiciaData.gridMappingFields['taxon.accepted_name'].caption
         });
-      });
+        el.settings.columns.push({
+          field: '#event_date#',
+          caption: 'Date'
+        });
+        el.settings.columns.push({
+          field: 'location.output_sref',
+          caption: indiciaData.gridMappingFields['location.output_sref'].caption
+        });
+      }
     }
     el.settings.availableColumnInfo = {};
     // Keep the list of names in order.
diff --git a/js/indicia.datacomponents/jquery.idc.leafletMap.js b/js/indicia.datacomponents/jquery.idc.leafletMap.js
index bdb4d7ae..d9a6f322 100644
--- a/js/indicia.datacomponents/jquery.idc.leafletMap.js
+++ b/js/indicia.datacomponents/jquery.idc.leafletMap.js
@@ -147,7 +147,12 @@
         config.options = $.extend({ radius: 'metric', fillOpacity: 0.5 }, config.options);
         if (!config.options.size && indiciaData.esSourceObjects[sourceId].settings.mapGridSquareSize) {
           config.options.size = indiciaData.esSourceObjects[sourceId].settings.mapGridSquareSize;
+          if (config.options.size === 'autoGridSquareSize') {
+            // Calculate according to map zoom.
+            config.options.size = $(el).idcLeafletMap('getAutoSquareSize');
+          }
         }
+        // If size is auto, override it.
         indiciaFns.findAndSetValue(config.options, 'size', $(el).idcLeafletMap('getAutoSquareSize'), 'autoGridSquareSize');
         // Apply metric to any options that are supposed to use it.
         $.each(config.options, function eachOption(key, value) {

From 82ed36d4464d72a5b23f8f018b2f95f11a7d9ee7 Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Thu, 14 May 2020 11:17:01 +0100
Subject: [PATCH 20/21] Don't provide sort icons for composite agg columns

Only composite source columns can be sorted on, not the calculated
columns.
---
 js/indicia.datacomponents/jquery.idc.dataGrid.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/js/indicia.datacomponents/jquery.idc.dataGrid.js b/js/indicia.datacomponents/jquery.idc.dataGrid.js
index 6cc00b58..41542ef3 100644
--- a/js/indicia.datacomponents/jquery.idc.dataGrid.js
+++ b/js/indicia.datacomponents/jquery.idc.dataGrid.js
@@ -117,7 +117,8 @@
   function addColumnHeadings(el, header) {
     var headerRow = $('<tr/>').appendTo(header);
     var breakpointsByIdx = [];
-    var aggInfo = el.settings.sourceObject.settings.aggregation;
+    var srcSettings = el.settings.sourceObject.settings;
+    var aggInfo = srcSettings.aggregation;
     if (el.settings.autoResponsiveCols) {
       // Build list of breakpoints to use by column position.
       $.each(el.settings.responsiveOptions.breakpoints, function eachPoint(name, point) {
@@ -145,9 +146,9 @@
       sortableField = sortableField
         || indiciaData.fieldConvertorSortFields[this.field.simpleFieldName()]
         // Simple top level terms agg columns should sort OK.
-        || (aggInfo && aggInfo[this.field])
+        || (srcSettings.mode !== 'compositeAggregation' && aggInfo && aggInfo[this.field])
         // Doc_count treated like a special agg - supports sort.
-        || (aggInfo && this.field === 'doc_count');
+        || (srcSettings.mode !== 'compositeAggregation' && aggInfo && this.field === 'doc_count');
       if (el.settings.sortable !== false && sortableField) {
         heading += '<span class="sort fas fa-sort"></span>';
       }

From 6c5dc3af5b15d8ddd2f8522b911a71ade5e14a16 Mon Sep 17 00:00:00 2001
From: John van Breda <john.vanbreda@biodiverseit.co.uk>
Date: Tue, 19 May 2020 16:57:28 +0100
Subject: [PATCH 21/21] Implement download @buttonContainerElement

---
 .../jquery.idc.esDownload.js                  | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/js/indicia.datacomponents/jquery.idc.esDownload.js b/js/indicia.datacomponents/jquery.idc.esDownload.js
index aa377f65..8e70c9b3 100644
--- a/js/indicia.datacomponents/jquery.idc.esDownload.js
+++ b/js/indicia.datacomponents/jquery.idc.esDownload.js
@@ -247,13 +247,22 @@
    */
   function initHandlers(el) {
     /**
-     * Download button click handler.
+     * Download button click handler. Note that the selector must directly
+     * find the button as it might not be a child of the element.
      */
-    $(el).find('.do-download').click(function doDownload() {
+    $('#' + el.id + '-button').click(function doDownload() {
       var sep = indiciaData.esProxyAjaxUrl.match(/\?/) ? '&' : '?';
       var query = sep + 'state=initial';
       var columnSettings;
       var srcSettings;
+      var tab;
+      // If possibly not on outputs tab, switch.
+      if (el.settings.buttonContainerElement) {
+        tab = $(el).closest('.ui-tabs-panel');
+        if (tab.length > 0) {
+          indiciaFns.activeTab($(tab).parent(), tab[0].id);
+        }
+      }
       initSource(el);
       srcSettings = el.settings.sourceObject.settings;
       // Prepare the source aggregations in composite mode if using automatic
@@ -321,6 +330,12 @@
       if (typeof options !== 'undefined') {
         $.extend(el.settings, options);
       }
+      if (el.settings.buttonContainerElement) {
+        if ($(el.settings.buttonContainerElement).length === 0) {
+          indiciaFns.controlFail(el, 'Invalid @buttonContainerElement option for ' + el.id);
+        }
+        $(el).find('button').appendTo($(el.settings.buttonContainerElement));
+      }
       // Don't do any more init at this point, as might be using a not-yet
       // instantiated dataGrid for config.
       initHandlers(el);