Merge branch 'dev' into dashboard-current-project/fix-bugs

Author: Jecomo-Alyssa-Lyn

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

@@ -1,6 +1,6 @@
 "use client";
 
-import { memo, useCallback, useEffect, useMemo, useState } from "react";
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import Link from "next/link";
 import KanbanBoardsSearch from "@/app/home/kanban/_components/KanbanBoardsSearch";
 import { getMembers } from "@/app/home/projects/actions";
@@ -18,6 +18,7 @@ import KanbanColumnAddButton from "./kanban_modals/KanbanColumnAddButton";
 import KanbanColumnAddModal from "./kanban_modals/KanbanColumnAddModal";
 import KanbanBoardColumnContainer from "./KanbanBoardColumnContainer";
 import UserTaskFilter from "./UserTaskFilter";
+import { useKanbanTaskUrlModal } from "@/hooks/useKanbanTaskUrlModal";
 
 interface KanbanBoardProps {
   boardData: KanbanBoardType & { kanban_columns: KanbanColumnType[] };
@@ -32,6 +33,9 @@ interface KanbanBoardProps {
 function KanbanBoard({ boardData, projectId }: KanbanBoardProps) {
   const user = useUserStore((state) => state.user);
 
+  // Sync the Kanban task modal with the URL ?taskId param
+  useKanbanTaskUrlModal(boardData);
+
   // User permissions - simple boolean checks following YAGNI principle
   const canAddColumn = user?.role_id === 1 || user?.role_id === 5;
   const canAddMember = canAddColumn;

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

@@ -168,7 +168,7 @@ export default function KanbanColumn({
       toast.error(response.error || "Failed to update column name");
     }
   };
-
+  
   return (
     <li
       ref={setColumnRef}

apps/codebility/app/home/kanban/[projectId]/[id]/_components/kanban_modals/KanbanTaskViewEditModal.tsx

@@ -3,6 +3,7 @@
 import { ReactNode, memo, useCallback } from "react";
 import { useModal } from "@/hooks/use-modal";
 import { ExtendedTask } from "@/types/home/codev";
+import { usePathname, useRouter } from "next/navigation";
 
 interface Props {
   children: ReactNode;
@@ -15,9 +16,12 @@ function KanbanTaskViewEditModal({
   task,
   onComplete,
 }: Props) {
+  const router = useRouter();
+  const pathname = usePathname();
   const { onOpen } = useModal();
 
   const handleClick = useCallback(() => {
+    router.push(`${pathname}?taskId=${task.id}`, { scroll: false });
     onOpen("taskViewModal", task, onComplete);
   }, [onOpen, task, onComplete]);
 

apps/codebility/app/home/kanban/[projectId]/[id]/_components/tasks/TaskViewModal.tsx

@@ -691,7 +691,12 @@ const TaskViewModal = ({
           <div className="flex items-center justify-between">
             <DialogHeader>
               <DialogTitle className="text-xl font-bold text-gray-900 dark:text-white">
-                {task?.title}
+                  {task?.title}{" "}
+                  {task?.ticket_code && (
+                    <span className="ml-1 text-gray-500 dark:text-gray-400 font-normal">
+                      #{task.ticket_code}
+                    </span>
+                  )}
               </DialogTitle>
             </DialogHeader>
             {canModifyTask && (
@@ -968,6 +973,36 @@ const TaskViewModal = ({
 
           <DialogFooter className="mt-4 flex justify-end">
             {/*Previous style: flex gap-6 sm:justify-end */}
+            {/* Copy URL button */}
+            <Button
+              onClick={() => {
+                if (!task?.id) {
+                  toast.error("Cannot copy URL: Task ID is missing");
+                  return;
+                }
+
+                const baseUrl = window.location.origin; // gets the website domain
+                const url = task.ticket_code
+                  ? `${baseUrl}/home/kanban/ticket/${task.ticket_code}`
+                  : new URL(window.location.href).toString();
+
+                navigator.clipboard.writeText(url);
+                toast.success("Task URL copied to clipboard");
+              }}
+              style={{
+                backgroundColor: "#2563EB",
+                color: "white",
+                padding: "6px 16px",
+                fontSize: "14px",
+                borderRadius: "4px",
+                border: "none",
+                minWidth: "auto",
+                width: "auto",
+              }}
+            >
+              Copy URL
+            </Button>
+        
             {/* VIEWING MODE: Show Close when just viewing (no changes) */}
             {!hasUnsavedChanges && (
               <Button

apps/codebility/app/home/kanban/[projectId]/[id]/_services/query.ts

@@ -5,12 +5,11 @@ import { createClientServerComponent } from "@/utils/supabase/server";
 export const getBoardData = async (boardId: String) => {
   try {
     const supabase = await createClientServerComponent();
-  
-    // Fetch board with columns
+
+    // Fetch the board and its columns
     const { data: boardData, error } = await supabase
       .from("kanban_boards")
-      .select(
-        `
+      .select(`
         id,
         name,
         description,
@@ -24,17 +23,16 @@ export const getBoardData = async (boardId: String) => {
           created_at,
           updated_at
         )
-      `,
-      )
+      `)
       .eq("id", boardId)
       .single();
 
     if (error) throw error;
 
-    // BUG FIX: Fetch only NON-ARCHIVED tasks (handles NULL values)
-    if (boardData?.kanban_columns && boardData.kanban_columns.length > 0) {
+    if (boardData?.kanban_columns) {
       const columnIds = boardData.kanban_columns.map((col: any) => col.id);
-      
+
+      // Fetch tasks
       const { data: tasks, error: tasksError } = await supabase
         .from("tasks")
         .select(`
@@ -75,15 +73,25 @@ export const getBoardData = async (boardId: String) => {
 
       if (tasksError) throw tasksError;
 
-      // BUG FIX: Double-check filtering on client side for extra safety
-      const activeTasks = tasks?.filter((task: any) => 
-        task.is_archive !== true
-      ) || [];
+      // Fetch ticket codes separately
+      const taskIds = tasks?.map((task: any) => task.id) || [];
+      const { data: ticketCodes, error: ticketError } = await supabase
+        .from("task_ticket_codes")
+        .select(`task_id, ticket_code`)
+        .in("task_id", taskIds);
+
+      if (ticketError) throw ticketError;
+
+      // Merge ticket_code into tasks
+      const tasksWithTicket = tasks?.map((task: any) => ({
+        ...task,
+        ticket_code: ticketCodes?.find((t: any) => t.task_id === task.id)?.ticket_code || null,
+      }));
 
       // Attach tasks to their respective columns
       boardData.kanban_columns = boardData.kanban_columns.map((column: any) => ({
         ...column,
-        tasks: activeTasks.filter((task: any) => task.kanban_column_id === column.id)
+        tasks: tasksWithTicket?.filter((task: any) => task.kanban_column_id === column.id) || [],
       }));
     } else {
       // If no columns exist, initialize empty tasks array
@@ -92,7 +100,7 @@ export const getBoardData = async (boardId: String) => {
         tasks: []
       })) || [];
     }
-
+    
     return boardData;
   } catch (error) {
     console.error("Error fetching board data:", error);
@@ -135,4 +143,4 @@ export const getSprintsData = async (projectId: String) => {
     console.error("Error fetching sprints data:", error);
     throw error;
   }
-};
+};

apps/codebility/app/home/kanban/[projectId]/[id]/page.tsx

@@ -35,6 +35,7 @@ const mapTask = (task: any): Task => ({
   skill_category_id: task.skill_category_id,
   codev: task.codev,
   skill_category: task.skill_category,
+  ticket_code: task.ticket_code || null,
 });
 
 const mapColumn = (column: any): KanbanColumnType => ({

apps/codebility/app/home/kanban/ticket/[ticketCode]/actions.ts

@@ -0,0 +1,80 @@
+"use server";
+
+import { createClientServerComponent } from "@/utils/supabase/server";
+
+interface GetTaskDetailsResult {
+  success: boolean;
+  error?: string;
+  data?: {
+    project_id: string;
+    board_id: string;
+    task_id: string;
+  };
+}
+
+export const getTaskDetailsByTicketCode = async (
+  ticket_code: string
+): Promise<GetTaskDetailsResult> => {
+  const supabase = await createClientServerComponent();
+
+  if (!ticket_code) {
+    return { success: false, error: "Ticket code is required" };
+  }
+
+  // 1️⃣ Get task_id from task_ticket_codes
+  const { data: taskTicket, error: taskTicketError } = await supabase
+    .from("task_ticket_codes")
+    .select("task_id")
+    .eq("ticket_code", ticket_code)
+    .single();
+
+  if (taskTicketError || !taskTicket) {
+    return { success: false, error: taskTicketError?.message || "Ticket not found" };
+  }
+
+  const task_id = taskTicket.task_id;
+
+  // 2️⃣ Get kanban_column_id from tasks
+  const { data: task, error: taskError } = await supabase
+    .from("tasks")
+    .select("kanban_column_id")
+    .eq("id", task_id)
+    .single();
+
+  if (taskError || !task) {
+    return { success: false, error: taskError?.message || "Task not found" };
+  }
+
+  const kanban_column_id = task.kanban_column_id;
+
+  // 3️⃣ Get board_id and project_id from kanban_columns
+  const { data: column, error: columnError } = await supabase
+    .from("kanban_columns")
+    .select("board_id")
+    .eq("id", kanban_column_id)
+    .single();
+
+  if (columnError || !column) {
+    return { success: false, error: columnError?.message || "Column not found" };
+  }
+
+  const board_id = column.board_id;
+
+  // 4️⃣ Get project_id from kanban_boards
+  const { data: board, error: boardError } = await supabase
+    .from("kanban_boards")
+    .select("project_id")
+    .eq("id", board_id)
+    .single();
+
+  if (boardError || !board) {
+    return { success: false, error: boardError?.message || "Board not found" };
+  }
+
+  const project_id = board.project_id;
+
+  return {
+    success: true,
+    data: { task_id, board_id, project_id },
+  };
+};

apps/codebility/app/home/kanban/ticket/[ticketCode]/page.tsx

@@ -0,0 +1,19 @@
+import { redirect } from 'next/navigation';
+import { getTaskDetailsByTicketCode } from './actions';
+
+interface PageProps {
+  params: {
+    ticketCode: string;
+  };
+}
+
+export default async function TicketPage({ params }: PageProps) {
+  const { ticketCode } = params;
+
+  const ticketInfo = await getTaskDetailsByTicketCode(ticketCode);
+
+  // Determine where to redirect
+  const destination = `/home/kanban/${ticketInfo.data?.project_id}/${ticketInfo.data?.board_id}?taskId=${ticketInfo.data?.task_id}`;
+
+  redirect(destination);
+}

apps/codebility/hooks/useKanbanTaskUrlModal.ts

@@ -0,0 +1,52 @@
+"use client";
+
+import { useEffect, useMemo, useRef } from "react";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
+import { useModal } from "@/hooks/use-modal";
+import { KanbanBoardType, KanbanColumnType } from "@/types/home/codev";
+
+/**
+ * Syncs the Kanban task modal with the URL ?taskId param.
+ */
+export function useKanbanTaskUrlModal(
+  boardData: KanbanBoardType & { kanban_columns: KanbanColumnType[] }
+) {
+  const { isOpen, type, onOpen } = useModal();
+  const router = useRouter();
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
+
+  // Flatten all tasks once
+  const tasks = useMemo(
+    () => boardData.kanban_columns.flatMap((col) => col.tasks ?? []),
+    [boardData.kanban_columns]
+  );
+
+  // Track whether we've already opened the modal from the URL
+  const openedFromUrlRef = useRef(false);
+
+  useEffect(() => {
+    const taskId = searchParams.get("taskId");
+
+    // Open modal only once from URL
+    if (taskId && !openedFromUrlRef.current) {
+      const task = tasks.find((t) => t.id === taskId);
+      if (task) {
+        onOpen("taskViewModal", task);
+        openedFromUrlRef.current = true;
+      }
+    }
+
+    // Clear URL if modal closed
+    if (!isOpen && searchParams.has("taskId")) {
+      router.replace(pathname, { scroll: false });
+      openedFromUrlRef.current = false; // reset so next URL param works
+    }
+
+    // If modal type changes away from taskViewModal, remove param
+    if (isOpen && type !== "taskViewModal" && searchParams.has("taskId")) {
+      router.replace(pathname, { scroll: false });
+      openedFromUrlRef.current = false;
+    }
+  }, [isOpen, type, tasks, onOpen, pathname, searchParams, router]);
+}

apps/codebility/types/home/codev.ts

@@ -350,6 +350,7 @@ export interface Task {
     id: string;
     name: string;
   };
+  ticket_code?: string;
 }
 
 export interface ExtendedTask extends Task {