Merge in DNS/adguard-home from ADG-9415 to master Squashed commit of the following: commit76bf99499aMerge:29529970a0389515eeAuthor: Ildar Kamalov <ik@adguard.com> Date: Wed Feb 26 18:31:41 2025 +0300 Merge branch 'master' into ADG-9415 commit29529970a3Merge:b49790daf782a1a982Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Feb 24 15:44:38 2025 +0300 Merge branch 'master' into ADG-9415 commitb49790daf8Author: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 24 15:30:18 2025 +0300 fix default lease duration value commitcb307472ecAuthor: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 24 10:35:26 2025 +0300 fix default response status commit115e743e1aAuthor: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 24 10:32:46 2025 +0300 fix upstream description commit26b0eddacaAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 18 17:40:41 2025 +0300 use const for test config file commit58faa7c537Author: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 18 17:31:04 2025 +0300 fix install config commit0a3346d911Author: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 17 15:25:23 2025 +0300 fix install check config commit17c4c26ea8Author: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 17:18:20 2025 +0300 fix query log commit14a2685ae3Author: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 15:52:36 2025 +0300 fix dhcp initial values commite7a8db7afdAuthor: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 14:37:24 2025 +0300 fix encryption form values commit1c8917f7acAuthor: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 14:07:29 2025 +0300 fix blocked services submit commit4dfa536ceaAuthor: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 13:50:47 2025 +0300 dns config ip validation commit4fee83fe13Author: Ildar Kamalov <ik@adguard.com> Date: Wed Feb 12 17:49:54 2025 +0300 add playwright warning commit8c2f36e7a6Author: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 18:36:18 2025 +0300 fix config file name commit83db5f33dcAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 16:16:43 2025 +0300 temp config file commit9080c1620fAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 15:01:46 2025 +0300 update readme commitee1520307fMerge:fd12e33c02fe2d254bAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 14:44:06 2025 +0300 Merge branch 'master' into ADG-9415 commitfd12e33c06Author: Igor Lobanov <bniwredyc@gmail.com> Date: Mon Feb 10 10:29:43 2025 +0100 added typecheck on build, fixed eslint commitb3849eebc4Merge:225167a8b9bf3ee128Author: Igor Lobanov <bniwredyc@gmail.com> Date: Mon Feb 10 09:43:32 2025 +0100 Merge branch 'ADG-9415' of https://bit.int.agrd.dev/scm/dns/adguard-home into ADG-9415 ... and 94 more commits
224 lines
8.2 KiB
TypeScript
224 lines
8.2 KiB
TypeScript
import React, { useState } from 'react';
|
|
import { useSelector } from 'react-redux';
|
|
import { Trans, useTranslation } from 'react-i18next';
|
|
import { Controller, FormProvider, useForm } from 'react-hook-form';
|
|
import Select from 'react-select';
|
|
|
|
import Tabs from '../../../ui/Tabs';
|
|
import { CLIENT_ID_LINK, LOCAL_TIMEZONE_VALUE } from '../../../../helpers/constants';
|
|
import { RootState } from '../../../../initialState';
|
|
import { Input } from '../../../ui/Controls/Input';
|
|
import { validateRequiredValue } from '../../../../helpers/validators';
|
|
import { ClientForm } from './types';
|
|
import { BlockedServices, ClientIds, MainSettings, ScheduleServices, UpstreamDns } from './components';
|
|
|
|
import '../Service.css';
|
|
|
|
const defaultFormValues: ClientForm = {
|
|
ids: [{ name: '' }],
|
|
name: '',
|
|
tags: [],
|
|
use_global_settings: false,
|
|
filtering_enabled: false,
|
|
safebrowsing_enabled: false,
|
|
parental_enabled: false,
|
|
ignore_querylog: false,
|
|
ignore_statistics: false,
|
|
blocked_services: {},
|
|
safe_search: { enabled: false },
|
|
upstreams: '',
|
|
upstreams_cache_enabled: false,
|
|
upstreams_cache_size: 0,
|
|
use_global_blocked_services: false,
|
|
blocked_services_schedule: {
|
|
time_zone: LOCAL_TIMEZONE_VALUE,
|
|
},
|
|
};
|
|
|
|
type Props = {
|
|
onSubmit: (values: ClientForm) => void;
|
|
onClose: () => void;
|
|
useGlobalSettings?: boolean;
|
|
useGlobalServices?: boolean;
|
|
blockedServicesSchedule?: {
|
|
time_zone: string;
|
|
};
|
|
processingAdding: boolean;
|
|
processingUpdating: boolean;
|
|
tagsOptions: { label: string; value: string }[];
|
|
initialValues?: ClientForm;
|
|
};
|
|
|
|
export const Form = ({
|
|
onSubmit,
|
|
onClose,
|
|
processingAdding,
|
|
processingUpdating,
|
|
tagsOptions,
|
|
initialValues,
|
|
}: Props) => {
|
|
const { t } = useTranslation();
|
|
const methods = useForm<ClientForm>({
|
|
defaultValues: {
|
|
...defaultFormValues,
|
|
...initialValues,
|
|
},
|
|
mode: 'onBlur',
|
|
});
|
|
|
|
const {
|
|
handleSubmit,
|
|
reset,
|
|
control,
|
|
formState: { isSubmitting, isValid },
|
|
} = methods;
|
|
|
|
const services = useSelector((store: RootState) => store?.services);
|
|
const { safe_search } = initialValues;
|
|
const safeSearchServices = { ...safe_search };
|
|
delete safeSearchServices.enabled;
|
|
|
|
const [activeTabLabel, setActiveTabLabel] = useState('settings');
|
|
|
|
const tabs = {
|
|
settings: {
|
|
title: 'settings',
|
|
component: <MainSettings safeSearchServices={safeSearchServices} />,
|
|
},
|
|
block_services: {
|
|
title: 'block_services',
|
|
component: <BlockedServices services={services?.allServices} />,
|
|
},
|
|
schedule_services: {
|
|
title: 'schedule_services',
|
|
component: <ScheduleServices />,
|
|
},
|
|
upstream_dns: {
|
|
title: 'upstream_dns',
|
|
component: <UpstreamDns />,
|
|
},
|
|
};
|
|
|
|
const activeTab = tabs[activeTabLabel].component;
|
|
|
|
return (
|
|
<FormProvider {...methods}>
|
|
<form onSubmit={handleSubmit(onSubmit)}>
|
|
<div className="modal-body">
|
|
<div className="form__group mb-0">
|
|
<div className="form__group">
|
|
<Controller
|
|
name="name"
|
|
control={control}
|
|
rules={{ validate: validateRequiredValue }}
|
|
render={({ field, fieldState }) => (
|
|
<Input
|
|
{...field}
|
|
type="text"
|
|
data-testid="clients_name"
|
|
placeholder={t('form_client_name')}
|
|
error={fieldState.error?.message}
|
|
onBlur={(event) => {
|
|
const trimmedValue = event.target.value.trim();
|
|
field.onBlur();
|
|
field.onChange(trimmedValue);
|
|
}}
|
|
/>
|
|
)}
|
|
/>
|
|
</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://link.adtidy.org/forward.html?action=dns_kb_filtering_syntax_ctag&from=ui&app=home"
|
|
key="0"
|
|
/>,
|
|
]}>
|
|
tags_desc
|
|
</Trans>
|
|
</div>
|
|
|
|
<Controller
|
|
name="tags"
|
|
control={control}
|
|
render={({ field }) => (
|
|
<Select
|
|
{...field}
|
|
data-testid="clients_tags"
|
|
options={tagsOptions}
|
|
className="basic-multi-select"
|
|
classNamePrefix="select"
|
|
isMulti
|
|
/>
|
|
)}
|
|
/>
|
|
</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={CLIENT_ID_LINK} target="_blank" rel="noopener noreferrer" key="0" />,
|
|
]}>
|
|
client_identifier_desc
|
|
</Trans>
|
|
</div>
|
|
</div>
|
|
|
|
<div className="form__group">
|
|
<ClientIds />
|
|
</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={isSubmitting}
|
|
onClick={() => {
|
|
reset();
|
|
onClose();
|
|
}}>
|
|
<Trans>cancel_btn</Trans>
|
|
</button>
|
|
|
|
<button
|
|
type="submit"
|
|
className="btn btn-success btn-standard"
|
|
disabled={isSubmitting || !isValid || processingAdding || processingUpdating}>
|
|
<Trans>save_btn</Trans>
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</form>
|
|
</FormProvider>
|
|
);
|
|
};
|