You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/06/30 21:39:46 UTC
[1/3] git commit: Add check for empty table before sorting
Repository: incubator-storm
Updated Branches:
refs/heads/master 66b30112d -> 85f87c4c4
Add check for empty table before sorting
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/31c786c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/31c786c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/31c786c6
Branch: refs/heads/master
Commit: 31c786c6634052d89ca62c57c428d95124a3a465
Parents: 4c70e40
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Tue Jun 24 18:51:01 2014 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Tue Jun 24 18:51:01 2014 +0000
----------------------------------------------------------------------
storm-core/src/ui/public/component.html | 22 ++++++++++++++++------
storm-core/src/ui/public/topology.html | 4 +++-
2 files changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/31c786c6/storm-core/src/ui/public/component.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/component.html b/storm-core/src/ui/public/component.html
index aae0245..512eba6 100644
--- a/storm-core/src/ui/public/component.html
+++ b/storm-core/src/ui/public/component.html
@@ -73,22 +73,32 @@ $(document).ready(function() {
componentSummary.append(Mustache.render($(template).filter("#component-summary-template").html(),response));
if(response["componentType"] == "spout") {
componentStatsDetail.append(Mustache.render($(template).filter("#spout-stats-detail-template").html(),response));
- $("#spout-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
+ if(response["spoutSummary"].length > 0) {
+ $("#spout-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
+ }
outputStats.append(Mustache.render($(template).filter("#output-stats-template").html(),response));
- $("#output-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
+ if(response["outputStats"].length > 0) {
+ $("#output-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
+ }
executorStats.append(Mustache.render($(template).filter("#executor-stats-template").html(),response));
- $("#executor-stats-table").tablesorter({ sortList: [[0,0]], headers: {1: { sorter: "stormtimestr"}}});
+ if(response["executorStats"].length > 0) {
+ $("#executor-stats-table").tablesorter({ sortList: [[0,0]], headers: {1: { sorter: "stormtimestr"}}});
+ }
} else {
componentStatsDetail.append(Mustache.render($(template).filter("#bolt-stats-template").html(),response));
- $("#bolt-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
+ if(response["boltStats"].length > 0) {
+ $("#bolt-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
+ }
inputStats.append(Mustache.render($(template).filter("#bolt-input-stats-template").html(),response));
if (response["inputStats"].length > 0) {
$("#bolt-input-stats-table").tablesorter({ sortList: [[0,0]], headers: {}});
}
outputStats.append(Mustache.render($(template).filter("#bolt-output-stats-template").html(),response));
- $("#bolt-output-stats-table").tablesorter({ sortList: [[0,0]], headers: {}});
- executorStats.append(Mustache.render($(template).filter("#bolt-executor-template").html(),response));
if(response["outputStats"].length > 0) {
+ $("#bolt-output-stats-table").tablesorter({ sortList: [[0,0]], headers: {}});
+ }
+ executorStats.append(Mustache.render($(template).filter("#bolt-executor-template").html(),response));
+ if(response["executorStats"].length > 0) {
$("#bolt-executor-table").tablesorter({ sortList: [[0,0]], headers: {}});
}
}
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/31c786c6/storm-core/src/ui/public/topology.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/topology.html b/storm-core/src/ui/public/topology.html
index 1020719..fd7340b 100644
--- a/storm-core/src/ui/public/topology.html
+++ b/storm-core/src/ui/public/topology.html
@@ -85,7 +85,9 @@ $(document).ready(function() {
topologySummary.append(Mustache.render($(template).filter("#topology-summary-template").html(),response));
topologyActions.append(Mustache.render($(template).filter("#topology-actions-template").html(),buttonJsonData));
topologyStats.append(Mustache.render($(template).filter("#topology-stats-template").html(),response));
- $("#topology-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
+ if(response["topologyStats"].length > 0) {
+ $("#topology-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
+ }
spoutStats.append(Mustache.render($(template).filter("#spout-stats-template").html(),response));
if(response["spouts"].length > 0) {
$("#spout-stats-table").tablesorter({sortList: [[0,0]], headers:{}});
[3/3] git commit: Added STORM-370 to Changelog
Posted by bo...@apache.org.
Added STORM-370 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/85f87c4c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/85f87c4c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/85f87c4c
Branch: refs/heads/master
Commit: 85f87c4c4cfee208dae48f057142eb393a37d8ca
Parents: 4749ac6
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Mon Jun 30 14:35:24 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Mon Jun 30 14:35:24 2014 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/85f87c4c/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76400d4..809df53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
* STORM-213: Decouple In-Process ZooKeeper from LocalCluster.
* STORM-365: Add support for Python 3 to storm command.
* STORM-332: Enable Kryo serialization in storm-kafka
+ * STORM-370: Add check for empty table before sorting dom in UI
## 0.9.2-incubating
* STORM-66: send taskid on initial handshake
[2/3] git commit: Merge branch 'fix-blank-ui-comps' of
https://github.com/kishorvpatil/incubator-storm into STORM-370
Posted by bo...@apache.org.
Merge branch 'fix-blank-ui-comps' of https://github.com/kishorvpatil/incubator-storm into STORM-370
STORM-370: Add check for empty table before sorting dom in UI
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/4749ac68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/4749ac68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/4749ac68
Branch: refs/heads/master
Commit: 4749ac682c18b375011a691dc69763a26712af3b
Parents: 66b3011 31c786c
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Mon Jun 30 14:34:56 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Mon Jun 30 14:34:56 2014 -0500
----------------------------------------------------------------------
storm-core/src/ui/public/component.html | 22 ++++++++++++++++------
storm-core/src/ui/public/topology.html | 4 +++-
2 files changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------