[39/50] [abbrv] ambari git commit: AMBARI-22157. Web Client Should Never List Any Upgrade Actions On Only Stack In System (alexantonenko)

2017-10-09 Thread jluniya 
AMBARI-22157. Web Client Should Never List Any Upgrade Actions On Only Stack In 
System (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fab2aa3c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fab2aa3c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fab2aa3c

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: fab2aa3c62e3dbe5cce795ca50c4b61baee1d19e
Parents: 7172655
Author: Alex Antonenko 
Authored: Fri Oct 6 16:35:29 2017 +0300
Committer: Alex Antonenko 
Committed: Fri Oct 6 16:35:29 2017 +0300

--
 .../stack_upgrade/upgrade_version_box_view.js   | 13 --
 .../upgrade_version_box_view_test.js| 44 ++--
 2 files changed, 49 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fab2aa3c/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 28f4f32..355ad88 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
@@ -199,7 +199,8 @@ App.UpgradeVersionBoxView = Em.View.extend({
 'isUpgrading',
 'controller.requestInProgress',
 'controller.requestInProgressRepoId',
-'parentView.repoVersions.@each.status'
+'parentView.repoVersions.@each.status',
+'isCurrentStackPresent'
   ),
 
   /**
@@ -208,6 +209,7 @@ App.UpgradeVersionBoxView = Em.View.extend({
*/
   isDisabledOnInit: function() {
 return  this.get('controller.requestInProgress') ||
+!this.get('isCurrentStackPresent') ||
 !this.get('content.isCompatible') ||
 (App.get('upgradeIsRunning') && !App.get('upgradeSuspended')) ||
 this.get('parentView.repoVersions').someProperty('status', 
'INSTALLING');
@@ -312,8 +314,6 @@ App.UpgradeVersionBoxView = Em.View.extend({
 });
   }
 
-
-
   }
   element.set('isDisabled', isDisabled);
 }
