diff --git a/apps/web/src/app/(dashboard)/documents/data-table.tsx b/apps/web/src/app/(dashboard)/documents/data-table.tsx index 264b3596e..35fdfb4b1 100644 --- a/apps/web/src/app/(dashboard)/documents/data-table.tsx +++ b/apps/web/src/app/(dashboard)/documents/data-table.tsx @@ -7,8 +7,8 @@ import Link from 'next/link'; import { Loader } from 'lucide-react'; import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params'; -import { DocumentWithReciepient } from '@documenso/lib/types/document-with-recipient'; import { FindResultSet } from '@documenso/lib/types/find-result-set'; +import { DocumentWithReciepient } from '@documenso/prisma/types/document-with-recipient'; import { DataTable } from '@documenso/ui/primitives/data-table'; import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination'; diff --git a/apps/web/src/components/(dashboard)/avatar/stack-avatars-with-tooltip.tsx b/apps/web/src/components/(dashboard)/avatar/stack-avatars-with-tooltip.tsx index 8a918fce0..dbd1dc712 100644 --- a/apps/web/src/components/(dashboard)/avatar/stack-avatars-with-tooltip.tsx +++ b/apps/web/src/components/(dashboard)/avatar/stack-avatars-with-tooltip.tsx @@ -1,5 +1,5 @@ import { initials } from '@documenso/lib/client-only/recipient-initials'; -import { type } from '@documenso/lib/client-only/recipient-type'; +import { getRecipientType } from '@documenso/lib/client-only/recipient-type'; import { Recipient } from '@documenso/prisma/client'; import { Tooltip, @@ -40,7 +40,7 @@ export const StackAvatarsWithTooltip = ({ recipients }: { recipients: Recipient[ {recipient.email} @@ -57,7 +57,7 @@ export const StackAvatarsWithTooltip = ({ recipients }: { recipients: Recipient[ {recipient.email} @@ -74,7 +74,7 @@ export const StackAvatarsWithTooltip = ({ recipients }: { recipients: Recipient[ {recipient.email} diff --git a/apps/web/src/components/(dashboard)/avatar/stack-avatars.tsx b/apps/web/src/components/(dashboard)/avatar/stack-avatars.tsx index c8d63bb82..97af9dc9e 100644 --- a/apps/web/src/components/(dashboard)/avatar/stack-avatars.tsx +++ b/apps/web/src/components/(dashboard)/avatar/stack-avatars.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { initials } from '@documenso/lib/client-only/recipient-initials'; -import { type } from '@documenso/lib/client-only/recipient-type'; +import { getRecipientType } from '@documenso/lib/client-only/recipient-type'; import { Recipient } from '@documenso/prisma/client'; import { StackAvatar } from './stack-avatar'; @@ -25,7 +25,7 @@ export function StackAvatars({ recipients }: { recipients: Recipient[] }) { key={recipient.id} first={first} zIndex={String(zIndex - index * 10)} - type={lastItemText && index === 4 ? 'unsigned' : type(recipient)} + type={lastItemText && index === 4 ? 'unsigned' : getRecipientType(recipient)} fallbackText={lastItemText ? lastItemText : initials(recipient.name)} /> ); diff --git a/packages/lib/client-only/recipient-type.ts b/packages/lib/client-only/recipient-type.ts index dbcf5baaf..8250eb707 100644 --- a/packages/lib/client-only/recipient-type.ts +++ b/packages/lib/client-only/recipient-type.ts @@ -1,8 +1,13 @@ import { Recipient } from '@documenso/prisma/client'; -export const type = (recipient: Recipient) => - recipient.sendStatus === 'SENT' && recipient.signingStatus === 'SIGNED' - ? 'completed' - : recipient.sendStatus === 'SENT' && recipient.signingStatus === 'NOT_SIGNED' - ? 'waiting' - : 'unsigned'; +export const getRecipientType = (recipient: Recipient) => { + if (recipient.sendStatus === 'SENT' && recipient.signingStatus === 'SIGNED') { + return 'completed'; + } + + if (recipient.sendStatus === 'SENT' && recipient.signingStatus === 'NOT_SIGNED') { + return 'waiting'; + } + + return 'unsigned'; +}; diff --git a/packages/lib/server-only/document/find-documents.ts b/packages/lib/server-only/document/find-documents.ts index 60fe8a5b3..41e9c858a 100644 --- a/packages/lib/server-only/document/find-documents.ts +++ b/packages/lib/server-only/document/find-documents.ts @@ -1,7 +1,7 @@ import { prisma } from '@documenso/prisma'; import { Document, DocumentStatus, Prisma } from '@documenso/prisma/client'; +import { DocumentWithReciepient } from '@documenso/prisma/types/document-with-recipient'; -import { DocumentWithReciepient } from '../../types/document-with-recipient'; import { FindResultSet } from '../../types/find-result-set'; export interface FindDocumentsOptions { diff --git a/packages/lib/types/document-with-recipient.ts b/packages/prisma/types/document-with-recipient.ts similarity index 100% rename from packages/lib/types/document-with-recipient.ts rename to packages/prisma/types/document-with-recipient.ts