Return-Path: X-Original-To: apmail-flink-commits-archive@minotaur.apache.org Delivered-To: apmail-flink-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 108EA18BBF for ; Fri, 26 Feb 2016 12:31:39 +0000 (UTC) Received: (qmail 61740 invoked by uid 500); 26 Feb 2016 12:31:32 -0000 Delivered-To: apmail-flink-commits-archive@flink.apache.org Received: (qmail 61681 invoked by uid 500); 26 Feb 2016 12:31:32 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 61660 invoked by uid 99); 26 Feb 2016 12:31:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Feb 2016 12:31:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5477EDFCE0; Fri, 26 Feb 2016 12:31:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rmetzger@apache.org To: commits@flink.apache.org Date: Fri, 26 Feb 2016 12:31:35 -0000 Message-Id: <69f479269ce5480fa0f44de7d92e60b8@git.apache.org> In-Reply-To: <46828cb9d783437d82f0898ca6f749f9@git.apache.org> References: <46828cb9d783437d82f0898ca6f749f9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/8] flink git commit: [FLINK-3437] [web-dashboard] Fix UI router state for job plan [FLINK-3437] [web-dashboard] Fix UI router state for job plan Transitive dependency EvEmitter updated to 1.0.2 This closes #1661 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/ee76fc45 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/ee76fc45 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/ee76fc45 Branch: refs/heads/master Commit: ee76fc453cc2cf123e9733048214a17335efb963 Parents: db6fda6 Author: Greg Hogan Authored: Wed Feb 17 16:52:22 2016 +0000 Committer: Robert Metzger Committed: Fri Feb 26 11:32:00 2016 +0100 ---------------------------------------------------------------------- .../web-dashboard/app/partials/jobs/job.jade | 2 +- .../web-dashboard/app/scripts/index.coffee | 10 +- flink-runtime-web/web-dashboard/web/js/index.js | 89 +- .../web-dashboard/web/js/vendor.js | 1138 ++++++++++++------ .../web-dashboard/web/partials/jobs/job.html | 2 +- 5 files changed, 835 insertions(+), 406 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/ee76fc45/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade ---------------------------------------------------------------------- diff --git a/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade b/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade index 39a6a1c..d80beee 100644 --- 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') http://git-wip-us.apache.org/repos/asf/flink/blob/ee76fc45/flink-runtime-web/web-dashboard/app/scripts/index.coffee ---------------------------------------------------------------------- diff --git a/flink-runtime-web/web-dashboard/app/scripts/index.coffee b/flink-runtime-web/web-dashboard/app/scripts/index.coffee index 120e2d6..e7a4829 100644 --- 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"