HPCC-23324 EclWatch failing to load

Incorrect use of "ESPBase.default" which was removed prematurely

Signed-off-by: Gordon Smith <gordonjsmith@gmail.com>

esp/src/eclwatch/FullResultWidget.js

@@ -32,7 +32,7 @@ define([
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, dom, iframe, Memory, Observable,
     registry,
     Grid, selector, DijitRegistry,
-    _Widget, ESPBase, ESPWorkunit, ESPLogicalFile, ESPUtil,
+    _Widget, ESPBaseMod, ESPWorkunit, ESPLogicalFile, ESPUtil,
     template) {
     return declare("FullResultWidget", [_Widget], {
         templateString: template,
@@ -73,7 +73,7 @@ define([
 
         _doDownload: function (type) {
             //TODO Fix
-            var base = new ESPBase.default();
+            var base = new ESPBaseMod.ESPBase();
             if (lang.exists("result.Sequence", this)) {
                 var sequence = this.result.Sequence;
                 var downloadPdfIframeName = "downloadIframe_" + sequence;

esp/src/eclwatch/LogWidget.js

@@ -49,7 +49,7 @@ define([
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, dom, domClass, domForm, date, on, topic,
     registry, Menu, MenuItem, MenuSeparator, PopupMenuItem,
     selector,
-    _TabContainerWidget, ESPBase, ESPUtil, ESPWorkunit, DelayLoadWidget, TargetSelectWidget, FilterDropDownWidget, ECLSourceWidget, WsTopology,
+    _TabContainerWidget, ESPBaseMod, ESPUtil, ESPWorkunit, DelayLoadWidget, TargetSelectWidget, FilterDropDownWidget, ECLSourceWidget, WsTopology,
     template) {
     return declare("LogWidget", [_TabContainerWidget, ESPUtil.FormHelper], {
         templateString: template,
@@ -100,7 +100,7 @@ define([
         },
 
         _doDownload: function (zip) {
-            var base = new ESPBase.default();
+            var base = new ESPBaseMod.ESPBase();
             var name = "//" + this.params.getNetaddress() + this.params.getLogDirectory() + "/" + this.logTargetSelect.get("value");
             var type = "tpcomp_log";
             window.open(base.getBaseURL("WsTopology") + "/SystemLog?Name=" + name + "&Type=" + type + "&Zip=" + zip, "_blank");

esp/src/eclwatch/ResultWidget.js

@@ -36,7 +36,7 @@ define([
 ], function (declare, lang, arrayUtil, i18n, nlsHPCC, ioQuery,
     registry, TextBox,
     Grid, Keyboard, ColumnResizer, CompoundColumns, DijitRegistry, PaginationModule,
-    _Widget, ESPBase, ESPWorkunit, ESPLogicalFile, FilterDropDownWidget, TableContainer, DGridHeaderHookMod, hpccCommon,
+    _Widget, ESPBaseMod, ESPWorkunit, ESPLogicalFile, FilterDropDownWidget, TableContainer, DGridHeaderHookMod, hpccCommon,
     template) {
     return declare("ResultWidget", [_Widget], {
         templateString: template,
@@ -84,7 +84,7 @@ define([
         },
 
         _doDownload: function (type) {
-            var base = new ESPBase.default();
+            var base = new ESPBaseMod.ESPBase();
             if (lang.exists("params.Sequence", this)) {
                 window.open(base.getBaseURL() + "/WUResultBin?Format=" + type + "&Wuid=" + this.params.Wuid + "&Sequence=" + this.params.Sequence, "_blank");
             } else if (lang.exists("params.LogicalName", this)) {

esp/src/eclwatch/UserQueryWidget.js

@@ -53,7 +53,7 @@ define([
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, dom, domForm, on, all,
     registry, Menu, MenuItem, MenuSeparator, Select,
     tree, selector,
-    _TabContainerWidget, WsAccess, WsAccount, ESPBase, ESPUtil, ESPRequest, UserDetailsWidget, GroupDetailsWidget, FilterDropDownWidget, TargetSelectWidget, ShowAccountPermissionsWidget, ShowIndividualPermissionsWidget,
+    _TabContainerWidget, WsAccess, WsAccount, ESPBaseMod, ESPUtil, ESPRequest, UserDetailsWidget, GroupDetailsWidget, FilterDropDownWidget, TargetSelectWidget, ShowAccountPermissionsWidget, ShowIndividualPermissionsWidget,
     template) {
     return declare("UserQueryWidget", [_TabContainerWidget], {
         templateString: template,
@@ -244,7 +244,7 @@ define([
                 }
                 groupnames += "groupnames_i" + idx + "=" + item.name;
             }, this);
-            var base = new ESPBase.default();
+            var base = new ESPBaseMod.ESPBase();
             window.open(base.getBaseURL("ws_access") + "/UserAccountExport?" + groupnames);
         },
 
@@ -325,7 +325,7 @@ define([
                 }
                 usernames += "usernames_i" + idx + "=" + item.username;
             }, this);
-            var base = new ESPBase.default();
+            var base = new ESPBaseMod.ESPBase();
             window.open(base.getBaseURL("ws_access") + "/UserAccountExport?" + usernames);
         },
 

esp/src/ganglia/WsRrd.js

@@ -11,11 +11,10 @@ define([
 
     "dojox/xml/parser",
 
-    "hpcc/ESPBase",
     "src/ESPRequest"
 ], function (declare, lang, arrayUtil, Deferred, QueryResults, JsonRest, Memory, Cache, Observable,
     parser,
-    ESPBase, ESPRequest) {
+    ESPRequest) {
         var GangliaMetricStore = declare([ESPRequest.Store], {
             service: "ws_rrd",
             action: "getAvailableMetrics",

esp/src/src/ESPResult.ts

@@ -10,7 +10,7 @@ import * as nlsHPCC from "dojo/i18n!hpcc/nls/hpcc";
 import * as entities from "dojox/html/entities";
 import * as parser from "dojox/xml/parser";
 
-import * as ESPBase from "./ESPBase";
+import { ESPBase } from "./ESPBase";
 import * as ESPRequest from "./ESPRequest";
 import * as Utility from "./Utility";
 import * as WsWorkunits from "./WsWorkunits";