Repository: ambari Updated Branches: refs/heads/trunk c575b6ea9 -> d7d0ba288
AMBARI-14399 Ranger error counter works wrong in some cases. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d7d0ba28 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d7d0ba28 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d7d0ba28 Branch: refs/heads/trunk Commit: d7d0ba288be1d14cd229c2b0d1e833a056c9d2a9 Parents: c575b6e Author: AndriyBabiychuk <[email protected]> Authored: Fri Dec 18 15:10:42 2015 +0200 Committer: AndriyBabiychuk <[email protected]> Committed: Fri Dec 18 15:10:42 2015 +0200 ---------------------------------------------------------------------- .../controllers/main/service/info/configs.js | 12 +- .../app/controllers/wizard/step7_controller.js | 19 +- .../models/configs/objects/service_config.js | 87 +++----- .../configs/objects/service_config_category.js | 33 +-- .../configs/objects/service_config_property.js | 13 +- .../app/models/configs/theme/sub_section.js | 18 +- .../app/models/configs/theme/sub_section_tab.js | 21 +- .../main/service/info/config_test.js | 30 +-- .../test/controllers/wizard/step7_test.js | 31 +-- .../objects/service_config_category_test.js | 132 +----------- .../objects/service_config_property_test.js | 9 - .../configs/objects/service_config_test.js | 215 +++++-------------- .../test/models/configs/sub_section_test.js | 10 +- 13 files changed, 151 insertions(+), 479 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d7d0ba28/ambari-web/app/controllers/main/service/info/configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js index f031ae8..c59bd91 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -122,13 +122,11 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ConfigsLoader, A * Number of errors in the configs in the selected service (only for AdvancedTab if App supports Enhanced Configs) * @type {number} */ - errorsCount: function () { - return this.get('selectedService.configs').filter(function (config) { - return Em.isNone(config.get('widgetType')); - }).filter(function(config) { - return !config.get('isValid') || (config.get('overrides') || []).someProperty('isValid', false); - }).filterProperty('isVisible').length; - }.property('[email protected]', '[email protected]', '[email protected]'), + errorsCount: function() { + return this.get('selectedService.configsWithErrors').filter(function(c) { + return Em.isNone(c.get('widget')); + }).length; + }.property('selectedService.configsWithErrors'), /** * Determines if Save-button should be disabled http://git-wip-us.apache.org/repos/asf/ambari/blob/d7d0ba28/ambari-web/app/controllers/wizard/step7_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js index 8877dbc..c098e10 100644 --- a/ambari-web/app/controllers/wizard/step7_controller.js +++ b/ambari-web/app/controllers/wizard/step7_controller.js @@ -132,13 +132,11 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E * Number of errors in the configs in the selected service * @type {number} */ - errorsCount: function () { - return this.get('selectedService.configs').filter(function (config) { - return Em.isNone(config.get('widgetType')); - }).filter(function(config) { - return !config.get('isValid') || (config.get('overrides') || []).someProperty('isValid', false); - }).filterProperty('isVisible').length; - }.property('[email protected]', '[email protected]','[email protected]'), + errorsCount: function() { + return this.get('selectedService.configsWithErrors').filter(function(c) { + return Em.isNone(c.get('widget')); + }).length; + }.property('selectedService.configsWithErrors.length'), /** * Should Next-button be disabled @@ -665,12 +663,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E } else if (configCondition.get('type') === 'config') { //simulate section wrapper for condition type "config" themeResource = Em.Object.create({ - configProperties: [ - Em.Object.create({ - name: configCondition.get('configName'), - fileName: configCondition.get('fileName') - }) - ] + configProperties: [App.config.configId(configCondition.get('configName'), configCondition.get('fileName'))] }); } if (themeResource) { http://git-wip-us.apache.org/repos/asf/ambari/blob/d7d0ba28/ambari-web/app/models/configs/objects/service_config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/configs/objects/service_config.js b/ambari-web/app/models/configs/objects/service_config.js index 5d827b7..f5da880 100644 --- a/ambari-web/app/models/configs/objects/service_config.js +++ b/ambari-web/app/models/configs/objects/service_config.js @@ -21,24 +21,47 @@ var App = require('app'); App.ServiceConfig = Ember.Object.extend({ serviceName: '', configCategories: [], - configs: null, + configCategoriesMap: function() { + var categoriesMap = {}; + this.get('configCategories').forEach(function(c) { + if (!categoriesMap[c.get('name')]) categoriesMap[c.get('name')] = c; + }); + return categoriesMap; + }.property('configCategories.[]'), + configs: [], restartRequired: false, restartRequiredMessage: '', restartRequiredHostsAndComponents: {}, configGroups: [], dependentServiceNames: [], initConfigsLength: 0, // configs length after initialization in order to watch changes - errorCount: function () { - var overrideErrors = 0, - masterErrors = 0, - slaveErrors = 0, - configs = this.get('configs'), - configCategories = this.get('configCategories'), - enhancedConfigsErrors = 0; - configCategories.forEach(function (_category) { - slaveErrors += _category.get('slaveErrorCount'); - _category.set('nonSlaveErrorCount', 0); + + errorCount: Em.computed.alias('configsWithErrors.length'), + + visibleProperties: function() { + return this.get('configs').filter(function(c) { + return c.get('isVisible') && !c.get('hiddenBySection'); + }); + }.property('[email protected]', '[email protected]'), + + configsWithErrors: function() { + return this.get('visibleProperties').filter(function(c) { + return !c.get('isValid') || !c.get('isValidOverride'); }); + }.property('[email protected]', '[email protected]'), + + observeErrors: function() { + this.get('configCategories').setEach('errorCount', 0); + this.get('configsWithErrors').forEach(function(c) { + if (this.get('configCategoriesMap')[c.get('category')]) { + this.get('configCategoriesMap')[c.get('category')].incrementProperty('errorCount'); + } + }, this); + }.observes('configsWithErrors'), + + observeForeignKeys: function() { + //TODO refactor or move this login to other place + var configs = this.get('configs'); configs.forEach(function (item) { if (item.get('isVisible')) { var options = item.get('options'); @@ -55,29 +78,7 @@ App.ServiceConfig = Ember.Object.extend({ } } }); - configs.forEach(function (item) { - var category = configCategories.findProperty('name', item.get('category')); - if (category && !item.get('isValid') && item.get('isVisible') && !item.get('widgetType')) { - category.incrementProperty('nonSlaveErrorCount'); - masterErrors++; - } - if (!item.get('isValid') && item.get('widgetType') && item.get('isVisible') && !item.get('hiddenBySection')) { - enhancedConfigsErrors++; - } - if (item.get('overrides')) { - item.get('overrides').forEach(function (e) { - if (e.error) { - if (category && !Em.get(e, 'parentSCP.widget')) { - category.incrementProperty('nonSlaveErrorCount'); - } - overrideErrors++; - } - }); - } - }); - return masterErrors + slaveErrors + overrideErrors + enhancedConfigsErrors; - }.property('[email protected]', '[email protected]', '[email protected]', '[email protected]'), - + }.observes('[email protected]'), /** * checks if for example for kdc_type, the value isn't just the pretty version of the saved value, for example mit-kdc * and Existing MIT KDC are the same value, but they are interpreted as being changed. This function fixes that @@ -118,24 +119,6 @@ App.ServiceConfig = Ember.Object.extend({ } }); -App.SlaveConfigs = Ember.Object.extend({ - componentName: null, - displayName: null, - hosts: null, - groups: null -}); - -App.Group = Ember.Object.extend({ - name: null, - hostNames: null, - properties: null, - errorCount: function () { - if (this.get('properties')) { - return this.get('properties').filterProperty('isValid', false).filterProperty('isVisible', true).get('length'); - } - }.property('[email protected]', '[email protected]') -}); - App.ConfigSiteTag = Ember.Object.extend({ site: DS.attr('string'), tag: DS.attr('string'), http://git-wip-us.apache.org/repos/asf/ambari/blob/d7d0ba28/ambari-web/app/models/configs/objects/service_config_category.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/configs/objects/service_config_category.js b/ambari-web/app/models/configs/objects/service_config_category.js index c351d97..26f46c9 100644 --- a/ambari-web/app/models/configs/objects/service_config_category.js +++ b/ambari-web/app/models/configs/objects/service_config_category.js @@ -24,7 +24,6 @@ App.ServiceConfigCategory = Ember.Object.extend({ * We cant have spaces in the name as this is being used as HTML element id while rendering. Hence we introduced 'displayName' where we can have spaces like 'Secondary Name Node' etc. */ displayName: null, - slaveConfigs: null, /** * check whether to show custom view in category instead of default */ @@ -40,38 +39,8 @@ App.ServiceConfigCategory = Ember.Object.extend({ * Can this category add new properties. Used for custom configurations. */ canAddProperty: false, - nonSlaveErrorCount: 0, - primaryName: function () { - switch (this.get('name')) { - case 'DataNode': - return 'DATANODE'; - break; - case 'TaskTracker': - return 'TASKTRACKER'; - break; - case 'RegionServer': - return 'HBASE_REGIONSERVER'; - } - return null; - }.property('name'), - - isForMasterComponent: Em.computed.existsIn('name', ['NameNode', 'SNameNode', 'JobTracker', 'HBase Master', 'Oozie Master', - 'Hive Metastore', 'WebHCat Server', 'ZooKeeper Server', 'Ganglia']), - - isForSlaveComponent: Em.computed.existsIn('name', ['DataNode', 'TaskTracker', 'RegionServer']), - - slaveErrorCount: function () { - var length = 0; - if (this.get('slaveConfigs.groups')) { - this.get('slaveConfigs.groups').forEach(function (_group) { - length += _group.get('errorCount'); - }, this); - } - return length; - }.property('[email protected]'), - - errorCount: Em.computed.sumProperties('slaveErrorCount', 'nonSlaveErrorCount'), + errorCount: 0, isAdvanced : function(){ var name = this.get('name'); http://git-wip-us.apache.org/repos/asf/ambari/blob/d7d0ba28/ambari-web/app/models/configs/objects/service_config_property.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/configs/objects/service_config_property.js b/ambari-web/app/models/configs/objects/service_config_property.js index feeb976..7a3fbb7 100644 --- a/ambari-web/app/models/configs/objects/service_config_property.js +++ b/ambari-web/app/models/configs/objects/service_config_property.js @@ -169,9 +169,8 @@ App.ServiceConfigProperty = Em.Object.extend({ } }); return originalSCPIssued || overridesIssue; - }.property('errorMessage', 'warnMessage', 'overrideErrorTrigger'), + }.property('errorMessage', 'warnMessage', '[email protected]', '[email protected]'), - overrideErrorTrigger: 0, //Trigger for overridable property error index: null, //sequence number in category editDone: false, //Text field: on focusOut: true, on focusIn: false isNotSaved: false, // user property was added but not saved @@ -202,11 +201,13 @@ App.ServiceConfigProperty = Em.Object.extend({ additionalView: null, /** - * On Overridable property error message, change overrideErrorTrigger value to recount number of errors service have + * Is property has active override with error */ - observeErrors: function () { - this.set("overrideErrorTrigger", this.get("overrideErrorTrigger") + 1); - }.observes("[email protected]"), + isValidOverride: function () { + return this.get('overrides.length') ? !this.get('overrides').find(function(o) { + return Em.get(o, 'isEditable') && Em.get(o, 'errorMessage'); + }) : true; + }.property("[email protected]"), /** * No override capabilities for fields which are not edtiable * and fields which represent master hosts. http://git-wip-us.apache.org/repos/asf/ambari/blob/d7d0ba28/ambari-web/app/models/configs/theme/sub_section.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/configs/theme/sub_section.js b/ambari-web/app/models/configs/theme/sub_section.js index c89500d..7274569 100644 --- a/ambari-web/app/models/configs/theme/sub_section.js +++ b/ambari-web/app/models/configs/theme/sub_section.js @@ -94,17 +94,25 @@ App.SubSection = DS.Model.extend({ showTabs: Em.computed.and('hasTabs', 'someSubSectionTabIsVisible'), + visibleProperties: function() { + return this.get('configs').filter(function(c) { + return c.get('isVisible') && !c.get('hiddenBySection'); + }); + }.property('[email protected]', '[email protected]'), + + visibleTabs: Em.computed.filterBy('subSectionTabs', 'isVisible', true), + /** * Number of the errors in all configs * @type {number} */ errorsCount: function () { - var visibleTabs = this.get('subSectionTabs').filterProperty('isVisible'); - var subSectionTabsErrors = visibleTabs.length ? visibleTabs.mapProperty('errorsCount').reduce(Em.sum, 0) : 0; - return subSectionTabsErrors + this.get('configs').filter(function(config) { - return config.get('isVisible') && (!config.get('isValid') || (config.get('overrides') || []).someProperty('isValid', false)); + var propertiesWithErrors = this.get('visibleProperties').filter(function(c) { + return !c.get('isValid') || !c.get('isValidOverride'); }).length; - }.property('[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]'), + var tabsWithErrors = this.get('visibleTabs').mapProperty('errorsCount').reduce(Em.sum, 0); + return propertiesWithErrors + tabsWithErrors; + }.property('[email protected]', '[email protected]', '[email protected]'), /** * @type {boolean} http://git-wip-us.apache.org/repos/asf/ambari/blob/d7d0ba28/ambari-web/app/models/configs/theme/sub_section_tab.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/configs/theme/sub_section_tab.js b/ambari-web/app/models/configs/theme/sub_section_tab.js index 7550f23..2262882 100644 --- a/ambari-web/app/models/configs/theme/sub_section_tab.js +++ b/ambari-web/app/models/configs/theme/sub_section_tab.js @@ -55,15 +55,21 @@ App.SubSectionTab = DS.Model.extend({ */ isActive: DS.attr('boolean', {defaultValue: false}), + visibleProperties: function() { + return this.get('configs').filter(function(c) { + return c.get('isVisible') && !c.get('hiddenBySection'); + }); + }.property('[email protected]', '[email protected]'), + /** * Number of the errors in all configs * @type {number} */ errorsCount: function () { - return this.get('configs').filter(function(config) { - return config.get('isVisible') && (!config.get('isValid') || (config.get('overrides') || []).someProperty('isValid', false)); + return this.get('visibleProperties').filter(function(config) { + return !config.get('isValid') || !config.get('isValidOverride'); }).length; - }.property('[email protected]', '[email protected]', '[email protected]'), + }.property('[email protected]', '[email protected]'), /** * If the visibility of subsection is dependent on a value of some config @@ -75,17 +81,12 @@ App.SubSectionTab = DS.Model.extend({ * If there is no configs, subsection can't be hidden * @type {boolean} */ - isHiddenByFilter: function () { - var configs = this.get('configs').filter(function(c) { - return !c.get('hiddenBySection') && c.get('isVisible'); - }); - return configs.length ? configs.everyProperty('isHiddenByFilter', true) : false; - }.property('[email protected]'), + isHiddenByFilter: Em.computed.everyBy('visibleProperties', 'isHiddenByFilter', true), /** * @type {boolean} */ - someConfigIsVisible: Em.computed.someBy('configs', 'isVisible', true), + someConfigIsVisible: Em.computed.gt('visibleProperties.length', 0), /** * Determines if subsection is visible http://git-wip-us.apache.org/repos/asf/ambari/blob/d7d0ba28/ambari-web/test/controllers/main/service/info/config_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/service/info/config_test.js b/ambari-web/test/controllers/main/service/info/config_test.js index aec369f..b6abb8e 100644 --- a/ambari-web/test/controllers/main/service/info/config_test.js +++ b/ambari-web/test/controllers/main/service/info/config_test.js @@ -778,30 +778,12 @@ describe("App.MainServiceInfoConfigsController", function () { it('should ignore configs with widgets (enhanced configs)', function () { - mainServiceInfoConfigsController.reopen({selectedService: { - configs: [ - Em.Object.create({isVisible: true, widgetType: 'type', isValid: false}), - Em.Object.create({isVisible: true, widgetType: 'type', isValid: true}), - Em.Object.create({isVisible: true, isValid: true}), - Em.Object.create({isVisible: true, isValid: false}) - ] - }}); - - expect(mainServiceInfoConfigsController.get('errorsCount')).to.equal(1); - - }); - - it('should ignore configs with widgets (enhanced configs) and hidden configs', function () { - - mainServiceInfoConfigsController.reopen({selectedService: { - configs: [ - Em.Object.create({isVisible: true, widgetType: 'type', isValid: false}), - Em.Object.create({isVisible: true, widgetType: 'type', isValid: true}), - Em.Object.create({isVisible: false, isValid: false}), - Em.Object.create({isVisible: true, isValid: true}), - Em.Object.create({isVisible: true, isValid: false}) - ] - }}); + mainServiceInfoConfigsController.reopen({selectedService: Em.Object.create({ + configsWithErrors: Em.A([ + Em.Object.create({widget: {}}), + Em.Object.create({widget: null}) + ]) + })}); expect(mainServiceInfoConfigsController.get('errorsCount')).to.equal(1); http://git-wip-us.apache.org/repos/asf/ambari/blob/d7d0ba28/ambari-web/test/controllers/wizard/step7_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/wizard/step7_test.js b/ambari-web/test/controllers/wizard/step7_test.js index 233f785..19c0196 100644 --- a/ambari-web/test/controllers/wizard/step7_test.js +++ b/ambari-web/test/controllers/wizard/step7_test.js @@ -1531,30 +1531,13 @@ describe('App.InstallerStep7Controller', function () { it('should ignore configs with widgets (enhanced configs)', function () { - installerStep7Controller.reopen({selectedService: { - configs: [ - Em.Object.create({isVisible: true, widgetType: 'type', isValid: false}), - Em.Object.create({isVisible: true, widgetType: 'type', isValid: true}), - Em.Object.create({isVisible: true, isValid: true}), - Em.Object.create({isVisible: true, isValid: false}) - ] - }}); - - expect(installerStep7Controller.get('errorsCount')).to.equal(1); - - }); - - it('should ignore configs with widgets (enhanced configs) and hidden configs', function () { - - installerStep7Controller.reopen({selectedService: { - configs: [ - Em.Object.create({isVisible: true, widgetType: 'type', isValid: false}), - Em.Object.create({isVisible: true, widgetType: 'type', isValid: true}), - Em.Object.create({isVisible: false, isValid: false}), - Em.Object.create({isVisible: true, isValid: true}), - Em.Object.create({isVisible: true, isValid: false}) - ] - }}); + installerStep7Controller.reopen({selectedService: Em.Object.create({ + configsWithErrors: Em.A([ + Em.Object.create({widget: {}}), + Em.Object.create({widget: null}) + ]) + }) + }); expect(installerStep7Controller.get('errorsCount')).to.equal(1); http://git-wip-us.apache.org/repos/asf/ambari/blob/d7d0ba28/ambari-web/test/models/configs/objects/service_config_category_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/models/configs/objects/service_config_category_test.js b/ambari-web/test/models/configs/objects/service_config_category_test.js index 87e1616..7961552 100644 --- a/ambari-web/test/models/configs/objects/service_config_category_test.js +++ b/ambari-web/test/models/configs/objects/service_config_category_test.js @@ -21,87 +21,7 @@ var App = require('app'); require('models/configs/objects/service_config_category'); require('models/configs/objects/service_config_property'); -var serviceConfigCategory, - nameCases = [ - { - name: 'DataNode', - primary: 'DATANODE' - }, - { - name: 'TaskTracker', - primary: 'TASKTRACKER' - }, - { - name: 'RegionServer', - primary: 'HBASE_REGIONSERVER' - }, - { - name: 'name', - primary: null - } - ], - components = [ - { - name: 'NameNode', - master: true - }, - { - name: 'SNameNode', - master: true - }, - { - name: 'JobTracker', - master: true - }, - { - name: 'HBase Master', - master: true - }, - { - name: 'Oozie Master', - master: true - }, - { - name: 'Hive Metastore', - master: true - }, - { - name: 'WebHCat Server', - master: true - }, - { - name: 'ZooKeeper Server', - master: true - }, - { - name: 'Ganglia', - master: true - }, - { - name: 'DataNode', - slave: true - }, - { - name: 'TaskTracker', - slave: true - }, - { - name: 'RegionServer', - slave: true - } - ], - masters = components.filterProperty('master'), - slaves = components.filterProperty('slave'), - groupsData = { - groups: [ - Em.Object.create({ - errorCount: 1 - }), - Em.Object.create({ - errorCount: 2 - }) - ] - }; +var serviceConfigCategory; function getCategory() { return App.ServiceConfigCategory.create(); @@ -113,54 +33,6 @@ describe('App.ServiceConfigCategory', function () { serviceConfigCategory = getCategory(); }); - App.TestAliases.testAsComputedSumProperties(getCategory(), 'errorCount', ['slaveErrorCount', 'nonSlaveErrorCount']); - - describe('#primaryName', function () { - nameCases.forEach(function (item) { - it('should return ' + item.primary, function () { - serviceConfigCategory.set('name', item.name); - expect(serviceConfigCategory.get('primaryName')).to.equal(item.primary); - }) - }); - }); - - describe('#isForMasterComponent', function () { - masters.forEach(function (item) { - it('should be true for ' + item.name, function () { - serviceConfigCategory.set('name', item.name); - expect(serviceConfigCategory.get('isForMasterComponent')).to.be.true; - }); - }); - it('should be false', function () { - serviceConfigCategory.set('name', 'name'); - expect(serviceConfigCategory.get('isForMasterComponent')).to.be.false; - }); - }); - - describe('#isForSlaveComponent', function () { - slaves.forEach(function (item) { - it('should be true for ' + item.name, function () { - serviceConfigCategory.set('name', item.name); - expect(serviceConfigCategory.get('isForSlaveComponent')).to.be.true; - }); - }); - it('should be false', function () { - serviceConfigCategory.set('name', 'name'); - expect(serviceConfigCategory.get('isForSlaveComponent')).to.be.false; - }); - }); - - describe('#slaveErrorCount', function () { - it('should be 0', function () { - serviceConfigCategory.set('slaveConfigs', []); - expect(serviceConfigCategory.get('slaveErrorCount')).to.equal(0); - }); - it('should sum all errorCount values', function () { - serviceConfigCategory.set('slaveConfigs', groupsData); - expect(serviceConfigCategory.get('slaveErrorCount')).to.equal(3); - }); - }); - describe('#isAdvanced', function () { it('should be true', function () { serviceConfigCategory.set('name', 'Advanced'); @@ -172,4 +44,4 @@ describe('App.ServiceConfigCategory', function () { }); }); -}); \ No newline at end of file +}); http://git-wip-us.apache.org/repos/asf/ambari/blob/d7d0ba28/ambari-web/test/models/configs/objects/service_config_property_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/models/configs/objects/service_config_property_test.js b/ambari-web/test/models/configs/objects/service_config_property_test.js index 346367f..7164602 100644 --- a/ambari-web/test/models/configs/objects/service_config_property_test.js +++ b/ambari-web/test/models/configs/objects/service_config_property_test.js @@ -335,15 +335,6 @@ describe('App.ServiceConfigProperty', function () { App.TestAliases.testAsComputedAnd(getProperty(), 'hideFinalIcon', ['!isFinal', 'isNotEditable']); - describe('#overrideErrorTrigger', function () { - it('should be an increment', function () { - serviceConfigProperty.set('overrides', configsData[0].overrides); - expect(serviceConfigProperty.get('overrideErrorTrigger')).to.equal(1); - serviceConfigProperty.set('overrides', []); - expect(serviceConfigProperty.get('overrideErrorTrigger')).to.equal(2); - }); - }); - describe('#isPropertyOverridable', function () { overridableFalseData.forEach(function (item) { it('should be false', function () { http://git-wip-us.apache.org/repos/asf/ambari/blob/d7d0ba28/ambari-web/test/models/configs/objects/service_config_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/models/configs/objects/service_config_test.js b/ambari-web/test/models/configs/objects/service_config_test.js index 9b5ba2d..b3e8122 100644 --- a/ambari-web/test/models/configs/objects/service_config_test.js +++ b/ambari-web/test/models/configs/objects/service_config_test.js @@ -21,178 +21,71 @@ var App = require('app'); require('models/configs/objects/service_config'); var serviceConfig, - group, - configsData = [ - Ember.Object.create({ - category: 'c0', - overrides: [ - { - error: true, - errorMessage: 'error' - }, - { - error: true - }, - {} - ] - }), - Ember.Object.create({ - category: 'c1', - isValid: false, - isVisible: true - }), - Ember.Object.create({ - category: 'c0', - isValid: true, - isVisible: true - }), - Ember.Object.create({ - category: 'c1', - isValid: false, - isVisible: false - }) - ], - configCategoriesData = [ - Em.Object.create({ - name: 'c0', - slaveErrorCount: 1 - }), - Em.Object.create({ - name: 'c1', - slaveErrorCount: 2 - }) - ], - components = [ - { - name: 'NameNode', - master: true - }, - { - name: 'SNameNode', - master: true - }, - { - name: 'JobTracker', - master: true - }, - { - name: 'HBase Master', - master: true - }, - { - name: 'Oozie Master', - master: true - }, - { - name: 'Hive Metastore', - master: true - }, - { - name: 'WebHCat Server', - master: true - }, - { - name: 'ZooKeeper Server', - master: true - }, - { - name: 'Ganglia', - master: true - }, - { - name: 'DataNode', - slave: true - }, - { - name: 'TaskTracker', - slave: true - }, - { - name: 'RegionServer', - slave: true - } - ], - masters = components.filterProperty('master'), - slaves = components.filterProperty('slave'), - groupNoErrorsData = [].concat(configsData.slice(2)), - groupErrorsData = [configsData[1]]; + group, + configs = [ + Em.Object.create({ + 'name': 'p1', + 'isVisible': true, + 'hiddenBySection': false, + 'isValid': true, + 'isValidOverride': true + }), + Em.Object.create({ + 'name': 'p2', + 'isVisible': false, + 'hiddenBySection': false, + 'isValid': true, + 'isValidOverride': true + }), + Em.Object.create({ + 'name': 'p3', + 'isVisible': true, + 'hiddenBySection': true, + 'isValid': true, + 'isValidOverride': true + }), + Em.Object.create({ + 'name': 'p4', + 'isVisible': true, + 'hiddenBySection': false, + 'isValid': false, + 'isValidOverride': true + }), + Em.Object.create({ + 'name': 'p5', + 'isVisible': true, + 'hiddenBySection': false, + 'isValid': true, + 'isValidOverride': false + }) + ]; describe('App.ServiceConfig', function () { beforeEach(function () { - serviceConfig = App.ServiceConfig.create(); + serviceConfig = App.ServiceConfig.create({ + configs: configs + }); }); - describe('#errorCount', function () { - it('should be 0', function () { - serviceConfig.setProperties({ - configs: [], - configCategories: [] - }); - expect(serviceConfig.get('errorCount')).to.equal(0); - }); - it('should sum counts of all errors', function () { - serviceConfig.setProperties({ - configs: configsData, - configCategories: configCategoriesData - }); - expect(serviceConfig.get('errorCount')).to.equal(6); - expect(serviceConfig.get('configCategories').findProperty('name', 'c0').get('nonSlaveErrorCount')).to.equal(2); - expect(serviceConfig.get('configCategories').findProperty('name', 'c1').get('nonSlaveErrorCount')).to.equal(1); - }); - it('should include invalid properties with widgets', function() { - serviceConfig.setProperties({ - configs: [ - Em.Object.create({ - isValid: false, - widgetType: 'type', - isVisible: true, - category: 'some1' - }), - Em.Object.create({ - isValid: false, - widgetType: 'type', - isVisible: true, - category: 'some2' - }), - Em.Object.create({ - isValid: false, - widgetType: null, - isVisible: true, - category: 'some2' - }), - Em.Object.create({ - isValid: false, - widgetType: 'type', - isVisible: true - }) - ], - configCategories: [ - Em.Object.create({ name: 'some1', slaveErrorCount: 0}), - Em.Object.create({ name: 'some2', slaveErrorCount: 0}) - ] - }); - expect(serviceConfig.get('errorCount')).to.equal(4); + describe('#visibleProperties', function() { + it('returns collection of properties that should be shown', function() { + expect(serviceConfig.get('visibleProperties').mapProperty('name')).to.be.eql(['p1','p4','p5']); }); }); -}); - -describe('App.Group', function () { - - beforeEach(function () { - group = App.Group.create(); + describe('#configsWithErrors', function() { + it('returns collection of properties with errors', function() { + expect(serviceConfig.get('configsWithErrors').mapProperty('name')).to.be.eql(['p4', 'p5']); + }) }); - describe('#errorCount', function () { - it('should be 0', function () { - group.set('properties', groupNoErrorsData); - expect(group.get('errorCount')).to.equal(0); - }); - it('should be 1', function () { - group.set('properties', groupErrorsData); - expect(group.get('errorCount')).to.equal(1); + describe('#errorCount', function() { + it('returns collection of properties with errors', function() { + serviceConfig.reopen({ + configsWithErrors: [{}, {}] + }); + expect(serviceConfig.get('errorCount')).to.equal(2); }); }); - }); http://git-wip-us.apache.org/repos/asf/ambari/blob/d7d0ba28/ambari-web/test/models/configs/sub_section_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/models/configs/sub_section_test.js b/ambari-web/test/models/configs/sub_section_test.js index afc37b2..e89bce9 100644 --- a/ambari-web/test/models/configs/sub_section_test.js +++ b/ambari-web/test/models/configs/sub_section_test.js @@ -52,15 +52,13 @@ describe('App.SubSection', function () { expect(model.get('errorsCount')).to.equal(3); }); - it('should use [email protected]', function() { + it('should use [email protected]', function() { // original value is valid var validOriginalSCP = model.get('configs').objectAt(0); // add override with not valid value - validOriginalSCP.set('overrides', [ - App.ServiceConfigProperty.create({ isValid: false }), - App.ServiceConfigProperty.create({ isValid: true }) - ]); - expect(model.get('errorsCount')).to.equal(4); + validOriginalSCP.set('isValidOverride', false); + validOriginalSCP.set('isValid', true); + expect(model.get('errorsCount')).to.equal(3); }); });
