mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-10 23:25:02 +03: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.
181 lines
6.0 KiB
TypeScript
181 lines
6.0 KiB
TypeScript
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { Button, Checkbox, Form, Modal, Select, Space } from 'antd';
|
|
import { DownloadOutlined, SyncOutlined } from '@ant-design/icons';
|
|
|
|
import { HttpUtil, FileManager, PromiseUtil } from '@/utils';
|
|
import { activateOnKey } from '@/utils/a11y';
|
|
import { useMediaQuery } from '@/hooks/useMediaQuery';
|
|
import { parseLogLine } from './logParse';
|
|
import './LogModal.css';
|
|
|
|
interface LogModalProps {
|
|
open: boolean;
|
|
onClose: () => void;
|
|
}
|
|
|
|
const AUTO_UPDATE_INTERVAL = 5000;
|
|
|
|
export default function LogModal({ open, onClose }: LogModalProps) {
|
|
const { t } = useTranslation();
|
|
const { isMobile } = useMediaQuery();
|
|
const [rows, setRows] = useState('20');
|
|
const [level, setLevel] = useState('info');
|
|
const [syslog, setSyslog] = useState(false);
|
|
const [autoUpdate, setAutoUpdate] = useState(false);
|
|
const [loading, setLoading] = useState(false);
|
|
const [logs, setLogs] = useState<string[]>([]);
|
|
const openRef = useRef(open);
|
|
|
|
const refresh = useCallback(async () => {
|
|
setLoading(true);
|
|
try {
|
|
const msg = await HttpUtil.post<string[]>(`/panel/api/server/logs/${rows}`, {
|
|
level,
|
|
syslog,
|
|
});
|
|
if (msg?.success) {
|
|
setLogs(msg.obj || []);
|
|
}
|
|
await PromiseUtil.sleep(300);
|
|
} finally {
|
|
setLoading(false);
|
|
}
|
|
}, [rows, level, syslog]);
|
|
|
|
const refreshRef = useRef(refresh);
|
|
useEffect(() => {
|
|
refreshRef.current = refresh;
|
|
}, [refresh]);
|
|
|
|
useEffect(() => {
|
|
openRef.current = open;
|
|
if (open) refresh();
|
|
}, [open, refresh]);
|
|
|
|
useEffect(() => {
|
|
if (openRef.current) refresh();
|
|
}, [rows, level, syslog, refresh]);
|
|
|
|
useEffect(() => {
|
|
if (!open || !autoUpdate) return;
|
|
const id = setInterval(() => refreshRef.current(), AUTO_UPDATE_INTERVAL);
|
|
return () => clearInterval(id);
|
|
}, [open, autoUpdate]);
|
|
|
|
const parsedLogs = useMemo(() => logs.map(parseLogLine), [logs]);
|
|
|
|
function download() {
|
|
FileManager.downloadTextFile(logs.join('\n'), 'x-ui.log');
|
|
}
|
|
|
|
const titleNode = (
|
|
<>
|
|
{t('pages.index.logs')}
|
|
<SyncOutlined spin={loading} className="reload-icon" role="button" tabIndex={0} aria-label={t('refresh')} onClick={refresh} onKeyDown={activateOnKey(refresh)} />
|
|
</>
|
|
);
|
|
|
|
return (
|
|
<Modal
|
|
open={open}
|
|
footer={null}
|
|
width={isMobile ? '100vw' : 800}
|
|
style={isMobile ? { top: 0, paddingBottom: 0, maxWidth: '100vw' } : undefined}
|
|
className={isMobile ? 'logmodal-mobile' : undefined}
|
|
onCancel={onClose}
|
|
title={titleNode}
|
|
>
|
|
<Form layout="inline" className="log-toolbar">
|
|
<Form.Item>
|
|
<Space.Compact>
|
|
<Select
|
|
value={rows}
|
|
size="small"
|
|
style={{ width: 70 }}
|
|
onChange={setRows}
|
|
options={[
|
|
{ value: '20', label: '20' },
|
|
{ value: '50', label: '50' },
|
|
{ value: '100', label: '100' },
|
|
{ value: '500', label: '500' },
|
|
{ value: '1000', label: '1000' },
|
|
]}
|
|
/>
|
|
<Select
|
|
value={level}
|
|
size="small"
|
|
style={{ width: 95 }}
|
|
onChange={setLevel}
|
|
options={[
|
|
{ value: 'debug', label: 'Debug' },
|
|
{ value: 'info', label: 'Info' },
|
|
{ value: 'notice', label: 'Notice' },
|
|
{ value: 'warning', label: 'Warning' },
|
|
{ value: 'err', label: 'Error' },
|
|
]}
|
|
/>
|
|
</Space.Compact>
|
|
</Form.Item>
|
|
<Form.Item>
|
|
<Checkbox checked={syslog} onChange={(e) => setSyslog(e.target.checked)}>
|
|
SysLog
|
|
</Checkbox>
|
|
<Checkbox checked={autoUpdate} onChange={(e) => setAutoUpdate(e.target.checked)}>
|
|
{t('pages.index.autoUpdate')}
|
|
</Checkbox>
|
|
</Form.Item>
|
|
<Form.Item className="download-item">
|
|
<Button type="primary" onClick={download} icon={<DownloadOutlined />} aria-label={t('download')} />
|
|
</Form.Item>
|
|
</Form>
|
|
|
|
<div className={`log-container ${isMobile ? 'log-container-mobile' : ''}`}>
|
|
{parsedLogs.length === 0 ? (
|
|
<div className="log-empty">No Record...</div>
|
|
) : isMobile ? (
|
|
parsedLogs.map((log, idx) => (
|
|
<div key={idx} className="log-card">
|
|
<div className="log-card-head">
|
|
{log.stamp && (
|
|
<span className="log-time">
|
|
{log.time && <span>{log.time}</span>}
|
|
{log.time && log.date ? ' ' : ''}
|
|
{log.date && <span className="log-date">{log.date}</span>}
|
|
</span>
|
|
)}
|
|
{log.levelText && (
|
|
<span className={`log-level-badge ${log.levelClass}`}>{log.levelText}</span>
|
|
)}
|
|
</div>
|
|
{(log.body || log.service) && (
|
|
<div className="log-body">
|
|
{log.service && <b>{log.service}</b>}
|
|
{log.service && log.body ? ' ' : ''}
|
|
{log.body && <span className="log-body-text">{log.body}</span>}
|
|
</div>
|
|
)}
|
|
</div>
|
|
))
|
|
) : (
|
|
parsedLogs.map((log, idx) => (
|
|
<div key={idx} className="log-line">
|
|
{log.stamp && <span className="log-stamp">{log.stamp}</span>}
|
|
{log.stamp && log.levelText ? ' ' : ''}
|
|
{log.levelText && <span className={`log-level ${log.levelClass}`}>{log.levelText}</span>}
|
|
{(log.body || log.service) && (
|
|
<>
|
|
{(log.stamp || log.levelText) && <span> - </span>}
|
|
{log.service && <b>{log.service}</b>}
|
|
{log.service && log.body ? ' ' : ''}
|
|
<span>{log.body}</span>
|
|
</>
|
|
)}
|
|
</div>
|
|
))
|
|
)}
|
|
</div>
|
|
</Modal>
|
|
);
|
|
}
|