@deephaven/iris-grid 0.22.3-beta.15 → 0.22.3-beta.21

package/dist/IrisGrid.js

@@ -1,13 +1,8 @@
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import React, { Component } from 'react';
 import memoize from 'memoizee';
 import classNames from 'classnames';
@@ -61,7 +56,6 @@ var DEFAULT_AGGREGATION_SETTINGS = Object.freeze({
   showOnTop: false
 });
 var UNFORMATTED_DATE_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS z";
-
 function isEmptyConfig(_ref) {
   var {
     advancedFilters,
@@ -76,7 +70,6 @@ function isEmptyConfig(_ref) {
   } = _ref;
   return advancedFilters.size === 0 && aggregationSettings.aggregations.length === 0 && customColumns.length === 0 && quickFilters.size === 0 && reverseType === TableUtils.REVERSE_TYPE.NONE && rollupConfig == null && searchFilter == null && selectDistinctColumns.length === 0 && sorts.length === 0;
 }
-
 export class IrisGrid extends Component {
   static makeQuickFilter(column, text, timeZone) {
     try {
@@ -84,69 +77,39 @@ export class IrisGrid extends Component {
     } catch (err) {
       log.error('Error creating quick filter', err);
     }
-
     return null;
   }
-
   constructor(props) {
     super(props);
-
     _defineProperty(this, "grid", void 0);
-
     _defineProperty(this, "gridWrapper", void 0);
-
     _defineProperty(this, "lastFocusedFilterBarColumn", void 0);
-
     _defineProperty(this, "lastLoadedConfig", void 0);
-
     _defineProperty(this, "tooltip", void 0);
-
     _defineProperty(this, "pending", void 0);
-
     _defineProperty(this, "globalColumnFormats", void 0);
-
     _defineProperty(this, "dateTimeFormatterOptions", void 0);
-
     _defineProperty(this, "decimalFormatOptions", void 0);
-
     _defineProperty(this, "integerFormatOptions", void 0);
-
     _defineProperty(this, "truncateNumbersWithPound", void 0);
-
     _defineProperty(this, "loadingScrimStartTime", void 0);
-
     _defineProperty(this, "loadingScrimFinishTime", void 0);
-
     _defineProperty(this, "animationFrame", void 0);
-
     _defineProperty(this, "loadingTimer", void 0);
-
     _defineProperty(this, "renderer", void 0);
-
     _defineProperty(this, "tableSaver", void 0);
-
     _defineProperty(this, "crossColumnRef", void 0);
-
     _defineProperty(this, "isAnimating", void 0);
-
     _defineProperty(this, "filterInputRef", void 0);
-
     _defineProperty(this, "toggleFilterBarAction", void 0);
-
     _defineProperty(this, "toggleSearchBarAction", void 0);
-
     _defineProperty(this, "toggleGotoRowAction", void 0);
-
     _defineProperty(this, "discardAction", void 0);
-
     _defineProperty(this, "commitAction", void 0);
-
     _defineProperty(this, "contextActions", void 0);
-
     _defineProperty(this, "getAdvancedMenuOpenedHandler", memoize(column => this.handleAdvancedMenuOpened.bind(this, column), {
       max: 100
     }));
-
     _defineProperty(this, "getCachedAdvancedFilterMenuActions", memoize((model, column, advancedFilterOptions, sortDirection, formatter) => /*#__PURE__*/React.createElement(AdvancedFilterCreator, {
       model: model,
       column: column,
@@ -159,10 +122,8 @@ export class IrisGrid extends Component {
     }), {
       max: 50
     }));
-
     _defineProperty(this, "getCachedOptionItems", memoize((isChartBuilderAvailable, isCustomColumnsAvailable, isFormatColumnsAvailable, isRollupAvailable, isTotalsAvailable, isSelectDistinctAvailable, isExportAvailable, toggleFilterBarAction, toggleSearchBarAction, toggleGotoRowAction, isFilterBarShown, showSearchBar, canDownloadCsv, canToggleSearch, showGotoRow, hasAdvancedSettings) => {
       var optionItems = [];
-
       if (isChartBuilderAvailable) {
         optionItems.push({
           type: OptionType.CHART_BUILDER,
@@ -170,13 +131,11 @@ export class IrisGrid extends Component {
           icon: dhGraphLineUp
         });
       }
-
       optionItems.push({
         type: OptionType.VISIBILITY_ORDERING_BUILDER,
         title: 'Column Visibility & Ordering',
         icon: dhEye
       });
-
       if (isFormatColumnsAvailable) {
         optionItems.push({
           type: OptionType.CONDITIONAL_FORMATTING,
@@ -184,7 +143,6 @@ export class IrisGrid extends Component {
           icon: vsEdit
         });
       }
-
       if (isCustomColumnsAvailable) {
         optionItems.push({
           type: OptionType.CUSTOM_COLUMN_BUILDER,
@@ -192,7 +150,6 @@ export class IrisGrid extends Component {
           icon: vsSplitHorizontal
         });
       }
-
       if (isRollupAvailable) {
         optionItems.push({
           type: OptionType.ROLLUP_ROWS,
@@ -200,7 +157,6 @@ export class IrisGrid extends Component {
           icon: dhTriangleDownSquare
         });
       }
-
       if (isTotalsAvailable) {
         optionItems.push({
           type: OptionType.AGGREGATIONS,
@@ -208,7 +164,6 @@ export class IrisGrid extends Component {
           icon: vsSymbolOperator
         });
       }
-
       if (isSelectDistinctAvailable) {
         optionItems.push({
           type: OptionType.SELECT_DISTINCT,
@@ -216,7 +171,6 @@ export class IrisGrid extends Component {
           icon: vsRuby
         });
       }
-
       if (isExportAvailable && canDownloadCsv) {
         optionItems.push({
           type: OptionType.TABLE_EXPORTER,
@@ -224,7 +178,6 @@ export class IrisGrid extends Component {
           icon: vsCloudDownload
         });
       }
-
       if (hasAdvancedSettings) {
         optionItems.push({
           type: OptionType.ADVANCED_SETTINGS,
@@ -232,7 +185,6 @@ export class IrisGrid extends Component {
           icon: vsTools
         });
       }
-
       optionItems.push({
         type: OptionType.QUICK_FILTERS,
         title: 'Quick Filters',
@@ -241,7 +193,6 @@ export class IrisGrid extends Component {
         isOn: isFilterBarShown,
         onChange: toggleFilterBarAction.action
       });
-
       if (canToggleSearch) {
         optionItems.push({
           type: OptionType.SEARCH_BAR,
@@ -252,7 +203,6 @@ export class IrisGrid extends Component {
           onChange: toggleSearchBarAction.action
         });
       }
-
       optionItems.push({
         type: OptionType.GOTO,
         title: 'Go to',
@@ -265,7 +215,6 @@ export class IrisGrid extends Component {
     }, {
       max: 1
     }));
-
     _defineProperty(this, "getCachedHiddenColumns", memoize(hiddenColumns => hiddenColumns, {
       max: 1,
       normalizer: _ref2 => {
@@ -273,7 +222,6 @@ export class IrisGrid extends Component {
         return hiddenColumns.join();
       }
     }));
-
     _defineProperty(this, "getAggregationMap", memoize((columns, aggregations) => {
       var aggregationMap = {};
       aggregations.forEach(_ref3 => {
@@ -286,7 +234,6 @@ export class IrisGrid extends Component {
       });
       return aggregationMap;
     }));
-
     _defineProperty(this, "getOperationMap", memoize((columns, aggregations) => {
       var operationMap = {};
       aggregations.filter(a => !AggregationUtils.isRollupOperation(a.operation)).forEach(_ref4 => {
@@ -297,46 +244,35 @@ export class IrisGrid extends Component {
         } = _ref4;
         AggregationUtils.getOperationColumnNames(columns, operation, selected, invert).forEach(name => {
           var _operationMap$name;
-
           var newOperations = [...((_operationMap$name = operationMap[name]) !== null && _operationMap$name !== void 0 ? _operationMap$name : []), operation];
           operationMap[name] = newOperations;
         });
       });
       return operationMap;
     }));
-
     _defineProperty(this, "getOperationOrder", memoize(aggregations => aggregations.map(a => a.operation).filter(o => !AggregationUtils.isRollupOperation(o))));
-
     _defineProperty(this, "getCachedFormatColumns", memoize((columns, rules) => getFormatColumns(columns, rules)));
-
     _defineProperty(this, "getCachedModelColumns", memoize((model, customColumns) => model.columns));
-
     _defineProperty(this, "getCachedPreviewFormatColumns", memoize((columns, rulesParam, preview, editIndex) => {
       log.debug('getCachedPreviewFormatColumns', rulesParam, preview, editIndex);
-
       if (preview !== undefined && editIndex !== undefined) {
         var rules = [...rulesParam];
         rules[editIndex] = preview;
         return this.getCachedFormatColumns(columns, rules);
       }
-
       return this.getCachedFormatColumns(columns, rulesParam);
     }));
-
     _defineProperty(this, "getModelRollupConfig", memoize((originalColumns, config, aggregationSettings) => IrisGridUtils.getModelRollupConfig(originalColumns, config, aggregationSettings)));
-
     _defineProperty(this, "getModelTotalsConfig", memoize((columns, config, aggregationSettings) => {
       var _config$columns$lengt, _config$columns, _aggregations$length;
-
       var {
         aggregations,
         showOnTop
-      } = aggregationSettings; // If we've got rollups, then aggregations are applied as part of that...
-
+      } = aggregationSettings;
+      // If we've got rollups, then aggregations are applied as part of that...
       if (((_config$columns$lengt = config === null || config === void 0 ? void 0 : (_config$columns = config.columns) === null || _config$columns === void 0 ? void 0 : _config$columns.length) !== null && _config$columns$lengt !== void 0 ? _config$columns$lengt : 0) > 0 || ((_aggregations$length = aggregations === null || aggregations === void 0 ? void 0 : aggregations.length) !== null && _aggregations$length !== void 0 ? _aggregations$length : 0) === 0) {
         return null;
       }
-
       var operationMap = this.getOperationMap(columns, aggregations);
       var operationOrder = this.getOperationOrder(aggregations);
       return {
@@ -345,7 +281,6 @@ export class IrisGrid extends Component {
         showOnTop
       };
     }));
-
     _defineProperty(this, "getCachedStateOverride", memoize((hoverSelectColumn, isFilterBarShown, isSelectingColumn, loadingScrimProgress, quickFilters, advancedFilters, sorts, reverseType, rollupConfig, isMenuShown) => ({
       hoverSelectColumn,
       isFilterBarShown,
@@ -360,11 +295,9 @@ export class IrisGrid extends Component {
     }), {
       max: 1
     }));
-
     _defineProperty(this, "getCachedFilter", memoize((customFilters, quickFilters, advancedFilters, partitionFilters, searchFilter) => [...(customFilters !== null && customFilters !== void 0 ? customFilters : []), ...(partitionFilters !== null && partitionFilters !== void 0 ? partitionFilters : []), ...IrisGridUtils.getFiltersFromFilterMap(quickFilters), ...IrisGridUtils.getFiltersFromFilterMap(advancedFilters), ...(searchFilter !== undefined ? [searchFilter] : [])], {
       max: 1
     }));
-
     _defineProperty(this, "getCachedTheme", memoize((theme, isEditable, floatingRowCount) => _objectSpread(_objectSpread(_objectSpread({}, IrisGridTheme), theme), {}, {
       autoSelectRow: !isEditable,
       // We only show the row footers when we have floating rows for aggregations
@@ -372,46 +305,37 @@ export class IrisGrid extends Component {
     }), {
       max: 1
     }));
-
     _defineProperty(this, "getAlwaysFetchColumns", memoize((alwaysFetchColumns, columns, movedColumns, floatingLeftColumnCount, floatingRightColumnCount, draggingRange) => {
       var floatingColumns = [];
-
       for (var i = 0; i < floatingLeftColumnCount; i += 1) {
         floatingColumns.push(columns[GridUtils.getModelIndex(i, movedColumns)].name);
       }
-
       for (var _i = 0; _i < floatingRightColumnCount; _i += 1) {
         floatingColumns.push(columns[GridUtils.getModelIndex(columns.length - 1 - _i, movedColumns)].name);
       }
-
       if (draggingRange) {
         for (var _i2 = draggingRange[0]; _i2 <= draggingRange[1]; _i2 += 1) {
           floatingColumns.push(columns[GridUtils.getModelIndex(_i2, movedColumns)].name);
         }
       }
-
       var columnSet = new Set([...alwaysFetchColumns, ...floatingColumns]);
       return [...columnSet];
     }));
-
     _defineProperty(this, "updateSearchFilter", debounce((searchValue, selectedSearchColumns, columns, invertSearchColumns) => {
       var searchFilter = CrossColumnSearch.createSearchFilter(searchValue, selectedSearchColumns, columns, invertSearchColumns);
       this.setState({
         searchFilter
       });
     }, SET_FILTER_DEBOUNCE));
-
     _defineProperty(this, "handleConditionalFormatEditorUpdate", debounce(conditionalFormatPreview => {
       this.setState({
         conditionalFormatPreview
       });
     }, SET_CONDITIONAL_FORMAT_DEBOUNCE));
-
     _defineProperty(this, "handleDownloadProgressUpdate", throttle((tableDownloadProgress, tableDownloadEstimatedTime) => {
       var {
         tableDownloadStatus
       } = this.state;
-
       if (tableDownloadStatus === TableCsvExporter.DOWNLOAD_STATUS.DOWNLOADING) {
         this.setState({
           tableDownloadProgress,
@@ -419,18 +343,15 @@ export class IrisGrid extends Component {
         });
       }
     }, UPDATE_DOWNLOAD_THROTTLE));
-
     _defineProperty(this, "getOverflowButtonTooltip", memoize(overflowButtonTooltipProps => {
       if (overflowButtonTooltipProps == null) {
         return null;
       }
-
       var wrapperStyle = _objectSpread(_objectSpread({
         position: 'absolute'
       }, overflowButtonTooltipProps), {}, {
         pointerEvents: 'none'
       });
-
       var popperOptions = {
         placement: 'left',
         modifiers: {
@@ -447,7 +368,6 @@ export class IrisGrid extends Component {
         ref: this.handleTooltipRef
       }, "View full contents"));
     }));
-
     this.handleAdvancedFilterChange = this.handleAdvancedFilterChange.bind(this);
     this.handleAdvancedFilterSortChange = this.handleAdvancedFilterSortChange.bind(this);
     this.handleAdvancedFilterDone = this.handleAdvancedFilterDone.bind(this);
@@ -514,8 +434,9 @@ export class IrisGrid extends Component {
     this.globalColumnFormats = [];
     this.decimalFormatOptions = {};
     this.integerFormatOptions = {};
-    this.truncateNumbersWithPound = false; // When the loading scrim started/when it should extend to the end of the screen.
+    this.truncateNumbersWithPound = false;
 
+    // When the loading scrim started/when it should extend to the end of the screen.
     this.renderer = new IrisGridRenderer();
     this.tableSaver = null;
     this.crossColumnRef = /*#__PURE__*/React.createRef();
@@ -538,7 +459,6 @@ export class IrisGrid extends Component {
         var {
           model
         } = this.props;
-
         if (isEditableGridModel(model) && model.isEditable && model.pendingDataMap.size > 0) {
           this.discardPending().catch(log.error);
         }
@@ -550,7 +470,6 @@ export class IrisGrid extends Component {
         var {
           model
         } = this.props;
-
         if (isEditableGridModel(model) && model.isEditable && model.pendingDataMap.size > 0 && model.pendingDataErrors.size === 0) {
           this.commitPending().catch(log.error);
         }
@@ -584,15 +503,11 @@ export class IrisGrid extends Component {
       frozenColumns
     } = props;
     var keyHandlers = [new ReverseKeyHandler(this), new ClearFilterKeyHandler(this)];
-
     if (canCopy) {
       keyHandlers.push(new CopyKeyHandler(this));
     }
-
     var mouseHandlers = [new IrisGridCellOverflowMouseHandler(this), new IrisGridColumnSelectMouseHandler(this), new IrisGridColumnTooltipMouseHandler(this), new IrisGridSortMouseHandler(this), new IrisGridFilterMouseHandler(this), new IrisGridContextMenuHandler(this), new IrisGridDataSelectMouseHandler(this), new PendingMouseHandler(this)];
-
     var _movedColumns = movedColumnsProp.length > 0 ? movedColumnsProp : _model.movedColumns;
-
     var movedRows = movedRowsProp.length > 0 ? movedRowsProp : _model.movedRows;
     var metricCalculator = new IrisGridMetricCalculator({
       userColumnWidths: new Map(userColumnWidths),
@@ -600,9 +515,7 @@ export class IrisGrid extends Component {
       movedColumns: _movedColumns
     });
     var searchColumns = _selectedSearchColumns !== null && _selectedSearchColumns !== void 0 ? _selectedSearchColumns : [];
-
     var _searchFilter = CrossColumnSearch.createSearchFilter(_searchValue, searchColumns, _model.columns, _invertSearchColumns);
-
     this.state = {
       isFilterBarShown: _isFilterBarShown,
       isSelectingPartition,
@@ -674,23 +587,19 @@ export class IrisGrid extends Component {
       gotoRowError: ''
     };
   }
-
   componentDidMount() {
     var {
       partitionColumn,
       model
     } = this.props;
     var column = partitionColumn !== null && partitionColumn !== void 0 ? partitionColumn : model.columns.find(c => c.isPartitionColumn);
-
     if (model.isFilterRequired && model.isValuesTableAvailable && column != null) {
       this.loadPartitionsTable(column);
     } else {
       this.initState();
     }
-
     this.startListening(model);
   }
-
   componentDidUpdate(prevProps) {
     var {
       inputFilters,
@@ -700,80 +609,63 @@ export class IrisGrid extends Component {
       customFilters,
       sorts
     } = this.props;
-
     if (model !== prevProps.model) {
       this.stopListening(prevProps.model);
       this.startListening(model);
     }
-
     var changedInputFilters = inputFilters !== prevProps.inputFilters ? inputFilters.filter(inputFilter => !prevProps.inputFilters.includes(inputFilter)) : [];
-
     if (changedInputFilters.length > 0) {
       var _advancedSettings$get;
-
       var {
         advancedSettings
       } = this.props;
       var replaceExistingFilters = (_advancedSettings$get = advancedSettings.get(AdvancedSettingsType.FILTER_CONTROL_CHANGE_CLEARS_ALL_FILTERS)) !== null && _advancedSettings$get !== void 0 ? _advancedSettings$get : false;
-
       if (replaceExistingFilters) {
         this.clearGridInputField();
         this.clearCrossColumSearch();
       }
-
       this.startLoading('Filtering...', true);
       this.applyInputFilters(changedInputFilters, replaceExistingFilters);
     }
-
     if (isSelectingColumn !== prevProps.isSelectingColumn) {
       this.resetColumnSelection();
     }
-
     if (settings !== prevProps.settings) {
       this.updateFormatterSettings(settings);
     }
-
     if (customFilters !== prevProps.customFilters) {
       this.startLoading('Filtering...', true);
     }
-
     if (sorts !== prevProps.sorts) {
       this.updateSorts(sorts);
     }
-
     var {
       loadingScrimStartTime,
       loadingScrimFinishTime
     } = this;
-
     if (loadingScrimStartTime != null && loadingScrimFinishTime != null) {
       window.requestAnimationFrame(() => {
         var now = Date.now();
         var currentTime = now - loadingScrimStartTime;
         var totalTime = loadingScrimFinishTime - loadingScrimStartTime;
         var loadingScrimProgress = Math.min(currentTime / totalTime, 1);
-
         if (loadingScrimFinishTime < now) {
           this.loadingScrimStartTime = undefined;
           this.loadingScrimFinishTime = undefined;
         }
-
         this.setState(state => {
           if (state.loadingScrimProgress == null) {
             log.debug2('Ignoring scrim update because loading cancelled.');
             return null;
           }
-
           return {
             loadingScrimProgress
           };
         });
       });
     }
-
     this.sendStateChange();
   }
-
   componentWillUnmount() {
     var {
       model
@@ -781,18 +673,14 @@ export class IrisGrid extends Component {
     this.stopListening(model);
     this.pending.cancel();
     this.updateSearchFilter.cancel();
-
     if (this.loadingTimer) {
       clearTimeout(this.loadingTimer);
     }
-
     this.handleDownloadProgressUpdate.cancel();
-
     if (this.animationFrame !== undefined) {
       cancelAnimationFrame(this.animationFrame);
     }
   }
-
   getValueForCell(columnIndex, rowIndex) {
     var rawValue = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     var {
@@ -800,10 +688,8 @@ export class IrisGrid extends Component {
     } = this.props;
     var modelColumn = this.getModelColumn(columnIndex);
     var modelRow = this.getModelRow(rowIndex);
-
     if (rawValue && modelColumn != null && modelRow != null) {
       var _value = model.valueForCell(modelColumn, modelRow);
-
       if (TableUtils.isDateType(model.columns[modelColumn].type)) {
         // The returned value is just a long value, we should return the value formatted as a full date string
         var {
@@ -811,21 +697,16 @@ export class IrisGrid extends Component {
         } = model;
         return dh.i18n.DateTimeFormat.format(UNFORMATTED_DATE_PATTERN, _value, dh.i18n.TimeZone.getTimeZone(formatter.timeZone));
       }
-
       return _value;
     }
-
     if (rawValue) {
       return null;
     }
-
     if (modelColumn != null && modelRow != null) {
       return model.textForCell(modelColumn, modelRow);
     }
-
     return '';
   }
-
   getModelColumn(columnIndex) {
     var {
       metrics
@@ -834,14 +715,11 @@ export class IrisGrid extends Component {
     var {
       modelColumns
     } = metrics;
-
     if (modelColumns == null) {
       return null;
     }
-
     return columnIndex != null ? modelColumns.get(columnIndex) : null;
   }
-
   getModelRow(rowIndex) {
     var {
       metrics
@@ -850,38 +728,32 @@ export class IrisGrid extends Component {
     var {
       modelRows
     } = metrics;
-
     if (modelRows == null) {
       return null;
     }
-
     return rowIndex != null ? modelRows.get(rowIndex) : null;
   }
-
   getTheme() {
     var _ref5;
-
     var {
       model,
       theme
     } = this.props;
     return this.getCachedTheme(theme, (_ref5 = isEditableGridModel(model) && model.isEditable) !== null && _ref5 !== void 0 ? _ref5 : false, model.floatingTopRowCount + model.floatingBottomRowCount);
   }
-
   getVisibleColumn(modelIndex) {
     var {
       movedColumns
     } = this.state;
     return GridUtils.getVisibleIndex(modelIndex, movedColumns);
   }
+
   /**
    * Applies the provided input filters as quick filters,
    * and clears any existing quickFilters or advancedFilters on that column
    * @param inputFilters Array of input filters to apply
    * @param replaceExisting If true, new filters will replace the existing ones, instead of merging
    */
-
-
   applyInputFilters(inputFilters) {
     var replaceExisting = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var {
@@ -907,7 +779,6 @@ export class IrisGrid extends Component {
         } = _ref7;
         return columnName === name && columnType === type;
       });
-
       if (modelIndex >= 0) {
         isChanged = newAdvancedFilters.delete(modelIndex) || isChanged;
         isChanged = this.applyQuickFilter(modelIndex, value, newQuickFilters) || isChanged;
@@ -915,7 +786,6 @@ export class IrisGrid extends Component {
         log.error('Unable to find column for inputFilter', name, type, value);
       }
     });
-
     if (isChanged) {
       this.setState({
         quickFilters: newQuickFilters,
@@ -923,6 +793,7 @@ export class IrisGrid extends Component {
       });
     }
   }
+
   /**
    * Applies a quick filter
    * @param modelIndex The index in the model of the column to set
@@ -930,8 +801,6 @@ export class IrisGrid extends Component {
    * @param quickFilters The quick filters map
    * @returns True if the filters have changed because this quick filter was applied
    */
-
-
   applyQuickFilter(modelIndex, value, quickFilters) {
     var {
       model
@@ -940,37 +809,30 @@ export class IrisGrid extends Component {
       formatter
     } = model;
     var column = model.columns[modelIndex];
-
     if (value != null && "".concat(value).trim().length > 0) {
       var quickFilter = quickFilters.get(modelIndex);
-
       if (quickFilter != null) {
         var {
           text
         } = quickFilter;
-
         if (text === value) {
           log.debug2('Ignoring change to existing filter');
           return false;
         }
       }
-
       quickFilters.set(modelIndex, {
         text: value,
         filter: IrisGrid.makeQuickFilter(column, value, formatter.timeZone)
       });
       return true;
     }
-
     return quickFilters.delete(modelIndex);
   }
-
   setAdvancedFilterMap(advancedFilters) {
     this.setState({
       advancedFilters
     });
   }
-
   setAdvancedFilter(modelIndex, filter, options) {
     log.debug('Setting advanced filter', modelIndex, filter);
     this.startLoading('Filtering...', true);
@@ -979,7 +841,6 @@ export class IrisGrid extends Component {
         advancedFilters
       } = _ref8;
       var newAdvancedFilters = new Map(advancedFilters);
-
       if (filter == null) {
         newAdvancedFilters.delete(modelIndex);
       } else {
@@ -988,20 +849,18 @@ export class IrisGrid extends Component {
           options
         });
       }
-
       return {
         advancedFilters: newAdvancedFilters
       };
     });
   }
+
   /**
    * Sets a quick filter against the provided column
    * @param modelIndex The index in the model for the column this filter is applied to
    * @param filter A filter to apply to the column, or null if there was an error
    * @param text The original text the filter was created with
    */
-
-
   setQuickFilter(modelIndex, filter, text) {
     log.debug('Setting quick filter', modelIndex, filter, text);
     this.startLoading('Filtering...', true);
@@ -1019,54 +878,46 @@ export class IrisGrid extends Component {
       };
     });
   }
+
   /**
    * Set grid filters based on the filter map
    * @param filterMap Filter map
    */
-
-
   setFilterMap(filterMap) {
     var _advancedSettings$get2;
-
     log.debug('setFilterMap', filterMap);
     var {
       advancedSettings
     } = this.props;
     var clearFiltersOnLinkerFilterUpdate = (_advancedSettings$get2 = advancedSettings.get(AdvancedSettingsType.LINK_CHANGE_CLEARS_ALL_FILTERS)) !== null && _advancedSettings$get2 !== void 0 ? _advancedSettings$get2 : false;
-
     if (clearFiltersOnLinkerFilterUpdate) {
       this.clearAllFilters();
     }
-
     var {
       model
     } = this.props;
     filterMap.forEach((_ref10, columnName) => {
       var {
         columnType,
-        text,
-        value
+        filterList
       } = _ref10;
       var column = model.columns.find(c => c.name === columnName && c.type === columnType);
-
       if (column == null) {
         return;
       }
-
       var columnIndex = model.getColumnIndexByName(column.name);
       assertNotNull(columnIndex);
-
-      if (value === undefined) {
+      var combinedText = IrisGridUtils.combineFiltersFromList(columnType, filterList);
+      if (combinedText.length === 0) {
         this.removeQuickFilter(columnIndex);
-      } else if (value === null) {
-        this.setQuickFilter(columnIndex, column.filter().isNull(), '=null');
       } else {
-        var filterValue = TableUtils.isTextType(columnType) ? dh.FilterValue.ofString(value) : dh.FilterValue.ofNumber(value);
-        this.setQuickFilter(columnIndex, column.filter().eq(filterValue), "".concat(text));
+        var {
+          formatter
+        } = model;
+        this.setQuickFilter(columnIndex, IrisGrid.makeQuickFilter(column, combinedText, formatter.timeZone), "".concat(combinedText));
       }
     });
   }
-
   removeColumnFilter(modelColumn) {
     this.startLoading('Filtering...', true);
     this.setState(_ref11 => {
@@ -1084,7 +935,6 @@ export class IrisGrid extends Component {
       };
     });
   }
-
   removeQuickFilter(modelColumn) {
     this.startLoading('Clearing Filter...', true);
     this.setState(_ref12 => {
@@ -1098,7 +948,6 @@ export class IrisGrid extends Component {
       };
     });
   }
-
   clearAllFilters() {
     log.debug('Clearing all filters');
     var {
@@ -1106,12 +955,11 @@ export class IrisGrid extends Component {
       quickFilters,
       searchFilter
     } = this.state;
-
     if (quickFilters.size === 0 && advancedFilters.size === 0 && searchFilter === null) {
       return;
-    } // if there is an active quick filter input field, reset it as well
-
+    }
 
+    // if there is an active quick filter input field, reset it as well
     this.clearGridInputField();
     this.startLoading('Clearing Filters...', true);
     this.setState({
@@ -1121,7 +969,6 @@ export class IrisGrid extends Component {
       searchFilter: undefined
     });
   }
-
   clearCrossColumSearch() {
     log.debug('Clearing cross-column search');
     this.setState({
@@ -1129,17 +976,15 @@ export class IrisGrid extends Component {
       searchFilter: undefined
     });
   }
-
   clearGridInputField() {
     if (this.filterInputRef.current != null) {
       this.filterInputRef.current.setValue('');
     }
   }
+
   /**
    * Rebuilds all the current filters. Necessary if something like the time zone has changed.
    */
-
-
   rebuildFilters() {
     log.debug('Rebuilding filters');
     var {
@@ -1182,7 +1027,6 @@ export class IrisGrid extends Component {
       advancedFilters: newAdvancedFilters
     });
   }
-
   setFilters(_ref13) {
     var {
       quickFilters,
@@ -1193,10 +1037,8 @@ export class IrisGrid extends Component {
       advancedFilters
     });
   }
-
   updateFormatterSettings(settings) {
     var _settings$defaultDeci, _settings$defaultInte, _settings$truncateNum;
-
     var forceUpdate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     var globalColumnFormats = FormatterUtils.getColumnFormats(settings);
     var dateTimeFormatterOptions = FormatterUtils.getDateTimeFormatterOptions(settings);
@@ -1208,7 +1050,6 @@ export class IrisGrid extends Component {
     var isDecimalFormattingChanged = !deepEqual(this.decimalFormatOptions, settings === null || settings === void 0 ? void 0 : settings.defaultDecimalFormatOptions);
     var isIntegerFormattingChanged = !deepEqual(this.integerFormatOptions, defaultIntegerFormatOptions);
     var isTruncateNumbersChanged = this.truncateNumbersWithPound !== truncateNumbersWithPound;
-
     if (isColumnFormatChanged || isDateFormattingChanged || isDecimalFormattingChanged || isIntegerFormattingChanged || isTruncateNumbersChanged) {
       this.globalColumnFormats = globalColumnFormats;
       this.dateTimeFormatterOptions = dateTimeFormatterOptions;
@@ -1216,25 +1057,20 @@ export class IrisGrid extends Component {
       this.integerFormatOptions = defaultIntegerFormatOptions;
       this.truncateNumbersWithPound = truncateNumbersWithPound;
       this.updateFormatter({}, forceUpdate);
-
       if (isDateFormattingChanged && forceUpdate) {
         this.rebuildFilters();
       }
     }
   }
-
   updateFormatter(updatedFormats) {
     var _this$globalColumnFor;
-
     var forceUpdate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     var {
       customColumnFormatMap
     } = this.state;
-
     var update = _objectSpread({
       customColumnFormatMap
     }, updatedFormats);
-
     var mergedColumnFormats = [...((_this$globalColumnFor = this.globalColumnFormats) !== null && _this$globalColumnFor !== void 0 ? _this$globalColumnFor : []), ...update.customColumnFormatMap.values()];
     var formatter = new Formatter(mergedColumnFormats, this.dateTimeFormatterOptions, this.decimalFormatOptions, this.integerFormatOptions, this.truncateNumbersWithPound);
     log.debug('updateFormatter', this.globalColumnFormats, mergedColumnFormats);
@@ -1246,14 +1082,12 @@ export class IrisGrid extends Component {
       }
     });
   }
-
   initFormatter() {
     var {
       settings
     } = this.props;
     this.updateFormatterSettings(settings);
   }
-
   initState() {
     var {
       applyInputFiltersOnInit,
@@ -1268,14 +1102,12 @@ export class IrisGrid extends Component {
     } = this.props;
     var searchColumns = selectedSearchColumns !== null && selectedSearchColumns !== void 0 ? selectedSearchColumns : [];
     var searchFilter = CrossColumnSearch.createSearchFilter(searchValue, searchColumns, model.columns, invertSearchColumns);
-
     if (applyInputFiltersOnInit) {
       // There may be more than one input filter on the same column with value === '' applied last
       // We don't want to skip it here, so only excluding the ones that were never applied (null)
       var inputFiltersWithValues = inputFilters.filter(inputFilter => inputFilter.value != null);
       this.applyInputFilters(inputFiltersWithValues);
     }
-
     this.setState({
       sorts,
       reverseType,
@@ -1285,49 +1117,36 @@ export class IrisGrid extends Component {
     });
     this.initFormatter();
   }
-
   loadPartitionsTable(partitionColumn) {
     var _this = this;
-
     return _asyncToGenerator(function* () {
       var {
         model
       } = _this.props;
-
       _this.setState({
         isSelectingPartition: true
       });
-
       try {
         var partitionTable = yield _this.pending.add(model.valuesTable(partitionColumn), resolved => resolved.close());
         var _column = partitionTable.columns[0];
-
         var sort = _column.sort().desc();
-
         partitionTable.applySort([sort]);
         partitionTable.setViewport(0, 0, [_column]);
         var data = yield _this.pending.add(partitionTable.getViewportData());
-
         if (data.rows.length > 0) {
           var row = data.rows[0];
-
           var _value2 = row.get(_column);
-
           _this.updatePartition(_value2, partitionColumn);
-
           _this.setState({
             isSelectingPartition: true
           });
         } else {
           log.info('Table does not have any data, just fetching all');
-
           _this.setState({
             isSelectingPartition: false
           });
-
           _this.handlePartitionFetchAll();
         }
-
         _this.setState({
           partitionTable,
           partitionColumn
@@ -1339,7 +1158,6 @@ export class IrisGrid extends Component {
       }
     })();
   }
-
   updatePartition(partition, partitionColumn) {
     var partitionFilter = partitionColumn.filter().eq(dh.FilterValue.ofString(partition));
     var partitionFilters = [partitionFilter];
@@ -1348,21 +1166,19 @@ export class IrisGrid extends Component {
       partitionFilters
     });
   }
-
   copyCell(columnIndex, rowIndex) {
     var rawValue = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     var {
       canCopy
     } = this.props;
-
     if (canCopy) {
       var _value3 = String(this.getValueForCell(columnIndex, rowIndex, rawValue));
-
       copyToClipboard(_value3).catch(e => log.error('Unable to copy cell', e));
     } else {
       log.error('Attempted to copyCell for user without copy permission.');
     }
   }
+
   /**
    * Copy the provided ranges to the clipboard
    * @paramranges The ranges to copy
@@ -1370,8 +1186,6 @@ export class IrisGrid extends Component {
    * @param formatValues Whether to format values or not
    * @param error Error message if one occurred
    */
-
-
   copyRanges(ranges) {
     var includeHeaders = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var formatValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
@@ -1385,7 +1199,6 @@ export class IrisGrid extends Component {
       movedColumns
     } = this.state;
     var userColumnWidths = metricCalculator.getUserColumnWidths();
-
     if (canCopy) {
       var copyOperation = {
         ranges: GridRange.boundedRanges(ranges, model.columnCount, model.rowCount),
@@ -1402,24 +1215,20 @@ export class IrisGrid extends Component {
       log.error('Attempted copyRanges for user without copy permission.');
     }
   }
-
   startLoading(loadingText) {
     var resetRanges = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     this.setState({
       loadingText
     });
     var theme = this.getTheme();
-
     if (resetRanges && this.grid) {
       this.grid.clearSelectedRanges();
       this.grid.setViewState({
         top: 0
       }, true);
     }
-
     if (this.loadingScrimStartTime == null) {
       var _this$gridWrapper$get, _this$gridWrapper;
-
       var {
         minScrimTransitionTime,
         maxScrimTransitionTime
@@ -1440,7 +1249,6 @@ export class IrisGrid extends Component {
       }, IrisGrid.loadingSpinnerDelay);
     }
   }
-
   stopLoading() {
     this.loadingScrimStartTime = undefined;
     this.loadingScrimFinishTime = undefined;
@@ -1449,17 +1257,15 @@ export class IrisGrid extends Component {
       loadingScrimProgress: null,
       loadingSpinnerShown: false
     });
-
     if (this.loadingTimer != null) {
       clearTimeout(this.loadingTimer);
       this.loadingTimer = undefined;
     }
   }
+
   /**
    * Rolls back the table state to the last known safe state, or if that's not available then clears all sorts/filters/custom columns.
    */
-
-
   rollback() {
     if (this.lastLoadedConfig) {
       log.debug('loading last loading config', this.lastLoadedConfig);
@@ -1500,36 +1306,30 @@ export class IrisGrid extends Component {
       });
     }
   }
+
   /**
    * Check if we can rollback the current state to a safe state.
    * @returns true if there's a previously known safe state or if some of the current state isn't empty.
    */
-
-
   canRollback() {
     return this.lastLoadedConfig != null || !isEmptyConfig(this.state);
   }
-
   startListening(model) {
     model.addEventListener(IrisGridModel.EVENT.UPDATED, this.handleUpdate);
     model.addEventListener(IrisGridModel.EVENT.REQUEST_FAILED, this.handleRequestFailed);
     model.addEventListener(IrisGridModel.EVENT.COLUMNS_CHANGED, this.handleCustomColumnsChanged);
     model.addEventListener(IrisGridModel.EVENT.PENDING_DATA_UPDATED, this.handlePendingDataUpdated);
   }
-
   stopListening(model) {
     model.removeEventListener(IrisGridModel.EVENT.UPDATED, this.handleUpdate);
     model.removeEventListener(IrisGridModel.EVENT.REQUEST_FAILED, this.handleRequestFailed);
     model.removeEventListener(IrisGridModel.EVENT.COLUMNS_CHANGED, this.handleCustomColumnsChanged);
     model.removeEventListener(IrisGridModel.EVENT.PENDING_DATA_UPDATED, this.handlePendingDataUpdated);
   }
-
   focus() {
     var _this$grid;
-
     (_this$grid = this.grid) === null || _this$grid === void 0 ? void 0 : _this$grid.focus();
   }
-
   focusFilterBar(column) {
     var {
       movedColumns
@@ -1541,14 +1341,12 @@ export class IrisGrid extends Component {
       columnCount
     } = model;
     var modelColumn = GridUtils.getModelIndex(column, movedColumns);
-
     if (column == null || column < 0 || columnCount <= column || !model.isFilterable(modelColumn)) {
       this.setState({
         focusedFilterBarColumn: null
       });
       return;
     }
-
     var {
       metricCalculator,
       metrics
@@ -1559,16 +1357,13 @@ export class IrisGrid extends Component {
       rightVisible,
       lastLeft
     } = metrics;
-
     if (column < left) {
       var _this$grid2;
-
       (_this$grid2 = this.grid) === null || _this$grid2 === void 0 ? void 0 : _this$grid2.setViewState({
         left: column
       }, true);
     } else if (rightVisible < column) {
       var _this$grid3, _this$grid4;
-
       var metricState = (_this$grid3 = this.grid) === null || _this$grid3 === void 0 ? void 0 : _this$grid3.getMetricState();
       assertNotNull(metricState);
       var newLeft = metricCalculator.getLastLeft(metricState, column, metricCalculator.getVisibleWidth(metricState));
@@ -1577,17 +1372,14 @@ export class IrisGrid extends Component {
         leftOffset: 0
       }, true);
     }
-
     this.lastFocusedFilterBarColumn = column;
     this.setState({
       focusedFilterBarColumn: column,
       isFilterBarShown: true
     });
   }
-
   hideColumnByVisibleIndex(columnVisibleIndex) {
     var _this$grid5;
-
     var {
       metricCalculator,
       movedColumns
@@ -1595,7 +1387,6 @@ export class IrisGrid extends Component {
     metricCalculator.setColumnWidth(GridUtils.getModelIndex(columnVisibleIndex, movedColumns), 0);
     (_this$grid5 = this.grid) === null || _this$grid5 === void 0 ? void 0 : _this$grid5.forceUpdate();
   }
-
   freezeColumnByColumnName(columnName) {
     var {
       frozenColumns,
@@ -1616,7 +1407,6 @@ export class IrisGrid extends Component {
       movedColumns: newMovedColumns
     });
   }
-
   unFreezeColumnByColumnName(columnName) {
     var {
       frozenColumns,
@@ -1630,22 +1420,20 @@ export class IrisGrid extends Component {
     allFrozenColumns.delete(columnName);
     var modelIndex = model.getColumnIndexByName(columnName);
     assertNotNull(modelIndex);
-    var visibleIndex = GridUtils.getVisibleIndex(modelIndex, movedColumns); // Move to after remaining frozen columns and front columns
+    var visibleIndex = GridUtils.getVisibleIndex(modelIndex, movedColumns);
 
+    // Move to after remaining frozen columns and front columns
     var newMovedColumns = GridUtils.moveItem(visibleIndex, allFrozenColumns.size + model.frontColumns.length, movedColumns);
     this.setState({
       frozenColumns: [...allFrozenColumns],
       movedColumns: newMovedColumns
     });
   }
-
   handleColumnVisibilityChanged(modelIndexes, visibilityOption) {
     var _this$grid6;
-
     var {
       metricCalculator
     } = this.state;
-
     if (visibilityOption === VisibilityOrderingBuilder.VISIBILITY_OPTIONS.SHOW) {
       modelIndexes.forEach(modelIndex => {
         metricCalculator.resetColumnWidth(modelIndex);
@@ -1655,10 +1443,8 @@ export class IrisGrid extends Component {
         metricCalculator.setColumnWidth(modelIndex, 0);
       });
     }
-
     (_this$grid6 = this.grid) === null || _this$grid6 === void 0 ? void 0 : _this$grid6.forceUpdate();
   }
-
   handleCrossColumnSearch(searchValue, selectedSearchColumns, invertSearchColumns) {
     var {
       model
@@ -1670,29 +1456,23 @@ export class IrisGrid extends Component {
       invertSearchColumns
     });
   }
-
   handleAnimationLoop() {
     var _this$grid7, _this$grid8;
-
     (_this$grid7 = this.grid) === null || _this$grid7 === void 0 ? void 0 : _this$grid7.updateCanvasScale();
     (_this$grid8 = this.grid) === null || _this$grid8 === void 0 ? void 0 : _this$grid8.updateCanvas();
-
     if (this.isAnimating) {
       this.animationFrame = requestAnimationFrame(this.handleAnimationLoop);
     }
   }
-
   handleAnimationStart() {
     log.debug2('handleAnimationStart');
     this.isAnimating = true;
     this.animationFrame = requestAnimationFrame(this.handleAnimationLoop);
   }
-
   handleAnimationEnd() {
     log.debug2('handleAnimationEnd');
     this.isAnimating = false;
   }
-
   handlePartitionAppend(value) {
     var {
       onPartitionAppend
@@ -1700,61 +1480,56 @@ export class IrisGrid extends Component {
     var {
       partitionColumn
     } = this.state;
+    if (!partitionColumn) {
+      return;
+    }
     onPartitionAppend(partitionColumn, value);
   }
-
   handlePartitionChange(partition) {
     var {
       partitionColumn
     } = this.state;
+    if (!partitionColumn) {
+      return;
+    }
     this.updatePartition(partition, partitionColumn);
   }
-
   handlePartitionFetchAll() {
     this.setState({
       partitionFilters: [],
       isSelectingPartition: false
     });
   }
-
   handlePartitionDone() {
     this.setState({
       isSelectingPartition: false
     });
   }
-
   handleTableLoadError(error) {
     if (PromiseUtils.isCanceled(error)) {
       return;
     }
-
     log.error(error);
     var {
       onError
     } = this.props;
     onError(error);
   }
-
   showAllColumns() {
     var _this$grid9;
-
     var {
       metricCalculator
     } = this.state;
     var userColumnWidths = metricCalculator.getUserColumnWidths();
     var entries = [...userColumnWidths.entries()];
-
     for (var i = 0; i < entries.length; i += 1) {
       var [modelIndex, columnWidth] = entries[i];
-
       if (columnWidth === 0) {
         metricCalculator.resetColumnWidth(modelIndex);
       }
     }
-
     (_this$grid9 = this.grid) === null || _this$grid9 === void 0 ? void 0 : _this$grid9.forceUpdate();
   }
-
   toggleSort(columnIndex, addToExisting) {
     log.info('Toggling sort for column', columnIndex);
     var {
@@ -1768,20 +1543,16 @@ export class IrisGrid extends Component {
     var sorts = TableUtils.toggleSortForColumn(currentSorts, model.columns, modelColumn, addToExisting);
     this.updateSorts(sorts);
   }
-
   updateSorts(sorts) {
     var _this$grid10;
-
     this.startLoading('Sorting...');
     this.setState({
       sorts
     });
     (_this$grid10 = this.grid) === null || _this$grid10 === void 0 ? void 0 : _this$grid10.forceUpdate();
   }
-
   sortColumn(modelColumn) {
     var _this$grid11;
-
     var direction = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : TableUtils.sortDirection.none;
     var isAbs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     var addToExisting = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
@@ -1796,24 +1567,20 @@ export class IrisGrid extends Component {
     });
     (_this$grid11 = this.grid) === null || _this$grid11 === void 0 ? void 0 : _this$grid11.forceUpdate();
   }
-
   reverse(reverseType) {
     var _this$grid12;
-
     this.startLoading('Reversing...');
     this.setState({
       reverseType
     });
     (_this$grid12 = this.grid) === null || _this$grid12 === void 0 ? void 0 : _this$grid12.forceUpdate();
   }
-
   isReversible() {
     var {
       model
     } = this.props;
     return model.isReversible;
   }
-
   toggleFilterBar() {
     var focusIndex = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.lastFocusedFilterBarColumn;
     var {
@@ -1823,7 +1590,6 @@ export class IrisGrid extends Component {
     this.setState({
       isFilterBarShown
     });
-
     if (isFilterBarShown) {
       if (focusIndex != null) {
         this.focusFilterBar(focusIndex);
@@ -1835,82 +1601,64 @@ export class IrisGrid extends Component {
         var {
           columnCount
         } = _model2;
-
         for (var i = 0; i < columnCount; i += 1) {
           var modelColumn = this.getModelColumn(i);
-
           if (modelColumn != null) {
             var _column2 = _model2.columns[modelColumn];
-
             if (_column2 != null && TableUtils.isTextType(_column2.type)) {
               columnIndex = i;
               break;
             }
           }
         }
-
         this.focusFilterBar(columnIndex);
       }
     } else {
       var _this$grid13;
-
       (_this$grid13 = this.grid) === null || _this$grid13 === void 0 ? void 0 : _this$grid13.focus();
     }
   }
-
   isTableSearchAvailable() {
     var _model$layoutHints, _dh$SearchDisplayMode, _dh$SearchDisplayMode2;
-
     var {
       model,
       canToggleSearch
     } = this.props;
     var searchDisplayMode = model === null || model === void 0 ? void 0 : (_model$layoutHints = model.layoutHints) === null || _model$layoutHints === void 0 ? void 0 : _model$layoutHints.searchDisplayMode;
-
     if (searchDisplayMode === ((_dh$SearchDisplayMode = dh.SearchDisplayMode) === null || _dh$SearchDisplayMode === void 0 ? void 0 : _dh$SearchDisplayMode.SEARCH_DISPLAY_HIDE)) {
       return false;
     }
-
     if (searchDisplayMode === ((_dh$SearchDisplayMode2 = dh.SearchDisplayMode) === null || _dh$SearchDisplayMode2 === void 0 ? void 0 : _dh$SearchDisplayMode2.SEARCH_DISPLAY_SHOW)) {
       return true;
     }
-
     return canToggleSearch;
   }
-
   toggleSearchBar() {
     var {
       showSearchBar
     } = this.state;
-
     if (!this.isTableSearchAvailable()) {
       return;
     }
-
     var update = !showSearchBar;
     this.setState({
       showSearchBar: update
     }, () => {
       var _this$crossColumnRef;
-
       if (update && (_this$crossColumnRef = this.crossColumnRef) !== null && _this$crossColumnRef !== void 0 && _this$crossColumnRef.current) {
         var _this$crossColumnRef2;
-
         (_this$crossColumnRef2 = this.crossColumnRef) === null || _this$crossColumnRef2 === void 0 ? void 0 : _this$crossColumnRef2.current.focus();
       } else {
         var _this$grid14;
-
         (_this$grid14 = this.grid) === null || _this$grid14 === void 0 ? void 0 : _this$grid14.focus();
       }
     });
   }
-
   toggleGotoRow() {
     var row = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     var {
       isGotoRowShown
     } = this.state;
-
     if (row) {
       // if invoked with a row, keep open instead of toggle
       this.setState({
@@ -1920,49 +1668,38 @@ export class IrisGrid extends Component {
       });
       return;
     }
-
     this.setState({
       isGotoRowShown: !isGotoRowShown,
       gotoRow: '',
       gotoRowError: ''
     });
   }
-
   commitPending() {
     var _this2 = this;
-
     return _asyncToGenerator(function* () {
       var _document, _document$activeEleme;
-
       var {
         model
       } = _this2.props;
-
       if (!isEditableGridModel(model) || !model.isEditable) {
         throw new Error('Cannot save, table is not editable');
       }
-
       var {
         pendingSavePromise
       } = _this2.state;
-
       if (pendingSavePromise != null) {
         throw new Error('Save already in progress');
       }
-
       var containsGridCellInputField = (_document = document) === null || _document === void 0 ? void 0 : (_document$activeEleme = _document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.classList.contains('grid-cell-input-field');
-
       if (containsGridCellInputField != null && containsGridCellInputField) {
         var _this2$grid;
-
         if (document.activeElement != null && document.activeElement.classList.contains('error')) {
           throw new ValidationError('Current input is invalid');
-        } // Focus the grid again to commit any pending input changes
-
+        }
 
+        // Focus the grid again to commit any pending input changes
         (_this2$grid = _this2.grid) === null || _this2$grid === void 0 ? void 0 : _this2$grid.focus();
       }
-
       var newPendingSavePromise = _this2.pending.add(model.commitPending()).then(() => {
         _this2.setState({
           pendingSaveError: null,
@@ -1976,27 +1713,21 @@ export class IrisGrid extends Component {
           });
         }
       });
-
       _this2.setState({
         pendingSavePromise: newPendingSavePromise
       });
-
       return newPendingSavePromise;
     })();
   }
-
   discardPending() {
     var _this3 = this;
-
     return _asyncToGenerator(function* () {
       var {
         pendingSavePromise
       } = _this3.state;
-
       if (pendingSavePromise != null) {
         throw new Error('Cannot cancel a save in progress');
       }
-
       _this3.setState({
         pendingSavePromise: null,
         pendingSaveError: null,
@@ -2005,24 +1736,23 @@ export class IrisGrid extends Component {
       });
     })();
   }
+
   /**
    * Select the passed in column and notify listener
    * @param column The column in this table to link
    */
-
-
   selectColumn(column) {
     var {
       onColumnSelected
     } = this.props;
     onColumnSelected(column);
   }
+
   /**
    * Select all the data for a given row and notify listener
    */
-
-
   selectData(columnIndex, rowIndex) {
+    var _this4 = this;
     var {
       model
     } = this.props;
@@ -2031,7 +1761,6 @@ export class IrisGrid extends Component {
       groupedColumns
     } = model;
     var dataMap = {};
-
     var _loop = function _loop(i) {
       var column = columns[i];
       var {
@@ -2040,6 +1769,7 @@ export class IrisGrid extends Component {
       } = column;
       var value = model.valueForCell(i, rowIndex);
       var text = model.textForCell(i, rowIndex);
+      var visibleIndex = _this4.getVisibleColumn(i);
       var isExpandable = isExpandableGridModel(model) && model.isRowExpandable(rowIndex);
       var isGrouped = groupedColumns.find(c => c.name === name) != null;
       dataMap[name] = {
@@ -2047,20 +1777,18 @@ export class IrisGrid extends Component {
         text,
         type,
         isGrouped,
-        isExpandable
+        isExpandable,
+        visibleIndex
       };
     };
-
     for (var i = 0; i < columns.length; i += 1) {
       _loop(i);
     }
-
     var {
       onDataSelected
     } = this.props;
     onDataSelected(rowIndex, dataMap);
   }
-
   handleAdvancedFilterChange(column, filter, options) {
     var {
       model
@@ -2069,10 +1797,8 @@ export class IrisGrid extends Component {
     assertNotNull(index);
     this.setAdvancedFilter(index, filter, options);
   }
-
   handleAdvancedFilterSortChange(column, direction) {
     var _this$grid15;
-
     var addToExisting = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     var {
       model
@@ -2081,7 +1807,6 @@ export class IrisGrid extends Component {
     assertNotNull(columnIndex);
     var oldSort = TableUtils.getSortForColumn(model.sort, columnIndex);
     var newSort = null;
-
     if (oldSort == null || oldSort.direction !== direction) {
       if (direction === TableUtils.sortDirection.descending) {
         newSort = column.sort().desc();
@@ -2089,7 +1814,6 @@ export class IrisGrid extends Component {
         newSort = column.sort().asc();
       }
     }
-
     var sorts = TableUtils.setSortForColumn(model.sort, columnIndex, newSort, addToExisting);
     log.info('Setting table sorts', sorts);
     this.startLoading('Sorting...');
@@ -2098,42 +1822,33 @@ export class IrisGrid extends Component {
     });
     (_this$grid15 = this.grid) === null || _this$grid15 === void 0 ? void 0 : _this$grid15.forceUpdate();
   }
-
   handleAdvancedFilterDone() {
     var _this$grid16;
-
     (_this$grid16 = this.grid) === null || _this$grid16 === void 0 ? void 0 : _this$grid16.focus();
   }
-
   handleAdvancedMenuOpened(column) {
     this.setState({
       shownAdvancedFilter: column
     });
   }
-
   handleGotoRowOpened() {
     this.setState({
       isGotoRowShown: true
     });
   }
-
   handleGotoRowClosed() {
     this.setState({
       isGotoRowShown: false
     });
   }
-
   handleAdvancedMenuClosed(columnIndex) {
     var _this$filterInputRef;
-
     var {
       focusedFilterBarColumn,
       isFilterBarShown
     } = this.state;
-
     if (isFilterBarShown && focusedFilterBarColumn === columnIndex && ((_this$filterInputRef = this.filterInputRef) === null || _this$filterInputRef === void 0 ? void 0 : _this$filterInputRef.current) !== null) {
       var _this$filterInputRef2;
-
       (_this$filterInputRef2 = this.filterInputRef) === null || _this$filterInputRef2 === void 0 ? void 0 : _this$filterInputRef2.current.focus();
       this.setState({
         shownAdvancedFilter: null
@@ -2145,15 +1860,14 @@ export class IrisGrid extends Component {
       });
     }
   }
-
   handleCancel() {
     this.rollback();
-  } // eslint-disable-next-line class-methods-use-this
-
-
-  handleChartChange() {// TODO: IDS-4242 Update Chart Preview
   }
 
+  // eslint-disable-next-line class-methods-use-this
+  handleChartChange() {
+    // TODO: IDS-4242 Update Chart Preview
+  }
   handleChartCreate(settings) {
     var {
       model,
@@ -2161,7 +1875,6 @@ export class IrisGrid extends Component {
     } = this.props;
     onCreateChart(settings, model);
   }
-
   handleGridError(error) {
     log.warn('Grid Error', error);
     this.setState({
@@ -2170,7 +1883,6 @@ export class IrisGrid extends Component {
       }, "".concat(error))
     });
   }
-
   handleFilterBarChange(value) {
     this.startLoading('Filtering...', true);
     this.setState(_ref14 => {
@@ -2179,49 +1891,40 @@ export class IrisGrid extends Component {
         quickFilters
       } = _ref14;
       var newQuickFilters = new Map(quickFilters);
-
       if (focusedFilterBarColumn != null) {
         var modelIndex = this.getModelColumn(focusedFilterBarColumn);
         assertNotNull(modelIndex);
         this.applyQuickFilter(modelIndex, value, newQuickFilters);
       }
-
       return {
         quickFilters: newQuickFilters
       };
     });
   }
-
   handleFilterBarDone() {
     var setGridFocus = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
     var defocusInput = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-
     if (setGridFocus) {
       var _this$grid17;
-
       (_this$grid17 = this.grid) === null || _this$grid17 === void 0 ? void 0 : _this$grid17.focus();
     }
-
     if (defocusInput) {
       this.setState({
         focusedFilterBarColumn: null
       });
     }
   }
-
   handleFilterBarTab(backward) {
     var {
       focusedFilterBarColumn
     } = this.state;
     assertNotNull(focusedFilterBarColumn);
-
     if (backward) {
       this.focusFilterBar(focusedFilterBarColumn - 1);
     } else {
       this.focusFilterBar(focusedFilterBarColumn + 1);
     }
   }
-
   handleFormatSelection(modelIndex, selectedFormat) {
     var {
       model
@@ -2231,7 +1934,6 @@ export class IrisGrid extends Component {
       customColumnFormatMap: prevCustomColumnFormatMap
     } = this.state;
     var customColumnFormatMap = new Map(prevCustomColumnFormatMap);
-
     if (selectedFormat != null) {
       var normalizedType = TableUtils.getNormalizedType(column.type);
       assertNotNull(normalizedType);
@@ -2240,26 +1942,22 @@ export class IrisGrid extends Component {
     } else {
       customColumnFormatMap.delete(column.name);
     }
-
     this.updateFormatter({
       customColumnFormatMap
     });
   }
-
   handleMenu(e) {
     e.stopPropagation();
     this.setState({
       isMenuShown: true
     });
   }
-
   handleMenuClose() {
     this.setState({
       isMenuShown: false,
       openOptions: []
     });
   }
-
   handleMenuBack() {
     this.setState(_ref15 => {
       var {
@@ -2272,7 +1970,6 @@ export class IrisGrid extends Component {
       };
     });
   }
-
   handleMenuSelect(option) {
     this.setState(_ref16 => {
       var {
@@ -2283,12 +1980,10 @@ export class IrisGrid extends Component {
       };
     });
   }
-
   handleRequestFailed(event) {
     var customEvent = event;
     log.error('request failed:', customEvent.detail);
     this.stopLoading();
-
     if (this.canRollback()) {
       this.startLoading('Rolling back changes...', true);
       this.rollback();
@@ -2300,10 +1995,8 @@ export class IrisGrid extends Component {
       onError(new Error("Error displaying table: ".concat(customEvent.detail)));
     }
   }
-
   handleUpdate() {
     var _this$grid18;
-
     this.stopLoading();
     log.debug2('Received model update');
     var {
@@ -2328,19 +2021,15 @@ export class IrisGrid extends Component {
       selectDistinctColumns,
       sorts
     };
-
     if (!isEmptyConfig(config)) {
       this.lastLoadedConfig = config;
     } else {
       this.lastLoadedConfig = null;
     }
-
     (_this$grid18 = this.grid) === null || _this$grid18 === void 0 ? void 0 : _this$grid18.forceUpdate();
   }
-
   handleViewChanged(metrics) {
     var _this$grid$state, _this$grid19;
-
     var {
       model
     } = this.props;
@@ -2348,16 +2037,15 @@ export class IrisGrid extends Component {
       selectionEndRow = 0
     } = (_this$grid$state = (_this$grid19 = this.grid) === null || _this$grid19 === void 0 ? void 0 : _this$grid19.state) !== null && _this$grid$state !== void 0 ? _this$grid$state : {};
     var pendingRowCount = 0;
-
     if (isEditableGridModel(model) && model.isEditable) {
       assertNotNull(metrics);
       var {
         bottomViewport
-      } = metrics; // We have an editable table that we can add new rows to
-      // Display empty rows beneath the table rows that user can fill in
+      } = metrics;
 
+      // We have an editable table that we can add new rows to
+      // Display empty rows beneath the table rows that user can fill in
       var bottomNonFloating = model.rowCount - model.floatingBottomRowCount;
-
       if (selectionEndRow === bottomNonFloating - 1) {
         // Selection is in the last row, add another blank row
         pendingRowCount = model.pendingRowCount + 1;
@@ -2369,13 +2057,11 @@ export class IrisGrid extends Component {
         pendingRowCount = Math.max(0, bottomViewport - (model.rowCount - model.pendingRowCount) - model.floatingTopRowCount - model.floatingBottomRowCount - 1);
       }
     }
-
     this.setState({
       metrics,
       pendingRowCount
     });
   }
-
   handleSelectionChanged(selectedRanges) {
     assertNotNull(selectedRanges);
     var {
@@ -2387,39 +2073,32 @@ export class IrisGrid extends Component {
     this.setState({
       selectedRanges
     });
-
     if (copyOperation != null) {
       this.setState({
         copyOperation: null
       });
     }
-
     onSelectionChanged(selectedRanges);
   }
-
   handleMovedColumnsChanged(movedColumns) {
     var onChangeApplied = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : () => null;
     this.setState({
       movedColumns
     }, onChangeApplied);
   }
-
   handleTooltipRef(tooltip) {
     // Need to start the timer right away, since we're creating the tooltip when we want the timer to start
     if (tooltip != null) {
       tooltip.startTimer();
     }
-
     this.tooltip = tooltip;
   }
-
   handleConditionalFormatsChange(conditionalFormats) {
     log.debug('Updated conditional formats', conditionalFormats);
     this.setState({
       conditionalFormats
     });
   }
-
   handleConditionalFormatCreate() {
     log.debug('Create new conditional format');
     var {
@@ -2436,7 +2115,6 @@ export class IrisGrid extends Component {
       conditionalFormatPreview: undefined
     });
   }
-
   handleConditionalFormatEdit(index) {
     log.debug('Edit conditional format', index);
     var {
@@ -2452,8 +2130,9 @@ export class IrisGrid extends Component {
       // Clone rule to preview temporary changes
       conditionalFormatPreview: _objectSpread({}, conditionalFormats[index])
     });
-  } // Apply live changes
+  }
 
+  // Apply live changes
 
   handleConditionalFormatEditorSave(config) {
     log.debug('Save conditional format changes', config);
@@ -2462,7 +2141,6 @@ export class IrisGrid extends Component {
         log.debug('Invalid format index');
         return null;
       }
-
       var conditionalFormats = [...state.conditionalFormats];
       conditionalFormats[state.conditionalFormatEditIndex] = config;
       return {
@@ -2472,16 +2150,14 @@ export class IrisGrid extends Component {
       this.handleMenuBack();
     });
   }
-
   handleConditionalFormatEditorCancel() {
-    this.handleMenuBack(); // Not resetting conditionalFormatPreview here
+    this.handleMenuBack();
+    // Not resetting conditionalFormatPreview here
     // to prevent editor fields change during the menu transition
-
     this.setState({
       conditionalFormatEditIndex: null
     });
   }
-
   handleUpdateCustomColumns(customColumns) {
     log.info("handleUpdateCustomColumns:", customColumns);
     var {
@@ -2499,21 +2175,18 @@ export class IrisGrid extends Component {
     } = model;
     var oldCustomColumns = model.customColumns.map(customColumn => "".concat(customColumn));
     var removedColumnNames = IrisGridUtils.getRemovedCustomColumnNames(oldCustomColumns, customColumns);
-
     if (removedColumnNames.length > 0) {
       var newSorts = IrisGridUtils.removeSortsInColumns(sorts, removedColumnNames);
       var newQuickFilters = IrisGridUtils.removeFiltersInColumns(columns, quickFilters, removedColumnNames);
       var newAdvancedFilters = IrisGridUtils.removeFiltersInColumns(columns, advancedFilters, removedColumnNames);
       var newMovedColumns = IrisGridUtils.removeColumnFromMovedColumns(columns, movedColumns, removedColumnNames);
       var newSelectDistinctColumns = IrisGridUtils.removeColumnsFromSelectDistinctColumns(selectDistinctColumns, removedColumnNames);
-
       if (newSorts.length !== sorts.length) {
         log.debug('removing sorts from removed custom columns...');
         this.setState({
           sorts: newSorts
         });
       }
-
       if (newQuickFilters.size !== quickFilters.size || newAdvancedFilters.size !== advancedFilters.size) {
         log.debug("removing filters from removed custom columns...");
         this.setState({
@@ -2521,14 +2194,12 @@ export class IrisGrid extends Component {
           advancedFilters: newAdvancedFilters
         });
       }
-
       if (!deepEqual(movedColumns, newMovedColumns)) {
         log.debug("change moved columns for removed custom columns", newMovedColumns);
         this.setState({
           movedColumns: newMovedColumns
         });
       }
-
       if (!deepEqual(selectDistinctColumns, newSelectDistinctColumns)) {
         log.debug("change selectDistinct columns for removed custom columns", newMovedColumns);
         this.setState({
@@ -2536,40 +2207,32 @@ export class IrisGrid extends Component {
         });
       }
     }
-
     this.setState({
       customColumns
     });
     this.startLoading('Applying custom columns...');
   }
-
   handleCustomColumnsChanged() {
     log.debug('custom columns changed');
     var {
       isReady
     } = this.state;
-
     if (isReady) {
       var _this$grid20;
-
       this.stopLoading();
       (_this$grid20 = this.grid) === null || _this$grid20 === void 0 ? void 0 : _this$grid20.forceUpdate();
     } else {
       this.initState();
     }
   }
-
   handlePendingCommitClicked() {
     return this.commitPending();
   }
-
   handlePendingDiscardClicked() {
     return this.discardPending();
   }
-
   handlePendingDataUpdated() {
     var _this$grid21;
-
     log.debug('pending data updated');
     var {
       model
@@ -2585,12 +2248,11 @@ export class IrisGrid extends Component {
     });
     (_this$grid21 = this.grid) === null || _this$grid21 === void 0 ? void 0 : _this$grid21.forceUpdate();
   }
+
   /**
    * User added, removed, or changed the order of aggregations, or position
    * @param aggregationSettings The new aggregation settings
    */
-
-
   handleAggregationsChange(aggregationSettings) {
     log.debug('handleAggregationsChange', aggregationSettings);
     this.startLoading("Aggregating ".concat(aggregationSettings.aggregations.map(a => a.operation).join(', '), "..."));
@@ -2598,12 +2260,11 @@ export class IrisGrid extends Component {
       aggregationSettings
     });
   }
+
   /**
    * A specific aggregation has been modified
    * @param aggregation The new aggregation
    */
-
-
   handleAggregationChange(aggregation) {
     log.debug('handleAggregationChange', aggregation);
     this.startLoading("Aggregating ".concat(aggregation.operation, "..."));
@@ -2619,12 +2280,11 @@ export class IrisGrid extends Component {
       };
     });
   }
+
   /**
    * An aggregations has been selected for editing
    * @param aggregation The aggregation to edit
    */
-
-
   handleAggregationEdit(aggregation) {
     log.debug('handleAggregationEdit', aggregation);
     var {
@@ -2638,18 +2298,17 @@ export class IrisGrid extends Component {
       selectedAggregation: aggregation
     });
   }
-
   handleRollupChange(rollupConfig) {
     var _rollupConfig$columns, _rollupConfig$columns2;
-
     log.info('Rollup change', rollupConfig);
     this.resetGridViewState();
     this.showAllColumns();
     this.clearAllFilters();
-    this.startLoading("Grouping by columns ".concat((_rollupConfig$columns = rollupConfig === null || rollupConfig === void 0 ? void 0 : (_rollupConfig$columns2 = rollupConfig.columns) === null || _rollupConfig$columns2 === void 0 ? void 0 : _rollupConfig$columns2.join(', ')) !== null && _rollupConfig$columns !== void 0 ? _rollupConfig$columns : '', "...")); // Have to clear select distinct since rollup uses the original columns, not the current ones.
+    this.startLoading("Grouping by columns ".concat((_rollupConfig$columns = rollupConfig === null || rollupConfig === void 0 ? void 0 : (_rollupConfig$columns2 = rollupConfig.columns) === null || _rollupConfig$columns2 === void 0 ? void 0 : _rollupConfig$columns2.join(', ')) !== null && _rollupConfig$columns !== void 0 ? _rollupConfig$columns : '', "..."));
+
+    // Have to clear select distinct since rollup uses the original columns, not the current ones.
     // IrisGridProxyModel has a check to prevent model update
     // when selectDistinctModel is cleared and the rollupConfig is set on the model.
-
     this.setState({
       rollupConfig,
       movedColumns: [],
@@ -2658,7 +2317,6 @@ export class IrisGrid extends Component {
       selectDistinctColumns: []
     });
   }
-
   handleSelectDistinctChanged(columnNames) {
     log.debug('SelectDistinct change', columnNames);
     this.resetGridViewState();
@@ -2672,12 +2330,10 @@ export class IrisGrid extends Component {
       reverseType: TableUtils.REVERSE_TYPE.NONE
     });
   }
-
   handleDownloadTableStart() {
     var {
       canDownloadCsv
     } = this.props;
-
     if (canDownloadCsv) {
       this.setState({
         isTableDownloading: true,
@@ -2689,19 +2345,16 @@ export class IrisGrid extends Component {
       log.error('Attempted to handleDownloadTableStart for user without download CSV permission.');
     }
   }
-
   handleDownloadTable(fileName, frozenTable, tableSubscription, snapshotRanges, modelRanges, includeColumnHeaders, useUnformattedValues) {
     var {
       canDownloadCsv
     } = this.props;
-
     if (canDownloadCsv) {
       log.info('start table downloading', fileName, frozenTable, tableSubscription, snapshotRanges, modelRanges, includeColumnHeaders, useUnformattedValues);
       this.setState(() => {
         if (this.tableSaver) {
           this.tableSaver.startDownload(fileName, frozenTable, tableSubscription, snapshotRanges, modelRanges, includeColumnHeaders, useUnformattedValues);
         }
-
         return {
           tableDownloadStatus: TableCsvExporter.DOWNLOAD_STATUS.DOWNLOADING
         };
@@ -2710,16 +2363,13 @@ export class IrisGrid extends Component {
       log.error('Attempted to handleDownloadTable for user without download CSV permission.');
     }
   }
-
   handleCancelDownloadTable() {
     var _this$tableSaver;
-
     (_this$tableSaver = this.tableSaver) === null || _this$tableSaver === void 0 ? void 0 : _this$tableSaver.cancelDownload();
     this.setState({
       isTableDownloading: false
     });
   }
-
   handleDownloadCompleted() {
     this.setState({
       isTableDownloading: false,
@@ -2727,7 +2377,6 @@ export class IrisGrid extends Component {
       tableDownloadStatus: TableCsvExporter.DOWNLOAD_STATUS.FINISHED
     });
   }
-
   handleDownloadCanceled() {
     this.setState({
       isTableDownloading: false,
@@ -2735,12 +2384,11 @@ export class IrisGrid extends Component {
       tableDownloadStatus: TableCsvExporter.DOWNLOAD_STATUS.CANCELED
     });
   }
+
   /**
    * Delete the specified ranges from the table.
    * @param ranges The ranges to delete
    */
-
-
   deleteRanges(ranges) {
     var {
       model
@@ -2751,16 +2399,13 @@ export class IrisGrid extends Component {
       }
     });
   }
-
   resetColumnSelection() {
     if (this.grid == null) {
       return;
     }
-
     var {
       isSelectingColumn
     } = this.props;
-
     if (isSelectingColumn) {
       var {
         columnAllowedCursor
@@ -2777,14 +2422,11 @@ export class IrisGrid extends Component {
       });
     }
   }
-
   resetGridViewState() {
     var forceUpdate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-
     if (!this.grid) {
       return;
     }
-
     this.grid.clearSelectedRanges();
     this.grid.setViewState({
       left: 0,
@@ -2793,12 +2435,10 @@ export class IrisGrid extends Component {
       leftOffset: 0
     }, forceUpdate);
   }
-
   sendStateChange() {
     if (!this.grid) {
       return;
     }
-
     var {
       state: irisGridState
     } = this;
@@ -2810,16 +2450,13 @@ export class IrisGrid extends Component {
     } = this.props;
     onStateChange(irisGridState, gridState);
   }
-
   handleOverflowClose() {
     this.setState({
       showOverflowModal: false
     });
   }
-
   getColumnBoundingRect() {
     var _this$gridWrapper2;
-
     var {
       metrics,
       shownColumnTooltip
@@ -2855,14 +2492,12 @@ export class IrisGrid extends Component {
       }
     };
   }
-
   handleGotoRowSelectedRowNumberSubmit() {
     var {
       gotoRow: rowNumber
     } = this.state;
     this.focusRowInGrid(rowNumber);
   }
-
   focusRowInGrid(rowNumber) {
     var {
       model
@@ -2873,49 +2508,41 @@ export class IrisGrid extends Component {
     this.setState({
       gotoRow: rowNumber
     });
-
     if (rowNumber === '') {
       this.setState({
         gotoRowError: ''
       });
       return;
     }
-
     var rowInt = parseInt(rowNumber, 10);
-
     if (rowInt > rowCount || rowInt < -rowCount) {
       this.setState({
         gotoRowError: 'Invalid row index'
       });
     } else if (rowInt === 0) {
       var _this$grid22;
-
       this.setState({
         gotoRowError: ''
       });
       (_this$grid22 = this.grid) === null || _this$grid22 === void 0 ? void 0 : _this$grid22.setFocusRow(0);
     } else if (rowInt < 0) {
       var _this$grid23;
-
       this.setState({
         gotoRowError: ''
       });
       (_this$grid23 = this.grid) === null || _this$grid23 === void 0 ? void 0 : _this$grid23.setFocusRow(rowInt + rowCount);
     } else {
       var _this$grid24;
-
       (_this$grid24 = this.grid) === null || _this$grid24 === void 0 ? void 0 : _this$grid24.setFocusRow(rowInt - 1);
       this.setState({
         gotoRowError: ''
       });
     }
   }
-
   handleGotoRowSelectedRowNumberChanged(event) {
     var rowNumber = event.target.value;
     this.focusRowInGrid(rowNumber);
   }
-
   getColumnTooltip(visibleIndex, metrics, model) {
     var {
       columnHeaderHeight,
@@ -2926,10 +2553,10 @@ export class IrisGrid extends Component {
     } = metrics;
     var columnX = visibleColumnXs.get(visibleIndex);
     var columnWidth = visibleColumnWidths.get(visibleIndex);
-
     if (columnX == null || columnWidth == null) {
       return null;
     }
+
     /**
      * Create a wrapper dom element, the size of the column header.
      * The wrapper acts as tooltip parent, the  tooltip component
@@ -2937,11 +2564,8 @@ export class IrisGrid extends Component {
      * The wrapper should be bound to within the grid dimensions,
      * so popper only remains triggered while mouse is inside the panel.
      */
-
-
     var boundedLeft = Math.max(0, columnX);
     var boundedWidth = columnWidth;
-
     if (columnX + columnWidth > width) {
       // column is extending past right edge
       boundedWidth = width - columnX;
@@ -2949,7 +2573,6 @@ export class IrisGrid extends Component {
       // column is extending past left edge
       boundedWidth = columnWidth - Math.abs(columnX);
     }
-
     var wrapperStyle = {
       position: 'absolute',
       top: (columnHeaderMaxDepth - 1) * columnHeaderHeight,
@@ -2958,6 +2581,7 @@ export class IrisGrid extends Component {
       height: columnHeaderHeight,
       pointerEvents: 'none'
     };
+
     /**
      * Because the popper parent wrapper center is no longer the same as
      * the column label center, we create a popper virtual ref, to handle
@@ -2966,7 +2590,6 @@ export class IrisGrid extends Component {
      * label, clamped to 0 + margin to width - margin. We add a margin,
      * otherwise the arrow wants to escape the boundary.
      */
-
     var virtualReference = {
       clientWidth: 1,
       clientHeight: columnHeaderHeight,
@@ -3003,20 +2626,17 @@ export class IrisGrid extends Component {
       column: column,
       onStatistics: () => {
         var _this$tooltip;
-
         (_this$tooltip = this.tooltip) === null || _this$tooltip === void 0 ? void 0 : _this$tooltip.update();
       }
     })));
   }
-
   render() {
     var _rollupConfig$columns3,
-        _rollupConfig$columns4,
-        _this4 = this,
-        _this$grid26,
-        _this$grid26$state$dr,
-        _openOptions;
-
+      _rollupConfig$columns4,
+      _this5 = this,
+      _this$grid26,
+      _this$grid26$state$dr,
+      _openOptions;
     var {
       children,
       customFilters,
@@ -3095,11 +2715,9 @@ export class IrisGrid extends Component {
       gotoRow,
       gotoRowError
     } = this.state;
-
     if (!isReady) {
       return null;
     }
-
     var theme = this.getTheme();
     var filter = this.getCachedFilter(customFilters, quickFilters, advancedFilters, partitionFilters, searchFilter);
     var userColumnWidths = metricCalculator.getUserColumnWidths();
@@ -3108,17 +2726,14 @@ export class IrisGrid extends Component {
     var bottom = metrics ? metrics.bottomViewport : 0;
     var left = null;
     var right = null;
-
     if (onlyFetchVisibleColumns) {
       left = metrics ? metrics.left : 0;
       right = metrics ? metrics.right : 0;
     }
-
     var isVisible = metrics != null && metrics.width > 0 && metrics.height > 0;
     var isRollup = ((_rollupConfig$columns3 = rollupConfig === null || rollupConfig === void 0 ? void 0 : (_rollupConfig$columns4 = rollupConfig.columns) === null || _rollupConfig$columns4 === void 0 ? void 0 : _rollupConfig$columns4.length) !== null && _rollupConfig$columns3 !== void 0 ? _rollupConfig$columns3 : 0) > 0;
     var focusField = null;
     var debounceMs = metrics ? Math.min(Math.max(IrisGrid.minDebounce, Math.round(metrics.rowCount / 200)), IrisGrid.maxDebounce) : IrisGrid.maxDebounce;
-
     if (isFilterBarShown && focusedFilterBarColumn != null && metrics != null) {
       var {
         gridX,
@@ -3129,16 +2744,12 @@ export class IrisGrid extends Component {
       } = metrics;
       var columnX = visibleColumnXs.get(focusedFilterBarColumn);
       var columnWidth = visibleColumnWidths.get(focusedFilterBarColumn);
-
       if (columnX != null && columnWidth != null) {
         var _theme$filterBarHeigh, _theme$filterBarHeigh2, _this$grid25;
-
         var x = gridX + columnX;
         var y = gridY - ((_theme$filterBarHeigh = theme.filterBarHeight) !== null && _theme$filterBarHeigh !== void 0 ? _theme$filterBarHeigh : 0);
         var fieldWidth = columnWidth + 1; // cover right border
-
         var fieldHeight = ((_theme$filterBarHeigh2 = theme.filterBarHeight) !== null && _theme$filterBarHeigh2 !== void 0 ? _theme$filterBarHeigh2 : 0) - 1; // remove bottom border
-
         var style = {
           top: y,
           left: x,
@@ -3152,12 +2763,10 @@ export class IrisGrid extends Component {
         assertNotNull(modelColumn);
         var quickFilter = quickFilters.get(modelColumn);
         var advancedFilter = advancedFilters.get(modelColumn);
-
         if (quickFilter != null) {
           _value4 = quickFilter.text;
           isValid = quickFilter.filter != null;
         }
-
         var isBarFiltered = quickFilters.size !== 0 || advancedFilters.size !== 0;
         focusField = /*#__PURE__*/React.createElement(FilterInputField, {
           ref: this.filterInputRef,
@@ -3183,9 +2792,7 @@ export class IrisGrid extends Component {
         });
       }
     }
-
     var loadingElement = null;
-
     if (loadingText != null) {
       var loadingStatus = /*#__PURE__*/React.createElement("div", {
         className: "iris-grid-loading-status"
@@ -3203,9 +2810,7 @@ export class IrisGrid extends Component {
         icon: vsClose,
         transform: "down-1"
       }), "Cancel"));
-
       var _gridY = metrics ? metrics.gridY : 0;
-
       loadingElement = /*#__PURE__*/React.createElement("div", {
         className: "iris-grid-loading",
         style: {
@@ -3213,19 +2818,14 @@ export class IrisGrid extends Component {
         }
       }, loadingStatus);
     }
-
     var columnTooltip = null;
-
     if (shownColumnTooltip != null && metrics) {
       var _this$tooltip2;
-
-      columnTooltip = this.getColumnTooltip(shownColumnTooltip, metrics, model); // #510 We may need to update the position of the tooltip if it's already opened and columns are resized
-
+      columnTooltip = this.getColumnTooltip(shownColumnTooltip, metrics, model);
+      // #510 We may need to update the position of the tooltip if it's already opened and columns are resized
       (_this$tooltip2 = this.tooltip) === null || _this$tooltip2 === void 0 ? void 0 : _this$tooltip2.update();
     }
-
     var filterBar = [];
-
     if (metrics && isFilterBarShown) {
       var {
         gridX: _gridX,
@@ -3237,33 +2837,22 @@ export class IrisGrid extends Component {
       var {
         filterBarHeight
       } = theme;
-
       var _loop2 = function _loop2(i) {
         var columnIndex = visibleColumns[i];
-
         var columnX = _visibleColumnXs.get(columnIndex);
-
         var columnWidth = _visibleColumnWidths.get(columnIndex);
-
-        var modelColumn = _this4.getModelColumn(columnIndex);
-
+        var modelColumn = _this5.getModelColumn(columnIndex);
         if (modelColumn != null) {
           var isFilterable = model.isFilterable(modelColumn);
-
           if (isFilterable && columnX != null && columnWidth != null && columnWidth > 0) {
             var _x = _gridX + columnX + columnWidth - 24;
-
             var _y = _gridY2 - (filterBarHeight !== null && filterBarHeight !== void 0 ? filterBarHeight : 0) + 2; // 2 acts as top margin for the button
-
-
             var _style = {
               position: 'absolute',
               top: _y,
               left: _x
             };
-
             var _advancedFilter = advancedFilters.get(modelColumn);
-
             var isFilterSet = _advancedFilter != null;
             var isFilterVisible = columnIndex === hoverAdvancedFilter || columnIndex === focusedFilterBarColumn || isFilterSet;
             var element = /*#__PURE__*/React.createElement("div", {
@@ -3278,22 +2867,21 @@ export class IrisGrid extends Component {
                 'filter-set': isFilterSet
               }),
               onClick: () => {
-                _this4.setState({
+                _this5.setState({
                   shownAdvancedFilter: columnIndex
                 });
               },
               onContextMenu: event => {
-                var _this4$grid;
-
-                (_this4$grid = _this4.grid) === null || _this4$grid === void 0 ? void 0 : _this4$grid.handleContextMenu(event);
+                var _this5$grid;
+                (_this5$grid = _this5.grid) === null || _this5$grid === void 0 ? void 0 : _this5$grid.handleContextMenu(event);
               },
               onMouseEnter: () => {
-                _this4.setState({
+                _this5.setState({
                   hoverAdvancedFilter: columnIndex
                 });
               },
               onMouseLeave: () => {
-                _this4.setState({
+                _this5.setState({
                   hoverAdvancedFilter: null
                 });
               }
@@ -3310,14 +2898,11 @@ export class IrisGrid extends Component {
           }
         }
       };
-
       for (var i = 0; i < visibleColumns.length; i += 1) {
         _loop2(i);
       }
     }
-
     var advancedFilterMenus = [];
-
     if (metrics) {
       var {
         gridX: _gridX2,
@@ -3326,18 +2911,13 @@ export class IrisGrid extends Component {
         visibleColumnWidths: _visibleColumnWidths2,
         columnHeaderHeight
       } = metrics;
-
       var _loop3 = function _loop3(_i3) {
         var columnIndex = _visibleColumns[_i3];
-
         var columnX = _visibleColumnXs2.get(columnIndex);
-
         var columnWidth = _visibleColumnWidths2.get(columnIndex);
-
         if (columnX != null && columnWidth != null && columnWidth > 0) {
           var xColumnHeader = _gridX2 + columnX;
           var xFilterBar = _gridX2 + columnX + columnWidth - 20;
-
           var _style2 = isFilterBarShown ? {
             position: 'absolute',
             top: columnHeaderHeight,
@@ -3351,14 +2931,10 @@ export class IrisGrid extends Component {
             width: columnWidth,
             height: columnHeaderHeight
           };
-
-          var _modelColumn = _this4.getModelColumn(columnIndex);
-
+          var _modelColumn = _this5.getModelColumn(columnIndex);
           if (_modelColumn != null) {
             var _column3 = model.columns[_modelColumn];
-
             var _advancedFilter2 = advancedFilters.get(_modelColumn);
-
             var {
               options: advancedFilterOptions
             } = _advancedFilter2 || {};
@@ -3370,9 +2946,9 @@ export class IrisGrid extends Component {
               style: _style2
             }, /*#__PURE__*/React.createElement(Popper, {
               className: "advanced-filter-menu-popper",
-              onEntered: _this4.getAdvancedMenuOpenedHandler(columnIndex),
+              onEntered: _this5.getAdvancedMenuOpenedHandler(columnIndex),
               onExited: () => {
-                _this4.handleAdvancedMenuClosed(columnIndex);
+                _this5.handleAdvancedMenuClosed(columnIndex);
               },
               isShown: shownAdvancedFilter === columnIndex,
               interactive: true,
@@ -3380,17 +2956,15 @@ export class IrisGrid extends Component {
               options: {
                 positionFixed: true
               }
-            }, _this4.getCachedAdvancedFilterMenuActions(model, _column3, advancedFilterOptions, sortDirection, formatter)));
+            }, _this5.getCachedAdvancedFilterMenuActions(model, _column3, advancedFilterOptions, sortDirection, formatter)));
             advancedFilterMenus.push(element);
           }
         }
       };
-
       for (var _i3 = 0; _i3 < _visibleColumns.length; _i3 += 1) {
         _loop3(_i3);
       }
     }
-
     var optionItems = this.getCachedOptionItems(onCreateChart !== undefined && model.isChartBuilderAvailable, model.isCustomColumnsAvailable, model.isFormatColumnsAvailable, model.isRollupAvailable, model.isTotalsAvailable, model.isSelectDistinctAvailable, model.isExportAvailable, this.toggleFilterBarAction, this.toggleSearchBarAction, this.toggleGotoRowAction, isFilterBarShown, showSearchBar, canDownloadCsv, this.isTableSearchAvailable(), isGotoRowShown, advancedSettings.size > 0);
     var openOptionsStack = openOptions.map(option => {
       switch (option.type) {
@@ -3401,7 +2975,6 @@ export class IrisGrid extends Component {
             onSubmit: this.handleChartCreate,
             key: OptionType.CHART_BUILDER
           });
-
         case OptionType.VISIBILITY_ORDERING_BUILDER:
           return /*#__PURE__*/React.createElement(VisibilityOrderingBuilder, {
             model: model,
@@ -3411,7 +2984,6 @@ export class IrisGrid extends Component {
             onMovedColumnsChanged: this.handleMovedColumnsChanged,
             key: OptionType.VISIBILITY_ORDERING_BUILDER
           });
-
         case OptionType.CONDITIONAL_FORMATTING:
           return /*#__PURE__*/React.createElement(ConditionalFormattingMenu, {
             rules: conditionalFormats,
@@ -3419,7 +2991,6 @@ export class IrisGrid extends Component {
             onCreate: this.handleConditionalFormatCreate,
             onSelect: this.handleConditionalFormatEdit
           });
-
         case OptionType.CONDITIONAL_FORMATTING_EDIT:
           assertNotNull(model.columns);
           assertNotNull(this.handleConditionalFormatEditorUpdate);
@@ -3430,7 +3001,6 @@ export class IrisGrid extends Component {
             onSave: this.handleConditionalFormatEditorSave,
             onCancel: this.handleConditionalFormatEditorCancel
           });
-
         case OptionType.CUSTOM_COLUMN_BUILDER:
           return /*#__PURE__*/React.createElement(CustomColumnBuilder, {
             model: model,
@@ -3439,7 +3009,6 @@ export class IrisGrid extends Component {
             onCancel: this.handleMenuBack,
             key: OptionType.CUSTOM_COLUMN_BUILDER
           });
-
         case OptionType.ROLLUP_ROWS:
           return /*#__PURE__*/React.createElement(RollupRows, {
             model: model,
@@ -3447,7 +3016,6 @@ export class IrisGrid extends Component {
             config: rollupConfig,
             key: OptionType.ROLLUP_ROWS
           });
-
         case OptionType.AGGREGATIONS:
           return /*#__PURE__*/React.createElement(Aggregations, {
             settings: aggregationSettings,
@@ -3455,14 +3023,12 @@ export class IrisGrid extends Component {
             onChange: this.handleAggregationsChange,
             onEdit: this.handleAggregationEdit
           });
-
         case OptionType.AGGREGATION_EDIT:
           return selectedAggregation && /*#__PURE__*/React.createElement(AggregationEdit, {
             aggregation: selectedAggregation,
             columns: model.originalColumns,
             onChange: this.handleAggregationChange
           });
-
         case OptionType.TABLE_EXPORTER:
           return /*#__PURE__*/React.createElement(TableCsvExporter, {
             model: model,
@@ -3479,20 +3045,17 @@ export class IrisGrid extends Component {
             selectedRanges: selectedRanges,
             key: OptionType.TABLE_EXPORTER
           });
-
         case OptionType.SELECT_DISTINCT:
           return /*#__PURE__*/React.createElement(SelectDistinctBuilder, {
             model: model,
             selectDistinctColumns: selectDistinctColumns,
             onChange: this.handleSelectDistinctChanged
           });
-
         case OptionType.ADVANCED_SETTINGS:
           return /*#__PURE__*/React.createElement(AdvancedSettingsMenu, {
             items: advancedSettings,
             onChange: onAdvancedSettingsChange
           });
-
         default:
           throw Error("Unexpected option type ".concat(option.type));
       }
@@ -3517,7 +3080,7 @@ export class IrisGrid extends Component {
       unmountOnExit: true
     }, /*#__PURE__*/React.createElement("div", {
       className: "iris-grid-partition-selector-wrapper iris-grid-bar iris-grid-bar-primary"
-    }, partitionTable && partitionColumn && /*#__PURE__*/React.createElement(IrisGridPartitionSelector, {
+    }, partitionTable && partitionColumn && partition != null && /*#__PURE__*/React.createElement(IrisGridPartitionSelector, {
       table: partitionTable,
       getFormattedString: (value, type, stringName) => model.displayString(value, type, stringName),
       columnName: partitionColumn.name,
@@ -3589,7 +3152,8 @@ export class IrisGrid extends Component {
       customColumns: customColumns,
       hiddenColumns: hiddenColumns,
       alwaysFetchColumns: this.getAlwaysFetchColumns(alwaysFetchColumns, model.columns, movedColumns, model.floatingLeftColumnCount, model.floatingRightColumnCount, (_this$grid26 = this.grid) === null || _this$grid26 === void 0 ? void 0 : (_this$grid26$state$dr = _this$grid26.state.draggingColumn) === null || _this$grid26$state$dr === void 0 ? void 0 : _this$grid26$state$dr.range),
-      formatColumns: this.getCachedPreviewFormatColumns(this.getCachedModelColumns(model, customColumns), conditionalFormats, conditionalFormatPreview, // Disable the preview format when we press Back on the format edit page
+      formatColumns: this.getCachedPreviewFormatColumns(this.getCachedModelColumns(model, customColumns), conditionalFormats, conditionalFormatPreview,
+      // Disable the preview format when we press Back on the format edit page
       ((_openOptions = openOptions[openOptions.length - 1]) === null || _openOptions === void 0 ? void 0 : _openOptions.type) === OptionType.CONDITIONAL_FORMATTING_EDIT ? conditionalFormatEditIndex !== null && conditionalFormatEditIndex !== void 0 ? conditionalFormatEditIndex : undefined : undefined),
       rollupConfig: this.getModelRollupConfig(model.originalColumns, rollupConfig, aggregationSettings),
       totalsConfig: this.getModelTotalsConfig(model.columns, rollupConfig, aggregationSettings),
@@ -3680,15 +3244,10 @@ export class IrisGrid extends Component {
       actions: this.contextActions
     }));
   }
-
 }
-
 _defineProperty(IrisGrid, "minDebounce", 150);
-
 _defineProperty(IrisGrid, "maxDebounce", 500);
-
 _defineProperty(IrisGrid, "loadingSpinnerDelay", 800);
-
 _defineProperty(IrisGrid, "defaultProps", {
   children: null,
   advancedFilters: new Map(),
@@ -3757,6 +3316,5 @@ _defineProperty(IrisGrid, "defaultProps", {
   theme: IrisGridTheme,
   canToggleSearch: true
 });
-
 export default IrisGrid;
 //# sourceMappingURL=IrisGrid.js.map