mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-19 11:34:59 +03:00
feat(routing): show tag (remark) in routing rules list (#5151)
* feat(routing): show tag (remark) in routing rules list Rules table and mobile cards showed raw inboundTag while the form already used remarks. Display "tag (remark)" when a remark exists; saved rules still store tags only. Signed-off-by: aleskxyz <39186039+aleskxyz@users.noreply.github.com> * feat(inbounds): show "tag (remark)" consistently wherever an inbound is listed Add a shared formatInboundLabel/formatInboundTag helper and apply the "tag (remark)" format across the routing rules table, mobile cards, the rule form and route tester, plus the client attach/detach/filter modals and the attached-inbounds column. Falls back to the bare tag when no distinct remark exists. Also fix the routing rules list mis-rendering inbounds whose remark contains a comma: formatted entries are now carried as an array end to end instead of being joined and re-split on commas. --------- Signed-off-by: aleskxyz <39186039+aleskxyz@users.noreply.github.com> Co-authored-by: Sanaei <ho3ein.sanaei@gmail.com>
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
import { useMemo } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Button, Dropdown, Tag, Tooltip } from 'antd';
|
||||
import {
|
||||
@@ -11,7 +12,8 @@ import {
|
||||
HolderOutlined,
|
||||
} from '@ant-design/icons';
|
||||
|
||||
import { chipPreview, ruleCriteriaChips } from './helpers';
|
||||
import { useInboundOptions } from '@/api/queries/useInboundOptions';
|
||||
import { buildRemarkByTag, chipPreview, inboundTagChipPreview, inboundTagsDisplayTitle, ruleCriteriaChips } from './helpers';
|
||||
import type { RuleRow } from './types';
|
||||
|
||||
interface RuleCardListProps {
|
||||
@@ -36,6 +38,8 @@ export default function RuleCardList({
|
||||
confirmDelete,
|
||||
}: RuleCardListProps) {
|
||||
const { t } = useTranslation();
|
||||
const { data: inboundOptions } = useInboundOptions();
|
||||
const remarkByTag = useMemo(() => buildRemarkByTag(inboundOptions || []), [inboundOptions]);
|
||||
return (
|
||||
<div className="rule-list">
|
||||
{rows.length === 0 ? (
|
||||
@@ -74,7 +78,11 @@ export default function RuleCardList({
|
||||
<div className="flow-side">
|
||||
<span className="flow-label">{t('pages.xray.Inbounds')}</span>
|
||||
{rule.inboundTag ? (
|
||||
<Tag color="blue" className="flow-tag">{chipPreview(rule.inboundTag)}</Tag>
|
||||
<Tooltip title={inboundTagsDisplayTitle(rule.inboundTag, remarkByTag)}>
|
||||
<Tag color="blue" className="flow-tag">
|
||||
{inboundTagChipPreview(rule.inboundTag, remarkByTag)}
|
||||
</Tag>
|
||||
</Tooltip>
|
||||
) : (
|
||||
<span className="criterion-empty">any</span>
|
||||
)}
|
||||
|
||||
Reference in New Issue
Block a user