HPCC-19093 Update to latest hpcc-js

Migrate comms layer to TypeScript.
Add hpcc-js debug option.

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

esp/src/eclwatch/ActivityWidget.js

@@ -32,11 +32,11 @@ define([
     "dgrid/tree",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ESPRequest",
-    "hpcc/ESPActivity",
+    "src/ESPRequest",
+    "src/ESPActivity",
     "hpcc/DelayLoadWidget",
-    "hpcc/ESPUtil",
-    "hpcc/Utility",
+    "src/ESPUtil",
+    "src/Utility",
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, on,
                 registry, Button, ToggleButton, ToolbarSeparator, ContentPane, Tooltip,

esp/src/eclwatch/CurrentUserDetailsWidget.js

@@ -24,7 +24,7 @@ define([
     "dijit/registry",
 
     "hpcc/_Widget",
-    "hpcc/ws_account",
+    "src/ws_account",
 
     "dojo/text!../templates/CurrentUserDetailsWidget.html",
 

esp/src/eclwatch/DFUQueryWidget.js

@@ -42,18 +42,18 @@ define([
     "dgrid/tree",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/WsDfu",
-    "hpcc/FileSpray",
-    "hpcc/ESPUtil",
-    "hpcc/ESPLogicalFile",
-    "hpcc/ESPDFUWorkunit",
+    "src/WsDfu",
+    "src/FileSpray",
+    "src/ESPUtil",
+    "src/ESPLogicalFile",
+    "src/ESPDFUWorkunit",
     "hpcc/DelayLoadWidget",
     "hpcc/TargetSelectWidget",
     "hpcc/TargetComboBoxWidget",
     "hpcc/FilterDropDownWidget",
     "hpcc/SelectionGridWidget",
-    "hpcc/WsTopology",
-    "hpcc/Utility",
+    "src/WsTopology",
+    "src/Utility",
 
     "put-selector/put",
 

esp/src/eclwatch/DFUSearchWidget.js

@@ -28,7 +28,7 @@ define([
     "hpcc/TargetSelectWidget",
     "hpcc/ResultsWidget",
     "hpcc/InfoGridWidget",
-    "hpcc/ESPWorkunit",
+    "src/ESPWorkunit",
 
     "dojo/text!../templates/DFUSearchWidget.html"
 ], function (declare,

esp/src/eclwatch/DFUWUDetailsWidget.js

@@ -36,8 +36,8 @@ define([
     "dijit/ProgressBar",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/FileSpray",
-    "hpcc/ESPDFUWorkunit",
+    "src/FileSpray",
+    "src/ESPDFUWorkunit",
     "hpcc/DelayLoadWidget",
 
     "dojo/text!../templates/DFUWUDetailsWidget.html",

esp/src/eclwatch/DelayLoadWidget.js

@@ -22,7 +22,7 @@ define([
 
     "dijit/layout/ContentPane",
 
-    "hpcc/Utility"
+    "src/Utility"
 ], function (declare, Deferred, lang, dom, domStyle,
     ContentPane,
     Utility) {

esp/src/eclwatch/DiskUsageWidget.js

@@ -25,8 +25,8 @@ define([
     "dgrid/selector",
 
     "hpcc/_Widget",
-    "hpcc/WsDfu",
-    "hpcc/ESPUtil",
+    "src/WsDfu",
+    "src/ESPUtil",
     "hpcc/FilterDropDownWidget",
 
     "dojo/text!../templates/DiskUsageWidget.html",

esp/src/eclwatch/DynamicESDLDefinitionDetailsWidget.js

@@ -21,7 +21,7 @@ define([
 
     "hpcc/_TabContainerWidget",
     "hpcc/ECLSourceWidget",
-    "hpcc/WsESDLConfig",
+    "src/WsESDLConfig",
 
     "dojo/text!../templates/DynamicESDLDefinitionDetailsWidget.html",
 

esp/src/eclwatch/DynamicESDLDefinitionQueryWidget.js

@@ -21,10 +21,10 @@ define([
     "dojo/_base/array",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/WsESDLConfig",
-    "hpcc/ESPUtil",
+    "src/WsESDLConfig",
+    "src/ESPUtil",
     "hpcc/DynamicESDLDefinitionDetailsWidget",
-    "hpcc/Utility"
+    "src/Utility"
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil,
                 GridDetailsWidget, WsESDLConfig, ESPUtil, DynamicESDLDefinitionDetailsWidget, Utility) {

esp/src/eclwatch/DynamicESDLDetailsWidget.js

@@ -46,14 +46,14 @@ define([
     'dgrid/editor',
 
     "hpcc/_TabContainerWidget",
-    "hpcc/ESPWorkunit",
-    "hpcc/ESPRequest",
-    "hpcc/ESPUtil",
+    "src/ESPWorkunit",
+    "src/ESPRequest",
+    "src/ESPUtil",
     "hpcc/TargetSelectWidget",
     "hpcc/ECLSourceWidget",
-    "hpcc/WsTopology",
+    "src/WsTopology",
     "hpcc/GridDetailsWidget",
-    "hpcc/WsESDLConfig",
+    "src/WsESDLConfig",
     "hpcc/DynamicESDLMethodWidget",
 
     "dojo/text!../templates/DynamicESDLDetailsWidget.html",

esp/src/eclwatch/DynamicESDLMethodWidget.js

@@ -28,9 +28,9 @@ define([
     "dijit/ToolbarSeparator",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ESPQuery",
-    "hpcc/ESPUtil",
-    "hpcc/WsESDLConfig",
+    "src/ESPQuery",
+    "src/ESPUtil",
+    "src/WsESDLConfig",
 
     "dgrid/selector",
     "dgrid/editor",

esp/src/eclwatch/DynamicESDLQueryWidget.js

@@ -29,10 +29,10 @@ define([
     "dgrid/extensions/ColumnHider",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/WsTopology",
-    "hpcc/WsESDLConfig",
+    "src/WsTopology",
+    "src/WsESDLConfig",
     "hpcc/DelayLoadWidget",
-    "hpcc/ESPUtil",
+    "src/ESPUtil",
     "hpcc/DynamicESDLDetailsWidget",
     "hpcc/DynamicESDLDefinitionQueryWidget",
     "hpcc/TargetSelectWidget"

esp/src/eclwatch/ECLPlaygroundResultsWidget.js

@@ -21,8 +21,8 @@ define([
     "dijit/registry",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/ESPWorkunit",
-    "hpcc/ESPQuery",
+    "src/ESPWorkunit",
+    "src/ESPQuery",
     "hpcc/ResultWidget",
     "hpcc/FullResultWidget",
     "hpcc/LFDetailsWidget",

esp/src/eclwatch/ECLPlaygroundWidget.js

@@ -33,9 +33,9 @@ define([
     "hpcc/GraphWidget",
     "hpcc/JSGraphWidget",
     "hpcc/ECLPlaygroundResultsWidget",
-    "hpcc/ESPWorkunit",
-    "hpcc/ESPQuery",
-    "hpcc/Utility",
+    "src/ESPWorkunit",
+    "src/ESPQuery",
+    "src/Utility",
     
     "dojo/text!../templates/ECLPlaygroundWidget.html",
 

esp/src/eclwatch/ECLSourceWidget.js

@@ -29,7 +29,7 @@ define([
     "src/CodeMirror",
 
     "hpcc/_Widget",
-    "hpcc/ESPWorkunit",
+    "src/ESPWorkunit",
 
     "dojo/text!../templates/ECLSourceWidget.html",
 

esp/src/eclwatch/EventScheduleWorkunitWidget.js

@@ -32,8 +32,8 @@ define([
     "hpcc/_TabContainerWidget",
     "hpcc/TargetSelectWidget",
     "hpcc/WUDetailsWidget",
-    "hpcc/WsWorkunits",
-    "hpcc/ESPUtil",
+    "src/WsWorkunits",
+    "src/ESPUtil",
     "hpcc/FilterDropDownWidget",
 
     "dojo/text!../templates/EventScheduleWorkunitWidget.html",

esp/src/eclwatch/FileBelongsToWidget.js

@@ -22,8 +22,8 @@ define([
 
     "hpcc/DelayLoadWidget",
     "hpcc/GridDetailsWidget",
-    "hpcc/ESPLogicalFile",
-    "hpcc/ESPUtil",
+    "src/ESPLogicalFile",
+    "src/ESPUtil",
     "hpcc/SFDetailsWidget"
 
 ], function (declare, i18n, nlsHPCC,

esp/src/eclwatch/FileHistoryWidget.js

@@ -26,8 +26,8 @@ define([
     "dijit/ToolbarSeparator",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/WsDfu",
-    "hpcc/ESPUtil"
+    "src/WsDfu",
+    "src/ESPUtil"
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil,
                 registry, Button, ToolbarSeparator,
                 GridDetailsWidget, WsDfu, ESPUtil) {
@@ -58,9 +58,7 @@ define([
                 onClick: function () { context._onErase(); }
             }).placeAt(this.openButton, "after");
 
-            var tmpSplitter = new ToolbarSeparator().placeAt(this.eraseHistory.domNode, "before");
-
-            dojo.destroy(this.openButton);
+            dojo.destroy(this.id + "Open");
 
             var retVal = new declare([ESPUtil.Grid(true, true)])({
                 store: this.store,

esp/src/eclwatch/FilterDropDownWidget.js

@@ -29,7 +29,7 @@ define([
     "dijit/form/CheckBox",
 
     "hpcc/_Widget",
-    "hpcc/Utility",
+    "src/Utility",
 
     "dojo/text!../templates/FilterDropDownWidget.html",
 

esp/src/eclwatch/FullResultWidget.js

@@ -31,10 +31,10 @@ define([
     "dgrid/extensions/DijitRegistry",
 
     "hpcc/_Widget",
-    "hpcc/ESPBase",
-    "hpcc/ESPWorkunit",
-    "hpcc/ESPLogicalFile",
-    "hpcc/ESPUtil",
+    "src/ESPBase",
+    "src/ESPWorkunit",
+    "src/ESPLogicalFile",
+    "src/ESPUtil",
 
     "dojo/text!../templates/FullResultWidget.html",
 
@@ -87,7 +87,7 @@ define([
 
         _doDownload: function (type) {
             //TODO Fix
-            var base = new ESPBase();
+            var base = new ESPBase.default();
             if (lang.exists("result.Sequence", this)) {
                 var sequence = this.result.Sequence;
                 var downloadPdfIframeName = "downloadIframe_" + sequence;

esp/src/eclwatch/GetDFUWorkunitsWidget.js

@@ -36,13 +36,13 @@ define([
     "dgrid/selector",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/ESPUtil",
-    "hpcc/ESPDFUWorkunit",
-    "hpcc/FileSpray",
+    "src/ESPUtil",
+    "src/ESPDFUWorkunit",
+    "src/FileSpray",
     "hpcc/DelayLoadWidget",
     "hpcc/TargetSelectWidget",
     "hpcc/FilterDropDownWidget",
-    "hpcc/Utility",
+    "src/Utility",
 
     "dojo/text!../templates/GetDFUWorkunitsWidget.html",
 

esp/src/eclwatch/GetNumberOfFilesToCopyWidget.js

@@ -22,8 +22,8 @@ define([
 
     "hpcc/GridDetailsWidget",
 
-    "hpcc/ESPUtil",
-    "hpcc/WsWorkunits"
+    "src/ESPUtil",
+    "src/WsWorkunits"
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil,
                 GridDetailsWidget, ESPUtil, WsWorkunits) {

esp/src/eclwatch/GraphPageWidget.js

@@ -33,11 +33,11 @@ define([
     "hpcc/_Widget",
     "hpcc/GraphWidget",
     "hpcc/JSGraphWidget",
-    "hpcc/ESPUtil",
-    "hpcc/ESPWorkunit",
+    "src/ESPUtil",
+    "src/ESPWorkunit",
     "hpcc/TimingTreeMapWidget",
-    "hpcc/WsWorkunits",
-    "hpcc/Utility",
+    "src/WsWorkunits",
+    "src/Utility",
 
     "dojo/text!../templates/GraphPageWidget.html",
 

esp/src/eclwatch/GraphTreeWidget.js

@@ -41,11 +41,11 @@ define([
     "hpcc/_Widget",
     "hpcc/GraphWidget",
     "hpcc/JSGraphWidget",
-    "hpcc/ESPUtil",
-    "hpcc/ESPWorkunit",
+    "src/ESPUtil",
+    "src/ESPWorkunit",
     "hpcc/TimingTreeMapWidget",
-    "hpcc/WsWorkunits",
-    "hpcc/Utility",
+    "src/WsWorkunits",
+    "src/Utility",
 
     "dojo/text!../templates/GraphTreeWidget.html",
 

esp/src/eclwatch/GraphWidget.js

@@ -37,8 +37,8 @@ define([
     "dojox/xml/parser",
 
     "hpcc/_Widget",
-    "hpcc/ESPUtil",
-    "hpcc/Utility",
+    "src/ESPUtil",
+    "src/Utility",
 
     "dojo/text!../templates/GraphWidget.html",
 

esp/src/eclwatch/GraphsWidget.js

@@ -27,13 +27,13 @@ define([
     "dgrid/selector",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ESPWorkunit",
-    "hpcc/ESPQuery",
-    "hpcc/ESPLogicalFile",
+    "src/ESPWorkunit",
+    "src/ESPQuery",
+    "src/ESPLogicalFile",
     "hpcc/DelayLoadWidget",
     "hpcc/TimingTreeMapWidget",
-    "hpcc/ESPUtil",
-    "hpcc/Utility",
+    "src/ESPUtil",
+    "src/Utility",
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, on, has,
                 Button,

esp/src/eclwatch/GridDetailsWidget.js

@@ -28,7 +28,7 @@ define([
     "dijit/PopupMenuItem",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/Utility",
+    "src/Utility",
 
     "dojo/text!../templates/GridDetailsWidget.html",
 

esp/src/eclwatch/GroupDetailsWidget.js

@@ -31,7 +31,7 @@ define([
     "dgrid/extensions/DijitRegistry",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/ws_access",
+    "src/ws_access",
     "hpcc/DelayLoadWidget",
 
     "dojo/text!../templates/GroupDetailsWidget.html",

esp/src/eclwatch/HPCCPlatformFilesWidget.js

@@ -20,7 +20,7 @@ define([
     "dojo/i18n!./nls/hpcc",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/ESPRequest",
+    "src/ESPRequest",
 
     "dojo/text!../templates/HPCCPlatformFilesWidget.html",
 

esp/src/eclwatch/HPCCPlatformOpsWidget.js

@@ -22,7 +22,7 @@ define([
     "dijit/registry",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/ESPRequest",
+    "src/ESPRequest",
 
     "dojo/text!../templates/HPCCPlatformOpsWidget.html",
 

esp/src/eclwatch/HPCCPlatformServicesPluginWidget.js

@@ -22,7 +22,7 @@ define([
 
     "hpcc/_TabContainerWidget",
     "hpcc/DelayLoadWidget",
-    "hpcc/WsTopology",
+    "src/WsTopology",
 
     "dojo/text!../templates/HPCCPlatformServicesPluginWidget.html",
 

esp/src/eclwatch/HPCCPlatformWidget.js

@@ -39,16 +39,16 @@ define([
     "src/CodeMirror",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/ESPRequest",
-    "hpcc/ESPActivity",
-    "hpcc/ESPUtil",
-    "hpcc/ws_account",
-    "hpcc/ws_access",
-    "hpcc/WsSMC",
-    "hpcc/WsTopology",
+    "src/ESPRequest",
+    "src/ESPActivity",
+    "src/ESPUtil",
+    "src/ws_account",
+    "src/ws_access",
+    "src/WsSMC",
+    "src/WsTopology",
     "hpcc/GraphWidget",
     "hpcc/DelayLoadWidget",
-    "hpcc/ws_machine",
+    "src/ws_machine",
     "hpcc/LockDialogWidget",
 
     "dojo/text!../templates/HPCCPlatformWidget.html",

esp/src/eclwatch/HelpersWidget.js

@@ -31,9 +31,9 @@ define([
     "dgrid/selector",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ESPUtil",
-    "hpcc/ESPRequest",
-    "hpcc/ESPWorkunit",
+    "src/ESPUtil",
+    "src/ESPRequest",
+    "src/ESPWorkunit",
     "hpcc/DelayLoadWidget"
 
 ],  function (declare, lang, i18n, nlsHPCC, arrayUtil, Memory, Observable, domConstruct, on,

esp/src/eclwatch/HexViewWidget.js

@@ -26,7 +26,7 @@ define([
     "dijit/registry",
 
     "hpcc/_Widget",
-    "hpcc/ESPWorkunit",
+    "src/ESPWorkunit",
     "hpcc/ECLSourceWidget",
 
     "dojo/text!../templates/HexViewWidget.html",

esp/src/eclwatch/InfoGridWidget.js

@@ -34,8 +34,8 @@ define([
     "dojox/html/entities",
 
     "hpcc/_Widget",
-    "hpcc/ESPUtil",
-    "hpcc/ESPWorkunit",
+    "src/ESPUtil",
+    "src/ESPWorkunit",
 
     "dojo/text!../templates/InfoGridWidget.html",
 

esp/src/eclwatch/JSGraphWidget.js

@@ -25,9 +25,9 @@ define([
     "@hpcc-js/graph",
     "@hpcc-js/layout",
     
-    "hpcc/WsWorkunits",
+    "src/WsWorkunits",
     "hpcc/GraphWidget",
-    "hpcc/ESPGraph",
+    "src/ESPGraph",
 
     "css!font-awesome/css/font-awesome.css"
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, Evented,
@@ -124,10 +124,10 @@ define([
         KeyState_Menu: 4,
 
         constructor: function (domNode) {
-            this.graphData = new ESPGraph();
+            this.graphData = new ESPGraph.Graph();
             this.graphWidget = new hpccGraph.Graph()
                 .allowDragging(false)
-                .zoomToolbar(false)
+                .zoomToolbar(true)
             ;
             var context = this;
             this.graphWidget.vertex_click = function (item, event) {
@@ -525,7 +525,7 @@ define([
     return declare("JSGraphWidget", [GraphWidget], {
         baseClass: "JSGraphWidget",
         constructor: function () {
-            this.graphData = new ESPGraph();
+            this.graphData = new ESPGraph.Graph();
         },
 
         hasOptions: function(key, val) {

esp/src/eclwatch/LFDetailsWidget.js

@@ -43,10 +43,10 @@ define([
     "hpcc/DelayLoadWidget",
     "hpcc/TargetSelectWidget",
     "hpcc/TargetComboBoxWidget",
-    "hpcc/ESPLogicalFile",
-    "hpcc/ESPDFUWorkunit",
+    "src/ESPLogicalFile",
+    "src/ESPDFUWorkunit",
     "hpcc/FileBelongsToWidget",
-    "hpcc/FileSpray",
+    "src/FileSpray",
     "hpcc/FileHistoryWidget",
 
     "dojo/text!../templates/LFDetailsWidget.html",
@@ -409,7 +409,9 @@ define([
                 this.queriesWidget.set("iconClass", "dijitInline dijitIcon dijitTabButtonIcon iconFind");
             } else if (name === "DFUFilePartsOnClusters") {
                 // Currently only checking first cluster may add loop through clusters and add a tab at a later date
-                this.updateInput("DFUFilePartsOnClusters", oldValue, newValue.DFUFilePartsOnCluster[0].Replicate);
+                if (lang.exists("DFUFilePartsOnCluster", newValue) && newValue.DFUFilePartsOnCluster.length) {
+                    this.updateInput("DFUFilePartsOnClusters", oldValue, newValue.DFUFilePartsOnCluster[0].Replicate);
+                }
             } else if (name === "RecordSize" && newValue === "0") {
                 this.updateInput("RecordSize", oldValue, this.i18n.NoPublishedSize);
             }

esp/src/eclwatch/LZBrowseWidget.js

@@ -38,16 +38,16 @@ define([
     "dgrid/selector",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/FileSpray",
-    "hpcc/ESPUtil",
-    "hpcc/ESPRequest",
-    "hpcc/ESPDFUWorkunit",
+    "src/FileSpray",
+    "src/ESPUtil",
+    "src/ESPRequest",
+    "src/ESPDFUWorkunit",
     "hpcc/DelayLoadWidget",
     "hpcc/TargetSelectWidget",
     "hpcc/TargetComboBoxWidget",
     "hpcc/SelectionGridWidget",
     "hpcc/FilterDropDownWidget",
-    "hpcc/Utility",
+    "src/Utility",
 
     "dojo/text!../templates/LZBrowseWidget.html",
 

esp/src/eclwatch/LibrariesUsedWidget.js

@@ -21,8 +21,8 @@ define([
     "dojo/_base/array",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ESPQuery",
-    "hpcc/ESPUtil"
+    "src/ESPQuery",
+    "src/ESPUtil"
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil,
                 GridDetailsWidget, ESPQuery, ESPUtil) {
     return declare("LibrariesUsedWidget", [GridDetailsWidget], {

esp/src/eclwatch/LockDialogWidget.js

@@ -31,8 +31,8 @@ define([
     "dijit/form/CheckBox",
 
     "hpcc/_Widget",
-    "hpcc/Utility",
-    "hpcc/ws_account",
+    "src/Utility",
+    "src/ws_account",
 
     "dojo/text!../templates/LockDialogWidget.html",
 

esp/src/eclwatch/LogWidget.js

@@ -35,14 +35,14 @@ define([
     "dgrid/selector",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/ESPBase",
-    "hpcc/ESPUtil",
-    "hpcc/ESPWorkunit",
+    "src/ESPBase",
+    "src/ESPUtil",
+    "src/ESPWorkunit",
     "hpcc/DelayLoadWidget",
     "hpcc/TargetSelectWidget",
     "hpcc/FilterDropDownWidget",
     "hpcc/ECLSourceWidget",
-    "hpcc/WsTopology",
+    "src/WsTopology",
 
     "dojo/text!../templates/LogWidget.html",
 
@@ -111,7 +111,7 @@ define([
         },
 
         _doDownload: function (zip) {
-            var base = new ESPBase();
+            var base = new ESPBase.default();
             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/MemberOfWidget.js

@@ -29,9 +29,9 @@ define([
     "dgrid/selector",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ws_access",
-    "hpcc/ws_account",
-    "hpcc/ESPUtil",
+    "src/ws_access",
+    "src/ws_account",
+    "src/ESPUtil",
     "hpcc/TargetSelectWidget"
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, all,

esp/src/eclwatch/MembersWidget.js

@@ -29,8 +29,8 @@ define([
     "dgrid/selector",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ws_access",
-    "hpcc/ESPUtil",
+    "src/ws_access",
+    "src/ESPUtil",
     "hpcc/TargetSelectWidget"
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, all,

esp/src/eclwatch/MonitoringWidget.js

@@ -31,11 +31,11 @@ define([
     "dgrid/extensions/ColumnHider",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ws_machine",
-    "hpcc/ESPWorkunit",
+    "src/ws_machine",
+    "src/ESPWorkunit",
     "hpcc/DelayLoadWidget",
-    "hpcc/ESPUtil",
-    "hpcc/Utility"
+    "src/ESPUtil",
+    "src/Utility"
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, on, domClass, topic,
                 registry, ToggleButton, ToolbarSeparator,

esp/src/eclwatch/PackageMapDetailsWidget.js

@@ -28,7 +28,7 @@ define([
     "hpcc/DelayLoadWidget",
     "hpcc/PackageSourceWidget",
     "hpcc/PackageMapPartsWidget",
-    "hpcc/WsPackageMaps",
+    "src/WsPackageMaps",
 
     "dojo/text!../templates/PackageMapDetailsWidget.html",
 

esp/src/eclwatch/PackageMapPartsWidget.js

@@ -39,11 +39,11 @@ define([
     "dgrid/selector",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/WsDFUXref",
+    "src/WsDFUXref",
     "hpcc/DelayLoadWidget",
-    "hpcc/ESPUtil",
-    "hpcc/WsPackageMaps",
-    "hpcc/Utility",
+    "src/ESPUtil",
+    "src/WsPackageMaps",
+    "src/Utility",
     "hpcc/FilterDropDownWidget",
     "hpcc/TargetSelectWidget",
     "hpcc/ECLSourceWidget"

esp/src/eclwatch/PackageMapQueryWidget.js

@@ -41,8 +41,8 @@ define([
     "hpcc/DelayLoadWidget",
     "hpcc/PackageMapDetailsWidget",
     "hpcc/PackageMapValidateWidget",
-    "hpcc/WsPackageMaps",
-    "hpcc/ESPPackageProcess",
+    "src/WsPackageMaps",
+    "src/ESPPackageProcess",
     "hpcc/SFDetailsWidget",
 
     "dojo/text!../templates/PackageMapQueryWidget.html",

esp/src/eclwatch/PackageMapValidateContentWidget.js

@@ -26,7 +26,7 @@ define([
     "hpcc/_TabContainerWidget",
     "hpcc/DelayLoadWidget",
     "hpcc/ECLSourceWidget",
-    "hpcc/WsPackageMaps",
+    "src/WsPackageMaps",
 
     "dojo/text!../templates/PackageMapValidateContentWidget.html",
 

esp/src/eclwatch/PackageMapValidateWidget.js

@@ -26,7 +26,7 @@ define([
     "hpcc/_TabContainerWidget",
     "hpcc/DelayLoadWidget",
     "hpcc/ECLSourceWidget",
-    "hpcc/WsPackageMaps",
+    "src/WsPackageMaps",
 
     "dojo/text!../templates/PackageMapValidateWidget.html",
 

esp/src/eclwatch/PackageSourceWidget.js

@@ -30,7 +30,7 @@ define([
 
     "src/CodeMirror",
 
-    "hpcc/WsPackageMaps",
+    "src/WsPackageMaps",
 
     "dojo/text!../templates/PackageSourceWidget.html"
 ],

esp/src/eclwatch/PermissionsWidget.js

@@ -26,8 +26,8 @@ define([
     "dgrid/editor",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ws_access",
-    "hpcc/ESPUtil"
+    "src/ws_access",
+    "src/ESPUtil"
 
 ], function (declare, lang, i18n, nlsHPCC,
                 registry, CheckBox,

esp/src/eclwatch/PreflightDetailsWidget.js

@@ -27,7 +27,7 @@ define([
     "dijit/form/TextBox",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ESPUtil",
+    "src/ESPUtil",
 
     "dgrid/selector"
 

esp/src/eclwatch/QuerySetDetailsWidget.js

@@ -32,10 +32,10 @@ define([
     "dgrid/extensions/ColumnResizer",
     "dgrid/extensions/DijitRegistry",
 
-    "hpcc/ESPQuery",
+    "src/ESPQuery",
     "hpcc/_TabContainerWidget",
     "hpcc/DelayLoadWidget",
-    "hpcc/Utility",
+    "src/Utility",
 
     "dojo/text!../templates/QuerySetDetailsWidget.html",
 

esp/src/eclwatch/QuerySetErrorsWidget.js

@@ -24,8 +24,8 @@ define([
     "dgrid/selector",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ESPQuery",
-    "hpcc/ESPUtil"
+    "src/ESPQuery",
+    "src/ESPUtil"
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, on,
                 selector,
                 GridDetailsWidget, ESPQuery, ESPUtil) {

esp/src/eclwatch/QuerySetLogicalFilesWidget.js

@@ -25,8 +25,8 @@ define([
 
     "hpcc/GridDetailsWidget",
     "hpcc/DelayLoadWidget",
-    "hpcc/ESPQuery",
-    "hpcc/ESPUtil"
+    "src/ESPQuery",
+    "src/ESPUtil"
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, on,
                 selector,
                 GridDetailsWidget, DelayLoadWidget, ESPQuery, ESPUtil) {

esp/src/eclwatch/QuerySetQueryWidget.js

@@ -32,10 +32,10 @@ define([
 
     "hpcc/_TabContainerWidget",
     "hpcc/DelayLoadWidget",
-    "hpcc/WsWorkunits",
-    "hpcc/ESPQuery",
-    "hpcc/ESPUtil",
-    "hpcc/Utility",
+    "src/WsWorkunits",
+    "src/ESPQuery",
+    "src/ESPUtil",
+    "src/Utility",
 
     "dojo/text!../templates/QuerySetQueryWidget.html",
 

esp/src/eclwatch/QuerySetSuperFilesWidget.js

@@ -27,8 +27,8 @@ define([
 
     "hpcc/GridDetailsWidget",
     "hpcc/DelayLoadWidget",
-    "hpcc/ESPUtil",
-    "hpcc/ESPQuery",
+    "src/ESPUtil",
+    "src/ESPQuery",
     "hpcc/SFDetailsWidget"
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, on, QueryResults,
                 tree, selector,

esp/src/eclwatch/QueryTestWidget.js

@@ -23,8 +23,8 @@ define([
     "dijit/registry",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/WsTopology",
-    "hpcc/ESPQuery",
+    "src/WsTopology",
+    "src/ESPQuery",
 
     "dijit/layout/BorderContainer",
     "dijit/layout/TabContainer",

esp/src/eclwatch/ResourcesWidget.js

@@ -28,11 +28,11 @@ define([
     "dgrid/selector",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ESPRequest",
-    "hpcc/ESPWorkunit",
+    "src/ESPRequest",
+    "src/ESPWorkunit",
     "hpcc/DelayLoadWidget",
-    "hpcc/WsTopology",
-    "hpcc/ESPUtil"
+    "src/WsTopology",
+    "src/ESPUtil"
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, on,
                 registry, ContentPane, Button,

esp/src/eclwatch/ResultWidget.js

@@ -36,9 +36,9 @@ define([
     "dgrid/extensions/Pagination",
 
     "hpcc/_Widget",
-    "hpcc/ESPBase",
-    "hpcc/ESPWorkunit",
-    "hpcc/ESPLogicalFile",
+    "src/ESPBase",
+    "src/ESPWorkunit",
+    "src/ESPLogicalFile",
     "hpcc/FilterDropDownWidget",
     "hpcc/TableContainer",
 
@@ -97,7 +97,7 @@ define([
         },
 
         _doDownload: function (type) {
-            var base = new ESPBase();
+            var base = new ESPBase.default();
             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/ResultsWidget.js

@@ -27,10 +27,10 @@ define([
     "dgrid/selector",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ESPRequest",
-    "hpcc/ESPWorkunit",
+    "src/ESPRequest",
+    "src/ESPWorkunit",
     "hpcc/DelayLoadWidget",
-    "hpcc/ESPUtil"
+    "src/ESPUtil"
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, on,
                 ContentPane, Button,

esp/src/eclwatch/SFDetailsWidget.js

@@ -46,10 +46,10 @@ define([
     "dgrid/selector",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/ESPUtil",
-    "hpcc/ESPLogicalFile",
+    "src/ESPUtil",
+    "src/ESPLogicalFile",
     "hpcc/DelayLoadWidget",
-    "hpcc/Utility",
+    "src/Utility",
 
     "dojo/text!../templates/SFDetailsWidget.html",
 

esp/src/eclwatch/SearchResultsWidget.js

@@ -32,16 +32,16 @@ define([
     "dgrid/selector",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/WsWorkunits",
-    "hpcc/ESPWorkunit",
-    "hpcc/ESPDFUWorkunit",
-    "hpcc/ESPLogicalFile",
-    "hpcc/ESPQuery",
-    "hpcc/FileSpray",
-    "hpcc/WsDfu",
+    "src/WsWorkunits",
+    "src/ESPWorkunit",
+    "src/ESPDFUWorkunit",
+    "src/ESPLogicalFile",
+    "src/ESPQuery",
+    "src/FileSpray",
+    "src/WsDfu",
     "hpcc/DelayLoadWidget",
-    "hpcc/ESPUtil",
-    "hpcc/Utility"
+    "src/ESPUtil",
+    "src/Utility"
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, Memory, Observable, on, all,
                 Button,

esp/src/eclwatch/ShowAccountPermissionsWidget.js

@@ -26,8 +26,8 @@ define([
     "dgrid/editor",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ws_access",
-    "hpcc/ESPUtil",
+    "src/ws_access",
+    "src/ESPUtil",
     "hpcc/ShowInheritedPermissionsWidget"
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil,

esp/src/eclwatch/ShowIndividualPermissionsWidget.js

@@ -25,8 +25,8 @@ define([
     "dgrid/editor",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ws_access",
-    "hpcc/ESPUtil"
+    "src/ws_access",
+    "src/ESPUtil"
 
 ], function (declare, lang, i18n, nlsHPCC,
                 registry, CheckBox,

esp/src/eclwatch/ShowInheritedPermissionsWidget.js

@@ -28,8 +28,8 @@ define([
     "dgrid/editor",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ws_access",
-    "hpcc/ESPUtil",
+    "src/ws_access",
+    "src/ESPUtil",
 
     "dijit/layout/BorderContainer",
     "dijit/layout/TabContainer",

esp/src/eclwatch/ShowPermissionsWidget.js

@@ -26,8 +26,8 @@ define([
     "dgrid/editor",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ws_access",
-    "hpcc/ESPUtil"
+    "src/ws_access",
+    "src/ESPUtil"
 ], function (declare, lang, i18n, nlsHPCC,
                 registry, CheckBox, ContentPane,
                 editor,

esp/src/eclwatch/SourceFilesWidget.js

@@ -25,10 +25,10 @@ define([
     "dgrid/selector",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ESPWorkunit",
+    "src/ESPWorkunit",
     "hpcc/DelayLoadWidget",
-    "hpcc/ESPUtil",
-    "hpcc/Utility",
+    "src/ESPUtil",
+    "src/Utility",
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, on,
                 tree, selector,

esp/src/eclwatch/TargetSelectClass.js

@@ -28,13 +28,13 @@ define([
 
     "dijit/registry",
 
-    "hpcc/WsTopology",
-    "hpcc/WsWorkunits",
-    "hpcc/FileSpray",
-    "hpcc/ws_access",
-    "hpcc/WsESDLConfig",
-    "hpcc/WsPackageMaps",
-    "hpcc/Utility"
+    "src/WsTopology",
+    "src/WsWorkunits",
+    "src/FileSpray",
+    "src/ws_access",
+    "src/WsESDLConfig",
+    "src/WsPackageMaps",
+    "src/Utility"
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, xhr, Deferred, ItemFileReadStore, all, Memory, on,
     registry,

esp/src/eclwatch/TimingGridWidget.js

@@ -27,8 +27,8 @@ define([
     "dgrid/selector",
 
     "hpcc/_Widget",
-    "hpcc/ESPUtil",
-    "hpcc/ESPWorkunit",
+    "src/ESPUtil",
+    "src/ESPWorkunit",
 
     "dojo/text!../templates/TimingGridWidget.html"
 ],

esp/src/eclwatch/TimingPageWidget.js

@@ -27,10 +27,10 @@ define([
     "dgrid/selector",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ESPWorkunit",
+    "src/ESPWorkunit",
     "hpcc/DelayLoadWidget",
     "hpcc/TimingTreeMapWidget",
-    "hpcc/ESPUtil"
+    "src/ESPUtil"
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, on,
             registry, BorderContainer,

esp/src/eclwatch/TimingTreeMapWidget.js

@@ -30,7 +30,7 @@ define([
     "dojox/treemap/TreeMap",
 
     "hpcc/_Widget",
-    "hpcc/ESPWorkunit",
+    "src/ESPWorkunit",
 
     "dojo/text!../templates/TimingTreeMapWidget.html"
 ],

esp/src/eclwatch/TopologyDetailsWidget.js

@@ -38,12 +38,12 @@ define([
     "dgrid/extensions/DijitRegistry",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/ESPWorkunit",
-    "hpcc/ESPRequest",
+    "src/ESPWorkunit",
+    "src/ESPRequest",
     "hpcc/TargetSelectWidget",
     "hpcc/ECLSourceWidget",
     "hpcc/LogWidget",
-    "hpcc/WsTopology",
+    "src/WsTopology",
     "hpcc/GetNumberOfFilesToCopyWidget",
 
     "dojo/text!../templates/TopologyDetailsWidget.html",

esp/src/eclwatch/TopologyWidget.js

@@ -37,14 +37,14 @@ define([
     "hpcc/GridDetailsWidget",
     "hpcc/PreflightDetailsWidget",
     "hpcc/RequestInformationWidget",
-    "hpcc/ESPRequest",
-    "hpcc/ESPTopology",
+    "src/ESPRequest",
+    "src/ESPTopology",
     "hpcc/TopologyDetailsWidget",
     "hpcc/DelayLoadWidget",
-    "hpcc/ESPUtil",
+    "src/ESPUtil",
     "hpcc/FilterDropDownWidget",
-    "hpcc/ws_machine",
-    "hpcc/Utility"
+    "src/ws_machine",
+    "src/Utility"
 
 ], function (declare, i18n, nlsHPCC, on, dom, domConstruct, lang,
                 CheckBox, TextBox, ValidationTextBox, registry, ToggleButton, Select, ToolbarSeparator, ContentPane,

esp/src/eclwatch/TpClusterInfoWidget.js

@@ -22,9 +22,9 @@ define([
     "dgrid/selector",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/WsTopology",
+    "src/WsTopology",
     "hpcc/DelayLoadWidget",
-    "hpcc/ESPUtil"
+    "src/ESPUtil"
 
 ], function (declare, lang, i18n, nlsHPCC,
                 selector,

esp/src/eclwatch/TpThorStatusWidget.js

@@ -24,10 +24,10 @@ define([
     "dijit/registry",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/ESPRequest",
-    "hpcc/ESPTopology",
+    "src/ESPRequest",
+    "src/ESPTopology",
     "hpcc/DelayLoadWidget",
-    "hpcc/WsTopology",
+    "src/WsTopology",
 
     "dojo/text!../templates/TpThorStatusWidget.html",
 

esp/src/eclwatch/UserDetailsWidget.js

@@ -32,7 +32,7 @@ define([
     "dgrid/extensions/DijitRegistry",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/ws_access",
+    "src/ws_access",
     "hpcc/DelayLoadWidget",
 
     "dojo/text!../templates/UserDetailsWidget.html",

esp/src/eclwatch/UserQueryWidget.js

@@ -34,11 +34,11 @@ define([
     "dgrid/selector",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/ws_access",
-    "hpcc/ws_account",
-    "hpcc/ESPBase",
-    "hpcc/ESPUtil",
-    "hpcc/ESPRequest",
+    "src/ws_access",
+    "src/ws_account",
+    "src/ESPBase",
+    "src/ESPUtil",
+    "src/ESPRequest",
     "hpcc/UserDetailsWidget",
     "hpcc/GroupDetailsWidget",
     "hpcc/FilterDropDownWidget",
@@ -266,7 +266,7 @@ define([
                 }
                 groupnames += "groupnames_i" + idx + "=" + item.name;
             }, this);
-            var base = new ESPBase();
+            var base = new ESPBase.default();
             window.open(base.getBaseURL("ws_access") + "/UserAccountExport?" + groupnames);
         },
 
@@ -346,7 +346,7 @@ define([
                 }
                 usernames += "usernames_i" + idx + "=" + item.username;
             }, this);
-            var base = new ESPBase();
+            var base = new ESPBase.default();
             window.open(base.getBaseURL("ws_access") + "/UserAccountExport?" + usernames);
         },
 

esp/src/eclwatch/VariablesWidget.js

@@ -21,9 +21,9 @@ define([
     "dojo/_base/array",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ESPWorkunit",
+    "src/ESPWorkunit",
     "hpcc/DelayLoadWidget",
-    "hpcc/ESPUtil"
+    "src/ESPUtil"
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil,
                 GridDetailsWidget, ESPWorkunit, DelayLoadWidget, ESPUtil) {

esp/src/eclwatch/VizWidget.js

@@ -36,10 +36,10 @@ define([
 
     "hpcc/TableContainer",
     "hpcc/_Widget",
-    "hpcc/ESPWorkunit",
-    "hpcc/WsWorkunits",
+    "src/ESPWorkunit",
+    "src/WsWorkunits",
     "hpcc/SelectionGridWidget",
-    "hpcc/Utility",
+    "src/Utility",
     
     "dojo/text!../templates/VizWidget.html",
 

esp/src/eclwatch/WUDetailsWidget.js

@@ -39,12 +39,12 @@ define([
     "src/Clippy",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/ESPWorkunit",
-    "hpcc/ESPRequest",
+    "src/ESPWorkunit",
+    "src/ESPRequest",
     "hpcc/TargetSelectWidget",
     "hpcc/DelayLoadWidget",
     "hpcc/InfoGridWidget",
-    "hpcc/WsWorkunits",
+    "src/WsWorkunits",
 
     "dojo/text!../templates/WUDetailsWidget.html",
 

esp/src/eclwatch/WUQueryWidget.js

@@ -35,13 +35,13 @@ define([
     "dgrid/selector",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/WsWorkunits",
-    "hpcc/ESPUtil",
-    "hpcc/ESPWorkunit",
+    "src/WsWorkunits",
+    "src/ESPUtil",
+    "src/ESPWorkunit",
     "hpcc/DelayLoadWidget",
     "hpcc/TargetSelectWidget",
     "hpcc/FilterDropDownWidget",
-    "hpcc/Utility",
+    "src/Utility",
 
     "dojo/text!../templates/WUQueryWidget.html",
 

esp/src/eclwatch/WUStatsWidget.js

@@ -31,7 +31,7 @@ define([
     "@hpcc-js/other",
     
     "hpcc/_Widget",
-    "hpcc/WsWorkunits",
+    "src/WsWorkunits",
 
     "dojo/text!../templates/WUStatsWidget.html",
 

esp/src/eclwatch/WorkflowsWidget.js

@@ -26,9 +26,9 @@ define([
     "dgrid/extensions/DijitRegistry",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/ESPWorkunit",
+    "src/ESPWorkunit",
     "hpcc/DelayLoadWidget",
-    "hpcc/ESPUtil"
+    "src/ESPUtil"
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil,
                 OnDemandGrid, Keyboard, ColumnResizer, DijitRegistry,

esp/src/eclwatch/XrefDetailsWidget.js

@@ -37,14 +37,14 @@ define([
     "dgrid/extensions/DijitRegistry",
 
     "hpcc/_TabContainerWidget",
-    "hpcc/ESPWorkunit",
-    "hpcc/ESPRequest",
+    "src/ESPWorkunit",
+    "src/ESPRequest",
     "hpcc/TargetSelectWidget",
     "hpcc/DelayLoadWidget",
     "hpcc/InfoGridWidget",
-    "hpcc/WsWorkunits",
+    "src/WsWorkunits",
     "hpcc/GridDetailsWidget",
-    "hpcc/WsDFUXref",
+    "src/WsDFUXref",
 
     "dojo/text!../templates/XrefDetailsWidget.html",
 

esp/src/eclwatch/XrefDirectoriesWidget.js

@@ -30,9 +30,9 @@ define([
     "dijit/form/Button",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/WsDFUXref",
+    "src/WsDFUXref",
     "hpcc/DelayLoadWidget",
-    "hpcc/ESPUtil",
+    "src/ESPUtil",
     "hpcc/XrefDetailsWidget"
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, on, dom, domConstruct, domClass,

esp/src/eclwatch/XrefErrorsWarningsWidget.js

@@ -30,9 +30,9 @@ define([
     "dijit/form/Button",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/WsDFUXref",
+    "src/WsDFUXref",
     "hpcc/DelayLoadWidget",
-    "hpcc/ESPUtil"
+    "src/ESPUtil"
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, on, dom, domConstruct, domClass,
                 registry, ToggleButton, ToolbarSeparator, Button,

esp/src/eclwatch/XrefFoundFilesWidget.js

@@ -32,9 +32,9 @@ define([
     "dgrid/selector",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/WsDFUXref",
+    "src/WsDFUXref",
     "hpcc/DelayLoadWidget",
-    "hpcc/ESPUtil"
+    "src/ESPUtil"
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, on, dom, domConstruct, domClass,
                 registry, ToggleButton, ToolbarSeparator, Button,

esp/src/eclwatch/XrefLostFilesWidget.js

@@ -32,10 +32,10 @@ define([
     "dgrid/selector",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/WsDFUXref",
-    "hpcc/ESPWorkunit",
+    "src/WsDFUXref",
+    "src/ESPWorkunit",
     "hpcc/DelayLoadWidget",
-    "hpcc/ESPUtil",
+    "src/ESPUtil",
     "hpcc/XrefDetailsWidget"
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, on, dom, domConstruct, domClass,

esp/src/eclwatch/XrefOrphanFilesWidget.js

@@ -32,9 +32,9 @@ define([
     "dgrid/selector",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/WsDFUXref",
+    "src/WsDFUXref",
     "hpcc/DelayLoadWidget",
-    "hpcc/ESPUtil",
+    "src/ESPUtil",
     "hpcc/FilterDropDownWidget",
     "hpcc/XrefDetailsWidget"
 

esp/src/eclwatch/XrefQueryWidget.js

@@ -32,9 +32,9 @@ define([
     "dgrid/selector",
 
     "hpcc/GridDetailsWidget",
-    "hpcc/WsDFUXref",
+    "src/WsDFUXref",
     "hpcc/DelayLoadWidget",
-    "hpcc/ESPUtil"
+    "src/ESPUtil"
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, on, dom, domConstruct, domClass,
                 registry, ToggleButton, ToolbarSeparator, Button,
                 selector,

esp/src/eclwatch/debugConfig.js

@@ -0,0 +1,8 @@
+const DEBUG_HPCC_JS = false;
+if (DEBUG_HPCC_JS) {
+    for (const key in dojoConfig.paths) {
+        if (key.indexOf("@hpcc-js/") === 0) {
+            dojoConfig.paths[key] = dojoConfig.paths[key].replace("/node_modules/@hpcc-js/", "/hpcc-js/packages/");
+        }
+    }
+}

esp/src/eclwatch/dojoConfig.js

@@ -22,18 +22,18 @@ function getConfig(env) {
             "ecl": baseUrl + "/eclwatch/ecl",
             "css": baseUrl + "/loader/css",
             "d3-selection": baseUrl + "/node_modules/d3-selection/build/d3-selection",
-            "@hpcc-js/api": baseUrl + "/node_modules/@hpcc-js/api/dist/api",
-            "@hpcc-js/chart": baseUrl + "/node_modules/@hpcc-js/chart/dist/chart",
-            "@hpcc-js/common": baseUrl + "/node_modules/@hpcc-js/common/dist/common",
-            "@hpcc-js/comms": baseUrl + "/node_modules/@hpcc-js/comms/dist/comms",
-            "@hpcc-js/composite": baseUrl + "/node_modules/@hpcc-js/composite/dist/composite",
-            "@hpcc-js/form": baseUrl + "/node_modules/@hpcc-js/form/dist/form",
-            "@hpcc-js/graph": baseUrl + "/node_modules/@hpcc-js/graph/dist/graph",
-            "@hpcc-js/layout": baseUrl + "/node_modules/@hpcc-js/layout/dist/layout",
-            "@hpcc-js/map": baseUrl + "/node_modules/@hpcc-js/map/dist/map",
-            "@hpcc-js/other": baseUrl + "/node_modules/@hpcc-js/other/dist/other",
-            "@hpcc-js/tree": baseUrl + "/node_modules/@hpcc-js/tree/dist/tree",
-            "@hpcc-js/util": baseUrl + "/node_modules/@hpcc-js/util/dist/util",
+            "@hpcc-js/api": baseUrl + "/node_modules/@hpcc-js/api/dist/index",
+            "@hpcc-js/chart": baseUrl + "/node_modules/@hpcc-js/chart/dist/index",
+            "@hpcc-js/common": baseUrl + "/node_modules/@hpcc-js/common/dist/index",
+            "@hpcc-js/comms": baseUrl + "/node_modules/@hpcc-js/comms/dist/index",
+            "@hpcc-js/composite": baseUrl + "/node_modules/@hpcc-js/composite/dist/index",
+            "@hpcc-js/form": baseUrl + "/node_modules/@hpcc-js/form/dist/index",
+            "@hpcc-js/graph": baseUrl + "/node_modules/@hpcc-js/graph/dist/index",
+            "@hpcc-js/layout": baseUrl + "/node_modules/@hpcc-js/layout/dist/index",
+            "@hpcc-js/map": baseUrl + "/node_modules/@hpcc-js/map/dist/index",
+            "@hpcc-js/other": baseUrl + "/node_modules/@hpcc-js/other/dist/index",
+            "@hpcc-js/tree": baseUrl + "/node_modules/@hpcc-js/tree/dist/index",
+            "@hpcc-js/util": baseUrl + "/node_modules/@hpcc-js/util/dist/index",
             "@hpcc-js/TopoJSON": dojoRoot ? "/esp/files/dist/TopoJSON" : baseUrl + "/node_modules/@hpcc-js/map/TopoJSON",
             "clipboard": baseUrl + "/node_modules/clipboard/dist/clipboard",
             "codemirror": baseUrl + "/node_modules/codemirror",

esp/src/eclwatch/stub.js

@@ -28,8 +28,8 @@ define([
     "dijit/Dialog",
     "dijit/form/Button",
 
-    "hpcc/ESPUtil",
-    "hpcc/Utility",
+    "src/ESPUtil",
+    "src/Utility",
     "hpcc/LockDialogWidget",
 
     "dojox/html/entities",

esp/src/eclwatch/viz/DojoD3.js

@@ -6,10 +6,10 @@
   "dojo/dom-geometry",
   "dojo/Evented",
 
-  "d3-selection"
+  "@hpcc-js/common"
 
 ], function (declare, lang, dom, domConstruct, domGeom, Evented,
-    d3Selection) {
+    hpccCommon) {
     return declare([Evented], {
         constructor: function () {
         },
@@ -40,7 +40,7 @@
             this._target = _target;
             this.calcGeom();
             this.injectStyleSheet();
-            this.Svg = d3Selection.select(this.target.domDivID).append("svg")
+            this.Svg = hpccCommon.select(this.target.domDivID).append("svg")
                 .attr("width", this.target.width)
                 .attr("height", this.target.height)
             ;

esp/src/lws.config.js

@@ -1,71 +1,32 @@
 const debugServerIP = "192.168.3.22";
+const debugHPCC_JS = false; //  Should never be TRUE in a PR  ---
+
+let rewrite = [
+    { from: "/esp/files/dist/*", to: "/build/dist/$1" },
+    { from: "/esp/files/*", to: "/$1" },
+    { from: "/FileSpray/*", to: "http://" + debugServerIP + ":8010/FileSpray/$1" },
+    { from: "/WsWorkunits/*", to: "http://" + debugServerIP + ":8010/WsWorkunits/$1" },
+    { from: "/main", to: "http://" + debugServerIP + ":8010/main" },
+    { from: "/WsECL/*", to: "http://" + debugServerIP + ":8002/WsECL/$1" },
+    { from: "/WsTopology/*", to: "http://" + debugServerIP + ":8010/WsTopology/$1" },
+    { from: "/WsSMC/*", to: "http://" + debugServerIP + ":8010/WsSMC/$1" },
+    { from: "/ws_machine/*", to: "http://" + debugServerIP + ":8010/ws_machine/$1" },
+    { from: "/ws_account/*", to: "http://" + debugServerIP + ":8010/ws_account/$1" },
+    { from: "/ws_access/*", to: "http://" + debugServerIP + ":8010/ws_access/$1" },
+    { from: "/WsESDLConfig/*", to: "http://" + debugServerIP + ":8010/WsESDLConfig/$1" },
+    { from: "/WsDfu/*", to: "http://" + debugServerIP + ":8010/WsDfu/$1" },
+    { from: "/WsDFUXRef/*", to: "http://" + debugServerIP + ":8010/WsDFUXRef/$1" },
+    { from: "/WsPackageProcess/*", to: "http://" + debugServerIP + ":8010/WsPackageProcess/$1" },
+    { from: "/*", to: "/$1" }
+];
+
+if (debugHPCC_JS) {
+    rewrite = [
+        { from: "/esp/files/node_modules/@hpcc-js/*", to: "/hpcc-js/packages/$1" }
+    ].concat(rewrite);
+}
+
 module.exports = {
     port: 8080,
-    rewrite: [
-        {
-            from: "/esp/files/dist/*",
-            to: "/build/dist/$1"
-        },
-        {
-            from: "/esp/files/*",
-            to: "/$1"
-        },
-        {
-            from: "/FileSpray/*",
-            to: "http://" + debugServerIP + ":8010/FileSpray/$1"
-        },
-        {
-            from: "/WsWorkunits/*",
-            to: "http://" + debugServerIP + ":8010/WsWorkunits/$1"
-        },
-        {
-            from: "/main",
-            to: "http://" + debugServerIP + ":8010/main"
-        },
-        {
-            from: "/WsECL/*",
-            to: "http://" + debugServerIP + ":8002/WsECL/$1"
-        },
-        {
-            from: "/WsTopology/*",
-            to: "http://" + debugServerIP + ":8010/WsTopology/$1"
-        },
-        {
-            from: "/WsSMC/*",
-            to: "http://" + debugServerIP + ":8010/WsSMC/$1"
-        },
-        {
-            from: "/ws_machine/*",
-            to: "http://" + debugServerIP + ":8010/ws_machine/$1"
-        },
-        {
-            from: "/ws_account/*",
-            to: "http://" + debugServerIP + ":8010/ws_account/$1"
-        },
-        {
-            from: "/ws_access/*",
-            to: "http://" + debugServerIP + ":8010/ws_access/$1"
-        },
-        {
-            from: "/WsESDLConfig/*",
-            to: "http://" + debugServerIP + ":8010/WsESDLConfig/$1"
-        },
-        {
-            from: "/WsDfu/*",
-            to: "http://" + debugServerIP + ":8010/WsDfu/$1"
-        },
-        {
-            from: "/WsDFUXRef/*",
-            to: "http://" + debugServerIP + ":8010/WsDFUXRef/$1"
-        },
-        {
-            from: "/WsPackageProcess/*",
-            to: "http://" + debugServerIP + ":8010/WsPackageProcess/$1"
-        },
-        {
-            from: "/*",
-            to: "/$1"
-        }        
-    ]
+    rewrite: rewrite
 }
-

esp/src/package.json

@@ -23,16 +23,17 @@
   "main": "src/stub.js",
   "dependencies": {},
   "devDependencies": {
-    "@hpcc-js/chart": "0.0.44",
-    "@hpcc-js/common": "0.0.41",
-    "@hpcc-js/comms": "0.0.42",
-    "@hpcc-js/composite": "0.0.44",
-    "@hpcc-js/form": "0.0.43",
-    "@hpcc-js/graph": "0.0.42",
-    "@hpcc-js/layout": "0.0.41",
-    "@hpcc-js/map": "0.0.45",
-    "@hpcc-js/other": "0.0.41",
-    "@hpcc-js/tree": "0.0.41",
+    "@types/dojo": "1.9.40",
+    "@hpcc-js/chart": "0.0.72",
+    "@hpcc-js/common": "0.0.70",
+    "@hpcc-js/comms": "0.0.75",
+    "@hpcc-js/composite": "0.0.76",
+    "@hpcc-js/form": "0.0.72",
+    "@hpcc-js/graph": "0.0.71",
+    "@hpcc-js/layout": "0.0.70",
+    "@hpcc-js/map": "0.0.75",
+    "@hpcc-js/other": "0.0.70",
+    "@hpcc-js/tree": "0.0.70",
     "clipboard": "1.7.1",
     "codemirror": "5.31.0",
     "cpx": "1.5.0",
@@ -52,7 +53,7 @@
     "rimraf": "2.6.2",
     "style-loader": "0.19.0",
     "tslib": "1.8.0",
-    "typescript": "2.5.3",
+    "typescript": "2.7.1",
     "url-loader": "0.6.2",
     "webpack": "3.8.1",
     "webpack-bundle-analyzer": "2.9.1"

esp/src/src/ESPActivity.ts

@@ -1,220 +1,195 @@
-/*##############################################################################
-#    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-############################################################################## */
-define([
-    "dojo/_base/declare",
-    "dojo/_base/array",
-    "dojo/_base/lang",
-    "dojo/store/Memory",
-    "dojo/store/Observable",
-
-    "hpcc/WsSMC",
-    "hpcc/ESPUtil",
-    "hpcc/ESPRequest",
-    "hpcc/ESPQueue",
-    "hpcc/ESPWorkunit",
-    "hpcc/ESPDFUWorkunit",
-    "hpcc/WsWorkunits"
-
-], function (declare, arrayUtil, lang, Memory, Observable,
-    WsSMC, ESPUtil, ESPRequest, ESPQueue, ESPWorkunit, ESPDFUWorkunit, WsWorkunits) {
-
-    var _workunits = {};
-
-    var Store = declare([Memory], {
-        idProperty: "__hpcc_id",
-        mayHaveChildren: function (item) {
-            return (item.getChildCount && item.getChildCount());
-        },
-        getChildren: function (parent, options) {
-            return parent.queryChildren();
-        }
-    });
+import * as declare from "dojo/_base/declare";
+import * as arrayUtil from "dojo/_base/array";
+import * as lang from "dojo/_base/lang";
+import * as Memory from "dojo/store/Memory";
+import * as Observable from "dojo/store/Observable";
+
+import * as WsSMC from "./WsSMC";
+import * as ESPUtil from "./ESPUtil";
+import * as ESPQueue from "./ESPQueue";
+import * as ESPWorkunit from "./ESPWorkunit";
+import * as ESPDFUWorkunit from "./ESPDFUWorkunit";
+import * as WsWorkunits from "./WsWorkunits";
+
+var Store = declare([Memory], {
+    idProperty: "__hpcc_id",
+    mayHaveChildren: function (item) {
+        return (item.getChildCount && item.getChildCount());
+    },
+    getChildren: function (parent, options) {
+        return parent.queryChildren();
+    }
+});
 
-    var Activity = declare([ESPUtil.Singleton, ESPUtil.Monitor], {
-        //  Asserts  ---
-        _assertHasWuid: function () {
-            if (!this.Wuid) {
-                throw new Error("Wuid cannot be empty.");
-            }
-        },
-        //  Attributes  ---
-        _StateIDSetter: function (StateID) {
-            this.StateID = StateID;
-            var actionEx = lang.exists("ActionEx", this) ? this.ActionEx : null;
-            this.set("hasCompleted", WsWorkunits.isComplete(this.StateID, actionEx));
-        },
-
-        //  ---  ---  ---
-        constructor: function (args) {
-            this._watched = [];
-            this.store = new Store();
-            this.observableStore = new Observable(this.store)
-        },
-
-        isInstanceOfQueue: function (obj) {
-            return ESPQueue.isInstanceOfQueue(obj);
-        },
-
-        isInstanceOfWorkunit: function (obj) {
-            return ESPWorkunit.isInstanceOfWorkunit(obj) || ESPDFUWorkunit.isInstanceOfWorkunit(obj);
-        },
-
-        setBanner: function (request) {
-            lang.mixin(request, {
-                FromSubmitBtn: true,
-                BannerAction: request.BannerAction ? 1 : 0,
-                EnableChatURL: 0
-            });
-            this.getActivity(request);
-        },
+var Activity = declare([ESPUtil.Singleton, ESPUtil.Monitor], {
+    //  Asserts  ---
+    _assertHasWuid: function () {
+        if (!this.Wuid) {
+            throw new Error("Wuid cannot be empty.");
+        }
+    },
+    //  Attributes  ---
+    _StateIDSetter: function (StateID) {
+        this.StateID = StateID;
+        var actionEx = lang.exists("ActionEx", this) ? this.ActionEx : null;
+        this.set("hasCompleted", WsWorkunits.isComplete(this.StateID, actionEx));
+    },
+
+    //  ---  ---  ---
+    constructor: function (args) {
+        this._watched = [];
+        this.store = new Store();
+        this.observableStore = new Observable(this.store)
+    },
+
+    isInstanceOfQueue: function (obj) {
+        return ESPQueue.isInstanceOfQueue(obj);
+    },
+
+    isInstanceOfWorkunit: function (obj) {
+        return ESPWorkunit.isInstanceOfWorkunit(obj) || ESPDFUWorkunit.isInstanceOfWorkunit(obj);
+    },
+
+    setBanner: function (request) {
+        lang.mixin(request, {
+            FromSubmitBtn: true,
+            BannerAction: request.BannerAction ? 1 : 0,
+            EnableChatURL: 0
+        });
+        this.getActivity(request);
+    },
+
+    resolve: function (id) {
+        var queue = this.observableStore.get(id);
+        if (queue) {
+            return queue;
+        }
 
-        resolve: function (id) {
-            var queue = this.observableStore.get(id);
+        var wu = id[0] === "D" ? ESPDFUWorkunit.Get(id) : ESPWorkunit.Get(id);
+        if (wu) {
+            //  is wu still in a queue?
+            queue = wu.get("ESPQueue");
             if (queue) {
-                return queue;
+                return queue.getChild(id);
             }
+        }
+        return null;
+    },
 
-            var wu = id[0] === "D" ? ESPDFUWorkunit.Get(id) : ESPWorkunit.Get(id);
-            if (wu) {
-                //  is wu still in a queue?
-                queue = wu.get("ESPQueue");
-                if (queue) {
-                    return queue.getChild(id);
+    monitor: function (callback) {
+        if (callback && this.__hpcc_changedCount) {
+            callback(this);
+        }
+        if (!this.hasCompleted) {
+            var context = this;
+            this.watch("__hpcc_changedCount", function (name, oldValue, newValue) {
+                if (oldValue !== newValue && newValue) {
+                    if (callback) {
+                        callback(context);
+                    }
                 }
+            });
+        }
+    },
+
+    getActivity: function (request) {
+        var context = this;
+        return WsSMC.Activity({
+            request: request
+        }).then(function (response) {
+            if (lang.exists("ActivityResponse", response)) {
+                var targetClusters = [];
+                var targetClusterMap = {};
+                context.refreshTargetClusters(lang.getObject("ActivityResponse.HThorClusterList.TargetCluster", false, response), targetClusters, targetClusterMap);
+                context.refreshTargetClusters(lang.getObject("ActivityResponse.ThorClusterList.TargetCluster", false, response), targetClusters, targetClusterMap);
+                context.refreshTargetClusters(lang.getObject("ActivityResponse.RoxieClusterList.TargetCluster", false, response), targetClusters, targetClusterMap);
+                context.refreshTargetClusters(lang.getObject("ActivityResponse.ServerJobQueues.ServerJobQueue", false, response), targetClusters, targetClusterMap);
+                context.refreshActiveWorkunits(lang.getObject("ActivityResponse.Running.ActiveWorkunit", false, response), targetClusters, targetClusterMap);
+                context.store.setData(targetClusters);
+                context.updateData(response.ActivityResponse);
             }
-            return null;
-        },
-
-        monitor: function (callback) {
-            if (callback && this.__hpcc_changedCount) {
-                callback(this);
-            }
-            if (!this.hasCompleted) {
-                var context = this;
-                this.watch("__hpcc_changedCount", function (name, oldValue, newValue) {
-                    if (oldValue !== newValue && newValue) {
-                        if (callback) {
-                            callback(context);
+            return response;
+        });
+    },
+
+    refreshTargetClusters: function (responseTargetClusters, targetClusters, targetClusterMap) {
+        var context = this;
+        if (responseTargetClusters) {
+            arrayUtil.forEach(responseTargetClusters, function (item, idx) {
+                var queue = null;
+                if (item.ClusterName) {
+                    queue = ESPQueue.GetTargetCluster(item.ClusterName);
+                } else {
+                    queue = ESPQueue.GetServerJobQueue(item.ServerName);
+                }
+                queue.updateData(item);
+                queue.set("DisplayName", queue.getDisplayName());
+                queue.clearChildren();
+                targetClusters.push(queue);
+                targetClusterMap[queue.__hpcc_id] = queue;
+                if (!context._watched[queue.__hpcc_id]) {
+                    context._watched[queue.__hpcc_id] = queue.watch("__hpcc_changedCount", function (name, oldValue, newValue) {
+                        if (oldValue !== newValue) {
+                            if (context.observableStore.get(queue.__hpcc_id)) {
+                                context.observableStore.notify(queue, queue.__hpcc_id);
+                            }
                         }
-                    }
-                });
-            }
-        },
-
-        getActivity: function (request) {
-            var context = this;
-            return WsSMC.Activity({
-                request: request
-            }).then(function (response) {
-                if (lang.exists("ActivityResponse", response)) {
-                    var targetClusters = [];
-                    var targetClusterMap = {};
-                    context.refreshTargetClusters(lang.getObject("ActivityResponse.HThorClusterList.TargetCluster", false, response), targetClusters, targetClusterMap);
-                    context.refreshTargetClusters(lang.getObject("ActivityResponse.ThorClusterList.TargetCluster", false, response), targetClusters, targetClusterMap);
-                    context.refreshTargetClusters(lang.getObject("ActivityResponse.RoxieClusterList.TargetCluster", false, response), targetClusters, targetClusterMap);
-                    context.refreshTargetClusters(lang.getObject("ActivityResponse.ServerJobQueues.ServerJobQueue", false, response), targetClusters, targetClusterMap);
-                    context.refreshActiveWorkunits(lang.getObject("ActivityResponse.Running.ActiveWorkunit", false, response), targetClusters, targetClusterMap);
-                    context.store.setData(targetClusters);
-                    context.updateData(response.ActivityResponse);
+                    });
                 }
-                return response;
             });
-        },
-
-        refreshTargetClusters: function (responseTargetClusters, targetClusters, targetClusterMap) {
-            var context = this;
-            if (responseTargetClusters) {
-                arrayUtil.forEach(responseTargetClusters, function (item, idx) {
-                    var queue = null;
-                    if (item.ClusterName) {
-                        queue = ESPQueue.GetTargetCluster(item.ClusterName);
-                    } else {
-                        queue = ESPQueue.GetServerJobQueue(item.ServerName);
-                    }
-                    queue.updateData(item);
-                    queue.set("DisplayName", queue.getDisplayName());
-                    queue.clearChildren();
-                    targetClusters.push(queue);
-                    targetClusterMap[queue.__hpcc_id] = queue;
-                    if (!context._watched[queue.__hpcc_id]) {
-                        context._watched[queue.__hpcc_id] = queue.watch("__hpcc_changedCount", function (name, oldValue, newValue) {
-                            if (oldValue !== newValue) {
-                                if (context.observableStore.get(queue.__hpcc_id)) {
-                                    context.observableStore.notify(queue, queue.__hpcc_id);
-                                }
-                            }
-                        });
-                    }
-                });
-            }
-        },
-
-        refreshActiveWorkunits: function (responseActiveWorkunits, targetClusters, targetClusterMap) {
-            if (responseActiveWorkunits) {
-                arrayUtil.forEach(responseActiveWorkunits, function (item, idx) {
-                    item["__hpcc_id"] = item.Wuid;
-                    var queue = null;
-                    if (item.ClusterName) {
-                        queue = ESPQueue.GetTargetCluster(item.ClusterName);
-                    } else {
-                        queue = ESPQueue.GetServerJobQueue(item.ServerName);
-                    }
-                    var wu = item.Server === "DFUserver" ? ESPDFUWorkunit.Get(item.Wuid) : ESPWorkunit.Get(item.Wuid);
-                    wu.updateData(lang.mixin({
-                        __hpcc_id: item.Wuid
-                    }, item));
-                    queue.addChild(wu);
-                });
-            }
-        },
-
-        inRefresh: false,
-        refresh: function (full) {
-            var context = this;
-            if (this.inRefresh) {
-                return;
-            }
-            this.inRefresh = true;
-            this.getActivity({
-            }).then(function (response) {
-                context.inRefresh = false;
-            }, function (err) {
-                context.inRefresh = false;
+        }
+    },
+
+    refreshActiveWorkunits: function (responseActiveWorkunits, targetClusters, targetClusterMap) {
+        if (responseActiveWorkunits) {
+            arrayUtil.forEach(responseActiveWorkunits, function (item, idx) {
+                item["__hpcc_id"] = item.Wuid;
+                var queue = null;
+                if (item.ClusterName) {
+                    queue = ESPQueue.GetTargetCluster(item.ClusterName);
+                } else {
+                    queue = ESPQueue.GetServerJobQueue(item.ServerName);
+                }
+                var wu = item.Server === "DFUserver" ? ESPDFUWorkunit.Get(item.Wuid) : ESPWorkunit.Get(item.Wuid);
+                wu.updateData(lang.mixin({
+                    __hpcc_id: item.Wuid
+                }, item));
+                queue.addChild(wu);
             });
-        },
-
-        getStore: function () {
-            return this.observableStore;
         }
-    });
-    var globalActivity = null;
-
-    return {
-        Get: function () {
-            if (!globalActivity) {
-                globalActivity = new Activity;
-                globalActivity.startMonitor();
-                globalActivity.refresh();
-            }
-            return globalActivity;
-        },
+    },
 
-        CreateActivityStore: function (options) {
-            var store = new Store(options);
-            return Observable(store);
+    inRefresh: false,
+    refresh: function (full) {
+        var context = this;
+        if (this.inRefresh) {
+            return;
         }
-    };
+        this.inRefresh = true;
+        this.getActivity({
+        }).then(function (response) {
+            context.inRefresh = false;
+        }, function (err) {
+            context.inRefresh = false;
+        });
+    },
+
+    getStore: function () {
+        return this.observableStore;
+    }
 });
+var globalActivity = null;
+
+export function Get() {
+    if (!globalActivity) {
+        globalActivity = new Activity;
+        globalActivity.startMonitor();
+        globalActivity.refresh();
+    }
+    return globalActivity;
+}
+
+export function CreateActivityStore(options) {
+    var store = new Store(options);
+    return Observable(store);
+}