@deephaven/iris-grid 0.38.1-beta.5 → 0.38.1

package/dist/IrisGridUtils.js

@@ -1,13 +1,14 @@
 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(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; }
 import { GridUtils } from '@deephaven/grid';
+import dh from '@deephaven/jsapi-shim';
 import { DateUtils, TableUtils } from '@deephaven/jsapi-utils';
 import Log from '@deephaven/log';
 import { assertNotNull, EMPTY_ARRAY, EMPTY_MAP } from '@deephaven/utils';
@@ -116,6 +117,152 @@ class IrisGridUtils {
     };
   }
 
+  /**
+   * Exports the state from IrisGrid to a JSON stringifiable object
+   * @param model The table model to export the state for
+   * @param irisGridState The current state of the IrisGrid
+   */
+  static dehydrateIrisGridState(model, irisGridState) {
+    var {
+      aggregationSettings = {
+        aggregations: EMPTY_ARRAY,
+        showOnTop: false
+      },
+      advancedFilters,
+      customColumnFormatMap,
+      isFilterBarShown,
+      metrics,
+      quickFilters,
+      customColumns,
+      conditionalFormats = EMPTY_ARRAY,
+      reverseType,
+      rollupConfig = undefined,
+      showSearchBar,
+      searchValue,
+      selectDistinctColumns = EMPTY_ARRAY,
+      selectedSearchColumns,
+      sorts,
+      invertSearchColumns,
+      pendingDataMap = EMPTY_MAP,
+      frozenColumns,
+      columnHeaderGroups
+    } = irisGridState;
+    assertNotNull(metrics);
+    var {
+      userColumnWidths,
+      userRowHeights
+    } = metrics;
+    var {
+      columns
+    } = model;
+    return {
+      advancedFilters: IrisGridUtils.dehydrateAdvancedFilters(columns, advancedFilters),
+      aggregationSettings,
+      customColumnFormatMap: [...customColumnFormatMap],
+      isFilterBarShown,
+      quickFilters: IrisGridUtils.dehydrateQuickFilters(quickFilters),
+      sorts: IrisGridUtils.dehydrateSort(sorts),
+      userColumnWidths: [...userColumnWidths].filter(_ref6 => {
+        var [columnIndex] = _ref6;
+        return columnIndex != null && columnIndex >= 0 && columnIndex < columns.length;
+      }).map(_ref7 => {
+        var [columnIndex, width] = _ref7;
+        return [columns[columnIndex].name, width];
+      }),
+      userRowHeights: [...userRowHeights],
+      customColumns: [...customColumns],
+      conditionalFormats: [...conditionalFormats],
+      reverseType,
+      rollupConfig,
+      showSearchBar,
+      searchValue,
+      selectDistinctColumns: [...selectDistinctColumns],
+      selectedSearchColumns,
+      invertSearchColumns,
+      pendingDataMap: IrisGridUtils.dehydratePendingDataMap(columns, pendingDataMap),
+      frozenColumns,
+      columnHeaderGroups: columnHeaderGroups === null || columnHeaderGroups === void 0 ? void 0 : columnHeaderGroups.map(item => ({
+        name: item.name,
+        children: item.children,
+        color: item.color
+      }))
+    };
+  }
+
+  /**
+   * Import a state for IrisGrid that was exported with {{@link dehydrateIrisGridState}}
+   * @param model The table model to import the state with
+   * @param irisGridState The saved IrisGrid state
+   */
+  static hydrateIrisGridState(model, irisGridState) {
+    var _ref11, _model$layoutHints;
+    var {
+      advancedFilters,
+      aggregationSettings = {
+        aggregations: [],
+        showOnTop: false
+      },
+      customColumnFormatMap,
+      isFilterBarShown,
+      quickFilters,
+      sorts,
+      customColumns,
+      conditionalFormats,
+      userColumnWidths,
+      userRowHeights,
+      reverseType,
+      rollupConfig = undefined,
+      showSearchBar,
+      searchValue,
+      selectDistinctColumns,
+      selectedSearchColumns,
+      invertSearchColumns = true,
+      pendingDataMap = [],
+      frozenColumns,
+      columnHeaderGroups
+    } = irisGridState;
+    var {
+      columns,
+      formatter
+    } = model;
+    return {
+      advancedFilters: IrisGridUtils.hydrateAdvancedFilters(columns, advancedFilters, formatter.timeZone),
+      aggregationSettings,
+      customColumnFormatMap: new Map(customColumnFormatMap),
+      isFilterBarShown,
+      quickFilters: IrisGridUtils.hydrateQuickFilters(columns, quickFilters, formatter.timeZone),
+      sorts: IrisGridUtils.hydrateSort(columns, sorts),
+      userColumnWidths: new Map(userColumnWidths.map(_ref8 => {
+        var [column, width] = _ref8;
+        if (typeof column === 'string' || column instanceof String) {
+          return [columns.findIndex(_ref9 => {
+            var {
+              name
+            } = _ref9;
+            return name === column;
+          }), width];
+        }
+        return [column, width];
+      }).filter(_ref10 => {
+        var [column] = _ref10;
+        return column != null && column >= 0 && column < columns.length;
+      })),
+      customColumns,
+      conditionalFormats,
+      userRowHeights: new Map(userRowHeights),
+      reverseType,
+      rollupConfig,
+      showSearchBar,
+      searchValue,
+      selectDistinctColumns,
+      selectedSearchColumns,
+      invertSearchColumns,
+      pendingDataMap: IrisGridUtils.hydratePendingDataMap(columns, pendingDataMap),
+      frozenColumns,
+      columnHeaderGroups: IrisGridUtils.parseColumnHeaderGroups(model, (_ref11 = columnHeaderGroups !== null && columnHeaderGroups !== void 0 ? columnHeaderGroups : (_model$layoutHints = model.layoutHints) === null || _model$layoutHints === void 0 ? void 0 : _model$layoutHints.columnGroups) !== null && _ref11 !== void 0 ? _ref11 : []).groups
+    };
+  }
+
   /**
    * Export the IrisGridPanel state.
    * @param model The table model the state is being dehydrated with
@@ -167,8 +314,8 @@ class IrisGridUtils {
    * @returns The dehydrated quick filters
    */
   static dehydrateQuickFilters(quickFilters) {
-    return [...quickFilters].map(_ref6 => {
-      var [columnIndex, quickFilter] = _ref6;
+    return [...quickFilters].map(_ref12 => {
+      var [columnIndex, quickFilter] = _ref12;
       var {
         text
       } = quickFilter;
@@ -177,107 +324,387 @@ class IrisGridUtils {
       }];
     });
   }
-  static dehydrateLong(value) {
-    return value != null ? "".concat(value) : null;
-  }
 
   /**
-   * Export the sorts from the provided table sorts to JSON stringifiable object
-   * @param  sorts The table sorts
-   * @returns The dehydrated sorts
+   * Import the saved quick filters to apply to the columns. Does not actually apply the filters.
+   * @param  columns The columns the filters will be applied to
+   * @param  savedQuickFilters Exported quick filters definitions
+   * @param  timeZone The time zone to make this value in if it is a date type. E.g. America/New_York
+   * @returns The quick filters to apply to the columns
    */
-  static dehydrateSort(sorts) {
-    return sorts.map(sort => {
+  static hydrateQuickFilters(columns, savedQuickFilters, timeZone) {
+    var importedFilters = savedQuickFilters.map(_ref13 => {
+      var [columnIndex, quickFilter] = _ref13;
       var {
-        column,
-        isAbs,
-        direction
-      } = sort;
-      return {
-        column: column.name,
-        isAbs,
-        direction
-      };
+        text
+      } = quickFilter;
+      var filter = null;
+      try {
+        var column = IrisGridUtils.getColumn(columns, columnIndex);
+        if (column != null) {
+          filter = TableUtils.makeQuickFilter(column, text, timeZone);
+        }
+      } catch (error) {
+        log.error('hydrateQuickFilters error with', text, error);
+      }
+      return [columnIndex, {
+        text,
+        filter
+      }];
     });
+    return new Map(importedFilters);
   }
 
   /**
-   * Pulls just the table settings from the panel state, eg. filters/sorts
-   * @param  panelState The dehydrated panel state
-   * @returns A dehydrated table settings object, { partition, partitionColumn, advancedFilters, quickFilters, sorts }
+   * Export the advanced filters from the provided columns to JSON striginfiable object
+   * @param columns The columns for the filters
+   * @param advancedFilters The advanced filters to dehydrate
+   * @returns The dehydrated advanced filters
    */
-  static extractTableSettings(panelState) {
-    var inputFilters = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-    var {
-      irisGridPanelState,
-      irisGridState
-    } = panelState;
-    var {
-      partitionColumn,
-      partition
-    } = irisGridPanelState;
-    var {
-      advancedFilters,
-      quickFilters,
-      sorts
-    } = irisGridState;
-    return {
-      advancedFilters,
-      inputFilters,
-      partition,
-      partitionColumn,
-      quickFilters,
-      sorts
-    };
-  }
-  static getInputFiltersForColumns(columns) {
-    var inputFilters = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-    return inputFilters.filter(_ref7 => {
-      var {
-        name,
-        type
-      } = _ref7;
-      return columns.find(_ref8 => {
-        var {
-          name: columnName,
-          type: columnType
-        } = _ref8;
-        return columnName === name && columnType === type;
-      });
+  static dehydrateAdvancedFilters(columns, advancedFilters) {
+    return [...advancedFilters].map(_ref14 => {
+      var [columnIndex, advancedFilter] = _ref14;
+      var column = IrisGridUtils.getColumn(columns, columnIndex);
+      assertNotNull(column);
+      var options = IrisGridUtils.dehydrateAdvancedFilterOptions(column, advancedFilter.options);
+      return [columnIndex, {
+        options
+      }];
     });
   }
-  static getFiltersFromFilterMap(filterMap) {
-    var filters = [];
-    var keys = Array.from(filterMap.keys());
-    for (var i = 0; i < keys.length; i += 1) {
-      var key = keys[i];
-      var item = filterMap.get(key);
-      if ((item === null || item === void 0 ? void 0 : item.filter) != null) {
-        filters.push(item.filter);
-      }
-    }
-    return filters;
-  }
 
   /**
-   * Get array of hidden column indexes
-   * @param  userColumnWidths Map of user column widths
-   * @returns Array of hidden column indexes
+   * Import the saved advanced filters to apply to the columns. Does not actually apply the filters.
+   * @param  columns The columns the filters will be applied to
+   * @param  savedAdvancedFilters Exported advanced filters definitions
+   * @param  timeZone The time zone to make this filter in if it is a date type. E.g. America/New_York
+   * @returns The advanced filters to apply to the columns
    */
-  static getHiddenColumns(userColumnWidths) {
-    return [...userColumnWidths.entries()].filter(_ref9 => {
-      var [, value] = _ref9;
-      return value === 0;
-    }).map(_ref10 => {
-      var [key] = _ref10;
-      return key;
+  static hydrateAdvancedFilters(columns, savedAdvancedFilters, timeZone) {
+    var importedFilters = savedAdvancedFilters.map(_ref15 => {
+      var [columnIndex, advancedFilter] = _ref15;
+      var column = IrisGridUtils.getColumn(columns, columnIndex);
+      assertNotNull(column);
+      var options = IrisGridUtils.hydrateAdvancedFilterOptions(column, advancedFilter.options);
+      var filter = null;
+      try {
+        var columnRetrieved = IrisGridUtils.getColumn(columns, columnIndex);
+        if (columnRetrieved != null) {
+          filter = TableUtils.makeAdvancedFilter(column, options, timeZone);
+        }
+      } catch (error) {
+        log.error('hydrateAdvancedFilters error with', options, error);
+      }
+      return [columnIndex, {
+        options,
+        filter
+      }];
     });
+    return new Map(importedFilters);
   }
-  static parseCustomColumnNames(customColumns) {
-    return customColumns.map(customColumn => customColumn.split('=')[0]);
-  }
-  static getRemovedCustomColumnNames(oldCustomColumns, customColumns) {
-    var oldCustomColumnsNames = IrisGridUtils.parseCustomColumnNames(oldCustomColumns);
+  static dehydrateAdvancedFilterOptions(column, options) {
+    var {
+        selectedValues
+      } = options,
+      otherOptions = _objectWithoutProperties(options, _excluded);
+    return _objectSpread({
+      selectedValues: selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.map(value => IrisGridUtils.dehydrateValue(value, column === null || column === void 0 ? void 0 : column.type))
+    }, otherOptions);
+  }
+  static hydrateAdvancedFilterOptions(column, options) {
+    var {
+        selectedValues
+      } = options,
+      otherOptions = _objectWithoutProperties(options, _excluded2);
+    return _objectSpread({
+      selectedValues: selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.map(value => IrisGridUtils.hydrateValue(value, column === null || column === void 0 ? void 0 : column.type))
+    }, otherOptions);
+  }
+  static dehydratePendingDataMap(columns, pendingDataMap) {
+    return [...pendingDataMap].map(_ref16 => {
+      var [rowIndex, {
+        data
+      }] = _ref16;
+      return [rowIndex, {
+        data: [...data].map(_ref17 => {
+          var [c, value] = _ref17;
+          return [columns[c].name, IrisGridUtils.dehydrateValue(value, columns[c].type)];
+        })
+      }];
+    });
+  }
+  static hydratePendingDataMap(columns, pendingDataMap) {
+    var columnMap = new Map();
+    var getColumnIndex = columnName => {
+      if (!columnMap.has(columnName)) {
+        columnMap.set(columnName, columns.findIndex(_ref18 => {
+          var {
+            name
+          } = _ref18;
+          return name === columnName;
+        }));
+      }
+      return columnMap.get(columnName);
+    };
+    return new Map(pendingDataMap.map(_ref19 => {
+      var [rowIndex, {
+        data
+      }] = _ref19;
+      return [rowIndex, {
+        data: new Map(data.map(_ref20 => {
+          var _getColumnIndex;
+          var [columnName, value] = _ref20;
+          var index = getColumnIndex(columnName);
+          assertNotNull(index);
+          return [(_getColumnIndex = getColumnIndex(columnName)) !== null && _getColumnIndex !== void 0 ? _getColumnIndex : null, IrisGridUtils.hydrateValue(value, columns[index].type)];
+        }))
+      }];
+    }));
+  }
+
+  /**
+   * Dehydrates/serializes a value for storage.
+   * @param  value The value to dehydrate
+   * @param  columnType The column type
+   */
+  static dehydrateValue(value, columnType) {
+    if (TableUtils.isDateType(columnType)) {
+      return IrisGridUtils.dehydrateDateTime(value);
+    }
+    if (TableUtils.isLongType(columnType)) {
+      return IrisGridUtils.dehydrateLong(value);
+    }
+    return value;
+  }
+
+  /**
+   * Hydrate a value from it's serialized state
+   * @param  value The dehydrated value that needs to be hydrated
+   * @param  columnType The type of column
+   */
+  static hydrateValue(value, columnType) {
+    if (TableUtils.isDateType(columnType)) {
+      return IrisGridUtils.hydrateDateTime(value);
+    }
+    if (TableUtils.isLongType(columnType)) {
+      return IrisGridUtils.hydrateLong(value);
+    }
+    return value;
+  }
+  static dehydrateDateTime(value) {
+    return value != null ? dh.i18n.DateTimeFormat.format(DateUtils.FULL_DATE_FORMAT, value) : null;
+  }
+  static hydrateDateTime(value) {
+    return value != null ? dh.i18n.DateTimeFormat.parse(DateUtils.FULL_DATE_FORMAT, value) : null;
+  }
+  static dehydrateLong(value) {
+    return value != null ? "".concat(value) : null;
+  }
+  static hydrateLong(value) {
+    return value != null ? dh.LongWrapper.ofString(value) : null;
+  }
+
+  /**
+   * Export the sorts from the provided table sorts to JSON stringifiable object
+   * @param  sorts The table sorts
+   * @returns The dehydrated sorts
+   */
+  static dehydrateSort(sorts) {
+    return sorts.map(sort => {
+      var {
+        column,
+        isAbs,
+        direction
+      } = sort;
+      return {
+        column: column.name,
+        isAbs,
+        direction
+      };
+    });
+  }
+
+  /**
+   * Import the saved sorts to apply to the table. Does not actually apply the sort.
+   * @param  columns The columns the sorts will be applied to
+   * @param  sorts Exported sort definitions
+   * @returns The sorts to apply to the table
+   */
+  static hydrateSort(columns, sorts) {
+    return sorts.map(sort => {
+      var {
+        column: columnIndexOrName,
+        isAbs,
+        direction
+      } = sort;
+      if (direction === TableUtils.sortDirection.reverse) {
+        return dh.Table.reverse();
+      }
+      var column = typeof columnIndexOrName === 'string' ? IrisGridUtils.getColumnByName(columns, columnIndexOrName) : IrisGridUtils.getColumn(columns, columnIndexOrName);
+      if (column != null) {
+        var columnSort = column.sort();
+        if (isAbs) {
+          columnSort = columnSort.abs();
+        }
+        if (direction === TableUtils.sortDirection.descending) {
+          columnSort = columnSort.desc();
+        } else {
+          columnSort = columnSort.asc();
+        }
+        return columnSort;
+      }
+      return null;
+    })
+    // If we can't find the column any more, it's null, filter it out
+    // If the item is a reverse sort item, filter it out - it will get applied with the `reverseType` property
+    // This should only happen when loading a legacy dashboard
+    .filter(item => item != null && item.direction !== TableUtils.sortDirection.reverse);
+  }
+
+  /**
+   * Pulls just the table settings from the panel state, eg. filters/sorts
+   * @param  panelState The dehydrated panel state
+   * @returns A dehydrated table settings object, { partition, partitionColumn, advancedFilters, quickFilters, sorts }
+   */
+  static extractTableSettings(panelState) {
+    var inputFilters = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    var {
+      irisGridPanelState,
+      irisGridState
+    } = panelState;
+    var {
+      partitionColumn,
+      partition
+    } = irisGridPanelState;
+    var {
+      advancedFilters,
+      quickFilters,
+      sorts
+    } = irisGridState;
+    return {
+      advancedFilters,
+      inputFilters,
+      partition,
+      partitionColumn,
+      quickFilters,
+      sorts
+    };
+  }
+
+  /**
+   * Applies the passed in table settings directly to the provided table
+   * @param  table The table to apply the settings to
+   * @param  tableSettings Dehydrated table settings extracted with `extractTableSettings`
+   * @param  timeZone The time zone to make this value in if it is a date type. E.g. America/New_York
+   */
+  static applyTableSettings(table, tableSettings, timeZone) {
+    var {
+      columns
+    } = table;
+    var quickFilters = [];
+    if (tableSettings.quickFilters) {
+      quickFilters = IrisGridUtils.getFiltersFromFilterMap(IrisGridUtils.hydrateQuickFilters(columns, tableSettings.quickFilters, timeZone));
+    }
+    var advancedFilters = [];
+    if (tableSettings.advancedFilters) {
+      advancedFilters = IrisGridUtils.getFiltersFromFilterMap(IrisGridUtils.hydrateAdvancedFilters(columns, tableSettings.advancedFilters, timeZone));
+    }
+    var inputFilters = IrisGridUtils.getFiltersFromInputFilters(columns, tableSettings.inputFilters, timeZone);
+    var sorts = [];
+    if (tableSettings.sorts) {
+      sorts = IrisGridUtils.hydrateSort(columns, tableSettings.sorts);
+    }
+    var filters = [...quickFilters, ...advancedFilters];
+    var {
+      partition,
+      partitionColumn: partitionColumnName
+    } = tableSettings;
+    if (partition != null && partitionColumnName != null) {
+      var partitionColumn = IrisGridUtils.getColumnByName(columns, partitionColumnName);
+      if (partitionColumn) {
+        var partitionFilter = partitionColumn.filter().eq(dh.FilterValue.ofString(partition));
+        filters = [partitionFilter, ...filters];
+      }
+    }
+    filters = [...inputFilters, ...filters];
+    table.applyFilter(filters);
+    table.applySort(sorts);
+  }
+  static getInputFiltersForColumns(columns) {
+    var inputFilters = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    return inputFilters.filter(_ref21 => {
+      var {
+        name,
+        type
+      } = _ref21;
+      return columns.find(_ref22 => {
+        var {
+          name: columnName,
+          type: columnType
+        } = _ref22;
+        return columnName === name && columnType === type;
+      });
+    });
+  }
+  static getFiltersFromInputFilters(columns) {
+    var inputFilters = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    var timeZone = arguments.length > 2 ? arguments[2] : undefined;
+    return inputFilters.map(_ref23 => {
+      var {
+        name,
+        type,
+        value
+      } = _ref23;
+      var column = columns.find(_ref24 => {
+        var {
+          name: columnName,
+          type: columnType
+        } = _ref24;
+        return columnName === name && columnType === type;
+      });
+      if (column) {
+        try {
+          return TableUtils.makeQuickFilter(column, value, timeZone);
+        } catch (e) {
+          // It may be unable to create it because user hasn't completed their input
+          log.debug('Unable to create input filter', e);
+        }
+      }
+      return null;
+    }).filter(filter => filter != null);
+  }
+  static getFiltersFromFilterMap(filterMap) {
+    var filters = [];
+    var keys = Array.from(filterMap.keys());
+    for (var i = 0; i < keys.length; i += 1) {
+      var key = keys[i];
+      var item = filterMap.get(key);
+      if ((item === null || item === void 0 ? void 0 : item.filter) != null) {
+        filters.push(item.filter);
+      }
+    }
+    return filters;
+  }
+
+  /**
+   * Get array of hidden column indexes
+   * @param  userColumnWidths Map of user column widths
+   * @returns Array of hidden column indexes
+   */
+  static getHiddenColumns(userColumnWidths) {
+    return [...userColumnWidths.entries()].filter(_ref25 => {
+      var [, value] = _ref25;
+      return value === 0;
+    }).map(_ref26 => {
+      var [key] = _ref26;
+      return key;
+    });
+  }
+  static parseCustomColumnNames(customColumns) {
+    return customColumns.map(customColumn => customColumn.split('=')[0]);
+  }
+  static getRemovedCustomColumnNames(oldCustomColumns, customColumns) {
+    var oldCustomColumnsNames = IrisGridUtils.parseCustomColumnNames(oldCustomColumns);
     var customColumnNames = IrisGridUtils.parseCustomColumnNames(customColumns);
     return oldCustomColumnsNames.filter(oldCustomColumnName => !customColumnNames.includes(oldCustomColumnName));
   }
@@ -285,10 +712,10 @@ class IrisGridUtils {
     return sorts.filter(sort => !columnNames.includes(sort.column.name));
   }
   static removeFiltersInColumns(columns, filters, removedColumnNames) {
-    var columnNames = columns.map(_ref11 => {
+    var columnNames = columns.map(_ref27 => {
       var {
         name
-      } = _ref11;
+      } = _ref27;
       return name;
     });
     var newFilter = new Map(filters);
@@ -296,10 +723,10 @@ class IrisGridUtils {
     return newFilter;
   }
   static removeColumnFromMovedColumns(columns, movedColumns, removedColumnNames) {
-    var columnNames = columns.map(_ref12 => {
+    var columnNames = columns.map(_ref28 => {
       var {
         name
-      } = _ref12;
+      } = _ref28;
       return name;
     });
     var newMoves = [...movedColumns];
@@ -387,10 +814,10 @@ class IrisGridUtils {
   static getColumnsToFetch(tableColumns, viewportColumns, alwaysFetchColumnNames) {
     var columnsToFetch = [...viewportColumns];
     alwaysFetchColumnNames.forEach(columnName => {
-      var column = tableColumns.find(_ref13 => {
+      var column = tableColumns.find(_ref29 => {
         var {
           name
-        } = _ref13;
+        } = _ref29;
         return name === columnName;
       });
       if (column != null && !viewportColumns.includes(column)) {
@@ -415,8 +842,32 @@ class IrisGridUtils {
   }
 
   /**
-   * Validate whether the ranges passed in are valid to take a snapshot from.
-   * Multiple selections are valid if all of the selected rows have the same columns selected.
+   * Get the dh.RangeSet representation of the provided ranges.
+   * Ranges are sorted prior to creating the RangeSet. Only the rows are taken into account,
+   * RangeSet does not have an option for columns.
+   * @param  ranges The ranges to get the range set for
+   * @returns The rangeset for the provided ranges
+   */
+  static rangeSetFromRanges(ranges) {
+    var rangeSets = ranges.slice().sort((a, b) => {
+      assertNotNull(a.startRow);
+      assertNotNull(b.startRow);
+      return a.startRow - b.startRow;
+    }).map(range => {
+      var {
+        startRow,
+        endRow
+      } = range;
+      assertNotNull(startRow);
+      assertNotNull(endRow);
+      return dh.RangeSet.ofRange(startRow, endRow);
+    });
+    return dh.RangeSet.ofRanges(rangeSets);
+  }
+
+  /**
+   * Validate whether the ranges passed in are valid to take a snapshot from.
+   * Multiple selections are valid if all of the selected rows have the same columns selected.
    *
    * @param ranges The ranges to validate
    * @returns True if the ranges are valid, false otherwise
@@ -534,12 +985,12 @@ class IrisGridUtils {
     var {
       aggregations = []
     } = aggregationSettings !== null && aggregationSettings !== void 0 ? aggregationSettings : {};
-    var aggregationColumns = aggregations.map(_ref14 => {
+    var aggregationColumns = aggregations.map(_ref30 => {
       var {
         operation,
         selected,
         invert
-      } = _ref14;
+      } = _ref30;
       return AggregationUtils.isRollupOperation(operation) ? [] : AggregationUtils.getOperationColumnNames(originalColumns, operation, selected, invert);
     });
     var aggregationMap = {};
@@ -607,17 +1058,17 @@ class IrisGridUtils {
    * @param  columnName The column name to retrieve
    */
   static getColumnByName(columns, columnName) {
-    var column = columns.find(_ref15 => {
+    var column = columns.find(_ref31 => {
       var {
         name
-      } = _ref15;
+      } = _ref31;
       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(_ref32 => {
         var {
           name
-        } = _ref16;
+        } = _ref32;
         return name;
       }));
     }
@@ -631,11 +1082,11 @@ class IrisGridUtils {
    * @returns Updated filter configs with column names changed to indexes
    */
   static changeFilterColumnNamesToIndexes(columns, filters) {
-    return filters.map(_ref17 => {
+    return filters.map(_ref33 => {
       var {
         name,
         filter
-      } = _ref17;
+      } = _ref33;
       var index = columns.findIndex(column => column.name === name);
       return index < 0 ? null : [index, filter];
     }).filter(filterConfig => filterConfig != null);
@@ -705,10 +1156,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(_ref34 => {
       var {
         children
-      } = _ref18;
+      } = _ref34;
       return children.length > 0;
     });
     if (groups.length === 0) {
@@ -808,468 +1259,6 @@ class IrisGridUtils {
     }
     return "".concat(value);
   }
-  constructor(dh) {
-    _defineProperty(this, "dh", void 0);
-    _defineProperty(this, "tableUtils", void 0);
-    this.dh = dh;
-    this.tableUtils = new TableUtils(dh);
-  }
-
-  /**
-   * Exports the state from IrisGrid to a JSON stringifiable object
-   * @param model The table model to export the state for
-   * @param irisGridState The current state of the IrisGrid
-   */
-  dehydrateIrisGridState(model, irisGridState) {
-    var {
-      aggregationSettings = {
-        aggregations: EMPTY_ARRAY,
-        showOnTop: false
-      },
-      advancedFilters,
-      customColumnFormatMap,
-      isFilterBarShown,
-      metrics,
-      quickFilters,
-      customColumns,
-      conditionalFormats = EMPTY_ARRAY,
-      reverseType,
-      rollupConfig = undefined,
-      showSearchBar,
-      searchValue,
-      selectDistinctColumns = EMPTY_ARRAY,
-      selectedSearchColumns,
-      sorts,
-      invertSearchColumns,
-      pendingDataMap = EMPTY_MAP,
-      frozenColumns,
-      columnHeaderGroups
-    } = irisGridState;
-    assertNotNull(metrics);
-    var {
-      userColumnWidths,
-      userRowHeights
-    } = metrics;
-    var {
-      columns
-    } = model;
-    return {
-      advancedFilters: this.dehydrateAdvancedFilters(columns, advancedFilters),
-      aggregationSettings,
-      customColumnFormatMap: [...customColumnFormatMap],
-      isFilterBarShown,
-      quickFilters: IrisGridUtils.dehydrateQuickFilters(quickFilters),
-      sorts: IrisGridUtils.dehydrateSort(sorts),
-      userColumnWidths: [...userColumnWidths].filter(_ref19 => {
-        var [columnIndex] = _ref19;
-        return columnIndex != null && columnIndex >= 0 && columnIndex < columns.length;
-      }).map(_ref20 => {
-        var [columnIndex, width] = _ref20;
-        return [columns[columnIndex].name, width];
-      }),
-      userRowHeights: [...userRowHeights],
-      customColumns: [...customColumns],
-      conditionalFormats: [...conditionalFormats],
-      reverseType,
-      rollupConfig,
-      showSearchBar,
-      searchValue,
-      selectDistinctColumns: [...selectDistinctColumns],
-      selectedSearchColumns,
-      invertSearchColumns,
-      pendingDataMap: this.dehydratePendingDataMap(columns, pendingDataMap),
-      frozenColumns,
-      columnHeaderGroups: columnHeaderGroups === null || columnHeaderGroups === void 0 ? void 0 : columnHeaderGroups.map(item => ({
-        name: item.name,
-        children: item.children,
-        color: item.color
-      }))
-    };
-  }
-
-  /**
-   * Import a state for IrisGrid that was exported with {{@link dehydrateIrisGridState}}
-   * @param model The table model to import the state with
-   * @param irisGridState The saved IrisGrid state
-   */
-  hydrateIrisGridState(model, irisGridState) {
-    var _ref24, _model$layoutHints;
-    var {
-      advancedFilters,
-      aggregationSettings = {
-        aggregations: [],
-        showOnTop: false
-      },
-      customColumnFormatMap,
-      isFilterBarShown,
-      quickFilters,
-      sorts,
-      customColumns,
-      conditionalFormats,
-      userColumnWidths,
-      userRowHeights,
-      reverseType,
-      rollupConfig = undefined,
-      showSearchBar,
-      searchValue,
-      selectDistinctColumns,
-      selectedSearchColumns,
-      invertSearchColumns = true,
-      pendingDataMap = [],
-      frozenColumns,
-      columnHeaderGroups
-    } = irisGridState;
-    var {
-      columns,
-      formatter
-    } = model;
-    return {
-      advancedFilters: this.hydrateAdvancedFilters(columns, advancedFilters, formatter.timeZone),
-      aggregationSettings,
-      customColumnFormatMap: new Map(customColumnFormatMap),
-      isFilterBarShown,
-      quickFilters: this.hydrateQuickFilters(columns, quickFilters, formatter.timeZone),
-      sorts: this.hydrateSort(columns, sorts),
-      userColumnWidths: new Map(userColumnWidths.map(_ref21 => {
-        var [column, width] = _ref21;
-        if (typeof column === 'string' || column instanceof String) {
-          return [columns.findIndex(_ref22 => {
-            var {
-              name
-            } = _ref22;
-            return name === column;
-          }), width];
-        }
-        return [column, width];
-      }).filter(_ref23 => {
-        var [column] = _ref23;
-        return column != null && column >= 0 && column < columns.length;
-      })),
-      customColumns,
-      conditionalFormats,
-      userRowHeights: new Map(userRowHeights),
-      reverseType,
-      rollupConfig,
-      showSearchBar,
-      searchValue,
-      selectDistinctColumns,
-      selectedSearchColumns,
-      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
-    };
-  }
-
-  /**
-   * Import the saved quick filters to apply to the columns. Does not actually apply the filters.
-   * @param  columns The columns the filters will be applied to
-   * @param  savedQuickFilters Exported quick filters definitions
-   * @param  timeZone The time zone to make this value in if it is a date type. E.g. America/New_York
-   * @returns The quick filters to apply to the columns
-   */
-  hydrateQuickFilters(columns, savedQuickFilters, timeZone) {
-    var importedFilters = savedQuickFilters.map(_ref25 => {
-      var [columnIndex, quickFilter] = _ref25;
-      var {
-        text
-      } = quickFilter;
-      var filter = null;
-      try {
-        var column = IrisGridUtils.getColumn(columns, columnIndex);
-        if (column != null) {
-          filter = this.tableUtils.makeQuickFilter(column, text, timeZone);
-        }
-      } catch (error) {
-        log.error('hydrateQuickFilters error with', text, error);
-      }
-      return [columnIndex, {
-        text,
-        filter
-      }];
-    });
-    return new Map(importedFilters);
-  }
-
-  /**
-   * Export the advanced filters from the provided columns to JSON striginfiable object
-   * @param columns The columns for the filters
-   * @param advancedFilters The advanced filters to dehydrate
-   * @returns The dehydrated advanced filters
-   */
-  dehydrateAdvancedFilters(columns, advancedFilters) {
-    return [...advancedFilters].map(_ref26 => {
-      var [columnIndex, advancedFilter] = _ref26;
-      var column = IrisGridUtils.getColumn(columns, columnIndex);
-      assertNotNull(column);
-      var options = this.dehydrateAdvancedFilterOptions(column, advancedFilter.options);
-      return [columnIndex, {
-        options
-      }];
-    });
-  }
-
-  /**
-   * Import the saved advanced filters to apply to the columns. Does not actually apply the filters.
-   * @param  columns The columns the filters will be applied to
-   * @param  savedAdvancedFilters Exported advanced filters definitions
-   * @param  timeZone The time zone to make this filter in if it is a date type. E.g. America/New_York
-   * @returns The advanced filters to apply to the columns
-   */
-  hydrateAdvancedFilters(columns, savedAdvancedFilters, timeZone) {
-    var importedFilters = savedAdvancedFilters.map(_ref27 => {
-      var [columnIndex, advancedFilter] = _ref27;
-      var column = IrisGridUtils.getColumn(columns, columnIndex);
-      assertNotNull(column);
-      var options = this.hydrateAdvancedFilterOptions(column, advancedFilter.options);
-      var filter = null;
-      try {
-        var columnRetrieved = IrisGridUtils.getColumn(columns, columnIndex);
-        if (columnRetrieved != null) {
-          filter = this.tableUtils.makeAdvancedFilter(column, options, timeZone);
-        }
-      } catch (error) {
-        log.error('hydrateAdvancedFilters error with', options, error);
-      }
-      return [columnIndex, {
-        options,
-        filter
-      }];
-    });
-    return new Map(importedFilters);
-  }
-  dehydrateAdvancedFilterOptions(column, options) {
-    var {
-        selectedValues
-      } = options,
-      otherOptions = _objectWithoutProperties(options, _excluded);
-    return _objectSpread({
-      selectedValues: selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.map(value => this.dehydrateValue(value, column === null || column === void 0 ? void 0 : column.type))
-    }, otherOptions);
-  }
-  hydrateAdvancedFilterOptions(column, options) {
-    var {
-        selectedValues
-      } = options,
-      otherOptions = _objectWithoutProperties(options, _excluded2);
-    return _objectSpread({
-      selectedValues: selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.map(value => this.hydrateValue(value, column === null || column === void 0 ? void 0 : column.type))
-    }, otherOptions);
-  }
-  dehydratePendingDataMap(columns, pendingDataMap) {
-    return [...pendingDataMap].map(_ref28 => {
-      var [rowIndex, {
-        data
-      }] = _ref28;
-      return [rowIndex, {
-        data: [...data].map(_ref29 => {
-          var [c, value] = _ref29;
-          return [columns[c].name, this.dehydrateValue(value, columns[c].type)];
-        })
-      }];
-    });
-  }
-  hydratePendingDataMap(columns, pendingDataMap) {
-    var columnMap = new Map();
-    var getColumnIndex = columnName => {
-      if (!columnMap.has(columnName)) {
-        columnMap.set(columnName, columns.findIndex(_ref30 => {
-          var {
-            name
-          } = _ref30;
-          return name === columnName;
-        }));
-      }
-      return columnMap.get(columnName);
-    };
-    return new Map(pendingDataMap.map(_ref31 => {
-      var [rowIndex, {
-        data
-      }] = _ref31;
-      return [rowIndex, {
-        data: new Map(data.map(_ref32 => {
-          var _getColumnIndex;
-          var [columnName, value] = _ref32;
-          var index = getColumnIndex(columnName);
-          assertNotNull(index);
-          return [(_getColumnIndex = getColumnIndex(columnName)) !== null && _getColumnIndex !== void 0 ? _getColumnIndex : null, this.hydrateValue(value, columns[index].type)];
-        }))
-      }];
-    }));
-  }
-
-  /**
-   * Dehydrates/serializes a value for storage.
-   * @param  value The value to dehydrate
-   * @param  columnType The column type
-   */
-  dehydrateValue(value, columnType) {
-    if (TableUtils.isDateType(columnType)) {
-      return this.dehydrateDateTime(value);
-    }
-    if (TableUtils.isLongType(columnType)) {
-      return IrisGridUtils.dehydrateLong(value);
-    }
-    return value;
-  }
-
-  /**
-   * Hydrate a value from it's serialized state
-   * @param  value The dehydrated value that needs to be hydrated
-   * @param  columnType The type of column
-   */
-  hydrateValue(value, columnType) {
-    if (TableUtils.isDateType(columnType)) {
-      return this.hydrateDateTime(value);
-    }
-    if (TableUtils.isLongType(columnType)) {
-      return this.hydrateLong(value);
-    }
-    return value;
-  }
-  dehydrateDateTime(value) {
-    return value != null ? this.dh.i18n.DateTimeFormat.format(DateUtils.FULL_DATE_FORMAT, value) : null;
-  }
-  hydrateDateTime(value) {
-    return value != null ? this.dh.i18n.DateTimeFormat.parse(DateUtils.FULL_DATE_FORMAT, value) : null;
-  }
-  hydrateLong(value) {
-    return value != null ? this.dh.LongWrapper.ofString(value) : null;
-  }
-
-  /**
-   * Import the saved sorts to apply to the table. Does not actually apply the sort.
-   * @param  columns The columns the sorts will be applied to
-   * @param  sorts Exported sort definitions
-   * @returns The sorts to apply to the table
-   */
-  hydrateSort(columns, sorts) {
-    var {
-      dh
-    } = this;
-    return sorts.map(sort => {
-      var {
-        column: columnIndexOrName,
-        isAbs,
-        direction
-      } = sort;
-      if (direction === TableUtils.sortDirection.reverse) {
-        return dh.Table.reverse();
-      }
-      var column = typeof columnIndexOrName === 'string' ? IrisGridUtils.getColumnByName(columns, columnIndexOrName) : IrisGridUtils.getColumn(columns, columnIndexOrName);
-      if (column != null) {
-        var columnSort = column.sort();
-        if (isAbs) {
-          columnSort = columnSort.abs();
-        }
-        if (direction === TableUtils.sortDirection.descending) {
-          columnSort = columnSort.desc();
-        } else {
-          columnSort = columnSort.asc();
-        }
-        return columnSort;
-      }
-      return null;
-    })
-    // If we can't find the column any more, it's null, filter it out
-    // If the item is a reverse sort item, filter it out - it will get applied with the `reverseType` property
-    // This should only happen when loading a legacy dashboard
-    .filter(item => item != null && item.direction !== TableUtils.sortDirection.reverse);
-  }
-
-  /**
-   * Applies the passed in table settings directly to the provided table
-   * @param  table The table to apply the settings to
-   * @param  tableSettings Dehydrated table settings extracted with `extractTableSettings`
-   * @param  timeZone The time zone to make this value in if it is a date type. E.g. America/New_York
-   */
-  applyTableSettings(table, tableSettings, timeZone) {
-    var {
-      columns
-    } = table;
-    var quickFilters = [];
-    if (tableSettings.quickFilters) {
-      quickFilters = IrisGridUtils.getFiltersFromFilterMap(this.hydrateQuickFilters(columns, tableSettings.quickFilters, timeZone));
-    }
-    var advancedFilters = [];
-    if (tableSettings.advancedFilters) {
-      advancedFilters = IrisGridUtils.getFiltersFromFilterMap(this.hydrateAdvancedFilters(columns, tableSettings.advancedFilters, timeZone));
-    }
-    var inputFilters = this.getFiltersFromInputFilters(columns, tableSettings.inputFilters, timeZone);
-    var sorts = [];
-    if (tableSettings.sorts) {
-      sorts = this.hydrateSort(columns, tableSettings.sorts);
-    }
-    var filters = [...quickFilters, ...advancedFilters];
-    var {
-      partition,
-      partitionColumn: partitionColumnName
-    } = tableSettings;
-    if (partition != null && partitionColumnName != null) {
-      var partitionColumn = IrisGridUtils.getColumnByName(columns, partitionColumnName);
-      if (partitionColumn) {
-        var partitionFilter = partitionColumn.filter().eq(dh.FilterValue.ofString(partition));
-        filters = [partitionFilter, ...filters];
-      }
-    }
-    filters = [...inputFilters, ...filters];
-    table.applyFilter(filters);
-    table.applySort(sorts);
-  }
-  getFiltersFromInputFilters(columns) {
-    var inputFilters = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-    var timeZone = arguments.length > 2 ? arguments[2] : undefined;
-    return inputFilters.map(_ref33 => {
-      var {
-        name,
-        type,
-        value
-      } = _ref33;
-      var column = columns.find(_ref34 => {
-        var {
-          name: columnName,
-          type: columnType
-        } = _ref34;
-        return columnName === name && columnType === type;
-      });
-      if (column) {
-        try {
-          return this.tableUtils.makeQuickFilter(column, value, timeZone);
-        } catch (e) {
-          // It may be unable to create it because user hasn't completed their input
-          log.debug('Unable to create input filter', e);
-        }
-      }
-      return null;
-    }).filter(filter => filter != null);
-  }
-
-  /**
-   * Get the dh.RangeSet representation of the provided ranges.
-   * Ranges are sorted prior to creating the RangeSet. Only the rows are taken into account,
-   * RangeSet does not have an option for columns.
-   * @param  ranges The ranges to get the range set for
-   * @returns The rangeset for the provided ranges
-   */
-  rangeSetFromRanges(ranges) {
-    var {
-      dh
-    } = this;
-    var rangeSets = ranges.slice().sort((a, b) => {
-      assertNotNull(a.startRow);
-      assertNotNull(b.startRow);
-      return a.startRow - b.startRow;
-    }).map(range => {
-      var {
-        startRow,
-        endRow
-      } = range;
-      assertNotNull(startRow);
-      assertNotNull(endRow);
-      return dh.RangeSet.ofRange(startRow, endRow);
-    });
-    return dh.RangeSet.ofRanges(rangeSets);
-  }
 }
 export default IrisGridUtils;
 //# sourceMappingURL=IrisGridUtils.js.map