Updated approvals page ui
Deploy Frontend / build-and-deploy (push) Failing after 29s
Details
Deploy Frontend / build-and-deploy (push) Failing after 29s
Details
This commit is contained in:
parent
208d0c8753
commit
a05a78f27e
|
|
@ -0,0 +1,25 @@
|
|||
import { Children, type ReactNode } from 'react'
|
||||
import { Box, Divider, Group, Text } from '@mantine/core'
|
||||
|
||||
export function InfoList({ children }: { children: ReactNode }) {
|
||||
const items = Children.toArray(children).filter(Boolean)
|
||||
return (
|
||||
<Box>
|
||||
{items.map((item, i) => (
|
||||
<Box key={i}>
|
||||
{i > 0 && <Divider />}
|
||||
{item}
|
||||
</Box>
|
||||
))}
|
||||
</Box>
|
||||
)
|
||||
}
|
||||
|
||||
export function InfoRow({ label, children }: { label: string; children: ReactNode }) {
|
||||
return (
|
||||
<Group justify="space-between" align="flex-start" wrap="nowrap" py={8} gap="md">
|
||||
<Text size="sm" c="dimmed" style={{ flexShrink: 0 }}>{label}</Text>
|
||||
<Group gap={4} wrap="nowrap" justify="flex-end" style={{ minWidth: 0 }}>{children}</Group>
|
||||
</Group>
|
||||
)
|
||||
}
|
||||
|
|
@ -1,12 +1,25 @@
|
|||
import { Badge } from '@mantine/core'
|
||||
import { APPROVAL_STATUS, TASK_STATUS, USER_STATUS } from './statuses'
|
||||
import { Badge, type BadgeProps } from '@mantine/core'
|
||||
import { APPROVAL_STATUS, DECISION_STATUS, REVOCATION_STATUS, STEP_STATUS, TASK_STATUS, USER_STATUS } from './statuses'
|
||||
|
||||
const MAPS = { approval: APPROVAL_STATUS, task: TASK_STATUS, user: USER_STATUS }
|
||||
const MAPS = {
|
||||
approval: APPROVAL_STATUS,
|
||||
task: TASK_STATUS,
|
||||
user: USER_STATUS,
|
||||
step: STEP_STATUS,
|
||||
decision: DECISION_STATUS,
|
||||
revocation: REVOCATION_STATUS,
|
||||
}
|
||||
|
||||
export function StatusBadge({ kind, status }: { kind: keyof typeof MAPS; status: string }) {
|
||||
interface Props {
|
||||
kind: keyof typeof MAPS
|
||||
status: string
|
||||
size?: BadgeProps['size']
|
||||
}
|
||||
|
||||
export function StatusBadge({ kind, status, size = 'md' }: Props) {
|
||||
const meta = MAPS[kind][status]
|
||||
return (
|
||||
<Badge variant="dot" color={meta?.color ?? 'gray'} size="md">
|
||||
<Badge variant="dot" color={meta?.color ?? 'gray'} size={size}>
|
||||
{meta?.label ?? status}
|
||||
</Badge>
|
||||
)
|
||||
|
|
|
|||
|
|
@ -20,6 +20,39 @@ export const TASK_STATUS: Record<string, StatusMeta> = {
|
|||
cancelled: { label: 'Отменена', plural: 'Отменены', color: 'red' },
|
||||
}
|
||||
|
||||
export const USER_STATUS: Record<string, StatusMeta> = {
|
||||
active: { label: 'Активен', plural: 'Активные', color: 'green' },
|
||||
blocked: { label: 'Заблокирован', plural: 'Заблокированные', color: 'red' },
|
||||
fired: { label: 'Уволен', plural: 'Уволенные', color: 'gray' },
|
||||
}
|
||||
|
||||
export const STEP_STATUS: Record<string, StatusMeta> = {
|
||||
pending: { label: 'Ожидает', plural: 'Ожидают', color: 'blue' },
|
||||
waiting: { label: 'В очереди', plural: 'В очереди', color: 'gray' },
|
||||
approved: { label: 'Согласовал', plural: 'Согласовали', color: 'green' },
|
||||
rejected: { label: 'Отклонил', plural: 'Отклонили', color: 'red' },
|
||||
cancelled_any_of: { label: 'Закрыт другим согласующим', plural: 'Закрыты', color: 'gray' },
|
||||
}
|
||||
|
||||
export const DECISION_STATUS: Record<string, StatusMeta> = {
|
||||
pending: { label: 'Ожидает', plural: 'Ожидают', color: 'blue' },
|
||||
approved: { label: 'Согласовал', plural: 'Согласовали', color: 'green' },
|
||||
rejected: { label: 'Отклонил', plural: 'Отклонили', color: 'red' },
|
||||
}
|
||||
|
||||
export const REVOCATION_STATUS: Record<string, StatusMeta> = {
|
||||
pending: { label: 'Ожидает ответа', plural: 'Ожидают', color: 'blue' },
|
||||
approved: { label: 'Одобрил отзыв', plural: 'Одобрили', color: 'green' },
|
||||
rejected: { label: 'Против отзыва', plural: 'Против', color: 'red' },
|
||||
}
|
||||
|
||||
export const TASK_STATUS: Record<string, StatusMeta> = {
|
||||
pending: { label: 'В работе', plural: 'В работе', color: 'blue' },
|
||||
waiting: { label: 'В очереди', plural: 'В очереди', color: 'gray' },
|
||||
completed: { label: 'Выполнена', plural: 'Выполнены', color: 'green' },
|
||||
cancelled: { label: 'Отменена', plural: 'Отменены', color: 'red' },
|
||||
}
|
||||
|
||||
export const USER_STATUS: Record<string, StatusMeta> = {
|
||||
active: { label: 'Активен', plural: 'Активные', color: 'green' },
|
||||
blocked: { label: 'Заблокирован', plural: 'Заблокированные', color: 'red' },
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ export default function Login() {
|
|||
Р
|
||||
</Box>
|
||||
<Title order={3}>Вход в систему</Title>
|
||||
<Text size="sm" c="dimmed">Портал РусПЭТ · панель администратора</Text>
|
||||
<Text size="sm" c="dimmed">Портал РусПЭТ</Text>
|
||||
</Stack>
|
||||
|
||||
<Paper p="xl">
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,523 @@
|
|||
import { useEffect, useMemo, useState } from 'react'
|
||||
import {
|
||||
ActionIcon,
|
||||
Alert,
|
||||
Avatar,
|
||||
Box,
|
||||
Code,
|
||||
Divider,
|
||||
Drawer,
|
||||
Group,
|
||||
Skeleton,
|
||||
Spoiler,
|
||||
Stack,
|
||||
Tabs,
|
||||
Text,
|
||||
ThemeIcon,
|
||||
Timeline,
|
||||
Tooltip,
|
||||
} from '@mantine/core'
|
||||
import { notifications } from '@mantine/notifications'
|
||||
import {
|
||||
IconAlertCircle,
|
||||
IconAlertTriangle,
|
||||
IconArrowBackUp,
|
||||
IconCheck,
|
||||
IconClock,
|
||||
IconDownload,
|
||||
IconEye,
|
||||
IconFileText,
|
||||
IconRotate,
|
||||
IconX,
|
||||
type Icon,
|
||||
} from '@tabler/icons-react'
|
||||
import {
|
||||
useAdditionalApprovers,
|
||||
useApproval,
|
||||
useApprovalComments,
|
||||
useApprovalObservers,
|
||||
useApprovalTasks,
|
||||
useRevocationRequest,
|
||||
} from '@/features/approvals/hooks/useApprovals'
|
||||
import { useCategories } from '@/features/categories/hooks/useCategories'
|
||||
import { StatusBadge } from '@/components/ui/StatusBadge'
|
||||
import { STEP_STATUS } from '@/components/ui/statuses'
|
||||
import { InfoList, InfoRow } from '@/components/ui/InfoRow'
|
||||
import {
|
||||
approvalFileUrl,
|
||||
formatFileSize,
|
||||
getMimeType,
|
||||
isPreviewable,
|
||||
saveFile,
|
||||
} from '@/lib/fileApi'
|
||||
import { formatMsk } from '@/utils/date'
|
||||
import FilePreviewModal from './FilePreviewModal'
|
||||
import classes from '@/components/UserDrawer.module.css'
|
||||
|
||||
interface Props {
|
||||
approvalId: number | null
|
||||
opened: boolean
|
||||
onClose: () => void
|
||||
}
|
||||
|
||||
const MODE_LABELS: Record<string, string> = {
|
||||
sequential: 'Последовательно',
|
||||
any_of: 'Любой из согласующих',
|
||||
}
|
||||
|
||||
const STEP_ICONS: Record<string, Icon> = {
|
||||
pending: IconClock,
|
||||
approved: IconCheck,
|
||||
rejected: IconX,
|
||||
waiting: IconClock,
|
||||
cancelled_any_of: IconAlertCircle,
|
||||
}
|
||||
|
||||
function Section({ title, count, children }: { title: string; count?: number; children: React.ReactNode }) {
|
||||
return (
|
||||
<Box>
|
||||
<Group gap={6} mb="xs">
|
||||
<Text size="sm" fw={600}>{title}</Text>
|
||||
{count !== undefined && <Text size="xs" c="dimmed">{count}</Text>}
|
||||
</Group>
|
||||
{children}
|
||||
</Box>
|
||||
)
|
||||
}
|
||||
|
||||
export default function ApprovalDetailsDrawer({ approvalId, opened, onClose }: Props) {
|
||||
const { data: approval, isLoading } = useApproval(approvalId)
|
||||
const { data: categories } = useCategories({ limit: 1000 })
|
||||
|
||||
// Хуки отдают ApiResponse<T> целиком — разворачиваем здесь
|
||||
const { data: additionalApproversResponse } = useAdditionalApprovers(approvalId)
|
||||
const { data: commentsResponse } = useApprovalComments(approvalId)
|
||||
const { data: observersResponse } = useApprovalObservers(approvalId)
|
||||
const { data: revocationRequestResponse } = useRevocationRequest(approvalId)
|
||||
const { data: tasksResponse } = useApprovalTasks(approvalId)
|
||||
|
||||
const additionalApprovers = additionalApproversResponse?.data ?? []
|
||||
const comments = commentsResponse?.data ?? []
|
||||
const observers = observersResponse?.data ?? []
|
||||
const revocationRequest = revocationRequestResponse?.data
|
||||
const tasksData = tasksResponse?.data
|
||||
|
||||
const [tab, setTab] = useState<string | null>('overview')
|
||||
const [preview, setPreview] = useState<{ id: number; name: string; type: string } | null>(null)
|
||||
|
||||
useEffect(() => {
|
||||
if (!opened) {
|
||||
setTab('overview')
|
||||
setPreview(null)
|
||||
}
|
||||
}, [opened])
|
||||
|
||||
const category =
|
||||
approval?.topic?.category_id && categories?.data
|
||||
? categories.data.find((c) => c.id === approval.topic?.category_id)
|
||||
: null
|
||||
|
||||
// Копия, чтобы не мутировать данные из кэша react-query
|
||||
const steps = useMemo(
|
||||
() => [...(approval?.steps ?? [])].sort((a, b) => (a.step_order || 0) - (b.step_order || 0)),
|
||||
[approval],
|
||||
)
|
||||
|
||||
const tasks = tasksData?.tasks ?? []
|
||||
const plannedTasks = tasksData?.topic_executors ?? []
|
||||
// План показываем, пока заявка не согласована и реальных задач ещё нет
|
||||
const showPlannedTasks = approval?.status === 'pending' && plannedTasks.length > 0 && tasks.length === 0
|
||||
|
||||
const prettyMetadata = useMemo(() => {
|
||||
if (!approval?.metadata) return null
|
||||
try {
|
||||
return JSON.stringify(JSON.parse(approval.metadata), null, 2)
|
||||
} catch {
|
||||
return approval.metadata
|
||||
}
|
||||
}, [approval?.metadata])
|
||||
|
||||
const handleDownload = async (fileId: number, fileName: string) => {
|
||||
if (!approvalId) return
|
||||
try {
|
||||
await saveFile(approvalFileUrl(approvalId, fileId, true), fileName)
|
||||
notifications.show({ title: 'Готово', message: 'Файл скачан', color: 'green' })
|
||||
} catch (error) {
|
||||
console.error('Download error:', error)
|
||||
notifications.show({ title: 'Ошибка', message: 'Не удалось скачать файл', color: 'red' })
|
||||
}
|
||||
}
|
||||
|
||||
const files = approval?.files ?? []
|
||||
const hasAlerts =
|
||||
!!tasksData?.has_task_error ||
|
||||
!!revocationRequest ||
|
||||
(approval?.status === 'revoked' && !!approval.revoked_by) ||
|
||||
approval?.status === 'revision'
|
||||
|
||||
return (
|
||||
<>
|
||||
<Drawer.Root opened={opened} onClose={onClose} position="right" size="min(720px, 100vw)">
|
||||
<Drawer.Overlay backgroundOpacity={0.25} />
|
||||
<Drawer.Content>
|
||||
<Drawer.Header>
|
||||
<Box style={{ minWidth: 0 }}>
|
||||
<Group gap="sm" wrap="nowrap">
|
||||
<Text fw={600}>Заявка #{approvalId}</Text>
|
||||
{approval && <StatusBadge kind="approval" status={approval.status || ''} />}
|
||||
</Group>
|
||||
{approval?.topic?.name && (
|
||||
<Text size="xs" c="dimmed" truncate>{approval.topic.name}</Text>
|
||||
)}
|
||||
</Box>
|
||||
<Drawer.CloseButton />
|
||||
</Drawer.Header>
|
||||
|
||||
<Drawer.Body className={classes.body}>
|
||||
{isLoading ? (
|
||||
<Stack className={classes.section} gap="md">
|
||||
<Skeleton h={64} />
|
||||
<Skeleton h={180} />
|
||||
<Skeleton h={120} />
|
||||
</Stack>
|
||||
) : !approval ? (
|
||||
<Text className={classes.section} size="sm" c="dimmed">Заявка не найдена</Text>
|
||||
) : (
|
||||
<>
|
||||
{hasAlerts && (
|
||||
<Stack className={classes.section} gap="sm" pb={0}>
|
||||
{tasksData?.has_task_error && (
|
||||
<Alert
|
||||
color="red"
|
||||
icon={<IconAlertTriangle size={16} />}
|
||||
title="Ошибка при создании задачи"
|
||||
>
|
||||
<Text size="sm">
|
||||
Для темы настроены исполнители и заявка согласована, но ни одной
|
||||
задачи не создано. Стоит проверить вручную.
|
||||
</Text>
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
{revocationRequest && (
|
||||
<Alert
|
||||
color="orange"
|
||||
icon={<IconRotate size={16} />}
|
||||
title="Идёт запрос на отзыв заявки"
|
||||
>
|
||||
<Stack gap={6}>
|
||||
<Text size="sm">
|
||||
Запросил: {revocationRequest.requested_by_name}
|
||||
{revocationRequest.reason && ` · ${revocationRequest.reason}`}
|
||||
</Text>
|
||||
{revocationRequest.approvers.map((a) => (
|
||||
<Group key={a.approver_id} justify="space-between" wrap="nowrap">
|
||||
<Text size="sm">{a.approver_name}</Text>
|
||||
<StatusBadge kind="revocation" status={a.status} size="sm" />
|
||||
</Group>
|
||||
))}
|
||||
</Stack>
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
{approval.status === 'revoked' && approval.revoked_by && (
|
||||
<Alert color="orange" icon={<IconAlertCircle size={16} />} title="Заявка отозвана">
|
||||
<Text size="sm">
|
||||
{approval.revoked_by.full_name}
|
||||
{approval.revoked_at && ` · ${formatMsk(approval.revoked_at)}`}
|
||||
</Text>
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
{approval.status === 'revision' && (
|
||||
<Alert color="violet" icon={<IconArrowBackUp size={16} />} title="Заявка на доработке">
|
||||
<Stack gap={4}>
|
||||
{approval.revision_comment && (
|
||||
<Text size="sm">{approval.revision_comment}</Text>
|
||||
)}
|
||||
{!!approval.revision_count && (
|
||||
<Text size="xs" c="dimmed">
|
||||
Количество доработок: {approval.revision_count}
|
||||
</Text>
|
||||
)}
|
||||
</Stack>
|
||||
</Alert>
|
||||
)}
|
||||
</Stack>
|
||||
)}
|
||||
|
||||
<Tabs value={tab} onChange={setTab} mt={hasAlerts ? 'sm' : 0}>
|
||||
<Tabs.List className={classes.tabsList}>
|
||||
<Tabs.Tab value="overview">Обзор</Tabs.Tab>
|
||||
<Tabs.Tab
|
||||
value="flow"
|
||||
rightSection={steps.length > 0 ? <Text span size="xs" c="dimmed">{steps.length}</Text> : null}
|
||||
>
|
||||
Согласование
|
||||
</Tabs.Tab>
|
||||
<Tabs.Tab
|
||||
value="tasks"
|
||||
rightSection={tasks.length > 0 ? <Text span size="xs" c="dimmed">{tasks.length}</Text> : null}
|
||||
>
|
||||
Задачи
|
||||
</Tabs.Tab>
|
||||
<Tabs.Tab
|
||||
value="comments"
|
||||
rightSection={comments.length > 0 ? <Text span size="xs" c="dimmed">{comments.length}</Text> : null}
|
||||
>
|
||||
Комментарии
|
||||
</Tabs.Tab>
|
||||
</Tabs.List>
|
||||
|
||||
{/* ——— Обзор ——— */}
|
||||
<Tabs.Panel value="overview" className={classes.section}>
|
||||
<Stack gap="xl">
|
||||
<InfoList>
|
||||
<InfoRow label="Категория">
|
||||
<Text size="sm">{category?.name || '—'}</Text>
|
||||
</InfoRow>
|
||||
<InfoRow label="Тема">
|
||||
<Text size="sm">{approval.topic?.name || '—'}</Text>
|
||||
</InfoRow>
|
||||
{approval.topic?.approval_mode && (
|
||||
<InfoRow label="Режим согласования">
|
||||
<Text size="sm">
|
||||
{MODE_LABELS[approval.topic.approval_mode] || approval.topic.approval_mode}
|
||||
</Text>
|
||||
</InfoRow>
|
||||
)}
|
||||
<InfoRow label="Инициатор">
|
||||
<Text size="sm">{approval.initiator?.full_name || '—'}</Text>
|
||||
</InfoRow>
|
||||
<InfoRow label="Отдел">
|
||||
<Text size="sm">{approval.department?.name || '—'}</Text>
|
||||
</InfoRow>
|
||||
<InfoRow label="Создана (МСК)">
|
||||
<Text size="sm">{formatMsk(approval.created_at)}</Text>
|
||||
</InfoRow>
|
||||
</InfoList>
|
||||
|
||||
{approval.content && (
|
||||
<Section title="Текст заявки">
|
||||
<Text size="sm" style={{ whiteSpace: 'pre-wrap' }}>{approval.content}</Text>
|
||||
</Section>
|
||||
)}
|
||||
|
||||
{files.length > 0 && (
|
||||
<Section title="Файлы" count={files.length}>
|
||||
<Stack gap={0}>
|
||||
{files.map((file, i) => {
|
||||
const name = file.file_name || 'Без имени'
|
||||
const mime = getMimeType(name)
|
||||
const kb = file.file_base64
|
||||
? Math.round((file.file_base64.length * 3) / 4 / 1024)
|
||||
: 0
|
||||
return (
|
||||
<Box key={file.id}>
|
||||
{i > 0 && <Divider />}
|
||||
<Group justify="space-between" wrap="nowrap" py={8}>
|
||||
<Group gap="sm" wrap="nowrap" style={{ minWidth: 0 }}>
|
||||
<ThemeIcon variant="light" color="gray" size={32} radius="md">
|
||||
<IconFileText size={16} stroke={1.6} />
|
||||
</ThemeIcon>
|
||||
<Box style={{ minWidth: 0 }}>
|
||||
<Text size="sm" fw={500} truncate>{name}</Text>
|
||||
{kb > 0 && <Text size="xs" c="dimmed">{formatFileSize(kb)}</Text>}
|
||||
</Box>
|
||||
</Group>
|
||||
<Group gap={4} wrap="nowrap">
|
||||
{isPreviewable(mime) && (
|
||||
<Tooltip label="Предпросмотр">
|
||||
<ActionIcon
|
||||
aria-label="Предпросмотр"
|
||||
onClick={() => setPreview({ id: file.id!, name, type: mime })}
|
||||
>
|
||||
<IconEye size={16} />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
)}
|
||||
<Tooltip label="Скачать">
|
||||
<ActionIcon
|
||||
aria-label="Скачать"
|
||||
onClick={() => handleDownload(file.id!, name)}
|
||||
>
|
||||
<IconDownload size={16} />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
</Group>
|
||||
</Group>
|
||||
</Box>
|
||||
)
|
||||
})}
|
||||
</Stack>
|
||||
</Section>
|
||||
)}
|
||||
|
||||
{prettyMetadata && (
|
||||
<Section title="Метаданные">
|
||||
<Spoiler maxHeight={96} showLabel="Показать полностью" hideLabel="Свернуть">
|
||||
<Code block>{prettyMetadata}</Code>
|
||||
</Spoiler>
|
||||
</Section>
|
||||
)}
|
||||
</Stack>
|
||||
</Tabs.Panel>
|
||||
|
||||
{/* ——— Согласование ——— */}
|
||||
<Tabs.Panel value="flow" className={classes.section}>
|
||||
<Stack gap="xl">
|
||||
{steps.length === 0 ? (
|
||||
<Text size="sm" c="dimmed">Шаги согласования не заданы</Text>
|
||||
) : (
|
||||
<Section title="Шаги">
|
||||
<Timeline active={steps.length} bulletSize={24} lineWidth={2}>
|
||||
{steps.map((step, index) => {
|
||||
const StepIcon = STEP_ICONS[step.status || ''] || IconClock
|
||||
const color = STEP_STATUS[step.status || '']?.color ?? 'gray'
|
||||
return (
|
||||
<Timeline.Item
|
||||
key={step.id}
|
||||
color={color}
|
||||
bullet={<StepIcon size={13} />}
|
||||
title={
|
||||
<Group gap="xs" wrap="nowrap">
|
||||
<Text size="sm" fw={500}>
|
||||
{step.approver_name_snapshot || 'Согласующий'}
|
||||
</Text>
|
||||
<StatusBadge kind="step" status={step.status || ''} size="sm" />
|
||||
</Group>
|
||||
}
|
||||
>
|
||||
<Text size="xs" c="dimmed">
|
||||
Шаг {index + 1}
|
||||
{step.approver?.full_name && ` · ${step.approver.full_name}`}
|
||||
{step.acted_at && ` · ${formatMsk(step.acted_at)}`}
|
||||
</Text>
|
||||
{step.comment && (
|
||||
<Text size="sm" mt={4}>{step.comment}</Text>
|
||||
)}
|
||||
</Timeline.Item>
|
||||
)
|
||||
})}
|
||||
</Timeline>
|
||||
</Section>
|
||||
)}
|
||||
|
||||
{additionalApprovers.length > 0 && (
|
||||
<Section title="Дополнительные согласующие" count={additionalApprovers.length}>
|
||||
<Stack gap={8}>
|
||||
{additionalApprovers.map((aa) => (
|
||||
<Group key={aa.id} justify="space-between" wrap="nowrap">
|
||||
<Box style={{ minWidth: 0 }}>
|
||||
<Text size="sm" truncate>{aa.approver_name}</Text>
|
||||
{aa.acted_at && (
|
||||
<Text size="xs" c="dimmed">{formatMsk(aa.acted_at)}</Text>
|
||||
)}
|
||||
</Box>
|
||||
<StatusBadge kind="decision" status={aa.status} size="sm" />
|
||||
</Group>
|
||||
))}
|
||||
</Stack>
|
||||
</Section>
|
||||
)}
|
||||
|
||||
{observers.length > 0 && (
|
||||
<Section title="Наблюдатели" count={observers.length}>
|
||||
<Group gap={6}>
|
||||
{observers.map((o) => (
|
||||
<Group key={o.id} gap={6} wrap="nowrap">
|
||||
<Avatar size={22} radius="xl" color="initials" name={o.full_name} />
|
||||
<Text size="sm">{o.full_name}</Text>
|
||||
</Group>
|
||||
))}
|
||||
</Group>
|
||||
</Section>
|
||||
)}
|
||||
</Stack>
|
||||
</Tabs.Panel>
|
||||
|
||||
{/* ——— Задачи ——— */}
|
||||
<Tabs.Panel value="tasks" className={classes.section}>
|
||||
{showPlannedTasks ? (
|
||||
<Section title="Будут поставлены после согласования">
|
||||
<Stack gap="sm">
|
||||
{[...plannedTasks]
|
||||
.sort((a, b) => a.step_order - b.step_order)
|
||||
.map((te) => (
|
||||
<Group key={te.id} justify="space-between" wrap="nowrap" align="flex-start">
|
||||
<Text size="sm" style={{ flex: 1 }}>{te.task_text || '—'}</Text>
|
||||
<Text size="xs" c="dimmed" ta="right">
|
||||
{te.executor_name || 'Исполнитель не назначен'}
|
||||
</Text>
|
||||
</Group>
|
||||
))}
|
||||
<Text size="xs" c="dimmed">
|
||||
Появятся автоматически, когда заявку согласуют полностью.
|
||||
</Text>
|
||||
</Stack>
|
||||
</Section>
|
||||
) : tasks.length === 0 ? (
|
||||
<Text size="sm" c="dimmed">Задач по заявке нет</Text>
|
||||
) : (
|
||||
<Stack gap="md">
|
||||
{tasks.map((task, i) => (
|
||||
<Box key={task.id}>
|
||||
{i > 0 && <Divider mb="md" />}
|
||||
<Group justify="space-between" wrap="nowrap" mb={4}>
|
||||
<Text size="sm" fw={500}>Задача №{i + 1}</Text>
|
||||
<StatusBadge kind="task" status={task.status} size="sm" />
|
||||
</Group>
|
||||
<Text size="sm">{task.task_text || '—'}</Text>
|
||||
<Text size="xs" c="dimmed" mt={4}>
|
||||
{task.executor_name || 'Исполнитель не назначен'}
|
||||
{task.completed_at && ` · выполнена ${formatMsk(task.completed_at)}`}
|
||||
</Text>
|
||||
</Box>
|
||||
))}
|
||||
</Stack>
|
||||
)}
|
||||
</Tabs.Panel>
|
||||
|
||||
{/* ——— Комментарии ——— */}
|
||||
<Tabs.Panel value="comments" className={classes.section}>
|
||||
{comments.length === 0 ? (
|
||||
<Text size="sm" c="dimmed">Комментариев нет</Text>
|
||||
) : (
|
||||
<Stack gap="lg">
|
||||
{comments.map((c) => (
|
||||
<Group key={c.id} gap="sm" align="flex-start" wrap="nowrap">
|
||||
<Avatar size={28} radius="xl" color="initials" name={c.user_name} />
|
||||
<Box style={{ minWidth: 0, flex: 1 }}>
|
||||
<Group gap={8}>
|
||||
<Text size="sm" fw={500}>{c.user_name}</Text>
|
||||
{c.created_at && (
|
||||
<Text size="xs" c="dimmed">{formatMsk(c.created_at)}</Text>
|
||||
)}
|
||||
</Group>
|
||||
<Text size="sm" style={{ whiteSpace: 'pre-wrap' }}>{c.comment}</Text>
|
||||
</Box>
|
||||
</Group>
|
||||
))}
|
||||
</Stack>
|
||||
)}
|
||||
</Tabs.Panel>
|
||||
</Tabs>
|
||||
</>
|
||||
)}
|
||||
</Drawer.Body>
|
||||
</Drawer.Content>
|
||||
</Drawer.Root>
|
||||
|
||||
{preview && approvalId && (
|
||||
<FilePreviewModal
|
||||
approvalId={approvalId}
|
||||
fileId={preview.id}
|
||||
fileName={preview.name}
|
||||
fileType={preview.type}
|
||||
opened
|
||||
onClose={() => setPreview(null)}
|
||||
/>
|
||||
)}
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
|
@ -1,691 +0,0 @@
|
|||
import { useState } from 'react'
|
||||
import {
|
||||
Modal,
|
||||
Stack,
|
||||
Text,
|
||||
Group,
|
||||
Badge,
|
||||
Paper,
|
||||
Loader,
|
||||
Center,
|
||||
Timeline,
|
||||
ScrollArea,
|
||||
Box,
|
||||
ActionIcon,
|
||||
Tooltip,
|
||||
Alert,
|
||||
Divider,
|
||||
} from '@mantine/core'
|
||||
import {
|
||||
IconUser,
|
||||
IconBuilding,
|
||||
IconCalendar,
|
||||
IconFileText,
|
||||
IconCheck,
|
||||
IconX,
|
||||
IconClock,
|
||||
IconAlertCircle,
|
||||
IconEye,
|
||||
IconDownload,
|
||||
IconMessageCircle,
|
||||
IconUserPlus,
|
||||
IconEyeglass,
|
||||
IconRotate,
|
||||
IconChecklist,
|
||||
IconAlertTriangle,
|
||||
} from '@tabler/icons-react'
|
||||
import { notifications } from '@mantine/notifications'
|
||||
import {
|
||||
useApproval,
|
||||
useAdditionalApprovers,
|
||||
useApprovalComments,
|
||||
useApprovalObservers,
|
||||
useRevocationRequest,
|
||||
useApprovalTasks,
|
||||
} from '@/features/approvals/hooks/useApprovals'
|
||||
import { useCategories } from '@/features/categories/hooks/useCategories'
|
||||
import FilePreviewModal from './FilePreviewModal'
|
||||
import { formatMsk } from '@/utils/date'
|
||||
|
||||
interface ApprovalDetailsModalProps {
|
||||
approvalId: number | null
|
||||
opened: boolean
|
||||
onClose: () => void
|
||||
}
|
||||
|
||||
const STATUS_COLORS: Record<string, string> = {
|
||||
draft: 'gray',
|
||||
pending: 'blue',
|
||||
approved: 'green',
|
||||
rejected: 'red',
|
||||
revoked: 'orange',
|
||||
revision: 'violet',
|
||||
}
|
||||
|
||||
const STATUS_LABELS: Record<string, string> = {
|
||||
pending: 'На согласовании',
|
||||
approved: 'Согласована',
|
||||
rejected: 'Отклонена',
|
||||
revoked: 'Отозвана',
|
||||
revision: 'На доработке',
|
||||
}
|
||||
|
||||
const STEP_STATUS_ICONS: Record<string, any> = {
|
||||
pending: IconClock,
|
||||
approved: IconCheck,
|
||||
rejected: IconX,
|
||||
waiting: IconClock,
|
||||
cancelled_any_of: IconAlertCircle,
|
||||
}
|
||||
|
||||
const STEP_STATUS_COLORS: Record<string, string> = {
|
||||
pending: 'blue',
|
||||
approved: 'green',
|
||||
rejected: 'red',
|
||||
waiting: 'gray',
|
||||
cancelled_any_of: 'orange',
|
||||
}
|
||||
|
||||
// Статусы "доп. согласующего" — те же значения, что в handleDecision
|
||||
// (isAdditionalApprover): "pending" / "approved" / "rejected".
|
||||
const ADDITIONAL_APPROVER_LABELS: Record<string, string> = {
|
||||
pending: 'Ожидает решения',
|
||||
approved: 'Одобрил',
|
||||
rejected: 'Отклонил',
|
||||
}
|
||||
|
||||
const ADDITIONAL_APPROVER_COLORS: Record<string, string> = {
|
||||
pending: 'blue',
|
||||
approved: 'green',
|
||||
rejected: 'red',
|
||||
}
|
||||
|
||||
// Статусы согласующего на запрос отзыва (см. HandleRevocationApproverDecision
|
||||
// в telegram_service).
|
||||
const REVOCATION_APPROVER_LABELS: Record<string, string> = {
|
||||
pending: 'Ещё не ответил',
|
||||
approved: 'Согласен на отзыв',
|
||||
rejected: 'Против отзыва',
|
||||
}
|
||||
|
||||
const REVOCATION_APPROVER_COLORS: Record<string, string> = {
|
||||
pending: 'gray',
|
||||
approved: 'green',
|
||||
rejected: 'red',
|
||||
}
|
||||
|
||||
const APPROVAL_MODE_LABELS: Record<string, string> = {
|
||||
sequential: 'Последовательно',
|
||||
any_of: 'Любой из согласующих',
|
||||
}
|
||||
|
||||
// Статусы задач — те же значения и подписи, что в отчёте (reportcore.go)
|
||||
// и в "Стадиях согласования" бота.
|
||||
const TASK_STATUS_LABELS: Record<string, string> = {
|
||||
pending: 'В работе',
|
||||
waiting: 'Ожидает',
|
||||
completed: 'Выполнена',
|
||||
cancelled: 'Отменена',
|
||||
cancellation: 'Требует отмены изменений',
|
||||
}
|
||||
|
||||
const TASK_STATUS_COLORS: Record<string, string> = {
|
||||
pending: 'blue',
|
||||
waiting: 'gray',
|
||||
completed: 'green',
|
||||
cancelled: 'red',
|
||||
cancellation: 'orange',
|
||||
}
|
||||
|
||||
const PREVIEWABLE_TYPES = [
|
||||
'image/jpeg',
|
||||
'image/png',
|
||||
'image/gif',
|
||||
'image/webp',
|
||||
'image/svg+xml',
|
||||
'application/pdf',
|
||||
'text/plain',
|
||||
]
|
||||
|
||||
const getMimeType = (fileName: string): string => {
|
||||
const ext = fileName.split('.').pop()?.toLowerCase() || ''
|
||||
const mimeTypes: Record<string, string> = {
|
||||
jpg: 'image/jpeg',
|
||||
jpeg: 'image/jpeg',
|
||||
png: 'image/png',
|
||||
gif: 'image/gif',
|
||||
webp: 'image/webp',
|
||||
svg: 'image/svg+xml',
|
||||
pdf: 'application/pdf',
|
||||
txt: 'text/plain',
|
||||
doc: 'application/msword',
|
||||
docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
|
||||
xls: 'application/vnd.ms-excel',
|
||||
xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
||||
}
|
||||
return mimeTypes[ext] || 'application/octet-stream'
|
||||
}
|
||||
|
||||
const generateSignature = async (): Promise<{ signature: string; timestamp: string; deviceId: string }> => {
|
||||
const timestamp = Math.floor(Date.now() / 1000).toString()
|
||||
const publicKey = import.meta.env.VITE_API_PUBLIC_KEY
|
||||
const privateKey = import.meta.env.VITE_API_PRIVATE_KEY
|
||||
const message = publicKey + ':' + timestamp
|
||||
const CryptoJS = await import('crypto-js')
|
||||
const signature = CryptoJS.HmacSHA256(message, privateKey).toString(CryptoJS.enc.Hex)
|
||||
const deviceId = localStorage.getItem('device_id') || 'admin-panel'
|
||||
return { signature, timestamp, deviceId }
|
||||
}
|
||||
|
||||
const getAuthHeaders = async () => {
|
||||
const token = localStorage.getItem('token')
|
||||
const { signature, timestamp, deviceId } = await generateSignature()
|
||||
return {
|
||||
Authorization: `Bearer ${token}`,
|
||||
ApiKey: signature,
|
||||
'X-Timestamp': timestamp,
|
||||
'x-device-id': deviceId,
|
||||
}
|
||||
}
|
||||
|
||||
export default function ApprovalDetailsModal({
|
||||
approvalId,
|
||||
opened,
|
||||
onClose,
|
||||
}: ApprovalDetailsModalProps) {
|
||||
const { data: approval, isLoading } = useApproval(approvalId)
|
||||
const { data: categories } = useCategories({ limit: 1000 })
|
||||
|
||||
// Хуки отдают ApiResponse<T> целиком (как useFlowNodesTree раньше) —
|
||||
// разворачиваем здесь, а не в самих хуках, чтобы не плодить два разных
|
||||
// соглашения об обёртке в одном проекте.
|
||||
const { data: additionalApproversResponse } = useAdditionalApprovers(approvalId)
|
||||
const { data: commentsResponse } = useApprovalComments(approvalId)
|
||||
const { data: observersResponse } = useApprovalObservers(approvalId)
|
||||
const { data: revocationRequestResponse } = useRevocationRequest(approvalId)
|
||||
const { data: tasksResponse } = useApprovalTasks(approvalId)
|
||||
|
||||
const additionalApprovers = additionalApproversResponse?.data
|
||||
const comments = commentsResponse?.data
|
||||
const observers = observersResponse?.data
|
||||
const revocationRequest = revocationRequestResponse?.data
|
||||
const tasksData = tasksResponse?.data
|
||||
|
||||
const [previewFileId, setPreviewFileId] = useState<number | null>(null)
|
||||
const [previewFileName, setPreviewFileName] = useState('')
|
||||
const [previewFileType, setPreviewFileType] = useState('')
|
||||
|
||||
const category = approval?.topic?.category_id && categories?.data
|
||||
? categories.data.find((c) => c.id === approval.topic?.category_id)
|
||||
: null
|
||||
|
||||
const handleFilePreview = (fileId: number, fileName: string) => {
|
||||
setPreviewFileId(fileId)
|
||||
setPreviewFileName(fileName)
|
||||
setPreviewFileType(getMimeType(fileName))
|
||||
}
|
||||
|
||||
const handleFileDownload = async (fileId: number, fileName: string) => {
|
||||
try {
|
||||
const headers = await getAuthHeaders()
|
||||
const url = `/api/approvals/${approvalId}/files/${fileId}/download`
|
||||
|
||||
const response = await fetch(url, { method: 'GET', headers })
|
||||
if (!response.ok) {
|
||||
throw new Error('Failed to download file')
|
||||
}
|
||||
|
||||
const blob = await response.blob()
|
||||
const blobUrl = window.URL.createObjectURL(blob)
|
||||
const link = document.createElement('a')
|
||||
link.href = blobUrl
|
||||
link.download = fileName
|
||||
document.body.appendChild(link)
|
||||
link.click()
|
||||
link.remove()
|
||||
window.URL.revokeObjectURL(blobUrl)
|
||||
|
||||
notifications.show({ title: 'Успешно', message: 'Файл скачан', color: 'green' })
|
||||
} catch (error) {
|
||||
console.error('Download error:', error)
|
||||
notifications.show({ title: 'Ошибка', message: 'Не удалось скачать файл', color: 'red' })
|
||||
}
|
||||
}
|
||||
|
||||
// Показываем превью "что будет поставлено" только пока заявка ещё не
|
||||
// согласована И задачи по факту ещё не созданы — как только появились
|
||||
// реальные ApprovalTask, показываем уже их (ниже), а не план.
|
||||
const showPlannedTasks =
|
||||
approval?.status === 'pending' &&
|
||||
!!tasksData?.topic_executors?.length &&
|
||||
!tasksData?.tasks?.length
|
||||
|
||||
return (
|
||||
<>
|
||||
<Modal
|
||||
opened={opened}
|
||||
onClose={onClose}
|
||||
title={
|
||||
<Group>
|
||||
<Text fw={700}>Заявка #{approvalId}</Text>
|
||||
{approval && (
|
||||
<Badge color={STATUS_COLORS[approval.status || ''] || 'gray'}>
|
||||
{STATUS_LABELS[approval.status || ''] || approval.status}
|
||||
</Badge>
|
||||
)}
|
||||
</Group>
|
||||
}
|
||||
size="xl"
|
||||
styles={{ body: { height: 'calc(80vh - 120px)', padding: 0 } }}
|
||||
>
|
||||
{isLoading ? (
|
||||
<Center p={40}>
|
||||
<Loader />
|
||||
</Center>
|
||||
) : approval ? (
|
||||
<ScrollArea style={{ height: 'calc(80vh - 120px)' }} offsetScrollbars>
|
||||
<Box p="md">
|
||||
<Stack gap="md">
|
||||
{/* НОВОЕ: ошибка создания задач — та же логика, что в отчёте
|
||||
(reportcore.go: hasTaskError). Ставим у самого верха, это
|
||||
требует внимания администратора, а не просто информация. */}
|
||||
{tasksData?.has_task_error && (
|
||||
<Alert icon={<IconAlertTriangle size={16} />} color="red" variant="filled">
|
||||
<Text size="sm" fw={600}>
|
||||
Ошибка при создании задачи
|
||||
</Text>
|
||||
<Text size="xs">
|
||||
Для темы этой заявки настроены исполнители, заявка согласована, но ни
|
||||
одной задачи по факту не создано — стоит проверить вручную.
|
||||
</Text>
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
{/* НОВОЕ: активный запрос на отзыв — самое "срочное", поэтому
|
||||
сверху, ещё до общей информации. Показывается, только если
|
||||
такой запрос реально есть (backend отдаёт data: null иначе) */}
|
||||
{revocationRequest && (
|
||||
<Alert icon={<IconRotate size={16} />} color="orange" variant="light">
|
||||
<Stack gap={6}>
|
||||
<Text size="sm" fw={600}>
|
||||
Идёт запрос на отзыв этой заявки
|
||||
</Text>
|
||||
<Text size="xs">
|
||||
Инициатор запроса: {revocationRequest.requested_by_name}
|
||||
</Text>
|
||||
{revocationRequest.reason && (
|
||||
<Text size="xs">Причина: {revocationRequest.reason}</Text>
|
||||
)}
|
||||
<Stack gap={4} mt={4}>
|
||||
{revocationRequest.approvers.map((a) => (
|
||||
<Group key={a.approver_id} justify="space-between" gap="xs">
|
||||
<Text size="xs">{a.approver_name}</Text>
|
||||
<Badge
|
||||
size="xs"
|
||||
color={REVOCATION_APPROVER_COLORS[a.status] || 'gray'}
|
||||
>
|
||||
{REVOCATION_APPROVER_LABELS[a.status] || a.status}
|
||||
</Badge>
|
||||
</Group>
|
||||
))}
|
||||
</Stack>
|
||||
</Stack>
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
{/* Основная информация */}
|
||||
<Paper withBorder p="md">
|
||||
<Text size="sm" c="dimmed" mb="xs">Основная информация</Text>
|
||||
<Stack gap="sm">
|
||||
<Group justify="space-between">
|
||||
<Text size="sm" c="dimmed">Категория:</Text>
|
||||
<Text fw={500}>{category?.name || '—'}</Text>
|
||||
</Group>
|
||||
<Group justify="space-between">
|
||||
<Text size="sm" c="dimmed">Тема:</Text>
|
||||
<Text>{approval.topic?.name || '—'}</Text>
|
||||
</Group>
|
||||
{/* Режим согласования — лежит на теме */}
|
||||
{approval.topic?.approval_mode && (
|
||||
<Group justify="space-between">
|
||||
<Text size="sm" c="dimmed">Режим согласования:</Text>
|
||||
<Text>
|
||||
{APPROVAL_MODE_LABELS[approval.topic.approval_mode] ||
|
||||
approval.topic.approval_mode}
|
||||
</Text>
|
||||
</Group>
|
||||
)}
|
||||
<Group justify="space-between">
|
||||
<Text size="sm" c="dimmed">Инициатор:</Text>
|
||||
<Group gap="xs">
|
||||
<IconUser size={16} />
|
||||
<Text>{approval.initiator?.full_name || '—'}</Text>
|
||||
</Group>
|
||||
</Group>
|
||||
<Group justify="space-between">
|
||||
<Text size="sm" c="dimmed">Отдел:</Text>
|
||||
<Group gap="xs">
|
||||
<IconBuilding size={16} />
|
||||
<Text>{approval.department?.name || '—'}</Text>
|
||||
</Group>
|
||||
</Group>
|
||||
<Group justify="space-between">
|
||||
<Text size="sm" c="dimmed">Дата создания (МСК):</Text>
|
||||
<Group gap="xs">
|
||||
<IconCalendar size={16} />
|
||||
<Text>{formatMsk(approval.created_at)}</Text>
|
||||
</Group>
|
||||
</Group>
|
||||
</Stack>
|
||||
</Paper>
|
||||
|
||||
{/* НОВОЕ: превью "что будет поставлено" — только для pending-заявок,
|
||||
пока реальных задач ещё нет. Данные берём из ApprovalTopicExecutor
|
||||
(настройка темы), а не из ApprovalTask (их ещё физически не существует). */}
|
||||
{showPlannedTasks && (
|
||||
<Paper withBorder p="md" bg="blue.0">
|
||||
<Group gap="xs" mb="xs">
|
||||
<IconChecklist size={16} />
|
||||
<Text size="sm" c="dimmed">
|
||||
Какие задачи будут поставлены после согласования
|
||||
</Text>
|
||||
</Group>
|
||||
<Stack gap="xs">
|
||||
{tasksData!.topic_executors
|
||||
.slice()
|
||||
.sort((a, b) => a.step_order - b.step_order)
|
||||
.map((te) => (
|
||||
<Group key={te.id} justify="space-between" wrap="nowrap">
|
||||
<Text size="sm" style={{ flex: 1 }}>
|
||||
{te.task_text || '—'}
|
||||
</Text>
|
||||
<Badge variant="light" color="blue">
|
||||
{te.executor_name || 'Исполнитель не назначен'}
|
||||
</Badge>
|
||||
</Group>
|
||||
))}
|
||||
</Stack>
|
||||
<Text size="xs" c="dimmed" mt="xs">
|
||||
Появится автоматически, как только заявку согласуют полностью.
|
||||
</Text>
|
||||
</Paper>
|
||||
)}
|
||||
|
||||
{/* НОВОЕ: уже реально выставленные задачи */}
|
||||
{!!tasksData?.tasks?.length && (
|
||||
<Paper withBorder p="md">
|
||||
<Group gap="xs" mb="xs">
|
||||
<IconChecklist size={16} />
|
||||
<Text size="sm" c="dimmed">Задачи</Text>
|
||||
</Group>
|
||||
<Stack gap="xs">
|
||||
{tasksData.tasks.map((task, i) => (
|
||||
<Paper key={task.id} withBorder p="sm">
|
||||
<Group justify="space-between" wrap="nowrap" mb={4}>
|
||||
<Text size="sm" fw={500}>
|
||||
Выставлена задача №{i + 1}
|
||||
</Text>
|
||||
<Badge size="xs" color={TASK_STATUS_COLORS[task.status] || 'gray'}>
|
||||
{TASK_STATUS_LABELS[task.status] || task.status}
|
||||
</Badge>
|
||||
</Group>
|
||||
<Text size="sm">{task.task_text || '—'}</Text>
|
||||
<Text size="xs" c="dimmed" mt={4}>
|
||||
Исполнитель: {task.executor_name || '—'}
|
||||
{task.completed_at && <> · Выполнена {formatMsk(task.completed_at)}</>}
|
||||
</Text>
|
||||
</Paper>
|
||||
))}
|
||||
</Stack>
|
||||
</Paper>
|
||||
)}
|
||||
|
||||
{/* Наблюдатели — вычисляются динамически по категории/теме
|
||||
(не хранимая связь), поэтому отдельным запросом */}
|
||||
{observers && observers.length > 0 && (
|
||||
<Paper withBorder p="md">
|
||||
<Group gap="xs" mb="xs">
|
||||
<IconEyeglass size={16} />
|
||||
<Text size="sm" c="dimmed">Наблюдатели</Text>
|
||||
</Group>
|
||||
<Group gap="xs">
|
||||
{observers.map((o) => (
|
||||
<Badge key={o.id} variant="light" color="gray">
|
||||
{o.full_name}
|
||||
</Badge>
|
||||
))}
|
||||
</Group>
|
||||
</Paper>
|
||||
)}
|
||||
|
||||
{/* Текст заявки */}
|
||||
{approval.content && (
|
||||
<Paper withBorder p="md">
|
||||
<Text size="sm" c="dimmed" mb="xs">Текст заявки</Text>
|
||||
<Text>{approval.content}</Text>
|
||||
</Paper>
|
||||
)}
|
||||
|
||||
{/* Метаданные */}
|
||||
{approval.metadata && (
|
||||
<Paper withBorder p="md">
|
||||
<Text size="sm" c="dimmed" mb="xs">Метаданные</Text>
|
||||
<Text size="sm" style={{ fontFamily: 'monospace', whiteSpace: 'pre-wrap' }}>
|
||||
{(() => {
|
||||
try {
|
||||
return JSON.stringify(JSON.parse(approval.metadata), null, 2)
|
||||
} catch {
|
||||
return approval.metadata
|
||||
}
|
||||
})()}
|
||||
</Text>
|
||||
</Paper>
|
||||
)}
|
||||
|
||||
{/* Файлы */}
|
||||
{approval.files && approval.files.length > 0 && (
|
||||
<Paper withBorder p="md">
|
||||
<Text size="sm" c="dimmed" mb="xs">Прикреплённые файлы</Text>
|
||||
<Stack gap="xs">
|
||||
{approval.files.map((file) => {
|
||||
const mimeType = getMimeType(file.file_name || '')
|
||||
const canPreview = PREVIEWABLE_TYPES.includes(mimeType)
|
||||
const fileSizeKB = file.file_base64
|
||||
? Math.round((file.file_base64.length * 3) / 4 / 1024)
|
||||
: 0
|
||||
|
||||
return (
|
||||
<Paper key={file.id} withBorder p="sm">
|
||||
<Group justify="space-between">
|
||||
<Group gap="sm">
|
||||
<IconFileText size={20} color="blue" />
|
||||
<Stack gap={0}>
|
||||
<Text size="sm" fw={500}>
|
||||
{file.file_name || 'Без имени'}
|
||||
</Text>
|
||||
{fileSizeKB > 0 && (
|
||||
<Text size="xs" c="dimmed">
|
||||
{fileSizeKB} KB
|
||||
</Text>
|
||||
)}
|
||||
</Stack>
|
||||
</Group>
|
||||
<Group gap="xs">
|
||||
{canPreview && (
|
||||
<Tooltip label="Предпросмотр">
|
||||
<ActionIcon
|
||||
variant="light"
|
||||
color="blue"
|
||||
onClick={() => handleFilePreview(file.id!, file.file_name || '')}
|
||||
>
|
||||
<IconEye size={16} />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
)}
|
||||
<Tooltip label="Скачать">
|
||||
<ActionIcon
|
||||
variant="light"
|
||||
color="green"
|
||||
onClick={() => handleFileDownload(file.id!, file.file_name || '')}
|
||||
>
|
||||
<IconDownload size={16} />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
</Group>
|
||||
</Group>
|
||||
</Paper>
|
||||
)
|
||||
})}
|
||||
</Stack>
|
||||
</Paper>
|
||||
)}
|
||||
|
||||
{/* Шаги согласования */}
|
||||
{approval.steps && approval.steps.length > 0 && (
|
||||
<Paper withBorder p="md">
|
||||
<Text size="sm" c="dimmed" mb="xs">Шаги согласования</Text>
|
||||
<Timeline active={-1} bulletSize={24} lineWidth={2}>
|
||||
{approval.steps
|
||||
.sort((a, b) => (a.step_order || 0) - (b.step_order || 0))
|
||||
.map((step, index) => {
|
||||
const StatusIcon = STEP_STATUS_ICONS[step.status || ''] || IconClock
|
||||
return (
|
||||
<Timeline.Item
|
||||
key={step.id}
|
||||
bullet={<StatusIcon size={14} />}
|
||||
title={
|
||||
<Group gap="xs">
|
||||
<Text size="sm" fw={500}>
|
||||
Шаг {index + 1}: {step.approver_name_snapshot || 'Согласующий'}
|
||||
</Text>
|
||||
<Badge size="xs" color={STEP_STATUS_COLORS[step.status || ''] || 'gray'}>
|
||||
{step.status}
|
||||
</Badge>
|
||||
</Group>
|
||||
}
|
||||
>
|
||||
<Text size="xs" c="dimmed">
|
||||
{step.approver?.full_name || '—'}
|
||||
{step.acted_at && (
|
||||
<>
|
||||
{' • '}
|
||||
{formatMsk(step.acted_at)}
|
||||
</>
|
||||
)}
|
||||
</Text>
|
||||
{step.comment && (
|
||||
<Text size="xs" mt={4}>
|
||||
Комментарий: {step.comment}
|
||||
</Text>
|
||||
)}
|
||||
</Timeline.Item>
|
||||
)
|
||||
})}
|
||||
</Timeline>
|
||||
</Paper>
|
||||
)}
|
||||
|
||||
{/* Дополнительные согласующие */}
|
||||
{additionalApprovers && additionalApprovers.length > 0 && (
|
||||
<Paper withBorder p="md">
|
||||
<Group gap="xs" mb="xs">
|
||||
<IconUserPlus size={16} />
|
||||
<Text size="sm" c="dimmed">Дополнительные согласующие</Text>
|
||||
</Group>
|
||||
<Stack gap="xs">
|
||||
{additionalApprovers.map((aa) => (
|
||||
<Group key={aa.id} justify="space-between">
|
||||
<Text size="sm">{aa.approver_name}</Text>
|
||||
<Group gap="xs">
|
||||
{aa.acted_at && (
|
||||
<Text size="xs" c="dimmed">{formatMsk(aa.acted_at)}</Text>
|
||||
)}
|
||||
<Badge size="xs" color={ADDITIONAL_APPROVER_COLORS[aa.status] || 'blue'}>
|
||||
{ADDITIONAL_APPROVER_LABELS[aa.status] || aa.status}
|
||||
</Badge>
|
||||
</Group>
|
||||
</Group>
|
||||
))}
|
||||
</Stack>
|
||||
</Paper>
|
||||
)}
|
||||
|
||||
{/* Комментарии */}
|
||||
{comments && comments.length > 0 && (
|
||||
<Paper withBorder p="md">
|
||||
<Group gap="xs" mb="xs">
|
||||
<IconMessageCircle size={16} />
|
||||
<Text size="sm" c="dimmed">Комментарии ({comments.length})</Text>
|
||||
</Group>
|
||||
<Stack gap="sm">
|
||||
{comments.map((c, i) => (
|
||||
<Box key={c.id}>
|
||||
<Group justify="space-between" gap="xs">
|
||||
<Text size="xs" fw={600}>{c.user_name}</Text>
|
||||
{c.created_at && (
|
||||
<Text size="xs" c="dimmed">{formatMsk(c.created_at)}</Text>
|
||||
)}
|
||||
</Group>
|
||||
<Text size="sm">{c.comment}</Text>
|
||||
{i < comments.length - 1 && <Divider mt="sm" />}
|
||||
</Box>
|
||||
))}
|
||||
</Stack>
|
||||
</Paper>
|
||||
)}
|
||||
|
||||
{/* Информация об отзыве */}
|
||||
{approval.status === 'revoked' && approval.revoked_by && (
|
||||
<Paper withBorder p="md" bg="orange.0">
|
||||
<Text size="sm" c="dimmed" mb="xs">Информация об отзыве</Text>
|
||||
<Group gap="sm">
|
||||
<IconAlertCircle size={16} />
|
||||
<Text size="sm">
|
||||
Отозвана: {approval.revoked_by.full_name}
|
||||
{approval.revoked_at && <> {formatMsk(approval.revoked_at)}</>}
|
||||
</Text>
|
||||
</Group>
|
||||
</Paper>
|
||||
)}
|
||||
|
||||
{/* Информация о доработке */}
|
||||
{approval.status === 'revision' && (
|
||||
<Paper withBorder p="md" bg="violet.0">
|
||||
<Text size="sm" c="dimmed" mb="xs">Информация о доработке</Text>
|
||||
<Stack gap="xs">
|
||||
{approval.revision_comment && (
|
||||
<Text size="sm">
|
||||
<Text fw={500} component="span">Комментарий:</Text> {approval.revision_comment}
|
||||
</Text>
|
||||
)}
|
||||
{approval.revision_count !== undefined && approval.revision_count > 0 && (
|
||||
<Text size="sm">
|
||||
<Text fw={500} component="span">Количество доработок:</Text> {approval.revision_count}
|
||||
</Text>
|
||||
)}
|
||||
</Stack>
|
||||
</Paper>
|
||||
)}
|
||||
</Stack>
|
||||
</Box>
|
||||
</ScrollArea>
|
||||
) : (
|
||||
<Center p={40}>
|
||||
<Text c="dimmed">Заявка не найдена</Text>
|
||||
</Center>
|
||||
)}
|
||||
</Modal>
|
||||
|
||||
{previewFileId && approvalId && (
|
||||
<FilePreviewModal
|
||||
approvalId={approvalId}
|
||||
fileId={previewFileId}
|
||||
fileName={previewFileName}
|
||||
fileType={previewFileType}
|
||||
opened={!!previewFileId}
|
||||
onClose={() => setPreviewFileId(null)}
|
||||
/>
|
||||
)}
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
|
@ -1,184 +1,103 @@
|
|||
import { useState, useEffect } from 'react'
|
||||
import { Modal, Group, Text, Loader, Center, Paper, ActionIcon, Stack, Box } from '@mantine/core'
|
||||
import { IconDownload } from '@tabler/icons-react'
|
||||
import { useEffect, useState } from 'react'
|
||||
import { Box, Button, Center, Group, Loader, Modal, Stack, Text } from '@mantine/core'
|
||||
import { useMediaQuery } from '@mantine/hooks'
|
||||
import { notifications } from '@mantine/notifications'
|
||||
import { IconDownload } from '@tabler/icons-react'
|
||||
import {
|
||||
approvalFileUrl,
|
||||
fetchFileBlob,
|
||||
isPreviewable,
|
||||
saveFile,
|
||||
taskFileUrl,
|
||||
} from '@/lib/fileApi'
|
||||
|
||||
interface FilePreviewModalProps {
|
||||
approvalId?: number // Теперь опционально
|
||||
interface Props {
|
||||
fileId: number
|
||||
fileName: string
|
||||
fileType: string
|
||||
opened: boolean
|
||||
onClose: () => void
|
||||
taskId?: number // 🆕 Для файлов задач
|
||||
approvalId?: number
|
||||
taskId?: number // для файлов задач
|
||||
}
|
||||
|
||||
// 🆕 Тип сущности
|
||||
type EntityType = 'approval' | 'task'
|
||||
|
||||
const getAuthHeaders = async () => {
|
||||
const token = localStorage.getItem('token')
|
||||
const timestamp = Math.floor(Date.now() / 1000).toString()
|
||||
const publicKey = import.meta.env.VITE_API_PUBLIC_KEY
|
||||
const privateKey = import.meta.env.VITE_API_PRIVATE_KEY
|
||||
const message = publicKey + ':' + timestamp
|
||||
const CryptoJS = await import('crypto-js')
|
||||
const signature = CryptoJS.HmacSHA256(message, privateKey).toString(CryptoJS.enc.Hex)
|
||||
const deviceId = localStorage.getItem('device_id') || 'admin-panel'
|
||||
|
||||
return {
|
||||
'Authorization': `Bearer ${token}`,
|
||||
'ApiKey': signature,
|
||||
'X-Timestamp': timestamp,
|
||||
'x-device-id': deviceId,
|
||||
}
|
||||
}
|
||||
type LoadState = { status: 'loading' } | { status: 'error' } | { status: 'ready'; url: string }
|
||||
|
||||
export default function FilePreviewModal({
|
||||
approvalId,
|
||||
taskId,
|
||||
fileId,
|
||||
fileName,
|
||||
fileType,
|
||||
opened,
|
||||
onClose,
|
||||
taskId, // 🆕
|
||||
}: FilePreviewModalProps) {
|
||||
const [loading, setLoading] = useState(true)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [fileUrl, setFileUrl] = useState<string | null>(null)
|
||||
}: Props) {
|
||||
const isMobile = useMediaQuery('(max-width: 48em)')
|
||||
const [state, setState] = useState<LoadState>({ status: 'loading' })
|
||||
|
||||
// 🆕 Определяем тип сущности
|
||||
const entityType: EntityType = taskId ? 'task' : 'approval'
|
||||
const entityId = taskId || approvalId
|
||||
const previewUrl = taskId
|
||||
? taskFileUrl(taskId, fileId)
|
||||
: approvalId
|
||||
? approvalFileUrl(approvalId, fileId)
|
||||
: null
|
||||
const downloadUrl = taskId
|
||||
? taskFileUrl(taskId, fileId, true)
|
||||
: approvalId
|
||||
? approvalFileUrl(approvalId, fileId, true)
|
||||
: null
|
||||
|
||||
// 🆕 Формируем URL в зависимости от типа сущности
|
||||
const getPreviewUrl = () => {
|
||||
if (entityType === 'task') {
|
||||
return `/api/approval-tasks/${taskId}/files/${fileId}`
|
||||
}
|
||||
return `/api/approvals/${approvalId}/files/${fileId}`
|
||||
}
|
||||
|
||||
const getDownloadUrl = () => {
|
||||
if (entityType === 'task') {
|
||||
return `/api/approval-tasks/${taskId}/files/${fileId}/download`
|
||||
}
|
||||
return `/api/approvals/${approvalId}/files/${fileId}/download`
|
||||
}
|
||||
|
||||
const canPreview = [
|
||||
'image/jpeg',
|
||||
'image/png',
|
||||
'image/gif',
|
||||
'image/webp',
|
||||
'image/svg+xml',
|
||||
'application/pdf',
|
||||
'text/plain',
|
||||
].includes(fileType)
|
||||
const canPreview = isPreviewable(fileType)
|
||||
|
||||
useEffect(() => {
|
||||
if (!opened || !canPreview || !entityId) return
|
||||
if (!opened || !canPreview || !previewUrl) return
|
||||
|
||||
let cancelled = false
|
||||
let objectUrl: string | null = null
|
||||
// Сбрасываем состояние, чтобы при открытии другого файла не мелькал предыдущий
|
||||
setState({ status: 'loading' })
|
||||
|
||||
const loadFile = async () => {
|
||||
setLoading(true)
|
||||
setError(null)
|
||||
|
||||
try {
|
||||
const headers = await getAuthHeaders()
|
||||
const url = getPreviewUrl()
|
||||
|
||||
const response = await fetch(url, {
|
||||
method: 'GET',
|
||||
headers,
|
||||
})
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`HTTP ${response.status}`)
|
||||
}
|
||||
|
||||
const blob = await response.blob()
|
||||
fetchFileBlob(previewUrl)
|
||||
.then((blob) => {
|
||||
if (cancelled) return
|
||||
objectUrl = window.URL.createObjectURL(blob)
|
||||
setFileUrl(objectUrl)
|
||||
} catch (err) {
|
||||
setState({ status: 'ready', url: objectUrl })
|
||||
})
|
||||
.catch((err) => {
|
||||
if (cancelled) return
|
||||
console.error('File load error:', err)
|
||||
setError('Не удалось загрузить файл')
|
||||
} finally {
|
||||
setLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
loadFile()
|
||||
setState({ status: 'error' })
|
||||
})
|
||||
|
||||
return () => {
|
||||
if (objectUrl) {
|
||||
window.URL.revokeObjectURL(objectUrl)
|
||||
}
|
||||
cancelled = true
|
||||
if (objectUrl) window.URL.revokeObjectURL(objectUrl)
|
||||
}
|
||||
}, [opened, entityId, fileId, canPreview])
|
||||
}, [opened, previewUrl, canPreview])
|
||||
|
||||
const handleDownload = async () => {
|
||||
if (!downloadUrl) return
|
||||
try {
|
||||
const headers = await getAuthHeaders()
|
||||
const url = getDownloadUrl()
|
||||
|
||||
const response = await fetch(url, {
|
||||
method: 'GET',
|
||||
headers,
|
||||
})
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error('Failed to download file')
|
||||
}
|
||||
|
||||
const blob = await response.blob()
|
||||
const blobUrl = window.URL.createObjectURL(blob)
|
||||
const link = document.createElement('a')
|
||||
link.href = blobUrl
|
||||
link.download = fileName
|
||||
document.body.appendChild(link)
|
||||
link.click()
|
||||
link.remove()
|
||||
window.URL.revokeObjectURL(blobUrl)
|
||||
|
||||
notifications.show({
|
||||
title: 'Успешно',
|
||||
message: 'Файл скачан',
|
||||
color: 'green',
|
||||
})
|
||||
await saveFile(downloadUrl, fileName)
|
||||
notifications.show({ title: 'Готово', message: 'Файл скачан', color: 'green' })
|
||||
} catch (err) {
|
||||
console.error('Download error:', err)
|
||||
notifications.show({
|
||||
title: 'Ошибка',
|
||||
message: 'Не удалось скачать файл',
|
||||
color: 'red',
|
||||
})
|
||||
notifications.show({ title: 'Ошибка', message: 'Не удалось скачать файл', color: 'red' })
|
||||
}
|
||||
}
|
||||
|
||||
if (!canPreview) {
|
||||
return (
|
||||
<Modal opened={opened} onClose={onClose} title="Предпросмотр недоступен" size="md">
|
||||
<Paper p="md" withBorder>
|
||||
<Stack gap="md">
|
||||
<Text>
|
||||
Предпросмотр этого типа файла не поддерживается.
|
||||
<br />
|
||||
Вы можете скачать файл.
|
||||
</Text>
|
||||
<Group justify="flex-end">
|
||||
<ActionIcon
|
||||
variant="light"
|
||||
color="blue"
|
||||
size="lg"
|
||||
onClick={handleDownload}
|
||||
>
|
||||
<IconDownload size={20} />
|
||||
</ActionIcon>
|
||||
</Group>
|
||||
</Stack>
|
||||
</Paper>
|
||||
<Modal opened={opened} onClose={onClose} title="Предпросмотр недоступен" size="sm" zIndex={400}>
|
||||
<Stack gap="md">
|
||||
<Text size="sm" c="dimmed">
|
||||
Этот тип файла нельзя открыть в браузере. Его можно скачать.
|
||||
</Text>
|
||||
<Group justify="flex-end">
|
||||
<Button leftSection={<IconDownload size={16} />} onClick={handleDownload}>
|
||||
Скачать
|
||||
</Button>
|
||||
</Group>
|
||||
</Stack>
|
||||
</Modal>
|
||||
)
|
||||
}
|
||||
|
|
@ -187,80 +106,59 @@ export default function FilePreviewModal({
|
|||
<Modal
|
||||
opened={opened}
|
||||
onClose={onClose}
|
||||
size="xl"
|
||||
zIndex={400}
|
||||
fullScreen={isMobile}
|
||||
title={
|
||||
<Group justify="space-between" style={{ flex: 1 }}>
|
||||
<Group justify="space-between" wrap="nowrap" gap="md" style={{ flex: 1 }}>
|
||||
<Text fw={600} lineClamp={1}>{fileName}</Text>
|
||||
<ActionIcon
|
||||
variant="light"
|
||||
color="blue"
|
||||
<Button
|
||||
size="compact-sm"
|
||||
variant="default"
|
||||
leftSection={<IconDownload size={14} />}
|
||||
onClick={handleDownload}
|
||||
>
|
||||
<IconDownload size={20} />
|
||||
</ActionIcon>
|
||||
Скачать
|
||||
</Button>
|
||||
</Group>
|
||||
}
|
||||
size="xl"
|
||||
styles={{
|
||||
body: {
|
||||
height: 'calc(80vh - 120px)',
|
||||
padding: 0,
|
||||
},
|
||||
title: { flex: 1, minWidth: 0 },
|
||||
body: { padding: 0, height: isMobile ? 'calc(100dvh - 70px)' : '75dvh' },
|
||||
}}
|
||||
>
|
||||
<Box style={{ height: '100%', width: '100%', position: 'relative' }}>
|
||||
{loading && (
|
||||
<Center style={{ position: 'absolute', inset: 0, zIndex: 1 }}>
|
||||
<Box style={{ height: '100%', position: 'relative' }}>
|
||||
{state.status === 'loading' && (
|
||||
<Center h="100%">
|
||||
<Stack align="center" gap="xs">
|
||||
<Loader size="lg" />
|
||||
<Text size="sm" c="dimmed">Загрузка файла...</Text>
|
||||
<Loader size="sm" />
|
||||
<Text size="sm" c="dimmed">Загрузка файла…</Text>
|
||||
</Stack>
|
||||
</Center>
|
||||
)}
|
||||
|
||||
{error && (
|
||||
{state.status === 'error' && (
|
||||
<Center h="100%">
|
||||
<Text c="red">{error}</Text>
|
||||
<Text size="sm" c="red">Не удалось загрузить файл</Text>
|
||||
</Center>
|
||||
)}
|
||||
|
||||
{fileUrl && !error && (
|
||||
<>
|
||||
{fileType.startsWith('image/') ? (
|
||||
<Center style={{ height: '100%', background: '#f5f5f5' }}>
|
||||
<img
|
||||
src={fileUrl}
|
||||
alt={fileName}
|
||||
style={{
|
||||
maxWidth: '100%',
|
||||
maxHeight: '100%',
|
||||
objectFit: 'contain',
|
||||
}}
|
||||
/>
|
||||
</Center>
|
||||
) : fileType === 'application/pdf' ? (
|
||||
<iframe
|
||||
src={fileUrl}
|
||||
style={{
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
border: 'none',
|
||||
}}
|
||||
title={fileName}
|
||||
{state.status === 'ready' &&
|
||||
(fileType.startsWith('image/') ? (
|
||||
<Center h="100%" style={{ background: 'var(--mantine-color-default-hover)' }}>
|
||||
<img
|
||||
src={state.url}
|
||||
alt={fileName}
|
||||
style={{ maxWidth: '100%', maxHeight: '100%', objectFit: 'contain' }}
|
||||
/>
|
||||
) : fileType === 'text/plain' ? (
|
||||
<iframe
|
||||
src={fileUrl}
|
||||
style={{
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
border: 'none',
|
||||
background: 'white',
|
||||
}}
|
||||
title={fileName}
|
||||
/>
|
||||
) : null}
|
||||
</>
|
||||
)}
|
||||
</Center>
|
||||
) : (
|
||||
<iframe
|
||||
src={state.url}
|
||||
title={fileName}
|
||||
style={{ width: '100%', height: '100%', border: 'none', background: '#fff' }}
|
||||
/>
|
||||
))}
|
||||
</Box>
|
||||
</Modal>
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue