From 82b87739d017fac09007e79506be747c82de2e8d Mon Sep 17 00:00:00 2001 From: David Nguyen Date: Mon, 12 Feb 2024 19:00:47 +1100 Subject: [PATCH] fix: update document links --- .../(dashboard)/documents/data-table-title.tsx | 15 +++++++++++---- .../src/app/(dashboard)/documents/data-table.tsx | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/apps/web/src/app/(dashboard)/documents/data-table-title.tsx b/apps/web/src/app/(dashboard)/documents/data-table-title.tsx index c04f9f13d..dc2ba154d 100644 --- a/apps/web/src/app/(dashboard)/documents/data-table-title.tsx +++ b/apps/web/src/app/(dashboard)/documents/data-table-title.tsx @@ -5,16 +5,19 @@ import Link from 'next/link'; import { useSession } from 'next-auth/react'; import { match } from 'ts-pattern'; -import { Document, Recipient, User } from '@documenso/prisma/client'; +import { formatDocumentsPath } from '@documenso/lib/utils/teams'; +import type { Document, Recipient, Team, User } from '@documenso/prisma/client'; export type DataTableTitleProps = { row: Document & { User: Pick; + team: Pick | null; Recipient: Recipient[]; }; + teamUrl?: string; }; -export const DataTableTitle = ({ row }: DataTableTitleProps) => { +export const DataTableTitle = ({ row, teamUrl }: DataTableTitleProps) => { const { data: session } = useSession(); if (!session) { @@ -25,14 +28,18 @@ export const DataTableTitle = ({ row }: DataTableTitleProps) => { const isOwner = row.User.id === session.user.id; const isRecipient = !!recipient; + const isCurrentTeamDocument = teamUrl && row.team?.url === teamUrl; + + const documentsPath = formatDocumentsPath(isCurrentTeamDocument ? teamUrl : undefined); return match({ isOwner, isRecipient, + isCurrentTeamDocument, }) - .with({ isOwner: true }, () => ( + .with({ isOwner: true }, { isCurrentTeamDocument: true }, () => ( diff --git a/apps/web/src/app/(dashboard)/documents/data-table.tsx b/apps/web/src/app/(dashboard)/documents/data-table.tsx index 13b85d526..1adaace7b 100644 --- a/apps/web/src/app/(dashboard)/documents/data-table.tsx +++ b/apps/web/src/app/(dashboard)/documents/data-table.tsx @@ -66,7 +66,7 @@ export const DocumentsDataTable = ({ }, { header: 'Title', - cell: ({ row }) => , + cell: ({ row }) => , }, { id: 'sender',