[31/50] [abbrv] ambari git commit: AMBARI-21704 Upgrade Wizard Has Incorrect Title. (atkach)
AMBARI-21704 Upgrade Wizard Has Incorrect Title. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6b523208
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6b523208
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6b523208
Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 6b5232088c87d07eaa8b740d12a35c3d1b171590
Parents: 8f0bcc0
Author: Andrii Tkach
Authored: Mon Aug 28 13:10:39 2017 +0300
Committer: Andrii Tkach
Committed: Mon Aug 28 13:10:39 2017 +0300
--
.../main/admin/stack_and_upgrade_controller.js | 59 ++--
ambari-web/app/messages.js | 9 +--
ambari-web/app/utils/ajax/ajax.js | 2 +-
.../stack_upgrade/upgrade_version_box_view.js | 11 ++--
.../admin/stack_and_upgrade_controller_test.js | 39 +
.../upgrade_version_box_view_test.js| 6 +-
6 files changed, 86 insertions(+), 40 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b523208/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index b33c55d..f02c5f3 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -151,12 +151,33 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
* @type {string}
*/
wizardModalTitle: function () {
-if (this.get('isDowngrade')) {
- return
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(this.get('upgradeVersion'));
-}
-return
Em.I18n.t('admin.stackUpgrade.dialog.header').format(this.get('upgradeVersion'));
+var repoVersion =
App.RepositoryVersion.find().findProperty('repositoryVersion',
this.get('toVersion'));
+return this.getUpgradeDowngradeHeader(
+ this.get('upgradeTypeDisplayName'),
+ this.get('upgradeVersion'),
+ this.get('isDowngrade'),
+ repoVersion && repoVersion.get('isPatch')
+);
}.property('upgradeTypeDisplayName', 'upgradeVersion', 'isDowngrade'),
+
+ /**
+ * @param {string} upgradeType
+ * @param {string} upgradeVersion
+ * @param {boolean} isDowngrade
+ * @param {boolean} isPatch
+ * @returns {string}
+ */
+ getUpgradeDowngradeHeader: function(upgradeType, upgradeVersion,
isDowngrade, isPatch) {
+if (isDowngrade) {
+ return
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(upgradeVersion);
+}
+if (isPatch) {
+ return
Em.I18n.t('admin.stackUpgrade.dialog.upgrade.patch.header').format(upgradeType,
upgradeVersion);
+}
+return
Em.I18n.t('admin.stackUpgrade.dialog.upgrade.header').format(upgradeType,
upgradeVersion);
+ },
+
/**
* methods through which cluster could be upgraded, "allowed" indicated if
the method is allowed
* by stack upgrade path
@@ -258,6 +279,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
'fromVersion',
'upgradeId',
'upgradeVersion',
+'toVersion',
'currentVersion',
'upgradeTypeDisplayName',
'upgradeType',
@@ -687,7 +709,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
},
Em.I18n.t('admin.stackUpgrade.downgrade.body').format(currentVersion.repository_name),
null,
-
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(currentVersion.repository_name),
+
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(this.get('upgradeVersion')),
Em.I18n.t('admin.stackUpgrade.downgrade.proceed')
);
},
@@ -736,7 +758,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
sender: this,
data: {
value: currentVersion.repository_version,
-label: currentVersion.repository_name,
+label: this.get('upgradeVersion'),
id: currentVersion.id,
isDowngrade: true,
upgradeType: this.get('upgradeType')
@@ -897,7 +919,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
upgradeSuccessCallback: function (data, opt, params) {
this.set('upgradeData', null);
this.set('upgradeId', data.resources[0].Upgrade.request_id);
-this.set('fromVersion', params.isDowngrade ?
data.resources[0].Upgrade.associated_version : null);
+this.set('toVersion', params.value);
this.set('upgradeVersion', params.label);
this.set('isDowngrade', !!params.isDowngrade);
var upgradeMethod = this.get('upgradeMethods').findProperty('type',
params.type)
ambari git commit: AMBARI-21704 Upgrade Wizard Has Incorrect Title. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 8f0bcc019 -> 6b5232088
AMBARI-21704 Upgrade Wizard Has Incorrect Title. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6b523208
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6b523208
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6b523208
Branch: refs/heads/trunk
Commit: 6b5232088c87d07eaa8b740d12a35c3d1b171590
Parents: 8f0bcc0
Author: Andrii Tkach
Authored: Mon Aug 28 13:10:39 2017 +0300
Committer: Andrii Tkach
Committed: Mon Aug 28 13:10:39 2017 +0300
--
.../main/admin/stack_and_upgrade_controller.js | 59 ++--
ambari-web/app/messages.js | 9 +--
ambari-web/app/utils/ajax/ajax.js | 2 +-
.../stack_upgrade/upgrade_version_box_view.js | 11 ++--
.../admin/stack_and_upgrade_controller_test.js | 39 +
.../upgrade_version_box_view_test.js| 6 +-
6 files changed, 86 insertions(+), 40 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b523208/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index b33c55d..f02c5f3 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -151,12 +151,33 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
* @type {string}
*/
wizardModalTitle: function () {
-if (this.get('isDowngrade')) {
- return
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(this.get('upgradeVersion'));
-}
-return
Em.I18n.t('admin.stackUpgrade.dialog.header').format(this.get('upgradeVersion'));
+var repoVersion =
App.RepositoryVersion.find().findProperty('repositoryVersion',
this.get('toVersion'));
+return this.getUpgradeDowngradeHeader(
+ this.get('upgradeTypeDisplayName'),
+ this.get('upgradeVersion'),
+ this.get('isDowngrade'),
+ repoVersion && repoVersion.get('isPatch')
+);
}.property('upgradeTypeDisplayName', 'upgradeVersion', 'isDowngrade'),
+
+ /**
+ * @param {string} upgradeType
+ * @param {string} upgradeVersion
+ * @param {boolean} isDowngrade
+ * @param {boolean} isPatch
+ * @returns {string}
+ */
+ getUpgradeDowngradeHeader: function(upgradeType, upgradeVersion,
isDowngrade, isPatch) {
+if (isDowngrade) {
+ return
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(upgradeVersion);
+}
+if (isPatch) {
+ return
Em.I18n.t('admin.stackUpgrade.dialog.upgrade.patch.header').format(upgradeType,
upgradeVersion);
+}
+return
Em.I18n.t('admin.stackUpgrade.dialog.upgrade.header').format(upgradeType,
upgradeVersion);
+ },
+
/**
* methods through which cluster could be upgraded, "allowed" indicated if
the method is allowed
* by stack upgrade path
@@ -258,6 +279,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
'fromVersion',
'upgradeId',
'upgradeVersion',
+'toVersion',
'currentVersion',
'upgradeTypeDisplayName',
'upgradeType',
@@ -687,7 +709,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
},
Em.I18n.t('admin.stackUpgrade.downgrade.body').format(currentVersion.repository_name),
null,
-
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(currentVersion.repository_name),
+
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(this.get('upgradeVersion')),
Em.I18n.t('admin.stackUpgrade.downgrade.proceed')
);
},
@@ -736,7 +758,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
sender: this,
data: {
value: currentVersion.repository_version,
-label: currentVersion.repository_name,
+label: this.get('upgradeVersion'),
id: currentVersion.id,
isDowngrade: true,
upgradeType: this.get('upgradeType')
@@ -897,7 +919,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
upgradeSuccessCallback: function (data, opt, params) {
this.set('upgradeData', null);
this.set('upgradeId', data.resources[0].Upgrade.request_id);
-this.set('fromVersion', params.isDowngrade ?
data.resources[0].Upgrade.associated_version : null);
+this.set('toVersion', params.value);
this.set('upgradeVersion', params.label);
this.set('isDowngrade', !!params.isDowngrade);
var upgradeMethod = th
[02/21] ambari git commit: AMBARI-21704 Upgrade Wizard Has Incorrect Title. (atkach)
AMBARI-21704 Upgrade Wizard Has Incorrect Title. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9232f35c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9232f35c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9232f35c
Branch: refs/heads/branch-2.6
Commit: 9232f35cb8d8223854abb988299c517af387fc92
Parents: 83e9d89
Author: Andrii Tkach
Authored: Thu Aug 10 19:31:06 2017 +0300
Committer: Andrii Tkach
Committed: Thu Aug 10 20:40:32 2017 +0300
--
.../main/admin/stack_and_upgrade_controller.js | 59 ++--
ambari-web/app/messages.js | 9 +--
ambari-web/app/routes/stack_upgrade_routes.js | 9 +--
ambari-web/app/utils/ajax/ajax.js | 2 +-
.../stack_upgrade/upgrade_version_box_view.js | 11 ++--
.../admin/stack_and_upgrade_controller_test.js | 39 +
.../upgrade_version_box_view_test.js| 6 +-
7 files changed, 87 insertions(+), 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9232f35c/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index d3bcb45..740562c 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -133,12 +133,33 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
* @type {string}
*/
wizardModalTitle: function () {
-if (this.get('isDowngrade')) {
- return
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(this.get('upgradeVersion'));
-}
-return
Em.I18n.t('admin.stackUpgrade.dialog.header').format(this.get('upgradeVersion'));
+var repoVersion =
App.RepositoryVersion.find().findProperty('repositoryVersion',
this.get('toVersion'));
+return this.getUpgradeDowngradeHeader(
+ this.get('upgradeTypeDisplayName'),
+ this.get('upgradeVersion'),
+ this.get('isDowngrade'),
+ repoVersion && repoVersion.get('isPatch')
+);
}.property('upgradeTypeDisplayName', 'upgradeVersion', 'isDowngrade'),
+
+ /**
+ * @param {string} upgradeType
+ * @param {string} upgradeVersion
+ * @param {boolean} isDowngrade
+ * @param {boolean} isPatch
+ * @returns {string}
+ */
+ getUpgradeDowngradeHeader: function(upgradeType, upgradeVersion,
isDowngrade, isPatch) {
+if (isDowngrade) {
+ return
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(upgradeVersion);
+}
+if (isPatch) {
+ return
Em.I18n.t('admin.stackUpgrade.dialog.upgrade.patch.header').format(upgradeType,
upgradeVersion);
+}
+return
Em.I18n.t('admin.stackUpgrade.dialog.upgrade.header').format(upgradeType,
upgradeVersion);
+ },
+
/**
* methods through which cluster could be upgraded, "allowed" indicated if
the method is allowed
* by stack upgrade path
@@ -239,6 +260,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
wizardStorageProperties: [
'upgradeId',
'upgradeVersion',
+'toVersion',
'currentVersion',
'upgradeTypeDisplayName',
'upgradeType',
@@ -665,7 +687,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
},
Em.I18n.t('admin.stackUpgrade.downgrade.body').format(currentVersion.repository_name),
null,
-
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(currentVersion.repository_name),
+
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(this.get('upgradeVersion')),
Em.I18n.t('admin.stackUpgrade.downgrade.proceed')
);
},
@@ -714,7 +736,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
sender: this,
data: {
value: currentVersion.repository_version,
-label: currentVersion.repository_name,
+label: this.get('upgradeVersion'),
id: currentVersion.id,
isDowngrade: true,
upgradeType: this.get('upgradeType')
@@ -875,7 +897,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
upgradeSuccessCallback: function (data, opt, params) {
this.set('upgradeData', null);
this.set('upgradeId', data.resources[0].Upgrade.request_id);
-this.set('fromVersion', params.isDowngrade ?
data.resources[0].Upgrade.associated_version : null);
+this.set('toVersion', params.value);
this.set('upgradeVersion', params.label);
this.set('isDowngrade', !!params.isDowngrade);
var upgradeMethod = this.get('
ambari git commit: AMBARI-21704 Upgrade Wizard Has Incorrect Title. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-feature-AMBARI-21450 83e9d89f2 -> 9232f35cb
AMBARI-21704 Upgrade Wizard Has Incorrect Title. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9232f35c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9232f35c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9232f35c
Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 9232f35cb8d8223854abb988299c517af387fc92
Parents: 83e9d89
Author: Andrii Tkach
Authored: Thu Aug 10 19:31:06 2017 +0300
Committer: Andrii Tkach
Committed: Thu Aug 10 20:40:32 2017 +0300
--
.../main/admin/stack_and_upgrade_controller.js | 59 ++--
ambari-web/app/messages.js | 9 +--
ambari-web/app/routes/stack_upgrade_routes.js | 9 +--
ambari-web/app/utils/ajax/ajax.js | 2 +-
.../stack_upgrade/upgrade_version_box_view.js | 11 ++--
.../admin/stack_and_upgrade_controller_test.js | 39 +
.../upgrade_version_box_view_test.js| 6 +-
7 files changed, 87 insertions(+), 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9232f35c/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index d3bcb45..740562c 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -133,12 +133,33 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
* @type {string}
*/
wizardModalTitle: function () {
-if (this.get('isDowngrade')) {
- return
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(this.get('upgradeVersion'));
-}
-return
Em.I18n.t('admin.stackUpgrade.dialog.header').format(this.get('upgradeVersion'));
+var repoVersion =
App.RepositoryVersion.find().findProperty('repositoryVersion',
this.get('toVersion'));
+return this.getUpgradeDowngradeHeader(
+ this.get('upgradeTypeDisplayName'),
+ this.get('upgradeVersion'),
+ this.get('isDowngrade'),
+ repoVersion && repoVersion.get('isPatch')
+);
}.property('upgradeTypeDisplayName', 'upgradeVersion', 'isDowngrade'),
+
+ /**
+ * @param {string} upgradeType
+ * @param {string} upgradeVersion
+ * @param {boolean} isDowngrade
+ * @param {boolean} isPatch
+ * @returns {string}
+ */
+ getUpgradeDowngradeHeader: function(upgradeType, upgradeVersion,
isDowngrade, isPatch) {
+if (isDowngrade) {
+ return
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(upgradeVersion);
+}
+if (isPatch) {
+ return
Em.I18n.t('admin.stackUpgrade.dialog.upgrade.patch.header').format(upgradeType,
upgradeVersion);
+}
+return
Em.I18n.t('admin.stackUpgrade.dialog.upgrade.header').format(upgradeType,
upgradeVersion);
+ },
+
/**
* methods through which cluster could be upgraded, "allowed" indicated if
the method is allowed
* by stack upgrade path
@@ -239,6 +260,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
wizardStorageProperties: [
'upgradeId',
'upgradeVersion',
+'toVersion',
'currentVersion',
'upgradeTypeDisplayName',
'upgradeType',
@@ -665,7 +687,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
},
Em.I18n.t('admin.stackUpgrade.downgrade.body').format(currentVersion.repository_name),
null,
-
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(currentVersion.repository_name),
+
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(this.get('upgradeVersion')),
Em.I18n.t('admin.stackUpgrade.downgrade.proceed')
);
},
@@ -714,7 +736,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
sender: this,
data: {
value: currentVersion.repository_version,
-label: currentVersion.repository_name,
+label: this.get('upgradeVersion'),
id: currentVersion.id,
isDowngrade: true,
upgradeType: this.get('upgradeType')
@@ -875,7 +897,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
upgradeSuccessCallback: function (data, opt, params) {
this.set('upgradeData', null);
this.set('upgradeId', data.resources[0].Upgrade.request_id);
-this.set('fromVersion', params.isDowngrade ?
data.resources[0].Upgrade.associated_version : null);
+this.set('toVersion', params.value);
this.set(
