Squashed commit of the following: commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba Merge: a23285ece2ddc82dAuthor: Simon Zolin <s.zolin@adguard.com> Date: Wed Apr 22 19:16:01 2020 +0300 Merge remote-tracking branch 'origin/master' into 715 commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Apr 22 18:30:30 2020 +0300 Review changes commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Apr 21 16:37:42 2020 +0300 + client: Add fastest addr option commit 9e713df80c5bf113c98794c0a20915c756a76938 Merge: e3bf40379b7c1181Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Apr 21 16:02:03 2020 +0300 Merge remote-tracking branch 'origin/master' into 715-fastest-addr commit e3bf4037f49198e42bde55305d6f9077341b556a Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Apr 21 15:40:49 2020 +0300 minor commit d6e6a823c5e51acc061b2850d362772efcb827e1 Author: Simon Zolin <s.zolin@adguard.com> Date: Fri Apr 17 17:56:24 2020 +0300 * API changes . removed POST /set_upstreams_config . removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers . added new fields to /dns_config and /dns_info commit 237a452d09cc48ff8f00e81c7fd35e7828bea835 Author: Simon Zolin <s.zolin@adguard.com> Date: Fri Apr 17 16:43:13 2020 +0300 * API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config commit 9976723b9725ed19e0cce152d1d1198b13c4acc1 Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Mar 23 10:28:25 2020 +0300 openapi commit 6f8ea16c6332606f29095b0094d71e8a91798f82 Merge: 36e4d4e8c8285c41Author: Simon Zolin <s.zolin@adguard.com> Date: Fri Mar 20 19:18:48 2020 +0300 Merge remote-tracking branch 'origin/master' into 715-fastest-addr commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342 Author: Simon Zolin <s.zolin@adguard.com> Date: Fri Mar 20 18:13:43 2020 +0300 + DNS: add fastest_addr setting
55 lines
1.9 KiB
JavaScript
55 lines
1.9 KiB
JavaScript
import { createAction } from 'redux-actions';
|
|
|
|
import apiClient from '../api/Api';
|
|
import { addErrorToast, addSuccessToast } from './index';
|
|
import { normalizeTextarea } from '../helpers/helpers';
|
|
|
|
export const getDnsConfigRequest = createAction('GET_DNS_CONFIG_REQUEST');
|
|
export const getDnsConfigFailure = createAction('GET_DNS_CONFIG_FAILURE');
|
|
export const getDnsConfigSuccess = createAction('GET_DNS_CONFIG_SUCCESS');
|
|
|
|
export const getDnsConfig = () => async (dispatch) => {
|
|
dispatch(getDnsConfigRequest());
|
|
try {
|
|
const data = await apiClient.getDnsConfig();
|
|
dispatch(getDnsConfigSuccess(data));
|
|
} catch (error) {
|
|
dispatch(addErrorToast({ error }));
|
|
dispatch(getDnsConfigFailure());
|
|
}
|
|
};
|
|
|
|
export const setDnsConfigRequest = createAction('SET_DNS_CONFIG_REQUEST');
|
|
export const setDnsConfigFailure = createAction('SET_DNS_CONFIG_FAILURE');
|
|
export const setDnsConfigSuccess = createAction('SET_DNS_CONFIG_SUCCESS');
|
|
|
|
export const setDnsConfig = config => async (dispatch) => {
|
|
dispatch(setDnsConfigRequest());
|
|
try {
|
|
const data = { ...config };
|
|
|
|
let hasDnsSettings = false;
|
|
if (Object.prototype.hasOwnProperty.call(data, 'bootstrap_dns')) {
|
|
data.bootstrap_dns = normalizeTextarea(config.bootstrap_dns);
|
|
hasDnsSettings = true;
|
|
}
|
|
if (Object.prototype.hasOwnProperty.call(data, 'upstream_dns')) {
|
|
data.upstream_dns = normalizeTextarea(config.upstream_dns);
|
|
hasDnsSettings = true;
|
|
}
|
|
|
|
await apiClient.setDnsConfig(data);
|
|
|
|
if (hasDnsSettings) {
|
|
dispatch(addSuccessToast('updated_upstream_dns_toast'));
|
|
} else {
|
|
dispatch(addSuccessToast('config_successfully_saved'));
|
|
}
|
|
|
|
dispatch(setDnsConfigSuccess(config));
|
|
} catch (error) {
|
|
dispatch(addErrorToast({ error }));
|
|
dispatch(setDnsConfigFailure());
|
|
}
|
|
};
|