all: imp chlog

Squashed commit of the following:

commit 284190f748345c7556e60b67f051ec5f6f080948
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 6 19:36:00 2023 +0300

    all: sync with master; upd chlog

.github/workflows/build.yml

@@ -1,8 +1,8 @@
 'name': 'build'
 
 'env':
-  'GO_VERSION': '1.24.1'
-  'NODE_VERSION': '18'
+  'GO_VERSION': '1.23.4'
+  'NODE_VERSION': '16'
 
 'on':
   'push':
@@ -39,7 +39,7 @@
       'with':
         'node-version': '${{ env.NODE_VERSION }}'
     - 'name': 'Set up Go modules cache'
-      'uses': 'actions/cache@v4'
+      'uses': 'actions/cache@v2'
       'with':
         'path': '~/go/pkg/mod'
         'key': "${{ runner.os }}-go-${{ hashFiles('go.sum') }}"
@@ -48,7 +48,7 @@
       'id': 'npm-cache'
       'run': 'echo "::set-output name=dir::$( npm config get cache )"'
     - 'name': 'Set up npm cache'
-      'uses': 'actions/cache@v4'
+      'uses': 'actions/cache@v2'
       'with':
         'path': '${{ steps.npm-cache.outputs.dir }}'
         'key': "${{ runner.os }}-node-${{ hashFiles('client/package-lock.json') }}"
@@ -80,7 +80,7 @@
       'with':
         'node-version': '${{ env.NODE_VERSION }}'
     - 'name': 'Set up Go modules cache'
-      'uses': 'actions/cache@v4'
+      'uses': 'actions/cache@v2'
       'with':
         'path': '~/go/pkg/mod'
         'key': "${{ runner.os }}-go-${{ hashFiles('go.sum') }}"
@@ -89,7 +89,7 @@
       'id': 'npm-cache'
       'run': 'echo "::set-output name=dir::$(npm config get cache)"'
     - 'name': 'Set up npm cache'
-      'uses': 'actions/cache@v4'
+      'uses': 'actions/cache@v2'
       'with':
         'path': '${{ steps.npm-cache.outputs.dir }}'
         'key': "${{ runner.os }}-node-${{ hashFiles('client/package-lock.json') }}"

.github/workflows/lint.yml

@@ -1,7 +1,7 @@
 'name': 'lint'
 
 'env':
-  'GO_VERSION': '1.24.1'
+  'GO_VERSION': '1.23.4'
 
 'on':
   'push':

.gitignore

@@ -19,10 +19,6 @@
 /agh-backup/
 /bin/
 /build/*
-/client/blob-report/
-/client/playwright-report/
-/client/playwright/.cache/
-/client/test-results/
 /data/
 /dist/
 /filtering/tests/filtering.TestLotsOfRules*.pprof

.markdownlint.json

@@ -1,25 +0,0 @@
-{
-  "ul-indent": {
-    "indent": 4
-  },
-  "ul-style": {
-    "style": "dash"
-  },
-  "emphasis-style": {
-    "style": "asterisk"
-  },
-  "no-duplicate-heading": {
-    "siblings_only": true
-  },
-  "no-inline-html": {
-    "allowed_elements": [
-      "a"
-    ]
-  },
-  "no-trailing-spaces": {
-    "br_spaces": 0
-  },
-  "line-length": false,
-  "no-bare-urls": false,
-  "link-fragments": false
-}

Makefile

@@ -27,12 +27,13 @@ DIST_DIR = dist
 GOAMD64 = v1
 GOPROXY = https://proxy.golang.org|direct
 GOTELEMETRY = off
-GOTOOLCHAIN = go1.24.1
+GOTOOLCHAIN = go1.23.4
 GPG_KEY = devteam@adguard.com
 GPG_KEY_PASSPHRASE = not-a-real-password
 NPM = npm
 NPM_FLAGS = --prefix $(CLIENT_DIR)
-NPM_INSTALL_FLAGS = $(NPM_FLAGS) --quiet --no-progress
+NPM_INSTALL_FLAGS = $(NPM_FLAGS) --quiet --no-progress --ignore-engines\
+	--ignore-optional --ignore-platform --ignore-scripts
 RACE = 0
 REVISION = $${REVISION:-$$(git rev-parse --short HEAD)}
 SIGN = 1
@@ -104,12 +105,10 @@ build-docker: ; $(ENV) "$(SHELL)" ./scripts/make/build-docker.sh
 build-release: $(BUILD_RELEASE_DEPS_$(FRONTEND_PREBUILT))
 	$(ENV) "$(SHELL)" ./scripts/make/build-release.sh
 
-js-build:     ; $(NPM) $(NPM_FLAGS) run build-prod
-js-deps:      ; $(NPM) $(NPM_INSTALL_FLAGS) ci
-js-typecheck: ; $(NPM) $(NPM_FLAGS) run typecheck
-js-lint:      ; $(NPM) $(NPM_FLAGS) run lint
-js-test:      ; $(NPM) $(NPM_FLAGS) run test
-js-test-e2e:  ; $(NPM) $(NPM_FLAGS) run test:e2e
+js-build: ; $(NPM) $(NPM_FLAGS) run build-prod
+js-deps:  ; $(NPM) $(NPM_INSTALL_FLAGS) ci
+js-lint:  ; $(NPM) $(NPM_FLAGS) run lint
+js-test:  ; $(NPM) $(NPM_FLAGS) run test
 
 go-bench:     ; $(ENV) "$(SHELL)"    ./scripts/make/go-bench.sh
 go-build:     ; $(ENV) "$(SHELL)"    ./scripts/make/go-build.sh

README.md

@@ -290,22 +290,6 @@ When you need to debug the frontend without recompiling the production version e
 [targ-docker]:  https://github.com/AdguardTeam/AdGuardHome/tree/master/scripts#build-dockersh-build-a-multi-architecture-docker-image
 [targ-release]: https://github.com/AdguardTeam/AdGuardHome/tree/master/scripts#build-releasesh-build-a-release-for-all-platforms
 
-#### <a href="#e2e-frontend-tests" id="e2e-frontend-tests" name="e2e-frontend-tests">End-to-End (E2E) Frontend Tests</a>
-
-AdGuard Home uses [Playwright](https://playwright.dev) for E2E testing. Tests are located in `tests/e2e`.
-
-**Running Tests:**
-- `npm run test:e2e` – run all tests (headless).
-- `npm run test:e2e:interactive` – run tests interactively.
-- `npm run test:e2e:debug` – run tests in debug mode.
-- `npm run test:e2e:codegen` – generate new test code.
-
-**Setup:**
-1. Run `npm install` to install dependencies.
-2. Run `npx playwright install` to set up required browsers.
-
-> **Warning:** Playwright will download and install its own browser binaries for testing, which may differ from the browsers installed on your system.
-
 ## <a href="#contributing" id="contributing" name="contributing">Contributing</a>
 
 You are welcome to fork this repository, make your changes and [submit a pull request][pr]. Please make sure you follow our [code guidelines][guide] though.

bamboo-specs/release.yaml

@@ -7,8 +7,8 @@
 # Make sure to sync any changes with the branch overrides below.
 'variables':
     'channel': 'edge'
-    'dockerFrontend': 'adguard/home-js-builder:2.1-bullseye'
-    'dockerGo': 'adguard/go-builder:1.24.1--1'
+    'dockerFrontend': 'adguard/home-js-builder:2.0'
+    'dockerGo': 'adguard/go-builder:1.23.4--1'
 
 'stages':
   - 'Build frontend':
@@ -277,8 +277,8 @@
         # need to build a few of these.
         'variables':
             'channel': 'beta'
-            'dockerFrontend': 'adguard/home-js-builder:2.1-bullseye'
-            'dockerGo': 'adguard/go-builder:1.24.1--1'
+            'dockerFrontend': 'adguard/home-js-builder:2.0'
+            'dockerGo': 'adguard/go-builder:1.23.4--1'
     # release-vX.Y.Z branches are the branches from which the actual final
     # release is built.
   - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@@ -293,5 +293,5 @@
         # are the ones that actually get released.
         'variables':
             'channel': 'release'
-            'dockerFrontend': 'adguard/home-js-builder:2.1-bullseye'
-            'dockerGo': 'adguard/go-builder:1.24.1--1'
+            'dockerFrontend': 'adguard/home-js-builder:2.0'
+            'dockerGo': 'adguard/go-builder:1.23.4--1'

bamboo-specs/test.yaml

@@ -5,8 +5,8 @@
     'key': 'AHBRTSPECS'
     'name': 'AdGuard Home - Build and run tests'
 'variables':
-    'dockerFrontend': 'adguard/home-js-builder:2.1-bullseye'
-    'dockerGo': 'adguard/go-builder:1.24.1--1'
+    'dockerFrontend': 'adguard/home-js-builder:2.0'
+    'dockerGo': 'adguard/go-builder:1.23.4--1'
     'channel': 'development'
 
 'stages':
@@ -29,12 +29,6 @@
         jobs:
           - 'Artifact'
 
-  - 'E2E':
-      manual: false
-      final: false
-      jobs:
-        - 'Test e2e'
-
 'Test frontend':
     'docker':
         'image': '${bamboo.dockerFrontend}'
@@ -54,7 +48,7 @@
 
                 set -e -f -u -x
 
-                make VERBOSE=1 js-deps js-typecheck js-lint js-test
+                make VERBOSE=1 js-deps js-lint js-test
     'final-tasks':
       - 'clean'
     'requirements':
@@ -171,38 +165,6 @@
     'requirements':
       - 'adg-docker': 'true'
 
-'Test e2e':
-    'artifact-subscriptions':
-      - 'artifact': 'AdGuardHome_linux_amd64'
-      - 'artifact': 'AdGuardHome frontend'
-    'docker':
-        'image': '${bamboo.dockerFrontend}'
-        'volumes':
-            '${system.YARN_DIR}': '${bamboo.cacheYarn}'
-    'key': 'E2ETEST'
-    'other':
-        'clean-working-dir': true
-    'tasks':
-      - 'checkout':
-            'force-clean-build': true
-      - 'script':
-            'interpreter': 'SHELL'
-            'scripts':
-              - |
-                #!/bin/sh
-
-                set -e -f -u -x
-
-                export CI=true
-
-                tar -xzf dist/AdGuardHome_linux_amd64.tar.gz -C /tmp
-
-                mv /tmp/AdGuardHome/AdGuardHome ./AdGuardHome
-
-                make VERBOSE=1 js-deps js-test-e2e
-    'requirements':
-      - 'adg-docker': 'true'
-
 'branches':
     'create': 'for-pull-request'
     'delete':
@@ -233,6 +195,6 @@
         # Set the default release channel on the release branch to beta, as we
         # may need to build a few of these.
         'variables':
-            'dockerFrontend': 'adguard/home-js-builder:2.1-bullseye'
-            'dockerGo': 'adguard/go-builder:1.24.1--1'
+            'dockerFrontend': 'adguard/home-js-builder:2.0'
+            'dockerGo': 'adguard/go-builder:1.23.4--1'
             'channel': 'candidate'

client/.eslintrc.json

@@ -1,7 +1,5 @@
 {
-    "plugins": [
-        "prettier"
-    ],
+    "plugins": ["prettier"],
     "extends": [
         "airbnb-base",
         "prettier",
@@ -23,23 +21,12 @@
         },
         "import/resolver": {
             "node": {
-                "extensions": [
-                    ".js",
-                    ".jsx",
-                    ".ts",
-                    ".tsx"
-                ]
+                "extensions": [".js", ".jsx", ".ts", ".tsx"]
             }
         }
     },
     "rules": {
         "@typescript-eslint/no-explicit-any": "off",
-        "@typescript-eslint/no-unused-vars": [
-            "error",
-            {
-                "argsIgnorePattern": "^_"
-            }
-        ],
         "import/extensions": [
             "error",
             "ignorePackages",
@@ -56,10 +43,7 @@
         "no-console": [
             "warn",
             {
-                "allow": [
-                    "warn",
-                    "error"
-                ]
+                "allow": ["warn", "error"]
             }
         ],
         "import/no-extraneous-dependencies": [

client/jest.config.mjs

@@ -0,0 +1,6 @@
+export default {
+    testEnvironment: 'jsdom',
+    transform: {
+        '^.+\\.tsx?$': 'babel-jest',
+    },
+};

client/package.json

@@ -7,14 +7,11 @@
         "build-prod": "cross-env BUILD_ENV=prod webpack --config webpack.prod.js",
         "watch": "cross-env BUILD_ENV=dev webpack --config webpack.dev.js --watch",
         "watch:hot": "cross-env BUILD_ENV=dev webpack-dev-server --config webpack.dev.js",
-        "lint": "eslint --ext .ts,.tsx src",
-        "lint:fix": "eslint --ext .ts,.tsx src --fix",
-        "test": "vitest --run",
-        "test:watch": "vitest --watch",
-        "test:e2e": "npx playwright test tests/e2e",
-        "test:e2e:interactive": "npx playwright test --ui",
-        "test:e2e:debug": "npx playwright test --debug",
-        "test:e2e:codegen": "npx playwright codegen",
+        "lint": "echo 'Lint temporarily disabled'",
+        "lint-new": "eslint './src/**/*.(ts|tsx)'",
+        "lint:fix": "eslint './src/**/*.(ts|tsx)' --fix",
+        "test": "jest",
+        "test:watch": "jest --watch",
         "typecheck": "tsc --noEmit",
         "typecheck:watch": "tsc --noEmit --watch"
     },
@@ -23,7 +20,6 @@
         "@nivo/line": "^0.64.0",
         "axios": "^0.19.2",
         "classnames": "^2.5.1",
-        "clsx": "^2.1.1",
         "countries-and-timezones": "^3.6.0",
         "date-fns": "^1.29.0",
         "i18next": "^19.6.2",
@@ -38,7 +34,6 @@
         "react": "^16.13.1",
         "react-click-outside": "^3.0.1",
         "react-dom": "^16.13.1",
-        "react-hook-form": "^7.54.0",
         "react-i18next": "^11.7.2",
         "react-modal": "^3.11.2",
         "react-popper-tooltip": "^2.11.1",
@@ -51,6 +46,7 @@
         "react-transition-group": "^4.4.5",
         "redux": "^4.0.5",
         "redux-actions": "^2.6.5",
+        "redux-form": "^8.3.10",
         "redux-thunk": "^2.3.0",
         "ts-migrate": "^0.1.35",
         "url-polyfill": "^1.1.12"
@@ -64,15 +60,15 @@
         "@babel/plugin-transform-runtime": "^7.24.3",
         "@babel/preset-env": "^7.24.5",
         "@babel/preset-react": "^7.24.1",
-        "@playwright/test": "1.50.1",
+        "@types/jest": "^29.5.12",
         "@types/lodash": "^4.17.4",
-        "@types/node": "^22.10.2",
         "@types/react": "^17.0.80",
         "@types/react-dom": "^18.3.0",
         "@types/react-redux": "^7.1.33",
         "@types/react-router-dom": "^5.3.3",
         "@types/react-table": "^7.7.20",
         "@types/redux-actions": "^2.6.5",
+        "@types/redux-form": "^8.3.10",
         "@typescript-eslint/eslint-plugin": "^7.11.0",
         "@typescript-eslint/parser": "^7.10.0",
         "babel-loader": "^9.1.3",
@@ -89,6 +85,8 @@
         "eslint-plugin-react-hooks": "^4.6.2",
         "file-loader": "^6.2.0",
         "html-webpack-plugin": "^5.6.0",
+        "jest": "^29.7.0",
+        "jest-environment-jsdom": "^29.7.0",
         "jscodeshift": "^0.15.2",
         "mini-css-extract-plugin": "^2.9.0",
         "path": "^0.12.7",
@@ -99,7 +97,6 @@
         "stylelint": "^16.5.0",
         "ts-loader": "^9.5.1",
         "url-loader": "^4.1.1",
-        "vitest": "^3.0.4",
         "webpack": "^5.91.0",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^5.0.4",

client/playwright.config.ts

@@ -1,52 +0,0 @@
-import { defineConfig, devices } from '@playwright/test';
-
-import path from 'path';
-import { CONFIG_FILE_PATH } from './tests/constants';
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-    testDir: './tests/e2e',
-    globalSetup: path.resolve('./tests/e2e/globalSetup.ts'),
-    globalTeardown: path.resolve('./tests/e2e/globalTeardown.ts'),
-    timeout: 5000,
-    /* Run tests in files in parallel */
-    fullyParallel: true,
-    /* Fail the build on CI if you accidentally left test.only in the source code. */
-    forbidOnly: !!process.env.CI,
-    /* Retry on CI only */
-    retries: process.env.CI ? 2 : 0,
-    /* Opt out of parallel tests on CI. */
-    workers: process.env.CI ? 1 : undefined,
-    /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-    reporter: 'html',
-    /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-    use: {
-        /* Base URL to use in actions like `await page.goto('/')`. */
-        baseURL: 'http://127.0.0.1:3000',
-
-        /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-        trace: 'on-first-retry',
-        launchOptions: {
-            headless: true,
-        },
-    },
-
-    /* Configure projects for major browsers */
-    projects: [
-        {
-            name: 'chromium',
-            use: { ...devices['Desktop Chrome'] },
-        },
-    ],
-
-    webServer: {
-        stdout: process.env.CI ? 'pipe' : 'ignore',
-        command: `${!process.env.CI ? 'sudo ' : ''}./AdGuardHome --local-frontend -v -c ${CONFIG_FILE_PATH}`,
-        url: 'http://127.0.0.1:3000',
-        cwd: '..',
-        reuseExistingServer: !process.env.CI,
-        timeout: 10000,
-    },
-});

client/src/__locales/bg.json

@@ -284,7 +284,6 @@
     "blocklist": "Черен списък",
     "filter_category_general": "General",
     "filter_category_security": "Сигурност",
-    "filter_category_other": "Друго",
     "port_53_faq_link": "Порт 53 често е зает от \"DNSStubListener\" или \"systemd-resolved\" услуги. Моля, прочетете <0>тази инструкция</0> как да решите това.",
     "parental_control": "Родителски контрол",
     "sunday_short": "Нд",

client/src/__locales/cs.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Použijte paralelní požadavky na urychlení řešení simultánním dotazováním na všechny navazující servery.",
     "parallel_requests": "Paralelní požadavky",
     "load_balancing": "Optimalizace vytížení",
-    "load_balancing_desc": "Dotazy jednoho odchozího serveru ve stejný čas.<br/>AdGuard Home používá náhodný algoritmus pro výběr serverů s nejnižším počtem neúspěšných vyhledávání a nejnižší průměrnou dobou vyhledávání.",
+    "load_balancing_desc": "Dotazy jednoho odchozího serveru ve stejný čas. AdGuard Home používá náhodný algoritmus pro výběr serverů s nejnižším počtem neúspěšných vyhledávání a nejnižší průměrnou dobou vyhledávání.",
     "bootstrap_dns": "Bootstrap DNS servery",
     "bootstrap_dns_desc": "IP adresy DNS serverů používaných k překladu IP adres řešitelů DoH/DoT, které zadáte jako odchozí servery. Komentáře nejsou povoleny.",
     "fallback_dns_title": "Záložní DNS servery",
@@ -294,9 +294,6 @@
     "blocked_response_ttl": "TTL blokované odezvy",
     "blocked_response_ttl_desc": "Určuje, na kolik sekund by měli klienti ukládat filtrovanou odezvu do mezipaměti",
     "form_enter_blocked_response_ttl": "Zadejte TTL blokované odezvy (v sekundách)",
-    "upstream_timeout": "Časový limit odchozího serveru",
-    "upstream_timeout_desc": "Určuje počet sekund čekání na odpověď od odchozího serveru",
-    "form_enter_upstream_timeout": "Zadejte dobu časového limitu odchozího serveru v sekundách",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS skrze HTTPS",
     "dns_over_tls": "DNS skrze TLS",
@@ -601,7 +598,7 @@
     "disable_ipv6": "Zakázat řešení IPv6 adres",
     "disable_ipv6_desc": "Odstranění všech dotazů DNS na adresy IPv6 (typ AAAA) a odstranění náznaků IPv6 z odpovědí HTTPS.",
     "fastest_addr": "Nejrychlejší IP adresa",
-    "fastest_addr_desc": "Počká na odpovědi <b>všech</b> serverů DNS, změří rychlost připojení TCP pro každý server a vrátí IP adresu serveru s nejvyšší rychlostí připojení.<br/>Tento režim může výrazně zpomalit dotazy DNS, pokud jeden nebo více odchozích serverů neodpovídá. Ujistěte se, že vaše odchozí servery jsou stabilní a že časový limit odchozích serverů je nízký.",
+    "fastest_addr_desc": "Dotazovat všechny DNS servery a vrátit nejrychlejší IP adresu ze všech odpovědí. To zpomalí dotazy DNS, protože AdGuard Home musí čekat na odpovědi ze všech serverů DNS, ale celková konektivita se zlepší.",
     "autofix_warning_text": "Pokud kliknete na „Opravit“, AdGuard Home nakonfiguruje váš systém tak, aby používal DNS server AdGuard Home.",
     "autofix_warning_list": "Jsou prováděny následující úlohy: <0>Deaktivace systému DNSStubListener</0> <0>Nastavení adresy serveru DNS na 127.0.0.1</0> <0>Nahrazení cíle symbolického odkazu z /etc/resolv.conf do /run/systemd/resolve/resolv.conf</0> <0>Zastavení služby DNSStubListener (znovu načtení služby systemd-resolved)</0>",
     "autofix_warning_result": "Výsledkem je, že všechny požadavky DNS z vašeho systému jsou ve výchozím nastavení zpracovány službou AdGuard Home.",

client/src/__locales/da.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Brug parallelforespørgsler til at accelerere fortolkningen ved at forespørge alle upstream-servere samtidigt.",
     "parallel_requests": "Parallelle forespørgsler",
     "load_balancing": "Belastningsfordeling",
-    "load_balancing_desc": "Forespørg én upstream-server ad gangen.<br/>AdGuard Home bruger en vægtet tilfældighedsalgoritme til vælg af servere med det laveste antal fejlslagne opslag og den laveste gennemsnitlige opslagstid.",
+    "load_balancing_desc": "Forespørg én upstream-server ad gangen. AdGuard Home bruger en vægtet tilfældighedsalgoritme til vælg af servere med det laveste antal fejlslagne opslag og den laveste gennemsnitlige opslagstid.",
     "bootstrap_dns": "Bootstrap DNS-servere",
     "bootstrap_dns_desc": "IP-adresser på DNS-servere, som bruges til at opløse IP-adresser på de DoH/DoT-opløsere, som angives som upstreams. Kommentarer er ikke tilladt.",
     "fallback_dns_title": "Reserve DNS-servere",
@@ -294,9 +294,6 @@
     "blocked_response_ttl": "Blokeret svar TTL",
     "blocked_response_ttl_desc": "Angiver, i hvor mange sekunder klienterne skal cache-lagre et filtreret svar",
     "form_enter_blocked_response_ttl": "Angiv blokeringssvar TTL (sekunder)",
-    "upstream_timeout": "Upstream-timeout",
-    "upstream_timeout_desc": "Angiver antallet af sekunder, der skal ventes på et svar fra upstream-serveren",
-    "form_enter_upstream_timeout": "Angiv varigheden af upstream-server timeout i sekunder",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -601,7 +598,7 @@
     "disable_ipv6": "Deaktivér IPv6-adresseopløsning",
     "disable_ipv6_desc": "Drop alle DNS-forespørgsler for IPv6-adresser (type AAAA), og fjern IPv6-tips fra HTTPS-svar.",
     "fastest_addr": "Hurtigste IP-adresse",
-    "fastest_addr_desc": "Vent på svar fra <b>alle</b> DNS-servere, mål TCP-forbindelseshastigheden for hver server, og returner IP-adressen på serveren med den hurtigste forbindelseshastighed.<br/>Denne tilstand kan sinke DNS-forespørgsler, betydeligt hvis en eller flere upstream-servere ikke svarer. Sørg for, at upstream-serverene er stabile, og at upstream-timeouten er lav.",
+    "fastest_addr_desc": "Forespørger alle DNS-servere og returner den hurtigste IP-adresse blandt alle svar. Dette vil gøre DNS-forespørgslerne langsommere grundet afventning af svar fra alle DNS-servere, men forbedrer samlet set forbindelsen.",
     "autofix_warning_text": "Klikker du på \"Reparér\", opsætter AdGuard Home dit system til brug med AdGuard Home DNS-server.",
     "autofix_warning_list": "Den vil udføre disse opgaver: <0>Deaktivere system DNSStubListener</0> <0>Opsætte DNS-serveradressen til 127.0.0.1</0> <0>Erstatte symbolsk linkmål for /etc/resolv.conf med /run/systemd/resolve/resolv.conf</0> <0>Stoppe DNSStubListener (genindlæs systemd-opløst tjeneste)</0>",
     "autofix_warning_result": "Det betyder, at alle DNS-forespørgsler fra dit system som standard behandles af AdGuard Home.",

client/src/__locales/de.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Parallele Abfragen verwenden, um das Auflösen zu beschleunigen, indem alle Upstream-Server gleichzeitig abgefragt werden.",
     "parallel_requests": "Paralleles Abfragen",
     "load_balancing": "Lastverteilung",
-    "load_balancing_desc": "Es wird jeweils ein Upstream-Server abgefragt.<br/> AdGuard Home verwendet einen gewichteten Zufallsalgorithmus, um die Server mit der geringsten Anzahl an fehlgeschlagenen Suchvorgängen und der niedrigsten durchschnittlichen Suchzeit auszuwählen.",
+    "load_balancing_desc": "Es wird jeweils ein Upstream-Server abgefragt. AdGuard Home verwendet einen gewichteten Zufallsalgorithmus, um die Server mit der geringsten Anzahl an fehlgeschlagenen Suchvorgängen und der niedrigsten durchschnittlichen Suchzeit auszuwählen.",
     "bootstrap_dns": "Bootstrap-DNS-Server",
     "bootstrap_dns_desc": "IP-Adressen der DNS-Server, die zum Auflösen der IP-Adressen von DoH/DoT Upstream-Servern verwendet werden, die Sie angegeben haben. Kommentare sind nicht erlaubt.",
     "fallback_dns_title": "Fallback-DNS-Server",
@@ -294,9 +294,6 @@
     "blocked_response_ttl": "Gültigkeitsdauer der blockierten Antwort",
     "blocked_response_ttl_desc": "Gibt an, wie viele Sekunden lang die Clients eine gefilterte Antwort zwischenspeichern sollen",
     "form_enter_blocked_response_ttl": "Geben Sie die Gültigkeitsdauer für blockierte Antworten ein (in Sekunden)",
-    "upstream_timeout": "Upstream-Timeout",
-    "upstream_timeout_desc": "Gibt die Anzahl der Sekunden an, die auf eine Antwort des Upstream-Servers gewartet werden soll",
-    "form_enter_upstream_timeout": "Geben Sie die Timeout-Dauer des Upstream-Servers in Sekunden ein",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -601,7 +598,7 @@
     "disable_ipv6": "IPv6 deaktivieren",
     "disable_ipv6_desc": "Alle DNS-Anfragen für IPv6-Adressen (Typ AAAA) verwerfen und IPv6-Hinweise aus HTTPS-Antworten entfernen.",
     "fastest_addr": "Schnellste IP-Adresse",
-    "fastest_addr_desc": "Auf Antworten von <b>allen</b> DNS-Servern warten, die TCP-Verbindungsgeschwindigkeit für jeden Server messen und die IP-Adresse des Servers mit der schnellsten Verbindungsgeschwindigkeit zurückgeben.<br/>Dieser Modus kann DNS-Anfragen erheblich verlangsamen, wenn ein oder mehrere Server nicht antworten. Stellen Sie sicher, dass Ihre Server stabil laufen und das Upstream-Timeout niedrig ist.",
+    "fastest_addr_desc": "Fragen Sie alle DNS-Server ab und geben Sie die schnellste IP-Adresse unter allen Antworten zurück. Dies verlangsamt DNS-Abfragen, da AdGuard Home auf Antworten von allen DNS-Servern warten muss, verbessert jedoch die Gesamtkonnektivität.",
     "autofix_warning_text": "Wenn Sie auf „Beheben“ klicken, konfiguriert AdGuardHome Ihr System für die Verwendung des AdGuardHome-DNS-Servers.",
     "autofix_warning_list": "Es werden folgende Aufgaben ausgeführt: <0>Deaktivieren des DNSStubListener-Systems</0> <0>Festlegen der DNS-Server-Adresse auf 127.0.0.1</0> <0>Ersetzen des symbolischen Linkziels von /etc/resolv.conf auf /run/systemd/resolve/resolv.conf</0> <0>Anhalten des DNSStubListener (systemseitig aufgelöster Dienst wird nachladen)</0>",
     "autofix_warning_result": "Als Folge daraus werden alle DNS-Anforderungen von Ihrem System standardmäßig von AdGuardHome verarbeitet.",

client/src/__locales/en.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Use parallel queries to speed up resolving by querying all upstream servers simultaneously.",
     "parallel_requests": "Parallel requests",
     "load_balancing": "Load-balancing",
-    "load_balancing_desc": "Query one upstream server at a time.<br/>AdGuard Home uses a weighted random algorithm to select servers with the lowest number of failed lookups and the lowest average lookup time.",
+    "load_balancing_desc": "Query one upstream server at a time. AdGuard Home uses a weighted random algorithm to select servers with the lowest number of failed lookups and the lowest average lookup time.",
     "bootstrap_dns": "Bootstrap DNS servers",
     "bootstrap_dns_desc": "IP addresses of DNS servers used to resolve IP addresses of the DoH/DoT resolvers you specify as upstreams. Comments are not permitted.",
     "fallback_dns_title": "Fallback DNS servers",
@@ -294,9 +294,6 @@
     "blocked_response_ttl": "Blocked response TTL",
     "blocked_response_ttl_desc": "Specifies for how many seconds the clients should cache a filtered response",
     "form_enter_blocked_response_ttl": "Enter blocked response TTL (seconds)",
-    "upstream_timeout": "Upstream timeout",
-    "upstream_timeout_desc": "Specifies the number of seconds to wait for a response from the upstream server",
-    "form_enter_upstream_timeout": "Enter the upstream server timeout duration in seconds",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -601,7 +598,7 @@
     "disable_ipv6": "Disable resolving of IPv6 addresses",
     "disable_ipv6_desc": "Drop all DNS queries for IPv6 addresses (type AAAA) and remove IPv6 hints from HTTPS responses.",
     "fastest_addr": "Fastest IP address",
-    "fastest_addr_desc": "Wait for responses from <b>all</b> DNS servers, measure the TCP connection speed for each server, and return the IP address of the server with the fastest connection speed.<br/>This mode can significantly slow down DNS queries, if one or more upstream servers are not responding. Make sure that your upstream servers are stable and your upstream timeout is low.",
+    "fastest_addr_desc": "Query all DNS servers and return the fastest IP address among all responses. This slows down DNS queries as AdGuard Home has to wait for responses from all DNS servers, but improves the overall connectivity.",
     "autofix_warning_text": "If you click \"Fix\", AdGuard Home will configure your system to use AdGuard Home DNS server.",
     "autofix_warning_list": "It will perform these tasks: <0>Deactivate system DNSStubListener</0> <0>Set DNS server address to 127.0.0.1</0> <0>Replace symbolic link target of /etc/resolv.conf with /run/systemd/resolve/resolv.conf</0> <0>Stop DNSStubListener (reload systemd-resolved service)</0>",
     "autofix_warning_result": "As a result all DNS requests from your system will be processed by AdGuard Home by default.",
@@ -620,10 +617,6 @@
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Reason: {{reason}}",
     "check_service": "Service name: {{service}}",
-    "check_hostname": "Hostname or domain name",
-    "check_client_id": "Client identifier (ClientID or IP address)",
-    "check_enter_client_id": "Enter client identifier",
-    "check_dns_record": "Select DNS record type",
     "service_name": "Service name",
     "check_not_found": "Not found in your filter lists",
     "client_confirm_block": "Are you sure you want to block the client \"{{ip}}\"?",

client/src/__locales/es.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Usar consultas paralelas para acelerar la resolución al consultar simultáneamente a todos los servidores DNS de subida.",
     "parallel_requests": "Consultas paralelas",
     "load_balancing": "Balanceo de carga",
-    "load_balancing_desc": "Consulta un servidor Dns upstream a la vez.<br/>AdGuard Home utiliza un algoritmo aleatorio ponderado para seleccionar los servidores con el menor número de fallos y el menor tiempo medio de búsqueda.",
+    "load_balancing_desc": "Consulta un servidor upstream a la vez. AdGuard Home utiliza un algoritmo aleatorio ponderado para seleccionar los servidores con el menor número de fallos y el menor tiempo medio de búsqueda.",
     "bootstrap_dns": "Servidores DNS de arranque",
     "bootstrap_dns_desc": "Direcciones IP de servidores DNS utilizadas para resolver direcciones IP de los solucionadores DoH/DoT que especifiques como ascendentes. No se permiten comentarios.",
     "fallback_dns_title": "Servidores DNS alternativos",
@@ -294,9 +294,6 @@
     "blocked_response_ttl": "Respuesta TTL bloqueada",
     "blocked_response_ttl_desc": "Especifica durante cuántos segundos los clientes deben almacenar en cache una respuesta filtrada",
     "form_enter_blocked_response_ttl": "Ingresa el TTL de respuesta bloqueada (segundos)",
-    "upstream_timeout": "Tiempo de espera del upstream",
-    "upstream_timeout_desc": "Especifica el número de segundos que se debe esperar para recibir una respuesta del servidor upstream",
-    "form_enter_upstream_timeout": "Ingresa la duración del tiempo de espera del servidor DNS upstream en segundos",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS mediante HTTPS",
     "dns_over_tls": "DNS mediante TLS",
@@ -601,7 +598,7 @@
     "disable_ipv6": "Deshabilitar resolución de direcciones IPv6",
     "disable_ipv6_desc": "Descarta todas las consultas de DNS para direcciones IPv6 (tipo AAAA) y elimina las sugerencias de IPv6 de las respuestas HTTPS.",
     "fastest_addr": "Dirección IP más rápida",
-    "fastest_addr_desc": "Espera a que respondan <b>todos</b> los servidores DNS, mide la velocidad de conexión TCP de cada servidor y devuelve la Dirección IP del servidor con la velocidad de conexión más rápida.<br/>Este modo puede ralentizar significativamente las consultas DNS, si uno o más servidores DNS de upstream no están respondiendo. Asegúrate de que tus servidores DNS upstream sean estables y tu tiempo de espera de upstream sea bajo.",
+    "fastest_addr_desc": "Consulta todos los servidores DNS y devuelve la dirección IP más rápida de todas las respuestas. Esto ralentiza las consultas DNS ya que AdGuard Home tiene que esperar las respuestas de todos los servidores DNS, pero mejora la conectividad general.",
     "autofix_warning_text": "Si haces clic en \"Corregir\", AdGuard Home configurará tu sistema para utilizar el servidor DNS de AdGuard Home.",
     "autofix_warning_list": "Realizará estas tareas: <0>Deshabilitar el sistema DNSStubListener</0> <0>Establecer la dirección del servidor DNS en 127.0.0.1</0> <0>Reemplazar el destino del enlace simbólico de /etc/resolv.conf por /run/systemd/resolve/resolv.conf</0> <0>Detener DNSStubListener (recargar el servicio systemd-resolved)</0>",
     "autofix_warning_result": "Como resultado, todas las peticiones DNS de tu sistema serán procesadas por AdGuard Home de manera predeterminada.",

client/src/__locales/fr.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Utilisez des requêtes parallèles pour accélérer la résolution en requêtant simultanément tous les serveurs en amont.",
     "parallel_requests": "Requêtes en parallèle",
     "load_balancing": "Équilibrage de charge",
-    "load_balancing_desc": "Une requête par serveur en amont à la fois.<br/>AdGuard Home utilise un algorithme aléatoire pondéré pour sélectionner les serveurs avec le plus petit nombre d'échecs de recherche et le temps de recherche moyen le plus bas.",
+    "load_balancing_desc": "Une requête par serveur en amont à la fois. AdGuard Home utilise un algorithme aléatoire pondéré pour sélectionner les serveurs avec le plus petit nombre d'échecs de recherche et le temps de recherche moyen le plus bas.",
     "bootstrap_dns": "Serveurs DNS d'amorçage",
     "bootstrap_dns_desc": "Les adresses IP des serveurs DNS utilisées pour résoudre les adresses IP des résolveurs DoH/DoT que vous spécifiez comme en amont. Les commentaires ne sont pas autorisés.",
     "fallback_dns_title": "Serveurs DNS de repli",
@@ -294,9 +294,6 @@
     "blocked_response_ttl": "Réponse bloquée TTL",
     "blocked_response_ttl_desc": "Spécifie pendant combien de secondes les clients doivent mettre en cache une réponse filtrée",
     "form_enter_blocked_response_ttl": "Saisir le TTL de la réponse bloquée (secondes)",
-    "upstream_timeout": "Délai d'attente en amont",
-    "upstream_timeout_desc": "Spécifie le nombre de secondes à attendre pour une réponse du serveur en amont",
-    "form_enter_upstream_timeout": "Saisir le délai d'attente du serveur en amont en secondes",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -601,7 +598,7 @@
     "disable_ipv6": "Désactiver la résolution des adresses IPv6",
     "disable_ipv6_desc": "Supprimer toutes les requêtes DNS pour les adresses IPv6 (type AAAA) et supprimer les indices IPv6 des réponses HTTPS.",
     "fastest_addr": "Adresse IP la plus rapide",
-    "fastest_addr_desc": "Attente les réponses de <b>tous</b> les serveurs DNS, mesure de la vitesse de connexion TCP pour chaque serveur et renvoi de l'adresse IP du serveur avec la vitesse de connexion la plus rapide.<br/>Ce mode peut considérablement ralentir les requêtes DNS, si un ou plusieurs serveurs en amont ne répondent pas. Assurez-vous que vos serveurs en amont sont stables et que votre délai dépassé en amont est faible.",
+    "fastest_addr_desc": "Rechercher tous les serveurs DNS et renvoyer l’adresse IP la plus rapide parmi toutes les réponses. Cela ralentit les requêtes DNS car AdGuard Home doit attendre les réponses de tous les serveurs DNS, mais la connectivité globale s'améliore.",
     "autofix_warning_text": "Si vous cliquez sur « Réparer », AdGuard Home configurera votre système pour utiliser le serveur DNS AdGuard Home.",
     "autofix_warning_list": "Ceci effectuera les tâches suivantes : <0>Désactiver le système DNSStubListener</0> <0>Définir l’adresse du serveur DNS à 127.0.0.1 </0> <0>Remplacer la cible du lien symbolique de /etc/resolv.conf par /run/systemd/resolve/resolv.conf</0> <0>Arrêter DNSStubListener (recharger le service résolu par systemd)</0>",
     "autofix_warning_result": "Par conséquent, toutes les demandes DNS de votre système seront traitées par AdGuardHome par défaut.",

client/src/__locales/id.json

@@ -1,26 +1,26 @@
 {
     "client_settings": "Pengaturan klien",
-    "example_upstream_reserved": "hulu <0>untuk domain tertentu</0>;",
-    "example_multiple_upstreams_reserved": "beberapa hulu <0>untuk domain tertentu</0>;",
+    "example_upstream_reserved": "upstream <0>untuk domain spesifik</0>;",
+    "example_multiple_upstreams_reserved": "beberapa server upstream <0>untuk domain spesifik</0>;",
     "example_upstream_comment": "komentar.",
-    "upstream_parallel": "Gunakan kueri paralel untuk mempercepat penyelesaian dengan mengkueri seluruh server hulu secara bersamaan.",
+    "upstream_parallel": "Gunakan kueri paralel untuk mempercepat resoluasi dengan menanyakan semua server upstream secara bersamaan",
     "parallel_requests": "Permintaan paralel",
     "load_balancing": "Penyeimbang beban",
     "load_balancing_desc": "Permintaan satu server pada satu waktu. AdGuard Home akan menggunakan algoritma acak tertimbang untuk memilih server sehingga server tercepat akan lebih sering digunakan.",
     "bootstrap_dns": "Server DNS bootstrap",
-    "bootstrap_dns_desc": "Alamat IP server DNS yang digunakan untuk menyelesaikan alamat IP penyelesai DoH/DoT yang Anda tentukan sebagai hulu. Tidak diizinkan untuk berkomentar.",
+    "bootstrap_dns_desc": "Alamat IP server DNS yang digunakan untuk menyelesaikan alamat IP resolver DoH/DoT yang Anda tentukan sebagai upstream. Komentar tidak diizinkan.",
     "fallback_dns_title": "Server DNS cadangan",
     "fallback_dns_desc": "Daftar server DNS cadangan yang digunakan ketika server hulu DNS tidak merespons. Sintaksnya sama dengan kolom hulu utama di atas.",
     "fallback_dns_placeholder": "Masukkan satu server DNS cadangan per baris",
     "local_ptr_title": "Server pembalik DNS pribadi",
-    "local_ptr_desc": "Server DNS yang digunakan oleh AdGuard Home untuk permintaan PTR, SOA, dan NS pribadi. Permintaan dianggap pribadi jika meminta domain ARPA yang berisi subnet dalam rentang IP pribadi (seperti \"192.168.12.34\") dan berasal dari klien dengan alamat IP pribadi. Jika tidak ditetapkan, standar pemecah DNS milik OS Anda akan digunakan, kecuali untuk alamat IP AdGuard Home.",
+    "local_ptr_desc": "Server DNS yang digunakan AdGuard Home untuk kueri PTR lokal. Server ini digunakan untuk menyelesaikan nama host klien dengan alamat IP pribadi, misalnya \"192.168.12.34\", menggunakan DNS terbalik. Jika tidak disetel, AdGuard Home menggunakan alamat resolver DNS default OS Anda kecuali untuk alamat AdGuard Home itu sendiri.",
     "local_ptr_default_resolver": "Secara bawaan, AdGuard Home menggunakan pemecah DNS terbalik: {{ip}}.",
     "local_ptr_no_default_resolver": "AdGuard Home tidak dapat menentukan pemecah DNS terbalik yang sesuai untuk sistem ini.",
     "local_ptr_placeholder": "Masukkan satu alamat IP per baris",
     "resolve_clients_title": "Aktifkan resolusi hostname klien",
-    "resolve_clients_desc": "Selesaikan alamat IP klien secara terbalik ke dalam nama host mereka dengan mengirimkan kueri PTR ke penyelesai yang sesuai (server DNS pribadi untuk klien lokal, server hulu untuk klien dengan alamat IP publik).",
+    "resolve_clients_desc": "Menyelesaikan alamat IP klien secara terbalik ke nama host mereka dengan mengirimkan kueri PTR ke resolver yang sesuai (server DNS pribadi untuk klien lokal, server upstream untuk klien dengan alamat IP publik).",
     "use_private_ptr_resolvers_title": "Gunakan server pembalik DNS pribadi",
-    "use_private_ptr_resolvers_desc": "Menyelesaikan permintaan PTR, SOA, dan NS untuk domain ARPA yang berisi alamat IP pribadi melalui server hulu pribadi, DHCP, /etc/hosts, dll. Jika dinonaktifkan, AdGuard Home akan merespons semua permintaan tersebut dengan NXDOMAIN.",
+    "use_private_ptr_resolvers_desc": "Lakukan pencarian DNS terbalik untuk alamat yang disajikan secara lokal menggunakan server hulu ini. Jika dinonaktifkan, Adguard Home merespons dengan NXDOMAIN untuk semua permintaan PTR tersebut kecuali untuk klien yang diketahui dari DHCP, /etc/hosts, dan seterusnya.",
     "check_dhcp_servers": "Cek untuk server DHCP",
     "save_config": "Simpan pengaturan",
     "enabled_dhcp": "Server DHCP diaktifkan",
@@ -49,12 +49,12 @@
     "form_error_server_name": "Nama server tidak valid",
     "form_error_subnet": "Subnet \"{{cidr}}\" tidak berisi alamat IP \"{{ip}}\"",
     "form_error_positive": "Harus lebih dari 0",
-    "form_error_gateway_ip": "Lease tidak dapat memiliki gerbang alamat IP",
+    "form_error_gateway_ip": "Sewa tidak dapat memiliki alamat IP gateway",
     "out_of_range_error": "Harus di luar rentang \"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "Harus lebih rendah dari rentang awal",
     "greater_range_start_error": "Harus lebih besar dari rentang awal",
     "subnet_error": "Alamat harus dalam satu subnet",
-    "gateway_or_subnet_invalid": "Subnet samaran tidak valid",
+    "gateway_or_subnet_invalid": "Subnet mask tidak valid",
     "dhcp_form_gateway_input": "IP gateway",
     "dhcp_form_subnet_input": "Subnet mask",
     "dhcp_form_range_title": "Rentang alamat IP",
@@ -132,8 +132,8 @@
     "top_clients": "Klien teratas",
     "no_clients_found": "Tidak ditemukan klien",
     "general_statistics": "Statistik umum",
-    "top_upstreams": "Hulu teratas",
-    "no_upstreams_data_found": "Tidak ada data hulu yang ditemukan",
+    "top_upstreams": "Top servers upstream",
+    "no_upstreams_data_found": "Tidak ada data server upstream yang ditemukan",
     "number_of_dns_query_days": "Jumlah kueri DNS diproses selama {{value}} hari terakhir",
     "number_of_dns_query_days_plural": "Jumlah kueri DNS yang diproses selama {{count}} hari terakhir",
     "number_of_dns_query_hours": "Jumlah kueri DNS diproses selama {{{count}} jam terakhir",
@@ -154,7 +154,7 @@
     "use_adguard_parental": "Gunakan layanan web kontrol orang tua AdGuard",
     "use_adguard_parental_hint": "AdGuard Home akan mengecek jika domain mengandung materi dewasa. Akan menggunakan API yang ramah privasi yang sama sebagai layanan web keamanan penjelajahan.",
     "enforce_safe_search": "Pakai pencarian aman",
-    "enforce_save_search_hint": "AdGuard Home akan memberlakukan pencarian yang aman di mesin pencari berikut ini: Google, YouTube, Bing, DuckDuckGo, Ecosia, Yandex, Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home dapat memaksa penelusuran aman pada mesin pencari berikut: Google, Youtube, Bing, DuckDuckGo, Yandex, dan Pixabay.",
     "no_servers_specified": "Sever tidak disebutkan",
     "general_settings": "Pengaturan umum",
     "dns_settings": "Pengaturan DNS",
@@ -169,8 +169,8 @@
     "upstream_dns_help": "Masukkan satu alamat server per baris. <a>Pelajari lebih lanjut</a> mengenai cara mengonfigurasi server DNS hulu.",
     "upstream_dns_configured_in_file": "Diatur dalam {{path}}",
     "test_upstream_btn": "Uji hulu",
-    "upstreams": "Hulu",
-    "upstream": "Hulu",
+    "upstreams": "Upstream",
+    "upstream": "Server upstream",
     "apply_btn": "Terapkan",
     "disabled_filtering_toast": "Penyaringan nonaktif",
     "enabled_filtering_toast": "Penyaringan aktif",
@@ -215,29 +215,29 @@
     "system_host_files": "Berkas host sistem",
     "examples_title": "Contoh",
     "example_meaning_filter_block": "blokir akses ke example.org dan seluruh subdomainnya;",
-    "example_meaning_filter_whitelist": "buka blokir akses ke domain example.org dan seluruh subdomainnya;",
+    "example_meaning_filter_whitelist": "buka blokir akses ke domain example.orf dan seluruh subdomainnya;",
     "example_meaning_host_block": "merespons dengan 127.0.0.1 untuk example.org (tetapi tidak untuk subdomainnya);",
     "example_comment": "! Komentar di sini.",
     "example_comment_meaning": "hanya sebuah komentar;",
     "example_comment_hash": "# Juga sebuah komentar.",
     "example_regex_meaning": "blokir akses ke domain yang cocok dengan ekspresi reguler yang ditentukan.",
-    "example_upstream_regular": "DNS biasa (melalui UDP);",
-    "example_upstream_regular_port": "DNS biasa (melalui UDP, dengan port);",
-    "example_upstream_udp": "DNS biasa (melalui UDP, nama host);",
+    "example_upstream_regular": "DNS reguler (melalui UDP);",
+    "example_upstream_regular_port": "DNS biasa (lebih dari UDP, dengan port);",
+    "example_upstream_udp": "DNS biasa (lebih dari UDP, nama host);",
     "example_upstream_dot": "<0>DNS melalui TLS</0> terenkripsi;",
     "example_upstream_doh": "<0>DNS melalui HTTPS</0> terenkripsi;",
     "example_upstream_doh3": "DNS melalui HTTPS terenkripsi dengan <0>HTTP/3</0> secara paksa dan tidak ada cadangan ke HTTP/2 atau lebih rendah;",
     "example_upstream_doq": "<0>DNS melalui QUIC</0> terenkripsi;",
-    "example_upstream_sdns": "<0>Stempel DNS</0> untuk <1>DNSCrypt</1> atau pengarah <2>DNS melalui HTTPS</2>;",
-    "example_upstream_tcp": "DNS biasa (melalui TCP);",
+    "example_upstream_sdns": "<0>Stempel DNS</0> untuk <1>DNSCrypt</1> atau pengarah <2>DNS-over-HTTPS</2>;",
+    "example_upstream_tcp": "DNS reguler (melalui TCP);",
     "example_upstream_tcp_port": "DNS biasa (melalui TCP, dengan port);",
-    "example_upstream_tcp_hostname": "DNS biasa (melalui TCP, nama host);",
+    "example_upstream_tcp_hostname": "DNS biasa (lebih dari TCP, nama host);",
     "all_lists_up_to_date_toast": "Semua daftar sudah diperbarui",
-    "updated_upstream_dns_toast": "Server hulu berhasil disimpan",
+    "updated_upstream_dns_toast": "Server upstream berhasil disimpan",
     "dns_test_ok_toast": "Server DNS yang ditentukan bekerja dengan benar",
     "dns_test_not_ok_toast": "Server \"{{key}}\": tidak dapat digunakan, mohon cek bahwa Anda telah menulisnya dengan benar",
     "dns_test_parsing_error_toast": "Bagian {{section}}: baris {{line}}: tidak dapat digunakan, mohon cek bahwa Anda telah menulisnya dengan benar",
-    "dns_test_warning_toast": "Hulu \"{{key}}\" tidak menanggapi permintaan pengujian dan mungkin tidak berfungsi dengan benar",
+    "dns_test_warning_toast": "Upstream \"{{key}}\" tidak menanggapi permintaan pengujian dan mungkin tidak berfungsi dengan baik",
     "unblock": "Buka Blokir",
     "block": "Blok",
     "disallow_this_client": "Cabut ijin untuk klien ini",
@@ -268,18 +268,18 @@
     "rule_added_to_custom_filtering_toast": "Aturan ditambah ke aturan penyaringan khusus: {{rule}}",
     "query_log_response_status": "Status: {{value}}",
     "query_log_filtered": "Difilter oleh {{filter}}",
-    "query_log_confirm_clear": "Apakah Anda yakin ingin menghapus seluruh catatan kueri?",
-    "query_log_cleared": "Catatan kueri berhasil dihapus",
-    "query_log_updated": "Catatan kueri berhasil diperbarui",
-    "query_log_clear": "Hapus catatan kueri",
+    "query_log_confirm_clear": "Apakah Anda yakin ingin menghapus seluruh kueri log?",
+    "query_log_cleared": "Kueri log telah berhasil dihapus",
+    "query_log_updated": "Log permintaan telah berhasil diperbarui",
+    "query_log_clear": "Hapus kueri log",
     "query_log_retention": "Rotasi kueri log",
-    "query_log_enable": "Aktifkan catatan",
-    "query_log_configuration": "Konfigurasi catatan",
-    "query_log_disabled": "Catatan kueri dinonaktifkan dan dapat dikonfigurasi di <0>pengaturan</0>",
+    "query_log_enable": "Aktifkan log",
+    "query_log_configuration": "Konfigurasi log",
+    "query_log_disabled": "Kueri log dinonaktifkan dan dapat dikonfigurasi di <0>pengaturan</0>",
     "query_log_strict_search": "Gunakan tanda kutip ganda untuk pencarian ketat",
     "query_log_retention_confirm": "Apakah Anda yakin ingin mengubah rotasi kueri log? Jika Anda menurunkan nilai interval, beberapa data akan hilang",
     "anonymize_client_ip": "Anonim IP klien",
-    "anonymize_client_ip_desc": "Jangan simpan alamat lengkap IP klien dalam catatan atau statistik",
+    "anonymize_client_ip_desc": "Jangan simpan alamat lengkap IP klien dalam log dan statistik",
     "dns_config": "Konfigurasi server DNS",
     "dns_cache_config": "Konfigurasi cache DNS",
     "dns_cache_config_desc": "Disini Anda bisa mengonfigurasi cache DNS",
@@ -308,8 +308,8 @@
     "form_enter_rate_limit": "Masukkan batas nilai",
     "rate_limit": "Batas nilai",
     "edns_enable": "Aktifkan EDNS Klien Subnet",
-    "edns_cs_desc": "Tambahkan opsi EDNS Client Subnet (ECS) ke permintaan hulu dan catat nilai yang dikirim oleh klien dalam catatan kueri.",
-    "edns_use_custom_ip": "Gunakan IP kustom untuk EDNS",
+    "edns_cs_desc": "Tambahkan opsi EDNS Client Subnet (ECS) ke permintaan upstream dan catat nilai yang dikirim oleh klien di log kueri.",
+    "edns_use_custom_ip": "Gunakan IP khusus untuk EDNS",
     "edns_use_custom_ip_desc": "Izinkan untuk menggunakan IP kustom untuk EDNS",
     "rate_limit_desc": "Jumlah permintaan per detik yang diperbolehkan untuk satu klien. Atur ke 0 untuk tidak terbatas.",
     "rate_limit_subnet_len_ipv4": "Panjang awalan subnet untuk alamat IPv4",
@@ -329,13 +329,13 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Respon pakai kode NXDOMAIN",
     "blocking_mode_null_ip": "Null IP: Respon pakai alamat IP kosong (0.0.0.0 untuk A; :: untuk AAAA)",
     "blocking_mode_custom_ip": "IP kustom: respon dengan alamat IP yang diset secara manual",
-    "theme_auto": "Otomatis",
+    "theme_auto": "Auto",
     "theme_light": "Terang",
     "theme_dark": "Gelap",
     "upstream_dns_client_desc": "Jika Anda biarkan kolom ini kosong, AdGuard Home akan menggunakan server yang dikonfigurasi di <0>pengaturan DNS</0>.",
     "tracker_source": "Sumber pelacak",
     "source_label": "Sumber",
-    "found_in_known_domain_db": "Ditemukan di basis data domain yang dikenal.",
+    "found_in_known_domain_db": "Ditemukan di database domain dikenal",
     "category_label": "Kategori",
     "rule_label": "Atura(n)",
     "list_label": "Daftar",
@@ -366,18 +366,18 @@
     "install_devices_router": "Router",
     "install_devices_router_desc": "Penyiapan ini secara otomatis mencakup semua perangkat yang terhubung ke router rumah Anda, tidak perlu mengkonfigurasi masing-masing perangkat secara manual.",
     "install_devices_address": "Server DNS AdGuard Home akan menggunakan alamat berikut",
-    "install_devices_router_list_1": "Buka preferensi untuk router Anda. Biasanya, Anda dapat mengaksesnya dari peramban Anda melalui URL, seperti http://192.168.0.1/ atau http://192.168.1.1/. Anda mungkin diminta untuk memasukkan kata sandi. Jika Anda tidak mengingatnya, Anda sering kali dapat mengatur ulang kata sandi dengan menekan tombol pada router itu sendiri, tetapi perlu diketahui bahwa jika prosedur ini dipilih, Anda mungkin akan kehilangan seluruh konfigurasi router. Jika router Anda memerlukan aplikasi untuk menyiapkannya, pasang aplikasi tersebut di ponsel atau PC Anda dan gunakan untuk mengakses pengaturan router.",
+    "install_devices_router_list_1": "Buka preferensi untuk router Anda. Biasanya, Anda dapat mengaksesnya dari browser Anda melalui URL, seperti http://192.168.0.1/ atau http://192.168.1.1/. Anda mungkin diminta untuk memasukkan kata sandi. Jika Anda tidak mengingatnya, Anda sering kali dapat mengatur ulang kata sandi dengan menekan tombol pada perute itu sendiri, tetapi perlu diketahui bahwa jika prosedur ini dipilih, Anda mungkin akan kehilangan seluruh konfigurasi perute. Jika router Anda memerlukan aplikasi untuk menyiapkannya, instal aplikasi tersebut di ponsel atau PC Anda dan gunakan untuk mengakses pengaturan router.",
     "install_devices_router_list_2": "Temukan pengaturan DHCP / DNS. Cari huruf DNS di sebelah kolom yang memungkinkan dua atau tiga set angka, masing-masing dipecah menjadi empat kelompok dengan satu hingga tiga digit.",
     "install_devices_router_list_3": "Masukkan alamat server AdGuard Home disana",
     "install_devices_router_list_4": "Anda tidak dapat menyetel server DNS kustom pada beberapa tipe router. Dalam hal ini mungkin membantu jika Anda mengatur AdGuard Home sebagai <0>server DHCP</0>. Jika tidak, Anda harus mencari petunjuk tentang cara mengkustomisasi server DNS untuk model router khusus Anda.",
     "install_devices_windows_list_1": "Buka Panel Kontrol melalui menu Start atau pencarian Windows.",
     "install_devices_windows_list_2": "Masuk ke kategori Jaringan dan Internet (Network and Internet) dan kemudian ke Pusat Jaringan dan Berbagi (Network and Sharing Center).",
     "install_devices_windows_list_3": "Di panel kiri, klik \"Ubah pengaturan adaptor\".",
-    "install_devices_windows_list_4": "Klik kanan koneksi aktif Anda dan pilih Properti.",
-    "install_devices_windows_list_5": "Temukan \"Protokol Internet Versi 4 (TCP/IPv4)\" (atau, untuk IPv6, \"Protokol Internet Versi 6 (TCP/IPv6)\") dalam daftar, pilih dan kemudian klik Properti lagi.",
+    "install_devices_windows_list_4": "Klik kanan koneksi aktif Anda dan pilih Properties.",
+    "install_devices_windows_list_5": "Temukan \"Internet Protocol Version 4 (TCP/IPv4)\" (atau, untuk IPv6, \"Internet Protocol Version 6 (TCP/IPv6)\") dalam daftar, pilih dan kemudian klik Properties lagi.",
     "install_devices_windows_list_6": "Pilih \"Gunakan alamat server DNS berikut\" dan masukkan alamat server Beranda AdGuard Anda.",
-    "install_devices_macos_list_1": "Klik ikon Apple dan buka Preferensi Sistem.",
-    "install_devices_macos_list_2": "Klik Jaringan.",
+    "install_devices_macos_list_1": "Klik ikon Apple dan pergi ke System Preferences.",
+    "install_devices_macos_list_2": "Klik Network.",
     "install_devices_macos_list_3": "Pilih koneksi pertama dalam daftar dan klik Advanced.",
     "install_devices_macos_list_4": "Pilih tab DNS dan masukkan alamat server AdGuard Anda.",
     "install_devices_android_list_1": "Dari layar beranda Menu Android, ketuk Pengaturan.",
@@ -394,7 +394,7 @@
     "open_dashboard": "Buka Beranda",
     "install_saved": "Berhasil disimpan",
     "encryption_title": "Enkripsi",
-    "encryption_desc": "Dukungan enkripsi (HTTPS/QUIC/TLS) untuk DNS dan antarmuka web admin",
+    "encryption_desc": "Enkripsi (HTTPS/QUIC/TLS) untuk DNS dan antarmuka admin",
     "encryption_config_saved": "Pengaturan enkripsi telah tersimpan",
     "encryption_server": "Nama server",
     "encryption_server_enter": "Masukkan nama domain anda",
@@ -406,7 +406,7 @@
     "encryption_dot": "Port DNS-over-TLS",
     "encryption_dot_desc": "Jika port ini terkonfigurasi, AdGuard Home akan menjalankan server DNS-over-TLS dalam port ini",
     "encryption_doq": "Port DNS-over-QUIC ",
-    "encryption_doq_desc": "Jika port ini dikonfigurasi, AdGuard Home akan menjalankan server DNS melalui QUIC pada port ini.",
+    "encryption_doq_desc": "Jika port ini diatur secara sepesifik, AdGuard Home akan menjalankan server DNS-lewat-QUIC pada port ini.",
     "encryption_certificates": "Sertifikat",
     "encryption_certificates_desc": "Untuk menggunakan enkripsi, Anda perlu memberikan rantai sertifikat SSL yang valid untuk domain Anda. Anda bisa mendapatkan sertifikat gratis di <0>{{link}}</0> atau Anda dapat membelinya dari salah satu Otoritas Sertifikat tepercaya.",
     "encryption_certificates_input": "Salin / rekatkan sertifikat PEM yang disandikan di sini.",
@@ -431,8 +431,8 @@
     "topline_expiring_certificate": "Sertifikat SSL Anda hampir kedaluwarsa. Perbarui <0>Pengaturan enkripsi</0>.",
     "topline_expired_certificate": "Sertifikat SSL Anda kedaluwarsa. Perbarui <0>Pengaturan enkripsi</0>.",
     "form_error_port_range": "Masukkan nomor port di kisaran 80-65535",
-    "form_error_port_unsafe": "Port tidak aman",
-    "form_error_equal": "Tidak boleh sama",
+    "form_error_port_unsafe": "Ini adalah port yang tidak aman",
+    "form_error_equal": "Seharusnya tidak sama",
     "form_error_password": "Kata sandi tidak cocok",
     "reset_settings": "Setel ulang pengaturan",
     "update_announcement": "AdGuard Home {{version}} sekarang tersedia! <0>Klik di sini</0> untuk info lebih lanjut.",
@@ -447,7 +447,7 @@
     "update_failed": "Pembaruan otomatis gagal. Silakan <a>ikuti langkah-langkah berikut</a> untuk memperbarui secara manual.",
     "manual_update": "Silakan <a>mengikuti langkah berikut</a> untuk memperbarui secara manual.",
     "processing_update": "Silahkan tunggu, AdGuard Home sedang diperbarui",
-    "clients_title": "Klien persisten",
+    "clients_title": "Klien yang gigih",
     "clients_desc": "Konfigurasikan catatan klien persisten untuk perangkat yang terhubung ke AdGuard Home",
     "settings_global": "Global",
     "settings_custom": "Kustom",
@@ -459,7 +459,7 @@
     "client_edit": "Ubah Klien",
     "client_identifier": "Identifikasi",
     "ip_address": "Alamat IP",
-    "client_identifier_desc": "Klien dapat diidentifikasi berdasarkan alamat IP, CIDR, alamat MAC, atau ClientID (dapat digunakan untuk DoT/DoH/DoQ). Pelajari lebih lanjut tentang cara mengidentifikasi klien <0>di sini</0>.",
+    "client_identifier_desc": "Klien dapat diidentifikasi oleh alamat IP, CIDR, alamat MAC atau ClientID (dapat digunakan untuk DoT/DoH/DoQ). <0>Di sini</0> Anda dapat mempelajari lebih lanjut tentang cara mengidentifikasi klien.",
     "form_enter_ip": "Masukkan IP",
     "form_enter_subnet_ip": "Masukkan alamat IP di subnet \"{{cidr}}\"",
     "form_enter_mac": "Masukkan MAC",
@@ -475,7 +475,7 @@
     "clients_not_found": "Tidak ada klien ditemukan",
     "client_confirm_delete": "Apakah anda yakin ingin menghapus klien \"{{key}}\"?",
     "list_confirm_delete": "Anda yakin ingin menghapus daftar ini?",
-    "auto_clients_title": "Klien runtime",
+    "auto_clients_title": "Klien (waktu berjalan)",
     "auto_clients_desc": "Informasi tentang alamat IP perangkat yang menggunakan atau mungkin menggunakan AdGuard Home. Informasi ini dikumpulkan dari beberapa sumber, termasuk berkas host, DNS terbalik, dll.",
     "access_title": "Pengaturan akses",
     "access_desc": "Disini anda dapat mengatur aturan akses untuk server AdGuard Home DNS",
@@ -484,9 +484,9 @@
     "access_disallowed_title": "Klien yang tidak diizinkan",
     "access_disallowed_desc": "Daftar CIDR, alamat IP, atau <a>ClientID</a>. Jika daftar ini memiliki entri, AdGuard Home akan membatalkan permintaan dari klien ini. Kolom ini diabaikan jika ada entri di daftar putih klien.",
     "access_blocked_title": "Domain yang diblokir",
-    "access_blocked_desc": "Jangan dikelirukan dengan filter. AdGuard Home membuang kueri DNS yang cocok dengan domain ini, dan kueri ini bahkan tidak muncul di catatan kueri. Anda dapat menentukan nama domain, karakter pengganti, atau aturan filter URL yang tepat, misalnya \"example.org\", \"*.example.org\", atau \"||example.org^\" secara bersamaan.",
+    "access_blocked_desc": "Jangan bingung dengan filter. AdGuard Home menghapus kueri DNS yang cocok dengan domain ini, dan kueri ini bahkan tidak muncul di log kueri. Anda dapat menentukan nama domain, karakter pengganti, atau aturan filter URL yang tepat, mis. \"example.org\", \"*.example.org\", atau \"||example.org^\" yang sesuai.",
     "access_settings_saved": "Pengaturan akses berhasil disimpan",
-    "updates_checked": "Versi baru AdGuard Home tersedia",
+    "updates_checked": "Versi baru AdGuard Home tersedia\n",
     "updates_version_equal": "AdGuard Home sudah tebaru",
     "check_updates_now": "Periksa pembaruan sekarang",
     "version_request_error": "Pemeriksaan pembaruan gagal. Harap periksa koneksi internet anda.",
@@ -563,7 +563,7 @@
     "ignore_domains": "Domain yang diabaikan (dipisahkan oleh baris baru)",
     "ignore_domains_title": "Domain yang diabaikan",
     "ignore_domains_desc_stats": "Kueri yang cocok dengan aturan ini tidak ditulis ke statistik",
-    "ignore_domains_desc_query": "Kueri yang cocok dengan aturan ini tidak ditulis ke catatan kueri",
+    "ignore_domains_desc_query": "Kueri yang cocok dengan aturan ini tidak ditulis ke log kueri",
     "interval_hours": "{{count}} jam",
     "interval_hours_plural": "{{count}} jam",
     "filters_configuration": "Konfigurasi filter",
@@ -593,8 +593,8 @@
     "example_rewrite_wildcard": "tulis ulang respon untuk semua subdomain <0>contoh.org</0>.",
     "rewrite_ip_address": "Alamat IP: pakai IP ini dalam respons A atau AAAA",
     "rewrite_domain_name": "Nama domain: tambah ke rekaman CNAME",
-    "rewrite_A": "<0>A</0>: nilai khusus, biarkan <0>A</0> merekam dari hulu",
-    "rewrite_AAAA": "<0>AAAA</0>: nilai khusus, biarkan <0>AAAA</0> merekam dari hulu",
+    "rewrite_A": "<0>A</0>: nilai khusus, biarkan <0>A</0> merekam dari upstream",
+    "rewrite_AAAA": "<0>AAAA</0>: nilai khusus, biarkan <0>AAAA</0> merekam dari upstream",
     "disable_ipv6": "Nonaktifkan penyelesaian alamat IPv6",
     "disable_ipv6_desc": "Hapus semua kueri DNS untuk alamat IPv6 (ketik AAAA) dan hapus petunjuk IPv6 dari respons HTTPS.",
     "fastest_addr": "Alamat IP tercepat",
@@ -655,8 +655,8 @@
     "enter_cache_size": "Masukkan ukuran cache (bytes)",
     "enter_cache_ttl_min_override": "Masukkan TTL minimum (detik)",
     "enter_cache_ttl_max_override": "Masukkan TTL maksimum (detik)",
-    "cache_ttl_min_override_desc": "Perpanjang nilai time-to-live (detik) yang diterima dari server hulu saat menyimpan respons DNS.",
-    "cache_ttl_max_override_desc": "Tetapkan nilai maksimum time-to-live (detik) untuk entri dalam cache DNS.",
+    "cache_ttl_min_override_desc": "Perpanjang nilai waktu untuk hidup (detik) yang diterima dari server hulu saat menyimpan respons DNS.",
+    "cache_ttl_max_override_desc": "Tetapkan nilai waktu-online maksimum (detik) untuk entri di cache DNS.",
     "ttl_cache_validation": "Nilai TTL cache minimum harus kurang dari atau sama dengan nilai maksimum",
     "cache_optimistic": "Caching yang optimis",
     "cache_optimistic_desc": "Buat AdGuard Home merespons dari cache bahkan ketika entri telah kedaluwarsa dan juga mencoba untuk menyegarkannya.",
@@ -678,7 +678,7 @@
     "use_saved_key": "Gunakan kunci yang disimpan sebelumnya",
     "parental_control": "Pengawasan Orang Tua",
     "safe_browsing": "Penjelajahan Aman",
-    "served_from_cache_label": "Disajikan dari cache",
+    "served_from_cache": "{{value}} <i>(disajikan dari cache)</i>",
     "form_error_password_length": "Kata sandi harus terdiri dari {{min}} hingga {{max}}",
     "anonymizer_notification": "<0>Catatan:</0> Anonimisasi IP diaktifkan. Anda dapat menonaktifkannya di <1>Pengaturan umum</1> .",
     "confirm_dns_cache_clear": "Apakah Anda yakin ingin menghapus cache DNS?",
@@ -688,11 +688,11 @@
     "theme_auto_desc": "Otomatis (berdasarkan skema warna perangkat anda)",
     "theme_dark_desc": "Tema gelap",
     "theme_light_desc": "Tema terang",
-    "disable_for_seconds": "Selama {{count}} detik",
-    "disable_for_seconds_plural": "Selama {{count}} detik",
-    "disable_for_minutes": "Selama {{count}} menit",
-    "disable_for_minutes_plural": "Selama {{count}} menit",
-    "disable_for_hours": "Selama {{count}} jam",
+    "disable_for_seconds": "Untuk {{count}} detik",
+    "disable_for_seconds_plural": "Untuk {{count}} detik",
+    "disable_for_minutes": "Untuk {{count}} menit",
+    "disable_for_minutes_plural": "Untuk {{count}} menit",
+    "disable_for_hours": "Untuk {{count}} jam",
     "disable_for_hours_plural": "Untuk {{count}} jam",
     "disable_until_tomorrow": "Sampai besok",
     "disable_notify_for_seconds": "Hentikan perlindungan selama {{count}} detik",
@@ -706,10 +706,10 @@
     "custom_retention_input": "Masukkan retensi dalam hitungan jam",
     "custom_rotation_input": "Masukkan rotasi dalam hitungan jam",
     "protection_section_label": "Perlindungan",
-    "log_and_stats_section_label": "Catatan kueri dan statistik",
-    "ignore_query_log": "Abaikan klien ini di catatan kueri",
+    "log_and_stats_section_label": "Log kueri dan statistik",
+    "ignore_query_log": "Abaikan klien ini di log kueri",
     "ignore_statistics": "Abaikan klien ini di statistik",
-    "schedule_services": "Jeda pemblokiran layanan",
+    "schedule_services": "Menjeda pemblokiran layanan",
     "schedule_services_desc": "Mengonfigurasi jadwal jeda filter pemblokiran layanan",
     "schedule_services_desc_client": "Mengonfigurasi jadwal jeda filter pemblokiran layanan untuk klien ini",
     "schedule_desc": "Tetapkan periode tidak aktif untuk layanan yang diblokir",
@@ -741,7 +741,7 @@
     "thursday_short": "Kam",
     "friday_short": "Jum",
     "saturday_short": "Sab",
-    "upstream_dns_cache_configuration": "Konfigurasi cache DNS hulu",
+    "upstream_dns_cache_configuration": "Konfigurasi cache DNS upstream",
     "enable_upstream_dns_cache": "Aktifkan cache DNS untuk konfigurasi hulu kustom pada klien ini",
     "dns_cache_size": "Ukuran cache DNS, dalam byte"
 }

client/src/__locales/it.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Utilizza richieste parallele per accelerare la risoluzione interrogando simultaneamente tutti i server upstream.",
     "parallel_requests": "Richieste parallele",
     "load_balancing": "Bilanciamento del carico",
-    "load_balancing_desc": "Esegui una query su un server upstream alla volta.<br/>AdGuard Home utilizza un algoritmo casuale ponderato per selezionare i server con il minor numero di ricerche fallite e il tempo medio di ricerca più basso.",
+    "load_balancing_desc": "Esegui una query su un server upstream alla volta. AdGuard Home utilizza un algoritmo casuale ponderato per selezionare i server con il minor numero di ricerche fallite e il tempo medio di ricerca più basso.",
     "bootstrap_dns": "Server DNS bootstrap",
     "bootstrap_dns_desc": "Indirizzi IP dei server DNS utilizzati per risolvere gli indirizzi IP dei resolver DoH/DoT specificati come upstream. I commenti non sono ammessi.",
     "fallback_dns_title": "Server DNS di fallback",
@@ -294,9 +294,6 @@
     "blocked_response_ttl": "Risposta TTL bloccata",
     "blocked_response_ttl_desc": "Specifica per quanti secondi i client devono tenere nella cache una risposta filtrata",
     "form_enter_blocked_response_ttl": "Inserisci tempo di vita (TTL) della risposta bloccata (secondi)",
-    "upstream_timeout": "Timeout upstream",
-    "upstream_timeout_desc": "Specifica il numero di secondi da attendere per una risposta dal server upstream",
-    "form_enter_upstream_timeout": "Inserisci la durata del timeout del server upstream in secondi",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS su HTTPS",
     "dns_over_tls": "DNS su TLS",
@@ -601,7 +598,7 @@
     "disable_ipv6": "Disattiva risoluzione indirizzi IPv6",
     "disable_ipv6_desc": "Eliminare tutte le query DNS per gli indirizzi IPv6 (tipo AAAA) e rimuovere i suggerimenti IPv6 dalle risposte HTTPS.",
     "fastest_addr": "Indirizzo IP più veloce",
-    "fastest_addr_desc": "Attendi le risposte da <b>tutti i</b> server DNS, misura la velocità di connessione TCP per ogni server e restituisci l'indirizzo IP del server con la velocità di connessione più elevata.<br/>Questa modalità può rallentare notevolmente le query DNS, se uno o più server upstream non rispondono. Assicurati che i tuoi server upstream siano stabili e che il timeout upstream sia basso.",
+    "fastest_addr_desc": "Interroga tutti i server DNS e restituisci l'indirizzo IP più veloce tra tutte le risposte. Ciò rallenterà le richieste DNS poiché AdGuard Home dovrà attendere le risposte da tutti i server DNS, ma ciò migliorerà complessivamente la connettività.",
     "autofix_warning_text": "Se fai clic su \"Correggi\", AdGuardHome configurerà il tuo sistema per utilizzare il server DNS AdGuardHome.",
     "autofix_warning_list": "Eseguirà queste attività: <0> Disattiva DNSStubListener di sistema </0> <0> Imposta l'indirizzo del server DNS su 127.0.0.1 </0> <0> Sostituisci la destinazione del collegamento simbolico di /etc/resolv.conf su / run / systemd /resolve/resolv.conf </0> <0> Arresta DNSStubListener (ricarica il servizio systemd-resolved) </0>",
     "autofix_warning_result": "Di conseguenza, tutte le richieste DNS dal sistema verranno elaborate da AdGuardHome per impostazione predefinita.",

client/src/__locales/ja.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "並列リクエストを使用する（同時にすべてのアップストリームサーバーに処理要求することで解決スピードが向上）",
     "parallel_requests": "並列リクエスト",
     "load_balancing": "ロードバランシング",
-    "load_balancing_desc": "一度に1つのアップストリームサーバーをクエリします。<br/>AdGuard Home は、重み付き乱択アルゴリズムを使用して、ルックアップに失敗した回数が最も少なく、平均ルックアップ時間が最も短いサーバーを選択します。",
+    "load_balancing_desc": "一度に1つのアップストリームサーバーをクエリします。AdGuard Home は、重み付き乱択アルゴリズムを使用して、ルックアップに失敗した回数が最も少なく、平均ルックアップ時間が最も短いサーバーを選択します。",
     "bootstrap_dns": "ブートストラップDNSサーバ",
     "bootstrap_dns_desc": "アップストリームとして指定したDoH/DoTリゾルバのIPアドレスを解決するために使用されるDNSサーバーのIPアドレスです。（コメントは許可されていません）",
     "fallback_dns_title": "フォールバックDNSサーバー",
@@ -294,9 +294,6 @@
     "blocked_response_ttl": "Blocked Response TTL（ブロック済み応答のTTL）",
     "blocked_response_ttl_desc": "フィルタリングされた応答をクライアントがキャッシュしておく時間（秒）を指定します。",
     "form_enter_blocked_response_ttl": "ブロック済み応答のTTL（秒単位）を入力してください",
-    "upstream_timeout": "Upstream timeout（アップストリームタイムアウト）",
-    "upstream_timeout_desc": "アップストリームサーバーからの応答を待つ秒数を指定します。",
-    "form_enter_upstream_timeout": "アップストリームサーバーのタイムアウト時間を秒単位で入力します。",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -601,7 +598,7 @@
     "disable_ipv6": "IPv6アドレスの解決を無効にする",
     "disable_ipv6_desc": "IPv6アドレス（タイプAAAA）に対するDNSクエリをすべて破棄し、HTTPS応答から IPv6 hint を削除します。",
     "fastest_addr": "最速のIPアドレス",
-    "fastest_addr_desc": "<b>すべての</b>DNSサーバーからの応答を待ち、各サーバーのTCP接続速度を測定し、最も接続速度の速いサーバーのIPアドレスを返します。<br/>※このモードでは、1つまたは複数のアップストリームサーバーが応答しない場合、DNSクエリが大幅に遅くなることがあります。アップストリームサーバーが安定していることを確認し、アップストリームタイムアウトは小さくしておいてください。",
+    "fastest_addr_desc": "すべてのDNSサーバーに処理要求し、全応答の中で最速のIPアドレスを返します。これにより、AdGuard HomeがすべてのDNSサーバーからの応答を待つ必要があるため、DNSクエリが遅くなりますが、全体的な接続性は向上します。",
     "autofix_warning_text": "「修正」をクリックすると、AdGuardHomeはAdGuardHome DNSサーバを使用するようにシステムを構成します。",
     "autofix_warning_list": "次のタスクを実行します：<0>システムDNSStubListenerを非アクティブ化します</0> <0>DNSサーバのアドレスを127.0.0.1に設定します</0> <0>/etc/resolv.confのシンボリックリンクの対象を/run/systemd/resolve/resolv.confに置換します</0> <0>DNSStubListenerを停止します（systemd-resolvedサービスをリロードします）</0>",
     "autofix_warning_result": "その結果、システムからのすべてのDNSリクエストは、デフォルトでAdGuard Homeによって処理されます。",

client/src/__locales/ko.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "쿼리 처리 속도를 높이려면 모든 업스트림 서버에서 동시에 병렬 쿼리를 사용해주세요.",
     "parallel_requests": "병렬 처리 요청",
     "load_balancing": "로드 밸런싱",
-    "load_balancing_desc": "한 번에 하나의 업스트림 서버를 쿼리합니다.<br/>AdGuard Home은 가중 무작위 알고리즘을 사용하여 조회 실패 횟수가 가장 적고 평균 조회 시간이 가장 짧은 서버를 선택합니다.",
+    "load_balancing_desc": "한 번에 하나의 업스트림 서버를 쿼리합니다. AdGuard Home은 가중 무작위 알고리즘을 사용하여 조회 실패 횟수가 가장 적고 평균 조회 시간이 가장 짧은 서버를 선택합니다.",
     "bootstrap_dns": "부트스트랩 DNS 서버",
     "bootstrap_dns_desc": "업스트림으로 지정한 DoH/DoT 리졸버의 IP 주소를 확인하는 데 사용되는 DNS 서버의 IP 주소입니다. 주석은 허용되지 않습니다.",
     "fallback_dns_title": "폴백 DNS 서버",
@@ -294,9 +294,6 @@
     "blocked_response_ttl": "차단된 TTL 응답",
     "blocked_response_ttl_desc": "클라이언트가 필터링된 응답을 캐시해야 하는 시간(초)을 지정합니다.",
     "form_enter_blocked_response_ttl": "차단된 응답 TTL(초)을 입력하세요.",
-    "upstream_timeout": "업스트림 제한 시간",
-    "upstream_timeout_desc": "업스트림 서버의 응답을 기다리는 시간(초)을 지정합니다.",
-    "form_enter_upstream_timeout": "업스트림 서버 응답 제한 시간을 초 단위로 입력하세요.",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -601,7 +598,7 @@
     "disable_ipv6": "IPv6 주소 확인 비활성화",
     "disable_ipv6_desc": "IPv6 주소(AAAA 유형)에 대한 모든 DNS 쿼리를 무시하고 HTTPS 유형 응답에서 IPv6 데이터를 제거합니다.",
     "fastest_addr": "가장 빠른 IP 주소",
-    "fastest_addr_desc": "<b>모든</b> DNS 서버의 응답을 기다렸다가 각 서버의 TCP 연결 속도를 측정하여 연결 속도가 가장 빠른 서버의 IP 주소를 반환합니다.<br/>이 모드는 하나 이상의 업스트림 서버가 응답하지 않는 경우, DNS 쿼리 속도가 상당히 느려질 수 있습니다. 업스트림 서버가 안정적이고 업스트림 타임아웃이 짧은지 확인하세요.",
+    "fastest_addr_desc": "모든 DNS 서버에 쿼리를 수행한 다음 반응이 가장 빠른 IP주소를 반송합니다. AdGuard Home이 모든 DNS 서버의 응답을 기다려야 하기 때문에 DNS 쿼리 속도가 느려지지만 전반적인 연결이 향상됩니다.",
     "autofix_warning_text": "'수정'을 클릭하면 AdGuard Home이 AdGuard Home DNS 서버를 사용하도록 시스템을 설정합니다.",
     "autofix_warning_list": "다음 작업을 진행합니다: <0>DNSStubListener 시스템 비활성화</0> <0>DNS 서버 주소를 127.0.0.1로 설정</0> <0>/etc/resolv.conf의 심볼릭 링크 타겟을 /run/systemd/resolve/resolv.conf로 변경</0> <0>DNSStubListener 중지 (systemd-resolved 서비스 새로고침)</0>",
     "autofix_warning_result": "결과적으로 시스템의 모든 DNS 요청은 기본적으로 AdGuard Home에 의해 처리됩니다.",

client/src/__locales/nl.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Parallelle verzoeken gebruiken om te versnellen door gelijktijdig verzoeken te sturen naar alle upstream servers.",
     "parallel_requests": "Parallelle verzoeken",
     "load_balancing": "Volume balanceren",
-    "load_balancing_desc": "Voer zoekopdrachten uit op één upstream-server tegelijk.<br/>AdGuard Home gebruikt een gewogen willekeurig algoritme om servers te selecteren met het laagste aantal mislukte zoekopdrachten en de laagste gemiddelde opzoektijd.",
+    "load_balancing_desc": "Voer zoekopdrachten uit op één upstream-server tegelijk. AdGuard Home gebruikt een gewogen willekeurig algoritme om servers te selecteren met het laagste aantal mislukte zoekopdrachten en de laagste gemiddelde opzoektijd.",
     "bootstrap_dns": "Bootstrap DNS-servers",
     "bootstrap_dns_desc": "IP-adressen van DNS-servers die worden gebruikt om IP-adressen om te zetten van de DoH/DoT-resolvers die je opgeeft als upstreams. Opmerkingen zijn niet toegestaan.",
     "fallback_dns_title": "Back-up DNS-servers",
@@ -166,7 +166,7 @@
     "encryption_settings": "Encryptie instellingen",
     "dhcp_settings": "DHCP instellingen",
     "upstream_dns": "Upstream DNS-servers",
-    "upstream_dns_help": "Een server-adres per regel invoeren. <a>Meer informatie</a> over het configureren van upstream DNS-servers.",
+    "upstream_dns_help": "Een server-adres per regel invoeren. <a>Meer weten</a> over het configureren van upstream DNS-servers.",
     "upstream_dns_configured_in_file": "Geconfigureerd in {{path}}",
     "test_upstream_btn": "Test upstream",
     "upstreams": "Upstreams",
@@ -294,9 +294,6 @@
     "blocked_response_ttl": "Geblokkeerde reactie TTL",
     "blocked_response_ttl_desc": "Hiermee geef je op hoeveel seconden de clients een gefilterd antwoord in de cache moeten opslaan",
     "form_enter_blocked_response_ttl": "Voer geblokkeerd antwoord TTL in (seconden)",
-    "upstream_timeout": "Upstream time-out",
-    "upstream_timeout_desc": "Geeft het aantal seconden aan dat moet worden gewacht op een reactie van de upstream-server",
-    "form_enter_upstream_timeout": "Voer de time-outduur van de upstream-server in seconden in",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-via-HTTPS",
     "dns_over_tls": "DNS-via-TLS",
@@ -327,10 +324,10 @@
     "rate_limit_whitelist_placeholder": "Voer één IP-adres per regel in",
     "blocking_ipv4_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
     "blocking_ipv6_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
-    "blocking_mode_default": "Standaard: Reageer met een nul IP-adres (0.0.0.0 for A; :: voor AAAA) wanneer geblokkeerd door een Adblock-type regel; reageer met het IP-adres dat is opgegeven in de regel wanneer geblokkeerd door een /etc/hosts type regel",
+    "blocking_mode_default": "Standaard: Reageer met een nul IP adres (0.0.0.0 for A; :: voor AAAA) wanneer geblokkeerd door een Adblock-type regel; reageer met het IP-adres dat is opgegeven in de regel wanneer geblokkeerd door een /etc/hosts type regel",
     "blocking_mode_refused": "REFUSED: Antwoorden met REFUSED code",
     "blocking_mode_nxdomain": "NXDOMAIN: Reageer met NXDOMAIN code",
-    "blocking_mode_null_ip": "Nul IP: Reageer met een nul IP-adres (0.0.0.0 voor A; :: voor AAAA)",
+    "blocking_mode_null_ip": "Nul IP: Reageer met een nul IP address (0.0.0.0 voor A; :: voor AAAA)",
     "blocking_mode_custom_ip": "Aangepast IP: Reageer met een handmatige ingesteld IP adres",
     "theme_auto": "Automatisch",
     "theme_light": "Licht",
@@ -601,7 +598,7 @@
     "disable_ipv6": "Oplossen IPv6-adressen uitschakelen",
     "disable_ipv6_desc": "Alle DNS-query's voor IPv6-adressen (type AAAA) verwijderen en IPv6-hints uit HTTPS-antwoorden verwijderen.",
     "fastest_addr": "Snelste IP adres",
-    "fastest_addr_desc": "Wacht op reacties van <b>alle</b> DNS-servers, meet de TCP-verbindingssnelheid voor elke server en retourneer het IP-adres van de server met de hoogste verbindingssnelheid.<br/>Deze modus kan DNS-query's aanzienlijk vertragen als een of meer upstream-servers niet reageren. Zorg ervoor dat je upstream-servers stabiel zijn en dat je upstream-time-out laag is.",
+    "fastest_addr_desc": "Alle DNS-servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat AdGuard Home moet wachten op de antwoorden van alles DNS-servers, maar verbetert wel de connectiviteit.",
     "autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home jouw systeem om de AdGuard Home DNS-server te gebruiken.",
     "autofix_warning_list": "De volgende taken worden uitgevoerd: <0> Deactiveren van Systeem DNSStubListener</0> <0> DNS-serveradres instellen op 127.0.0.1 </0> <0> Symbolisch koppelingsdoel van /etc/resolv.conf vervangen door /run/systemd/resolve/resolv.conf </0> <0> Stop DNSStubListener (herlaad systemd-resolved service) </0>",
     "autofix_warning_result": "Als gevolg hiervan worden alle DNS-aanvragen van je systeem standaard door AdGuard Home verwerkt.",

client/src/__locales/pt-br.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Usar consultas paralelas para acelerar a resolução consultando simultaneamente todos os servidores DNS primário",
     "parallel_requests": "Solicitações paralelas",
     "load_balancing": "Balanceamento de carga",
-    "load_balancing_desc": "Consulte um servidor upstream por vez.<br/>O AdGuard Home usa um algoritmo aleatório ponderado para selecionar servidores com o menor número de falhas e o menor tempo médio de consulta.",
+    "load_balancing_desc": "Consulte um servidor upstream por vez. O AdGuard Home usa um algoritmo aleatório ponderado para selecionar servidores com o menor número de falhas e o menor tempo médio de consulta.",
     "bootstrap_dns": "Servidores DNS de inicialização",
     "bootstrap_dns_desc": "Endereços IP de servidores DNS usados para resolver endereços IP dos resolvedores DoH/DoT que você especifica como upstreams. Comentários não são permitidos.",
     "fallback_dns_title": "Servidores DNS Fallback",
@@ -294,9 +294,6 @@
     "blocked_response_ttl": "Resposta bloqueada TTL",
     "blocked_response_ttl_desc": "Especifica por quantos segundos os clientes devem armazenar em cache uma resposta filtrada",
     "form_enter_blocked_response_ttl": "Insira o TTL da resposta bloqueada (segundos)",
-    "upstream_timeout": "Tempo limite de upstream",
-    "upstream_timeout_desc": "Especifica o número de segundos para esperar por uma resposta do servidor upstream",
-    "form_enter_upstream_timeout": "Insira a duração do tempo limite do servidor upstream em segundos",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-sobre-HTTPS",
     "dns_over_tls": "DNS-sobre-TLS",
@@ -601,7 +598,7 @@
     "disable_ipv6": "Desativar resolução de endereços IPv6",
     "disable_ipv6_desc": "Descarta todas as consultas DNS para endereços IPv6 (tipo AAAA) e remove dicas de IPv6 das respostas HTTPS.",
     "fastest_addr": "Endereço de IP mais rápido",
-    "fastest_addr_desc": "Aguarde as respostas de <b>todos</b> os servidores DNS, meça a velocidade da conexão TCP para cada servidor e retorne o endereço de IP do servidor com a velocidade de conexão mais rápida.<br/>Esse modo pode retardar significativamente as consultas de DNS, se um ou mais servidores DNS primários não estiverem respondendo. Certifique-se de que seus servidores DNS primários sejam estáveis e que seu tempo de espera para DNS seja baixo.",
+    "fastest_addr_desc": "Consulta todos os servidores DNS e retorna o endereço IP mais rápido entre todas as respostas. Isso torna as consultas DNS mais lentas, pois o AdGuard Home tem que esperar pelas respostas de todos os servidores DNS, mas melhora a conectividade geral.",
     "autofix_warning_text": "Se clicar em \"Corrigir\", o AdGuardHome irá configurar o seu sistema para utilizar o servidor DNS do AdGuardHome.",
     "autofix_warning_list": "Ele irá realizar estas tarefas: <0>Desativar sistema DNSStubListener</0> <0>Definir endereço do servidor DNS para 127.0.0.1</0> <0>Substituir o alvo simbólico do link /etc/resolv.conf para /run/systemd/resolv.conf</0> <0>Parar DNSStubListener (recarregar serviço resolvido pelo sistema)</0>",
     "autofix_warning_result": "Como resultado, todos as solicitações DNS do seu sistema serão processadas pelo AdGuard Home por padrão.",

client/src/__locales/pt-pt.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Usar consultas paralelas para acelerar a resolução consultando simultaneamente todos os servidores DNS",
     "parallel_requests": "Solicitações paralelas",
     "load_balancing": "Balanceamento de carga",
-    "load_balancing_desc": "Consulta um servidor upstream de cada vez. <br/>O AdGuard Home usa um algoritmo aleatório ponderado para selecionar servidores com o menor número de pesquisas falhadas e o menor tempo médio de pesquisa.",
+    "load_balancing_desc": "Consulta um servidor a montante de cada vez. O AdGuard Home usa um algoritmo aleatório ponderado para selecionar servidores com o menor número de pesquisas com falha e o menor tempo médio de pesquisa.",
     "bootstrap_dns": "Servidores DNS de arranque",
     "bootstrap_dns_desc": "Endereços IP de servidores DNS usados para resolver endereços IP dos resolvedores DoH/DoT que você especifica como upstreams. Comentários não são permitidos.",
     "fallback_dns_title": "Servidores DNS de fallback",
@@ -294,9 +294,6 @@
     "blocked_response_ttl": "Resposta bloqueada TTL",
     "blocked_response_ttl_desc": "Especifica por quantos segundos os clientes devem armazenar em cache uma resposta filtrada",
     "form_enter_blocked_response_ttl": "Insira o TTL da resposta bloqueada (segundos)",
-    "upstream_timeout": "Tempo esgotado de upstream",
-    "upstream_timeout_desc": "Especifica o número de segundos a aguardar por uma resposta do servidor upstream",
-    "form_enter_upstream_timeout": "Insira a duração do tempo esgotado do servidor upstream em segundos",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-sobre-HTTPS",
     "dns_over_tls": "DNS-sobre-TLS",
@@ -601,7 +598,7 @@
     "disable_ipv6": "Desativar resolução de endereços IPv6",
     "disable_ipv6_desc": "Descarte todas as consultas DNS para endereços IPv6 (tipo AAAA) e remova as dicas IPv6 das respostas HTTPS.",
     "fastest_addr": "Endereço de IP mais rápido",
-    "fastest_addr_desc": "Aguarda por respostas de <b>todos</b> os servidores DNS, mede a velocidade da ligação TCP para cada servidor e devolva o endereço IP do servidor com a velocidade de ligação mais rápida.<br/>Este modo pode abrandar significativamente as consultas DNS, se um ou mais servidores upstream não estiverem a responder. Certifique-se de que os seus servidores upstream são estáveis e que o tempo esgotado de upstream é baixo.",
+    "fastest_addr_desc": "Consulta todos os servidores DNS e retorna o endereço IP mais rápido entre todas as respostas. Isso torna as consultas DNS mais lentas, pois o AdGuard Home tem que esperar pelas respostas de todos os servidores DNS, mas melhora a conectividade geral.",
     "autofix_warning_text": "Se clicar em \"Corrigir\", o AdGuardHome irá configurar o seu sistema para utilizar o servidor DNS do AdGuardHome.",
     "autofix_warning_list": "Irá realizar estas tarefas: <0>Desativar sistema DNSStubListener</0> <0>Definir endereço do servidor DNS para 127.0.0.1</0> <0>Substituir o alvo simbólico do link /etc/resolv.conf para /run/systemd/resolv.conf</0> <0>Parar DNSStubListener (recarregar serviço resolvido pelo sistema)</0>",
     "autofix_warning_result": "Como resultado, todos as solicitações DNS do seu sistema serão processadas pelo AdGuard Home por predefinição.",

client/src/__locales/ru.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Использовать параллельные запросы ко всем серверам одновременно для ускорения обработки запроса.",
     "parallel_requests": "Параллельные запросы",
     "load_balancing": "Распределение нагрузки\n",
-    "load_balancing_desc": "Запрашивать по одному upstream-серверу.<br/>AdGuard Home использует алгоритм случайной выборки с учётом веса для выбора серверов с наименьшим количеством неудачных запросов и наименьшим средним временем выполнения запроса.",
+    "load_balancing_desc": "Запрашивайте по одному серверу за раз. AdGuard Home использует алгоритм случайной выборки с учётом веса для выбора серверов с наименьшим количеством неудачных запросов и наименьшим средним временем выполнения запроса.",
     "bootstrap_dns": "Bootstrap DNS-серверы",
     "bootstrap_dns_desc": "IP-адреса DNS-серверов, используемых для поиска IP-адресов DoH/DoT upstream-серверов, которые вы указали. Комментарии не допускаются.",
     "fallback_dns_title": "Резервные DNS-серверы",
@@ -294,9 +294,6 @@
     "blocked_response_ttl": "TTL заблокированного ответа",
     "blocked_response_ttl_desc": "Указывает, в течение скольких секунд клиенты должны кешировать отфильтрованный ответ",
     "form_enter_blocked_response_ttl": "Введите TTL заблокированного ответа (в секундах)",
-    "upstream_timeout": "Время ожидания ответов от upstream-серверов",
-    "upstream_timeout_desc": "Длительность ожидания ответа от upstream-серверов в секундах",
-    "form_enter_upstream_timeout": "Введите время ожидания для upstream-сервера в секундах",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -601,7 +598,7 @@
     "disable_ipv6": "Отключить обработку IPv6-адресов",
     "disable_ipv6_desc": "Игнорировать все DNS-запросы адресов IPv6 (тип AAAA) и удалять IPv6-данные из ответов типа HTTPS.",
     "fastest_addr": "Самый быстрый IP-адрес",
-    "fastest_addr_desc": "Дождаться ответов от <b>всех</b> DNS-серверов, измерить скорость TCP-соединения для каждого сервера и вернуть IP-адрес сервера с самой высокой скоростью соединения.<br/>Этот режим может значительно замедлить выполнение DNS-запросов, если один или несколько серверов не отвечают. Убедитесь, что ваши серверы работают стабильно, а время ожидания серверов мало.",
+    "fastest_addr_desc": "Опросить все DNS-серверы и вернуть самый быстрый IP-адрес из полученных ответов. Это замедлит DNS-запросы, так как нужно будет дождаться ответов со всех DNS-серверов, но улучшит соединение.",
     "autofix_warning_text": "При нажатии «Исправить» AdGuard Home настроит вашу систему на использование DNS-сервера AdGuard Home.",
     "autofix_warning_list": "Будут выполняться следующие задачи: <0>Деактивировать системный DNSStubListener</0> <0>Установить адрес сервера DNS на 127.0.0.1</0> <0>Создать символическую ссылку /etc/resolv.conf на /run/systemd/resolve/resolv.conf</0> <0>Остановить DNSStubListener (перезагрузить системную службу)</0>.",
     "autofix_warning_result": "В результате все DNS-запросы от вашей системы будут по умолчанию обрабатываться AdGuard Home.\n",

client/src/__locales/sk.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Používať paralelné dopyty na zrýchlenie súčasným dopytovaním všetkých upstream serverov súčasne.",
     "parallel_requests": "Paralelné dopyty",
     "load_balancing": "Vyrovnávanie záťaže",
-    "load_balancing_desc": "Dopytuje sa súčasne len jeden upstream server.<br/>AdGuard Home používa vážený náhodný algoritmus na výber serverov s najnižším počtom neúspešných vyhľadávaní a najnižším priemerným časom vyhľadávania.",
+    "load_balancing_desc": "Dopytuje sa súčasne len jeden upstream server. AdGuard Home používa vážený náhodný algoritmus na výber serverov s najnižším počtom neúspešných vyhľadávaní a najnižším priemerným časom vyhľadávania.",
     "bootstrap_dns": "Bootstrap DNS servery",
     "bootstrap_dns_desc": "IP adresy serverov DNS používaných na rozlíšenie IP adries prekladačov DoH/DoT, ktoré zadáte ako upstream. Komentáre nie sú povolené.",
     "fallback_dns_title": "Záložné servery DNS",
@@ -294,9 +294,6 @@
     "blocked_response_ttl": "Blokovaná odozva TTL",
     "blocked_response_ttl_desc": "Určuje, na koľko sekúnd by mali klienti uložiť filtrovanú odozvu do vyrovnávacej pamäte",
     "form_enter_blocked_response_ttl": "Zadajte TTL blokovanej odozve (sekundy)",
-    "upstream_timeout": "Časový limit pre upstream",
-    "upstream_timeout_desc": "Určuje počet sekúnd čakania na odpoveď z upstream servera",
-    "form_enter_upstream_timeout": "Zadajte trvanie časového limitu upstream servera v sekundách",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -601,7 +598,7 @@
     "disable_ipv6": "Vypnúť rozlišovanie IPv6 adries",
     "disable_ipv6_desc": "Ignorovať všetky dotazy DNS na adresy IPv6 (typ AAAA) a odstrániť IPv6 údaje z HTTPS odpovedí.",
     "fastest_addr": "Najrýchlejšia IP adresa",
-    "fastest_addr_desc": "Čaká na odpovede od <b>všetkých</b> DNS serverov, zmeria rýchlosť pripojenia TCP pre každý server a vráti adresu IP servera s najväčšou rýchlosťou pripojenia.<br/>Tento režim môže výrazne spomaliť DNS dopyty, ak jeden alebo viac upstream serverov neodpovedá. Uistite sa, že Vaše upstream servery sú stabilné a upstream upstream je nízky.",
+    "fastest_addr_desc": "Dopytovať všetky servery DNS a vrátiť najrýchlejšiu IP adresu zo všetkých odpovedí. Toto spomalí DNS dopyty, pretože AdGuard Home musí čakať na odpovede zo všetkých serverov DNS, ale zlepší sa celkové pripojenie.",
     "autofix_warning_text": "Ak kliknete na „Opraviť“, AdGuardHome nakonfiguruje Váš systém tak, aby používal DNS server AdGuardHome.",
     "autofix_warning_list": "Bude vykonávať tieto úlohy: <0>Deaktivovať systém DNSStubListener</0> <0>Nastaviť adresu servera DNS na 127.0.0.1</0> <0>Nahradiť cieľový symbolický odkaz /etc/resolv.conf na /run/systemd/resolve/resolv.conf</0> <0>Zastaviť službu DNSStubListener (znova načítať službu systemd-resolved)</0>",
     "autofix_warning_result": "Výsledkom bude, že všetky DNS dopyty z Vášho systému budú štandardne spracované službou AdGuard Home.",

client/src/__locales/tr.json

@@ -40,11 +40,11 @@
     "dhcp_ipv4_settings": "DHCP IPv4 Ayarları",
     "dhcp_ipv6_settings": "DHCP IPv6 Ayarları",
     "form_error_required": "Gerekli alan",
-    "form_error_ip4_format": "IPv4 adresi geçersiz",
-    "form_error_ip4_gateway_format": "Ağ geçidi IPv4 adresi geçersiz",
-    "form_error_ip6_format": "IPv6 adresi geçersiz",
-    "form_error_ip_format": "IP adresi geçersiz",
-    "form_error_mac_format": "MAC adresi geçersiz",
+    "form_error_ip4_format": "Geçersiz IPv4 adresi",
+    "form_error_ip4_gateway_format": "Geçersiz ağ geçidi IPv4 adresi",
+    "form_error_ip6_format": "Geçersiz IPv6 adresi",
+    "form_error_ip_format": "Geçersiz IP adresi",
+    "form_error_mac_format": "Geçersiz MAC adresi",
     "form_error_client_id_format": "İstemci Kimliği yalnızca sayılar, küçük harfler ve kısa çizgiler içermelidir",
     "form_error_server_name": "Sunucu adı geçersiz",
     "form_error_subnet": "\"{{cidr}}\" alt ağı, \"{{ip}}\" IP adresini içermiyor",
@@ -68,7 +68,7 @@
     "ip": "IP",
     "dhcp_table_hostname": "Ana makine Adı",
     "dhcp_table_expires": "Bitiş tarihi",
-    "dhcp_warning": "DHCP sunucusunu yine de etkinleştirmek istiyorsanız, ağınızda başka bir aktif DHCP sunucusu olmadığından emin olun, aksi takdirde ağa bağlı cihazların internet bağlantısı kesilebilir!",
+    "dhcp_warning": "DHCP sunucusunu yine de etkinleştirmek istiyorsanız, ağınızda başka aktif DHCP sunucusu olmadığından emin olun, aksi takdirde ağa bağlı cihazların internet bağlantısı kesilebilir!",
     "dhcp_error": "AdGuard Home, ağda başka bir etkin DHCP sunucusu olup olmadığını belirleyemedi",
     "dhcp_static_ip_error": "DHCP sunucusunu kullanmak için sabit bir IP adresi ayarlanmalıdır. AdGuard Home, bu ağ arayüzünün sabit bir IP adresi kullanılarak yapılandırılıp yapılandırılmadığını belirleyemedi. Lütfen sabit IP adresini elle ayarlayın.",
     "dhcp_dynamic_ip_found": "Sisteminiz, <0>{{interfaceName}}</0> arayüzü için dinamik IP adresi yapılandırması kullanıyor. DHCP sunucusunu kullanmak için sabit bir IP adresi ayarlanmalıdır. Geçerli olan IP adresiniz <0>{{ipAddress}}</0>. \"DHCP sunucusunu etkinleştir\" düğmesine basarsanız, AdGuard Home bu IP adresini otomatik bir şekilde sabit olarak ayarlayacaktır.",
@@ -147,13 +147,13 @@
     "average_upstream_response_time": "Ortalama üst kaynak yanıt süresi",
     "response_time": "Yanıt süresi",
     "average_processing_time_hint": "Bir DNS isteğinin milisaniye cinsinden ortalama işlem süresi",
-    "block_domain_use_filters_and_hosts": "Filtre ve ana bilgisayar dosyalarını kullanarak alan adlarını engelle",
+    "block_domain_use_filters_and_hosts": "Filtre ve hosts dosyalarını kullanarak alan adlarını engelle",
     "filters_block_toggle_hint": "<a>Filtreler</a> ayarlarında engelleme kuralları oluşturabilirsiniz.",
     "use_adguard_browsing_sec": "AdGuard gezinti koruması web hizmetini kullan",
     "use_adguard_browsing_sec_hint": "AdGuard Home, alan adının gezinti koruması web hizmeti tarafından engellenip engellenmediğini kontrol eder. Kontrolü gerçekleştirmek için gizlilik dostu arama API'sini kullanır: sunucuya yalnızca SHA256 karma alan adının kısa bir ön eki gönderilir.",
     "use_adguard_parental": "AdGuard ebeveyn denetimi web hizmetini kullan",
     "use_adguard_parental_hint": "AdGuard Home, alan adının yetişkin içerik bulundurup bulundurmadığını kontrol eder. Gezinti koruması web hizmeti ile kullandığımız aynı gizlilik dostu API'yi kullanır.",
-    "enforce_safe_search": "Güvenli aramayı kullan",
+    "enforce_safe_search": "Güvenli Aramayı kullan",
     "enforce_save_search_hint": "AdGuard Home, şu arama motorlarında güvenli aramayı uygular: Google, YouTube, Bing, DuckDuckGo, Ecosia, Yandex, Pixabay.",
     "no_servers_specified": "Sunucu belirtilmedi",
     "general_settings": "Genel ayarlar",
@@ -294,9 +294,6 @@
     "blocked_response_ttl": "Engellenen yanıt kullanım süresi",
     "blocked_response_ttl_desc": "İstemcilerin filtrelenmiş bir yanıtı kaç saniye süreyle önbelleğe alması gerektiğini belirtir",
     "form_enter_blocked_response_ttl": "Engellenen yanıt kullanım süresini girin (saniye)",
-    "upstream_timeout": "Üst kaynak zaman aşımı",
-    "upstream_timeout_desc": "Üst kaynak sunucusundan yanıt almak için kaç saniye bekleneceğini belirtir",
-    "form_enter_upstream_timeout": "Üst kaynak sunucusu zaman aşımı süresini saniye cinsinden girin",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -311,7 +308,7 @@
     "form_enter_rate_limit": "Sıklık limitini girin",
     "rate_limit": "Sıklık limiti",
     "edns_enable": "EDNS istemci alt ağını etkinleştir",
-    "edns_cs_desc": "Üst sunucu isteklerine ECS (EDNS İstemci Alt Ağı) seçeneğini ekler ve istemciler tarafından gönderilen değerleri sorgu günlüğünde kaydeder.",
+    "edns_cs_desc": "Kaynak yönü isteklerine EDNS İstemci Alt Ağı seçeneğini (ECS) ekleyin ve istemciler tarafından gönderilen değerleri sorgu günlüğüne kaydedin.",
     "edns_use_custom_ip": "EDNS için özel IP kullan",
     "edns_use_custom_ip_desc": "EDNS için özel IP kullanımına izin ver",
     "rate_limit_desc": "İstemci başına izin verilen saniyedeki istek sayısı. 0 olarak ayarlamak, sınır olmadığı anlamına gelir.",
@@ -345,17 +342,17 @@
     "unknown_filter": "Bilinmeyen filtre {{filterId}}",
     "known_tracker": "Bilinen izleyici",
     "install_welcome_title": "AdGuard Home'a hoş geldiniz!",
-    "install_welcome_desc": "AdGuard Home, ağ genelinde reklam ve izleyici engelleyen bir DNS sunucusudur. Tüm ağınızı ve cihazlarınızı kontrol etmenizi sağlar ve istemci tarafında ek bir yazılım kullanmanıza gerek duymaz.",
+    "install_welcome_desc": "AdGuard Home, ağ genelinde reklamları ve izleyicileri engelleyen bir DNS sunucusudur. Tüm ağınızı ve tüm cihazlarınızı kontrol etmenizi sağlar, istemci tarafında herhangi bir program kullanmanıza gerek duymaz.",
     "install_settings_title": "Yönetici Web Arayüzü",
     "install_settings_listen": "Dinleme arayüzü",
     "install_settings_port": "Bağlantı noktası",
-    "install_settings_interface_link": "AdGuard Home yönetici web arayüzüne aşağıdaki adreslerden erişebilirsiniz:",
+    "install_settings_interface_link": "AdGuard Home yönetici web arayüzünüz aşağıdaki adreslerde bulunacaktır:",
     "form_error_port": "Geçerli bir bağlantı noktası değeri girin",
     "install_settings_dns": "DNS sunucusu",
-    "install_settings_dns_desc": "Cihazlarınızı veya yönlendiricinizi aşağıdaki adreslerdeki DNS sunucusunu kullanacak şekilde yapılandırmanız gerekir:",
+    "install_settings_dns_desc": "Aşağıdaki adreslerde DNS sunucusunu kullanmak için cihazlarınızı veya yönlendiricinizi yapılandırmanız gerekir:",
     "install_settings_all_interfaces": "Tüm arayüzler",
     "install_auth_title": "Kimlik Doğrulama",
-    "install_auth_desc": "AdGuard Home yönetici web arayüzüne parola ile kimlik doğrulama yapılandırılmalıdır. AdGuard Home yalnızca yerel ağınızdan erişilebilir olsa bile, yine de yetkisiz erişime karşı korunması önemlidir.",
+    "install_auth_desc": "AdGuard Home yönetim web arayüzü için şifre doğrulaması yapılandırılmalıdır. AdGuard Home'a yalnızca yerel ağınızdan erişilebilir olsa bile, onu sınırsız erişimden korumak yine de önemlidir.",
     "install_auth_username": "Kullanıcı adı",
     "install_auth_password": "Parola",
     "install_auth_confirm": "Parolayı onayla",
@@ -369,10 +366,10 @@
     "install_devices_router": "Yönlendirici",
     "install_devices_router_desc": "Bu kurulum, ev yönlendiricinize bağlı tüm cihazları otomatik olarak kapsar ve her birini elle yapılandırmanıza gerek yoktur.",
     "install_devices_address": "AdGuard Home DNS sunucusu aşağıdaki adresleri dinliyor",
-    "install_devices_router_list_1": "Yönlendiricinizin ayarlarına gidin. Genellikle, tarayıcınızdan http://192.168.0.1/ veya http://192.168.1.1/ gibi bir URL üzerinden erişebilirsiniz. Giriş yaparken bir parola girmeniz istenebilir. Parolanızı hatırlamıyorsanız, genellikle yönlendiricinin üzerindeki bir düğmeye basarak parolayı sıfırlayabilirsiniz, ancak bu işlemi seçerseniz yönlendiricinin tüm yapılandırmasını kaybedebileceğinizi unutmayın. Yönlendiricinizin kurulumu için bir uygulama gerekiyorsa, lütfen uygulamayı telefonunuza veya bilgisayarınıza yükleyin ve yönlendiricinin ayarlarına erişmek için bu uygulamayı kullanın.",
+    "install_devices_router_list_1": "Yönlendiricinizin ayarlarına gidin. Genellikle tarayıcınızdan http://192.168.0.1/ veya http://192.168.1.1/ gibi bir URL aracılığıyla erişebilirsiniz. Bir parola girmeniz istenebilir. Hatırlamıyorsanız, genellikle yönlendiricinin üzerindeki bir düğmeye basarak parolayı sıfırlayabilirsiniz, ancak bu işlemin seçilmesi durumunda yüksek ihtimalle tüm yönlendirici yapılandırmasını kaybedeceğinizi unutmayın. Yönlendiricinizin kurulumu için bir uygulama gerekiyorsa, lütfen uygulamayı telefonunuza veya PC'nize yükleyin ve yönlendiricinin ayarlarına erişmek için kullanın.",
     "install_devices_router_list_2": "DHCP/DNS ayarlarını bulun. DNS satırlarını arayın, genelde iki veya üç tanedir, üç rakam girilebilen dört ayrı grup içeren satırdır.",
     "install_devices_router_list_3": "AdGuard Home sunucu adreslerinizi oraya girin.",
-    "install_devices_router_list_4": "Bazı yönlendirici türlerinde özel bir DNS sunucusu yapılandırılamaz. Bu durumda, AdGuard Home'u bir <0>DHCP sunucusu</0> olarak yapılandırmak yardımcı olabilir. Aksi takdirde, yönlendirici modelinizde DNS sunucularını nasıl özelleştireceğinizi öğrenmek için yönlendirici kılavuzunu kontrol etmelisiniz.",
+    "install_devices_router_list_4": "Bazı yönlendirici türlerinde özel bir DNS sunucusu ayarlanamaz. Bu durumda, AdGuard Home'u <0>DHCP sunucusu</0> olarak ayarlamak yardımcı olabilir. Aksi takdirde, yönlendirici modeliniz için DNS sunucularını nasıl ayarlayacağınız konusunda yönlendirici kılavuzuna bakmalısınız.",
     "install_devices_windows_list_1": "Başlat menüsünden veya Windows araması aracılığıyla Denetim Masası'nı açın.",
     "install_devices_windows_list_2": "Ağ ve İnternet kategorisine girin ve ardından Ağ ve Paylaşım Merkezi'ne girin.",
     "install_devices_windows_list_3": "Sol panelde \"Bağdaştırıcı ayarlarını değiştirin\" öğesine tıklayın.",
@@ -392,7 +389,7 @@
     "install_devices_ios_list_2": "Sol menüde bulunan Wi-Fi bölümüne girin (telefon ağlar için özel DNS sunucusu ayarlanamaz).",
     "install_devices_ios_list_3": "O anda aktif olan ağın adına dokunun.",
     "install_devices_ios_list_4": "DNS alanına AdGuard Home sunucunuzun adreslerini girin.",
-    "get_started": "Başla",
+    "get_started": "Başlayın",
     "next": "Sonraki",
     "open_dashboard": "Panoyu Aç",
     "install_saved": "Başarıyla kaydedildi",
@@ -455,14 +452,14 @@
     "settings_global": "Genel",
     "settings_custom": "Özel",
     "table_client": "İstemci",
-    "table_name": "Ad",
+    "table_name": "AdAdı",
     "save_btn": "Kaydet",
     "client_add": "İstemci Ekle",
     "client_new": "Yeni İstemci",
     "client_edit": "İstemciyi Düzenle",
     "client_identifier": "Tanımlayıcı",
     "ip_address": "IP adresi",
-    "client_identifier_desc": "İstemciler, IP adresi, CIDR, MAC adresi veya ClientID (DoT/DoH/DoQ için kullanılabilir) ile tanımlanabilir. İstemcileri nasıl tanımlayacağınız hakkında daha fazla bilgiye <0>buradan</0> ulaşabilirsiniz.",
+    "client_identifier_desc": "İstemciler IP adresleri, CIDR, MAC adresleri veya ClientID (DoT/DoH/DoQ için kullanılabilir) ile tanımlanabilir. İstemcileri nasıl tanımlayacağınız hakkında daha fazla bilgiyi <0>buradan</0> edinebilirsiniz.",
     "form_enter_ip": "IP girin",
     "form_enter_subnet_ip": "\"{{cidr}}\" alt ağına bir IP adresi girin",
     "form_enter_mac": "MAC adresi girin",
@@ -479,7 +476,7 @@
     "client_confirm_delete": "\"{{key}}\" istemcisini silmek istediğinizden emin misiniz?",
     "list_confirm_delete": "Bu listeyi silmek istediğinizden emin misiniz?",
     "auto_clients_title": "Çalışma zamanı istemcileri",
-    "auto_clients_desc": "AdGuard Home'u kullanan veya kullanabilecek cihazların IP adresleri hakkında bilgiler. Bu bilgiler, ana bilgisayar dosyaları, ters DNS sorguları ve çeşitli diğer kaynaklardan toplanmaktadır.",
+    "auto_clients_desc": "AdGuard Home'u kullanan veya kullanabilecek cihazların IP adresleri hakkında bilgiler. Bu bilgiler, hosts dosyaları, ters DNS, vb. dâhil olmak üzere çeşitli kaynaklardan toplanır.",
     "access_title": "Erişim ayarları",
     "access_desc": "AdGuard Home DNS sunucusu için erişim kurallarını buradan yapılandırabilirsiniz",
     "access_allowed_title": "İzin verilen istemciler",
@@ -601,12 +598,12 @@
     "disable_ipv6": "IPv6 adreslerinin çözümlenmesini devre dışı bırak",
     "disable_ipv6_desc": "IPv6 adresleri için tüm DNS sorgularını bırakın (AAAA yazın) ve HTTPS yanıtlarından IPv6 ipuçlarını kaldırın.",
     "fastest_addr": "En hızlı IP adresi",
-    "fastest_addr_desc": "<b>Tüm</b> DNS sunucularından yanıt bekler, her sunucu için TCP bağlantı hızını ölçer ve en hızlı bağlantı hızına sahip sunucunun IP adresini döndürür.<br/>Bu yapılandırma, bir veya daha fazla üst kaynak sunucusu yanıt vermediğinde, DNS sorgularını önemli ölçüde yavaşlatabilir. Üst kaynak sunucularınızın kararlı olduğundan ve üst kaynak zaman aşım sürenizin düşük olduğundan emin olun.",
+    "fastest_addr_desc": "Tüm DNS sunucularını sorgulayın ve tüm yanıtlar arasından en hızlı olan IP adresini döndürün. AdGuard Home'un tüm DNS sunucularından yanıt beklemesi gerektiği için DNS sorgularını yavaşlatır, ancak genel bağlantıyı iyileştirir.",
     "autofix_warning_text": "\"Düzelt\" seçeneğine tıklarsanız, AdGuard Home, sisteminizi AdGuard Home DNS sunucusunu kullanacak şekilde yapılandırır.",
     "autofix_warning_list": "Bu görevleri gerçekleştirir: <0>Sistem DNSStubListener'ı devre dışı bırakın</0> <0>DNS sunucusu adresini 127.0.0.1 olarak ayarlayın</0> <0>/etc/resolv.conf'un sembolik bağlantı hedefini /run/systemd/resolve/resolv.conf ile değiştirin<0> <0>DNSStubListener'ı durdurun (systemd çözümlenmiş hizmeti yeniden yükleyin)</0>",
     "autofix_warning_result": "Sonuç olarak, sisteminizden gelen tüm DNS istekleri varsayılan olarak AdGuard Home tarafından işlenecektir.",
     "tags_title": "Etiketler",
-    "tags_desc": "İstemciyi tanımlayan etiketleri seçebilirsiniz. Filtreleme kurallarına etiketleri dahil ederek daha hassas bir şekilde uygulayabilirsiniz. <0>Daha fazla bilgi edinin</0>.",
+    "tags_desc": "İstemciye karşılık gelen etiketleri seçebilirsiniz. Etiketleri daha kesin olarak uygulamak için filtreleme kurallarına dâhil edin. <0>Daha fazla bilgi edinin</0>.",
     "form_select_tags": "İstemci etiketlerini seçin",
     "check_title": "Filtrelemeyi denetleyin",
     "check_desc": "Ana makine adının filtreleme durumunu kontrol edin.",
@@ -627,11 +624,11 @@
     "client_blocked": "\"{{ip}}\" istemcisi başarıyla engellendi",
     "client_unblocked": "\"{{ip}}\" istemcinin engellemesi başarıyla kaldırıldı",
     "static_ip": "Sabit IP adresi",
-    "static_ip_desc": "AdGuard Home bir sunucudur, bu nedenle düzgün çalışabilmesi için sabit bir IP adresine ihtiyaç duyar. Aksi takdirde, yönlendiriciniz bu cihaza farklı bir IP adresi atayabilir.",
+    "static_ip_desc": "AdGuard Home bir sunucudur, bu nedenle düzgün çalışması için sabit bir IP adresine ihtiyacı vardır. Aksi takdirde, yönlendiriciniz bir zaman sonra bu cihaza farklı bir IP adresi atayabilir.",
     "set_static_ip": "Sabit IP adresi ayarla",
     "install_static_ok": "Güzel haber! Sabit IP adresi zaten yapılandırılmış",
     "install_static_error": "AdGuard Home, bu ağ arayüzü için otomatik olarak yapılandıramıyor. Lütfen bunu elle nasıl yapacağınızla ilgili talimatlara bakın.",
-    "install_static_configure": "AdGuard Home, <0>{{ip}}</0> sabit IP adresinin kullanıldığını tespit etti. Sabit adresiniz olarak ayarlanmasını ister misiniz?",
+    "install_static_configure": "AdGuard Home, <0>{{ip}}</0> dinamik IP adresinin kullanıldığını tespit etti. Sabit adresiniz olarak ayarlanmasını ister misiniz?",
     "confirm_static_ip": "AdGuard Home, {{ip}} adresini sabit IP adresiniz olacak şekilde yapılandırır. Devam etmek istiyor musunuz?",
     "list_updated": "{{count}} liste güncellendi",
     "list_updated_plural": "{{count}} liste güncellendi",
@@ -710,8 +707,8 @@
     "custom_rotation_input": "Rotasyonu saat cinsinden girin",
     "protection_section_label": "Koruma",
     "log_and_stats_section_label": "Sorgu günlüğü ve istatistikler",
-    "ignore_query_log": "Sorgu günlüğünde bu istemciyi gösterme",
-    "ignore_statistics": "İstatistiklerde bu istemciyi gösterme",
+    "ignore_query_log": "Sorgu günlüğünde bu istemciyi yoksay",
+    "ignore_statistics": "İstatistiklerde bu istemciyi yoksay",
     "schedule_services": "Hizmet engellemeyi duraklat",
     "schedule_services_desc": "Hizmet engelleme filtresinin duraklatma planını yapılandırın",
     "schedule_services_desc_client": "Bu istemci için hizmet engelleme filtresinin duraklatma planını yapılandırın",
@@ -745,6 +742,6 @@
     "friday_short": "Cum",
     "saturday_short": "Cmt",
     "upstream_dns_cache_configuration": "Üst kaynak DNS önbellek yapılandırması",
-    "enable_upstream_dns_cache": "Bu istemcinin özel üst kaynak yapılandırması için DNS önbelleğini etkinleştir",
+    "enable_upstream_dns_cache": "Bu istemcinin özel üst kaynak yapılandırması için DNS önbelleğe almayı etkinleştir",
     "dns_cache_size": "DNS önbellek boyutu, bayt cinsinden"
 }

client/src/__locales/uk.json

@@ -20,7 +20,7 @@
     "resolve_clients_title": "Увімкнути зворотне вирішення IP-адрес клієнтів",
     "resolve_clients_desc": "Визначати доменні імена клієнтів за допомогою PTR-запитів до відповідних серверів — приватних DNS-серверів для локальних клієнтів та upstream-серверів для клієнтів з публічними IP-адресами.",
     "use_private_ptr_resolvers_title": "Використовувати приватні зворотні DNS-резолвери",
-    "use_private_ptr_resolvers_desc": "Розвʼязувати запити PTR, SOA та NS для доменів ARPA, що містять приватні IP-адреси, через приватні вихідні сервери, DHCP, /etc/hosts тощо. Якщо вимкнено, AdGuard Home відповідатиме на всі такі запити з NXDOMAIN.",
+    "use_private_ptr_resolvers_desc": "Надсилати зворотні DNS-запити до вказаних серверів для клієнтів, що обслуговуються локально. Якщо вимкнено, AdGuard Home буде відповідати NXDOMAIN на всі такі PTR-запити, окрім запитів про клієнтів, що уже відомі завдяки DHCP, /etc/hosts тощо.",
     "check_dhcp_servers": "Перевірити DHCP-сервери",
     "save_config": "Зберегти конфігурацію",
     "enabled_dhcp": "DHCP-сервер увімкнено",
@@ -343,10 +343,10 @@
     "known_tracker": "Відомі трекери",
     "install_welcome_title": "Вітаємо в AdGuard Home!",
     "install_welcome_desc": "AdGuard Home — це мережевий DNS-сервер, що блокує рекламу та відстеження. Його мета — надати вам контроль над усією мережею та всіма пристроями в ній без потреби використання програми на стороні клієнта.",
-    "install_settings_title": "Вебінтерфейс адміністратора",
+    "install_settings_title": "Веб-інтерфейс адміністратора",
     "install_settings_listen": "Мережевий інтерфейс",
     "install_settings_port": "Порт",
-    "install_settings_interface_link": "Вебінтерфейс адміністратора AdGuard Home буде доступний за такими адресами:",
+    "install_settings_interface_link": "Веб-інтерфейс адміністратора AdGuard Home буде доступний за такими адресами:",
     "form_error_port": "Уведіть правильне значення порту",
     "install_settings_dns": "DNS-сервер",
     "install_settings_dns_desc": "Вам потрібно буде налаштувати свої пристрої або маршрутизатор для використання DNS-сервера за такими адресами:",

client/src/__locales/zh-cn.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "使用并行请求以同时查询所有上游服务器来加快解析速度。",
     "parallel_requests": "并行请求",
     "load_balancing": "负载均衡",
-    "load_balancing_desc": "一次查询一台上游服务器。<br/>AdGuard Home 使用加权随机算法来选择具有最少失败查找和最低平均查找时间的服务器。",
+    "load_balancing_desc": "一次查询一台服务器。AdGuard Home 使用加权随机算法来选择具有最少失败查找和最低平均查找时间的服务器。",
     "bootstrap_dns": "Bootstrap DNS 服务器",
     "bootstrap_dns_desc": "DNS 服务器的 IP 地址，用于解析指定为上游的 DoH/DoT 解析器的 IP 地址。不允许添加注释。",
     "fallback_dns_title": "后备 DNS 服务器",
@@ -294,9 +294,6 @@
     "blocked_response_ttl": "屏蔽的 TTL 应答",
     "blocked_response_ttl_desc": "指定客户端应缓存已过滤响应的秒数",
     "form_enter_blocked_response_ttl": "输入拦截的 TTL 应答（秒）",
-    "upstream_timeout": "上游超时",
-    "upstream_timeout_desc": "指定等待上游服务器响应的秒数",
-    "form_enter_upstream_timeout": "输入上游服务器超时时间（以秒为单位）",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -601,7 +598,7 @@
     "disable_ipv6": "禁用 IPv6 地址的解析",
     "disable_ipv6_desc": "丢弃对 IPv6 地址（类型 AAAA）的所有 DNS 查询，并从 HTTPS 响应中删除 IPv6 相关的信息。",
     "fastest_addr": "最快的 IP 地址",
-    "fastest_addr_desc": "等待<b>所有</b> DNS 服务器的响应，测量每个服务器的 TCP 连接速度，并返回连接速度最快的服务器的 IP 地址。<br/>如果一个或多个上游服务器没有响应，此模式会显著减慢 DNS 查询速度。确保您的上游服务器稳定且上游超时时间短。",
+    "fastest_addr_desc": "查询所有 DNS 服务器并返回所有响应中速度最快的 IP 地址。因 AdGuard Home 必须等待全部 DNS 服务器响应，这会降低 DNS 查询的速度，但此举将会在总体上改善连接速度。",
     "autofix_warning_text": "若您单击「修复」，AdGuard Home 将会配置您的系统以使用 AdGuard Home 的 DNS 服务器。",
     "autofix_warning_list": "其将会进行如下工作：<0>停用系统DNSStubListener</0><0>设置DNS服务器地址为127.0.0.1</0><0>将/etc/resolv.conf的符号链接目标替换为/run/systemd/resolv/resolv.conf</0><0>停止DNSStubListener（重新加载系统解析服务）</0>",
     "autofix_warning_result": "因此，默认情况下所有来自系统的 DNS 请求都将由 AdGuard Home 处理。",

client/src/__locales/zh-tw.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "透過同時地查詢所有上游的伺服器，使用並行的查詢以加速解析。",
     "parallel_requests": "並行的請求",
     "load_balancing": "負載平衡",
-    "load_balancing_desc": "一次查詢一台上游伺服器。<br/>AdGuard Home 使用加權隨機演算法來選擇具有最少失敗查詢和最低平均查詢時間的伺服器。",
+    "load_balancing_desc": "一次查詢一台伺服器。AdGuard Home 使用加權隨機演算法來選擇具有最少失敗查詢和最低平均查詢時間的伺服器。",
     "bootstrap_dns": "自我啟動（Bootstrap）DNS 伺服器",
     "bootstrap_dns_desc": "DNS 伺服器的 IP 位址，用於解析您指定為上游伺服器的 DoH/DoT 解析器的 IP 位址。不允許註釋。",
     "fallback_dns_title": "應變 DNS 伺服器",
@@ -20,17 +20,17 @@
     "resolve_clients_title": "啟用用戶端的 IP 位址之反向的解析",
     "resolve_clients_desc": "透過傳送指標（PTR）查詢到對應的解析器（私人 DNS 伺服器供區域的用戶端，上游的伺服器供有公共 IP 位址的用戶端），反向地解析用戶端的 IP 位址變為它們的主機名稱。",
     "use_private_ptr_resolvers_title": "使用私人反向的 DNS 解析器",
-    "use_private_ptr_resolvers_desc": "使用私人上游伺服器、DHCP、/etc/hosts 等方式解析包含私人 IP 位址的 ARPA 網域的 PTR、SOA 和 NS 請求。如果停用，AdGuard Home 將對所有此類請求以 NXDOMAIN 回應。",
+    "use_private_ptr_resolvers_desc": "使用私人上游伺服器、DHCP、/etc/hosts 等方式解析包含私人 IP 位址的 ARPA 網域的 PTR、SOA 和 NS 請求。如果禁用，AdGuard Home 將對所有此類請求以 NXDOMAIN 回應。",
     "check_dhcp_servers": "檢查動態主機設定協定（DHCP）伺服器",
     "save_config": "儲存配置",
     "enabled_dhcp": "動態主機設定協定（DHCP）伺服器被啟用",
-    "disabled_dhcp": "DHCP 伺服器已停用",
+    "disabled_dhcp": "動態主機設定協定（DHCP）伺服器被禁用",
     "unavailable_dhcp": "DHCP 為不可用的",
     "unavailable_dhcp_desc": "AdGuard Home 無法於您的作業系統上執行 DHCP 伺服器",
     "dhcp_title": "動態主機設定協定（DHCP）伺服器（實驗性的！）",
     "dhcp_description": "如果您的路由器未提供動態主機設定協定（DHCP）設定，您可使用 AdGuard 自身內建的 DHCP 伺服器。",
     "dhcp_enable": "啟用動態主機設定協定（DHCP）伺服器",
-    "dhcp_disable": "停用 DHCP 伺服器",
+    "dhcp_disable": "禁用動態主機設定協定（DHCP）伺服器",
     "dhcp_not_found": "因為 AdGuard Home 於該網路上未發現任何現行的 DHCP 伺服器，啟用內建的動態主機設定協定（DHCP）伺服器為安全的。然而，您應手動地重新檢查那個，因為自動的探查目前不予 100％ 保證。",
     "dhcp_found": "於該網路上，一個現行的動態主機設定協定（DHCP）伺服器被發現。啟用內建的 DHCP 伺服器為不安全的。",
     "dhcp_leases": "動態主機設定協定（DHCP）租約",
@@ -294,9 +294,6 @@
     "blocked_response_ttl": "已封鎖的回應之存活時間（TTL）",
     "blocked_response_ttl_desc": "對用戶端應快取受過濾的回應，指定多少秒數",
     "form_enter_blocked_response_ttl": "請輸入已封鎖回應的存活時間（秒）",
-    "upstream_timeout": "上游超時",
-    "upstream_timeout_desc": "指定等待來自此上游伺服器回應的秒數",
-    "form_enter_upstream_timeout": "輸入上游伺服器超時時間（以秒為單位）",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -482,7 +479,7 @@
     "auto_clients_desc": "AdGuard Home 使用或可能使用的裝置的 IP 地址資訊。這些資訊來自多個來源，包括主機檔案、反向 DNS 等。",
     "access_title": "存取設定",
     "access_desc": "於此您可配置用於 AdGuard Home DNS 伺服器之存取規則",
-    "access_allowed_title": "被允許的用戶端",
+    "access_allowed_title": "已允許的用戶端",
     "access_allowed_desc": "無類別網域間路由（CIDRs）、IP 位址或<a>用戶端 IDs</a> 之清單。如果此清單有項目，AdGuard Home 將接受僅來自這些用戶端的請求。",
     "access_disallowed_title": "未被允許的用戶端",
     "access_disallowed_desc": "無類別網域間路由（CIDRs）、IP 位址或<a>用戶端 IDs</a> 之清單。如果此清單有項目，AdGuard Home 將排除來自這些用戶端的請求。如果在已允許的用戶端中有項目，此欄位被忽略。",
@@ -563,7 +560,7 @@
     "statistics_retention_confirm": "您確定您想要更改統計資料保留嗎？如果您減少該間隔值，某些資料將被丟失",
     "statistics_cleared": "統計資料被成功地清除",
     "statistics_enable": "啟用統計資料",
-    "ignore_domains": "被忽略的網域（被換行分隔）",
+    "ignore_domains": "忽略的網域（以換行符分隔）",
     "ignore_domains_title": "被忽略的網域",
     "ignore_domains_desc_stats": "符合這些規則的查詢不會被記錄在統計資料中",
     "ignore_domains_desc_query": "符合這些規則的查詢不會被寫入查詢記錄中",
@@ -601,7 +598,7 @@
     "disable_ipv6": "禁用 IPv6 位址之解析",
     "disable_ipv6_desc": "停止所有對於 IPv6 位址（類型 AAAA）的 DNS 查詢，並從 HTTPS 回應中移除 IPv6 的提示。",
     "fastest_addr": "最快的 IP 位址",
-    "fastest_addr_desc": "等待<b>所有</b> DNS 伺服器的回應，測量每個伺服器的 TCP 連線速度，並返回連線速度最快的伺服器的 IP 位址。<br/>如果一個或多個上游伺服器沒有回應，此模式會顯著減慢 DNS 查詢速度。確保您的上游伺服器穩定且上游超時時間短。",
+    "fastest_addr_desc": "查詢所有的 DNS 伺服器並返回在所有的回應之中最快的 IP 位址。因為 AdGuard Home 必須等待來自所有的 DNS 伺服器之回應，這使 DNS 查詢變慢，但改善總體的連線。",
     "autofix_warning_text": "如果您點擊\"修復\"，AdGuard Home 將配置您的系統使用 AdGuard Home DNS 伺服器。",
     "autofix_warning_list": "它將執行這些任務：<0>撤銷系統 DNSStubListener</0> <0>設定 DNS 伺服器位址為 127.0.0.1</0> <0>用 /run/systemd/resolve/resolv.conf 取代 /etc/resolv.conf 的符號連結目標</0> <0>停止 DNSStubListener（重新載入 systemd-resolved 服務）</0>",
     "autofix_warning_result": "因此，預設下，來自您的系統之所有的 DNS 請求將被 AdGuard Home 處理。",
@@ -640,7 +637,7 @@
     "validated_with_dnssec": "已用網域名稱系統安全性擴充功能（DNSSEC）驗證",
     "all_queries": "所有的查詢",
     "show_blocked_responses": "已封鎖的",
-    "show_whitelisted_responses": "被允許的",
+    "show_whitelisted_responses": "已允許的",
     "show_processed_responses": "已處理的",
     "blocked_safebrowsing": "被安全瀏覽封鎖",
     "blocked_adult_websites": "被家長控制封鎖",
@@ -676,8 +673,8 @@
     "click_to_view_queries": "點擊以檢視查詢",
     "port_53_faq_link": "連接埠 53 常被 \"DNSStubListener\" 或 \"systemd-resolved\" 服務佔用。請閱讀有關如何解決這個的<0>用法說明</0>。",
     "adg_will_drop_dns_queries": "AdGuard Home 將持續排除來自此用戶端之所有的 DNS 查詢。",
-    "filter_allowlist": "警告：此動作也將把 \"{{disallowed_rule}}\" 規則排除在被允許的用戶端的清單之外。",
-    "last_rule_in_allowlist": "因為排除 \"{{disallowed_rule}}\" 規則將禁用\"被允許的用戶端\"清單，無法不允許此用戶端。",
+    "filter_allowlist": "警告：此動作也將把 \"{{disallowed_rule}}\" 規則排除在已允許的用戶端的清單之外。",
+    "last_rule_in_allowlist": "因為排除 \"{{disallowed_rule}}\" 規則將禁用\"已允許的用戶端\"清單，無法不允許此用戶端。",
     "use_saved_key": "使用該先前已儲存的金鑰",
     "parental_control": "家長控制",
     "safe_browsing": "安全瀏覽",

client/src/__tests__/helpers.test.ts

@@ -1,5 +1,3 @@
-import { describe, expect, test, afterEach, vi, beforeEach, it } from 'vitest';
-
 import { sortIp, countClientsStatistics, findAddressType, subnetMaskToBitMask } from '../helpers/helpers';
 import { ADDRESS_TYPES } from '../helpers/constants';
 
@@ -261,7 +259,7 @@ describe('sortIp', () => {
         const originalWarn = console.warn;
 
         beforeEach(() => {
-            console.warn = vi.fn();
+            console.warn = jest.fn();
         });
 
         afterEach(() => {
@@ -349,15 +347,15 @@ describe('sortIp', () => {
 });
 
 describe('findAddressType', () => {
-    it('should return IP type for IP addresses', () => {
+    describe('ip', () => {
         expect(findAddressType('127.0.0.1')).toStrictEqual(ADDRESS_TYPES.IP);
     });
 
-    it('should return CIDR type for CIDR addresses', () => {
+    describe('cidr', () => {
         expect(findAddressType('127.0.0.1/8')).toStrictEqual(ADDRESS_TYPES.CIDR);
     });
 
-    it('should return UNKNOWN type for MAC addresses', () => {
+    describe('mac', () => {
         expect(findAddressType('00:1B:44:11:3A:B7')).toStrictEqual(ADDRESS_TYPES.UNKNOWN);
     });
 });

client/src/actions/index.tsx

@@ -19,6 +19,7 @@ import {
     CHECK_TIMEOUT,
     STATUS_RESPONSE,
     SETTINGS_NAMES,
+    FORM_NAME,
     MANUAL_UPDATE_LINK,
     DISABLE_PROTECTION_TIMINGS,
 } from '../helpers/constants';
@@ -423,9 +424,10 @@ export const testUpstream =
         }
     };
 
-export const testUpstreamWithFormValues = (formValues: any) => async (dispatch: any, getState: any) => {
+export const testUpstreamWithFormValues = () => async (dispatch: any, getState: any) => {
     const { upstream_dns_file } = getState().dnsConfig;
-    const { bootstrap_dns, upstream_dns, local_ptr_upstreams, fallback_dns } = formValues;
+    const { bootstrap_dns, upstream_dns, local_ptr_upstreams, fallback_dns } =
+        getState().form[FORM_NAME.UPSTREAM].values;
 
     return dispatch(
         testUpstream(
@@ -510,15 +512,16 @@ export const findActiveDhcpRequest = createAction('FIND_ACTIVE_DHCP_REQUEST');
 export const findActiveDhcpSuccess = createAction('FIND_ACTIVE_DHCP_SUCCESS');
 export const findActiveDhcpFailure = createAction('FIND_ACTIVE_DHCP_FAILURE');
 
-export const findActiveDhcp = (selectedInterface: any) => async (dispatch: any, getState: any) => {
+export const findActiveDhcp = (name: any) => async (dispatch: any, getState: any) => {
     dispatch(findActiveDhcpRequest());
     try {
         const req = {
-            interface: selectedInterface,
+            interface: name,
         };
         const activeDhcp = await apiClient.findActiveDhcp(req);
         dispatch(findActiveDhcpSuccess(activeDhcp));
         const { check, interface_name, interfaces } = getState().dhcp;
+        const selectedInterface = getState().form[FORM_NAME.DHCP_INTERFACES].values.interface_name;
         const v4 = check?.v4 ?? { static_ip: {}, other_server: {} };
         const v6 = check?.v6 ?? { other_server: {} };
 

client/src/actions/install.ts

@@ -27,8 +27,7 @@ export const setAllSettingsSuccess = createAction('SET_ALL_SETTINGS_SUCCESS');
 export const setAllSettings = (values: any) => async (dispatch: any) => {
     dispatch(setAllSettingsRequest());
     try {
-        const config = { ...values };
-        delete config.confirm_password;
+        const { confirm_password, ...config } = values;
 
         await apiClient.setAllSettings(config);
         dispatch(setAllSettingsSuccess());
@@ -49,11 +48,7 @@ export const checkConfig = (values: any) => async (dispatch: any) => {
     dispatch(checkConfigRequest());
     try {
         const check = await apiClient.checkConfig(values);
-        dispatch(checkConfigSuccess({
-            web: { ...values.web, ...check.web },
-            dns: { ...values.dns, ...check.dns },
-            static_ip: check.static_ip,
-        }));
+        dispatch(checkConfigSuccess(check));
     } catch (error) {
         dispatch(addErrorToast({ error }));
         dispatch(checkConfigFailure());

client/src/actions/queryLogs.ts

@@ -3,9 +3,8 @@ import { createAction } from 'redux-actions';
 import apiClient from '../api/Api';
 
 import { normalizeLogs } from '../helpers/helpers';
-import { DEFAULT_LOGS_FILTER, QUERY_LOGS_PAGE_LIMIT } from '../helpers/constants';
+import { DEFAULT_LOGS_FILTER, FORM_NAME, QUERY_LOGS_PAGE_LIMIT } from '../helpers/constants';
 import { addErrorToast, addSuccessToast } from './toasts';
-import { SearchFormValues } from '../components/Logs';
 
 const getLogsWithParams = async (config: any) => {
     const { older_than, filter, ...values } = config;
@@ -28,10 +27,12 @@ export const getAdditionalLogsRequest = createAction('GET_ADDITIONAL_LOGS_REQUES
 export const getAdditionalLogsFailure = createAction('GET_ADDITIONAL_LOGS_FAILURE');
 export const getAdditionalLogsSuccess = createAction('GET_ADDITIONAL_LOGS_SUCCESS');
 
-const shortPollQueryLogs = async (data: any, filter: any, dispatch: any, currentQuery?: string, total?: any) => {
+const shortPollQueryLogs = async (data: any, filter: any, dispatch: any, getState: any, total?: any) => {
     const { logs, oldest } = data;
     const totalData = total || { logs };
 
+    const queryForm = getState().form[FORM_NAME.LOGS_FILTER];
+    const currentQuery = queryForm && queryForm.values.search;
     const previousQuery = filter?.search;
     const isQueryTheSame =
         typeof previousQuery === 'string' && typeof currentQuery === 'string' && previousQuery === currentQuery;
@@ -50,7 +51,7 @@ const shortPollQueryLogs = async (data: any, filter: any, dispatch: any, current
                 filter,
             });
             if (additionalLogs.oldest.length > 0) {
-                return await shortPollQueryLogs(additionalLogs, filter, dispatch, currentQuery, {
+                return await shortPollQueryLogs(additionalLogs, filter, dispatch, getState, {
                     logs: [...totalData.logs, ...additionalLogs.logs],
                     oldest: additionalLogs.oldest,
                 });
@@ -90,18 +91,17 @@ export const updateLogs = () => async (dispatch: any, getState: any) => {
     }
 };
 
-export const getLogs = (currentQuery?: string) => async (dispatch: any, getState: any) => {
+export const getLogs = () => async (dispatch: any, getState: any) => {
     dispatch(getLogsRequest());
     try {
         const { isFiltered, filter, oldest } = getState().queryLogs;
-
         const data = await getLogsWithParams({
             older_than: oldest,
             filter,
         });
 
         if (isFiltered) {
-            const additionalData = await shortPollQueryLogs(data, filter, dispatch, currentQuery);
+            const additionalData = await shortPollQueryLogs(data, filter, dispatch, getState);
             const updatedData = additionalData.logs ? { ...data, ...additionalData } : data;
             dispatch(getLogsSuccess(updatedData));
         } else {
@@ -122,13 +122,13 @@ export const setLogsFilterRequest = createAction('SET_LOGS_FILTER_REQUEST');
  * @param {string} filter.response_status 'QUERY' field of RESPONSE_FILTER object
  * @returns function
  */
-export const setLogsFilter = (filter: SearchFormValues) => setLogsFilterRequest(filter);
+export const setLogsFilter = (filter: any) => setLogsFilterRequest(filter);
 
 export const setFilteredLogsRequest = createAction('SET_FILTERED_LOGS_REQUEST');
 export const setFilteredLogsFailure = createAction('SET_FILTERED_LOGS_FAILURE');
 export const setFilteredLogsSuccess = createAction('SET_FILTERED_LOGS_SUCCESS');
 
-export const setFilteredLogs = (filter?: SearchFormValues) => async (dispatch: any) => {
+export const setFilteredLogs = (filter?: any) => async (dispatch: any, getState: any) => {
     dispatch(setFilteredLogsRequest());
     try {
         const data = await getLogsWithParams({
@@ -136,9 +136,7 @@ export const setFilteredLogs = (filter?: SearchFormValues) => async (dispatch: a
             filter,
         });
 
-        const currentQuery = filter?.search;
-
-        const additionalData = await shortPollQueryLogs(data, filter, dispatch, currentQuery);
+        const additionalData = await shortPollQueryLogs(data, filter, dispatch, getState);
         const updatedData = additionalData.logs ? { ...data, ...additionalData } : data;
 
         dispatch(

client/src/actions/stats.ts

@@ -46,7 +46,7 @@ export const getStats = () => async (dispatch: any) => {
         const normalizedTopClients = normalizeTopStats(stats.top_clients);
 
         const clientsParams = getParamsForClientsSearch(normalizedTopClients, 'name');
-        const clients = await apiClient.searchClients(clientsParams);
+        const clients = await apiClient.findClients(clientsParams);
         const topClientsWithInfo = addClientInfo(normalizedTopClients, clients, 'name');
 
         const normalizedStats = {

client/src/api/Api.ts

@@ -415,7 +415,7 @@ class Api {
     // Per-client settings
     GET_CLIENTS = { path: 'clients', method: 'GET' };
 
-    SEARCH_CLIENTS = { path: 'clients/search', method: 'POST' };
+    FIND_CLIENTS = { path: 'clients/find', method: 'GET' };
 
     ADD_CLIENT = { path: 'clients/add', method: 'POST' };
 
@@ -453,12 +453,11 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    searchClients(config: any) {
-        const { path, method } = this.SEARCH_CLIENTS;
-        const parameters = {
-            data: config,
-        };
-        return this.makeRequest(path, method, parameters);
+    findClients(params: any) {
+        const { path, method } = this.FIND_CLIENTS;
+        const url = getPathWithQueryString(path, params);
+
+        return this.makeRequest(url, method);
     }
 
     // DNS access settings

client/src/components/Dashboard/Counters.tsx

@@ -23,7 +23,7 @@ interface RowProps {
 
 const Row = ({ label, count, response_status, tooltipTitle, translationComponents }: RowProps) => {
     const content = response_status ? (
-        <LogsSearchLink response_status={response_status}>{count}</LogsSearchLink>
+        <LogsSearchLink response_status={response_status}>{formatNumber(count)}</LogsSearchLink>
     ) : (
         count
     );
@@ -77,16 +77,16 @@ const Counters = ({ refreshButton, subtitle }: CountersProps) => {
             ? t('number_of_dns_query_hours', { count: msToHours(interval) })
             : t('number_of_dns_query_days', { count: msToDays(interval) });
 
-    const rows: RowProps[] = [
+    const rows = [
         {
             label: 'dns_query',
-            count: formatNumber(numDnsQueries),
+            count: numDnsQueries.toString(),
             tooltipTitle: dnsQueryTooltip,
             response_status: RESPONSE_FILTER.ALL.QUERY,
         },
         {
             label: 'blocked_by',
-            count: formatNumber(numBlockedFiltering),
+            count: numBlockedFiltering.toString(),
             tooltipTitle: 'number_of_dns_query_blocked_24_hours',
             response_status: RESPONSE_FILTER.BLOCKED.QUERY,
 
@@ -98,19 +98,19 @@ const Counters = ({ refreshButton, subtitle }: CountersProps) => {
         },
         {
             label: 'stats_malware_phishing',
-            count: formatNumber(numReplacedSafebrowsing),
+            count: numReplacedSafebrowsing.toString(),
             tooltipTitle: 'number_of_dns_query_blocked_24_hours_by_sec',
             response_status: RESPONSE_FILTER.BLOCKED_THREATS.QUERY,
         },
         {
             label: 'stats_adult',
-            count: formatNumber(numReplacedParental),
+            count: numReplacedParental.toString(),
             tooltipTitle: 'number_of_dns_query_blocked_24_hours_adult',
             response_status: RESPONSE_FILTER.BLOCKED_ADULT_WEBSITES.QUERY,
         },
         {
             label: 'enforced_save_search',
-            count: formatNumber(numReplacedSafesearch),
+            count: numReplacedSafesearch.toString(),
             tooltipTitle: 'number_of_dns_query_to_safe_search',
             response_status: RESPONSE_FILTER.SAFE_SEARCH.QUERY,
         },

client/src/components/Dashboard/UpstreamAvgTime.tsx

@@ -10,7 +10,6 @@ import Card from '../ui/Card';
 
 import DomainCell from './DomainCell';
 import { DASHBOARD_TABLES_DEFAULT_PAGE_SIZE, TABLES_MIN_ROWS } from '../../helpers/constants';
-import { formatNumber } from '../../helpers/helpers';
 
 interface TimeCellProps {
     value?: string | number;
@@ -21,7 +20,7 @@ const TimeCell = ({ value }: TimeCellProps) => {
         return '–';
     }
 
-    const valueInMilliseconds = formatNumber(round(Number(value) * 1000));
+    const valueInMilliseconds = round(Number(value) * 1000);
 
     return (
         <div className="logs__row o-hidden">

client/src/components/Dashboard/index.tsx

@@ -154,7 +154,7 @@ const Dashboard = ({
                         }}
                         disabled={processingProtection}>
                         {protectionDisabledDuration
-                            ? `${t('enable_protection_timer', { time: getRemaningTimeText(protectionDisabledDuration) })}`
+                            ? `${t('enable_protection_timer')} ${getRemaningTimeText(protectionDisabledDuration)}`
                             : getProtectionBtnText(protectionEnabled)}
                     </button>
 

client/src/components/Filters/Check/index.tsx

@@ -1,112 +1,62 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
+
+import { Field, reduxForm } from 'redux-form';
 import { useSelector } from 'react-redux';
-import { Controller, useForm } from 'react-hook-form';
 
 import Card from '../../ui/Card';
+
+import { renderInputField } from '../../../helpers/form';
+
 import Info from './Info';
-
+import { FORM_NAME } from '../../../helpers/constants';
 import { RootState } from '../../../initialState';
-import { validateRequiredValue } from '../../../helpers/validators';
-import { Input } from '../../ui/Controls/Input';
-import { DNS_RECORD_TYPES } from '../../../helpers/constants';
-import { Select } from '../../ui/Controls/Select';
 
-export type FilteringCheckFormValues = {
-    name: string;
-    client_id?: string;
-    dns_record_type?: string;
+interface CheckProps {
+    handleSubmit: (...args: unknown[]) => string;
+    pristine: boolean;
+    invalid: boolean;
 }
 
-type Props = {
-    onSubmit?: (data: FilteringCheckFormValues) => void;
-};
+const Check = (props: CheckProps) => {
+    const { pristine, invalid, handleSubmit } = props;
 
-const Check = ({ onSubmit }: Props) => {
     const { t } = useTranslation();
 
     const processingCheck = useSelector((state: RootState) => state.filtering.processingCheck);
-    const hostname = useSelector((state: RootState) => state.filtering.check.hostname);
 
-    const {
-        control,
-        handleSubmit,
-        formState: { isValid },
-    } = useForm<FilteringCheckFormValues>({
-        mode: 'onBlur',
-        defaultValues: {
-            name: '',
-            client_id: '',
-            dns_record_type: DNS_RECORD_TYPES[0],
-        },
-    });
+    const hostname = useSelector((state: RootState) => state.filtering.check.hostname);
 
     return (
         <Card title={t('check_title')} subtitle={t('check_desc')}>
-            <form onSubmit={handleSubmit(onSubmit)}>
+            <form onSubmit={handleSubmit}>
                 <div className="row">
                     <div className="col-12 col-md-6">
-                        <Controller
-                            name="name"
-                            control={control}
-                            rules={{ validate: validateRequiredValue }}
-                            render={({ field, fieldState }) => (
-                                <Input
-                                    {...field}
-                                    type="text"
-                                    label={t('check_hostname')}
-                                    data-testid="check_domain_name"
-                                    placeholder="example.com"
-                                    error={fieldState.error?.message}
-                                />
-                            )}
-                        />
+                        <div className="input-group">
+                            <Field
+                                id="name"
+                                name="name"
+                                component={renderInputField}
+                                type="text"
+                                className="form-control"
+                                placeholder={t('form_enter_host')}
+                            />
 
-                        <Controller
-                            name="client_id"
-                            control={control}
-                            render={({ field, fieldState }) => (
-                                <Input
-                                    {...field}
-                                    type="text"
-                                    data-testid="check_client_id"
-                                    label={t('check_client_id')}
-                                    placeholder={t('check_enter_client_id')}
-                                    error={fieldState.error?.message}
-                                />
-                            )}
-                        />
-
-                        <Controller
-                            name="dns_record_type"
-                            control={control}
-                            render={({ field }) => (
-                                <Select
-                                    {...field}
-                                    label={t('check_dns_record')}
-                                    data-testid="check_dns_record_type"
-                                >
-                                    {DNS_RECORD_TYPES.map((type) => (
-                                        <option key={type} value={type}>
-                                            {type}
-                                        </option>
-                                    ))}
-                                </Select>
-                            )}
-                        />
-
-                        <button
-                            className="btn btn-success btn-standard btn-large"
-                            type="submit"
-                            data-testid="check_domain_submit"
-                            disabled={!isValid || processingCheck}
-                        >
-                            {t('check')}
-                        </button>
+                            <span className="input-group-append">
+                                <button
+                                    className="btn btn-success btn-standard btn-large"
+                                    type="submit"
+                                    onClick={handleSubmit}
+                                    disabled={pristine || invalid || processingCheck}>
+                                    {t('check')}
+                                </button>
+                            </span>
+                        </div>
 
                         {hostname && (
                             <>
                                 <hr />
+
                                 <Info />
                             </>
                         )}
@@ -117,4 +67,4 @@ const Check = ({ onSubmit }: Props) => {
     );
 };
 
-export default Check;
+export default reduxForm({ form: FORM_NAME.DOMAIN_CHECK })(Check);

client/src/components/Filters/CustomRules.tsx

@@ -7,7 +7,7 @@ import PageTitle from '../ui/PageTitle';
 
 import Examples from './Examples';
 
-import Check, { FilteringCheckFormValues } from './Check';
+import Check from './Check';
 
 import { getTextareaCommentsHighlight, syncScroll } from '../../helpers/highlightTextareaComments';
 import { COMMENT_LINE_DEFAULT_TOKEN } from '../../helpers/constants';
@@ -48,7 +48,7 @@ class CustomRules extends Component<CustomRulesProps> {
         this.props.setRules(this.props.filtering.userRules);
     };
 
-    handleCheck = (values: FilteringCheckFormValues) => {
+    handleCheck = (values: any) => {
         this.props.checkHost(values);
     };
 

client/src/components/Filters/FiltersList.tsx

@@ -1,94 +0,0 @@
-import React from 'react';
-import classNames from 'classnames';
-import { Controller, useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
-import { Checkbox } from '../ui/Controls/Checkbox';
-
-const getIconsData = (homepage: string, source: string) => [
-    {
-        iconName: 'dashboard',
-        href: homepage,
-        className: 'ml-1',
-    },
-    {
-        iconName: 'info',
-        href: source,
-    },
-];
-
-const renderIcons = (iconsData: { iconName: string; href: string; className?: string }[]) =>
-    iconsData.map(({ iconName, href, className = '' }) => (
-        <a
-            key={iconName}
-            href={href}
-            target="_blank"
-            rel="noopener noreferrer"
-            className={classNames('d-flex align-items-center', className)}>
-            <svg className="icon icon--15 mr-1 icon--gray">
-                <use xlinkHref={`#${iconName}`} />
-            </svg>
-        </a>
-    ));
-
-type Filter = {
-    categoryId: string;
-    homepage: string;
-    source: string;
-    name: string;
-};
-
-type Category = {
-    name: string;
-    description: string;
-};
-
-type Props = {
-    categories: Record<string, Category>;
-    filters: Record<string, Filter>;
-    selectedSources: Record<string, boolean>;
-};
-
-export const FiltersList = ({ categories, filters, selectedSources }: Props) => {
-    const { t } = useTranslation();
-    const { control } = useFormContext();
-
-    return (
-        <>
-            {Object.entries(categories).map(([categoryId, category]) => {
-                const categoryFilters = Object.entries(filters)
-                    .filter(([, filter]) => filter.categoryId === categoryId)
-                    .map(([key, filter]) => ({ ...filter, id: key }));
-
-                return (
-                    <div key={category.name} className="modal-body__item">
-                        <h6 className="font-weight-bold mb-1">{t(category.name)}</h6>
-                        <p className="mb-3">{t(category.description)}</p>
-                        {categoryFilters.map((filter) => {
-                            const { homepage, source, name, id } = filter;
-                            const isSelected = selectedSources[source];
-                            const iconsData = getIconsData(homepage, source);
-
-                            return (
-                                <div key={name} className="d-flex align-items-center pb-1">
-                                    <Controller
-                                        name={id}
-                                        control={control}
-                                        render={({ field }) => (
-                                            <Checkbox
-                                                {...field}
-                                                data-testid={`filters_${id}`}
-                                                title={name}
-                                                disabled={isSelected}
-                                            />
-                                        )}
-                                    />
-                                    {renderIcons(iconsData)}
-                                </div>
-                            );
-                        })}
-                    </div>
-                );
-            })}
-        </>
-    );
-};

client/src/components/Filters/Form.tsx

@@ -1,152 +1,208 @@
 import React from 'react';
-import { useForm, Controller, FormProvider } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
+
+import { Field, reduxForm } from 'redux-form';
+import { withTranslation } from 'react-i18next';
+import flow from 'lodash/flow';
+import classNames from 'classnames';
 import { validatePath, validateRequiredValue } from '../../helpers/validators';
 
-import { MODAL_OPEN_TIMEOUT, MODAL_TYPE } from '../../helpers/constants';
+import { CheckboxField, renderInputField } from '../../helpers/form';
+import { MODAL_OPEN_TIMEOUT, MODAL_TYPE, FORM_NAME } from '../../helpers/constants';
 import filtersCatalog from '../../helpers/filters/filters';
-import { FiltersList } from './FiltersList';
-import { Input } from '../ui/Controls/Input';
 
-type FormValues = {
-    enabled: boolean;
-    name: string;
-    url: string;
-};
+const getIconsData = (homepage: any, source: any) => [
+    {
+        iconName: 'dashboard',
+        href: homepage,
+        className: 'ml-1',
+    },
+    {
+        iconName: 'info',
+        href: source,
+    },
+];
 
-const defaultValues: FormValues = {
-    enabled: true,
-    name: '',
-    url: '',
-};
+const renderIcons = (iconsData: any) =>
+    iconsData.map(({ iconName, href, className = '' }: any) => (
+        <a
+            key={iconName}
+            href={href}
+            target="_blank"
+            rel="noopener noreferrer"
+            className={classNames('d-flex align-items-center', className)}>
+            <svg className="icon icon--15 mr-1 icon--gray">
+                <use xlinkHref={`#${iconName}`} />
+            </svg>
+        </a>
+    ));
 
-type Props = {
-    closeModal: () => void;
-    onSubmit: (values: FormValues) => void;
+interface renderCheckboxFieldProps {
+    // https://redux-form.com/8.3.0/docs/api/field.md/#props
+    input: {
+        name: string;
+        value: string;
+        checked: boolean;
+        onChange: (...args: unknown[]) => unknown;
+    };
+    disabled: boolean;
+}
+
+const renderCheckboxField = (props: renderCheckboxFieldProps) => (
+    <CheckboxField
+        {...props}
+        meta={{ touched: false, error: null }}
+        input={{
+            ...props.input,
+            checked: props.disabled || props.input.checked,
+        }}
+    />
+);
+
+const renderFilters = ({ categories, filters }: any, selectedSources: any, t: any) =>
+    Object.keys(categories).map((categoryId) => {
+        const category = categories[categoryId];
+        const categoryFilters: any = [];
+        Object.keys(filters)
+            .sort()
+            .forEach((key) => {
+                const filter = filters[key];
+                filter.id = key;
+                if (filter.categoryId === categoryId) {
+                    categoryFilters.push(filter);
+                }
+            });
+
+        return (
+            <div key={category.name} className="modal-body__item">
+                <h6 className="font-weight-bold mb-1">{t(category.name)}</h6>
+
+                <p className="mb-3">{t(category.description)}</p>
+
+                {categoryFilters.map((filter) => {
+                    const { homepage, source, name } = filter;
+
+                    const isSelected = Object.prototype.hasOwnProperty.call(selectedSources, source);
+
+                    const iconsData = getIconsData(homepage, source);
+
+                    return (
+                        <div key={name} className="d-flex align-items-center pb-1">
+                            <Field
+                                name={filter.id}
+                                type="checkbox"
+                                component={renderCheckboxField}
+                                placeholder={t(name)}
+                                disabled={isSelected}
+                            />
+                            {renderIcons(iconsData)}
+                        </div>
+                    );
+                })}
+            </div>
+        );
+    });
+
+interface FormProps {
+    t: (...args: unknown[]) => string;
+    closeModal: (...args: unknown[]) => unknown;
+    handleSubmit: (...args: unknown[]) => string;
     processingAddFilter: boolean;
     processingConfigFilter: boolean;
     whitelist?: boolean;
     modalType: string;
-    toggleFilteringModal: ({ type }: { type?: keyof typeof MODAL_TYPE }) => void;
-    selectedSources?: Record<string, boolean>;
-    initialValues?: FormValues;
-};
+    toggleFilteringModal: (...args: unknown[]) => unknown;
+    selectedSources?: object;
+}
 
-export const Form = ({
-    closeModal,
-    processingAddFilter,
-    processingConfigFilter,
-    whitelist,
-    modalType,
-    toggleFilteringModal,
-    selectedSources,
-    onSubmit,
-    initialValues,
-}: Props) => {
-    const { t } = useTranslation();
+const Form = (props: FormProps) => {
+    const {
+        t,
+        closeModal,
+        handleSubmit,
+        processingAddFilter,
+        processingConfigFilter,
+        whitelist,
+        modalType,
+        toggleFilteringModal,
+        selectedSources,
+    } = props;
 
-    const methods = useForm({
-        defaultValues: {
-            ...defaultValues,
-            ...initialValues,
-        },
-        mode: 'onBlur',
-    });
-    const { handleSubmit, control } = methods;
-
-    const openModal = (modalType: keyof typeof MODAL_TYPE, timeout = MODAL_OPEN_TIMEOUT) => {
-        toggleFilteringModal(undefined);
+    const openModal = (modalType: any, timeout = MODAL_OPEN_TIMEOUT) => {
+        toggleFilteringModal();
         setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
     };
 
-    const openFilteringListModal = () => openModal('CHOOSE_FILTERING_LIST');
+    const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
 
-    const openAddFiltersModal = () => openModal('ADD_FILTERS');
+    const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
 
     return (
-        <FormProvider {...methods}>
-            <form onSubmit={handleSubmit(onSubmit)}>
-                <div className="modal-body modal-body--filters">
-                    {modalType === MODAL_TYPE.SELECT_MODAL_TYPE && (
-                        <div className="d-flex justify-content-around">
-                            <button
-                                onClick={openFilteringListModal}
-                                className="btn btn-success btn-standard mr-2 btn-large">
-                                {t('choose_from_list')}
-                            </button>
-
-                            <button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
-                                {t('add_custom_list')}
-                            </button>
-                        </div>
-                    )}
-                    {modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST && (
-                        <FiltersList
-                            categories={filtersCatalog.categories}
-                            filters={filtersCatalog.filters}
-                            selectedSources={selectedSources}
-                        />
-                    )}
-                    {modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST && modalType !== MODAL_TYPE.SELECT_MODAL_TYPE && (
-                        <>
-                            <div className="form__group">
-                                <Controller
-                                    name="name"
-                                    control={control}
-                                    render={({ field, fieldState }) => (
-                                        <Input
-                                            {...field}
-                                            type="text"
-                                            data-testid="filters_name"
-                                            placeholder={t('enter_name_hint')}
-                                            error={fieldState.error?.message}
-                                            trimOnBlur
-                                        />
-                                    )}
-                                />
-                            </div>
-
-                            <div className="form__group">
-                                <Controller
-                                    name="url"
-                                    control={control}
-                                    rules={{ validate: { validateRequiredValue, validatePath } }}
-                                    render={({ field, fieldState }) => (
-                                        <Input
-                                            {...field}
-                                            type="text"
-                                            data-testid="filters_url"
-                                            placeholder={t('enter_url_or_path_hint')}
-                                            error={fieldState.error?.message}
-                                            trimOnBlur
-                                        />
-                                    )}
-                                />
-                            </div>
-
-                            <div className="form__description">
-                                {whitelist ? t('enter_valid_allowlist') : t('enter_valid_blocklist')}
-                            </div>
-                        </>
-                    )}
-                </div>
-
-                <div className="modal-footer">
-                    <button type="button" className="btn btn-secondary" onClick={closeModal}>
-                        {t('cancel_btn')}
-                    </button>
-
-                    {modalType !== MODAL_TYPE.SELECT_MODAL_TYPE && (
+        <form onSubmit={handleSubmit}>
+            <div className="modal-body modal-body--filters">
+                {modalType === MODAL_TYPE.SELECT_MODAL_TYPE && (
+                    <div className="d-flex justify-content-around">
                         <button
-                            type="submit"
-                            data-testid="filters_save"
-                            className="btn btn-success"
-                            disabled={processingAddFilter || processingConfigFilter}>
-                            {t('save_btn')}
+                            onClick={openFilteringListModal}
+                            className="btn btn-success btn-standard mr-2 btn-large">
+                            {t('choose_from_list')}
                         </button>
-                    )}
-                </div>
-            </form>
-        </FormProvider>
+
+                        <button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
+                            {t('add_custom_list')}
+                        </button>
+                    </div>
+                )}
+                {modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST && renderFilters(filtersCatalog, selectedSources, t)}
+                {modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST && modalType !== MODAL_TYPE.SELECT_MODAL_TYPE && (
+                    <>
+                        <div className="form__group">
+                            <Field
+                                id="name"
+                                name="name"
+                                type="text"
+                                component={renderInputField}
+                                className="form-control"
+                                placeholder={t('enter_name_hint')}
+                                normalizeOnBlur={(data: any) => data.trim()}
+                            />
+                        </div>
+
+                        <div className="form__group">
+                            <Field
+                                id="url"
+                                name="url"
+                                type="text"
+                                component={renderInputField}
+                                className="form-control"
+                                placeholder={t('enter_url_or_path_hint')}
+                                validate={[validateRequiredValue, validatePath]}
+                                normalizeOnBlur={(data: any) => data.trim()}
+                            />
+                        </div>
+
+                        <div className="form__description">
+                            {whitelist ? t('enter_valid_allowlist') : t('enter_valid_blocklist')}
+                        </div>
+                    </>
+                )}
+            </div>
+
+            <div className="modal-footer">
+                <button type="button" className="btn btn-secondary" onClick={closeModal}>
+                    {t('cancel_btn')}
+                </button>
+
+                {modalType !== MODAL_TYPE.SELECT_MODAL_TYPE && (
+                    <button
+                        type="submit"
+                        className="btn btn-success"
+                        disabled={processingAddFilter || processingConfigFilter}>
+                        {t('save_btn')}
+                    </button>
+                )}
+            </div>
+        </form>
     );
 };
+
+export default flow([withTranslation(), reduxForm({ form: FORM_NAME.FILTER })])(Form);

client/src/components/Filters/Modal.tsx

@@ -5,7 +5,7 @@ import { withTranslation } from 'react-i18next';
 
 import { MODAL_TYPE } from '../../helpers/constants';
 
-import { Form } from './Form';
+import Form from './Form';
 import '../ui/Modal.css';
 
 import { getMap } from '../../helpers/helpers';
@@ -75,15 +75,25 @@ class Modal extends Component<ModalProps> {
     render() {
         const {
             isOpen,
+
             processingAddFilter,
+
             processingConfigFilter,
+
             handleSubmit,
+
             modalType,
+
             currentFilterData,
+
             whitelist,
+
             toggleFilteringModal,
+
             filters,
+
             t,
+
             filtersCatalog,
         } = this.props;
 

client/src/components/Filters/Rewrites/Form.tsx

@@ -1,69 +1,42 @@
 import React from 'react';
-import { Controller, useForm } from 'react-hook-form';
-import { Trans, useTranslation } from 'react-i18next';
 
+import { Field, reduxForm } from 'redux-form';
+import { Trans, withTranslation } from 'react-i18next';
+import flow from 'lodash/flow';
+
+import { renderInputField } from '../../../helpers/form';
 import { validateAnswer, validateDomain, validateRequiredValue } from '../../../helpers/validators';
-import { Input } from '../../ui/Controls/Input';
+import { FORM_NAME } from '../../../helpers/constants';
 
-interface RewriteFormValues {
-    domain: string;
-    answer: string;
+interface FormProps {
+    pristine: boolean;
+    handleSubmit: (...args: unknown[]) => string;
+    reset: (...args: unknown[]) => string;
+    toggleRewritesModal: (...args: unknown[]) => unknown;
+    submitting: boolean;
+    processingAdd: boolean;
+    t: (...args: unknown[]) => string;
+    initialValues?: object;
 }
 
-type Props = {
-    processingAdd: boolean;
-    currentRewrite?: RewriteFormValues;
-    toggleRewritesModal: () => void;
-    onSubmit?: (data: RewriteFormValues) => Promise<void> | void;
-};
-
-const Form = ({ processingAdd, currentRewrite, toggleRewritesModal, onSubmit }: Props) => {
-    const { t } = useTranslation();
-
-    const {
-        handleSubmit,
-        reset,
-        control,
-        formState: { isDirty, isSubmitting },
-    } = useForm<RewriteFormValues>({
-        mode: 'onBlur',
-        defaultValues: {
-            domain: currentRewrite?.domain || '',
-            answer: currentRewrite?.answer || '',
-        },
-    });
-
-    const handleFormSubmit = async (data: RewriteFormValues) => {
-        if (onSubmit) {
-            await onSubmit(data);
-        }
-    };
+const Form = (props: FormProps) => {
+    const { t, handleSubmit, reset, pristine, submitting, toggleRewritesModal, processingAdd } = props;
 
     return (
-        <form onSubmit={handleSubmit(handleFormSubmit)}>
+        <form onSubmit={handleSubmit}>
             <div className="modal-body">
                 <div className="form__desc form__desc--top">
                     <Trans>domain_desc</Trans>
                 </div>
                 <div className="form__group">
-                    <Controller
+                    <Field
+                        id="domain"
                         name="domain"
-                        control={control}
-                        rules={{
-                            validate: {
-                                validate: validateDomain,
-                                required: validateRequiredValue,
-                            },
-                        }}
-                        render={({ field, fieldState }) => (
-                            <Input
-                                {...field}
-                                type="text"
-                                data-testid="rewrites_domain"
-                                placeholder={t('form_domain')}
-                                error={fieldState.error?.message}
-                            />
-                        )}
+                        component={renderInputField}
+                        type="text"
+                        className="form-control"
+                        placeholder={t('form_domain')}
+                        validate={[validateRequiredValue, validateDomain]}
                     />
                 </div>
                 <Trans>examples_title</Trans>:
@@ -71,6 +44,7 @@ const Form = ({ processingAdd, currentRewrite, toggleRewritesModal, onSubmit }:
                     <li>
                         <code>example.org</code> – <Trans>example_rewrite_domain</Trans>
                     </li>
+
                     <li>
                         <code>*.example.org</code> –&nbsp;
                         <span>
@@ -79,24 +53,14 @@ const Form = ({ processingAdd, currentRewrite, toggleRewritesModal, onSubmit }:
                     </li>
                 </ol>
                 <div className="form__group">
-                    <Controller
+                    <Field
+                        id="answer"
                         name="answer"
-                        control={control}
-                        rules={{
-                            validate: {
-                                validate: validateAnswer,
-                                required: validateRequiredValue,
-                            },
-                        }}
-                        render={({ field, fieldState }) => (
-                            <Input
-                                {...field}
-                                type="text"
-                                data-testid="rewrites_answer"
-                                placeholder={t('form_answer')}
-                                error={fieldState.error?.message}
-                            />
-                        )}
+                        component={renderInputField}
+                        type="text"
+                        className="form-control"
+                        placeholder={t('form_answer')}
+                        validate={[validateRequiredValue, validateAnswer]}
                     />
                 </div>
             </div>
@@ -113,9 +77,8 @@ const Form = ({ processingAdd, currentRewrite, toggleRewritesModal, onSubmit }:
                 <div className="btn-list">
                     <button
                         type="button"
-                        data-testid="rewrites_cancel"
                         className="btn btn-secondary btn-standard"
-                        disabled={isSubmitting || processingAdd}
+                        disabled={submitting || processingAdd}
                         onClick={() => {
                             reset();
                             toggleRewritesModal();
@@ -125,9 +88,8 @@ const Form = ({ processingAdd, currentRewrite, toggleRewritesModal, onSubmit }:
 
                     <button
                         type="submit"
-                        data-testid="rewrites_save"
                         className="btn btn-success btn-standard"
-                        disabled={isSubmitting || !isDirty || processingAdd}>
+                        disabled={submitting || pristine || processingAdd}>
                         <Trans>save_btn</Trans>
                     </button>
                 </div>
@@ -136,4 +98,10 @@ const Form = ({ processingAdd, currentRewrite, toggleRewritesModal, onSubmit }:
     );
 };
 
-export default Form;
+export default flow([
+    withTranslation(),
+    reduxForm({
+        form: FORM_NAME.REWRITES,
+        enableReinitialize: true,
+    }),
+])(Form);

client/src/components/Filters/Rewrites/Modal.tsx

@@ -14,7 +14,7 @@ interface ModalProps {
     processingAdd: boolean;
     processingDelete: boolean;
     modalType: string;
-    currentRewrite?: { answer: string, domain: string; };
+    currentRewrite?: object;
 }
 
 const Modal = (props: ModalProps) => {
@@ -23,6 +23,7 @@ const Modal = (props: ModalProps) => {
         handleSubmit,
         toggleRewritesModal,
         processingAdd,
+        processingDelete,
         modalType,
         currentRewrite,
     } = props;
@@ -49,10 +50,11 @@ const Modal = (props: ModalProps) => {
                 </div>
 
                 <Form
+                    initialValues={{ ...currentRewrite }}
                     onSubmit={handleSubmit}
                     toggleRewritesModal={toggleRewritesModal}
                     processingAdd={processingAdd}
-                    currentRewrite={currentRewrite}
+                    processingDelete={processingDelete}
                 />
             </div>
         </ReactModal>

client/src/components/Filters/Services/Form.tsx

@@ -1,55 +1,38 @@
 import React from 'react';
 
-import { Trans } from 'react-i18next';
+import { Field, reduxForm } from 'redux-form';
+import { Trans, withTranslation } from 'react-i18next';
+import flow from 'lodash/flow';
 
-import { Controller, useForm } from 'react-hook-form';
+import { toggleAllServices } from '../../../helpers/helpers';
 
-import { ServiceField } from './ServiceField';
-
-export type BlockedService = {
-    id: string;
-    name: string;
-    icon_svg: string;
-};
-
-type FormValues = {
-    blocked_services: Record<string, boolean>;
-};
+import { renderServiceField } from '../../../helpers/form';
+import { FORM_NAME } from '../../../helpers/constants';
 
 interface FormProps {
-    initialValues: Record<string, boolean>;
-    blockedServices: BlockedService[];
-    onSubmit: (values: FormValues) => void;
+    blockedServices: unknown[];
+    pristine: boolean;
+    handleSubmit: (...args: unknown[]) => string;
+    change: (...args: unknown[]) => unknown;
+    submitting: boolean;
     processing: boolean;
     processingSet: boolean;
+    t: (...args: unknown[]) => string;
 }
 
-export const Form = ({ initialValues, blockedServices, processing, processingSet, onSubmit }: FormProps) => {
-    const {
-        handleSubmit,
-        control,
-        setValue,
-        formState: { isSubmitting },
-    } = useForm<FormValues>({
-        mode: 'onBlur',
-        defaultValues: initialValues,
-    });
-
-    const handleToggleAllServices = async (isSelected: boolean) => {
-        blockedServices.forEach((service: BlockedService) => setValue(`blocked_services.${service.id}`, isSelected));
-    };
+const Form = (props: FormProps) => {
+    const { blockedServices, handleSubmit, change, pristine, submitting, processing, processingSet } = props;
 
     return (
-        <form onSubmit={handleSubmit(onSubmit)}>
+        <form onSubmit={handleSubmit}>
             <div className="form__group">
                 <div className="row mb-4">
                     <div className="col-6">
                         <button
                             type="button"
-                            data-testid="blocked_services_block_all"
                             className="btn btn-secondary btn-block"
                             disabled={processing || processingSet}
-                            onClick={() => handleToggleAllServices(true)}>
+                            onClick={() => toggleAllServices(blockedServices, change, true)}>
                             <Trans>block_all</Trans>
                         </button>
                     </div>
@@ -57,30 +40,24 @@ export const Form = ({ initialValues, blockedServices, processing, processingSet
                     <div className="col-6">
                         <button
                             type="button"
-                            data-testid="blocked_services_unblock_all"
                             className="btn btn-secondary btn-block"
                             disabled={processing || processingSet}
-                            onClick={() => handleToggleAllServices(false)}>
+                            onClick={() => toggleAllServices(blockedServices, change, false)}>
                             <Trans>unblock_all</Trans>
                         </button>
                     </div>
                 </div>
 
                 <div className="services">
-                    {blockedServices.map((service: BlockedService) => (
-                        <Controller
+                    {blockedServices.map((service: any) => (
+                        <Field
                             key={service.id}
+                            icon={service.icon_svg}
                             name={`blocked_services.${service.id}`}
-                            control={control}
-                            render={({ field }) => (
-                                <ServiceField
-                                    {...field}
-                                    data-testid={`blocked_services_${service.id}`}
-                                    placeholder={service.name}
-                                    disabled={processing || processingSet}
-                                    icon={service.icon_svg}
-                                />
-                            )}
+                            type="checkbox"
+                            component={renderServiceField}
+                            placeholder={service.name}
+                            disabled={processing || processingSet}
                         />
                     ))}
                 </div>
@@ -89,12 +66,19 @@ export const Form = ({ initialValues, blockedServices, processing, processingSet
             <div className="btn-list">
                 <button
                     type="submit"
-                    data-testid="blocked_services_save"
                     className="btn btn-success btn-standard btn-large"
-                    disabled={isSubmitting || processing || processingSet}>
+                    disabled={submitting || pristine || processing || processingSet}>
                     <Trans>save_btn</Trans>
                 </button>
             </div>
         </form>
     );
 };
+
+export default flow([
+    withTranslation(),
+    reduxForm({
+        form: FORM_NAME.SERVICES,
+        enableReinitialize: true,
+    }),
+])(Form);

client/src/components/Filters/Services/ServiceField.tsx

@@ -1,42 +0,0 @@
-import React from 'react';
-import cn from 'classnames';
-import { FieldValues, ControllerRenderProps } from 'react-hook-form';
-
-type Props = ControllerRenderProps<FieldValues> & {
-    placeholder: string;
-    disabled?: boolean;
-    className?: string;
-    icon?: string;
-    error?: string;
-};
-
-export const ServiceField = React.forwardRef<HTMLInputElement, Props>(
-    ({ name, value, onChange, onBlur, placeholder, disabled, className, icon, error, ...rest }, ref) => (
-        <>
-            <label className={cn('service custom-switch', className)}>
-                <input
-                    name={name}
-                    type="checkbox"
-                    className="custom-switch-input"
-                    checked={!!value}
-                    onChange={onChange}
-                    onBlur={onBlur}
-                    ref={ref}
-                    disabled={disabled}
-                    {...rest}
-                />
-
-                <span className="service__switch custom-switch-indicator"></span>
-
-                <span className="service__text" title={placeholder}>
-                    {placeholder}
-                </span>
-                {icon && <div dangerouslySetInnerHTML={{ __html: window.atob(icon) }} className="service__icon" />}
-            </label>
-
-            {!disabled && error && <span className="form__message form__message--error">{error}</span>}
-        </>
-    ),
-);
-
-ServiceField.displayName = 'ServiceField';

client/src/components/Filters/Services/index.tsx

@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 
 import { useDispatch, useSelector } from 'react-redux';
 
-import { Form } from './Form';
+import Form from './Form';
 
 import Card from '../../ui/Card';
 import { getBlockedServices, getAllBlockedServices, updateBlockedServices } from '../../../actions/services';
@@ -86,8 +86,7 @@ const Services = () => {
             <Card
                 title={t('schedule_services')}
                 subtitle={t('schedule_services_desc')}
-                bodyType="card-body box-body--settings"
-            >
+                bodyType="card-body box-body--settings">
                 <ScheduleForm schedule={services.list.schedule} onScheduleSubmit={handleScheduleSubmit} />
             </Card>
         </>

client/src/components/Logs/Filters/Form.tsx

@@ -1,71 +1,158 @@
 import React, { useEffect } from 'react';
 
+import { Field, type InjectedFormProps, reduxForm } from 'redux-form';
 import { useTranslation } from 'react-i18next';
-import { useDispatch } from 'react-redux';
+import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 
 import { useHistory } from 'react-router-dom';
 import classNames from 'classnames';
-import { useFormContext } from 'react-hook-form';
 import {
     DEBOUNCE_FILTER_TIMEOUT,
     DEFAULT_LOGS_FILTER,
+    FORM_NAME,
     RESPONSE_FILTER,
     RESPONSE_FILTER_QUERIES,
 } from '../../../helpers/constants';
 import { setLogsFilter } from '../../../actions/queryLogs';
 import useDebounce from '../../../helpers/useDebounce';
 
-import { getLogsUrlParams } from '../../../helpers/helpers';
+import { createOnBlurHandler, getLogsUrlParams } from '../../../helpers/helpers';
 
-import { SearchField } from './SearchField';
-import { SearchFormValues } from '..';
+import Tooltip from '../../ui/Tooltip';
+import { RootState } from '../../../initialState';
 
-type Props = {
+interface renderFilterFieldProps {
+    input: {
+        value: string;
+    };
+    id: string;
+    onClearInputClick: (...args: unknown[]) => unknown;
     className?: string;
-    setIsLoading: (value: boolean) => void;
+    placeholder?: string;
+    type?: string;
+    disabled?: boolean;
+    autoComplete?: string;
+    tooltip?: string;
+    onKeyDown?: (...args: unknown[]) => unknown;
+    normalizeOnBlur?: (...args: unknown[]) => unknown;
+    meta: {
+        touched?: boolean;
+        error?: object;
+    };
+}
+
+const renderFilterField = ({
+    input,
+    id,
+    className,
+    placeholder,
+    type,
+    disabled,
+    autoComplete,
+    tooltip,
+    meta: { touched, error },
+    onClearInputClick,
+    onKeyDown,
+    normalizeOnBlur,
+}: renderFilterFieldProps) => {
+    const onBlur = (event: any) => createOnBlurHandler(event, input, normalizeOnBlur);
+
+    return (
+        <>
+            <div className="input-group-search input-group-search__icon--magnifier">
+                <svg className="icons icon--24 icon--gray">
+                    <use xlinkHref="#magnifier" />
+                </svg>
+            </div>
+
+            <input
+                {...input}
+                id={id}
+                placeholder={placeholder}
+                type={type}
+                className={className}
+                disabled={disabled}
+                autoComplete={autoComplete}
+                aria-label={placeholder}
+                onKeyDown={onKeyDown}
+                onBlur={onBlur}
+            />
+
+            <div
+                className={classNames('input-group-search input-group-search__icon--cross', {
+                    invisible: input.value.length < 1,
+                })}>
+                <svg className="icons icon--20 icon--gray" onClick={onClearInputClick}>
+                    <use xlinkHref="#cross" />
+                </svg>
+            </div>
+
+            <span className="input-group-search input-group-search__icon--tooltip">
+                <Tooltip content={tooltip} className="tooltip-container">
+                    <svg className="icons icon--20 icon--gray">
+                        <use xlinkHref="#question" />
+                    </svg>
+                </Tooltip>
+            </span>
+            {!disabled && touched && error && <span className="form__message form__message--error">{error}</span>}
+        </>
+    );
 };
 
-export const Form = ({ className, setIsLoading }: Props) => {
+const FORM_NAMES = {
+    search: 'search',
+    response_status: 'response_status',
+};
+
+type FiltersFormProps = {
+    className?: string;
+    responseStatusClass?: string;
+    setIsLoading: (...args: unknown[]) => unknown;
+};
+
+const Form = (props: FiltersFormProps & InjectedFormProps) => {
+    const { className = '', responseStatusClass, setIsLoading, change } = props;
+
     const { t } = useTranslation();
     const dispatch = useDispatch();
     const history = useHistory();
 
-    const { register, watch, setValue } = useFormContext<SearchFormValues>();
+    const { response_status, search } = useSelector(
+        (state: RootState) => state?.form[FORM_NAME.LOGS_FILTER].values,
+        shallowEqual,
+    );
 
-    const searchValue = watch('search');
-    const responseStatusValue = watch('response_status');
-
-    const [debouncedSearch, setDebouncedSearch] = useDebounce(searchValue.trim(), DEBOUNCE_FILTER_TIMEOUT);
+    const [debouncedSearch, setDebouncedSearch] = useDebounce(search.trim(), DEBOUNCE_FILTER_TIMEOUT);
 
     useEffect(() => {
         dispatch(
             setLogsFilter({
-                response_status: responseStatusValue,
+                response_status,
                 search: debouncedSearch,
             }),
         );
 
-        history.replace(`${getLogsUrlParams(debouncedSearch, responseStatusValue)}`);
-    }, [responseStatusValue, debouncedSearch]);
+        history.replace(`${getLogsUrlParams(debouncedSearch, response_status)}`);
+    }, [response_status, debouncedSearch]);
 
-    useEffect(() => {
-        if (responseStatusValue && !(responseStatusValue in RESPONSE_FILTER_QUERIES)) {
-            setValue('response_status', DEFAULT_LOGS_FILTER.response_status);
-        }
-    }, [responseStatusValue, setValue]);
+    if (response_status && !(response_status in RESPONSE_FILTER_QUERIES)) {
+        change(FORM_NAMES.response_status, DEFAULT_LOGS_FILTER[FORM_NAMES.response_status]);
+    }
 
     const onInputClear = async () => {
         setIsLoading(true);
-        setValue('search', DEFAULT_LOGS_FILTER.search);
+        change(FORM_NAMES.search, DEFAULT_LOGS_FILTER[FORM_NAMES.search]);
         setIsLoading(false);
     };
 
-    const onEnterPress = (e: React.KeyboardEvent<HTMLInputElement>) => {
+    const onEnterPress = (e: any) => {
         if (e.key === 'Enter') {
-            setDebouncedSearch(searchValue);
+            setDebouncedSearch(search);
         }
     };
 
+    const normalizeOnBlur = (data: any) => data.trim();
+
     return (
         <form
             className="d-flex flex-wrap form-control--container"
@@ -73,28 +160,40 @@ export const Form = ({ className, setIsLoading }: Props) => {
                 e.preventDefault();
             }}>
             <div className="field__search">
-                <SearchField
-                    value={searchValue}
-                    handleChange={(val) => setValue('search', val)}
-                    onKeyDown={onEnterPress}
-                    onClear={onInputClear}
+                <Field
+                    id={FORM_NAMES.search}
+                    name={FORM_NAMES.search}
+                    component={renderFilterField}
+                    type="text"
+                    className={classNames('form-control form-control--search form-control--transparent', className)}
                     placeholder={t('domain_or_client')}
                     tooltip={t('query_log_strict_search')}
-                    className={classNames('form-control form-control--search form-control--transparent', className)}
+                    onClearInputClick={onInputClear}
+                    onKeyDown={onEnterPress}
+                    normalizeOnBlur={normalizeOnBlur}
                 />
             </div>
 
             <div className="field__select">
-                <select
-                    {...register('response_status')}
-                    className="form-control custom-select custom-select--logs custom-select__arrow--left form-control--transparent d-sm-block">
+                <Field
+                    name={FORM_NAMES.response_status}
+                    component="select"
+                    className={classNames(
+                        'form-control custom-select custom-select--logs custom-select__arrow--left form-control--transparent',
+                        responseStatusClass,
+                    )}>
                     {Object.values(RESPONSE_FILTER).map(({ QUERY, LABEL, disabled }: any) => (
                         <option key={LABEL} value={QUERY} disabled={disabled}>
                             {t(LABEL)}
                         </option>
                     ))}
-                </select>
+                </Field>
             </div>
         </form>
     );
 };
+
+export const FiltersForm = reduxForm<Record<string, any>, FiltersFormProps>({
+    form: FORM_NAME.LOGS_FILTER,
+    enableReinitialize: true,
+})(Form);

client/src/components/Logs/Filters/SearchField.tsx

@@ -1,62 +0,0 @@
-import React, { ComponentProps } from 'react';
-import Tooltip from '../../ui/Tooltip';
-
-interface Props extends ComponentProps<'input'> {
-    handleChange: (newValue: string) => void;
-    onClear: () => void;
-    tooltip?: string;
-}
-
-export const SearchField = ({
-    handleChange,
-    onClear,
-    value,
-    tooltip,
-    className,
-    ...rest
-}: Props) => {
-    const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-        handleChange(e.target.value);
-    };
-
-    const handleBlur = (e: React.FocusEvent<HTMLInputElement>) => {
-        e.target.value = e.target.value.trim();
-        handleChange(e.target.value)
-    }
-
-    return (
-        <>
-            <div className="input-group-search input-group-search__icon--magnifier">
-                <svg className="icons icon--24 icon--gray">
-                    <use xlinkHref="#magnifier" />
-                </svg>
-            </div>
-            <input
-                className={className}
-                value={value}
-                onChange={handleInputChange}
-                onBlur={handleBlur}
-                {...rest}
-            />
-            {typeof value === 'string' && value.length > 0 && (
-                <div
-                    className="input-group-search input-group-search__icon--cross"
-                    onClick={onClear}
-                >
-                    <svg className="icons icon--20 icon--gray">
-                    <use xlinkHref="#cross" />
-                    </svg>
-                </div>
-            )}
-            {tooltip && (
-                <span className="input-group-search input-group-search__icon--tooltip">
-                    <Tooltip content={tooltip} className="tooltip-container">
-                        <svg className="icons icon--20 icon--gray">
-                            <use xlinkHref="#question" />
-                        </svg>
-                    </Tooltip>
-                </span>
-            )}
-        </>
-    );
-};

client/src/components/Logs/Filters/index.tsx

@@ -2,16 +2,17 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
 
-import { Form } from './Form';
+import { FiltersForm } from './Form';
 import { refreshFilteredLogs } from '../../../actions/queryLogs';
 import { addSuccessToast } from '../../../actions/toasts';
 
 interface FiltersProps {
+    filter: object;
     processingGetLogs: boolean;
     setIsLoading: (...args: unknown[]) => unknown;
 }
 
-const Filters = ({ setIsLoading }: FiltersProps) => {
+const Filters = ({ filter, setIsLoading }: FiltersProps) => {
     const { t } = useTranslation();
     const dispatch = useDispatch();
 
@@ -37,9 +38,7 @@ const Filters = ({ setIsLoading }: FiltersProps) => {
                     </svg>
                 </button>
             </h1>
-            <Form
-                setIsLoading={setIsLoading}
-            />
+            <FiltersForm responseStatusClass="d-sm-block" setIsLoading={setIsLoading} initialValues={filter} />
         </div>
     );
 };

client/src/components/Logs/InfiniteTable.tsx

@@ -18,7 +18,6 @@ interface InfiniteTableProps {
     isLoading: boolean;
     items: unknown[];
     isSmallScreen: boolean;
-    currentQuery: string;
     setDetailedDataCurrent: Dispatch<SetStateAction<any>>;
     setButtonType: (...args: unknown[]) => unknown;
     setModalOpened: (...args: unknown[]) => unknown;
@@ -28,7 +27,6 @@ const InfiniteTable = ({
     isLoading,
     items,
     isSmallScreen,
-    currentQuery,
     setDetailedDataCurrent,
     setButtonType,
     setModalOpened,
@@ -45,7 +43,7 @@ const InfiniteTable = ({
 
     const listener = useCallback(() => {
         if (!loadingRef.current && loader.current && isScrolledIntoView(loader.current)) {
-            dispatch(getLogs(currentQuery));
+            dispatch(getLogs());
         }
     }, []);
 

client/src/components/Logs/index.tsx

@@ -7,8 +7,7 @@ import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import queryString from 'query-string';
 import classNames from 'classnames';
-import { FormProvider, useForm } from 'react-hook-form';
-import { BLOCK_ACTIONS, DEFAULT_LOGS_FILTER, MEDIUM_SCREEN_SIZE } from '../../helpers/constants';
+import { BLOCK_ACTIONS, MEDIUM_SCREEN_SIZE } from '../../helpers/constants';
 
 import Loading from '../ui/Loading';
 
@@ -30,12 +29,7 @@ import { BUTTON_PREFIX } from './Cells/helpers';
 import AnonymizerNotification from './AnonymizerNotification';
 import { RootState } from '../../initialState';
 
-export type SearchFormValues = {
-    search: string;
-    response_status: string;
-};
-
-const processContent = (data: any, _buttonType: string) =>
+const processContent = (data: any, buttonType: string) =>
     Object.entries(data).map(([key, value]) => {
         if (!value) {
             return null;
@@ -82,6 +76,7 @@ const Logs = () => {
     const {
         enabled,
         processingGetConfig,
+        // processingAdditionalLogs,
         processingGetLogs,
         anonymize_client_ip: anonymizeClientIp,
     } = useSelector((state: RootState) => state.queryLogs, shallowEqual);
@@ -93,17 +88,6 @@ const Logs = () => {
     const search = search_url_param || filter?.search || '';
     const response_status = response_status_url_param || filter?.response_status || '';
 
-    const formMethods = useForm<SearchFormValues>({
-        mode: 'onBlur',
-        defaultValues: {
-            search: search || DEFAULT_LOGS_FILTER.search,
-            response_status: response_status || DEFAULT_LOGS_FILTER.response_status,
-        },
-    });
-
-    const { watch } = formMethods;
-    const currentQuery = watch('search');
-
     const [isSmallScreen, setIsSmallScreen] = useState(window.innerWidth <= MEDIUM_SCREEN_SIZE);
     const [detailedDataCurrent, setDetailedDataCurrent] = useState({});
     const [buttonType, setButtonType] = useState(BLOCK_ACTIONS.BLOCK);
@@ -190,12 +174,15 @@ const Logs = () => {
 
     const renderPage = () => (
         <>
-            <FormProvider {...formMethods}>
-                <Filters
-                    setIsLoading={setIsLoading}
-                    processingGetLogs={processingGetLogs}
-                />
-            </FormProvider>
+            <Filters
+                filter={{
+                    response_status,
+                    search,
+                }}
+                setIsLoading={setIsLoading}
+                processingGetLogs={processingGetLogs}
+                // processingAdditionalLogs={processingAdditionalLogs}
+            />
 
             <InfiniteTable
                 isLoading={isLoading}
@@ -204,7 +191,6 @@ const Logs = () => {
                 setDetailedDataCurrent={setDetailedDataCurrent}
                 setButtonType={setButtonType}
                 setModalOpened={setModalOpened}
-                currentQuery={currentQuery}
             />
 
             <Modal

client/src/components/Settings/Clients/AutoClients.tsx

@@ -12,7 +12,7 @@ import whoisCell from './whoisCell';
 
 import LogsSearchLink from '../../ui/LogsSearchLink';
 
-import { sortIp, formatNumber } from '../../../helpers/helpers';
+import { sortIp } from '../../../helpers/helpers';
 import { LocalStorageHelper, LOCAL_STORAGE_KEYS } from '../../../helpers/localStorageHelper';
 import { TABLES_MIN_ROWS } from '../../../helpers/constants';
 
@@ -66,7 +66,7 @@ class AutoClients extends Component<AutoClientsProps> {
                     return (
                         <div className="logs__row">
                             <div className="logs__text" title={clientStats}>
-                                <LogsSearchLink search={row.original.ip}>{formatNumber(clientStats)}</LogsSearchLink>
+                                <LogsSearchLink search={row.original.ip}>{clientStats}</LogsSearchLink>
                             </div>
                         </div>
                     );

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

@@ -12,7 +12,7 @@ import ReactTable from 'react-table';
 import { getAllBlockedServices, getBlockedServices } from '../../../../actions/services';
 
 import { initSettings } from '../../../../actions';
-import { splitByNewLine, countClientsStatistics, sortIp, getService, formatNumber } from '../../../../helpers/helpers';
+import { splitByNewLine, countClientsStatistics, sortIp, getService } from '../../../../helpers/helpers';
 import { MODAL_TYPE, LOCAL_TIMEZONE_VALUE, TABLES_MIN_ROWS } from '../../../../helpers/constants';
 
 import Card from '../../../ui/Card';
@@ -111,12 +111,6 @@ const ClientsTable = ({
                 config.tags = [];
             }
 
-            if (values.ids) {
-                config.ids = values.ids.map((id) => id.name);
-            } else {
-                config.ids = [];
-            }
-
             if (typeof values.upstreams_cache_size === 'string') {
                 config.upstreams_cache_size = 0;
             }
@@ -306,16 +300,13 @@ const ClientsTable = ({
             sortMethod: (a: any, b: any) => b - a,
             minWidth: 120,
             Cell: (row: any) => {
-                let content = row.value;
-                if (typeof content === "number") {
-                    content = formatNumber(content);
-                } else {
-                    content = CellWrap(row);
-                }
-                if (!content) {
+                const content = CellWrap(row);
+
+                if (!row.value) {
                     return content;
                 }
-                return <LogsSearchLink search={row.original.name}>{content}</LogsSearchLink>;
+
+                return <LogsSearchLink search={row.original.ids[0]}>{content}</LogsSearchLink>;
             },
         },
         {

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

@@ -0,0 +1,514 @@
+import React, { useState } from 'react';
+import { connect, useSelector } from 'react-redux';
+import { Field, FieldArray, reduxForm, formValueSelector, FormErrors } 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 { ScheduleForm } from '../../Filters/Services/ScheduleForm';
+import { toggleAllServices, trimLinesAndRemoveEmpty, captitalizeWords } from '../../../helpers/helpers';
+import {
+    toNumber,
+    renderInputField,
+    renderGroupField,
+    CheckboxField,
+    renderServiceField,
+    renderTextareaField,
+} from '../../../helpers/form';
+import { validateClientId, validateRequiredValue } from '../../../helpers/validators';
+import { CLIENT_ID_LINK, FORM_NAME, UINT32_RANGE } from '../../../helpers/constants';
+import './Service.css';
+import { RootState } from '../../../initialState';
+
+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',
+    },
+];
+
+const logAndStatsCheckboxes = [
+    {
+        name: 'ignore_querylog',
+        placeholder: 'ignore_query_log',
+    },
+    {
+        name: 'ignore_statistics',
+        placeholder: 'ignore_statistics',
+    },
+];
+const validate = (values: any): FormErrors<any, string> => {
+    const errors: {
+        name?: string;
+        ids?: string[];
+    } = {};
+    const { name, ids } = values;
+
+    errors.name = validateRequiredValue(name);
+
+    if (ids && ids.length) {
+        const idArrayErrors: any = [];
+        ids.forEach((id: any, idx: any) => {
+            idArrayErrors[idx] = validateRequiredValue(id) || validateClientId(id);
+        });
+
+        if (idArrayErrors.length) {
+            errors.ids = idArrayErrors;
+        }
+    }
+    // @ts-expect-error FIXME: ts migration
+    return errors;
+};
+
+const renderFieldsWrapper = (placeholder: any, buttonTitle: any) =>
+    function cell(row: any) {
+        const { fields } = row;
+        return (
+            <div className="form__group">
+                {fields.map((ip: any, index: any) => (
+                    <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: any) => 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'));
+
+interface renderMultiselectProps {
+    input: {
+        name: string;
+        value: string;
+        checked: boolean;
+        onChange: (...args: unknown[]) => unknown;
+        onBlur: (...args: unknown[]) => unknown;
+    };
+    placeholder?: string;
+    options?: unknown[];
+}
+
+const renderMultiselect = (props: renderMultiselectProps) => {
+    const { input, placeholder, options } = props;
+
+    return (
+        <Select
+            {...input}
+            options={options}
+            className="basic-multi-select"
+            classNamePrefix="select"
+            onChange={(value: any) => input.onChange(value)}
+            onBlur={() => input.onBlur(input.value)}
+            placeholder={placeholder}
+            blurInputOnSelect={false}
+            isMulti
+        />
+    );
+};
+
+interface FormProps {
+    pristine: boolean;
+    handleSubmit: (...args: unknown[]) => string;
+    reset: (...args: unknown[]) => string;
+    change: (...args: unknown[]) => unknown;
+    submitting: boolean;
+    handleClose: (...args: unknown[]) => unknown;
+    useGlobalSettings?: boolean;
+    useGlobalServices?: boolean;
+    blockedServicesSchedule?: {
+        time_zone: string;
+    };
+    t: (...args: unknown[]) => string;
+    processingAdding: boolean;
+    processingUpdating: boolean;
+    invalid: boolean;
+    tagsOptions: unknown[];
+    initialValues?: {
+        safe_search: any;
+    };
+}
+
+let Form = (props: FormProps) => {
+    const {
+        t,
+        handleSubmit,
+        reset,
+        change,
+        submitting,
+        useGlobalSettings,
+        useGlobalServices,
+        blockedServicesSchedule,
+        handleClose,
+        processingAdding,
+        processingUpdating,
+        invalid,
+        tagsOptions,
+        initialValues,
+    } = props;
+
+    const services = useSelector((store: RootState) => store?.services);
+    const { safe_search } = initialValues;
+    const safeSearchServices = { ...safe_search };
+    delete safeSearchServices.enabled;
+
+    const [activeTabLabel, setActiveTabLabel] = useState('settings');
+
+    const handleScheduleSubmit = (values: any) => {
+        change('blocked_services_schedule', { ...values });
+    };
+
+    const tabs = {
+        settings: {
+            title: 'settings',
+
+            component: (
+                <div title={props.t('main_settings')}>
+                    <div className="form__label--bot form__label--bold">{t('protection_section_label')}</div>
+                    {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 className="form__group">
+                        <Field
+                            name="safe_search.enabled"
+                            type="checkbox"
+                            component={CheckboxField}
+                            placeholder={t('enforce_safe_search')}
+                            disabled={useGlobalSettings}
+                        />
+                    </div>
+
+                    <div className="form__group--inner">
+                        {Object.keys(safeSearchServices).map((searchKey) => (
+                            <div key={searchKey}>
+                                <Field
+                                    name={`safe_search.${searchKey}`}
+                                    type="checkbox"
+                                    component={CheckboxField}
+                                    placeholder={captitalizeWords(searchKey)}
+                                    disabled={useGlobalSettings}
+                                />
+                            </div>
+                        ))}
+                    </div>
+
+                    <div className="form__label--bold form__label--top form__label--bot">
+                        {t('log_and_stats_section_label')}
+                    </div>
+                    {logAndStatsCheckboxes.map((setting) => (
+                        <div className="form__group" key={setting.name}>
+                            <Field
+                                name={setting.name}
+                                type="checkbox"
+                                component={CheckboxField}
+                                placeholder={t(setting.placeholder)}
+                            />
+                        </div>
+                    ))}
+                </div>
+            ),
+        },
+        block_services: {
+            title: 'block_services',
+
+            component: (
+                <div 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.allServices, 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.allServices, change, false)}>
+                                    <Trans>unblock_all</Trans>
+                                </button>
+                            </div>
+                        </div>
+                        {services.allServices.length > 0 && (
+                            <div className="services">
+                                {services.allServices.map((service: any) => (
+                                    <Field
+                                        key={service.id}
+                                        icon={service.icon_svg}
+                                        name={`blocked_services.${service.id}`}
+                                        type="checkbox"
+                                        component={renderServiceField}
+                                        placeholder={service.name}
+                                        disabled={useGlobalServices}
+                                    />
+                                ))}
+                            </div>
+                        )}
+                    </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 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={renderTextareaField}
+                        type="text"
+                        className="form-control form-control--textarea mb-5"
+                        placeholder={t('upstream_dns')}
+                        normalizeOnBlur={trimLinesAndRemoveEmpty}
+                    />
+
+                    <Examples />
+
+                    <div className="form__label--bold mt-5 mb-3">{t('upstream_dns_cache_configuration')}</div>
+
+                    <div className="form__group mb-2">
+                        <Field
+                            name="upstreams_cache_enabled"
+                            type="checkbox"
+                            component={CheckboxField}
+                            placeholder={t('enable_upstream_dns_cache')}
+                        />
+                    </div>
+
+                    <div className="form__group form__group--settings">
+                        <label htmlFor="upstreams_cache_size" className="form__label">
+                            {t('dns_cache_size')}
+                        </label>
+
+                        <Field
+                            name="upstreams_cache_size"
+                            type="number"
+                            component={renderInputField}
+                            placeholder={t('enter_cache_size')}
+                            className="form-control"
+                            normalize={toNumber}
+                            min={0}
+                            max={UINT32_RANGE.MAX}
+                        />
+                    </div>
+                </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: any) => 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://link.adtidy.org/forward.html?action=dns_kb_filtering_syntax_ctag&from=ui&app=home"
+                                        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={CLIENT_ID_LINK} target="_blank" rel="noopener noreferrer" key="0">
+                                        text
+                                    </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();
+                            handleClose();
+                        }}>
+                        <Trans>cancel_btn</Trans>
+                    </button>
+
+                    <button
+                        type="submit"
+                        className="btn btn-success btn-standard"
+                        disabled={submitting || invalid || processingAdding || processingUpdating}>
+                        <Trans>save_btn</Trans>
+                    </button>
+                </div>
+            </div>
+        </form>
+    );
+};
+
+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);
+
+export default flow([
+    withTranslation(),
+    reduxForm({
+        form: FORM_NAME.CLIENT,
+        enableReinitialize: true,
+        validate,
+    }),
+])(Form);

client/src/components/Settings/Clients/Form/components/BlockedServices.tsx

@@ -1,84 +0,0 @@
-import React from 'react';
-import { Trans, useTranslation } from 'react-i18next';
-import { Controller, useFormContext } from 'react-hook-form';
-import { ClientForm } from '../types';
-import { BlockedService } from '../../../../Filters/Services/Form';
-import { ServiceField } from '../../../../Filters/Services/ServiceField';
-
-type Props = {
-    services: BlockedService[];
-};
-
-export const BlockedServices = ({ services }: Props) => {
-    const { t } = useTranslation();
-    const { watch, setValue, control } = useFormContext<ClientForm>();
-
-    const useGlobalServices = watch('use_global_blocked_services');
-
-    const handleToggleAllServices = (isSelected: boolean) => {
-        services.forEach((service: BlockedService) => setValue(`blocked_services.${service.id}`, isSelected));
-    };
-
-    return (
-        <div title={t('block_services')}>
-            <div className="form__group">
-                <Controller
-                    name="use_global_blocked_services"
-                    control={control}
-                    render={({ field }) => (
-                        <ServiceField
-                            {...field}
-                            data-testid="clients_use_global_blocked_services"
-                            placeholder={t('blocked_services_global')}
-                            className="service--global"
-                        />
-                    )}
-                />
-
-                <div className="row mb-4">
-                    <div className="col-6">
-                        <button
-                            type="button"
-                            data-testid="clients_block_all"
-                            className="btn btn-secondary btn-block"
-                            disabled={useGlobalServices}
-                            onClick={() => handleToggleAllServices(true)}>
-                            <Trans>block_all</Trans>
-                        </button>
-                    </div>
-
-                    <div className="col-6">
-                        <button
-                            type="button"
-                            data-testid="clients_unblock_all"
-                            className="btn btn-secondary btn-block"
-                            disabled={useGlobalServices}
-                            onClick={() => handleToggleAllServices(false)}>
-                            <Trans>unblock_all</Trans>
-                        </button>
-                    </div>
-                </div>
-                {services.length > 0 && (
-                    <div className="services">
-                        {services.map((service: BlockedService) => (
-                            <Controller
-                                key={service.id}
-                                name={`blocked_services.${service.id}`}
-                                control={control}
-                                render={({ field }) => (
-                                    <ServiceField
-                                        {...field}
-                                        data-testid={`clients_service_${service.id}`}
-                                        placeholder={service.name}
-                                        disabled={useGlobalServices}
-                                        icon={service.icon_svg}
-                                    />
-                                )}
-                            />
-                        ))}
-                    </div>
-                )}
-            </div>
-        </div>
-    );
-};

client/src/components/Settings/Clients/Form/components/ClientIds.tsx

@@ -1,74 +0,0 @@
-import React from 'react';
-import { Controller, useFieldArray, useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
-import { ClientForm } from '../types';
-import { Input } from '../../../../ui/Controls/Input';
-import { validateClientId, validateRequiredValue } from '../../../../../helpers/validators';
-
-export const ClientIds = () => {
-    const { t } = useTranslation();
-    const { control } = useFormContext<ClientForm>();
-
-    const { fields, append, remove } = useFieldArray<ClientForm>({
-        control,
-        name: 'ids',
-    });
-
-    return (
-        <div className="form__group">
-            {fields.map((field, index) => (
-                <div key={field.id} className="mb-1">
-                    <Controller
-                        name={`ids.${index}.name`}
-                        control={control}
-                        rules={{
-                            validate: {
-                                required: (value) => validateRequiredValue(value),
-                                validId: (value) => validateClientId(value),
-                            },
-                        }}
-                        render={({ field, fieldState }) => (
-                            <Input
-                                {...field}
-                                type="text"
-                                data-testid={`clients_id_${index}`}
-                                placeholder={t('form_enter_id')}
-                                error={fieldState.error?.message}
-                                onBlur={(event) => {
-                                    const trimmedValue = event.target.value.trim();
-                                    field.onBlur();
-                                    field.onChange(trimmedValue);
-                                }}
-                                rightAddon={
-                                    index !== 0 && (
-                                        <span className="input-group-append">
-                                            <button
-                                                type="button"
-                                                data-testid={`clients_id_remove_${index}`}
-                                                className="btn btn-secondary btn-icon btn-icon--green"
-                                                onClick={() => remove(index)}>
-                                                <svg className="icon icon--24">
-                                                    <use xlinkHref="#cross" />
-                                                </svg>
-                                            </button>
-                                        </span>
-                                    )
-                                }
-                            />
-                        )}
-                    />
-                </div>
-            ))}
-            <button
-                type="button"
-                data-testid="clients_id_add"
-                className="btn btn-link btn-block btn-sm"
-                onClick={() => append({ name: '' })}
-                title={t('form_add_id')}>
-                <svg className="icon icon--24">
-                    <use xlinkHref="#plus" />
-                </svg>
-            </button>
-        </div>
-    );
-};

client/src/components/Settings/Clients/Form/components/MainSettings.tsx

@@ -1,126 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { Controller, useFormContext } from 'react-hook-form';
-import i18next from 'i18next';
-import { captitalizeWords } from '../../../../../helpers/helpers';
-import { ClientForm } from '../types';
-import { Checkbox } from '../../../../ui/Controls/Checkbox';
-
-type ProtectionSettings = 'use_global_settings' | 'filtering_enabled' | 'safebrowsing_enabled' | 'parental_enabled';
-
-const settingsCheckboxes: {
-    name: ProtectionSettings;
-    placeholder: string;
-}[] = [
-    {
-        name: 'use_global_settings',
-        placeholder: i18next.t('client_global_settings'),
-    },
-    {
-        name: 'filtering_enabled',
-        placeholder: i18next.t('block_domain_use_filters_and_hosts'),
-    },
-    {
-        name: 'safebrowsing_enabled',
-        placeholder: i18next.t('use_adguard_browsing_sec'),
-    },
-    {
-        name: 'parental_enabled',
-        placeholder: i18next.t('use_adguard_parental'),
-    },
-];
-
-type LogsStatsSettings = 'ignore_querylog' | 'ignore_statistics';
-
-const logAndStatsCheckboxes: { name: LogsStatsSettings; placeholder: string }[] = [
-    {
-        name: 'ignore_querylog',
-        placeholder: i18next.t('ignore_query_log'),
-    },
-    {
-        name: 'ignore_statistics',
-        placeholder: i18next.t('ignore_statistics'),
-    },
-];
-
-type Props = {
-    safeSearchServices: Record<string, boolean>;
-};
-
-export const MainSettings = ({ safeSearchServices }: Props) => {
-    const { t } = useTranslation();
-    const { watch, control } = useFormContext<ClientForm>();
-
-    const useGlobalSettings = watch('use_global_settings');
-
-    return (
-        <div title={t('main_settings')}>
-            <div className="form__label--bot form__label--bold">{t('protection_section_label')}</div>
-            {settingsCheckboxes.map((setting) => (
-                <div className="form__group" key={setting.name}>
-                    <Controller
-                        name={setting.name}
-                        control={control}
-                        render={({ field }) => (
-                            <Checkbox
-                                {...field}
-                                data-testid={`clients_${setting.name}`}
-                                title={setting.placeholder}
-                                disabled={setting.name !== 'use_global_settings' ? useGlobalSettings : false}
-                            />
-                        )}
-                    />
-                </div>
-            ))}
-
-            <div className="form__group">
-                <Controller
-                    name="safe_search.enabled"
-                    control={control}
-                    render={({ field }) => (
-                        <Checkbox
-                            data-testid="clients_safe_search"
-                            {...field}
-                            title={t('enforce_safe_search')}
-                            disabled={useGlobalSettings}
-                        />
-                    )}
-                />
-            </div>
-
-            <div className="form__group--inner">
-                {Object.keys(safeSearchServices).map((searchKey) => (
-                    <div key={searchKey}>
-                        <Controller
-                            name={`safe_search.${searchKey}`}
-                            control={control}
-                            render={({ field }) => (
-                                <Checkbox
-                                    {...field}
-                                    data-testid={`clients_safe_search_${searchKey}`}
-                                    title={captitalizeWords(searchKey)}
-                                    disabled={useGlobalSettings}
-                                />
-                            )}
-                        />
-                    </div>
-                ))}
-            </div>
-
-            <div className="form__label--bold form__label--top form__label--bot">
-                {t('log_and_stats_section_label')}
-            </div>
-            {logAndStatsCheckboxes.map((setting) => (
-                <div className="form__group" key={setting.name}>
-                    <Controller
-                        name={setting.name}
-                        control={control}
-                        render={({ field }) => (
-                            <Checkbox {...field} data-testid={`clients_${setting.name}`} title={setting.placeholder} />
-                        )}
-                    />
-                </div>
-            ))}
-        </div>
-    );
-};

client/src/components/Settings/Clients/Form/components/ScheduleServices.tsx

@@ -1,25 +0,0 @@
-import React from 'react';
-import { Trans } from 'react-i18next';
-import { useFormContext } from 'react-hook-form';
-import { ScheduleForm } from '../../../../Filters/Services/ScheduleForm';
-import { ClientForm } from '../types';
-
-export const ScheduleServices = () => {
-    const { watch, setValue } = useFormContext<ClientForm>();
-
-    const blockedServicesSchedule = watch('blocked_services_schedule');
-
-    const handleScheduleSubmit = (values: any) => {
-        setValue('blocked_services_schedule', values);
-    };
-
-    return (
-        <>
-            <div className="form__desc mb-4">
-                <Trans>schedule_services_desc_client</Trans>
-            </div>
-
-            <ScheduleForm schedule={blockedServicesSchedule} onScheduleSubmit={handleScheduleSubmit} clientForm />
-        </>
-    );
-};

client/src/components/Settings/Clients/Form/components/UpstreamDns.tsx

@@ -1,83 +0,0 @@
-import React from 'react';
-import { Trans, useTranslation } from 'react-i18next';
-
-import { Controller, useFormContext } from 'react-hook-form';
-import Examples from '../../../Dns/Upstream/Examples';
-import { UINT32_RANGE } from '../../../../../helpers/constants';
-import { Textarea } from '../../../../ui/Controls/Textarea';
-import { ClientForm } from '../types';
-import { Checkbox } from '../../../../ui/Controls/Checkbox';
-import { Input } from '../../../../ui/Controls/Input';
-import { toNumber } from '../../../../../helpers/form';
-
-export const UpstreamDns = () => {
-    const { t } = useTranslation();
-
-    const { control } = useFormContext<ClientForm>();
-
-    return (
-        <div title={t('upstream_dns')}>
-            <div className="form__desc mb-3">
-                <Trans components={[<a href="#dns" key="0" />]}>upstream_dns_client_desc</Trans>
-            </div>
-
-            <Controller
-                name="upstreams"
-                control={control}
-                render={({ field }) => (
-                    <Textarea
-                        {...field}
-                        data-testid="clients_upstreams"
-                        className="form-control form-control--textarea mb-5"
-                        placeholder={t('upstream_dns')}
-                        trimOnBlur
-                    />
-                )}
-            />
-
-            <Examples />
-
-            <div className="form__label--bold mt-5 mb-3">{t('upstream_dns_cache_configuration')}</div>
-
-            <div className="form__group mb-2">
-                <Controller
-                    name="upstreams_cache_enabled"
-                    control={control}
-                    render={({ field }) => (
-                        <Checkbox
-                            {...field}
-                            data-testid="clients_upstreams_cache_enabled"
-                            title={t('enable_upstream_dns_cache')}
-                        />
-                    )}
-                />
-            </div>
-
-            <div className="form__group form__group--settings">
-                <label htmlFor="upstreams_cache_size" className="form__label">
-                    {t('dns_cache_size')}
-                </label>
-
-                <Controller
-                    name="upstreams_cache_size"
-                    control={control}
-                    render={({ field, fieldState }) => (
-                        <Input
-                            {...field}
-                            type="number"
-                            data-testid="clients_upstreams_cache_size"
-                            placeholder={t('enter_cache_size')}
-                            error={fieldState.error?.message}
-                            min={0}
-                            max={UINT32_RANGE.MAX}
-                            onChange={(e) => {
-                                const { value } = e.target;
-                                field.onChange(toNumber(value));
-                            }}
-                        />
-                    )}
-                />
-            </div>
-        </div>
-    );
-};

client/src/components/Settings/Clients/Form/components/index.ts

@@ -1,5 +0,0 @@
-export { BlockedServices } from './BlockedServices';
-export { ClientIds } from './ClientIds';
-export { ScheduleServices } from './ScheduleServices';
-export { MainSettings } from './MainSettings';
-export { UpstreamDns } from './UpstreamDns';

client/src/components/Settings/Clients/Form/index.tsx

@@ -1,223 +0,0 @@
-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>
-    );
-};

client/src/components/Settings/Clients/Form/types.ts

@@ -1,28 +0,0 @@
-export type ClientForm = {
-    name: string;
-    tags: { value: string; label: string }[];
-    ids: { name: string }[];
-    use_global_settings: boolean;
-    use_global_blocked_services: boolean;
-    blocked_services_schedule: {
-        time_zone: string;
-    };
-    safe_search: {
-        enabled: boolean;
-        [key: string]: boolean;
-    };
-    upstreams: string;
-    upstreams_cache_enabled: boolean;
-    upstreams_cache_size: number;
-    blocked_services: Record<string, boolean>;
-    filtering_enabled: boolean;
-    safebrowsing_enabled: boolean;
-    parental_enabled: boolean;
-    ignore_querylog: boolean;
-    ignore_statistics: boolean;
-};
-
-export type SubmitClientForm = Omit<ClientForm, 'ids' | 'tags'> & {
-    ids: string[];
-    tags: string[];
-};

client/src/components/Settings/Clients/Modal.tsx

@@ -4,15 +4,8 @@ import { Trans, withTranslation } from 'react-i18next';
 import ReactModal from 'react-modal';
 
 import { MODAL_TYPE } from '../../../helpers/constants';
-import { Form } from './Form';
 
-const normalizeIds = (initialIds?: string[]): { name: string }[] => {
-    if (!initialIds || initialIds.length === 0) {
-        return [{ name: '' }];
-    }
-
-    return initialIds.map((id: string) => ({ name: id }));
-};
+import Form from './Form';
 
 const getInitialData = ({ initial, modalType, clientId, clientName }: any) => {
     if (initial && initial.blocked_services) {
@@ -26,7 +19,6 @@ const getInitialData = ({ initial, modalType, clientId, clientName }: any) => {
         return {
             ...initial,
             blocked_services: blocked,
-            ids: normalizeIds(initial.ids),
         };
     }
 
@@ -34,14 +26,11 @@ const getInitialData = ({ initial, modalType, clientId, clientName }: any) => {
         return {
             ...initial,
             name: clientName,
-            ids: [{ name: clientId }],
+            ids: [clientId],
         };
     }
 
-    return {
-        ...initial,
-        ids: normalizeIds(initial.ids),
-    };
+    return initial;
 };
 
 interface ModalProps {
@@ -52,7 +41,7 @@ interface ModalProps {
     handleClose: (...args: unknown[]) => unknown;
     processingAdding: boolean;
     processingUpdating: boolean;
-    tagsOptions: { label: string; value: string }[];
+    tagsOptions: unknown[];
     t: (...args: unknown[]) => string;
     clientId?: string;
 }
@@ -96,7 +85,7 @@ const Modal = ({
                 <Form
                     initialValues={{ ...initialData }}
                     onSubmit={handleSubmit}
-                    onClose={handleClose}
+                    handleClose={handleClose}
                     processingAdding={processingAdding}
                     processingUpdating={processingUpdating}
                     tagsOptions={tagsOptions}

client/src/components/Settings/Dhcp/FormDHCPv4.tsx

@@ -1,22 +1,28 @@
-import React, { useMemo } from 'react';
-import { Controller, useFormContext } from 'react-hook-form';
+import React, { useCallback } from 'react';
+import { shallowEqual, useSelector } from 'react-redux';
+
+import { Field, reduxForm } from 'redux-form';
 import { useTranslation } from 'react-i18next';
 
-import { UINT32_RANGE } from '../../../helpers/constants';
+import { renderInputField, toNumber } from '../../../helpers/form';
+import { FORM_NAME, UINT32_RANGE } from '../../../helpers/constants';
 import {
+    validateIpv4,
+    validateRequiredValue,
+    validateIpv4RangeEnd,
     validateGatewaySubnetMask,
     validateIpForGatewaySubnetMask,
-    validateIpv4,
-    validateIpv4RangeEnd,
     validateNotInRange,
-    validateRequiredValue,
 } from '../../../helpers/validators';
-import { DhcpFormValues } from '.';
-import { Input } from '../../ui/Controls/Input';
-import { toNumber } from '../../../helpers/form';
+import { RootState } from '../../../initialState';
 
-type FormDHCPv4Props = {
+interface FormDHCPv4Props {
+    handleSubmit: (...args: unknown[]) => string;
+    submitting: boolean;
+    initialValues: { v4?: any };
     processingConfig?: boolean;
+    change: (field: string, value: any) => void;
+    reset: () => void;
     ipv4placeholders?: {
         gateway_ip: string;
         subnet_mask: string;
@@ -24,179 +30,127 @@ type FormDHCPv4Props = {
         range_end: string;
         lease_duration: string;
     };
-    interfaces: any;
-    onSubmit?: (data: DhcpFormValues) => void;
-};
+}
 
-const FormDHCPv4 = ({ processingConfig, ipv4placeholders, interfaces, onSubmit }: FormDHCPv4Props) => {
+const FormDHCPv4 = ({ handleSubmit, submitting, processingConfig, ipv4placeholders }: FormDHCPv4Props) => {
     const { t } = useTranslation();
 
-    const {
-        handleSubmit,
-        formState: { errors, isSubmitting },
-        control,
-        watch,
-    } = useFormContext<DhcpFormValues>();
+    const dhcp = useSelector((state: RootState) => state.form[FORM_NAME.DHCPv4], shallowEqual);
 
-    const interfaceName = watch('interface_name');
-    const isInterfaceIncludesIpv4 = interfaces?.[interfaceName]?.ipv4_addresses;
+    const interfaces = useSelector((state: RootState) => state.form[FORM_NAME.DHCP_INTERFACES], shallowEqual);
+    const interface_name = interfaces?.values?.interface_name;
 
-    const formValues = watch('v4');
-    const isEmptyConfig = !Object.values(formValues || {}).some(Boolean);
-    const hasV4Errors = errors.v4 && Object.keys(errors.v4).length > 0;
+    const isInterfaceIncludesIpv4 = useSelector(
+        (state: RootState) => !!state.dhcp?.interfaces?.[interface_name]?.ipv4_addresses,
+    );
 
-    const isDisabled = useMemo(() => {
-        return isSubmitting || hasV4Errors || processingConfig || !isInterfaceIncludesIpv4 || isEmptyConfig;
-    }, [isSubmitting, hasV4Errors, processingConfig, isInterfaceIncludesIpv4, isEmptyConfig]);
+    const isEmptyConfig = !Object.values(dhcp?.values?.v4 ?? {}).some(Boolean);
+
+    const invalid =
+        dhcp?.syncErrors ||
+        interfaces?.syncErrors ||
+        !isInterfaceIncludesIpv4 ||
+        isEmptyConfig ||
+        submitting ||
+        processingConfig;
+
+    const validateRequired = useCallback(
+        (value) => {
+            if (isEmptyConfig) {
+                return undefined;
+            }
+            return validateRequiredValue(value);
+        },
+        [isEmptyConfig],
+    );
 
     return (
-        <form onSubmit={handleSubmit(onSubmit)}>
+        <form onSubmit={handleSubmit}>
             <div className="row">
                 <div className="col-lg-6">
                     <div className="form__group form__group--settings">
-                        <Controller
+                        <label>{t('dhcp_form_gateway_input')}</label>
+
+                        <Field
                             name="v4.gateway_ip"
-                            control={control}
-                            rules={{
-                                validate: {
-                                    ipv4: validateIpv4,
-                                    required: (value) => (isEmptyConfig ? undefined : validateRequiredValue(value)),
-                                    notInRange: validateNotInRange,
-                                },
-                            }}
-                            render={({ field, fieldState }) => (
-                                <Input
-                                    {...field}
-                                    type="text"
-                                    data-testid="v4_gateway_ip"
-                                    label={t('dhcp_form_gateway_input')}
-                                    placeholder={t(ipv4placeholders.gateway_ip)}
-                                    error={fieldState.error?.message}
-                                    disabled={!isInterfaceIncludesIpv4}
-                                />
-                            )}
+                            component={renderInputField}
+                            type="text"
+                            className="form-control"
+                            placeholder={t(ipv4placeholders.gateway_ip)}
+                            validate={[validateIpv4, validateRequired, validateNotInRange]}
+                            disabled={!isInterfaceIncludesIpv4}
                         />
                     </div>
 
                     <div className="form__group form__group--settings">
-                        <Controller
+                        <label>{t('dhcp_form_subnet_input')}</label>
+
+                        <Field
                             name="v4.subnet_mask"
-                            control={control}
-                            rules={{
-                                validate: {
-                                    required: (value) => (isEmptyConfig ? undefined : validateRequiredValue(value)),
-                                    subnet: validateGatewaySubnetMask,
-                                },
-                            }}
-                            render={({ field, fieldState }) => (
-                                <Input
-                                    {...field}
-                                    type="text"
-                                    data-testid="v4_subnet_mask"
-                                    label={t('dhcp_form_subnet_input')}
-                                    placeholder={t(ipv4placeholders.subnet_mask)}
-                                    error={fieldState.error?.message}
-                                    disabled={!isInterfaceIncludesIpv4}
-                                />
-                            )}
+                            component={renderInputField}
+                            type="text"
+                            className="form-control"
+                            placeholder={t(ipv4placeholders.subnet_mask)}
+                            validate={[validateRequired, validateGatewaySubnetMask]}
+                            disabled={!isInterfaceIncludesIpv4}
                         />
                     </div>
                 </div>
 
                 <div className="col-lg-6">
-                    <div className="form__group mb-0">
+                    <div className="form__group form__group--settings">
                         <div className="row">
                             <div className="col-12">
                                 <label>{t('dhcp_form_range_title')}</label>
                             </div>
 
                             <div className="col">
-                                <Controller
+                                <Field
                                     name="v4.range_start"
-                                    control={control}
-                                    rules={{
-                                        validate: {
-                                            ipv4: validateIpv4,
-                                            gateway: validateIpForGatewaySubnetMask,
-                                        },
-                                    }}
-                                    render={({ field, fieldState }) => (
-                                        <Input
-                                            {...field}
-                                            type="text"
-                                            data-testid="v4_range_start"
-                                            placeholder={t(ipv4placeholders.range_start)}
-                                            error={fieldState.error?.message}
-                                            disabled={!isInterfaceIncludesIpv4}
-                                        />
-                                    )}
+                                    component={renderInputField}
+                                    type="text"
+                                    className="form-control"
+                                    placeholder={t(ipv4placeholders.range_start)}
+                                    validate={[validateIpv4, validateIpForGatewaySubnetMask]}
+                                    disabled={!isInterfaceIncludesIpv4}
                                 />
                             </div>
 
                             <div className="col">
-                                <Controller
+                                <Field
                                     name="v4.range_end"
-                                    control={control}
-                                    rules={{
-                                        validate: {
-                                            ipv4: validateIpv4,
-                                            rangeEnd: validateIpv4RangeEnd,
-                                            gateway: validateIpForGatewaySubnetMask,
-                                        },
-                                    }}
-                                    render={({ field, fieldState }) => (
-                                        <Input
-                                            {...field}
-                                            type="text"
-                                            data-testid="v4_range_end"
-                                            placeholder={t(ipv4placeholders.range_end)}
-                                            error={fieldState.error?.message}
-                                            disabled={!isInterfaceIncludesIpv4}
-                                        />
-                                    )}
+                                    component={renderInputField}
+                                    type="text"
+                                    className="form-control"
+                                    placeholder={t(ipv4placeholders.range_end)}
+                                    validate={[validateIpv4, validateIpv4RangeEnd, validateIpForGatewaySubnetMask]}
+                                    disabled={!isInterfaceIncludesIpv4}
                                 />
                             </div>
                         </div>
                     </div>
 
                     <div className="form__group form__group--settings">
-                        <Controller
+                        <label>{t('dhcp_form_lease_title')}</label>
+
+                        <Field
                             name="v4.lease_duration"
-                            control={control}
-                            rules={{
-                                validate: {
-                                    required: (value) => (isEmptyConfig ? undefined : validateRequiredValue(value)),
-                                },
-                            }}
-                            render={({ field, fieldState }) => (
-                                <Input
-                                    {...field}
-                                    type="number"
-                                    data-testid="v4_lease_duration"
-                                    label={t('dhcp_form_lease_title')}
-                                    placeholder={t(ipv4placeholders.lease_duration)}
-                                    error={fieldState.error?.message}
-                                    disabled={!isInterfaceIncludesIpv4}
-                                    min={1}
-                                    max={UINT32_RANGE.MAX}
-                                    value={field.value ?? ''}
-                                    onChange={(e) => {
-                                        const { value } = e.target;
-                                        field.onChange(toNumber(value));
-                                    }}
-                                />
-                            )}
+                            component={renderInputField}
+                            type="number"
+                            className="form-control"
+                            placeholder={t(ipv4placeholders.lease_duration)}
+                            validate={validateRequired}
+                            normalize={toNumber}
+                            min={1}
+                            max={UINT32_RANGE.MAX}
+                            disabled={!isInterfaceIncludesIpv4}
                         />
                     </div>
                 </div>
             </div>
 
             <div className="btn-list">
-                <button
-                    data-testid="v4_save"
-                    type="submit"
-                    className="btn btn-success btn-standard"
-                    disabled={isDisabled}>
+                <button type="submit" className="btn btn-success btn-standard" disabled={invalid}>
                     {t('save_config')}
                 </button>
             </div>
@@ -204,4 +158,9 @@ const FormDHCPv4 = ({ processingConfig, ipv4placeholders, interfaces, onSubmit }
     );
 };
 
-export default FormDHCPv4;
+export default reduxForm<
+    Record<string, any>,
+    Omit<FormDHCPv4Props, 'submitting' | 'handleSubmit' | 'reset' | 'change'>
+>({
+    form: FORM_NAME.DHCPv4,
+})(FormDHCPv4);

client/src/components/Settings/Dhcp/FormDHCPv6.tsx

@@ -1,92 +1,93 @@
-import React, { useMemo } from 'react';
-import { Controller, useFormContext } from 'react-hook-form';
+import React, { useCallback } from 'react';
+import { shallowEqual, useSelector } from 'react-redux';
+
+import { Field, reduxForm } from 'redux-form';
 import { useTranslation } from 'react-i18next';
 
-import { UINT32_RANGE } from '../../../helpers/constants';
+import { renderInputField, toNumber } from '../../../helpers/form';
+import { FORM_NAME, UINT32_RANGE } from '../../../helpers/constants';
 import { validateIpv6, validateRequiredValue } from '../../../helpers/validators';
-import { DhcpFormValues } from '.';
-import { Input } from '../../ui/Controls/Input';
-import { toNumber } from '../../../helpers/form';
+import { RootState } from '../../../initialState';
 
-type FormDHCPv6Props = {
+interface FormDHCPv6Props {
+    handleSubmit: (...args: unknown[]) => string;
+    submitting: boolean;
+    initialValues: {
+        v6?: any;
+    };
+    change: (field: string, value: any) => void;
+    reset: () => void;
     processingConfig?: boolean;
     ipv6placeholders?: {
         range_start: string;
         range_end: string;
         lease_duration: string;
     };
-    interfaces: any;
-    onSubmit?: (data: DhcpFormValues) => Promise<void> | void;
-};
+}
 
-const FormDHCPv6 = ({ processingConfig, ipv6placeholders, interfaces, onSubmit }: FormDHCPv6Props) => {
+const FormDHCPv6 = ({ handleSubmit, submitting, processingConfig, ipv6placeholders }: FormDHCPv6Props) => {
     const { t } = useTranslation();
-    const {
-        handleSubmit,
-        formState: { isSubmitting, isValid },
-        control,
-        watch,
-    } = useFormContext<DhcpFormValues>();
 
-    const interfaceName = watch('interface_name');
-    const isInterfaceIncludesIpv6 = interfaces?.[interfaceName]?.ipv6_addresses;
+    const dhcp = useSelector((state: RootState) => state.form[FORM_NAME.DHCPv6], shallowEqual);
 
-    const formValues = watch('v6');
-    const isEmptyConfig = !Object.values(formValues || {}).some(Boolean);
+    const interfaces = useSelector((state: RootState) => state.form[FORM_NAME.DHCP_INTERFACES], shallowEqual);
+    const interface_name = interfaces?.values?.interface_name;
 
-    const isDisabled = useMemo(() => {
-        return isSubmitting || !isValid || processingConfig || !isInterfaceIncludesIpv6 || isEmptyConfig;
-    }, [isSubmitting, isValid, processingConfig, isInterfaceIncludesIpv6, isEmptyConfig]);
+    const isInterfaceIncludesIpv6 = useSelector(
+        (state: RootState) => !!state.dhcp?.interfaces?.[interface_name]?.ipv6_addresses,
+    );
+
+    const isEmptyConfig = !Object.values(dhcp?.values?.v6 ?? {}).some(Boolean);
+
+    const invalid =
+        dhcp?.syncErrors ||
+        interfaces?.syncErrors ||
+        !isInterfaceIncludesIpv6 ||
+        isEmptyConfig ||
+        submitting ||
+        processingConfig;
+
+    const validateRequired = useCallback(
+        (value) => {
+            if (isEmptyConfig) {
+                return undefined;
+            }
+            return validateRequiredValue(value);
+        },
+        [isEmptyConfig],
+    );
 
     return (
-        <form onSubmit={handleSubmit(onSubmit)}>
+        <form onSubmit={handleSubmit}>
             <div className="row">
                 <div className="col-lg-6">
-                    <div className="form__group mb-0">
+                    <div className="form__group form__group--settings">
                         <div className="row">
                             <div className="col-12">
                                 <label>{t('dhcp_form_range_title')}</label>
                             </div>
 
                             <div className="col">
-                                <Controller
+                                <Field
                                     name="v6.range_start"
-                                    control={control}
-                                    rules={{
-                                        validate: isInterfaceIncludesIpv6
-                                            ? {
-                                                  ipv6: validateIpv6,
-                                                  required: validateRequiredValue,
-                                              }
-                                            : undefined,
-                                    }}
-                                    render={({ field, fieldState }) => (
-                                        <Input
-                                            {...field}
-                                            type="text"
-                                            data-testid="v6_range_start"
-                                            placeholder={t(ipv6placeholders.range_start)}
-                                            error={fieldState.error?.message}
-                                            disabled={!isInterfaceIncludesIpv6}
-                                        />
-                                    )}
+                                    component={renderInputField}
+                                    type="text"
+                                    className="form-control"
+                                    placeholder={t(ipv6placeholders.range_start)}
+                                    validate={[validateIpv6, validateRequired]}
+                                    disabled={!isInterfaceIncludesIpv6}
                                 />
                             </div>
 
                             <div className="col">
-                                <Controller
+                                <Field
                                     name="v6.range_end"
-                                    control={control}
-                                    render={({ field, fieldState }) => (
-                                        <Input
-                                            {...field}
-                                            type="text"
-                                            data-testid="v6_range_end"
-                                            placeholder={t(ipv6placeholders.range_end)}
-                                            error={fieldState.error?.message}
-                                            disabled
-                                        />
-                                    )}
+                                    component="input"
+                                    type="text"
+                                    className="form-control disabled cursor--not-allowed"
+                                    placeholder={t(ipv6placeholders.range_end)}
+                                    value={t(ipv6placeholders.range_end)}
+                                    disabled
                                 />
                             </div>
                         </div>
@@ -96,43 +97,25 @@ const FormDHCPv6 = ({ processingConfig, ipv6placeholders, interfaces, onSubmit }
 
             <div className="row">
                 <div className="col-lg-6 form__group form__group--settings">
-                    <Controller
+                    <label>{t('dhcp_form_lease_title')}</label>
+
+                    <Field
                         name="v6.lease_duration"
-                        control={control}
-                        rules={{
-                            validate: isInterfaceIncludesIpv6
-                                ? {
-                                      required: validateRequiredValue,
-                                  }
-                                : undefined,
-                        }}
-                        render={({ field, fieldState }) => (
-                            <Input
-                                {...field}
-                                type="number"
-                                data-testid="v6_lease_duration"
-                                label={t('dhcp_form_lease_title')}
-                                placeholder={t(ipv6placeholders.lease_duration)}
-                                error={fieldState.error?.message}
-                                disabled={!isInterfaceIncludesIpv6}
-                                min={1}
-                                max={UINT32_RANGE.MAX}
-                                onChange={(e) => {
-                                    const { value } = e.target;
-                                    field.onChange(toNumber(value));
-                                }}
-                            />
-                        )}
+                        component={renderInputField}
+                        type="number"
+                        className="form-control"
+                        placeholder={t(ipv6placeholders.lease_duration)}
+                        validate={validateRequired}
+                        normalizeOnBlur={toNumber}
+                        min={1}
+                        max={UINT32_RANGE.MAX}
+                        disabled={!isInterfaceIncludesIpv6}
                     />
                 </div>
             </div>
 
             <div className="btn-list">
-                <button
-                    data-testid="v6_save"
-                    type="submit"
-                    className="btn btn-success btn-standard"
-                    disabled={isDisabled}>
+                <button type="submit" className="btn btn-success btn-standard" disabled={invalid}>
                     {t('save_config')}
                 </button>
             </div>
@@ -140,4 +123,9 @@ const FormDHCPv6 = ({ processingConfig, ipv6placeholders, interfaces, onSubmit }
     );
 };
 
-export default FormDHCPv6;
+export default reduxForm<
+    Record<string, any>,
+    Omit<FormDHCPv6Props, 'handleSubmit' | 'change' | 'submitting' | 'reset'>
+>({
+    form: FORM_NAME.DHCPv6,
+})(FormDHCPv6);

client/src/components/Settings/Dhcp/Interfaces.tsx

@@ -1,11 +1,13 @@
 import React from 'react';
-import { useSelector } from 'react-redux';
-import { useFormContext } from 'react-hook-form';
+import { shallowEqual, useSelector } from 'react-redux';
+
+import { Field, reduxForm } from 'redux-form';
 import { Trans, useTranslation } from 'react-i18next';
 
+import { renderSelectField } from '../../../helpers/form';
 import { validateRequiredValue } from '../../../helpers/validators';
+import { FORM_NAME } from '../../../helpers/constants';
 import { RootState } from '../../../initialState';
-import { DhcpFormValues } from '.';
 
 const renderInterfaces = (interfaces: any) =>
     Object.keys(interfaces).map((item) => {
@@ -45,13 +47,13 @@ const getInterfaceValues = ({ gateway_ip, hardware_address, ip_addresses }: any)
     },
 ];
 
-interface RenderInterfaceValuesProps {
+interface renderInterfaceValuesProps {
     gateway_ip: string;
     hardware_address: string;
     ip_addresses: string[];
 }
 
-const renderInterfaceValues = ({ gateway_ip, hardware_address, ip_addresses }: RenderInterfaceValuesProps) => (
+const renderInterfaceValues = ({ gateway_ip, hardware_address, ip_addresses }: renderInterfaceValuesProps) => (
     <div className="d-flex align-items-end dhcp__interfaces-info">
         <ul className="list-unstyled m-0">
             {getInterfaceValues({
@@ -75,15 +77,11 @@ const renderInterfaceValues = ({ gateway_ip, hardware_address, ip_addresses }: R
 
 const Interfaces = () => {
     const { t } = useTranslation();
-    const {
-        register,
-        watch,
-        formState: { errors },
-    } = useFormContext<DhcpFormValues>();
 
-    const { processingInterfaces, interfaces, enabled } = useSelector((store: RootState) => store.dhcp);
+    const { processingInterfaces, interfaces, enabled } = useSelector((store: RootState) => store.dhcp, shallowEqual);
 
-    const interface_name = watch('interface_name');
+    const interface_name =
+        useSelector((store: RootState) => store.form[FORM_NAME.DHCP_INTERFACES]?.values?.interface_name);
 
     if (processingInterfaces || !interfaces) {
         return null;
@@ -94,34 +92,27 @@ const Interfaces = () => {
     return (
         <div className="row dhcp__interfaces">
             <div className="col col__dhcp">
-                <label htmlFor="interface_name" className="form__label">
-                    {t('dhcp_interface_select')}
-                </label>
-                <select
-                    id="interface_name"
-                    data-testid="interface_name"
+                <Field
+                    name="interface_name"
+                    component={renderSelectField}
                     className="form-control custom-select pl-4 col-md"
-                    disabled={enabled}
-                    {...register('interface_name', {
-                        validate: validateRequiredValue,
-                    })}>
+                    validate={[validateRequiredValue]}
+                    label="dhcp_interface_select">
                     <option value="" disabled={enabled}>
                         {t('dhcp_interface_select')}
                     </option>
                     {renderInterfaces(interfaces)}
-                </select>
-                {errors.interface_name && (
-                    <div className="form__message form__message--error">{t(errors.interface_name.message)}</div>
-                )}
+                </Field>
             </div>
-            {interfaceValue &&
-                renderInterfaceValues({
-                    gateway_ip: interfaceValue.gateway_ip,
-                    hardware_address: interfaceValue.hardware_address,
-                    ip_addresses: interfaceValue.ip_addresses,
-                })}
+            {interfaceValue && renderInterfaceValues({
+                gateway_ip: interfaceValue.gateway_ip,
+                hardware_address: interfaceValue.hardware_address,
+                ip_addresses: interfaceValue.ip_addresses
+            })}
         </div>
     );
 };
 
-export default Interfaces;
+export default reduxForm({
+    form: FORM_NAME.DHCP_INTERFACES,
+})(Interfaces);

client/src/components/Settings/Dhcp/StaticLeases/Form.tsx

@@ -1,9 +1,10 @@
 import React from 'react';
-import { useForm, Controller } from 'react-hook-form';
+
+import { Field, reduxForm } from 'redux-form';
 import { Trans, useTranslation } from 'react-i18next';
 import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 
-import { normalizeMac } from '../../../../helpers/form';
+import { renderInputField, normalizeMac } from '../../../../helpers/form';
 import {
     validateIpv4,
     validateMac,
@@ -11,12 +12,12 @@ import {
     validateIpv4InCidr,
     validateIpGateway,
 } from '../../../../helpers/validators';
+import { FORM_NAME } from '../../../../helpers/constants';
 
 import { toggleLeaseModal } from '../../../../actions';
 import { RootState } from '../../../../initialState';
-import { Input } from '../../../ui/Controls/Input';
 
-type Props = {
+interface FormStaticLeaseProps {
     initialValues?: {
         mac?: string;
         ip?: string;
@@ -24,26 +25,20 @@ type Props = {
         cidr?: string;
         gatewayIp?: string;
     };
+    pristine: boolean;
+    handleSubmit: (...args: unknown[]) => string;
+    reset: () => void;
+    submitting: boolean;
     processingAdding?: boolean;
     cidr?: string;
     isEdit?: boolean;
-    onSubmit: (data: any) => void;
-};
+}
 
-export const Form = ({ initialValues, processingAdding, cidr, isEdit, onSubmit }: Props) => {
+const Form = ({ handleSubmit, reset, pristine, submitting, processingAdding, cidr, isEdit }: FormStaticLeaseProps) => {
     const { t } = useTranslation();
     const dispatch = useDispatch();
-    const dynamicLease = useSelector((store: RootState) => store.dhcp.leaseModalConfig, shallowEqual);
 
-    const {
-        handleSubmit,
-        control,
-        reset,
-        formState: { isSubmitting, isDirty },
-    } = useForm({
-        defaultValues: initialValues,
-        mode: 'onBlur',
-    });
+    const dynamicLease = useSelector((store: RootState) => store.dhcp.leaseModalConfig, shallowEqual);
 
     const onClick = () => {
         reset();
@@ -51,64 +46,42 @@ export const Form = ({ initialValues, processingAdding, cidr, isEdit, onSubmit }
     };
 
     return (
-        <form onSubmit={handleSubmit(onSubmit)}>
+        <form onSubmit={handleSubmit}>
             <div className="modal-body">
                 <div className="form__group">
-                    <Controller
+                    <Field
+                        id="mac"
                         name="mac"
-                        control={control}
-                        rules={{ validate: { required: validateRequiredValue, mac: validateMac } }}
-                        render={({ field, fieldState }) => (
-                            <Input
-                                {...field}
-                                type="text"
-                                data-testid="static_lease_mac"
-                                placeholder={t('form_enter_mac')}
-                                disabled={isEdit}
-                                error={fieldState.error?.message}
-                                onChange={(e) => field.onChange(normalizeMac(e.target.value))}
-                            />
-                        )}
+                        component={renderInputField}
+                        type="text"
+                        className="form-control"
+                        placeholder={t('form_enter_mac')}
+                        normalize={normalizeMac}
+                        validate={[validateRequiredValue, validateMac]}
+                        disabled={isEdit}
                     />
                 </div>
 
                 <div className="form__group">
-                    <Controller
+                    <Field
+                        id="ip"
                         name="ip"
-                        control={control}
-                        rules={{
-                            validate: {
-                                required: validateRequiredValue,
-                                ipv4: validateIpv4,
-                                inCidr: validateIpv4InCidr,
-                                gateway: validateIpGateway,
-                            },
-                        }}
-                        render={({ field, fieldState }) => (
-                            <Input
-                                {...field}
-                                type="text"
-                                data-testid="static_lease_ip"
-                                error={fieldState.error?.message}
-                                placeholder={t('form_enter_subnet_ip', { cidr })}
-                            />
-                        )}
+                        component={renderInputField}
+                        type="text"
+                        className="form-control"
+                        placeholder={t('form_enter_subnet_ip', { cidr })}
+                        validate={[validateRequiredValue, validateIpv4, validateIpv4InCidr, validateIpGateway]}
                     />
                 </div>
 
                 <div className="form__group">
-                    <Controller
+                    <Field
+                        id="hostname"
                         name="hostname"
-                        control={control}
-                        render={({ field, fieldState }) => (
-                            <Input
-                                {...field}
-                                type="text"
-                                data-testid="static_lease_hostname"
-                                error={fieldState.error?.message}
-                                placeholder={t('form_enter_hostname')}
-                            />
-                        )}
+                        component={renderInputField}
+                        type="text"
+                        className="form-control"
+                        placeholder={t('form_enter_hostname')}
                     />
                 </div>
             </div>
@@ -117,18 +90,16 @@ export const Form = ({ initialValues, processingAdding, cidr, isEdit, onSubmit }
                 <div className="btn-list">
                     <button
                         type="button"
-                        data-testid="static_lease_cancel"
                         className="btn btn-secondary btn-standard"
-                        disabled={isSubmitting}
+                        disabled={submitting}
                         onClick={onClick}>
                         <Trans>cancel_btn</Trans>
                     </button>
 
                     <button
                         type="submit"
-                        data-testid="static_lease_save"
                         className="btn btn-success btn-standard"
-                        disabled={isSubmitting || processingAdding || (!isDirty && !dynamicLease)}>
+                        disabled={submitting || processingAdding || (pristine && !dynamicLease)}>
                         <Trans>save_btn</Trans>
                     </button>
                 </div>
@@ -136,3 +107,8 @@ export const Form = ({ initialValues, processingAdding, cidr, isEdit, onSubmit }
         </form>
     );
 };
+
+export default reduxForm<
+    Record<string, any>,
+    Omit<FormStaticLeaseProps, 'submitting' | 'handleSubmit' | 'reset' | 'pristine'>
+>({ form: FORM_NAME.LEASE })(Form);

client/src/components/Settings/Dhcp/StaticLeases/Modal.tsx

@@ -4,7 +4,7 @@ import { Trans, withTranslation } from 'react-i18next';
 import ReactModal from 'react-modal';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 
-import { Form } from './Form';
+import Form from './Form';
 
 import { toggleLeaseModal } from '../../../../actions';
 import { MODAL_TYPE } from '../../../../helpers/constants';

client/src/components/Settings/Dhcp/index.tsx

@@ -4,8 +4,8 @@ import { Trans, useTranslation } from 'react-i18next';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import classNames from 'classnames';
 
-import { FormProvider, useForm } from 'react-hook-form';
-import { DHCP_DESCRIPTION_PLACEHOLDERS, STATUS_RESPONSE } from '../../../helpers/constants';
+import { destroy } from 'redux-form';
+import { DHCP_DESCRIPTION_PLACEHOLDERS, DHCP_FORM_NAMES, STATUS_RESPONSE, FORM_NAME } from '../../../helpers/constants';
 
 import Leases from './Leases';
 
@@ -40,55 +40,6 @@ import {
 import './index.css';
 import { RootState } from '../../../initialState';
 
-type IPv4FormValues = {
-    gateway_ip?: string;
-    subnet_mask?: string;
-    range_start?: string;
-    range_end?: string;
-    lease_duration?: number;
-}
-
-type IPv6FormValues = {
-    range_start?: string;
-    range_end?: string;
-    lease_duration?: number;
-}
-
-const getDefaultV4Values = (v4: IPv4FormValues) => {
-    const emptyForm = Object.entries(v4).every(
-        ([key, value]) => key === 'lease_duration' || value === ''
-    );
-
-    if (emptyForm) {
-        return {
-            ...v4,
-            lease_duration: undefined,
-        }
-    }
-
-    return v4;
-}
-
-export type DhcpFormValues = {
-    v4?: IPv4FormValues;
-    v6?: IPv6FormValues;
-    interface_name?: string;
-};
-
-const DEFAULT_V4_VALUES = {
-    gateway_ip: '',
-    subnet_mask: '',
-    range_start: '',
-    range_end: '',
-    lease_duration: undefined,
-};
-
-const DEFAULT_V6_VALUES = {
-    range_start: '',
-    range_end: '',
-    lease_duration: undefined,
-};
-
 const Dhcp = () => {
     const { t } = useTranslation();
     const dispatch = useDispatch();
@@ -114,21 +65,12 @@ const Dhcp = () => {
         modalType,
     } = useSelector((state: RootState) => state.dhcp, shallowEqual);
 
-    const methods = useForm<DhcpFormValues>({
-        mode: 'onBlur',
-        defaultValues: {
-            v4: getDefaultV4Values(v4),
-            v6,
-            interface_name: interfaceName || '',
-        },
-    });
-    const { watch, reset } = methods;
+    const interface_name =
+        useSelector((state: RootState) => state.form[FORM_NAME.DHCP_INTERFACES]?.values?.interface_name);
+    const isInterfaceIncludesIpv4 =
+        useSelector((state: RootState) => !!state.dhcp?.interfaces?.[interface_name]?.ipv4_addresses);
 
-    const interface_name = watch('interface_name');
-    const isInterfaceIncludesIpv4 = useSelector(
-        (state: RootState) => !!state.dhcp?.interfaces?.[interface_name]?.ipv4_addresses,
-    );
-    const ipv4Config = watch('v4');
+    const dhcp = useSelector((state: RootState) => state.form[FORM_NAME.DHCPv4], shallowEqual);
 
     const [ipv4placeholders, setIpv4Placeholders] = useState(DHCP_DESCRIPTION_PLACEHOLDERS.ipv4);
     const [ipv6placeholders, setIpv6Placeholders] = useState(DHCP_DESCRIPTION_PLACEHOLDERS.ipv6);
@@ -143,22 +85,6 @@ const Dhcp = () => {
         }
     }, [dhcp_available]);
 
-    useEffect(() => {
-        if (v4 || v6 || interfaceName) {
-            reset({
-                v4: {
-                    ...DEFAULT_V4_VALUES,
-                    ...getDefaultV4Values(v4),
-                },
-                v6: {
-                    ...DEFAULT_V6_VALUES,
-                    ...v6,
-                },
-                interface_name: interfaceName || '',
-            });
-        }
-    }, [v4, v6, interfaceName, reset]);
-
     useEffect(() => {
         const [ipv4] = interfaces?.[interface_name]?.ipv4_addresses ?? [];
         const [ipv6] = interfaces?.[interface_name]?.ipv6_addresses ?? [];
@@ -177,17 +103,13 @@ const Dhcp = () => {
     const clear = () => {
         // eslint-disable-next-line no-alert
         if (window.confirm(t('dhcp_reset'))) {
-            reset({
-                v4: DEFAULT_V4_VALUES,
-                v6: DEFAULT_V6_VALUES,
-                interface_name: '',
-            });
+            Object.values(DHCP_FORM_NAMES).forEach((formName: any) => dispatch(destroy(formName)));
             dispatch(resetDhcp());
             dispatch(getDhcpStatus());
         }
     };
 
-    const handleSubmit = (values: DhcpFormValues) => {
+    const handleSubmit = (values: any) => {
         dispatch(
             setDhcpConfig({
                 interface_name,
@@ -208,7 +130,12 @@ const Dhcp = () => {
     const enteredSomeValue = enteredSomeV4Value || enteredSomeV6Value || interfaceName;
 
     const getToggleDhcpButton = () => {
-        const filledConfig = interface_name && (Object.values(v4).every(Boolean) || Object.values(v6).every(Boolean));
+        const filledConfig =
+            interface_name &&
+            (Object.values(v4)
+
+                .every(Boolean) ||
+                Object.values(v6).every(Boolean));
 
         const className = classNames('btn btn-sm', {
             'btn-gray': enabled,
@@ -246,6 +173,9 @@ const Dhcp = () => {
 
     const toggleModal = () => dispatch(toggleLeaseModal());
 
+    const initialV4 = enteredSomeV4Value ? v4 : {};
+    const initialV6 = enteredSomeV6Value ? v6 : {};
+
     if (processing || processingInterfaces) {
         return <Loading />;
     }
@@ -266,13 +196,19 @@ const Dhcp = () => {
 
     const toggleDhcpButton = getToggleDhcpButton();
 
-    const inputtedIPv4values = ipv4Config.gateway_ip && ipv4Config.subnet_mask;
+    const inputtedIPv4values = dhcp?.values?.v4?.gateway_ip && dhcp?.values?.v4?.subnet_mask;
 
-    const isEmptyConfig = !Object.values(ipv4Config).some(Boolean);
+    const isEmptyConfig = !Object.values(dhcp?.values?.v4 ?? {}).some(Boolean);
     const disabledLeasesButton = Boolean(
-        !isInterfaceIncludesIpv4 || isEmptyConfig || processingConfig || !inputtedIPv4values,
+        dhcp?.syncErrors ||
+            !isInterfaceIncludesIpv4 ||
+            isEmptyConfig ||
+            processingConfig ||
+            !inputtedIPv4values,
     );
-    const cidr = inputtedIPv4values ? `${ipv4Config.gateway_ip}/${subnetMaskToBitMask(ipv4Config.subnet_mask)}` : '';
+    const cidr = inputtedIPv4values
+        ? `${dhcp?.values?.v4?.gateway_ip}/${subnetMaskToBitMask(dhcp?.values?.v4?.subnet_mask)}`
+        : '';
 
     return (
         <>
@@ -310,30 +246,29 @@ const Dhcp = () => {
                             </div>
                         )}
 
-                    <FormProvider {...methods}>
-                        <Interfaces />
-                        <Card title={t('dhcp_ipv4_settings')} bodyType="card-body box-body--settings">
-                            <div>
-                                <FormDHCPv4
-                                    onSubmit={handleSubmit}
-                                    processingConfig={processingConfig}
-                                    ipv4placeholders={ipv4placeholders}
-                                    interfaces={interfaces}
-                                />
-                            </div>
-                        </Card>
-                        <Card title={t('dhcp_ipv6_settings')} bodyType="card-body box-body--settings">
-                            <div>
-                                <FormDHCPv6
-                                    onSubmit={handleSubmit}
-                                    processingConfig={processingConfig}
-                                    ipv6placeholders={ipv6placeholders}
-                                    interfaces={interfaces}
-                                />
-                            </div>
-                        </Card>
-                    </FormProvider>
+                    <Interfaces initialValues={{ interface_name: interfaceName }} />
 
+                    <Card title={t('dhcp_ipv4_settings')} bodyType="card-body box-body--settings">
+                        <div>
+                            <FormDHCPv4
+                                onSubmit={handleSubmit}
+                                initialValues={{ v4: initialV4 }}
+                                processingConfig={processingConfig}
+                                ipv4placeholders={ipv4placeholders}
+                            />
+                        </div>
+                    </Card>
+
+                    <Card title={t('dhcp_ipv6_settings')} bodyType="card-body box-body--settings">
+                        <div>
+                            <FormDHCPv6
+                                onSubmit={handleSubmit}
+                                initialValues={{ v6: initialV6 }}
+                                processingConfig={processingConfig}
+                                ipv6placeholders={ipv6placeholders}
+                            />
+                        </div>
+                    </Card>
                     {enabled && (
                         <Card title={t('dhcp_leases')} bodyType="card-body box-body--settings">
                             <div className="row">
@@ -355,7 +290,7 @@ const Dhcp = () => {
                                     processingDeleting={processingDeleting}
                                     processingUpdating={processingUpdating}
                                     cidr={cidr}
-                                    gatewayIp={ipv4Config.gateway_ip}
+                                    gatewayIp={dhcp?.values?.v4?.gateway_ip}
                                 />
 
                                 <div className="btn-list mt-2">

client/src/components/Settings/Dns/Access/Form.tsx

@@ -1,140 +1,118 @@
-import React, { ReactNode } from 'react';
-import { Controller, useForm } from 'react-hook-form';
-import { Trans, useTranslation } from 'react-i18next';
+import React from 'react';
+import { connect } from 'react-redux';
 
-import i18next from 'i18next';
-import { CLIENT_ID_LINK } from '../../../../helpers/constants';
-import { removeEmptyLines, trimMultilineString } from '../../../../helpers/helpers';
-import { Textarea } from '../../../ui/Controls/Textarea';
+import { Field, reduxForm, formValueSelector } from 'redux-form';
+import { Trans, withTranslation } from 'react-i18next';
+import flow from 'lodash/flow';
 
-type FormData = {
-    allowed_clients: string;
-    disallowed_clients: string;
-    blocked_hosts: string;
-};
+import { renderTextareaField } from '../../../../helpers/form';
+import { trimMultilineString, removeEmptyLines } from '../../../../helpers/helpers';
+import { CLIENT_ID_LINK, FORM_NAME } from '../../../../helpers/constants';
 
-const fields: {
-    id: keyof FormData;
-    title: string;
-    subtitle: ReactNode;
-    normalizeOnBlur: (value: string) => string;
-}[] = [
+const fields = [
     {
         id: 'allowed_clients',
-        title: i18next.t('access_allowed_title'),
-        subtitle: (
-            <Trans
-                components={{
-                    a: <a href={CLIENT_ID_LINK} target="_blank" rel="noopener noreferrer" />,
-                }}>
-                access_allowed_desc
-            </Trans>
-        ),
+        title: 'access_allowed_title',
+        subtitle: 'access_allowed_desc',
         normalizeOnBlur: removeEmptyLines,
     },
     {
         id: 'disallowed_clients',
-        title: i18next.t('access_disallowed_title'),
-        subtitle: (
-            <Trans
-                components={{
-                    a: <a href={CLIENT_ID_LINK} target="_blank" rel="noopener noreferrer" />,
-                }}>
-                access_disallowed_desc
-            </Trans>
-        ),
+        title: 'access_disallowed_title',
+        subtitle: 'access_disallowed_desc',
         normalizeOnBlur: trimMultilineString,
     },
     {
         id: 'blocked_hosts',
-        title: i18next.t('access_blocked_title'),
-        subtitle: i18next.t('access_blocked_desc'),
+        title: 'access_blocked_title',
+        subtitle: 'access_blocked_desc',
         normalizeOnBlur: removeEmptyLines,
     },
 ];
 
-type FormProps = {
-    initialValues?: {
-        allowed_clients?: string;
-        disallowed_clients?: string;
-        blocked_hosts?: string;
-    };
-    onSubmit: (data: FormData) => void;
+interface FormProps {
+    handleSubmit: (...args: unknown[]) => string;
+    submitting: boolean;
+    invalid: boolean;
+    initialValues: object;
     processingSet: boolean;
-};
+    t: (...args: unknown[]) => string;
+    textarea?: boolean;
+    allowedClients?: string;
+}
 
-const Form = ({ initialValues, onSubmit, processingSet }: FormProps) => {
-    const { t } = useTranslation();
+interface renderFieldProps {
+    id?: string;
+    title?: string;
+    subtitle?: string;
+    disabled?: boolean;
+    processingSet?: boolean;
+    normalizeOnBlur?: (...args: unknown[]) => unknown;
+}
 
-    const {
-        control,
-        handleSubmit,
-        watch,
-        formState: { isSubmitting, isDirty },
-    } = useForm<FormData>({
-        mode: 'onBlur',
-        defaultValues: {
-            allowed_clients: initialValues?.allowed_clients || '',
-            disallowed_clients: initialValues?.disallowed_clients || '',
-            blocked_hosts: initialValues?.blocked_hosts || '',
-        },
-    });
-
-    const allowedClients = watch('allowed_clients');
+let Form = (props: FormProps) => {
+    const { allowedClients, handleSubmit, submitting, invalid, processingSet } = props;
 
     const renderField = ({
         id,
         title,
         subtitle,
+        disabled = false,
+        processingSet,
         normalizeOnBlur,
-    }: {
-        id: keyof FormData;
-        title: string;
-        subtitle: ReactNode;
-        normalizeOnBlur: (value: string) => string;
-    }) => {
-        const disabled = allowedClients && id === 'disallowed_clients';
+    }: renderFieldProps) => (
+        <div key={id} className="form__group mb-5">
+            <label className="form__label form__label--with-desc" htmlFor={id}>
+                <Trans>{title}</Trans>
 
-        return (
-            <div key={id} className="form__group mb-5">
-                <label className="form__label form__label--with-desc" htmlFor={id}>
-                    {title}
-                    {disabled && <>&nbsp;({t('disabled')})</>}
-                </label>
+                {disabled && (
+                    <>
+                        <span> </span>(<Trans>disabled</Trans>)
+                    </>
+                )}
+            </label>
 
-                <div className="form__desc form__desc--top">{subtitle}</div>
-
-                <Controller
-                    name={id}
-                    control={control}
-                    render={({ field }) => (
-                        <Textarea
-                            {...field}
-                            id={id}
-                            data-testid={id}
-                            disabled={disabled || processingSet}
-                            onBlur={(e) => {
-                                field.onChange(normalizeOnBlur(e.target.value));
-                            }}
-                        />
-                    )}
-                />
+            <div className="form__desc form__desc--top">
+                <Trans
+                    components={{
+                        a: (
+                            <a href={CLIENT_ID_LINK} target="_blank" rel="noopener noreferrer">
+                                text
+                            </a>
+                        ),
+                    }}>
+                    {subtitle}
+                </Trans>
             </div>
-        );
-    };
+
+            <Field
+                id={id}
+                name={id}
+                component={renderTextareaField}
+                type="text"
+                className="form-control form-control--textarea font-monospace"
+                disabled={disabled || processingSet}
+                normalizeOnBlur={normalizeOnBlur}
+            />
+        </div>
+    );
 
     return (
-        <form onSubmit={handleSubmit(onSubmit)}>
-            {fields.map((f) => renderField(f))}
+        <form onSubmit={handleSubmit}>
+            {fields.map((f) => {
+                return renderField({
+                    ...f,
+                    disabled: allowedClients && f.id === 'disallowed_clients' || false
+                });
+            })}
 
             <div className="card-actions">
                 <div className="btn-list">
                     <button
                         type="submit"
-                        data-testid="access_save"
                         className="btn btn-success btn-standard"
-                        disabled={isSubmitting || !isDirty || processingSet}>
-                        {t('save_config')}
+                        disabled={submitting || invalid || processingSet}>
+                        <Trans>save_config</Trans>
                     </button>
                 </div>
             </div>
@@ -142,4 +120,18 @@ const Form = ({ initialValues, onSubmit, processingSet }: FormProps) => {
     );
 };
 
-export default Form;
+const selector = formValueSelector(FORM_NAME.ACCESS);
+
+Form = connect((state) => {
+    const allowedClients = selector(state, 'allowed_clients');
+    return {
+        allowedClients,
+    };
+})(Form);
+
+export default flow([
+    withTranslation(),
+    reduxForm({
+        form: FORM_NAME.ACCESS,
+    }),
+])(Form);

client/src/components/Settings/Dns/Cache/Form.tsx

@@ -1,72 +1,52 @@
 import React from 'react';
-import { Controller, useForm } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
-import { useDispatch, useSelector } from 'react-redux';
 
-import i18next from 'i18next';
-import { clearDnsCache } from '../../../../actions/dnsConfig';
-import { CACHE_CONFIG_FIELDS, UINT32_RANGE } from '../../../../helpers/constants';
+import { Field, reduxForm } from 'redux-form';
+import { Trans, useTranslation } from 'react-i18next';
+import { shallowEqual, useDispatch, useSelector } from 'react-redux';
+
+import { renderInputField, toNumber, CheckboxField } from '../../../../helpers/form';
+import { CACHE_CONFIG_FIELDS, FORM_NAME, UINT32_RANGE } from '../../../../helpers/constants';
+
 import { replaceZeroWithEmptyString } from '../../../../helpers/helpers';
+import { clearDnsCache } from '../../../../actions/dnsConfig';
 import { RootState } from '../../../../initialState';
-import { Checkbox } from '../../../ui/Controls/Checkbox';
 
 const INPUTS_FIELDS = [
     {
         name: CACHE_CONFIG_FIELDS.cache_size,
-        title: i18next.t('cache_size'),
-        description: i18next.t('cache_size_desc'),
-        placeholder: i18next.t('enter_cache_size'),
+        title: 'cache_size',
+        description: 'cache_size_desc',
+        placeholder: 'enter_cache_size',
     },
     {
         name: CACHE_CONFIG_FIELDS.cache_ttl_min,
-        title: i18next.t('cache_ttl_min_override'),
-        description: i18next.t('cache_ttl_min_override_desc'),
-        placeholder: i18next.t('enter_cache_ttl_min_override'),
+        title: 'cache_ttl_min_override',
+        description: 'cache_ttl_min_override_desc',
+        placeholder: 'enter_cache_ttl_min_override',
     },
     {
         name: CACHE_CONFIG_FIELDS.cache_ttl_max,
-        title: i18next.t('cache_ttl_max_override'),
-        description: i18next.t('cache_ttl_max_override_desc'),
-        placeholder: i18next.t('enter_cache_ttl_max_override'),
+        title: 'cache_ttl_max_override',
+        description: 'cache_ttl_max_override_desc',
+        placeholder: 'enter_cache_ttl_max_override',
     },
 ];
 
-type FormData = {
-    cache_size: number;
-    cache_ttl_min: number;
-    cache_ttl_max: number;
-    cache_optimistic: boolean;
-};
+interface CacheFormProps {
+    handleSubmit: (...args: unknown[]) => string;
+    submitting: boolean;
+    invalid: boolean;
+}
 
-type CacheFormProps = {
-    initialValues?: Partial<FormData>;
-    onSubmit: (data: FormData) => void;
-};
-
-const Form = ({ initialValues, onSubmit }: CacheFormProps) => {
+const Form = ({ handleSubmit, submitting, invalid }: CacheFormProps) => {
     const { t } = useTranslation();
     const dispatch = useDispatch();
 
-    const { processingSetConfig } = useSelector((state: RootState) => state.dnsConfig);
-
-    const {
-        register,
-        handleSubmit,
-        watch,
-        control,
-        formState: { isSubmitting, isDirty },
-    } = useForm<FormData>({
-        mode: 'onBlur',
-        defaultValues: {
-            cache_size: initialValues?.cache_size || 0,
-            cache_ttl_min: initialValues?.cache_ttl_min || 0,
-            cache_ttl_max: initialValues?.cache_ttl_max || 0,
-            cache_optimistic: initialValues?.cache_optimistic || false,
-        },
-    });
-
-    const cache_ttl_min = watch('cache_ttl_min');
-    const cache_ttl_max = watch('cache_ttl_max');
+    const { processingSetConfig } = useSelector((state: RootState) => state.dnsConfig, shallowEqual);
+    const { cache_ttl_max, cache_ttl_min } = useSelector(
+        (state: RootState) => state.form[FORM_NAME.CACHE].values,
+        shallowEqual,
+    );
 
     const minExceedsMax = cache_ttl_min > 0 && cache_ttl_max > 0 && cache_ttl_min > cache_ttl_max;
 
@@ -77,30 +57,29 @@ const Form = ({ initialValues, onSubmit }: CacheFormProps) => {
     };
 
     return (
-        <form onSubmit={handleSubmit(onSubmit)}>
+        <form onSubmit={handleSubmit}>
             <div className="row">
                 {INPUTS_FIELDS.map(({ name, title, description, placeholder }) => (
                     <div className="col-12" key={name}>
                         <div className="col-12 col-md-7 p-0">
                             <div className="form__group form__group--settings">
                                 <label htmlFor={name} className="form__label form__label--with-desc">
-                                    {title}
+                                    {t(title)}
                                 </label>
 
-                                <div className="form__desc form__desc--top">{description}</div>
+                                <div className="form__desc form__desc--top">{t(description)}</div>
 
-                                <input
+                                <Field
+                                    name={name}
                                     type="number"
-                                    data-testid={`dns_${name}`}
-                                    className="form-control"
-                                    placeholder={placeholder}
+                                    component={renderInputField}
+                                    placeholder={t(placeholder)}
                                     disabled={processingSetConfig}
+                                    className="form-control"
+                                    normalizeOnBlur={replaceZeroWithEmptyString}
+                                    normalize={toNumber}
                                     min={0}
                                     max={UINT32_RANGE.MAX}
-                                    {...register(name as keyof FormData, {
-                                        valueAsNumber: true,
-                                        setValueAs: (value) => replaceZeroWithEmptyString(value),
-                                    })}
                                 />
                             </div>
                         </div>
@@ -112,18 +91,13 @@ const Form = ({ initialValues, onSubmit }: CacheFormProps) => {
             <div className="row">
                 <div className="col-12 col-md-7">
                     <div className="form__group form__group--settings">
-                        <Controller
+                        <Field
                             name="cache_optimistic"
-                            control={control}
-                            render={({ field }) => (
-                                <Checkbox
-                                    {...field}
-                                    data-testid="dns_cache_optimistic"
-                                    title={t('cache_optimistic')}
-                                    subtitle={t('cache_optimistic_desc')}
-                                    disabled={processingSetConfig}
-                                />
-                            )}
+                            type="checkbox"
+                            component={CheckboxField}
+                            placeholder={t('cache_optimistic')}
+                            disabled={processingSetConfig}
+                            subtitle={t('cache_optimistic_desc')}
                         />
                     </div>
                 </div>
@@ -131,21 +105,19 @@ const Form = ({ initialValues, onSubmit }: CacheFormProps) => {
 
             <button
                 type="submit"
-                data-testid="dns_save"
                 className="btn btn-success btn-standard btn-large"
-                disabled={isSubmitting || !isDirty || processingSetConfig || minExceedsMax}>
-                {t('save_btn')}
+                disabled={submitting || invalid || processingSetConfig || minExceedsMax}>
+                <Trans>save_btn</Trans>
             </button>
 
             <button
                 type="button"
-                data-testid="dns_clear"
                 className="btn btn-outline-secondary btn-standard form__button"
                 onClick={handleClearCache}>
-                {t('clear_cache')}
+                <Trans>clear_cache</Trans>
             </button>
         </form>
     );
 };
 
-export default Form;
+export default reduxForm({ form: FORM_NAME.CACHE })(Form);

client/src/components/Settings/Dns/Config/Form.tsx

@@ -1,279 +1,211 @@
 import React from 'react';
-import { Controller, useForm } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
+import { shallowEqual, useSelector } from 'react-redux';
 
-import i18next from 'i18next';
-import { validateIp, validateIpv4, validateIpv6, validateRequiredValue } from '../../../../helpers/validators';
+import { Field, reduxForm } from 'redux-form';
+import { Trans, useTranslation } from 'react-i18next';
+import {
+    renderInputField,
+    renderRadioField,
+    renderTextareaField,
+    CheckboxField,
+    toNumber,
+} from '../../../../helpers/form';
+import {
+    validateIpv4,
+    validateIpv6,
+    validateRequiredValue,
+    validateIp,
+    validateIPv4Subnet,
+    validateIPv6Subnet,
+} from '../../../../helpers/validators';
 
-import { BLOCKING_MODES, UINT32_RANGE } from '../../../../helpers/constants';
-import { Checkbox } from '../../../ui/Controls/Checkbox';
-import { Input } from '../../../ui/Controls/Input';
-import { toNumber } from '../../../../helpers/form';
-import { Textarea } from '../../../ui/Controls/Textarea';
-import { Radio } from '../../../ui/Controls/Radio';
+import { removeEmptyLines } from '../../../../helpers/helpers';
+import { BLOCKING_MODES, FORM_NAME, UINT32_RANGE } from '../../../../helpers/constants';
+import { RootState } from '../../../../initialState';
 
-const checkboxes: {
-    name: 'dnssec_enabled' | 'disable_ipv6';
-    placeholder: string;
-    subtitle: string;
-}[] = [
+const checkboxes = [
     {
         name: 'dnssec_enabled',
-        placeholder: i18next.t('dnssec_enable'),
-        subtitle: i18next.t('dnssec_enable_desc'),
+        placeholder: 'dnssec_enable',
+        subtitle: 'dnssec_enable_desc',
     },
     {
         name: 'disable_ipv6',
-        placeholder: i18next.t('disable_ipv6'),
-        subtitle: i18next.t('disable_ipv6_desc'),
+        placeholder: 'disable_ipv6',
+        subtitle: 'disable_ipv6_desc',
     },
 ];
 
-const customIps: {
-    name: 'blocking_ipv4' | 'blocking_ipv6';
-    label: string;
-    description: string;
-    validateIp: (value: string) => string;
-}[] = [
+const customIps = [
     {
+        description: 'blocking_ipv4_desc',
         name: 'blocking_ipv4',
-        label: i18next.t('blocking_ipv4'),
-        description: i18next.t('blocking_ipv4_desc'),
         validateIp: validateIpv4,
     },
     {
+        description: 'blocking_ipv6_desc',
         name: 'blocking_ipv6',
-        label: i18next.t('blocking_ipv6'),
-        description: i18next.t('blocking_ipv6_desc'),
         validateIp: validateIpv6,
     },
 ];
 
-const blockingModeOptions = [
-    {
-        value: BLOCKING_MODES.default,
-        label: i18next.t('default'),
-    },
-    {
-        value: BLOCKING_MODES.refused,
-        label: i18next.t('refused'),
-    },
-    {
-        value: BLOCKING_MODES.nxdomain,
-        label: i18next.t('nxdomain'),
-    },
-    {
-        value: BLOCKING_MODES.null_ip,
-        label: i18next.t('null_ip'),
-    },
-    {
-        value: BLOCKING_MODES.custom_ip,
-        label: i18next.t('custom_ip'),
-    },
-];
+const getFields = (processing: any, t: any) =>
+    Object.values(BLOCKING_MODES)
 
-const blockingModeDescriptions = [
-    i18next.t(`blocking_mode_default`),
-    i18next.t(`blocking_mode_refused`),
-    i18next.t(`blocking_mode_nxdomain`),
-    i18next.t(`blocking_mode_null_ip`),
-    i18next.t(`blocking_mode_custom_ip`),
-];
+        .map((mode: any) => (
+            <Field
+                key={mode}
+                name="blocking_mode"
+                type="radio"
+                component={renderRadioField}
+                value={mode}
+                placeholder={t(mode)}
+                disabled={processing}
+            />
+        ));
 
-type FormData = {
-    ratelimit: number;
-    ratelimit_subnet_len_ipv4: number;
-    ratelimit_subnet_len_ipv6: number;
-    ratelimit_whitelist: string;
-    edns_cs_enabled: boolean;
-    edns_cs_use_custom: boolean;
-    edns_cs_custom_ip?: string;
-    dnssec_enabled: boolean;
-    disable_ipv6: boolean;
-    blocking_mode: string;
-    blocking_ipv4?: string;
-    blocking_ipv6?: string;
-    blocked_response_ttl: number;
-};
-
-type Props = {
+interface ConfigFormProps {
+    handleSubmit: (...args: unknown[]) => string;
+    submitting: boolean;
+    invalid: boolean;
     processing?: boolean;
-    initialValues?: Partial<FormData>;
-    onSubmit: (data: FormData) => void;
-};
+}
 
-const Form = ({ processing, initialValues, onSubmit }: Props) => {
+const Form = ({ handleSubmit, submitting, invalid, processing }: ConfigFormProps) => {
     const { t } = useTranslation();
-
-    const {
-        handleSubmit,
-        watch,
-        control,
-        formState: { isSubmitting, isDirty },
-    } = useForm<FormData>({
-        mode: 'onBlur',
-        defaultValues: initialValues,
-    });
-
-    const blocking_mode = watch('blocking_mode');
-    const edns_cs_enabled = watch('edns_cs_enabled');
-    const edns_cs_use_custom = watch('edns_cs_use_custom');
+    const { blocking_mode, edns_cs_enabled, edns_cs_use_custom } = useSelector(
+        (state: RootState) => state.form[FORM_NAME.BLOCKING_MODE].values ?? {},
+        shallowEqual,
+    );
 
     return (
-        <form onSubmit={handleSubmit(onSubmit)}>
+        <form onSubmit={handleSubmit}>
             <div className="row">
                 <div className="col-12 col-md-7">
                     <div className="form__group form__group--settings">
-                        <Controller
+                        <label htmlFor="ratelimit" className="form__label form__label--with-desc">
+                            <Trans>rate_limit</Trans>
+                        </label>
+
+                        <div className="form__desc form__desc--top">
+                            <Trans>rate_limit_desc</Trans>
+                        </div>
+
+                        <Field
                             name="ratelimit"
-                            control={control}
-                            rules={{ validate: validateRequiredValue }}
-                            render={({ field, fieldState }) => (
-                                <Input
-                                    {...field}
-                                    data-testid="dns_config_ratelimit"
-                                    type="number"
-                                    label={t('rate_limit')}
-                                    desc={t('rate_limit_desc')}
-                                    error={fieldState.error?.message}
-                                    min={UINT32_RANGE.MIN}
-                                    max={UINT32_RANGE.MAX}
-                                    disabled={processing}
-                                    onChange={(e) => {
-                                        const { value } = e.target;
-                                        field.onChange(toNumber(value));
-                                    }}
-                                />
-                            )}
+                            type="number"
+                            component={renderInputField}
+                            className="form-control"
+                            placeholder={t('form_enter_rate_limit')}
+                            normalize={toNumber}
+                            validate={validateRequiredValue}
+                            min={UINT32_RANGE.MIN}
+                            max={UINT32_RANGE.MAX}
                         />
                     </div>
                 </div>
 
                 <div className="col-12 col-md-7">
                     <div className="form__group form__group--settings">
-                        <Controller
+                        <label htmlFor="ratelimit_subnet_len_ipv4" className="form__label form__label--with-desc">
+                            <Trans>rate_limit_subnet_len_ipv4</Trans>
+                        </label>
+
+                        <div className="form__desc form__desc--top">
+                            <Trans>rate_limit_subnet_len_ipv4_desc</Trans>
+                        </div>
+
+                        <Field
                             name="ratelimit_subnet_len_ipv4"
-                            control={control}
-                            rules={{ validate: validateRequiredValue }}
-                            render={({ field, fieldState }) => (
-                                <Input
-                                    {...field}
-                                    data-testid="dns_config_subnet_ipv4"
-                                    type="number"
-                                    label={t('rate_limit_subnet_len_ipv4')}
-                                    desc={t('rate_limit_subnet_len_ipv4_desc')}
-                                    error={fieldState.error?.message}
-                                    min={0}
-                                    max={32}
-                                    disabled={processing}
-                                    onChange={(e) => {
-                                        const { value } = e.target;
-                                        field.onChange(toNumber(value));
-                                    }}
-                                />
-                            )}
+                            type="number"
+                            component={renderInputField}
+                            className="form-control"
+                            placeholder={t('form_enter_rate_limit_subnet_len')}
+                            normalize={toNumber}
+                            validate={[validateRequiredValue, validateIPv4Subnet]}
+                            min={0}
+                            max={32}
                         />
                     </div>
                 </div>
 
                 <div className="col-12 col-md-7">
                     <div className="form__group form__group--settings">
-                        <Controller
+                        <label htmlFor="ratelimit_subnet_len_ipv6" className="form__label form__label--with-desc">
+                            <Trans>rate_limit_subnet_len_ipv6</Trans>
+                        </label>
+
+                        <div className="form__desc form__desc--top">
+                            <Trans>rate_limit_subnet_len_ipv6_desc</Trans>
+                        </div>
+
+                        <Field
                             name="ratelimit_subnet_len_ipv6"
-                            control={control}
-                            rules={{ validate: validateRequiredValue }}
-                            render={({ field, fieldState }) => (
-                                <Input
-                                    {...field}
-                                    data-testid="dns_config_subnet_ipv6"
-                                    type="number"
-                                    label={t('rate_limit_subnet_len_ipv6')}
-                                    desc={t('rate_limit_subnet_len_ipv6_desc')}
-                                    error={fieldState.error?.message}
-                                    min={0}
-                                    max={128}
-                                    disabled={processing}
-                                    onChange={(e) => {
-                                        const { value } = e.target;
-                                        field.onChange(toNumber(value));
-                                    }}
-                                />
-                            )}
+                            type="number"
+                            component={renderInputField}
+                            className="form-control"
+                            placeholder={t('form_enter_rate_limit_subnet_len')}
+                            normalize={toNumber}
+                            validate={[validateRequiredValue, validateIPv6Subnet]}
+                            min={0}
+                            max={128}
                         />
                     </div>
                 </div>
 
                 <div className="col-12 col-md-7">
                     <div className="form__group form__group--settings">
-                        <Controller
+                        <label htmlFor="ratelimit_whitelist" className="form__label form__label--with-desc">
+                            <Trans>rate_limit_whitelist</Trans>
+                        </label>
+
+                        <div className="form__desc form__desc--top">
+                            <Trans>rate_limit_whitelist_desc</Trans>
+                        </div>
+
+                        <Field
                             name="ratelimit_whitelist"
-                            control={control}
-                            render={({ field, fieldState }) => (
-                                <Textarea
-                                    {...field}
-                                    data-testid="dns_config_subnet_ipv6"
-                                    label={t('rate_limit_whitelist')}
-                                    desc={t('rate_limit_whitelist_desc')}
-                                    error={fieldState.error?.message}
-                                    disabled={processing}
-                                    trimOnBlur
-                                />
-                            )}
+                            component={renderTextareaField}
+                            type="text"
+                            className="form-control"
+                            placeholder={t('rate_limit_whitelist_placeholder')}
+                            normalizeOnBlur={removeEmptyLines}
                         />
                     </div>
                 </div>
 
                 <div className="col-12">
                     <div className="form__group form__group--settings">
-                        <Controller
+                        <Field
                             name="edns_cs_enabled"
-                            control={control}
-                            render={({ field }) => (
-                                <Checkbox
-                                    {...field}
-                                    data-testid="dns_config_edns_cs_enabled"
-                                    title={t('edns_enable')}
-                                    disabled={processing}
-                                />
-                            )}
+                            type="checkbox"
+                            component={CheckboxField}
+                            placeholder={t('edns_enable')}
+                            disabled={processing}
+                            subtitle={t('edns_cs_desc')}
                         />
                     </div>
                 </div>
 
                 <div className="col-12 form__group form__group--inner">
-                    <div className="form__group">
-                        <Controller
+                    <div className="form__group ">
+                        <Field
                             name="edns_cs_use_custom"
-                            control={control}
-                            render={({ field }) => (
-                                <Checkbox
-                                    {...field}
-                                    data-testid="dns_config_edns_use_custom_ip"
-                                    title={t('edns_use_custom_ip')}
-                                    disabled={processing || !edns_cs_enabled}
-                                />
-                            )}
+                            type="checkbox"
+                            component={CheckboxField}
+                            placeholder={t('edns_use_custom_ip')}
+                            disabled={processing || !edns_cs_enabled}
+                            subtitle={t('edns_use_custom_ip_desc')}
                         />
                     </div>
 
                     {edns_cs_use_custom && (
-                        <Controller
+                        <Field
                             name="edns_cs_custom_ip"
-                            control={control}
-                            rules={{
-                                validate: {
-                                    required: validateRequiredValue,
-                                    id: validateIp,
-                                },
-                            }}
-                            render={({ field, fieldState }) => (
-                                <Input
-                                    {...field}
-                                    data-testid="dns_config_edns_cs_custom_ip"
-                                    error={fieldState.error?.message}
-                                    disabled={processing || !edns_cs_enabled}
-                                />
-                            )}
+                            component={renderInputField}
+                            className="form-control"
+                            placeholder={t('form_enter_ip')}
+                            validate={[validateIp, validateRequiredValue]}
                         />
                     )}
                 </div>
@@ -281,18 +213,13 @@ const Form = ({ processing, initialValues, onSubmit }: Props) => {
                 {checkboxes.map(({ name, placeholder, subtitle }) => (
                     <div className="col-12" key={name}>
                         <div className="form__group form__group--settings">
-                            <Controller
+                            <Field
                                 name={name}
-                                control={control}
-                                render={({ field }) => (
-                                    <Checkbox
-                                        {...field}
-                                        data-testid={`dns_config_${name}`}
-                                        title={placeholder}
-                                        subtitle={subtitle}
-                                        disabled={processing}
-                                    />
-                                )}
+                                type="checkbox"
+                                component={CheckboxField}
+                                placeholder={t(placeholder)}
+                                disabled={processing}
+                                subtitle={t(subtitle)}
                             />
                         </div>
                     </div>
@@ -300,50 +227,42 @@ const Form = ({ processing, initialValues, onSubmit }: Props) => {
 
                 <div className="col-12">
                     <div className="form__group form__group--settings mb-4">
-                        <label className="form__label form__label--with-desc">{t('blocking_mode')}</label>
+                        <label className="form__label form__label--with-desc">
+                            <Trans>blocking_mode</Trans>
+                        </label>
 
                         <div className="form__desc form__desc--top">
-                            {blockingModeDescriptions.map((desc: string) => (
-                                <li key={desc}>{desc}</li>
-                            ))}
+                            {Object.values(BLOCKING_MODES)
+
+                                .map((mode: any) => (
+                                    <li key={mode}>
+                                        <Trans>{`blocking_mode_${mode}`}</Trans>
+                                    </li>
+                                ))}
                         </div>
 
-                        <div className="custom-controls-stacked">
-                            <Controller
-                                name="blocking_mode"
-                                control={control}
-                                render={({ field }) => (
-                                    <Radio {...field} options={blockingModeOptions} disabled={processing} />
-                                )}
-                            />
-                        </div>
+                        <div className="custom-controls-stacked">{getFields(processing, t)}</div>
                     </div>
                 </div>
                 {blocking_mode === BLOCKING_MODES.custom_ip && (
                     <>
-                        {customIps.map(({ label, description, name, validateIp }) => (
+                        {customIps.map(({ description, name, validateIp }) => (
                             <div className="col-12 col-sm-6" key={name}>
                                 <div className="form__group form__group--settings">
-                                    <Controller
+                                    <label className="form__label form__label--with-desc" htmlFor={name}>
+                                        <Trans>{name}</Trans>
+                                    </label>
+
+                                    <div className="form__desc form__desc--top">
+                                        <Trans>{description}</Trans>
+                                    </div>
+
+                                    <Field
                                         name={name}
-                                        control={control}
-                                        rules={{
-                                            validate: {
-                                                required: validateRequiredValue,
-                                                ip: validateIp,
-                                            },
-                                        }}
-                                        render={({ field, fieldState }) => (
-                                            <Input
-                                                {...field}
-                                                data-testid="dns_config_blocked_response_ttl"
-                                                type="text"
-                                                label={label}
-                                                desc={description}
-                                                error={fieldState.error?.message}
-                                                disabled={processing}
-                                            />
-                                        )}
+                                        component={renderInputField}
+                                        className="form-control"
+                                        placeholder={t('form_enter_ip')}
+                                        validate={[validateIp, validateRequiredValue]}
                                     />
                                 </div>
                             </div>
@@ -353,27 +272,24 @@ const Form = ({ processing, initialValues, onSubmit }: Props) => {
 
                 <div className="col-12 col-md-7">
                     <div className="form__group form__group--settings">
-                        <Controller
+                        <label htmlFor="blocked_response_ttl" className="form__label form__label--with-desc">
+                            <Trans>blocked_response_ttl</Trans>
+                        </label>
+
+                        <div className="form__desc form__desc--top">
+                            <Trans>blocked_response_ttl_desc</Trans>
+                        </div>
+
+                        <Field
                             name="blocked_response_ttl"
-                            control={control}
-                            rules={{ validate: validateRequiredValue }}
-                            render={({ field, fieldState }) => (
-                                <Input
-                                    {...field}
-                                    data-testid="dns_config_blocked_response_ttl"
-                                    type="number"
-                                    label={t('blocked_response_ttl')}
-                                    desc={t('blocked_response_ttl_desc')}
-                                    error={fieldState.error?.message}
-                                    min={UINT32_RANGE.MIN}
-                                    max={UINT32_RANGE.MAX}
-                                    disabled={processing}
-                                    onChange={(e) => {
-                                        const { value } = e.target;
-                                        field.onChange(toNumber(value));
-                                    }}
-                                />
-                            )}
+                            type="number"
+                            component={renderInputField}
+                            className="form-control"
+                            placeholder={t('form_enter_blocked_response_ttl')}
+                            normalize={toNumber}
+                            validate={validateRequiredValue}
+                            min={UINT32_RANGE.MIN}
+                            max={UINT32_RANGE.MAX}
                         />
                     </div>
                 </div>
@@ -381,13 +297,14 @@ const Form = ({ processing, initialValues, onSubmit }: Props) => {
 
             <button
                 type="submit"
-                data-testid="dns_config_save"
                 className="btn btn-success btn-standard btn-large"
-                disabled={isSubmitting || !isDirty || processing}>
-                {t('save_btn')}
+                disabled={submitting || invalid || processing}>
+                <Trans>save_btn</Trans>
             </button>
         </form>
     );
 };
 
-export default Form;
+export default reduxForm<Record<string, any>, Omit<ConfigFormProps, 'invalid' | 'submitting' | 'handleSubmit'>>({
+    form: FORM_NAME.BLOCKING_MODE,
+})(Form);

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

@@ -1,110 +1,173 @@
 import React, { useRef } from 'react';
-import { Controller, useForm } from 'react-hook-form';
-import { Trans, useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
 
-import i18next from 'i18next';
-import clsx from 'clsx';
-import { testUpstreamWithFormValues } from '../../../../actions';
-import { DNS_REQUEST_OPTIONS, UINT32_RANGE, UPSTREAM_CONFIGURATION_WIKI_LINK } from '../../../../helpers/constants';
-import { removeEmptyLines } from '../../../../helpers/helpers';
-import { getTextareaCommentsHighlight, syncScroll } from '../../../../helpers/highlightTextareaComments';
-import { RootState } from '../../../../initialState';
-import '../../../ui/texareaCommentsHighlight.css';
+import { Field, reduxForm } from 'redux-form';
+import { Trans, useTranslation } from 'react-i18next';
+import classnames from 'classnames';
+
 import Examples from './Examples';
-import { Checkbox } from '../../../ui/Controls/Checkbox';
-import { Textarea } from '../../../ui/Controls/Textarea';
-import { Radio } from '../../../ui/Controls/Radio';
-import { Input } from '../../../ui/Controls/Input';
-import { validateRequiredValue } from '../../../../helpers/validators';
-import { toNumber } from '../../../../helpers/form';
+
+import { renderRadioField, renderTextareaField, CheckboxField } from '../../../../helpers/form';
+import { DNS_REQUEST_OPTIONS, FORM_NAME, UPSTREAM_CONFIGURATION_WIKI_LINK } from '../../../../helpers/constants';
+
+import { testUpstreamWithFormValues } from '../../../../actions';
+
+import { removeEmptyLines, trimLinesAndRemoveEmpty } from '../../../../helpers/helpers';
+
+import { getTextareaCommentsHighlight, syncScroll } from '../../../../helpers/highlightTextareaComments';
+import '../../../ui/texareaCommentsHighlight.css';
+import { RootState } from '../../../../initialState';
 
 const UPSTREAM_DNS_NAME = 'upstream_dns';
+const UPSTREAM_MODE_NAME = 'upstream_mode';
 
-type FormData = {
-    upstream_dns: string;
-    upstream_mode: string;
-    fallback_dns: string;
-    bootstrap_dns: string;
-    local_ptr_upstreams: string;
-    use_private_ptr_resolvers: boolean;
-    resolve_clients: boolean;
-    upstream_timeout: number;
+interface renderFieldProps {
+    name: string;
+    component: any;
+    type: string;
+    className?: string;
+    placeholder: string;
+    subtitle?: string;
+    value?: string;
+    normalizeOnBlur?: (...args: unknown[]) => unknown;
+    containerClass?: string;
+    onScroll?: (...args: unknown[]) => unknown;
+}
+
+const renderField = ({
+    name,
+    component,
+    type,
+    className,
+    placeholder,
+    subtitle,
+    value,
+    normalizeOnBlur,
+    containerClass,
+    onScroll,
+}: renderFieldProps) => {
+    const { t } = useTranslation();
+
+    const processingTestUpstream = useSelector((state: RootState) => state.settings.processingTestUpstream);
+
+    const processingSetConfig = useSelector((state: RootState) => state.dnsConfig.processingSetConfig);
+
+    return (
+        <div key={placeholder} className={classnames('col-12 mb-4', containerClass)}>
+            <Field
+                id={name}
+                value={value}
+                name={name}
+                component={component}
+                type={type}
+                className={className}
+                placeholder={t(placeholder)}
+                subtitle={t(subtitle)}
+                disabled={processingSetConfig || processingTestUpstream}
+                normalizeOnBlur={normalizeOnBlur}
+                onScroll={onScroll}
+            />
+        </div>
+    );
 };
 
-type FormProps = {
-    initialValues?: Partial<FormData>;
-    onSubmit: (data: FormData) => void;
+interface renderTextareaWithHighlightFieldProps {
+    className: string;
+    disabled?: boolean;
+    id: string;
+    input?: object;
+    meta?: object;
+    normalizeOnBlur?: (...args: unknown[]) => unknown;
+    onScroll?: (...args: unknown[]) => unknown;
+    placeholder: string;
+    type: string;
+}
+
+const renderTextareaWithHighlightField = (props: renderTextareaWithHighlightFieldProps) => {
+    const upstream_dns = useSelector((store: RootState) => store.form[FORM_NAME.UPSTREAM].values.upstream_dns);
+
+    const upstream_dns_file = useSelector((state: RootState) => state.dnsConfig.upstream_dns_file);
+    const ref = useRef(null);
+
+    const onScroll = (e: any) => syncScroll(e, ref);
+
+    return (
+        <>
+            {renderTextareaField({
+                ...props,
+                disabled: !!upstream_dns_file,
+                onScroll,
+                normalizeOnBlur: trimLinesAndRemoveEmpty,
+            })}
+
+            {getTextareaCommentsHighlight(ref, upstream_dns)}
+        </>
+    );
 };
 
-const upstreamModeOptions = [
+const INPUT_FIELDS = [
     {
-        label: i18next.t('load_balancing'),
-        desc: <Trans components={{ br: <br />, b: <b /> }}>load_balancing_desc</Trans>,
+        name: UPSTREAM_MODE_NAME,
+        type: 'radio',
         value: DNS_REQUEST_OPTIONS.LOAD_BALANCING,
+        component: renderRadioField,
+        subtitle: 'load_balancing_desc',
+        placeholder: 'load_balancing',
     },
     {
-        label: i18next.t('parallel_requests'),
-        desc: <Trans components={{ br: <br />, b: <b /> }}>upstream_parallel</Trans>,
+        name: UPSTREAM_MODE_NAME,
+        type: 'radio',
         value: DNS_REQUEST_OPTIONS.PARALLEL,
+        component: renderRadioField,
+        subtitle: 'upstream_parallel',
+        placeholder: 'parallel_requests',
     },
     {
-        label: i18next.t('fastest_addr'),
-        desc: <Trans components={{ br: <br />, b: <b /> }}>fastest_addr_desc</Trans>,
+        name: UPSTREAM_MODE_NAME,
+        type: 'radio',
         value: DNS_REQUEST_OPTIONS.FASTEST_ADDR,
+        component: renderRadioField,
+        subtitle: 'fastest_addr_desc',
+        placeholder: 'fastest_addr',
     },
 ];
 
-const Form = ({ initialValues, onSubmit }: FormProps) => {
-    const { t } = useTranslation();
+interface FormProps {
+    handleSubmit?: (...args: unknown[]) => string;
+    submitting?: boolean;
+    invalid?: boolean;
+    initialValues?: object;
+    upstream_dns?: string;
+    fallback_dns?: string;
+    bootstrap_dns?: string;
+}
+
+const Form = ({ submitting, invalid, handleSubmit }: FormProps) => {
     const dispatch = useDispatch();
-    const textareaRef = useRef<HTMLTextAreaElement>(null);
+    const { t } = useTranslation();
 
-    const {
-        control,
-        handleSubmit,
-        watch,
-        formState: { isSubmitting, isDirty },
-    } = useForm<FormData>({
-        mode: 'onBlur',
-        defaultValues: {
-            upstream_dns: initialValues?.upstream_dns || '',
-            upstream_mode: initialValues?.upstream_mode || DNS_REQUEST_OPTIONS.LOAD_BALANCING,
-            fallback_dns: initialValues?.fallback_dns || '',
-            bootstrap_dns: initialValues?.bootstrap_dns || '',
-            local_ptr_upstreams: initialValues?.local_ptr_upstreams || '',
-            use_private_ptr_resolvers: initialValues?.use_private_ptr_resolvers || false,
-            resolve_clients: initialValues?.resolve_clients || false,
-            upstream_timeout: initialValues?.upstream_timeout || 0,
-        },
-    });
+    const upstream_dns = useSelector((store: RootState) => store.form[FORM_NAME.UPSTREAM].values.upstream_dns);
 
-    const upstream_dns = watch('upstream_dns');
     const processingTestUpstream = useSelector((state: RootState) => state.settings.processingTestUpstream);
+
     const processingSetConfig = useSelector((state: RootState) => state.dnsConfig.processingSetConfig);
     const defaultLocalPtrUpstreams = useSelector((state: RootState) => state.dnsConfig.default_local_ptr_upstreams);
-    const upstream_dns_file = useSelector((state: RootState) => state.dnsConfig.upstream_dns_file);
 
-    const handleUpstreamTest = () => {
-        const formValues = {
-            bootstrap_dns: watch('bootstrap_dns'),
-            upstream_dns: watch('upstream_dns'),
-            local_ptr_upstreams: watch('local_ptr_upstreams'),
-            fallback_dns: watch('fallback_dns'),
-        };
-        dispatch(testUpstreamWithFormValues(formValues));
+    const handleUpstreamTest = () => dispatch(testUpstreamWithFormValues());
+
+    const testButtonClass = classnames('btn btn-primary btn-standard mr-2', {
+        'btn-loading': processingTestUpstream,
+    });
+
+    const components = {
+        a: <a href={UPSTREAM_CONFIGURATION_WIKI_LINK} target="_blank" rel="noopener noreferrer" />,
     };
 
     return (
-        <form onSubmit={handleSubmit(onSubmit)} className="form--upstream">
+        <form onSubmit={handleSubmit} className="form--upstream">
             <div className="row">
-                <label className="col form__label" htmlFor="upstream_dns">
-                    <Trans
-                        components={{
-                            a: <a href={UPSTREAM_CONFIGURATION_WIKI_LINK} target="_blank" rel="noopener noreferrer" />,
-                        }}>
-                        upstream_dns_help
-                    </Trans>{' '}
+                <label className="col form__label" htmlFor={UPSTREAM_DNS_NAME}>
+                    <Trans components={components}>upstream_dns_help</Trans>{' '}
                     <Trans
                         components={[
                             <a
@@ -121,69 +184,44 @@ const Form = ({ initialValues, onSubmit }: FormProps) => {
 
                 <div className="col-12 mb-4">
                     <div className="text-edit-container">
-                        <Controller
-                            name="upstream_dns"
-                            control={control}
-                            render={({ field }) => (
-                                <>
-                                    <Textarea
-                                        {...field}
-                                        id={UPSTREAM_DNS_NAME}
-                                        data-testid="upstream_dns"
-                                        className="form-control--textarea-large text-input"
-                                        wrapperClassName="mb-0"
-                                        placeholder={t('upstream_dns')}
-                                        disabled={!!upstream_dns_file || processingSetConfig || processingTestUpstream}
-                                        onScroll={(e) => syncScroll(e, textareaRef)}
-                                        trimOnBlur
-                                    />
-                                    {getTextareaCommentsHighlight(textareaRef, upstream_dns)}
-                                </>
-                            )}
+                        <Field
+                            id={UPSTREAM_DNS_NAME}
+                            name={UPSTREAM_DNS_NAME}
+                            component={renderTextareaWithHighlightField}
+                            type="text"
+                            className="form-control form-control--textarea font-monospace text-input"
+                            placeholder={t('upstream_dns')}
+                            disabled={processingSetConfig || processingTestUpstream}
+                            normalizeOnBlur={removeEmptyLines}
                         />
                     </div>
                 </div>
+                {INPUT_FIELDS.map(renderField)}
 
                 <div className="col-12">
                     <Examples />
-                    <hr />
-                </div>
 
-                <div className="col-12 mb-4">
-                    <Controller
-                        name="upstream_mode"
-                        control={control}
-                        render={({ field }) => (
-                            <Radio
-                                {...field}
-                                options={upstreamModeOptions}
-                                disabled={processingSetConfig || processingTestUpstream}
-                            />
-                        )}
-                    />
+                    <hr />
                 </div>
 
                 <div className="col-12">
                     <label className="form__label form__label--with-desc" htmlFor="fallback_dns">
-                        {t('fallback_dns_title')}
+                        <Trans>fallback_dns_title</Trans>
                     </label>
 
-                    <div className="form__desc form__desc--top">{t('fallback_dns_desc')}</div>
+                    <div className="form__desc form__desc--top">
+                        <Trans>fallback_dns_desc</Trans>
+                    </div>
 
-                    <Controller
+                    <Field
+                        id="fallback_dns"
                         name="fallback_dns"
-                        control={control}
-                        render={({ field }) => (
-                            <Textarea
-                                {...field}
-                                id="fallback_dns"
-                                data-testid="fallback_dns"
-                                wrapperClassName="mb-0"
-                                placeholder={t('fallback_dns_placeholder')}
-                                disabled={processingSetConfig}
-                                trimOnBlur
-                            />
-                        )}
+                        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>
 
@@ -191,30 +229,24 @@ const Form = ({ initialValues, onSubmit }: FormProps) => {
                     <hr />
                 </div>
 
-                <div className="col-12">
+                <div className="col-12 mb-2">
                     <label className="form__label form__label--with-desc" htmlFor="bootstrap_dns">
-                        {t('bootstrap_dns')}
+                        <Trans>bootstrap_dns</Trans>
                     </label>
 
-                    <div className="form__desc form__desc--top">{t('bootstrap_dns_desc')}</div>
+                    <div className="form__desc form__desc--top">
+                        <Trans>bootstrap_dns_desc</Trans>
+                    </div>
 
-                    <Controller
+                    <Field
+                        id="bootstrap_dns"
                         name="bootstrap_dns"
-                        control={control}
-                        render={({ field }) => (
-                            <Textarea
-                                {...field}
-                                id="bootstrap_dns"
-                                data-testid="bootstrap_dns"
-                                placeholder={t('bootstrap_dns')}
-                                wrapperClassName="mb-0"
-                                disabled={processingSetConfig}
-                                onBlur={(e) => {
-                                    const value = removeEmptyLines(e.target.value);
-                                    field.onChange(value);
-                                }}
-                            />
-                        )}
+                        component={renderTextareaField}
+                        type="text"
+                        className="form-control form-control--textarea form-control--textarea-small font-monospace"
+                        placeholder={t('bootstrap_dns')}
+                        disabled={processingSetConfig}
+                        normalizeOnBlur={removeEmptyLines}
                     />
                 </div>
 
@@ -224,47 +256,43 @@ const Form = ({ initialValues, onSubmit }: FormProps) => {
 
                 <div className="col-12">
                     <label className="form__label form__label--with-desc" htmlFor="local_ptr">
-                        {t('local_ptr_title')}
+                        <Trans>local_ptr_title</Trans>
                     </label>
 
-                    <div className="form__desc form__desc--top">{t('local_ptr_desc')}</div>
-
                     <div className="form__desc form__desc--top">
-                        {defaultLocalPtrUpstreams?.length > 0
-                            ? t('local_ptr_default_resolver', {
-                                  ip: defaultLocalPtrUpstreams.map((s: any) => `"${s}"`).join(', '),
-                              })
-                            : t('local_ptr_no_default_resolver')}
+                        <Trans>local_ptr_desc</Trans>
                     </div>
 
-                    <Controller
-                        name="local_ptr_upstreams"
-                        control={control}
-                        render={({ field }) => (
-                            <Textarea
-                                {...field}
-                                id="local_ptr_upstreams"
-                                data-testid="local_ptr_upstreams"
-                                placeholder={t('local_ptr_placeholder')}
-                                disabled={processingSetConfig}
-                                trimOnBlur
-                            />
+                    <div className="form__desc form__desc--top">
+                        {/** TODO: Add internazionalization for "" */}
+                        {defaultLocalPtrUpstreams?.length > 0 ? (
+                            <Trans values={{ ip: defaultLocalPtrUpstreams.map((s: any) => `"${s}"`).join(', ') }}>
+                                local_ptr_default_resolver
+                            </Trans>
+                        ) : (
+                            <Trans>local_ptr_no_default_resolver</Trans>
                         )}
+                    </div>
+
+                    <Field
+                        id="local_ptr_upstreams"
+                        name="local_ptr_upstreams"
+                        component={renderTextareaField}
+                        type="text"
+                        className="form-control form-control--textarea form-control--textarea-small font-monospace"
+                        placeholder={t('local_ptr_placeholder')}
+                        disabled={processingSetConfig}
+                        normalizeOnBlur={removeEmptyLines}
                     />
 
                     <div className="mt-4">
-                        <Controller
+                        <Field
                             name="use_private_ptr_resolvers"
-                            control={control}
-                            render={({ field }) => (
-                                <Checkbox
-                                    {...field}
-                                    data-testid="dns_use_private_ptr_resolvers"
-                                    title={t('use_private_ptr_resolvers_title')}
-                                    subtitle={t('use_private_ptr_resolvers_desc')}
-                                    disabled={processingSetConfig}
-                                />
-                            )}
+                            type="checkbox"
+                            component={CheckboxField}
+                            placeholder={t('use_private_ptr_resolvers_title')}
+                            subtitle={t('use_private_ptr_resolvers_desc')}
+                            disabled={processingSetConfig}
                         />
                     </div>
                 </div>
@@ -274,79 +302,32 @@ const Form = ({ initialValues, onSubmit }: FormProps) => {
                 </div>
 
                 <div className="col-12 mb-4">
-                    <Controller
+                    <Field
                         name="resolve_clients"
-                        control={control}
-                        render={({ field }) => (
-                            <Checkbox
-                                {...field}
-                                data-testid="dns_resolve_clients"
-                                title={t('resolve_clients_title')}
-                                subtitle={t('resolve_clients_desc')}
-                                disabled={processingSetConfig}
-                            />
-                        )}
+                        type="checkbox"
+                        component={CheckboxField}
+                        placeholder={t('resolve_clients_title')}
+                        subtitle={t('resolve_clients_desc')}
+                        disabled={processingSetConfig}
                     />
                 </div>
-
-                <div className="col-12">
-                    <hr />
-                </div>
-
-                <div className="col-12 col-md-7">
-                    <div className="form__group">
-                        <label htmlFor="upstream_timeout" className="form__label form__label--with-desc">
-                            <Trans>upstream_timeout</Trans>
-                        </label>
-
-                        <div className="form__desc form__desc--top">
-                            <Trans>upstream_timeout_desc</Trans>
-                        </div>
-
-                        <Controller
-                            name="upstream_timeout"
-                            control={control}
-                            rules={{ validate: validateRequiredValue }}
-                            render={({ field }) => (
-                                <Input
-                                    {...field}
-                                    type="number"
-                                    id="upstream_timeout"
-                                    data-testid="upstream_timeout"
-                                    placeholder={t('form_enter_upstream_timeout')}
-                                    disabled={processingSetConfig}
-                                    min={1}
-                                    max={UINT32_RANGE.MAX}
-                                    onChange={(e) => {
-                                        const { value } = e.target;
-                                        field.onChange(toNumber(value));
-                                    }}
-                                />
-                            )}
-                        />
-                    </div>
-                </div>
             </div>
 
             <div className="card-actions">
                 <div className="btn-list">
                     <button
                         type="button"
-                        data-testid="dns_upstream_test"
-                        className={clsx('btn btn-primary btn-standard mr-2', {
-                            'btn-loading': processingTestUpstream,
-                        })}
+                        className={testButtonClass}
                         onClick={handleUpstreamTest}
                         disabled={!upstream_dns || processingTestUpstream}>
-                        {t('test_upstream_btn')}
+                        <Trans>test_upstream_btn</Trans>
                     </button>
 
                     <button
                         type="submit"
-                        data-testid="dns_upstream_save"
                         className="btn btn-success btn-standard"
-                        disabled={isSubmitting || !isDirty || processingSetConfig || processingTestUpstream}>
-                        {t('apply_btn')}
+                        disabled={submitting || invalid || processingSetConfig || processingTestUpstream}>
+                        <Trans>apply_btn</Trans>
                     </button>
                 </div>
             </div>
@@ -354,4 +335,4 @@ const Form = ({ initialValues, onSubmit }: FormProps) => {
     );
 };
 
-export default Form;
+export default reduxForm({ form: FORM_NAME.UPSTREAM })(Form);

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

@@ -19,7 +19,6 @@ const Upstream = () => {
         resolve_clients,
         local_ptr_upstreams,
         use_private_ptr_resolvers,
-        upstream_timeout,
     } = useSelector((state: RootState) => state.dnsConfig, shallowEqual);
 
     const upstream_dns_file = useSelector((state: RootState) => state.dnsConfig.upstream_dns_file);
@@ -33,7 +32,6 @@ const Upstream = () => {
             resolve_clients,
             local_ptr_upstreams,
             use_private_ptr_resolvers,
-            upstream_timeout,
         } = values;
 
         const dnsConfig = {
@@ -43,7 +41,6 @@ const Upstream = () => {
             resolve_clients,
             local_ptr_upstreams,
             use_private_ptr_resolvers,
-            upstream_timeout,
             ...(upstream_dns_file ? null : { upstream_dns }),
         };
 
@@ -67,7 +64,6 @@ const Upstream = () => {
                             resolve_clients,
                             local_ptr_upstreams,
                             use_private_ptr_resolvers,
-                            upstream_timeout,
                         }}
                         onSubmit={handleSubmit}
                     />

client/src/components/Settings/Encryption/Form.tsx

@@ -1,9 +1,11 @@
 import React from 'react';
+import { connect } from 'react-redux';
 
-import { Trans, useTranslation } from 'react-i18next';
+import { Field, reduxForm, formValueSelector } from 'redux-form';
+import { Trans, withTranslation } from 'react-i18next';
+import flow from 'lodash/flow';
 
-import { Controller, useForm } from 'react-hook-form';
-import i18next from 'i18next';
+import { renderInputField, CheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
 import {
     validateServerName,
     validateIsSafePort,
@@ -12,6 +14,7 @@ import {
     validatePortTLS,
     validatePlainDns,
 } from '../../../helpers/validators';
+import i18n from '../../../i18n';
 
 import KeyStatus from './KeyStatus';
 
@@ -19,39 +22,51 @@ import CertificateStatus from './CertificateStatus';
 import {
     DNS_OVER_QUIC_PORT,
     DNS_OVER_TLS_PORT,
+    FORM_NAME,
     STANDARD_HTTPS_PORT,
     ENCRYPTION_SOURCE,
 } from '../../../helpers/constants';
-import { Checkbox } from '../../ui/Controls/Checkbox';
-import { Radio } from '../../ui/Controls/Radio';
-import { Input } from '../../ui/Controls/Input';
-import { Textarea } from '../../ui/Controls/Textarea';
-import { EncryptionData } from '../../../initialState';
-import { toNumber } from '../../../helpers/form';
 
-const certificateSourceOptions = [
-    {
-        label: i18next.t('encryption_certificates_source_path'),
-        value: ENCRYPTION_SOURCE.PATH,
-    },
-    {
-        label: i18next.t('encryption_certificates_source_content'),
-        value: ENCRYPTION_SOURCE.CONTENT,
-    },
-];
+const validate = (values: any) => {
+    const errors: { port_dns_over_tls?: string; port_https?: string } = {};
 
-const keySourceOptions = [
-    {
-        label: i18next.t('encryption_key_source_path'),
-        value: ENCRYPTION_SOURCE.PATH,
-    },
-    {
-        label: i18next.t('encryption_key_source_content'),
-        value: ENCRYPTION_SOURCE.CONTENT,
-    },
-];
+    if (values.port_dns_over_tls && values.port_https) {
+        if (values.port_dns_over_tls === values.port_https) {
+            errors.port_dns_over_tls = i18n.t('form_error_equal');
 
-const validationMessage = (warningValidation: string, isWarning: boolean) => {
+            errors.port_https = i18n.t('form_error_equal');
+        }
+    }
+
+    return errors;
+};
+
+const clearFields = (change: any, setTlsConfig: any, validateTlsConfig: any, t: any) => {
+    const fields = {
+        private_key: '',
+        certificate_chain: '',
+        private_key_path: '',
+        certificate_path: '',
+        port_https: STANDARD_HTTPS_PORT,
+        port_dns_over_tls: DNS_OVER_TLS_PORT,
+        port_dns_over_quic: DNS_OVER_QUIC_PORT,
+        server_name: '',
+        force_https: false,
+        enabled: false,
+        private_key_saved: false,
+        serve_plain_dns: true,
+    };
+    // eslint-disable-next-line no-alert
+    if (window.confirm(t('encryption_reset'))) {
+        Object.keys(fields)
+
+            .forEach((field) => change(field, fields[field]));
+        setTlsConfig(fields);
+        validateTlsConfig(fields);
+    }
+};
+
+const validationMessage = (warningValidation: any, isWarning: any) => {
     if (!warningValidation) {
         return null;
     }
@@ -73,60 +88,56 @@ const validationMessage = (warningValidation: string, isWarning: boolean) => {
     );
 };
 
-export type EncryptionFormValues = {
-    enabled?: boolean;
-    serve_plain_dns?: boolean;
-    server_name?: string;
-    force_https?: boolean;
-    port_https?: number;
-    port_dns_over_tls?: number;
-    port_dns_over_quic?: number;
-    certificate_chain?: string;
-    private_key?: string;
-    certificate_path?: string;
-    private_key_path?: string;
-    certificate_source?: string;
-    key_source?: string;
-    private_key_saved?: boolean;
-};
-
-type Props = {
-    initialValues: EncryptionFormValues;
-    encryption: EncryptionData;
-    onSubmit: (values: EncryptionFormValues) => void;
-    debouncedConfigValidation: (values: EncryptionFormValues) => void;
-    setTlsConfig: (values: Partial<EncryptionData>) => void;
-    validateTlsConfig: (values: Partial<EncryptionData>) => void;
-};
-
-const defaultValues = {
-    enabled: false,
-    serve_plain_dns: true,
-    server_name: '',
-    force_https: false,
-    port_https: STANDARD_HTTPS_PORT,
-    port_dns_over_tls: DNS_OVER_TLS_PORT,
-    port_dns_over_quic: DNS_OVER_QUIC_PORT,
-    certificate_chain: '',
-    private_key: '',
-    certificate_path: '',
-    private_key_path: '',
-    certificate_source: ENCRYPTION_SOURCE.PATH,
-    key_source: ENCRYPTION_SOURCE.PATH,
-    private_key_saved: false,
-};
-
-export const Form = ({
-    initialValues,
-    encryption,
-    onSubmit,
-    setTlsConfig,
-    debouncedConfigValidation,
-    validateTlsConfig,
-}: Props) => {
-    const { t } = useTranslation();
+interface FormProps {
+    handleSubmit: (...args: unknown[]) => string;
+    handleChange?: (...args: unknown[]) => unknown;
+    isEnabled: boolean;
+    servePlainDns: boolean;
+    certificateChain: string;
+    privateKey: string;
+    certificatePath: string;
+    privateKeyPath: string;
+    change: (...args: unknown[]) => unknown;
+    submitting: boolean;
+    invalid: boolean;
+    initialValues: object;
+    processingConfig: boolean;
+    processingValidate: boolean;
+    status_key?: string;
+    not_after?: string;
+    warning_validation?: string;
+    valid_chain?: boolean;
+    valid_key?: boolean;
+    valid_cert?: boolean;
+    valid_pair?: boolean;
+    dns_names?: string[];
+    key_type?: string;
+    issuer?: string;
+    subject?: string;
+    t: (...args: unknown[]) => string;
+    setTlsConfig: (...args: unknown[]) => unknown;
+    validateTlsConfig: (...args: unknown[]) => unknown;
+    certificateSource?: string;
+    privateKeySource?: string;
+    privateKeySaved?: boolean;
+}
 
+let Form = (props: FormProps) => {
     const {
+        t,
+        handleSubmit,
+        handleChange,
+        isEnabled,
+        servePlainDns,
+        certificateChain,
+        privateKey,
+        certificatePath,
+        privateKeyPath,
+        change,
+        invalid,
+        submitting,
+        processingConfig,
+        processingValidate,
         not_after,
         valid_chain,
         valid_key,
@@ -137,100 +148,37 @@ export const Form = ({
         issuer,
         subject,
         warning_validation,
-        processingConfig,
-        processingValidate,
-    } = encryption;
-
-    const {
-        control,
-        handleSubmit,
-        watch,
-        reset,
-        setValue,
-        setError,
-        getValues,
-        formState: { isSubmitting, isValid },
-    } = useForm<EncryptionFormValues>({
-        defaultValues: {
-            ...defaultValues,
-            ...initialValues,
-        },
-        mode: 'onBlur',
-    });
-
-    const {
-        enabled: isEnabled,
-        serve_plain_dns: servePlainDns,
-        certificate_chain: certificateChain,
-        private_key: privateKey,
-        private_key_path: privateKeyPath,
-        key_source: privateKeySource,
-        private_key_saved: privateKeySaved,
-        certificate_path: certificatePath,
-        certificate_source: certificateSource,
-    } = watch();
-
-    const handleBlur = () => {
-        debouncedConfigValidation(getValues());
-    };
+        setTlsConfig,
+        validateTlsConfig,
+        certificateSource,
+        privateKeySource,
+        privateKeySaved,
+    } = props;
 
     const isSavingDisabled = () => {
-        const processing = isSubmitting || processingConfig || processingValidate;
+        const processing = submitting || processingConfig || processingValidate;
 
         if (servePlainDns && !isEnabled) {
-            return !isValid || processing;
+            return invalid || processing;
         }
 
-        return !isValid || processing || !valid_key || !valid_cert || !valid_pair;
-    };
-
-    const clearFields = () => {
-        if (window.confirm(t('encryption_reset'))) {
-            reset();
-            setTlsConfig(defaultValues);
-            validateTlsConfig(defaultValues);
-        }
-    };
-
-    const validatePorts = (values: EncryptionFormValues) => {
-        const errors: { port_dns_over_tls?: string; port_https?: string } = {};
-
-        if (values.port_dns_over_tls && values.port_https) {
-            if (values.port_dns_over_tls === values.port_https) {
-                errors.port_dns_over_tls = i18next.t('form_error_equal');
-                errors.port_https = i18next.t('form_error_equal');
-            }
-        }
-
-        return errors;
-    };
-
-    const onFormSubmit = (data: EncryptionFormValues) => {
-        const validationErrors = validatePorts(data);
-
-        if (Object.keys(validationErrors).length > 0) {
-            Object.entries(validationErrors).forEach(([field, message]) => {
-                setError(field as keyof EncryptionFormValues, { type: 'manual', message });
-            });
-        } else {
-            onSubmit(data);
-        }
+        return invalid || processing || !valid_key || !valid_cert || !valid_pair;
     };
 
     const isDisabled = isSavingDisabled();
     const isWarning = valid_key && valid_cert && valid_pair;
 
     return (
-        <form onSubmit={handleSubmit(onFormSubmit)}>
+        <form onSubmit={handleSubmit}>
             <div className="row">
                 <div className="col-12">
                     <div className="form__group form__group--settings mb-3">
-                        <Controller
+                        <Field
                             name="enabled"
-                            control={control}
-                            render={({ field }) => (
-                                <Checkbox {...field} title={t('encryption_enable')} onBlur={handleBlur} />
-                            )}
+                            type="checkbox"
+                            component={CheckboxField}
+                            placeholder={t('encryption_enable')}
+                            onChange={handleChange}
                         />
                     </div>
 
@@ -239,13 +187,13 @@ export const Form = ({
                     </div>
 
                     <div className="form__group mb-3 mt-5">
-                        <Controller
+                        <Field
                             name="serve_plain_dns"
-                            control={control}
-                            rules={{
-                                validate: (value) => validatePlainDns(value, getValues()),
-                            }}
-                            render={({ field }) => <Checkbox {...field} title={t('encryption_plain_dns_enable')} />}
+                            type="checkbox"
+                            component={CheckboxField}
+                            placeholder={t('encryption_plain_dns_enable')}
+                            onChange={handleChange}
+                            validate={validatePlainDns}
                         />
                     </div>
 
@@ -264,20 +212,16 @@ export const Form = ({
 
                 <div className="col-lg-6">
                     <div className="form__group form__group--settings">
-                        <Controller
+                        <Field
+                            id="server_name"
                             name="server_name"
-                            control={control}
-                            rules={{ validate: validateServerName }}
-                            render={({ field, fieldState }) => (
-                                <Input
-                                    {...field}
-                                    type="text"
-                                    placeholder={t('encryption_server_enter')}
-                                    error={fieldState.error?.message}
-                                    disabled={!isEnabled}
-                                    onBlur={handleBlur}
-                                />
-                            )}
+                            component={renderInputField}
+                            type="text"
+                            className="form-control"
+                            placeholder={t('encryption_server_enter')}
+                            onChange={handleChange}
+                            disabled={!isEnabled}
+                            validate={validateServerName}
                         />
 
                         <div className="form__desc">
@@ -288,12 +232,13 @@ export const Form = ({
 
                 <div className="col-lg-6">
                     <div className="form__group form__group--settings">
-                        <Controller
+                        <Field
                             name="force_https"
-                            control={control}
-                            render={({ field }) => (
-                                <Checkbox {...field} title={t('encryption_redirect')} disabled={!isEnabled} />
-                            )}
+                            type="checkbox"
+                            component={CheckboxField}
+                            placeholder={t('encryption_redirect')}
+                            onChange={handleChange}
+                            disabled={!isEnabled}
                         />
 
                         <div className="form__desc">
@@ -310,24 +255,17 @@ export const Form = ({
                             <Trans>encryption_https</Trans>
                         </label>
 
-                        <Controller
+                        <Field
+                            id="port_https"
                             name="port_https"
-                            control={control}
-                            rules={{ validate: { validatePort, validateIsSafePort } }}
-                            render={({ field, fieldState }) => (
-                                <Input
-                                    {...field}
-                                    type="number"
-                                    placeholder={t('encryption_https')}
-                                    error={fieldState.error?.message}
-                                    disabled={!isEnabled}
-                                    onChange={(e) => {
-                                        const { value } = e.target;
-                                        field.onChange(toNumber(value));
-                                    }}
-                                    onBlur={handleBlur}
-                                />
-                            )}
+                            component={renderInputField}
+                            type="number"
+                            className="form-control"
+                            placeholder={t('encryption_https')}
+                            validate={[validatePort, validateIsSafePort]}
+                            normalize={toNumber}
+                            onChange={handleChange}
+                            disabled={!isEnabled}
                         />
 
                         <div className="form__desc">
@@ -342,24 +280,17 @@ export const Form = ({
                             <Trans>encryption_dot</Trans>
                         </label>
 
-                        <Controller
+                        <Field
+                            id="port_dns_over_tls"
                             name="port_dns_over_tls"
-                            control={control}
-                            rules={{ validate: validatePortTLS }}
-                            render={({ field, fieldState }) => (
-                                <Input
-                                    {...field}
-                                    type="number"
-                                    placeholder={t('encryption_dot')}
-                                    error={fieldState.error?.message}
-                                    disabled={!isEnabled}
-                                    onChange={(e) => {
-                                        const { value } = e.target;
-                                        field.onChange(toNumber(value));
-                                    }}
-                                    onBlur={handleBlur}
-                                />
-                            )}
+                            component={renderInputField}
+                            type="number"
+                            className="form-control"
+                            placeholder={t('encryption_dot')}
+                            validate={[validatePortTLS]}
+                            normalize={toNumber}
+                            onChange={handleChange}
+                            disabled={!isEnabled}
                         />
 
                         <div className="form__desc">
@@ -374,24 +305,17 @@ export const Form = ({
                             <Trans>encryption_doq</Trans>
                         </label>
 
-                        <Controller
+                        <Field
+                            id="port_dns_over_quic"
                             name="port_dns_over_quic"
-                            control={control}
-                            rules={{ validate: validatePortQuic }}
-                            render={({ field, fieldState }) => (
-                                <Input
-                                    {...field}
-                                    type="number"
-                                    placeholder={t('encryption_doq')}
-                                    error={fieldState.error?.message}
-                                    disabled={!isEnabled}
-                                    onChange={(e) => {
-                                        const { value } = e.target;
-                                        field.onChange(toNumber(value));
-                                    }}
-                                    onBlur={handleBlur}
-                                />
-                            )}
+                            component={renderInputField}
+                            type="number"
+                            className="form-control"
+                            placeholder={t('encryption_doq')}
+                            validate={[validatePortQuic]}
+                            normalize={toNumber}
+                            onChange={handleChange}
+                            disabled={!isEnabled}
                         />
 
                         <div className="form__desc">
@@ -428,44 +352,50 @@ export const Form = ({
 
                         <div className="form__inline mb-2">
                             <div className="custom-controls-stacked">
-                                <Controller
+                                <Field
                                     name="certificate_source"
-                                    control={control}
-                                    render={({ field }) => (
-                                        <Radio {...field} options={certificateSourceOptions} disabled={!isEnabled} />
-                                    )}
+                                    component={renderRadioField}
+                                    type="radio"
+                                    className="form-control mr-2"
+                                    value="path"
+                                    placeholder={t('encryption_certificates_source_path')}
+                                    disabled={!isEnabled}
+                                />
+
+                                <Field
+                                    name="certificate_source"
+                                    component={renderRadioField}
+                                    type="radio"
+                                    className="form-control mr-2"
+                                    value="content"
+                                    placeholder={t('encryption_certificates_source_content')}
+                                    disabled={!isEnabled}
                                 />
                             </div>
                         </div>
 
-                        {certificateSource === ENCRYPTION_SOURCE.CONTENT ? (
-                            <Controller
+                        {certificateSource === ENCRYPTION_SOURCE.CONTENT && (
+                            <Field
+                                id="certificate_chain"
                                 name="certificate_chain"
-                                control={control}
-                                render={({ field, fieldState }) => (
-                                    <Textarea
-                                        {...field}
-                                        placeholder={t('encryption_certificates_input')}
-                                        disabled={!isEnabled}
-                                        error={fieldState.error?.message}
-                                        onBlur={handleBlur}
-                                    />
-                                )}
+                                component="textarea"
+                                type="text"
+                                className="form-control form-control--textarea"
+                                placeholder={t('encryption_certificates_input')}
+                                onChange={handleChange}
+                                disabled={!isEnabled}
                             />
-                        ) : (
-                            <Controller
+                        )}
+                        {certificateSource === ENCRYPTION_SOURCE.PATH && (
+                            <Field
+                                id="certificate_path"
                                 name="certificate_path"
-                                control={control}
-                                render={({ field, fieldState }) => (
-                                    <Input
-                                        {...field}
-                                        type="text"
-                                        placeholder={t('encryption_certificate_path')}
-                                        error={fieldState.error?.message}
-                                        disabled={!isEnabled}
-                                        onBlur={handleBlur}
-                                    />
-                                )}
+                                component={renderInputField}
+                                type="text"
+                                className="form-control"
+                                placeholder={t('encryption_certificate_path')}
+                                onChange={handleChange}
+                                disabled={!isEnabled}
                             />
                         )}
                     </div>
@@ -494,67 +424,70 @@ export const Form = ({
 
                         <div className="form__inline mb-2">
                             <div className="custom-controls-stacked">
-                                <Controller
+                                <Field
                                     name="key_source"
-                                    control={control}
-                                    render={({ field }) => (
-                                        <Radio {...field} options={keySourceOptions} disabled={!isEnabled} />
-                                    )}
+                                    component={renderRadioField}
+                                    type="radio"
+                                    className="form-control mr-2"
+                                    value={ENCRYPTION_SOURCE.PATH}
+                                    placeholder={t('encryption_key_source_path')}
+                                    disabled={!isEnabled}
+                                />
+
+                                <Field
+                                    name="key_source"
+                                    component={renderRadioField}
+                                    type="radio"
+                                    className="form-control mr-2"
+                                    value={ENCRYPTION_SOURCE.CONTENT}
+                                    placeholder={t('encryption_key_source_content')}
+                                    disabled={!isEnabled}
                                 />
                             </div>
                         </div>
 
-                        {privateKeySource === ENCRYPTION_SOURCE.CONTENT ? (
-                            <>
-                                <Controller
-                                    name="private_key_saved"
-                                    control={control}
-                                    render={({ field }) => (
-                                        <Checkbox
-                                            {...field}
-                                            title={t('use_saved_key')}
-                                            disabled={!isEnabled}
-                                            onChange={(checked: boolean) => {
-                                                if (checked) {
-                                                    setValue('private_key', '');
-                                                }
-                                                field.onChange(checked);
-                                            }}
-                                            onBlur={handleBlur}
-                                        />
-                                    )}
-                                />
-
-                                <Controller
-                                    name="private_key"
-                                    control={control}
-                                    render={({ field, fieldState }) => (
-                                        <Textarea
-                                            {...field}
-                                            placeholder={t('encryption_key_input')}
-                                            disabled={!isEnabled || privateKeySaved}
-                                            error={fieldState.error?.message}
-                                            onBlur={handleBlur}
-                                        />
-                                    )}
-                                />
-                            </>
-                        ) : (
-                            <Controller
+                        {privateKeySource === ENCRYPTION_SOURCE.PATH && (
+                            <Field
                                 name="private_key_path"
-                                control={control}
-                                render={({ field, fieldState }) => (
-                                    <Input
-                                        {...field}
-                                        type="text"
-                                        placeholder={t('encryption_private_key_path')}
-                                        error={fieldState.error?.message}
-                                        disabled={!isEnabled}
-                                        onBlur={handleBlur}
-                                    />
-                                )}
+                                component={renderInputField}
+                                type="text"
+                                className="form-control"
+                                placeholder={t('encryption_private_key_path')}
+                                onChange={handleChange}
+                                disabled={!isEnabled}
                             />
                         )}
+                        {privateKeySource === ENCRYPTION_SOURCE.CONTENT && [
+                            <Field
+                                key="private_key_saved"
+                                name="private_key_saved"
+                                type="checkbox"
+                                className="form__group form__group--settings mb-2"
+                                component={CheckboxField}
+                                disabled={!isEnabled}
+                                placeholder={t('use_saved_key')}
+                                onChange={(event: any) => {
+                                    if (event.target.checked) {
+                                        change('private_key', '');
+                                    }
+                                    if (handleChange) {
+                                        handleChange(event);
+                                    }
+                                }}
+                            />,
+
+                            <Field
+                                id="private_key"
+                                key="private_key"
+                                name="private_key"
+                                component="textarea"
+                                type="text"
+                                className="form-control form-control--textarea"
+                                placeholder={t('encryption_key_input')}
+                                onChange={handleChange}
+                                disabled={!isEnabled || privateKeySaved}
+                            />,
+                        ]}
                     </div>
 
                     <div className="form__status">
@@ -572,11 +505,44 @@ export const Form = ({
                 <button
                     type="button"
                     className="btn btn-secondary btn-standart"
-                    disabled={isSubmitting || processingConfig}
-                    onClick={clearFields}>
+                    disabled={submitting || processingConfig}
+                    onClick={() => clearFields(change, setTlsConfig, validateTlsConfig, t)}>
                     <Trans>reset_settings</Trans>
                 </button>
             </div>
         </form>
     );
 };
+
+const selector = formValueSelector(FORM_NAME.ENCRYPTION);
+
+Form = connect((state) => {
+    const isEnabled = selector(state, 'enabled');
+    const servePlainDns = selector(state, 'serve_plain_dns');
+    const certificateChain = selector(state, 'certificate_chain');
+    const privateKey = selector(state, 'private_key');
+    const certificatePath = selector(state, 'certificate_path');
+    const privateKeyPath = selector(state, 'private_key_path');
+    const certificateSource = selector(state, 'certificate_source');
+    const privateKeySource = selector(state, 'key_source');
+    const privateKeySaved = selector(state, 'private_key_saved');
+    return {
+        isEnabled,
+        servePlainDns,
+        certificateChain,
+        privateKey,
+        certificatePath,
+        privateKeyPath,
+        certificateSource,
+        privateKeySource,
+        privateKeySaved,
+    };
+})(Form);
+
+export default flow([
+    withTranslation(),
+    reduxForm({
+        form: FORM_NAME.ENCRYPTION,
+        validate,
+    }),
+])(Form);

client/src/components/Settings/Encryption/index.tsx

@@ -1,60 +1,61 @@
-import React, { useCallback, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { debounce } from 'lodash';
+import React, { Component } from 'react';
+import { withTranslation } from 'react-i18next';
+import debounce from 'lodash/debounce';
+
 import { DEBOUNCE_TIMEOUT, ENCRYPTION_SOURCE } from '../../../helpers/constants';
 
-import { EncryptionFormValues, Form } from './Form';
+import Form from './Form';
+
 import Card from '../../ui/Card';
+
 import PageTitle from '../../ui/PageTitle';
+
 import Loading from '../../ui/Loading';
 import { EncryptionData } from '../../../initialState';
 
-type Props = {
+interface EncryptionProps {
+    setTlsConfig: (...args: unknown[]) => unknown;
+    validateTlsConfig: (...args: unknown[]) => unknown;
     encryption: EncryptionData;
-    setTlsConfig: (values: Partial<EncryptionData>) => void;
-    validateTlsConfig: (values: Partial<EncryptionData>) => void;
-};
+    t: (...args: unknown[]) => string;
+}
 
-export const Encryption = ({ encryption, setTlsConfig, validateTlsConfig }: Props) => {
-    const { t } = useTranslation();
+class Encryption extends Component<EncryptionProps> {
+    componentDidMount() {
+        const { validateTlsConfig, encryption } = this.props;
 
-    const initialValues = useMemo((): EncryptionFormValues => {
-        const {
-            enabled,
-            serve_plain_dns,
-            server_name,
-            force_https,
-            port_https,
-            port_dns_over_tls,
-            port_dns_over_quic,
-            certificate_chain,
-            private_key,
-            certificate_path,
-            private_key_path,
-            private_key_saved,
-        } = encryption;
+        if (encryption.enabled) {
+            validateTlsConfig(encryption);
+        }
+    }
+
+    handleFormSubmit = (values: any) => {
+        const submitValues = this.getSubmitValues(values);
+
+        this.props.setTlsConfig(submitValues);
+    };
+
+    handleFormChange = debounce((values) => {
+        const submitValues = this.getSubmitValues(values);
+
+        if (submitValues.enabled) {
+            this.props.validateTlsConfig(submitValues);
+        }
+    }, DEBOUNCE_TIMEOUT);
+
+    getInitialValues = (data: any) => {
+        const { certificate_chain, private_key, private_key_saved } = data;
         const certificate_source = certificate_chain ? ENCRYPTION_SOURCE.CONTENT : ENCRYPTION_SOURCE.PATH;
         const key_source = private_key || private_key_saved ? ENCRYPTION_SOURCE.CONTENT : ENCRYPTION_SOURCE.PATH;
 
         return {
-            enabled,
-            serve_plain_dns,
-            server_name,
-            force_https,
-            port_https,
-            port_dns_over_tls,
-            port_dns_over_quic,
-            certificate_chain,
-            private_key,
-            certificate_path,
-            private_key_path,
-            private_key_saved,
+            ...data,
             certificate_source,
             key_source,
         };
-    }, [encryption]);
+    };
 
-    const getSubmitValues = useCallback((values: any) => {
+    getSubmitValues = (values: any) => {
         const { certificate_source, key_source, private_key_saved, ...config } = values;
 
         if (certificate_source === ENCRYPTION_SOURCE.PATH) {
@@ -75,47 +76,63 @@ export const Encryption = ({ encryption, setTlsConfig, validateTlsConfig }: Prop
         }
 
         return config;
-    }, []);
+    };
 
-    const handleFormSubmit = useCallback(
-        (values: any) => {
-            const submitValues = getSubmitValues(values);
-            setTlsConfig(submitValues);
-        },
-        [getSubmitValues, setTlsConfig],
-    );
+    render() {
+        const { encryption, t } = this.props;
+        const {
+            enabled,
+            server_name,
+            force_https,
+            port_https,
+            port_dns_over_tls,
+            port_dns_over_quic,
+            certificate_chain,
+            private_key,
+            certificate_path,
+            private_key_path,
+            private_key_saved,
+            serve_plain_dns,
+        } = encryption;
 
-    const validateConfig = useCallback((values) => {
-        const submitValues = getSubmitValues(values);
+        const initialValues = this.getInitialValues({
+            enabled,
+            server_name,
+            force_https,
+            port_https,
+            port_dns_over_tls,
+            port_dns_over_quic,
+            certificate_chain,
+            private_key,
+            certificate_path,
+            private_key_path,
+            private_key_saved,
+            serve_plain_dns,
+        });
 
-        if (submitValues.enabled) {
-            validateTlsConfig(submitValues);
-        }
-    }, []);
+        return (
+            <div className="encryption">
+                <PageTitle title={t('encryption_settings')} />
 
-    const debouncedConfigValidation = useMemo(() => debounce(validateConfig, DEBOUNCE_TIMEOUT), [validateConfig]);
+                {encryption.processing && <Loading />}
+                {!encryption.processing && (
+                    <Card
+                        title={t('encryption_title')}
+                        subtitle={t('encryption_desc')}
+                        bodyType="card-body box-body--settings">
+                        <Form
+                            initialValues={initialValues}
+                            onSubmit={this.handleFormSubmit}
+                            onChange={this.handleFormChange}
+                            setTlsConfig={this.props.setTlsConfig}
+                            validateTlsConfig={this.props.validateTlsConfig}
+                            {...this.props.encryption}
+                        />
+                    </Card>
+                )}
+            </div>
+        );
+    }
+}
 
-    return (
-        <div className="encryption">
-            <PageTitle title={t('encryption_settings')} />
-
-            {encryption.processing ? (
-                <Loading />
-            ) : (
-                <Card
-                    title={t('encryption_title')}
-                    subtitle={t('encryption_desc')}
-                    bodyType="card-body box-body--settings">
-                    <Form
-                        initialValues={initialValues}
-                        onSubmit={handleFormSubmit}
-                        debouncedConfigValidation={debouncedConfigValidation}
-                        setTlsConfig={setTlsConfig}
-                        validateTlsConfig={validateTlsConfig}
-                        encryption={encryption}
-                    />
-                </Card>
-            )}
-        </div>
-    );
-};
+export default withTranslation()(Encryption);

client/src/components/Settings/FiltersConfig/Form.tsx

@@ -0,0 +1,85 @@
+import React from 'react';
+
+import { Field, reduxForm } from 'redux-form';
+import { Trans, withTranslation } from 'react-i18next';
+import flow from 'lodash/flow';
+
+import { CheckboxField, toNumber } from '../../../helpers/form';
+import { FILTERS_INTERVALS_HOURS, FILTERS_RELATIVE_LINK, FORM_NAME } from '../../../helpers/constants';
+
+const getTitleForInterval = (interval: any, t: any) => {
+    if (interval === 0) {
+        return t('disabled');
+    }
+    if (interval === 72 || interval === 168) {
+        return t('interval_days', { count: interval / 24 });
+    }
+
+    return t('interval_hours', { count: interval });
+};
+
+const getIntervalSelect = (processing: any, t: any, handleChange: any, toNumber: any) => (
+    <Field
+        name="interval"
+        className="custom-select"
+        component="select"
+        onChange={handleChange}
+        normalize={toNumber}
+        disabled={processing}>
+        {FILTERS_INTERVALS_HOURS.map((interval) => (
+            <option value={interval} key={interval}>
+                {getTitleForInterval(interval, t)}
+            </option>
+        ))}
+    </Field>
+);
+
+interface FormProps {
+    handleSubmit: (...args: unknown[]) => string;
+    handleChange?: (...args: unknown[]) => unknown;
+    change: (...args: unknown[]) => unknown;
+    submitting: boolean;
+    invalid: boolean;
+    processing: boolean;
+    t: (...args: unknown[]) => string;
+}
+
+const Form = (props: FormProps) => {
+    const { handleSubmit, handleChange, processing, t } = props;
+
+    const components = {
+        a: <a href={FILTERS_RELATIVE_LINK} rel="noopener noreferrer" />,
+    };
+
+    return (
+        <form onSubmit={handleSubmit}>
+            <div className="row">
+                <div className="col-12">
+                    <div className="form__group form__group--settings">
+                        <Field
+                            name="enabled"
+                            type="checkbox"
+                            modifier="checkbox--settings"
+                            component={CheckboxField}
+                            placeholder={t('block_domain_use_filters_and_hosts')}
+                            subtitle={<Trans components={components}>filters_block_toggle_hint</Trans>}
+                            onChange={handleChange}
+                            disabled={processing}
+                        />
+                    </div>
+                </div>
+
+                <div className="col-12 col-md-5">
+                    <div className="form__group form__group--inner mb-5">
+                        <label className="form__label">
+                            <Trans>filters_interval</Trans>
+                        </label>
+                        {getIntervalSelect(processing, t, handleChange, toNumber)}
+                    </div>
+                </div>
+            </div>
+        </form>
+    );
+};
+
+export default flow([withTranslation(), reduxForm({ form: FORM_NAME.FILTER_CONFIG })])(Form);

client/src/components/Settings/FiltersConfig/index.tsx

@@ -1,115 +1,39 @@
-import React, { useEffect, useRef } from 'react';
-import { Controller, useForm } from 'react-hook-form';
-import { Trans, useTranslation } from 'react-i18next';
+import React from 'react';
+import { withTranslation } from 'react-i18next';
+import debounce from 'lodash/debounce';
 
-import i18next from 'i18next';
-import { toNumber } from '../../../helpers/form';
-import { DAY, FILTERS_INTERVALS_HOURS, FILTERS_RELATIVE_LINK } from '../../../helpers/constants';
-import { Checkbox } from '../../ui/Controls/Checkbox';
-import { Select } from '../../ui/Controls/Select';
+import { DEBOUNCE_TIMEOUT } from '../../../helpers/constants';
 
-const THREE_DAYS_INTERVAL = DAY * 3;
-const SEVEN_DAYS_INTERVAL = DAY * 7;
+import Form from './Form';
 
-const getTitleForInterval = (interval: number) => {
-    if (interval === 0) {
-        return i18next.t('disabled');
-    }
+import { getObjDiff } from '../../../helpers/helpers';
 
-    if (interval === THREE_DAYS_INTERVAL || interval === SEVEN_DAYS_INTERVAL) {
-        return i18next.t('interval_days', { count: interval / DAY });
-    }
-
-    return i18next.t('interval_hours', { count: interval });
-};
-
-export type FormValues = {
-    enabled: boolean;
-    interval: number;
-};
-
-type Props = {
-    initialValues: FormValues;
-    setFiltersConfig: (values: FormValues) => void;
+interface FiltersConfigProps {
+    initialValues: object;
     processing: boolean;
-};
+    setFiltersConfig: (...args: unknown[]) => unknown;
+    t: (...args: unknown[]) => string;
+}
 
-export const FiltersConfig = ({ initialValues, setFiltersConfig, processing }: Props) => {
-    const { t } = useTranslation();
-    const prevFormValuesRef = useRef<FormValues>(initialValues);
+const FiltersConfig = (props: FiltersConfigProps) => {
+    const { initialValues, processing } = props;
 
-    const { watch, control } = useForm({
-        mode: 'onBlur',
-        defaultValues: initialValues,
-    });
+    const handleFormChange = debounce((values) => {
+        const diff = getObjDiff(initialValues, values);
 
-    const formValues = watch();
-
-    useEffect(() => {
-        const prevFormValues = prevFormValuesRef.current;
-
-        if (JSON.stringify(prevFormValues) !== JSON.stringify(formValues)) {
-            setFiltersConfig(formValues);
-            prevFormValuesRef.current = formValues;
+        if (Object.values(diff).length > 0) {
+            props.setFiltersConfig(values);
         }
-    }, [formValues]);
-
-    const components = {
-        a: <a href={FILTERS_RELATIVE_LINK} rel="noopener noreferrer" />,
-    };
+    }, DEBOUNCE_TIMEOUT);
 
     return (
-        <>
-            <div className="row">
-                <div className="col-12">
-                    <div className="form__group form__group--settings">
-                        <Controller
-                            name="enabled"
-                            control={control}
-                            render={({ field }) => (
-                                <Checkbox
-                                    {...field}
-                                    data-testid="filters_enabled"
-                                    title={t('block_domain_use_filters_and_hosts')}
-                                    disabled={processing}
-                                />
-                            )}
-                        />
-
-                        <p>
-                            <Trans components={components}>filters_block_toggle_hint</Trans>
-                        </p>
-                    </div>
-                </div>
-
-                <div className="col-12 col-md-5">
-                    <div className="form__group form__group--inner mb-5">
-                        <label className="form__label">
-                            <Trans>filters_interval</Trans>
-                        </label>
-                        <Controller
-                            name="interval"
-                            control={control}
-                            render={({ field }) => (
-                                <Select
-                                    {...field}
-                                    data-testid="filters_interval"
-                                    disabled={processing}
-                                    onChange={(e) => {
-                                        const { value } = e.target;
-                                        field.onChange(toNumber(value));
-                                    }}>
-                                    {FILTERS_INTERVALS_HOURS.map((interval) => (
-                                        <option value={interval} key={interval}>
-                                            {getTitleForInterval(interval)}
-                                        </option>
-                                    ))}
-                                </Select>
-                            )}
-                        />
-                    </div>
-                </div>
-            </div>
-        </>
+        <Form
+            initialValues={initialValues}
+            onSubmit={handleFormChange}
+            onChange={handleFormChange}
+            processing={processing}
+        />
     );
 };
+
+export default withTranslation()(FiltersConfig);

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

@@ -1,182 +1,147 @@
 import React, { useEffect } from 'react';
-import { Trans, useTranslation } from 'react-i18next';
-import i18next from 'i18next';
-import { Controller, useForm } from 'react-hook-form';
+import { change, Field, formValueSelector, reduxForm } from 'redux-form';
+import { connect } from 'react-redux';
+import { Trans, withTranslation } from 'react-i18next';
+import flow from 'lodash/flow';
+
+import {
+    CheckboxField,
+    toFloatNumber,
+    renderTextareaField,
+    renderInputField,
+    renderRadioField,
+} from '../../../helpers/form';
 
 import { trimLinesAndRemoveEmpty } from '../../../helpers/helpers';
-import { QUERY_LOG_INTERVALS_DAYS, HOUR, DAY, RETENTION_CUSTOM, RETENTION_RANGE } from '../../../helpers/constants';
+import {
+    FORM_NAME,
+    QUERY_LOG_INTERVALS_DAYS,
+    HOUR,
+    DAY,
+    RETENTION_CUSTOM,
+    RETENTION_CUSTOM_INPUT,
+    RETENTION_RANGE,
+    CUSTOM_INTERVAL,
+} from '../../../helpers/constants';
 import '../FormButton.css';
-import { Checkbox } from '../../ui/Controls/Checkbox';
-import { Input } from '../../ui/Controls/Input';
-import { toNumber } from '../../../helpers/form';
-import { Textarea } from '../../ui/Controls/Textarea';
 
-const getIntervalTitle = (interval: number) => {
+const getIntervalTitle = (interval: any, t: any) => {
     switch (interval) {
         case RETENTION_CUSTOM:
-            return i18next.t('settings_custom');
+            return t('settings_custom');
         case 6 * HOUR:
-            return i18next.t('interval_6_hour');
+            return t('interval_6_hour');
         case DAY:
-            return i18next.t('interval_24_hour');
+            return t('interval_24_hour');
         default:
-            return i18next.t('interval_days', { count: interval / DAY });
+            return t('interval_days', { count: interval / DAY });
     }
 };
 
-export type FormValues = {
-    enabled: boolean;
-    anonymize_client_ip: boolean;
-    interval: number;
-    customInterval?: number | null;
-    ignored: string;
-};
+const getIntervalFields = (processing: any, t: any, toNumber: any) =>
+    QUERY_LOG_INTERVALS_DAYS.map((interval) => (
+        <Field
+            key={interval}
+            name="interval"
+            type="radio"
+            component={renderRadioField}
+            value={interval}
+            placeholder={getIntervalTitle(interval, t)}
+            normalize={toNumber}
+            disabled={processing}
+        />
+    ));
 
-type Props = {
-    initialValues: Partial<FormValues>;
+interface FormProps {
+    handleSubmit: (...args: unknown[]) => string;
+    handleClear: (...args: unknown[]) => unknown;
+    submitting: boolean;
+    invalid: boolean;
     processing: boolean;
-    processingReset: boolean;
-    onSubmit: (values: FormValues) => void;
-    onReset: () => void;
-};
-
-export const Form = ({ initialValues, processing, processingReset, onSubmit, onReset }: Props) => {
-    const { t } = useTranslation();
+    processingClear: boolean;
+    t: (...args: unknown[]) => string;
+    interval?: number;
+    customInterval?: number;
+    dispatch: (...args: unknown[]) => unknown;
+}
 
+let Form = (props: FormProps) => {
     const {
         handleSubmit,
-        watch,
-        setValue,
-        control,
-        formState: { isSubmitting },
-    } = useForm<FormValues>({
-        mode: 'onBlur',
-        defaultValues: {
-            enabled: initialValues.enabled || false,
-            anonymize_client_ip: initialValues.anonymize_client_ip || false,
-            interval: initialValues.interval || DAY,
-            customInterval: initialValues.customInterval || null,
-            ignored: initialValues.ignored || '',
-        },
-    });
-
-    const intervalValue = watch('interval');
-    const customIntervalValue = watch('customInterval');
+        submitting,
+        invalid,
+        processing,
+        processingClear,
+        handleClear,
+        t,
+        interval,
+        customInterval,
+        dispatch,
+    } = props;
 
     useEffect(() => {
-        if (QUERY_LOG_INTERVALS_DAYS.includes(intervalValue)) {
-            setValue('customInterval', null);
+        if (QUERY_LOG_INTERVALS_DAYS.includes(interval)) {
+            dispatch(change(FORM_NAME.LOG_CONFIG, CUSTOM_INTERVAL, null));
         }
-    }, [intervalValue]);
-
-    const onSubmitForm = (data: FormValues) => {
-        onSubmit(data);
-    };
-
-    const handleIgnoredBlur = (e: React.FocusEvent<HTMLTextAreaElement>) => {
-        const trimmed = trimLinesAndRemoveEmpty(e.target.value);
-        setValue('ignored', trimmed);
-    };
-
-    const disableSubmit = isSubmitting || processing || (intervalValue === RETENTION_CUSTOM && !customIntervalValue);
+    }, [interval]);
 
     return (
-        <form onSubmit={handleSubmit(onSubmitForm)}>
+        <form onSubmit={handleSubmit}>
             <div className="form__group form__group--settings">
-                <Controller
+                <Field
                     name="enabled"
-                    control={control}
-                    render={({ field }) => (
-                        <Checkbox
-                            {...field}
-                            data-testid="logs_enabled"
-                            title={t('query_log_enable')}
-                            disabled={processing}
-                        />
-                    )}
+                    type="checkbox"
+                    component={CheckboxField}
+                    placeholder={t('query_log_enable')}
+                    disabled={processing}
                 />
             </div>
 
             <div className="form__group form__group--settings">
-                <Controller
+                <Field
                     name="anonymize_client_ip"
-                    control={control}
-                    render={({ field }) => (
-                        <Checkbox
-                            {...field}
-                            data-testid="logs_anonymize_client_ip"
-                            title={t('anonymize_client_ip')}
-                            subtitle={t('anonymize_client_ip_desc')}
-                            disabled={processing}
-                        />
-                    )}
+                    type="checkbox"
+                    component={CheckboxField}
+                    placeholder={t('anonymize_client_ip')}
+                    subtitle={t('anonymize_client_ip_desc')}
+                    disabled={processing}
                 />
             </div>
 
-            <div className="form__label">
+            <label className="form__label">
                 <Trans>query_log_retention</Trans>
-            </div>
+            </label>
 
             <div className="form__group form__group--settings">
                 <div className="custom-controls-stacked">
-                    <label className="custom-control custom-radio">
-                        <input
-                            type="radio"
-                            data-testid="logs_config_interval"
-                            className="custom-control-input"
-                            disabled={processing}
-                            checked={!QUERY_LOG_INTERVALS_DAYS.includes(intervalValue)}
-                            value={RETENTION_CUSTOM}
-                            onChange={(e) => {
-                                setValue('interval', parseInt(e.target.value, 10));
-                            }}
-                        />
-
-                        <span className="custom-control-label">{getIntervalTitle(RETENTION_CUSTOM)}</span>
-                    </label>
-
-                    {!QUERY_LOG_INTERVALS_DAYS.includes(intervalValue) && (
+                    <Field
+                        key={RETENTION_CUSTOM}
+                        name="interval"
+                        type="radio"
+                        component={renderRadioField}
+                        value={QUERY_LOG_INTERVALS_DAYS.includes(interval) ? RETENTION_CUSTOM : interval}
+                        placeholder={getIntervalTitle(RETENTION_CUSTOM, t)}
+                        normalize={toFloatNumber}
+                        disabled={processing}
+                    />
+                    {!QUERY_LOG_INTERVALS_DAYS.includes(interval) && (
                         <div className="form__group--input">
                             <div className="form__desc form__desc--top">{t('custom_rotation_input')}</div>
 
-                            <Controller
-                                name="customInterval"
-                                control={control}
-                                render={({ field, fieldState }) => (
-                                    <Input
-                                        {...field}
-                                        data-testid="logs_config_custom_interval"
-                                        disabled={processing}
-                                        error={fieldState.error?.message}
-                                        min={RETENTION_RANGE.MIN}
-                                        max={RETENTION_RANGE.MAX}
-                                        onChange={(e) => {
-                                            const { value } = e.target;
-                                            field.onChange(toNumber(value));
-                                        }}
-                                    />
-                                )}
+                            <Field
+                                key={RETENTION_CUSTOM_INPUT}
+                                name={CUSTOM_INTERVAL}
+                                type="number"
+                                className="form-control"
+                                component={renderInputField}
+                                disabled={processing}
+                                normalize={toFloatNumber}
+                                min={RETENTION_RANGE.MIN}
+                                max={RETENTION_RANGE.MAX}
                             />
                         </div>
                     )}
-
-                    {QUERY_LOG_INTERVALS_DAYS.map((interval) => (
-                        <label key={interval} className="custom-control custom-radio">
-                            <input
-                                type="radio"
-                                className="custom-control-input"
-                                data-testid={`logs_config_${interval}`}
-                                disabled={processing}
-                                value={interval}
-                                checked={intervalValue === interval}
-                                onChange={(e) => {
-                                    setValue('interval', parseInt(e.target.value, 10));
-                                }}
-                            />
-
-                            <span className="custom-control-label">{getIntervalTitle(interval)}</span>
-                        </label>
-                    ))}
+                    {getIntervalFields(processing, t, toFloatNumber)}
                 </div>
             </div>
 
@@ -189,41 +154,51 @@ export const Form = ({ initialValues, processing, processingReset, onSubmit, onR
             </div>
 
             <div className="form__group form__group--settings">
-                <Controller
+                <Field
                     name="ignored"
-                    control={control}
-                    render={({ field, fieldState }) => (
-                        <Textarea
-                            {...field}
-                            data-testid="logs_config_ingored"
-                            placeholder={t('ignore_domains')}
-                            className="text-input"
-                            disabled={processing}
-                            error={fieldState.error?.message}
-                            onBlur={handleIgnoredBlur}
-                        />
-                    )}
+                    type="textarea"
+                    className="form-control form-control--textarea font-monospace text-input"
+                    component={renderTextareaField}
+                    placeholder={t('ignore_domains')}
+                    disabled={processing}
+                    normalizeOnBlur={trimLinesAndRemoveEmpty}
                 />
             </div>
 
             <div className="mt-5">
                 <button
                     type="submit"
-                    data-testid="logs_config_save"
                     className="btn btn-success btn-standard btn-large"
-                    disabled={disableSubmit}>
+                    disabled={
+                        submitting ||
+                        invalid ||
+                        processing ||
+                        (!QUERY_LOG_INTERVALS_DAYS.includes(interval) && !customInterval)
+                    }>
                     <Trans>save_btn</Trans>
                 </button>
 
                 <button
                     type="button"
-                    data-testid="logs_config_clear"
                     className="btn btn-outline-secondary btn-standard form__button"
-                    onClick={onReset}
-                    disabled={processingReset}>
+                    onClick={() => handleClear()}
+                    disabled={processingClear}>
                     <Trans>query_log_clear</Trans>
                 </button>
             </div>
         </form>
     );
 };
+
+const selector = formValueSelector(FORM_NAME.LOG_CONFIG);
+
+Form = connect((state) => {
+    const interval = selector(state, 'interval');
+    const customInterval = selector(state, CUSTOM_INTERVAL);
+    return {
+        interval,
+        customInterval,
+    };
+})(Form);
+
+export default flow([withTranslation(), reduxForm({ form: FORM_NAME.LOG_CONFIG })])(Form);

client/src/components/Settings/LogsConfig/index.tsx

@@ -3,7 +3,7 @@ import { withTranslation } from 'react-i18next';
 
 import Card from '../../ui/Card';
 
-import { Form, FormValues } from './Form';
+import Form from './Form';
 import { HOUR } from '../../../helpers/constants';
 
 interface LogsConfigProps {
@@ -20,7 +20,7 @@ interface LogsConfigProps {
 }
 
 class LogsConfig extends Component<LogsConfigProps> {
-    handleFormSubmit = (values: FormValues) => {
+    handleFormSubmit = (values: any) => {
         const { t, interval: prevInterval } = this.props;
         const { interval, customInterval, ...rest } = values;
 
@@ -53,12 +53,19 @@ class LogsConfig extends Component<LogsConfigProps> {
     render() {
         const {
             t,
+
             enabled,
+
             interval,
+
             processing,
+
             processingClear,
+
             anonymize_client_ip,
+
             ignored,
+
             customInterval,
         } = this.props;
 
@@ -73,10 +80,10 @@ class LogsConfig extends Component<LogsConfigProps> {
                             anonymize_client_ip,
                             ignored: ignored?.join('\n'),
                         }}
-                        processing={processing}
-                        processingReset={processingClear}
                         onSubmit={this.handleFormSubmit}
-                        onReset={this.handleClear}
+                        processing={processing}
+                        processingClear={processingClear}
+                        handleClear={this.handleClear}
                     />
                 </div>
             </Card>

client/src/components/Settings/Settings.css

@@ -63,7 +63,6 @@
 }
 
 .form__message {
-    margin-top: 4px;
     font-size: 11px;
 }
 
@@ -98,10 +97,6 @@
     margin: 0 0 8px;
 }
 
-.form__label {
-    margin-bottom: 8px;
-}
-
 .form__label--bold {
     font-weight: 700;
 }

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

@@ -1,101 +1,90 @@
 import React, { useEffect } from 'react';
-import { Trans, useTranslation } from 'react-i18next';
-import i18next from 'i18next';
+import { change, Field, formValueSelector, reduxForm } from 'redux-form';
+import { Trans, withTranslation } from 'react-i18next';
+import flow from 'lodash/flow';
+import { connect } from 'react-redux';
 
-import { Controller, useForm } from 'react-hook-form';
-import { STATS_INTERVALS_DAYS, DAY, RETENTION_CUSTOM, RETENTION_RANGE } from '../../../helpers/constants';
+import {
+    renderRadioField,
+    toNumber,
+    CheckboxField,
+    renderTextareaField,
+    toFloatNumber,
+    renderInputField,
+} from '../../../helpers/form';
+import {
+    FORM_NAME,
+    STATS_INTERVALS_DAYS,
+    DAY,
+    RETENTION_CUSTOM,
+    RETENTION_CUSTOM_INPUT,
+    CUSTOM_INTERVAL,
+    RETENTION_RANGE,
+} from '../../../helpers/constants';
 
+import { trimLinesAndRemoveEmpty } from '../../../helpers/helpers';
 import '../FormButton.css';
-import { Checkbox } from '../../ui/Controls/Checkbox';
-import { Input } from '../../ui/Controls/Input';
-import { toNumber } from '../../../helpers/form';
-import { Textarea } from '../../ui/Controls/Textarea';
 
-const getIntervalTitle = (interval: any) => {
-    switch (interval) {
+const getIntervalTitle = (intervalMs: any, t: any) => {
+    switch (intervalMs) {
         case RETENTION_CUSTOM:
-            return i18next.t('settings_custom');
+            return t('settings_custom');
         case DAY:
-            return i18next.t('interval_24_hour');
+            return t('interval_24_hour');
         default:
-            return i18next.t('interval_days', { count: interval / DAY });
+            return t('interval_days', { count: intervalMs / DAY });
     }
 };
 
-export type FormValues = {
-    enabled: boolean;
-    interval: number;
-    customInterval?: number | null;
-    ignored: string;
-};
-
-const defaultFormValues = {
-    enabled: false,
-    interval: DAY,
-    customInterval: null,
-    ignored: '',
-};
-
-type Props = {
-    initialValues: FormValues;
+interface FormProps {
+    handleSubmit: (...args: unknown[]) => string;
+    handleReset: (...args: unknown[]) => string;
+    change: (...args: unknown[]) => unknown;
+    submitting: boolean;
+    invalid: boolean;
     processing: boolean;
     processingReset: boolean;
-    onSubmit: (values: FormValues) => void;
-    onReset: () => void;
-};
-
-export const Form = ({ initialValues, processing, processingReset, onSubmit, onReset }: Props) => {
-    const { t } = useTranslation();
+    t: (...args: unknown[]) => string;
+    interval?: number;
+    customInterval?: number;
+    dispatch: (...args: unknown[]) => unknown;
+}
 
+let Form = (props: FormProps) => {
     const {
         handleSubmit,
-        watch,
-        setValue,
-        control,
-        formState: { isSubmitting },
-    } = useForm<FormValues>({
-        mode: 'onBlur',
-        defaultValues: {
-            ...defaultFormValues,
-            ...initialValues,
-        },
-    });
-
-    const intervalValue = watch('interval');
-    const customIntervalValue = watch('customInterval');
+        processing,
+        submitting,
+        invalid,
+        handleReset,
+        processingReset,
+        t,
+        interval,
+        customInterval,
+        dispatch,
+    } = props;
 
     useEffect(() => {
-        if (STATS_INTERVALS_DAYS.includes(intervalValue)) {
-            setValue('customInterval', null);
+        if (STATS_INTERVALS_DAYS.includes(interval)) {
+            dispatch(change(FORM_NAME.STATS_CONFIG, CUSTOM_INTERVAL, null));
         }
-    }, [intervalValue]);
-
-    const onSubmitForm = (data: FormValues) => {
-        onSubmit(data);
-    };
-
-    const disableSubmit = isSubmitting || processing || (intervalValue === RETENTION_CUSTOM && !customIntervalValue);
+    }, [interval]);
 
     return (
-        <form onSubmit={handleSubmit(onSubmitForm)}>
+        <form onSubmit={handleSubmit}>
             <div className="form__group form__group--settings">
-                <Controller
+                <Field
                     name="enabled"
-                    control={control}
-                    render={({ field }) => (
-                        <Checkbox
-                            {...field}
-                            data-testid="stats_config_enabled"
-                            title={t('statistics_enable')}
-                            disabled={processing}
-                        />
-                    )}
+                    type="checkbox"
+                    component={CheckboxField}
+                    placeholder={t('statistics_enable')}
+                    disabled={processing}
                 />
             </div>
 
-            <div className="form__label form__label--with-desc">
+            <label className="form__label form__label--with-desc">
                 <Trans>statistics_retention</Trans>
-            </div>
+            </label>
 
             <div className="form__desc form__desc--top">
                 <Trans>statistics_retention_desc</Trans>
@@ -103,105 +92,85 @@ export const Form = ({ initialValues, processing, processingReset, onSubmit, onR
 
             <div className="form__group form__group--settings mt-2">
                 <div className="custom-controls-stacked">
-                    <label className="custom-control custom-radio">
-                        <input
-                            type="radio"
-                            data-testid="stats_config_interval"
-                            className="custom-control-input"
-                            disabled={processing}
-                            checked={!STATS_INTERVALS_DAYS.includes(intervalValue)}
-                            value={RETENTION_CUSTOM}
-                            onChange={(e) => {
-                                setValue('interval', parseInt(e.target.value, 10));
-                            }}
-                        />
-
-                        <span className="custom-control-label">{getIntervalTitle(RETENTION_CUSTOM)}</span>
-                    </label>
-
-                    {!STATS_INTERVALS_DAYS.includes(intervalValue) && (
+                    <Field
+                        key={RETENTION_CUSTOM}
+                        name="interval"
+                        type="radio"
+                        component={renderRadioField}
+                        value={STATS_INTERVALS_DAYS.includes(interval) ? RETENTION_CUSTOM : interval}
+                        placeholder={getIntervalTitle(RETENTION_CUSTOM, t)}
+                        normalize={toFloatNumber}
+                        disabled={processing}
+                    />
+                    {!STATS_INTERVALS_DAYS.includes(interval) && (
                         <div className="form__group--input">
-                            <div className="form__desc form__desc--top">{i18next.t('custom_retention_input')}</div>
+                            <div className="form__desc form__desc--top">{t('custom_retention_input')}</div>
 
-                            <Controller
-                                name="customInterval"
-                                control={control}
-                                render={({ field, fieldState }) => (
-                                    <Input
-                                        {...field}
-                                        data-testid="stats_config_custom_interval"
-                                        disabled={processing}
-                                        error={fieldState.error?.message}
-                                        min={RETENTION_RANGE.MIN}
-                                        max={RETENTION_RANGE.MAX}
-                                        onChange={(e) => {
-                                            const { value } = e.target;
-                                            field.onChange(toNumber(value));
-                                        }}
-                                    />
-                                )}
+                            <Field
+                                key={RETENTION_CUSTOM_INPUT}
+                                name={CUSTOM_INTERVAL}
+                                type="number"
+                                className="form-control"
+                                component={renderInputField}
+                                disabled={processing}
+                                normalize={toFloatNumber}
+                                min={RETENTION_RANGE.MIN}
+                                max={RETENTION_RANGE.MAX}
                             />
                         </div>
                     )}
                     {STATS_INTERVALS_DAYS.map((interval) => (
-                        <label key={interval} className="custom-control custom-radio">
-                            <input
-                                type="radio"
-                                className="custom-control-input"
-                                disabled={processing}
-                                value={interval}
-                                checked={intervalValue === interval}
-                                onChange={(e) => {
-                                    setValue('interval', parseInt(e.target.value, 10));
-                                }}
-                            />
-
-                            <span className="custom-control-label">{getIntervalTitle(interval)}</span>
-                        </label>
+                        <Field
+                            key={interval}
+                            name="interval"
+                            type="radio"
+                            component={renderRadioField}
+                            value={interval}
+                            placeholder={getIntervalTitle(interval, t)}
+                            normalize={toNumber}
+                            disabled={processing}
+                        />
                     ))}
                 </div>
             </div>
 
-            <div className="form__label form__label--with-desc">
+            <label className="form__label form__label--with-desc">
                 <Trans>ignore_domains_title</Trans>
-            </div>
+            </label>
 
             <div className="form__desc form__desc--top">
                 <Trans>ignore_domains_desc_stats</Trans>
             </div>
 
             <div className="form__group form__group--settings">
-                <Controller
+                <Field
                     name="ignored"
-                    control={control}
-                    render={({ field, fieldState }) => (
-                        <Textarea
-                            {...field}
-                            data-testid="stats_config_ignored"
-                            placeholder={t('ignore_domains')}
-                            className="text-input"
-                            disabled={processing}
-                            error={fieldState.error?.message}
-                            trimOnBlur
-                        />
-                    )}
+                    type="textarea"
+                    className="form-control form-control--textarea font-monospace text-input"
+                    component={renderTextareaField}
+                    placeholder={t('ignore_domains')}
+                    disabled={processing}
+                    normalizeOnBlur={trimLinesAndRemoveEmpty}
                 />
             </div>
 
             <div className="mt-5">
                 <button
                     type="submit"
-                    data-testid="stats_config_save"
                     className="btn btn-success btn-standard btn-large"
-                    disabled={disableSubmit}>
+                    disabled={
+                        submitting ||
+                        invalid ||
+                        processing ||
+                        (!STATS_INTERVALS_DAYS.includes(interval) && !customInterval)
+                    }>
                     <Trans>save_btn</Trans>
                 </button>
 
                 <button
                     type="button"
-                    data-testid="stats_config_clear"
                     className="btn btn-outline-secondary btn-standard form__button"
-                    onClick={onReset}
+                    onClick={() => handleReset()}
                     disabled={processingReset}>
                     <Trans>statistics_clear</Trans>
                 </button>
@@ -209,3 +178,16 @@ export const Form = ({ initialValues, processing, processingReset, onSubmit, onR
         </form>
     );
 };
+
+const selector = formValueSelector(FORM_NAME.STATS_CONFIG);
+
+Form = connect((state) => {
+    const interval = selector(state, 'interval');
+    const customInterval = selector(state, CUSTOM_INTERVAL);
+    return {
+        interval,
+        customInterval,
+    };
+})(Form);
+
+export default flow([withTranslation(), reduxForm({ form: FORM_NAME.STATS_CONFIG })])(Form);

client/src/components/Settings/StatsConfig/index.tsx

@@ -3,7 +3,7 @@ import { withTranslation } from 'react-i18next';
 
 import Card from '../../ui/Card';
 
-import { Form, FormValues } from './Form';
+import Form from './Form';
 import { HOUR } from '../../../helpers/constants';
 
 interface StatsConfigProps {
@@ -19,7 +19,7 @@ interface StatsConfigProps {
 }
 
 class StatsConfig extends Component<StatsConfigProps> {
-    handleFormSubmit = ({ enabled, interval, ignored, customInterval }: FormValues) => {
+    handleFormSubmit = ({ enabled, interval, ignored, customInterval }: any) => {
         const { t, interval: prevInterval } = this.props;
         const newInterval = customInterval ? customInterval * HOUR : interval;
 
@@ -49,11 +49,17 @@ class StatsConfig extends Component<StatsConfigProps> {
     render() {
         const {
             t,
+
             interval,
+
             customInterval,
+
             processing,
+
             processingReset,
+
             ignored,
+
             enabled,
         } = this.props;
 
@@ -67,10 +73,10 @@ class StatsConfig extends Component<StatsConfigProps> {
                             enabled,
                             ignored: ignored.join('\n'),
                         }}
+                        onSubmit={this.handleFormSubmit}
                         processing={processing}
                         processingReset={processingReset}
-                        onSubmit={this.handleFormSubmit}
-                        onReset={this.handleReset}
+                        handleReset={this.handleReset}
                     />
                 </div>
             </Card>

client/src/components/Settings/index.tsx

@@ -1,14 +1,13 @@
 import React, { Component, Fragment } from 'react';
 import { withTranslation } from 'react-i18next';
 
-import i18next from 'i18next';
 import StatsConfig from './StatsConfig';
 
 import LogsConfig from './LogsConfig';
 
-import { FiltersConfig } from './FiltersConfig';
+import FiltersConfig from './FiltersConfig';
 
-import { Checkbox } from '../ui/Controls/Checkbox';
+import Checkbox from '../ui/Checkbox';
 
 import Loading from '../ui/Loading';
 
@@ -25,14 +24,14 @@ const ORDER_KEY = 'order';
 const SETTINGS = {
     safebrowsing: {
         enabled: false,
-        title: i18next.t('use_adguard_browsing_sec'),
-        subtitle: i18next.t('use_adguard_browsing_sec_hint'),
+        title: 'use_adguard_browsing_sec',
+        subtitle: 'use_adguard_browsing_sec_hint',
         [ORDER_KEY]: 0,
     },
     parental: {
         enabled: false,
-        title: i18next.t('use_adguard_parental'),
-        subtitle: i18next.t('use_adguard_parental_hint'),
+        title: 'use_adguard_parental',
+        subtitle: 'use_adguard_parental_hint',
         [ORDER_KEY]: 1,
     },
 };
@@ -90,18 +89,9 @@ class Settings extends Component<SettingsProps> {
     renderSettings = (settings: any) =>
         getObjectKeysSorted(SETTINGS, ORDER_KEY).map((key: any) => {
             const setting = settings[key];
-            const { enabled, title, subtitle } = setting;
+            const { enabled } = setting;
 
-            return (
-                <div key={key} className="form__group form__group--checkbox">
-                    <Checkbox
-                        value={enabled}
-                        title={title}
-                        subtitle={subtitle}
-                        onChange={(checked) => this.props.toggleSetting(key, !checked)}
-                    />
-                </div>
-            );
+            return <Checkbox {...setting} key={key} handleChange={() => this.props.toggleSetting(key, enabled)} />;
         });
 
     renderSafeSearch = () => {
@@ -116,29 +106,27 @@ class Settings extends Component<SettingsProps> {
 
         return (
             <>
-                <div className="form__group form__group--checkbox">
-                    <Checkbox
-                        value={enabled}
-                        title={i18next.t('enforce_safe_search')}
-                        subtitle={i18next.t('enforce_save_search_hint')}
-                        onChange={(checked) =>
-                            this.props.toggleSetting('safesearch', { ...safesearch, enabled: checked })
-                        }
-                    />
-                </div>
+                <Checkbox
+                    enabled={enabled}
+                    title="enforce_safe_search"
+                    subtitle="enforce_save_search_hint"
+                    handleChange={({ target: { checked: enabled } }) =>
+                        this.props.toggleSetting('safesearch', { ...safesearch, enabled })
+                    }
+                />
 
                 <div className="form__group--inner">
                     {Object.keys(searches).map((searchKey) => (
-                        <div key={searchKey} className="form__group form__group--checkbox">
-                            <Checkbox
-                                value={searches[searchKey]}
-                                title={captitalizeWords(searchKey)}
-                                disabled={!safesearch.enabled}
-                                onChange={(checked) =>
-                                    this.props.toggleSetting('safesearch', { ...safesearch, [searchKey]: checked })
-                                }
-                            />
-                        </div>
+                        <Checkbox
+                            key={searchKey}
+                            enabled={searches[searchKey]}
+                            title={captitalizeWords(searchKey)}
+                            subtitle=""
+                            disabled={!safesearch.enabled}
+                            handleChange={({ target: { checked } }: any) =>
+                                this.props.toggleSetting('safesearch', { ...safesearch, [searchKey]: checked })
+                            }
+                        />
                     ))}
                 </div>
             </>
@@ -148,14 +136,23 @@ class Settings extends Component<SettingsProps> {
     render() {
         const {
             settings,
+
             setStatsConfig,
+
             resetStats,
+
             stats,
+
             queryLogs,
+
             setLogsConfig,
+
             clearLogs,
+
             filtering,
+
             setFiltersConfig,
+
             t,
         } = this.props;
 
@@ -166,7 +163,6 @@ class Settings extends Component<SettingsProps> {
                 <PageTitle title={t('general_settings')} />
 
                 {!isDataReady && <Loading />}
-
                 {isDataReady && (
                     <div className="content">
                         <div className="row">

client/src/components/SetupGuide/index.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Trans, withTranslation } from 'react-i18next';
 
-import { Guide } from '../ui/Guide';
+import Guide from '../ui/Guide';
 
 import Card from '../ui/Card';
 
@@ -14,7 +14,10 @@ interface SetupGuideProps {
     t: (id: string) => string;
 }
 
-const SetupGuide = ({ t, dashboard: { dnsAddresses } }: SetupGuideProps) => (
+const SetupGuide = ({
+    t,
+    dashboard: { dnsAddresses },
+}: SetupGuideProps) => (
     <div className="guide">
         <PageTitle title={t('setup_guide')} />
 

client/src/components/ui/Checkbox.tsx

@@ -0,0 +1,59 @@
+import React, { Component } from 'react';
+import { withTranslation } from 'react-i18next';
+
+import './Checkbox.css';
+
+interface CheckboxProps {
+    title: string;
+    subtitle: string;
+    enabled: boolean;
+    handleChange: (...args: unknown[]) => unknown;
+    disabled?: boolean;
+    t?: (...args: unknown[]) => string;
+}
+
+class Checkbox extends Component<CheckboxProps> {
+    render() {
+        const {
+            title,
+
+            subtitle,
+
+            enabled,
+
+            handleChange,
+
+            disabled,
+
+            t,
+        } = this.props;
+        return (
+            <div className="form__group form__group--checkbox">
+                <label className="checkbox checkbox--settings">
+                    <span className="checkbox__marker" />
+
+                    <input
+                        type="checkbox"
+                        className="checkbox__input"
+                        onChange={handleChange}
+                        checked={enabled}
+                        disabled={disabled}
+                    />
+
+                    <span className="checkbox__label">
+                        <span className="checkbox__label-text">
+                            <span className="checkbox__label-title">{t(title)}</span>
+
+                            <span
+                                className="checkbox__label-subtitle"
+                                dangerouslySetInnerHTML={{ __html: t(subtitle) }}
+                            />
+                        </span>
+                    </span>
+                </label>
+            </div>
+        );
+    }
+}
+
+export default withTranslation()(Checkbox);

client/src/components/ui/Controls/Checkbox/index.tsx

@@ -1,50 +0,0 @@
-import React, { forwardRef, ReactNode } from 'react';
-import clsx from 'clsx';
-
-import './checkbox.css';
-
-type Props = {
-    title: string;
-    subtitle?: ReactNode;
-    value: boolean;
-    name?: string;
-    disabled?: boolean;
-    className?: string;
-    error?: string;
-    onChange: (value: boolean) => void;
-    onBlur?: () => void;
-};
-
-export const Checkbox = forwardRef<HTMLInputElement, Props>(
-    (
-        { title, subtitle, value, name, disabled, error, className = 'checkbox--form', onChange, onBlur, ...rest },
-        ref,
-    ) => (
-        <>
-            <label className={clsx('checkbox', className)}>
-                <span className="checkbox__marker" />
-                <input
-                    name={name}
-                    type="checkbox"
-                    className="checkbox__input"
-                    disabled={disabled}
-                    checked={value}
-                    onChange={(e) => onChange(e.target.checked)}
-                    onBlur={onBlur}
-                    ref={ref}
-                    {...rest}
-                />
-                <span className="checkbox__label">
-                    <span className="checkbox__label-text checkbox__label-text--long">
-                        <span className="checkbox__label-title">{title}</span>
-
-                        {subtitle && <span className="checkbox__label-subtitle">{subtitle}</span>}
-                    </span>
-                </span>
-            </label>
-            {error && <div className="form__message form__message--error">{error}</div>}
-        </>
-    ),
-);
-
-Checkbox.displayName = 'Checkbox';

client/src/components/ui/Controls/Input.tsx

@@ -1,45 +0,0 @@
-import React, { ComponentProps, forwardRef, ReactNode } from 'react';
-import clsx from 'clsx';
-
-type Props = ComponentProps<'input'> & {
-    label?: string;
-    desc?: string;
-    leftAddon?: ReactNode;
-    rightAddon?: ReactNode;
-    error?: string;
-    trimOnBlur?: boolean;
-};
-
-export const Input = forwardRef<HTMLInputElement, Props>(
-    ({ name, label, desc, className, leftAddon, rightAddon, error, trimOnBlur, onBlur, ...rest }, ref) => (
-        <div className={clsx('form-group', { 'has-error': !!error })}>
-            {label && (
-                <label className={clsx('form__label', { 'form__label--with-desc': !!desc })} htmlFor={name}>
-                    {label}
-                </label>
-            )}
-            {desc && <div className="form__desc form__desc--top">{desc}</div>}
-            <div className="input-group">
-                {leftAddon && <div>{leftAddon}</div>}
-                <input
-                    className={clsx('form-control', { 'is-invalid': !!error }, className)}
-                    ref={ref}
-                    onBlur={(e) => {
-                        if (trimOnBlur) {
-                            e.target.value = e.target.value.trim();
-                            rest.onChange(e);
-                        }
-                        if (onBlur) {
-                            onBlur(e);
-                        }
-                    }}
-                    {...rest}
-                />
-                {rightAddon && <div>{rightAddon}</div>}
-            </div>
-            {error && <div className="form__message form__message--error mt-1">{error}</div>}
-        </div>
-    ),
-);
-
-Input.displayName = 'Input';

client/src/components/ui/Controls/Radio.tsx

@@ -1,50 +0,0 @@
-import React, { forwardRef, ReactNode } from 'react';
-
-type Props<T> = {
-    name: string;
-    value: T;
-    onChange: (e: T) => void;
-    options: { label: string; desc?: ReactNode; value: T }[];
-    disabled?: boolean;
-    error?: string;
-};
-
-export const Radio = forwardRef<HTMLInputElement, Props<string | boolean | number | undefined>>(
-    ({ disabled, onChange, value, options, name, error, ...rest }, ref) => {
-        const getId = (label: string) => (name ? `${label}_${name}` : label);
-
-        return (
-            <div>
-                {options.map((o) => {
-                    const checked = value === o.value;
-
-                    return (
-                        <label
-                            key={`${getId(o.label)}`}
-                            htmlFor={getId(o.label)}
-                            className="custom-control custom-radio">
-                            <input
-                                id={getId(o.label)}
-                                data-testid={o.value}
-                                type="radio"
-                                className="custom-control-input"
-                                onChange={() => onChange(o.value)}
-                                checked={checked}
-                                disabled={disabled}
-                                ref={ref}
-                                {...rest}
-                            />
-
-                            <span className="custom-control-label">{o.label}</span>
-
-                            {o.desc && <span className="checkbox__label-subtitle">{o.desc}</span>}
-                        </label>
-                    );
-                })}
-                {!disabled && error && <span className="form__message form__message--error">{error}</span>}
-            </div>
-        );
-    },
-);
-
-Radio.displayName = 'Radio';

client/src/components/ui/Controls/Select.tsx

@@ -1,27 +0,0 @@
-import React, { ComponentProps, forwardRef } from 'react';
-import clsx from 'clsx';
-
-type SelectProps = ComponentProps<'select'> & {
-    label?: string;
-    error?: string;
-};
-
-export const Select = forwardRef<HTMLSelectElement, SelectProps>(
-    ({ name, label, className, error, children, ...rest }, ref) => (
-        <div className={clsx('form-group', { 'has-error': !!error })}>
-            {label && (
-                <label className="form__label" htmlFor={name}>
-                    {label}
-                </label>
-            )}
-            <div className="input-group">
-                <select className={clsx('form-control custom-select', className)} ref={ref} {...rest}>
-                    {children}
-                </select>
-            </div>
-            {error && <div className="form__message form__message--error mt-1">{error}</div>}
-        </div>
-    ),
-);
-
-Select.displayName = 'Select';

client/src/components/ui/Controls/Textarea.tsx

@@ -1,45 +0,0 @@
-import React, { ComponentProps, forwardRef } from 'react';
-import clsx from 'clsx';
-import { trimLinesAndRemoveEmpty } from '../../../helpers/helpers';
-
-type Props = ComponentProps<'textarea'> & {
-    className?: string;
-    wrapperClassName?: string;
-    label?: string;
-    desc?: string;
-    error?: string;
-    trimOnBlur?: boolean;
-};
-
-export const Textarea = forwardRef<HTMLTextAreaElement, Props>(
-    ({ name, label, desc, className, wrapperClassName, error, trimOnBlur, onBlur, ...rest }, ref) => (
-        <div className={clsx('form-group', wrapperClassName, { 'has-error': !!error })}>
-            {label && (
-                <label className={clsx('form__label', { 'form__label--with-desc': !!desc })} htmlFor={name}>
-                    {label}
-                </label>
-            )}
-            {desc && <div className="form__desc form__desc--top">{desc}</div>}
-            <textarea
-                className={clsx(
-                    'form-control form-control--textarea form-control--textarea-small font-monospace',
-                    className,
-                )}
-                ref={ref}
-                onBlur={(e) => {
-                    if (trimOnBlur) {
-                        const normalizedValue = trimLinesAndRemoveEmpty(e.target.value);
-                        rest.onChange(normalizedValue);
-                    }
-                    if (onBlur) {
-                        onBlur(e);
-                    }
-                }}
-                {...rest}
-            />
-            {error && <div className="form__message form__message--error">{error}</div>}
-        </div>
-    ),
-);
-
-Textarea.displayName = 'Textarea';

client/src/components/ui/Guide/Guide.tsx

@@ -7,7 +7,7 @@ import { MOBILE_CONFIG_LINKS } from '../../../helpers/constants';
 
 import Tabs from '../Tabs';
 
-import { MobileConfigForm } from './MobileConfigForm';
+import MobileConfigForm from './MobileConfigForm';
 import { RootState } from '../../../initialState';
 
 interface renderLiProps {
@@ -346,7 +346,7 @@ interface GuideProps {
     dnsAddresses?: unknown[];
 }
 
-export const Guide = ({ dnsAddresses }: GuideProps) => {
+const Guide = ({ dnsAddresses }: GuideProps) => {
     const { t } = useTranslation();
 
     const serverName = useSelector((state: RootState) => state.encryption?.server_name);
@@ -381,3 +381,5 @@ export const Guide = ({ dnsAddresses }: GuideProps) => {
 Guide.defaultProps = {
     dnsAddresses: [],
 };
+
+export default Guide;