-
-
-
-
-
-
-
+ {INPUT_FIELDS.map(({
+ name, component, type, className, placeholder, getTitle, subtitle, disabled,
+ }) =>
+ {typeof getTitle === 'function' && getTitle()}
+
+
)}
-
-
-
-
- bootstrap_dns_desc
-
-
+
+
+
+ bootstrap_dns_desc
+
@@ -92,12 +109,11 @@ let Form = (props) => {
className={testButtonClass}
onClick={() =>
testUpstream({
- upstream_dns: upstreamDns,
- bootstrap_dns: bootstrapDns,
- all_servers: allServers,
+ upstream_dns,
+ bootstrap_dns,
})
}
- disabled={!upstreamDns || processingTestUpstream}
+ disabled={!upstream_dns || processingTestUpstream}
>
test_upstream_btn
@@ -105,7 +121,7 @@ let Form = (props) => {
type="submit"
className="btn btn-success btn-standard"
disabled={
- submitting || invalid || processingSetUpstream || processingTestUpstream
+ submitting || invalid || processingSetConfig || processingTestUpstream
}
>
apply_btn
@@ -122,24 +138,28 @@ Form.propTypes = {
submitting: PropTypes.bool,
invalid: PropTypes.bool,
initialValues: PropTypes.object,
- upstreamDns: PropTypes.string,
- bootstrapDns: PropTypes.string,
- allServers: PropTypes.bool,
+ upstream_dns: PropTypes.string,
+ bootstrap_dns: PropTypes.string,
+ fastest_addr: PropTypes.bool,
+ parallel_requests: PropTypes.bool,
processingTestUpstream: PropTypes.bool,
- processingSetUpstream: PropTypes.bool,
+ processingSetConfig: PropTypes.bool,
t: PropTypes.func,
};
const selector = formValueSelector('upstreamForm');
Form = connect((state) => {
- const upstreamDns = selector(state, 'upstream_dns');
- const bootstrapDns = selector(state, 'bootstrap_dns');
- const allServers = selector(state, 'all_servers');
+ const upstream_dns = selector(state, 'upstream_dns');
+ const bootstrap_dns = selector(state, 'bootstrap_dns');
+ const fastest_addr = selector(state, 'fastest_addr');
+ const parallel_requests = selector(state, 'parallel_requests');
+
return {
- upstreamDns,
- bootstrapDns,
- allServers,
+ upstream_dns,
+ bootstrap_dns,
+ fastest_addr,
+ parallel_requests,
};
})(Form);
diff --git a/client/src/components/Settings/Dns/Upstream/index.js b/client/src/components/Settings/Dns/Upstream/index.js
index 292c2cfd..62a93795 100644
--- a/client/src/components/Settings/Dns/Upstream/index.js
+++ b/client/src/components/Settings/Dns/Upstream/index.js
@@ -7,7 +7,7 @@ import Card from '../../../ui/Card';
class Upstream extends Component {
handleSubmit = (values) => {
- this.props.setUpstream(values);
+ this.props.setDnsConfig(values);
};
handleTest = (values) => {
@@ -17,11 +17,14 @@ class Upstream extends Component {
render() {
const {
t,
- upstreamDns: upstream_dns,
- bootstrapDns: bootstrap_dns,
- allServers: all_servers,
- processingSetUpstream,
processingTestUpstream,
+ dnsConfig: {
+ upstream_dns,
+ bootstrap_dns,
+ fastest_addr,
+ parallel_requests,
+ processingSetConfig,
+ },
} = this.props;
return (
@@ -36,12 +39,13 @@ class Upstream extends Component {
initialValues={{
upstream_dns,
bootstrap_dns,
- all_servers,
+ fastest_addr,
+ parallel_requests,
}}
testUpstream={this.handleTest}
onSubmit={this.handleSubmit}
processingTestUpstream={processingTestUpstream}
- processingSetUpstream={processingSetUpstream}
+ processingSetConfig={processingSetConfig}
/>
@@ -51,14 +55,11 @@ class Upstream extends Component {
}
Upstream.propTypes = {
- upstreamDns: PropTypes.string,
- bootstrapDns: PropTypes.string,
- allServers: PropTypes.bool,
- setUpstream: PropTypes.func.isRequired,
testUpstream: PropTypes.func.isRequired,
- processingSetUpstream: PropTypes.bool.isRequired,
processingTestUpstream: PropTypes.bool.isRequired,
t: PropTypes.func.isRequired,
+ dnsConfig: PropTypes.object.isRequired,
+ setDnsConfig: PropTypes.func.isRequired,
};
export default withNamespaces()(Upstream);
diff --git a/client/src/components/Settings/Dns/index.js b/client/src/components/Settings/Dns/index.js
index aae1fdab..8eb6e5a4 100644
--- a/client/src/components/Settings/Dns/index.js
+++ b/client/src/components/Settings/Dns/index.js
@@ -10,7 +10,6 @@ import Loading from '../../ui/Loading';
class Dns extends Component {
componentDidMount() {
- this.props.getDnsSettings();
this.props.getAccessList();
this.props.getDnsConfig();
}
@@ -18,59 +17,45 @@ class Dns extends Component {
render() {
const {
t,
- dashboard,
settings,
access,
setAccessList,
testUpstream,
- setUpstream,
dnsConfig,
setDnsConfig,
} = this.props;
- const isDataLoading = dashboard.processingDnsSettings
- || access.processing
- || dnsConfig.processingGetConfig;
- const isDataReady = !dashboard.processingDnsSettings
- && !access.processing
- && !dnsConfig.processingGetConfig;
+ const isDataLoading = access.processing || dnsConfig.processingGetConfig;
return (
- {isDataLoading && }
- {isDataReady && (
+ {isDataLoading ?
+ :
+
-
-
- )}
+ }
);
}
}
Dns.propTypes = {
- dashboard: PropTypes.object.isRequired,
settings: PropTypes.object.isRequired,
- setUpstream: PropTypes.func.isRequired,
testUpstream: PropTypes.func.isRequired,
getAccessList: PropTypes.func.isRequired,
setAccessList: PropTypes.func.isRequired,
access: PropTypes.object.isRequired,
- getDnsSettings: PropTypes.func.isRequired,
dnsConfig: PropTypes.object.isRequired,
setDnsConfig: PropTypes.func.isRequired,
getDnsConfig: PropTypes.func.isRequired,
diff --git a/client/src/components/ui/Card.css b/client/src/components/ui/Card.css
index 577fa60a..e5840f7f 100644
--- a/client/src/components/ui/Card.css
+++ b/client/src/components/ui/Card.css
@@ -10,6 +10,11 @@
}
.card-table-overflow {
+ overflow-y: auto;
+ max-height: 100%;
+}
+
+.card-table-overflow--limited {
overflow-y: auto;
max-height: 280px;
}
diff --git a/client/src/components/ui/Checkbox.css b/client/src/components/ui/Checkbox.css
index ff657898..bab88c79 100644
--- a/client/src/components/ui/Checkbox.css
+++ b/client/src/components/ui/Checkbox.css
@@ -83,6 +83,7 @@
.checkbox__input:disabled + .checkbox__label {
cursor: default;
+ color: var(--gray);
}
.checkbox__input:disabled + .checkbox__label:before {
diff --git a/client/src/components/ui/Guide.js b/client/src/components/ui/Guide.js
index bc18366a..cbb0035b 100644
--- a/client/src/components/ui/Guide.js
+++ b/client/src/components/ui/Guide.js
@@ -34,6 +34,9 @@ const Guide = (props) => {
install_devices_router_list_3
+
+ install_devices_router_list_4
+
+
+ 
+
+
+ 
+
+
+ 
+