From f569361e57a61482fb64b3a6be7c1fe5e6237703 Mon Sep 17 00:00:00 2001
From: pit <pit@192-168-0-136.rdsnet.ro>
Date: Tue, 10 Oct 2023 16:52:58 +0300
Subject: [PATCH] chore: feedback fix

---
 .../documents/data-table-action-button.tsx    | 30 -------------------
 .../documents/data-table-action-dropdown.tsx  |  7 -----
 .../admin/documents/data-table.tsx            | 30 +++++++++++--------
 3 files changed, 17 insertions(+), 50 deletions(-)
 delete mode 100644 apps/web/src/app/(dashboard)/admin/documents/data-table-action-button.tsx

diff --git a/apps/web/src/app/(dashboard)/admin/documents/data-table-action-button.tsx b/apps/web/src/app/(dashboard)/admin/documents/data-table-action-button.tsx
deleted file mode 100644
index a3fed63ec..000000000
--- a/apps/web/src/app/(dashboard)/admin/documents/data-table-action-button.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-'use client';
-
-import Link from 'next/link';
-
-import { Edit } from 'lucide-react';
-import { useSession } from 'next-auth/react';
-
-import { Document } from '@documenso/prisma/client';
-import { Button } from '@documenso/ui/primitives/button';
-
-export type DataTableActionButtonProps = {
-  row: Pick<Document, 'id'>;
-};
-
-export const DataTableActionButton = ({ row }: DataTableActionButtonProps) => {
-  const { data: session } = useSession();
-
-  if (!session) {
-    return null;
-  }
-
-  return (
-    <Button className="w-24" asChild>
-      <Link href={`/documents/${row.id}`}>
-        <Edit className="-ml-1 mr-2 h-4 w-4" />
-        Edit
-      </Link>
-    </Button>
-  );
-};
diff --git a/apps/web/src/app/(dashboard)/admin/documents/data-table-action-dropdown.tsx b/apps/web/src/app/(dashboard)/admin/documents/data-table-action-dropdown.tsx
index 21650ffc5..a4a4b5ee4 100644
--- a/apps/web/src/app/(dashboard)/admin/documents/data-table-action-dropdown.tsx
+++ b/apps/web/src/app/(dashboard)/admin/documents/data-table-action-dropdown.tsx
@@ -1,7 +1,6 @@
 'use client';
 
 import { Copy, Download, History, MoreHorizontal, Trash2, XCircle } from 'lucide-react';
-import { useSession } from 'next-auth/react';
 
 import { getFile } from '@documenso/lib/universal/upload/get-file';
 import { Document, DocumentStatus, User } from '@documenso/prisma/client';
@@ -22,12 +21,6 @@ export type DataTableActionDropdownProps = {
 };
 
 export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) => {
-  const { data: session } = useSession();
-
-  if (!session) {
-    return null;
-  }
-
   // const isRecipient = !!recipient;
   // const isDraft = row.status === DocumentStatus.DRAFT;
   // const isPending = row.status === DocumentStatus.PENDING;
diff --git a/apps/web/src/app/(dashboard)/admin/documents/data-table.tsx b/apps/web/src/app/(dashboard)/admin/documents/data-table.tsx
index cef49b3df..8bda26ef4 100644
--- a/apps/web/src/app/(dashboard)/admin/documents/data-table.tsx
+++ b/apps/web/src/app/(dashboard)/admin/documents/data-table.tsx
@@ -4,33 +4,30 @@ import { useTransition } from 'react';
 
 import Link from 'next/link';
 
-import { Loader } from 'lucide-react';
-import { useSession } from 'next-auth/react';
+import { Edit, Loader } from 'lucide-react';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
 import { FindResultSet } from '@documenso/lib/types/find-result-set';
-import { Document, Recipient, User } from '@documenso/prisma/client';
+import { Document, User } from '@documenso/prisma/client';
 import { Avatar, AvatarFallback } from '@documenso/ui/primitives/avatar';
+import { Button } from '@documenso/ui/primitives/button';
 import { DataTable } from '@documenso/ui/primitives/data-table';
 import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
 
 import { DocumentStatus } from '~/components/formatter/document-status';
 import { LocaleDate } from '~/components/formatter/locale-date';
 
-import { DataTableActionButton } from './data-table-action-button';
 import { DataTableActionDropdown } from './data-table-action-dropdown';
 
 export type DocumentsDataTableProps = {
   results: FindResultSet<
     Document & {
-      Recipient: Recipient[];
       User: Pick<User, 'id' | 'name' | 'email'>;
     }
   >;
 };
 
 export const DocumentsDataTable = ({ results }: DocumentsDataTableProps) => {
-  const { data: session } = useSession();
   const [isPending, startTransition] = useTransition();
 
   const updateSearchParams = useUpdateSearchParams();
@@ -44,10 +41,6 @@ export const DocumentsDataTable = ({ results }: DocumentsDataTableProps) => {
     });
   };
 
-  if (!session) {
-    return null;
-  }
-
   return (
     <div className="relative">
       <DataTable
@@ -65,7 +58,13 @@ export const DocumentsDataTable = ({ results }: DocumentsDataTableProps) => {
                 <Link
                   title={row.original.title}
                   className="block max-w-[10rem] truncate font-medium hover:underline md:max-w-[20rem]"
-                  href={`/documents/${row.original.id}`}
+                  href={{
+                    pathname: `/admin/documents/${row.original.id}`,
+                    query: {
+                      userId: row.original.User.id,
+                      documentId: row.original.id,
+                    },
+                  }}
                 >
                   {row.original.title}
                 </Link>
@@ -90,13 +89,18 @@ export const DocumentsDataTable = ({ results }: DocumentsDataTableProps) => {
           {
             header: 'Status',
             accessorKey: 'status',
-            cell: ({ row }) => <DocumentStatus status={row.getValue('status')} />,
+            cell: ({ row }) => <DocumentStatus status={row.original.status} />,
           },
           {
             header: 'Actions',
             cell: ({ row }) => (
               <div className="flex items-center gap-x-4">
-                <DataTableActionButton row={row.original} />
+                <Button className="w-24" asChild>
+                  <Link href={`/documents/${row.original.id}`}>
+                    <Edit className="-ml-1 mr-2 h-4 w-4" />
+                    Edit
+                  </Link>
+                </Button>
                 <DataTableActionDropdown row={row.original} />
               </div>
             ),