-
-
-
- {(editingServer.gateways || []).map((gw, idx) => (
-
-
-
-
{gw.primary ? 'Основной шлюз' : 'Резервный шлюз'}
- {(editingServer.gateways || []).length > 1 && (
-
- )}
-
-
- ))}
-
-
-
-
Один шлюз должен быть помечен как основной.
-
-
)}
diff --git a/frontend/src/ServerManager.jsx b/frontend/src/ServerManager.jsx
index 2743569..ec8e44b 100644
--- a/frontend/src/ServerManager.jsx
+++ b/frontend/src/ServerManager.jsx
@@ -31,6 +31,43 @@ const SERVER_TYPE_OPTIONS = [
{ value: 'jumphost', label: 'Jumphost' },
{ value: 'exit', label: 'Выходная нода' },
];
+const NEEDS_GATEWAYS = (type) => ['jumphost', 'exit'].includes(String(type || '').toLowerCase());
+
+const makeGateway = (over = {}) => ({
+ id: `${Date.now()}-${Math.random().toString(16).slice(2, 8)}`,
+ name: '',
+ ip: '',
+ comment: '',
+ primary: false,
+ ...over,
+});
+
+const normalizeGateways = (gateways = [], fallbackName = '') => {
+ if (!Array.isArray(gateways)) return [];
+ const cleaned = gateways
+ .map((g, idx) => ({
+ id: g?.id || `${Date.now()}-${idx}`,
+ name: String(g?.name || '').trim(),
+ ip: String(g?.ip || '').trim(),
+ comment: String(g?.comment || '').trim(),
+ primary: Boolean(g?.primary),
+ }))
+ .filter(g => g.name || g.ip || g.comment);
+ if (cleaned.length === 0) {
+ return [{ id: `${Date.now()}-primary`, name: fallbackName || 'gateway', ip: '', comment: '', primary: true }];
+ }
+ // ensure single primary
+ let hasPrimary = false;
+ cleaned.forEach((g, i) => {
+ if (g.primary && !hasPrimary) {
+ hasPrimary = true;
+ } else {
+ g.primary = false;
+ }
+ });
+ if (!hasPrimary) cleaned[0].primary = true;
+ return cleaned;
+};
function ServerManager() {
const [servers, setServers] = useState([]);
@@ -44,7 +81,8 @@ function ServerManager() {
provider: '',
tunnel: 'GRE',
type: 'jumphost',
- gateway: ''
+ gateway: '',
+ gateways: [makeGateway({ primary: true })],
});
const [error, setError] = useState('');
const [success, setSuccess] = useState('');
@@ -136,6 +174,7 @@ function ServerManager() {
const normalized = (Array.isArray(response.data) ? response.data : []).map((srv) => ({
...srv,
type: normalizeServerType(srv.type),
+ gateways: NEEDS_GATEWAYS(srv.type) ? normalizeGateways(srv.gateways, srv.gateway || srv.dns || srv.ip) : (Array.isArray(srv.gateways) ? srv.gateways : []),
}));
setServers(normalized);
setError('');
@@ -212,10 +251,20 @@ function ServerManager() {
};
const handleAddServerFromModal = () => {
- if (!newServer.ip.trim() || !newServer.dns.trim() || !newServer.country.trim() || !newServer.provider.trim() || !newServer.tunnel.trim() || !newServer.gateway.trim() || !newServer.type) {
+ if (!newServer.ip.trim() || !newServer.dns.trim() || !newServer.country.trim() || !newServer.provider.trim() || !newServer.tunnel.trim() || !newServer.type) {
setError('Все обязательные поля должны быть заполнены.');
return;
}
+ if (NEEDS_GATEWAYS(newServer.type)) {
+ const normalizedGws = normalizeGateways(newServer.gateways, newServer.gateway || newServer.dns || newServer.ip);
+ if (!normalizedGws.length) {
+ setError('Добавьте хотя бы один gateway и отметьте основной.');
+ return;
+ }
+ newServer.gateways = normalizedGws;
+ } else {
+ newServer.gateways = [];
+ }
// Проверяем, если выбран "Другой" провайдер, то customProvider должен быть заполнен
if (newServer.provider === 'Другой' && !customProvider.trim()) {
@@ -246,7 +295,8 @@ function ServerManager() {
provider: '',
tunnel: 'GRE',
type: 'jumphost',
- gateway: ''
+ gateway: '',
+ gateways: [makeGateway({ primary: true })],
});
setCustomProvider('');
setAddServerModalOpen(false);
@@ -264,7 +314,11 @@ function ServerManager() {
};
const handleEditModalSave = (updatedServer) => {
- const normalizedServer = { ...updatedServer, type: normalizeServerType(updatedServer.type) };
+ const normalizedServer = {
+ ...updatedServer,
+ type: normalizeServerType(updatedServer.type),
+ gateways: NEEDS_GATEWAYS(updatedServer.type) ? normalizeGateways(updatedServer.gateways, updatedServer.gateway || updatedServer.dns || updatedServer.ip) : [],
+ };
setServers(servers.map(s => {
const sameId = s.id && updatedServer.id ? s.id === updatedServer.id : false;
const sameIp = s.ip === updatedServer.ip;
@@ -1022,6 +1076,100 @@ function ServerManager() {
required
helpText="Имя основного шлюза для маршрутизации"
/>
+ {NEEDS_GATEWAYS(newServer.type) && (
+ <>
+
Шлюзы
+
+ {newServer.gateways.map((gw, idx) => (
+
+
+
+
+ {
+ const list = newServer.gateways.map((g, i) => i === idx ? { ...g, name: e.target.value } : g);
+ setNewServer({ ...newServer, gateways: list });
+ }}
+ placeholder="GW-MSK"
+ required
+ />
+
+
+
+ {
+ const list = newServer.gateways.map((g, i) => i === idx ? { ...g, ip: e.target.value } : g);
+ setNewServer({ ...newServer, gateways: list });
+ }}
+ placeholder="10.0.0.1"
+ />
+
+
+
+ {
+ const list = newServer.gateways.map((g, i) => i === idx ? { ...g, comment: e.target.value } : g);
+ setNewServer({ ...newServer, gateways: list });
+ }}
+ placeholder="Основной шлюз"
+ />
+
+
+
+ {
+ const list = newServer.gateways.map((g, i) => ({ ...g, primary: i === idx ? e.target.checked : false }));
+ if (!list.some(g => g.primary)) list[idx].primary = true;
+ setNewServer({ ...newServer, gateways: list });
+ }}
+ title="Основной шлюз"
+ />
+
+
+
+
+
{gw.primary ? 'Основной шлюз' : 'Резервный шлюз'}
+ {newServer.gateways.length > 1 && (
+
+ )}
+
+
+ ))}
+
+
+
Для jumphost/exit должен быть один основной gateway.
+
+ )}