Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9221618E69 for ; Wed, 22 Jul 2015 14:02:30 +0000 (UTC) Received: (qmail 75583 invoked by uid 500); 22 Jul 2015 14:02:27 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 75484 invoked by uid 500); 22 Jul 2015 14:02:27 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 75396 invoked by uid 99); 22 Jul 2015 14:02:27 -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; Wed, 22 Jul 2015 14:02:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5C075E33CA; Wed, 22 Jul 2015 14:02:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alexantonenko@apache.org To: commits@ambari.apache.org Date: Wed, 22 Jul 2015 14:02:29 -0000 Message-Id: <8e538dab3c534c5391b3f73894ffec33@git.apache.org> In-Reply-To: <557e0dc87a0341329a2353650906be2c@git.apache.org> References: <557e0dc87a0341329a2353650906be2c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] ambari git commit: AMBARI-12494. Editing repo versions URLs is enabled regardless of version status (alexantonenko) AMBARI-12494. Editing repo versions URLs is enabled regardless of version status (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2605a845 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2605a845 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2605a845 Branch: refs/heads/trunk Commit: 2605a8450aef54a387cd651432db944c96dd8b8f Parents: 81bfa8c Author: Alex Antonenko Authored: Wed Jul 22 14:30:36 2015 +0300 Committer: Alex Antonenko Committed: Wed Jul 22 17:02:22 2015 +0300 ---------------------------------------------------------------------- .../admin/stack_upgrade/upgrade_version_box.hbs | 2 +- .../stack_upgrade/upgrade_version_box_view.js | 6 +- .../upgrade_version_box_view_test.js | 85 +++++++++++++++++--- 3 files changed, 80 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2605a845/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs index 2e037d1..be5df49 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs @@ -20,7 +20,7 @@ {{/if}} -

+

{{view.content.displayName}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2605a845/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js index 25be6e2..6ea53ac 100644 --- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js +++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js @@ -49,6 +49,10 @@ App.UpgradeVersionBoxView = Em.View.extend({ return (this.get('controller.upgradeVersion') === this.get('content.displayName') && App.get('upgradeState') !== 'INIT'); }.property('App.upgradeState', 'content.displayName', 'controller.upgradeVersion'), + isRepoUrlsEditDisabled: function () { + return ['INSTALLING', 'UPGRADING'].contains(this.get('content.status')) || this.get('isUpgrading'); + }.property('content.status', 'isUpgrading'), + /** * @type {string} */ @@ -239,7 +243,7 @@ App.UpgradeVersionBoxView = Em.View.extend({ }) }); - return App.ModalPopup.show({ + return this.get('isRepoUrlsEditDisabled') ? null : App.ModalPopup.show({ classNames: ['repository-list', 'sixty-percent-width-modal'], skipValidation: false, autoHeight: false, http://git-wip-us.apache.org/repos/asf/ambari/blob/2605a845/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js index 080bf39..7654411 100644 --- a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js +++ b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js @@ -21,14 +21,19 @@ var App = require('app'); require('views/main/admin/stack_upgrade/upgrade_version_box_view'); describe('App.UpgradeVersionBoxView', function () { - var view = App.UpgradeVersionBoxView.create({ - controller: Em.Object.create({ - upgrade: Em.K - }), - content: Em.Object.create(), - parentView: Em.Object.create({ - repoVersions: [] - }) + + var view; + + beforeEach(function () { + view = App.UpgradeVersionBoxView.create({ + controller: Em.Object.create({ + upgrade: Em.K + }), + content: Em.Object.create(), + parentView: Em.Object.create({ + repoVersions: [] + }) + }); }); describe("#isUpgrading", function () { @@ -212,6 +217,18 @@ describe('App.UpgradeVersionBoxView', function () { }); describe("#editRepositories()", function () { + var cases = [ + { + isRepoUrlsEditDisabled: true, + popupShowCallCount: 0, + title: 'edit repo URLS disabled, popup shouldn\'t be shown' + }, + { + isRepoUrlsEditDisabled: false, + popupShowCallCount: 1, + title: 'edit repo URLS enabled, popup should be shown' + } + ]; beforeEach(function () { sinon.stub(App.RepositoryVersion, 'find').returns(Em.Object.create({ operatingSystems: [] @@ -222,9 +239,14 @@ describe('App.UpgradeVersionBoxView', function () { App.RepositoryVersion.find.restore(); App.ModalPopup.show.restore(); }); - it("show popup", function () { - view.editRepositories(); - expect(App.ModalPopup.show.calledOnce).to.be.true; + cases.forEach(function (item) { + it(item.title, function () { + view.reopen({ + isRepoUrlsEditDisabled: item.isRepoUrlsEditDisabled + }); + view.editRepositories(); + expect(App.ModalPopup.show.callCount).to.equal(item.popupShowCallCount); + }); }); }); @@ -767,4 +789,45 @@ describe('App.UpgradeVersionBoxView', function () { }); + describe('#isRepoUrlsEditDisabled', function () { + + var cases = [ + { + status: 'INSTALLING', + isUpgrading: false, + isRepoUrlsEditDisabled: true, + title: 'installing packages' + }, + { + status: 'UPGRADING', + isUpgrading: true, + isRepoUrlsEditDisabled: true, + title: 'upgrading' + }, + { + status: 'INSTALLED', + isUpgrading: true, + isRepoUrlsEditDisabled: true, + title: 'upgrading just started' + }, + { + status: 'INIT', + isUpgrading: false, + isRepoUrlsEditDisabled: false, + title: 'neither upgrading nor installing packages' + } + ]; + + cases.forEach(function (item) { + it(item.title, function () { + view.reopen({ + isUpgrading: item.isUpgrading + }); + view.set('content.status', item.status); + expect(view.get('isRepoUrlsEditDisabled')).to.equal(item.isRepoUrlsEditDisabled); + }); + }); + + }); + });