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

package/dist/IrisGrid.js

@@ -16,7 +16,6 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { ContextActions, Stack, Menu, Page, Popper, ThemeExport, Tooltip, Button, ContextActionUtils } from '@deephaven/components';
 import { Grid, GridRange, GridUtils, isEditableGridModel, isExpandableGridModel } from '@deephaven/grid';
 import { dhEye, dhFilterFilled, dhGraphLineUp, dhTriangleDownSquare, vsClose, vsCloudDownload, vsEdit, vsFilter, vsMenu, vsReply, vsRuby, vsSearch, vsSplitHorizontal, vsSymbolOperator, vsTools } from '@deephaven/icons';
-import dh from '@deephaven/jsapi-shim';
 import { DateUtils, Formatter, FormatterUtils, TableUtils } from '@deephaven/jsapi-utils';
 import { assertNotNull, copyToClipboard, EMPTY_ARRAY, EMPTY_MAP, Pending, PromiseUtils, ValidationError, getOrThrow } from '@deephaven/utils';
 import { Type as FilterType } from '@deephaven/filters';
@@ -75,14 +74,6 @@ function isEmptyConfig(_ref) {
   return advancedFilters.size === 0 && aggregationSettings.aggregations.length === 0 && customColumns.length === 0 && quickFilters.size === 0 && reverseType === TableUtils.REVERSE_TYPE.NONE && rollupConfig == null && searchFilter == null && selectDistinctColumns.length === 0 && sorts.length === 0;
 }
 export class IrisGrid extends Component {
-  static makeQuickFilter(column, text, timeZone) {
-    try {
-      return TableUtils.makeQuickFilter(column, text, timeZone);
-    } catch (err) {
-      log.error('Error creating quick filter', err);
-    }
-    return null;
-  }
   constructor(props) {
     var _model$layoutHints, _model$layoutHints$hi, _model$columns$0$name, _model$columns$;
     super(props);
@@ -112,19 +103,27 @@ export class IrisGrid extends Component {
     _defineProperty(this, "discardAction", void 0);
     _defineProperty(this, "commitAction", void 0);
     _defineProperty(this, "contextActions", void 0);
+    _defineProperty(this, "tableUtils", void 0);
     _defineProperty(this, "getAdvancedMenuOpenedHandler", memoize(column => this.handleAdvancedMenuOpened.bind(this, column), {
       max: 100
     }));
-    _defineProperty(this, "getCachedAdvancedFilterMenuActions", memoize((model, column, advancedFilterOptions, sortDirection, formatter) => /*#__PURE__*/React.createElement(AdvancedFilterCreator, {
-      model: model,
-      column: column,
-      onFilterChange: this.handleAdvancedFilterChange,
-      onSortChange: this.handleAdvancedFilterSortChange,
-      onDone: this.handleAdvancedFilterDone,
-      options: advancedFilterOptions,
-      sortDirection: sortDirection,
-      formatter: formatter
-    }), {
+    _defineProperty(this, "getCachedAdvancedFilterMenuActions", memoize((model, column, advancedFilterOptions, sortDirection, formatter) => {
+      var {
+        dh
+      } = this.props;
+      return /*#__PURE__*/React.createElement(AdvancedFilterCreator, {
+        dh: dh,
+        model: model,
+        column: column,
+        onFilterChange: this.handleAdvancedFilterChange,
+        onSortChange: this.handleAdvancedFilterSortChange,
+        onDone: this.handleAdvancedFilterDone,
+        options: advancedFilterOptions,
+        sortDirection: sortDirection,
+        formatter: formatter,
+        tableUtils: this.tableUtils
+      });
+    }, {
       max: 50
     }));
     _defineProperty(this, "getCachedOptionItems", memoize((isChartBuilderAvailable, isCustomColumnsAvailable, isFormatColumnsAvailable, isRollupAvailable, isTotalsAvailable, isSelectDistinctAvailable, isExportAvailable, toggleFilterBarAction, toggleSearchBarAction, toggleGotoRowAction, isFilterBarShown, showSearchBar, canDownloadCsv, canToggleSearch, showGotoRow, hasAdvancedSettings) => {
@@ -252,15 +251,15 @@ export class IrisGrid extends Component {
       return operationMap;
     }));
     _defineProperty(this, "getOperationOrder", memoize(aggregations => aggregations.map(a => a.operation).filter(o => !AggregationUtils.isRollupOperation(o))));
-    _defineProperty(this, "getCachedFormatColumns", memoize((columns, rules) => getFormatColumns(columns, rules)));
-    _defineProperty(this, "getCachedPreviewFormatColumns", memoize((columns, rulesParam, preview, editIndex) => {
+    _defineProperty(this, "getCachedFormatColumns", memoize((dh, columns, rules) => getFormatColumns(dh, columns, rules)));
+    _defineProperty(this, "getCachedPreviewFormatColumns", memoize((dh, columns, rulesParam, preview, editIndex) => {
       log.debug('getCachedPreviewFormatColumns', rulesParam, preview, editIndex);
       if (preview !== undefined && editIndex !== undefined) {
         var rules = [...rulesParam];
         rules[editIndex] = preview;
-        return this.getCachedFormatColumns(columns, rules);
+        return this.getCachedFormatColumns(dh, columns, rules);
       }
-      return this.getCachedFormatColumns(columns, rulesParam);
+      return this.getCachedFormatColumns(dh, columns, rulesParam);
     }));
     _defineProperty(this, "getModelRollupConfig", memoize((originalColumns, config, aggregationSettings) => IrisGridUtils.getModelRollupConfig(originalColumns, config, aggregationSettings)));
     _defineProperty(this, "getModelTotalsConfig", memoize((columns, config, aggregationSettings) => {
@@ -322,7 +321,10 @@ export class IrisGrid extends Component {
       return Object.freeze([...columnSet]);
     }));
     _defineProperty(this, "updateSearchFilter", debounce((searchValue, selectedSearchColumns, columns, invertSearchColumns) => {
-      var searchFilter = CrossColumnSearch.createSearchFilter(searchValue, selectedSearchColumns, columns, invertSearchColumns);
+      var {
+        dh
+      } = this.props;
+      var searchFilter = CrossColumnSearch.createSearchFilter(dh, searchValue, selectedSearchColumns, columns, invertSearchColumns);
       this.setState({
         searchFilter
       });
@@ -544,6 +546,7 @@ export class IrisGrid extends Component {
     };
     this.contextActions = [this.toggleFilterBarAction, this.toggleSearchBarAction, this.toggleGotoRowAction, this.discardAction, this.commitAction];
     var {
+      dh: _dh,
       aggregationSettings: _aggregationSettings,
       conditionalFormats,
       customColumnFormatMap,
@@ -573,7 +576,7 @@ export class IrisGrid extends Component {
     if (canCopy) {
       keyHandlers.push(new CopyKeyHandler(this));
     }
-    var mouseHandlers = [new IrisGridCellOverflowMouseHandler(this), new IrisGridRowTreeMouseHandler(this), new IrisGridTokenMouseHandler(this), new IrisGridColumnSelectMouseHandler(this), new IrisGridColumnTooltipMouseHandler(this), new IrisGridSortMouseHandler(this), new IrisGridFilterMouseHandler(this), new IrisGridContextMenuHandler(this), new IrisGridDataSelectMouseHandler(this), new PendingMouseHandler(this)];
+    var mouseHandlers = [new IrisGridCellOverflowMouseHandler(this), new IrisGridRowTreeMouseHandler(this), new IrisGridTokenMouseHandler(this), new IrisGridColumnSelectMouseHandler(this), new IrisGridColumnTooltipMouseHandler(this), new IrisGridSortMouseHandler(this), new IrisGridFilterMouseHandler(this), new IrisGridContextMenuHandler(this, _dh), new IrisGridDataSelectMouseHandler(this), new PendingMouseHandler(this)];
     var _movedColumns = movedColumnsProp.length > 0 ? movedColumnsProp : _model.initialMovedColumns;
     var movedRows = movedRowsProp.length > 0 ? movedRowsProp : _model.initialMovedRows;
     var _metricCalculator = new IrisGridMetricCalculator({
@@ -583,7 +586,8 @@ export class IrisGrid extends Component {
       initialColumnWidths: new Map(_model === null || _model === void 0 ? void 0 : (_model$layoutHints = _model.layoutHints) === null || _model$layoutHints === void 0 ? void 0 : (_model$layoutHints$hi = _model$layoutHints.hiddenColumns) === null || _model$layoutHints$hi === void 0 ? void 0 : _model$layoutHints$hi.map(name => [_model.getColumnIndexByName(name), 0]))
     });
     var searchColumns = _selectedSearchColumns !== null && _selectedSearchColumns !== void 0 ? _selectedSearchColumns : [];
-    var _searchFilter = CrossColumnSearch.createSearchFilter(_searchValue, searchColumns, _model.columns, _invertSearchColumns);
+    var _searchFilter = CrossColumnSearch.createSearchFilter(_dh, _searchValue, searchColumns, _model.columns, _invertSearchColumns);
+    this.tableUtils = new TableUtils(_dh);
     this.state = {
       isFilterBarShown: _isFilterBarShown,
       isSelectingPartition,
@@ -617,7 +621,7 @@ export class IrisGrid extends Component {
       movedColumns: _movedColumns,
       movedRows,
       shownColumnTooltip: null,
-      formatter: new Formatter(),
+      formatter: new Formatter(_dh),
       isMenuShown: false,
       customColumnFormatMap: new Map(customColumnFormatMap),
       conditionalFormats,
@@ -761,6 +765,7 @@ export class IrisGrid extends Component {
   getValueForCell(columnIndex, rowIndex) {
     var rawValue = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     var {
+      dh,
       model
     } = this.props;
     var modelColumn = this.getModelColumn(columnIndex);
@@ -824,6 +829,14 @@ export class IrisGrid extends Component {
     } = this.state;
     return GridUtils.getVisibleIndex(modelIndex, movedColumns);
   }
+  makeQuickFilter(column, text, timeZone) {
+    try {
+      return this.tableUtils.makeQuickFilter(column, text, timeZone);
+    } catch (err) {
+      log.error('Error creating quick filter', err);
+    }
+    return null;
+  }
 
   /**
    * Applies the provided input filters as quick filters,
@@ -899,7 +912,7 @@ export class IrisGrid extends Component {
       }
       quickFilters.set(modelIndex, {
         text: value,
-        filter: IrisGrid.makeQuickFilter(column, value, formatter.timeZone)
+        filter: this.makeQuickFilter(column, value, formatter.timeZone)
       });
       return true;
     }
@@ -991,7 +1004,7 @@ export class IrisGrid extends Component {
         var {
           formatter
         } = model;
-        this.setQuickFilter(columnIndex, IrisGrid.makeQuickFilter(column, combinedText, formatter.timeZone), "".concat(combinedText));
+        this.setQuickFilter(columnIndex, this.makeQuickFilter(column, combinedText, formatter.timeZone), "".concat(combinedText));
       }
     });
   }
@@ -1082,7 +1095,7 @@ export class IrisGrid extends Component {
         options
       } = value;
       var column = columns[key];
-      var filter = TableUtils.makeAdvancedFilter(column, options, formatter.timeZone);
+      var filter = this.tableUtils.makeAdvancedFilter(column, options, formatter.timeZone);
       newAdvancedFilters.set(key, {
         options,
         filter
@@ -1095,7 +1108,7 @@ export class IrisGrid extends Component {
       var column = columns[key];
       newQuickFilters.set(key, {
         text,
-        filter: IrisGrid.makeQuickFilter(column, text, formatter.timeZone)
+        filter: this.makeQuickFilter(column, text, formatter.timeZone)
       });
     });
     this.startLoading('Rebuilding filters...', true);
@@ -1145,11 +1158,14 @@ export class IrisGrid extends Component {
     var {
       customColumnFormatMap
     } = this.state;
+    var {
+      dh
+    } = this.props;
     var update = _objectSpread({
       customColumnFormatMap
     }, updatedFormats);
     var mergedColumnFormats = [...((_this$globalColumnFor = this.globalColumnFormats) !== null && _this$globalColumnFor !== void 0 ? _this$globalColumnFor : []), ...update.customColumnFormatMap.values()];
-    var formatter = new Formatter(mergedColumnFormats, this.dateTimeFormatterOptions, this.decimalFormatOptions, this.integerFormatOptions, this.truncateNumbersWithPound);
+    var formatter = new Formatter(dh, mergedColumnFormats, this.dateTimeFormatterOptions, this.decimalFormatOptions, this.integerFormatOptions, this.truncateNumbersWithPound);
     log.debug('updateFormatter', this.globalColumnFormats, mergedColumnFormats);
     this.setState(_objectSpread(_objectSpread({}, update), {}, {
       formatter
@@ -1168,6 +1184,7 @@ export class IrisGrid extends Component {
   initState() {
     var {
       applyInputFiltersOnInit,
+      dh,
       inputFilters,
       sorts,
       model,
@@ -1178,7 +1195,7 @@ export class IrisGrid extends Component {
       invertSearchColumns
     } = this.props;
     var searchColumns = selectedSearchColumns !== null && selectedSearchColumns !== void 0 ? selectedSearchColumns : [];
-    var searchFilter = CrossColumnSearch.createSearchFilter(searchValue, searchColumns, model.columns, invertSearchColumns);
+    var searchFilter = CrossColumnSearch.createSearchFilter(dh, searchValue, searchColumns, model.columns, invertSearchColumns);
     if (applyInputFiltersOnInit) {
       // There may be more than one input filter on the same column with value === '' applied last
       // We don't want to skip it here, so only excluding the ones that were never applied (null)
@@ -1236,6 +1253,9 @@ export class IrisGrid extends Component {
     })();
   }
   updatePartition(partition, partitionColumn) {
+    var {
+      dh
+    } = this.props;
     var partitionFilter = partitionColumn.filter().eq(dh.FilterValue.ofString(partition));
     var partitionFilters = [partitionFilter];
     this.setState({
@@ -1724,6 +1744,7 @@ export class IrisGrid extends Component {
   isTableSearchAvailable() {
     var _model$layoutHints3, _dh$SearchDisplayMode, _dh$SearchDisplayMode2;
     var {
+      dh,
       model,
       canToggleSearch
     } = this.props;
@@ -2526,6 +2547,7 @@ export class IrisGrid extends Component {
         gotoValueSelectedFilter
       } = _this5.state;
       var {
+        dh,
         model
       } = _this5.props;
       if (!model.isSeekRowAvailable) {
@@ -2560,7 +2582,7 @@ export class IrisGrid extends Component {
             }
           case TableUtils.dataType.DATETIME:
             {
-              var [startDate] = DateUtils.parseDateRange(inputString, formatter.timeZone);
+              var [startDate] = DateUtils.parseDateRange(dh, inputString, formatter.timeZone);
               rowIndex = yield model.seekRow(searchFromRow, selectedColumn, dh.ValueType.DATETIME, startDate, undefined, undefined, isBackwards !== null && isBackwards !== void 0 ? isBackwards : false);
               break;
             }
@@ -2582,7 +2604,7 @@ export class IrisGrid extends Component {
             }
           default:
             {
-              rowIndex = yield model.seekRow(searchFromRow, selectedColumn, dh.ValueType.STRING, 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, _this5.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);
@@ -2912,6 +2934,7 @@ export class IrisGrid extends Component {
       _this$grid29$state$dr,
       _openOptions;
     var {
+      dh,
       children,
       customFilters,
       getDownloadWorker,
@@ -3215,6 +3238,12 @@ export class IrisGrid extends Component {
           var _modelColumn = _this6.getModelColumn(columnIndex);
           if (_modelColumn != null) {
             var _column4 = model.columns[_modelColumn];
+            if (_column4 == null) {
+              // Grid metrics is likely out of sync with model
+              log.warn("Column does not exist at index ".concat(_modelColumn, " for column array of length ").concat(model.columns.length));
+              // eslint-disable-next-line no-continue
+              return "continue";
+            }
             var _advancedFilter2 = advancedFilters.get(_modelColumn);
             var {
               options: advancedFilterOptions
@@ -3243,7 +3272,8 @@ export class IrisGrid extends Component {
         }
       };
       for (var _i3 = 0; _i3 < _visibleColumns.length; _i3 += 1) {
-        _loop3();
+        var _ret = _loop3();
+        if (_ret === "continue") continue;
       }
     }
     var optionItems = this.getCachedOptionItems(onCreateChart !== undefined && model.isChartBuilderAvailable, model.isCustomColumnsAvailable, model.isFormatColumnsAvailable, model.isRollupAvailable, model.isTotalsAvailable || isRollup, model.isSelectDistinctAvailable, model.isExportAvailable, this.toggleFilterBarAction, this.toggleSearchBarAction, this.toggleGotoRowAction, isFilterBarShown, showSearchBar, canDownloadCsv, this.isTableSearchAvailable(), isGotoShown, advancedSettings.size > 0);
@@ -3253,6 +3283,7 @@ export class IrisGrid extends Component {
         case OptionType.CHART_BUILDER:
           return /*#__PURE__*/React.createElement(ChartBuilder, {
             model: model,
+            dh: dh,
             onChange: this.handleChartChange,
             onSubmit: this.handleChartCreate,
             key: OptionType.CHART_BUILDER
@@ -3280,6 +3311,7 @@ export class IrisGrid extends Component {
           assertNotNull(model.columns);
           assertNotNull(this.handleConditionalFormatEditorUpdate);
           return /*#__PURE__*/React.createElement(ConditionalFormatEditor, {
+            dh: dh,
             columns: model.columns,
             rule: conditionalFormatPreview,
             onUpdate: this.handleConditionalFormatEditorUpdate,
@@ -3316,6 +3348,7 @@ export class IrisGrid extends Component {
           });
         case OptionType.TABLE_EXPORTER:
           return /*#__PURE__*/React.createElement(TableCsvExporter, {
+            dh: dh,
             model: model,
             name: name,
             userColumnWidths: userColumnWidths,
@@ -3365,6 +3398,7 @@ export class IrisGrid extends Component {
     }, /*#__PURE__*/React.createElement("div", {
       className: "iris-grid-partition-selector-wrapper iris-grid-bar iris-grid-bar-primary"
     }, partitionTable && partitionColumn && partition != null && /*#__PURE__*/React.createElement(IrisGridPartitionSelector, {
+      dh: dh,
       table: partitionTable,
       getFormattedString: (value, type, stringName) => model.displayString(value, type, stringName),
       columnName: partitionColumn.name,
@@ -3422,6 +3456,7 @@ export class IrisGrid extends Component {
       text: overflowText,
       onClose: this.handleOverflowClose
     }), isVisible && /*#__PURE__*/React.createElement(IrisGridModelUpdater, {
+      dh: dh,
       model: model,
       modelColumns: model.columns,
       top: top,
@@ -3436,7 +3471,7 @@ export class IrisGrid extends Component {
       customColumns: customColumns,
       hiddenColumns: hiddenColumns,
       alwaysFetchColumns: this.getAlwaysFetchColumns(alwaysFetchColumns, model.columns, movedColumns, model.floatingLeftColumnCount, model.floatingRightColumnCount, (_this$grid29 = this.grid) === null || _this$grid29 === void 0 ? void 0 : (_this$grid29$state$dr = _this$grid29.state.draggingColumn) === null || _this$grid29$state$dr === void 0 ? void 0 : _this$grid29$state$dr.range),
-      formatColumns: this.getCachedPreviewFormatColumns(model.columns, conditionalFormats, conditionalFormatPreview,
+      formatColumns: this.getCachedPreviewFormatColumns(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),
       rollupConfig: this.getModelRollupConfig(model.originalColumns, rollupConfig, aggregationSettings),
@@ -3458,6 +3493,7 @@ export class IrisGrid extends Component {
       }),
       tooltip: "Table Options"
     })), focusField, loadingElement, filterBar, columnTooltip, advancedFilterMenus, overflowButtonTooltipProps && this.getOverflowButtonTooltip(overflowButtonTooltipProps), expandCellTooltipProps && this.getExpandCellTooltip(expandCellTooltipProps), linkHoverTooltipProps && this.getLinkHoverTooltip(linkHoverTooltipProps)), /*#__PURE__*/React.createElement(GotoRow, {
+      dh: dh,
       model: model,
       isShown: isGotoShown,
       gotoRow: gotoRow,
@@ -3501,6 +3537,7 @@ export class IrisGrid extends Component {
       onExiting: this.handleAnimationStart,
       onExited: this.handleAnimationEnd
     }), /*#__PURE__*/React.createElement(TableSaver, {
+      dh: dh,
       ref: tableSaver => {
         this.tableSaver = tableSaver;
       },