mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-18 19:15:03 +03:00
feat(inbounds): bulk-attach & assign-group client actions + form defaults
- Bulk-attach an inbound's clients onto other inbounds (same identity, shared traffic): new ClientService.BulkAttach + POST /clients/bulkAttach, an inbound row action, and AttachClientsModal. - Assign all of an inbound's clients to a group from the inbound page, reusing /clients/bulkAssignGroup and the existing BulkAssignGroupModal. - Default a random user/pass account for new Mixed and HTTP inbounds instead of an empty accounts list. - Capitalize the inbound Security toggle labels (None/TLS/Reality).
This commit is contained in:
@@ -38,6 +38,8 @@ import LazyMount from '@/components/LazyMount';
|
||||
const InboundFormModal = lazy(() => import('./InboundFormModal'));
|
||||
const InboundInfoModal = lazy(() => import('./InboundInfoModal'));
|
||||
const QrCodeModal = lazy(() => import('./QrCodeModal'));
|
||||
const AttachClientsModal = lazy(() => import('./AttachClientsModal'));
|
||||
const AssignClientsGroupModal = lazy(() => import('./AssignClientsGroupModal'));
|
||||
|
||||
type RowAction =
|
||||
| 'edit'
|
||||
@@ -49,6 +51,8 @@ type RowAction =
|
||||
| 'delete'
|
||||
| 'resetTraffic'
|
||||
| 'delAllClients'
|
||||
| 'attachClients'
|
||||
| 'assignGroup'
|
||||
| 'clone';
|
||||
|
||||
type GeneralAction = 'import' | 'export' | 'subs' | 'resetInbounds';
|
||||
@@ -121,6 +125,12 @@ export default function InboundsPage() {
|
||||
const [qrOpen, setQrOpen] = useState(false);
|
||||
const [qrDbInbound, setQrDbInbound] = useState<DBInbound | null>(null);
|
||||
|
||||
const [attachOpen, setAttachOpen] = useState(false);
|
||||
const [attachSource, setAttachSource] = useState<DBInbound | null>(null);
|
||||
|
||||
const [groupOpen, setGroupOpen] = useState(false);
|
||||
const [groupSource, setGroupSource] = useState<DBInbound | null>(null);
|
||||
|
||||
const [textOpen, setTextOpen] = useState(false);
|
||||
const [textTitle, setTextTitle] = useState('');
|
||||
const [textContent, setTextContent] = useState('');
|
||||
@@ -438,7 +448,7 @@ export default function InboundsPage() {
|
||||
// Actions that touch per-client secrets (uuid, password, flow, ...) need
|
||||
// the full payload that the slim list view does not ship. Hydrate first
|
||||
// and then operate on the rehydrated record.
|
||||
const hydratingKeys: RowAction[] = ['edit', 'showInfo', 'qrcode', 'export', 'subs', 'clipboard', 'clone'];
|
||||
const hydratingKeys: RowAction[] = ['edit', 'showInfo', 'qrcode', 'export', 'subs', 'clipboard', 'clone', 'attachClients', 'assignGroup'];
|
||||
let target = dbInbound;
|
||||
if (hydratingKeys.includes(key)) {
|
||||
const hydrated = await hydrateInbound(dbInbound.id);
|
||||
@@ -475,6 +485,14 @@ export default function InboundsPage() {
|
||||
case 'delAllClients':
|
||||
confirmDelAllClients(target);
|
||||
break;
|
||||
case 'attachClients':
|
||||
setAttachSource(target);
|
||||
setAttachOpen(true);
|
||||
break;
|
||||
case 'assignGroup':
|
||||
setGroupSource(target);
|
||||
setGroupOpen(true);
|
||||
break;
|
||||
case 'clone':
|
||||
confirmClone(target);
|
||||
break;
|
||||
@@ -587,6 +605,23 @@ export default function InboundsPage() {
|
||||
subSettings={subSettings}
|
||||
/>
|
||||
</LazyMount>
|
||||
<LazyMount when={attachOpen}>
|
||||
<AttachClientsModal
|
||||
open={attachOpen}
|
||||
onClose={() => setAttachOpen(false)}
|
||||
onAttached={refresh}
|
||||
source={attachSource}
|
||||
dbInbounds={dbInbounds}
|
||||
/>
|
||||
</LazyMount>
|
||||
<LazyMount when={groupOpen}>
|
||||
<AssignClientsGroupModal
|
||||
open={groupOpen}
|
||||
onClose={() => setGroupOpen(false)}
|
||||
onAssigned={refresh}
|
||||
source={groupSource}
|
||||
/>
|
||||
</LazyMount>
|
||||
|
||||
<LazyMount when={textOpen}>
|
||||
<TextModal
|
||||
|
||||
Reference in New Issue
Block a user