@@ -357,7 +357,8 @@ App.UpgradeVersionBoxView = Em.View.extend({
* @returns {boolean}
*/
   isDisabledOnInstalled: function() {
-return !App.isAuthorized('CLUSTER.UPGRADE_DOWNGRADE_STACK') ||
+return !this.get('isCurrentStackPresent') ||
+  !App.isAuthorized('CLUSTER.UPGRADE_DOWNGRADE_STACK') ||
   this.get('controller.requestInProgress') ||
   this.get('parentView.repoVersions').someProperty('status', 'INSTALLING') 
||
   (this.get('controller.isDowngrade') &&
@@ -392,6 +393,10 @@ App.UpgradeVersionBoxView = Em.View.extend({
 $('.out-of-sync-badge').tooltip('destroy');
   },
 
+  isCurrentStackPresent: 
Ember.computed('parentView.repoVersions.@each.stackVersion.state', function () {
+return 
this.get('parentView.repoVersions').someProperty('stackVersion.state', 
'CURRENT');
+  }),
+
   /**
* run custom action of controller
*/

http://git-wip-us.apache.org/repos/asf/ambari/blob/fab2aa3c/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 506fb81..9bee7af 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
@@ -29,6 +29,7 @@ describe('App.UpgradeVersionBoxView', function () {
 sinon.stub(App.db, 'getFilterConditions', function () {return [];});
 view = App.UpgradeVersionBoxView.create({
   initFilters: Em.K,
+  isCurrentStackPresent: true,
   controller: Em.Object.create({
 upgrade: Em.K,
 getRepoVersionInstallId: Em.K,
@@ -1103,6 +1104,7 @@ describe('App.UpgradeVersionBoxView', function () {
 upgradeSuspended: true,
 status: 'INSTALLED',
 isCompatible: true,
+isCurrentStackPresent: true,
 expected: true
   },
   {
@@ -,6 +1113,7 @@ describe('App.UpgradeVersionBoxView', function () {
 upgradeSuspended: false,
 status: 'INSTALLED',
 isCompatible: true,
+isCurrentStackPresent: true,
 expected: true
   },
   {
@@ -1119,6 +1122,7 @@ describe('App.UpgradeVersionBoxView', function () {
 upgradeSuspended: false,
 status: 'INSTALLING',
 isCompatible: true,
+isCurrentStackPresent: true,

ambari git commit: AMBARI-22157. Web Client Should Never List Any Upgrade Actions On Only Stack In System (alexantonenko)

2017-10-06 Thread alexantonenko 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 6bfcb838e -> 5eab1a569


AMBARI-22157. Web Client Should Never List Any Upgrade Actions On Only Stack In 
System (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5eab1a56
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5eab1a56
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5eab1a56

Branch: refs/heads/branch-2.6
Commit: 5eab1a569c4316efe9a5adc9f843a0e015ff4e1f
Parents: 6bfcb83
Author: Alex Antonenko 
Authored: Fri Oct 6 16:36:26 2017 +0300
Committer: Alex Antonenko 
Committed: Fri Oct 6 16:36:26 2017 +0300

--
 .../stack_upgrade/upgrade_version_box_view.js   | 13 --
 .../upgrade_version_box_view_test.js| 44 ++--
 2 files changed, 49 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5eab1a56/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 95bdcc0..67dd498 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
@@ -203,7 +203,8 @@ App.UpgradeVersionBoxView = Em.View.extend({
 'controller.requestInProgressRepoId',
 'parentView.repoVersions.@each.status',
 'App.currentStackName',
-'App.upgradeIsRunning'
+'App.upgradeIsRunning',
+'isCurrentStackPresent'
   ),
 
   /**
@@ -305,8 +306,6 @@ App.UpgradeVersionBoxView = Em.View.extend({
 });
   }
 
-
-
   this.addRemoveIopSelectButton(element, isDisabled);
   }
   element.set('isDisabled', isDisabled);
@@ -364,12 +363,17 @@ App.UpgradeVersionBoxView = Em.View.extend({
 return false;
   },
 
+  isCurrentStackPresent: 
Ember.computed('parentView.repoVersions.@each.stackVersion.state', function () {
+return 
this.get('parentView.repoVersions').someProperty('stackVersion.state', 
'CURRENT');
+  }),
+
   /**
* check if actions of NOT_REQUIRED stack version disabled
* @returns {boolean}
*/
   isDisabledOnInit: function() {
 return  this.get('controller.requestInProgress') ||
+!this.get('isCurrentStackPresent') ||
 !this.get('content.isCompatible') ||
 (App.get('upgradeIsRunning') && !App.get('upgradeSuspended')) ||
 this.get('parentView.repoVersions').someProperty('status', 
'INSTALLING');
@@ -380,7 +384,8 @@ App.UpgradeVersionBoxView = Em.View.extend({
* @returns {boolean}
*/
   isDisabledOnInstalled: function() {
-return !App.isAuthorized('CLUSTER.UPGRADE_DOWNGRADE_STACK') ||
+return !this.get('isCurrentStackPresent') ||
+  !App.isAuthorized('CLUSTER.UPGRADE_DOWNGRADE_STACK') ||
   this.get('controller.requestInProgress') ||
   this.get('parentView.repoVersions').someProperty('status', 'INSTALLING') 
||
   (this.get('controller.isDowngrade') &&

http://git-wip-us.apache.org/repos/asf/ambari/blob/5eab1a56/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 4469222..fd4e890 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
@@ -29,6 +29,7 @@ describe('App.UpgradeVersionBoxView', function () {
 sinon.stub(App.db, 'getFilterConditions', function () {return [];});
 view = App.UpgradeVersionBoxView.create({
   initFilters: Em.K,
+  isCurrentStackPresent: true,
   controller: Em.Object.create({
 upgrade: Em.K,
 getRepoVersionInstallId: Em.K,
@@ -1038,6 +1039,7 @@ describe('App.UpgradeVersionBoxView', function () {
 upgradeSuspended: true,
 status: 'INSTALLED',
 isCompatible: true,
+isCurrentStackPresent: true,
 expected: true
   },
   {
@@ -1046,6 +1048,7 @@ describe('App.UpgradeVersionBoxView', function () {
 upgradeSuspended: false,
 status: 'INSTALLED',
 isCompatible: true,
+isCurrentStackPresent: true,
 expected: true
   },
   {
@@ -1054,6 +1057,7 @@ describe('App.UpgradeVersionBoxView', function () {
 upgradeSuspended: false,
 status: 'INSTALLING',

ambari git commit: AMBARI-22157. Web Client Should Never List Any Upgrade Actions On Only Stack In System (alexantonenko)

2017-10-06 Thread alexantonenko 
Repository: ambari
Updated Branches:
  refs/heads/trunk 7172655ff -> fab2aa3c6


AMBARI-22157. Web Client Should Never List Any Upgrade Actions On Only Stack In 
System (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fab2aa3c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fab2aa3c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fab2aa3c

Branch: refs/heads/trunk
Commit: fab2aa3c62e3dbe5cce795ca50c4b61baee1d19e
Parents: 7172655
Author: Alex Antonenko 
Authored: Fri Oct 6 16:35:29 2017 +0300
Committer: Alex Antonenko 
Committed: Fri Oct 6 16:35:29 2017 +0300

--
 .../stack_upgrade/upgrade_version_box_view.js   | 13 --
 .../upgrade_version_box_view_test.js| 44 ++--
 2 files changed, 49 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fab2aa3c/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 28f4f32..355ad88 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
@@ -199,7 +199,8 @@ App.UpgradeVersionBoxView = Em.View.extend({
 'isUpgrading',
 'controller.requestInProgress',
 'controller.requestInProgressRepoId',
-'parentView.repoVersions.@each.status'
+'parentView.repoVersions.@each.status',
+'isCurrentStackPresent'
   ),
 
   /**
@@ -208,6 +209,7 @@ App.UpgradeVersionBoxView = Em.View.extend({
*/
   isDisabledOnInit: function() {
 return  this.get('controller.requestInProgress') ||
+!this.get('isCurrentStackPresent') ||
 !this.get('content.isCompatible') ||
 (App.get('upgradeIsRunning') && !App.get('upgradeSuspended')) ||
 this.get('parentView.repoVersions').someProperty('status', 
'INSTALLING');
@@ -312,8 +314,6 @@ App.UpgradeVersionBoxView = Em.View.extend({
 });
   }
 
-
-
   }
   element.set('isDisabled', isDisabled);
 }
@@ -357,7 +357,8 @@ App.UpgradeVersionBoxView = Em.View.extend({
* @returns {boolean}
*/
   isDisabledOnInstalled: function() {
-return !App.isAuthorized('CLUSTER.UPGRADE_DOWNGRADE_STACK') ||
+return !this.get('isCurrentStackPresent') ||
+  !App.isAuthorized('CLUSTER.UPGRADE_DOWNGRADE_STACK') ||
   this.get('controller.requestInProgress') ||
   this.get('parentView.repoVersions').someProperty('status', 'INSTALLING') 
||
   (this.get('controller.isDowngrade') &&
@@ -392,6 +393,10 @@ App.UpgradeVersionBoxView = Em.View.extend({
 $('.out-of-sync-badge').tooltip('destroy');
   },
 
+  isCurrentStackPresent: 
Ember.computed('parentView.repoVersions.@each.stackVersion.state', function () {
+return 
this.get('parentView.repoVersions').someProperty('stackVersion.state', 
'CURRENT');
+  }),
+
   /**
* run custom action of controller
*/

http://git-wip-us.apache.org/repos/asf/ambari/blob/fab2aa3c/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 506fb81..9bee7af 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
@@ -29,6 +29,7 @@ describe('App.UpgradeVersionBoxView', function () {
 sinon.stub(App.db, 'getFilterConditions', function () {return [];});
 view = App.UpgradeVersionBoxView.create({
   initFilters: Em.K,
+  isCurrentStackPresent: true,
   controller: Em.Object.create({
 upgrade: Em.K,
 getRepoVersionInstallId: Em.K,
@@ -1103,6 +1104,7 @@ describe('App.UpgradeVersionBoxView', function () {
 upgradeSuspended: true,
 status: 'INSTALLED',
 isCompatible: true,
+isCurrentStackPresent: true,
 expected: true
   },
   {
@@ -,6 +1113,7 @@ describe('App.UpgradeVersionBoxView', function () {
 upgradeSuspended: false,
 status: 'INSTALLED',
 isCompatible: true,
+isCurrentStackPresent: true,
 expected: true
   },
   {
@@ -1119,6 +1122,7 @@ describe('App.UpgradeVersionBoxView', function () {
 upgradeSuspended: false,
 status: 'INSTALLING',