Merge pull request #17539 from jeclrsg/hpcc-29757-daliserver-logs

HPCC-29757 ECL Watch fix system servers page show audit and server logs
hpcc-systems · Jul 4, 2023 · b6f02c5 · b6f02c5
2 parents 325880b + c4b348e
commit b6f02c5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/esp/src/eclwatch/ClusterProcessesQueryWidget.js b/esp/src/eclwatch/ClusterProcessesQueryWidget.js
@@ -80,10 +80,14 @@ define([
         initTab: function () {
             var currSel = this.getSelectedChild();
             if (currSel && !currSel.initalized) {
-                if (currSel.id === this.legacyClustersProcessesIframeWidget.id && !this.legacyClustersProcessesIframeWidget.initalized) {
+                if (currSel.id === this.id + "_Grid") {
+                    this.refreshGrid();
+                } else if (currSel.id === this.legacyClustersProcessesIframeWidget.id && !this.legacyClustersProcessesIframeWidget.initalized) {
                     this.legacyClustersProcessesIframeWidget.init({
                         src: ESPRequest.getBaseURL("WsTopology") + "/TpClusterQuery?Type=ROOT"
                     });
+                } else {
+                    currSel.init(currSel.params);
                 }
             }
         },

diff --git a/esp/src/eclwatch/SystemServersQueryWidget.js b/esp/src/eclwatch/SystemServersQueryWidget.js
@@ -68,10 +68,14 @@ define([
         initTab: function () {
             var currSel = this.getSelectedChild();
             if (currSel && !currSel.initalized) {
-                if (currSel.id === this.systemServersQueryWidgetIframeWidget.id && !this.systemServersQueryWidgetIframeWidget.initalized) {
+                if (currSel.id === this.id + "_Grid") {
+                    this.refreshGrid();
+                } else if (currSel.id === this.systemServersQueryWidgetIframeWidget.id && !this.systemServersQueryWidgetIframeWidget.initalized) {
                     this.systemServersQueryWidgetIframeWidget.init({
                         src: ESPRequest.getBaseURL("WsTopology") + "/TpServiceQuery?Type=ALLSERVICES"
                     });
+                } else {
+                    currSel.init(currSel.params);
                 }
             }
         },
@@ -278,7 +282,7 @@ define([
             retVal.on(".dgrid-cell .gridClick:click", function (evt) {
                 var item = retVal.row(evt).data;
                 if (evt.target.title === "Audit Log" || evt.target.title === "Component Log") {
-                    context._onOpenLog(item);
+                    context._onOpenLog(item, evt.target.title);
                 } else {
                     context._onOpenConfiguration(item);
                 }
@@ -349,11 +353,11 @@ define([
             });
         },
 
-        _onOpenLog: function (item) {
+        _onOpenLog: function (item, type) {
             var nodeTab = this.ensureLogsPane(item.Name + ": " + item.Parent.LogDirectory, {
                 params: item,
                 ParentName: item.Parent.Name,
-                LogDirectory: item.Parent.LogDirectory,
+                LogDirectory: type === "Audit Log" ? item.Parent.AuditLogDirectory : item.Parent.LogDirectory,
                 NetAddress: item.Netaddress,
                 OS: item.OS,
                 newPreflight: true

diff --git a/esp/src/eclwatch/TargetClustersQueryWidget.js b/esp/src/eclwatch/TargetClustersQueryWidget.js
@@ -56,10 +56,14 @@ define([
         initTab: function () {
             var currSel = this.getSelectedChild();
             if (currSel && !currSel.initalized) {
-                if (currSel.id === this.legacyTargetClustersIframeWidget.id && !this.legacyTargetClustersIframeWidget.initalized) {
+                if (currSel.id === this.id + "_Grid") {
+                    this.refreshGrid();
+                } else if (currSel.id === this.legacyTargetClustersIframeWidget.id && !this.legacyTargetClustersIframeWidget.initalized) {
                     this.legacyTargetClustersIframeWidget.init({
                         src: ESPRequest.getBaseURL("WsTopology") + "/TpTargetClusterQuery?Type=ROOT"
                     });
+                } else if (currSel.params.newPreflight || currSel.params.Usergenerated) { //prevents loop of pfTab.init above
+                    currSel.init(currSel.params);
                 }
             }
         },