@deephaven/iris-grid 0.106.3 → 0.106.4-use-persistent-state.7

package/dist/IrisGridUtils.js

@@ -1,12 +1,12 @@
 var _excluded = ["selectedValues"],
   _excluded2 = ["selectedValues"];
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { GridUtils } from '@deephaven/grid';
 import { DateUtils, TableUtils } from '@deephaven/jsapi-utils';
 import Log from '@deephaven/log';
@@ -41,7 +41,8 @@ function isDateWrapper(value) {
 }
 class IrisGridUtils {
   /**
-   * Exports the state from Grid component to a JSON stringifiable object
+   * Exports the state from Grid component to a JSON stringifiable object.
+   * See IrisGridCacheUtil for memoization and comparing dehydrated states.
    * @param model The table model to export the Grid state for
    * @param gridState The state of the Grid to export
    * @returns An object that can be stringified and imported with {{@link hydrateGridState}}
@@ -541,18 +542,24 @@ class IrisGridUtils {
     var {
       aggregations = []
     } = aggregationSettings !== null && aggregationSettings !== void 0 ? aggregationSettings : {};
-    var aggregationColumns = aggregations.map(_ref14 => {
+    var filteredAggregations = aggregations.filter(_ref14 => {
+      var {
+        operation
+      } = _ref14;
+      return !AggregationUtils.isRollupProhibited(operation);
+    });
+    var aggregationColumns = filteredAggregations.map(_ref15 => {
       var {
         operation,
         selected,
         invert
-      } = _ref14;
+      } = _ref15;
       return AggregationUtils.isRollupOperation(operation) ? [] : AggregationUtils.getOperationColumnNames(originalColumns, operation, selected, invert);
     });
     var aggregationMap = {};
     // Aggregation columns should show first, add them first
-    for (var i = 0; i < aggregations.length; i += 1) {
-      aggregationMap[aggregations[i].operation] = aggregationColumns[i];
+    for (var i = 0; i < filteredAggregations.length; i += 1) {
+      aggregationMap[filteredAggregations[i].operation] = aggregationColumns[i];
     }
     if (showNonAggregatedColumns) {
       // Filter out any column that already has an aggregation or grouping
@@ -614,17 +621,17 @@ class IrisGridUtils {
    * @param  columnName The column name to retrieve
    */
   static getColumnByName(columns, columnName) {
-    var column = columns.find(_ref15 => {
+    var column = columns.find(_ref16 => {
       var {
         name
-      } = _ref15;
+      } = _ref16;
       return name === columnName;
     });
     if (column == null) {
-      log.error('Unable to retrieve column by name', columnName, columns.map(_ref16 => {
+      log.error('Unable to retrieve column by name', columnName, columns.map(_ref17 => {
         var {
           name
-        } = _ref16;
+        } = _ref17;
         return name;
       }));
     }
@@ -638,11 +645,11 @@ class IrisGridUtils {
    * @returns Updated filter configs with column names changed to indexes
    */
   static changeFilterColumnNamesToIndexes(columns, filters) {
-    return filters.map(_ref17 => {
+    return filters.map(_ref18 => {
       var {
         name,
         filter
-      } = _ref17;
+      } = _ref18;
       var index = columns.findIndex(column => column.name === name);
       return index < 0 ? null : [index, filter];
     }).filter(filterConfig => filterConfig != null);
@@ -712,10 +719,10 @@ class IrisGridUtils {
     var groupMap = new Map();
 
     // Remove any empty groups before parsing
-    var groups = groupsParam === null || groupsParam === void 0 ? void 0 : groupsParam.filter(_ref18 => {
+    var groups = groupsParam === null || groupsParam === void 0 ? void 0 : groupsParam.filter(_ref19 => {
       var {
         children
-      } = _ref18;
+      } = _ref19;
       return children != null && children.length > 0;
     });
     if (groups.length === 0) {
@@ -831,7 +838,8 @@ class IrisGridUtils {
   }
 
   /**
-   * Exports the state from IrisGrid to a JSON stringifiable object
+   * Exports the state from IrisGrid to a JSON stringifiable object.
+   * See IrisGridCacheUtil for memoization and comparing dehydrated states.
    * @param model The table model to export the state for
    * @param irisGridState The current state of the IrisGrid
    */
@@ -844,12 +852,18 @@ class IrisGridUtils {
       advancedFilters,
       customColumnFormatMap,
       isFilterBarShown,
-      metrics,
+      metrics: {
+        userColumnWidths,
+        userRowHeights
+      } = {
+        userColumnWidths: EMPTY_MAP,
+        userRowHeights: EMPTY_MAP
+      },
       quickFilters,
       customColumns,
       conditionalFormats = EMPTY_ARRAY,
       reverse,
-      rollupConfig = undefined,
+      rollupConfig,
       showSearchBar,
       searchValue,
       selectDistinctColumns = EMPTY_ARRAY,
@@ -859,13 +873,8 @@ class IrisGridUtils {
       pendingDataMap = EMPTY_MAP,
       frozenColumns,
       columnHeaderGroups,
-      partitionConfig = undefined
+      partitionConfig
     } = irisGridState;
-    assertNotNull(metrics);
-    var {
-      userColumnWidths,
-      userRowHeights
-    } = metrics;
     var {
       columns
     } = model;
@@ -879,11 +888,11 @@ class IrisGridUtils {
       isFilterBarShown,
       quickFilters: IrisGridUtils.dehydrateQuickFilters(quickFilters),
       sorts: IrisGridUtils.dehydrateSort(sorts),
-      userColumnWidths: [...userColumnWidths].filter(_ref19 => {
-        var [columnIndex] = _ref19;
+      userColumnWidths: [...userColumnWidths].filter(_ref20 => {
+        var [columnIndex] = _ref20;
         return columnIndex != null && columnIndex >= 0 && columnIndex < columns.length;
-      }).map(_ref20 => {
-        var [columnIndex, width] = _ref20;
+      }).map(_ref21 => {
+        var [columnIndex, width] = _ref21;
         return [columns[columnIndex].name, width];
       }),
       userRowHeights: [...userRowHeights],
@@ -916,7 +925,7 @@ class IrisGridUtils {
    * @param irisGridState The saved IrisGrid state
    */
   hydrateIrisGridState(model, irisGridState) {
-    var _ref24, _model$layoutHints;
+    var _ref25, _model$layoutHints;
     var {
       advancedFilters,
       aggregationSettings = {
@@ -956,19 +965,19 @@ class IrisGridUtils {
       isFilterBarShown,
       quickFilters: this.hydrateQuickFilters(columns, quickFilters, formatter.timeZone),
       sorts: this.hydrateSort(columns, sorts),
-      userColumnWidths: new Map(userColumnWidths.map(_ref21 => {
-        var [column, width] = _ref21;
+      userColumnWidths: new Map(userColumnWidths.map(_ref22 => {
+        var [column, width] = _ref22;
         if (typeof column === 'string' || column instanceof String) {
-          return [columns.findIndex(_ref22 => {
+          return [columns.findIndex(_ref23 => {
             var {
               name
-            } = _ref22;
+            } = _ref23;
             return name === column;
           }), width];
         }
         return [column, width];
-      }).filter(_ref23 => {
-        var [column] = _ref23;
+      }).filter(_ref24 => {
+        var [column] = _ref24;
         return column != null && column >= 0 && column < columns.length;
       })),
       customColumns,
@@ -983,7 +992,7 @@ class IrisGridUtils {
       invertSearchColumns,
       pendingDataMap: this.hydratePendingDataMap(columns, pendingDataMap),
       frozenColumns,
-      columnHeaderGroups: IrisGridUtils.parseColumnHeaderGroups(model, (_ref24 = columnHeaderGroups !== null && columnHeaderGroups !== void 0 ? columnHeaderGroups : (_model$layoutHints = model.layoutHints) === null || _model$layoutHints === void 0 ? void 0 : _model$layoutHints.columnGroups) !== null && _ref24 !== void 0 ? _ref24 : []).groups,
+      columnHeaderGroups: IrisGridUtils.parseColumnHeaderGroups(model, (_ref25 = columnHeaderGroups !== null && columnHeaderGroups !== void 0 ? columnHeaderGroups : (_model$layoutHints = model.layoutHints) === null || _model$layoutHints === void 0 ? void 0 : _model$layoutHints.columnGroups) !== null && _ref25 !== void 0 ? _ref25 : []).groups,
       partitionConfig: this.hydratePartitionConfig(partitionColumns, partitionConfig)
     };
   }
@@ -996,8 +1005,8 @@ class IrisGridUtils {
    * @returns The quick filters to apply to the columns
    */
   hydrateQuickFilters(columns, savedQuickFilters, timeZone) {
-    var importedFilters = savedQuickFilters.map(_ref25 => {
-      var [columnIndex, quickFilter] = _ref25;
+    var importedFilters = savedQuickFilters.map(_ref26 => {
+      var [columnIndex, quickFilter] = _ref26;
       var {
         text
       } = quickFilter;
@@ -1025,8 +1034,8 @@ class IrisGridUtils {
    * @returns The dehydrated advanced filters
    */
   dehydrateAdvancedFilters(columns, advancedFilters) {
-    return [...advancedFilters].map(_ref26 => {
-      var [columnIndex, advancedFilter] = _ref26;
+    return [...advancedFilters].map(_ref27 => {
+      var [columnIndex, advancedFilter] = _ref27;
       var column = IrisGridUtils.getColumn(columns, columnIndex);
       assertNotNull(column);
       var options = this.dehydrateAdvancedFilterOptions(column, advancedFilter.options);
@@ -1044,8 +1053,8 @@ class IrisGridUtils {
    * @returns The advanced filters to apply to the columns
    */
   hydrateAdvancedFilters(columns, savedAdvancedFilters, timeZone) {
-    var importedFilters = savedAdvancedFilters.map(_ref27 => {
-      var [columnIndex, advancedFilter] = _ref27;
+    var importedFilters = savedAdvancedFilters.map(_ref28 => {
+      var [columnIndex, advancedFilter] = _ref28;
       var column = IrisGridUtils.getColumn(columns, columnIndex);
       assertNotNull(column);
       var options = this.hydrateAdvancedFilterOptions(column, advancedFilter.options);
@@ -1084,16 +1093,16 @@ class IrisGridUtils {
     }, otherOptions);
   }
   dehydratePendingDataMap(columns, pendingDataMap) {
-    return [...pendingDataMap].map(_ref28 => {
+    return [...pendingDataMap].map(_ref29 => {
       var [rowIndex, {
         data
-      }] = _ref28;
+      }] = _ref29;
       return [rowIndex, {
-        data: [...data].filter(_ref29 => {
-          var [c] = _ref29;
+        data: [...data].filter(_ref30 => {
+          var [c] = _ref30;
           return typeof c === 'number';
-        }).map(_ref30 => {
-          var [c, value] = _ref30;
+        }).map(_ref31 => {
+          var [c, value] = _ref31;
           return [columns[c].name, this.dehydrateValue(value, columns[c].type)];
         })
       }];
@@ -1103,23 +1112,23 @@ class IrisGridUtils {
     var columnMap = new Map();
     var getColumnIndex = columnName => {
       if (!columnMap.has(columnName)) {
-        columnMap.set(columnName, columns.findIndex(_ref31 => {
+        columnMap.set(columnName, columns.findIndex(_ref32 => {
           var {
             name
-          } = _ref31;
+          } = _ref32;
           return name === columnName;
         }));
       }
       return columnMap.get(columnName);
     };
-    return new Map(pendingDataMap.map(_ref32 => {
+    return new Map(pendingDataMap.map(_ref33 => {
       var [rowIndex, {
         data
-      }] = _ref32;
+      }] = _ref33;
       return [rowIndex, {
-        data: new Map(data.map(_ref33 => {
+        data: new Map(data.map(_ref34 => {
           var _getColumnIndex;
-          var [columnName, value] = _ref33;
+          var [columnName, value] = _ref34;
           var index = getColumnIndex(columnName);
           assertNotNull(index);
           return [(_getColumnIndex = getColumnIndex(columnName)) !== null && _getColumnIndex !== void 0 ? _getColumnIndex : null, this.hydrateValue(value, columns[index].type)];
@@ -1268,17 +1277,17 @@ class IrisGridUtils {
   getFiltersFromInputFilters(columns) {
     var inputFilters = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
     var timeZone = arguments.length > 2 ? arguments[2] : undefined;
-    return inputFilters.map(_ref34 => {
+    return inputFilters.map(_ref35 => {
       var {
         name,
         type,
         value
-      } = _ref34;
-      var column = columns.find(_ref35 => {
+      } = _ref35;
+      var column = columns.find(_ref36 => {
         var {
           name: columnName,
           type: columnType
-        } = _ref35;
+        } = _ref36;
         return columnName === name && columnType === type;
       });
       if (column) {