You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2015/06/24 19:13:07 UTC
ambari git commit: AMBARI-12120 Configs / Usability: Compare mode
shows empty categories. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 105723260 -> 8a7b84520
AMBARI-12120 Configs / Usability: Compare mode shows empty categories. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8a7b8452
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8a7b8452
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8a7b8452
Branch: refs/heads/branch-2.1
Commit: 8a7b845206e8b764e6384f220a7e3828121e83de
Parents: 1057232
Author: Andrii Tkach <at...@hortonworks.com>
Authored: Wed Jun 24 15:59:10 2015 +0300
Committer: Andrii Tkach <at...@hortonworks.com>
Committed: Wed Jun 24 20:12:56 2015 +0300
----------------------------------------------------------------------
.../configs/service_configs_by_category_view.js | 9 ++++----
.../service_configs_by_category_view_test.js | 22 ++++++++++----------
2 files changed, 16 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a7b8452/ambari-web/app/views/common/configs/service_configs_by_category_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/service_configs_by_category_view.js b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
index 7d3c304..73454ff 100644
--- a/ambari-web/app/views/common/configs/service_configs_by_category_view.js
+++ b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
@@ -90,10 +90,11 @@ App.ServiceConfigsByCategoryView = Em.View.extend(App.UserPref, App.ConfigOverri
*/
isShowBlock: function () {
var isCustomPropertiesCategory = this.get('category.customCanAddProperty');
- var emptyFiltered = this.get('categoryConfigs').filterProperty('isHiddenByFilter', false).length > 0;
- var isWidgetsOnlyCategory = this.get('categoryConfigs.length') == this.get('categoryConfigs').filterProperty('widget').length;
- return isCustomPropertiesCategory && this.get('controller.filter') === '' && !this.get('parentView.columns').someProperty('selected') ||
- (emptyFiltered && !isWidgetsOnlyCategory);
+ var hasFilteredAdvancedConfigs = this.get('categoryConfigs').filter(function (config) {
+ return config.get('isHiddenByFilter') === false && Em.isNone(config.get('widget'));
+ }, this).length > 0;
+ return (isCustomPropertiesCategory && this.get('controller.filter') === '' && !this.get('parentView.columns').someProperty('selected')) ||
+ hasFilteredAdvancedConfigs;
}.property('category.customCanAddProperty', 'categoryConfigs.@each.isHiddenByFilter', 'categoryConfigs.@each.widget', 'controller.filter', 'parentView.columns.@each.selected'),
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a7b8452/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
index c7d6da9..e0b2409 100644
--- a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
+++ b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
@@ -106,7 +106,7 @@ describe('App.ServiceConfigsByCategoryView', function () {
var tests = [
{
categoryConfigs: Em.A([
- { isHiddenByFilter: false }
+ Em.Object.create({ isHiddenByFilter: false })
]),
category: {},
m: 'no configs with widget, filtered properties are visible. Panel should be shown',
@@ -120,7 +120,7 @@ describe('App.ServiceConfigsByCategoryView', function () {
},
{
categoryConfigs: Em.A([
- { isHiddenByFilter: false }
+ Em.Object.create({ isHiddenByFilter: false })
]),
category: Em.Object.create({ customCanAddProperty: true}),
m: 'Category with custom properties. Filtered configs are hidden. Panel should be shown',
@@ -128,7 +128,7 @@ describe('App.ServiceConfigsByCategoryView', function () {
},
{
categoryConfigs: Em.A([
- { isHiddenByFilter: true }
+ Em.Object.create({ isHiddenByFilter: true })
]),
category: Em.Object.create({ customCanAddProperty: false }),
m: 'Filtered configs are hidden. Category not for custom properties. Panel should be hidden',
@@ -142,8 +142,8 @@ describe('App.ServiceConfigsByCategoryView', function () {
},
{
categoryConfigs: Em.A([
- { widget: {someProp: 'a'}},
- { widget: {someProp: 'b'}}
+ Em.Object.create({ widget: {someProp: 'a'}}),
+ Em.Object.create({ widget: {someProp: 'b'}})
]),
category: Em.Object.create({ customCanAddProperty: false }),
m: 'All properties have widgets and category is not custom. Panel should be hidden',
@@ -151,8 +151,8 @@ describe('App.ServiceConfigsByCategoryView', function () {
},
{
categoryConfigs: Em.A([
- { widget: null },
- { widget: null }
+ Em.Object.create({ widget: null }),
+ Em.Object.create({ widget: null })
]),
category: Em.Object.create({ customCanAddProperty: false }),
m: 'All properties have widgets set to `null` and category is not custom. Panel should be hidden',
@@ -160,8 +160,8 @@ describe('App.ServiceConfigsByCategoryView', function () {
},
{
categoryConfigs: Em.A([
- { widget: {someProp: 'a'} },
- { isHiddenByFilter: true }
+ Em.Object.create({ widget: {someProp: 'a'} }),
+ Em.Object.create({ isHiddenByFilter: true })
]),
category: Em.Object.create({ customCanAddProperty: false }),
m: 'Category contains mixed properties. Properties are hidden by filter. Panel should be hidden',
@@ -169,8 +169,8 @@ describe('App.ServiceConfigsByCategoryView', function () {
},
{
categoryConfigs: Em.A([
- { widget: {someProp: 'a'} },
- { isHiddenByFilter: false }
+ Em.Object.create({ widget: {someProp: 'a'} }),
+ Em.Object.create({ isHiddenByFilter: false })
]),
category: Em.Object.create({ customCanAddProperty: false }),
m: 'Category contains mixed properties. Properties are visible. Panel should be shown',