better handling of dummy and null values

lineupjs · Mar 26, 2020 · 2a14508 · 2a14508
1 parent 1333e86
commit 2a14508
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/model/StringColumn.ts b/src/model/StringColumn.ts
@@ -213,7 +213,10 @@ export default class StringColumn extends ValueColumn<string> {
     if (filter === this.currentFilter) {
       return;
     }
-    if (this.currentFilter && filter && this.currentFilter.filterMissing === filter.filterMissing && this.currentFilter.filter === filter.filter) {
+    const current = this.currentFilter || {filter: null, filterMissing: false};
+    const target = filter || {filter: null, filterMissing: false};
+    if (current.filterMissing === target.filterMissing && (current.filter === target.filter ||
+      (current.filter instanceof RegExp && target.filter instanceof RegExp && current.filter.source === target.filter.source))) {
       return;
     }
     this.fire([StringColumn.EVENT_FILTER_CHANGED, Column.EVENT_DIRTY_VALUES, Column.EVENT_DIRTY], this.currentFilter, this.currentFilter = filter);

diff --git a/src/ui/dialogs/StringFilterDialog.ts b/src/ui/dialogs/StringFilterDialog.ts
@@ -30,7 +30,11 @@ export default class StringFilterDialog extends ADialog {
 
   private updateFilter(filter: string | RegExp | null, filterMissing: boolean) {
     updateFilterState(this.attachment, this.column, filterMissing || filter != null);
-    this.column.setFilter({filter, filterMissing});
+    if (filter == null && !filterMissing) {
+      this.column.setFilter(null);
+    } else {
+      this.column.setFilter({filter, filterMissing});
+    }
   }
 
   protected reset() {
@@ -40,7 +44,7 @@ export default class StringFilterDialog extends ADialog {
 
   protected cancel() {
     if (this.before) {
-      this.updateFilter(this.before.filter, this.before.filterMissing);
+      this.updateFilter(this.before.filter === '' ? null : this.before.filter, this.before.filterMissing);
     } else {
       this.updateFilter(null, false);
     }