Updated notification page design
Deploy Frontend / build-and-deploy (push) Failing after 23s Details

This commit is contained in:
romanskijdev 2026-07-12 19:43:58 +03:00
parent b181d9a4be
commit 6e480142b7
1 changed files with 372 additions and 218 deletions

View File

@ -1,9 +1,13 @@
import { useState, useMemo } from 'react'
import {
Paper, Stack, TextInput, Button, Group, MultiSelect, Checkbox,
Text, FileButton, Image, ActionIcon, Divider, Alert, Badge,
Text, FileButton, Image, ActionIcon, Divider, Alert, Badge, Grid,
ThemeIcon,
} from '@mantine/core'
import { IconPhoto, IconX, IconSend, IconAlertCircle, IconMessage, IconUsers } from '@tabler/icons-react'
import {
IconPhoto, IconX, IconSend, IconAlertCircle, IconUsers,
IconUser, IconMask, IconBuilding, IconTag, IconEye, IconMessage,
} from '@tabler/icons-react'
import { RichTextEditor, Link } from '@mantine/tiptap'
import { useEditor } from '@tiptap/react'
import StarterKit from '@tiptap/starter-kit'
@ -15,15 +19,15 @@ 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 { modals } from '@mantine/modals'
import { Modal } from '@mantine/core'
import '@mantine/tiptap/styles.css'
const ROLE_TYPE_OPTIONS = [
{ value: 'director', label: 'Директора' },
{ value: 'approver', label: 'Согласующие' },
{ value: 'observer', label: 'Наблюдатели' },
{ value: 'executor', label: 'Исполнители' },
{ value: 'controller', label: 'Контролёры' },
{ value: 'director', label: 'Директора', icon: '👔' },
{ value: 'approver', label: 'Согласующие', icon: '✅' },
{ value: 'observer', label: 'Наблюдатели', icon: '👀' },
{ value: 'executor', label: 'Исполнители', icon: '⚙️' },
{ value: 'controller', label: 'Контролёры', icon: '🎯' },
]
export default function SendNotificationForm() {
@ -40,6 +44,8 @@ export default function SendNotificationForm() {
const [photoFileName, setPhotoFileName] = useState<string | null>(null)
const [photoPreviewUrl, setPhotoPreviewUrl] = useState<string | null>(null)
const [confirmOpen, setConfirmOpen] = useState(false)
const { data: usersData } = useUsers({
limit: 50,
...(debouncedUserSearch && { full_name: debouncedUserSearch }),
@ -62,12 +68,10 @@ 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],
@ -82,7 +86,6 @@ export default function SendNotificationForm() {
setPhotoPreviewUrl(null)
return
}
const reader = new FileReader()
reader.onload = () => {
const result = reader.result as string
@ -90,16 +93,14 @@ export default function SendNotificationForm() {
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}). Соотношение сторон не должно превышать 20:1.`,
message: `Telegram не примет это фото: слишком вытянутые пропорции (${img.width}×${img.height}).`,
color: 'red',
})
return
}
setPhotoBase64(result.split(',')[1] || '')
setPhotoFileName(file.name)
setPhotoPreviewUrl(result)
@ -116,224 +117,377 @@ export default function SendNotificationForm() {
selectedDepartmentIds.length > 0
const messageHtml = editor?.getHTML() ?? ''
const messageText = editor?.getText() ?? ''
const isMessageEmpty = editor?.isEmpty ?? true
const canSubmit = title.trim().length > 0 && !isMessageEmpty && hasAnyTarget
const totalRecipients =
selectedUserIds.length +
selectedRoleIds.length +
selectedRoleFlags.length +
selectedDepartmentIds.length
const totalCriteria =
(selectedUserIds.length > 0 ? 1 : 0) +
(selectedRoleIds.length > 0 ? 1 : 0) +
(selectedRoleFlags.length > 0 ? 1 : 0) +
(selectedDepartmentIds.length > 0 ? 1 : 0)
const handleSubmit = () => {
if (!canSubmit) return
modals.openConfirmModal({
title: 'Подтверждение отправки',
children: (
<Text size="sm">
Вы уверены, что хотите отправить уведомление <b>«{title.trim()}»</b>?
{totalRecipients > 0 && (
<> Получателей по выбранным критериям: ~<b>{totalRecipients}</b> групп.</>
)}
</Text>
),
labels: { confirm: 'Отправить', cancel: 'Отмена' },
confirmProps: { color: 'blue' },
onConfirm: () => {
createNotification.mutate(
{
title: title.trim(),
message_html: convertHtmlToTelegram(messageHtml),
photo_base64: photoBase64 || undefined,
photo_file_name: photoFileName || undefined,
targets: {
user_ids: selectedUserIds.map(Number),
role_ids: selectedRoleIds.map(Number),
role_type_flags: selectedRoleFlags,
department_ids: selectedDepartmentIds.map(Number),
},
},
{
onSuccess: () => {
setTitle('')
editor?.commands.clearContent()
setSelectedUserIds([])
setSelectedRoleIds([])
setSelectedRoleFlags([])
setSelectedDepartmentIds([])
handlePhotoChange(null)
notifications.show({
title: 'Успешно',
message: 'Уведомление отправлено',
color: 'green',
})
},
},
)
const doSubmit = () => {
setConfirmOpen(false)
createNotification.mutate(
{
title: title.trim(),
message_html: convertHtmlToTelegram(messageHtml),
photo_base64: photoBase64 || undefined,
photo_file_name: photoFileName || undefined,
targets: {
user_ids: selectedUserIds.map(Number),
role_ids: selectedRoleIds.map(Number),
role_type_flags: selectedRoleFlags,
department_ids: selectedDepartmentIds.map(Number),
},
},
})
{
onSuccess: () => {
setTitle('')
editor?.commands.clearContent()
setSelectedUserIds([])
setSelectedRoleIds([])
setSelectedRoleFlags([])
setSelectedDepartmentIds([])
handlePhotoChange(null)
notifications.show({
title: 'Успешно',
message: 'Уведомление отправлено',
color: 'green',
})
},
},
)
}
return (
<Paper withBorder p="md" radius="md">
<Stack gap="lg">
{/* Заголовок формы */}
<Group justify="space-between" align="center">
<Text size="xl" fw={700}>Новая рассылка</Text>
{totalRecipients > 0 && (
<Badge size="lg" variant="light" color="blue">
{totalRecipients} критериев выбрано
</Badge>
)}
<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">
<IconMessage size={20} />
</ThemeIcon>
<div>
<Text size="xl" fw={700}>Новая рассылка</Text>
<Text size="xs" c="dimmed">Отправится через Telegram Bot</Text>
</div>
</Group>
<TextInput
label="Заголовок рассылки"
description="Только для админки, в Telegram не отправляется"
placeholder="Плановые работы 15 июля"
value={title}
onChange={(e) => setTitle(e.currentTarget.value)}
required
/>
{/* Редактор сообщения */}
<Stack gap={4}>
<Group justify="space-between" align="center">
<Text size="sm" fw={500}>Текст сообщения</Text>
{!isMessageEmpty && (
<Badge size="xs" variant="light" color="green">
Заполнено
</Badge>
)}
</Group>
<RichTextEditor editor={editor} style={{ minHeight: 220 }}>
<RichTextEditor.Toolbar sticky stickyOffset={0}>
<RichTextEditor.ControlsGroup>
<RichTextEditor.Bold />
<RichTextEditor.Italic />
<RichTextEditor.Underline />
<RichTextEditor.Strikethrough />
<RichTextEditor.ClearFormatting />
</RichTextEditor.ControlsGroup>
<RichTextEditor.ControlsGroup>
<RichTextEditor.Code />
<RichTextEditor.CodeBlock />
</RichTextEditor.ControlsGroup>
<RichTextEditor.ControlsGroup>
<RichTextEditor.Link />
<RichTextEditor.Unlink />
</RichTextEditor.ControlsGroup>
</RichTextEditor.Toolbar>
<RichTextEditor.Content style={{ minHeight: 160 }} />
</RichTextEditor>
<Text size="xs" c="dimmed">
Поддерживаются: <b>жирный</b>, <i>курсив</i>, <u>подчёркнутый</u>, <s>зачёркнутый</s>, <code>код</code>, ссылки — остальное Telegram не отображает
</Text>
</Stack>
{/* Фото */}
<Stack gap={4}>
<Text size="sm" fw={500}>Фото (опционально)</Text>
{photoPreviewUrl ? (
<Group gap="xs">
<Paper withBorder p={4} radius="sm">
<Image src={photoPreviewUrl} h={80} w={80} radius="sm" fit="cover" />
</Paper>
<Stack gap={2}>
<Text size="xs" lineClamp={1}>{photoFileName}</Text>
<ActionIcon
color="red"
variant="light"
size="sm"
onClick={() => handlePhotoChange(null)}
>
<IconX size={14} />
</ActionIcon>
</Stack>
</Group>
) : (
<FileButton onChange={handlePhotoChange} accept="image/png,image/jpeg,image/webp">
{(props) => (
<Button {...props} variant="light" leftSection={<IconPhoto size={16} />}>
Прикрепить фото
</Button>
)}
</FileButton>
)}
</Stack>
<Divider label="Получатели" labelPosition="left" />
<MultiSelect
label="Конкретные пользователи"
placeholder="Начните вводить имя..."
data={userOptions}
value={selectedUserIds}
onChange={setSelectedUserIds}
searchable
searchValue={userSearch}
onSearchChange={setUserSearch}
clearable
nothingFoundMessage="Никого не найдено"
/>
<MultiSelect
label="Роли"
placeholder="Выберите роли"
data={roleOptions}
value={selectedRoleIds}
onChange={setSelectedRoleIds}
searchable
clearable
/>
<Stack gap={4}>
<Text size="sm" fw={500}>Тип роли</Text>
<Checkbox.Group value={selectedRoleFlags} onChange={setSelectedRoleFlags}>
<Group gap="md" mt={4}>
{ROLE_TYPE_OPTIONS.map((opt) => (
<Checkbox key={opt.value} value={opt.value} label={opt.label} />
))}
</Group>
</Checkbox.Group>
</Stack>
<MultiSelect
label="Отделы"
placeholder="Выберите отделы"
data={departmentOptions}
value={selectedDepartmentIds}
onChange={setSelectedDepartmentIds}
searchable
clearable
/>
{!hasAnyTarget && (
<Alert color="blue" variant="light" icon={<IconAlertCircle size={16} />}>
Выберите хотя бы один способ определения получателей
</Alert>
{totalCriteria > 0 && (
<Badge size="lg" variant="light" color="blue" radius="sm">
{totalCriteria} {totalCriteria === 1 ? 'критерий' : 'критериев'}
</Badge>
)}
</Group>
<Divider />
<Grid gutter="xl">
<Grid.Col span={{ base: 12, lg: 7 }}>
<Stack gap="lg">
<TextInput
label="Заголовок рассылки"
description="Только для админки, в Telegram не отправляется"
placeholder="Плановые работы 15 июля"
value={title}
onChange={(e) => setTitle(e.currentTarget.value)}
required
size="md"
/>
<Group justify="space-between" align="center">
<Text size="xs" c="dimmed">
Сообщение будет отправлено через Telegram Bot
{/* Редактор */}
<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>
)}
</Group>
<RichTextEditor editor={editor} style={{ minHeight: 320 }}>
<RichTextEditor.Toolbar sticky stickyOffset={0}>
<RichTextEditor.ControlsGroup>
<RichTextEditor.Bold />
<RichTextEditor.Italic />
<RichTextEditor.Underline />
<RichTextEditor.Strikethrough />
</RichTextEditor.ControlsGroup>
<RichTextEditor.ControlsGroup>
<RichTextEditor.Code />
<RichTextEditor.CodeBlock />
<RichTextEditor.ClearFormatting />
</RichTextEditor.ControlsGroup>
<RichTextEditor.ControlsGroup>
<RichTextEditor.Link />
<RichTextEditor.Unlink />
</RichTextEditor.ControlsGroup>
</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 ? (
<Group gap="sm">
<Paper withBorder p={4} radius="sm">
<Image src={photoPreviewUrl} h={90} w={90} radius="sm" fit="cover" />
</Paper>
<Stack gap={2} style={{ flex: 1 }}>
<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>
</Group>
) : (
<FileButton onChange={handlePhotoChange} accept="image/png,image/jpeg,image/webp">
{(props) => (
<Button {...props} variant="light" leftSection={<IconPhoto size={16} />}>
Прикрепить фото
</Button>
)}
</FileButton>
)}
</Stack>
</Stack>
</Grid.Col>
{/* ===== ПРАВАЯ КОЛОНКА: ПОЛУЧАТЕЛИ + ПРЕВЬЮ ===== */}
<Grid.Col span={{ base: 12, lg: 5 }}>
<Stack gap="lg">
{/* Получатели */}
<Paper withBorder p="md" radius="md">
<Group justify="space-between" mb="md">
<Group gap="xs">
<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>
)}
</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"
/>
<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"
/>
<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}>
<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>
<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>
</Paper>
{/* ===== ПРЕВЬЮ TELEGRAM ===== */}
<Paper withBorder p="md" radius="md" style={{
background: 'linear-gradient(135deg, var(--mantine-color-gray-0), var(--mantine-color-gray-1))',
}}>
<Group gap="xs" mb="sm">
<IconEye size={16} color="var(--mantine-color-gray-6)" />
<Text size="sm" fw={600} c="dimmed">Как увидят в Telegram</Text>
</Group>
{/* Имитация Telegram bubble */}
<Paper
p="sm"
radius="md"
style={{
backgroundColor: 'var(--mantine-color-white)',
boxShadow: '0 1px 3px rgba(0,0,0,0.08)',
borderLeft: '3px solid var(--mantine-color-blue-5)',
}}
>
{title.trim() && (
<Text fw={700} size="sm" mb={4} lineClamp={2}>
{title.trim()}
</Text>
)}
{photoPreviewUrl && (
<Image
src={photoPreviewUrl}
h={120}
radius="sm"
fit="cover"
mb={6}
/>
)}
<Text
size="sm"
lineClamp={6}
c={isMessageEmpty ? 'dimmed' : undefined}
style={{ whiteSpace: 'pre-wrap' }}
>
{isMessageEmpty ? 'Текст сообщения появится здесь...' : messageText}
</Text>
<Text size="xs" c="dimmed" ta="right" mt={4}>
{new Date().toLocaleTimeString('ru-RU', { hour: '2-digit', minute: '2-digit' })} ✓✓
</Text>
</Paper>
</Paper>
{/* Кнопка отправки */}
<Button
fullWidth
size="md"
leftSection={<IconSend size={18} />}
onClick={() => setConfirmOpen(true)}
loading={createNotification.isPending}
disabled={!canSubmit}
>
Отправить уведомление
</Button>
</Stack>
</Grid.Col>
</Grid>
{/* ===== МОДАЛКА ПОДТВЕРЖДЕНИЯ ===== */}
<Modal
opened={confirmOpen}
onClose={() => setConfirmOpen(false)}
title="Подтверждение отправки"
centered
>
<Stack gap="md">
<Text size="sm">
Отправить уведомление <b>«{title.trim()}»</b>?
</Text>
<Button
leftSection={<IconSend size={16} />}
onClick={handleSubmit}
loading={createNotification.isPending}
disabled={!canSubmit}
>
Отправить уведомление
</Button>
</Group>
</Stack>
<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>
)}
</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>
</Group>
</Stack>
</Modal>
</Paper>
)
}