You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2016/02/11 16:45:44 UTC
[1/2] ambari git commit: AMBARI-15014 Incorrect #of required
properties at Ranger Customize Services page (Next button not enabled).
(ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 58b0b5014 -> b34606340
AMBARI-15014 Incorrect #of required properties at Ranger Customize Services page (Next button not enabled). (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d3d66f25
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d3d66f25
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d3d66f25
Branch: refs/heads/branch-2.2
Commit: d3d66f2549a16cd1aab17af3e4a7fe033626ca79
Parents: 58b0b50
Author: ababiichuk <ab...@hortonworks.com>
Authored: Thu Feb 11 15:25:06 2016 +0200
Committer: ababiichuk <ab...@hortonworks.com>
Committed: Thu Feb 11 16:01:31 2016 +0200
----------------------------------------------------------------------
.../app/controllers/wizard/step7_controller.js | 5 +--
ambari-web/app/mixins/common/serverValidator.js | 2 +-
.../models/configs/objects/service_config.js | 4 +-
.../configs/objects/service_config_property.js | 6 ---
.../app/models/configs/theme/sub_section.js | 4 +-
.../app/models/configs/theme/sub_section_tab.js | 4 +-
.../config_recommendation_popup.hbs | 46 ++++++++++----------
.../configs/widgets/config_widget_view.js | 5 +--
ambari-web/test/models/configs/section_test.js | 7 ---
9 files changed, 29 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3d66f25/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 db6464d..b00669a 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -685,10 +685,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
themeResource.get('configProperties').forEach(function (_config) {
configs.forEach(function (item) {
if (item.name === _config.get('name') && item.filename === _config.get('fileName')) {
- // if config has already been hidden by condition with "subsection" or "subsectionTab" type
- // then ignore condition of "config" type
- if (configCondition.get('type') === 'config' && item.hiddenBySection) return false;
- item.hiddenBySection = !valueAttributes['visible'];
+ item.isVisible = valueAttributes['visible'];
}
});
}, this);
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3d66f25/ambari-web/app/mixins/common/serverValidator.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/serverValidator.js b/ambari-web/app/mixins/common/serverValidator.js
index ebb68ad..1ea9c59 100644
--- a/ambari-web/app/mixins/common/serverValidator.js
+++ b/ambari-web/app/mixins/common/serverValidator.js
@@ -399,7 +399,7 @@ App.ServerValidatorMixin = Em.Mixin.create({
: self.get('stepConfigs');
var configsWithErrors = stepConfigs.some(function (step) {
return step.get('configs').some(function(c) {
- return c.get('isVisible') && !c.get('hiddenBySection') && (c.get('warn') || c.get('error'));
+ return c.get('isVisible') && (c.get('warn') || c.get('error'));
})
});
if (configsWithErrors) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3d66f25/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 71b05e6..d8677d1 100644
--- a/ambari-web/app/models/configs/objects/service_config.js
+++ b/ambari-web/app/models/configs/objects/service_config.js
@@ -61,7 +61,7 @@ App.ServiceConfig = Ember.Object.extend({
category.incrementProperty('nonSlaveErrorCount');
masterErrors++;
}
- if (!item.get('isValid') && item.get('widgetType') && item.get('isVisible') && !item.get('hiddenBySection')) {
+ if (!item.get('isValid') && item.get('widgetType') && item.get('isVisible')) {
enhancedConfigsErrors++;
}
if (item.get('overrides')) {
@@ -76,7 +76,7 @@ App.ServiceConfig = Ember.Object.extend({
}
});
return masterErrors + slaveErrors + overrideErrors + enhancedConfigsErrors;
- }.property('configs.@each.isValid', 'configs.@each.isVisible', 'configs.@each.hiddenBySection', 'configCategories.@each.slaveErrorCount', 'configs.@each.overrideErrorTrigger'),
+ }.property('configs.@each.isValid', 'configs.@each.isVisible', 'configCategories.@each.slaveErrorCount', 'configs.@each.overrideErrorTrigger'),
/**
* checks if for example for kdc_type, the value isn't just the pretty version of the saved value, for example mit-kdc
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3d66f25/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 dcc7a1e..1da8e21 100644
--- a/ambari-web/app/models/configs/objects/service_config_property.js
+++ b/ambari-web/app/models/configs/objects/service_config_property.js
@@ -187,12 +187,6 @@ App.ServiceConfigProperty = Em.Object.extend({
showAsTextBox: false,
/**
- * config is invisible since wrapper section is hidden
- * @type {boolean}
- */
- hiddenBySection: false,
-
- /**
* @type {boolean}
*/
recommendedValueExists: function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3d66f25/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 ce26a3c..d4c9195 100644
--- a/ambari-web/app/models/configs/theme/sub_section.js
+++ b/ambari-web/app/models/configs/theme/sub_section.js
@@ -182,9 +182,7 @@ App.SubSection = DS.Model.extend({
* @type {boolean}
*/
isHiddenByFilter: function () {
- var configs = this.get('configs').filter(function(c) {
- return !c.get('hiddenBySection') && c.get('isVisible');
- });
+ var configs = this.get('configs').filterProperty('isVisible');
return configs.length ? configs.everyProperty('isHiddenByFilter', true) : false;
}.property('configs.@each.isHiddenByFilter'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3d66f25/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 d5d5349..610a1d3 100644
--- a/ambari-web/app/models/configs/theme/sub_section_tab.js
+++ b/ambari-web/app/models/configs/theme/sub_section_tab.js
@@ -76,9 +76,7 @@ App.SubSectionTab = DS.Model.extend({
* @type {boolean}
*/
isHiddenByFilter: function () {
- var configs = this.get('configs').filter(function(c) {
- return !c.get('hiddenBySection') && c.get('isVisible');
- });
+ var configs = this.get('configs').filterProperty('isVisible');
return configs.length ? configs.everyProperty('isHiddenByFilter', true) : false;
}.property('configs.@each.isHiddenByFilter'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3d66f25/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs b/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs
index f58e086..fab5742 100644
--- a/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs
+++ b/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs
@@ -31,30 +31,28 @@
{{#each service in view.serviceConfigs}}
{{#each property in service.configs}}
{{#if property.isVisible}}
- {{#unless property.hiddenBySection}}
- {{#if property.warn}}
- <tr>
- <td>{{property.serviceName}}</td>
- <td>{{property.name}}</td>
- <td>{{property.value}}</td>
- <td>
- <div class="property-message">{{property.warnMessage}}</div>
- <div class="property-description">{{property.description}}</div>
- </td>
- </tr>
- {{/if}}
- {{#if property.error}}
- <tr>
- <td>{{property.serviceName}}</td>
- <td>{{property.name}}</td>
- <td>{{property.value}}</td>
- <td>
- <div class="property-message">{{property.errorMessage}}</div>
- <div class="property-description">{{property.description}}</div>
- </td>
- </tr>
- {{/if}}
- {{/unless}}
+ {{#if property.warn}}
+ <tr>
+ <td>{{property.serviceName}}</td>
+ <td>{{property.name}}</td>
+ <td>{{property.value}}</td>
+ <td>
+ <div class="property-message">{{property.warnMessage}}</div>
+ <div class="property-description">{{property.description}}</div>
+ </td>
+ </tr>
+ {{/if}}
+ {{#if property.error}}
+ <tr>
+ <td>{{property.serviceName}}</td>
+ <td>{{property.name}}</td>
+ <td>{{property.value}}</td>
+ <td>
+ <div class="property-message">{{property.errorMessage}}</div>
+ <div class="property-description">{{property.description}}</div>
+ </td>
+ </tr>
+ {{/if}}
{{/if}}
{{/each}}
{{/each}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3d66f25/ambari-web/app/views/common/configs/widgets/config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/config_widget_view.js b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
index a0515e6..4b4c477 100644
--- a/ambari-web/app/views/common/configs/widgets/config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
@@ -442,9 +442,6 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo
var conditionalConfig = serviceConfigs.filterProperty('filename',conditionalConfigFileName).findProperty('name', conditionalConfigName);
if (conditionalConfig) {
conditionalConfig.set(valueAttribute, valueAttributes[key]);
- if (valueAttribute === 'isVisible') {
- conditionalConfig.set('hiddenBySection', !valueAttributes[key]);
- }
}
}
}
@@ -468,7 +465,7 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo
themeResource = App.SubSectionTab.find().findProperty('name', subsectionConditionName);
}
themeResource.set('isHiddenByConfig', !valueAttributes['visible']);
- themeResource.get('configs').setEach('hiddenBySection', !valueAttributes['visible']);
+ themeResource.get('configs').setEach('isVisible', valueAttributes['visible']);
}
}
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3d66f25/ambari-web/test/models/configs/section_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/models/configs/section_test.js b/ambari-web/test/models/configs/section_test.js
index 967534e..f7be9b7 100644
--- a/ambari-web/test/models/configs/section_test.js
+++ b/ambari-web/test/models/configs/section_test.js
@@ -64,13 +64,6 @@ describe('App.Section', function () {
},
{
subSections: [
- App.SubSection.createRecord({configs: [Em.Object.create({isHiddenByFilter: true, isVisible: false, hiddenBySection: false}), Em.Object.create({isHiddenByFilter: true, isVisible: true, hiddenBySection: true})]})
- ],
- m: 'no subsections are hidden (hiddenBySection)',
- e: false
- },
- {
- subSections: [
App.SubSection.createRecord({configs: [Em.Object.create({isHiddenByFilter: true, isVisible: true}), Em.Object.create({isHiddenByFilter: true, isVisible: true})]}),
App.SubSection.createRecord({configs: [Em.Object.create({isHiddenByFilter: false, isVisible: true}), Em.Object.create({isHiddenByFilter: false, isVisible: true})]})
],
[2/2] ambari git commit: AMBARI-15015 UI adds config properties that
are not necessary. (ababiichuk)
Posted by ab...@apache.org.
AMBARI-15015 UI adds config properties that are not necessary. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b3460634
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b3460634
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b3460634
Branch: refs/heads/branch-2.2
Commit: b3460634012500765dc54317cc1c28b77780c336
Parents: d3d66f2
Author: ababiichuk <ab...@hortonworks.com>
Authored: Thu Feb 11 16:00:06 2016 +0200
Committer: ababiichuk <ab...@hortonworks.com>
Committed: Thu Feb 11 16:01:57 2016 +0200
----------------------------------------------------------------------
.../app/controllers/wizard/step8_controller.js | 30 +++++++++++---------
1 file changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b3460634/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index aa1d97b..747bf83 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1559,15 +1559,17 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
isGLUSTERFSSelected = installedAndSelectedServices.someProperty('serviceName', 'GLUSTERFS');
coreSiteObj.forEach(function (_coreSiteObj) {
- if (isGLUSTERFSSelected && _coreSiteObj.name == "fs.default.name") {
- coreSiteProperties[_coreSiteObj.name] =
- this.get('configs').someProperty('name', 'fs_glusterfs_default_name') ?
- this.get('configs').findProperty('name', 'fs_glusterfs_default_name').value : null;
- }
- if (isGLUSTERFSSelected && _coreSiteObj.name == "fs.defaultFS") {
- coreSiteProperties[_coreSiteObj.name] =
- this.get('configs').someProperty('name', 'glusterfs_defaultFS_name') ?
- this.get('configs').findProperty('name', 'glusterfs_defaultFS_name').value : null;
+ if (coreSiteObj.isRequiredByAgent !== false) {
+ if (isGLUSTERFSSelected && _coreSiteObj.name == "fs.default.name") {
+ coreSiteProperties[_coreSiteObj.name] =
+ this.get('configs').someProperty('name', 'fs_glusterfs_default_name') ?
+ this.get('configs').findProperty('name', 'fs_glusterfs_default_name').value : null;
+ }
+ if (isGLUSTERFSSelected && _coreSiteObj.name == "fs.defaultFS") {
+ coreSiteProperties[_coreSiteObj.name] =
+ this.get('configs').someProperty('name', 'glusterfs_defaultFS_name') ?
+ this.get('configs').findProperty('name', 'glusterfs_defaultFS_name').value : null;
+ }
}
}, this);
var attributes = App.router.get('mainServiceInfoConfigsController').getConfigAttributes(coreSiteObj);
@@ -1621,10 +1623,12 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
var configs = this.get('configs').filterProperty('filename', 'storm-site.xml');
var stormProperties = {};
configs.forEach(function (_configProperty) {
- if (["nimbus.seeds", "storm.zookeeper.servers"].contains(_configProperty.name)) {
- stormProperties[_configProperty.name] = JSON.stringify(_configProperty.value).replace(/"/g, "'");
- } else {
- stormProperties[_configProperty.name] = _configProperty.value;
+ if (_configProperty.isRequiredByAgent !== false) {
+ if (["nimbus.seeds", "storm.zookeeper.servers"].contains(_configProperty.name)) {
+ stormProperties[_configProperty.name] = JSON.stringify(_configProperty.value).replace(/"/g, "'");
+ } else {
+ stormProperties[_configProperty.name] = _configProperty.value;
+ }
}
}, this);
return {type: 'storm-site', tag: tag, properties: stormProperties};