@deephaven/iris-grid 0.59.1-beta.0 → 0.59.1-beta.12

package/dist/IrisGrid.js

@@ -40,6 +40,7 @@ import { Aggregations, AggregationEdit, AggregationUtils, ChartBuilder, CustomCo
 import IrisGridUtils from "./IrisGridUtils.js";
 import CrossColumnSearch from "./CrossColumnSearch.js";
 import IrisGridModel from "./IrisGridModel.js";
+import { isPartitionedGridModel } from "./PartitionedGridModel.js";
 import IrisGridPartitionSelector from "./IrisGridPartitionSelector.js";
 import SelectDistinctBuilder from "./sidebar/SelectDistinctBuilder.js";
 import AdvancedSettingsType from "./sidebar/AdvancedSettingsType.js";
@@ -51,6 +52,7 @@ import IrisGridCellOverflowModal from "./IrisGridCellOverflowModal.js";
 import GotoRow from "./GotoRow.js";
 import AggregationOperation from "./sidebar/aggregations/AggregationOperation.js";
 import { IrisGridThemeContext } from "./IrisGridThemeProvider.js";
+import { isMissingPartitionError } from "./MissingPartitionError.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var log = Log.module('IrisGrid');
@@ -297,7 +299,7 @@ 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] : [])], {
+    _defineProperty(this, "getCachedFilter", memoize((customFilters, quickFilters, advancedFilters, searchFilter) => [...(customFilters !== null && customFilters !== void 0 ? customFilters : []), ...IrisGridUtils.getFiltersFromFilterMap(quickFilters), ...IrisGridUtils.getFiltersFromFilterMap(advancedFilters), ...(searchFilter !== undefined ? [searchFilter] : [])], {
       max: 1
     }));
     _defineProperty(this, "getCachedTheme", memoize((contextTheme, theme, isEditable, floatingRowCount) => {
@@ -438,7 +440,8 @@ export class IrisGrid extends Component {
     }));
     _defineProperty(this, "handleGotoValueChanged", input => {
       this.setState({
-        gotoValue: input
+        gotoValue: input,
+        gotoValueManuallyChanged: true
       });
       this.debouncedSeekRow(input);
     });
@@ -496,8 +499,6 @@ export class IrisGrid extends Component {
     this.handleDownloadCanceled = this.handleDownloadCanceled.bind(this);
     this.handleDownloadCompleted = this.handleDownloadCompleted.bind(this);
     this.handlePartitionChange = this.handlePartitionChange.bind(this);
-    this.handlePartitionFetchAll = this.handlePartitionFetchAll.bind(this);
-    this.handlePartitionDone = this.handlePartitionDone.bind(this);
     this.handleColumnVisibilityChanged = this.handleColumnVisibilityChanged.bind(this);
     this.handleColumnVisibilityReset = this.handleColumnVisibilityReset.bind(this);
     this.handleCrossColumnSearch = this.handleCrossColumnSearch.bind(this);
@@ -566,11 +567,11 @@ export class IrisGrid extends Component {
       customColumnFormatMap,
       isFilterBarShown: _isFilterBarShown,
       isSelectingPartition,
+      partitions,
+      partitionConfig,
       model: _model,
       movedColumns: movedColumnsProp,
       movedRows: movedRowsProp,
-      partitions,
-      partitionColumns,
       rollupConfig: _rollupConfig,
       userColumnWidths: _userColumnWidths,
       userRowHeights,
@@ -614,10 +615,10 @@ export class IrisGrid extends Component {
       metrics: undefined,
       keyHandlers,
       mouseHandlers,
-      partitions,
-      partitionColumns,
-      partitionTable: null,
-      partitionFilters: [],
+      partitionConfig: partitionConfig !== null && partitionConfig !== void 0 ? partitionConfig : partitions && partitions.length ? {
+        partitions,
+        mode: 'partition'
+      } : undefined,
       // setAdvancedFilter and setQuickFilter mutate the arguments
       // so we want to always use map copies from the state instead of props
       quickFilters: _quickFilters ? new Map(_quickFilters) : new Map(),
@@ -683,20 +684,15 @@ export class IrisGrid extends Component {
       gotoValueSelectedColumnName: (_model$columns$0$name = (_model$columns$ = _model.columns[0]) === null || _model$columns$ === void 0 ? void 0 : _model$columns$.name) !== null && _model$columns$0$name !== void 0 ? _model$columns$0$name : '',
       gotoValueSelectedFilter: FilterType.eqIgnoreCase,
       gotoValue: '',
+      gotoValueManuallyChanged: false,
       columnHeaderGroups: columnHeaderGroups !== null && columnHeaderGroups !== void 0 ? columnHeaderGroups : _model.initialColumnHeaderGroups
     };
   }
   componentDidMount() {
     var {
-      partitionColumns,
       model
     } = this.props;
-    var columns = partitionColumns.length ? partitionColumns : model.columns.filter(c => c.isPartitionColumn);
-    if (model.isFilterRequired && model.isValuesTableAvailable && columns.length) {
-      this.loadPartitionsTable(columns);
-    } else {
-      this.initState();
-    }
+    this.initState();
     this.startListening(model);
   }
   componentDidUpdate(prevProps, prevState) {
@@ -1237,6 +1233,20 @@ export class IrisGrid extends Component {
     this.updateFormatterSettings(settings);
   }
   initState() {
+    var {
+      model
+    } = this.props;
+    try {
+      if (isPartitionedGridModel(model) && model.isPartitionRequired) {
+        this.loadPartitionsTable(model);
+      } else {
+        this.loadTableState();
+      }
+    } catch (error) {
+      this.handleTableLoadError(error);
+    }
+  }
+  loadTableState() {
     var {
       applyInputFiltersOnInit,
       inputFilters,
@@ -1265,67 +1275,72 @@ export class IrisGrid extends Component {
     });
     this.initFormatter();
   }
-  loadPartitionsTable(partitionColumns) {
+  loadPartitionsTable(model) {
     var _this = this;
     return _asyncToGenerator(function* () {
-      var {
-        model
-      } = _this.props;
-      _this.setState({
-        isSelectingPartition: true
-      });
       try {
-        var partitionTable = yield _this.pending.add(model.valuesTable(partitionColumns), resolved => resolved.close());
-        var columns = partitionTable.columns.slice(0, partitionColumns.length);
-        var sorts = columns.map(column => column.sort().desc());
-        partitionTable.applySort(sorts);
-        partitionTable.setViewport(0, 0, columns);
-        var _data = yield _this.pending.add(partitionTable.getViewportData());
-        if (_data.rows.length > 0) {
-          var row = _data.rows[0];
-          var values = columns.map(column => row.get(column));
-          _this.updatePartition(values, partitionColumns);
-          _this.setState({
-            isSelectingPartition: true
-          });
-        } else {
-          log.info('Table does not have any data, just fetching all');
-          _this.setState({
-            isSelectingPartition: false
-          });
-          _this.handlePartitionFetchAll();
-        }
+        var partitionConfig = yield _this.getInitialPartitionConfig(model);
         _this.setState({
-          partitionTable,
-          partitionColumns
-        }, () => {
-          _this.initState();
-        });
+          isSelectingPartition: true,
+          partitionConfig
+        }, _this.loadTableState);
       } catch (error) {
-        _this.handleTableLoadError(error);
+        if (!PromiseUtils.isCanceled(error)) {
+          _this.handleTableLoadError(error);
+        }
       }
     })();
   }
-  updatePartition(partitions, partitionColumns) {
-    var partitionFilters = [];
-    for (var i = 0; i < partitionColumns.length; i += 1) {
-      var partition = partitions[i];
-      var partitionColumn = partitionColumns[i];
-      if (partition !== null && !(TableUtils.isCharType(partitionColumn.type) && partition === '')) {
-        var {
-          model: _model2
-        } = this.props;
-        var partitionText = TableUtils.isCharType(partitionColumn.type) ? _model2.displayString(partition, partitionColumn.type, partitionColumn.name) : partition;
-        var partitionFilter = this.tableUtils.makeQuickFilterFromComponent(partitionColumn, partitionText);
-        if (partitionFilter !== null) {
-          partitionFilters.push(partitionFilter);
-        }
+
+  /**
+   * Gets the initial partition config for the currently set model.
+   * Sorts the key table and gets the first key.
+   * If the table is ticking, it will wait for the first tick.
+   */
+  getInitialPartitionConfig(model) {
+    var _this2 = this;
+    return _asyncToGenerator(function* () {
+      var {
+        partitionConfig
+      } = _this2.state;
+      if (partitionConfig !== undefined) {
+        // User already has a partition selected, just use that
+        return partitionConfig;
       }
-    }
-    this.setState({
-      partitions,
-      partitionFilters
-    });
+      var keyTable = yield _this2.pending.add(model.partitionKeysTable(), resolved => resolved.close());
+      var {
+        dh
+      } = model;
+      var sorts = keyTable.columns.map(column => column.sort().desc());
+      keyTable.applySort(sorts);
+      keyTable.setViewport(0, 0);
+      return new Promise((resolve, reject) => {
+        // We want to wait for the first UPDATED event instead of just getting viewport data here
+        // It's possible that the key table does not have any rows of data yet, so just wait until it does have one
+        keyTable.addEventListener(dh.Table.EVENT_UPDATED, event => {
+          try {
+            var {
+              detail: _data
+            } = event;
+            if (_data.rows.length === 0) {
+              // Table is empty, wait for the next updated event
+              return;
+            }
+            var row = _data.rows[0];
+            var values = keyTable.columns.map(column => row.get(column));
+            var newPartition = {
+              partitions: values,
+              mode: 'partition'
+            };
+            keyTable.close();
+            resolve(newPartition);
+          } catch (e) {
+            keyTable.close();
+            reject(e);
+          }
+        });
+      });
+    })();
   }
   copyCell(columnIndex, rowIndex) {
     var rawValue = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
@@ -1685,24 +1700,10 @@ export class IrisGrid extends Component {
     log.debug2('handleAnimationEnd');
     this.isAnimating = false;
   }
-  handlePartitionChange(partitions) {
-    var {
-      partitionColumns
-    } = this.state;
-    if (partitionColumns.length === 0) {
-      return;
-    }
-    this.updatePartition(partitions, partitionColumns);
-  }
-  handlePartitionFetchAll() {
+  handlePartitionChange(partitionConfig) {
+    this.startLoading('Partitioning...');
     this.setState({
-      partitionFilters: [],
-      isSelectingPartition: false
-    });
-  }
-  handlePartitionDone() {
-    this.setState({
-      isSelectingPartition: false
+      partitionConfig
     });
   }
   handleTableLoadError(error) {
@@ -1800,15 +1801,15 @@ export class IrisGrid extends Component {
       } else {
         var columnIndex = 0;
         var {
-          model: _model3
+          model: _model2
         } = this.props;
         var {
           columnCount
-        } = _model3;
+        } = _model2;
         for (var i = 0; i < columnCount; i += 1) {
           var modelColumn = this.getModelColumn(i);
           if (modelColumn != null) {
-            var _column = _model3.columns[modelColumn];
+            var _column = _model2.columns[modelColumn];
             if (_column != null && TableUtils.isTextType(_column.type)) {
               columnIndex = i;
               break;
@@ -1877,7 +1878,8 @@ export class IrisGrid extends Component {
         gotoValue: value,
         gotoValueSelectedColumnName: columnName,
         gotoRowError: '',
-        gotoValueError: ''
+        gotoValueError: '',
+        gotoValueManuallyChanged: false
       });
       this.focusRowInGrid(row);
       (_this$gotoRowRef$curr = this.gotoRowRef.current) === null || _this$gotoRowRef$curr === void 0 ? void 0 : _this$gotoRowRef$curr.focus();
@@ -1892,7 +1894,8 @@ export class IrisGrid extends Component {
         gotoRow: '',
         gotoValue: '',
         gotoRowError: '',
-        gotoValueError: ''
+        gotoValueError: '',
+        gotoValueManuallyChanged: false
       });
       return;
     }
@@ -1912,64 +1915,65 @@ export class IrisGrid extends Component {
       gotoValue: text,
       gotoValueSelectedColumnName: name,
       gotoRowError: '',
-      gotoValueError: ''
+      gotoValueError: '',
+      gotoValueManuallyChanged: false
     });
   }
   commitPending() {
-    var _this2 = this;
+    var _this3 = this;
     return _asyncToGenerator(function* () {
       var _document, _document$activeEleme;
       var {
         model
-      } = _this2.props;
+      } = _this3.props;
       if (!isEditableGridModel(model) || !model.isEditable) {
         throw new Error('Cannot save, table is not editable');
       }
       var {
         pendingSavePromise
-      } = _this2.state;
+      } = _this3.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;
+        var _this3$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
-        (_this2$grid = _this2.grid) === null || _this2$grid === void 0 ? void 0 : _this2$grid.focus();
+        (_this3$grid = _this3.grid) === null || _this3$grid === void 0 ? void 0 : _this3$grid.focus();
       }
-      var newPendingSavePromise = _this2.pending.add(model.commitPending()).then(() => {
-        _this2.setState({
+      var newPendingSavePromise = _this3.pending.add(model.commitPending()).then(() => {
+        _this3.setState({
           pendingSaveError: null,
           pendingSavePromise: null
         });
       }).catch(err => {
         if (!PromiseUtils.isCanceled(err)) {
-          _this2.setState({
+          _this3.setState({
             pendingSaveError: err,
             pendingSavePromise: null
           });
         }
       });
-      _this2.setState({
+      _this3.setState({
         pendingSavePromise: newPendingSavePromise
       });
       return newPendingSavePromise;
     })();
   }
   discardPending() {
-    var _this3 = this;
+    var _this4 = this;
     return _asyncToGenerator(function* () {
       var {
         pendingSavePromise
-      } = _this3.state;
+      } = _this4.state;
       if (pendingSavePromise != null) {
         throw new Error('Cannot cancel a save in progress');
       }
-      _this3.setState({
+      _this4.setState({
         pendingSavePromise: null,
         pendingSaveError: null,
         pendingDataMap: new Map(),
@@ -1993,7 +1997,7 @@ export class IrisGrid extends Component {
    * Select all the data for a given row and notify listener
    */
   selectData(columnIndex, rowIndex) {
-    var _this4 = this;
+    var _this5 = this;
     var {
       model
     } = this.props;
@@ -2010,7 +2014,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 visibleIndex = _this5.getVisibleColumn(i);
       var isExpandable = isExpandableGridModel(model) && model.isRowExpandable(rowIndex);
       var isGrouped = groupedColumns.find(c => c.name === name) != null;
       dataMap[name] = {
@@ -2075,12 +2079,14 @@ export class IrisGrid extends Component {
   }
   handleGotoRowOpened() {
     this.setState({
-      isGotoShown: true
+      isGotoShown: true,
+      gotoValueManuallyChanged: false
     });
   }
   handleGotoRowClosed() {
     this.setState({
-      isGotoShown: false
+      isGotoShown: false,
+      gotoValueManuallyChanged: false
     });
   }
   handleAdvancedMenuClosed(columnIndex) {
@@ -2224,10 +2230,23 @@ export class IrisGrid extends Component {
     });
   }
   handleRequestFailed(event) {
-    var customEvent = event;
-    log.error('request failed:', customEvent.detail);
+    var {
+      detail: error
+    } = event;
+    log.error('request failed:', error);
     this.stopLoading();
-    if (this.canRollback()) {
+    var {
+      partitionConfig
+    } = this.state;
+    if (isMissingPartitionError(error) && partitionConfig != null) {
+      // We'll try loading the initial partition again
+      this.startLoading('Reloading partition...', true);
+      this.setState({
+        partitionConfig: undefined
+      }, () => {
+        this.initState();
+      });
+    } else if (this.canRollback()) {
       this.startLoading('Rolling back changes...', true);
       this.rollback();
     } else {
@@ -2235,7 +2254,7 @@ export class IrisGrid extends Component {
       var {
         onError
       } = this.props;
-      onError(new Error("Error displaying table: ".concat(customEvent.detail)));
+      onError(new Error("Error displaying table: ".concat(error)));
     }
   }
   handleUpdate() {
@@ -2485,7 +2504,7 @@ export class IrisGrid extends Component {
       this.stopLoading();
       (_this$grid24 = this.grid) === null || _this$grid24 === void 0 ? void 0 : _this$grid24.forceUpdate();
     } else {
-      this.initState();
+      this.loadTableState();
     }
   }
   handlePendingCommitClicked() {
@@ -2657,17 +2676,17 @@ export class IrisGrid extends Component {
   }
   seekRow(inputString) {
     var _arguments = arguments,
-      _this5 = this;
+      _this6 = this;
     return _asyncToGenerator(function* () {
-      var _this5$grid;
+      var _this6$grid;
       var isBackwards = _arguments.length > 1 && _arguments[1] !== undefined ? _arguments[1] : false;
       var {
         gotoValueSelectedColumnName: selectedColumnName,
         gotoValueSelectedFilter
-      } = _this5.state;
+      } = _this6.state;
       var {
         model
-      } = _this5.props;
+      } = _this6.props;
       var {
         dh
       } = model;
@@ -2681,14 +2700,14 @@ export class IrisGrid extends Component {
       if (selectedColumn === undefined) {
         return;
       }
-      var searchFromRow = (_this5$grid = _this5.grid) === null || _this5$grid === void 0 ? void 0 : _this5$grid.state.cursorRow;
+      var searchFromRow = (_this6$grid = _this6.grid) === null || _this6$grid === void 0 ? void 0 : _this6$grid.state.cursorRow;
       if (searchFromRow == null) {
         searchFromRow = 0;
       }
       var isContains = gotoValueSelectedFilter === FilterType.contains || gotoValueSelectedFilter === FilterType.containsIgnoreCase;
       var isIgnoreCase = gotoValueSelectedFilter === FilterType.eqIgnoreCase || gotoValueSelectedFilter === FilterType.containsIgnoreCase;
       try {
-        var _this5$grid2;
+        var _this6$grid2;
         var {
           formatter
         } = model;
@@ -2725,15 +2744,15 @@ export class IrisGrid extends Component {
             }
           default:
             {
-              rowIndex = yield model.seekRow(searchFromRow, selectedColumn, dh.ValueType.STRING, _this5.tableUtils.makeValue(selectedColumn.type, inputString, formatter.timeZone), undefined, undefined, isBackwards !== null && isBackwards !== void 0 ? isBackwards : false);
+              rowIndex = yield model.seekRow(searchFromRow, selectedColumn, dh.ValueType.STRING, _this6.tableUtils.makeValue(selectedColumn.type, inputString, formatter.timeZone), undefined, undefined, isBackwards !== null && isBackwards !== void 0 ? isBackwards : false);
             }
         }
-        (_this5$grid2 = _this5.grid) === null || _this5$grid2 === void 0 ? void 0 : _this5$grid2.setFocusRow(rowIndex);
-        _this5.setState({
+        (_this6$grid2 = _this6.grid) === null || _this6$grid2 === void 0 ? void 0 : _this6$grid2.setFocusRow(rowIndex);
+        _this6.setState({
           gotoValueError: ''
         });
       } catch (e) {
-        _this5.setState({
+        _this6.setState({
           gotoValueError: 'invalid input'
         });
       }
@@ -3017,19 +3036,35 @@ export class IrisGrid extends Component {
       model
     } = this.props;
     var cursorRow = (_this$grid29 = this.grid) === null || _this$grid29 === void 0 ? void 0 : _this$grid29.state.cursorRow;
+    var {
+      gotoValueSelectedColumnName: prevColumnName,
+      gotoValueManuallyChanged
+    } = this.state;
     if (cursorRow != null) {
       var _index = model.getColumnIndexByName(columnName);
       var _column2 = IrisGridUtils.getColumnByName(model.columns, columnName);
+      var prevColumn = IrisGridUtils.getColumnByName(model.columns, prevColumnName);
       if (_index == null || _column2 == null) {
         return;
       }
       var _value3 = model.valueForCell(_index, cursorRow);
       var text = IrisGridUtils.convertValueToText(_value3, _column2.type);
-      this.setState({
-        gotoValueSelectedColumnName: columnName,
-        gotoValue: text,
-        gotoValueError: ''
-      });
+
+      // do NOT update value if user manually changed value AND column type remains the same
+      if (gotoValueManuallyChanged && _column2.type === (prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.type)) {
+        this.setState({
+          gotoValueSelectedColumnName: columnName,
+          gotoValueError: ''
+        });
+      } else {
+        // do update, and set goToValueManuallyChanged to false because value was automatically changed
+        this.setState({
+          gotoValueSelectedColumnName: columnName,
+          gotoValue: text,
+          gotoValueError: '',
+          gotoValueManuallyChanged: false
+        });
+      }
     }
     this.setState({
       gotoValueSelectedColumnName: columnName,
@@ -3051,7 +3086,7 @@ export class IrisGrid extends Component {
   render() {
     var _rollupConfig$columns3,
       _rollupConfig$columns4,
-      _this6 = this,
+      _this7 = this,
       _this$grid31,
       _this$grid31$state$dr,
       _openOptions;
@@ -3091,10 +3126,6 @@ export class IrisGrid extends Component {
       hoverSelectColumn,
       quickFilters,
       advancedFilters,
-      partitions,
-      partitionFilters,
-      partitionTable,
-      partitionColumns,
       searchFilter,
       selectDistinctColumns,
       movedColumns,
@@ -3138,13 +3169,14 @@ export class IrisGrid extends Component {
       gotoValueError,
       gotoValueSelectedColumnName,
       gotoValue,
-      gotoValueSelectedFilter
+      gotoValueSelectedFilter,
+      partitionConfig
     } = this.state;
     if (!isReady) {
       return null;
     }
     var theme = this.getTheme();
-    var filter = this.getCachedFilter(customFilters, quickFilters, advancedFilters, partitionFilters, searchFilter);
+    var filter = this.getCachedFilter(customFilters, quickFilters, advancedFilters, searchFilter);
     var userColumnWidths = metricCalculator.getUserColumnWidths();
     var stateOverride = this.getCachedStateOverride(hoverSelectColumn, isFilterBarShown, isSelectingColumn, loadingScrimProgress, quickFilters, advancedFilters, sorts, reverseType, rollupConfig, isMenuShown);
     var top = metrics ? metrics.top : 0;
@@ -3269,7 +3301,7 @@ export class IrisGrid extends Component {
         var columnIndex = visibleColumns[i];
         var columnX = _allColumnXs.get(columnIndex);
         var columnWidth = _allColumnWidths.get(columnIndex);
-        var modelColumn = _this6.getModelColumn(columnIndex);
+        var modelColumn = _this7.getModelColumn(columnIndex);
         if (modelColumn != null) {
           var isFilterable = model.isFilterable(modelColumn);
           if (isFilterable && columnX != null && columnWidth != null && columnWidth > 0) {
@@ -3294,21 +3326,21 @@ export class IrisGrid extends Component {
                   'filter-set': isFilterSet
                 }),
                 onClick: () => {
-                  _this6.setState({
+                  _this7.setState({
                     shownAdvancedFilter: columnIndex
                   });
                 },
                 onContextMenu: event => {
-                  var _this6$grid;
-                  (_this6$grid = _this6.grid) === null || _this6$grid === void 0 ? void 0 : _this6$grid.handleContextMenu(event);
+                  var _this7$grid;
+                  (_this7$grid = _this7.grid) === null || _this7$grid === void 0 ? void 0 : _this7$grid.handleContextMenu(event);
                 },
                 onMouseEnter: () => {
-                  _this6.setState({
+                  _this7.setState({
                     hoverAdvancedFilter: columnIndex
                   });
                 },
                 onMouseLeave: () => {
-                  _this6.setState({
+                  _this7.setState({
                     hoverAdvancedFilter: null
                   });
                 },
@@ -3361,7 +3393,7 @@ export class IrisGrid extends Component {
             width: columnWidth,
             height: columnHeaderHeight
           };
-          var _modelColumn = _this6.getModelColumn(columnIndex);
+          var _modelColumn = _this7.getModelColumn(columnIndex);
           if (_modelColumn != null) {
             var _column3 = model.columns[_modelColumn];
             if (_column3 == null) {
@@ -3381,9 +3413,9 @@ export class IrisGrid extends Component {
               style: _style2,
               children: /*#__PURE__*/_jsx(Popper, {
                 className: "advanced-filter-menu-popper",
-                onEntered: _this6.getAdvancedMenuOpenedHandler(columnIndex),
+                onEntered: _this7.getAdvancedMenuOpenedHandler(columnIndex),
                 onExited: () => {
-                  _this6.handleAdvancedMenuClosed(columnIndex);
+                  _this7.handleAdvancedMenuClosed(columnIndex);
                 },
                 isShown: shownAdvancedFilter === columnIndex,
                 interactive: true,
@@ -3391,7 +3423,7 @@ export class IrisGrid extends Component {
                 options: {
                   positionFixed: true
                 },
-                children: _this6.getCachedAdvancedFilterMenuActions(model, _column3, advancedFilterOptions, sortDirection, formatter)
+                children: _this7.getCachedAdvancedFilterMenuActions(model, _column3, advancedFilterOptions, sortDirection, formatter)
               })
             }, columnIndex);
             advancedFilterMenus.push(element);
@@ -3518,15 +3550,10 @@ export class IrisGrid extends Component {
           unmountOnExit: true,
           children: /*#__PURE__*/_jsx("div", {
             className: "iris-grid-partition-selector-wrapper iris-grid-bar iris-grid-bar-primary",
-            children: partitionTable && partitionColumns.length && partitions.length && /*#__PURE__*/_jsx(IrisGridPartitionSelector, {
-              dh: model.dh,
-              table: partitionTable,
-              getFormattedString: (value, type, stringName) => model.displayString(value, type, stringName),
-              columns: partitionColumns,
-              partitions: partitions,
-              onChange: this.handlePartitionChange,
-              onFetchAll: this.handlePartitionFetchAll,
-              onDone: this.handlePartitionDone
+            children: isPartitionedGridModel(model) && model.isPartitionRequired && partitionConfig && /*#__PURE__*/_jsx(IrisGridPartitionSelector, {
+              model: model,
+              partitionConfig: partitionConfig,
+              onChange: this.handlePartitionChange
             })
           })
         }), /*#__PURE__*/_jsx(CSSTransition, {
@@ -3598,7 +3625,8 @@ export class IrisGrid extends Component {
             pendingRowCount: pendingRowCount,
             pendingDataMap: pendingDataMap,
             frozenColumns: frozenColumns,
-            columnHeaderGroups: columnHeaderGroups
+            columnHeaderGroups: columnHeaderGroups,
+            partitionConfig: partitionConfig
           }), !isMenuShown && /*#__PURE__*/_jsx("div", {
             className: "grid-settings-button",
             children: /*#__PURE__*/_jsx(Button, {
@@ -3727,8 +3755,8 @@ _defineProperty(IrisGrid, "defaultProps", {
   onError: () => undefined,
   onStateChange: () => undefined,
   onAdvancedSettingsChange: () => undefined,
-  partitions: [],
-  partitionColumns: [],
+  partitions: undefined,
+  partitionConfig: undefined,
   quickFilters: EMPTY_MAP,
   selectDistinctColumns: EMPTY_ARRAY,
   sorts: EMPTY_ARRAY,