From ff7c26f6f78fe71cddd21a7b66fed84e43db99ae Mon Sep 17 00:00:00 2001
From: shats <admin@shts.su>
Date: Tue, 20 Jan 2026 18:49:25 +0700
Subject: [PATCH] feat(ServerModal, serverUtils): implement conditional tunnel
 selection based on server type; add needsTunnel utility function for improved
 server configuration

---
 .../src/components/server/ServerModal.jsx     | 33 ++++++++++---------
 frontend/src/utils/serverUtils.js             | 12 +++++++
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/server/ServerModal.jsx b/frontend/src/components/server/ServerModal.jsx
index d5dab57..5a13808 100644
--- a/frontend/src/components/server/ServerModal.jsx
+++ b/frontend/src/components/server/ServerModal.jsx
@@ -4,6 +4,7 @@ import {
   makeGateway, 
   normalizeGateways, 
   needsGateways as NEEDS_GATEWAYS,
+  needsTunnel as NEEDS_TUNNEL,
   SERVER_TYPE_OPTIONS,
   TUNNEL_TYPES
 } from '../../utils/serverUtils.js';
@@ -417,7 +418,7 @@ function ServerModal({ show, mode = 'add', server, onSave, onClose, error: exter
                 )}
 
                 {/* Тип сервера */}
-                <div className="col-md-6">
+                <div className={NEEDS_TUNNEL(localServer.type) ? "col-md-6" : "col-12"}>
                   <label className="form-label required">Тип сервера</label>
                   <select
                     className="form-select"
@@ -433,20 +434,22 @@ function ServerModal({ show, mode = 'add', server, onSave, onClose, error: exter
                   </select>
                 </div>
 
-                {/* Тип туннеля */}
-                <div className="col-md-6">
-                  <label className="form-label required">Тип туннеля</label>
-                  <select
-                    className="form-select"
-                    value={localServer.tunnel || 'GRE'}
-                    onChange={(e) => handleFieldChange('tunnel', e.target.value)}
-                    required
-                  >
-                    {TUNNEL_TYPES.map((t) => (
-                      <option key={t} value={t}>{t}</option>
-                    ))}
-                  </select>
-                </div>
+                {/* Тип туннеля - только для типов, которым он нужен */}
+                {NEEDS_TUNNEL(localServer.type) && (
+                  <div className="col-md-6">
+                    <label className="form-label required">Тип туннеля</label>
+                    <select
+                      className="form-select"
+                      value={localServer.tunnel || 'GRE'}
+                      onChange={(e) => handleFieldChange('tunnel', e.target.value)}
+                      required
+                    >
+                      {TUNNEL_TYPES.map((t) => (
+                        <option key={t} value={t}>{t}</option>
+                      ))}
+                    </select>
+                  </div>
+                )}
 
                 {/* Основной шлюз (текстовое поле для совместимости) */}
                 <div className="col-12">
diff --git a/frontend/src/utils/serverUtils.js b/frontend/src/utils/serverUtils.js
index e9e7224..5064726 100644
--- a/frontend/src/utils/serverUtils.js
+++ b/frontend/src/utils/serverUtils.js
@@ -92,8 +92,20 @@ export const SERVER_TYPE_OPTIONS = [
   { value: 'jumphost', label: 'Jumphost' },
   { value: 'exit', label: 'Выходная нода' },
   { value: 'bgp', label: 'BGP роутер' },
+  { value: 'dns', label: 'DNS сервер' },
 ];
 
+/**
+ * Проверяет, нужен ли туннель для данного типа сервера
+ * @param {string} type - Тип сервера
+ * @returns {boolean}
+ */
+export const needsTunnel = (type) => {
+  // BGP и DNS серверам туннель не нужен
+  const noTunnelTypes = ['bgp', 'dns'];
+  return !noTunnelTypes.includes(String(type || '').toLowerCase());
+};
+
 /**
  * Типы туннелей
  */