From d895b68f04c7239c13fc81e103713bb2d1eda53a Mon Sep 17 00:00:00 2001 From: "Christine." Date: Tue, 11 Feb 2025 14:52:27 +0800 Subject: [PATCH] fix: use remoteDestination replace DestinationIP in connection page, #2668 (#2679) * fix: use remoteDestination replace DestinationIP in connection page, #2668 * add: missing i18n text * fix: display the target address details in connection page --- src/components/connection/connection-detail.tsx | 7 ++++--- src/components/connection/connection-table.tsx | 8 ++++---- src/locales/ar.json | 3 ++- src/locales/en.json | 3 ++- src/locales/fa.json | 3 ++- src/locales/id.json | 3 ++- src/locales/ru.json | 3 ++- src/locales/tt.json | 3 ++- src/locales/zh.json | 3 ++- src/services/types.d.ts | 1 + 10 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/components/connection/connection-detail.tsx b/src/components/connection/connection-detail.tsx index aeda2039..e101841c 100644 --- a/src/components/connection/connection-detail.tsx +++ b/src/components/connection/connection-detail.tsx @@ -51,8 +51,8 @@ const InnerConnectionDetail = ({ data, onClose }: InnerProps) => { const chains = [...data.chains].reverse().join(" / "); const rule = rulePayload ? `${data.rule}(${rulePayload})` : data.rule; const host = metadata.host - ? `${metadata.host}:${metadata.destinationPort}` - : `${metadata.destinationIP}:${metadata.destinationPort}`; + ? `${metadata.host}:${metadata.remoteDestination}` + : `${metadata.remoteDestination}:${metadata.destinationPort}`; const information = [ { label: t("Host"), value: host }, @@ -79,7 +79,8 @@ const InnerConnectionDetail = ({ data, onClose }: InnerProps) => { label: t("Source"), value: `${metadata.sourceIP}:${metadata.sourcePort}`, }, - { label: t("Destination IP"), value: metadata.destinationIP }, + { label: t("Destination"), value: metadata.remoteDestination }, + { label: t("DestinationPort"), value: `${metadata.destinationPort}` }, { label: t("Type"), value: `${metadata.type}(${metadata.network})` }, ]; diff --git a/src/components/connection/connection-table.tsx b/src/components/connection/connection-table.tsx index d792e0d1..adf10505 100644 --- a/src/components/connection/connection-table.tsx +++ b/src/components/connection/connection-table.tsx @@ -71,8 +71,8 @@ export const ConnectionTable = (props: Props) => { }, { field: "source", headerName: t("Source"), flex: 200, minWidth: 130 }, { - field: "destinationIP", - headerName: t("Destination IP"), + field: "remoteDestination", + headerName: t("Destination"), flex: 200, minWidth: 130, }, @@ -88,7 +88,7 @@ export const ConnectionTable = (props: Props) => { id: each.id, host: metadata.host ? `${metadata.host}:${metadata.destinationPort}` - : `${metadata.destinationIP}:${metadata.destinationPort}`, + : `${metadata.remoteDestination}:${metadata.destinationPort}`, download: each.download, upload: each.upload, dlSpeed: each.curDownload, @@ -98,7 +98,7 @@ export const ConnectionTable = (props: Props) => { process: truncateStr(metadata.process || metadata.processPath), time: each.start, source: `${metadata.sourceIP}:${metadata.sourcePort}`, - destinationIP: metadata.destinationIP, + remoteDestination: `${metadata.remoteDestination}:${metadata.destinationPort}`, type: `${metadata.type}(${metadata.network})`, connectionData: each, }; diff --git a/src/locales/ar.json b/src/locales/ar.json index 30007ba3..3c0f62da 100644 --- a/src/locales/ar.json +++ b/src/locales/ar.json @@ -178,7 +178,8 @@ "Process": "عملية", "Time": "الوقت", "Source": "المصدر", - "Destination IP": "عنوان IP الوجهة", + "Destination": "عنوان IP الوجهة", + "DestinationPort": "ميناء الوجهة", "Close Connection": "إغلاق الاتصال", "Rules": "القواعد", "Rule Provider": "مزود القواعد", diff --git a/src/locales/en.json b/src/locales/en.json index b8dacb1f..23bd9ec0 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -178,7 +178,8 @@ "Process": "Process", "Time": "Time", "Source": "Source", - "Destination IP": "Destination IP", + "Destination": "Destination IP", + "DestinationPort": "Destination Port", "Close Connection": "Close Connection", "Rules": "Rules", "Rule Provider": "Rule Provider", diff --git a/src/locales/fa.json b/src/locales/fa.json index 785ef155..7d82ea2e 100644 --- a/src/locales/fa.json +++ b/src/locales/fa.json @@ -178,7 +178,8 @@ "Process": "فرآیند", "Time": "زمان", "Source": "منبع", - "Destination IP": "آدرس IP مقصد", + "Destination": "آدرس IP مقصد", + "DestinationPort": "بندر هدف", "Close Connection": "بستن اتصال", "Rules": "قوانین", "Rule Provider": "تأمین‌کننده قانون", diff --git a/src/locales/id.json b/src/locales/id.json index d160332b..0ae8b42e 100644 --- a/src/locales/id.json +++ b/src/locales/id.json @@ -210,7 +210,8 @@ "Process": "Proses", "Time": "Waktu", "Source": "Sumber", - "Destination IP": "IP Tujuan", + "Destination": "IP Tujuan", + "DestinationPort": "Port Tujuan", "Close Connection": "Tutup Koneksi", "Rules": "Aturan", "Rule Provider": "Penyedia Aturan", diff --git a/src/locales/ru.json b/src/locales/ru.json index 78ebc6d7..fc8c6701 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -178,7 +178,8 @@ "Process": "Процесс", "Time": "Время подключения", "Source": "Исходный адрес", - "Destination IP": "IP-адрес назначения", + "Destination": "IP-адрес назначения", + "DestinationPort": "Целевой порт", "Close Connection": "Закрыть соединение", "Rules": "Правила", "Rule Provider": "Провайдер правило", diff --git a/src/locales/tt.json b/src/locales/tt.json index 5a090993..f336cf63 100644 --- a/src/locales/tt.json +++ b/src/locales/tt.json @@ -178,7 +178,8 @@ "Process": "Процесс", "Time": "Тоташу вакыты", "Source": "Чыганак адресы", - "Destination IP": "Максат IP-адресы", + "Destination": "Максат IP-адресы", + "DestinationPort": "Барасы порты", "Close Connection": "Тоташуны ябу", "Rules": "Кагыйдәләр", "Rule Provider": "Кагыйдә провайдеры", diff --git a/src/locales/zh.json b/src/locales/zh.json index 0581079d..622cfe16 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -178,7 +178,8 @@ "Process": "进程", "Time": "连接时间", "Source": "源地址", - "Destination IP": "目标地址", + "Destination": "目标地址", + "DestinationPort": "目标端口", "Close Connection": "关闭连接", "Rules": "规则", "Rule Provider": "规则集合", diff --git a/src/services/types.d.ts b/src/services/types.d.ts index ff452bc1..8e520318 100644 --- a/src/services/types.d.ts +++ b/src/services/types.d.ts @@ -120,6 +120,7 @@ interface IConnectionsItem { sourcePort: string; destinationPort: string; destinationIP?: string; + remoteDestination?: string; process?: string; processPath?: string; };