diff --git a/src/api/telegramManagers.ts b/src/api/telegramManagers.ts index 638b509..8324c04 100644 --- a/src/api/telegramManagers.ts +++ b/src/api/telegramManagers.ts @@ -19,8 +19,8 @@ export const telegramManagersApi = { verifyCode: (phone: string, code: string, password?: string) => managerApiClient.post('/managers/auth/verify-code', { phone, code, password }), - delete: (managerId: number) => - managerApiClient.delete(`/managers/${managerId}`), + delete: (managerId: number, wipeData: boolean) => + managerApiClient.delete(`/managers/${managerId}?wipe_data=${wipeData}`), startQr: () => managerApiClient.post('/managers/auth/qr/start'), diff --git a/src/api/whatsappManagers.ts b/src/api/whatsappManagers.ts index d25ea25..f898e16 100644 --- a/src/api/whatsappManagers.ts +++ b/src/api/whatsappManagers.ts @@ -12,7 +12,8 @@ export const whatsappManagersApi = { getStatus: () => waApiClient.get('/managers/status'), startQr: () => waApiClient.post('/managers/auth/qr/start'), checkQrStatus: (token: string) => waApiClient.get(`/managers/auth/qr/status?token=${token}`), - delete: (phone: string) => waApiClient.delete(`/managers/${phone}`), + delete: (phone: string, wipeData: boolean) => + waApiClient.delete(`/managers/${phone}?wipe_data=${wipeData}`), updateName: (phone: string, name: string) => waApiClient.put(`/managers/${phone}/name`, { name }), } \ No newline at end of file diff --git a/src/features/telegramManagers/useTelegramManagers.ts b/src/features/telegramManagers/useTelegramManagers.ts index 3054680..eff896c 100644 --- a/src/features/telegramManagers/useTelegramManagers.ts +++ b/src/features/telegramManagers/useTelegramManagers.ts @@ -13,15 +13,25 @@ export function useTelegramManagers() { }) } +interface DeleteTelegramParams { + managerId: number; + wipeData: boolean; +} + export function useDeleteTelegramManager() { const queryClient = useQueryClient() return useMutation({ - mutationFn: (managerId: number) => telegramManagersApi.delete(managerId), - onSuccess: () => { + // Передаем объект с двумя полями + mutationFn: ({ managerId, wipeData }: DeleteTelegramParams) => + telegramManagersApi.delete(managerId, wipeData), + onSuccess: (_, variables) => { notifications.show({ title: 'Успешно', - message: 'Сессия менеджера завершена', + // Можно сделать динамическое сообщение в зависимости от галочки + message: variables.wipeData + ? 'Сессия и история переписки удалены' + : 'Сессия менеджера отключена', color: 'green', }) queryClient.invalidateQueries({ queryKey: ['telegram-managers-status'] }) diff --git a/src/features/whatsappManagers/useWhatsappManagers.ts b/src/features/whatsappManagers/useWhatsappManagers.ts index c536fd3..f3c1426 100644 --- a/src/features/whatsappManagers/useWhatsappManagers.ts +++ b/src/features/whatsappManagers/useWhatsappManagers.ts @@ -13,18 +13,28 @@ export function useWhatsAppManagers() { }) } +interface DeleteWhatsappParams { + phone: string; + wipeData: boolean; +} + export function useDeleteWhatsAppManager() { const queryClient = useQueryClient() return useMutation({ - mutationFn: (phone: string) => whatsappManagersApi.delete(phone), - onSuccess: () => { + // Передаем объект с двумя полями + mutationFn: ({ phone, wipeData }: DeleteWhatsappParams) => + whatsappManagersApi.delete(phone, wipeData), + onSuccess: (_, variables) => { notifications.show({ title: 'Успешно', - message: 'Сессия менеджера завершена', + message: variables.wipeData + ? 'Сессия и история переписки удалены' + : 'Сессия менеджера отключена', color: 'green', }) - queryClient.invalidateQueries({ queryKey: ['WhatsApp-managers-status'] }) + // Внимание: проверьте регистр ключа. Обычно используют ['whatsapp-managers-status'] (строчными) + queryClient.invalidateQueries({ queryKey: ['whatsapp-managers-status'] }) }, onError: (error: any) => { notifications.show({ diff --git a/src/pages/telegramManagers/TelegramManagersPage.tsx b/src/pages/telegramManagers/TelegramManagersPage.tsx index 3e5ab63..bb51372 100644 --- a/src/pages/telegramManagers/TelegramManagersPage.tsx +++ b/src/pages/telegramManagers/TelegramManagersPage.tsx @@ -16,7 +16,8 @@ import { Alert, Modal, Image, - TextInput + TextInput, + Checkbox } from '@mantine/core' import { IconTrash, @@ -30,7 +31,6 @@ import { IconEdit, IconMessage2 } from '@tabler/icons-react' -import { modals } from '@mantine/modals' import { notifications } from '@mantine/notifications' import { useQueryClient } from '@tanstack/react-query' import dayjs from 'dayjs' @@ -39,27 +39,23 @@ import { formatMsk } from '@/utils/date.ts' // Импорты Telegram import AddManagerModal from './components/AddManagerModal' +import DeleteManagerModal from "./components/DeleteManagersModal" import { useDeleteTelegramManager, useTelegramManagers } from "@/features/telegramManagers/useTelegramManagers" import { telegramManagersApi } from '@/api/telegramManagers' -import {useDeleteWhatsAppManager, useWhatsAppManagers} from '@/features/whatsappManagers/useWhatsappManagers' -import {whatsappManagersApi} from "@/api/whatsappManagers.ts"; + +// Импорты WhatsApp +import { useDeleteWhatsAppManager, useWhatsAppManagers } from '@/features/whatsappManagers/useWhatsappManagers' +import { whatsappManagersApi } from "@/api/whatsappManagers.ts" +import {ManagerSession} from "@/types/api.ts"; dayjs.locale('ru') -export interface ManagerSession { - manager_id: number | string; - name: string; - phone: string; - is_online: boolean; - last_incoming_message_at: string | null; - last_outgoing_message_at: string | null; -} - +// ── ПЕРЕИСПОЛЬЗУЕМЫЕ КОМПОНЕНТЫ ───────────────────────────────────────────── interface ManagersTableProps { managers: ManagerSession[] | undefined; isLoading: boolean; - onDelete: (id: number | string, name: string) => void; + onDelete: (manager: ManagerSession) => void; onEdit: (manager: ManagerSession) => void; onViewChats: (manager: ManagerSession) => void; emptyText?: string; @@ -123,8 +119,8 @@ function ManagersTable({ managers, isLoading, onDelete, onEdit, onViewChats, emp - - onDelete(mgr.manager_id, mgr.name)}> + + onDelete(mgr)}> @@ -169,24 +165,21 @@ function EditManagerModal({ opened, onClose, manager, onSave }: { opened: boolea ) } - // ── ВКЛАДКА TELEGRAM ──────────────────────────────────────────────────────── function TelegramTab() { const [createModalOpened, setCreateModalOpened] = useState(false) const [editingManager, setEditingManager] = useState(null) + const [deletingManager, setDeletingManager] = useState(null) + const { data: managers, isLoading, isFetching } = useTelegramManagers() const deleteManager = useDeleteTelegramManager() const queryClient = useQueryClient() - const handleDelete = (managerId: number | string, name: string) => { - modals.openConfirmModal({ - title: 'Полное удаление сессии', - children: Вы уверены? Сессия {name} будет отключена, а история сообщений стерта из базы данных., - labels: { confirm: 'Удалить', cancel: 'Отмена' }, - confirmProps: { color: 'red' }, - onConfirm: () => deleteManager.mutate(Number(managerId)), - }) + const confirmDelete = async (wipeData: boolean) => { + if (deletingManager) { + await deleteManager.mutateAsync({ managerId: Number(deletingManager.manager_id), wipeData }) + } } const handleSaveName = async (newName: string) => { @@ -201,7 +194,6 @@ function TelegramTab() { } const handleViewChats = (mgr: ManagerSession) => { - // Заглушка для перехода в раздел чатов notifications.show({ title: 'Чаты', message: `Открытие переписки для ${mgr.name}...`, color: 'blue' }) } @@ -211,18 +203,39 @@ function TelegramTab() { Управление активными сессиями пользовательских Telegram аккаунтов + - + + {isFetching && !isLoading && } + setCreateModalOpened(false)} /> - setEditingManager(null)} manager={editingManager} onSave={handleSaveName} /> + + setEditingManager(null)} + manager={editingManager} + onSave={handleSaveName} + /> + + setDeletingManager(null)} + manager={deletingManager} + onConfirm={confirmDelete} + title="Отключение Telegram" + /> ) } -// ── ВКЛАДКА WHATSAPP ──────────────────────────────────────────────────────── - function AddWhatsappModal({ opened, onClose }: { opened: boolean, onClose: () => void }) { const [qrData, setQrData] = useState<{ token: string, img: string } | null>(null) const pollingIntervalRef = useRef(null) @@ -257,7 +270,7 @@ function AddWhatsappModal({ opened, onClose }: { opened: boolean, onClose: () => stopPolling() notifications.show({ title: 'Успешно', message: 'WhatsApp подключен!', color: 'green' }) queryClient.invalidateQueries({ queryKey: ['whatsapp-managers-status'] }) - onClose() // Теперь интервал убит, модалка закроется чисто + onClose() } else if (res.data.status === 'failed') { stopPolling() @@ -290,19 +303,16 @@ function AddWhatsappModal({ opened, onClose }: { opened: boolean, onClose: () => function WhatsappTab() { const [createModalOpened, setCreateModalOpened] = useState(false) const [editingManager, setEditingManager] = useState(null) + const [deletingManager, setDeletingManager] = useState(null) + const { data: managers, isLoading, isFetching } = useWhatsAppManagers() const deleteManager = useDeleteWhatsAppManager() const queryClient = useQueryClient() - const handleDelete = (managerId: number | string, name: string) => { - const mgr = managers?.find((m: ManagerSession) => m.manager_id === managerId) - modals.openConfirmModal({ - title: 'Отключить WhatsApp', - children: Вы уверены? Сессия {name} будет отключена, а история сообщений стерта из базы данных., - labels: { confirm: 'Удалить', cancel: 'Отмена' }, - confirmProps: { color: 'red' }, - onConfirm: () => { if (mgr) deleteManager.mutate(mgr.phone) }, - }) + const confirmDelete = async (wipeData: boolean) => { + if (deletingManager) { + await deleteManager.mutateAsync({ phone: deletingManager.phone, wipeData }) + } } const handleSaveName = async (newName: string) => { @@ -326,12 +336,36 @@ function WhatsappTab() { Управление активными сессиями пользовательских аккаунтов WhatsApp + - + + {isFetching && !isLoading && } + setCreateModalOpened(false)} /> - setEditingManager(null)} manager={editingManager} onSave={handleSaveName} /> + + setEditingManager(null)} + manager={editingManager} + onSave={handleSaveName} + /> + + setDeletingManager(null)} + manager={deletingManager} + onConfirm={confirmDelete} + title="Отключение WhatsApp" + /> ) } @@ -347,14 +381,18 @@ export default function MessengersPage() { Интеграции мессенджеров Подключение и мониторинг каналов связи менеджеров + }>Telegram }>WhatsApp }>Max + + + } color="blue" variant="light"> diff --git a/src/pages/telegramManagers/components/DeleteManagersModal.tsx b/src/pages/telegramManagers/components/DeleteManagersModal.tsx new file mode 100644 index 0000000..5fd6aee --- /dev/null +++ b/src/pages/telegramManagers/components/DeleteManagersModal.tsx @@ -0,0 +1,42 @@ +import {Button, Checkbox, Group, Modal, Stack, Text} from '@mantine/core' +import {useEffect, useState} from 'react' +import {ManagerSession} from "@/types/api.ts"; + +export default function DeleteManagerModal({ opened, onClose, manager, onConfirm, title }: { + opened: boolean, + onClose: () => void, + manager: ManagerSession | null, + onConfirm: (wipeData: boolean) => Promise, + title: string +}) { + const [wipeData, setWipeData] = useState(false) + const [loading, setLoading] = useState(false) + + useEffect(() => { if (opened) setWipeData(false) }, [opened]) + + const handleConfirm = async () => { + setLoading(true) + await onConfirm(wipeData) + setLoading(false) + onClose() + } + + return ( + + + Вы уверены, что хотите отключить сессию менеджера {manager?.name}? + setWipeData(event.currentTarget.checked)} + /> + + + + + + + ) +} \ No newline at end of file