UI for user upload CA bundle file for VMware
Add support of CA certificates and restrictions that enable/disable certificate upload field Change-Id: Id38bf7c74869fa60852ca1cb2ccaa9c63412cf64 Partial-Bug: 1616438
This commit is contained in:
parent
2eeb51bba6
commit
5ce3ca33df
|
@ -41,6 +41,7 @@ var Field = React.createClass({
|
||||||
var props = _.extend({
|
var props = _.extend({
|
||||||
onChange: this.onChange,
|
onChange: this.onChange,
|
||||||
disabled: this.props.disabled,
|
disabled: this.props.disabled,
|
||||||
|
tooltipText: this.props.tooltipText,
|
||||||
error: (this.props.model.validationError || {})[metadata.name]
|
error: (this.props.model.validationError || {})[metadata.name]
|
||||||
}, _.pick(metadata, 'name', 'type', 'label', 'description'));
|
}, _.pick(metadata, 'name', 'type', 'label', 'description'));
|
||||||
switch (metadata.type) {
|
switch (metadata.type) {
|
||||||
|
@ -77,13 +78,16 @@ var FieldGroup = React.createClass({
|
||||||
var restrictions = this.props.model.testRestrictions();
|
var restrictions = this.props.model.testRestrictions();
|
||||||
var metadata = _.filter(this.props.model.get('metadata'), VmWareModels.isRegularField);
|
var metadata = _.filter(this.props.model.get('metadata'), VmWareModels.isRegularField);
|
||||||
var fields = metadata.map((meta) => {
|
var fields = metadata.map((meta) => {
|
||||||
|
if (restrictions.hide[meta.name] && restrictions.hide[meta.name].result) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
return (
|
return (
|
||||||
<Field
|
<Field
|
||||||
key={meta.name}
|
key={meta.name}
|
||||||
model={this.props.model}
|
model={this.props.model}
|
||||||
metadata={meta}
|
metadata={meta}
|
||||||
disabled={this.props.disabled}
|
disabled={this.props.disabled || restrictions.disable[meta.name].result}
|
||||||
disableWarning={restrictions.disable[meta.name]}
|
tooltipText={restrictions.disable[meta.name].message}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
@ -338,7 +342,9 @@ var VmWareTab = React.createClass({
|
||||||
cluster: this.props.cluster,
|
cluster: this.props.cluster,
|
||||||
settings: this.props.cluster.get('settings'),
|
settings: this.props.cluster.get('settings'),
|
||||||
networking_parameters: this.props.cluster.get('networkConfiguration')
|
networking_parameters: this.props.cluster.get('networkConfiguration')
|
||||||
.get('networking_parameters')
|
.get('networking_parameters'),
|
||||||
|
current_vcenter: this.model.get('availability_zones').at(0),
|
||||||
|
glance: this.model.get('glance')
|
||||||
});
|
});
|
||||||
|
|
||||||
this.onModelSync(); // eslint-disable-line no-sync
|
this.onModelSync(); // eslint-disable-line no-sync
|
||||||
|
@ -407,6 +413,7 @@ var VmWareTab = React.createClass({
|
||||||
var model = this.state.model;
|
var model = this.state.model;
|
||||||
var currentJson = JSON.stringify(this.model.toJSON());
|
var currentJson = JSON.stringify(this.model.toJSON());
|
||||||
var editable = this.props.cluster.isAvailableForSettingsChanges();
|
var editable = this.props.cluster.isAvailableForSettingsChanges();
|
||||||
|
this.actions = this.model.testRestrictions();
|
||||||
var hide = this.actions.hide || {};
|
var hide = this.actions.hide || {};
|
||||||
var disable = this.actions.disable || {};
|
var disable = this.actions.disable || {};
|
||||||
|
|
||||||
|
|
|
@ -557,7 +557,10 @@ var ClusterActionsPanel = React.createClass({
|
||||||
function(cluster) {
|
function(cluster) {
|
||||||
if (cluster.get('settings').get('common.use_vcenter.value')) {
|
if (cluster.get('settings').get('common.use_vcenter.value')) {
|
||||||
var vcenter = cluster.get('vcenter');
|
var vcenter = cluster.get('vcenter');
|
||||||
vcenter.setModels(configModels);
|
vcenter.setModels(_.extend({
|
||||||
|
current_vcenter: vcenter.get('availability_zones').at(0),
|
||||||
|
glance: vcenter.get('glance')
|
||||||
|
}, configModels));
|
||||||
return !vcenter.isValid() && {
|
return !vcenter.isValid() && {
|
||||||
blocker: [
|
blocker: [
|
||||||
<span key='vcenter'>{i18n('vmware.has_errors') + ' '}
|
<span key='vcenter'>{i18n('vmware.has_errors') + ' '}
|
||||||
|
|
Loading…
Reference in New Issue