all: sync with master; upd chlog

client/src/components/Settings/Clients/ClientsTable/ClientsTable.js

@@ -6,7 +6,7 @@ import { Trans, useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
 import ReactTable from 'react-table';
 
-import { getAllBlockedServices } from '../../../../actions/services';
+import { getAllBlockedServices, getBlockedServices } from '../../../../actions/services';
 import { initSettings } from '../../../../actions';
 import {
     splitByNewLine,
@@ -14,7 +14,7 @@ import {
     sortIp,
     getService,
 } from '../../../../helpers/helpers';
-import { MODAL_TYPE } from '../../../../helpers/constants';
+import { MODAL_TYPE, LOCAL_TIMEZONE_VALUE } from '../../../../helpers/constants';
 import Card from '../../../ui/Card';
 import CellWrap from '../../../ui/CellWrap';
 import LogsSearchLink from '../../../ui/LogsSearchLink';
@@ -45,6 +45,7 @@ const ClientsTable = ({
 
     useEffect(() => {
         dispatch(getAllBlockedServices());
+        dispatch(getBlockedServices());
         dispatch(initSettings());
     }, []);
 
@@ -112,6 +113,9 @@ const ClientsTable = ({
             tags: [],
             use_global_settings: true,
             use_global_blocked_services: true,
+            blocked_services_schedule: {
+                time_zone: LOCAL_TIMEZONE_VALUE,
+            },
             safe_search: { ...(safesearch || {}) },
         };
     };

client/src/components/Settings/Clients/Form.js

@@ -11,6 +11,7 @@ import Select from 'react-select';
 import i18n from '../../../i18n';
 import Tabs from '../../ui/Tabs';
 import Examples from '../Dns/Upstream/Examples';
+import { ScheduleForm } from '../../Filters/Services/ScheduleForm';
 import { toggleAllServices, trimLinesAndRemoveEmpty, captitalizeWords } from '../../../helpers/helpers';
 import {
     renderInputField,
@@ -137,10 +138,10 @@ let Form = (props) => {
         handleSubmit,
         reset,
         change,
-        pristine,
         submitting,
         useGlobalSettings,
         useGlobalServices,
+        blockedServicesSchedule,
         toggleClientModal,
         processingAdding,
         processingUpdating,
@@ -155,6 +156,10 @@ let Form = (props) => {
 
     const [activeTabLabel, setActiveTabLabel] = useState('settings');
 
+    const handleScheduleSubmit = (values) => {
+        change('blocked_services_schedule', values);
+    };
+
     const tabs = {
         settings: {
             title: 'settings',
@@ -269,6 +274,21 @@ let Form = (props) => {
                 </div>
             </div>,
         },
+        schedule_services: {
+            title: 'schedule_services',
+            component: (
+                <>
+                    <div className="form__desc mb-4">
+                        <Trans>schedule_services_desc_client</Trans>
+                    </div>
+                    <ScheduleForm
+                        schedule={blockedServicesSchedule}
+                        onScheduleSubmit={handleScheduleSubmit}
+                        clientForm
+                    />
+                </>
+            ),
+        },
         upstream_dns: {
             title: 'upstream_dns',
             component: <div label="upstream" title={props.t('upstream_dns')}>
@@ -355,8 +375,12 @@ let Form = (props) => {
                     </div>
                 </div>
 
-                <Tabs controlClass="form" tabs={tabs} activeTabLabel={activeTabLabel}
-                      setActiveTabLabel={setActiveTabLabel}>
+                <Tabs
+                    controlClass="form"
+                    tabs={tabs}
+                    activeTabLabel={activeTabLabel}
+                    setActiveTabLabel={setActiveTabLabel}
+                >
                     {activeTab}
                 </Tabs>
             </div>
@@ -380,7 +404,6 @@ let Form = (props) => {
                         disabled={
                             submitting
                             || invalid
-                            || pristine
                             || processingAdding
                             || processingUpdating
                         }
@@ -402,6 +425,7 @@ Form.propTypes = {
     toggleClientModal: PropTypes.func.isRequired,
     useGlobalSettings: PropTypes.bool,
     useGlobalServices: PropTypes.bool,
+    blockedServicesSchedule: PropTypes.object,
     t: PropTypes.func.isRequired,
     processingAdding: PropTypes.bool.isRequired,
     processingUpdating: PropTypes.bool.isRequired,
@@ -415,9 +439,11 @@ const selector = formValueSelector(FORM_NAME.CLIENT);
 Form = connect((state) => {
     const useGlobalSettings = selector(state, 'use_global_settings');
     const useGlobalServices = selector(state, 'use_global_blocked_services');
+    const blockedServicesSchedule = selector(state, 'blocked_services_schedule');
     return {
         useGlobalSettings,
         useGlobalServices,
+        blockedServicesSchedule,
     };
 })(Form);
 

client/src/components/Settings/Dns/Upstream/Form.js

@@ -179,6 +179,30 @@ const Form = ({
                 <Examples />
                 <hr />
             </div>
+            <div className="col-12">
+                <label
+                    className="form__label form__label--with-desc"
+                    htmlFor="fallback_dns"
+                >
+                    <Trans>fallback_dns_title</Trans>
+                </label>
+                <div className="form__desc form__desc--top">
+                    <Trans>fallback_dns_desc</Trans>
+                </div>
+                <Field
+                    id="fallback_dns"
+                    name="fallback_dns"
+                    component={renderTextareaField}
+                    type="text"
+                    className="form-control form-control--textarea form-control--textarea-small font-monospace"
+                    placeholder={t('fallback_dns_placeholder')}
+                    disabled={processingSetConfig}
+                    normalizeOnBlur={removeEmptyLines}
+                />
+            </div>
+            <div className="col-12">
+                <hr />
+            </div>
             <div className="col-12 mb-2">
                 <label
                     className="form__label form__label--with-desc"
@@ -286,6 +310,7 @@ Form.propTypes = {
     invalid: PropTypes.bool,
     initialValues: PropTypes.object,
     upstream_dns: PropTypes.string,
+    fallback_dns: PropTypes.string,
     bootstrap_dns: PropTypes.string,
 };
 

client/src/components/Settings/Dns/Upstream/index.js

@@ -10,6 +10,7 @@ const Upstream = () => {
     const dispatch = useDispatch();
     const {
         upstream_dns,
+        fallback_dns,
         bootstrap_dns,
         upstream_mode,
         resolve_clients,
@@ -21,6 +22,7 @@ const Upstream = () => {
 
     const handleSubmit = (values) => {
         const {
+            fallback_dns,
             bootstrap_dns,
             upstream_dns,
             upstream_mode,
@@ -30,6 +32,7 @@ const Upstream = () => {
         } = values;
 
         const dnsConfig = {
+            fallback_dns,
             bootstrap_dns,
             upstream_mode,
             resolve_clients,
@@ -52,6 +55,7 @@ const Upstream = () => {
                 <Form
                     initialValues={{
                         upstream_dns: upstreamDns,
+                        fallback_dns,
                         bootstrap_dns,
                         upstream_mode,
                         resolve_clients,

client/src/components/Settings/LogsConfig/Form.js

@@ -13,8 +13,11 @@ import flow from 'lodash/flow';
 import {
     CheckboxField,
     toFloatNumber,
-    renderTextareaField, renderInputField, renderRadioField,
+    renderTextareaField,
+    renderInputField,
+    renderRadioField,
 } from '../../../helpers/form';
+import { trimLinesAndRemoveEmpty } from '../../../helpers/helpers';
 import {
     FORM_NAME,
     QUERY_LOG_INTERVALS_DAYS,
@@ -147,6 +150,7 @@ let Form = (props) => {
                     component={renderTextareaField}
                     placeholder={t('ignore_domains')}
                     disabled={processing}
+                    normalizeOnBlur={trimLinesAndRemoveEmpty}
                 />
             </div>
             <div className="mt-5">

client/src/components/Settings/StatsConfig/Form.js

@@ -24,6 +24,7 @@ import {
     CUSTOM_INTERVAL,
     RETENTION_RANGE,
 } from '../../../helpers/constants';
+import { trimLinesAndRemoveEmpty } from '../../../helpers/helpers';
 import '../FormButton.css';
 
 const getIntervalTitle = (intervalMs, t) => {
@@ -135,6 +136,7 @@ let Form = (props) => {
                     component={renderTextareaField}
                     placeholder={t('ignore_domains')}
                     disabled={processing}
+                    normalizeOnBlur={trimLinesAndRemoveEmpty}
                 />
             </div>
             <div className="mt-5">