From 8ffd59df10aad55db23bf33707c85adca1d65b98 Mon Sep 17 00:00:00 2001
From: Surbiks <s.surbiks@gmail.com>
Date: Tue, 6 Feb 2024 01:23:50 +0330
Subject: [PATCH] manage balancer in rules table

---
 web/html/xui/xray.html               | 17 +++++++++++++----
 web/html/xui/xray_rule_modal.html    | 23 ++++++++++++++++++++++-
 web/translation/translate.en_US.toml |  2 ++
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html
index 0a3d26b2..f0b7ae27 100644
--- a/web/html/xui/xray.html
+++ b/web/html/xui/xray.html
@@ -327,6 +327,14 @@
                                         [[ rule.outboundTag ]]
                                     </a-popover>
                                 </template>
+                                <template slot="balancer" slot-scope="text, rule, index">
+                                    <a-popover :overlay-class-name="themeSwitcher.currentTheme">
+                                        <template slot="content">
+                                            <p v-if="rule.balancerTag">Balancer Tag: [[ rule.balancerTag ]]</p>
+                                        </template>
+                                        [[ rule.balancerTag ]]
+                                    </a-popover>
+                                </template>
                                 <template slot="info" slot-scope="text, rule, index">
                                     <a-popover placement="bottomRight"
                                         v-if="(rule.source+rule.sourcePort+rule.network+rule.protocol+rule.attrs+rule.ip+rule.domain+rule.port).length>0"
@@ -526,9 +534,10 @@
             { title: 'Domain', dataIndex: 'domain', align: 'center', width: 20, ellipsis: true },
             { title: 'Port', dataIndex: 'port', align: 'center', width: 10, ellipsis: true }]},
         { title: '{{ i18n "pages.xray.rules.inbound"}}', children: [
-            { title: 'Inbound Tag', dataIndex: 'inboundTag', align: 'center', width: 20, ellipsis: true },
+            { title: 'Inbound Tag', dataIndex: 'inboundTag', align: 'center', width: 15, ellipsis: true },
             { title: 'Client Email', dataIndex: 'user', align: 'center', width: 20, ellipsis: true }]},
-        { title: '{{ i18n "pages.xray.rules.outbound"}}', dataIndex: 'outboundTag', align: 'center', width: 20 },
+        { title: '{{ i18n "pages.xray.rules.outbound"}}', dataIndex: 'outboundTag', align: 'center', width: 15 },
+        { title: '{{ i18n "pages.xray.rules.balancer"}}', dataIndex: 'balancerTag', align: 'center', width: 15 },
     ];
 
     const rulesMobileColumns = [
@@ -971,6 +980,7 @@
                 });
             },
             editBalancer(index) {
+                const oldTag = this.balancersData[index].tag;
                 balancerModal.show({
                     title: '{{ i18n "pages.xray.balancer.editBalancer"}}',
                     okText: '{{ i18n "pages.xray.balancer.editBalancer"}}',
@@ -979,7 +989,6 @@
                     confirm: (balancer) => {
                         balancerModal.loading();
                         newTemplateSettings = this.templateSettings;
-                        let oldTag = this.balancersData[index].tag;
 
                         let tmpBalancer = {
                             'tag': balancer.tag,
@@ -1010,7 +1019,7 @@
                 newTemplateSettings = this.templateSettings;
 
                 //remove from balancers
-                let oldTag = this.balancersData[index].tag;
+                const oldTag = this.balancersData[index].tag;
                 this.balancersData.splice(index, 1);
 
                 // remove from settings
diff --git a/web/html/xui/xray_rule_modal.html b/web/html/xui/xray_rule_modal.html
index 9ed9e06a..07cc3217 100644
--- a/web/html/xui/xray_rule_modal.html
+++ b/web/html/xui/xray_rule_modal.html
@@ -107,6 +107,19 @@
                 <a-select-option v-for="tag in ruleModal.outboundTags" :value="tag">[[ tag ]]</a-select-option>
             </a-select>
         </a-form-item>
+        <a-form-item>
+            <template slot="label">
+                <a-tooltip>
+                    <template slot="title">
+                        <span>{{ i18n "pages.xray.balancer.balancerDesc" }}</span>
+                    </template>
+                    Balancer Tag <a-icon type="question-circle"></a-icon>
+                </a-tooltip>
+            </template>
+            <a-select v-model="ruleModal.rule.balancerTag" :dropdown-class-name="themeSwitcher.currentTheme">
+                <a-select-option v-for="tag in ruleModal.balancerTags" :value="tag">[[ tag ]]</a-select-option>
+            </a-select>
+        </a-form-item>
     </table>
     </a-form>
 </a-modal>
@@ -133,11 +146,12 @@
             protocol: [],
             attrs: [],
             outboundTag: "",
+            balancerTag: "",
         },
         inboundTags: [],
         outboundTags: [],
         users: [],
-        balancerTag: [],
+        balancerTags: [],
         ok() {
             newRule = ruleModal.getResult();
             ObjectUtil.execute(ruleModal.confirm, newRule);
@@ -160,6 +174,7 @@
                 this.rule.protocol = rule.protocol;
                 this.rule.attrs = rule.attrs ? Object.entries(rule.attrs) : [];
                 this.rule.outboundTag = rule.outboundTag;
+                this.rule.balancerTag = rule.balancerTag ? rule.balancerTag : ""
             } else {
                 this.rule = {
                     domainMatcher: "",
@@ -174,6 +189,7 @@
                     protocol: [],
                     attrs: [],
                     outboundTag: "",
+                    balancerTag: "",
                 }
             }
             this.isEdit = isEdit;
@@ -186,6 +202,10 @@
                 }
                 if(app.templateSettings.reverse.portals) this.outboundTags.push(...app.templateSettings.reverse.portals.map(b => b.tag));
             }
+
+            if (app.templateSettings.routing && app.templateSettings.routing.balancers) {
+                this.balancerTags = app.templateSettings.routing.balancers.filter((o) => !ObjectUtil.isEmpty(o.tag)).map(obj => obj.tag)
+            }
         },
         close() {
             ruleModal.visible = false;
@@ -211,6 +231,7 @@
             rule.protocol = value.protocol;
             rule.attrs = Object.fromEntries(value.attrs);
             rule.outboundTag = value.outboundTag;
+            rule.balancerTag = value.balancerTag;
 
             for (const [key, value] of Object.entries(rule)) {
                 if (
diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml
index 0edf1c3d..f4f9afac 100644
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -407,6 +407,7 @@
 "dest" = "Destination"
 "inbound" = "Inbound"
 "outbound" = "Outbound"
+"balancer" = "Balancer"
 "info" = "Info"
 "add" = "Add Rule"
 "edit" = "Edit Rule"
@@ -433,6 +434,7 @@
 "balancerStrategy" = "Strategy"
 "balancerSelectors" = "Selectors"
 "tag" = "Tag"
+"balancerDesc" = "balancerTag and outboundTag must choose one of the two. outboundTag Effective when specified at the same time."
 
 [pages.xray.wireguard]
 "secretKey" = "Secret Key"