[FLINK-2902][web-dashboard] Sort finished jobs by their end time, running jobs by start time
This closes #1296 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/676854b9 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/676854b9 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/676854b9 Branch: refs/heads/master Commit: 676854b92520516a8090eab98b125d6cd9a6b1bf Parents: 1fd386e Author: Sachin Goel <sachingoel0...@gmail.com> Authored: Sat Oct 24 16:30:23 2015 +0530 Committer: Fabian Hueske <fhue...@apache.org> Committed: Thu Oct 29 11:02:24 2015 +0100 ---------------------------------------------------------------------- .../web-dashboard/app/partials/jobs/completed-jobs.jade | 2 +- .../web-dashboard/app/partials/jobs/running-jobs.jade | 2 +- flink-runtime-web/web-dashboard/app/partials/overview.jade | 4 ++-- .../web-dashboard/web/partials/jobs/completed-jobs.html | 2 +- .../web-dashboard/web/partials/jobs/running-jobs.html | 2 +- flink-runtime-web/web-dashboard/web/partials/overview.html | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/676854b9/flink-runtime-web/web-dashboard/app/partials/jobs/completed-jobs.jade ---------------------------------------------------------------------- diff --git a/flink-runtime-web/web-dashboard/app/partials/jobs/completed-jobs.jade b/flink-runtime-web/web-dashboard/app/partials/jobs/completed-jobs.jade index 02c9fd2..c16401d 100644 --- a/flink-runtime-web/web-dashboard/app/partials/jobs/completed-jobs.jade +++ b/flink-runtime-web/web-dashboard/app/partials/jobs/completed-jobs.jade @@ -35,7 +35,7 @@ nav.navbar.navbar-default.navbar-fixed-top.navbar-main th Status tbody - tr(ng-repeat="job in jobs" ui-sref="single-job.plan.overview({ jobid: job.jid })") + tr(ng-repeat="job in jobs|orderBy:\"'end-time'\":true" ui-sref="single-job.plan.overview({ jobid: job.jid })") td {{job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}} td {{job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}} td {{job.duration}} ms http://git-wip-us.apache.org/repos/asf/flink/blob/676854b9/flink-runtime-web/web-dashboard/app/partials/jobs/running-jobs.jade ---------------------------------------------------------------------- diff --git a/flink-runtime-web/web-dashboard/app/partials/jobs/running-jobs.jade b/flink-runtime-web/web-dashboard/app/partials/jobs/running-jobs.jade index 9c02c02..357f159 100644 --- a/flink-runtime-web/web-dashboard/app/partials/jobs/running-jobs.jade +++ b/flink-runtime-web/web-dashboard/app/partials/jobs/running-jobs.jade @@ -35,7 +35,7 @@ nav.navbar.navbar-default.navbar-fixed-top.navbar-main th Status tbody - tr(ng-repeat="job in jobs" ui-sref="single-job.plan.overview({ jobid: job.jid })") + tr(ng-repeat="job in jobs|orderBy:\"'start-time'\"" ui-sref="single-job.plan.overview({ jobid: job.jid })") td {{job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}} td {{job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}} td {{job.duration}} ms http://git-wip-us.apache.org/repos/asf/flink/blob/676854b9/flink-runtime-web/web-dashboard/app/partials/overview.jade ---------------------------------------------------------------------- diff --git a/flink-runtime-web/web-dashboard/app/partials/overview.jade b/flink-runtime-web/web-dashboard/app/partials/overview.jade index cad0792..0b478d0 100644 --- a/flink-runtime-web/web-dashboard/app/partials/overview.jade +++ b/flink-runtime-web/web-dashboard/app/partials/overview.jade @@ -95,7 +95,7 @@ nav.navbar.navbar-default.navbar-fixed-top.navbar-main th Status tbody - tr(ng-repeat="job in runningJobs" ui-sref="single-job.plan.overview({ jobid: job.jid })") + tr(ng-repeat="job in runningJobs|orderBy:\"'start-time'\"" ui-sref="single-job.plan.overview({ jobid: job.jid })") td {{job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}} td {{job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}} td {{job.duration}} ms @@ -123,7 +123,7 @@ nav.navbar.navbar-default.navbar-fixed-top.navbar-main th Status tbody - tr(ng-repeat="job in finishedJobs" ui-sref="single-job.plan.overview({ jobid: job.jid })") + tr(ng-repeat="job in finishedJobs|orderBy:\"'end-time'\":true" ui-sref="single-job.plan.overview({ jobid: job.jid })") td {{job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}} td {{job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}} td {{job.duration}} ms http://git-wip-us.apache.org/repos/asf/flink/blob/676854b9/flink-runtime-web/web-dashboard/web/partials/jobs/completed-jobs.html ---------------------------------------------------------------------- diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/completed-jobs.html b/flink-runtime-web/web-dashboard/web/partials/jobs/completed-jobs.html index b76278d..bf9f640 100644 --- a/flink-runtime-web/web-dashboard/web/partials/jobs/completed-jobs.html +++ b/flink-runtime-web/web-dashboard/web/partials/jobs/completed-jobs.html @@ -35,7 +35,7 @@ limitations under the License. </tr> </thead> <tbody> - <tr ng-repeat="job in jobs" ui-sref="single-job.plan.overview({ jobid: job.jid })"> + <tr ng-repeat="job in jobs|orderBy:"'end-time'":true" ui-sref="single-job.plan.overview({ jobid: job.jid })"> <td>{{job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td> <td>{{job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td> <td>{{job.duration}} ms</td> http://git-wip-us.apache.org/repos/asf/flink/blob/676854b9/flink-runtime-web/web-dashboard/web/partials/jobs/running-jobs.html ---------------------------------------------------------------------- diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/running-jobs.html b/flink-runtime-web/web-dashboard/web/partials/jobs/running-jobs.html index e175d07..5d95f47 100644 --- a/flink-runtime-web/web-dashboard/web/partials/jobs/running-jobs.html +++ b/flink-runtime-web/web-dashboard/web/partials/jobs/running-jobs.html @@ -35,7 +35,7 @@ limitations under the License. </tr> </thead> <tbody> - <tr ng-repeat="job in jobs" ui-sref="single-job.plan.overview({ jobid: job.jid })"> + <tr ng-repeat="job in jobs|orderBy:"'start-time'"" ui-sref="single-job.plan.overview({ jobid: job.jid })"> <td>{{job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td> <td>{{job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td> <td>{{job.duration}} ms</td> http://git-wip-us.apache.org/repos/asf/flink/blob/676854b9/flink-runtime-web/web-dashboard/web/partials/overview.html ---------------------------------------------------------------------- diff --git a/flink-runtime-web/web-dashboard/web/partials/overview.html b/flink-runtime-web/web-dashboard/web/partials/overview.html index ec3c580..295ee27 100644 --- a/flink-runtime-web/web-dashboard/web/partials/overview.html +++ b/flink-runtime-web/web-dashboard/web/partials/overview.html @@ -92,7 +92,7 @@ limitations under the License. </tr> </thead> <tbody> - <tr ng-repeat="job in runningJobs" ui-sref="single-job.plan.overview({ jobid: job.jid })"> + <tr ng-repeat="job in runningJobs|orderBy:"'start-time'"" ui-sref="single-job.plan.overview({ jobid: job.jid })"> <td>{{job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td> <td>{{job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td> <td>{{job.duration}} ms</td> @@ -127,7 +127,7 @@ limitations under the License. </tr> </thead> <tbody> - <tr ng-repeat="job in finishedJobs" ui-sref="single-job.plan.overview({ jobid: job.jid })"> + <tr ng-repeat="job in finishedJobs|orderBy:"'end-time'":true" ui-sref="single-job.plan.overview({ jobid: job.jid })"> <td>{{job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td> <td>{{job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td> <td>{{job.duration}} ms</td>