mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-19 11:34:59 +03:00
Add Enable/Disable Toggle for Xray Routing Rules (#5296)
* feat: add enable/disable toggle for xray routing rules * fix(routing): never let the internal api rule be disabled The Enable/Disable toggle could strip the stats api rule: its table switch was locked, but the rule-form modal's Enable dropdown was not, and stripDisabledRules had no api-rule guard (EnsureStatsRouting's delete only runs when the api rule isn't already first). A disabled api rule then dropped out of the generated config and broke traffic accounting. - stripDisabledRules now always keeps the api rule, even if marked disabled, and strips the panel-only enabled key from every rule - extract isApiRule helper (backend + frontend) and reuse it across the table switch, card switch, and form modal - disable the form-modal Enable dropdown for the api rule - add stripDisabledRules tests covering the api-rule survival path --------- Co-authored-by: Sanaei <ho3ein.sanaei@gmail.com>
This commit is contained in:
@@ -5,9 +5,10 @@ import { PlusOutlined, MinusOutlined, QuestionCircleOutlined } from '@ant-design
|
||||
import { InputAddon } from '@/components/ui';
|
||||
import { useInboundOptions } from '@/api/queries/useInboundOptions';
|
||||
import { RuleFormSchema, type RuleFormValues } from '@/schemas/xray';
|
||||
import { buildRemarkByTag, formatInboundTag } from './helpers';
|
||||
import { buildRemarkByTag, formatInboundTag, isApiRule } from './helpers';
|
||||
|
||||
export interface RoutingRule {
|
||||
enabled?: boolean;
|
||||
type?: string;
|
||||
domain?: string | string[];
|
||||
ip?: string | string[];
|
||||
@@ -38,6 +39,7 @@ interface RuleFormModalProps {
|
||||
type FormState = RuleFormValues;
|
||||
|
||||
const initialForm = (): FormState => ({
|
||||
enabled: true,
|
||||
domain: '',
|
||||
ip: '',
|
||||
port: '',
|
||||
@@ -81,6 +83,7 @@ export default function RuleFormModal({
|
||||
if (!open) return;
|
||||
if (rule) {
|
||||
setForm({
|
||||
enabled: rule.enabled !== false,
|
||||
domain: Array.isArray(rule.domain) ? rule.domain.join(',') : rule.domain || '',
|
||||
ip: Array.isArray(rule.ip) ? rule.ip.join(',') : rule.ip || '',
|
||||
port: rule.port || '',
|
||||
@@ -109,6 +112,7 @@ export default function RuleFormModal({
|
||||
const v = validated.data;
|
||||
const built: Record<string, unknown> = {
|
||||
type: 'field',
|
||||
enabled: v.enabled,
|
||||
domain: csv(v.domain),
|
||||
ip: csv(v.ip),
|
||||
port: v.port,
|
||||
@@ -151,6 +155,18 @@ export default function RuleFormModal({
|
||||
onCancel={onClose}
|
||||
>
|
||||
<Form colon={false} labelCol={{ md: { span: 8 } }} wrapperCol={{ md: { span: 14 } }}>
|
||||
<Form.Item label={t('enable')}>
|
||||
<Select
|
||||
value={form.enabled}
|
||||
onChange={(v) => update('enabled', v)}
|
||||
disabled={isApiRule(rule ?? {})}
|
||||
options={[
|
||||
{ value: true, label: t('enable') },
|
||||
{ value: false, label: t('disable') },
|
||||
]}
|
||||
/>
|
||||
</Form.Item>
|
||||
|
||||
<Form.Item
|
||||
label={
|
||||
<Tooltip title={t('pages.xray.rules.useComma')}>
|
||||
|
||||
Reference in New Issue
Block a user