diff --git a/worklenz-frontend/src/components/board/taskCard/TaskCard.tsx b/worklenz-frontend/src/components/board/taskCard/TaskCard.tsx index 6856a693..fe6651f1 100644 --- a/worklenz-frontend/src/components/board/taskCard/TaskCard.tsx +++ b/worklenz-frontend/src/components/board/taskCard/TaskCard.tsx @@ -284,7 +284,7 @@ const TaskCard: React.FC = ({ task }) => { format={value => formatDate(value)} /> - {task.sub_tasks_count && task.sub_tasks_count > 0 && ( + {task.sub_tasks_count && task.sub_tasks_count > 1 && ( + + + {task.sub_tasks_count || 0} + {task.show_sub_tasks ? : } + + + )} diff --git a/worklenz-frontend/src/components/kanban-board-management-v2/kanbanTaskCard.tsx b/worklenz-frontend/src/components/kanban-board-management-v2/kanbanTaskCard.tsx index f3862cbd..be35f8c7 100644 --- a/worklenz-frontend/src/components/kanban-board-management-v2/kanbanTaskCard.tsx +++ b/worklenz-frontend/src/components/kanban-board-management-v2/kanbanTaskCard.tsx @@ -195,12 +195,12 @@ const KanbanTaskCard: React.FC = ({ {task.time_spent_string} )} - {task.comments_count && task.comments_count > 0 && ( + {task.comments_count && task.comments_count > 1 && ( {task.comments_count} )} - {task.attachments_count && task.attachments_count > 0 && ( + {task.attachments_count && task.attachments_count > 1 && ( {task.attachments_count} diff --git a/worklenz-frontend/src/components/task-list-v2/TaskRow.tsx b/worklenz-frontend/src/components/task-list-v2/TaskRow.tsx index 152340d1..30467a66 100644 --- a/worklenz-frontend/src/components/task-list-v2/TaskRow.tsx +++ b/worklenz-frontend/src/components/task-list-v2/TaskRow.tsx @@ -1,8 +1,8 @@ import React, { memo, useMemo, useCallback, useState } from 'react'; import { useSortable } from '@dnd-kit/sortable'; import { CSS } from '@dnd-kit/utilities'; -import { CheckCircleOutlined, HolderOutlined, CloseOutlined, DownOutlined, RightOutlined, DoubleRightOutlined, ArrowsAltOutlined } from '@ant-design/icons'; -import { Checkbox, DatePicker } from 'antd'; +import { CheckCircleOutlined, HolderOutlined, CloseOutlined, DownOutlined, RightOutlined, DoubleRightOutlined, ArrowsAltOutlined, CommentOutlined, EyeOutlined, PaperClipOutlined, MinusCircleOutlined, RetweetOutlined } from '@ant-design/icons'; +import { Checkbox, DatePicker, Tooltip } from 'antd'; import { dayjs, taskManagementAntdConfig } from '@/shared/antd-imports'; import { Task } from '@/types/task-management.types'; import { InlineMember } from '@/types/teamMembers/inlineMember.types'; @@ -49,7 +49,6 @@ interface TaskLabelsCellProps { } const TaskLabelsCell: React.FC = memo(({ labels, isDarkMode }) => { - console.log('labels', labels); if (!labels) { return null; } @@ -302,7 +301,7 @@ const TaskRow: React.FC = memo(({ taskId, projectId, visibleColumn ) : ( { - if (!taskId) return null; + if (!taskId || subTasksCount <= 1) return null; return (