From 4a4288d47ab64b4e7d08d7ae3fb732315c389bf9 Mon Sep 17 00:00:00 2001
From: Takeshi Kimata <117462761+kimatata@users.noreply.github.com>
Date: Sun, 14 Apr 2024 22:43:55 +0900
Subject: [PATCH] Implemented test run editor's test case selection

---
 .../[projectId]/runs/[runId]/RunEditor.tsx    |  1 -
 .../runs/[runId]/TestCaseSelector.tsx         | 63 ++++++++++---------
 frontend/config/selection.ts                  |  1 -
 3 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/frontend/app/projects/[projectId]/runs/[runId]/RunEditor.tsx b/frontend/app/projects/[projectId]/runs/[runId]/RunEditor.tsx
index 170d1ac..95f9291 100644
--- a/frontend/app/projects/[projectId]/runs/[runId]/RunEditor.tsx
+++ b/frontend/app/projects/[projectId]/runs/[runId]/RunEditor.tsx
@@ -263,7 +263,6 @@ export default function RunEditor({ projectId, runId }: Props) {
           </div>
           <div className="w-9/12">
             <TestCaseSelector
-              projectId={projectId}
               cases={testcases}
               selectedKeys={selectedKeys}
               onSelectionChange={setSelectedKeys}
diff --git a/frontend/app/projects/[projectId]/runs/[runId]/TestCaseSelector.tsx b/frontend/app/projects/[projectId]/runs/[runId]/TestCaseSelector.tsx
index 913b82e..c36f899 100644
--- a/frontend/app/projects/[projectId]/runs/[runId]/TestCaseSelector.tsx
+++ b/frontend/app/projects/[projectId]/runs/[runId]/TestCaseSelector.tsx
@@ -14,9 +14,8 @@ import {
   DropdownItem,
   Selection,
   SortDescriptor,
-  Link,
 } from "@nextui-org/react";
-import { MoreVertical } from "lucide-react";
+import { ChevronDown, MoreVertical } from "lucide-react";
 import { priorities, testRunCaseStatus } from "@/config/selection";
 import { CaseType } from "@/types/case";
 
@@ -24,20 +23,17 @@ const headerColumns = [
   { name: "ID", uid: "id", sortable: true },
   { name: "Title", uid: "title", sortable: true },
   { name: "Priority", uid: "priority", sortable: true },
-  { name: "isIncluded", uid: "isIncluded", sortable: true },
   { name: "Status", uid: "runStatus", sortable: true },
   { name: "Actions", uid: "actions" },
 ];
 
 type Props = {
-  projectId: string;
   cases: CaseType[];
   selectedKeys: Selection;
   onSelectionChange: React.Dispatch<React.SetStateAction<Selection>>;
 };
 
 export default function TestCaseSelector({
-  projectId,
   cases,
   selectedKeys,
   onSelectionChange,
@@ -56,27 +52,21 @@ export default function TestCaseSelector({
       return sortDescriptor.direction === "descending" ? -cmp : cmp;
     });
   }, [sortDescriptor, cases]);
+
+  const notIncludedCaseClass = "text-neutral-200 dark:text-neutral-600";
+  const chipBaseClass = "border-none gap-1 text-default-600";
+
   const renderCell = useCallback((testCase: CaseType, columnKey: Key) => {
     const cellValue = testCase[columnKey as keyof CaseType];
-    // console.log(columnKey, cellValue)
+    const isIncluded = testCase.isIncluded;
 
     switch (columnKey) {
-      case "id":
-        return <span>{cellValue}</span>;
-      case "title":
-        return (
-          <Link
-            underline="hover"
-            href={`/projects/${projectId}/folders/${testCase.folderId}/cases/${testCase.id}`}
-            className="dark:text-white"
-          >
-            {cellValue}
-          </Link>
-        );
       case "priority":
         return (
           <Chip
-            className="border-none gap-1 text-default-600"
+            className={
+              isIncluded ? chipBaseClass : chipBaseClass + notIncludedCaseClass
+            }
             color={priorities[cellValue].color}
             size="sm"
             variant="dot"
@@ -84,19 +74,27 @@ export default function TestCaseSelector({
             {priorities[cellValue].name}
           </Chip>
         );
-      case "isIncluded":
-        const flag = cellValue ? "true" : "false"
-        return <span>{flag}</span>;
       case "runStatus":
         return (
-          <Chip
-            className="border-none gap-1 text-default-600"
-            color={testRunCaseStatus[cellValue].color}
-            size="sm"
-            variant="dot"
-          >
-            {testRunCaseStatus[cellValue].name}
-          </Chip>
+          <Dropdown>
+            <DropdownTrigger>
+              <Button
+                size="sm"
+                variant="light"
+                isDisabled={!isIncluded}
+                endContent={isIncluded ? <ChevronDown size={16} /> : <></>}
+              >
+                {isIncluded ? testRunCaseStatus[cellValue].name : <></>}
+              </Button>
+            </DropdownTrigger>
+            <DropdownMenu aria-label="test case actions">
+              {testRunCaseStatus.map((runCaseStatus, index) => (
+                <DropdownItem key={index} onClick={() => {}}>
+                  {testRunCaseStatus[index].name}
+                </DropdownItem>
+              ))}
+            </DropdownMenu>
+          </Dropdown>
         );
       case "actions":
         return (
@@ -167,7 +165,10 @@ export default function TestCaseSelector({
         </TableHeader>
         <TableBody emptyContent={"No cases found"} items={sortedItems}>
           {(item) => (
-            <TableRow key={item.id}>
+            <TableRow
+              key={item.id}
+              className={!item.isIncluded ? notIncludedCaseClass : ""}
+            >
               {(columnKey) => (
                 <TableCell>{renderCell(item, columnKey)}</TableCell>
               )}
diff --git a/frontend/config/selection.ts b/frontend/config/selection.ts
index c72c9f6..872506e 100644
--- a/frontend/config/selection.ts
+++ b/frontend/config/selection.ts
@@ -43,7 +43,6 @@ const testRunStatus = [
 ]
 
 const testRunCaseStatus = [
-  { name: "Not included", uid: "notincluded", color: "primary" },
   { name: "Untested", uid: "untested", color: "primary" },
   { name: "Passed", uid: "passed", color: "success" },
   { name: "Failed", uid: "untested", color: "danger" },