Repository: ambari Updated Branches: refs/heads/trunk 7b67b01cb -> d95e484b1
AMBARI-21879. Cluster version showing as Upgrade when INSTALL_FAILED (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d95e484b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d95e484b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d95e484b Branch: refs/heads/trunk Commit: d95e484b18768e61108cfc0cc690879d69334821 Parents: 7b67b01 Author: Alex Antonenko <aantone...@hortonworks.com> Authored: Tue Sep 5 17:15:33 2017 +0300 Committer: Alex Antonenko <aantone...@hortonworks.com> Committed: Tue Sep 5 17:15:33 2017 +0300 ---------------------------------------------------------------------- .../stack_upgrade/upgrade_version_box_view.js | 64 +++++++++++--------- .../upgrade_version_box_view_test.js | 34 ++--------- 2 files changed, 42 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d95e484b/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 87e843b..1a2cc60 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 @@ -261,38 +261,46 @@ App.UpgradeVersionBoxView = Em.View.extend({ if (Em.get(currentVersion, 'stack_name') !== this.get('content.stackVersionType') || isVersionHigherThanCurrent) { var isDisabled = this.isDisabledOnInstalled(); - element.set('isButtonGroup', true); - if (status === 'OUT_OF_SYNC') { - element.set('text', this.get('isVersionColumnView') ? Em.I18n.t('common.reinstall') : Em.I18n.t('admin.stackVersions.version.reinstall')); - element.set('action', 'installRepoVersionConfirmation'); - element.get('buttons').pushObject({ - text: this.get('isVersionColumnView') ? Em.I18n.t('common.upgrade') : Em.I18n.t('admin.stackVersions.version.performUpgrade'), - action: 'confirmUpgrade', - isDisabled: isDisabled - }); - } else { - var isVersionColumnView = this.get('isVersionColumnView'); - element.set('text', isVersionColumnView ? Em.I18n.t('common.upgrade') : Em.I18n.t('admin.stackVersions.version.performUpgrade')); - element.set('action', 'confirmUpgrade'); - element.get('buttons').pushObject({ - text: isVersionColumnView ? Em.I18n.t('common.reinstall') : Em.I18n.t('admin.stackVersions.version.reinstall'), - action: 'installRepoVersionConfirmation', - isDisabled: isDisabled - }); - - element.get('buttons').pushObject({ - text: Em.I18n.t('admin.stackVersions.version.preUpgradeCheck'), - action: 'showUpgradeOptions', - isDisabled: isDisabled - }); + switch (status){ + case 'OUT_OF_SYNC': + element.set('isButtonGroup', true); + element.set('text', this.get('isVersionColumnView') ? Em.I18n.t('common.reinstall') : Em.I18n.t('admin.stackVersions.version.reinstall')); + element.set('action', 'installRepoVersionConfirmation'); + element.get('buttons').pushObject({ + text: this.get('isVersionColumnView') ? Em.I18n.t('common.upgrade') : Em.I18n.t('admin.stackVersions.version.performUpgrade'), + action: 'confirmUpgrade', + isDisabled: isDisabled + }); + break; + case 'INSTALL_FAILED': + element.set('isButton', true); + element.set('text', this.get('isVersionColumnView') ? Em.I18n.t('common.reinstall') : Em.I18n.t('admin.stackVersions.version.reinstall')); + element.set('action', 'installRepoVersionConfirmation'); + break; + default: + var isVersionColumnView = this.get('isVersionColumnView'); + element.set('isButtonGroup', true); + element.set('text', isVersionColumnView ? Em.I18n.t('common.upgrade') : Em.I18n.t('admin.stackVersions.version.performUpgrade')); + element.set('action', 'confirmUpgrade'); + element.get('buttons').pushObject({ + text: isVersionColumnView ? Em.I18n.t('common.reinstall') : Em.I18n.t('admin.stackVersions.version.reinstall'), + action: 'installRepoVersionConfirmation', + isDisabled: isDisabled + }); - if (this.get('content.isPatch')) { element.get('buttons').pushObject({ - text: Em.I18n.t('common.discard'), - action: 'confirmDiscardRepoVersion', + text: Em.I18n.t('admin.stackVersions.version.preUpgradeCheck'), + action: 'showUpgradeOptions', isDisabled: isDisabled }); - } + + if (this.get('content.isPatch')) { + element.get('buttons').pushObject({ + text: Em.I18n.t('common.discard'), + action: 'confirmDiscardRepoVersion', + isDisabled: isDisabled + }); + } } element.set('isDisabled', isDisabled); } http://git-wip-us.apache.org/repos/asf/ambari/blob/d95e484b/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 acad709..5b0ce86 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 @@ -545,20 +545,9 @@ describe('App.UpgradeVersionBoxView', function () { }, expected: { status: 'INSTALL_FAILED', - isButtonGroup: true, - buttons: [{ - text: Em.I18n.t('admin.stackVersions.version.reinstall'), - action: 'installRepoVersionConfirmation', - isDisabled: true - }, - { - text: Em.I18n.t('admin.stackVersions.version.preUpgradeCheck'), - action: 'showUpgradeOptions', - isDisabled: true - }], - text: Em.I18n.t('admin.stackVersions.version.performUpgrade'), - action: 'confirmUpgrade', - isDisabled: true + isButton: true, + text: Em.I18n.t('admin.stackVersions.version.reinstall'), + action: 'installRepoVersionConfirmation', }, title: 'INSTALL_FAILED state, no admin access, request in progress, another installation running' }, @@ -587,20 +576,9 @@ describe('App.UpgradeVersionBoxView', function () { }, expected: { status: 'INSTALL_FAILED', - isButtonGroup: true, - buttons: [{ - text: Em.I18n.t('admin.stackVersions.version.reinstall'), - action: 'installRepoVersionConfirmation', - isDisabled: true - }, - { - text: Em.I18n.t('admin.stackVersions.version.preUpgradeCheck'), - action: 'showUpgradeOptions', - isDisabled: true - }], - text: Em.I18n.t('admin.stackVersions.version.performUpgrade'), - action: 'confirmUpgrade', - isDisabled: true + isButton: true, + text: Em.I18n.t('admin.stackVersions.version.reinstall'), + action: 'installRepoVersionConfirmation', }, title: 'INSTALL_FAILED state, no admin access, no requests in progress, another installation running' },
