+
-
-
-
+ {[
+ ExtendedDocumentStatus.INBOX,
+ ExtendedDocumentStatus.PENDING,
+ ExtendedDocumentStatus.COMPLETED,
+ ExtendedDocumentStatus.DRAFT,
+ ExtendedDocumentStatus.ALL,
+ ].map((value) => (
+
+
+
-
- {Math.min(stats.PENDING, 99)}
-
-
-
-
-
-
-
-
-
- {Math.min(stats.COMPLETED, 99)}
-
-
-
-
-
-
-
-
-
- {Math.min(stats.DRAFT, 99)}
-
-
-
-
-
-
- All
-
-
+ {value !== ExtendedDocumentStatus.ALL && (
+
+ {Math.min(stats[value], 99)}
+
+ )}
+
+
+ ))}
diff --git a/apps/web/src/components/formatter/document-status.tsx b/apps/web/src/components/formatter/document-status.tsx
index 4e1ccf742..126a52f4f 100644
--- a/apps/web/src/components/formatter/document-status.tsx
+++ b/apps/web/src/components/formatter/document-status.tsx
@@ -3,16 +3,17 @@ import { HTMLAttributes } from 'react';
import { CheckCircle2, Clock, File } from 'lucide-react';
import type { LucideIcon } from 'lucide-react/dist/lucide-react';
-import { DocumentStatus as InternalDocumentStatus } from '@documenso/prisma/client';
+import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
+import { SignatureIcon } from '@documenso/ui/icons/signature';
import { cn } from '@documenso/ui/lib/utils';
type FriendlyStatus = {
label: string;
- icon: LucideIcon;
+ icon?: LucideIcon;
color: string;
};
-const FRIENDLY_STATUS_MAP: Record
= {
+const FRIENDLY_STATUS_MAP: Record = {
PENDING: {
label: 'Pending',
icon: Clock,
@@ -28,10 +29,19 @@ const FRIENDLY_STATUS_MAP: Record = {
icon: File,
color: 'text-yellow-500',
},
+ INBOX: {
+ label: 'Inbox',
+ icon: SignatureIcon,
+ color: 'text-muted-foreground',
+ },
+ ALL: {
+ label: 'All',
+ color: 'text-muted-foreground',
+ },
};
export type DocumentStatusProps = HTMLAttributes & {
- status: InternalDocumentStatus;
+ status: ExtendedDocumentStatus;
inheritColor?: boolean;
};
@@ -45,11 +55,13 @@ export const DocumentStatus = ({
return (
-
+ {Icon && (
+
+ )}
{label}
);
diff --git a/packages/lib/server-only/document/find-documents.ts b/packages/lib/server-only/document/find-documents.ts
index 4b209f611..93b1e2089 100644
--- a/packages/lib/server-only/document/find-documents.ts
+++ b/packages/lib/server-only/document/find-documents.ts
@@ -1,14 +1,17 @@
+import { match } from 'ts-pattern';
+
import { prisma } from '@documenso/prisma';
-import { Document, DocumentStatus, Prisma, SigningStatus } from '@documenso/prisma/client';
+import { Document, Prisma, SigningStatus } from '@documenso/prisma/client';
import { DocumentWithRecipientAndSender } from '@documenso/prisma/types/document';
import { DocumentWithReciepient } from '@documenso/prisma/types/document-with-recipient';
+import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
import { FindResultSet } from '../../types/find-result-set';
export interface FindDocumentsOptions {
userId: number;
term?: string;
- status?: DocumentStatus;
+ status?: ExtendedDocumentStatus;
page?: number;
perPage?: number;
orderBy?: {
@@ -20,29 +23,102 @@ export interface FindDocumentsOptions {
export const findDocuments = async ({
userId,
term,
- status,
+ status = ExtendedDocumentStatus.ALL,
page = 1,
perPage = 10,
orderBy,
}: FindDocumentsOptions): Promise> => {
+ const user = await prisma.user.findFirstOrThrow({
+ where: {
+ id: userId,
+ },
+ });
+
const orderByColumn = orderBy?.column ?? 'created';
const orderByDirection = orderBy?.direction ?? 'desc';
- const filters: Prisma.DocumentWhereInput = {
- status,
- userId,
- };
+ const termFilters = !term
+ ? undefined
+ : ({
+ title: {
+ contains: term,
+ mode: 'insensitive',
+ },
+ } as const);
- if (term) {
- filters.title = {
- contains: term,
- mode: 'insensitive',
- };
- }
+ const filters = match(status)
+ .with(ExtendedDocumentStatus.ALL, () => ({
+ OR: [
+ {
+ userId,
+ },
+ {
+ status: {
+ not: ExtendedDocumentStatus.DRAFT,
+ },
+ Recipient: {
+ some: {
+ email: user.email,
+ },
+ },
+ },
+ ],
+ }))
+ .with(ExtendedDocumentStatus.INBOX, () => ({
+ status: {
+ not: ExtendedDocumentStatus.DRAFT,
+ },
+ Recipient: {
+ some: {
+ email: user.email,
+ signingStatus: SigningStatus.NOT_SIGNED,
+ },
+ },
+ }))
+ .with(ExtendedDocumentStatus.DRAFT, () => ({
+ userId,
+ status: ExtendedDocumentStatus.DRAFT,
+ }))
+ .with(ExtendedDocumentStatus.PENDING, () => ({
+ OR: [
+ {
+ userId,
+ status: ExtendedDocumentStatus.PENDING,
+ },
+ {
+ status: ExtendedDocumentStatus.PENDING,
+
+ Recipient: {
+ some: {
+ email: user.email,
+ signingStatus: SigningStatus.SIGNED,
+ },
+ },
+ },
+ ],
+ }))
+ .with(ExtendedDocumentStatus.COMPLETED, () => ({
+ OR: [
+ {
+ userId,
+ status: ExtendedDocumentStatus.COMPLETED,
+ },
+ {
+ status: ExtendedDocumentStatus.COMPLETED,
+ Recipient: {
+ some: {
+ email: user.email,
+ },
+ },
+ },
+ ],
+ }))
+ .exhaustive();
const [data, count] = await Promise.all([
prisma.document.findMany({
where: {
+ ...termFilters,
...filters,
},
skip: Math.max(page - 1, 0) * perPage,
@@ -51,11 +127,19 @@ export const findDocuments = async ({
[orderByColumn]: orderByDirection,
},
include: {
+ User: {
+ select: {
+ id: true,
+ name: true,
+ email: true,
+ },
+ },
Recipient: true,
},
}),
prisma.document.count({
where: {
+ ...termFilters,
...filters,
},
}),
diff --git a/packages/lib/server-only/document/get-stats.ts b/packages/lib/server-only/document/get-stats.ts
index 25754d7bc..6e875f9be 100644
--- a/packages/lib/server-only/document/get-stats.ts
+++ b/packages/lib/server-only/document/get-stats.ts
@@ -1,30 +1,88 @@
import { prisma } from '@documenso/prisma';
-import { DocumentStatus } from '@documenso/prisma/client';
+import { SigningStatus, User } from '@documenso/prisma/client';
+import { isExtendedDocumentStatus } from '@documenso/prisma/guards/is-extended-document-status';
+import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
export type GetStatsInput = {
- userId: number;
+ user: User;
};
-export const getStats = async ({ userId }: GetStatsInput) => {
- const result = await prisma.document.groupBy({
- by: ['status'],
- _count: {
- _all: true,
- },
- where: {
- userId,
- },
- });
+export const getStats = async ({ user }: GetStatsInput) => {
+ const [ownerCounts, notSignedCounts, hasSignedCounts] = await Promise.all([
+ prisma.document.groupBy({
+ by: ['status'],
+ _count: {
+ _all: true,
+ },
+ where: {
+ userId: user.id,
+ },
+ }),
+ prisma.document.groupBy({
+ by: ['status'],
+ _count: {
+ _all: true,
+ },
+ where: {
+ status: ExtendedDocumentStatus.PENDING,
+ Recipient: {
+ some: {
+ email: user.email,
+ signingStatus: SigningStatus.NOT_SIGNED,
+ },
+ },
+ },
+ }),
+ prisma.document.groupBy({
+ by: ['status'],
+ _count: {
+ _all: true,
+ },
+ where: {
+ status: {
+ not: ExtendedDocumentStatus.DRAFT,
+ },
+ Recipient: {
+ some: {
+ email: user.email,
+ signingStatus: SigningStatus.SIGNED,
+ },
+ },
+ },
+ }),
+ ]);
- const stats: Record = {
- [DocumentStatus.DRAFT]: 0,
- [DocumentStatus.PENDING]: 0,
- [DocumentStatus.COMPLETED]: 0,
+ const stats: Record = {
+ [ExtendedDocumentStatus.DRAFT]: 0,
+ [ExtendedDocumentStatus.PENDING]: 0,
+ [ExtendedDocumentStatus.COMPLETED]: 0,
+ [ExtendedDocumentStatus.INBOX]: 0,
+ [ExtendedDocumentStatus.ALL]: 0,
};
- result.forEach((stat) => {
+ ownerCounts.forEach((stat) => {
stats[stat.status] = stat._count._all;
});
+ notSignedCounts.forEach((stat) => {
+ stats[ExtendedDocumentStatus.INBOX] += stat._count._all;
+ });
+
+ hasSignedCounts.forEach((stat) => {
+ if (stat.status === ExtendedDocumentStatus.COMPLETED) {
+ stats[ExtendedDocumentStatus.COMPLETED] += stat._count._all;
+ }
+
+ if (stat.status === ExtendedDocumentStatus.PENDING) {
+ stats[ExtendedDocumentStatus.PENDING] += stat._count._all;
+ }
+ });
+
+ Object.keys(stats).forEach((key) => {
+ if (key !== ExtendedDocumentStatus.ALL && isExtendedDocumentStatus(key)) {
+ stats[ExtendedDocumentStatus.ALL] += stats[key];
+ }
+ });
+
return stats;
};
diff --git a/packages/prisma/guards/is-extended-document-status.ts b/packages/prisma/guards/is-extended-document-status.ts
new file mode 100644
index 000000000..43be73f64
--- /dev/null
+++ b/packages/prisma/guards/is-extended-document-status.ts
@@ -0,0 +1,11 @@
+import { ExtendedDocumentStatus } from '../types/extended-document-status';
+
+export const isExtendedDocumentStatus = (value: unknown): value is ExtendedDocumentStatus => {
+ if (typeof value !== 'string') {
+ return false;
+ }
+
+ // We're using the assertion for a type-guard so it's safe to ignore the eslint warning
+ // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+ return Object.values(ExtendedDocumentStatus).includes(value as ExtendedDocumentStatus);
+};
diff --git a/packages/prisma/types/extended-document-status.ts b/packages/prisma/types/extended-document-status.ts
new file mode 100644
index 000000000..a3576750d
--- /dev/null
+++ b/packages/prisma/types/extended-document-status.ts
@@ -0,0 +1,10 @@
+import { DocumentStatus } from '@prisma/client';
+
+export const ExtendedDocumentStatus = {
+ ...DocumentStatus,
+ INBOX: 'INBOX',
+ ALL: 'ALL',
+} as const;
+
+export type ExtendedDocumentStatus =
+ (typeof ExtendedDocumentStatus)[keyof typeof ExtendedDocumentStatus];
diff --git a/packages/ui/icons/signature.tsx b/packages/ui/icons/signature.tsx
new file mode 100644
index 000000000..b91998bb5
--- /dev/null
+++ b/packages/ui/icons/signature.tsx
@@ -0,0 +1,28 @@
+import type { LucideIcon } from 'lucide-react/dist/lucide-react';
+
+export const SignatureIcon: LucideIcon = ({
+ size = 24,
+ color = 'currentColor',
+ strokeWidth = 1.33,
+ absoluteStrokeWidth,
+ ...props
+}) => {
+ return (
+
+ );
+};