This is an automated email from the ASF dual-hosted git repository. ishanbha pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push: new 443a473 [AMBARI-24636] Add Service wizard fails if a service without configs is installed. 443a473 is described below commit 443a473fec9f30bcfa9ecd0f52d8b1d86b487cb2 Author: Ishan Bhatt <ishanbhatt.1...@gmail.com> AuthorDate: Thu Sep 13 11:38:44 2018 -0700 [AMBARI-24636] Add Service wizard fails if a service without configs is installed. --- ambari-web/app/controllers/main/service/item.js | 2 +- .../app/mixins/common/configs/enhanced_configs.js | 33 ++++++++++++---------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/ambari-web/app/controllers/main/service/item.js b/ambari-web/app/controllers/main/service/item.js index ea99c54..b4d059c 100644 --- a/ambari-web/app/controllers/main/service/item.js +++ b/ambari-web/app/controllers/main/service/item.js @@ -576,7 +576,7 @@ App.MainServiceItemController = Em.Controller.extend(App.SupportClientConfigsDow sender: this, data: { context, - serviceName: serviceName.toUpperCase(), + serviceName: serviceName, state: serviceHealth, query: requestQuery }, diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js b/ambari-web/app/mixins/common/configs/enhanced_configs.js index 750ab4d..bf091fb 100644 --- a/ambari-web/app/mixins/common/configs/enhanced_configs.js +++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js @@ -649,22 +649,25 @@ App.EnhancedConfigsMixin = Em.Mixin.create(App.ConfigWithOverrideRecommendationP updateAttributesFromTheme: function (serviceName) { this.prepareSectionsConfigProperties(serviceName); - const serviceConfigs = this.get('stepConfigs').findProperty('serviceName', serviceName).get('configs'), - configConditions = App.ThemeCondition.find().filter(condition => { - const dependentConfigName = condition.get('configName'), - dependentConfigFileName = condition.get('fileName'), - configsToDependOn = condition.getWithDefault('configs', []); - return serviceConfigs.some(serviceConfig => { - const serviceConfigName = Em.get(serviceConfig, 'name'), - serviceConfigFileName = Em.get(serviceConfig, 'filename'); - return (serviceConfigName === dependentConfigName && serviceConfigFileName === dependentConfigFileName) - || configsToDependOn.some(config => { - const {configName, fileName} = config; - return serviceConfigName === configName && serviceConfigFileName === fileName; - }); + const service = this.get('stepConfigs').findProperty('serviceName', serviceName); + if (service) { + const serviceConfigs = service.get('configs'), + configConditions = App.ThemeCondition.find().filter(condition => { + const dependentConfigName = condition.get('configName'), + dependentConfigFileName = condition.get('fileName'), + configsToDependOn = condition.getWithDefault('configs', []); + return serviceConfigs.some(serviceConfig => { + const serviceConfigName = Em.get(serviceConfig, 'name'), + serviceConfigFileName = Em.get(serviceConfig, 'filename'); + return (serviceConfigName === dependentConfigName && serviceConfigFileName === dependentConfigFileName) + || configsToDependOn.some(config => { + const {configName, fileName} = config; + return serviceConfigName === configName && serviceConfigFileName === fileName; + }); + }); }); - }); - this.updateAttributesFromConditions(configConditions, serviceConfigs, serviceName); + this.updateAttributesFromConditions(configConditions, serviceConfigs, serviceName); + } }, prepareSectionsConfigProperties: function (serviceName) {