@deephaven/iris-grid 1.7.1 → 1.7.2-beta.3

package/dist/IrisGridTableModelTemplate.js

@@ -74,10 +74,6 @@ class IrisGridTableModelTemplate extends IrisGridModel {
   get columns() {
     return this.table.columns;
   }
-
-  // Map from new row index to their values. Only for input tables that can have new rows added.
-  // The index of these rows start at 0, and they are appended at the end of the regular table data.
-  // These rows can be sparse, so using a map instead of an array.
   /**
    * @param dh JSAPI instance
    * @param table Iris data table to be used in the model
@@ -107,6 +103,9 @@ class IrisGridTableModelTemplate extends IrisGridModel {
     _defineProperty(this, "totalsTablePromise", void 0);
     _defineProperty(this, "totals", void 0);
     _defineProperty(this, "totalsDataMap", void 0);
+    // Map from new row index to their values. Only for input tables that can have new rows added.
+    // The index of these rows start at 0, and they are appended at the end of the regular table data.
+    // These rows can be sparse, so using a map instead of an array.
     _defineProperty(this, "pendingNewDataMap", void 0);
     _defineProperty(this, "pendingNewRowCount", 0);
     _defineProperty(this, "_columnHeaderGroupMap", new Map());
@@ -146,7 +145,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
       if (frontColumns.length > 0 || backColumns.length > 0 || frozenColumns.length > 0) {
         var usedColumns = new Set();
         var frontIndex = 0;
-        frozenColumns === null || frozenColumns === void 0 ? void 0 : frozenColumns.forEach(name => {
+        frozenColumns === null || frozenColumns === void 0 || frozenColumns.forEach(name => {
           if (usedColumns.has(name)) {
             throw new Error("Column specified in multiple layout hints: ".concat(name));
           }
@@ -161,7 +160,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
           frontIndex += 1;
         });
         var backIndex = this.columns.length - 1;
-        backColumns === null || backColumns === void 0 ? void 0 : backColumns.forEach(name => {
+        backColumns === null || backColumns === void 0 || backColumns.forEach(name => {
           if (usedColumns.has(name)) {
             throw new Error("Column specified in multiple layout hints: ".concat(name));
           }
@@ -245,6 +244,9 @@ class IrisGridTableModelTemplate extends IrisGridModel {
       log.debug2('setViewport', this.viewport);
       this.applyViewport();
     }, SET_VIEWPORT_THROTTLE));
+    /**
+     * Applies the current viewport to the underlying table.
+     */
     _defineProperty(this, "applyViewport", throttle(() => {
       if (!this.viewport) {
         return;
@@ -284,7 +286,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
             if (!map.has(rowIndex)) {
               map.set(rowIndex, []);
             }
-            (_map$get = map.get(rowIndex)) === null || _map$get === void 0 ? void 0 : _map$get.push(new MissingKeyError(rowIndex, columns[i].name));
+            (_map$get = map.get(rowIndex)) === null || _map$get === void 0 || _map$get.push(new MissingKeyError(rowIndex, columns[i].name));
           }
         }
       });
@@ -397,10 +399,10 @@ class IrisGridTableModelTemplate extends IrisGridModel {
     }));
   }
   get rowCount() {
-    var _this$totals$operatio, _this$totals, _this$totals$operatio2;
+    var _this$totals$operatio, _this$totals;
     return (
       // Table size can be negative if the table isn't ready yet
-      Math.max(this.table.size, 0) + this.pendingNewRowCount + ((_this$totals$operatio = (_this$totals = this.totals) === null || _this$totals === void 0 ? void 0 : (_this$totals$operatio2 = _this$totals.operationOrder) === null || _this$totals$operatio2 === void 0 ? void 0 : _this$totals$operatio2.length) !== null && _this$totals$operatio !== void 0 ? _this$totals$operatio : 0)
+      Math.max(this.table.size, 0) + this.pendingNewRowCount + ((_this$totals$operatio = (_this$totals = this.totals) === null || _this$totals === void 0 || (_this$totals = _this$totals.operationOrder) === null || _this$totals === void 0 ? void 0 : _this$totals.length) !== null && _this$totals$operatio !== void 0 ? _this$totals$operatio : 0)
     );
   }
   get pendingDataErrors() {
@@ -449,12 +451,12 @@ class IrisGridTableModelTemplate extends IrisGridModel {
     return this.columns.length;
   }
   get floatingBottomRowCount() {
-    var _this$totals$operatio3, _this$totals2, _this$totals2$operati;
-    return this.totals != null && this.totals.showOnTop ? 0 : (_this$totals$operatio3 = (_this$totals2 = this.totals) === null || _this$totals2 === void 0 ? void 0 : (_this$totals2$operati = _this$totals2.operationOrder) === null || _this$totals2$operati === void 0 ? void 0 : _this$totals2$operati.length) !== null && _this$totals$operatio3 !== void 0 ? _this$totals$operatio3 : 0;
+    var _this$totals$operatio2, _this$totals2;
+    return this.totals != null && this.totals.showOnTop ? 0 : (_this$totals$operatio2 = (_this$totals2 = this.totals) === null || _this$totals2 === void 0 || (_this$totals2 = _this$totals2.operationOrder) === null || _this$totals2 === void 0 ? void 0 : _this$totals2.length) !== null && _this$totals$operatio2 !== void 0 ? _this$totals$operatio2 : 0;
   }
   get floatingTopRowCount() {
-    var _this$totals$operatio4, _this$totals3, _this$totals3$operati;
-    return this.totals != null && this.totals.showOnTop ? (_this$totals$operatio4 = (_this$totals3 = this.totals) === null || _this$totals3 === void 0 ? void 0 : (_this$totals3$operati = _this$totals3.operationOrder) === null || _this$totals3$operati === void 0 ? void 0 : _this$totals3$operati.length) !== null && _this$totals$operatio4 !== void 0 ? _this$totals$operatio4 : 0 : 0;
+    var _this$totals$operatio3, _this$totals3;
+    return this.totals != null && this.totals.showOnTop ? (_this$totals$operatio3 = (_this$totals3 = this.totals) === null || _this$totals3 === void 0 || (_this$totals3 = _this$totals3.operationOrder) === null || _this$totals3 === void 0 ? void 0 : _this$totals3.length) !== null && _this$totals$operatio3 !== void 0 ? _this$totals$operatio3 : 0 : 0;
   }
   get isValuesTableAvailable() {
     return this.table.selectDistinct != null && this.table.copy != null;
@@ -520,15 +522,15 @@ class IrisGridTableModelTemplate extends IrisGridModel {
 
     // Use a separate cache from memoization just for the strings that are currently displayed
     if (((_this$formattedString = this.formattedStringData[x]) === null || _this$formattedString === void 0 ? void 0 : _this$formattedString[y]) === undefined) {
-      var _value = this.valueForCell(x, y);
-      if (_value === null) {
+      var value = this.valueForCell(x, y);
+      if (value === null) {
         return null;
       }
-      if (_value === undefined) {
+      if (value === undefined) {
         return undefined;
       }
-      var _column = this.sourceColumn(x, y);
-      var hasCustomColumnFormat = this.getCachedCustomColumnFormatFlag(this.formatter, _column.name, _column.type);
+      var column = this.sourceColumn(x, y);
+      var hasCustomColumnFormat = this.getCachedCustomColumnFormatFlag(this.formatter, column.name, column.type);
       var formatOverride;
       if (!hasCustomColumnFormat) {
         var formatForCell = this.formatForCell(x, y);
@@ -536,7 +538,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
           formatOverride = formatForCell;
         }
       }
-      var text = this.displayString(_value, _column.type, _column.name, formatOverride);
+      var text = this.displayString(value, column.type, column.name, formatOverride);
       this.cacheFormattedValue(x, y, text);
     }
     return this.formattedStringData[x][y];
@@ -576,9 +578,9 @@ class IrisGridTableModelTemplate extends IrisGridModel {
     if (data) {
       var {
         format,
-        value: _value2
+        value
       } = data;
-      if (_value2 == null || _value2 === '') {
+      if (value == null || value === '') {
         assertNotNull(theme.nullStringColor);
         return theme.nullStringColor;
       }
@@ -592,9 +594,9 @@ class IrisGridTableModelTemplate extends IrisGridModel {
       }
 
       // Fallback to formatting based on the value/type of the cell
-      if (_value2 != null) {
-        var _column2 = this.sourceColumn(x, y);
-        return IrisGridUtils.colorForValue(theme, _column2.type, _column2.name, _value2);
+      if (value != null) {
+        var column = this.sourceColumn(x, y);
+        return IrisGridUtils.colorForValue(theme, column.type, column.name, value);
       }
     } else if (this.isPendingRow(y) && this.isKeyColumn(x)) {
       assertNotNull(theme.errorTextColor);
@@ -732,8 +734,8 @@ class IrisGridTableModelTemplate extends IrisGridModel {
     }
   }
   row(y) {
-    var _this$totals$operatio5, _this$totals4, _this$totals4$operati, _this$totals$showOnTo, _this$totals5, _this$viewportData$of, _this$viewportData, _this$viewportData$ro, _this$viewportData2, _this$viewportData2$r;
-    var totalsRowCount = (_this$totals$operatio5 = (_this$totals4 = this.totals) === null || _this$totals4 === void 0 ? void 0 : (_this$totals4$operati = _this$totals4.operationOrder) === null || _this$totals4$operati === void 0 ? void 0 : _this$totals4$operati.length) !== null && _this$totals$operatio5 !== void 0 ? _this$totals$operatio5 : 0;
+    var _this$totals$operatio4, _this$totals4, _this$totals$showOnTo, _this$totals5, _this$viewportData$of, _this$viewportData, _this$viewportData$ro, _this$viewportData2;
+    var totalsRowCount = (_this$totals$operatio4 = (_this$totals4 = this.totals) === null || _this$totals4 === void 0 || (_this$totals4 = _this$totals4.operationOrder) === null || _this$totals4 === void 0 ? void 0 : _this$totals4.length) !== null && _this$totals$operatio4 !== void 0 ? _this$totals$operatio4 : 0;
     var showOnTop = (_this$totals$showOnTo = (_this$totals5 = this.totals) === null || _this$totals5 === void 0 ? void 0 : _this$totals5.showOnTop) !== null && _this$totals$showOnTo !== void 0 ? _this$totals$showOnTo : false;
     var totalsRow = this.totalsRow(y);
     if (totalsRow != null) {
@@ -749,7 +751,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
     }
     var offset = (_this$viewportData$of = (_this$viewportData = this.viewportData) === null || _this$viewportData === void 0 ? void 0 : _this$viewportData.offset) !== null && _this$viewportData$of !== void 0 ? _this$viewportData$of : 0;
     var viewportY = (showOnTop ? y - totalsRowCount : y) - offset;
-    return (_this$viewportData$ro = (_this$viewportData2 = this.viewportData) === null || _this$viewportData2 === void 0 ? void 0 : (_this$viewportData2$r = _this$viewportData2.rows) === null || _this$viewportData2$r === void 0 ? void 0 : _this$viewportData2$r[viewportY]) !== null && _this$viewportData$ro !== void 0 ? _this$viewportData$ro : null;
+    return (_this$viewportData$ro = (_this$viewportData2 = this.viewportData) === null || _this$viewportData2 === void 0 || (_this$viewportData2 = _this$viewportData2.rows) === null || _this$viewportData2 === void 0 ? void 0 : _this$viewportData2[viewportY]) !== null && _this$viewportData$ro !== void 0 ? _this$viewportData$ro : null;
   }
 
   /**
@@ -772,15 +774,14 @@ class IrisGridTableModelTemplate extends IrisGridModel {
       // When there are multiple aggregations for the column, the column name will be the original name of the column with the operation appended afterward
       // When the the operation is the default operation OR there is only one operation for the column, then the totals column name is just the original column name
       var totalsColumn = (_this$totalsTable = this.totalsTable) === null || _this$totalsTable === void 0 ? void 0 : _this$totalsTable.columns.find(col => {
-        var _this$totals9, _this$totals9$operati;
-        return col.name === "".concat(tableColumn.name, "__").concat(operation) || (operation === defaultOperation || ((_this$totals9 = this.totals) === null || _this$totals9 === void 0 ? void 0 : (_this$totals9$operati = _this$totals9.operationMap[col.name]) === null || _this$totals9$operati === void 0 ? void 0 : _this$totals9$operati.length) === 1) && col.name === tableColumn.name;
+        var _this$totals9;
+        return col.name === "".concat(tableColumn.name, "__").concat(operation) || (operation === defaultOperation || ((_this$totals9 = this.totals) === null || _this$totals9 === void 0 || (_this$totals9 = _this$totals9.operationMap[col.name]) === null || _this$totals9 === void 0 ? void 0 : _this$totals9.length) === 1) && col.name === tableColumn.name;
       });
       if (totalsColumn != null) {
         return totalsColumn;
       }
       // There may be cases were the totals table doesn't have a column, such as when there's a virtual column
     }
-
     return this.columns[column];
   }
 
@@ -791,9 +792,9 @@ class IrisGridTableModelTemplate extends IrisGridModel {
    * @returns The row within the totals table if it's a totals row, null otherwise
    */
   totalsRow(y) {
-    var _this$totals$operatio6, _this$totals10, _this$totals10$operat, _this$totals$showOnTo2, _this$totals11;
-    var totalsRowCount = (_this$totals$operatio6 = (_this$totals10 = this.totals) === null || _this$totals10 === void 0 ? void 0 : (_this$totals10$operat = _this$totals10.operationOrder) === null || _this$totals10$operat === void 0 ? void 0 : _this$totals10$operat.length) !== null && _this$totals$operatio6 !== void 0 ? _this$totals$operatio6 : 0;
-    var showOnTop = (_this$totals$showOnTo2 = (_this$totals11 = this.totals) === null || _this$totals11 === void 0 ? void 0 : _this$totals11.showOnTop) !== null && _this$totals$showOnTo2 !== void 0 ? _this$totals$showOnTo2 : false;
+    var _this$totals$operatio5, _this$totals0, _this$totals$showOnTo2, _this$totals1;
+    var totalsRowCount = (_this$totals$operatio5 = (_this$totals0 = this.totals) === null || _this$totals0 === void 0 || (_this$totals0 = _this$totals0.operationOrder) === null || _this$totals0 === void 0 ? void 0 : _this$totals0.length) !== null && _this$totals$operatio5 !== void 0 ? _this$totals$operatio5 : 0;
+    var showOnTop = (_this$totals$showOnTo2 = (_this$totals1 = this.totals) === null || _this$totals1 === void 0 ? void 0 : _this$totals1.showOnTop) !== null && _this$totals$showOnTo2 !== void 0 ? _this$totals$showOnTo2 : false;
     var totalsRow = showOnTop ? y : y - this.table.size;
     if (totalsRow >= 0 && totalsRow < totalsRowCount) {
       return totalsRow;
@@ -866,8 +867,8 @@ class IrisGridTableModelTemplate extends IrisGridModel {
   }
   copyTotalsData(totalsData) {
     var _this$totals$defaultO2,
-      _this$totals12,
-      _this$totals13,
+      _this$totals10,
+      _this$totals11,
       _this = this;
     if (totalsData == null) {
       log.warn('invalid data!');
@@ -883,12 +884,12 @@ class IrisGridTableModelTemplate extends IrisGridModel {
     }
     var dataMap = new Map();
     var row = rows[0];
-    var defaultOperation = (_this$totals$defaultO2 = (_this$totals12 = this.totals) === null || _this$totals12 === void 0 ? void 0 : _this$totals12.defaultOperation) !== null && _this$totals$defaultO2 !== void 0 ? _this$totals$defaultO2 : AggregationOperation.SUM;
-    var operationMap = (_this$totals13 = this.totals) === null || _this$totals13 === void 0 ? void 0 : _this$totals13.operationMap;
+    var defaultOperation = (_this$totals$defaultO2 = (_this$totals10 = this.totals) === null || _this$totals10 === void 0 ? void 0 : _this$totals10.defaultOperation) !== null && _this$totals$defaultO2 !== void 0 ? _this$totals$defaultO2 : AggregationOperation.SUM;
+    var operationMap = (_this$totals11 = this.totals) === null || _this$totals11 === void 0 ? void 0 : _this$totals11.operationMap;
     var _loop = function _loop() {
       var _operationMap$name$, _operationMap$name;
       var column = columns[c];
-      var [name, operation = (_operationMap$name$ = operationMap === null || operationMap === void 0 ? void 0 : (_operationMap$name = operationMap[name]) === null || _operationMap$name === void 0 ? void 0 : _operationMap$name[0]) !== null && _operationMap$name$ !== void 0 ? _operationMap$name$ : defaultOperation] = column.name.split('__');
+      var [name, operation = (_operationMap$name$ = operationMap === null || operationMap === void 0 || (_operationMap$name = operationMap[name]) === null || _operationMap$name === void 0 ? void 0 : _operationMap$name[0]) !== null && _operationMap$name$ !== void 0 ? _operationMap$name$ : defaultOperation] = column.name.split('__');
       if (!dataMap.has(operation)) {
         dataMap.set(operation, {
           data: new Map()
@@ -931,8 +932,8 @@ class IrisGridTableModelTemplate extends IrisGridModel {
       columns
     } = data;
     for (var r = 0; r < data.rows.length; r += 1) {
-      var _row = data.rows[r];
-      var newRow = this.extractViewportRow(_row, columns);
+      var row = data.rows[r];
+      var newRow = this.extractViewportRow(row, columns);
       newData.rows.push(newRow);
     }
     return newData;
@@ -940,11 +941,11 @@ class IrisGridTableModelTemplate extends IrisGridModel {
   extractViewportRow(row, columns) {
     var data = new Map();
     for (var c = 0; c < columns.length; c += 1) {
-      var _column3 = columns[c];
-      var index = this.getColumnIndexByName(_column3.name);
-      data.set(index !== null && index !== void 0 ? index : _column3.name, {
-        value: row.get(_column3),
-        format: row.getFormat(_column3)
+      var column = columns[c];
+      var index = this.getColumnIndexByName(column.name);
+      data.set(index !== null && index !== void 0 ? index : column.name, {
+        value: row.get(column),
+        format: row.getFormat(column)
       });
     }
     return {
@@ -1040,11 +1041,6 @@ class IrisGridTableModelTemplate extends IrisGridModel {
       this.addTotalsListeners(this.totalsTable);
     }
   }
-
-  /**
-   * Applies the current viewport to the underlying table.
-   */
-
   applyBufferedViewport(viewportTop, viewportBottom, columns) {
     this.dispatchEvent(new EventShimCustomEvent(IrisGridModel.EVENT.VIEWPORT_UPDATED));
     log.debug2('applyBufferedViewport', viewportTop, viewportBottom, columns);
@@ -1215,8 +1211,8 @@ class IrisGridTableModelTemplate extends IrisGridModel {
     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 _column4 = range.startColumn; _column4 <= bound; _column4 += 1) {
-      if (this.isKeyColumn(_column4)) {
+    for (var column = range.startColumn; column <= bound; column += 1) {
+      if (this.isKeyColumn(column)) {
         isKeyColumnInRange = true;
         break;
       }
@@ -1288,8 +1284,8 @@ class IrisGridTableModelTemplate extends IrisGridModel {
           var column = _this6.columns[x];
           columnSet.add(column);
           if (formattedText[x] === undefined) {
-            var _value3 = _this6.tableUtils.makeValue(column.type, text, _this6.formatter.timeZone);
-            formattedText[x] = _value3 != null ? _this6.displayString(_value3, column.type, column.name) : null;
+            var value = _this6.tableUtils.makeValue(column.type, text, _this6.formatter.timeZone);
+            formattedText[x] = value != null ? _this6.displayString(value, column.type, column.name) : null;
           }
           _this6.cachePendingValue(x, y, formattedText[x]);
         });
@@ -1410,11 +1406,11 @@ class IrisGridTableModelTemplate extends IrisGridModel {
                 data: new Map()
               });
             }
-            var _row2 = newDataMap.get(pendingRow);
-            assertNotNull(_row2);
+            var row = newDataMap.get(pendingRow);
+            assertNotNull(row);
             var {
               data: rowData
-            } = _row2;
+            } = row;
             var newRowData = new Map(rowData);
             if (value != null) {
               newRowData.set(x, {
@@ -1424,7 +1420,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
               newRowData.delete(x);
             }
             if (newRowData.size > 0) {
-              newDataMap.set(pendingRow, _objectSpread(_objectSpread({}, _row2), {}, {
+              newDataMap.set(pendingRow, _objectSpread(_objectSpread({}, row), {}, {
                 data: newRowData
               }));
             } else {
@@ -1444,7 +1440,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
           if (!rowMap.has(y)) {
             rowMap.set(y, []);
           }
-          (_rowMap$get = rowMap.get(y)) === null || _rowMap$get === void 0 ? void 0 : _rowMap$get.push(edit);
+          (_rowMap$get = rowMap.get(y)) === null || _rowMap$get === void 0 || _rowMap$get.push(edit);
           return rowMap;
         }, new Map());
         var ranges = GridRange.consolidate(edits.map(edit => {
@@ -1560,8 +1556,8 @@ class IrisGridTableModelTemplate extends IrisGridModel {
   }
   isValidForCell(x, y, value) {
     try {
-      var _column5 = this.columns[x];
-      this.tableUtils.makeValue(_column5.type, value, this.formatter.timeZone);
+      var column = this.columns[x];
+      this.tableUtils.makeValue(column.type, value, this.formatter.timeZone);
       return true;
     } catch (e) {
       return false;