mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-16 18:15:01 +03:00
b9eda09da9
npm install was failing with ERESOLVE: the lockfile pinned storybook 10.5.7 and vitest 4.1.10 as peers while package.json asked for ^10.5.9 and ^4.1.11, and npm would not move either. Neither npm update, a targeted install, nor --package-lock-only broke the cycle, so node_modules and package-lock.json were regenerated from scratch (601 packages, 0 vulnerabilities). oxlint 1.79.0 then promoted five React Compiler rules into the correctness category, flagging 101 pre-existing sites. 1.78.0 exits 0 on the same tree, so nothing in our code changed - the rule set grew. They are fixed rather than suppressed: - refs (31): latest-value ref writes moved out of render into an effect. onlineClientsRef turned out to be write-only and is gone; expireDiffRef and trafficDiffRef were replaced by reading the values directly. - set-state-in-effect (55): reset-on-open modals now adjust state during render; where an effect mixed a synchronous reset with an async fetch, the reset moved to render and the effect kept only the request. useMediaQuery became useSyncExternalStore. - preserve-manual-memoization (11): optional-chained deps the compiler cannot match, hoisted to locals or dropped where the memo wrapped a string concat. - purity (3): Date.now() in render replaced by a state-backed clock, which also refreshes the expiry tag every 60s instead of freezing it until the next unrelated re-render. - immutability (1): applyClientStatsEvent merged websocket traffic into DBInbound rows in place; it now rebuilds only the rows it touches. Two things fell out of that. clientCount is derived with useMemo instead of an imperative rebuildClientCount() called from five sites, which also fixes a staleness bug where changing the expiry or traffic threshold left the counts alone until some later rebuild. statsVersion existed only to force a re-render after an in-place mutation, is meaningless now that rows are replaced, and nothing read it, so it is removed. Also adds a lint:fix script - oxlint --fix was previously only reachable through the lint-staged hook.
151 lines
4.3 KiB
TypeScript
151 lines
4.3 KiB
TypeScript
import { 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 type { ClientRecord } from '@/hooks/useClients';
|
|
|
|
interface GroupRemoveClientsModalProps {
|
|
open: boolean;
|
|
groupName: string | null;
|
|
members: ClientRecord[];
|
|
onClose: () => void;
|
|
onSubmit: (emails: string[]) => Promise<{ affected?: number } | null>;
|
|
}
|
|
|
|
interface ClientRow {
|
|
email: string;
|
|
comment: string;
|
|
enable: boolean;
|
|
}
|
|
|
|
export default function GroupRemoveClientsModal({
|
|
open,
|
|
groupName,
|
|
members,
|
|
onClose,
|
|
onSubmit,
|
|
}: GroupRemoveClientsModalProps) {
|
|
const { t } = useTranslation();
|
|
const [messageApi, messageContextHolder] = message.useMessage();
|
|
const [saving, setSaving] = useState(false);
|
|
const [selectedEmails, setSelectedEmails] = useState<string[]>([]);
|
|
const [search, setSearch] = useState('');
|
|
|
|
const rows = useMemo<ClientRow[]>(
|
|
() =>
|
|
(members || [])
|
|
.map((c) => ({
|
|
email: (c.email || '').trim(),
|
|
comment: (c.comment || '').trim(),
|
|
enable: c.enable !== false,
|
|
}))
|
|
.filter((r) => r.email),
|
|
[members],
|
|
);
|
|
|
|
// React resets this during render rather than in an effect so the modal's
|
|
// first open frame already shows cleared fields.
|
|
const [wasOpen, setWasOpen] = useState(false);
|
|
if (open !== wasOpen) {
|
|
setWasOpen(open);
|
|
if (open) {
|
|
setSelectedEmails([]);
|
|
setSearch('');
|
|
}
|
|
}
|
|
|
|
const filteredRows = useMemo(() => {
|
|
const q = search.trim().toLowerCase();
|
|
if (!q) return rows;
|
|
return rows.filter(
|
|
(r) => r.email.toLowerCase().includes(q) || r.comment.toLowerCase().includes(q),
|
|
);
|
|
}, [rows, 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 (!groupName || selectedEmails.length === 0) return;
|
|
setSaving(true);
|
|
try {
|
|
const result = await onSubmit(selectedEmails);
|
|
if (!result) return;
|
|
const affected = result.affected ?? selectedEmails.length;
|
|
messageApi.success(
|
|
t('pages.groups.removeFromGroupResult', { count: affected, name: groupName }),
|
|
);
|
|
onClose();
|
|
} finally {
|
|
setSaving(false);
|
|
}
|
|
}
|
|
|
|
return (
|
|
<Modal
|
|
open={open}
|
|
onCancel={onClose}
|
|
onOk={submit}
|
|
okButtonProps={{ danger: true, disabled: selectedEmails.length === 0, loading: saving }}
|
|
okText={t('remove')}
|
|
cancelText={t('cancel')}
|
|
title={t('pages.groups.removeFromGroupTitle', { name: groupName ?? '' })}
|
|
width={680}
|
|
>
|
|
{messageContextHolder}
|
|
<Typography.Paragraph type="secondary">
|
|
{t('pages.groups.removeFromGroupDesc')}
|
|
</Typography.Paragraph>
|
|
|
|
<Space orientation="vertical" size="small" style={{ width: '100%' }}>
|
|
<Space style={{ width: '100%', justifyContent: 'space-between' }} wrap>
|
|
<Input.Search
|
|
allowClear
|
|
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: rows.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>
|
|
);
|
|
}
|