Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2025-11-23 05:01:54 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix: rebase

Browse Source
This commit is contained in:
David Nguyen
2025-06-12 17:46:03 +10:00
parent e3ce7f94e6
commit 5f17288af6
12 changed files with 210 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
View File

@ -6,6 +6,7 @@ import { DateTime } from 'luxon';
import { Link, redirect } from 'react-router';
import { getEntireDocument } from '@documenso/lib/server-only/admin/get-entire-document';
import { isDocumentBeingProcessed } from '@documenso/lib/utils/document';
import { trpc } from '@documenso/trpc/react';
import {
Accordion,
@ -24,6 +25,7 @@ import {
import { useToast } from '@documenso/ui/primitives/use-toast';
import { AdminDocumentDeleteDialog } from '~/components/dialogs/admin-document-delete-dialog';
import { DocumentProcessingPoll } from '~/components/general/document/document-processing-poll';
import { DocumentStatus } from '~/components/general/document/document-status';
import { AdminDocumentRecipientItemTable } from '~/components/tables/admin-document-recipient-item-table';
@ -69,7 +71,10 @@ export default function AdminDocumentDetailsPage({ loaderData }: Route.Component
<div className="flex items-start justify-between">
<div className="flex items-center gap-x-4">
<h1 className="text-2xl font-semibold">{document.title}</h1>
<DocumentStatus status={document.status} />
<DocumentStatus
status={document.status}
isProcessing={isDocumentBeingProcessed(document)}
/>
</div>
{document.deletedAt && (
@ -162,6 +167,8 @@ export default function AdminDocumentDetailsPage({ loaderData }: Route.Component
<hr className="my-4" />
{document && <AdminDocumentDeleteDialog document={document} />}
<DocumentProcessingPoll documents={document} />
</div>
);
}

8
apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
View File

@ -8,6 +8,7 @@ import { Link, useSearchParams } from 'react-router';
import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
import { isDocumentBeingProcessed } from '@documenso/lib/utils/document';
import { extractInitials } from '@documenso/lib/utils/recipient-formatter';
import { trpc } from '@documenso/trpc/react';
import { Avatar, AvatarFallback } from '@documenso/ui/primitives/avatar';
@ -75,7 +76,12 @@ export default function AdminDocumentsPage() {
{
header: _(msg`Status`),
accessorKey: 'status',
cell: ({ row }) => <DocumentStatus status={row.original.status} />,
cell: ({ row }) => (
<DocumentStatus
status={row.original.status}
isProcessing={isDocumentBeingProcessed(row.original)}
/>
),
},
{
header: _(msg`Owner`),

5
apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
View File

@ -10,6 +10,7 @@ import { useSession } from '@documenso/lib/client-only/providers/session';
import { getDocumentWithDetailsById } from '@documenso/lib/server-only/document/get-document-with-details-by-id';
import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
import { DocumentVisibility } from '@documenso/lib/types/document-visibility';
import { isDocumentBeingProcessed } from '@documenso/lib/utils/document';
import { formatDocumentsPath } from '@documenso/lib/utils/teams';
import { DocumentReadOnlyFields } from '@documenso/ui/components/document/document-read-only-fields';
import { Badge } from '@documenso/ui/primitives/badge';
@ -23,6 +24,7 @@ import { DocumentPageViewDropdown } from '~/components/general/document/document
import { DocumentPageViewInformation } from '~/components/general/document/document-page-view-information';
import { DocumentPageViewRecentActivity } from '~/components/general/document/document-page-view-recent-activity';
import { DocumentPageViewRecipients } from '~/components/general/document/document-page-view-recipients';
import { DocumentProcessingPoll } from '~/components/general/document/document-processing-poll';
import { DocumentRecipientLinkCopyDialog } from '~/components/general/document/document-recipient-link-copy-dialog';
import {
DocumentStatus as DocumentStatusComponent,
@ -128,6 +130,7 @@ export default function DocumentPage() {
<DocumentStatusComponent
inheritColor
status={document.status}
isProcessing={isDocumentBeingProcessed(document)}
className="text-muted-foreground"
/>
@ -241,6 +244,8 @@ export default function DocumentPage() {
</div>
</div>
</div>
<DocumentProcessingPoll documents={document} />
</div>
);
}

6
apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx
View File

@ -3,8 +3,7 @@ import { useEffect, useMemo, useState } from 'react';
import { Trans } from '@lingui/react/macro';
import { OrganisationType } from '@prisma/client';
import { FolderIcon, HomeIcon, Loader2 } from 'lucide-react';
import { useNavigate, useSearchParams } from 'react-router';
import { Link } from 'react-router';
import { Link, useNavigate, useSearchParams } from 'react-router';
import { z } from 'zod';
import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
@ -29,6 +28,7 @@ import { FolderDeleteDialog } from '~/components/dialogs/folder-delete-dialog';
import { FolderMoveDialog } from '~/components/dialogs/folder-move-dialog';
import { FolderSettingsDialog } from '~/components/dialogs/folder-settings-dialog';
import { DocumentDropZoneWrapper } from '~/components/general/document/document-drop-zone-wrapper';
import { DocumentProcessingPoll } from '~/components/general/document/document-processing-poll';
import { DocumentSearch } from '~/components/general/document/document-search';
import { DocumentStatus } from '~/components/general/document/document-status';
import { DocumentUploadDropzone } from '~/components/general/document/document-upload';
@ -346,6 +346,8 @@ export default function DocumentsPage() {
}}
/>
)}
<DocumentProcessingPoll documents={data?.data} />
</div>
</div>

3
apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId._index.tsx
View File

@ -26,6 +26,7 @@ import { FolderDeleteDialog } from '~/components/dialogs/folder-delete-dialog';
import { FolderMoveDialog } from '~/components/dialogs/folder-move-dialog';
import { FolderSettingsDialog } from '~/components/dialogs/folder-settings-dialog';
import { DocumentDropZoneWrapper } from '~/components/general/document/document-drop-zone-wrapper';
import { DocumentProcessingPoll } from '~/components/general/document/document-processing-poll';
import { DocumentSearch } from '~/components/general/document/document-search';
import { DocumentStatus } from '~/components/general/document/document-status';
import { DocumentUploadDropzone } from '~/components/general/document/document-upload';
@ -314,6 +315,8 @@ export default function DocumentsPage() {
}}
/>
)}
<DocumentProcessingPoll documents={data?.data} />
</div>
</div>