mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-18 02:26:11 +00:00
71aca2018a
* feat(a11y): label list, toolbar & dashboard actions for screen readers Phase 1 of #5486 (Android TalkBack support). Icon-only controls across the management surfaces previously announced only their untranslated icon name (e.g. "edit", "ellipsis") or nothing at all. - Add aria-label to icon-only row-action and toolbar buttons across inbounds, clients, groups, hosts, nodes and xray (outbounds/routing/dns/balancers) lists, plus the dashboard cards. - Make clickable bare icons and AntD Card actions keyboard-operable via role/tabIndex + Enter/Space (new activateOnKey helper); convert mobile dropdown triggers to buttons so they open from the keyboard. - Fix the sidebar hamburger's mislabeled aria-label (was the dashboard label) and translate previously-hardcoded outbound menu labels. New i18n keys in all 13 locales: sort, menu.openMenu, pages.xray.outbound.moveToTop. * feat(a11y): label modal, QR and copy/download controls for screen readers Phase 2 of #5486. Modal and overlay controls relied on tooltips (not a reliable accessible name) or were bare clickable icons with no keyboard or screen-reader support. - Add aria-label to copy/QR/download/info icon buttons in the inbound and client info modals, sub-links modal, QR panel, backup/log modals, and to the bare search/select inputs of the attach/detach client modals. - Make click-to-copy QR codes and the IP-log refresh/clear, geofile reload and log refresh icons keyboard-operable (role/tabIndex + Enter/Space) with translated labels. - Label the 2FA code input; drop the QrPanel download-image string fallback now that the key exists. New i18n key in all 13 locales: downloadImage. * feat(a11y): label form fields and shared form components for screen readers Phase 3 of #5486. Form controls and shared form widgets were largely unlabelled, and several remove controls were not keyboard-operable. - SettingListItem now ties its title to the control via aria-labelledby, giving accessible names to the ~90 settings-tab inputs at once. - InputAddon gains button semantics (role/tabIndex/Enter+Space) and an ariaLabel prop when used as an interactive remove control. - Sparkline charts expose a role="img" summary of their latest values. - Add aria-label to add/remove/regenerate icon buttons and bare inputs/selects across inbound, client and xray (dns/routing/balancer/ outbound) forms; make clickable remove icons keyboard-operable; mark decorative help/target icons aria-hidden; label the JSON editor, date-time clear button, header-map remove, notification select-all and remark token chips. New i18n keys in all 13 locales: regenerate, jsonEditor, pages.xray.balancer.{costMatch,costValue,costRegexp}. * chore(a11y): add eslint-plugin-jsx-a11y harness and fix flagged interactions Phase 4 of #5486. Adds eslint-plugin-jsx-a11y (recommended ruleset, scoped to .tsx) so screen-reader/keyboard regressions fail lint. - Make the mobile node-card header a proper keyboard disclosure (role=button, aria-expanded, Enter/Space activation that ignores clicks on the nested action buttons) and drop the now-redundant stop-propagation click handlers the linter flagged on card-action wrappers in the node, client and inbound mobile cards. - Disable jsx-a11y/no-autofocus: the autofocus on the login field and modal primary inputs is intentional focus management that helps screen-reader and keyboard users land on the right control. make lint passes with the a11y ruleset enforced. * feat(a11y): cover remaining deferred spots (settings tabs, sockopt, API docs) Completes the panel sweep for #5486 by labelling the spots previously left out of phases 1-4: - NotifyTimeField (Telegram notifications): the mode, interval, unit and custom-cron inputs now carry aria-labels. - The Sockopt toggle in transport options. - Settings category tabs in icons-only (mobile) mode now expose the tab name as the icon's aria-label instead of the raw icon name. - The Swagger API-docs view is wrapped in a labelled region landmark. New i18n keys in all 13 locales: pages.settings.notifyTime.{interval,unit}. * feat(a11y): label shared xray form components and remark field Code review surfaced frontend/src/lib/xray/forms/ — shared form components used by the host and inbound JSON forms — which the initial audit missed. - FinalMaskForm (TCP/UDP final-mask editor): label the icon-only add and regenerate buttons and make all six remove icons keyboard-operable (role/tabIndex/Enter+Space); adds useTranslation to its sub-components. - CustomSockoptList: the remove icon is now keyboard-operable. - SniffingFields: aria-label on the otherwise label-less destOverride select. - RemarkTemplateField: aria-label on the remark-variable picker button. New i18n key in all 13 locales: pages.inbounds.sniffingDestOverride. * feat(a11y): label client info modal and WireGuard config block After rebasing onto the WireGuard client-config feature, re-apply the ClientInfoModal copy/QR/IP-log aria-labels (the modal was restructured upstream, so the original labels did not carry over) and label the new ConfigBlock component's copy/download/QR actions. ConfigBlock's action wrapper keeps its stop-propagation handler (a non-interactive guard for the Collapse header) under a scoped jsx-a11y exception. * fix(frontend): let npm install jsx-a11y under ESLint 10 eslint-plugin-jsx-a11y@6.10.2 declares a peer range that stops at ESLint 9, but the panel is on ESLint 10, so `npm ci` aborts with ERESOLVE even though the plugin runs fine on ESLint 10 with flat config. Add an npm override so jsx-a11y accepts the project's ESLint version. This keeps normal peer resolution (recharts' react-is peer still auto-installs) — no global legacy-peer-deps and no manual react-is pin needed. * fix(a11y): size mobile row triggers and move node expand role to chevron Address automated review on #5652: - add size="small" to the inbound/client/node mobile-card "more" dropdown triggers so they match the adjacent small Switch and the established desktop RowActions pattern. - move the node card-head disclosure semantics (role/tabIndex/aria-expanded/ keyboard) onto the chevron affordance so the expand control is no longer a role="button" wrapping the Switch, info button and dropdown. Mouse click-anywhere-to-expand is preserved on the header div.
261 lines
10 KiB
TypeScript
261 lines
10 KiB
TypeScript
import { useMemo, useState } from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { Alert, Button, Input, InputNumber, Select, Space, Switch, Tabs } from 'antd';
|
|
import { BellOutlined, SendOutlined, SettingOutlined } from '@ant-design/icons';
|
|
import { LanguageManager } from '@/utils';
|
|
import { HttpUtil } from '@/utils';
|
|
import type { AllSetting } from '@/models/setting';
|
|
import { SettingListItem } from '@/components/ui';
|
|
import { TelegramNotifications } from '@/components/ui/notifications/TelegramNotifications';
|
|
import { useMediaQuery } from '@/hooks/useMediaQuery';
|
|
import { catTabLabel } from './catTabLabel';
|
|
|
|
interface TelegramTabProps {
|
|
allSetting: AllSetting;
|
|
updateSetting: (patch: Partial<AllSetting>) => void;
|
|
}
|
|
|
|
// The notification schedule is fed straight to robfig/cron's AddJob (see
|
|
// web.go startTask), which accepts @every <duration>, the @hourly/@daily/...
|
|
// macros, and full crontab expressions. This builder covers the common cases
|
|
// with dropdowns so users don't have to memorise the syntax, while "Custom"
|
|
// preserves the raw crontab escape hatch.
|
|
type Unit = 's' | 'm' | 'h';
|
|
type Macro = '@hourly' | '@daily' | '@weekly' | '@monthly';
|
|
type Mode = 'every' | Macro | 'custom';
|
|
const MACROS: Macro[] = ['@hourly', '@daily', '@weekly', '@monthly'];
|
|
const EVERY_RE = /^@every\s+(\d+)\s*([smh])$/i;
|
|
|
|
interface RunTime {
|
|
mode: Mode;
|
|
num: number;
|
|
unit: Unit;
|
|
custom: string;
|
|
}
|
|
|
|
function parseRunTime(raw: string): RunTime {
|
|
const v = (raw ?? '').trim();
|
|
const m = v.match(EVERY_RE);
|
|
if (m) {
|
|
return { mode: 'every', num: Math.max(1, Number(m[1]) || 1), unit: m[2].toLowerCase() as Unit, custom: '' };
|
|
}
|
|
if ((MACROS as string[]).includes(v)) {
|
|
return { mode: v as Macro, num: 1, unit: 'h', custom: '' };
|
|
}
|
|
return { mode: 'custom', num: 1, unit: 'h', custom: v };
|
|
}
|
|
|
|
function composeRunTime(s: RunTime): string {
|
|
if (s.mode === 'every') return `@every ${Math.max(1, s.num || 1)}${s.unit}`;
|
|
if (s.mode === 'custom') return s.custom;
|
|
return s.mode;
|
|
}
|
|
|
|
// The panel's cron runs with seconds enabled (cron.WithSeconds() in web.go), so
|
|
// crontab expressions are 6-field: "second minute hour day month weekday". When
|
|
// the user drops into Custom we seed the box with the crontab equivalent of the
|
|
// current selection rather than a bare @macro, so they get a real expression to
|
|
// edit (and one that the 6-field parser accepts).
|
|
function toCrontab(s: RunTime): string {
|
|
switch (s.mode) {
|
|
case '@hourly': return '0 0 * * * *';
|
|
case '@daily': return '0 0 0 * * *';
|
|
case '@weekly': return '0 0 0 * * 0';
|
|
case '@monthly': return '0 0 0 1 * *';
|
|
case 'every': {
|
|
const n = Math.max(1, s.num || 1);
|
|
if (s.unit === 's') return `*/${n} * * * * *`;
|
|
if (s.unit === 'm') return `0 */${n} * * * *`;
|
|
return `0 0 */${n} * * *`;
|
|
}
|
|
default: return s.custom;
|
|
}
|
|
}
|
|
|
|
function NotifyTimeField({ value, onChange }: { value: string; onChange: (v: string) => void }) {
|
|
const { t } = useTranslation();
|
|
// Init once: the Settings tabs only mount after settings are fetched, so the
|
|
// incoming value is already the persisted one.
|
|
const [state, setState] = useState<RunTime>(() => parseRunTime(value));
|
|
|
|
function update(patch: Partial<RunTime>) {
|
|
const next = { ...state, ...patch };
|
|
setState(next);
|
|
onChange(composeRunTime(next));
|
|
}
|
|
|
|
function onModeChange(mode: Mode) {
|
|
// Seed Custom with the crontab equivalent of the current selection so the
|
|
// box starts from a real expression (e.g. "0 0 0 * * *", not "@daily").
|
|
if (mode === 'custom' && !state.custom.trim()) {
|
|
update({ mode, custom: toCrontab(state) });
|
|
} else {
|
|
update({ mode });
|
|
}
|
|
}
|
|
|
|
const modeOptions = [
|
|
{ value: 'every', label: t('pages.settings.notifyTime.every') },
|
|
{ value: '@hourly', label: t('pages.settings.notifyTime.hourly') },
|
|
{ value: '@daily', label: t('pages.settings.notifyTime.daily') },
|
|
{ value: '@weekly', label: t('pages.settings.notifyTime.weekly') },
|
|
{ value: '@monthly', label: t('pages.settings.notifyTime.monthly') },
|
|
{ value: 'custom', label: t('pages.settings.notifyTime.custom') },
|
|
];
|
|
const unitOptions = [
|
|
{ value: 's', label: t('pages.settings.notifyTime.seconds') },
|
|
{ value: 'm', label: t('pages.settings.notifyTime.minutes') },
|
|
{ value: 'h', label: t('pages.settings.notifyTime.hours') },
|
|
];
|
|
|
|
return (
|
|
<Space orientation="vertical" size="small" style={{ width: '100%' }}>
|
|
<Select<Mode>
|
|
style={{ width: '100%' }}
|
|
value={state.mode}
|
|
options={modeOptions}
|
|
onChange={onModeChange}
|
|
aria-label={t('pages.settings.telegramNotifyTime')}
|
|
/>
|
|
{state.mode === 'every' && (
|
|
<Space.Compact style={{ width: '100%' }}>
|
|
<InputNumber
|
|
min={1}
|
|
style={{ width: '50%' }}
|
|
value={state.num}
|
|
onChange={(v) => update({ num: Math.max(1, Number(v) || 1) })}
|
|
aria-label={t('pages.settings.notifyTime.interval')}
|
|
/>
|
|
<Select<Unit>
|
|
style={{ width: '50%' }}
|
|
value={state.unit}
|
|
options={unitOptions}
|
|
onChange={(unit) => update({ unit })}
|
|
aria-label={t('pages.settings.notifyTime.unit')}
|
|
/>
|
|
</Space.Compact>
|
|
)}
|
|
{state.mode === 'custom' && (
|
|
<Input
|
|
value={state.custom}
|
|
placeholder="0 30 8 * * *"
|
|
onChange={(e) => update({ custom: e.target.value })}
|
|
aria-label={t('pages.settings.notifyTime.custom')}
|
|
/>
|
|
)}
|
|
</Space>
|
|
);
|
|
}
|
|
|
|
export default function TelegramTab({ allSetting, updateSetting }: TelegramTabProps) {
|
|
const { t } = useTranslation();
|
|
const { isMobile } = useMediaQuery();
|
|
const [testLoading, setTestLoading] = useState(false);
|
|
const [testResult, setTestResult] = useState<{ success: boolean; msg: string } | null>(null);
|
|
|
|
async function handleTestTgBot() {
|
|
setTestLoading(true);
|
|
setTestResult(null);
|
|
try {
|
|
const res = await HttpUtil.post('/panel/api/setting/testTgBot') as { success?: boolean; msg?: string };
|
|
setTestResult({ success: !!res.success, msg: res.msg || '' });
|
|
} catch (e: unknown) {
|
|
setTestResult({ success: false, msg: e instanceof Error ? e.message : t('pages.settings.requestFailed') });
|
|
} finally {
|
|
setTestLoading(false);
|
|
}
|
|
}
|
|
|
|
const langOptions = useMemo(
|
|
() => LanguageManager.supportedLanguages.map((l: { value: string; name: string; icon: string }) => ({
|
|
value: l.value,
|
|
label: (
|
|
<>
|
|
<span role="img" aria-label={l.name}>{l.icon}</span>
|
|
<span>{l.name}</span>
|
|
</>
|
|
),
|
|
})),
|
|
[],
|
|
);
|
|
|
|
return (
|
|
<Tabs defaultActiveKey="1" items={[
|
|
{
|
|
key: '1',
|
|
label: catTabLabel(<SettingOutlined />, t('pages.settings.panelSettings'), isMobile),
|
|
children: (
|
|
<>
|
|
<SettingListItem paddings="small" title={t('pages.settings.telegramBotEnable')} description={t('pages.settings.telegramBotEnableDesc')}>
|
|
<Switch checked={allSetting.tgBotEnable} onChange={(v) => updateSetting({ tgBotEnable: v })} />
|
|
</SettingListItem>
|
|
|
|
<SettingListItem
|
|
paddings="small"
|
|
title={t('pages.settings.telegramToken')}
|
|
description={allSetting.hasTgBotToken ? t('pages.settings.telegramTokenConfigured') : t('pages.settings.telegramTokenDesc')}
|
|
>
|
|
<Input.Password
|
|
value={allSetting.tgBotToken}
|
|
placeholder={allSetting.hasTgBotToken ? t('pages.settings.telegramTokenPlaceholder') : ''}
|
|
onChange={(e) => updateSetting({ tgBotToken: e.target.value })}
|
|
/>
|
|
</SettingListItem>
|
|
|
|
<SettingListItem paddings="small" title={t('pages.settings.telegramChatId')} description={t('pages.settings.telegramChatIdDesc')}>
|
|
<Input value={allSetting.tgBotChatId} onChange={(e) => updateSetting({ tgBotChatId: e.target.value })} />
|
|
</SettingListItem>
|
|
|
|
<SettingListItem paddings="small" title={t('pages.settings.telegramBotLanguage')}>
|
|
<Select
|
|
value={allSetting.tgLang}
|
|
onChange={(v) => updateSetting({ tgLang: v })}
|
|
style={{ width: '100%' }}
|
|
options={langOptions}
|
|
/>
|
|
</SettingListItem>
|
|
|
|
<SettingListItem paddings="small" title={t('pages.settings.telegramAPIServer')} description={t('pages.settings.telegramAPIServerDesc')}>
|
|
<Input value={allSetting.tgBotAPIServer} placeholder="https://api.example.com"
|
|
onChange={(e) => updateSetting({ tgBotAPIServer: e.target.value })} />
|
|
</SettingListItem>
|
|
|
|
<Space orientation="vertical" size={8} style={{ width: '100%', marginTop: 16 }}>
|
|
<Button type="primary" icon={<SendOutlined />} loading={testLoading} onClick={handleTestTgBot}>
|
|
{t('pages.settings.testTgBot')}
|
|
</Button>
|
|
{testResult && (
|
|
<Alert
|
|
type={testResult.success ? 'success' : 'error'}
|
|
title={testResult.msg}
|
|
showIcon
|
|
closable
|
|
onClose={() => setTestResult(null)}
|
|
/>
|
|
)}
|
|
</Space>
|
|
</>
|
|
),
|
|
},
|
|
{
|
|
key: '2',
|
|
label: catTabLabel(<BellOutlined />, t('pages.settings.notifications'), isMobile),
|
|
children: (
|
|
<>
|
|
<SettingListItem paddings="small" title={t('pages.settings.telegramNotifyTime')} description={t('pages.settings.telegramNotifyTimeDesc')}>
|
|
<NotifyTimeField value={allSetting.tgRunTime} onChange={(v) => updateSetting({ tgRunTime: v })} />
|
|
</SettingListItem>
|
|
<SettingListItem paddings="small" title={t('pages.settings.tgNotifyBackup')} description={t('pages.settings.tgNotifyBackupDesc')}>
|
|
<Switch checked={allSetting.tgBotBackup} onChange={(v) => updateSetting({ tgBotBackup: v })} />
|
|
</SettingListItem>
|
|
|
|
<SettingListItem paddings="small" title={t('pages.settings.tgEventBusNotify')} description={t('pages.settings.tgEventBusNotifyDesc')}>
|
|
<TelegramNotifications allSetting={allSetting} updateSetting={updateSetting} />
|
|
</SettingListItem>
|
|
</>
|
|
),
|
|
},
|
|
]} />
|
|
);
|
|
}
|