{"action":"created","comment":{"url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/comments/80470609","id":80470609,"diff_hunk":"@@ -18,53 +18,163 @@ define([\n     \"dojo/i18n\",\n     \"dojo/i18n!./nls/hpcc\",\n     \"dojo/on\",\n+    \"dojo/dom\",\n+    \"dojo/dom-construct\",\n+    \"dojo/_base/lang\",\n \n+    \"dijit/form/CheckBox\",\n+    \"dijit/form/TextBox\",\n+    \"dijit/form/ValidationTextBox\",\n     \"dijit/registry\",\n     \"dijit/form/ToggleButton\",\n+    \"dijit/form/Select\",\n     \"dijit/ToolbarSeparator\",\n     \"dijit/layout/ContentPane\",\n \n     \"dgrid/tree\",\n+    \"dgrid/selector\",\n \n     \"hpcc/GridDetailsWidget\",\n+    \"hpcc/PreflightDetailsWidget\",\n+    \"hpcc/RequestInformationWidget\",\n     \"hpcc/ESPRequest\",\n     \"hpcc/ESPTopology\",\n     \"hpcc/TopologyDetailsWidget\",\n     \"hpcc/DelayLoadWidget\",\n-    \"hpcc/ESPUtil\"\n+    \"hpcc/ESPUtil\",\n+    \"hpcc/FilterDropDownWidget\",\n+    \"hpcc/ws_machine\",\n \n-], function (declare, i18n, nlsHPCC, on,\n-                registry, ToggleButton, ToolbarSeparator, ContentPane,\n-                tree,\n-                GridDetailsWidget, ESPRequest, ESPTopology, TopologyDetailsWidget, DelayLoadWidget, ESPUtil) {\n+], function (declare, i18n, nlsHPCC, on, dom, domConstruct, lang,\n+                CheckBox, TextBox, ValidationTextBox, registry, ToggleButton, Select, ToolbarSeparator, ContentPane,\n+                tree, selector,\n+                GridDetailsWidget, PreflightDetailsWidget, RequestInformationWidget, ESPRequest, ESPTopology, TopologyDetailsWidget, DelayLoadWidget, ESPUtil, FilterDropDownWidget, WsMachine) {\n     return declare(\"TopologyWidget\", [GridDetailsWidget], {\n \n         i18n: nlsHPCC,\n         gridTitle: nlsHPCC.title_Topology,\n         idProperty: \"__hpcc_id\",\n+        filter: null,\n+        filterLoaded: null,\n \n         postCreate: function (args) {\n             this.inherited(arguments);\n             this.detailsWidget = new TopologyDetailsWidget({\n                 id: this.id + \"Details\",\n                 region: \"right\",\n                 splitter: true,\n-                style: \"width: 66%\",\n+                style: \"width: 80%\",\n                 minSize: 240\n             });\n             this.detailsWidget.placeAt(this.gridTab, \"last\");\n+            this.filter = new FilterDropDownWidget();\n         },\n \n         init: function (params) {\n+            var context = this;\n             if (this.inherited(arguments))\n                 return;\n-\n+            this.detailsWidget.requestInformationWidget.set(\"disabled\", true);\n+            this.filter.disable(true);\n             this.refreshGrid();\n+\n+            this.filter.on(\"apply\", function (evt) {\n+                var selection = context.grid.getSelected();\n+                var filter = context.getFilter();\n+\n+                for (var i = 0; i < selection.length; ++i) {\n+                    if (context.viewModeMachines.checked || context.viewModeServices.checked) {\n+                        var MachineInformationClean = \"Addresses.\" + [i];\n+                        var MachineInformationCount = \"Addresses.itemcount\";\n+                        if (context.viewModeMachines.checked) {\n+                            filter[MachineInformationClean] = selection[i].getNetaddress() + \"|:\" + selection[i].__hpcc_parentNode.__hpcc_treeItem.Type + \":\" + selection[i].__hpcc_treeItem.Name + \":\" + 2 + \":\" + selection[i].__hpcc_treeItem.Directory + \":\" + 0;\n+                        } else if (context.viewModeServices.checked) {\n+                            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;\n+                        }\n+                            WsMachine.GetMachineInfo ({\n+                                request: {\n+                                    [MachineInformationClean]: filter[MachineInformationClean],\n+                                    [MachineInformationCount]: 1000,","path":"esp/src/eclwatch/TopologyWidget.js","position":87,"original_position":87,"commit_id":"b316a1645e4b7fd65026bb257842a869e990c8f7","original_commit_id":"b316a1645e4b7fd65026bb257842a869e990c8f7","user":{"login":"GordonSmith","id":966863,"avatar_url":"https://avatars.githubusercontent.com/u/966863?v=3","gravatar_id":"","url":"https://api.github.com/users/GordonSmith","html_url":"https://github.com/GordonSmith","followers_url":"https://api.github.com/users/GordonSmith/followers","following_url":"https://api.github.com/users/GordonSmith/following{/other_user}","gists_url":"https://api.github.com/users/GordonSmith/gists{/gist_id}","starred_url":"https://api.github.com/users/GordonSmith/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/GordonSmith/subscriptions","organizations_url":"https://api.github.com/users/GordonSmith/orgs","repos_url":"https://api.github.com/users/GordonSmith/repos","events_url":"https://api.github.com/users/GordonSmith/events{/privacy}","received_events_url":"https://api.github.com/users/GordonSmith/received_events","type":"User","site_admin":false},"body":"Is this syntax correct?","created_at":"2016-09-26T13:10:30Z","updated_at":"2016-09-26T13:10:30Z","html_url":"https://github.com/hpcc-systems/HPCC-Platform/pull/9165#discussion_r80470609","pull_request_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/9165","_links":{"self":{"href":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/comments/80470609"},"html":{"href":"https://github.com/hpcc-systems/HPCC-Platform/pull/9165#discussion_r80470609"},"pull_request":{"href":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/9165"}}},"pull_request":{"url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/9165","id":86589275,"html_url":"https://github.com/hpcc-systems/HPCC-Platform/pull/9165","diff_url":"https://github.com/hpcc-systems/HPCC-Platform/pull/9165.diff","patch_url":"https://github.com/hpcc-systems/HPCC-Platform/pull/9165.patch","issue_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/issues/9165","number":9165,"state":"open","locked":false,"title":"HPCC-14453 Preflight upgrade","user":{"login":"miguelvazq","id":2362956,"avatar_url":"https://avatars.githubusercontent.com/u/2362956?v=3","gravatar_id":"","url":"https://api.github.com/users/miguelvazq","html_url":"https://github.com/miguelvazq","followers_url":"https://api.github.com/users/miguelvazq/followers","following_url":"https://api.github.com/users/miguelvazq/following{/other_user}","gists_url":"https://api.github.com/users/miguelvazq/gists{/gist_id}","starred_url":"https://api.github.com/users/miguelvazq/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/miguelvazq/subscriptions","organizations_url":"https://api.github.com/users/miguelvazq/orgs","repos_url":"https://api.github.com/users/miguelvazq/repos","events_url":"https://api.github.com/users/miguelvazq/events{/privacy}","received_events_url":"https://api.github.com/users/miguelvazq/received_events","type":"User","site_admin":false},"body":"Add pre flight submission form into new ECL Watch.\r\n\r\nSigned-off by: Miguel Vazquez <miguel.vazquez@lexisnexis.com>","created_at":"2016-09-23T22:12:49Z","updated_at":"2016-09-26T13:15:20Z","closed_at":null,"merged_at":null,"merge_commit_sha":"bef00266500b7ebb8f15b32a7f6db3e28fc47a90","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/9165/commits","review_comments_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/9165/comments","review_comment_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/comments{/number}","comments_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/issues/9165/comments","statuses_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/statuses/b316a1645e4b7fd65026bb257842a869e990c8f7","head":{"label":"miguelvazq:PreflightUpgrade","ref":"PreflightUpgrade","sha":"b316a1645e4b7fd65026bb257842a869e990c8f7","user":{"login":"miguelvazq","id":2362956,"avatar_url":"https://avatars.githubusercontent.com/u/2362956?v=3","gravatar_id":"","url":"https://api.github.com/users/miguelvazq","html_url":"https://github.com/miguelvazq","followers_url":"https://api.github.com/users/miguelvazq/followers","following_url":"https://api.github.com/users/miguelvazq/following{/other_user}","gists_url":"https://api.github.com/users/miguelvazq/gists{/gist_id}","starred_url":"https://api.github.com/users/miguelvazq/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/miguelvazq/subscriptions","organizations_url":"https://api.github.com/users/miguelvazq/orgs","repos_url":"https://api.github.com/users/miguelvazq/repos","events_url":"https://api.github.com/users/miguelvazq/events{/privacy}","received_events_url":"https://api.github.com/users/miguelvazq/received_events","type":"User","site_admin":false},"repo":{"id":5951538,"name":"HPCC-Platform","full_name":"miguelvazq/HPCC-Platform","owner":{"login":"miguelvazq","id":2362956,"avatar_url":"https://avatars.githubusercontent.com/u/2362956?v=3","gravatar_id":"","url":"https://api.github.com/users/miguelvazq","html_url":"https://github.com/miguelvazq","followers_url":"https://api.github.com/users/miguelvazq/followers","following_url":"https://api.github.com/users/miguelvazq/following{/other_user}","gists_url":"https://api.github.com/users/miguelvazq/gists{/gist_id}","starred_url":"https://api.github.com/users/miguelvazq/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/miguelvazq/subscriptions","organizations_url":"https://api.github.com/users/miguelvazq/orgs","repos_url":"https://api.github.com/users/miguelvazq/repos","events_url":"https://api.github.com/users/miguelvazq/events{/privacy}","received_events_url":"https://api.github.com/users/miguelvazq/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/miguelvazq/HPCC-Platform","description":"IMPORTANT - Issue tracking has been migrated to JIRA - use your github ID and password reset mechanism to log in","fork":true,"url":"https://api.github.com/repos/miguelvazq/HPCC-Platform","forks_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/forks","keys_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/keys{/key_id}","collaborators_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/teams","hooks_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/hooks","issue_events_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/issues/events{/number}","events_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/events","assignees_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/assignees{/user}","branches_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/branches{/branch}","tags_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/tags","blobs_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/git/refs{/sha}","trees_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/git/trees{/sha}","statuses_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/statuses/{sha}","languages_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/languages","stargazers_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/stargazers","contributors_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/contributors","subscribers_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/subscribers","subscription_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/subscription","commits_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/commits{/sha}","git_commits_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/git/commits{/sha}","comments_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/comments{/number}","issue_comment_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/issues/comments{/number}","contents_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/contents/{+path}","compare_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/compare/{base}...{head}","merges_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/merges","archive_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/downloads","issues_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/issues{/number}","pulls_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/pulls{/number}","milestones_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/milestones{/number}","notifications_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/labels{/name}","releases_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/releases{/id}","deployments_url":"https://api.github.com/repos/miguelvazq/HPCC-Platform/deployments","created_at":"2012-09-25T14:49:33Z","updated_at":"2014-09-12T17:18:09Z","pushed_at":"2016-09-23T22:12:35Z","git_url":"git://github.com/miguelvazq/HPCC-Platform.git","ssh_url":"git@github.com:miguelvazq/HPCC-Platform.git","clone_url":"https://github.com/miguelvazq/HPCC-Platform.git","svn_url":"https://github.com/miguelvazq/HPCC-Platform","homepage":"track.hpccsystems.com","size":154963,"stargazers_count":1,"watchers_count":1,"language":"C++","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":1,"forks":0,"open_issues":1,"watchers":1,"default_branch":"master"}},"base":{"label":"hpcc-systems:master","ref":"master","sha":"97a1e4594a24e602c3b7bf4e41a4c32b9789bd49","user":{"login":"hpcc-systems","id":900867,"avatar_url":"https://avatars.githubusercontent.com/u/900867?v=3","gravatar_id":"","url":"https://api.github.com/users/hpcc-systems","html_url":"https://github.com/hpcc-systems","followers_url":"https://api.github.com/users/hpcc-systems/followers","following_url":"https://api.github.com/users/hpcc-systems/following{/other_user}","gists_url":"https://api.github.com/users/hpcc-systems/gists{/gist_id}","starred_url":"https://api.github.com/users/hpcc-systems/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hpcc-systems/subscriptions","organizations_url":"https://api.github.com/users/hpcc-systems/orgs","repos_url":"https://api.github.com/users/hpcc-systems/repos","events_url":"https://api.github.com/users/hpcc-systems/events{/privacy}","received_events_url":"https://api.github.com/users/hpcc-systems/received_events","type":"Organization","site_admin":false},"repo":{"id":2030681,"name":"HPCC-Platform","full_name":"hpcc-systems/HPCC-Platform","owner":{"login":"hpcc-systems","id":900867,"avatar_url":"https://avatars.githubusercontent.com/u/900867?v=3","gravatar_id":"","url":"https://api.github.com/users/hpcc-systems","html_url":"https://github.com/hpcc-systems","followers_url":"https://api.github.com/users/hpcc-systems/followers","following_url":"https://api.github.com/users/hpcc-systems/following{/other_user}","gists_url":"https://api.github.com/users/hpcc-systems/gists{/gist_id}","starred_url":"https://api.github.com/users/hpcc-systems/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hpcc-systems/subscriptions","organizations_url":"https://api.github.com/users/hpcc-systems/orgs","repos_url":"https://api.github.com/users/hpcc-systems/repos","events_url":"https://api.github.com/users/hpcc-systems/events{/privacy}","received_events_url":"https://api.github.com/users/hpcc-systems/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/hpcc-systems/HPCC-Platform","description":"HPCC Systems (High Performance Computing Cluster) is an open source, massive parallel-processing computing platform for big data processing and analytics.","fork":false,"url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform","forks_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/forks","keys_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/keys{/key_id}","collaborators_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/teams","hooks_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/hooks","issue_events_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/issues/events{/number}","events_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/events","assignees_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/assignees{/user}","branches_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/branches{/branch}","tags_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/tags","blobs_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/git/refs{/sha}","trees_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/git/trees{/sha}","statuses_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/statuses/{sha}","languages_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/languages","stargazers_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/stargazers","contributors_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/contributors","subscribers_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/subscribers","subscription_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/subscription","commits_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/commits{/sha}","git_commits_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/git/commits{/sha}","comments_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/comments{/number}","issue_comment_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/issues/comments{/number}","contents_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/contents/{+path}","compare_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/compare/{base}...{head}","merges_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/merges","archive_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/downloads","issues_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/issues{/number}","pulls_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls{/number}","milestones_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/milestones{/number}","notifications_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/labels{/name}","releases_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/releases{/id}","deployments_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/deployments","created_at":"2011-07-11T14:29:51Z","updated_at":"2016-09-25T18:03:47Z","pushed_at":"2016-09-26T13:11:32Z","git_url":"git://github.com/hpcc-systems/HPCC-Platform.git","ssh_url":"git@github.com:hpcc-systems/HPCC-Platform.git","clone_url":"https://github.com/hpcc-systems/HPCC-Platform.git","svn_url":"https://github.com/hpcc-systems/HPCC-Platform","homepage":"http://hpccsystems.com","size":184061,"stargazers_count":287,"watchers_count":287,"language":"C++","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":153,"mirror_url":null,"open_issues_count":426,"forks":153,"open_issues":426,"watchers":287,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/9165"},"html":{"href":"https://github.com/hpcc-systems/HPCC-Platform/pull/9165"},"issue":{"href":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/issues/9165"},"comments":{"href":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/issues/9165/comments"},"review_comments":{"href":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/9165/comments"},"review_comment":{"href":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/9165/commits"},"statuses":{"href":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/statuses/b316a1645e4b7fd65026bb257842a869e990c8f7"}}}}
{"actor":{"display_login":"GordonSmith"}}