From ef6e8cf6c00875fffc697134f2bcf43a4cea067e Mon Sep 17 00:00:00 2001
From: Pattadon <pattadon2546pn@gmail.com>
Date: Tue, 12 Nov 2024 15:17:43 +0700
Subject: [PATCH] feat: update Modal and DataTable components to handle
 additional deal properties and improve rendering logic

---
 src/app/portfolio/[uid]/page.tsx | 22 ++++++---
 src/components/dataTable.tsx     | 77 ++++++++++++++++++++++++--------
 src/components/modal.tsx         | 21 +++++----
 3 files changed, 83 insertions(+), 37 deletions(-)

diff --git a/src/app/portfolio/[uid]/page.tsx b/src/app/portfolio/[uid]/page.tsx
index 0ac0a4c..163f77c 100644
--- a/src/app/portfolio/[uid]/page.tsx
+++ b/src/app/portfolio/[uid]/page.tsx
@@ -244,13 +244,21 @@ export default async function Portfolio({ params }: { params: { uid: string } })
           <CardContent className="mt-5 grid grid-flow-row-dense">
             <RecentFunds data={latestDeals} />
             <div className="mt-5 flex justify-center">
-              {/* {deals && deals.length ? <Modal data={latestDeals.map((deal) => {
-                return {
-                  name: deal.name,
-                  amount: deal.amount,
-                  date: deal.date, 
-                };
-              })} /> : undefined} */}
+              {/* {latestDeals.length} */}
+              {deals && deals.length ? (
+                <Modal
+                  data={latestDeals.map((item) => {
+                    return {
+                      date: item.date,
+                      name: item.name,
+                      amount: item.amount,
+                      status: item.status,
+                      logoURL: item.logo_url,
+                      profileURL: `deals/${item.projectId}`
+                    };
+                  })}
+                />
+              ) : undefined}
             </div>
           </CardContent>
         </Card>
diff --git a/src/components/dataTable.tsx b/src/components/dataTable.tsx
index e7f5d96..d4d80f3 100644
--- a/src/components/dataTable.tsx
+++ b/src/components/dataTable.tsx
@@ -26,19 +26,17 @@ import {
 import { Input } from "@/components/ui/input";
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
 
-export type Payment = {
-  data?: {
-    name?: string;
-    amount?: number;
-    avatar?: string;
-    date?: Date;
-    logo_url?: string;
-    status?: string;
-    profile_url?: string;
-  }[];
+export type ModalProps = {
+  date: Date;
+  amount: number;
+  name: string;
+  investorId?: string;
+  profileURL?: string;
+  logoURL?: string;
+  status?: string;
 };
 
-export const columns: ColumnDef<Payment>[] = [
+export const columns: ColumnDef<ModalProps>[] = [
   {
     id: "select",
     header: ({ table }) => (
@@ -59,21 +57,62 @@ export const columns: ColumnDef<Payment>[] = [
     enableHiding: false,
   },
   {
-    accessorKey: "email",
+    accessorKey: "name",
     header: ({ column }) => {
       return (
         <Button variant="ghost" onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}>
-          Email
+          Name
           <ArrowUpDown />
         </Button>
       );
     },
-    cell: ({ row }) => <div className="lowercase">{row.getValue("email")}</div>,
+    cell: ({ row }) => <div className="lowercase">{row.getValue("name")}</div>,
   },
   {
     accessorKey: "status",
     header: "Status",
-    cell: ({ row }) => <div className="capitalize">{row.getValue("status")}</div>,
+    cell: ({ row }) => (
+      <div className="flex items-center space-x-1">
+        <span className="relative flex h-3 w-3">
+          <span
+            className={`animate-ping absolute inline-flex h-3 w-3 rounded-full opacity-75 ${
+              row.getValue("status") === "In Progress"
+                ? "bg-sky-400"
+                : row.getValue("status") === "Completed"
+                  ? "bg-green-400"
+                  : "bg-yellow-400"
+            }`}
+          ></span>
+          <span
+            className={`relative inline-flex rounded-full h-2 w-2 mt-[2px] ml-0.5 ${
+              row.getValue("status") === "In Progress"
+                ? "bg-sky-500"
+                : row.getValue("status") === "Completed"
+                  ? "bg-green-500"
+                  : "bg-yellow-500"
+            }`}
+          ></span>
+        </span>
+        <p
+          className={`text-xs m-0 ${
+            row.getValue("status") === "In Progress"
+              ? "text-sky-500"
+              : row.getValue("status") === "Completed"
+                ? "text-green-500"
+                : "text-yellow-500"
+          }`}
+        >
+        </p>
+
+        <div className={`capitalize ${
+                        row.getValue("status") === "In Progress"
+                          ? "text-sky-500"
+                          : row.getValue("status") === "Completed"
+                            ? "text-green-500"
+                            : "text-yellow-500"
+                      }`}>{row.getValue("status")}</div>
+      </div>
+    ),
   },
   {
     accessorKey: "amount",
@@ -92,7 +131,7 @@ export const columns: ColumnDef<Payment>[] = [
   },
 ];
 
-export function DataTable({ data }: { data: Payment[] }) {
+export function DataTable({ data }: { data: ModalProps[] }) {
   const [sorting, setSorting] = React.useState<SortingState>([]);
   const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([]);
   const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({});
@@ -121,9 +160,9 @@ export function DataTable({ data }: { data: Payment[] }) {
     <div className="w-full">
       <div className="flex items-center py-4">
         <Input
-          placeholder="Filter emails..."
-          value={(table.getColumn("email")?.getFilterValue() as string) ?? ""}
-          onChange={(event) => table.getColumn("email")?.setFilterValue(event.target.value)}
+          placeholder="Filter names..."
+          value={(table.getColumn("name")?.getFilterValue() as string) ?? ""}
+          onChange={(event) => table.getColumn("name")?.setFilterValue(event.target.value)}
           className="max-w-sm"
         />
         <DropdownMenu>
diff --git a/src/components/modal.tsx b/src/components/modal.tsx
index 2de0b43..aa58f19 100644
--- a/src/components/modal.tsx
+++ b/src/components/modal.tsx
@@ -3,18 +3,17 @@ import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog";
 import { Button } from "./ui/button";
 import { DataTable } from "./dataTable";
 
-export type Payment = {
-  data?: {
-    name?: string;
-    amount?: number;
-    avatar?: string;
-    date?: Date;
-    logo_url?: string;
-    status?: string;
-    profile_url?: string;
-  }[];
+export type ModalProps = {
+  date: Date;
+  amount: number;
+  name: string;
+  investorId?: string;
+  profileURL?: string;
+  logoURL?: string;
+  status?: string;
 };
-export function Modal({ data }: { data: Payment[] }) {
+
+export function Modal({ data }: { data: ModalProps[] }) {
   return (
     <div>
       <Dialog>