Merge pull request #9049 from GordonSmith/HPCC-15848

HPCC-15848 Graph properties fail to display

Reviewed-By: Miguel Vazquez <miguel.vazquez@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

esp/src/eclwatch/GraphWidget.js

@@ -802,17 +802,11 @@ define([
                         var first = true;
                         var table = {};
                         var tr = {};
+                        var context = this;
                         for (var key in props) {
                             if (key[0] == "_")
                                 continue;
-
-                            if (first) {
-                                first = false;
-                                table = domConstruct.create("table", { border: 1, cellspacing: 0, width: "100%" }, place);
-                                tr = domConstruct.create("tr", null, table);
-                                domConstruct.create("th", { innerHTML: this.i18n.Property }, tr);
-                                domConstruct.create("th", { innerHTML: this.i18n.Value }, tr);
-                            }
+                            ensureHeader();
                             tr = domConstruct.create("tr", null, table);
                             domConstruct.create("td", { innerHTML: Utility.xmlEncode(key) }, tr);
                             domConstruct.create("td", { innerHTML: Utility.xmlEncode(props[key]) }, tr);
@@ -820,6 +814,7 @@ define([
                         arrayUtil.filter(wu.helpers, function (d) {
                             return globalID && d.minActivityId <= globalID && globalID <= d.maxActivityId;
                         }).forEach(function (d) {
+                            ensureHeader();
                             tr = domConstruct.create("tr", null, table);
                             domConstruct.create("td", { innerHTML: this.i18n.Helper }, tr);
                             domConstruct.create("td", { innerHTML: "<a href='" + "/WsWorkunits/WUFile?Wuid=" + wu.Wuid + "&Name=" + d.Name + "&IPAddress=" + d.IPAddress + "&Description=" + d.Description + "&Type=" + d.Type + "' target='_blank'>" + d.Description + "</a>" }, tr);
@@ -827,6 +822,16 @@ define([
                         if (first == false) {
                             domConstruct.create("br", null, place);
                         }
+
+                        function ensureHeader() {
+                            if (first) {
+                                first = false;
+                                table = domConstruct.create("table", { border: 1, cellspacing: 0, width: "100%" }, place);
+                                tr = domConstruct.create("tr", null, table);
+                                domConstruct.create("th", { innerHTML: context.i18n.Property }, tr);
+                                domConstruct.create("th", { innerHTML: context.i18n.Value }, tr);
+                            }
+                        }
                     }
                 }
             },