Updated notifications table
Deploy Frontend / build-and-deploy (push) Failing after 26s
Details
Deploy Frontend / build-and-deploy (push) Failing after 26s
Details
This commit is contained in:
parent
965af735a9
commit
13500e8b38
|
|
@ -170,7 +170,7 @@
|
|||
│ │ ├── notifications
|
||||
│ │ │ ├── NotificationsPage.tsx
|
||||
│ │ │ ├── components
|
||||
│ │ │ │ ├── NotificationDetailsModal.tsx
|
||||
│ │ │ │ ├── NotificationDetailsDrawer.tsx
|
||||
│ │ │ │ ├── NotificationsHistoryTable.tsx
|
||||
│ │ │ │ ├── SendNotificationForm.tsx
|
||||
│ │ ├── permissions
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
import { useEffect } from 'react'
|
||||
import { Box, Button, Group, NumberInput, Paper, Stack, Title, Text, Select, Textarea } from '@mantine/core'
|
||||
import { Box, Button, Group, NumberInput, Paper, Stack, Text, Select, Textarea, Skeleton } from '@mantine/core'
|
||||
import { DateTimePicker } from '@mantine/dates'
|
||||
import { useForm } from '@mantine/form'
|
||||
import { useMonthlyOrderSettings, useSaveMonthlyOrderSettings } from '@/features/monthlyOrders/hooks/useMonthlyOrderSettings'
|
||||
import { IconDeviceFloppy, IconInfoCircle } from '@tabler/icons-react'
|
||||
import dayjs from 'dayjs'
|
||||
import { IconDeviceFloppy } from '@tabler/icons-react'
|
||||
|
||||
import { useMonthlyOrderSettings, useSaveMonthlyOrderSettings } from '@/features/monthlyOrders/hooks/useMonthlyOrderSettings'
|
||||
import { PageHeader } from '@/components/ui/PageHeader'
|
||||
|
||||
interface SettingsFormValues {
|
||||
deadline_date: Date | null
|
||||
|
|
@ -34,76 +36,112 @@ export default function MonthlyOrdersSettingsPage() {
|
|||
if (currentSettings) {
|
||||
form.setValues({
|
||||
deadline_date: currentSettings.deadline_date ? new Date(currentSettings.deadline_date) : null,
|
||||
assembly_time_days: currentSettings.assembly_time_days || 3,
|
||||
assembly_time_days: currentSettings.assembly_time_days ?? 3,
|
||||
market_stage: currentSettings.market_stage || null,
|
||||
market_stage_comment: currentSettings.market_stage_comment || '',
|
||||
})
|
||||
form.resetDirty() // Сбрасываем флаг изменений после загрузки данных
|
||||
}
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [currentSettings])
|
||||
|
||||
const handleSubmit = (values: SettingsFormValues) => {
|
||||
saveSettings({
|
||||
deadline_date: values.deadline_date ? dayjs(values.deadline_date).format() : null,
|
||||
assembly_time_days: values.assembly_time_days,
|
||||
market_stage: values.market_stage,
|
||||
market_stage_comment: values.market_stage_comment,
|
||||
})
|
||||
saveSettings(
|
||||
{
|
||||
deadline_date: values.deadline_date ? dayjs(values.deadline_date).format() : null,
|
||||
assembly_time_days: values.assembly_time_days,
|
||||
market_stage: values.market_stage,
|
||||
market_stage_comment: values.market_stage_comment,
|
||||
},
|
||||
{
|
||||
onSuccess: () => form.resetDirty(), // После успешного сохранения кнопка снова блокируется
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
if (isLoading) return <Text>Загрузка...</Text>
|
||||
|
||||
return (
|
||||
<Box>
|
||||
<Title order={2} mb="lg">Настройки: Заказ товаров на месяц</Title>
|
||||
<Stack gap="lg">
|
||||
<PageHeader
|
||||
title="Настройки: Заказ товаров на месяц"
|
||||
description="Глобальные параметры для работы с заказами текущего месяца"
|
||||
/>
|
||||
|
||||
<Paper withBorder shadow="sm" p="md" radius="md" maw={500}>
|
||||
<form onSubmit={form.onSubmit(handleSubmit)}>
|
||||
{isLoading ? (
|
||||
<Paper withBorder p="md" radius="md" maw={600}>
|
||||
<Stack gap="md">
|
||||
<Text c="dimmed" size="sm">
|
||||
Эти настройки применяются к текущему месяцу. Заказы открываются автоматически 15-го числа и закрываются в указанную дату.
|
||||
</Text>
|
||||
|
||||
<DateTimePicker
|
||||
label="Крайняя дата и время"
|
||||
description="После этого времени менеджеры не смогут редактировать заказы на месяц и они отправятся на согласование."
|
||||
placeholder="Выберите дату и время"
|
||||
valueFormat="DD.MM.YYYY HH:mm"
|
||||
withSeconds={false}
|
||||
{...form.getInputProps('deadline_date')}
|
||||
/>
|
||||
|
||||
<Select
|
||||
label="Стадия рынка"
|
||||
placeholder="Выберите текущую стадию"
|
||||
data={[
|
||||
{ value: 'растущий', label: 'Растущий' },
|
||||
{ value: 'падающий', label: 'Падающий' },
|
||||
{ value: 'стоячий', label: 'Стоячий' },
|
||||
]}
|
||||
clearable
|
||||
{...form.getInputProps('market_stage')}
|
||||
/>
|
||||
|
||||
<Textarea
|
||||
label="Комментарий к стадии рынка"
|
||||
placeholder="Опишите подробности текущей ситуации на рынке"
|
||||
minRows={3}
|
||||
autosize
|
||||
{...form.getInputProps('market_stage_comment')}
|
||||
/>
|
||||
|
||||
<Group justify="flex-end" mt="md">
|
||||
<Button
|
||||
type="submit"
|
||||
loading={isPending}
|
||||
leftSection={<IconDeviceFloppy size={18} />}
|
||||
>
|
||||
Сохранить настройки
|
||||
</Button>
|
||||
</Group>
|
||||
<Skeleton h={50} />
|
||||
<Skeleton h={50} />
|
||||
<Skeleton h={50} />
|
||||
<Skeleton h={90} />
|
||||
</Stack>
|
||||
</form>
|
||||
</Paper>
|
||||
</Box>
|
||||
</Paper>
|
||||
) : (
|
||||
<Paper withBorder p="md" radius="md" maw={600}>
|
||||
<form onSubmit={form.onSubmit(handleSubmit)}>
|
||||
<Stack gap="md">
|
||||
<Group wrap="nowrap" align="flex-start" gap="xs" style={{ color: 'var(--mantine-color-dimmed)' }}>
|
||||
<IconInfoCircle size={18} style={{ flexShrink: 0, marginTop: 2 }} />
|
||||
<Text size="sm">
|
||||
Эти настройки применяются к текущему месяцу. Заказы открываются автоматически 15-го числа и закрываются в указанную дату.
|
||||
</Text>
|
||||
</Group>
|
||||
|
||||
<DateTimePicker
|
||||
label="Крайняя дата и время (Дедлайн)"
|
||||
description="После этого времени менеджеры не смогут редактировать заказы, и они отправятся на согласование"
|
||||
placeholder="Выберите дату и время"
|
||||
valueFormat="DD.MM.YYYY HH:mm"
|
||||
withSeconds={false}
|
||||
required
|
||||
{...form.getInputProps('deadline_date')}
|
||||
/>
|
||||
|
||||
<NumberInput
|
||||
label="Срок сборки (в днях)"
|
||||
description="Количество дней, заложенных на формирование заказа"
|
||||
placeholder="Например: 3"
|
||||
min={0}
|
||||
required
|
||||
{...form.getInputProps('assembly_time_days')}
|
||||
/>
|
||||
|
||||
<Select
|
||||
label="Стадия рынка"
|
||||
placeholder="Выберите текущую стадию"
|
||||
data={[
|
||||
{ value: 'растущий', label: 'Растущий' },
|
||||
{ value: 'падающий', label: 'Падающий' },
|
||||
{ value: 'стоячий', label: 'Стоячий' },
|
||||
]}
|
||||
clearable
|
||||
{...form.getInputProps('market_stage')}
|
||||
/>
|
||||
|
||||
<Textarea
|
||||
label="Комментарий к стадии рынка"
|
||||
placeholder="Опишите подробности текущей ситуации на рынке"
|
||||
minRows={3}
|
||||
autosize
|
||||
{...form.getInputProps('market_stage_comment')}
|
||||
/>
|
||||
|
||||
<Group justify="space-between" mt="md" wrap="nowrap">
|
||||
<Text size="xs" c="dimmed">
|
||||
{form.isDirty() ? 'У вас есть несохраненные изменения' : ''}
|
||||
</Text>
|
||||
<Button
|
||||
type="submit"
|
||||
loading={isPending}
|
||||
disabled={!form.isDirty()}
|
||||
leftSection={<IconDeviceFloppy size={18} />}
|
||||
>
|
||||
Сохранить настройки
|
||||
</Button>
|
||||
</Group>
|
||||
</Stack>
|
||||
</form>
|
||||
</Paper>
|
||||
)}
|
||||
</Stack>
|
||||
)
|
||||
}
|
||||
|
|
@ -1,6 +1,8 @@
|
|||
import { Stack, Tabs, Text, Alert } from '@mantine/core'
|
||||
import { Stack, Tabs, Alert } from '@mantine/core'
|
||||
import { IconSend, IconHistory, IconLock } from '@tabler/icons-react'
|
||||
|
||||
import { useAuth } from '@/hooks/useAuth'
|
||||
import { PageHeader } from '@/components/ui/PageHeader'
|
||||
import SendNotificationForm from './components/SendNotificationForm'
|
||||
import NotificationsHistoryTable from './components/NotificationsHistoryTable'
|
||||
|
||||
|
|
@ -9,8 +11,17 @@ export default function NotificationsPage() {
|
|||
const isObserver = user?.is_observer === true
|
||||
|
||||
return (
|
||||
<Stack gap="md">
|
||||
<Text size="xl" fw={700}>Уведомления</Text>
|
||||
<Stack gap="lg">
|
||||
<PageHeader
|
||||
title="Уведомления"
|
||||
description="Центр массовых рассылок и история отправленных сообщений"
|
||||
/>
|
||||
|
||||
{isObserver && (
|
||||
<Alert color="blue" variant="light" icon={<IconLock size={16} />}>
|
||||
В режиме наблюдателя доступен только просмотр истории уведомлений
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
<Tabs defaultValue={isObserver ? 'history' : 'send'}>
|
||||
<Tabs.List>
|
||||
|
|
@ -34,12 +45,6 @@ export default function NotificationsPage() {
|
|||
<NotificationsHistoryTable />
|
||||
</Tabs.Panel>
|
||||
</Tabs>
|
||||
|
||||
{isObserver && (
|
||||
<Alert color="blue" variant="light" icon={<IconLock size={16} />}>
|
||||
В режиме наблюдателя доступен только просмотр истории уведомлений
|
||||
</Alert>
|
||||
)}
|
||||
</Stack>
|
||||
)
|
||||
}
|
||||
|
|
@ -0,0 +1,97 @@
|
|||
import { useNotification } from '@/features/notifications/hooks/useNotifications'
|
||||
import { Drawer, Stack, Text, Badge, Skeleton, Box, Group } from '@mantine/core'
|
||||
import { DataTable, type Column } from '@/components/ui/DataTable'
|
||||
import classes from '@/components/UserDrawer.module.css'
|
||||
|
||||
interface Props {
|
||||
notificationId: number | null
|
||||
opened: boolean
|
||||
onClose: () => void
|
||||
}
|
||||
|
||||
const RECIPIENT_STATUS_LABELS: Record<string, { label: string; color: string }> = {
|
||||
pending: { label: 'В очереди', color: 'gray' },
|
||||
sent: { label: 'Доставлено', color: 'green' },
|
||||
failed: { label: 'Ошибка', color: 'red' },
|
||||
}
|
||||
|
||||
export default function NotificationDetailsDrawer({ notificationId, opened, onClose }: Props) {
|
||||
const { data: notification, isLoading } = useNotification(notificationId)
|
||||
|
||||
const columns: Column<any>[] = [
|
||||
{
|
||||
key: 'user',
|
||||
header: 'Пользователь',
|
||||
cell: (r) => <Text size="sm" fw={500}>{r.user?.full_name || `ID ${r.user_id}`}</Text>
|
||||
},
|
||||
{
|
||||
key: 'status',
|
||||
header: 'Статус',
|
||||
width: 120,
|
||||
cell: (r) => {
|
||||
const statusInfo = RECIPIENT_STATUS_LABELS[r.status || ''] || { label: r.status || '—', color: 'gray' }
|
||||
return <Badge color={statusInfo.color} variant="light" size="sm">{statusInfo.label}</Badge>
|
||||
}
|
||||
},
|
||||
{
|
||||
key: 'error',
|
||||
header: 'Лог ошибки',
|
||||
cell: (r) => <Text size="xs" c="red" lineClamp={2}>{r.error_message || '—'}</Text>
|
||||
}
|
||||
]
|
||||
|
||||
return (
|
||||
<Drawer.Root opened={opened} onClose={onClose} position="right" size="min(640px, 100vw)">
|
||||
<Drawer.Overlay backgroundOpacity={0.25} />
|
||||
<Drawer.Content>
|
||||
<Drawer.Header>
|
||||
<Box style={{ minWidth: 0 }}>
|
||||
<Group gap="sm" wrap="nowrap">
|
||||
<Text fw={600}>Детали уведомления</Text>
|
||||
{notification && <Badge variant="light" color="gray">ID {notification.id}</Badge>}
|
||||
</Group>
|
||||
</Box>
|
||||
<Drawer.CloseButton />
|
||||
</Drawer.Header>
|
||||
|
||||
<Drawer.Body className={classes.body} pb="xl">
|
||||
{isLoading ? (
|
||||
<Stack className={classes.section} gap="md">
|
||||
<Skeleton h={40} />
|
||||
<Skeleton h={120} />
|
||||
<Skeleton h={200} mt="lg" />
|
||||
</Stack>
|
||||
) : !notification ? (
|
||||
<Text size="sm" c="dimmed">Уведомление не найдено</Text>
|
||||
) : (
|
||||
<Stack gap="xl" mt="sm">
|
||||
<Box>
|
||||
<Text size="sm" fw={600} mb="xs">Содержимое</Text>
|
||||
<Box p="md" style={{ border: '1px solid var(--mantine-color-default-border)', borderRadius: 'var(--mantine-radius-md)', backgroundColor: 'var(--mantine-color-gray-0)' }}>
|
||||
<Text fw={600} mb="sm">{notification.title}</Text>
|
||||
<div
|
||||
style={{ fontSize: 14 }}
|
||||
dangerouslySetInnerHTML={{ __html: notification.message_html }}
|
||||
/>
|
||||
</Box>
|
||||
</Box>
|
||||
|
||||
<Box>
|
||||
<Text size="sm" fw={600} mb="xs">Получатели ({notification.recipients?.length || 0})</Text>
|
||||
<Box style={{ border: '1px solid var(--mantine-color-default-border)', borderRadius: 'var(--mantine-radius-md)' }}>
|
||||
<DataTable
|
||||
columns={columns}
|
||||
rows={notification.recipients || []}
|
||||
getRowId={(r) => r.id}
|
||||
minWidth={400}
|
||||
empty={{ title: 'Нет получателей' }}
|
||||
/>
|
||||
</Box>
|
||||
</Box>
|
||||
</Stack>
|
||||
)}
|
||||
</Drawer.Body>
|
||||
</Drawer.Content>
|
||||
</Drawer.Root>
|
||||
)
|
||||
}
|
||||
|
|
@ -1,75 +0,0 @@
|
|||
import { useNotification } from '@/features/notifications/hooks/useNotifications'
|
||||
import { Modal, Stack, Text, Badge, ScrollArea, Table, Divider, Loader, Center } from '@mantine/core'
|
||||
|
||||
interface Props {
|
||||
notificationId: number | null
|
||||
opened: boolean
|
||||
onClose: () => void
|
||||
}
|
||||
|
||||
const RECIPIENT_STATUS_LABELS: Record<string, { label: string; color: string }> = {
|
||||
pending: { label: 'В очереди', color: 'gray' },
|
||||
sent: { label: 'Доставлено', color: 'green' },
|
||||
failed: { label: 'Ошибка', color: 'red' },
|
||||
}
|
||||
|
||||
export default function NotificationDetailsModal({ notificationId, opened, onClose }: Props) {
|
||||
const { data: notification, isLoading } = useNotification(notificationId)
|
||||
|
||||
return (
|
||||
<Modal opened={opened} onClose={onClose} title="Детали уведомления" size="lg">
|
||||
{isLoading || !notification ? (
|
||||
<Center p={40}>
|
||||
<Loader />
|
||||
</Center>
|
||||
) : (
|
||||
<Stack gap="md">
|
||||
<Stack gap={4}>
|
||||
<Text fw={600}>{notification.title}</Text>
|
||||
<div
|
||||
style={{ fontSize: 14 }}
|
||||
dangerouslySetInnerHTML={{ __html: notification.message_html }}
|
||||
/>
|
||||
</Stack>
|
||||
|
||||
<Divider label="Получатели" labelPosition="left" />
|
||||
|
||||
<ScrollArea h={300}>
|
||||
<Table striped>
|
||||
<Table.Thead>
|
||||
<Table.Tr>
|
||||
<Table.Th>Пользователь</Table.Th>
|
||||
<Table.Th style={{ width: 120 }}>Статус</Table.Th>
|
||||
<Table.Th>Ошибка</Table.Th>
|
||||
</Table.Tr>
|
||||
</Table.Thead>
|
||||
<Table.Tbody>
|
||||
{(notification.recipients || []).map((r) => {
|
||||
const statusInfo = RECIPIENT_STATUS_LABELS[r.status || ''] || {
|
||||
label: r.status || '—',
|
||||
color: 'gray',
|
||||
}
|
||||
return (
|
||||
<Table.Tr key={r.id}>
|
||||
<Table.Td>{r.user?.full_name || `ID ${r.user_id}`}</Table.Td>
|
||||
<Table.Td>
|
||||
<Badge color={statusInfo.color} variant="light" size="sm">
|
||||
{statusInfo.label}
|
||||
</Badge>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Text size="xs" c="red">
|
||||
{r.error_message || ''}
|
||||
</Text>
|
||||
</Table.Td>
|
||||
</Table.Tr>
|
||||
)
|
||||
})}
|
||||
</Table.Tbody>
|
||||
</Table>
|
||||
</ScrollArea>
|
||||
</Stack>
|
||||
)}
|
||||
</Modal>
|
||||
)
|
||||
}
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
import { useState } from 'react'
|
||||
import {
|
||||
Paper, Table, Badge, Group, Text, Pagination, Loader, Center, Box, Stack,
|
||||
} from '@mantine/core'
|
||||
import NotificationDetailsModal from './NotificationDetailsModal'
|
||||
import { Badge, Group, Text } from '@mantine/core'
|
||||
import { useNotifications } from '@/features/notifications/hooks/useNotifications'
|
||||
import { DataTable, type Column } from '@/components/ui/DataTable'
|
||||
import NotificationDetailsDrawer from './NotificationDetailsDrawer'
|
||||
|
||||
const LIMIT = 20
|
||||
|
||||
|
|
@ -18,108 +17,72 @@ export default function NotificationsHistoryTable() {
|
|||
const [page, setPage] = useState(1)
|
||||
const [selectedId, setSelectedId] = useState<number | null>(null)
|
||||
|
||||
const { data, isLoading } = useNotifications({
|
||||
const { data, isLoading, isFetching } = useNotifications({
|
||||
offset: (page - 1) * LIMIT,
|
||||
limit: LIMIT,
|
||||
})
|
||||
|
||||
const totalPages = data?.total_count ? Math.ceil(data.total_count / LIMIT) : 1
|
||||
const total = data?.total_count ?? 0
|
||||
|
||||
const columns: Column<any>[] = [
|
||||
{
|
||||
key: 'id',
|
||||
header: 'ID',
|
||||
width: 80,
|
||||
cell: (r) => <Text size="sm" fw={500}>#{r.id}</Text>
|
||||
},
|
||||
{
|
||||
key: 'title',
|
||||
header: 'Заголовок',
|
||||
cell: (r) => <Text size="sm" fw={500}>{r.title}</Text>
|
||||
},
|
||||
{
|
||||
key: 'status',
|
||||
header: 'Статус',
|
||||
width: 140,
|
||||
cell: (r) => {
|
||||
const statusInfo = STATUS_LABELS[r.status || ''] || { label: r.status || '—', color: 'gray' }
|
||||
return <Badge color={statusInfo.color} variant="light">{statusInfo.label}</Badge>
|
||||
}
|
||||
},
|
||||
{
|
||||
key: 'delivery',
|
||||
header: 'Доставлено',
|
||||
width: 180,
|
||||
cell: (r) => (
|
||||
<Group gap={6}>
|
||||
<Badge color="green" variant="light" size="sm">{r.sent_count ?? 0}</Badge>
|
||||
{(r.failed_count ?? 0) > 0 && <Badge color="red" variant="light" size="sm">{r.failed_count} ошибок</Badge>}
|
||||
<Text size="xs" c="dimmed">из {r.total_count ?? 0}</Text>
|
||||
</Group>
|
||||
)
|
||||
},
|
||||
{
|
||||
key: 'date',
|
||||
header: 'Дата отправки',
|
||||
width: 160,
|
||||
cell: (r) => <Text size="sm" c="dimmed">{r.sent_at ? new Date(r.sent_at).toLocaleString('ru-RU') : '—'}</Text>
|
||||
},
|
||||
]
|
||||
|
||||
return (
|
||||
<Stack gap="md">
|
||||
<Paper withBorder>
|
||||
{isLoading ? (
|
||||
<Center p={60}>
|
||||
<Loader />
|
||||
</Center>
|
||||
) : (
|
||||
<>
|
||||
<Table striped highlightOnHover>
|
||||
<Table.Thead>
|
||||
<Table.Tr>
|
||||
<Table.Th style={{ width: 60 }}>ID</Table.Th>
|
||||
<Table.Th>Заголовок</Table.Th>
|
||||
<Table.Th style={{ width: 120 }}>Статус</Table.Th>
|
||||
<Table.Th style={{ width: 160 }}>Доставлено</Table.Th>
|
||||
<Table.Th style={{ width: 160 }}>Дата отправки</Table.Th>
|
||||
</Table.Tr>
|
||||
</Table.Thead>
|
||||
<Table.Tbody>
|
||||
{data?.data?.length === 0 ? (
|
||||
<Table.Tr>
|
||||
<Table.Td colSpan={5}>
|
||||
<Center p={40}>
|
||||
<Text c="dimmed">Уведомления не отправлялись</Text>
|
||||
</Center>
|
||||
</Table.Td>
|
||||
</Table.Tr>
|
||||
) : (
|
||||
(data?.data || []).map((n) => {
|
||||
const statusInfo = STATUS_LABELS[n.status || ''] || {
|
||||
label: n.status || '—',
|
||||
color: 'gray',
|
||||
}
|
||||
return (
|
||||
<Table.Tr
|
||||
key={n.id}
|
||||
style={{ cursor: 'pointer' }}
|
||||
onClick={() => setSelectedId(n.id!)}
|
||||
>
|
||||
<Table.Td>{n.id}</Table.Td>
|
||||
<Table.Td>
|
||||
<Text fw={500}>{n.title}</Text>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Badge color={statusInfo.color} variant="light">
|
||||
{statusInfo.label}
|
||||
</Badge>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Group gap={6}>
|
||||
<Badge color="green" variant="light" size="sm">
|
||||
{n.sent_count ?? 0}
|
||||
</Badge>
|
||||
{(n.failed_count ?? 0) > 0 && (
|
||||
<Badge color="red" variant="light" size="sm">
|
||||
{n.failed_count} ошибок
|
||||
</Badge>
|
||||
)}
|
||||
<Text size="xs" c="dimmed">
|
||||
из {n.total_count ?? 0}
|
||||
</Text>
|
||||
</Group>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Text size="sm" c="dimmed">
|
||||
{n.sent_at ? new Date(n.sent_at).toLocaleString('ru-RU') : '—'}
|
||||
</Text>
|
||||
</Table.Td>
|
||||
</Table.Tr>
|
||||
)
|
||||
})
|
||||
)}
|
||||
</Table.Tbody>
|
||||
</Table>
|
||||
<>
|
||||
<DataTable
|
||||
columns={columns}
|
||||
rows={data?.data ?? []}
|
||||
getRowId={(r) => r.id}
|
||||
loading={isLoading}
|
||||
refreshing={isFetching}
|
||||
onRowClick={(r) => setSelectedId(r.id)}
|
||||
empty={{ title: 'Уведомления не отправлялись' }}
|
||||
pagination={{ page, pageSize: LIMIT, total, onChange: setPage }}
|
||||
/>
|
||||
|
||||
{totalPages > 1 && (
|
||||
<Box p="md" style={{ borderTop: '1px solid var(--mantine-color-gray-3)' }}>
|
||||
<Group justify="space-between">
|
||||
<Text size="sm" c="dimmed">
|
||||
Страница {page} из {totalPages}
|
||||
</Text>
|
||||
<Pagination value={page} onChange={setPage} total={totalPages} withEdges />
|
||||
</Group>
|
||||
</Box>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</Paper>
|
||||
|
||||
<NotificationDetailsModal
|
||||
<NotificationDetailsDrawer
|
||||
notificationId={selectedId}
|
||||
opened={selectedId !== null}
|
||||
onClose={() => setSelectedId(null)}
|
||||
/>
|
||||
</Stack>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
|
@ -1,8 +1,7 @@
|
|||
import { useState, useMemo } from 'react'
|
||||
import {
|
||||
Paper, Stack, TextInput, Button, Group, MultiSelect, Checkbox,
|
||||
Text, FileButton, Image, ActionIcon, Divider, Alert, Badge, Grid,
|
||||
ThemeIcon,
|
||||
Text, FileButton, Image, ActionIcon, Alert, Badge, Grid, ThemeIcon, Tabs
|
||||
} from '@mantine/core'
|
||||
import {
|
||||
IconPhoto, IconX, IconSend, IconAlertCircle, IconUsers,
|
||||
|
|
@ -13,15 +12,16 @@ import { useEditor } from '@tiptap/react'
|
|||
import StarterKit from '@tiptap/starter-kit'
|
||||
import Underline from '@tiptap/extension-underline'
|
||||
import { useDebouncedValue } from '@mantine/hooks'
|
||||
import { useUsers } from '@/features/users/hooks/useUsers'
|
||||
import { useDepartments } from '@/features/departments/hooks/useDepartments'
|
||||
import { useAllRoles } from '@/features/roles/hooks/useAllRoles'
|
||||
import { useCreateNotification } from '@/features/notifications/hooks/useNotifications.ts'
|
||||
import { convertHtmlToTelegram } from '@/features/notifications/utils/telegramHtml.ts'
|
||||
import { notifications } from '@mantine/notifications'
|
||||
import { Modal } from '@mantine/core'
|
||||
import '@mantine/tiptap/styles.css'
|
||||
|
||||
import { useUsers } from '@/features/users/hooks/useUsers'
|
||||
import { useDepartments } from '@/features/departments/hooks/useDepartments'
|
||||
import { useAllRoles } from '@/features/roles/hooks/useAllRoles'
|
||||
import { useCreateNotification } from '@/features/notifications/hooks/useNotifications'
|
||||
import { convertHtmlToTelegram } from '@/features/notifications/utils/telegramHtml'
|
||||
|
||||
const ROLE_TYPE_OPTIONS = [
|
||||
{ value: 'director', label: 'Директора', icon: '👔' },
|
||||
{ value: 'approver', label: 'Согласующие', icon: '✅' },
|
||||
|
|
@ -68,16 +68,8 @@ export default function SendNotificationForm() {
|
|||
})),
|
||||
[usersData],
|
||||
)
|
||||
const roleOptions = useMemo(
|
||||
() => roles.map((r) => ({ value: String(r.id), label: r.name })),
|
||||
[roles],
|
||||
)
|
||||
const departmentOptions = useMemo(
|
||||
() => departments.map((d) => ({ value: String(d.id), label: d.name })),
|
||||
[departments],
|
||||
)
|
||||
|
||||
const MAX_ASPECT_RATIO = 20
|
||||
const roleOptions = useMemo(() => roles.map((r) => ({ value: String(r.id), label: r.name })), [roles])
|
||||
const departmentOptions = useMemo(() => departments.map((d) => ({ value: String(d.id), label: d.name })), [departments])
|
||||
|
||||
const handlePhotoChange = (file: File | null) => {
|
||||
if (!file) {
|
||||
|
|
@ -92,13 +84,8 @@ export default function SendNotificationForm() {
|
|||
const img = new window.Image()
|
||||
img.onload = () => {
|
||||
const ratio = Math.max(img.width, img.height) / Math.min(img.width, img.height)
|
||||
const sumDimensions = img.width + img.height
|
||||
if (ratio > MAX_ASPECT_RATIO || sumDimensions > 10000) {
|
||||
notifications.show({
|
||||
title: 'Некорректное изображение',
|
||||
message: `Telegram не примет это фото: слишком вытянутые пропорции (${img.width}×${img.height}).`,
|
||||
color: 'red',
|
||||
})
|
||||
if (ratio > 20 || img.width + img.height > 10000) {
|
||||
notifications.show({ title: 'Ошибка', message: 'Telegram не примет это фото из-за пропорций.', color: 'red' })
|
||||
return
|
||||
}
|
||||
setPhotoBase64(result.split(',')[1] || '')
|
||||
|
|
@ -110,30 +97,16 @@ export default function SendNotificationForm() {
|
|||
reader.readAsDataURL(file)
|
||||
}
|
||||
|
||||
const hasAnyTarget =
|
||||
selectedUserIds.length > 0 ||
|
||||
selectedRoleIds.length > 0 ||
|
||||
selectedRoleFlags.length > 0 ||
|
||||
selectedDepartmentIds.length > 0
|
||||
|
||||
const messageHtml = editor?.getHTML() ?? ''
|
||||
const messageText = editor?.getText() ?? ''
|
||||
const hasAnyTarget = selectedUserIds.length > 0 || selectedRoleIds.length > 0 || selectedRoleFlags.length > 0 || selectedDepartmentIds.length > 0
|
||||
const isMessageEmpty = editor?.isEmpty ?? true
|
||||
|
||||
const canSubmit = title.trim().length > 0 && !isMessageEmpty && hasAnyTarget
|
||||
|
||||
const totalCriteria =
|
||||
(selectedUserIds.length > 0 ? 1 : 0) +
|
||||
(selectedRoleIds.length > 0 ? 1 : 0) +
|
||||
(selectedRoleFlags.length > 0 ? 1 : 0) +
|
||||
(selectedDepartmentIds.length > 0 ? 1 : 0)
|
||||
|
||||
const doSubmit = () => {
|
||||
setConfirmOpen(false)
|
||||
createNotification.mutate(
|
||||
{
|
||||
title: title.trim(),
|
||||
message_html: convertHtmlToTelegram(messageHtml),
|
||||
message_html: convertHtmlToTelegram(editor?.getHTML() ?? ''),
|
||||
photo_base64: photoBase64 || undefined,
|
||||
photo_file_name: photoFileName || undefined,
|
||||
targets: {
|
||||
|
|
@ -152,11 +125,7 @@ export default function SendNotificationForm() {
|
|||
setSelectedRoleFlags([])
|
||||
setSelectedDepartmentIds([])
|
||||
handlePhotoChange(null)
|
||||
notifications.show({
|
||||
title: 'Успешно',
|
||||
message: 'Уведомление отправлено',
|
||||
color: 'green',
|
||||
})
|
||||
notifications.show({ title: 'Успешно', message: 'Уведомление отправлено', color: 'green' })
|
||||
},
|
||||
},
|
||||
)
|
||||
|
|
@ -164,7 +133,6 @@ export default function SendNotificationForm() {
|
|||
|
||||
return (
|
||||
<Paper withBorder p={{ base: 'md', md: 'xl' }} radius="md">
|
||||
{/* ===== HEADER ===== */}
|
||||
<Group justify="space-between" align="center" mb="lg">
|
||||
<Group gap="sm">
|
||||
<ThemeIcon size="lg" radius="md" variant="light" color="blue">
|
||||
|
|
@ -175,11 +143,6 @@ export default function SendNotificationForm() {
|
|||
<Text size="xs" c="dimmed">Отправится через Telegram Bot</Text>
|
||||
</div>
|
||||
</Group>
|
||||
{totalCriteria > 0 && (
|
||||
<Badge size="lg" variant="light" color="blue" radius="sm">
|
||||
{totalCriteria} {totalCriteria === 1 ? 'критерий' : 'критериев'}
|
||||
</Badge>
|
||||
)}
|
||||
</Group>
|
||||
|
||||
<Grid gap="xl">
|
||||
|
|
@ -195,15 +158,10 @@ export default function SendNotificationForm() {
|
|||
size="md"
|
||||
/>
|
||||
|
||||
{/* Редактор */}
|
||||
<Stack gap={6}>
|
||||
<Group justify="space-between" align="center">
|
||||
<Text size="sm" fw={500}>Текст сообщения</Text>
|
||||
{!isMessageEmpty && (
|
||||
<Badge size="xs" variant="light" color="green" leftSection={<IconEye size={10} />}>
|
||||
Заполнено
|
||||
</Badge>
|
||||
)}
|
||||
{!isMessageEmpty && <Badge size="xs" variant="light" color="green" leftSection={<IconEye size={10} />}>Заполнено</Badge>}
|
||||
</Group>
|
||||
<RichTextEditor editor={editor} style={{ minHeight: 320 }}>
|
||||
<RichTextEditor.Toolbar sticky stickyOffset={0}>
|
||||
|
|
@ -225,12 +183,8 @@ export default function SendNotificationForm() {
|
|||
</RichTextEditor.Toolbar>
|
||||
<RichTextEditor.Content style={{ minHeight: 220 }} />
|
||||
</RichTextEditor>
|
||||
<Text size="xs" c="dimmed">
|
||||
<b>жирный</b> · <i>курсив</i> · <u>подчёркнутый</u> · <s>зачёркнутый</s> · <code>код</code> · ссылки — остальное Telegram не отобразит
|
||||
</Text>
|
||||
</Stack>
|
||||
|
||||
{/* Фото */}
|
||||
<Stack gap={6}>
|
||||
<Text size="sm" fw={500}>Фото (опционально)</Text>
|
||||
{photoPreviewUrl ? (
|
||||
|
|
@ -242,20 +196,12 @@ export default function SendNotificationForm() {
|
|||
<Text size="sm" fw={500} lineClamp={1}>{photoFileName}</Text>
|
||||
<Text size="xs" c="dimmed">Готово к отправке</Text>
|
||||
</Stack>
|
||||
<ActionIcon
|
||||
color="red"
|
||||
variant="light"
|
||||
onClick={() => handlePhotoChange(null)}
|
||||
>
|
||||
<IconX size={16} />
|
||||
</ActionIcon>
|
||||
<ActionIcon color="red" variant="light" onClick={() => handlePhotoChange(null)}><IconX size={16} /></ActionIcon>
|
||||
</Group>
|
||||
) : (
|
||||
<FileButton onChange={handlePhotoChange} accept="image/png,image/jpeg,image/webp">
|
||||
{(props) => (
|
||||
<Button {...props} variant="light" leftSection={<IconPhoto size={16} />}>
|
||||
Прикрепить фото
|
||||
</Button>
|
||||
<Button {...props} variant="light" leftSection={<IconPhoto size={16} />}>Прикрепить фото</Button>
|
||||
)}
|
||||
</FileButton>
|
||||
)}
|
||||
|
|
@ -263,181 +209,108 @@ export default function SendNotificationForm() {
|
|||
</Stack>
|
||||
</Grid.Col>
|
||||
|
||||
{/* ===== ПРАВАЯ КОЛОНКА: ПОЛУЧАТЕЛИ + ПРЕВЬЮ ===== */}
|
||||
<Grid.Col span={{ base: 12, lg: 5 }}>
|
||||
<Stack gap="lg">
|
||||
{/* Получатели */}
|
||||
<Paper withBorder p="md" radius="md">
|
||||
<Stack gap="lg" h="100%">
|
||||
<Paper withBorder p="md" radius="md" style={{ flex: 1 }}>
|
||||
<Group justify="space-between" mb="md">
|
||||
<Group gap="xs">
|
||||
<ThemeIcon size="sm" variant="light" color="violet">
|
||||
<IconUsers size={14} />
|
||||
</ThemeIcon>
|
||||
<ThemeIcon size="sm" variant="light" color="violet"><IconUsers size={14} /></ThemeIcon>
|
||||
<Text size="sm" fw={600}>Получатели</Text>
|
||||
</Group>
|
||||
{hasAnyTarget && (
|
||||
<Badge size="xs" variant="light" color="violet">
|
||||
Настроено
|
||||
</Badge>
|
||||
)}
|
||||
{hasAnyTarget && <Badge size="xs" variant="light" color="violet">Настроено</Badge>}
|
||||
</Group>
|
||||
|
||||
<Stack gap="md">
|
||||
<MultiSelect
|
||||
label={
|
||||
<Group gap={4}>
|
||||
<IconUser size={14} />
|
||||
<Text size="sm" span>Конкретные пользователи</Text>
|
||||
{selectedUserIds.length > 0 && (
|
||||
<Badge size="xs" variant="filled" circle>{selectedUserIds.length}</Badge>
|
||||
)}
|
||||
</Group>
|
||||
}
|
||||
placeholder="Начните вводить имя..."
|
||||
data={userOptions}
|
||||
value={selectedUserIds}
|
||||
onChange={setSelectedUserIds}
|
||||
searchable
|
||||
searchValue={userSearch}
|
||||
onSearchChange={setUserSearch}
|
||||
clearable
|
||||
nothingFoundMessage="Никого не найдено"
|
||||
size="xs"
|
||||
/>
|
||||
<Tabs defaultValue="users">
|
||||
<Tabs.List mb="md">
|
||||
<Tabs.Tab value="users" leftSection={<IconUser size={14} />}>Точечно</Tabs.Tab>
|
||||
<Tabs.Tab value="mass" leftSection={<IconBuilding size={14} />}>Массово</Tabs.Tab>
|
||||
</Tabs.List>
|
||||
|
||||
<MultiSelect
|
||||
label={
|
||||
<Group gap={4}>
|
||||
<IconMask size={14} />
|
||||
<Text size="sm" span>Роли</Text>
|
||||
{selectedRoleIds.length > 0 && (
|
||||
<Badge size="xs" variant="filled" circle>{selectedRoleIds.length}</Badge>
|
||||
)}
|
||||
</Group>
|
||||
}
|
||||
placeholder="Выберите роли"
|
||||
data={roleOptions}
|
||||
value={selectedRoleIds}
|
||||
onChange={setSelectedRoleIds}
|
||||
searchable
|
||||
clearable
|
||||
size="xs"
|
||||
/>
|
||||
<Tabs.Panel value="users">
|
||||
<MultiSelect
|
||||
label="Конкретные пользователи"
|
||||
placeholder="Начните вводить имя..."
|
||||
data={userOptions}
|
||||
value={selectedUserIds}
|
||||
onChange={setSelectedUserIds}
|
||||
searchable
|
||||
searchValue={userSearch}
|
||||
onSearchChange={setUserSearch}
|
||||
clearable
|
||||
/>
|
||||
</Tabs.Panel>
|
||||
|
||||
<Stack gap={6}>
|
||||
<Group gap={4}>
|
||||
<IconTag size={14} />
|
||||
<Text size="sm" span>Тип роли</Text>
|
||||
{selectedRoleFlags.length > 0 && (
|
||||
<Badge size="xs" variant="filled" circle>{selectedRoleFlags.length}</Badge>
|
||||
)}
|
||||
</Group>
|
||||
<Checkbox.Group value={selectedRoleFlags} onChange={setSelectedRoleFlags}>
|
||||
<Tabs.Panel value="mass">
|
||||
<Stack gap="md">
|
||||
<MultiSelect
|
||||
label="Отделы"
|
||||
placeholder="Выберите отделы"
|
||||
data={departmentOptions}
|
||||
value={selectedDepartmentIds}
|
||||
onChange={setSelectedDepartmentIds}
|
||||
searchable clearable
|
||||
/>
|
||||
<MultiSelect
|
||||
label="Роли"
|
||||
placeholder="Выберите роли"
|
||||
data={roleOptions}
|
||||
value={selectedRoleIds}
|
||||
onChange={setSelectedRoleIds}
|
||||
searchable clearable
|
||||
/>
|
||||
<Stack gap={6}>
|
||||
{ROLE_TYPE_OPTIONS.map((opt) => (
|
||||
<Checkbox
|
||||
key={opt.value}
|
||||
value={opt.value}
|
||||
label={
|
||||
<Group gap={6}>
|
||||
<Text size="sm">{opt.icon}</Text>
|
||||
<Text size="sm">{opt.label}</Text>
|
||||
</Group>
|
||||
}
|
||||
/>
|
||||
))}
|
||||
<Text size="sm" fw={500}>Системные типы ролей</Text>
|
||||
<Checkbox.Group value={selectedRoleFlags} onChange={setSelectedRoleFlags}>
|
||||
<Stack gap={6}>
|
||||
{ROLE_TYPE_OPTIONS.map((opt) => (
|
||||
<Checkbox
|
||||
key={opt.value}
|
||||
value={opt.value}
|
||||
label={<Group gap={6}><Text size="sm">{opt.icon}</Text><Text size="sm">{opt.label}</Text></Group>}
|
||||
/>
|
||||
))}
|
||||
</Stack>
|
||||
</Checkbox.Group>
|
||||
</Stack>
|
||||
</Checkbox.Group>
|
||||
</Stack>
|
||||
|
||||
<MultiSelect
|
||||
label={
|
||||
<Group gap={4}>
|
||||
<IconBuilding size={14} />
|
||||
<Text size="sm" span>Отделы</Text>
|
||||
{selectedDepartmentIds.length > 0 && (
|
||||
<Badge size="xs" variant="filled" circle>{selectedDepartmentIds.length}</Badge>
|
||||
)}
|
||||
</Group>
|
||||
}
|
||||
placeholder="Выберите отделы"
|
||||
data={departmentOptions}
|
||||
value={selectedDepartmentIds}
|
||||
onChange={setSelectedDepartmentIds}
|
||||
searchable
|
||||
clearable
|
||||
size="xs"
|
||||
/>
|
||||
|
||||
{!hasAnyTarget && (
|
||||
<Alert color="blue" variant="light" icon={<IconAlertCircle size={16} />} p="xs">
|
||||
<Text size="xs">Выберите хотя бы один способ определения получателей</Text>
|
||||
</Alert>
|
||||
)}
|
||||
</Stack>
|
||||
</Stack>
|
||||
</Tabs.Panel>
|
||||
</Tabs>
|
||||
</Paper>
|
||||
|
||||
{/* Кнопка отправки */}
|
||||
<Button
|
||||
fullWidth
|
||||
size="md"
|
||||
leftSection={<IconSend size={18} />}
|
||||
onClick={() => setConfirmOpen(true)}
|
||||
loading={createNotification.isPending}
|
||||
disabled={!canSubmit}
|
||||
>
|
||||
Отправить уведомление
|
||||
</Button>
|
||||
<Stack gap="sm">
|
||||
{!hasAnyTarget && (
|
||||
<Alert color="blue" variant="light" icon={<IconAlertCircle size={16} />} p="xs">
|
||||
<Text size="xs">Выберите хотя бы один способ определения получателей для отправки</Text>
|
||||
</Alert>
|
||||
)}
|
||||
<Button
|
||||
fullWidth size="md"
|
||||
leftSection={<IconSend size={18} />}
|
||||
onClick={() => setConfirmOpen(true)}
|
||||
loading={createNotification.isPending}
|
||||
disabled={!canSubmit}
|
||||
>
|
||||
Отправить уведомление
|
||||
</Button>
|
||||
</Stack>
|
||||
</Stack>
|
||||
</Grid.Col>
|
||||
</Grid>
|
||||
|
||||
{/* ===== МОДАЛКА ПОДТВЕРЖДЕНИЯ ===== */}
|
||||
<Modal
|
||||
opened={confirmOpen}
|
||||
onClose={() => setConfirmOpen(false)}
|
||||
title="Подтверждение отправки"
|
||||
centered
|
||||
>
|
||||
<Modal opened={confirmOpen} onClose={() => setConfirmOpen(false)} title="Подтверждение отправки" centered>
|
||||
<Stack gap="md">
|
||||
<Text size="sm">
|
||||
Отправить уведомление <b>«{title.trim()}»</b>?
|
||||
</Text>
|
||||
<Text size="sm">Отправить уведомление <b>«{title.trim()}»</b>?</Text>
|
||||
<Paper withBorder p="sm" radius="sm">
|
||||
<Stack gap={4}>
|
||||
{selectedUserIds.length > 0 && (
|
||||
<Group justify="space-between">
|
||||
<Text size="xs" c="dimmed">Пользователей</Text>
|
||||
<Text size="sm" fw={500}>{selectedUserIds.length}</Text>
|
||||
</Group>
|
||||
)}
|
||||
{selectedRoleIds.length > 0 && (
|
||||
<Group justify="space-between">
|
||||
<Text size="xs" c="dimmed">Ролей</Text>
|
||||
<Text size="sm" fw={500}>{selectedRoleIds.length}</Text>
|
||||
</Group>
|
||||
)}
|
||||
{selectedRoleFlags.length > 0 && (
|
||||
<Group justify="space-between">
|
||||
<Text size="xs" c="dimmed">Типов ролей</Text>
|
||||
<Text size="sm" fw={500}>{selectedRoleFlags.length}</Text>
|
||||
</Group>
|
||||
)}
|
||||
{selectedDepartmentIds.length > 0 && (
|
||||
<Group justify="space-between">
|
||||
<Text size="xs" c="dimmed">Отделов</Text>
|
||||
<Text size="sm" fw={500}>{selectedDepartmentIds.length}</Text>
|
||||
</Group>
|
||||
)}
|
||||
{selectedUserIds.length > 0 && <Group justify="space-between"><Text size="xs" c="dimmed">Пользователей</Text><Text size="sm" fw={500}>{selectedUserIds.length}</Text></Group>}
|
||||
{selectedRoleIds.length > 0 && <Group justify="space-between"><Text size="xs" c="dimmed">Ролей</Text><Text size="sm" fw={500}>{selectedRoleIds.length}</Text></Group>}
|
||||
{selectedRoleFlags.length > 0 && <Group justify="space-between"><Text size="xs" c="dimmed">Типов ролей</Text><Text size="sm" fw={500}>{selectedRoleFlags.length}</Text></Group>}
|
||||
{selectedDepartmentIds.length > 0 && <Group justify="space-between"><Text size="xs" c="dimmed">Отделов</Text><Text size="sm" fw={500}>{selectedDepartmentIds.length}</Text></Group>}
|
||||
</Stack>
|
||||
</Paper>
|
||||
<Group justify="flex-end" gap="sm" mt="xs">
|
||||
<Button variant="default" onClick={() => setConfirmOpen(false)}>
|
||||
Отмена
|
||||
</Button>
|
||||
<Button color="blue" onClick={doSubmit} loading={createNotification.isPending}>
|
||||
Отправить
|
||||
</Button>
|
||||
<Button variant="default" onClick={() => setConfirmOpen(false)}>Отмена</Button>
|
||||
<Button color="blue" onClick={doSubmit} loading={createNotification.isPending}>Отправить</Button>
|
||||
</Group>
|
||||
</Stack>
|
||||
</Modal>
|
||||
|
|
|
|||
Loading…
Reference in New Issue