[FLINK-3437] [web-dashboard] Fix UI router state for job plan

Transitive dependency EvEmitter updated to 1.0.2 This closes apache#1661
ScapeQin · Feb 26, 2016 · ee76fc4 · ee76fc4
1 parent db6fda6
commit ee76fc4
Show file tree

Hide file tree

Showing 5 changed files with 835 additions and 406 deletions.
diff --git a/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade b/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade
@@ -50,7 +50,7 @@ nav.navbar.navbar-default.navbar-fixed-top.navbar-main(ng-if="job")
 nav.navbar.navbar-default.navbar-fixed-top.navbar-main-additional(ng-if="job")
   ul.nav.nav-tabs
     li(ui-sref-active='active')
-      a(ui-sref=".plan.subtasks") Plan
+      a(ui-sref=".plan") Plan
 
     //- li(ui-sref-active='active' ng-if="job['end-time'] > -1")
     li(ui-sref-active='active')

diff --git a/flink-runtime-web/web-dashboard/app/scripts/index.coffee b/flink-runtime-web/web-dashboard/app/scripts/index.coffee
@@ -54,6 +54,14 @@ angular.module('flinkApp', ['ui.router', 'angularMoment'])
 
 # --------------------------------------
 
+.run ($rootScope, $state) ->
+  $rootScope.$on '$stateChangeStart', (event, toState, toParams, fromState) ->
+    if toState.redirectTo
+      event.preventDefault()
+      $state.go toState.redirectTo, toParams
+
+# --------------------------------------
+
 .config ($stateProvider, $urlRouterProvider) ->
   $stateProvider.state "overview",
     url: "/overview"
@@ -86,7 +94,7 @@ angular.module('flinkApp', ['ui.router', 'angularMoment'])
 
   .state "single-job.plan",
     url: ""
-    abstract: true
+    redirectTo: "single-job.plan.subtasks"
     views:
       details:
         templateUrl: "partials/jobs/job.plan.html"

diff --git a/flink-runtime-web/web-dashboard/web/js/index.js b/flink-runtime-web/web-dashboard/web/js/index.js