mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-26 09:52:14 +03:00
* 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.
185 lines
5.4 KiB
TypeScript
185 lines
5.4 KiB
TypeScript
import { useEffect, useMemo, useState } from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { Input, Modal, Space, Table, Tag, Typography, message } from 'antd';
|
|
import type { ColumnsType } from 'antd/es/table';
|
|
|
|
import { HttpUtil } from '@/utils';
|
|
import { coerceInboundJsonField, type DBInbound } from '@/models/dbinbound';
|
|
|
|
interface DetachClientsModalProps {
|
|
open: boolean;
|
|
source: DBInbound | null;
|
|
onClose: () => void;
|
|
onDetached?: () => void;
|
|
}
|
|
|
|
interface BulkDetachResult {
|
|
detached?: string[];
|
|
skipped?: string[];
|
|
errors?: string[];
|
|
}
|
|
|
|
interface ClientRow {
|
|
email: string;
|
|
comment: string;
|
|
enable: boolean;
|
|
}
|
|
|
|
function readClientRows(settings: unknown): ClientRow[] {
|
|
const parsed = coerceInboundJsonField(settings) as {
|
|
clients?: Array<{ email?: string; comment?: string; enable?: boolean }>;
|
|
};
|
|
const clients = Array.isArray(parsed?.clients) ? parsed.clients : [];
|
|
return clients
|
|
.map((c) => ({
|
|
email: (c?.email || '').trim(),
|
|
comment: (c?.comment || '').trim(),
|
|
enable: c?.enable !== false,
|
|
}))
|
|
.filter((r) => r.email);
|
|
}
|
|
|
|
export default function DetachClientsModal({
|
|
open,
|
|
source,
|
|
onClose,
|
|
onDetached,
|
|
}: DetachClientsModalProps) {
|
|
const { t } = useTranslation();
|
|
const [messageApi, messageContextHolder] = message.useMessage();
|
|
const [saving, setSaving] = useState(false);
|
|
const [clientRows, setClientRows] = useState<ClientRow[]>([]);
|
|
const [selectedEmails, setSelectedEmails] = useState<string[]>([]);
|
|
const [search, setSearch] = useState('');
|
|
|
|
useEffect(() => {
|
|
if (!open) return;
|
|
const rows = source ? readClientRows(source.settings) : [];
|
|
setClientRows(rows);
|
|
setSelectedEmails([]);
|
|
setSearch('');
|
|
}, [open, source]);
|
|
|
|
const filteredRows = useMemo(() => {
|
|
const q = search.trim().toLowerCase();
|
|
if (!q) return clientRows;
|
|
return clientRows.filter(
|
|
(r) => r.email.toLowerCase().includes(q) || r.comment.toLowerCase().includes(q),
|
|
);
|
|
}, [clientRows, search]);
|
|
|
|
const columns: ColumnsType<ClientRow> = useMemo(
|
|
() => [
|
|
{
|
|
title: t('pages.inbounds.email'),
|
|
dataIndex: 'email',
|
|
key: 'email',
|
|
ellipsis: true,
|
|
},
|
|
{
|
|
title: t('comment'),
|
|
dataIndex: 'comment',
|
|
key: 'comment',
|
|
ellipsis: true,
|
|
},
|
|
{
|
|
title: t('enable'),
|
|
dataIndex: 'enable',
|
|
key: 'enable',
|
|
width: 90,
|
|
render: (enabled: boolean) =>
|
|
enabled ? (
|
|
<Tag color="success">{t('enable')}</Tag>
|
|
) : (
|
|
<Tag>{t('pages.inbounds.attachClientsStatusDisabled')}</Tag>
|
|
),
|
|
},
|
|
],
|
|
[t],
|
|
);
|
|
|
|
async function submit() {
|
|
if (!source || selectedEmails.length === 0) return;
|
|
setSaving(true);
|
|
try {
|
|
const msg = await HttpUtil.post(
|
|
'/panel/api/clients/bulkDetach',
|
|
{ emails: selectedEmails, inboundIds: [source.id] },
|
|
{ headers: { 'Content-Type': 'application/json' } },
|
|
);
|
|
if (!msg?.success) {
|
|
messageApi.error(msg?.msg || t('somethingWentWrong'));
|
|
return;
|
|
}
|
|
const result = (msg.obj || {}) as BulkDetachResult;
|
|
const detached = result.detached?.length ?? 0;
|
|
const skipped = result.skipped?.length ?? 0;
|
|
const errors = result.errors?.length ?? 0;
|
|
if (errors > 0) {
|
|
messageApi.warning(t('pages.inbounds.detachClientsResultMixed', { detached, skipped, errors }));
|
|
} else {
|
|
messageApi.success(t('pages.inbounds.detachClientsResult', { detached, skipped }));
|
|
}
|
|
onDetached?.();
|
|
onClose();
|
|
} finally {
|
|
setSaving(false);
|
|
}
|
|
}
|
|
|
|
return (
|
|
<Modal
|
|
open={open}
|
|
onCancel={onClose}
|
|
onOk={submit}
|
|
okButtonProps={{
|
|
danger: true,
|
|
disabled: selectedEmails.length === 0,
|
|
loading: saving,
|
|
}}
|
|
okText={t('pages.inbounds.detachClients')}
|
|
cancelText={t('cancel')}
|
|
title={t('pages.inbounds.detachClientsTitle', { remark: source?.tag ?? '' })}
|
|
width={680}
|
|
>
|
|
{messageContextHolder}
|
|
<Typography.Paragraph type="secondary">
|
|
{t('pages.inbounds.detachClientsDesc', { count: clientRows.length })}
|
|
</Typography.Paragraph>
|
|
|
|
<Space orientation="vertical" size="small" style={{ width: '100%' }}>
|
|
<Typography.Text strong>{t('pages.inbounds.detachClientsSelectLabel')}</Typography.Text>
|
|
<Space style={{ width: '100%', justifyContent: 'space-between' }} wrap>
|
|
<Input.Search
|
|
allowClear
|
|
aria-label={t('search')}
|
|
value={search}
|
|
onChange={(e) => setSearch(e.target.value)}
|
|
placeholder={t('pages.inbounds.attachClientsSearchPlaceholder')}
|
|
style={{ maxWidth: 320 }}
|
|
/>
|
|
<Typography.Text type="secondary">
|
|
{t('pages.inbounds.attachClientsSelectedCount', {
|
|
selected: selectedEmails.length,
|
|
total: clientRows.length,
|
|
})}
|
|
</Typography.Text>
|
|
</Space>
|
|
<Table<ClientRow>
|
|
size="small"
|
|
rowKey="email"
|
|
columns={columns}
|
|
dataSource={filteredRows}
|
|
pagination={false}
|
|
scroll={{ y: 280 }}
|
|
rowSelection={{
|
|
selectedRowKeys: selectedEmails,
|
|
onChange: (keys) => setSelectedEmails(keys as string[]),
|
|
preserveSelectedRowKeys: true,
|
|
}}
|
|
/>
|
|
</Space>
|
|
</Modal>
|
|
);
|
|
}
|