diff --git a/worklenz-frontend/src/components/task-list-v2/TaskListV2.tsx b/worklenz-frontend/src/components/task-list-v2/TaskListV2.tsx index 3d03267e..0d6f5df4 100644 --- a/worklenz-frontend/src/components/task-list-v2/TaskListV2.tsx +++ b/worklenz-frontend/src/components/task-list-v2/TaskListV2.tsx @@ -471,7 +471,7 @@ const TaskListV2: React.FC = () => { // Render column headers const renderColumnHeaders = useCallback(() => (
-
+
{visibleColumns.map((column, index) => { const columnStyle: ColumnStyle = { width: column.width, @@ -490,7 +490,21 @@ const TaskListV2: React.FC = () => {
@@ -508,7 +522,7 @@ const TaskListV2: React.FC = () => { ); })} {/* Add Custom Column Button - positioned at the end and scrolls with content */} -
+
diff --git a/worklenz-frontend/src/components/task-list-v2/TaskRow.tsx b/worklenz-frontend/src/components/task-list-v2/TaskRow.tsx index 08303a4b..b3130cf8 100644 --- a/worklenz-frontend/src/components/task-list-v2/TaskRow.tsx +++ b/worklenz-frontend/src/components/task-list-v2/TaskRow.tsx @@ -417,9 +417,9 @@ const TaskRow: React.FC = memo(({ taskId, projectId, visibleColumn case 'description': return ( -
+
= memo(({ taskId, projectId, visibleColumn case 'status': return ( -
+
= memo(({ taskId, projectId, visibleColumn case 'priority': return ( -
+
= memo(({ taskId, projectId, visibleColumn case 'dueDate': return ( -
+
{activeDatePicker === 'dueDate' ? (
= memo(({ taskId, projectId, visibleColumn
) : (
{ e.stopPropagation(); datePickerHandlers.setDueDate(); @@ -532,7 +532,7 @@ const TaskRow: React.FC = memo(({ taskId, projectId, visibleColumn case 'progress': return ( -
+
{task.progress !== undefined && task.progress >= 0 && (task.progress === 100 ? ( @@ -556,7 +556,7 @@ const TaskRow: React.FC = memo(({ taskId, projectId, visibleColumn case 'labels': return ( -
+
@@ -582,18 +582,22 @@ const TaskRow: React.FC = memo(({ taskId, projectId, visibleColumn case 'estimation': return ( -
- {task.timeTracking?.estimated && ( +
+ {task.timeTracking?.estimated ? ( {task.timeTracking.estimated}h + ) : ( + + 0 + )}
); case 'startDate': return ( -
+
{activeDatePicker === 'startDate' ? (
= memo(({ taskId, projectId, visibleColumn
) : (
{ e.stopPropagation(); datePickerHandlers.setStartDate(); @@ -651,42 +655,50 @@ const TaskRow: React.FC = memo(({ taskId, projectId, visibleColumn case 'completedDate': return ( -
- {formattedDates.completed && ( +
+ {formattedDates.completed ? ( {formattedDates.completed} + ) : ( + - )}
); case 'createdDate': return ( -
- {formattedDates.created && ( +
+ {formattedDates.created ? ( {formattedDates.created} + ) : ( + - )}
); case 'lastUpdated': return ( -
- {formattedDates.updated && ( +
+ {formattedDates.updated ? ( {formattedDates.updated} + ) : ( + - )}
); case 'reporter': return ( -
- {task.reporter && ( +
+ {task.reporter ? ( {task.reporter} + ) : ( + - )}
); @@ -696,7 +708,7 @@ const TaskRow: React.FC = memo(({ taskId, projectId, visibleColumn const column = visibleColumns.find(col => col.id === columnId); if (column && (column.custom_column || column.isCustom) && updateTaskCustomColumnValue) { return ( -
+