This is an automated email from the ASF dual-hosted git repository.

orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/main by this push:
     new 8864869  QPID-8568: [Broker-J] Context variables disappear from All 
list in GUI context editor
8864869 is described below

commit 886486962147e4bbecf41a8a280026c580ce4644
Author: Marek Laca <[email protected]>
AuthorDate: Tue Oct 26 14:07:03 2021 +0200

    QPID-8568: [Broker-J] Context variables disappear from All list in GUI 
context editor
    
    This closes #112
---
 .../js/qpid/common/ContextVariablesEditor.js       | 29 ++++++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git 
a/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js
 
b/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js
index 24c681a..cbcdea1 100644
--- 
a/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js
+++ 
b/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js
@@ -159,7 +159,6 @@ define(["qpid/common/util",
                 {
                     that._onEdit(inRowIndex);
                 });
-                grid.startup();
                 this._filterBox = registry.byNode(query(".filter", 
this.domNode)[0]);
                 this._filterBox.on("change", function (value)
                 {
@@ -169,9 +168,26 @@ define(["qpid/common/util",
                     }
                 });
             },
+            startup: function()
+            {
+                this.inherited(arguments);
+                this._grid.startup();
+                this._filter(this._filterBox.value);
+            },
             resize: function ()
             {
-                this._grid.render();
+                if (this._onResizeHandle)
+                {
+                    this._onResizeHandle.remove();
+                }
+                const that = this;
+                this._onResizeHandle = this.defer(function ()
+                {
+                    that._onResizeHandle = null;
+                    that._grid.setQuery({"inherited": that._filterBox.value});
+                    that._grid.sort();
+                    that._grid.update();
+                });
             },
             setData: function (actualValues, allEffectiveValues, 
inheritedActualValues)
             {
@@ -215,8 +231,9 @@ define(["qpid/common/util",
                         grid.store.newItem(storeItem);
                     }
                     grid.store.save();
+                    grid.sort();
+                    grid.render();
                 }
-                this._filter(this._filterBox.value);
                 this._handleOnChange(actualValues);
             },
             addInheritedContext: function (object)
@@ -257,7 +274,8 @@ define(["qpid/common/util",
                         }
                     }
                     grid.store.save();
-                    this._filter(this._filterBox.value);
+                    grid.sort();
+                    grid.render();
                 }
             },
             removeDynamicallyAddedInheritedContext: function ()
@@ -327,6 +345,7 @@ define(["qpid/common/util",
             },
             onChange: function (newValue)
             {
+                this.inherited(arguments);
             },
             _newItem: function ()
             {
@@ -434,7 +453,7 @@ define(["qpid/common/util",
             },
             _filter: function (value)
             {
-                this._grid.filter({"inherited": value});
+                this._grid.filter({"inherited": value}, true);
             },
             _nextId: function ()
             {

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to