Merge in DNS/adguard-home from 1383-client-id to master Updates #1383. Squashed commit of the following: commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:51:59 2021 +0300 - client: check if IP is valid commit 0c330585a170ea149ee75e43dfa65211e057299c Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:07:50 2021 +0300 - client: find clients by client_id commit 71c9593ee35d996846f061e114b7867c3aa3c978 Merge: 9104f1613e9edd9eAuthor: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 16:09:45 2021 +0300 Merge branch 'master' into 1383-client-id commit 9104f1615d2d462606c52017df25a422df872cea Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 13:28:50 2021 +0300 dnsforward: imp tests commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 12:39:52 2021 +0300 dnsforward: fix address commit 98b222ba69a5d265f620c180c960d01c84a1fb3b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:50:31 2021 +0300 home: imp code commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20 Merge: 199fdc05c215b820Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:45:13 2021 +0300 Merge branch 'master' into 1383-client-id commit 199fdc056f8a8be5500584f3aaee32865188aedc Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:20:37 2021 +0300 all: imp tests, logging, etc commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:55:19 2021 +0300 + client: remove block button from clients with client_id commit 32991a0b4c56583a02fb5e00bba95d96000bce20 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:54:25 2021 +0300 + client: add requests count for client_id commit 2d68df4d2eac4a296d7469923e601dad4575c1a1 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 15:49:50 2021 +0300 stats: handle client ids commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:45:25 2021 +0300 openapi: fix example commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:37:10 2021 +0300 openapi: improve clients find api docs commit f79876e550c424558b704bc316a4cd04f25db011 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:18:52 2021 +0300 home: accept ids in clients find commit 5b72595122aa0bd64debadfd753ed8a0e0840629 Merge: 607e241fabf8f65fAuthor: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:34:56 2021 +0300 Merge branch 'master' into 1383-client-id commit 607e241f1c339dd6397218f70b8301e3de6a1ee0 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:30:39 2021 +0300 dnsforward: fix quic commit f046352fef93e46234c2bbe8ae316d21034260e5 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 16:53:09 2021 +0300 all: remove wildcard requirement commit 3b679489bae82c54177372be453fe184d8f0bab6 Author: Andrey Meshkov <am@adguard.com> Date: Mon Jan 25 16:02:28 2021 +0300 workDir now supports symlinks commit 0647ab4f113de2223f6949df001f42ecab05c995 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:59:46 2021 +0300 - client: remove wildcard from domain validation commit b1aec04a4ecadc9d65648ed6d284188fecce01c3 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:55:39 2021 +0300 + client: add form to download mobileconfig ... and 12 more commits
376 lines
13 KiB
JavaScript
376 lines
13 KiB
JavaScript
import React, { useState } from 'react';
|
|
import { connect } from 'react-redux';
|
|
import PropTypes from 'prop-types';
|
|
import {
|
|
Field, FieldArray, reduxForm, formValueSelector,
|
|
} from 'redux-form';
|
|
import { Trans, withTranslation } from 'react-i18next';
|
|
import flow from 'lodash/flow';
|
|
import Select from 'react-select';
|
|
|
|
import i18n from '../../../i18n';
|
|
import Tabs from '../../ui/Tabs';
|
|
import Examples from '../Dns/Upstream/Examples';
|
|
import { toggleAllServices } from '../../../helpers/helpers';
|
|
import {
|
|
renderInputField,
|
|
renderGroupField,
|
|
CheckboxField,
|
|
renderServiceField,
|
|
} from '../../../helpers/form';
|
|
import { validateClientId, validateRequiredValue } from '../../../helpers/validators';
|
|
import { FORM_NAME, SERVICES } from '../../../helpers/constants';
|
|
import './Service.css';
|
|
|
|
const settingsCheckboxes = [
|
|
{
|
|
name: 'use_global_settings',
|
|
placeholder: 'client_global_settings',
|
|
},
|
|
{
|
|
name: 'filtering_enabled',
|
|
placeholder: 'block_domain_use_filters_and_hosts',
|
|
},
|
|
{
|
|
name: 'safebrowsing_enabled',
|
|
placeholder: 'use_adguard_browsing_sec',
|
|
},
|
|
{
|
|
name: 'parental_enabled',
|
|
placeholder: 'use_adguard_parental',
|
|
},
|
|
{
|
|
name: 'safesearch_enabled',
|
|
placeholder: 'enforce_safe_search',
|
|
},
|
|
];
|
|
const validate = (values) => {
|
|
const errors = {};
|
|
const { name, ids } = values;
|
|
errors.name = validateRequiredValue(name);
|
|
|
|
if (ids && ids.length) {
|
|
const idArrayErrors = [];
|
|
ids.forEach((id, idx) => {
|
|
idArrayErrors[idx] = validateRequiredValue(id) || validateClientId(id);
|
|
});
|
|
|
|
if (idArrayErrors.length) {
|
|
errors.ids = idArrayErrors;
|
|
}
|
|
}
|
|
return errors;
|
|
};
|
|
|
|
const renderFieldsWrapper = (placeholder, buttonTitle) => function cell(row) {
|
|
const {
|
|
fields,
|
|
} = row;
|
|
return (
|
|
<div className="form__group">
|
|
{fields.map((ip, index) => (
|
|
<div key={index} className="mb-1">
|
|
<Field
|
|
name={ip}
|
|
component={renderGroupField}
|
|
type="text"
|
|
className="form-control"
|
|
placeholder={placeholder}
|
|
isActionAvailable={index !== 0}
|
|
removeField={() => fields.remove(index)}
|
|
normalizeOnBlur={(data) => data.trim()}
|
|
/>
|
|
</div>
|
|
))}
|
|
<button
|
|
type="button"
|
|
className="btn btn-link btn-block btn-sm"
|
|
onClick={() => fields.push()}
|
|
title={buttonTitle}
|
|
>
|
|
<svg className="icon icon--24">
|
|
<use xlinkHref="#plus" />
|
|
</svg>
|
|
</button>
|
|
</div>
|
|
);
|
|
};
|
|
|
|
// Should create function outside of component to prevent component re-renders
|
|
const renderFields = renderFieldsWrapper(i18n.t('form_enter_id'), i18n.t('form_add_id'));
|
|
|
|
const renderMultiselect = (props) => {
|
|
const { input, placeholder, options } = props;
|
|
|
|
return (
|
|
<Select
|
|
{...input}
|
|
options={options}
|
|
className="basic-multi-select"
|
|
classNamePrefix="select"
|
|
onChange={(value) => input.onChange(value)}
|
|
onBlur={() => input.onBlur(input.value)}
|
|
placeholder={placeholder}
|
|
blurInputOnSelect={false}
|
|
isMulti
|
|
/>
|
|
);
|
|
};
|
|
|
|
renderMultiselect.propTypes = {
|
|
input: PropTypes.object.isRequired,
|
|
placeholder: PropTypes.string,
|
|
options: PropTypes.array,
|
|
};
|
|
|
|
let Form = (props) => {
|
|
const {
|
|
t,
|
|
handleSubmit,
|
|
reset,
|
|
change,
|
|
pristine,
|
|
submitting,
|
|
useGlobalSettings,
|
|
useGlobalServices,
|
|
toggleClientModal,
|
|
processingAdding,
|
|
processingUpdating,
|
|
invalid,
|
|
tagsOptions,
|
|
} = props;
|
|
|
|
const [activeTabLabel, setActiveTabLabel] = useState('settings');
|
|
|
|
const tabs = {
|
|
settings: {
|
|
title: 'settings',
|
|
component: <div label="settings" title={props.t('main_settings')}>
|
|
{settingsCheckboxes.map((setting) => (
|
|
<div className="form__group" key={setting.name}>
|
|
<Field
|
|
name={setting.name}
|
|
type="checkbox"
|
|
component={CheckboxField}
|
|
placeholder={t(setting.placeholder)}
|
|
disabled={
|
|
setting.name !== 'use_global_settings'
|
|
? useGlobalSettings
|
|
: false
|
|
}
|
|
/>
|
|
</div>
|
|
))}
|
|
</div>,
|
|
},
|
|
block_services: {
|
|
title: 'block_services',
|
|
component: <div label="services" title={props.t('block_services')}>
|
|
<div className="form__group">
|
|
<Field
|
|
name="use_global_blocked_services"
|
|
type="checkbox"
|
|
component={renderServiceField}
|
|
placeholder={t('blocked_services_global')}
|
|
modifier="service--global"
|
|
/>
|
|
<div className="row mb-4">
|
|
<div className="col-6">
|
|
<button
|
|
type="button"
|
|
className="btn btn-secondary btn-block"
|
|
disabled={useGlobalServices}
|
|
onClick={() => toggleAllServices(SERVICES, change, true)}
|
|
>
|
|
<Trans>block_all</Trans>
|
|
</button>
|
|
</div>
|
|
<div className="col-6">
|
|
<button
|
|
type="button"
|
|
className="btn btn-secondary btn-block"
|
|
disabled={useGlobalServices}
|
|
onClick={() => toggleAllServices(SERVICES, change, false)}
|
|
>
|
|
<Trans>unblock_all</Trans>
|
|
</button>
|
|
</div>
|
|
</div>
|
|
<div className="services">
|
|
{SERVICES.map((service) => (
|
|
<Field
|
|
key={service.id}
|
|
icon={`service_${service.id}`}
|
|
name={`blocked_services.${service.id}`}
|
|
type="checkbox"
|
|
component={renderServiceField}
|
|
placeholder={service.name}
|
|
disabled={useGlobalServices}
|
|
/>
|
|
))}
|
|
</div>
|
|
</div>
|
|
</div>,
|
|
},
|
|
upstream_dns: {
|
|
title: 'upstream_dns',
|
|
component: <div label="upstream" title={props.t('upstream_dns')}>
|
|
<div className="form__desc mb-3">
|
|
<Trans components={[<a href="#dns" key="0">link</a>]}>
|
|
upstream_dns_client_desc
|
|
</Trans>
|
|
</div>
|
|
<Field
|
|
id="upstreams"
|
|
name="upstreams"
|
|
component="textarea"
|
|
type="text"
|
|
className="form-control form-control--textarea mb-5"
|
|
placeholder={t('upstream_dns')}
|
|
/>
|
|
<Examples />
|
|
</div>,
|
|
},
|
|
};
|
|
|
|
const activeTab = tabs[activeTabLabel].component;
|
|
|
|
return (
|
|
<form onSubmit={handleSubmit}>
|
|
<div className="modal-body">
|
|
<div className="form__group mb-0">
|
|
<div className="form__group">
|
|
<Field
|
|
id="name"
|
|
name="name"
|
|
component={renderInputField}
|
|
type="text"
|
|
className="form-control"
|
|
placeholder={t('form_client_name')}
|
|
normalizeOnBlur={(data) => data.trim()}
|
|
/>
|
|
</div>
|
|
|
|
<div className="form__group mb-4">
|
|
<div className="form__label">
|
|
<strong className="mr-3">
|
|
<Trans>tags_title</Trans>
|
|
</strong>
|
|
</div>
|
|
<div className="form__desc mt-0 mb-2">
|
|
<Trans components={[
|
|
<a target="_blank" rel="noopener noreferrer" href="https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists#ctag"
|
|
key="0">link</a>,
|
|
]}>
|
|
tags_desc
|
|
</Trans>
|
|
</div>
|
|
<Field
|
|
name="tags"
|
|
component={renderMultiselect}
|
|
placeholder={t('form_select_tags')}
|
|
options={tagsOptions}
|
|
/>
|
|
</div>
|
|
|
|
<div className="form__group">
|
|
<div className="form__label">
|
|
<strong className="mr-3">
|
|
<Trans>client_identifier</Trans>
|
|
</strong>
|
|
</div>
|
|
<div className="form__desc mt-0">
|
|
<Trans
|
|
components={[
|
|
<a href="https://github.com/AdguardTeam/AdGuardHome/wiki/Clients#idclient" key="0" target="_blank" rel="noopener noreferrer">
|
|
link
|
|
</a>,
|
|
]}
|
|
>
|
|
client_identifier_desc
|
|
</Trans>
|
|
</div>
|
|
</div>
|
|
|
|
<div className="form__group">
|
|
<FieldArray
|
|
name="ids"
|
|
component={renderFields}
|
|
/>
|
|
</div>
|
|
</div>
|
|
|
|
<Tabs controlClass="form" tabs={tabs} activeTabLabel={activeTabLabel}
|
|
setActiveTabLabel={setActiveTabLabel}>
|
|
{activeTab}
|
|
</Tabs>
|
|
</div>
|
|
|
|
<div className="modal-footer">
|
|
<div className="btn-list">
|
|
<button
|
|
type="button"
|
|
className="btn btn-secondary btn-standard"
|
|
disabled={submitting}
|
|
onClick={() => {
|
|
reset();
|
|
toggleClientModal();
|
|
}}
|
|
>
|
|
<Trans>cancel_btn</Trans>
|
|
</button>
|
|
<button
|
|
type="submit"
|
|
className="btn btn-success btn-standard"
|
|
disabled={
|
|
submitting
|
|
|| invalid
|
|
|| pristine
|
|
|| processingAdding
|
|
|| processingUpdating
|
|
}
|
|
>
|
|
<Trans>save_btn</Trans>
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</form>
|
|
);
|
|
};
|
|
|
|
Form.propTypes = {
|
|
pristine: PropTypes.bool.isRequired,
|
|
handleSubmit: PropTypes.func.isRequired,
|
|
reset: PropTypes.func.isRequired,
|
|
change: PropTypes.func.isRequired,
|
|
submitting: PropTypes.bool.isRequired,
|
|
toggleClientModal: PropTypes.func.isRequired,
|
|
useGlobalSettings: PropTypes.bool,
|
|
useGlobalServices: PropTypes.bool,
|
|
t: PropTypes.func.isRequired,
|
|
processingAdding: PropTypes.bool.isRequired,
|
|
processingUpdating: PropTypes.bool.isRequired,
|
|
invalid: PropTypes.bool.isRequired,
|
|
tagsOptions: PropTypes.array.isRequired,
|
|
};
|
|
|
|
const selector = formValueSelector(FORM_NAME.CLIENT);
|
|
|
|
Form = connect((state) => {
|
|
const useGlobalSettings = selector(state, 'use_global_settings');
|
|
const useGlobalServices = selector(state, 'use_global_blocked_services');
|
|
return {
|
|
useGlobalSettings,
|
|
useGlobalServices,
|
|
};
|
|
})(Form);
|
|
|
|
export default flow([
|
|
withTranslation(),
|
|
reduxForm({
|
|
form: FORM_NAME.CLIENT,
|
|
enableReinitialize: true,
|
|
validate,
|
|
}),
|
|
])(Form);
|