[GitHub] nwangtw closed pull request #3151: Update topology UI to make topology info more consistent across pages

[GitBox <gi...@apache.org>]

nwangtw closed pull request #3151: Update topology UI to make topology info more consistent across pages
URL: https://github.com/apache/incubator-heron/pull/3151
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/heron/tools/ui/resources/static/js/alltopologies.js b/heron/tools/ui/resources/static/js/alltopologies.js
index f540ff6d19..831dd96947 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 a0f0f72582..3e39f3f636 100644
--- a/heron/tools/ui/resources/templates/topology.html
+++ b/heron/tools/ui/resources/templates/topology.html
@@ -127,11 +127,12 @@ <h4 class="space-above">
       <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 @@ <h4 class="space-above">
           <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>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services