mirror of
https://github.com/documenso/documenso.git
synced 2026-09-29 16:24:30 +10:00
fix: keep the fix in the UI
This commit is contained in:
@@ -38,9 +38,9 @@ type EnvelopeDownloadDialogProps = {
|
||||
|
||||
/**
|
||||
* Used as the display/download name for single-item envelopes, since item titles
|
||||
* are never updated on rename. Pass it alongside `envelopeItems`.
|
||||
* are never updated when the envelope is renamed.
|
||||
*/
|
||||
envelopeTitle?: string;
|
||||
envelopeTitle: string;
|
||||
|
||||
/**
|
||||
* The recipient token to download the document.
|
||||
@@ -56,7 +56,7 @@ export const EnvelopeDownloadDialog = ({
|
||||
envelopeStatus,
|
||||
isLegacy,
|
||||
envelopeItems: initialEnvelopeItems,
|
||||
envelopeTitle: initialEnvelopeTitle,
|
||||
envelopeTitle,
|
||||
token,
|
||||
trigger,
|
||||
}: EnvelopeDownloadDialogProps) => {
|
||||
@@ -104,18 +104,14 @@ export const EnvelopeDownloadDialog = ({
|
||||
access: token ? { type: 'recipient', token } : { type: 'user' },
|
||||
},
|
||||
{
|
||||
initialData: initialEnvelopeItems
|
||||
? { data: initialEnvelopeItems, envelopeTitle: initialEnvelopeTitle ?? '' }
|
||||
: undefined,
|
||||
initialData: initialEnvelopeItems ? { data: initialEnvelopeItems } : undefined,
|
||||
enabled: open,
|
||||
},
|
||||
);
|
||||
|
||||
const envelopeItems = envelopeItemsPayload?.data || [];
|
||||
const envelopeTitle = envelopeItemsPayload?.envelopeTitle;
|
||||
|
||||
const getItemTitle = (item: EnvelopeItemToDownload) =>
|
||||
envelopeItems.length === 1 && envelopeTitle ? envelopeTitle : item.title;
|
||||
const getItemTitle = (item: EnvelopeItemToDownload) => (envelopeItems.length === 1 ? envelopeTitle : item.title);
|
||||
|
||||
const onDownload = async (envelopeItem: EnvelopeItemToDownload, version: 'original' | 'signed' | 'pending') => {
|
||||
const { id: envelopeItemId } = envelopeItem;
|
||||
|
||||
@@ -150,7 +150,7 @@ export const EnvelopesBulkDownloadDialog = ({
|
||||
try {
|
||||
const downloadVersion = getDownloadVersion(envelope);
|
||||
|
||||
const { data: envelopeItems, envelopeTitle } = await trpcUtils.envelope.item.getManyByToken.fetch({
|
||||
const { data: envelopeItems } = await trpcUtils.envelope.item.getManyByToken.fetch({
|
||||
envelopeId: envelope.id,
|
||||
access: {
|
||||
type: 'user',
|
||||
@@ -171,7 +171,7 @@ export const EnvelopesBulkDownloadDialog = ({
|
||||
const { filename, blob } = await fetchPDF({
|
||||
envelopeItem,
|
||||
token: undefined,
|
||||
fileName: envelopeItems.length === 1 ? envelopeTitle : envelopeItem.title,
|
||||
fileName: envelopeItems.length === 1 ? envelope.title : envelopeItem.title,
|
||||
version: downloadVersion,
|
||||
});
|
||||
|
||||
|
||||
@@ -99,6 +99,7 @@ export const DocumentsTableActionButton = ({ row }: DocumentsTableActionButtonPr
|
||||
<EnvelopeDownloadDialog
|
||||
envelopeId={row.envelopeId}
|
||||
envelopeStatus={row.status}
|
||||
envelopeTitle={row.title}
|
||||
token={recipient?.token}
|
||||
trigger={
|
||||
<Button className="w-32">
|
||||
|
||||
@@ -154,6 +154,7 @@ export const DocumentsTableActionDropdown = ({ row, onMoveDocument }: DocumentsT
|
||||
<EnvelopeDownloadDialog
|
||||
envelopeId={row.envelopeId}
|
||||
envelopeStatus={row.status}
|
||||
envelopeTitle={row.title}
|
||||
isLegacy={row.internalVersion === 1}
|
||||
token={canManageDocument ? undefined : recipient?.token}
|
||||
trigger={
|
||||
|
||||
@@ -248,6 +248,7 @@ export const InboxTableActionButton = ({ row }: InboxTableActionButtonProps) =>
|
||||
<EnvelopeDownloadDialog
|
||||
envelopeId={row.envelopeId}
|
||||
envelopeStatus={row.status}
|
||||
envelopeTitle={row.title}
|
||||
token={recipient?.token}
|
||||
trigger={
|
||||
<Button className="w-32">
|
||||
|
||||
@@ -66,6 +66,7 @@ export const TemplatesTableActionDropdown = ({
|
||||
<EnvelopeDownloadDialog
|
||||
envelopeId={row.envelopeId}
|
||||
envelopeStatus={DocumentStatus.DRAFT}
|
||||
envelopeTitle={row.title}
|
||||
trigger={
|
||||
<DropdownMenuItem asChild onSelect={(e) => e.preventDefault()}>
|
||||
<div>
|
||||
|
||||
@@ -34,7 +34,7 @@ export const getEnvelopeItemsByTokenRoute = maybeAuthenticatedProcedure
|
||||
});
|
||||
}
|
||||
|
||||
const { envelopeItems: data, envelopeTitle } = await handleGetEnvelopeItemsByUser({
|
||||
const { envelopeItems: data } = await handleGetEnvelopeItemsByUser({
|
||||
envelopeId,
|
||||
userId: user.id,
|
||||
teamId,
|
||||
@@ -42,18 +42,16 @@ export const getEnvelopeItemsByTokenRoute = maybeAuthenticatedProcedure
|
||||
|
||||
return {
|
||||
data,
|
||||
envelopeTitle,
|
||||
};
|
||||
}
|
||||
|
||||
const { envelopeItems: data, envelopeTitle } = await handleGetEnvelopeItemsByToken({
|
||||
const { envelopeItems: data } = await handleGetEnvelopeItemsByToken({
|
||||
envelopeId,
|
||||
token: access.token,
|
||||
});
|
||||
|
||||
return {
|
||||
data,
|
||||
envelopeTitle,
|
||||
};
|
||||
});
|
||||
|
||||
@@ -85,7 +83,6 @@ const handleGetEnvelopeItemsByToken = async ({ envelopeId, token }: { envelopeId
|
||||
|
||||
return {
|
||||
envelopeItems: envelope.envelopeItems,
|
||||
envelopeTitle: envelope.title,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -150,6 +147,5 @@ const handleGetEnvelopeItemsByUser = async ({
|
||||
|
||||
return {
|
||||
envelopeItems: envelope.envelopeItems,
|
||||
envelopeTitle: envelope.title,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -21,5 +21,4 @@ export const ZGetEnvelopeItemsByTokenResponseSchema = z.object({
|
||||
title: true,
|
||||
order: true,
|
||||
}).array(),
|
||||
envelopeTitle: z.string(),
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user