Add list of upstream servers

Closes #344
This commit is contained in:
Ildar Kamalov
2018-09-26 18:38:06 +03:00
parent 3afd8fccc7
commit 2c72035000
5 changed files with 24 additions and 16 deletions

View File

@@ -10,3 +10,7 @@
padding-left: 20px;
padding-right: 20px;
}
.form-control--textarea {
min-height: 110px;
}

View File

@@ -34,8 +34,8 @@ export default class Upstream extends Component {
<div className="col">
<form>
<textarea
className="form-control"
value={this.props.upstream}
className="form-control form-control--textarea"
value={this.props.upstreamDns}
onChange={this.handleChange}
/>
<div className="card-actions">
@@ -63,7 +63,7 @@ export default class Upstream extends Component {
}
Upstream.propTypes = {
upstream: PropTypes.string,
upstreamDns: PropTypes.string,
processingTestUpstream: PropTypes.bool,
handleUpstreamChange: PropTypes.func,
handleUpstreamSubmit: PropTypes.func,

View File

@@ -36,16 +36,16 @@ export default class Settings extends Component {
}
handleUpstreamChange = (value) => {
this.props.handleUpstreamChange({ upstream: value });
this.props.handleUpstreamChange({ upstreamDns: value });
};
handleUpstreamSubmit = () => {
this.props.setUpstream(this.props.settings.upstream);
this.props.setUpstream(this.props.dashboard.upstreamDns);
};
handleUpstreamTest = () => {
if (this.props.settings.upstream.length > 0) {
this.props.testUpstream(this.props.settings.upstream);
if (this.props.dashboard.upstreamDns.length > 0) {
this.props.testUpstream(this.props.dashboard.upstreamDns);
} else {
this.props.addErrorToast({ error: 'No servers specified' });
}
@@ -69,7 +69,8 @@ export default class Settings extends Component {
}
render() {
const { settings, upstream } = this.props;
const { settings } = this.props;
const { upstreamDns } = this.props.dashboard;
return (
<Fragment>
<PageTitle title="Settings" />
@@ -84,7 +85,7 @@ export default class Settings extends Component {
</div>
</Card>
<Upstream
upstream={upstream}
upstreamDns={upstreamDns}
processingTestUpstream={settings.processingTestUpstream}
handleUpstreamChange={this.handleUpstreamChange}
handleUpstreamSubmit={this.handleUpstreamSubmit}