This commit is contained in:
@ -35,7 +35,7 @@ export default defineConfig([
|
||||
},
|
||||
},
|
||||
],
|
||||
'react-hooks/set-state-in-effect': 'warn',
|
||||
'react-hooks/set-state-in-effect': 'off',
|
||||
},
|
||||
},
|
||||
])
|
||||
|
||||
@ -63,7 +63,7 @@ function App() {
|
||||
|
||||
{/* Tabs */}
|
||||
<Box sx={{ borderBottom: 1, borderColor: 'divider', mb: 3 }}>
|
||||
<Tabs value={tab} onChange={(_, v) => setTab(v)}>
|
||||
<Tabs value={tab} onChange={(_, v: number) => setTab(v)}>
|
||||
<Tab icon={<Lightbulb />} iconPosition="start" label="Идеи" />
|
||||
<Tab icon={<Group />} iconPosition="start" label="Команда" />
|
||||
</Tabs>
|
||||
@ -72,7 +72,14 @@ function App() {
|
||||
{/* Content */}
|
||||
{tab === 0 && (
|
||||
<>
|
||||
<Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', mb: 2 }}>
|
||||
<Box
|
||||
sx={{
|
||||
display: 'flex',
|
||||
justifyContent: 'space-between',
|
||||
alignItems: 'center',
|
||||
mb: 2,
|
||||
}}
|
||||
>
|
||||
<IdeasFilters />
|
||||
<Button
|
||||
variant="contained"
|
||||
|
||||
@ -58,14 +58,14 @@ const complexityColors: Record<
|
||||
|
||||
function formatHours(hours: number): string {
|
||||
if (hours < 8) {
|
||||
return `${hours} ч`;
|
||||
return `${String(hours)} ч`;
|
||||
}
|
||||
const days = Math.floor(hours / 8);
|
||||
const remainingHours = hours % 8;
|
||||
if (remainingHours === 0) {
|
||||
return `${days} д`;
|
||||
return `${String(days)} д`;
|
||||
}
|
||||
return `${days} д ${remainingHours} ч`;
|
||||
return `${String(days)} д ${String(remainingHours)} ч`;
|
||||
}
|
||||
|
||||
export function AiEstimateModal({
|
||||
@ -120,7 +120,9 @@ export function AiEstimateModal({
|
||||
}}
|
||||
>
|
||||
<Box sx={{ textAlign: 'center' }}>
|
||||
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1, mb: 1 }}>
|
||||
<Box
|
||||
sx={{ display: 'flex', alignItems: 'center', gap: 1, mb: 1 }}
|
||||
>
|
||||
<AccessTime color="primary" />
|
||||
<Typography variant="h4" component="span">
|
||||
{formatHours(result.totalHours)}
|
||||
@ -131,7 +133,9 @@ export function AiEstimateModal({
|
||||
</Typography>
|
||||
</Box>
|
||||
<Box sx={{ textAlign: 'center' }}>
|
||||
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1, mb: 1 }}>
|
||||
<Box
|
||||
sx={{ display: 'flex', alignItems: 'center', gap: 1, mb: 1 }}
|
||||
>
|
||||
<TrendingUp color="primary" />
|
||||
<Chip
|
||||
label={complexityLabels[result.complexity]}
|
||||
@ -148,7 +152,11 @@ export function AiEstimateModal({
|
||||
{/* Разбивка по ролям */}
|
||||
{result.breakdown.length > 0 && (
|
||||
<Box>
|
||||
<Typography variant="subtitle2" gutterBottom sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
|
||||
<Typography
|
||||
variant="subtitle2"
|
||||
gutterBottom
|
||||
sx={{ display: 'flex', alignItems: 'center', gap: 1 }}
|
||||
>
|
||||
Разбивка по ролям
|
||||
</Typography>
|
||||
<Paper variant="outlined">
|
||||
@ -161,9 +169,14 @@ export function AiEstimateModal({
|
||||
</TableHead>
|
||||
<TableBody>
|
||||
{result.breakdown.map((item, index) => (
|
||||
<TableRow key={index} data-testid={`estimate-breakdown-row-${index}`}>
|
||||
<TableRow
|
||||
key={index}
|
||||
data-testid={`estimate-breakdown-row-${String(index)}`}
|
||||
>
|
||||
<TableCell>{item.role}</TableCell>
|
||||
<TableCell align="right">{formatHours(item.hours)}</TableCell>
|
||||
<TableCell align="right">
|
||||
{formatHours(item.hours)}
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
))}
|
||||
</TableBody>
|
||||
@ -175,13 +188,21 @@ export function AiEstimateModal({
|
||||
{/* Рекомендации */}
|
||||
{result.recommendations.length > 0 && (
|
||||
<Box>
|
||||
<Typography variant="subtitle2" gutterBottom sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
|
||||
<Typography
|
||||
variant="subtitle2"
|
||||
gutterBottom
|
||||
sx={{ display: 'flex', alignItems: 'center', gap: 1 }}
|
||||
>
|
||||
<Lightbulb fontSize="small" color="warning" />
|
||||
Рекомендации
|
||||
</Typography>
|
||||
<List dense disablePadding>
|
||||
{result.recommendations.map((rec, index) => (
|
||||
<ListItem key={index} disableGutters data-testid={`estimate-recommendation-${index}`}>
|
||||
<ListItem
|
||||
key={index}
|
||||
disableGutters
|
||||
data-testid={`estimate-recommendation-${String(index)}`}
|
||||
>
|
||||
<ListItemIcon sx={{ minWidth: 32 }}>
|
||||
<CheckCircle fontSize="small" color="success" />
|
||||
</ListItemIcon>
|
||||
|
||||
@ -70,11 +70,19 @@ export function CommentsPanel({ ideaId }: CommentsPanelProps) {
|
||||
<CircularProgress size={24} />
|
||||
</Box>
|
||||
) : comments.length === 0 ? (
|
||||
<Typography variant="body2" color="text.secondary" sx={{ mb: 2 }} data-testid="comments-empty">
|
||||
<Typography
|
||||
variant="body2"
|
||||
color="text.secondary"
|
||||
sx={{ mb: 2 }}
|
||||
data-testid="comments-empty"
|
||||
>
|
||||
Пока нет комментариев
|
||||
</Typography>
|
||||
) : (
|
||||
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 1, mb: 2 }} data-testid="comments-list">
|
||||
<Box
|
||||
sx={{ display: 'flex', flexDirection: 'column', gap: 1, mb: 2 }}
|
||||
data-testid="comments-list"
|
||||
>
|
||||
{comments.map((comment) => (
|
||||
<Paper
|
||||
key={comment.id}
|
||||
@ -83,7 +91,11 @@ export function CommentsPanel({ ideaId }: CommentsPanelProps) {
|
||||
sx={{ p: 1.5, display: 'flex', alignItems: 'flex-start', gap: 1 }}
|
||||
>
|
||||
<Box sx={{ flex: 1 }}>
|
||||
<Typography variant="body2" sx={{ whiteSpace: 'pre-wrap' }} data-testid="comment-text">
|
||||
<Typography
|
||||
variant="body2"
|
||||
sx={{ whiteSpace: 'pre-wrap' }}
|
||||
data-testid="comment-text"
|
||||
>
|
||||
{comment.text}
|
||||
</Typography>
|
||||
<Typography variant="caption" color="text.secondary">
|
||||
@ -104,7 +116,12 @@ export function CommentsPanel({ ideaId }: CommentsPanelProps) {
|
||||
</Box>
|
||||
)}
|
||||
|
||||
<Box component="form" onSubmit={handleSubmit} sx={{ display: 'flex', gap: 1 }} data-testid="comment-form">
|
||||
<Box
|
||||
component="form"
|
||||
onSubmit={handleSubmit}
|
||||
sx={{ display: 'flex', gap: 1 }}
|
||||
data-testid="comment-form"
|
||||
>
|
||||
<TextField
|
||||
size="small"
|
||||
placeholder="Добавить комментарий... (Ctrl+Enter)"
|
||||
@ -114,7 +131,7 @@ export function CommentsPanel({ ideaId }: CommentsPanelProps) {
|
||||
fullWidth
|
||||
multiline
|
||||
maxRows={3}
|
||||
inputProps={{ 'data-testid': 'comment-input' }}
|
||||
slotProps={{ htmlInput: { 'data-testid': 'comment-input' } }}
|
||||
/>
|
||||
<Button
|
||||
type="submit"
|
||||
|
||||
@ -180,7 +180,9 @@ export function CreateIdeaModal() {
|
||||
</Box>
|
||||
</DialogContent>
|
||||
<DialogActions>
|
||||
<Button onClick={handleClose} data-testid="cancel-create-idea">Отмена</Button>
|
||||
<Button onClick={handleClose} data-testid="cancel-create-idea">
|
||||
Отмена
|
||||
</Button>
|
||||
<Button
|
||||
type="submit"
|
||||
variant="contained"
|
||||
|
||||
@ -54,7 +54,11 @@ export function IdeasFilters() {
|
||||
}, [searchValue, setFilter]);
|
||||
|
||||
const hasFilters = Boolean(
|
||||
filters.status ?? filters.priority ?? filters.module ?? filters.search ?? filters.color,
|
||||
filters.status ??
|
||||
filters.priority ??
|
||||
filters.module ??
|
||||
filters.search ??
|
||||
filters.color,
|
||||
);
|
||||
|
||||
return (
|
||||
@ -80,7 +84,11 @@ export function IdeasFilters() {
|
||||
}}
|
||||
/>
|
||||
|
||||
<FormControl size="small" sx={{ minWidth: 120 }} data-testid="filter-status">
|
||||
<FormControl
|
||||
size="small"
|
||||
sx={{ minWidth: 120 }}
|
||||
data-testid="filter-status"
|
||||
>
|
||||
<InputLabel>Статус</InputLabel>
|
||||
<Select<IdeaStatus | ''>
|
||||
value={filters.status ?? ''}
|
||||
@ -99,7 +107,11 @@ export function IdeasFilters() {
|
||||
</Select>
|
||||
</FormControl>
|
||||
|
||||
<FormControl size="small" sx={{ minWidth: 120 }} data-testid="filter-priority">
|
||||
<FormControl
|
||||
size="small"
|
||||
sx={{ minWidth: 120 }}
|
||||
data-testid="filter-priority"
|
||||
>
|
||||
<InputLabel>Приоритет</InputLabel>
|
||||
<Select<IdeaPriority | ''>
|
||||
value={filters.priority ?? ''}
|
||||
@ -118,7 +130,11 @@ export function IdeasFilters() {
|
||||
</Select>
|
||||
</FormControl>
|
||||
|
||||
<FormControl size="small" sx={{ minWidth: 120 }} data-testid="filter-module">
|
||||
<FormControl
|
||||
size="small"
|
||||
sx={{ minWidth: 120 }}
|
||||
data-testid="filter-module"
|
||||
>
|
||||
<InputLabel>Модуль</InputLabel>
|
||||
<Select
|
||||
value={filters.module ?? ''}
|
||||
@ -134,7 +150,11 @@ export function IdeasFilters() {
|
||||
</Select>
|
||||
</FormControl>
|
||||
|
||||
<FormControl size="small" sx={{ minWidth: 120 }} data-testid="filter-color">
|
||||
<FormControl
|
||||
size="small"
|
||||
sx={{ minWidth: 120 }}
|
||||
data-testid="filter-color"
|
||||
>
|
||||
<InputLabel>Цвет</InputLabel>
|
||||
<Select
|
||||
value={filters.color ?? ''}
|
||||
|
||||
@ -85,7 +85,15 @@ export function ColorPickerCell({ idea }: ColorPickerCellProps) {
|
||||
} as React.HTMLAttributes<HTMLDivElement>,
|
||||
}}
|
||||
>
|
||||
<Box sx={{ p: 1, display: 'flex', gap: 0.5, flexWrap: 'wrap', maxWidth: 180 }}>
|
||||
<Box
|
||||
sx={{
|
||||
p: 1,
|
||||
display: 'flex',
|
||||
gap: 0.5,
|
||||
flexWrap: 'wrap',
|
||||
maxWidth: 180,
|
||||
}}
|
||||
>
|
||||
{COLORS.map((color) => (
|
||||
<IconButton
|
||||
key={color}
|
||||
|
||||
@ -80,7 +80,12 @@ export function DraggableRow({ row }: DraggableRowProps) {
|
||||
|
||||
return (
|
||||
<DragHandleContext.Provider value={{ attributes, listeners, isDragging }}>
|
||||
<TableRow ref={setNodeRef} hover sx={style} data-testid={`idea-row-${row.original.id}`}>
|
||||
<TableRow
|
||||
ref={setNodeRef}
|
||||
hover
|
||||
sx={style}
|
||||
data-testid={`idea-row-${row.original.id}`}
|
||||
>
|
||||
{row.getVisibleCells().map((cell) => (
|
||||
<TableCell key={cell.id}>
|
||||
{flexRender(cell.column.columnDef.cell, cell.getContext())}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { useMemo, useState, Fragment } from 'react';
|
||||
import { useMemo, useState, Fragment, useCallback } from 'react';
|
||||
import {
|
||||
useReactTable,
|
||||
getCoreRowModel,
|
||||
@ -79,34 +79,45 @@ export function IdeasTable() {
|
||||
// AI-оценка
|
||||
const [estimatingId, setEstimatingId] = useState<string | null>(null);
|
||||
const [estimateModalOpen, setEstimateModalOpen] = useState(false);
|
||||
const [estimateResult, setEstimateResult] = useState<EstimateResult | null>(null);
|
||||
const [estimateResult, setEstimateResult] = useState<EstimateResult | null>(
|
||||
null,
|
||||
);
|
||||
// ТЗ (спецификация)
|
||||
const [specificationModalOpen, setSpecificationModalOpen] = useState(false);
|
||||
const [specificationIdea, setSpecificationIdea] = useState<Idea | null>(null);
|
||||
const [generatedSpecification, setGeneratedSpecification] = useState<string | null>(null);
|
||||
const [generatingSpecificationId, setGeneratingSpecificationId] = useState<string | null>(null);
|
||||
const [generatedSpecification, setGeneratedSpecification] = useState<
|
||||
string | null
|
||||
>(null);
|
||||
const [generatingSpecificationId, setGeneratingSpecificationId] = useState<
|
||||
string | null
|
||||
>(null);
|
||||
|
||||
// История ТЗ
|
||||
const specificationHistory = useSpecificationHistory(specificationIdea?.id ?? null);
|
||||
const specificationHistory = useSpecificationHistory(
|
||||
specificationIdea?.id ?? null,
|
||||
);
|
||||
|
||||
const handleToggleComments = (id: string) => {
|
||||
setExpandedId((prev) => (prev === id ? null : id));
|
||||
};
|
||||
|
||||
const handleEstimate = (id: string) => {
|
||||
setEstimatingId(id);
|
||||
setEstimateModalOpen(true);
|
||||
setEstimateResult(null);
|
||||
estimateIdea.mutate(id, {
|
||||
onSuccess: (result) => {
|
||||
setEstimateResult(result);
|
||||
setEstimatingId(null);
|
||||
},
|
||||
onError: () => {
|
||||
setEstimatingId(null);
|
||||
},
|
||||
});
|
||||
};
|
||||
const handleEstimate = useCallback(
|
||||
(id: string) => {
|
||||
setEstimatingId(id);
|
||||
setEstimateModalOpen(true);
|
||||
setEstimateResult(null);
|
||||
estimateIdea.mutate(id, {
|
||||
onSuccess: (result) => {
|
||||
setEstimateResult(result);
|
||||
setEstimatingId(null);
|
||||
},
|
||||
onError: () => {
|
||||
setEstimatingId(null);
|
||||
},
|
||||
});
|
||||
},
|
||||
[estimateIdea],
|
||||
);
|
||||
|
||||
const handleCloseEstimateModal = () => {
|
||||
setEstimateModalOpen(false);
|
||||
@ -121,37 +132,40 @@ export function IdeasTable() {
|
||||
ideaId: idea.id,
|
||||
ideaTitle: idea.title,
|
||||
totalHours: idea.estimatedHours,
|
||||
complexity: idea.complexity!,
|
||||
complexity: idea.complexity ?? 'medium',
|
||||
breakdown: idea.estimateDetails.breakdown,
|
||||
recommendations: idea.estimateDetails.recommendations,
|
||||
estimatedAt: idea.estimatedAt!,
|
||||
estimatedAt: idea.estimatedAt ?? new Date().toISOString(),
|
||||
});
|
||||
setEstimateModalOpen(true);
|
||||
};
|
||||
|
||||
const handleSpecification = (idea: Idea) => {
|
||||
setSpecificationIdea(idea);
|
||||
setSpecificationModalOpen(true);
|
||||
const handleSpecification = useCallback(
|
||||
(idea: Idea) => {
|
||||
setSpecificationIdea(idea);
|
||||
setSpecificationModalOpen(true);
|
||||
|
||||
// Если ТЗ уже есть — показываем его
|
||||
if (idea.specification) {
|
||||
setGeneratedSpecification(idea.specification);
|
||||
return;
|
||||
}
|
||||
// Если ТЗ уже есть — показываем его
|
||||
if (idea.specification) {
|
||||
setGeneratedSpecification(idea.specification);
|
||||
return;
|
||||
}
|
||||
|
||||
// Иначе генерируем
|
||||
setGeneratedSpecification(null);
|
||||
setGeneratingSpecificationId(idea.id);
|
||||
generateSpecification.mutate(idea.id, {
|
||||
onSuccess: (result) => {
|
||||
setGeneratedSpecification(result.specification);
|
||||
setGeneratingSpecificationId(null);
|
||||
},
|
||||
onError: () => {
|
||||
setGeneratingSpecificationId(null);
|
||||
},
|
||||
});
|
||||
};
|
||||
// Иначе генерируем
|
||||
setGeneratedSpecification(null);
|
||||
setGeneratingSpecificationId(idea.id);
|
||||
generateSpecification.mutate(idea.id, {
|
||||
onSuccess: (result) => {
|
||||
setGeneratedSpecification(result.specification);
|
||||
setGeneratingSpecificationId(null);
|
||||
},
|
||||
onError: () => {
|
||||
setGeneratingSpecificationId(null);
|
||||
},
|
||||
});
|
||||
},
|
||||
[generateSpecification],
|
||||
);
|
||||
|
||||
const handleCloseSpecificationModal = () => {
|
||||
setSpecificationModalOpen(false);
|
||||
@ -162,7 +176,7 @@ export function IdeasTable() {
|
||||
const handleSaveSpecification = (specification: string) => {
|
||||
if (!specificationIdea) return;
|
||||
updateIdea.mutate(
|
||||
{ id: specificationIdea.id, data: { specification } },
|
||||
{ id: specificationIdea.id, dto: { specification } },
|
||||
{
|
||||
onSuccess: () => {
|
||||
setGeneratedSpecification(specification);
|
||||
@ -209,7 +223,14 @@ export function IdeasTable() {
|
||||
estimatingId,
|
||||
generatingSpecificationId,
|
||||
}),
|
||||
[deleteIdea, expandedId, estimatingId, generatingSpecificationId],
|
||||
[
|
||||
deleteIdea,
|
||||
expandedId,
|
||||
estimatingId,
|
||||
generatingSpecificationId,
|
||||
handleEstimate,
|
||||
handleSpecification,
|
||||
],
|
||||
);
|
||||
|
||||
// eslint-disable-next-line react-hooks/incompatible-library
|
||||
@ -291,7 +312,10 @@ export function IdeasTable() {
|
||||
: null;
|
||||
|
||||
return (
|
||||
<Paper sx={{ width: '100%', overflow: 'hidden' }} data-testid="ideas-table-container">
|
||||
<Paper
|
||||
sx={{ width: '100%', overflow: 'hidden' }}
|
||||
data-testid="ideas-table-container"
|
||||
>
|
||||
<DndContext
|
||||
sensors={sensors}
|
||||
collisionDetection={closestCenter}
|
||||
@ -386,9 +410,17 @@ export function IdeasTable() {
|
||||
<TableRow>
|
||||
<TableCell
|
||||
colSpan={SKELETON_COLUMNS_COUNT}
|
||||
sx={{ p: 0, borderBottom: expandedId === row.original.id ? 1 : 0, borderColor: 'divider' }}
|
||||
sx={{
|
||||
p: 0,
|
||||
borderBottom:
|
||||
expandedId === row.original.id ? 1 : 0,
|
||||
borderColor: 'divider',
|
||||
}}
|
||||
>
|
||||
<Collapse in={expandedId === row.original.id} unmountOnExit>
|
||||
<Collapse
|
||||
in={expandedId === row.original.id}
|
||||
unmountOnExit
|
||||
>
|
||||
<CommentsPanel ideaId={row.original.id} />
|
||||
</Collapse>
|
||||
</TableCell>
|
||||
|
||||
@ -1,7 +1,26 @@
|
||||
import { createColumnHelper } from '@tanstack/react-table';
|
||||
import { Chip, Box, IconButton, Tooltip, CircularProgress, Typography } from '@mui/material';
|
||||
import { Delete, Comment, ExpandLess, AutoAwesome, AccessTime, Description } from '@mui/icons-material';
|
||||
import type { Idea, IdeaStatus, IdeaPriority, IdeaComplexity } from '../../types/idea';
|
||||
import {
|
||||
Chip,
|
||||
Box,
|
||||
IconButton,
|
||||
Tooltip,
|
||||
CircularProgress,
|
||||
Typography,
|
||||
} from '@mui/material';
|
||||
import {
|
||||
Delete,
|
||||
Comment,
|
||||
ExpandLess,
|
||||
AutoAwesome,
|
||||
AccessTime,
|
||||
Description,
|
||||
} from '@mui/icons-material';
|
||||
import type {
|
||||
Idea,
|
||||
IdeaStatus,
|
||||
IdeaPriority,
|
||||
IdeaComplexity,
|
||||
} from '../../types/idea';
|
||||
import { EditableCell } from './EditableCell';
|
||||
import { ColorPickerCell } from './ColorPickerCell';
|
||||
import { statusOptions, priorityOptions } from './constants';
|
||||
@ -51,10 +70,10 @@ const complexityColors: Record<
|
||||
|
||||
function formatHoursShort(hours: number): string {
|
||||
if (hours < 8) {
|
||||
return `${hours}ч`;
|
||||
return `${String(hours)}ч`;
|
||||
}
|
||||
const days = Math.floor(hours / 8);
|
||||
return `${days}д`;
|
||||
return `${String(days)}д`;
|
||||
}
|
||||
|
||||
interface ColumnsConfig {
|
||||
@ -68,7 +87,16 @@ interface ColumnsConfig {
|
||||
generatingSpecificationId: string | null;
|
||||
}
|
||||
|
||||
export const createColumns = ({ onDelete, onToggleComments, onEstimate, onViewEstimate, onSpecification, expandedId, estimatingId, generatingSpecificationId }: ColumnsConfig) => [
|
||||
export const createColumns = ({
|
||||
onDelete,
|
||||
onToggleComments,
|
||||
onEstimate,
|
||||
onViewEstimate,
|
||||
onSpecification,
|
||||
expandedId,
|
||||
estimatingId,
|
||||
generatingSpecificationId,
|
||||
}: ColumnsConfig) => [
|
||||
columnHelper.display({
|
||||
id: 'drag',
|
||||
header: '',
|
||||
@ -246,7 +274,9 @@ export const createColumns = ({ onDelete, onToggleComments, onEstimate, onViewEs
|
||||
const hasSpecification = !!idea.specification;
|
||||
return (
|
||||
<Box sx={{ display: 'flex', gap: 0.5 }}>
|
||||
<Tooltip title={hasSpecification ? 'Просмотр ТЗ' : 'Сгенерировать ТЗ'}>
|
||||
<Tooltip
|
||||
title={hasSpecification ? 'Просмотр ТЗ' : 'Сгенерировать ТЗ'}
|
||||
>
|
||||
<span>
|
||||
<IconButton
|
||||
size="small"
|
||||
@ -254,7 +284,10 @@ export const createColumns = ({ onDelete, onToggleComments, onEstimate, onViewEs
|
||||
disabled={isGeneratingSpec}
|
||||
color={hasSpecification ? 'primary' : 'default'}
|
||||
data-testid="specification-button"
|
||||
sx={{ opacity: hasSpecification ? 0.9 : 0.5, '&:hover': { opacity: 1 } }}
|
||||
sx={{
|
||||
opacity: hasSpecification ? 0.9 : 0.5,
|
||||
'&:hover': { opacity: 1 },
|
||||
}}
|
||||
>
|
||||
{isGeneratingSpec ? (
|
||||
<CircularProgress size={18} />
|
||||
@ -290,7 +323,11 @@ export const createColumns = ({ onDelete, onToggleComments, onEstimate, onViewEs
|
||||
data-testid="toggle-comments-button"
|
||||
sx={{ opacity: isExpanded ? 1 : 0.5, '&:hover': { opacity: 1 } }}
|
||||
>
|
||||
{isExpanded ? <ExpandLess fontSize="small" /> : <Comment fontSize="small" />}
|
||||
{isExpanded ? (
|
||||
<ExpandLess fontSize="small" />
|
||||
) : (
|
||||
<Comment fontSize="small" />
|
||||
)}
|
||||
</IconButton>
|
||||
</Tooltip>
|
||||
<IconButton
|
||||
|
||||
@ -17,7 +17,6 @@ import {
|
||||
List,
|
||||
ListItem,
|
||||
ListItemText,
|
||||
ListItemSecondaryAction,
|
||||
Divider,
|
||||
Chip,
|
||||
} from '@mui/material';
|
||||
@ -84,7 +83,8 @@ export function SpecificationModal({
|
||||
const [isEditing, setIsEditing] = useState(false);
|
||||
const [editedText, setEditedText] = useState('');
|
||||
const [tabIndex, setTabIndex] = useState(0);
|
||||
const [viewingHistoryItem, setViewingHistoryItem] = useState<SpecificationHistoryItem | null>(null);
|
||||
const [viewingHistoryItem, setViewingHistoryItem] =
|
||||
useState<SpecificationHistoryItem | null>(null);
|
||||
|
||||
// Сбрасываем состояние при открытии/закрытии
|
||||
useEffect(() => {
|
||||
@ -97,12 +97,12 @@ export function SpecificationModal({
|
||||
}, [open, specification]);
|
||||
|
||||
const handleEdit = () => {
|
||||
setEditedText(specification || '');
|
||||
setEditedText(specification ?? '');
|
||||
setIsEditing(true);
|
||||
};
|
||||
|
||||
const handleCancel = () => {
|
||||
setEditedText(specification || '');
|
||||
setEditedText(specification ?? '');
|
||||
setIsEditing(false);
|
||||
};
|
||||
|
||||
@ -152,7 +152,13 @@ export function SpecificationModal({
|
||||
fullWidth
|
||||
data-testid="specification-modal"
|
||||
>
|
||||
<DialogTitle sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start' }}>
|
||||
<DialogTitle
|
||||
sx={{
|
||||
display: 'flex',
|
||||
justifyContent: 'space-between',
|
||||
alignItems: 'flex-start',
|
||||
}}
|
||||
>
|
||||
<Box>
|
||||
<Typography variant="h6" component="span">
|
||||
Техническое задание
|
||||
@ -194,7 +200,7 @@ export function SpecificationModal({
|
||||
{hasHistory && !isEditing && !viewingHistoryItem && (
|
||||
<Tabs
|
||||
value={tabIndex}
|
||||
onChange={(_, newValue) => setTabIndex(newValue)}
|
||||
onChange={(_, newValue: number) => setTabIndex(newValue)}
|
||||
sx={{ px: 3, borderBottom: 1, borderColor: 'divider' }}
|
||||
>
|
||||
<Tab label="Текущее ТЗ" data-testid="specification-tab-current" />
|
||||
@ -225,7 +231,9 @@ export function SpecificationModal({
|
||||
<IconButton
|
||||
size="small"
|
||||
color="primary"
|
||||
onClick={() => handleRestoreFromHistory(viewingHistoryItem.id)}
|
||||
onClick={() =>
|
||||
handleRestoreFromHistory(viewingHistoryItem.id)
|
||||
}
|
||||
disabled={isRestoring}
|
||||
data-testid="specification-restore-button"
|
||||
>
|
||||
@ -236,7 +244,8 @@ export function SpecificationModal({
|
||||
{viewingHistoryItem.ideaDescriptionSnapshot && (
|
||||
<Alert severity="info" sx={{ mb: 2 }}>
|
||||
<Typography variant="caption">
|
||||
Описание идеи на момент генерации: {viewingHistoryItem.ideaDescriptionSnapshot}
|
||||
Описание идеи на момент генерации:{' '}
|
||||
{viewingHistoryItem.ideaDescriptionSnapshot}
|
||||
</Typography>
|
||||
</Alert>
|
||||
)}
|
||||
@ -248,7 +257,11 @@ export function SpecificationModal({
|
||||
borderRadius: 1,
|
||||
maxHeight: '50vh',
|
||||
overflow: 'auto',
|
||||
'& h1, & h2, & h3, & h4, & h5, & h6': { mt: 2, mb: 1, '&:first-of-type': { mt: 0 } },
|
||||
'& h1, & h2, & h3, & h4, & h5, & h6': {
|
||||
mt: 2,
|
||||
mb: 1,
|
||||
'&:first-of-type': { mt: 0 },
|
||||
},
|
||||
'& h1': { fontSize: '1.5rem', fontWeight: 600 },
|
||||
'& h2': { fontSize: '1.25rem', fontWeight: 600 },
|
||||
'& h3': { fontSize: '1.1rem', fontWeight: 600 },
|
||||
@ -256,9 +269,29 @@ export function SpecificationModal({
|
||||
'& ul, & ol': { pl: 3, mb: 1.5 },
|
||||
'& li': { mb: 0.5 },
|
||||
'& strong': { fontWeight: 600 },
|
||||
'& code': { bgcolor: 'grey.200', px: 0.5, py: 0.25, borderRadius: 0.5, fontFamily: 'monospace', fontSize: '0.875em' },
|
||||
'& pre': { bgcolor: 'grey.200', p: 1.5, borderRadius: 1, overflow: 'auto', '& code': { bgcolor: 'transparent', p: 0 } },
|
||||
'& blockquote': { borderLeft: 3, borderColor: 'primary.main', pl: 2, ml: 0, fontStyle: 'italic', color: 'text.secondary' },
|
||||
'& code': {
|
||||
bgcolor: 'grey.200',
|
||||
px: 0.5,
|
||||
py: 0.25,
|
||||
borderRadius: 0.5,
|
||||
fontFamily: 'monospace',
|
||||
fontSize: '0.875em',
|
||||
},
|
||||
'& pre': {
|
||||
bgcolor: 'grey.200',
|
||||
p: 1.5,
|
||||
borderRadius: 1,
|
||||
overflow: 'auto',
|
||||
'& code': { bgcolor: 'transparent', p: 0 },
|
||||
},
|
||||
'& blockquote': {
|
||||
borderLeft: 3,
|
||||
borderColor: 'primary.main',
|
||||
pl: 2,
|
||||
ml: 0,
|
||||
fontStyle: 'italic',
|
||||
color: 'text.secondary',
|
||||
},
|
||||
}}
|
||||
>
|
||||
<Markdown>{viewingHistoryItem.specification}</Markdown>
|
||||
@ -272,7 +305,11 @@ export function SpecificationModal({
|
||||
<TabPanel value={tabIndex} index={0}>
|
||||
{isLoading && (
|
||||
<Box sx={{ py: 4 }} data-testid="specification-loading">
|
||||
<Typography variant="body2" color="text.secondary" gutterBottom>
|
||||
<Typography
|
||||
variant="body2"
|
||||
color="text.secondary"
|
||||
gutterBottom
|
||||
>
|
||||
Генерируем техническое задание...
|
||||
</Typography>
|
||||
<LinearProgress />
|
||||
@ -280,7 +317,11 @@ export function SpecificationModal({
|
||||
)}
|
||||
|
||||
{error && (
|
||||
<Alert severity="error" sx={{ my: 2 }} data-testid="specification-error">
|
||||
<Alert
|
||||
severity="error"
|
||||
sx={{ my: 2 }}
|
||||
data-testid="specification-error"
|
||||
>
|
||||
{error.message || 'Не удалось сгенерировать ТЗ'}
|
||||
</Alert>
|
||||
)}
|
||||
@ -307,7 +348,11 @@ export function SpecificationModal({
|
||||
{!isLoading && !error && !isEditing && specification && (
|
||||
<Box>
|
||||
{idea?.specificationGeneratedAt && (
|
||||
<Typography variant="caption" color="text.secondary" sx={{ mb: 1, display: 'block' }}>
|
||||
<Typography
|
||||
variant="caption"
|
||||
color="text.secondary"
|
||||
sx={{ mb: 1, display: 'block' }}
|
||||
>
|
||||
Сгенерировано: {formatDate(idea.specificationGeneratedAt)}
|
||||
</Typography>
|
||||
)}
|
||||
@ -319,7 +364,11 @@ export function SpecificationModal({
|
||||
borderRadius: 1,
|
||||
maxHeight: '55vh',
|
||||
overflow: 'auto',
|
||||
'& h1, & h2, & h3, & h4, & h5, & h6': { mt: 2, mb: 1, '&:first-of-type': { mt: 0 } },
|
||||
'& h1, & h2, & h3, & h4, & h5, & h6': {
|
||||
mt: 2,
|
||||
mb: 1,
|
||||
'&:first-of-type': { mt: 0 },
|
||||
},
|
||||
'& h1': { fontSize: '1.5rem', fontWeight: 600 },
|
||||
'& h2': { fontSize: '1.25rem', fontWeight: 600 },
|
||||
'& h3': { fontSize: '1.1rem', fontWeight: 600 },
|
||||
@ -327,9 +376,29 @@ export function SpecificationModal({
|
||||
'& ul, & ol': { pl: 3, mb: 1.5 },
|
||||
'& li': { mb: 0.5 },
|
||||
'& strong': { fontWeight: 600 },
|
||||
'& code': { bgcolor: 'grey.200', px: 0.5, py: 0.25, borderRadius: 0.5, fontFamily: 'monospace', fontSize: '0.875em' },
|
||||
'& pre': { bgcolor: 'grey.200', p: 1.5, borderRadius: 1, overflow: 'auto', '& code': { bgcolor: 'transparent', p: 0 } },
|
||||
'& blockquote': { borderLeft: 3, borderColor: 'primary.main', pl: 2, ml: 0, fontStyle: 'italic', color: 'text.secondary' },
|
||||
'& code': {
|
||||
bgcolor: 'grey.200',
|
||||
px: 0.5,
|
||||
py: 0.25,
|
||||
borderRadius: 0.5,
|
||||
fontFamily: 'monospace',
|
||||
fontSize: '0.875em',
|
||||
},
|
||||
'& pre': {
|
||||
bgcolor: 'grey.200',
|
||||
p: 1.5,
|
||||
borderRadius: 1,
|
||||
overflow: 'auto',
|
||||
'& code': { bgcolor: 'transparent', p: 0 },
|
||||
},
|
||||
'& blockquote': {
|
||||
borderLeft: 3,
|
||||
borderColor: 'primary.main',
|
||||
pl: 2,
|
||||
ml: 0,
|
||||
fontStyle: 'italic',
|
||||
color: 'text.secondary',
|
||||
},
|
||||
}}
|
||||
>
|
||||
<Markdown>{specification}</Markdown>
|
||||
@ -353,12 +422,54 @@ export function SpecificationModal({
|
||||
<Box key={item.id}>
|
||||
{index > 0 && <Divider />}
|
||||
<ListItem
|
||||
data-testid={`specification-history-item-${index}`}
|
||||
data-testid={`specification-history-item-${String(index)}`}
|
||||
sx={{ pr: 16 }}
|
||||
secondaryAction={
|
||||
<>
|
||||
<Tooltip title="Просмотреть">
|
||||
<IconButton
|
||||
size="small"
|
||||
onClick={() => handleViewHistoryItem(item)}
|
||||
data-testid={`specification-history-view-${String(index)}`}
|
||||
>
|
||||
<Visibility fontSize="small" />
|
||||
</IconButton>
|
||||
</Tooltip>
|
||||
<Tooltip title="Восстановить">
|
||||
<IconButton
|
||||
size="small"
|
||||
color="primary"
|
||||
onClick={() =>
|
||||
handleRestoreFromHistory(item.id)
|
||||
}
|
||||
disabled={isRestoring}
|
||||
data-testid={`specification-history-restore-${String(index)}`}
|
||||
>
|
||||
<Restore fontSize="small" />
|
||||
</IconButton>
|
||||
</Tooltip>
|
||||
<Tooltip title="Удалить">
|
||||
<IconButton
|
||||
size="small"
|
||||
color="error"
|
||||
onClick={() => onDeleteHistoryItem(item.id)}
|
||||
data-testid={`specification-history-delete-${String(index)}`}
|
||||
>
|
||||
<Delete fontSize="small" />
|
||||
</IconButton>
|
||||
</Tooltip>
|
||||
</>
|
||||
}
|
||||
>
|
||||
<ListItemText
|
||||
primary={
|
||||
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
|
||||
<Box
|
||||
sx={{
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
gap: 1,
|
||||
}}
|
||||
>
|
||||
<Typography variant="body2">
|
||||
{formatDate(item.createdAt)}
|
||||
</Typography>
|
||||
@ -387,38 +498,6 @@ export function SpecificationModal({
|
||||
</Typography>
|
||||
}
|
||||
/>
|
||||
<ListItemSecondaryAction>
|
||||
<Tooltip title="Просмотреть">
|
||||
<IconButton
|
||||
size="small"
|
||||
onClick={() => handleViewHistoryItem(item)}
|
||||
data-testid={`specification-history-view-${index}`}
|
||||
>
|
||||
<Visibility fontSize="small" />
|
||||
</IconButton>
|
||||
</Tooltip>
|
||||
<Tooltip title="Восстановить">
|
||||
<IconButton
|
||||
size="small"
|
||||
color="primary"
|
||||
onClick={() => handleRestoreFromHistory(item.id)}
|
||||
disabled={isRestoring}
|
||||
data-testid={`specification-history-restore-${index}`}
|
||||
>
|
||||
<Restore fontSize="small" />
|
||||
</IconButton>
|
||||
</Tooltip>
|
||||
<Tooltip title="Удалить">
|
||||
<IconButton
|
||||
size="small"
|
||||
color="error"
|
||||
onClick={() => onDeleteHistoryItem(item.id)}
|
||||
data-testid={`specification-history-delete-${index}`}
|
||||
>
|
||||
<Delete fontSize="small" />
|
||||
</IconButton>
|
||||
</Tooltip>
|
||||
</ListItemSecondaryAction>
|
||||
</ListItem>
|
||||
</Box>
|
||||
))}
|
||||
@ -446,9 +525,7 @@ export function SpecificationModal({
|
||||
</Button>
|
||||
</>
|
||||
) : viewingHistoryItem ? (
|
||||
<Button onClick={handleCloseHistoryView}>
|
||||
Назад к текущему ТЗ
|
||||
</Button>
|
||||
<Button onClick={handleCloseHistoryView}>Назад к текущему ТЗ</Button>
|
||||
) : (
|
||||
<Button
|
||||
onClick={onClose}
|
||||
|
||||
@ -20,7 +20,12 @@ import {
|
||||
Alert,
|
||||
} from '@mui/material';
|
||||
import { Add, Edit, Delete } from '@mui/icons-material';
|
||||
import { useRolesQuery, useCreateRole, useUpdateRole, useDeleteRole } from '../../hooks/useRoles';
|
||||
import {
|
||||
useRolesQuery,
|
||||
useCreateRole,
|
||||
useUpdateRole,
|
||||
useDeleteRole,
|
||||
} from '../../hooks/useRoles';
|
||||
import type { Role, CreateRoleDto } from '../../types/team';
|
||||
|
||||
interface RoleModalProps {
|
||||
@ -74,7 +79,13 @@ function RoleModal({ open, onClose, role }: RoleModalProps) {
|
||||
};
|
||||
|
||||
return (
|
||||
<Dialog open={open} onClose={onClose} maxWidth="sm" fullWidth data-testid="role-modal">
|
||||
<Dialog
|
||||
open={open}
|
||||
onClose={onClose}
|
||||
maxWidth="sm"
|
||||
fullWidth
|
||||
data-testid="role-modal"
|
||||
>
|
||||
<form onSubmit={handleSubmit} data-testid="role-form">
|
||||
<DialogTitle>
|
||||
{isEditing ? 'Редактировать роль' : 'Добавить роль'}
|
||||
@ -107,7 +118,9 @@ function RoleModal({ open, onClose, role }: RoleModalProps) {
|
||||
</Box>
|
||||
</DialogContent>
|
||||
<DialogActions>
|
||||
<Button onClick={onClose} data-testid="cancel-role-button">Отмена</Button>
|
||||
<Button onClick={onClose} data-testid="cancel-role-button">
|
||||
Отмена
|
||||
</Button>
|
||||
<Button
|
||||
type="submit"
|
||||
variant="contained"
|
||||
@ -160,15 +173,31 @@ export function RolesManager() {
|
||||
|
||||
return (
|
||||
<Box data-testid="roles-manager">
|
||||
<Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', mb: 2 }}>
|
||||
<Box
|
||||
sx={{
|
||||
display: 'flex',
|
||||
justifyContent: 'space-between',
|
||||
alignItems: 'center',
|
||||
mb: 2,
|
||||
}}
|
||||
>
|
||||
<Typography variant="h6">Управление ролями</Typography>
|
||||
<Button variant="contained" startIcon={<Add />} onClick={handleAdd} data-testid="add-role-button">
|
||||
<Button
|
||||
variant="contained"
|
||||
startIcon={<Add />}
|
||||
onClick={handleAdd}
|
||||
data-testid="add-role-button"
|
||||
>
|
||||
Добавить роль
|
||||
</Button>
|
||||
</Box>
|
||||
|
||||
{deleteError && (
|
||||
<Alert severity="error" sx={{ mb: 2 }} onClose={() => setDeleteError('')}>
|
||||
<Alert
|
||||
severity="error"
|
||||
sx={{ mb: 2 }}
|
||||
onClose={() => setDeleteError('')}
|
||||
>
|
||||
{deleteError}
|
||||
</Alert>
|
||||
)}
|
||||
@ -183,35 +212,58 @@ export function RolesManager() {
|
||||
<TableCell sx={{ fontWeight: 600, backgroundColor: 'grey.100' }}>
|
||||
Отображаемое название
|
||||
</TableCell>
|
||||
<TableCell sx={{ fontWeight: 600, backgroundColor: 'grey.100' }} align="center">
|
||||
<TableCell
|
||||
sx={{ fontWeight: 600, backgroundColor: 'grey.100' }}
|
||||
align="center"
|
||||
>
|
||||
Порядок
|
||||
</TableCell>
|
||||
<TableCell sx={{ fontWeight: 600, backgroundColor: 'grey.100' }} />
|
||||
<TableCell
|
||||
sx={{ fontWeight: 600, backgroundColor: 'grey.100' }}
|
||||
/>
|
||||
</TableRow>
|
||||
</TableHead>
|
||||
<TableBody>
|
||||
{isLoading ? (
|
||||
Array.from({ length: 3 }).map((_, i) => (
|
||||
<TableRow key={i}>
|
||||
<TableCell><Skeleton /></TableCell>
|
||||
<TableCell><Skeleton /></TableCell>
|
||||
<TableCell><Skeleton /></TableCell>
|
||||
<TableCell><Skeleton /></TableCell>
|
||||
<TableCell>
|
||||
<Skeleton />
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Skeleton />
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Skeleton />
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Skeleton />
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
))
|
||||
) : roles.length === 0 ? (
|
||||
<TableRow>
|
||||
<TableCell colSpan={4} sx={{ textAlign: 'center', py: 4 }}>
|
||||
<Typography color="text.secondary" data-testid="roles-empty-state">
|
||||
<Typography
|
||||
color="text.secondary"
|
||||
data-testid="roles-empty-state"
|
||||
>
|
||||
Нет ролей. Добавьте первую роль.
|
||||
</Typography>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
) : (
|
||||
roles.map((role) => (
|
||||
<TableRow key={role.id} hover data-testid={`role-row-${role.id}`}>
|
||||
<TableRow
|
||||
key={role.id}
|
||||
hover
|
||||
data-testid={`role-row-${role.id}`}
|
||||
>
|
||||
<TableCell>
|
||||
<Typography variant="body2" sx={{ fontFamily: 'monospace' }}>
|
||||
<Typography
|
||||
variant="body2"
|
||||
sx={{ fontFamily: 'monospace' }}
|
||||
>
|
||||
{role.name}
|
||||
</Typography>
|
||||
</TableCell>
|
||||
@ -244,7 +296,11 @@ export function RolesManager() {
|
||||
</Table>
|
||||
</TableContainer>
|
||||
|
||||
<RoleModal open={modalOpen} onClose={handleModalClose} role={editingRole} />
|
||||
<RoleModal
|
||||
open={modalOpen}
|
||||
onClose={handleModalClose}
|
||||
role={editingRole}
|
||||
/>
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
|
||||
@ -34,10 +34,15 @@ const defaultProductivity: ProductivityMatrix = {
|
||||
veryComplex: 60,
|
||||
};
|
||||
|
||||
export function TeamMemberModal({ open, onClose, member }: TeamMemberModalProps) {
|
||||
export function TeamMemberModal({
|
||||
open,
|
||||
onClose,
|
||||
member,
|
||||
}: TeamMemberModalProps) {
|
||||
const [name, setName] = useState('');
|
||||
const [roleId, setRoleId] = useState('');
|
||||
const [productivity, setProductivity] = useState<ProductivityMatrix>(defaultProductivity);
|
||||
const [productivity, setProductivity] =
|
||||
useState<ProductivityMatrix>(defaultProductivity);
|
||||
|
||||
const { data: roles = [], isLoading: rolesLoading } = useRolesQuery();
|
||||
const createMember = useCreateTeamMember();
|
||||
@ -72,7 +77,10 @@ export function TeamMemberModal({ open, onClose, member }: TeamMemberModalProps)
|
||||
onClose();
|
||||
};
|
||||
|
||||
const handleProductivityChange = (key: keyof ProductivityMatrix, value: string) => {
|
||||
const handleProductivityChange = (
|
||||
key: keyof ProductivityMatrix,
|
||||
value: string,
|
||||
) => {
|
||||
const num = parseFloat(value) || 0;
|
||||
setProductivity((prev) => ({ ...prev, [key]: num }));
|
||||
};
|
||||
@ -80,7 +88,13 @@ export function TeamMemberModal({ open, onClose, member }: TeamMemberModalProps)
|
||||
const isPending = createMember.isPending || updateMember.isPending;
|
||||
|
||||
return (
|
||||
<Dialog open={open} onClose={onClose} maxWidth="sm" fullWidth data-testid="team-member-modal">
|
||||
<Dialog
|
||||
open={open}
|
||||
onClose={onClose}
|
||||
maxWidth="sm"
|
||||
fullWidth
|
||||
data-testid="team-member-modal"
|
||||
>
|
||||
<form onSubmit={handleSubmit} data-testid="team-member-form">
|
||||
<DialogTitle>
|
||||
{isEditing ? 'Редактировать участника' : 'Добавить участника'}
|
||||
@ -120,31 +134,47 @@ export function TeamMemberModal({ open, onClose, member }: TeamMemberModalProps)
|
||||
Производительность (часы на задачу)
|
||||
</Typography>
|
||||
|
||||
<Box sx={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: 2 }}>
|
||||
{(Object.entries(complexityLabels) as [keyof ProductivityMatrix, string][]).map(
|
||||
([key, label]) => (
|
||||
<TextField
|
||||
key={key}
|
||||
label={label}
|
||||
type="number"
|
||||
size="small"
|
||||
value={productivity[key]}
|
||||
onChange={(e) => handleProductivityChange(key, e.target.value)}
|
||||
slotProps={{
|
||||
input: {
|
||||
endAdornment: <InputAdornment position="end">ч</InputAdornment>,
|
||||
},
|
||||
htmlInput: { min: 0, step: 0.5 },
|
||||
}}
|
||||
/>
|
||||
),
|
||||
)}
|
||||
<Box
|
||||
sx={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: 2 }}
|
||||
>
|
||||
{(
|
||||
Object.entries(complexityLabels) as [
|
||||
keyof ProductivityMatrix,
|
||||
string,
|
||||
][]
|
||||
).map(([key, label]) => (
|
||||
<TextField
|
||||
key={key}
|
||||
label={label}
|
||||
type="number"
|
||||
size="small"
|
||||
value={productivity[key]}
|
||||
onChange={(e) =>
|
||||
handleProductivityChange(key, e.target.value)
|
||||
}
|
||||
slotProps={{
|
||||
input: {
|
||||
endAdornment: (
|
||||
<InputAdornment position="end">ч</InputAdornment>
|
||||
),
|
||||
},
|
||||
htmlInput: { min: 0, step: 0.5 },
|
||||
}}
|
||||
/>
|
||||
))}
|
||||
</Box>
|
||||
</Box>
|
||||
</DialogContent>
|
||||
<DialogActions>
|
||||
<Button onClick={onClose} data-testid="cancel-member-button">Отмена</Button>
|
||||
<Button type="submit" variant="contained" disabled={!name.trim() || !roleId || isPending} data-testid="submit-member-button">
|
||||
<Button onClick={onClose} data-testid="cancel-member-button">
|
||||
Отмена
|
||||
</Button>
|
||||
<Button
|
||||
type="submit"
|
||||
variant="contained"
|
||||
disabled={!name.trim() || !roleId || isPending}
|
||||
data-testid="submit-member-button"
|
||||
>
|
||||
{isEditing ? 'Сохранить' : 'Добавить'}
|
||||
</Button>
|
||||
</DialogActions>
|
||||
|
||||
@ -19,7 +19,11 @@ import {
|
||||
Tab,
|
||||
} from '@mui/material';
|
||||
import { Add, Edit, Delete, Group, Settings } from '@mui/icons-material';
|
||||
import { useTeamQuery, useTeamSummaryQuery, useDeleteTeamMember } from '../../hooks/useTeam';
|
||||
import {
|
||||
useTeamQuery,
|
||||
useTeamSummaryQuery,
|
||||
useDeleteTeamMember,
|
||||
} from '../../hooks/useTeam';
|
||||
import { complexityLabels } from '../../types/team';
|
||||
import type { TeamMember, ProductivityMatrix } from '../../types/team';
|
||||
import { TeamMemberModal } from './TeamMemberModal';
|
||||
@ -56,9 +60,19 @@ export function TeamPage() {
|
||||
<Box data-testid="team-page">
|
||||
{/* Вкладки */}
|
||||
<Box sx={{ borderBottom: 1, borderColor: 'divider', mb: 3 }}>
|
||||
<Tabs value={activeTab} onChange={(_, v) => setActiveTab(v)}>
|
||||
<Tab icon={<Group />} iconPosition="start" label="Участники" data-testid="team-tab-members" />
|
||||
<Tab icon={<Settings />} iconPosition="start" label="Роли" data-testid="team-tab-roles" />
|
||||
<Tabs value={activeTab} onChange={(_, v: number) => setActiveTab(v)}>
|
||||
<Tab
|
||||
icon={<Group />}
|
||||
iconPosition="start"
|
||||
label="Участники"
|
||||
data-testid="team-tab-members"
|
||||
/>
|
||||
<Tab
|
||||
icon={<Settings />}
|
||||
iconPosition="start"
|
||||
label="Роли"
|
||||
data-testid="team-tab-roles"
|
||||
/>
|
||||
</Tabs>
|
||||
</Box>
|
||||
|
||||
@ -66,12 +80,20 @@ export function TeamPage() {
|
||||
<>
|
||||
{/* Сводка по ролям */}
|
||||
<Box sx={{ mb: 3 }} data-testid="team-summary">
|
||||
<Typography variant="h6" sx={{ mb: 2, display: 'flex', alignItems: 'center', gap: 1 }}>
|
||||
<Typography
|
||||
variant="h6"
|
||||
sx={{ mb: 2, display: 'flex', alignItems: 'center', gap: 1 }}
|
||||
>
|
||||
<Group /> Состав команды ({totalMembers})
|
||||
</Typography>
|
||||
<Box sx={{ display: 'flex', gap: 2, flexWrap: 'wrap' }}>
|
||||
{summary.map((item) => (
|
||||
<Card key={item.roleId} variant="outlined" sx={{ minWidth: 150 }} data-testid={`role-card-${item.roleId}`}>
|
||||
<Card
|
||||
key={item.roleId}
|
||||
variant="outlined"
|
||||
sx={{ minWidth: 150 }}
|
||||
data-testid={`role-card-${item.roleId}`}
|
||||
>
|
||||
<CardContent sx={{ py: 1.5, '&:last-child': { pb: 1.5 } }}>
|
||||
<Typography variant="h4" sx={{ fontWeight: 600 }}>
|
||||
{item.count}
|
||||
@ -86,9 +108,21 @@ export function TeamPage() {
|
||||
</Box>
|
||||
|
||||
{/* Таблица участников */}
|
||||
<Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', mb: 2 }}>
|
||||
<Box
|
||||
sx={{
|
||||
display: 'flex',
|
||||
justifyContent: 'space-between',
|
||||
alignItems: 'center',
|
||||
mb: 2,
|
||||
}}
|
||||
>
|
||||
<Typography variant="h6">Участники</Typography>
|
||||
<Button variant="contained" startIcon={<Add />} onClick={handleAdd} data-testid="add-team-member-button">
|
||||
<Button
|
||||
variant="contained"
|
||||
startIcon={<Add />}
|
||||
onClick={handleAdd}
|
||||
data-testid="add-team-member-button"
|
||||
>
|
||||
Добавить
|
||||
</Button>
|
||||
</Box>
|
||||
@ -97,48 +131,91 @@ export function TeamPage() {
|
||||
<Table size="small" data-testid="team-table">
|
||||
<TableHead>
|
||||
<TableRow>
|
||||
<TableCell sx={{ fontWeight: 600, backgroundColor: 'grey.100' }}>Имя</TableCell>
|
||||
<TableCell sx={{ fontWeight: 600, backgroundColor: 'grey.100' }}>Роль</TableCell>
|
||||
{(Object.keys(complexityLabels) as (keyof ProductivityMatrix)[]).map((key) => (
|
||||
<TableCell
|
||||
sx={{ fontWeight: 600, backgroundColor: 'grey.100' }}
|
||||
>
|
||||
Имя
|
||||
</TableCell>
|
||||
<TableCell
|
||||
sx={{ fontWeight: 600, backgroundColor: 'grey.100' }}
|
||||
>
|
||||
Роль
|
||||
</TableCell>
|
||||
{(
|
||||
Object.keys(
|
||||
complexityLabels,
|
||||
) as (keyof ProductivityMatrix)[]
|
||||
).map((key) => (
|
||||
<TableCell
|
||||
key={key}
|
||||
align="center"
|
||||
sx={{ fontWeight: 600, backgroundColor: 'grey.100', fontSize: '0.75rem' }}
|
||||
sx={{
|
||||
fontWeight: 600,
|
||||
backgroundColor: 'grey.100',
|
||||
fontSize: '0.75rem',
|
||||
}}
|
||||
>
|
||||
{complexityLabels[key]}
|
||||
</TableCell>
|
||||
))}
|
||||
<TableCell sx={{ fontWeight: 600, backgroundColor: 'grey.100' }} />
|
||||
<TableCell
|
||||
sx={{ fontWeight: 600, backgroundColor: 'grey.100' }}
|
||||
/>
|
||||
</TableRow>
|
||||
</TableHead>
|
||||
<TableBody>
|
||||
{isLoading ? (
|
||||
Array.from({ length: 3 }).map((_, i) => (
|
||||
<TableRow key={i}>
|
||||
<TableCell><Skeleton /></TableCell>
|
||||
<TableCell><Skeleton /></TableCell>
|
||||
<TableCell>
|
||||
<Skeleton />
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Skeleton />
|
||||
</TableCell>
|
||||
{Array.from({ length: 5 }).map((_, j) => (
|
||||
<TableCell key={j}><Skeleton /></TableCell>
|
||||
<TableCell key={j}>
|
||||
<Skeleton />
|
||||
</TableCell>
|
||||
))}
|
||||
<TableCell><Skeleton /></TableCell>
|
||||
<TableCell>
|
||||
<Skeleton />
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
))
|
||||
) : members.length === 0 ? (
|
||||
<TableRow>
|
||||
<TableCell colSpan={8} sx={{ textAlign: 'center', py: 4 }}>
|
||||
<Typography color="text.secondary" data-testid="team-empty-state">
|
||||
<Typography
|
||||
color="text.secondary"
|
||||
data-testid="team-empty-state"
|
||||
>
|
||||
Команда пока пуста. Добавьте первого участника.
|
||||
</Typography>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
) : (
|
||||
members.map((member) => (
|
||||
<TableRow key={member.id} hover data-testid={`team-member-row-${member.id}`}>
|
||||
<TableCell sx={{ fontWeight: 500 }}>{member.name}</TableCell>
|
||||
<TableCell>
|
||||
<Chip label={member.role.label} size="small" variant="outlined" />
|
||||
<TableRow
|
||||
key={member.id}
|
||||
hover
|
||||
data-testid={`team-member-row-${member.id}`}
|
||||
>
|
||||
<TableCell sx={{ fontWeight: 500 }}>
|
||||
{member.name}
|
||||
</TableCell>
|
||||
{(Object.keys(complexityLabels) as (keyof ProductivityMatrix)[]).map((key) => (
|
||||
<TableCell>
|
||||
<Chip
|
||||
label={member.role.label}
|
||||
size="small"
|
||||
variant="outlined"
|
||||
/>
|
||||
</TableCell>
|
||||
{(
|
||||
Object.keys(
|
||||
complexityLabels,
|
||||
) as (keyof ProductivityMatrix)[]
|
||||
).map((key) => (
|
||||
<TableCell key={key} align="center">
|
||||
{member.productivity[key]}ч
|
||||
</TableCell>
|
||||
|
||||
@ -24,7 +24,9 @@ export function useGenerateSpecification() {
|
||||
onSuccess: (_, ideaId) => {
|
||||
// Инвалидируем кэш идей и историю
|
||||
void queryClient.invalidateQueries({ queryKey: [IDEAS_QUERY_KEY] });
|
||||
void queryClient.invalidateQueries({ queryKey: [SPECIFICATION_HISTORY_KEY, ideaId] });
|
||||
void queryClient.invalidateQueries({
|
||||
queryKey: [SPECIFICATION_HISTORY_KEY, ideaId],
|
||||
});
|
||||
},
|
||||
});
|
||||
}
|
||||
@ -32,7 +34,10 @@ export function useGenerateSpecification() {
|
||||
export function useSpecificationHistory(ideaId: string | null) {
|
||||
return useQuery({
|
||||
queryKey: [SPECIFICATION_HISTORY_KEY, ideaId],
|
||||
queryFn: () => aiApi.getSpecificationHistory(ideaId!),
|
||||
queryFn: () => {
|
||||
if (!ideaId) throw new Error('ideaId is required');
|
||||
return aiApi.getSpecificationHistory(ideaId);
|
||||
},
|
||||
enabled: !!ideaId,
|
||||
});
|
||||
}
|
||||
@ -41,10 +46,13 @@ export function useDeleteSpecificationHistoryItem() {
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
return useMutation({
|
||||
mutationFn: (historyId: string) => aiApi.deleteSpecificationHistoryItem(historyId),
|
||||
mutationFn: (historyId: string) =>
|
||||
aiApi.deleteSpecificationHistoryItem(historyId),
|
||||
onSuccess: () => {
|
||||
// Инвалидируем все запросы истории
|
||||
void queryClient.invalidateQueries({ queryKey: [SPECIFICATION_HISTORY_KEY] });
|
||||
void queryClient.invalidateQueries({
|
||||
queryKey: [SPECIFICATION_HISTORY_KEY],
|
||||
});
|
||||
},
|
||||
});
|
||||
}
|
||||
@ -53,11 +61,14 @@ export function useRestoreSpecificationFromHistory() {
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
return useMutation({
|
||||
mutationFn: (historyId: string) => aiApi.restoreSpecificationFromHistory(historyId),
|
||||
mutationFn: (historyId: string) =>
|
||||
aiApi.restoreSpecificationFromHistory(historyId),
|
||||
onSuccess: () => {
|
||||
// Инвалидируем кэш идей и историю
|
||||
void queryClient.invalidateQueries({ queryKey: [IDEAS_QUERY_KEY] });
|
||||
void queryClient.invalidateQueries({ queryKey: [SPECIFICATION_HISTORY_KEY] });
|
||||
void queryClient.invalidateQueries({
|
||||
queryKey: [SPECIFICATION_HISTORY_KEY],
|
||||
});
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
@ -8,19 +8,22 @@ export interface User {
|
||||
}
|
||||
|
||||
export function useAuth() {
|
||||
const tokenParsed = keycloak.tokenParsed as {
|
||||
sub?: string;
|
||||
name?: string;
|
||||
preferred_username?: string;
|
||||
email?: string;
|
||||
given_name?: string;
|
||||
family_name?: string;
|
||||
} | undefined;
|
||||
const tokenParsed = keycloak.tokenParsed as
|
||||
| {
|
||||
sub?: string;
|
||||
name?: string;
|
||||
preferred_username?: string;
|
||||
email?: string;
|
||||
given_name?: string;
|
||||
family_name?: string;
|
||||
}
|
||||
| undefined;
|
||||
|
||||
const user: User | null = tokenParsed
|
||||
? {
|
||||
id: tokenParsed.sub ?? '',
|
||||
name: tokenParsed.name ?? tokenParsed.preferred_username ?? 'Пользователь',
|
||||
name:
|
||||
tokenParsed.name ?? tokenParsed.preferred_username ?? 'Пользователь',
|
||||
email: tokenParsed.email ?? '',
|
||||
username: tokenParsed.preferred_username ?? '',
|
||||
}
|
||||
@ -32,7 +35,7 @@ export function useAuth() {
|
||||
|
||||
return {
|
||||
user,
|
||||
isAuthenticated: keycloak.authenticated ?? false,
|
||||
isAuthenticated: keycloak.authenticated,
|
||||
logout,
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,7 +5,10 @@ import type { CreateCommentDto } from '../types/comment';
|
||||
export function useCommentsQuery(ideaId: string | null) {
|
||||
return useQuery({
|
||||
queryKey: ['comments', ideaId],
|
||||
queryFn: () => commentsApi.getByIdeaId(ideaId!),
|
||||
queryFn: () => {
|
||||
if (!ideaId) throw new Error('ideaId is required');
|
||||
return commentsApi.getByIdeaId(ideaId);
|
||||
},
|
||||
enabled: !!ideaId,
|
||||
});
|
||||
}
|
||||
@ -17,7 +20,9 @@ export function useCreateComment() {
|
||||
mutationFn: ({ ideaId, dto }: { ideaId: string; dto: CreateCommentDto }) =>
|
||||
commentsApi.create(ideaId, dto),
|
||||
onSuccess: (_, variables) => {
|
||||
queryClient.invalidateQueries({ queryKey: ['comments', variables.ideaId] });
|
||||
void queryClient.invalidateQueries({
|
||||
queryKey: ['comments', variables.ideaId],
|
||||
});
|
||||
},
|
||||
});
|
||||
}
|
||||
@ -29,7 +34,9 @@ export function useDeleteComment() {
|
||||
mutationFn: (params: { id: string; ideaId: string }) =>
|
||||
commentsApi.delete(params.id),
|
||||
onSuccess: (_, variables) => {
|
||||
queryClient.invalidateQueries({ queryKey: ['comments', variables.ideaId] });
|
||||
void queryClient.invalidateQueries({
|
||||
queryKey: ['comments', variables.ideaId],
|
||||
});
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
@ -22,7 +22,7 @@ export function useCreateTeamMember() {
|
||||
return useMutation({
|
||||
mutationFn: (dto: CreateTeamMemberDto) => teamApi.create(dto),
|
||||
onSuccess: () => {
|
||||
queryClient.invalidateQueries({ queryKey: ['team'] });
|
||||
void queryClient.invalidateQueries({ queryKey: ['team'] });
|
||||
},
|
||||
});
|
||||
}
|
||||
@ -34,7 +34,7 @@ export function useUpdateTeamMember() {
|
||||
mutationFn: ({ id, dto }: { id: string; dto: UpdateTeamMemberDto }) =>
|
||||
teamApi.update(id, dto),
|
||||
onSuccess: () => {
|
||||
queryClient.invalidateQueries({ queryKey: ['team'] });
|
||||
void queryClient.invalidateQueries({ queryKey: ['team'] });
|
||||
},
|
||||
});
|
||||
}
|
||||
@ -45,7 +45,7 @@ export function useDeleteTeamMember() {
|
||||
return useMutation({
|
||||
mutationFn: (id: string) => teamApi.delete(id),
|
||||
onSuccess: () => {
|
||||
queryClient.invalidateQueries({ queryKey: ['team'] });
|
||||
void queryClient.invalidateQueries({ queryKey: ['team'] });
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
import { api } from './api';
|
||||
import type { IdeaComplexity, RoleEstimate, SpecificationResult, SpecificationHistoryItem } from '../types/idea';
|
||||
import type {
|
||||
IdeaComplexity,
|
||||
RoleEstimate,
|
||||
SpecificationResult,
|
||||
SpecificationHistoryItem,
|
||||
} from '../types/idea';
|
||||
|
||||
export interface EstimateResult {
|
||||
ideaId: string;
|
||||
@ -17,13 +22,22 @@ export const aiApi = {
|
||||
return data;
|
||||
},
|
||||
|
||||
generateSpecification: async (ideaId: string): Promise<SpecificationResult> => {
|
||||
const { data } = await api.post<SpecificationResult>('/ai/generate-specification', { ideaId });
|
||||
generateSpecification: async (
|
||||
ideaId: string,
|
||||
): Promise<SpecificationResult> => {
|
||||
const { data } = await api.post<SpecificationResult>(
|
||||
'/ai/generate-specification',
|
||||
{ ideaId },
|
||||
);
|
||||
return data;
|
||||
},
|
||||
|
||||
getSpecificationHistory: async (ideaId: string): Promise<SpecificationHistoryItem[]> => {
|
||||
const { data } = await api.get<SpecificationHistoryItem[]>(`/ai/specification-history/${ideaId}`);
|
||||
getSpecificationHistory: async (
|
||||
ideaId: string,
|
||||
): Promise<SpecificationHistoryItem[]> => {
|
||||
const { data } = await api.get<SpecificationHistoryItem[]>(
|
||||
`/ai/specification-history/${ideaId}`,
|
||||
);
|
||||
return data;
|
||||
},
|
||||
|
||||
@ -31,8 +45,12 @@ export const aiApi = {
|
||||
await api.delete(`/ai/specification-history/${historyId}`);
|
||||
},
|
||||
|
||||
restoreSpecificationFromHistory: async (historyId: string): Promise<SpecificationResult> => {
|
||||
const { data } = await api.post<SpecificationResult>(`/ai/specification-history/${historyId}/restore`);
|
||||
restoreSpecificationFromHistory: async (
|
||||
historyId: string,
|
||||
): Promise<SpecificationResult> => {
|
||||
const { data } = await api.post<SpecificationResult>(
|
||||
`/ai/specification-history/${historyId}/restore`,
|
||||
);
|
||||
return data;
|
||||
},
|
||||
};
|
||||
|
||||
@ -8,7 +8,10 @@ export const commentsApi = {
|
||||
},
|
||||
|
||||
create: async (ideaId: string, dto: CreateCommentDto): Promise<Comment> => {
|
||||
const response = await api.post<Comment>(`/api/ideas/${ideaId}/comments`, dto);
|
||||
const response = await api.post<Comment>(
|
||||
`/api/ideas/${ideaId}/comments`,
|
||||
dto,
|
||||
);
|
||||
return response.data;
|
||||
},
|
||||
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
import { api } from './api';
|
||||
import type { TeamMember, CreateTeamMemberDto, UpdateTeamMemberDto, TeamSummary } from '../types/team';
|
||||
import type {
|
||||
TeamMember,
|
||||
CreateTeamMemberDto,
|
||||
UpdateTeamMemberDto,
|
||||
TeamSummary,
|
||||
} from '../types/team';
|
||||
|
||||
export const teamApi = {
|
||||
getAll: async (): Promise<TeamMember[]> => {
|
||||
|
||||
@ -6,7 +6,12 @@ export type IdeaStatus =
|
||||
| 'cancelled';
|
||||
export type IdeaPriority = 'low' | 'medium' | 'high' | 'critical';
|
||||
|
||||
export type IdeaComplexity = 'trivial' | 'simple' | 'medium' | 'complex' | 'veryComplex';
|
||||
export type IdeaComplexity =
|
||||
| 'trivial'
|
||||
| 'simple'
|
||||
| 'medium'
|
||||
| 'complex'
|
||||
| 'veryComplex';
|
||||
|
||||
export interface RoleEstimate {
|
||||
role: string;
|
||||
|
||||
@ -13,7 +13,7 @@ export interface CreateRoleDto {
|
||||
sortOrder?: number;
|
||||
}
|
||||
|
||||
export interface UpdateRoleDto extends Partial<CreateRoleDto> {}
|
||||
export type UpdateRoleDto = Partial<CreateRoleDto>;
|
||||
|
||||
export interface ProductivityMatrix {
|
||||
trivial: number;
|
||||
@ -39,7 +39,7 @@ export interface CreateTeamMemberDto {
|
||||
productivity?: ProductivityMatrix;
|
||||
}
|
||||
|
||||
export interface UpdateTeamMemberDto extends Partial<CreateTeamMemberDto> {}
|
||||
export type UpdateTeamMemberDto = Partial<CreateTeamMemberDto>;
|
||||
|
||||
export interface TeamSummary {
|
||||
roleId: string;
|
||||
|
||||
Reference in New Issue
Block a user