feat(enhanced-kanban): enhance EnhancedKanbanTaskCard with improved task interaction and display
- Refactored EnhancedKanbanTaskCard to include new features such as task labels rendering, progress display, and a custom due date picker. - Implemented click handling to open a task drawer for detailed task management. - Enhanced UI with Ant Design components for better visual feedback and user interaction.
This commit is contained in:
@@ -1,9 +1,25 @@
|
|||||||
import React from 'react';
|
import React, { useCallback, useMemo, useState } from 'react';
|
||||||
import { useSortable, defaultAnimateLayoutChanges } from '@dnd-kit/sortable';
|
import { useSortable, defaultAnimateLayoutChanges } from '@dnd-kit/sortable';
|
||||||
import { CSS } from '@dnd-kit/utilities';
|
import { CSS } from '@dnd-kit/utilities';
|
||||||
import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
|
import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
|
||||||
import { useAppSelector } from '@/hooks/useAppSelector';
|
import { useAppSelector } from '@/hooks/useAppSelector';
|
||||||
import './EnhancedKanbanTaskCard.css';
|
import './EnhancedKanbanTaskCard.css';
|
||||||
|
import Flex from 'antd/es/flex';
|
||||||
|
import Tag from 'antd/es/tag';
|
||||||
|
import Tooltip from 'antd/es/tooltip';
|
||||||
|
import Progress from 'antd/es/progress';
|
||||||
|
import Button from 'antd/es/button';
|
||||||
|
import { useAppDispatch } from '@/hooks/useAppDispatch';
|
||||||
|
import { setShowTaskDrawer, setSelectedTaskId } from '@/features/task-drawer/task-drawer.slice';
|
||||||
|
import PrioritySection from '../board/taskCard/priority-section/priority-section';
|
||||||
|
import Typography from 'antd/es/typography';
|
||||||
|
import CustomAvatarGroup from '../board/custom-avatar-group';
|
||||||
|
import CustomDueDatePicker from '../board/custom-due-date-picker';
|
||||||
|
import { themeWiseColor } from '@/utils/themeWiseColor';
|
||||||
|
import { ForkOutlined } from '@ant-design/icons';
|
||||||
|
import { Dayjs } from 'dayjs';
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
import { CaretDownFilled, CaretRightFilled } from '@ant-design/icons';
|
||||||
|
|
||||||
interface EnhancedKanbanTaskCardProps {
|
interface EnhancedKanbanTaskCardProps {
|
||||||
task: IProjectTask;
|
task: IProjectTask;
|
||||||
@@ -18,8 +34,12 @@ const EnhancedKanbanTaskCard: React.FC<EnhancedKanbanTaskCardProps> = React.memo
|
|||||||
isDragOverlay = false,
|
isDragOverlay = false,
|
||||||
isDropTarget = false
|
isDropTarget = false
|
||||||
}) => {
|
}) => {
|
||||||
|
const dispatch = useAppDispatch();
|
||||||
const themeMode = useAppSelector(state => state.themeReducer.mode);
|
const themeMode = useAppSelector(state => state.themeReducer.mode);
|
||||||
|
const [dueDate, setDueDate] = useState<Dayjs | null>(
|
||||||
|
task?.end_date ? dayjs(task?.end_date) : null
|
||||||
|
);
|
||||||
|
const [isSubTaskShow, setIsSubTaskShow] = useState(false);
|
||||||
const {
|
const {
|
||||||
attributes,
|
attributes,
|
||||||
listeners,
|
listeners,
|
||||||
@@ -44,6 +64,39 @@ const EnhancedKanbanTaskCard: React.FC<EnhancedKanbanTaskCardProps> = React.memo
|
|||||||
backgroundColor: themeMode === 'dark' ? '#292929' : '#fafafa',
|
backgroundColor: themeMode === 'dark' ? '#292929' : '#fafafa',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleCardClick = useCallback((e: React.MouseEvent, id: string) => {
|
||||||
|
// Prevent the event from propagating to parent elements
|
||||||
|
e.stopPropagation();
|
||||||
|
|
||||||
|
// Don't handle click if we're dragging
|
||||||
|
if (isDragging) return;
|
||||||
|
|
||||||
|
// Add a small delay to ensure it's a click and not the start of a drag
|
||||||
|
const clickTimeout = setTimeout(() => {
|
||||||
|
dispatch(setSelectedTaskId(id));
|
||||||
|
dispatch(setShowTaskDrawer(true));
|
||||||
|
}, 50);
|
||||||
|
|
||||||
|
return () => clearTimeout(clickTimeout);
|
||||||
|
}, [dispatch, isDragging]);
|
||||||
|
|
||||||
|
const renderLabels = useMemo(() => {
|
||||||
|
if (!task?.labels?.length) return null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{task.labels.slice(0, 2).map((label: any) => (
|
||||||
|
<Tag key={label.id} style={{ marginRight: '2px' }} color={label?.color_code}>
|
||||||
|
<span style={{ color: themeMode === 'dark' ? '#383838' : '', fontSize: 10 }}>
|
||||||
|
{label.name}
|
||||||
|
</span>
|
||||||
|
</Tag>
|
||||||
|
))}
|
||||||
|
{task.labels.length > 2 && <Tag>+ {task.labels.length - 2}</Tag>}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}, [task.labels, themeMode]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
ref={setNodeRef}
|
ref={setNodeRef}
|
||||||
@@ -52,14 +105,63 @@ const EnhancedKanbanTaskCard: React.FC<EnhancedKanbanTaskCardProps> = React.memo
|
|||||||
{...attributes}
|
{...attributes}
|
||||||
{...listeners}
|
{...listeners}
|
||||||
>
|
>
|
||||||
<div className="task-content">
|
<div className="task-content" onClick={e => handleCardClick(e, task.id || '')}>
|
||||||
<div className="task-title" title={task.name}>{task.name}</div>
|
<Flex align="center" justify="space-between" className="mb-2">
|
||||||
{/* {task.task_key && <div className="task-key">{task.task_key}</div>} */}
|
<Flex>
|
||||||
{task.assignees && task.assignees.length > 0 && (
|
{renderLabels}
|
||||||
<div className="task-assignees">
|
</Flex>
|
||||||
Assignees: {task.assignees.map(a => a.name).join(', ')}
|
|
||||||
</div>
|
<Tooltip title={` ${task?.completed_count} / ${task?.total_tasks_count}`}>
|
||||||
)}
|
<Progress type="circle" percent={task?.complete_ratio} size={24} strokeWidth={(task.complete_ratio || 0) >= 100 ? 9 : 7} />
|
||||||
|
</Tooltip>
|
||||||
|
</Flex>
|
||||||
|
<Flex gap={4} align="center">
|
||||||
|
{/* Action Icons */}
|
||||||
|
<PrioritySection task={task} />
|
||||||
|
<Typography.Text
|
||||||
|
style={{ fontWeight: 500 }}
|
||||||
|
ellipsis={{ tooltip: task.name }}
|
||||||
|
>
|
||||||
|
{task.name}
|
||||||
|
</Typography.Text>
|
||||||
|
</Flex>
|
||||||
|
<Flex
|
||||||
|
align="center"
|
||||||
|
justify="space-between"
|
||||||
|
style={{
|
||||||
|
marginBlock: 8,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{task && <CustomAvatarGroup task={task} sectionId={task.status_id || ''} />}
|
||||||
|
|
||||||
|
<Flex gap={4} align="center">
|
||||||
|
<CustomDueDatePicker task={task} onDateChange={setDueDate} />
|
||||||
|
|
||||||
|
{/* Subtask Section */}
|
||||||
|
<Button
|
||||||
|
// onClick={handleSubtaskButtonClick}
|
||||||
|
size="small"
|
||||||
|
style={{
|
||||||
|
padding: 0,
|
||||||
|
}}
|
||||||
|
type="text"
|
||||||
|
>
|
||||||
|
<Tag
|
||||||
|
bordered={false}
|
||||||
|
style={{
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
margin: 0,
|
||||||
|
backgroundColor: themeWiseColor('white', '#1e1e1e', themeMode),
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<ForkOutlined rotate={90} />
|
||||||
|
<span>{task.sub_tasks_count}</span>
|
||||||
|
{isSubTaskShow ? <CaretDownFilled /> : <CaretRightFilled />}
|
||||||
|
</Tag>
|
||||||
|
</Button>
|
||||||
|
</Flex>
|
||||||
|
</Flex>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user