Merge branch 'develop'

Indicia-Team · Nov 7, 2019 · fb7bc42 · fb7bc42
2 parents d92de51 + da1f7af
commit fb7bc42
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 840 deletions.
diff --git a/js/indicia.datacomponents/idc.esDataSource.js b/js/indicia.datacomponents/idc.esDataSource.js
@@ -147,6 +147,10 @@ var IdcEsDataSource;
             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' };
+            }
             // Build any configured output tables.
             source.buildTableXY(response);
             $.each(indiciaData.outputPluginClasses, function eachPluginClass(i, pluginClass) {

diff --git a/js/indicia.datacomponents/jquery.idc.dataGrid.js b/js/indicia.datacomponents/jquery.idc.dataGrid.js
@@ -638,17 +638,19 @@
    */
   function drawTableFooter(el, response, data, afterKey) {
     var fromRowIndex = typeof data.from === 'undefined' ? 1 : (data.from + 1);
+    var ofLabel;
     // Set up the count info in the footer.
     if (!el.settings.aggregation) {
       if (response.hits.hits.length > 0) {
+        ofLabel = response.hits.total.relation === 'gte' ? 'at least ' : '';
         $(el).find('tfoot .showing').html('Showing ' + fromRowIndex +
-          ' to ' + (fromRowIndex + (response.hits.hits.length - 1)) + ' of ' + response.hits.total);
+          ' to ' + (fromRowIndex + (response.hits.hits.length - 1)) + ' of ' + ofLabel + response.hits.total.value);
       } else {
         $(el).find('tfoot .showing').html('No hits');
       }
       // 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);
+      $(el).find('.pager-row .next').prop('disabled', fromRowIndex + response.hits.hits.length >= response.hits.total.value);
     } else if (el.settings.aggregation === 'composite') {
       if (afterKey) {
         el.settings.compositeInfo.pageAfterKeys[el.settings.compositeInfo.page + 1] = afterKey;
@@ -970,7 +972,7 @@
       if (el.settings.responsive) {
         $(el).find('table').trigger('footable_redraw');
       }
-      el.settings.totalRowCount = el.settings.aggregation ? null : response.hits.total;
+      el.settings.totalRowCount = el.settings.aggregation ? null : response.hits.total.value;
       drawTableFooter(el, response, data, afterKey);
       fireAfterPopulationCallbacks(el);
       setColWidths(el, maxCharsPerCol);

diff --git a/js/indicia.datacomponents/jquery.idc.esDownload.js b/js/indicia.datacomponents/jquery.idc.esDownload.js
@@ -72,8 +72,8 @@
    *   Response body from the ES proxy containing progress data.
    */
   function updateProgress(el, response) {
-    $(el).find('.progress-text').text(response.done + ' of ' + response.total);
-    animateTo(el, response.done / response.total);
+    $(el).find('.progress-text').text(response.done + ' of ' + response.total.value);
+    animateTo(el, response.done / response.total.value);
   }
 
   /**
@@ -112,7 +112,7 @@
     var data = {
       scroll_id: lastResponse.scroll_id
     };
-    if (lastResponse.done < lastResponse.total) {
+    if (lastResponse.done < lastResponse.total.value) {
       $.extend(data, getColumnSettings(el));
       // Post to the ES proxy. Pass scroll_id parameter to request the next
       // chunk of the dataset.
@@ -122,6 +122,11 @@
         dataType: 'json',
         data: data,
         success: function success(response) {
+          // Patch response from V6 to behave like V7.
+          if (indiciaData.esVersion === 6) {
+            response.total = { value: response.total, relation: 'eq' };
+          }
+          response.done = Math.min(response.done, response.total.value);
           updateProgress(el, response);
           doPages(el, response);
         }
@@ -137,7 +142,7 @@
       $(el).find('.idc-download-files').append('<div><a href="' + lastResponse.filename + '">' +
         '<span class="fas fa-file-archive fa-2x"></span>' +
         'Download .zip file</a><br/>' +
-        'File containing ' + lastResponse.total + ' occurrences. Available until ' + hours + ':' + minutes + '</div>');
+        'File containing ' + lastResponse.total.value + ' occurrences. Available until ' + hours + ':' + minutes + '</div>');
       $(el).find('.idc-download-files').fadeIn('med');
     }
   }

diff --git a/js/indicia.datacomponents/jquery.idc.verificationButtons.js b/js/indicia.datacomponents/jquery.idc.verificationButtons.js
@@ -94,10 +94,8 @@
             setTimeout(function doPopulate() {
               indiciaFns.populateDataSources();
             }, 500);
-          } else {
-            if (response !== 'OK') {
-              alert('Indicia records update failed');
-            }
+          } else if (response !== 'OK') {
+            alert('Indicia records update failed');
           }
         }
       ).always(function cleanup() {

diff --git a/js/indicia.locks.js b/js/indicia.locks.js
@@ -13,12 +13,12 @@
  */
 
 /**
- * @requires jquery.js, jquery.cookie.js, json2.js
+ * @requires jquery.js, jquery.cookie.js
  */
 
 /**
  * indicia.locks
- * 
+ *
  * This is a library of support code for the indicia project. It implements the
  * javascript for lockable form controls. These allow users to lock controls so
  * the set values are reset as the control value when the form is redisplayed.
@@ -43,10 +43,10 @@
 
   // 'constant' for the base cookie name for locks
   var COOKIE_NAME = 'indicia_locked_controls';
-  
+
   // variable to indicate if locking initialised.
   var initialised = false;
-  
+
   // variables to hold the tool-tips pumped in from PHP. This has to be done to
   // support I18n.
   var lockedTip = '';
@@ -60,7 +60,7 @@
 
   // variables to hold reference to map div and spatial ref input
   var mapDiv, srefId;
-  
+
   // variable to hold user name, or empty string for anonymous
   var user = '';
 
@@ -320,9 +320,9 @@
       if (srefId!==null && mapDiv!==null && escControlId===srefId) {
         $(mapDiv).before('<div id="mapLockMask" style="position: absolute;"/>');
         $('#mapLockMask').css({"opacity": "0.25", "background-color": "white",
-            "left":$(mapDiv).position().left + "px", 
-            "top":$(mapDiv).position().top + "px", 
-            "z-index":9999}) 
+            "left":$(mapDiv).position().left + "px",
+            "top":$(mapDiv).position().top + "px",
+            "z-index":9999})
             .width($(mapDiv).width())
             .height($(mapDiv).height());
       }

diff --git a/js/jquery.indiciaMapPanel.js b/js/jquery.indiciaMapPanel.js
@@ -2358,7 +2358,7 @@ var destroyAllFeatures;
         }
       });
       // Hide the Google layer if it is not the current base layer.
-      if (map.baseLayer !== olLayer) {
+      if (typeof olLayer !== 'undefined' && map.baseLayer !== olLayer) {
         olLayer.display(false);
       }
     }