From feb15745d2e867e360cd97de6763a668d6921158 Mon Sep 17 00:00:00 2001
From: Ildar Kamalov <ik@adguard.com>
Date: Tue, 21 Nov 2023 17:27:38 +0300
Subject: [PATCH] client: move cache fields to the upstream tab

---
 client/src/__locales/en.json                  |  3 +-
 .../src/components/Settings/Clients/Form.js   | 58 +++++++++----------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/client/src/__locales/en.json b/client/src/__locales/en.json
index 5edd09e3..3f6f74d7 100644
--- a/client/src/__locales/en.json
+++ b/client/src/__locales/en.json
@@ -736,5 +736,6 @@
     "friday_short": "Fri",
     "saturday_short": "Sat",
     "upstream_dns_cache_configuration": "Upstream DNS cache configuration",
-    "enable_upstream_dns_cache": "Enable upstream DNS cache"
+    "enable_upstream_dns_cache": "Enable DNS cache for this client's custom upstream configuration",
+    "dns_cache_size": "DNS cache size (in bytes)"
 }
diff --git a/client/src/components/Settings/Clients/Form.js b/client/src/components/Settings/Clients/Form.js
index bc1c9712..ba4ec4b3 100644
--- a/client/src/components/Settings/Clients/Form.js
+++ b/client/src/components/Settings/Clients/Form.js
@@ -222,35 +222,6 @@ let Form = (props) => {
                         />
                     </div>
                 ))}
-                <div className="form__label--bold form__label--top form__label--bot">
-                    {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('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>,
         },
         block_services: {
@@ -341,6 +312,35 @@ let Form = (props) => {
                     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>,
         },
     };