From ecae39d94be5000e60539df0b3db41835b6cf009 Mon Sep 17 00:00:00 2001
From: braginini <bangvalo@gmail.com>
Date: Thu, 13 Jul 2023 12:55:04 +0200
Subject: [PATCH] Adjust DNS view

---
 src/components/NameServerGroupUpdate.tsx | 81 ++++++++++++------------
 src/views/Nameservers.tsx                | 19 +++---
 2 files changed, 49 insertions(+), 51 deletions(-)

diff --git a/src/components/NameServerGroupUpdate.tsx b/src/components/NameServerGroupUpdate.tsx
index 95b25be..73ef467 100644
--- a/src/components/NameServerGroupUpdate.tsx
+++ b/src/components/NameServerGroupUpdate.tsx
@@ -314,6 +314,46 @@ const NameServerGroupUpdate = () => {
     { errors }: any
   ) => (
     <Row>
+      <Col span={24} style={{ marginBottom: "15px" }}>
+        <Form.Item name="enabled" label="">
+          <div
+              style={{
+                display: "flex",
+                gap: "15px",
+              }}
+          >
+            <Switch
+                onChange={handleChangeDisabled}
+                defaultChecked={formNSGroup.enabled}
+                size="small"
+                checked={formNSGroup.enabled}
+            />
+            <div>
+              <label
+                  style={{
+                    color: "rgba(0, 0, 0, 0.88)",
+                    fontSize: "14px",
+                    fontWeight: "500",
+                  }}
+              >
+                Enabled
+              </label>
+              <Paragraph
+                  type={"secondary"}
+                  style={{
+                    marginTop: "-2",
+                    fontWeight: "400",
+                    marginBottom: "0",
+                  }}
+              >
+                {formNSGroup.enabled
+                    ? "Disable this server if you don't want the configuration to apply immediately"
+                    : " Enable this server if you want the configuration to apply immediately"}
+              </Paragraph>
+            </div>
+          </div>
+        </Form.Item>
+      </Col>
       <Col>
         <div style={{ width: "100%", maxWidth: "360px" }}>
           <label
@@ -713,46 +753,7 @@ const NameServerGroupUpdate = () => {
                   </Select>
                 </Form.Item>
               </Col>
-              <Col span={24} style={{ marginBottom: "15px" }}>
-                <Form.Item name="enabled" label="">
-                  <div
-                    style={{
-                      display: "flex",
-                      gap: "15px",
-                    }}
-                  >
-                    <Switch
-                      onChange={handleChangeDisabled}
-                      defaultChecked={formNSGroup.enabled}
-                      size="small"
-                      checked={formNSGroup.enabled}
-                    />
-                    <div>
-                      <label
-                        style={{
-                          color: "rgba(0, 0, 0, 0.88)",
-                          fontSize: "14px",
-                          fontWeight: "500",
-                        }}
-                      >
-                        Enabled
-                      </label>
-                      <Paragraph
-                        type={"secondary"}
-                        style={{
-                          marginTop: "-2",
-                          fontWeight: "400",
-                          marginBottom: "0",
-                        }}
-                      >
-                        {formNSGroup.enabled
-                          ? "Disable this server if you don't want it to apply immediately"
-                          : " Enable this server if you want it to apply immediately"}
-                      </Paragraph>
-                    </div>
-                  </div>
-                </Form.Item>
-              </Col>
+
               <Col
                 style={{
                   width: "100%",
diff --git a/src/views/Nameservers.tsx b/src/views/Nameservers.tsx
index 9a856a0..0b72c01 100644
--- a/src/views/Nameservers.tsx
+++ b/src/views/Nameservers.tsx
@@ -601,7 +601,6 @@ export const Nameservers = () => {
               <Column
                 title="Name"
                 dataIndex="name"
-                align="center"
                 onFilter={(value: string | number | boolean, record) =>
                   (record as any).name.includes(value)
                 }
@@ -642,10 +641,17 @@ export const Nameservers = () => {
                   );
                 }}
               />
+              <Column
+                  title="Match domains"
+                  dataIndex="domains"
+                  align="center"
+                  render={(text, record: NameserverGroupDataTable) => {
+                    return renderPopoverDomains(text, record.domains, record);
+                  }}
+              />
               <Column
                 title="Nameservers"
                 dataIndex="nameservers"
-                align="center"
                 render={(nameservers: NameServer[]) => (
                   <>
                     {nameservers.map((nameserver) => (
@@ -654,18 +660,9 @@ export const Nameservers = () => {
                   </>
                 )}
               />
-              <Column
-                title="Match domains"
-                dataIndex="domains"
-                align="center"
-                render={(text, record: NameserverGroupDataTable) => {
-                  return renderPopoverDomains(text, record.domains, record);
-                }}
-              />
               <Column
                 title="Distribution groups"
                 dataIndex="groupsCount"
-                align="center"
                 render={(text, record: NameserverGroupDataTable) => {
                   return renderPopoverGroups(text, record.groups, record);
                 }}