@deephaven/iris-grid 1.28.1 → 1.29.0

package/dist/IrisGridTableModelTemplate.js

@@ -20,6 +20,7 @@ import Log from '@deephaven/log';
 import { EventShimCustomEvent, PromiseUtils, assertNotNull } from '@deephaven/utils';
 import { TableUtils, Formatter, FormatterUtils, DateUtils } from '@deephaven/jsapi-utils';
 import IrisGridModel from "./IrisGridModel.js";
+import { serializeKeyValues } from "./KeyedSelection.js";
 import AggregationOperation from "./sidebar/aggregations/AggregationOperation.js";
 import IrisGridUtils from "./IrisGridUtils.js";
 import MissingKeyError from "./MissingKeyError.js";
@@ -121,6 +122,16 @@ class IrisGridTableModelTemplate extends IrisGridModel {
     _defineProperty(this, "_columnHeaderGroups", []);
     _defineProperty(this, "_isColumnHeaderGroupsInitialized", false);
     _defineProperty(this, "_movedColumns", null);
+    _defineProperty(this, "getMemoizedSelectionKeyColumnIndices", memoize((columns, raw) => {
+      if (raw == null || typeof raw !== 'string' || raw.trim() === '') {
+        return [];
+      }
+      return raw.split(',').map(name => {
+        var idx = columns.findIndex(c => c.name === name.trim());
+        if (idx < 0) throw new Error("Selection key column not found: ".concat(name));
+        return idx;
+      });
+    }));
     _defineProperty(this, "getMemoizedInitialMovedColumns", memoize(layoutHints => {
       var _layoutHints$columnGr, _layoutHints$frontCol, _layoutHints$backColu, _layoutHints$frozenCo;
       if (!layoutHints) {
@@ -325,6 +336,21 @@ class IrisGridTableModelTemplate extends IrisGridModel {
     this.pendingNewDataMap = new Map();
     this.pendingNewRowCount = 0;
   }
+  get selectionKeyColumnIndices() {
+    var _getAttribute, _ref2;
+    return this.getMemoizedSelectionKeyColumnIndices(this.columns, (_getAttribute = (_ref2 = this.table).getAttribute) === null || _getAttribute === void 0 ? void 0 : _getAttribute.call(_ref2, 'keyColumns'));
+  }
+  get hasUniqueSelectionKeys() {
+    var _getAttribute2, _ref3;
+    return ((_getAttribute2 = (_ref3 = this.table).getAttribute) === null || _getAttribute2 === void 0 ? void 0 : _getAttribute2.call(_ref3, 'uniqueKeys')) === 'true';
+  }
+
+  // Totals rows have aggregate column values (not real row keys), so exclude
+  // them from keyed selection to keep copy / download filters meaningful.
+  // Follow up to design how this should work is DH-23589
+  isKeyableRow(row) {
+    return !this.isTotalsRow(row);
+  }
   close() {
     this.table.close();
     if (this.totalsTable !== null) {
@@ -467,7 +493,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
     return !this.isSaveInProgress && this.inputTable != null;
   }
   get isDeletable() {
-    return this.keyColumnSet.size > 0;
+    return this.inputKeyColumnSet.size > 0;
   }
   get isViewportPending() {
     if (this.viewport == null || this.viewport.columns === undefined || this.viewportData == null) {
@@ -539,7 +565,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
   textForCell(x, y) {
     var _this$columns$x;
     var text = this.textValueForCell(x, y);
-    if (text == null && this.isKeyColumn(x)) {
+    if (text == null && this.isInputKeyColumn(x)) {
       var pendingRow = this.pendingRow(y);
       if (pendingRow != null && this.pendingDataMap.has(pendingRow)) {
         // Asterisk to show a value is required for a key column on a row that has some data entered
@@ -587,7 +613,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
         var column = this.sourceColumn(x, y);
         return IrisGridUtils.colorForValue(theme, column.type, column.name, value);
       }
-    } else if (this.isPendingRow(y) && this.isKeyColumn(x)) {
+    } else if (this.isPendingRow(y) && this.isInputKeyColumn(x)) {
       assertNotNull(theme.errorTextColor);
       return theme.errorTextColor;
     }
@@ -1140,12 +1166,190 @@ class IrisGridTableModelTemplate extends IrisGridModel {
       return data.map(row => row.join('\t')).join('\n');
     })();
   }
-  valuesTable(columns) {
+
+  /**
+   * Builds a filter condition matching any row whose key columns equal one of the provided key value sets.
+   *
+   * @param keyValues A map of key column names to their corresponding values
+   * @param keyColumns The key columns to filter by
+   * @returns A filter condition matching the provided key values, or null if no filter is needed
+   */
+  buildKeyFilter(keyValues, keyColumns) {
+    // Return null if there are no key values to filter by
+    if (keyValues.size === 0) return null;
+
+    // Create an AND filter for each set of key values
+    var keyFilters = [];
+    keyValues.forEach(values => {
+      var colFilters = values.map((val, i) => {
+        var col = keyColumns[i];
+        return this.tableUtils.makeNullableEqFilter(col, val);
+      });
+      keyFilters.push(colFilters.length === 1 ? colFilters[0] : colFilters[0].and(...colFilters.slice(1)));
+    });
+
+    // Combine the key filters with OR logic
+    return keyFilters.length === 1 ? keyFilters[0] : keyFilters[0].or(...keyFilters.slice(1));
+  }
+  createFilteredByKeysTable(keyValues, invertedSelection) {
     var _this4 = this;
+    return _asyncToGenerator(function* () {
+      if (TableUtils.isTreeTable(_this4.table)) {
+        throw new Error('createFilteredByKeysTable is not supported on tree tables');
+      }
+      var keyColumns = _this4.selectionKeyColumnIndices.map(i => _this4.columns[i]);
+      var keyFilter = _this4.buildKeyFilter(keyValues, keyColumns);
+      var copy = yield _this4.table.copy();
+      try {
+        if (keyFilter == null && !invertedSelection) {
+          // Empty non-inverted selection means zero rows match; filter to nothing so
+          // callers (e.g. CSV exporter) see size=0 rather than the full unfiltered table.
+          var neverMatch = keyColumns[0].filter().isNull().and(keyColumns[0].filter().isNull().not());
+          yield _this4.tableUtils.applyFilter(copy, [neverMatch]);
+        } else if (keyFilter != null) {
+          var filter = invertedSelection ? [keyFilter.not()] : [keyFilter];
+          yield _this4.tableUtils.applyFilter(copy, filter);
+        }
+        // Fall-through when keyFilter == null && invertedSelection: all rows selected.
+        // Skip applyFilter — an empty filter array on a fresh copy produces no
+        // filterchanged event, causing applyFilter to time out.
+        return copy;
+      } catch (err) {
+        // applyFilter can reject or time out; the copy hasn't been returned to any
+        // caller yet, so close it here to avoid leaking a JS API table.
+        copy.close();
+        throw err;
+      }
+    })();
+  }
+  fetchKeyValuesForRowRanges(ranges) {
+    var _this5 = this;
+    return _asyncToGenerator(function* () {
+      // Compute the bounding envelope covering every range so the server round
+      // trip is one viewport subscription regardless of how many disjoint ranges
+      // were selected. Handles reverse-ordered and out-of-order input.
+      var minStart = null;
+      var maxEnd = null;
+      for (var i = 0; i < ranges.length; i += 1) {
+        var _ranges$i = ranges[i],
+          startRow = _ranges$i.startRow,
+          endRow = _ranges$i.endRow;
+        if (startRow == null) continue; // eslint-disable-line no-continue
+        var rEnd = endRow !== null && endRow !== void 0 ? endRow : startRow;
+        var low = Math.min(startRow, rEnd);
+        var high = Math.max(startRow, rEnd);
+        if (minStart === null || low < minStart) minStart = low;
+        if (maxEnd === null || high > maxEnd) maxEnd = high;
+      }
+      if (minStart === null || maxEnd === null) return new Map();
+      var keyColumns = _this5.selectionKeyColumnIndices.map(i => _this5.columns[i]);
+      // Use a secondary viewport subscription on the live table to avoid a copy/filter round-trip.
+      var sub = _this5.table.createViewportSubscription({
+        rows: {
+          first: minStart,
+          last: maxEnd
+        },
+        columns: keyColumns
+      });
+      try {
+        var data = yield sub.getViewportData();
+        var result = new Map();
+        // Filter to only rows the caller actually requested — the envelope may
+        // include rows between disjoint ranges that must not be selected.
+        data.rows.forEach((row, i) => {
+          var rowIndex = data.offset + i;
+          if (!IrisGridTableModelTemplate.rowInAnyRange(rowIndex, ranges)) return;
+          var values = keyColumns.map(col => row.get(col));
+          result.set(serializeKeyValues(values), values);
+        });
+        return result;
+      } finally {
+        sub.close();
+      }
+    })();
+  }
+  static rowInAnyRange(rowIndex, ranges) {
+    for (var i = 0; i < ranges.length; i += 1) {
+      var _ranges$i2 = ranges[i],
+        startRow = _ranges$i2.startRow,
+        endRow = _ranges$i2.endRow;
+      if (startRow == null) continue; // eslint-disable-line no-continue
+      var rEnd = endRow !== null && endRow !== void 0 ? endRow : startRow;
+      var low = Math.min(startRow, rEnd);
+      var high = Math.max(startRow, rEnd);
+      if (rowIndex >= low && rowIndex <= high) return true;
+    }
+    return false;
+  }
+
+  /**
+   * Implementation of snapshotByKeys.
+   * This works by filtering the table based on the key values and then taking a snapshot of the entire filtered table.
+   */
+  snapshotByKeys(columns, keyValues, invertedSelection) {
+    var _arguments3 = arguments,
+      _this6 = this;
+    return _asyncToGenerator(function* () {
+      var includeHeaders = _arguments3.length > 3 && _arguments3[3] !== undefined ? _arguments3[3] : false;
+      var formatValue = _arguments3.length > 4 && _arguments3[4] !== undefined ? _arguments3[4] : v => v;
+      var maxRows = _arguments3.length > 5 && _arguments3[5] !== undefined ? _arguments3[5] : null;
+      if (maxRows != null && maxRows < 1) {
+        throw new Error("maxRows must be at least 1, got ".concat(maxRows));
+      }
+      if (TableUtils.isTreeTable(_this6.table)) {
+        throw new Error('snapshotByKeys is not supported on tree tables');
+      }
+      var keyColumns = _this6.selectionKeyColumnIndices.map(i => _this6.columns[i]);
+      var keyFilter = _this6.buildKeyFilter(keyValues, keyColumns);
+      if (keyFilter == null && !invertedSelection) {
+        // Empty normal selection — nothing to copy
+        return includeHeaders ? [columns.map(c => c.name)] : [];
+      }
+      var filteredTable = yield _this6.createFilteredByKeysTable(keyValues, invertedSelection);
+      try {
+        var result = [];
+        if (includeHeaders) {
+          result.push(columns.map(c => c.name));
+        }
+        if (filteredTable.size > 0) {
+          var lastRow = maxRows != null ? Math.min(filteredTable.size - 1, maxRows - 1) : filteredTable.size - 1;
+          var sub = filteredTable.createViewportSubscription({
+            rows: {
+              first: 0,
+              last: lastRow
+            },
+            columns: [...columns]
+          });
+          try {
+            var data = yield sub.getViewportData();
+            result.push(...data.rows.map(rowData => columns.map(col => formatValue(rowData.get(col), col))));
+          } finally {
+            sub.close();
+          }
+        }
+        return result;
+      } finally {
+        filteredTable.close();
+      }
+    })();
+  }
+  textSnapshotByKeys(columns, keyValues, invertedSelection) {
+    var _arguments4 = arguments,
+      _this7 = this;
+    return _asyncToGenerator(function* () {
+      var includeHeaders = _arguments4.length > 3 && _arguments4[3] !== undefined ? _arguments4[3] : false;
+      var formatValue = _arguments4.length > 4 && _arguments4[4] !== undefined ? _arguments4[4] : v => "".concat(v);
+      var maxRows = _arguments4.length > 5 && _arguments4[5] !== undefined ? _arguments4[5] : null;
+      var data = yield _this7.snapshotByKeys(columns, keyValues, invertedSelection, includeHeaders, formatValue, maxRows);
+      return data.map(row => row.join('\t')).join('\n');
+    })();
+  }
+  valuesTable(columns) {
+    var _this8 = this;
     return _asyncToGenerator(function* () {
       var table = null;
       try {
-        table = yield _this4.table.copy();
+        table = yield _this8.table.copy();
         table.applyFilter([]);
         table.applySort([]);
         return yield table.selectDistinct(Array.isArray(columns) ? columns : [columns]);
@@ -1169,17 +1373,17 @@ class IrisGridTableModelTemplate extends IrisGridModel {
     if (this.frontColumns.includes(columnName) || this.backColumns.includes(columnName) || this.frozenColumns.includes(columnName) || !columnName) {
       return false;
     }
-    return !this.isKeyColumn(modelIndex);
+    return !this.isInputKeyColumn(modelIndex);
   }
   isColumnSortable(modelIndex) {
     var _this$columns$modelIn;
     return (_this$columns$modelIn = this.columns[modelIndex].isSortable) !== null && _this$columns$modelIn !== void 0 ? _this$columns$modelIn : true;
   }
-  isKeyColumn(x) {
-    return this.keyColumnSet.has(this.columns[x].name);
+  isInputKeyColumn(x) {
+    return this.inputKeyColumnSet.has(this.columns[x].name);
   }
-  isValueColumn(x) {
-    return this.valueColumnSet.has(this.columns[x].name);
+  isInputValueColumn(x) {
+    return this.inputValueColumnSet.has(this.columns[x].name);
   }
   isRowMovable() {
     return false;
@@ -1196,23 +1400,23 @@ class IrisGridTableModelTemplate extends IrisGridModel {
     // If an input table does not have key columns, it is append only and existing rows cannot be editable
     // Pending rows are always editable
     var isPendingRange = this.isPendingRow(range.startRow) && this.isPendingRow(range.endRow);
-    var isKeyColumnInRange = false;
+    var isInputKeyColumnInRange = false;
     assertNotNull(range.startColumn);
     // Check if any of the columns in grid range are key columns
     var bound = (_range$endColumn = range.endColumn) !== null && _range$endColumn !== void 0 ? _range$endColumn : this.table.size;
     for (var column = range.startColumn; column <= bound; column += 1) {
-      var isKey = this.isKeyColumn(column);
-      var isValue = this.isValueColumn(column);
+      var isKey = this.isInputKeyColumn(column);
+      var isValue = this.isInputValueColumn(column);
       if (!isKey && !isValue) {
         // If any column is not a key or value column, range is not editable
         return false;
       }
       if (isKey) {
-        isKeyColumnInRange = true;
+        isInputKeyColumnInRange = true;
         break;
       }
     }
-    if (!(isPendingRange || this.keyColumnSet.size !== 0 && !isKeyColumnInRange)) {
+    if (!(isPendingRange || this.inputKeyColumnSet.size !== 0 && !isInputKeyColumnInRange)) {
       return false;
     }
     return true;
@@ -1249,10 +1453,10 @@ class IrisGridTableModelTemplate extends IrisGridModel {
    * @returns A promise that resolves successfully when the operation is complete, or rejects if there's an error
    */
   setValueForCell(x, y, text) {
-    var _this5 = this;
+    var _this9 = this;
     return _asyncToGenerator(function* () {
       // Cache the value in our pending string cache so that it stays displayed until our edit has been completed
-      return _this5.setValueForRanges([new GridRange(x, y, x, y)], text);
+      return _this9.setValueForRanges([new GridRange(x, y, x, y)], text);
     })();
   }
 
@@ -1263,9 +1467,9 @@ class IrisGridTableModelTemplate extends IrisGridModel {
    * @returns A promise that resolves successfully when the operation is complete, or rejects if there's an error
    */
   setValueForRanges(ranges, text) {
-    var _this6 = this;
+    var _this0 = this;
     return _asyncToGenerator(function* () {
-      if (!_this6.isEditableRanges(ranges)) {
+      if (!_this0.isEditableRanges(ranges)) {
         throw new Error("Edits contain uneditable ranges");
       }
       try {
@@ -1276,35 +1480,35 @@ class IrisGridTableModelTemplate extends IrisGridModel {
         // Since there could be different formatting for each column, but the value will be the same across rows
         var formattedText = [];
         GridRange.forEachCell(ranges, (x, y) => {
-          var column = _this6.columns[x];
+          var column = _this0.columns[x];
           columnSet.add(column);
           if (formattedText[x] === undefined) {
-            var value = _this6.tableUtils.makeValue(column.type, text, _this6.formatter.timeZone);
-            formattedText[x] = value != null ? _this6.displayString(value, column.type, column.name) : null;
+            var value = _this0.tableUtils.makeValue(column.type, text, _this0.formatter.timeZone);
+            formattedText[x] = value != null ? _this0.displayString(value, column.type, column.name) : null;
           }
-          _this6.cachePendingValue(x, y, formattedText[x]);
+          _this0.cachePendingValue(x, y, formattedText[x]);
         });
 
         // Take care of updates to the pending new area first, as they can be updated synchronously
-        var pendingAreaRange = _this6.getPendingAreaRange();
+        var pendingAreaRange = _this0.getPendingAreaRange();
         var pendingRanges = ranges.map(range => GridRange.intersection(pendingAreaRange, range)).filter(range => range != null).map(range => {
           assertNotNull(range);
-          return GridRange.offset(range, 0, -(_this6.floatingTopRowCount + _this6.table.size));
+          return GridRange.offset(range, 0, -(_this0.floatingTopRowCount + _this0.table.size));
         });
         if (pendingRanges.length > 0) {
-          var newDataMap = new Map(_this6.pendingNewDataMap);
+          var newDataMap = new Map(_this0.pendingNewDataMap);
           GridRange.forEachCell(pendingRanges, (columnIndex, rowIndex) => {
             if (!newDataMap.has(rowIndex)) {
               newDataMap.set(rowIndex, {
                 data: new Map()
               });
             }
-            var column = _this6.columns[columnIndex];
+            var column = _this0.columns[columnIndex];
             var row = newDataMap.get(rowIndex);
             assertNotNull(row);
             var rowData = row.data;
             var newRowData = new Map(rowData);
-            var value = _this6.tableUtils.makeValue(column.type, text, _this6.formatter.timeZone);
+            var value = _this0.tableUtils.makeValue(column.type, text, _this0.formatter.timeZone);
             if (value != null) {
               newRowData.set(columnIndex, {
                 value
@@ -1320,29 +1524,29 @@ class IrisGridTableModelTemplate extends IrisGridModel {
               newDataMap.delete(rowIndex);
             }
           });
-          _this6.pendingDataMap = newDataMap;
+          _this0.pendingDataMap = newDataMap;
         }
-        _this6.dispatchEvent(new EventShimCustomEvent(IrisGridModel.EVENT.UPDATED));
-        var tableAreaRange = _this6.getTableAreaRange();
+        _this0.dispatchEvent(new EventShimCustomEvent(IrisGridModel.EVENT.UPDATED));
+        var tableAreaRange = _this0.getTableAreaRange();
         var tableRanges = ranges.map(range => GridRange.intersection(tableAreaRange, range)).filter(range => range != null);
         if (tableRanges.length > 0) {
-          var _this6$inputTable;
+          var _this0$inputTable;
           // Get a snapshot of the full rows, as we need to write a full row when editing
-          var data = yield _this6.snapshot(tableRanges.map(range => {
+          var data = yield _this0.snapshot(tableRanges.map(range => {
             var _range$startRow, _range$endRow;
             return new GridRange(null, (_range$startRow = range === null || range === void 0 ? void 0 : range.startRow) !== null && _range$startRow !== void 0 ? _range$startRow : null, null, (_range$endRow = range === null || range === void 0 ? void 0 : range.endRow) !== null && _range$endRow !== void 0 ? _range$endRow : null);
           }));
           var newRows = data.map(row => {
             var newRow = {};
-            for (var c = 0; c < _this6.columns.length; c += 1) {
-              newRow[_this6.columns[c].name] = row[c];
+            for (var c = 0; c < _this0.columns.length; c += 1) {
+              newRow[_this0.columns[c].name] = row[c];
             }
             columnSet.forEach(column => {
-              newRow[column.name] = _this6.tableUtils.makeValue(column.type, text, _this6.formatter.timeZone);
+              newRow[column.name] = _this0.tableUtils.makeValue(column.type, text, _this0.formatter.timeZone);
             });
             return newRow;
           });
-          var result = yield (_this6$inputTable = _this6.inputTable) === null || _this6$inputTable === void 0 ? void 0 : _this6$inputTable.addRows(newRows);
+          var result = yield (_this0$inputTable = _this0.inputTable) === null || _this0$inputTable === void 0 ? void 0 : _this0$inputTable.addRows(newRows);
           log.debug('setValueForRanges(', ranges, ',', text, ') set tableRanges', tableRanges, 'result', result);
         }
 
@@ -1352,7 +1556,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
         GridRange.forEachCell(ranges, (x, y) => {
           var cellText = formattedText[x];
           assertNotNull(cellText);
-          _this6.cacheFormattedValue(x, y, cellText);
+          _this0.cacheFormattedValue(x, y, cellText);
         });
       } catch (err) {
         log.error('Unable to set ranges', ranges, text, err);
@@ -1364,25 +1568,25 @@ class IrisGridTableModelTemplate extends IrisGridModel {
         });
       } finally {
         GridRange.forEachCell(ranges, (x, y) => {
-          _this6.clearPendingValue(x, y);
+          _this0.clearPendingValue(x, y);
         });
       }
     })();
   }
   setValues() {
-    var _arguments3 = arguments,
-      _this7 = this;
+    var _arguments5 = arguments,
+      _this1 = this;
     return _asyncToGenerator(function* () {
-      var edits = _arguments3.length > 0 && _arguments3[0] !== undefined ? _arguments3[0] : [];
+      var edits = _arguments5.length > 0 && _arguments5[0] !== undefined ? _arguments5[0] : [];
       log.debug('setValues(', edits, ')');
       if (!edits.every(edit => {
         var _edit$column, _edit$row;
-        return _this7.isEditableRange(GridRange.makeCell((_edit$column = edit.column) !== null && _edit$column !== void 0 ? _edit$column : edit.x, (_edit$row = edit.row) !== null && _edit$row !== void 0 ? _edit$row : edit.y));
+        return _this1.isEditableRange(GridRange.makeCell((_edit$column = edit.column) !== null && _edit$column !== void 0 ? _edit$column : edit.x, (_edit$row = edit.row) !== null && _edit$row !== void 0 ? _edit$row : edit.y));
       })) {
         throw new Error("Edits contain uneditable ranges");
       }
       try {
-        var newDataMap = new Map(_this7.pendingNewDataMap);
+        var newDataMap = new Map(_this1.pendingNewDataMap);
 
         // Cache the display values
         edits.forEach(edit => {
@@ -1390,13 +1594,13 @@ class IrisGridTableModelTemplate extends IrisGridModel {
           var text = edit.text;
           var x = (_edit$column2 = edit.column) !== null && _edit$column2 !== void 0 ? _edit$column2 : edit.x;
           var y = (_edit$row2 = edit.row) !== null && _edit$row2 !== void 0 ? _edit$row2 : edit.y;
-          var column = _this7.columns[x];
-          var value = _this7.tableUtils.makeValue(column.type, text, _this7.formatter.timeZone);
-          var formattedText = value != null ? _this7.displayString(value, column.type, column.name) : null;
-          _this7.cachePendingValue(x, y, formattedText);
+          var column = _this1.columns[x];
+          var value = _this1.tableUtils.makeValue(column.type, text, _this1.formatter.timeZone);
+          var formattedText = value != null ? _this1.displayString(value, column.type, column.name) : null;
+          _this1.cachePendingValue(x, y, formattedText);
 
           // Take care of updates to the pending new area as well, as that can be updated synchronously
-          var pendingRow = _this7.pendingRow(y);
+          var pendingRow = _this1.pendingRow(y);
           if (pendingRow != null) {
             if (!newDataMap.has(pendingRow)) {
               newDataMap.set(pendingRow, {
@@ -1423,10 +1627,10 @@ class IrisGridTableModelTemplate extends IrisGridModel {
             }
           }
         });
-        _this7.pendingDataMap = newDataMap;
+        _this1.pendingDataMap = newDataMap;
 
         // Send an update right after setting the pending map so the values are displayed immediately
-        _this7.dispatchEvent(new EventShimCustomEvent(IrisGridModel.EVENT.UPDATED));
+        _this1.dispatchEvent(new EventShimCustomEvent(IrisGridModel.EVENT.UPDATED));
 
         // Need to group by row...
         var rowEditMap = edits.reduce((rowMap, edit) => {
@@ -1442,12 +1646,12 @@ class IrisGridTableModelTemplate extends IrisGridModel {
           var _edit$column3, _edit$row4;
           return GridRange.makeCell((_edit$column3 = edit.column) !== null && _edit$column3 !== void 0 ? _edit$column3 : edit.x, (_edit$row4 = edit.row) !== null && _edit$row4 !== void 0 ? _edit$row4 : edit.y);
         }));
-        var tableAreaRange = _this7.getTableAreaRange();
+        var tableAreaRange = _this1.getTableAreaRange();
         var tableRanges = ranges.map(range => GridRange.intersection(tableAreaRange, range)).filter(range => range != null);
         if (tableRanges.length > 0) {
-          var _this7$inputTable;
+          var _this1$inputTable;
           // Get a snapshot of the full rows, as we need to write a full row when editing
-          var data = yield _this7.snapshot(tableRanges.map(range => {
+          var data = yield _this1.snapshot(tableRanges.map(range => {
             assertNotNull(range);
             return new GridRange(null, range.startRow, null, range.endRow);
           }));
@@ -1466,22 +1670,22 @@ class IrisGridTableModelTemplate extends IrisGridModel {
               r -= rangeRowCount;
             }
             var newRow = {};
-            for (var c = 0; c < _this7.columns.length; c += 1) {
-              newRow[_this7.columns[c].name] = row[c];
+            for (var c = 0; c < _this1.columns.length; c += 1) {
+              newRow[_this1.columns[c].name] = row[c];
             }
             assertNotNull(rowIndex);
             var rowEdits = rowEditMap.get(rowIndex);
             if (rowEdits != null) {
               rowEdits.forEach(edit => {
                 var _edit$column4;
-                var column = _this7.columns[(_edit$column4 = edit.column) !== null && _edit$column4 !== void 0 ? _edit$column4 : edit.x];
-                newRow[column.name] = _this7.tableUtils.makeValue(column.type, edit.text, _this7.formatter.timeZone);
+                var column = _this1.columns[(_edit$column4 = edit.column) !== null && _edit$column4 !== void 0 ? _edit$column4 : edit.x];
+                newRow[column.name] = _this1.tableUtils.makeValue(column.type, edit.text, _this1.formatter.timeZone);
               });
             }
             return newRow;
           });
           log.info('setValues setting tableRanges', tableRanges);
-          var result = yield (_this7$inputTable = _this7.inputTable) === null || _this7$inputTable === void 0 ? void 0 : _this7$inputTable.addRows(newRows);
+          var result = yield (_this1$inputTable = _this1.inputTable) === null || _this1$inputTable === void 0 ? void 0 : _this1$inputTable.addRows(newRows);
           log.info('setValues set tableRanges', tableRanges, 'SUCCESS', result);
         }
 
@@ -1494,45 +1698,45 @@ class IrisGridTableModelTemplate extends IrisGridModel {
           var text = edit.text;
           var x = (_edit$column5 = edit.column) !== null && _edit$column5 !== void 0 ? _edit$column5 : edit.x;
           var y = (_edit$row5 = edit.row) !== null && _edit$row5 !== void 0 ? _edit$row5 : edit.y;
-          var column = _this7.columns[x];
-          var value = _this7.tableUtils.makeValue(column.type, text, _this7.formatter.timeZone);
-          var formattedText = value != null ? _this7.displayString(value, column.type, column.name) : null;
-          _this7.cacheFormattedValue(x, y, formattedText);
+          var column = _this1.columns[x];
+          var value = _this1.tableUtils.makeValue(column.type, text, _this1.formatter.timeZone);
+          var formattedText = value != null ? _this1.displayString(value, column.type, column.name) : null;
+          _this1.cacheFormattedValue(x, y, formattedText);
         });
       } finally {
         edits.forEach(edit => {
-          _this7.clearPendingValue(edit.column, edit.row);
+          _this1.clearPendingValue(edit.column, edit.row);
         });
       }
     })();
   }
   commitPending() {
-    var _this8 = this;
+    var _this10 = this;
     return _asyncToGenerator(function* () {
-      if (_this8.pendingNewDataMap.size <= 0) {
+      if (_this10.pendingNewDataMap.size <= 0) {
         throw new Error('No pending changes to commit');
       }
       try {
-        var _this8$inputTable, _this8$viewport$botto, _this8$viewport;
-        _this8.isSaveInProgress = true;
+        var _this10$inputTable, _this10$viewport$bott, _this10$viewport;
+        _this10.isSaveInProgress = true;
         var newRows = [];
-        _this8.pendingNewDataMap.forEach(row => {
+        _this10.pendingNewDataMap.forEach(row => {
           var newRow = {};
-          row.data.forEach((_ref2, columnIndex) => {
-            var value = _ref2.value;
-            var columnName = typeof columnIndex === 'string' ? columnIndex : _this8.columns[columnIndex].name;
+          row.data.forEach((_ref4, columnIndex) => {
+            var value = _ref4.value;
+            var columnName = typeof columnIndex === 'string' ? columnIndex : _this10.columns[columnIndex].name;
             newRow[columnName] = value;
           });
           newRows.push(newRow);
         });
-        var result = yield (_this8$inputTable = _this8.inputTable) === null || _this8$inputTable === void 0 ? void 0 : _this8$inputTable.addRows(newRows);
-        log.debug('commitPending()', _this8.pendingNewDataMap, 'result', result);
-        _this8.pendingNewDataMap = new Map();
-        _this8.pendingNewRowCount = Math.max(0, ((_this8$viewport$botto = (_this8$viewport = _this8.viewport) === null || _this8$viewport === void 0 ? void 0 : _this8$viewport.bottom) !== null && _this8$viewport$botto !== void 0 ? _this8$viewport$botto : 0) - _this8.table.size);
-        _this8.formattedStringData = [];
-        _this8.dispatchEvent(new EventShimCustomEvent(IrisGridModel.EVENT.PENDING_DATA_UPDATED));
+        var result = yield (_this10$inputTable = _this10.inputTable) === null || _this10$inputTable === void 0 ? void 0 : _this10$inputTable.addRows(newRows);
+        log.debug('commitPending()', _this10.pendingNewDataMap, 'result', result);
+        _this10.pendingNewDataMap = new Map();
+        _this10.pendingNewRowCount = Math.max(0, ((_this10$viewport$bott = (_this10$viewport = _this10.viewport) === null || _this10$viewport === void 0 ? void 0 : _this10$viewport.bottom) !== null && _this10$viewport$bott !== void 0 ? _this10$viewport$bott : 0) - _this10.table.size);
+        _this10.formattedStringData = [];
+        _this10.dispatchEvent(new EventShimCustomEvent(IrisGridModel.EVENT.PENDING_DATA_UPDATED));
       } finally {
-        _this8.isSaveInProgress = false;
+        _this10.isSaveInProgress = false;
       }
     })();
   }