AMBARI-20692. Add Ability to Pause An Upgrade In Progress (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/01e37277 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/01e37277 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/01e37277 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: 01e372770fb19ed50324846ce0e9ae080ae8fc01 Parents: 65d2f3f Author: Alex Antonenko <[email protected]> Authored: Thu Apr 6 19:07:15 2017 +0300 Committer: Alex Antonenko <[email protected]> Committed: Thu Apr 6 20:59:54 2017 +0300 ---------------------------------------------------------------------- ambari-web/app/routes/stack_upgrade_routes.js | 2 +- .../stack_upgrade/stack_upgrade_wizard.hbs | 47 ++++++++------------ ambari-web/test/views/main/service/menu_test.js | 10 ++--- .../test/views/main/service/service_test.js | 2 - 4 files changed, 22 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/01e37277/ambari-web/app/routes/stack_upgrade_routes.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/stack_upgrade_routes.js b/ambari-web/app/routes/stack_upgrade_routes.js index ea40a1b..42dc4dd 100644 --- a/ambari-web/app/routes/stack_upgrade_routes.js +++ b/ambari-web/app/routes/stack_upgrade_routes.js @@ -22,7 +22,7 @@ module.exports = App.WizardRoute.extend({ route: 'stack/upgrade', breadcrumbs: { - label: 'App.router.mainAdminStackAndUpgradeController.wizardModalTitle' + labelBindingPath: 'App.router.mainAdminStackAndUpgradeController.wizardModalTitle' }, enter: function (router) { http://git-wip-us.apache.org/repos/asf/ambari/blob/01e37277/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs index f82cca4..f6be5d1 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs @@ -38,6 +38,15 @@ <div class="task-list scrollable-block task-list-main-wrap"> {{#if view.isLoaded}} <div> + <div class="row"> + {{#if isDowngrade}} + <button + class="btn btn-default" {{action confirmPauseDowngrade target="view"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button> + {{else}} + <button + class="btn btn-default" {{action confirmPauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button> + {{/if}} + </div> {{#if view.runningItem}} <div class="panel panel-default details-box row"> <div class="row col-md-12"> @@ -80,11 +89,6 @@ {{#if view.isDowngradeAvailable}} <button class="btn btn-danger" {{bindAttr disabled="controller.requestInProgress"}} {{action confirmDowngrade view.failedItem target="controller"}}>{{t common.downgrade}}</button> {{/if}} - {{#if isDowngrade}} - <button class="btn btn-default" {{action confirmPauseDowngrade target="view"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button> - {{else}} - <button class="btn btn-default" {{action confirmPauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button> - {{/if}} {{#if view.failedItem.skippable}} <button class="btn btn-warning" {{bindAttr disabled="controller.requestInProgress"}} {{action continue view.failedItem target="view"}}>{{t admin.stackUpgrade.dialog.continue}}</button> {{/if}} @@ -107,14 +111,9 @@ {{#if view.isDowngradeAvailable}} <button class="btn btn-danger" {{bindAttr disabled="controller.requestInProgress"}} {{action confirmDowngrade view.manualItem target="controller"}}>{{t common.downgrade}}</button> {{/if}} - {{#if isDowngrade}} - <button class="btn btn-default" {{action confirmPauseDowngrade target="view"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button> - {{else}} - <button class="btn btn-default" {{action confirmPauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button> - {{/if}} - <button class="btn btn-success" {{bindAttr disabled="view.isManualProceedDisabled"}} {{action complete view.manualItem target="view"}}> - {{t common.proceed}} - </button> + <button class="btn btn-success" {{bindAttr disabled="view.isManualProceedDisabled"}} {{action complete view.manualItem target="view"}}> + {{t common.proceed}} + </button> </div> </div> {{/if}} @@ -187,17 +186,12 @@ {{#if view.isDowngradeAvailable}} <button class="btn btn-danger" {{bindAttr disabled="controller.requestInProgress"}} {{action confirmDowngrade view.manualItem target="controller"}}>{{t common.downgrade}}</button> {{/if}} - {{#if isDowngrade}} - <button class="btn btn-default" {{action confirmPauseDowngrade target="view"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button> - {{else}} - <button class="btn btn-default" {{action confirmPauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button> - {{/if}} {{#if view.isHoldingState}} <button class="btn btn-default" {{bindAttr disabled="controller.requestInProgress"}} {{action retry view.failedItem target="view"}}>{{t common.retry}}</button> {{else}} - <button class="btn btn-success" {{bindAttr disabled="view.isManualProceedDisabled"}} {{action complete view.manualItem target="view"}}> - {{t common.proceed}} - </button> + <button class="btn btn-success" {{bindAttr disabled="view.isManualProceedDisabled"}} {{action complete view.manualItem target="view"}}> + {{t common.proceed}} + </button> {{/if}} </div> </div> @@ -249,14 +243,9 @@ {{#if view.isDowngradeAvailable}} <button class="btn btn-danger" {{bindAttr disabled="controller.requestInProgress"}} {{action confirmDowngrade view.manualItem target="controller"}}>{{t common.downgrade}}</button> {{/if}} - {{#if isDowngrade}} - <button class="btn btn-default" {{action confirmPauseDowngrade target="view"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button> - {{else}} - <button class="btn btn-default" {{action confirmPauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button> - {{/if}} - <button class="btn btn-success" {{bindAttr disabled="view.isManualProceedDisabled"}} {{action complete view.manualItem target="view"}}> - {{t common.proceed}} - </button> + <button class="btn btn-success" {{bindAttr disabled="view.isManualProceedDisabled"}} {{action complete view.manualItem target="view"}}> + {{t common.proceed}} + </button> </div> </div> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/01e37277/ambari-web/test/views/main/service/menu_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/service/menu_test.js b/ambari-web/test/views/main/service/menu_test.js index f925f2c..6295b63 100644 --- a/ambari-web/test/views/main/service/menu_test.js +++ b/ambari-web/test/views/main/service/menu_test.js @@ -19,10 +19,6 @@ var App = require('app'); require('views/main/service/menu'); -function getView() { - return App.MainServiceMenuView.create(); -} - function getItemViewClass() { return App.MainServiceMenuView.create().get('itemViewClass').create({ content: Em.Object.create(), @@ -112,7 +108,7 @@ describe('App.MainServiceMenuView', function () { itemView.set('parentView.activeServiceId', 'S1'); expect(itemView.get('active')).to.be.equal('active'); }); - it('should return "active" ', function() { + it('should not return "active" ', function() { itemView.set('content.id', 'S1'); itemView.set('parentView.activeServiceId', 'S2'); expect(itemView.get('active')).to.be.empty; @@ -168,13 +164,13 @@ describe('App.MainServiceMenuView', function () { App.router.transitionTo.restore(); }); - it('App.router.set should be called', function() { + it('App.router.set should be called (routeToConfigs true)', function() { expect(App.router.set.calledWith('mainServiceItemController.routeToConfigs', true)).to.be.true; }); it('App.router.transitionTo should be called', function() { expect(App.router.transitionTo.calledWith('services.service.configs', Em.Object.create())).to.be.true; }); - it('App.router.set should be called', function() { + it('App.router.set should be called (routeToConfigs false)', function() { expect(App.router.set.calledWith('mainServiceItemController.routeToConfigs', false)).to.be.true; }); }); http://git-wip-us.apache.org/repos/asf/ambari/blob/01e37277/ambari-web/test/views/main/service/service_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/service/service_test.js b/ambari-web/test/views/main/service/service_test.js index 72c2f3e..fec2540 100644 --- a/ambari-web/test/views/main/service/service_test.js +++ b/ambari-web/test/views/main/service/service_test.js @@ -18,8 +18,6 @@ var App = require('app'); require('views/main/service/service'); -var testHelpers = require('test/helpers'); - describe('App.MainDashboardServiceHealthView', function () { var view;
