AMBARI-22111. UI displays Patch version even after full stack upgrade (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/60620144 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/60620144 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/60620144 Branch: refs/heads/branch-feature-AMBARI-20859 Commit: 60620144aabb6315c9906a46a793132f12bda15a Parents: 86afb7c Author: Alex Antonenko <[email protected]> Authored: Mon Oct 2 21:48:47 2017 +0300 Committer: Alex Antonenko <[email protected]> Committed: Mon Oct 2 21:48:47 2017 +0300 ---------------------------------------------------------------------- .../admin/stack_upgrade/upgrade_version_box_view.js | 14 ++++++++++---- .../stack_upgrade/upgrade_version_box_view_test.js | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/60620144/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 b37a094..212ef3d 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 @@ -135,7 +135,7 @@ App.UpgradeVersionBoxView = Em.View.extend({ }, 'INSTALLED': { iconClass: 'glyphicon glyphicon-ok', - isLink: true, + isButtonGroup: true, text: Em.I18n.t('common.installed'), action: null }, @@ -261,9 +261,8 @@ App.UpgradeVersionBoxView = Em.View.extend({ this.get('content.repositoryVersion'), Em.get(currentVersion, 'repository_version') ) === 1; - + var isDisabled = this.isDisabledOnInstalled(); if (Em.get(currentVersion, 'stack_name') !== this.get('content.stackVersionType') || isVersionHigherThanCurrent) { - var isDisabled = this.isDisabledOnInstalled(); switch (status){ case 'OUT_OF_SYNC': element.set('isButtonGroup', true); @@ -297,7 +296,7 @@ App.UpgradeVersionBoxView = Em.View.extend({ isDisabled: isDisabled }); - if (this.get('content.isPatch')) { + if (this.get('content.isPatch') || this.get('content.isMaint')) { element.get('buttons').pushObject({ text: Em.I18n.t('common.hide'), action: 'confirmDiscardRepoVersion', @@ -309,6 +308,13 @@ App.UpgradeVersionBoxView = Em.View.extend({ } else { element.setProperties(this.get('statePropertiesMap')['INSTALLED']); + if (this.get('content.isPatch') || this.get('content.isMaint')) { + element.get('buttons').pushObject({ + text: Em.I18n.t('common.hide'), + action: 'confirmDiscardRepoVersion', + isDisabled: isDisabled + }); + } } }, http://git-wip-us.apache.org/repos/asf/ambari/blob/60620144/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 174f51c..854e734 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 @@ -681,7 +681,7 @@ describe('App.UpgradeVersionBoxView', function () { }, expected: { status: 'INSTALLED', - isLink: true, + isButtonGroup: true, iconClass: 'glyphicon glyphicon-ok', text: Em.I18n.t('common.installed'), action: null @@ -1377,7 +1377,7 @@ describe('App.UpgradeVersionBoxView', function () { expect(element).to.be.eql(Em.Object.create({ "action": null, "iconClass": "glyphicon glyphicon-ok", - "isLink": true, + "isButtonGroup": true, "text": "Installed" })); });
