You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by is...@apache.org on 2018/09/14 03:48:39 UTC
[ambari] branch branch-2.7 updated: [AMBARI-24636] Add Service
wizard fails if a service without configs is installed.
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 2f9e7f5 [AMBARI-24636] Add Service wizard fails if a service without configs is installed.
2f9e7f5 is described below
commit 2f9e7f5730dfa989034d5afd60279c616398f175
Author: Ishan Bhatt <is...@gmail.com>
AuthorDate: Thu Sep 13 11:18:16 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 d52cc3f..94e37a3 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) {