From f57e6930234bf00c7df0eb5c167f6a4e8a58c7ed Mon Sep 17 00:00:00 2001
From: MHSanaei <ho3ein.sanaei@gmail.com>
Date: Wed, 21 Jun 2023 14:02:13 +0330
Subject: [PATCH] better clients info tables

Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
---
 web/html/xui/form/protocol/shadowsocks.html |  6 ++++--
 web/html/xui/form/protocol/trojan.html      |  6 ++++--
 web/html/xui/form/protocol/vless.html       |  8 ++++++--
 web/html/xui/form/protocol/vmess.html       |  6 ++++--
 web/html/xui/inbound_info_modal.html        | 18 +++++++++++++++---
 web/translation/translate.en_US.toml        |  1 -
 web/translation/translate.fa_IR.toml        |  1 -
 web/translation/translate.ru_RU.toml        |  1 -
 web/translation/translate.zh_Hans.toml      |  1 -
 9 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/web/html/xui/form/protocol/shadowsocks.html b/web/html/xui/form/protocol/shadowsocks.html
index e9b01ea5..7af96373 100644
--- a/web/html/xui/form/protocol/shadowsocks.html
+++ b/web/html/xui/form/protocol/shadowsocks.html
@@ -96,10 +96,12 @@
         <a-collapse-panel :header="'{{ i18n "pages.client.clientCount"}} : ' + inbound.settings.shadowsockses.length">
             <table width="100%">
                 <tr class="client-table-header">
-                    <th v-for="col in Object.keys(inbound.settings.shadowsockses[0]).slice(0, 3)">[[ col ]]</th>
+                    <th>{{ i18n "pages.inbounds.email" }}</th>
+                    <th>Password</th>
                 </tr>
                 <tr v-for="(client, index) in inbound.settings.shadowsockses" :class="index % 2 == 1 ? 'client-table-odd-row' : ''">
-                    <td v-for="col in Object.values(client).slice(0, 3)">[[ col ]]</td>
+                    <td>[[ client.email ]]</td>
+                    <td>[[ client.password ]]</td>
                 </tr>
             </table>
         </a-collapse-panel>
diff --git a/web/html/xui/form/protocol/trojan.html b/web/html/xui/form/protocol/trojan.html
index f494adb9..46ae5e32 100644
--- a/web/html/xui/form/protocol/trojan.html
+++ b/web/html/xui/form/protocol/trojan.html
@@ -102,10 +102,12 @@
         <a-collapse-panel :header="'{{ i18n "pages.client.clientCount"}} : ' + inbound.settings.trojans.length">
             <table width="100%">
                 <tr class="client-table-header">
-                    <th v-for="col in Object.keys(inbound.settings.trojans[0]).slice(0, 3)">[[ col ]]</th>
+                    <th>{{ i18n "pages.inbounds.email" }}</th>
+                    <th>Password</th>
                 </tr>
                 <tr v-for="(client, index) in inbound.settings.trojans" :class="index % 2 == 1 ? 'client-table-odd-row' : ''">
-                    <td v-for="col in Object.values(client).slice(0, 3)">[[ col ]]</td>
+                    <td>[[ client.email ]]</td>
+                    <td>[[ client.password ]]</td>
                 </tr>
             </table>
         </a-collapse-panel>
diff --git a/web/html/xui/form/protocol/vless.html b/web/html/xui/form/protocol/vless.html
index f661a839..12729eff 100644
--- a/web/html/xui/form/protocol/vless.html
+++ b/web/html/xui/form/protocol/vless.html
@@ -108,10 +108,14 @@
         <a-collapse-panel :header="'{{ i18n "pages.client.clientCount"}} : ' + inbound.settings.vlesses.length">
             <table width="100%">
                 <tr class="client-table-header">
-                    <th v-for="col in Object.keys(inbound.settings.vlesses[0]).slice(0, 3)">[[ col ]]</th>
+                    <th>{{ i18n "pages.inbounds.email" }}</th>
+                    <th>Flow</th>
+                    <th>ID</th>
                 </tr>
                 <tr v-for="(client, index) in inbound.settings.vlesses" :class="index % 2 == 1 ? 'client-table-odd-row' : ''">
-                    <td v-for="col in Object.values(client).slice(0, 3)">[[ col ]]</td>
+                    <td>[[ client.email ]]</td>
+                    <td>[[ client.flow ]]</td>
+                    <td>[[ client.id ]]</td>
                 </tr>
             </table>
         </a-collapse-panel>
