@deephaven/iris-grid 1.27.3 → 1.27.5-alpha-nodehttp2-config.98bcfa9.0

package/dist/IrisGrid.js

@@ -72,18 +72,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 = _ref.advancedFilters,
-    aggregationSettings = _ref.aggregationSettings,
-    customColumns = _ref.customColumns,
-    quickFilters = _ref.quickFilters,
-    reverse = _ref.reverse,
-    rollupConfig = _ref.rollupConfig,
-    searchFilter = _ref.searchFilter,
-    selectDistinctColumns = _ref.selectDistinctColumns,
-    sorts = _ref.sorts;
-  return advancedFilters.size === 0 && aggregationSettings.aggregations.length === 0 && customColumns.length === 0 && quickFilters.size === 0 && !reverse && rollupConfig == null && searchFilter == null && selectDistinctColumns.length === 0 && sorts.length === 0;
-}
 
 /**
  * The subset of `IrisGridProps` that overrides how the grid presents its
@@ -308,8 +296,8 @@ class IrisGrid extends Component {
       })).sort((a, b) => {
         var _a$item$order, _b$item$order;
         return ((_a$item$order = a.item.order) !== null && _a$item$order !== void 0 ? _a$item$order : Infinity) - ((_b$item$order = b.item.order) !== null && _b$item$order !== void 0 ? _b$item$order : Infinity) || a.index - b.index;
-      }).map(_ref2 => {
-        var item = _ref2.item;
+      }).map(_ref => {
+        var item = _ref.item;
         return item;
       });
       return Object.freeze(sortedItems);
@@ -332,10 +320,10 @@ class IrisGrid extends Component {
     }));
     _defineProperty(this, "getAggregationMap", memoize((columns, aggregations) => {
       var aggregationMap = {};
-      aggregations.forEach(_ref3 => {
-        var operation = _ref3.operation,
-          selected = _ref3.selected,
-          invert = _ref3.invert;
+      aggregations.forEach(_ref2 => {
+        var operation = _ref2.operation,
+          selected = _ref2.selected,
+          invert = _ref2.invert;
         aggregationMap[operation] = AggregationUtils.getOperationColumnNames(columns, operation, selected, invert);
       });
       return aggregationMap;
@@ -470,10 +458,11 @@ class IrisGrid extends Component {
       leading: false,
       trailing: true
     }));
-    // Apply live changes
+    // Apply live changes; clear any previous preview error on each new update
     _defineProperty(this, "handleConditionalFormatEditorUpdate", debounce(conditionalFormatPreview => {
       this.setState({
-        conditionalFormatPreview
+        conditionalFormatPreview,
+        conditionalFormatError: null
       });
     }, SET_CONDITIONAL_FORMAT_DEBOUNCE));
     _defineProperty(this, "handleDownloadProgressUpdate", throttle((tableDownloadProgress, tableDownloadEstimatedTime) => {
@@ -799,6 +788,7 @@ class IrisGrid extends Component {
       conditionalFormats,
       conditionalFormatEditIndex: null,
       conditionalFormatPreview: undefined,
+      conditionalFormatError: null,
       // Column user is hovering over for selection
       hoverSelectColumn: null,
       isTableDownloading: false,
@@ -859,7 +849,10 @@ class IrisGrid extends Component {
       settings = _this$props.settings,
       model = _this$props.model,
       customFilters = _this$props.customFilters,
+      quickFilters = _this$props.quickFilters,
       sorts = _this$props.sorts,
+      isQuickFiltersControlled = _this$props.isQuickFiltersControlled,
+      isSortsControlled = _this$props.isSortsControlled,
       getMetricCalculator = _this$props.getMetricCalculator;
     if (model !== prevProps.model) {
       this.stopListening(prevProps.model);
@@ -903,9 +896,12 @@ class IrisGrid extends Component {
         resetRanges: true
       });
     }
-    if (sorts !== prevProps.sorts) {
+    if (sorts !== prevProps.sorts || !prevProps.isSortsControlled && isSortsControlled) {
       this.updateSorts(sorts);
     }
+    if (quickFilters !== prevProps.quickFilters || !prevProps.isQuickFiltersControlled && isQuickFiltersControlled) {
+      this.updateQuickFilters(quickFilters);
+    }
     var loadingScrimStartTime = this.loadingScrimStartTime,
       loadingScrimFinishTime = this.loadingScrimFinishTime;
     if (loadingScrimStartTime != null && loadingScrimFinishTime != null) {
@@ -1041,7 +1037,7 @@ class IrisGrid extends Component {
     return rowIndex != null ? modelRows.get(rowIndex) : null;
   }
   getTheme() {
-    var _ref4;
+    var _ref3;
     var _this$props3 = this.props,
       model = _this$props3.model,
       theme = _this$props3.theme,
@@ -1049,7 +1045,7 @@ class IrisGrid extends Component {
     var _this$context = this.context,
       contextTheme = _this$context.theme,
       contextDensity = _this$context.density;
-    return this.getCachedTheme(contextTheme, theme, (_ref4 = isEditableGridModel(model) && model.isEditable) !== null && _ref4 !== void 0 ? _ref4 : false, model.floatingTopRowCount + model.floatingBottomRowCount, density !== null && density !== void 0 ? density : contextDensity);
+    return this.getCachedTheme(contextTheme, theme, (_ref3 = isEditableGridModel(model) && model.isEditable) !== null && _ref3 !== void 0 ? _ref3 : false, model.floatingTopRowCount + model.floatingBottomRowCount, density !== null && density !== void 0 ? density : contextDensity);
   }
   getVisibleColumn(modelIndex) {
     var movedColumns = this.state.movedColumns;
@@ -1079,30 +1075,33 @@ class IrisGrid extends Component {
       quickFilters = _this$state2.quickFilters;
     var newAdvancedFilters = replaceExisting ? new Map() : new Map(advancedFilters);
     var newQuickFilters = replaceExisting ? new Map() : new Map(quickFilters);
-    var isChanged = replaceExisting && advancedFilters.size > 0;
-    inputFilters.forEach(_ref5 => {
-      var name = _ref5.name,
-        type = _ref5.type,
-        value = _ref5.value;
-      var modelIndex = model.columns.findIndex(_ref6 => {
-        var columnName = _ref6.name,
-          columnType = _ref6.type;
+    var didAdvancedFiltersChange = replaceExisting && advancedFilters.size > 0;
+    var didQuickFiltersChange = replaceExisting && quickFilters.size > 0;
+    inputFilters.forEach(_ref4 => {
+      var name = _ref4.name,
+        type = _ref4.type,
+        value = _ref4.value;
+      var modelIndex = model.columns.findIndex(_ref5 => {
+        var columnName = _ref5.name,
+          columnType = _ref5.type;
         return columnName === name && columnType === type;
       });
       if (modelIndex >= 0) {
-        isChanged = newAdvancedFilters.delete(modelIndex) || isChanged;
-        isChanged = this.applyQuickFilter(modelIndex, value, newQuickFilters) || isChanged;
+        didAdvancedFiltersChange = newAdvancedFilters.delete(modelIndex) || didAdvancedFiltersChange;
+        didQuickFiltersChange = this.applyQuickFilter(modelIndex, value, newQuickFilters) || didQuickFiltersChange;
       } else {
         log.error('Unable to find column for inputFilter', name, type, value);
       }
     });
-    if (isChanged) {
+    if (didQuickFiltersChange) {
+      this.requestQuickFiltersChange(newQuickFilters);
+    }
+    if (didAdvancedFiltersChange) {
       this.setState({
-        quickFilters: newQuickFilters,
         advancedFilters: newAdvancedFilters
       });
     }
-    return isChanged;
+    return didQuickFiltersChange || didAdvancedFiltersChange;
   }
 
   /**
@@ -1143,8 +1142,8 @@ class IrisGrid extends Component {
     this.startLoading('Filtering...', {
       resetRanges: true
     });
-    this.setState(_ref7 => {
-      var advancedFilters = _ref7.advancedFilters;
+    this.setState(_ref6 => {
+      var advancedFilters = _ref6.advancedFilters;
       var newAdvancedFilters = new Map(advancedFilters);
       if (filter == null) {
         newAdvancedFilters.delete(modelIndex);
@@ -1168,20 +1167,13 @@ class IrisGrid extends Component {
    */
   setQuickFilter(modelIndex, filter, text) {
     log.debug('Setting quick filter', modelIndex, filter, text);
-    this.startLoading('Filtering...', {
-      resetRanges: true
-    });
-    this.setState(_ref8 => {
-      var quickFilters = _ref8.quickFilters;
-      var newQuickFilters = new Map(quickFilters);
-      newQuickFilters.set(modelIndex, {
-        filter,
-        text
-      });
-      return {
-        quickFilters: newQuickFilters
-      };
+    var quickFilters = this.state.quickFilters;
+    var newQuickFilters = new Map(quickFilters);
+    newQuickFilters.set(modelIndex, {
+      filter,
+      text
     });
+    this.requestQuickFiltersChange(newQuickFilters);
   }
 
   /**
@@ -1197,9 +1189,12 @@ class IrisGrid extends Component {
       this.clearAllFilters();
     }
     var model = this.props.model;
-    filterMap.forEach((_ref9, columnName) => {
-      var columnType = _ref9.columnType,
-        filterList = _ref9.filterList;
+    var quickFilters = this.state.quickFilters;
+    var newQuickFilters = clearFiltersOnLinkerFilterUpdate ? new Map() : new Map(quickFilters);
+    var didQuickFiltersChange = false;
+    filterMap.forEach((_ref7, columnName) => {
+      var columnType = _ref7.columnType,
+        filterList = _ref7.filterList;
       var column = model.columns.find(c => c.name === columnName && c.type === columnType);
       if (column == null) {
         return;
@@ -1208,73 +1203,89 @@ class IrisGrid extends Component {
       assertNotNull(columnIndex);
       var combinedText = IrisGridUtils.combineFiltersFromList(columnType, filterList);
       if (combinedText.length === 0) {
-        this.removeQuickFilter(columnIndex);
+        didQuickFiltersChange = newQuickFilters.delete(columnIndex) || didQuickFiltersChange;
       } else {
         var formatter = model.formatter;
-        this.setQuickFilter(columnIndex, this.makeQuickFilter(column, combinedText, formatter.timeZone), "".concat(combinedText));
+        newQuickFilters.set(columnIndex, {
+          filter: this.makeQuickFilter(column, combinedText, formatter.timeZone),
+          text: "".concat(combinedText)
+        });
+        didQuickFiltersChange = true;
       }
     });
+    if (didQuickFiltersChange) {
+      this.requestQuickFiltersChange(newQuickFilters);
+    }
   }
   removeColumnFilter(modelRange) {
-    this.startLoading('Filtering...', {
-      resetRanges: true
-    });
     var clearRange = Array.isArray(modelRange) ? modelRange : [modelRange, modelRange];
-    this.setState(_ref0 => {
-      var advancedFilters = _ref0.advancedFilters,
-        quickFilters = _ref0.quickFilters;
-      var newAdvancedFilters = advancedFilters ? new Map(advancedFilters) : new Map();
-      var newQuickFilters = quickFilters ? new Map(quickFilters) : new Map();
-      newAdvancedFilters.forEach((_, column) => {
-        if (column >= clearRange[0] && column <= clearRange[1]) {
-          newAdvancedFilters.delete(column);
-        }
-      });
-      newQuickFilters.forEach((_, column) => {
-        if (column >= clearRange[0] && column <= clearRange[1]) {
-          newQuickFilters.delete(column);
-        }
-      });
-      return {
-        quickFilters: newQuickFilters,
-        advancedFilters: newAdvancedFilters
-      };
+    var _this$state3 = this.state,
+      advancedFilters = _this$state3.advancedFilters,
+      quickFilters = _this$state3.quickFilters;
+    var isQuickFiltersControlled = this.props.isQuickFiltersControlled;
+    var newAdvancedFilters = new Map(advancedFilters);
+    var newQuickFilters = new Map(quickFilters);
+    newAdvancedFilters.forEach((_, column) => {
+      if (column >= clearRange[0] && column <= clearRange[1]) {
+        newAdvancedFilters.delete(column);
+      }
     });
+    newQuickFilters.forEach((_, column) => {
+      if (column >= clearRange[0] && column <= clearRange[1]) {
+        newQuickFilters.delete(column);
+      }
+    });
+    var didAdvancedFiltersChange = newAdvancedFilters.size !== advancedFilters.size;
+    var didQuickFiltersChange = newQuickFilters.size !== quickFilters.size;
+    if (didQuickFiltersChange) {
+      this.requestQuickFiltersChange(newQuickFilters);
+    }
+    if (didAdvancedFiltersChange) {
+      if (!didQuickFiltersChange || isQuickFiltersControlled) {
+        this.startLoading('Filtering...', {
+          resetRanges: true
+        });
+      }
+      this.setState({
+        advancedFilters: newAdvancedFilters
+      });
+    }
   }
   removeQuickFilter(modelColumn) {
-    this.startLoading('Clearing Filter...', {
-      resetRanges: true
-    });
-    this.setState(_ref1 => {
-      var quickFilters = _ref1.quickFilters;
-      var newQuickFilters = new Map(quickFilters);
-      newQuickFilters.delete(modelColumn);
-      return {
-        quickFilters: newQuickFilters
-      };
-    });
+    var quickFilters = this.state.quickFilters;
+    var newQuickFilters = new Map(quickFilters);
+    newQuickFilters.delete(modelColumn);
+    this.requestQuickFiltersChange(newQuickFilters);
   }
   clearAllFilters() {
     log.debug('Clearing all filters');
-    var _this$state3 = this.state,
-      advancedFilters = _this$state3.advancedFilters,
-      quickFilters = _this$state3.quickFilters,
-      searchFilter = _this$state3.searchFilter;
+    var _this$state4 = this.state,
+      advancedFilters = _this$state4.advancedFilters,
+      quickFilters = _this$state4.quickFilters,
+      searchFilter = _this$state4.searchFilter;
+    var isQuickFiltersControlled = this.props.isQuickFiltersControlled;
     if (quickFilters.size === 0 && advancedFilters.size === 0 && searchFilter === null) {
       return;
     }
-
-    // if there is an active quick filter input field, reset it as well
-    this.clearGridInputField();
-    this.startLoading('Clearing Filters...', {
-      resetRanges: true
-    });
-    this.setState({
-      quickFilters: new Map(),
-      advancedFilters: new Map(),
-      searchValue: '',
-      searchFilter: undefined
-    });
+    if (quickFilters.size > 0) {
+      this.requestQuickFiltersChange(EMPTY_MAP);
+    }
+    var hasOtherFilters = advancedFilters.size > 0 || searchFilter != null;
+    if (hasOtherFilters) {
+      if (quickFilters.size === 0 || isQuickFiltersControlled) {
+        this.startLoading('Clearing Filters...', {
+          resetRanges: true
+        });
+      }
+      this.setState({
+        advancedFilters: new Map(),
+        searchValue: '',
+        searchFilter: undefined
+      });
+    }
+    if (!isQuickFiltersControlled) {
+      this.clearGridInputField();
+    }
   }
   clearAllAggregations() {
     log.debug('Clearing all aggregations');
@@ -1300,9 +1311,9 @@ class IrisGrid extends Component {
    */
   rebuildFilters() {
     var model = this.props.model;
-    var _this$state4 = this.state,
-      advancedFilters = _this$state4.advancedFilters,
-      quickFilters = _this$state4.quickFilters;
+    var _this$state5 = this.state,
+      advancedFilters = _this$state5.advancedFilters,
+      quickFilters = _this$state5.quickFilters;
     if (advancedFilters.size === 0 && quickFilters.size === 0) {
       log.debug('No filters to rebuild');
       return;
@@ -1332,16 +1343,18 @@ class IrisGrid extends Component {
     this.startLoading('Rebuilding filters...', {
       resetRanges: true
     });
+    if (quickFilters.size > 0) {
+      this.requestQuickFiltersChange(newQuickFilters);
+    }
     this.setState({
-      quickFilters: newQuickFilters,
       advancedFilters: newAdvancedFilters
     });
   }
-  setFilters(_ref10) {
-    var quickFilters = _ref10.quickFilters,
-      advancedFilters = _ref10.advancedFilters;
+  setFilters(_ref8) {
+    var quickFilters = _ref8.quickFilters,
+      advancedFilters = _ref8.advancedFilters;
+    this.requestQuickFiltersChange(quickFilters);
     this.setState({
-      quickFilters,
       advancedFilters
     });
   }
@@ -1519,15 +1532,15 @@ class IrisGrid extends Component {
     if (isPartitionedGridModel(model)) {
       var data = this.getRowDataMap(rowIndex);
       var partitionColumnSet = new Set(model.partitionColumns.map(column => column.name));
-      var values = Object.entries(data).filter(_ref11 => {
-        var _ref12 = _slicedToArray(_ref11, 2),
-          key = _ref12[0],
-          _ = _ref12[1];
+      var values = Object.entries(data).filter(_ref9 => {
+        var _ref0 = _slicedToArray(_ref9, 2),
+          key = _ref0[0],
+          _ = _ref0[1];
         return partitionColumnSet.has(key);
-      }).map(_ref13 => {
-        var _ref14 = _slicedToArray(_ref13, 2),
-          key = _ref14[0],
-          columnData = _ref14[1];
+      }).map(_ref1 => {
+        var _ref10 = _slicedToArray(_ref1, 2),
+          key = _ref10[0],
+          columnData = _ref10[1];
         return columnData.value;
       });
       var newPartition = {
@@ -1585,9 +1598,9 @@ class IrisGrid extends Component {
     var _this$props5 = this.props,
       model = _this$props5.model,
       canCopy = _this$props5.canCopy;
-    var _this$state5 = this.state,
-      metricCalculator = _this$state5.metricCalculator,
-      movedColumns = _this$state5.movedColumns;
+    var _this$state6 = this.state,
+      metricCalculator = _this$state6.metricCalculator,
+      movedColumns = _this$state6.movedColumns;
     var userColumnWidths = metricCalculator.getUserColumnWidths();
     if (canCopy) {
       var copyOperation = {
@@ -1606,13 +1619,13 @@ class IrisGrid extends Component {
     }
   }
   startLoading(loadingText) {
-    var _ref15 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref15$resetRanges = _ref15.resetRanges,
-      resetRanges = _ref15$resetRanges === void 0 ? false : _ref15$resetRanges,
-      _ref15$loadingCancelS = _ref15.loadingCancelShown,
-      loadingCancelShown = _ref15$loadingCancelS === void 0 ? true : _ref15$loadingCancelS,
-      _ref15$loadingBlocksG = _ref15.loadingBlocksGrid,
-      loadingBlocksGrid = _ref15$loadingBlocksG === void 0 ? true : _ref15$loadingBlocksG;
+    var _ref11 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+      _ref11$resetRanges = _ref11.resetRanges,
+      resetRanges = _ref11$resetRanges === void 0 ? false : _ref11$resetRanges,
+      _ref11$loadingCancelS = _ref11.loadingCancelShown,
+      loadingCancelShown = _ref11$loadingCancelS === void 0 ? true : _ref11$loadingCancelS,
+      _ref11$loadingBlocksG = _ref11.loadingBlocksGrid,
+      loadingBlocksGrid = _ref11$loadingBlocksG === void 0 ? true : _ref11$loadingBlocksG;
     this.setState({
       loadingText,
       loadingCancelShown,
@@ -1670,6 +1683,9 @@ class IrisGrid extends Component {
       var _this$lastLoadedConfi = this.lastLoadedConfig,
         advancedFilters = _this$lastLoadedConfi.advancedFilters,
         aggregationSettings = _this$lastLoadedConfi.aggregationSettings,
+        conditionalFormats = _this$lastLoadedConfi.conditionalFormats,
+        conditionalFormatEditIndex = _this$lastLoadedConfi.conditionalFormatEditIndex,
+        conditionalFormatPreview = _this$lastLoadedConfi.conditionalFormatPreview,
         customColumns = _this$lastLoadedConfi.customColumns,
         quickFilters = _this$lastLoadedConfi.quickFilters,
         reverse = _this$lastLoadedConfi.reverse,
@@ -1681,6 +1697,9 @@ class IrisGrid extends Component {
       this.setState({
         advancedFilters,
         aggregationSettings,
+        conditionalFormats,
+        conditionalFormatEditIndex,
+        conditionalFormatPreview,
         customColumns,
         quickFilters,
         reverse,
@@ -1694,6 +1713,9 @@ class IrisGrid extends Component {
       this.setState({
         advancedFilters: new Map(),
         aggregationSettings: DEFAULT_AGGREGATION_SETTINGS,
+        conditionalFormats: [],
+        conditionalFormatEditIndex: null,
+        conditionalFormatPreview: undefined,
         customColumns: [],
         quickFilters: new Map(),
         reverse: false,
@@ -1709,7 +1731,7 @@ class IrisGrid extends Component {
    * @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);
+    return this.lastLoadedConfig != null || !IrisGridUtils.isEmptyConfig(this.state);
   }
   startListening(model) {
     model.addEventListener(IrisGridModel.EVENT.UPDATED, this.handleUpdate);
@@ -1748,9 +1770,9 @@ class IrisGrid extends Component {
       });
       return;
     }
-    var _this$state6 = this.state,
-      metricCalculator = _this$state6.metricCalculator,
-      metrics = _this$state6.metrics;
+    var _this$state7 = this.state,
+      metricCalculator = _this$state7.metricCalculator,
+      metrics = _this$state7.metrics;
     assertNotNull(metrics);
     var metricState = this.getMetricState();
     assertNotNull(metricState);
@@ -1770,16 +1792,16 @@ class IrisGrid extends Component {
   }
   hideColumnByVisibleIndex(columnVisibleIndex) {
     var _this$grid5;
-    var _this$state7 = this.state,
-      metricCalculator = _this$state7.metricCalculator,
-      movedColumns = _this$state7.movedColumns;
+    var _this$state8 = this.state,
+      metricCalculator = _this$state8.metricCalculator,
+      movedColumns = _this$state8.movedColumns;
     metricCalculator.setColumnWidth(GridUtils.getModelIndex(columnVisibleIndex, movedColumns), 0);
     (_this$grid5 = this.grid) === null || _this$grid5 === void 0 || _this$grid5.forceUpdate();
   }
   freezeColumnByColumnName(columnName) {
-    var _this$state8 = this.state,
-      frozenColumns = _this$state8.frozenColumns,
-      movedColumns = _this$state8.movedColumns;
+    var _this$state9 = this.state,
+      frozenColumns = _this$state9.frozenColumns,
+      movedColumns = _this$state9.movedColumns;
     var model = this.props.model;
     log.debug2('freezing column', columnName);
     var allFrozenColumns = frozenColumns == null ? new Set(model.frozenColumns) : new Set(frozenColumns);
@@ -1794,9 +1816,9 @@ class IrisGrid extends Component {
     });
   }
   unFreezeColumnByColumnName(columnName) {
-    var _this$state9 = this.state,
-      frozenColumns = _this$state9.frozenColumns,
-      movedColumns = _this$state9.movedColumns;
+    var _this$state0 = this.state,
+      frozenColumns = _this$state0.frozenColumns,
+      movedColumns = _this$state0.movedColumns;
     var model = this.props.model;
     log.debug2('unfreezing column', columnName);
     var allFrozenColumns = frozenColumns == null ? new Set(model.frozenColumns) : new Set(frozenColumns);
@@ -1846,9 +1868,9 @@ class IrisGrid extends Component {
   }
   handleColumnVisibilityChanged(modelIndexes, isVisible) {
     var _this$grid6;
-    var _this$state0 = this.state,
-      metricCalculator = _this$state0.metricCalculator,
-      metrics = _this$state0.metrics;
+    var _this$state1 = this.state,
+      metricCalculator = _this$state1.metricCalculator,
+      metrics = _this$state1.metrics;
     assertNotNull(metrics);
     if (isVisible) {
       modelIndexes.forEach(modelIndex => {
@@ -1927,9 +1949,9 @@ class IrisGrid extends Component {
   }
   handleViewportUpdated() {
     var model = this.props.model;
-    var _this$state1 = this.state,
-      loadingText = _this$state1.loadingText,
-      loadingSpinnerShown = _this$state1.loadingSpinnerShown;
+    var _this$state10 = this.state,
+      loadingText = _this$state10.loadingText,
+      loadingSpinnerShown = _this$state10.loadingSpinnerShown;
     var loadingMessage = 'Waiting for viewport...';
 
     // pending and no timer already exists
@@ -1974,7 +1996,7 @@ class IrisGrid extends Component {
     if (model.isColumnSortable(columnIndex)) {
       var currentSorts = this.state.sorts;
       var sorts = TableUtils.toggleSortForColumn(currentSorts, model.columns, modelColumn, addToExisting);
-      this.updateSorts(sorts);
+      this.requestSortsChange(sorts);
     } else {
       log.debug('Column type was not sortable', model.columns[columnIndex]);
     }
@@ -1987,19 +2009,50 @@ class IrisGrid extends Component {
     });
     (_this$grid0 = this.grid) === null || _this$grid0 === void 0 || _this$grid0.forceUpdate();
   }
-  sortColumn(modelColumn) {
+  requestSortsChange(sorts) {
+    var _this$props6 = this.props,
+      isSortsControlled = _this$props6.isSortsControlled,
+      onSortsChange = _this$props6.onSortsChange;
+    onSortsChange === null || onSortsChange === void 0 || onSortsChange(sorts);
+    if (!isSortsControlled) {
+      this.updateSorts(sorts);
+    }
+  }
+  updateQuickFilters(quickFilters) {
     var _this$grid1;
+    var currentQuickFilters = this.state.quickFilters;
+    if (quickFilters == null) {
+      if (currentQuickFilters.size === 0) {
+        return;
+      }
+    } else if (quickFilters === currentQuickFilters) {
+      return;
+    }
+    this.startLoading('Filtering...', {
+      resetRanges: true
+    });
+    this.setState({
+      quickFilters: quickFilters !== null && quickFilters !== void 0 ? quickFilters : EMPTY_MAP
+    });
+    (_this$grid1 = this.grid) === null || _this$grid1 === void 0 || _this$grid1.forceUpdate();
+  }
+  requestQuickFiltersChange(quickFilters) {
+    var _this$props7 = this.props,
+      isQuickFiltersControlled = _this$props7.isQuickFiltersControlled,
+      onQuickFiltersChange = _this$props7.onQuickFiltersChange;
+    onQuickFiltersChange === null || onQuickFiltersChange === void 0 || onQuickFiltersChange(quickFilters);
+    if (!isQuickFiltersControlled) {
+      this.updateQuickFilters(quickFilters);
+    }
+  }
+  sortColumn(modelColumn) {
     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;
     assertNotNull(modelColumn);
     var model = this.props.model;
     var sorts = TableUtils.sortColumn(model.sort, model.columns, modelColumn, direction, isAbs, addToExisting);
-    this.startLoading('Sorting...');
-    this.setState({
-      sorts
-    });
-    (_this$grid1 = this.grid) === null || _this$grid1 === void 0 || _this$grid1.forceUpdate();
+    this.requestSortsChange(sorts);
   }
   reverse(reverse) {
     var _this$grid10;
@@ -2046,9 +2099,9 @@ class IrisGrid extends Component {
   }
   isTableSearchAvailable() {
     var _model$layoutHints3, _dh$SearchDisplayMode, _dh$SearchDisplayMode2;
-    var _this$props6 = this.props,
-      model = _this$props6.model,
-      canToggleSearch = _this$props6.canToggleSearch;
+    var _this$props8 = this.props,
+      model = _this$props8.model,
+      canToggleSearch = _this$props8.canToggleSearch;
     var dh = model.dh;
     var searchDisplayMode = model === null || model === void 0 || (_model$layoutHints3 = model.layoutHints) === null || _model$layoutHints3 === void 0 ? void 0 : _model$layoutHints3.searchDisplayMode;
     if (searchDisplayMode === ((_dh$SearchDisplayMode = dh.SearchDisplayMode) === null || _dh$SearchDisplayMode === void 0 ? void 0 : _dh$SearchDisplayMode.SEARCH_DISPLAY_HIDE)) {
@@ -2245,7 +2298,6 @@ class IrisGrid extends Component {
     this.setAdvancedFilter(index, filter, options);
   }
   handleAdvancedFilterSortChange(column, direction) {
-    var _this$grid15;
     var addToExisting = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     var model = this.props.model;
     var columnIndex = model.getColumnIndexByName(column.name);
@@ -2262,19 +2314,15 @@ class IrisGrid extends Component {
     }
     var sorts = TableUtils.setSortForColumn(model.sort, columnName, newSort, addToExisting);
     log.info('Setting table sorts', sorts);
-    this.startLoading('Sorting...');
-    this.setState({
-      sorts
-    });
-    (_this$grid15 = this.grid) === null || _this$grid15 === void 0 || _this$grid15.forceUpdate();
+    this.requestSortsChange(sorts);
   }
   handleAdvancedFilterDone() {
-    var _this$grid16;
-    (_this$grid16 = this.grid) === null || _this$grid16 === void 0 || _this$grid16.focus();
+    var _this$grid15;
+    (_this$grid15 = this.grid) === null || _this$grid15 === void 0 || _this$grid15.focus();
   }
   handleAdvancedFilterToggleMaximize(column) {
-    this.setState(_ref16 => {
-      var maximizedAdvancedFilter = _ref16.maximizedAdvancedFilter;
+    this.setState(_ref12 => {
+      var maximizedAdvancedFilter = _ref12.maximizedAdvancedFilter;
       return {
         maximizedAdvancedFilter: maximizedAdvancedFilter === column ? null : column
       };
@@ -2300,9 +2348,9 @@ class IrisGrid extends Component {
   }
   handleAdvancedMenuClosed(columnIndex) {
     var _this$filterInputRef;
-    var _this$state10 = this.state,
-      focusedFilterBarColumn = _this$state10.focusedFilterBarColumn,
-      isFilterBarShown = _this$state10.isFilterBarShown;
+    var _this$state11 = this.state,
+      focusedFilterBarColumn = _this$state11.focusedFilterBarColumn,
+      isFilterBarShown = _this$state11.isFilterBarShown;
     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 || _this$filterInputRef2.current.focus();
@@ -2327,9 +2375,9 @@ class IrisGrid extends Component {
     // TODO: IDS-4242 Update Chart Preview
   }
   handleChartCreate(settings) {
-    var _this$props7 = this.props,
-      model = _this$props7.model,
-      onCreateChart = _this$props7.onCreateChart;
+    var _this$props9 = this.props,
+      model = _this$props9.model,
+      onCreateChart = _this$props9.onCreateChart;
     onCreateChart(settings, model);
   }
   handleGridError(error) {
@@ -2342,29 +2390,23 @@ class IrisGrid extends Component {
     });
   }
   handleFilterBarChange(value) {
-    this.startLoading('Filtering...', {
-      resetRanges: true
-    });
-    this.setState(_ref17 => {
-      var focusedFilterBarColumn = _ref17.focusedFilterBarColumn,
-        quickFilters = _ref17.quickFilters;
-      var newQuickFilters = new Map(quickFilters);
-      if (focusedFilterBarColumn != null) {
-        var modelIndex = this.getModelColumn(focusedFilterBarColumn);
-        assertNotNull(modelIndex);
-        this.applyQuickFilter(modelIndex, value, newQuickFilters);
-      }
-      return {
-        quickFilters: newQuickFilters
-      };
-    });
+    var _this$state12 = this.state,
+      focusedFilterBarColumn = _this$state12.focusedFilterBarColumn,
+      quickFilters = _this$state12.quickFilters;
+    var newQuickFilters = new Map(quickFilters);
+    if (focusedFilterBarColumn != null) {
+      var modelIndex = this.getModelColumn(focusedFilterBarColumn);
+      assertNotNull(modelIndex);
+      this.applyQuickFilter(modelIndex, value, newQuickFilters);
+    }
+    this.requestQuickFiltersChange(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 || _this$grid17.focus();
+      var _this$grid16;
+      (_this$grid16 = this.grid) === null || _this$grid16 === void 0 || _this$grid16.focus();
     }
     if (defocusInput) {
       this.setState({
@@ -2401,9 +2443,9 @@ class IrisGrid extends Component {
   handleColumnAlignmentChange(modelIndex, alignment) {
     var model = this.props.model;
     var column = model.columns[modelIndex];
-    this.setState(_ref18 => {
-      var _ref18$columnAlignmen = _ref18.columnAlignmentMap,
-        columnAlignmentMap = _ref18$columnAlignmen === void 0 ? EMPTY_MAP : _ref18$columnAlignmen;
+    this.setState(_ref13 => {
+      var _ref13$columnAlignmen = _ref13.columnAlignmentMap,
+        columnAlignmentMap = _ref13$columnAlignmen === void 0 ? EMPTY_MAP : _ref13$columnAlignmen;
       var newColumnAlignmentMap = new Map(columnAlignmentMap);
       if (alignment != null) {
         newColumnAlignmentMap.set(column.name, alignment);
@@ -2428,8 +2470,8 @@ class IrisGrid extends Component {
     });
   }
   handleMenuBack() {
-    this.setState(_ref19 => {
-      var openOptions = _ref19.openOptions;
+    this.setState(_ref14 => {
+      var openOptions = _ref14.openOptions;
       var newOptions = [...openOptions];
       newOptions.pop();
       return {
@@ -2438,19 +2480,21 @@ class IrisGrid extends Component {
     });
   }
   handleMenuSelect(option) {
-    this.setState(_ref20 => {
-      var openOptions = _ref20.openOptions;
+    this.setState(_ref15 => {
+      var openOptions = _ref15.openOptions;
       return {
         openOptions: [...openOptions, option]
       };
     });
   }
   handleRequestFailed(event) {
-    var _ref21 = event,
-      error = _ref21.detail;
+    var _ref16 = event,
+      error = _ref16.detail;
     log.error('request failed:', error);
     this.stopLoading();
-    var partitionConfig = this.state.partitionConfig;
+    var _this$state13 = this.state,
+      partitionConfig = _this$state13.partitionConfig,
+      conditionalFormatEditIndex = _this$state13.conditionalFormatEditIndex;
     if (isMissingPartitionError(error) && partitionConfig != null) {
       // We'll try loading the initial partition again
       this.startLoading('Reloading partition...', {
@@ -2461,6 +2505,14 @@ class IrisGrid extends Component {
       }, () => {
         this.initState();
       });
+    } else if (conditionalFormatEditIndex !== null) {
+      var _errorMessage;
+      // Preview format failed — surface error in the editor instead of rolling back
+      var errorMessage = (_errorMessage = error === null || error === void 0 ? void 0 : error.errorMessage) !== null && _errorMessage !== void 0 ? _errorMessage : String(error);
+      this.setState({
+        conditionalFormatError: errorMessage,
+        conditionalFormatPreview: undefined
+      });
     } else if (this.canRollback()) {
       this.startLoading('Rolling back changes...', {
         resetRanges: true
@@ -2481,11 +2533,11 @@ class IrisGrid extends Component {
    * pending operations into a single scrim).
    */
   handlePending(event) {
-    var _ref22 = event,
-      detail = _ref22.detail;
-    var _ref23 = detail !== null && detail !== void 0 ? detail : {},
-      text = _ref23.text,
-      options = _ref23.options;
+    var _ref17 = event,
+      detail = _ref17.detail;
+    var _ref18 = detail !== null && detail !== void 0 ? detail : {},
+      text = _ref18.text,
+      options = _ref18.options;
     if (this.loadingScrimStartTime == null) {
       this.startLoading(text !== null && text !== void 0 ? text : 'Loading...', _objectSpread({
         loadingCancelShown: false
@@ -2512,21 +2564,27 @@ class IrisGrid extends Component {
     this.stopLoading();
   }
   handleUpdate() {
-    var _this$grid18;
+    var _this$grid17;
     log.debug2('Received model update');
-    var _this$state11 = this.state,
-      advancedFilters = _this$state11.advancedFilters,
-      aggregationSettings = _this$state11.aggregationSettings,
-      customColumns = _this$state11.customColumns,
-      quickFilters = _this$state11.quickFilters,
-      reverse = _this$state11.reverse,
-      rollupConfig = _this$state11.rollupConfig,
-      searchFilter = _this$state11.searchFilter,
-      selectDistinctColumns = _this$state11.selectDistinctColumns,
-      sorts = _this$state11.sorts;
+    var _this$state14 = this.state,
+      advancedFilters = _this$state14.advancedFilters,
+      aggregationSettings = _this$state14.aggregationSettings,
+      conditionalFormats = _this$state14.conditionalFormats,
+      conditionalFormatEditIndex = _this$state14.conditionalFormatEditIndex,
+      conditionalFormatPreview = _this$state14.conditionalFormatPreview,
+      customColumns = _this$state14.customColumns,
+      quickFilters = _this$state14.quickFilters,
+      reverse = _this$state14.reverse,
+      rollupConfig = _this$state14.rollupConfig,
+      searchFilter = _this$state14.searchFilter,
+      selectDistinctColumns = _this$state14.selectDistinctColumns,
+      sorts = _this$state14.sorts;
     var config = {
       advancedFilters,
       aggregationSettings,
+      conditionalFormats,
+      conditionalFormatEditIndex,
+      conditionalFormatPreview,
       customColumns,
       quickFilters,
       reverse,
@@ -2535,12 +2593,12 @@ class IrisGrid extends Component {
       selectDistinctColumns,
       sorts
     };
-    if (!isEmptyConfig(config)) {
+    if (!IrisGridUtils.isEmptyConfig(config)) {
       this.lastLoadedConfig = config;
     } else {
       this.lastLoadedConfig = null;
     }
-    (_this$grid18 = this.grid) === null || _this$grid18 === void 0 || _this$grid18.forceUpdate();
+    (_this$grid17 = this.grid) === null || _this$grid17 === void 0 || _this$grid17.forceUpdate();
     this.stopLoading();
   }
   handleTableChanged() {
@@ -2568,11 +2626,11 @@ class IrisGrid extends Component {
     });
   }
   handleViewChanged(metrics) {
-    var _this$grid$state, _this$grid19;
+    var _this$grid$state, _this$grid18;
     var model = this.props.model;
-    var _ref24 = (_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 : {},
-      _ref24$selectionEndRo = _ref24.selectionEndRow,
-      selectionEndRow = _ref24$selectionEndRo === void 0 ? 0 : _ref24$selectionEndRo;
+    var _ref19 = (_this$grid$state = (_this$grid18 = this.grid) === null || _this$grid18 === void 0 ? void 0 : _this$grid18.state) !== null && _this$grid$state !== void 0 ? _this$grid$state : {},
+      _ref19$selectionEndRo = _ref19.selectionEndRow,
+      selectionEndRow = _ref19$selectionEndRo === void 0 ? 0 : _ref19$selectionEndRo;
     var pendingRowCount = 0;
     if (isEditableGridModel(model) && model.isEditable) {
       assertNotNull(metrics);
@@ -2637,8 +2695,8 @@ class IrisGrid extends Component {
       // Parsing them again causes a loop with undo/redo that makes it unusable
       columnHeaderGroups: columnHeaderGroups.every(group => isColumnHeaderGroup(group) && group.isValid()) ? columnHeaderGroups : IrisGridUtils.parseColumnHeaderGroups(model, columnHeaderGroups).groups
     }, () => {
-      var _this$grid20;
-      return (_this$grid20 = this.grid) === null || _this$grid20 === void 0 ? void 0 : _this$grid20.forceUpdate();
+      var _this$grid19;
+      return (_this$grid19 = this.grid) === null || _this$grid19 === void 0 ? void 0 : _this$grid19.forceUpdate();
     });
   }
   handleTooltipRef(tooltip) {
@@ -2656,9 +2714,9 @@ class IrisGrid extends Component {
   }
   handleConditionalFormatCreate() {
     log.debug('Create new conditional format');
-    var _this$state12 = this.state,
-      openOptions = _this$state12.openOptions,
-      conditionalFormats = _this$state12.conditionalFormats;
+    var _this$state15 = this.state,
+      openOptions = _this$state15.openOptions,
+      conditionalFormats = _this$state15.conditionalFormats;
     this.setState({
       openOptions: [...openOptions, {
         type: OptionType.CONDITIONAL_FORMATTING_EDIT,
@@ -2671,9 +2729,9 @@ class IrisGrid extends Component {
   }
   handleConditionalFormatEdit(index) {
     log.debug('Edit conditional format', index);
-    var _this$state13 = this.state,
-      openOptions = _this$state13.openOptions,
-      conditionalFormats = _this$state13.conditionalFormats;
+    var _this$state16 = this.state,
+      openOptions = _this$state16.openOptions,
+      conditionalFormats = _this$state16.conditionalFormats;
     this.setState({
       openOptions: [...openOptions, {
         type: OptionType.CONDITIONAL_FORMATTING_EDIT,
@@ -2705,18 +2763,19 @@ class IrisGrid extends Component {
     // Not resetting conditionalFormatPreview here
     // to prevent editor fields change during the menu transition
     this.setState({
-      conditionalFormatEditIndex: null
+      conditionalFormatEditIndex: null,
+      conditionalFormatError: null
     });
   }
   handleUpdateCustomColumns(customColumns) {
     log.info("handleUpdateCustomColumns:", customColumns);
     var model = this.props.model;
-    var _this$state14 = this.state,
-      movedColumns = _this$state14.movedColumns,
-      sorts = _this$state14.sorts,
-      quickFilters = _this$state14.quickFilters,
-      advancedFilters = _this$state14.advancedFilters,
-      selectDistinctColumns = _this$state14.selectDistinctColumns;
+    var _this$state17 = this.state,
+      movedColumns = _this$state17.movedColumns,
+      sorts = _this$state17.sorts,
+      quickFilters = _this$state17.quickFilters,
+      advancedFilters = _this$state17.advancedFilters,
+      selectDistinctColumns = _this$state17.selectDistinctColumns;
     var columns = model.columns;
     var oldCustomColumns = model.customColumns.map(customColumn => "".concat(customColumn));
     var removedColumnNames = IrisGridUtils.getRemovedCustomColumnNames(oldCustomColumns, customColumns);
@@ -2728,16 +2787,18 @@ class IrisGrid extends Component {
       var newSelectDistinctColumns = IrisGridUtils.removeColumnsFromSelectDistinctColumns(selectDistinctColumns, removedColumnNames);
       if (newSorts.length !== sorts.length) {
         log.debug('removing sorts from removed custom columns...');
-        this.setState({
-          sorts: newSorts
-        });
+        this.requestSortsChange(newSorts);
       }
       if (newQuickFilters.size !== quickFilters.size || newAdvancedFilters.size !== advancedFilters.size) {
         log.debug("removing filters from removed custom columns...");
-        this.setState({
-          quickFilters: newQuickFilters,
-          advancedFilters: newAdvancedFilters
-        });
+        if (newQuickFilters.size !== quickFilters.size) {
+          this.requestQuickFiltersChange(newQuickFilters);
+        }
+        if (newAdvancedFilters.size !== advancedFilters.size) {
+          this.setState({
+            advancedFilters: newAdvancedFilters
+          });
+        }
       }
       if (!deepEqual(movedColumns, newMovedColumns)) {
         log.debug("change moved columns for removed custom columns", newMovedColumns);
@@ -2824,7 +2885,7 @@ class IrisGrid extends Component {
     return this.discardPending();
   }
   handlePendingDataUpdated() {
-    var _this$grid21;
+    var _this$grid20;
     log.debug('pending data updated');
     var model = this.props.model;
     var pendingDataMap = model.pendingDataMap,
@@ -2834,13 +2895,13 @@ class IrisGrid extends Component {
       pendingDataErrors,
       pendingSaveError: null
     });
-    (_this$grid21 = this.grid) === null || _this$grid21 === void 0 || _this$grid21.forceUpdate();
+    (_this$grid20 = this.grid) === null || _this$grid20 === void 0 || _this$grid20.forceUpdate();
   }
   handleResizeColumn(modelIndex) {
-    var _this$grid22;
-    var _this$state15 = this.state,
-      metrics = _this$state15.metrics,
-      metricCalculator = _this$state15.metricCalculator;
+    var _this$grid21;
+    var _this$state18 = this.state,
+      metrics = _this$state18.metrics,
+      metricCalculator = _this$state18.metricCalculator;
     if (!metrics) throw new Error('Metrics not set');
     var contentWidth = getOrThrow(metrics.contentColumnWidths, modelIndex);
     var userWidths = metricCalculator.getUserColumnWidths();
@@ -2850,23 +2911,23 @@ class IrisGrid extends Component {
     } else {
       metricCalculator.setColumnWidth(modelIndex, contentWidth);
     }
-    (_this$grid22 = this.grid) === null || _this$grid22 === void 0 || _this$grid22.forceUpdate();
+    (_this$grid21 = this.grid) === null || _this$grid21 === void 0 || _this$grid21.forceUpdate();
   }
   handleResizeAllColumns() {
-    var _this$grid23;
-    var _this$state16 = this.state,
-      metrics = _this$state16.metrics,
-      metricCalculator = _this$state16.metricCalculator;
+    var _this$grid22;
+    var _this$state19 = this.state,
+      metrics = _this$state19.metrics,
+      metricCalculator = _this$state19.metricCalculator;
     if (!metrics) throw new Error('Metrics not set');
     var allColumns = [...metrics.allColumnWidths.entries()];
-    var visibleColumns = allColumns.filter(_ref25 => {
-      var _ref26 = _slicedToArray(_ref25, 2),
-        _ = _ref26[0],
-        width = _ref26[1];
+    var visibleColumns = allColumns.filter(_ref20 => {
+      var _ref21 = _slicedToArray(_ref20, 2),
+        _ = _ref21[0],
+        width = _ref21[1];
       return width !== 0;
-    }).map(_ref27 => {
-      var _ref28 = _slicedToArray(_ref27, 1),
-        modelIndex = _ref28[0];
+    }).map(_ref22 => {
+      var _ref23 = _slicedToArray(_ref22, 1),
+        modelIndex = _ref23[0];
       return modelIndex;
     });
     var contentWidths = metrics.contentColumnWidths;
@@ -2888,7 +2949,7 @@ class IrisGrid extends Component {
         metricCalculator.setColumnWidth(_modelIndex, _contentWidth);
       }
     }
-    (_this$grid23 = this.grid) === null || _this$grid23 === void 0 || _this$grid23.forceUpdate();
+    (_this$grid22 = this.grid) === null || _this$grid22 === void 0 || _this$grid22.forceUpdate();
   }
 
   /**
@@ -2929,8 +2990,8 @@ class IrisGrid extends Component {
     if (shouldStartLoading) {
       this.startLoading("Aggregating ".concat(aggregation.operation, "..."));
     }
-    this.setState(_ref29 => {
-      var aggregationSettings = _ref29.aggregationSettings;
+    this.setState(_ref24 => {
+      var aggregationSettings = _ref24.aggregationSettings;
       return {
         selectedAggregation: aggregation,
         aggregationSettings: _objectSpread(_objectSpread({}, aggregationSettings), {}, {
@@ -2972,6 +3033,7 @@ class IrisGrid extends Component {
     this.resetGridViewState();
     this.clearAllFilters();
     this.startLoading("Grouping by columns ".concat((_rollupConfig$columns5 = rollupConfig === null || rollupConfig === void 0 || (_rollupConfig$columns6 = rollupConfig.columns) === null || _rollupConfig$columns6 === void 0 ? void 0 : _rollupConfig$columns6.join(', ')) !== null && _rollupConfig$columns5 !== void 0 ? _rollupConfig$columns5 : '', "..."));
+    this.requestSortsChange(EMPTY_ARRAY);
 
     // Have to clear select distinct since rollup uses the original columns, not the current ones.
     // IrisGridProxyModel has a check to prevent model update
@@ -2980,7 +3042,6 @@ class IrisGrid extends Component {
       rollupConfig,
       movedColumns: EMPTY_ARRAY,
       frozenColumns: EMPTY_ARRAY,
-      sorts: EMPTY_ARRAY,
       reverse: false,
       selectDistinctColumns: EMPTY_ARRAY
     });
@@ -2992,10 +3053,10 @@ class IrisGrid extends Component {
     this.clearAllFilters();
     this.clearAllAggregations();
     this.startLoading("Selecting distinct values in ".concat(columnNames.length > 0 ? columnNames.join(', ') : '', "..."));
+    this.requestSortsChange(EMPTY_ARRAY);
     this.setState({
       selectDistinctColumns: columnNames,
       movedColumns: [],
-      sorts: [],
       reverse: false
     });
   }
@@ -3034,8 +3095,8 @@ class IrisGrid extends Component {
    */
   removeEmptyAggregations() {
     log.debug('removeEmptyAggregations');
-    this.setState(_ref30 => {
-      var aggregationSettings = _ref30.aggregationSettings;
+    this.setState(_ref25 => {
+      var aggregationSettings = _ref25.aggregationSettings;
       var aggregations = aggregationSettings.aggregations;
       var newAggregations = aggregations.filter(a => a.selected.length > 0 || a.invert);
       if (newAggregations.length !== aggregations.length) {
@@ -3210,11 +3271,11 @@ class IrisGrid extends Component {
     onStateChange(irisGridState, gridState);
   }
   handleOverflowClose() {
-    var _this$grid24;
+    var _this$grid23;
     this.setState({
       showOverflowModal: false
     });
-    (_this$grid24 = this.grid) === null || _this$grid24 === void 0 || _this$grid24.focus(); // Focus on the grid after closing the overflow modal
+    (_this$grid23 = this.grid) === null || _this$grid23 === void 0 || _this$grid23.focus(); // Focus on the grid after closing the overflow modal
   }
   handleOpenNoPastePermissionModal(errorMessage) {
     this.setState({
@@ -3229,9 +3290,9 @@ class IrisGrid extends Component {
   }
   getColumnBoundingRect() {
     var _this$gridWrapper2;
-    var _this$state17 = this.state,
-      metrics = _this$state17.metrics,
-      shownColumnTooltip = _this$state17.shownColumnTooltip;
+    var _this$state20 = this.state,
+      metrics = _this$state20.metrics,
+      shownColumnTooltip = _this$state20.shownColumnTooltip;
     assertNotNull(metrics);
     assertNotNull(shownColumnTooltip);
     var gridRect = (_this$gridWrapper2 = this.gridWrapper) === null || _this$gridWrapper2 === void 0 ? void 0 : _this$gridWrapper2.getBoundingClientRect();
@@ -3284,22 +3345,22 @@ class IrisGrid extends Component {
         gotoRowError: 'Invalid row index'
       });
     } else if (rowInt === 0) {
-      var _this$grid25;
+      var _this$grid24;
       this.setState({
         gotoRowError: '',
         gotoValueError: ''
       });
-      (_this$grid25 = this.grid) === null || _this$grid25 === void 0 || _this$grid25.setFocusRow(0);
+      (_this$grid24 = this.grid) === null || _this$grid24 === void 0 || _this$grid24.setFocusRow(0);
     } else if (rowInt < 0) {
-      var _this$grid26;
+      var _this$grid25;
       this.setState({
         gotoRowError: '',
         gotoValueError: ''
       });
-      (_this$grid26 = this.grid) === null || _this$grid26 === void 0 || _this$grid26.setFocusRow(rowInt + rowCount);
+      (_this$grid25 = this.grid) === null || _this$grid25 === void 0 || _this$grid25.setFocusRow(rowInt + rowCount);
     } else {
-      var _this$grid27;
-      (_this$grid27 = this.grid) === null || _this$grid27 === void 0 || _this$grid27.setFocusRow(rowInt - 1);
+      var _this$grid26;
+      (_this$grid26 = this.grid) === null || _this$grid26 === void 0 || _this$grid26.setFocusRow(rowInt - 1);
       this.setState({
         gotoRowError: '',
         gotoValueError: ''
@@ -3397,12 +3458,12 @@ class IrisGrid extends Component {
     });
   }
   handleGotoValueSelectedColumnNameChanged(columnName) {
-    var _this$grid28;
+    var _this$grid27;
     var model = this.props.model;
-    var cursorRow = (_this$grid28 = this.grid) === null || _this$grid28 === void 0 ? void 0 : _this$grid28.state.cursorRow;
-    var _this$state18 = this.state,
-      prevColumnName = _this$state18.gotoValueSelectedColumnName,
-      gotoValueManuallyChanged = _this$state18.gotoValueManuallyChanged;
+    var cursorRow = (_this$grid27 = this.grid) === null || _this$grid27 === void 0 ? void 0 : _this$grid27.state.cursorRow;
+    var _this$state21 = this.state,
+      prevColumnName = _this$state21.gotoValueSelectedColumnName,
+      gotoValueManuallyChanged = _this$state21.gotoValueManuallyChanged;
     if (cursorRow != null) {
       var index = model.getColumnIndexByName(columnName);
       var column = IrisGridUtils.getColumnByName(model.columns, columnName);
@@ -3455,7 +3516,7 @@ class IrisGrid extends Component {
    * @returns The filter input field element or null if not applicable
    */
   getFilterBarInput(metrics, metricCalculator, focusedFilterBarColumn, quickFilters, advancedFilters) {
-    var _this$grid29;
+    var _this$grid28;
     if (metrics == null || focusedFilterBarColumn == null) {
       return null;
     }
@@ -3510,7 +3571,7 @@ class IrisGrid extends Component {
       onChange: this.handleFilterBarChange,
       onDone: this.handleFilterBarDone,
       onTab: this.handleFilterBarTab,
-      onContextMenu: (_this$grid29 = this.grid) === null || _this$grid29 === void 0 ? void 0 : _this$grid29.handleContextMenu,
+      onContextMenu: (_this$grid28 = this.grid) === null || _this$grid28 === void 0 ? void 0 : _this$grid28.handleContextMenu,
       debounceMs: debounceMs,
       value: value
     }, focusedFilterBarColumn);
@@ -3519,94 +3580,95 @@ class IrisGrid extends Component {
     var _rollupConfig$columns7,
       _rollupConfig$columns8,
       _this7 = this,
-      _this$grid30,
+      _this$grid29,
       _openOptions;
-    var _this$props8 = this.props,
-      children = _this$props8.children,
-      customFilters = _this$props8.customFilters,
-      getDownloadWorker = _this$props8.getDownloadWorker,
-      isSelectingColumn = _this$props8.isSelectingColumn,
-      isStuckToBottom = _this$props8.isStuckToBottom,
-      isStuckToRight = _this$props8.isStuckToRight,
-      model = _this$props8.model,
-      name = _this$props8.name,
-      onlyFetchVisibleColumns = _this$props8.onlyFetchVisibleColumns,
-      alwaysFetchColumns = _this$props8.alwaysFetchColumns,
-      advancedSettings = _this$props8.advancedSettings,
-      onAdvancedSettingsChange = _this$props8.onAdvancedSettingsChange,
-      canDownloadCsv = _this$props8.canDownloadCsv,
-      onCreateChart = _this$props8.onCreateChart,
-      transformTableOptions = _this$props8.transformTableOptions;
+    var _this$props0 = this.props,
+      children = _this$props0.children,
+      customFilters = _this$props0.customFilters,
+      getDownloadWorker = _this$props0.getDownloadWorker,
+      isSelectingColumn = _this$props0.isSelectingColumn,
+      isStuckToBottom = _this$props0.isStuckToBottom,
+      isStuckToRight = _this$props0.isStuckToRight,
+      model = _this$props0.model,
+      name = _this$props0.name,
+      onlyFetchVisibleColumns = _this$props0.onlyFetchVisibleColumns,
+      alwaysFetchColumns = _this$props0.alwaysFetchColumns,
+      advancedSettings = _this$props0.advancedSettings,
+      onAdvancedSettingsChange = _this$props0.onAdvancedSettingsChange,
+      canDownloadCsv = _this$props0.canDownloadCsv,
+      onCreateChart = _this$props0.onCreateChart,
+      transformTableOptions = _this$props0.transformTableOptions;
     var cellInputRendererRegistry = this.context.cellInputRendererRegistry;
-    var _this$state19 = this.state,
-      metricCalculator = _this$state19.metricCalculator,
-      metrics = _this$state19.metrics,
-      isFilterBarShown = _this$state19.isFilterBarShown,
-      isSelectingPartition = _this$state19.isSelectingPartition,
-      isMenuShown = _this$state19.isMenuShown,
-      isReady = _this$state19.isReady,
-      copyOperation = _this$state19.copyOperation,
-      focusedFilterBarColumn = _this$state19.focusedFilterBarColumn,
-      loadingText = _this$state19.loadingText,
-      loadingScrimProgress = _this$state19.loadingScrimProgress,
-      loadingSpinnerShown = _this$state19.loadingSpinnerShown,
-      loadingCancelShown = _this$state19.loadingCancelShown,
-      loadingBlocksGrid = _this$state19.loadingBlocksGrid,
-      shownColumnTooltip = _this$state19.shownColumnTooltip,
-      hoverAdvancedFilter = _this$state19.hoverAdvancedFilter,
-      shownAdvancedFilter = _this$state19.shownAdvancedFilter,
-      maximizedAdvancedFilter = _this$state19.maximizedAdvancedFilter,
-      hoverSelectColumn = _this$state19.hoverSelectColumn,
-      quickFilters = _this$state19.quickFilters,
-      advancedFilters = _this$state19.advancedFilters,
-      searchFilter = _this$state19.searchFilter,
-      selectDistinctColumns = _this$state19.selectDistinctColumns,
-      movedColumns = _this$state19.movedColumns,
-      movedRows = _this$state19.movedRows,
-      formatter = _this$state19.formatter,
-      conditionalFormats = _this$state19.conditionalFormats,
-      conditionalFormatPreview = _this$state19.conditionalFormatPreview,
-      conditionalFormatEditIndex = _this$state19.conditionalFormatEditIndex,
-      columnAlignmentMap = _this$state19.columnAlignmentMap,
-      sorts = _this$state19.sorts,
-      reverse = _this$state19.reverse,
-      customColumns = _this$state19.customColumns,
-      selectedRanges = _this$state19.selectedRanges,
-      isTableDownloading = _this$state19.isTableDownloading,
-      tableDownloadStatus = _this$state19.tableDownloadStatus,
-      tableDownloadProgress = _this$state19.tableDownloadProgress,
-      tableDownloadEstimatedTime = _this$state19.tableDownloadEstimatedTime,
-      showSearchBar = _this$state19.showSearchBar,
-      searchValue = _this$state19.searchValue,
-      selectedSearchColumns = _this$state19.selectedSearchColumns,
-      invertSearchColumns = _this$state19.invertSearchColumns,
-      aggregationSettings = _this$state19.aggregationSettings,
-      selectedAggregation = _this$state19.selectedAggregation,
-      rollupConfig = _this$state19.rollupConfig,
-      openOptions = _this$state19.openOptions,
-      pendingSavePromise = _this$state19.pendingSavePromise,
-      pendingSaveError = _this$state19.pendingSaveError,
-      pendingRowCount = _this$state19.pendingRowCount,
-      pendingDataErrors = _this$state19.pendingDataErrors,
-      pendingDataMap = _this$state19.pendingDataMap,
-      toastMessage = _this$state19.toastMessage,
-      frozenColumns = _this$state19.frozenColumns,
-      columnHeaderGroups = _this$state19.columnHeaderGroups,
-      showOverflowModal = _this$state19.showOverflowModal,
-      showNoPastePermissionModal = _this$state19.showNoPastePermissionModal,
-      noPastePermissionError = _this$state19.noPastePermissionError,
-      overflowText = _this$state19.overflowText,
-      overflowButtonTooltipProps = _this$state19.overflowButtonTooltipProps,
-      expandCellTooltipProps = _this$state19.expandCellTooltipProps,
-      hoverTooltipProps = _this$state19.hoverTooltipProps,
-      isGotoShown = _this$state19.isGotoShown,
-      gotoRow = _this$state19.gotoRow,
-      gotoRowError = _this$state19.gotoRowError,
-      gotoValueError = _this$state19.gotoValueError,
-      gotoValueSelectedColumnName = _this$state19.gotoValueSelectedColumnName,
-      gotoValue = _this$state19.gotoValue,
-      gotoValueSelectedFilter = _this$state19.gotoValueSelectedFilter,
-      partitionConfig = _this$state19.partitionConfig;
+    var _this$state22 = this.state,
+      metricCalculator = _this$state22.metricCalculator,
+      metrics = _this$state22.metrics,
+      isFilterBarShown = _this$state22.isFilterBarShown,
+      isSelectingPartition = _this$state22.isSelectingPartition,
+      isMenuShown = _this$state22.isMenuShown,
+      isReady = _this$state22.isReady,
+      copyOperation = _this$state22.copyOperation,
+      focusedFilterBarColumn = _this$state22.focusedFilterBarColumn,
+      loadingText = _this$state22.loadingText,
+      loadingScrimProgress = _this$state22.loadingScrimProgress,
+      loadingSpinnerShown = _this$state22.loadingSpinnerShown,
+      loadingCancelShown = _this$state22.loadingCancelShown,
+      loadingBlocksGrid = _this$state22.loadingBlocksGrid,
+      shownColumnTooltip = _this$state22.shownColumnTooltip,
+      hoverAdvancedFilter = _this$state22.hoverAdvancedFilter,
+      shownAdvancedFilter = _this$state22.shownAdvancedFilter,
+      maximizedAdvancedFilter = _this$state22.maximizedAdvancedFilter,
+      hoverSelectColumn = _this$state22.hoverSelectColumn,
+      quickFilters = _this$state22.quickFilters,
+      advancedFilters = _this$state22.advancedFilters,
+      searchFilter = _this$state22.searchFilter,
+      selectDistinctColumns = _this$state22.selectDistinctColumns,
+      movedColumns = _this$state22.movedColumns,
+      movedRows = _this$state22.movedRows,
+      formatter = _this$state22.formatter,
+      conditionalFormats = _this$state22.conditionalFormats,
+      conditionalFormatPreview = _this$state22.conditionalFormatPreview,
+      conditionalFormatEditIndex = _this$state22.conditionalFormatEditIndex,
+      conditionalFormatError = _this$state22.conditionalFormatError,
+      columnAlignmentMap = _this$state22.columnAlignmentMap,
+      sorts = _this$state22.sorts,
+      reverse = _this$state22.reverse,
+      customColumns = _this$state22.customColumns,
+      selectedRanges = _this$state22.selectedRanges,
+      isTableDownloading = _this$state22.isTableDownloading,
+      tableDownloadStatus = _this$state22.tableDownloadStatus,
+      tableDownloadProgress = _this$state22.tableDownloadProgress,
+      tableDownloadEstimatedTime = _this$state22.tableDownloadEstimatedTime,
+      showSearchBar = _this$state22.showSearchBar,
+      searchValue = _this$state22.searchValue,
+      selectedSearchColumns = _this$state22.selectedSearchColumns,
+      invertSearchColumns = _this$state22.invertSearchColumns,
+      aggregationSettings = _this$state22.aggregationSettings,
+      selectedAggregation = _this$state22.selectedAggregation,
+      rollupConfig = _this$state22.rollupConfig,
+      openOptions = _this$state22.openOptions,
+      pendingSavePromise = _this$state22.pendingSavePromise,
+      pendingSaveError = _this$state22.pendingSaveError,
+      pendingRowCount = _this$state22.pendingRowCount,
+      pendingDataErrors = _this$state22.pendingDataErrors,
+      pendingDataMap = _this$state22.pendingDataMap,
+      toastMessage = _this$state22.toastMessage,
+      frozenColumns = _this$state22.frozenColumns,
+      columnHeaderGroups = _this$state22.columnHeaderGroups,
+      showOverflowModal = _this$state22.showOverflowModal,
+      showNoPastePermissionModal = _this$state22.showNoPastePermissionModal,
+      noPastePermissionError = _this$state22.noPastePermissionError,
+      overflowText = _this$state22.overflowText,
+      overflowButtonTooltipProps = _this$state22.overflowButtonTooltipProps,
+      expandCellTooltipProps = _this$state22.expandCellTooltipProps,
+      hoverTooltipProps = _this$state22.hoverTooltipProps,
+      isGotoShown = _this$state22.isGotoShown,
+      gotoRow = _this$state22.gotoRow,
+      gotoRowError = _this$state22.gotoRowError,
+      gotoValueError = _this$state22.gotoValueError,
+      gotoValueSelectedColumnName = _this$state22.gotoValueSelectedColumnName,
+      gotoValue = _this$state22.gotoValue,
+      gotoValueSelectedFilter = _this$state22.gotoValueSelectedFilter,
+      partitionConfig = _this$state22.partitionConfig;
     if (!isReady) {
       return null;
     }
@@ -3773,8 +3835,8 @@ class IrisGrid extends Component {
               return 1; // continue
             }
             var advancedFilter = advancedFilters.get(modelColumn);
-            var _ref31 = advancedFilter || {},
-              advancedFilterOptions = _ref31.options;
+            var _ref26 = advancedFilter || {},
+              advancedFilterOptions = _ref26.options;
             var sort = TableUtils.getSortForColumn(model.sort, column.name);
             var sortDirection = sort ? sort.direction : null;
             if (!isSortDirection(sortDirection)) {
@@ -3844,6 +3906,7 @@ class IrisGrid extends Component {
             dh: model.dh,
             columns: model.columns,
             rule: conditionalFormatPreview,
+            errorMessage: conditionalFormatError !== null && conditionalFormatError !== void 0 ? conditionalFormatError : undefined,
             onUpdate: this.handleConditionalFormatEditorUpdate,
             onSave: this.handleConditionalFormatEditorSave,
             onCancel: this.handleConditionalFormatEditorCancel
@@ -4014,7 +4077,7 @@ class IrisGrid extends Component {
             movedColumns: movedColumns,
             customColumns: customColumns,
             hiddenColumns: hiddenColumns,
-            alwaysFetchColumns: this.getAlwaysFetchColumns(alwaysFetchColumns, model.columns, movedColumns, model.floatingLeftColumnCount, model.floatingRightColumnCount, (_this$grid30 = this.grid) === null || _this$grid30 === void 0 || (_this$grid30 = _this$grid30.state.draggingColumn) === null || _this$grid30 === void 0 ? void 0 : _this$grid30.range),
+            alwaysFetchColumns: this.getAlwaysFetchColumns(alwaysFetchColumns, model.columns, movedColumns, model.floatingLeftColumnCount, model.floatingRightColumnCount, (_this$grid29 = this.grid) === null || _this$grid29 === void 0 || (_this$grid29 = _this$grid29.state.draggingColumn) === null || _this$grid29 === void 0 ? void 0 : _this$grid29.range),
             formatColumns: this.getCachedPreviewFormatColumns(model.dh, model.columns, 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),
@@ -4164,8 +4227,12 @@ _defineProperty(IrisGrid, "defaultProps", {
   partitions: undefined,
   partitionConfig: undefined,
   quickFilters: EMPTY_MAP,
+  isQuickFiltersControlled: false,
+  onQuickFiltersChange: undefined,
   selectDistinctColumns: EMPTY_ARRAY,
   sorts: EMPTY_ARRAY,
+  isSortsControlled: false,
+  onSortsChange: undefined,
   reverse: false,
   customColumns: EMPTY_ARRAY,
   aggregationSettings: DEFAULT_AGGREGATION_SETTINGS,