Skip to content

The Open Source DocuSign Alternative.

fix: fix bug for completed document shortcut (#839)

Catalin Pit204388888d30
diff --git a/apps/web/src/components/(dashboard)/common/command-menu.tsx b/apps/web/src/components/(dashboard)/common/command-menu.tsx
index ffbd213a4..93f7fa729 100644
--- a/apps/web/src/components/(dashboard)/common/command-menu.tsx
+++ b/apps/web/src/components/(dashboard)/common/command-menu.tsx
@@ -5,6 +5,7 @@ import { useCallback, useMemo, useState } from 'react';
import { useRouter } from 'next/navigation';
import { Loader, Monitor, Moon, Sun } from 'lucide-react';
+import { useSession } from 'next-auth/react';
import { useTheme } from 'next-themes';
import { useHotkeys } from 'react-hotkeys-hook';
@@ -13,6 +14,7 @@ import {
SETTINGS_PAGE_SHORTCUT,
TEMPLATES_PAGE_SHORTCUT,
} from '@documenso/lib/constants/keyboard-shortcuts';
+import type { Document, Recipient } from '@documenso/prisma/client';
import { trpc as trpcReact } from '@documenso/trpc/react';
import {
CommandDialog,
@@ -65,6 +67,8 @@ export type CommandMenuProps = {
export function CommandMenu({ open, onOpenChange }: CommandMenuProps) {
const { setTheme } = useTheme();
+ const { data: session } = useSession();
+
const router = useRouter();
const [isOpen, setIsOpen] = useState(() => open ?? false);
@@ -81,6 +85,17 @@ export function CommandMenu({ open, onOpenChange }: CommandMenuProps) {
},
);
+ const isOwner = useCallback(
+ (document: Document) => document.userId === session?.user.id,
+ [session?.user.id],
+ );
+
+ const getSigningLink = useCallback(
+ (recipients: Recipient[]) =>
+ `/sign/${recipients.find((r) => r.email === session?.user.email)?.token}`,
+ [session?.user.email],
+ );
+
const searchResults = useMemo(() => {
if (!searchDocumentsData) {
return [];
@@ -88,10 +103,10 @@ export function CommandMenu({ open, onOpenChange }: CommandMenuProps) {
return searchDocumentsData.map((document) => ({
label: document.title,
- path: `/documents/${document.id}`,
+ path: isOwner(document) ? `/documents/${document.id}` : getSigningLink(document.Recipient),
value: [document.id, document.title, ...document.Recipient.map((r) => r.email)].join(' '),
}));
- }, [searchDocumentsData]);
+ }, [searchDocumentsData, isOwner, getSigningLink]);
const currentPage = pages[pages.length - 1];