diff --git a/web/html/xui/form/protocol/vmess.html b/web/html/xui/form/protocol/vmess.html
index b58ecaee..a37f8468 100644
--- a/web/html/xui/form/protocol/vmess.html
+++ b/web/html/xui/form/protocol/vmess.html
@@ -97,10 +97,12 @@
         <a-collapse-panel :header="'{{ i18n "pages.client.clientCount" }}: ' + inbound.settings.vmesses.length">
             <table width="100%">
                     <tr class="client-table-header">
-                    <th v-for="col in Object.keys(inbound.settings.vmesses[0]).slice(0, 3)">[[ col ]]</th>
+                        <th>{{ i18n "pages.inbounds.email" }}</th>
+                        <th>ID</th>
                 </tr>
                 <tr v-for="(client, index) in inbound.settings.vmesses" :class="index % 2 == 1 ? 'client-table-odd-row' : ''">
-                    <td v-for="col in Object.values(client).slice(0, 3)">[[ col ]]</td>
+                    <td>[[ client.email ]]</td>
+                    <td>[[ client.id ]]</td>
                 </tr>
             </table>
         </a-collapse-panel>
diff --git a/web/html/xui/inbound_info_modal.html b/web/html/xui/inbound_info_modal.html
index 23bd5af1..d44634a0 100644
--- a/web/html/xui/inbound_info_modal.html
+++ b/web/html/xui/inbound_info_modal.html
@@ -68,9 +68,21 @@
     <template v-if="infoModal.clientSettings">
     <a-divider>{{ i18n "pages.inbounds.client" }}</a-divider>
     <table style="margin-bottom: 10px;">
-        <tr v-for="col,index in Object.keys(infoModal.clientSettings).slice(0, 3)">
-            <td>[[ col ]]</td>
-            <td><a-tag color="green">[[ infoModal.clientSettings[col] ]]</a-tag></td>
+        <tr>
+            <td>{{ i18n "pages.inbounds.email" }}</td>
+            <td><a-tag color="green">[[ infoModal.clientSettings.email ]]</a-tag></td>
+        </tr>
+        <tr v-if="infoModal.clientSettings.id">
+            <td>ID</td>
+            <td><a-tag color="green">[[ infoModal.clientSettings.id ]]</a-tag></td>
+        </tr>
+        <tr v-if="infoModal.inbound.canEnableTlsFlow()">
+            <td>Flow</td>
+            <td><a-tag color="green">[[ infoModal.clientSettings.flow ]]</a-tag></td>
+        </tr>
+        <tr v-if="infoModal.clientSettings.password">
+            <td>Password</td>
+            <td><a-tag color="green">[[ infoModal.clientSettings.password ]]</a-tag></td>
         </tr>
         <tr>
             <td>{{ i18n "status" }}</td>
diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml
index 4e2f7c4a..11853096 100644
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -39,7 +39,6 @@
 "depleted" = "Depleted"
 "depletingSoon" = "Depleting soon"
 "domainName" = "Domain name"
-"additional" = "Alter"
 "monitor" = "Listening IP"
 "certificate" = "Certificate"
 "fail" = "Fail"
diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml
index 06cbc23c..815faadd 100644
--- a/web/translation/translate.fa_IR.toml
+++ b/web/translation/translate.fa_IR.toml
@@ -39,7 +39,6 @@
 "depleted" = "منقضی"
 "depletingSoon" = "در حال انقضا"
 "domainName" = "آدرس دامنه"
-"additional" = "آی دی جایگزین"
 "monitor" = "آی پی اتصال"
 "certificate" = "گواهی دیجیتال"
 "fail" = "خطا"
diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml
index faaf3c6b..10eb539c 100644
--- a/web/translation/translate.ru_RU.toml
+++ b/web/translation/translate.ru_RU.toml
@@ -39,7 +39,6 @@
 "depleted" = "Исчерпано"
 "depletingSoon" = "Почти исчерпано"
 "domainName" = "Домен"
-"additional" = "Дополнительно"
 "monitor" = "Порт IP"
 "certificate" = "Сертификат"
 "fail" = "Неудачно"
diff --git a/web/translation/translate.zh_Hans.toml b/web/translation/translate.zh_Hans.toml
index 1aa704e0..d2303926 100644
--- a/web/translation/translate.zh_Hans.toml
+++ b/web/translation/translate.zh_Hans.toml
@@ -39,7 +39,6 @@
 "depleted" = "耗尽"
 "depletingSoon" = "即将耗尽"
 "domainName" = "域名"
-"additional" = "额外"
 "monitor" = "监听"
 "certificate" = "证书"
 "fail" = "失败"