The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
feat: add inbox counter (#1849)
Ephraim Duncan29a03d4ec7ab
diff --git a/apps/remix/app/components/general/app-header.tsx b/apps/remix/app/components/general/app-header.tsxindex f907e7efd..dce88ac53 100644--- a/apps/remix/app/components/general/app-header.tsx+++ b/apps/remix/app/components/general/app-header.tsx@@ -1,11 +1,13 @@import { type HTMLAttributes, useEffect, useState } from 'react';+import { ReadStatus } from '@prisma/client';import { InboxIcon, MenuIcon, SearchIcon } from 'lucide-react';import { Link, useParams } from 'react-router';import { useSession } from '@documenso/lib/client-only/providers/session';import { isPersonalLayout } from '@documenso/lib/utils/organisations';import { getRootHref } from '@documenso/lib/utils/params';+import { trpc } from '@documenso/trpc/react';import { cn } from '@documenso/ui/lib/utils';import { Button } from '@documenso/ui/primitives/button';@@ -28,6 +30,15 @@ export const Header = ({ className, ...props }: HeaderProps) => {const [isHamburgerMenuOpen, setIsHamburgerMenuOpen] = useState(false);const [scrollY, setScrollY] = useState(0);+ const { data: unreadCountData } = trpc.document.inbox.getCount.useQuery(+ {+ readStatus: ReadStatus.NOT_OPENED,+ },+ {+ // refetchInterval: 30000, // Refetch every 30 seconds+ },+ );+useEffect(() => {const onScroll = () => {setScrollY(window.scrollY);@@ -61,12 +72,11 @@ export const Header = ({ className, ...props }: HeaderProps) => {<Link to="/inbox" className="relative block h-10 w-10"><InboxIcon className="text-muted-foreground hover:text-foreground h-5 w-5 flex-shrink-0 transition-colors" />- {/* Todo: Add counter. */}- {/* {unreadCount > 0 && (- <span className="bg-muted text-muted-foreground absolute -right-2 -top-2 flex h-5 w-5 items-center justify-center rounded-full text-[10px]">- 1+ {unreadCountData && unreadCountData.count > 0 && (+ <span className="bg-primary text-primary-foreground absolute -right-1.5 -top-1.5 flex h-5 w-5 items-center justify-center rounded-full text-[10px] font-semibold">+ {unreadCountData.count > 99 ? '99+' : unreadCountData.count}</span>- )} */}+ )}</Link></Button>diff --git a/apps/remix/app/components/general/app-nav-mobile.tsx b/apps/remix/app/components/general/app-nav-mobile.tsxindex 757a26f68..b45246875 100644--- a/apps/remix/app/components/general/app-nav-mobile.tsx+++ b/apps/remix/app/components/general/app-nav-mobile.tsx@@ -2,12 +2,14 @@ import { useMemo } from 'react';import { useLingui } from '@lingui/react/macro';import { Trans } from '@lingui/react/macro';+import { ReadStatus } from '@prisma/client';import { Link } from 'react-router';import LogoImage from '@documenso/assets/logo.png';import { authClient } from '@documenso/auth/client';import { useSession } from '@documenso/lib/client-only/providers/session';import { isPersonalLayout } from '@documenso/lib/utils/organisations';+import { trpc } from '@documenso/trpc/react';import { Sheet, SheetContent } from '@documenso/ui/primitives/sheet';import { ThemeSwitcher } from '@documenso/ui/primitives/theme-switcher';@@ -25,6 +27,15 @@ export const AppNavMobile = ({ isMenuOpen, onMenuOpenChange }: AppNavMobilePropsconst currentTeam = useOptionalCurrentTeam();+ const { data: unreadCountData } = trpc.document.inbox.getCount.useQuery(+ {+ readStatus: ReadStatus.NOT_OPENED,+ },+ {+ // refetchInterval: 30000, // Refetch every 30 seconds+ },+ );+const handleMenuItemClick = () => {onMenuOpenChange?.(false);};@@ -52,11 +63,11 @@ export const AppNavMobile = ({ isMenuOpen, onMenuOpenChange }: AppNavMobilePropsreturn [{href: `/t/${teamUrl}/documents`,- label: t`Documents`,+ text: t`Documents`,},{href: `/t/${teamUrl}/templates`,- label: t`Templates`,+ text: t`Templates`,},{href: '/inbox',@@ -86,11 +97,16 @@ export const AppNavMobile = ({ isMenuOpen, onMenuOpenChange }: AppNavMobileProps{menuNavigationLinks.map(({ href, text }) => (<Linkkey={href}- className="text-foreground hover:text-foreground/80 text-2xl font-semibold"+ className="text-foreground hover:text-foreground/80 flex items-center gap-2 text-2xl font-semibold"to={href}onClick={() => handleMenuItemClick()}>{text}+ {href === '/inbox' && unreadCountData && unreadCountData.count > 0 && (+ <span className="bg-primary text-primary-foreground flex h-6 min-w-[1.5rem] items-center justify-center rounded-full px-1.5 text-xs font-semibold">+ {unreadCountData.count > 99 ? '99+' : unreadCountData.count}+ </span>+ )}</Link>))}diff --git a/packages/trpc/server/document-router/get-inbox-count.ts b/packages/trpc/server/document-router/get-inbox-count.tsnew file mode 100644index 000000000..f6b7ef0e2--- /dev/null+++ b/packages/trpc/server/document-router/get-inbox-count.ts@@ -0,0 +1,35 @@+import { DocumentStatus, RecipientRole } from '@prisma/client';++import { prisma } from '@documenso/prisma';++import { authenticatedProcedure } from '../trpc';+import { ZGetInboxCountRequestSchema, ZGetInboxCountResponseSchema } from './get-inbox-count.types';++export const getInboxCountRoute = authenticatedProcedure+ .input(ZGetInboxCountRequestSchema)+ .output(ZGetInboxCountResponseSchema)+ .query(async ({ input, ctx }) => {+ const { readStatus } = input ?? {};++ const userEmail = ctx.user.email;++ const count = await prisma.recipient.count({+ where: {+ email: userEmail,+ readStatus,+ role: {+ not: RecipientRole.CC,+ },+ document: {+ status: {+ not: DocumentStatus.DRAFT,+ },+ deletedAt: null,+ },+ },+ });++ return {+ count,+ };+ });diff --git a/packages/trpc/server/document-router/get-inbox-count.types.ts b/packages/trpc/server/document-router/get-inbox-count.types.tsnew file mode 100644index 000000000..bd10626b4--- /dev/null+++ b/packages/trpc/server/document-router/get-inbox-count.types.ts@@ -0,0 +1,15 @@+// import type { OpenApiMeta } from 'trpc-to-openapi';+import { ReadStatus } from '@prisma/client';+import { z } from 'zod';++export const ZGetInboxCountRequestSchema = z+ .object({+ readStatus: z.nativeEnum(ReadStatus).optional(),+ })+ .optional();++export const ZGetInboxCountResponseSchema = z.object({+ count: z.number(),+});++export type TGetInboxCountResponse = z.infer<typeof ZGetInboxCountResponseSchema>;diff --git a/packages/trpc/server/document-router/router.ts b/packages/trpc/server/document-router/router.tsindex b1d60effb..a2fa0467d 100644--- a/packages/trpc/server/document-router/router.ts+++ b/packages/trpc/server/document-router/router.ts@@ -28,6 +28,7 @@ import { isDocumentCompleted } from '@documenso/lib/utils/document';import { authenticatedProcedure, procedure, router } from '../trpc';import { findInboxRoute } from './find-inbox';+import { getInboxCountRoute } from './get-inbox-count';import {ZCreateDocumentRequestSchema,ZCreateDocumentV2RequestSchema,@@ -59,6 +60,7 @@ import { updateDocumentRoute } from './update-document';export const documentRouter = router({inbox: {find: findInboxRoute,+ getCount: getInboxCountRoute,},/**