@deephaven/iris-grid 0.54.1-ui.1 → 0.55.1-alpha-theming-bootstrap.77

package/dist/IrisGrid.js

@@ -49,6 +49,8 @@ import ConditionalFormattingMenu from "./sidebar/conditional-formatting/Conditio
 import ConditionalFormatEditor from "./sidebar/conditional-formatting/ConditionalFormatEditor.js";
 import IrisGridCellOverflowModal from "./IrisGridCellOverflowModal.js";
 import GotoRow from "./GotoRow.js";
+import AggregationOperation from "./sidebar/aggregations/AggregationOperation.js";
+import { IrisGridThemeContext } from "./IrisGridThemeProvider.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var log = Log.module('IrisGrid');
@@ -259,13 +261,16 @@ export class IrisGrid extends Component {
     }));
     _defineProperty(this, "getModelRollupConfig", memoize((originalColumns, config, aggregationSettings) => IrisGridUtils.getModelRollupConfig(originalColumns, config, aggregationSettings)));
     _defineProperty(this, "getModelTotalsConfig", memoize((columns, config, aggregationSettings) => {
-      var _config$columns$lengt, _config$columns, _aggregations$length;
-      var {
-        aggregations,
-        showOnTop
-      } = aggregationSettings;
-      // If we've got rollups, then aggregations are applied as part of that...
-      if (((_config$columns$lengt = config === null || config === void 0 ? void 0 : (_config$columns = config.columns) === null || _config$columns === void 0 ? void 0 : _config$columns.length) !== null && _config$columns$lengt !== void 0 ? _config$columns$lengt : 0) > 0 || ((_aggregations$length = aggregations === null || aggregations === void 0 ? void 0 : aggregations.length) !== null && _aggregations$length !== void 0 ? _aggregations$length : 0) === 0) {
+      var _config$columns$lengt, _config$columns;
+      if (((_config$columns$lengt = config === null || config === void 0 ? void 0 : (_config$columns = config.columns) === null || _config$columns === void 0 ? void 0 : _config$columns.length) !== null && _config$columns$lengt !== void 0 ? _config$columns$lengt : 0) > 0) {
+        // If we've got rollups, then aggregations are applied as part of that...
+        return null;
+      }
+
+      // Filter out aggregations without any columns actually selected
+      var aggregations = aggregationSettings.aggregations.filter(agg => agg.selected.length > 0 || agg.invert);
+      if (aggregations.length === 0) {
+        // We don't actually have any aggregations set, don't bother
         return null;
       }
       var operationMap = this.getOperationMap(columns, aggregations);
@@ -273,7 +278,8 @@ export class IrisGrid extends Component {
       return {
         operationMap,
         operationOrder,
-        showOnTop
+        showOnTop: aggregationSettings.showOnTop,
+        defaultOperation: AggregationOperation.SKIP
       };
     }));
     _defineProperty(this, "getCachedStateOverride", memoize((hoverSelectColumn, isFilterBarShown, isSelectingColumn, loadingScrimProgress, quickFilters, advancedFilters, sorts, reverseType, rollupConfig, isMenuShown) => ({
@@ -293,13 +299,13 @@ export class IrisGrid extends Component {
     _defineProperty(this, "getCachedFilter", memoize((customFilters, quickFilters, advancedFilters, partitionFilters, searchFilter) => [...(customFilters !== null && customFilters !== void 0 ? customFilters : []), ...(partitionFilters !== null && partitionFilters !== void 0 ? partitionFilters : []), ...IrisGridUtils.getFiltersFromFilterMap(quickFilters), ...IrisGridUtils.getFiltersFromFilterMap(advancedFilters), ...(searchFilter !== undefined ? [searchFilter] : [])], {
       max: 1
     }));
-    _defineProperty(this, "getCachedTheme", memoize((theme, isEditable, floatingRowCount) => {
-      var _theme$rowFooterWidth;
+    _defineProperty(this, "getCachedTheme", memoize((contextTheme, theme, isEditable, floatingRowCount) => {
+      var _ref4, _theme$rowFooterWidth;
       var defaultTheme = createDefaultIrisGridTheme();
 
       // We only show the row footers when we have floating rows for aggregations
-      var rowFooterWidth = floatingRowCount > 0 ? (_theme$rowFooterWidth = theme === null || theme === void 0 ? void 0 : theme.rowFooterWidth) !== null && _theme$rowFooterWidth !== void 0 ? _theme$rowFooterWidth : defaultTheme.rowFooterWidth : 0;
-      return _objectSpread(_objectSpread(_objectSpread({}, defaultTheme), theme), {}, {
+      var rowFooterWidth = floatingRowCount > 0 ? (_ref4 = (_theme$rowFooterWidth = theme === null || theme === void 0 ? void 0 : theme.rowFooterWidth) !== null && _theme$rowFooterWidth !== void 0 ? _theme$rowFooterWidth : contextTheme === null || contextTheme === void 0 ? void 0 : contextTheme.rowFooterWidth) !== null && _ref4 !== void 0 ? _ref4 : defaultTheme.rowFooterWidth : 0;
+      return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultTheme), contextTheme), theme), {}, {
         autoSelectRow: !isEditable,
         rowFooterWidth
       });
@@ -690,7 +696,7 @@ export class IrisGrid extends Component {
     }
     this.startListening(model);
   }
-  componentDidUpdate(prevProps) {
+  componentDidUpdate(prevProps, prevState) {
     var {
       inputFilters,
       isSelectingColumn,
@@ -754,6 +760,15 @@ export class IrisGrid extends Component {
         });
       });
     }
+    var {
+      openOptions
+    } = this.state;
+    if (openOptions !== prevState.openOptions) {
+      var isAggEditType = option => option.type === OptionType.AGGREGATION_EDIT;
+      if (!openOptions.some(isAggEditType) && prevState.openOptions.some(isAggEditType)) {
+        this.removeEmptyAggregations();
+      }
+    }
     this.sendStateChange();
   }
   componentWillUnmount() {
@@ -844,12 +859,12 @@ export class IrisGrid extends Component {
     return rowIndex != null ? modelRows.get(rowIndex) : null;
   }
   getTheme() {
-    var _ref4;
+    var _ref5;
     var {
       model,
       theme
     } = this.props;
-    return this.getCachedTheme(theme, (_ref4 = isEditableGridModel(model) && model.isEditable) !== null && _ref4 !== void 0 ? _ref4 : false, model.floatingTopRowCount + model.floatingBottomRowCount);
+    return this.getCachedTheme(this.context, theme, (_ref5 = isEditableGridModel(model) && model.isEditable) !== null && _ref5 !== void 0 ? _ref5 : false, model.floatingTopRowCount + model.floatingBottomRowCount);
   }
   getVisibleColumn(modelIndex) {
     var {
@@ -884,17 +899,17 @@ export class IrisGrid extends Component {
     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 => {
+    inputFilters.forEach(_ref6 => {
       var {
         name,
         type,
         value
-      } = _ref5;
-      var modelIndex = model.columns.findIndex(_ref6 => {
+      } = _ref6;
+      var modelIndex = model.columns.findIndex(_ref7 => {
         var {
           name: columnName,
           type: columnType
-        } = _ref6;
+        } = _ref7;
         return columnName === name && columnType === type;
       });
       if (modelIndex >= 0) {
@@ -954,10 +969,10 @@ export class IrisGrid extends Component {
   setAdvancedFilter(modelIndex, filter, options) {
     log.debug('Setting advanced filter', modelIndex, filter);
     this.startLoading('Filtering...', true);
-    this.setState(_ref7 => {
+    this.setState(_ref8 => {
       var {
         advancedFilters
-      } = _ref7;
+      } = _ref8;
       var newAdvancedFilters = new Map(advancedFilters);
       if (filter == null) {
         newAdvancedFilters.delete(modelIndex);
@@ -982,10 +997,10 @@ export class IrisGrid extends Component {
   setQuickFilter(modelIndex, filter, text) {
     log.debug('Setting quick filter', modelIndex, filter, text);
     this.startLoading('Filtering...', true);
-    this.setState(_ref8 => {
+    this.setState(_ref9 => {
       var {
         quickFilters
-      } = _ref8;
+      } = _ref9;
       var newQuickFilters = new Map(quickFilters);
       newQuickFilters.set(modelIndex, {
         filter,
@@ -1014,11 +1029,11 @@ export class IrisGrid extends Component {
     var {
       model
     } = this.props;
-    filterMap.forEach((_ref9, columnName) => {
+    filterMap.forEach((_ref10, columnName) => {
       var {
         columnType,
         filterList
-      } = _ref9;
+      } = _ref10;
       var column = model.columns.find(c => c.name === columnName && c.type === columnType);
       if (column == null) {
         return;
@@ -1038,11 +1053,11 @@ export class IrisGrid extends Component {
   }
   removeColumnFilter(modelColumn) {
     this.startLoading('Filtering...', true);
-    this.setState(_ref10 => {
+    this.setState(_ref11 => {
       var {
         advancedFilters,
         quickFilters
-      } = _ref10;
+      } = _ref11;
       var newAdvancedFilters = advancedFilters ? new Map(advancedFilters) : new Map();
       var newQuickFilters = quickFilters ? new Map(quickFilters) : new Map();
       newQuickFilters.delete(modelColumn);
@@ -1055,10 +1070,10 @@ export class IrisGrid extends Component {
   }
   removeQuickFilter(modelColumn) {
     this.startLoading('Clearing Filter...', true);
-    this.setState(_ref11 => {
+    this.setState(_ref12 => {
       var {
         quickFilters
-      } = _ref11;
+      } = _ref12;
       var newQuickFilters = new Map(quickFilters);
       newQuickFilters.delete(modelColumn);
       return {
@@ -1145,11 +1160,11 @@ export class IrisGrid extends Component {
       advancedFilters: newAdvancedFilters
     });
   }
-  setFilters(_ref12) {
+  setFilters(_ref13) {
     var {
       quickFilters,
       advancedFilters
-    } = _ref12;
+    } = _ref13;
     this.setState({
       quickFilters,
       advancedFilters
@@ -2077,11 +2092,11 @@ export class IrisGrid extends Component {
   }
   handleFilterBarChange(value) {
     this.startLoading('Filtering...', true);
-    this.setState(_ref13 => {
+    this.setState(_ref14 => {
       var {
         focusedFilterBarColumn,
         quickFilters
-      } = _ref13;
+      } = _ref14;
       var newQuickFilters = new Map(quickFilters);
       if (focusedFilterBarColumn != null) {
         var modelIndex = this.getModelColumn(focusedFilterBarColumn);
@@ -2151,10 +2166,10 @@ export class IrisGrid extends Component {
     });
   }
   handleMenuBack() {
-    this.setState(_ref14 => {
+    this.setState(_ref15 => {
       var {
         openOptions
-      } = _ref14;
+      } = _ref15;
       var newOptions = [...openOptions];
       newOptions.pop();
       return {
@@ -2163,10 +2178,10 @@ export class IrisGrid extends Component {
     });
   }
   handleMenuSelect(option) {
-    this.setState(_ref15 => {
+    this.setState(_ref16 => {
       var {
         openOptions
-      } = _ref15;
+      } = _ref16;
       return {
         openOptions: [...openOptions, option]
       };
@@ -2480,10 +2495,10 @@ export class IrisGrid extends Component {
   handleAggregationChange(aggregation) {
     log.debug('handleAggregationChange', aggregation);
     this.startLoading("Aggregating ".concat(aggregation.operation, "..."));
-    this.setState(_ref16 => {
+    this.setState(_ref17 => {
       var {
         aggregationSettings
-      } = _ref16;
+      } = _ref17;
       return {
         selectedAggregation: aggregation,
         aggregationSettings: _objectSpread(_objectSpread({}, aggregationSettings), {}, {
@@ -2576,6 +2591,34 @@ export class IrisGrid extends Component {
       log.error('Attempted to handleDownloadTable for user without download CSV permission.');
     }
   }
+
+  /**
+   * Aggregation editing has completed. Need to filter out any aggregations that have no columns selected
+   */
+  removeEmptyAggregations() {
+    log.debug('removeEmptyAggregations');
+    this.setState(_ref18 => {
+      var {
+        aggregationSettings
+      } = _ref18;
+      var {
+        aggregations
+      } = aggregationSettings;
+      var newAggregations = aggregations.filter(a => a.selected.length > 0 || a.invert);
+      if (newAggregations.length !== aggregations.length) {
+        return {
+          selectedAggregation: null,
+          aggregationSettings: _objectSpread(_objectSpread({}, aggregationSettings), {}, {
+            aggregations: newAggregations
+          })
+        };
+      }
+      return {
+        selectedAggregation: null,
+        aggregationSettings
+      };
+    });
+  }
   seekRow(inputString) {
     var _arguments = arguments,
       _this5 = this;
@@ -3625,6 +3668,7 @@ export class IrisGrid extends Component {
     });
   }
 }
+_defineProperty(IrisGrid, "contextType", IrisGridThemeContext);
 _defineProperty(IrisGrid, "minDebounce", 150);
 _defineProperty(IrisGrid, "maxDebounce", 500);
 _defineProperty(IrisGrid, "loadingSpinnerDelay", 800);