From efe3be201797a3b46ae2f41acb380c1df885c73a Mon Sep 17 00:00:00 2001
From: vsaliieva <vsaliieva@zenoss.com>
Date: Tue, 16 Jul 2024 14:27:06 +0300
Subject: [PATCH] Fix for refresh button

Fixes ZEN-34963.

Changed the order to store reload followed by grid refresh
to ensure that the grid's refresh operation occurs after
the store has been updated with new data from the server
---
 Products/ZenUI3/browser/resources/js/zenoss/EventPanels.js      | 2 +-
 Products/ZenUI3/browser/resources/js/zenoss/itinfrastructure.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Products/ZenUI3/browser/resources/js/zenoss/EventPanels.js b/Products/ZenUI3/browser/resources/js/zenoss/EventPanels.js
index 402f1eaee6..0555a4cfe4 100644
--- a/Products/ZenUI3/browser/resources/js/zenoss/EventPanels.js
+++ b/Products/ZenUI3/browser/resources/js/zenoss/EventPanels.js
@@ -1711,8 +1711,8 @@
             return val;
         },
         refresh: function() {
-            this.callParent(arguments);
             this.getStore().reload();
+            this.callParent(arguments);
             this.fireEvent('eventgridrefresh', this);
         }
     }); // SimpleEventGridPanel
diff --git a/Products/ZenUI3/browser/resources/js/zenoss/itinfrastructure.js b/Products/ZenUI3/browser/resources/js/zenoss/itinfrastructure.js
index b04bcc97f6..6fd26594f3 100644
--- a/Products/ZenUI3/browser/resources/js/zenoss/itinfrastructure.js
+++ b/Products/ZenUI3/browser/resources/js/zenoss/itinfrastructure.js
@@ -1665,8 +1665,8 @@ Ext.onReady(function () {
                         handler: function () {
                             var grid = Ext.getCmp('device_grid');
                             if (grid.isVisible(true)) {
-                                grid.refresh();
                                 grid.getStore().reload();
+                                grid.refresh();
                                 Ext.getCmp('organizer_events').refresh();
                                 refreshTreePanel();
                             }