Merge pull request #9211 from GordonSmith/HPCC-16397

HPCC-16397 Build failing due to syntax issues.

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

esp/src/eclwatch/DynamicESDLMethodWidget.js

@@ -94,7 +94,7 @@ define([
             }).placeAt(this.dialog);
             this.valueTextBox = new TextBox({
                 label: this.i18n.Value,
-                placeholder: this.i18n.Value,
+                placeholder: this.i18n.Value
             }).placeAt(this.dialog);
             this.addAddAttritbuteButton = new Button({
                 disabled: true,
@@ -153,7 +153,7 @@ define([
                         editorArgs: {
                             required: true,
                             placeholder: context.i18n.AttributesAreRequired,
-                            promptMessage: context.i18n.AttributesAreRequired,
+                            promptMessage: context.i18n.AttributesAreRequired
                         }
                     }),
                     Value: editor({ label: context.i18n.Value, editor: "text",

esp/src/eclwatch/PreflightDetailsWidget.js

@@ -29,7 +29,7 @@ define([
     "hpcc/GridDetailsWidget",
     "hpcc/ESPUtil",
 
-    "dgrid/selector",
+    "dgrid/selector"
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil,
                 registry, Button, ToolbarSeparator, Dialog, TextBox,
@@ -64,7 +64,7 @@ define([
 
             var retVal = new declare([ESPUtil.Grid(true, true)])({
                 store: this.store,
-                columns: context.setColumns(),
+                columns: context.setColumns()
             }, domID);
             return retVal;
         },
@@ -82,9 +82,9 @@ define([
                 var finalColumns = params.Columns.Item;
                 for (var index in finalColumns) {
                     var clean = finalColumns[index].replace(/([~!@#$%^&*()_+=`{}\[\]\|\\:;'<>,.\/? ])+/g, '').replace(/^(-)+|(-)+$/g,'');
-                    if (clean === 'Condition') {
+                    if (clean === "Condition") {
                         lang.mixin(dynamicColumns, {
-                            [clean] : {
+                            "Condition": {
                                 "label": finalColumns[index],
                                 formatter: function (Name, row) {
                                     return context.formatState(row.Condition);
@@ -94,7 +94,7 @@ define([
                     } 
                     if (clean === 'State') {
                         lang.mixin(dynamicColumns, {
-                            [clean] : {
+                            "State": {
                                 "label": finalColumns[index],
                                 formatter: function (Name, row) {
                                     return context.formatCondition(row.State);
@@ -102,11 +102,11 @@ define([
                             }
                         });
                     } else {
-                        lang.mixin(dynamicColumns, {
-                            [clean] : {
-                                "label": finalColumns[index]
-                            }
-                        });
+                        var tmpObj = {};
+                        tmpObj[clean] = {
+                            "label": finalColumns[index]
+                        };
+                        lang.mixin(dynamicColumns, tmpObj);
                     }
                 }
                 context.grid.set("columns", dynamicColumns);
@@ -178,10 +178,10 @@ define([
                     }
                     if (row.Storage) {
                         arrayUtil.forEach(row.Storage.StorageInfo, function (storage, idx) {
-                            var cleanColumn = storage.Description.replace(/([~!@#$%^&*()_+=`{}\[\]\|\\:;'<>,.\/? ])+/g, '').replace(/^(-)+|(-)+$/g,'');
-                            lang.mixin(dynamicRowsObj, {
-                                [cleanColumn]: storage.PercentAvail + "%"
-                            });
+                            var cleanColumn = storage.Description.replace(/([~!@#$%^&*()_+=`{}\[\]\|\\:;'<>,.\/? ])+/g, '').replace(/^(-)+|(-)+$/g, '');
+                            var tmpObj = {};
+                            tmpObj[cleanColumn] = storage.PercentAvail + "%";
+                            lang.mixin(dynamicRowsObj, tmpObj);
                         });
                     }
                   results.push(dynamicRowsObj);
@@ -217,10 +217,10 @@ define([
                         }
                         if (setRows.Storage) {
                             arrayUtil.forEach(setRows.Storage.StorageInfo, function (storage, idx) {
-                                var cleanColumn = storage.Description.replace(/([~!@#$%^&*()_+=`{}\[\]\|\\:;'<>,.\/? ])+/g, '').replace(/^(-)+|(-)+$/g,'');
-                                lang.mixin(dynamicRowsObj, {
-                                    [cleanColumn]: storage.PercentAvail + "%"
-                                });
+                                var cleanColumn = storage.Description.replace(/([~!@#$%^&*()_+=`{}\[\]\|\\:;'<>,.\/? ])+/g, '').replace(/^(-)+|(-)+$/g, '');
+                                var tmpObj = {};
+                                tmpObj[cleanColumn] = storage.PercentAvail + "%";
+                                lang.mixin(dynamicRowsObj, tmpObj);
                             });
                         }
                       results.push(dynamicRowsObj);

esp/src/eclwatch/TopologyWidget.js

@@ -82,65 +82,69 @@ define([
                 var selection = context.grid.getSelected();
                 var filter = context.getFilter();
 
+                var MachineInformationCount = 0;
+                var TargetClusterCount = 0;
                 for (var i = 0; i < selection.length; ++i) {
                     if (context.viewModeMachines.checked || context.viewModeServices.checked) {
-                        var MachineInformationClean = "Addresses." + [i];
-                        var MachineInformationCount = "Addresses.itemcount";
+                        var MachineInformationClean = "Addresses." + i;
+                        MachineInformationCount++;
                         if (context.viewModeMachines.checked) {
                             filter[MachineInformationClean] = selection[i].getNetaddress() + "|:" + selection[i].__hpcc_parentNode.__hpcc_treeItem.Type + ":" + selection[i].__hpcc_treeItem.Name + ":" + 2 + ":" + selection[i].__hpcc_treeItem.Directory + ":" + 0;
                         } else if (context.viewModeServices.checked) {
                             filter[MachineInformationClean] = selection[i].__hpcc_children[0].__hpcc_treeItem.Netaddress + "|:" + selection[i].__hpcc_treeItem.Type + ":" + selection[i].__hpcc_treeItem.Name + ":" + 2 + ":" + selection[i].__hpcc_children[0].__hpcc_treeItem.Directory;
                         }
-                            WsMachine.GetMachineInfo ({
-                                request: {
-                                    [MachineInformationClean]: filter[MachineInformationClean],
-                                    [MachineInformationCount]: 1000,
-                                    Path: selection[i].__hpcc_treeItem.Path,
-                                    Cluster: selection[i].__hpcc_treeItem.Name,
-                                    AutoRefresh:filter.AutoRefresh,
-                                    MemThreshold:filter.MemThreshold,
-                                    CpuThreshold:filter.CpuThreshold,
-                                    MemThresholdType:filter.MemThreshold,
-                                    GetProcessorInfo:filter.GetProcessorInfo,
-                                    GetStorageInfo:filter.GetStorageInfo,
-                                    LocalFileSystemsOnly:filter.LocalFileSystemsOnly,
-                                    GetSoftwareInfo:filter.GetSoftwareInfo,
-                                    DiskThreshold:filter.DiskThreshold,
-                                    DiskThresholdType:filter.DiskThresholdType,
-                                    ApplyProcessFilter:filter.ApplyProcessFilter,
-                                    AddProcessesToFilter: filter.AddtionalProcessesToFilter,
-                                    cbAutoRefresh: filter.cbAutoRefresh,
-                                }
-                            }).then(function (response) {
-                                var pfTab = context.ensureMIPane(response.GetMachineInfoResponse.Machines.MachineInfoEx[0].Address, {
-                                    params: response.GetMachineInfoResponse
-                                });
-                                context.detailsWidget.requestInformationWidget.set("disabled", false);
-                                context.detailsWidget.requestInformationWidget.init(response.GetMachineInfoResponse);
-                                pfTab.init(response.GetMachineInfoResponse, "machines");
+                        var request = {
+                            Path: selection[i].__hpcc_treeItem.Path,
+                            Cluster: selection[i].__hpcc_treeItem.Name,
+                            AutoRefresh: filter.AutoRefresh,
+                            MemThreshold: filter.MemThreshold,
+                            CpuThreshold: filter.CpuThreshold,
+                            MemThresholdType: filter.MemThreshold,
+                            GetProcessorInfo: filter.GetProcessorInfo,
+                            GetStorageInfo: filter.GetStorageInfo,
+                            LocalFileSystemsOnly: filter.LocalFileSystemsOnly,
+                            GetSoftwareInfo: filter.GetSoftwareInfo,
+                            DiskThreshold: filter.DiskThreshold,
+                            DiskThresholdType: filter.DiskThresholdType,
+                            ApplyProcessFilter: filter.ApplyProcessFilter,
+                            AddProcessesToFilter: filter.AddtionalProcessesToFilter,
+                            cbAutoRefresh: filter.cbAutoRefresh
+                        };
+                        request[MachineInformationClean] = filter[MachineInformationClean];
+                        request["Addresses.itemcount"] = MachineInformationCount;
+                        WsMachine.GetMachineInfo({
+                            request: request
+                        }).then(function (response) {
+                            var pfTab = context.ensureMIPane(response.GetMachineInfoResponse.Machines.MachineInfoEx[0].Address, {
+                                params: response.GetMachineInfoResponse
                             });
+                            context.detailsWidget.requestInformationWidget.set("disabled", false);
+                            context.detailsWidget.requestInformationWidget.init(response.GetMachineInfoResponse);
+                            pfTab.init(response.GetMachineInfoResponse, "machines");
+                        });
                     } else {
-                        var TargetClustersClean = "TargetClusters." + [i];
-                        var TargetClusterCount = "TargetClusters.itemcount";
+                        var TargetClustersClean = "TargetClusters." + i;
+                        TargetClusterCount++;
                         filter[TargetClustersClean] = selection[i].__hpcc_treeItem.Type + ":" + selection[i].__hpcc_treeItem.Name;
-                        WsMachine.GetTargetClusterInfo ({
-                            request: {
-                                [TargetClustersClean]: filter[TargetClustersClean],
-                                [TargetClusterCount]: 1000,
-                                AutoRefresh:filter.AutoRefresh,
-                                MemThreshold:filter.MemThreshold,
-                                CpuThreshold:filter.CpuThreshold,
-                                MemThresholdType:filter.MemThreshold,
-                                GetProcessorInfo:filter.GetProcessorInfo,
-                                GetStorageInfo:filter.GetStorageInfo,
-                                LocalFileSystemsOnly:filter.LocalFileSystemsOnly,
-                                GetSoftwareInfo:filter.GetSoftwareInfo,
-                                DiskThreshold:filter.DiskThreshold,
-                                DiskThresholdType:filter.DiskThresholdType,
-                                ApplyProcessFilter:filter.ApplyProcessFilter,
-                                AddProcessesToFilter: filter.AddtionalProcessesToFilter,
-                                cbAutoRefresh: filter.cbAutoRefresh,
-                            }
+                        var request = {
+                            AutoRefresh: filter.AutoRefresh,
+                            MemThreshold: filter.MemThreshold,
+                            CpuThreshold: filter.CpuThreshold,
+                            MemThresholdType: filter.MemThreshold,
+                            GetProcessorInfo: filter.GetProcessorInfo,
+                            GetStorageInfo: filter.GetStorageInfo,
+                            LocalFileSystemsOnly: filter.LocalFileSystemsOnly,
+                            GetSoftwareInfo: filter.GetSoftwareInfo,
+                            DiskThreshold: filter.DiskThreshold,
+                            DiskThresholdType: filter.DiskThresholdType,
+                            ApplyProcessFilter: filter.ApplyProcessFilter,
+                            AddProcessesToFilter: filter.AddtionalProcessesToFilter,
+                            cbAutoRefresh: filter.cbAutoRefresh
+                        };
+                        request[TargetClustersClean] = filter[TargetClustersClean];
+                        request["TargetClusters.itemcount"] = TargetClusterCount;
+                        WsMachine.GetTargetClusterInfo({
+                            request: request
                         }).then(function (response) {
                             if (lang.exists("GetTargetClusterInfoResponse", response)) {
                                 var pfTab = context.ensureTCPane(response.GetTargetClusterInfoResponse.TargetClusterInfoList.TargetClusterInfo[0].Name + response.GetTargetClusterInfoResponse.TimeStamp, {
@@ -407,7 +411,7 @@ define([
                         id: id,
                         name: id,
                         placeholder: placeholder,
-                        class: "miniSelect",
+                        "class": "miniSelect",
                         options: value
                     });
                 break;

esp/src/eclwatch/XrefOrphanFilesWidget.js

@@ -63,7 +63,7 @@ define([
         createGrid: function (domID) {
             var context = this;
             this.openButton = registry.byId(this.id + "Open");
-            this.delete = new Button({
+            this._delete = new Button({
                 id: this.id + "Delete",
                 disabled: false,
                 onClick: function (val) {