From dd4e437d5ba8dd3bccf3b57936fcc97e92bb0711 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Mon, 19 Oct 2020 13:17:09 -0600
Subject: [PATCH] Etemplate: Fix flipping between 2 nextmatch filter values
 stopped updating results after 2 changes

---
 api/js/etemplate/et2_extension_nextmatch.js | 29 +++++++++++++--------
 api/js/etemplate/et2_extension_nextmatch.ts | 16 +++++++++---
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/api/js/etemplate/et2_extension_nextmatch.js b/api/js/etemplate/et2_extension_nextmatch.js
index 3f99781e86..cbf409d7c5 100644
--- a/api/js/etemplate/et2_extension_nextmatch.js
+++ b/api/js/etemplate/et2_extension_nextmatch.js
@@ -2825,21 +2825,28 @@ var et2_nextmatch_header_bar = /** @class */ (function (_super) {
             var change = function (_node) {
                 // Call previously set change function
                 var result = widget_change.call(_widget, _node, header.nextmatch);
-                // Update filters, if we're not already doing so
-                if ((result || typeof result === 'undefined') && _widget.isDirty() && !header.update_in_progress) {
-                    // Update dirty
-                    _widget._oldValue = _widget.getValue();
+                // Find current value in activeFilters
+                var entry = header.nextmatch.activeFilters;
+                var path = _widget.getArrayMgr('content').explodeKey(_widget.id);
+                var i = 0;
+                if (path.length > 0) {
+                    for (; i < path.length; i++) {
+                        entry = entry[path[i]];
+                    }
+                }
+                // Update filters, if the value is different and we're not already doing so
+                if ((result || typeof result === 'undefined') && entry != _widget.getValue() && !header.update_in_progress) {
                     // Widget will not have an entry in getValues() because nulls
                     // are not returned, we remove it from activeFilters
                     if (_widget._oldValue == null) {
-                        var path = _widget.getArrayMgr('content').explodeKey(_widget.id);
-                        if (path.length > 0) {
-                            var entry = header.nextmatch.activeFilters;
-                            var i = 0;
-                            for (; i < path.length - 1; i++) {
-                                entry = entry[path[i]];
+                        var path_1 = _widget.getArrayMgr('content').explodeKey(_widget.id);
+                        if (path_1.length > 0) {
+                            var entry_1 = header.nextmatch.activeFilters;
+                            var i_1 = 0;
+                            for (; i_1 < path_1.length - 1; i_1++) {
+                                entry_1 = entry_1[path_1[i_1]];
                             }
-                            delete entry[path[i]];
+                            delete entry_1[path_1[i_1]];
                         }
                         header.nextmatch.applyFilters(header.nextmatch.activeFilters);
                     }
diff --git a/api/js/etemplate/et2_extension_nextmatch.ts b/api/js/etemplate/et2_extension_nextmatch.ts
index 05bb69794f..a3bb5ddffc 100644
--- a/api/js/etemplate/et2_extension_nextmatch.ts
+++ b/api/js/etemplate/et2_extension_nextmatch.ts
@@ -3608,11 +3608,19 @@ class et2_nextmatch_header_bar extends et2_DOMWidget implements et2_INextmatchHe
 				// Call previously set change function
 				const result = widget_change.call(_widget, _node, header.nextmatch);
 
-				// Update filters, if we're not already doing so
-				if ((result || typeof result === 'undefined') && _widget.isDirty() && !header.update_in_progress) {
-					// Update dirty
-					_widget._oldValue = _widget.getValue();
+				// Find current value in activeFilters
+				let entry = header.nextmatch.activeFilters;
+				const path = _widget.getArrayMgr('content').explodeKey(_widget.id);
+				let i = 0;
+				if (path.length > 0) {
+					for (; i < path.length; i++) {
+						entry = entry[path[i]];
+					}
+				}
 
+				// Update filters, if the value is different and we're not already doing so
+				if ((result || typeof result === 'undefined') && entry != _widget.getValue() && !header.update_in_progress)
+				{
 					// Widget will not have an entry in getValues() because nulls
 					// are not returned, we remove it from activeFilters
 					if (_widget._oldValue == null) {