The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
fix: document count period filter (#882)
David Nguyen27d8098511e4
diff --git a/apps/web/src/app/(dashboard)/documents/page.tsx b/apps/web/src/app/(dashboard)/documents/page.tsxindex a15d65306..e61aad649 100644--- a/apps/web/src/app/(dashboard)/documents/page.tsx+++ b/apps/web/src/app/(dashboard)/documents/page.tsx@@ -2,6 +2,7 @@ import type { Metadata } from 'next';import Link from 'next/link';import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';+import type { PeriodSelectorValue } from '@documenso/lib/server-only/document/find-documents';import { findDocuments } from '@documenso/lib/server-only/document/find-documents';import { getStats } from '@documenso/lib/server-only/document/get-stats';import { isExtendedDocumentStatus } from '@documenso/prisma/guards/is-extended-document-status';@@ -9,7 +10,6 @@ import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-documenimport { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';import { PeriodSelector } from '~/components/(dashboard)/period-selector/period-selector';-import type { PeriodSelectorValue } from '~/components/(dashboard)/period-selector/types';import { isPeriodSelectorValue } from '~/components/(dashboard)/period-selector/types';import { DocumentStatus } from '~/components/formatter/document-status';@@ -32,15 +32,16 @@ export const metadata: Metadata = {export default async function DocumentsPage({ searchParams = {} }: DocumentsPageProps) {const { user } = await getRequiredServerComponentSession();- const stats = await getStats({- user,- });-const status = isExtendedDocumentStatus(searchParams.status) ? searchParams.status : 'ALL';const period = isPeriodSelectorValue(searchParams.period) ? searchParams.period : '';const page = Number(searchParams.page) || 1;const perPage = Number(searchParams.perPage) || 20;+ const stats = await getStats({+ user,+ period,+ });+const results = await findDocuments({userId: user.id,status,diff --git a/apps/web/src/components/(dashboard)/period-selector/types.ts b/apps/web/src/components/(dashboard)/period-selector/types.tsindex 2b50f5d6c..8ae1c5fbe 100644--- a/apps/web/src/components/(dashboard)/period-selector/types.ts+++ b/apps/web/src/components/(dashboard)/period-selector/types.ts@@ -1,4 +1,4 @@-export type PeriodSelectorValue = '' | '7d' | '14d' | '30d';+import type { PeriodSelectorValue } from '@documenso/lib/server-only/document/find-documents';export const isPeriodSelectorValue = (value: unknown): value is PeriodSelectorValue => {// eslint-disable-next-line @typescript-eslint/consistent-type-assertionsdiff --git a/packages/lib/server-only/document/find-documents.ts b/packages/lib/server-only/document/find-documents.tsindex def85f2d4..2929c515b 100644--- a/packages/lib/server-only/document/find-documents.ts+++ b/packages/lib/server-only/document/find-documents.ts@@ -9,6 +9,8 @@ import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-documenimport type { FindResultSet } from '../../types/find-result-set';import { maskRecipientTokensForDocument } from '../../utils/mask-recipient-tokens-for-document';+export type PeriodSelectorValue = '' | '7d' | '14d' | '30d';+export type FindDocumentsOptions = {userId: number;term?: string;@@ -19,7 +21,7 @@ export type FindDocumentsOptions = {column: keyof Omit<Document, 'document'>;direction: 'asc' | 'desc';};- period?: '' | '7d' | '14d' | '30d';+ period?: PeriodSelectorValue;};export const findDocuments = async ({diff --git a/packages/lib/server-only/document/get-stats.ts b/packages/lib/server-only/document/get-stats.tsindex 044d9a2dc..6aaa9a596 100644--- a/packages/lib/server-only/document/get-stats.ts+++ b/packages/lib/server-only/document/get-stats.ts@@ -1,14 +1,31 @@+import { DateTime } from 'luxon';+import { prisma } from '@documenso/prisma';-import type { User } from '@documenso/prisma/client';+import type { Prisma, User } from '@documenso/prisma/client';import { SigningStatus } from '@documenso/prisma/client';import { isExtendedDocumentStatus } from '@documenso/prisma/guards/is-extended-document-status';import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';+import type { PeriodSelectorValue } from './find-documents';+export type GetStatsInput = {user: User;+ period?: PeriodSelectorValue;};-export const getStats = async ({ user }: GetStatsInput) => {+export const getStats = async ({ user, period }: GetStatsInput) => {+ let createdAt: Prisma.DocumentWhereInput['createdAt'];++ if (period) {+ const daysAgo = parseInt(period.replace(/d$/, ''), 10);++ const startOfPeriod = DateTime.now().minus({ days: daysAgo }).startOf('day');++ createdAt = {+ gte: startOfPeriod.toJSDate(),+ };+ }+const [ownerCounts, notSignedCounts, hasSignedCounts] = await Promise.all([prisma.document.groupBy({by: ['status'],@@ -17,6 +34,7 @@ export const getStats = async ({ user }: GetStatsInput) => {},where: {userId: user.id,+ createdAt,deletedAt: null,},}),@@ -33,6 +51,7 @@ export const getStats = async ({ user }: GetStatsInput) => {signingStatus: SigningStatus.NOT_SIGNED,},},+ createdAt,deletedAt: null,},}),@@ -42,6 +61,7 @@ export const getStats = async ({ user }: GetStatsInput) => {_all: true,},where: {+ createdAt,User: {email: {not: user.email,