@deephaven/iris-grid 0.41.2-beta.0 → 0.41.2-beta.4

package/dist/mousehandlers/IrisGridContextMenuHandler.js

@@ -307,6 +307,7 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
         actions: []
       };
       if (value == null) {
+        // null gets a special menu
         if (quickFilters.get(modelColumn)) {
           filterMenu.actions.push({
             title: 'And',
@@ -316,6 +317,17 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
           });
         }
         filterMenu.actions.push(...this.nullFilterActions(column));
+      } else if (value === '') {
+        // empty string gets a special menu
+        if (quickFilters.get(modelColumn)) {
+          filterMenu.actions.push({
+            title: 'And',
+            actions: this.emptyStringFilterActions(column, quickFilters.get(modelColumn), '&&'),
+            order: 2,
+            group: ContextActions.groups.high
+          });
+        }
+        filterMenu.actions.push(...this.emptyStringFilterActions(column));
       } else if (TableUtils.isBooleanType(column.type)) {
         // boolean should have OR condition, and handles it's own null menu options
         if (quickFilters.get(modelColumn)) {
@@ -696,6 +708,7 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
       model
     } = this.irisGrid.props;
     var columnIndex = model.getColumnIndexByName(column.name);
+    var quickFilterValueText = TableUtils.escapeQuickTextFilter(valueText);
     assertNotNull(columnIndex);
     actions.push({
       menuElement: /*#__PURE__*/React.createElement("div", {
@@ -708,7 +721,7 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
       title: 'text is exactly',
       description: "Show only rows where ".concat(column.name, " is ").concat(value, " (case sensitive)"),
       action: () => {
-        this.irisGrid.setQuickFilter(columnIndex, IrisGridContextMenuHandler.getQuickFilterCondition(filter, column.filter().eq(filterValue), operator), IrisGridContextMenuHandler.getQuickFilterText(filterText, "=".concat(valueText), operator));
+        this.irisGrid.setQuickFilter(columnIndex, IrisGridContextMenuHandler.getQuickFilterCondition(filter, column.filter().eq(filterValue), operator), IrisGridContextMenuHandler.getQuickFilterText(filterText, "".concat(quickFilterValueText), operator));
       },
       order: 10,
       group: ContextActions.groups.low
@@ -717,7 +730,7 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
       title: 'text is not exactly',
       description: "Show only rows where ".concat(column.name, " is not ").concat(valueText, " (case sensitive)"),
       action: () => {
-        this.irisGrid.setQuickFilter(columnIndex, IrisGridContextMenuHandler.getQuickFilterCondition(filter, column.filter().notEq(filterValue), operator), IrisGridContextMenuHandler.getQuickFilterText(filterText, "!=".concat(valueText), operator));
+        this.irisGrid.setQuickFilter(columnIndex, IrisGridContextMenuHandler.getQuickFilterCondition(filter, column.filter().notEq(filterValue), operator), IrisGridContextMenuHandler.getQuickFilterText(filterText, "!=".concat(quickFilterValueText), operator));
       },
       order: 20,
       group: ContextActions.groups.low
@@ -726,7 +739,7 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
       title: "text contains",
       description: "Show only rows where ".concat(column.name, " contains ").concat(valueText),
       action: () => {
-        this.irisGrid.setQuickFilter(columnIndex, IrisGridContextMenuHandler.getQuickFilterCondition(filter, column.filter().contains(filterValue), operator), IrisGridContextMenuHandler.getQuickFilterText(filterText, "~".concat(valueText), operator));
+        this.irisGrid.setQuickFilter(columnIndex, IrisGridContextMenuHandler.getQuickFilterCondition(filter, column.filter().isNull().not().and(column.filter().contains(filterValue)), operator), IrisGridContextMenuHandler.getQuickFilterText(filterText, "~".concat(quickFilterValueText), operator));
       },
       order: 30,
       group: ContextActions.groups.low
@@ -735,7 +748,7 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
       title: 'text does not contain',
       description: "Show only rows where ".concat(column.name, " does not contain ").concat(value),
       action: () => {
-        this.irisGrid.setQuickFilter(columnIndex, IrisGridContextMenuHandler.getQuickFilterCondition(filter, column.filter().contains(filterValue).not(), operator), IrisGridContextMenuHandler.getQuickFilterText(filterText, "!~".concat(valueText), operator));
+        this.irisGrid.setQuickFilter(columnIndex, IrisGridContextMenuHandler.getQuickFilterCondition(filter, column.filter().isNull().or(column.filter().contains(filterValue).not()), operator), IrisGridContextMenuHandler.getQuickFilterText(filterText, "!~".concat(quickFilterValueText), operator));
       },
       order: 40,
       group: ContextActions.groups.low
@@ -744,7 +757,7 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
       title: 'text starts with',
       description: "Show only rows where ".concat(column.name, " starts with ").concat(valueText),
       action: () => {
-        this.irisGrid.setQuickFilter(columnIndex, IrisGridContextMenuHandler.getQuickFilterCondition(filter, column.filter().invoke('startsWith', filterValue), operator), IrisGridContextMenuHandler.getQuickFilterText(filterText, "".concat(valueText, "*"), operator));
+        this.irisGrid.setQuickFilter(columnIndex, IrisGridContextMenuHandler.getQuickFilterCondition(filter, column.filter().isNull().not().and(column.filter().invoke('startsWith', filterValue)), operator), IrisGridContextMenuHandler.getQuickFilterText(filterText, "".concat(quickFilterValueText, "*"), operator));
       },
       order: 50,
       group: ContextActions.groups.low
@@ -753,7 +766,7 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
       title: 'text ends with',
       description: "Show only rows where ".concat(column.name, " ends with ").concat(valueText),
       action: () => {
-        this.irisGrid.setQuickFilter(columnIndex, IrisGridContextMenuHandler.getQuickFilterCondition(filter, column.filter().invoke('endsWith', filterValue), operator), IrisGridContextMenuHandler.getQuickFilterText(filterText, "*".concat(valueText), operator));
+        this.irisGrid.setQuickFilter(columnIndex, IrisGridContextMenuHandler.getQuickFilterCondition(filter, column.filter().isNull().not().and(column.filter().invoke('endsWith', filterValue)), operator), IrisGridContextMenuHandler.getQuickFilterText(filterText, "*".concat(quickFilterValueText), operator));
       },
       order: 60,
       group: ContextActions.groups.low
@@ -982,6 +995,57 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
     });
     return actions;
   }
+  emptyStringFilterActions(column, quickFilter, operator) {
+    var {
+      dh
+    } = this;
+    var filterValue = dh.FilterValue.ofString('');
+    var newQuickFilter = quickFilter;
+    if (!newQuickFilter) {
+      newQuickFilter = {
+        filter: null,
+        text: null
+      };
+    }
+    var {
+      filter,
+      text: filterText
+    } = newQuickFilter;
+    var actions = [];
+    var {
+      model
+    } = this.irisGrid.props;
+    var columnIndex = model.getColumnIndexByName(column.name);
+    assertNotNull(columnIndex);
+    actions.push({
+      menuElement: /*#__PURE__*/React.createElement("div", {
+        className: "iris-grid-filter-menu-item-value"
+      }, operator ? IrisGridContextMenuHandler.getOperatorAsText(operator) : '', ' ', /*#__PURE__*/React.createElement("i", {
+        className: "text-muted"
+      }, "empty")),
+      order: 1,
+      group: ContextActions.groups.high
+    });
+    actions.push({
+      title: 'is empty string',
+      description: "Show only rows where ".concat(column.name, " is empty"),
+      action: () => {
+        this.irisGrid.setQuickFilter(columnIndex, IrisGridContextMenuHandler.getQuickFilterCondition(filter, column.filter().eq(filterValue), operator), IrisGridContextMenuHandler.getQuickFilterText(filterText, "=", operator));
+      },
+      order: 10,
+      group: ContextActions.groups.low
+    });
+    actions.push({
+      title: 'is not empty string',
+      description: "Show only rows where ".concat(column.name, " is not empty"),
+      action: () => {
+        this.irisGrid.setQuickFilter(columnIndex, IrisGridContextMenuHandler.getQuickFilterCondition(filter, column.filter().notEq(filterValue), operator), IrisGridContextMenuHandler.getQuickFilterText(filterText, "!=", operator));
+      },
+      order: 20,
+      group: ContextActions.groups.low
+    });
+    return actions;
+  }
   nullFilterActions(column, quickFilter, operator) {
     var filter = null;
     var filterText = null;
@@ -998,7 +1062,9 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
     actions.push({
       menuElement: /*#__PURE__*/React.createElement("div", {
         className: "iris-grid-filter-menu-item-value"
-      }, operator ? IrisGridContextMenuHandler.getOperatorAsText(operator) : '', ' ', "\"null\""),
+      }, operator ? IrisGridContextMenuHandler.getOperatorAsText(operator) : '', ' ', /*#__PURE__*/React.createElement("i", {
+        className: "text-muted"
+      }, "null")),
       order: 1,
       group: ContextActions.groups.high
     });