Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2025-11-15 09:12:02 +10:00
Code Issues Packages Projects Releases Wiki Activity

feat: add bin tab to show soft deleted documents

Browse Source
This commit is contained in:
Ephraim Atta-Duncan
2024-05-30 19:51:28 +00:00
committed by Mythie
parent f31caaab08
commit c6393b7a9e
6 changed files with 125 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/web/src/app/(dashboard)/documents/documents-page-view.tsx
View File

@ -115,6 +115,7 @@ export const DocumentsPageView = async ({ searchParams = {}, team }: DocumentsPa
ExtendedDocumentStatus.PENDING,
ExtendedDocumentStatus.COMPLETED,
ExtendedDocumentStatus.DRAFT,
ExtendedDocumentStatus.BIN,
ExtendedDocumentStatus.ALL,
].map((value) => (
<TabsTrigger

7
apps/web/src/app/(dashboard)/documents/empty-state.tsx
View File

@ -1,4 +1,4 @@
import { Bird, CheckCircle2 } from 'lucide-react';
import { Bird, CheckCircle2, Trash } from 'lucide-react';
import { match } from 'ts-pattern';
import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
@ -29,6 +29,11 @@ export const EmptyDocumentState = ({ status }: EmptyDocumentProps) => {
'You have not yet created or received any documents. To create a document please upload one.',
icon: Bird,
}))
.with(ExtendedDocumentStatus.BIN, () => ({
title: 'No documents in the bin',
message: "There are no documents in the bin. You can't restore any documents.",
icon: Trash,
}))
.otherwise(() => ({
title: 'Nothing to do',
message:

7
apps/web/src/components/formatter/document-status.tsx
View File

@ -1,6 +1,6 @@
import type { HTMLAttributes } from 'react';
import { CheckCircle2, Clock, File } from 'lucide-react';
import { CheckCircle2, Clock, File, TrashIcon } from 'lucide-react';
import type { LucideIcon } from 'lucide-react/dist/lucide-react';
import type { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
@ -38,6 +38,11 @@ export const FRIENDLY_STATUS_MAP: Record<ExtendedDocumentStatus, FriendlyStatus>
label: 'All',
color: 'text-muted-foreground',
},
BIN: {
label: 'Bin',
icon: TrashIcon,
color: 'text-red-500 dark:text-red-200',
},
};
export type DocumentStatusProps = HTMLAttributes<HTMLSpanElement> & {

155
packages/lib/server-only/document/find-documents.ts
View File

@ -94,57 +94,61 @@ export const findDocuments = async ({
};
}
let deletedFilter: Prisma.DocumentWhereInput = {
AND: {
OR: [
{
userId: user.id,
deletedAt: null,
},
{
Recipient: {
some: {
email: user.email,
documentDeletedAt: null,
},
},
},
],
},
};
let deletedFilter: Prisma.DocumentWhereInput | undefined;
if (team) {
if (status !== ExtendedDocumentStatus.BIN) {
deletedFilter = {
AND: {
OR: team.teamEmail
? [
{
teamId: team.id,
deletedAt: null,
OR: [
{
userId: user.id,
deletedAt: null,
},
{
Recipient: {
some: {
email: user.email,
documentDeletedAt: null,
},
{
User: {
email: team.teamEmail.email,
},
deletedAt: null,
},
{
Recipient: {
some: {
email: team.teamEmail.email,
documentDeletedAt: null,
},
},
},
]
: [
{
teamId: team.id,
deletedAt: null,
},
],
},
},
],
},
};
if (team) {
deletedFilter = {
AND: {
OR: team.teamEmail
? [
{
teamId: team.id,
deletedAt: null,
},
{
User: {
email: team.teamEmail.email,
},
deletedAt: null,
},
{
Recipient: {
some: {
email: team.teamEmail.email,
documentDeletedAt: null,
},
},
},
]
: [
{
teamId: team.id,
deletedAt: null,
},
],
},
};
}
}
const whereClause: Prisma.DocumentWhereInput = {
@ -298,6 +302,29 @@ const findDocumentsFilter = (status: ExtendedDocumentStatus, user: User) => {
},
],
}))
.with(ExtendedDocumentStatus.BIN, () => ({
OR: [
{
userId: user.id,
teamId: null,
status: ExtendedDocumentStatus.COMPLETED,
deletedAt: {
gte: DateTime.now().minus({ days: 30 }).startOf('day').toJSDate(),
},
},
{
status: ExtendedDocumentStatus.COMPLETED,
Recipient: {
some: {
email: user.email,
documentDeletedAt: {
gte: DateTime.now().minus({ days: 30 }).startOf('day').toJSDate(),
},
},
},
},
],
}))
.exhaustive();
};
@ -477,5 +504,43 @@ const findTeamDocumentsFilter = (
return filter;
})
.with(ExtendedDocumentStatus.BIN, () => {
const filter: Prisma.DocumentWhereInput = {
OR: [
{
teamId: team.id,
deletedAt: {
gte: DateTime.now().minus({ days: 30 }).startOf('day').toJSDate(),
},
},
],
};
if (teamEmail && filter.OR) {
filter.OR.push(
{
User: {
email: teamEmail,
},
deletedAt: {
gte: DateTime.now().minus({ days: 30 }).startOf('day').toJSDate(),
},
},
{
Recipient: {
some: {
email: teamEmail,
documentDeletedAt: {
gte: DateTime.now().minus({ days: 30 }).startOf('day').toJSDate(),
},
},
},
},
);
}
return filter;
})
.exhaustive();
};

1
packages/lib/server-only/document/get-stats.ts
View File

@ -36,6 +36,7 @@ export const getStats = async ({ user, period, ...options }: GetStatsInput) => {
[ExtendedDocumentStatus.COMPLETED]: 0,
[ExtendedDocumentStatus.INBOX]: 0,
[ExtendedDocumentStatus.ALL]: 0,
[ExtendedDocumentStatus.BIN]: 0,
};
ownerCounts.forEach((stat) => {

1
packages/prisma/types/extended-document-status.ts
View File

@ -4,6 +4,7 @@ export const ExtendedDocumentStatus = {
...DocumentStatus,
INBOX: 'INBOX',
ALL: 'ALL',
BIN: 'BIN',
} as const;
export type ExtendedDocumentStatus =