[incubator-heron] branch master updated: Update topology UI to make topology info more consistent across pages (#3151)

[nw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nwang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git


The following commit(s) were added to refs/heads/master by this push:
     new 5270725  Update topology UI to make topology info more consistent across pages (#3151)
5270725 is described below

commit 527072530f19775d2cc448b5fac0fb2b7d56b4f1
Author: Ning Wang <nw...@twitter.com>
AuthorDate: Thu Jan 10 14:08:47 2019 -0800

    Update topology UI to make topology info more consistent across pages (#3151)
---
 heron/tools/ui/resources/static/js/alltopologies.js | 8 ++++----
 heron/tools/ui/resources/templates/topology.html    | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/heron/tools/ui/resources/static/js/alltopologies.js b/heron/tools/ui/resources/static/js/alltopologies.js
index f540ff6..831dd96 100644
--- a/heron/tools/ui/resources/static/js/alltopologies.js
+++ b/heron/tools/ui/resources/static/js/alltopologies.js
@@ -54,8 +54,8 @@ var TopologyItem = React.createClass({
          <td className="col-md-3 break-all"><a className="toponame" href={'./topologies/' + topology.cluster + '/' + topology.environ + '/' + topology.name}>{topology.name}</a></td>
          <td className="col-md-1 topostatus">{topology.status}</td>
          <td className="col-md-1 topocluster">{displaycluster}</td>
-         <td className="col-md-1 topoenviron">{displayenv}</td>
          <td className="col-md-1 toporunrole break-all">{topology.role}</td>
+         <td className="col-md-1 topoenviron">{displayenv}</td>
          <td className="col-md-1 toporeleaseversion">{topology.release_version}</td>
          <td className="col-md-1 toposubmittedby break-all">{topology.submission_user}</td>
          <td className="col-md-2 toposubmittedat no-break">{display_time}</td>
@@ -182,12 +182,12 @@ var TopologyTable = React.createClass({
               <th onClick={sortBy("cluster")} className={sortClass("cluster")}>
                 Cluster
               </th>
-              <th onClick={sortBy("environ")} className={sortClass("environ")}>
-                Environ
-              </th>
               <th onClick={sortBy("role")} className={sortClass("role")}>
                 Role
               </th>
+              <th onClick={sortBy("environ")} className={sortClass("environ")}>
+                Environ
+              </th>
               <th onClick={sortBy("release_version")} className={sortClass("release_version")}>
                 Version
               </th>
diff --git a/heron/tools/ui/resources/templates/topology.html b/heron/tools/ui/resources/templates/topology.html
index a0f0f72..3e39f3f 100644
--- a/heron/tools/ui/resources/templates/topology.html
+++ b/heron/tools/ui/resources/templates/topology.html
@@ -127,11 +127,12 @@ under the License.
       <thead>
         <th>Topology name</th>
         <th>Status</th>
-        <th>DC</th>
+        <th>Cluster</th>
         <th>Role</th>
         <th>Environment</th>
+        <th>Version</th>
         <th>Launched at</th>
-        <th>Launched by</th>
+        <th>Submitted by</th>
         <th>Links</th>
       </thead>
 
@@ -142,6 +143,7 @@ under the License.
           <td>{{cluster}}</td>
           <td>{{execution_state['role']}}</td>
           <td>{{environ}}</td>
+          <td>{{execution_state['release_version']}}</td>
           <td>{{launched}}</td>
           <td>{{execution_state['submission_user']}}</td>
           <td>