Skip to content

Commit f93aa3e

Browse files
Merge pull request #586 from CodebilityDev/archives-fix&taskdeletion-fix/juryyy
Archives fix&taskdeletion fix/juryyy
2 parents b6e51e0 + c56c9d5 commit f93aa3e

2 files changed

Lines changed: 14 additions & 6 deletions

File tree

‎apps/codebility/app/home/kanban/[projectId]/[id]/_components/ArchiveColumn.tsx‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default function ArchiveColumn({ projectId, boardId }: ArchiveColumnProps
3535
const fetchArchivedTasks = async () => {
3636
setIsLoading(true);
3737
try {
38-
// First get all column IDs for this board
38+
3939
const { data: columns, error: columnsError } = await supabase
4040
.from("kanban_columns")
4141
.select("id")
@@ -50,7 +50,7 @@ export default function ArchiveColumn({ projectId, boardId }: ArchiveColumnProps
5050
return;
5151
}
5252

53-
// Then fetch archived tasks for these columns
53+
5454
const { data: tasks, error: tasksError } = await supabase
5555
.from("tasks")
5656
.select(`
@@ -61,6 +61,7 @@ export default function ArchiveColumn({ projectId, boardId }: ArchiveColumnProps
6161
difficulty,
6262
type,
6363
due_date,
64+
deadline,
6465
points,
6566
pr_link,
6667
sidekick_ids,
@@ -70,6 +71,7 @@ export default function ArchiveColumn({ projectId, boardId }: ArchiveColumnProps
7071
created_at,
7172
updated_at,
7273
skill_category_id,
74+
codev_id,
7375
codev!tasks_codev_id_fkey (
7476
id,
7577
first_name,
@@ -99,7 +101,7 @@ export default function ArchiveColumn({ projectId, boardId }: ArchiveColumnProps
99101
fetchArchivedTasks();
100102
}, [supabase, boardId]);
101103

102-
// Automatically open the task modal if a taskId is highlighted in the URL
104+
103105
useEffect(() => {
104106
if (highlightTaskId && archivedTasks.length > 0) {
105107
const task = archivedTasks.find(t => t.id === highlightTaskId);
@@ -113,14 +115,18 @@ export default function ArchiveColumn({ projectId, boardId }: ArchiveColumnProps
113115
if (!supabase) return;
114116

115117
try {
118+
119+
await supabase.from("tasks_comments").delete().eq("task_id", taskId);
120+
await supabase.from("task_ticket_codes").delete().eq("task_id", taskId);
121+
116122
const { error } = await supabase
117123
.from("tasks")
118124
.delete()
119125
.eq("id", taskId);
120126

121127
if (error) throw error;
122128

123-
// Remove from local state
129+
124130
setArchivedTasks(prev => prev.filter(task => task.id !== taskId));
125131
toast.success("Task deleted successfully");
126132
} catch (error) {

‎apps/codebility/app/home/kanban/[projectId]/[id]/actions.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,10 @@ export const createNewTask = async (
220220
if (boardData?.project_id) {
221221
revalidatePath(`/home/kanban/${boardData.project_id}/${columnData.board_id}`);
222222

223-
// Send notification if task is assigned to someone other than the creator
224223
if (codev_id && newTask?.id) {
225224
const { data: { user } } = await supabase.auth.getUser();
226225

227-
// Only send notification if assigning to someone else
226+
228227
if (user && user.id !== codev_id) {
229228
await createNotificationAction({
230229
recipientId: codev_id,
@@ -367,6 +366,9 @@ export const deleteTask = async (
367366
.eq("id", taskId)
368367
.single();
369368

369+
await supabase.from("tasks_comments").delete().eq("task_id", taskId);
370+
await supabase.from("task_ticket_codes").delete().eq("task_id", taskId);
371+
370372
const { error } = await supabase.from("tasks").delete().eq("id", taskId);
371373

372374
if (error) {

0 commit comments

Comments
 (0)