The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
feat: add folders (#1711)
Catalin Pit17370749b41b
diff --git a/apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx b/apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsxnew file mode 100644index 000000000..e8aefd0c0--- /dev/null+++ b/apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx@@ -0,0 +1,216 @@+import { useEffect } from 'react';++import { zodResolver } from '@hookform/resolvers/zod';+import { msg } from '@lingui/core/macro';+import { useLingui } from '@lingui/react';+import { Trans } from '@lingui/react/macro';+import type * as DialogPrimitive from '@radix-ui/react-dialog';+import { FolderIcon, HomeIcon, Loader2 } from 'lucide-react';+import { useForm } from 'react-hook-form';+import { useNavigate } from 'react-router';+import { z } from 'zod';++import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { FolderType } from '@documenso/lib/types/folder-type';+import { formatDocumentsPath } from '@documenso/lib/utils/teams';+import { trpc } from '@documenso/trpc/react';+import { Button } from '@documenso/ui/primitives/button';+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+} from '@documenso/ui/primitives/dialog';+import {+ Form,+ FormControl,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from '@documenso/ui/primitives/form/form';+import { useToast } from '@documenso/ui/primitives/use-toast';++import { useOptionalCurrentTeam } from '~/providers/team';++export type DocumentMoveToFolderDialogProps = {+ documentId: number;+ open: boolean;+ onOpenChange: (open: boolean) => void;+ currentFolderId?: string;+} & Omit<DialogPrimitive.DialogProps, 'children'>;++const ZMoveDocumentFormSchema = z.object({+ folderId: z.string().nullable().optional(),+});++type TMoveDocumentFormSchema = z.infer<typeof ZMoveDocumentFormSchema>;++export const DocumentMoveToFolderDialog = ({+ documentId,+ open,+ onOpenChange,+ currentFolderId,+ ...props+}: DocumentMoveToFolderDialogProps) => {+ const { _ } = useLingui();+ const { toast } = useToast();+ const navigate = useNavigate();+ const team = useOptionalCurrentTeam();++ const form = useForm<TMoveDocumentFormSchema>({+ resolver: zodResolver(ZMoveDocumentFormSchema),+ defaultValues: {+ folderId: currentFolderId,+ },+ });++ const { data: folders, isLoading: isFoldersLoading } = trpc.folder.findFolders.useQuery(+ {+ parentId: currentFolderId,+ type: FolderType.DOCUMENT,+ },+ {+ enabled: open,+ },+ );++ const { mutateAsync: moveDocumentToFolder } = trpc.folder.moveDocumentToFolder.useMutation();++ useEffect(() => {+ if (!open) {+ form.reset();+ } else {+ form.reset({ folderId: currentFolderId });+ }+ }, [open, currentFolderId, form]);++ const onSubmit = async (data: TMoveDocumentFormSchema) => {+ try {+ await moveDocumentToFolder({+ documentId,+ folderId: data.folderId ?? null,+ });++ toast({+ title: _(msg`Document moved`),+ description: _(msg`The document has been moved successfully.`),+ variant: 'default',+ });++ onOpenChange(false);++ const documentsPath = formatDocumentsPath(team?.url);++ if (data.folderId) {+ void navigate(`${documentsPath}/f/${data.folderId}`);+ } else {+ void navigate(documentsPath);+ }+ } catch (err) {+ const error = AppError.parseError(err);++ if (error.code === AppErrorCode.NOT_FOUND) {+ toast({+ title: _(msg`Error`),+ description: _(msg`The folder you are trying to move the document to does not exist.`),+ variant: 'destructive',+ });++ return;+ }++ toast({+ title: _(msg`Error`),+ description: _(msg`An error occurred while moving the document.`),+ variant: 'destructive',+ });+ }+ };++ return (+ <Dialog {...props} open={open} onOpenChange={onOpenChange}>+ <DialogContent>+ <DialogHeader>+ <DialogTitle>+ <Trans>Move Document to Folder</Trans>+ </DialogTitle>++ <DialogDescription>+ <Trans>Select a folder to move this document to.</Trans>+ </DialogDescription>+ </DialogHeader>++ <Form {...form}>+ <form onSubmit={form.handleSubmit(onSubmit)} className="mt-4 flex flex-col gap-y-4">+ <FormField+ control={form.control}+ name="folderId"+ render={({ field }) => (+ <FormItem>+ <FormLabel>+ <Trans>Folder</Trans>+ </FormLabel>+ <FormControl>+ <div className="space-y-2">+ {isFoldersLoading ? (+ <div className="flex h-10 items-center justify-center">+ <Loader2 className="h-4 w-4 animate-spin" />+ </div>+ ) : (+ <>+ <Button+ type="button"+ variant={field.value === null ? 'default' : 'outline'}+ className="w-full justify-start"+ onClick={() => field.onChange(null)}+ disabled={currentFolderId === null}+ >+ <HomeIcon className="mr-2 h-4 w-4" />+ <Trans>Root (No Folder)</Trans>+ </Button>++ {folders?.data.map((folder) => (+ <Button+ key={folder.id}+ type="button"+ variant={field.value === folder.id ? 'default' : 'outline'}+ className="w-full justify-start"+ onClick={() => field.onChange(folder.id)}+ disabled={currentFolderId === folder.id}+ >+ <FolderIcon className="mr-2 h-4 w-4" />+ {folder.name}+ </Button>+ ))}+ </>+ )}+ </div>+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />++ <DialogFooter>+ <Button type="button" variant="secondary" onClick={() => onOpenChange(false)}>+ <Trans>Cancel</Trans>+ </Button>++ <Button+ type="submit"+ disabled={+ isFoldersLoading || form.formState.isSubmitting || currentFolderId === null+ }+ >+ <Trans>Move</Trans>+ </Button>+ </DialogFooter>+ </form>+ </Form>+ </DialogContent>+ </Dialog>+ );+};diff --git a/apps/remix/app/components/dialogs/folder-create-dialog.tsx b/apps/remix/app/components/dialogs/folder-create-dialog.tsxnew file mode 100644index 000000000..c0544ba3a--- /dev/null+++ b/apps/remix/app/components/dialogs/folder-create-dialog.tsx@@ -0,0 +1,163 @@+import { useEffect, useState } from 'react';++import { zodResolver } from '@hookform/resolvers/zod';+import { msg } from '@lingui/core/macro';+import { useLingui } from '@lingui/react';+import type * as DialogPrimitive from '@radix-ui/react-dialog';+import { FolderPlusIcon } from 'lucide-react';+import { useForm } from 'react-hook-form';+import { useNavigate, useParams } from 'react-router';+import { z } from 'zod';++import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { FolderType } from '@documenso/lib/types/folder-type';+import { formatDocumentsPath } from '@documenso/lib/utils/teams';+import { trpc } from '@documenso/trpc/react';+import { Button } from '@documenso/ui/primitives/button';+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+ DialogTrigger,+} from '@documenso/ui/primitives/dialog';+import {+ Form,+ FormControl,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from '@documenso/ui/primitives/form/form';+import { Input } from '@documenso/ui/primitives/input';+import { useToast } from '@documenso/ui/primitives/use-toast';++import { useOptionalCurrentTeam } from '~/providers/team';++const ZCreateFolderFormSchema = z.object({+ name: z.string().min(1, { message: 'Folder name is required' }),+});++type TCreateFolderFormSchema = z.infer<typeof ZCreateFolderFormSchema>;++export type CreateFolderDialogProps = {+ trigger?: React.ReactNode;+} & Omit<DialogPrimitive.DialogProps, 'children'>;++export const CreateFolderDialog = ({ trigger, ...props }: CreateFolderDialogProps) => {+ const { _ } = useLingui();+ const { toast } = useToast();+ const { folderId } = useParams();++ const navigate = useNavigate();+ const team = useOptionalCurrentTeam();++ const [isCreateFolderOpen, setIsCreateFolderOpen] = useState(false);++ const { mutateAsync: createFolder } = trpc.folder.createFolder.useMutation();++ const form = useForm<TCreateFolderFormSchema>({+ resolver: zodResolver(ZCreateFolderFormSchema),+ defaultValues: {+ name: '',+ },+ });++ const onSubmit = async (data: TCreateFolderFormSchema) => {+ try {+ const newFolder = await createFolder({+ name: data.name,+ parentId: folderId,+ type: FolderType.DOCUMENT,+ });++ setIsCreateFolderOpen(false);++ toast({+ description: 'Folder created successfully',+ });++ const documentsPath = formatDocumentsPath(team?.url);++ void navigate(`${documentsPath}/f/${newFolder.id}`);+ } catch (err) {+ const error = AppError.parseError(err);++ if (error.code === AppErrorCode.ALREADY_EXISTS) {+ toast({+ title: 'Failed to create folder',+ description: _(msg`This folder name is already taken.`),+ variant: 'destructive',+ });++ return;+ }++ toast({+ title: 'Failed to create folder',+ description: _(msg`An unknown error occurred while creating the folder.`),+ variant: 'destructive',+ });+ }+ };++ useEffect(() => {+ if (!isCreateFolderOpen) {+ form.reset();+ }+ }, [isCreateFolderOpen, form]);++ return (+ <Dialog {...props} open={isCreateFolderOpen} onOpenChange={setIsCreateFolderOpen}>+ <DialogTrigger asChild>+ {trigger ?? (+ <Button variant="outline" className="flex items-center space-x-2">+ <FolderPlusIcon className="h-4 w-4" />+ <span>Create Folder</span>+ </Button>+ )}+ </DialogTrigger>++ <DialogContent>+ <DialogHeader>+ <DialogTitle>Create New Folder</DialogTitle>+ <DialogDescription>+ Enter a name for your new folder. Folders help you organize your documents.+ </DialogDescription>+ </DialogHeader>++ <Form {...form}>+ <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">+ <FormField+ control={form.control}+ name="name"+ render={({ field }) => (+ <FormItem>+ <FormLabel>Folder Name</FormLabel>+ <FormControl>+ <Input placeholder="My Folder" {...field} />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />++ <DialogFooter>+ <Button+ type="button"+ variant="secondary"+ onClick={() => setIsCreateFolderOpen(false)}+ >+ Cancel+ </Button>++ <Button type="submit">Create</Button>+ </DialogFooter>+ </form>+ </Form>+ </DialogContent>+ </Dialog>+ );+};diff --git a/apps/remix/app/components/dialogs/folder-delete-dialog.tsx b/apps/remix/app/components/dialogs/folder-delete-dialog.tsxnew file mode 100644index 000000000..e1fd6fac0--- /dev/null+++ b/apps/remix/app/components/dialogs/folder-delete-dialog.tsx@@ -0,0 +1,159 @@+import { useEffect } from 'react';++import { zodResolver } from '@hookform/resolvers/zod';+import { msg } from '@lingui/core/macro';+import { useLingui } from '@lingui/react';+import { Trans } from '@lingui/react/macro';+import type * as DialogPrimitive from '@radix-ui/react-dialog';+import { useForm } from 'react-hook-form';+import { z } from 'zod';++import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { trpc } from '@documenso/trpc/react';+import type { TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';+import { Button } from '@documenso/ui/primitives/button';+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+} from '@documenso/ui/primitives/dialog';+import {+ Form,+ FormControl,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from '@documenso/ui/primitives/form/form';+import { Input } from '@documenso/ui/primitives/input';+import { useToast } from '@documenso/ui/primitives/use-toast';++export type FolderDeleteDialogProps = {+ folder: TFolderWithSubfolders | null;+ isOpen: boolean;+ onOpenChange: (open: boolean) => void;+} & Omit<DialogPrimitive.DialogProps, 'children'>;++export const FolderDeleteDialog = ({ folder, isOpen, onOpenChange }: FolderDeleteDialogProps) => {+ const { _ } = useLingui();++ const { toast } = useToast();+ const { mutateAsync: deleteFolder } = trpc.folder.deleteFolder.useMutation();++ const deleteMessage = _(msg`delete ${folder?.name ?? 'folder'}`);++ const ZDeleteFolderFormSchema = z.object({+ confirmText: z.literal(deleteMessage, {+ errorMap: () => ({ message: _(msg`You must type '${deleteMessage}' to confirm`) }),+ }),+ });++ type TDeleteFolderFormSchema = z.infer<typeof ZDeleteFolderFormSchema>;++ const form = useForm<TDeleteFolderFormSchema>({+ resolver: zodResolver(ZDeleteFolderFormSchema),+ defaultValues: {+ confirmText: '',+ },+ });++ const onFormSubmit = async () => {+ if (!folder) return;++ try {+ await deleteFolder({+ id: folder.id,+ });++ onOpenChange(false);++ toast({+ title: 'Folder deleted successfully',+ });+ } catch (err) {+ const error = AppError.parseError(err);++ if (error.code === AppErrorCode.NOT_FOUND) {+ toast({+ title: 'Folder not found',+ description: _(msg`The folder you are trying to delete does not exist.`),+ variant: 'destructive',+ });++ return;+ }++ toast({+ title: 'Failed to delete folder',+ description: _(msg`An unknown error occurred while deleting the folder.`),+ variant: 'destructive',+ });+ }+ };++ useEffect(() => {+ if (!isOpen) {+ form.reset();+ }+ }, [isOpen]);++ return (+ <Dialog open={isOpen} onOpenChange={onOpenChange}>+ <DialogContent>+ <DialogHeader>+ <DialogTitle>Delete Folder</DialogTitle>+ <DialogDescription>+ Are you sure you want to delete this folder?+ {folder && folder._count.documents > 0 && (+ <span className="text-destructive mt-2 block">+ This folder contains {folder._count.documents} document(s). Deleting it will also+ delete all documents in the folder.+ </span>+ )}+ {folder && folder._count.subfolders > 0 && (+ <span className="text-destructive mt-2 block">+ This folder contains {folder._count.subfolders} subfolder(s). Deleting it will+ delete all subfolders and their contents.+ </span>+ )}+ </DialogDescription>+ </DialogHeader>+ <Form {...form}>+ <form onSubmit={form.handleSubmit(onFormSubmit)} className="space-y-4">+ <FormField+ control={form.control}+ name="confirmText"+ render={({ field }) => (+ <FormItem>+ <FormLabel>+ <Trans>+ Confirm by typing:{' '}+ <span className="font-sm text-destructive font-semibold">+ {deleteMessage}+ </span>+ </Trans>+ </FormLabel>+ <FormControl>+ <Input {...field} placeholder={deleteMessage} />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ <DialogFooter>+ <Button variant="secondary" onClick={() => onOpenChange(false)}>+ Cancel+ </Button>+ <Button variant="destructive" type="submit" disabled={!form.formState.isValid}>+ Delete+ </Button>+ </DialogFooter>+ </form>+ </Form>+ </DialogContent>+ </Dialog>+ );+};diff --git a/apps/remix/app/components/dialogs/folder-move-dialog.tsx b/apps/remix/app/components/dialogs/folder-move-dialog.tsxnew file mode 100644index 000000000..2c12b7c7f--- /dev/null+++ b/apps/remix/app/components/dialogs/folder-move-dialog.tsx@@ -0,0 +1,169 @@+import { useEffect } from 'react';++import { zodResolver } from '@hookform/resolvers/zod';+import { msg } from '@lingui/core/macro';+import { useLingui } from '@lingui/react';+import type * as DialogPrimitive from '@radix-ui/react-dialog';+import { FolderIcon, HomeIcon } from 'lucide-react';+import { useForm } from 'react-hook-form';+import { z } from 'zod';++import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { trpc } from '@documenso/trpc/react';+import type { TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';+import { Button } from '@documenso/ui/primitives/button';+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+} from '@documenso/ui/primitives/dialog';+import {+ Form,+ FormControl,+ FormField,+ FormItem,+ FormMessage,+} from '@documenso/ui/primitives/form/form';+import { useToast } from '@documenso/ui/primitives/use-toast';++export type FolderMoveDialogProps = {+ foldersData: TFolderWithSubfolders[] | undefined;+ folder: TFolderWithSubfolders | null;+ isOpen: boolean;+ onOpenChange: (open: boolean) => void;+} & Omit<DialogPrimitive.DialogProps, 'children'>;++const ZMoveFolderFormSchema = z.object({+ targetFolderId: z.string().nullable(),+});++type TMoveFolderFormSchema = z.infer<typeof ZMoveFolderFormSchema>;++export const FolderMoveDialog = ({+ foldersData,+ folder,+ isOpen,+ onOpenChange,+}: FolderMoveDialogProps) => {+ const { _ } = useLingui();++ const { toast } = useToast();+ const { mutateAsync: moveFolder } = trpc.folder.moveFolder.useMutation();++ const form = useForm<TMoveFolderFormSchema>({+ resolver: zodResolver(ZMoveFolderFormSchema),+ defaultValues: {+ targetFolderId: folder?.parentId ?? null,+ },+ });++ const onFormSubmit = async ({ targetFolderId }: TMoveFolderFormSchema) => {+ if (!folder) return;++ try {+ await moveFolder({+ id: folder.id,+ parentId: targetFolderId || null,+ });++ onOpenChange(false);++ toast({+ title: 'Folder moved successfully',+ });+ } catch (err) {+ const error = AppError.parseError(err);++ if (error.code === AppErrorCode.NOT_FOUND) {+ toast({+ title: 'Folder not found',+ description: _(msg`The folder you are trying to move does not exist.`),+ variant: 'destructive',+ });++ return;+ }++ toast({+ title: 'Failed to move folder',+ description: _(msg`An unknown error occurred while moving the folder.`),+ variant: 'destructive',+ });+ }+ };++ useEffect(() => {+ if (!isOpen) {+ form.reset();+ }+ }, [isOpen, form]);++ // Filter out the current folder and only show folders of the same type+ const filteredFolders = foldersData?.filter(+ (f) => f.id !== folder?.id && f.type === folder?.type,+ );++ return (+ <Dialog open={isOpen} onOpenChange={onOpenChange}>+ <DialogContent>+ <DialogHeader>+ <DialogTitle>Move Folder</DialogTitle>+ <DialogDescription>Select a destination for this folder.</DialogDescription>+ </DialogHeader>+ <Form {...form}>+ <form onSubmit={form.handleSubmit(onFormSubmit)} className="space-y-4 py-4">+ <FormField+ control={form.control}+ name="targetFolderId"+ render={({ field }) => (+ <FormItem>+ <FormControl>+ <div className="space-y-2">+ <Button+ type="button"+ variant={!field.value ? 'default' : 'outline'}+ className="w-full justify-start"+ disabled={!folder?.parentId}+ onClick={() => field.onChange(null)}+ >+ <HomeIcon className="mr-2 h-4 w-4" />+ Root+ </Button>++ {filteredFolders &&+ filteredFolders.map((f) => (+ <Button+ key={f.id}+ type="button"+ disabled={f.id === folder?.parentId}+ variant={field.value === f.id ? 'default' : 'outline'}+ className="w-full justify-start"+ onClick={() => field.onChange(f.id)}+ >+ <FolderIcon className="mr-2 h-4 w-4" />+ {f.name}+ </Button>+ ))}+ </div>+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ <DialogFooter>+ <Button type="button" variant="secondary" onClick={() => onOpenChange(false)}>+ Cancel+ </Button>+ <Button type="submit" disabled={form.formState.isSubmitting}>+ Move Folder+ </Button>+ </DialogFooter>+ </form>+ </Form>+ </DialogContent>+ </Dialog>+ );+};diff --git a/apps/remix/app/components/dialogs/folder-settings-dialog.tsx b/apps/remix/app/components/dialogs/folder-settings-dialog.tsxnew file mode 100644index 000000000..cae0cd8f4--- /dev/null+++ b/apps/remix/app/components/dialogs/folder-settings-dialog.tsx@@ -0,0 +1,173 @@+import { useEffect } from 'react';++import { zodResolver } from '@hookform/resolvers/zod';+import { msg } from '@lingui/core/macro';+import { useLingui } from '@lingui/react';+import type * as DialogPrimitive from '@radix-ui/react-dialog';+import { useForm } from 'react-hook-form';+import { z } from 'zod';++import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { DocumentVisibility } from '@documenso/lib/types/document-visibility';+import { trpc } from '@documenso/trpc/react';+import type { TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';+import { Button } from '@documenso/ui/primitives/button';+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+} from '@documenso/ui/primitives/dialog';+import {+ Form,+ FormControl,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from '@documenso/ui/primitives/form/form';+import { Input } from '@documenso/ui/primitives/input';+import {+ Select,+ SelectContent,+ SelectItem,+ SelectTrigger,+ SelectValue,+} from '@documenso/ui/primitives/select';+import { useToast } from '@documenso/ui/primitives/use-toast';++import { useOptionalCurrentTeam } from '~/providers/team';++export type FolderSettingsDialogProps = {+ folder: TFolderWithSubfolders | null;+ isOpen: boolean;+ onOpenChange: (open: boolean) => void;+} & Omit<DialogPrimitive.DialogProps, 'children'>;++export const ZUpdateFolderFormSchema = z.object({+ name: z.string().min(1),+ visibility: z.nativeEnum(DocumentVisibility).optional(),+});++export type TUpdateFolderFormSchema = z.infer<typeof ZUpdateFolderFormSchema>;++export const FolderSettingsDialog = ({+ folder,+ isOpen,+ onOpenChange,+}: FolderSettingsDialogProps) => {+ const { _ } = useLingui();+ const team = useOptionalCurrentTeam();++ const { toast } = useToast();+ const { mutateAsync: updateFolder } = trpc.folder.updateFolder.useMutation();++ const isTeamContext = !!team;++ const form = useForm<z.infer<typeof ZUpdateFolderFormSchema>>({+ resolver: zodResolver(ZUpdateFolderFormSchema),+ defaultValues: {+ name: folder?.name ?? '',+ visibility: folder?.visibility ?? DocumentVisibility.EVERYONE,+ },+ });++ useEffect(() => {+ if (folder) {+ form.reset({+ name: folder.name,+ visibility: folder.visibility ?? DocumentVisibility.EVERYONE,+ });+ }+ }, [folder, form]);++ const onFormSubmit = async (data: TUpdateFolderFormSchema) => {+ if (!folder) return;++ try {+ await updateFolder({+ id: folder.id,+ name: data.name,+ visibility: isTeamContext+ ? (data.visibility ?? DocumentVisibility.EVERYONE)+ : DocumentVisibility.EVERYONE,+ });++ toast({+ title: _(msg`Folder updated successfully`),+ });++ onOpenChange(false);+ } catch (err) {+ const error = AppError.parseError(err);++ if (error.code === AppErrorCode.NOT_FOUND) {+ toast({+ title: _(msg`Folder not found`),+ });+ }+ }+ };++ return (+ <Dialog open={isOpen} onOpenChange={onOpenChange}>+ <DialogContent>+ <DialogHeader>+ <DialogTitle>Folder Settings</DialogTitle>+ <DialogDescription>Manage the settings for this folder.</DialogDescription>+ </DialogHeader>++ <Form {...form}>+ <form onSubmit={form.handleSubmit(onFormSubmit)} className="space-y-4">+ <FormField+ control={form.control}+ name="name"+ render={({ field }) => (+ <FormItem>+ <FormLabel>Name</FormLabel>+ <FormControl>+ <Input {...field} />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />++ {isTeamContext && (+ <FormField+ control={form.control}+ name="visibility"+ render={({ field }) => (+ <FormItem>+ <FormLabel>Visibility</FormLabel>+ <Select onValueChange={field.onChange} defaultValue={field.value}>+ <FormControl>+ <SelectTrigger>+ <SelectValue placeholder="Select visibility" />+ </SelectTrigger>+ </FormControl>+ <SelectContent>+ <SelectItem value={DocumentVisibility.EVERYONE}>Everyone</SelectItem>+ <SelectItem value={DocumentVisibility.MANAGER_AND_ABOVE}>+ Managers and above+ </SelectItem>+ <SelectItem value={DocumentVisibility.ADMIN}>Admins only</SelectItem>+ </SelectContent>+ </Select>+ <FormMessage />+ </FormItem>+ )}+ />+ )}++ <DialogFooter>+ <Button type="submit">Save Changes</Button>+ </DialogFooter>+ </form>+ </Form>+ </DialogContent>+ </Dialog>+ );+};diff --git a/apps/remix/app/components/dialogs/template-create-dialog.tsx b/apps/remix/app/components/dialogs/template-create-dialog.tsxindex e623c806b..373f87a21 100644--- a/apps/remix/app/components/dialogs/template-create-dialog.tsx+++ b/apps/remix/app/components/dialogs/template-create-dialog.tsx@@ -24,11 +24,11 @@ import { DocumentDropzone } from '@documenso/ui/primitives/document-dropzone';import { useToast } from '@documenso/ui/primitives/use-toast';type TemplateCreateDialogProps = {- teamId?: number;templateRootPath: string;+ folderId?: string;};-export const TemplateCreateDialog = ({ templateRootPath }: TemplateCreateDialogProps) => {+export const TemplateCreateDialog = ({ templateRootPath, folderId }: TemplateCreateDialogProps) => {const navigate = useNavigate();const { user } = useSession();@@ -53,6 +53,7 @@ export const TemplateCreateDialog = ({ templateRootPath }: TemplateCreateDialogPconst { id } = await createTemplate({title: file.name,templateDocumentDataId: response.id,+ folderId: folderId,});toast({diff --git a/apps/remix/app/components/dialogs/template-folder-create-dialog.tsx b/apps/remix/app/components/dialogs/template-folder-create-dialog.tsxnew file mode 100644index 000000000..aaf0322f4--- /dev/null+++ b/apps/remix/app/components/dialogs/template-folder-create-dialog.tsx@@ -0,0 +1,164 @@+import { useEffect, useState } from 'react';++import { zodResolver } from '@hookform/resolvers/zod';+import { msg } from '@lingui/core/macro';+import { useLingui } from '@lingui/react';+import type * as DialogPrimitive from '@radix-ui/react-dialog';+import { FolderPlusIcon } from 'lucide-react';+import { useForm } from 'react-hook-form';+import { useNavigate, useParams } from 'react-router';+import { z } from 'zod';++import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { FolderType } from '@documenso/lib/types/folder-type';+import { formatTemplatesPath } from '@documenso/lib/utils/teams';+import { trpc } from '@documenso/trpc/react';+import { Button } from '@documenso/ui/primitives/button';+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+ DialogTrigger,+} from '@documenso/ui/primitives/dialog';+import {+ Form,+ FormControl,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from '@documenso/ui/primitives/form/form';+import { Input } from '@documenso/ui/primitives/input';+import { useToast } from '@documenso/ui/primitives/use-toast';++import { useOptionalCurrentTeam } from '~/providers/team';++const ZCreateFolderFormSchema = z.object({+ name: z.string().min(1, { message: 'Folder name is required' }),+});++type TCreateFolderFormSchema = z.infer<typeof ZCreateFolderFormSchema>;++export type TemplateFolderCreateDialogProps = {+ trigger?: React.ReactNode;+} & Omit<DialogPrimitive.DialogProps, 'children'>;++export const TemplateFolderCreateDialog = ({+ trigger,+ ...props+}: TemplateFolderCreateDialogProps) => {+ const { toast } = useToast();+ const { _ } = useLingui();+ const navigate = useNavigate();+ const team = useOptionalCurrentTeam();+ const { folderId } = useParams();++ const [isCreateFolderOpen, setIsCreateFolderOpen] = useState(false);++ const { mutateAsync: createFolder } = trpc.folder.createFolder.useMutation();++ const form = useForm<TCreateFolderFormSchema>({+ resolver: zodResolver(ZCreateFolderFormSchema),+ defaultValues: {+ name: '',+ },+ });++ const onSubmit = async (data: TCreateFolderFormSchema) => {+ try {+ const newFolder = await createFolder({+ name: data.name,+ parentId: folderId,+ type: FolderType.TEMPLATE,+ });++ setIsCreateFolderOpen(false);++ toast({+ description: _(msg`Folder created successfully`),+ });++ const templatesPath = formatTemplatesPath(team?.url);++ void navigate(`${templatesPath}/f/${newFolder.id}`);+ } catch (err) {+ const error = AppError.parseError(err);++ if (error.code === AppErrorCode.ALREADY_EXISTS) {+ toast({+ title: _(msg`Failed to create folder`),+ description: _(msg`This folder name is already taken.`),+ variant: 'destructive',+ });++ return;+ }++ toast({+ title: _(msg`Failed to create folder`),+ description: _(msg`An unknown error occurred while creating the folder.`),+ variant: 'destructive',+ });+ }+ };++ useEffect(() => {+ if (!isCreateFolderOpen) {+ form.reset();+ }+ }, [isCreateFolderOpen, form]);++ return (+ <Dialog {...props} open={isCreateFolderOpen} onOpenChange={setIsCreateFolderOpen}>+ <DialogTrigger asChild>+ {trigger ?? (+ <Button variant="outline" className="flex items-center space-x-2">+ <FolderPlusIcon className="h-4 w-4" />+ <span>Create Folder</span>+ </Button>+ )}+ </DialogTrigger>++ <DialogContent>+ <DialogHeader>+ <DialogTitle>Create New Folder</DialogTitle>+ <DialogDescription>+ Enter a name for your new folder. Folders help you organize your templates.+ </DialogDescription>+ </DialogHeader>++ <Form {...form}>+ <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">+ <FormField+ control={form.control}+ name="name"+ render={({ field }) => (+ <FormItem>+ <FormLabel>Folder Name</FormLabel>+ <FormControl>+ <Input placeholder="My Folder" {...field} />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />++ <DialogFooter>+ <Button+ type="button"+ variant="secondary"+ onClick={() => setIsCreateFolderOpen(false)}+ >+ Cancel+ </Button>+ <Button type="submit">Create</Button>+ </DialogFooter>+ </form>+ </Form>+ </DialogContent>+ </Dialog>+ );+};diff --git a/apps/remix/app/components/dialogs/template-folder-delete-dialog.tsx b/apps/remix/app/components/dialogs/template-folder-delete-dialog.tsxnew file mode 100644index 000000000..b337f9c25--- /dev/null+++ b/apps/remix/app/components/dialogs/template-folder-delete-dialog.tsx@@ -0,0 +1,163 @@+import { useEffect } from 'react';++import { zodResolver } from '@hookform/resolvers/zod';+import { msg } from '@lingui/core/macro';+import { useLingui } from '@lingui/react';+import { Trans } from '@lingui/react/macro';+import type * as DialogPrimitive from '@radix-ui/react-dialog';+import { useForm } from 'react-hook-form';+import { z } from 'zod';++import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { trpc } from '@documenso/trpc/react';+import type { TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';+import { Button } from '@documenso/ui/primitives/button';+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+} from '@documenso/ui/primitives/dialog';+import {+ Form,+ FormControl,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from '@documenso/ui/primitives/form/form';+import { Input } from '@documenso/ui/primitives/input';+import { useToast } from '@documenso/ui/primitives/use-toast';++export type TemplateFolderDeleteDialogProps = {+ folder: TFolderWithSubfolders | null;+ isOpen: boolean;+ onOpenChange: (open: boolean) => void;+} & Omit<DialogPrimitive.DialogProps, 'children'>;++export const TemplateFolderDeleteDialog = ({+ folder,+ isOpen,+ onOpenChange,+}: TemplateFolderDeleteDialogProps) => {+ const { _ } = useLingui();++ const { toast } = useToast();+ const { mutateAsync: deleteFolder } = trpc.folder.deleteFolder.useMutation();++ const deleteMessage = _(msg`delete ${folder?.name ?? 'folder'}`);++ const ZDeleteFolderFormSchema = z.object({+ confirmText: z.literal(deleteMessage, {+ errorMap: () => ({ message: _(msg`You must type '${deleteMessage}' to confirm`) }),+ }),+ });++ type TDeleteFolderFormSchema = z.infer<typeof ZDeleteFolderFormSchema>;++ const form = useForm<TDeleteFolderFormSchema>({+ resolver: zodResolver(ZDeleteFolderFormSchema),+ defaultValues: {+ confirmText: '',+ },+ });++ const onFormSubmit = async () => {+ if (!folder) return;++ try {+ await deleteFolder({+ id: folder.id,+ });++ onOpenChange(false);++ toast({+ title: 'Folder deleted successfully',+ });+ } catch (err) {+ const error = AppError.parseError(err);++ if (error.code === AppErrorCode.NOT_FOUND) {+ toast({+ title: 'Folder not found',+ description: _(msg`The folder you are trying to delete does not exist.`),+ variant: 'destructive',+ });++ return;+ }++ toast({+ title: 'Failed to delete folder',+ description: _(msg`An unknown error occurred while deleting the folder.`),+ variant: 'destructive',+ });+ }+ };++ useEffect(() => {+ if (!isOpen) {+ form.reset();+ }+ }, [isOpen]);++ return (+ <Dialog open={isOpen} onOpenChange={onOpenChange}>+ <DialogContent>+ <DialogHeader>+ <DialogTitle>Delete Folder</DialogTitle>+ <DialogDescription>+ Are you sure you want to delete this folder?+ {folder && folder._count.documents > 0 && (+ <span className="text-destructive mt-2 block">+ This folder contains {folder._count.documents} document(s). Deleting it will also+ delete all documents in the folder.+ </span>+ )}+ {folder && folder._count.subfolders > 0 && (+ <span className="text-destructive mt-2 block">+ This folder contains {folder._count.subfolders} subfolder(s). Deleting it will+ delete all subfolders and their contents.+ </span>+ )}+ </DialogDescription>+ </DialogHeader>+ <Form {...form}>+ <form onSubmit={form.handleSubmit(onFormSubmit)} className="space-y-4">+ <FormField+ control={form.control}+ name="confirmText"+ render={({ field }) => (+ <FormItem>+ <FormLabel>+ <Trans>+ Confirm by typing:{' '}+ <span className="font-sm text-destructive font-semibold">+ {deleteMessage}+ </span>+ </Trans>+ </FormLabel>+ <FormControl>+ <Input {...field} placeholder={deleteMessage} />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ <DialogFooter>+ <Button variant="secondary" onClick={() => onOpenChange(false)}>+ Cancel+ </Button>+ <Button variant="destructive" type="submit" disabled={!form.formState.isValid}>+ Delete+ </Button>+ </DialogFooter>+ </form>+ </Form>+ </DialogContent>+ </Dialog>+ );+};diff --git a/apps/remix/app/components/dialogs/template-folder-move-dialog.tsx b/apps/remix/app/components/dialogs/template-folder-move-dialog.tsxnew file mode 100644index 000000000..e683bceda--- /dev/null+++ b/apps/remix/app/components/dialogs/template-folder-move-dialog.tsx@@ -0,0 +1,175 @@+import { useEffect } from 'react';++import { zodResolver } from '@hookform/resolvers/zod';+import { msg } from '@lingui/core/macro';+import { useLingui } from '@lingui/react';+import type * as DialogPrimitive from '@radix-ui/react-dialog';+import { FolderIcon, HomeIcon } from 'lucide-react';+import { useForm } from 'react-hook-form';+import { z } from 'zod';++import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { trpc } from '@documenso/trpc/react';+import type { TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';+import { Button } from '@documenso/ui/primitives/button';+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+} from '@documenso/ui/primitives/dialog';+import {+ Form,+ FormControl,+ FormField,+ FormItem,+ FormMessage,+} from '@documenso/ui/primitives/form/form';+import { useToast } from '@documenso/ui/primitives/use-toast';++export type TemplateFolderMoveDialogProps = {+ foldersData: TFolderWithSubfolders[] | undefined;+ folder: TFolderWithSubfolders | null;+ isOpen: boolean;+ onOpenChange: (open: boolean) => void;+} & Omit<DialogPrimitive.DialogProps, 'children'>;++const ZMoveFolderFormSchema = z.object({+ targetFolderId: z.string().optional(),+});++type TMoveFolderFormSchema = z.infer<typeof ZMoveFolderFormSchema>;++export const TemplateFolderMoveDialog = ({+ foldersData,+ folder,+ isOpen,+ onOpenChange,+}: TemplateFolderMoveDialogProps) => {+ const { _ } = useLingui();++ const { toast } = useToast();+ const { mutateAsync: moveFolder } = trpc.folder.moveFolder.useMutation();++ const form = useForm<TMoveFolderFormSchema>({+ resolver: zodResolver(ZMoveFolderFormSchema),+ defaultValues: {+ targetFolderId: folder?.parentId ?? '',+ },+ });++ const onFormSubmit = async ({ targetFolderId }: TMoveFolderFormSchema) => {+ if (!folder) return;++ try {+ await moveFolder({+ id: folder.id,+ parentId: targetFolderId ?? '',+ });++ onOpenChange(false);++ toast({+ title: 'Folder moved successfully',+ });+ } catch (err) {+ const error = AppError.parseError(err);++ if (error.code === AppErrorCode.NOT_FOUND) {+ toast({+ title: 'Folder not found',+ description: _(msg`The folder you are trying to move does not exist.`),+ variant: 'destructive',+ });++ return;+ }++ toast({+ title: 'Failed to move folder',+ description: _(msg`An unknown error occurred while moving the folder.`),+ variant: 'destructive',+ });+ }+ };++ useEffect(() => {+ if (!isOpen) {+ form.reset();+ }+ }, [isOpen, form]);++ // Filter out the current folder and only show folders of the same type+ const filteredFolders = foldersData?.filter(+ (f) => f.id !== folder?.id && f.type === folder?.type,+ );++ return (+ <Dialog open={isOpen} onOpenChange={onOpenChange}>+ <DialogContent>+ <DialogHeader>+ <DialogTitle>Move Folder</DialogTitle>+ <DialogDescription>Select a destination for this folder.</DialogDescription>+ </DialogHeader>+ <Form {...form}>+ <form onSubmit={form.handleSubmit(onFormSubmit)} className="space-y-4 py-4">+ <FormField+ control={form.control}+ name="targetFolderId"+ render={({ field }) => (+ <FormItem>+ <FormControl>+ <div className="space-y-2">+ <Button+ type="button"+ variant={!field.value ? 'default' : 'outline'}+ className="w-full justify-start"+ disabled={!folder?.parentId}+ onClick={() => field.onChange(undefined)}+ >+ <HomeIcon className="mr-2 h-4 w-4" />+ Root+ </Button>++ {filteredFolders &&+ filteredFolders.map((f) => (+ <Button+ key={f.id}+ type="button"+ disabled={f.id === folder?.parentId}+ variant={field.value === f.id ? 'default' : 'outline'}+ className="w-full justify-start"+ onClick={() => field.onChange(f.id)}+ >+ <FolderIcon className="mr-2 h-4 w-4" />+ {f.name}+ </Button>+ ))}+ </div>+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ <DialogFooter>+ <Button type="button" variant="secondary" onClick={() => onOpenChange(false)}>+ Cancel+ </Button>+ <Button+ type="submit"+ disabled={+ form.formState.isSubmitting ||+ form.getValues('targetFolderId') === folder?.parentId+ }+ >+ Move Folder+ </Button>+ </DialogFooter>+ </form>+ </Form>+ </DialogContent>+ </Dialog>+ );+};diff --git a/apps/remix/app/components/dialogs/template-folder-settings-dialog.tsx b/apps/remix/app/components/dialogs/template-folder-settings-dialog.tsxnew file mode 100644index 000000000..886b30d41--- /dev/null+++ b/apps/remix/app/components/dialogs/template-folder-settings-dialog.tsx@@ -0,0 +1,176 @@+import { useEffect } from 'react';++import { zodResolver } from '@hookform/resolvers/zod';+import { msg } from '@lingui/core/macro';+import { useLingui } from '@lingui/react';+import type * as DialogPrimitive from '@radix-ui/react-dialog';+import { useForm } from 'react-hook-form';+import { z } from 'zod';++import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { DocumentVisibility } from '@documenso/lib/types/document-visibility';+import { FolderType } from '@documenso/lib/types/folder-type';+import { trpc } from '@documenso/trpc/react';+import type { TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';+import { Button } from '@documenso/ui/primitives/button';+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+} from '@documenso/ui/primitives/dialog';+import {+ Form,+ FormControl,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from '@documenso/ui/primitives/form/form';+import { Input } from '@documenso/ui/primitives/input';+import {+ Select,+ SelectContent,+ SelectItem,+ SelectTrigger,+ SelectValue,+} from '@documenso/ui/primitives/select';+import { useToast } from '@documenso/ui/primitives/use-toast';++import { useOptionalCurrentTeam } from '~/providers/team';++export type TemplateFolderSettingsDialogProps = {+ folder: TFolderWithSubfolders | null;+ isOpen: boolean;+ onOpenChange: (open: boolean) => void;+} & Omit<DialogPrimitive.DialogProps, 'children'>;++export const ZUpdateFolderFormSchema = z.object({+ name: z.string().min(1),+ visibility: z.nativeEnum(DocumentVisibility).optional(),+});++export type TUpdateFolderFormSchema = z.infer<typeof ZUpdateFolderFormSchema>;++export const TemplateFolderSettingsDialog = ({+ folder,+ isOpen,+ onOpenChange,+}: TemplateFolderSettingsDialogProps) => {+ const { _ } = useLingui();+ const team = useOptionalCurrentTeam();++ const { toast } = useToast();+ const { mutateAsync: updateFolder } = trpc.folder.updateFolder.useMutation();++ const isTeamContext = !!team;+ const isTemplateFolder = folder?.type === FolderType.TEMPLATE;++ const form = useForm<z.infer<typeof ZUpdateFolderFormSchema>>({+ resolver: zodResolver(ZUpdateFolderFormSchema),+ defaultValues: {+ name: folder?.name ?? '',+ visibility: folder?.visibility ?? DocumentVisibility.EVERYONE,+ },+ });++ useEffect(() => {+ if (folder) {+ form.reset({+ name: folder.name,+ visibility: folder.visibility ?? DocumentVisibility.EVERYONE,+ });+ }+ }, [folder, form]);++ const onFormSubmit = async (data: TUpdateFolderFormSchema) => {+ if (!folder) return;++ try {+ await updateFolder({+ id: folder.id,+ name: data.name,+ visibility:+ isTeamContext && !isTemplateFolder+ ? (data.visibility ?? DocumentVisibility.EVERYONE)+ : DocumentVisibility.EVERYONE,+ });++ toast({+ title: _(msg`Folder updated successfully`),+ });++ onOpenChange(false);+ } catch (err) {+ const error = AppError.parseError(err);++ if (error.code === AppErrorCode.NOT_FOUND) {+ toast({+ title: _(msg`Folder not found`),+ });+ }+ }+ };++ return (+ <Dialog open={isOpen} onOpenChange={onOpenChange}>+ <DialogContent>+ <DialogHeader>+ <DialogTitle>Folder Settings</DialogTitle>+ <DialogDescription>Manage the settings for this folder.</DialogDescription>+ </DialogHeader>++ <Form {...form}>+ <form onSubmit={form.handleSubmit(onFormSubmit)} className="space-y-4">+ <FormField+ control={form.control}+ name="name"+ render={({ field }) => (+ <FormItem>+ <FormLabel>Name</FormLabel>+ <FormControl>+ <Input {...field} />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />++ {isTeamContext && !isTemplateFolder && (+ <FormField+ control={form.control}+ name="visibility"+ render={({ field }) => (+ <FormItem>+ <FormLabel>Visibility</FormLabel>+ <Select onValueChange={field.onChange} defaultValue={field.value}>+ <FormControl>+ <SelectTrigger>+ <SelectValue placeholder="Select visibility" />+ </SelectTrigger>+ </FormControl>+ <SelectContent>+ <SelectItem value={DocumentVisibility.EVERYONE}>Everyone</SelectItem>+ <SelectItem value={DocumentVisibility.MANAGER_AND_ABOVE}>+ Managers and above+ </SelectItem>+ <SelectItem value={DocumentVisibility.ADMIN}>Admins only</SelectItem>+ </SelectContent>+ </Select>+ <FormMessage />+ </FormItem>+ )}+ />+ )}++ <DialogFooter>+ <Button type="submit">Save Changes</Button>+ </DialogFooter>+ </form>+ </Form>+ </DialogContent>+ </Dialog>+ );+};diff --git a/apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx b/apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsxnew file mode 100644index 000000000..c0d068ac4--- /dev/null+++ b/apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx@@ -0,0 +1,213 @@+import { useEffect } from 'react';++import { zodResolver } from '@hookform/resolvers/zod';+import { msg } from '@lingui/core/macro';+import { useLingui } from '@lingui/react';+import { Trans } from '@lingui/react/macro';+import type * as DialogPrimitive from '@radix-ui/react-dialog';+import { FolderIcon, HomeIcon, Loader2 } from 'lucide-react';+import { useForm } from 'react-hook-form';+import { useNavigate } from 'react-router';+import { z } from 'zod';++import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { FolderType } from '@documenso/lib/types/folder-type';+import { formatTemplatesPath } from '@documenso/lib/utils/teams';+import { trpc } from '@documenso/trpc/react';+import { Button } from '@documenso/ui/primitives/button';+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+} from '@documenso/ui/primitives/dialog';+import {+ Form,+ FormControl,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from '@documenso/ui/primitives/form/form';+import { useToast } from '@documenso/ui/primitives/use-toast';++import { useOptionalCurrentTeam } from '~/providers/team';++export type TemplateMoveToFolderDialogProps = {+ templateId: number;+ templateTitle: string;+ isOpen: boolean;+ onOpenChange: (open: boolean) => void;+ currentFolderId?: string | null;+} & Omit<DialogPrimitive.DialogProps, 'children'>;++const ZMoveTemplateFormSchema = z.object({+ folderId: z.string().nullable().optional(),+});++type TMoveTemplateFormSchema = z.infer<typeof ZMoveTemplateFormSchema>;++export function TemplateMoveToFolderDialog({+ templateId,+ templateTitle,+ isOpen,+ onOpenChange,+ currentFolderId,+ ...props+}: TemplateMoveToFolderDialogProps) {+ const { _ } = useLingui();+ const { toast } = useToast();+ const navigate = useNavigate();+ const team = useOptionalCurrentTeam();++ const form = useForm<TMoveTemplateFormSchema>({+ resolver: zodResolver(ZMoveTemplateFormSchema),+ defaultValues: {+ folderId: currentFolderId ?? null,+ },+ });++ const { data: folders, isLoading: isFoldersLoading } = trpc.folder.findFolders.useQuery(+ {+ parentId: currentFolderId ?? null,+ type: FolderType.TEMPLATE,+ },+ {+ enabled: isOpen,+ },+ );++ const { mutateAsync: moveTemplateToFolder } = trpc.folder.moveTemplateToFolder.useMutation();++ useEffect(() => {+ if (!isOpen) {+ form.reset();+ } else {+ form.reset({ folderId: currentFolderId ?? null });+ }+ }, [isOpen, currentFolderId, form]);++ const onSubmit = async (data: TMoveTemplateFormSchema) => {+ try {+ await moveTemplateToFolder({+ templateId,+ folderId: data.folderId ?? null,+ });++ toast({+ title: _(msg`Template moved`),+ description: _(msg`The template has been moved successfully.`),+ variant: 'default',+ });++ onOpenChange(false);++ const templatesPath = formatTemplatesPath(team?.url);++ if (data.folderId) {+ void navigate(`${templatesPath}/f/${data.folderId}`);+ } else {+ void navigate(templatesPath);+ }+ } catch (err) {+ const error = AppError.parseError(err);++ if (error.code === AppErrorCode.NOT_FOUND) {+ toast({+ title: _(msg`Error`),+ description: _(msg`The folder you are trying to move the template to does not exist.`),+ variant: 'destructive',+ });++ return;+ }++ toast({+ title: _(msg`Error`),+ description: _(msg`An error occurred while moving the template.`),+ variant: 'destructive',+ });+ }+ };++ return (+ <Dialog {...props} open={isOpen} onOpenChange={onOpenChange}>+ <DialogContent>+ <DialogHeader>+ <DialogTitle>+ <Trans>Move Template to Folder</Trans>+ </DialogTitle>++ <DialogDescription>+ <Trans>Move "{templateTitle}" to a folder</Trans>+ </DialogDescription>+ </DialogHeader>++ <Form {...form}>+ <form onSubmit={form.handleSubmit(onSubmit)} className="mt-4 flex flex-col gap-y-4">+ <FormField+ control={form.control}+ name="folderId"+ render={({ field }) => (+ <FormItem>+ <FormLabel>+ <Trans>Folder</Trans>+ </FormLabel>+ <FormControl>+ <div className="space-y-2">+ {isFoldersLoading ? (+ <div className="flex h-10 items-center justify-center">+ <Loader2 className="h-4 w-4 animate-spin" />+ </div>+ ) : (+ <>+ <Button+ type="button"+ variant={field.value === null ? 'default' : 'outline'}+ className="w-full justify-start"+ onClick={() => field.onChange(null)}+ disabled={currentFolderId === null}+ >+ <HomeIcon className="mr-2 h-4 w-4" />+ <Trans>Root (No Folder)</Trans>+ </Button>++ {folders?.data?.map((folder) => (+ <Button+ key={folder.id}+ type="button"+ variant={field.value === folder.id ? 'default' : 'outline'}+ className="w-full justify-start"+ onClick={() => field.onChange(folder.id)}+ disabled={currentFolderId === folder.id}+ >+ <FolderIcon className="mr-2 h-4 w-4" />+ {folder.name}+ </Button>+ ))}+ </>+ )}+ </div>+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />++ <DialogFooter>+ <Button type="button" variant="secondary" onClick={() => onOpenChange(false)}>+ <Trans>Cancel</Trans>+ </Button>++ <Button type="submit" disabled={isFoldersLoading || form.formState.isSubmitting}>+ <Trans>Move</Trans>+ </Button>+ </DialogFooter>+ </form>+ </Form>+ </DialogContent>+ </Dialog>+ );+}diff --git a/apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx b/apps/remix/app/components/general/document/document-drop-zone-wrapper.tsxnew file mode 100644index 000000000..aadcca37e--- /dev/null+++ b/apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx@@ -0,0 +1,192 @@+import { type ReactNode, useState } from 'react';++import { msg } from '@lingui/core/macro';+import { useLingui } from '@lingui/react';+import { Trans } from '@lingui/react/macro';+import { Loader } from 'lucide-react';+import { useDropzone } from 'react-dropzone';+import { Link, useNavigate, useParams } from 'react-router';+import { match } from 'ts-pattern';++import { useLimits } from '@documenso/ee/server-only/limits/provider/client';+import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';+import { useSession } from '@documenso/lib/client-only/providers/session';+import { APP_DOCUMENT_UPLOAD_SIZE_LIMIT, IS_BILLING_ENABLED } from '@documenso/lib/constants/app';+import { DEFAULT_DOCUMENT_TIME_ZONE, TIME_ZONES } from '@documenso/lib/constants/time-zones';+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { megabytesToBytes } from '@documenso/lib/universal/unit-convertions';+import { putPdfFile } from '@documenso/lib/universal/upload/put-file';+import { formatDocumentsPath } from '@documenso/lib/utils/teams';+import { trpc } from '@documenso/trpc/react';+import { cn } from '@documenso/ui/lib/utils';+import { useToast } from '@documenso/ui/primitives/use-toast';++import { useOptionalCurrentTeam } from '~/providers/team';++export interface DocumentDropZoneWrapperProps {+ children: ReactNode;+ className?: string;+}++export const DocumentDropZoneWrapper = ({ children, className }: DocumentDropZoneWrapperProps) => {+ const { _ } = useLingui();+ const { toast } = useToast();+ const { user } = useSession();+ const { folderId } = useParams();++ const team = useOptionalCurrentTeam();++ const navigate = useNavigate();+ const analytics = useAnalytics();++ const [isLoading, setIsLoading] = useState(false);++ const userTimezone =+ TIME_ZONES.find((timezone) => timezone === Intl.DateTimeFormat().resolvedOptions().timeZone) ??+ DEFAULT_DOCUMENT_TIME_ZONE;++ const { quota, remaining, refreshLimits } = useLimits();++ const { mutateAsync: createDocument } = trpc.document.createDocument.useMutation();++ const isUploadDisabled = remaining.documents === 0 || !user.emailVerified;++ const onFileDrop = async (file: File) => {+ if (isUploadDisabled && IS_BILLING_ENABLED()) {+ await navigate('/settings/billing');+ return;+ }++ try {+ setIsLoading(true);++ const response = await putPdfFile(file);++ const { id } = await createDocument({+ title: file.name,+ documentDataId: response.id,+ timezone: userTimezone,+ folderId: folderId ?? undefined,+ });++ void refreshLimits();++ toast({+ title: _(msg`Document uploaded`),+ description: _(msg`Your document has been uploaded successfully.`),+ duration: 5000,+ });++ analytics.capture('App: Document Uploaded', {+ userId: user.id,+ documentId: id,+ timestamp: new Date().toISOString(),+ });++ await navigate(+ folderId+ ? `${formatDocumentsPath(team?.url)}/f/${folderId}/${id}/edit`+ : `${formatDocumentsPath(team?.url)}/${id}/edit`,+ );+ } catch (err) {+ const error = AppError.parseError(err);++ const errorMessage = match(error.code)+ .with('INVALID_DOCUMENT_FILE', () => msg`You cannot upload encrypted PDFs`)+ .with(+ AppErrorCode.LIMIT_EXCEEDED,+ () => msg`You have reached your document limit for this month. Please upgrade your plan.`,+ )+ .otherwise(() => msg`An error occurred while uploading your document.`);++ toast({+ title: _(msg`Error`),+ description: _(errorMessage),+ variant: 'destructive',+ duration: 7500,+ });+ } finally {+ setIsLoading(false);+ }+ };++ const onFileDropRejected = () => {+ toast({+ title: _(msg`Your document failed to upload.`),+ description: _(msg`File cannot be larger than ${APP_DOCUMENT_UPLOAD_SIZE_LIMIT}MB`),+ duration: 5000,+ variant: 'destructive',+ });+ };++ const { getRootProps, getInputProps, isDragActive } = useDropzone({+ accept: {+ 'application/pdf': ['.pdf'],+ },+ //disabled: isUploadDisabled,+ multiple: false,+ maxSize: megabytesToBytes(APP_DOCUMENT_UPLOAD_SIZE_LIMIT),+ onDrop: ([acceptedFile]) => {+ if (acceptedFile) {+ void onFileDrop(acceptedFile);+ }+ },+ onDropRejected: () => {+ void onFileDropRejected();+ },+ noClick: true,+ noDragEventsBubbling: true,+ });++ return (+ <div {...getRootProps()} className={cn('relative min-h-screen', className)}>+ <input {...getInputProps()} />+ {children}++ {isDragActive && (+ <div className="bg-muted/60 fixed left-0 top-0 z-[9999] h-full w-full backdrop-blur-[4px]">+ <div className="pointer-events-none flex h-full w-full flex-col items-center justify-center">+ <h2 className="text-foreground text-2xl font-semibold">+ <Trans>Upload Document</Trans>+ </h2>++ <p className="text-muted-foreground text-md mt-4">+ <Trans>Drag and drop your PDF file here</Trans>+ </p>++ {isUploadDisabled && IS_BILLING_ENABLED() && (+ <Link+ to="/settings/billing"+ className="mt-4 text-sm text-amber-500 hover:underline dark:text-amber-400"+ >+ <Trans>Upgrade your plan to upload more documents</Trans>+ </Link>+ )}++ {!isUploadDisabled &&+ team?.id === undefined &&+ remaining.documents > 0 &&+ Number.isFinite(remaining.documents) && (+ <p className="text-muted-foreground/80 mt-4 text-sm">+ <Trans>+ {remaining.documents} of {quota.documents} documents remaining this month.+ </Trans>+ </p>+ )}+ </div>+ </div>+ )}++ {isLoading && (+ <div className="bg-muted/30 absolute inset-0 z-50 backdrop-blur-[2px]">+ <div className="pointer-events-none flex h-1/2 w-full flex-col items-center justify-center">+ <Loader className="text-primary h-12 w-12 animate-spin" />+ <p className="text-foreground mt-8 font-medium">+ <Trans>Uploading document...</Trans>+ </p>+ </div>+ </div>+ )}+ </div>+ );+};diff --git a/apps/remix/app/components/general/document/document-page-view-button.tsx b/apps/remix/app/components/general/document/document-page-view-button.tsxindex 97e797976..64b12bb67 100644--- a/apps/remix/app/components/general/document/document-page-view-button.tsx+++ b/apps/remix/app/components/general/document/document-page-view-button.tsx@@ -38,6 +38,9 @@ export const DocumentPageViewButton = ({ document }: DocumentPageViewButtonPropsconst role = recipient?.role;const documentsPath = formatDocumentsPath(document.team?.url);+ const formatPath = document.folderId+ ? `${documentsPath}/f/${document.folderId}/${document.id}/edit`+ : `${documentsPath}/${document.id}/edit`;const onDownloadClick = async () => {try {@@ -101,7 +104,7 @@ export const DocumentPageViewButton = ({ document }: DocumentPageViewButtonProps)).with({ isComplete: false }, () => (<Button className="w-full" asChild>- <Link to={`${documentsPath}/${document.id}/edit`}>+ <Link to={formatPath}><Trans>Edit</Trans></Link></Button>diff --git a/apps/remix/app/components/general/document/document-upload.tsx b/apps/remix/app/components/general/document/document-upload.tsxindex 741b6da02..66a04b014 100644--- a/apps/remix/app/components/general/document/document-upload.tsx+++ b/apps/remix/app/components/general/document/document-upload.tsx@@ -4,7 +4,7 @@ import { msg } from '@lingui/core/macro';import { useLingui } from '@lingui/react';import { Trans } from '@lingui/react/macro';import { Loader } from 'lucide-react';-import { useNavigate } from 'react-router';+import { useNavigate, useParams } from 'react-router';import { match } from 'ts-pattern';import { useLimits } from '@documenso/ee/server-only/limits/provider/client';@@ -17,7 +17,13 @@ import { putPdfFile } from '@documenso/lib/universal/upload/put-file';import { formatDocumentsPath } from '@documenso/lib/utils/teams';import { trpc } from '@documenso/trpc/react';import { cn } from '@documenso/ui/lib/utils';-import { DocumentDropzone } from '@documenso/ui/primitives/document-dropzone';+import { DocumentDropzone } from '@documenso/ui/primitives/document-upload';+import {+ Tooltip,+ TooltipContent,+ TooltipProvider,+ TooltipTrigger,+} from '@documenso/ui/primitives/tooltip';import { useToast } from '@documenso/ui/primitives/use-toast';import { useOptionalCurrentTeam } from '~/providers/team';@@ -30,6 +36,7 @@ export const DocumentUploadDropzone = ({ className }: DocumentUploadDropzonePropconst { _ } = useLingui();const { toast } = useToast();const { user } = useSession();+ const { folderId } = useParams();const team = useOptionalCurrentTeam();@@ -69,6 +76,7 @@ export const DocumentUploadDropzone = ({ className }: DocumentUploadDropzoneProptitle: file.name,documentDataId: response.id,timezone: userTimezone,+ folderId: folderId ?? undefined,});void refreshLimits();@@ -85,7 +93,11 @@ export const DocumentUploadDropzone = ({ className }: DocumentUploadDropzoneProptimestamp: new Date().toISOString(),});- await navigate(`${formatDocumentsPath(team?.url)}/${id}/edit`);+ await navigate(+ folderId+ ? `${formatDocumentsPath(team?.url)}/f/${folderId}/${id}/edit`+ : `${formatDocumentsPath(team?.url)}/${id}/edit`,+ );} catch (err) {const error = AppError.parseError(err);@@ -121,25 +133,31 @@ export const DocumentUploadDropzone = ({ className }: DocumentUploadDropzonePropreturn (<div className={cn('relative', className)}>- <DocumentDropzone- className="h-[min(400px,50vh)]"- disabled={remaining.documents === 0 || !user.emailVerified}- disabledMessage={disabledMessage}- onDrop={onFileDrop}- onDropRejected={onFileDropRejected}- />-- <div className="absolute -bottom-6 right-0">- {team?.id === undefined &&- remaining.documents > 0 &&- Number.isFinite(remaining.documents) && (- <p className="text-muted-foreground/60 text-xs">- <Trans>- {remaining.documents} of {quota.documents} documents remaining this month.- </Trans>- </p>- )}- </div>+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <div>+ <DocumentDropzone+ disabled={remaining.documents === 0 || !user.emailVerified}+ disabledMessage={disabledMessage}+ onDrop={onFileDrop}+ onDropRejected={onFileDropRejected}+ />+ </div>+ </TooltipTrigger>+ {team?.id === undefined &&+ remaining.documents > 0 &&+ Number.isFinite(remaining.documents) && (+ <TooltipContent>+ <p className="text-sm">+ <Trans>+ {remaining.documents} of {quota.documents} documents remaining this month.+ </Trans>+ </p>+ </TooltipContent>+ )}+ </Tooltip>+ </TooltipProvider>{isLoading && (<div className="bg-background/50 absolute inset-0 flex items-center justify-center rounded-lg">diff --git a/apps/remix/app/components/general/folder/folder-card.tsx b/apps/remix/app/components/general/folder/folder-card.tsxnew file mode 100644index 000000000..2f85174df--- /dev/null+++ b/apps/remix/app/components/general/folder/folder-card.tsx@@ -0,0 +1,88 @@+import { FolderIcon, PinIcon } from 'lucide-react';++import { FolderType } from '@documenso/lib/types/folder-type';+import { formatFolderCount } from '@documenso/lib/utils/format-folder-count';+import { type TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';+import { Button } from '@documenso/ui/primitives/button';+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from '@documenso/ui/primitives/dropdown-menu';++export type FolderCardProps = {+ folder: TFolderWithSubfolders;+ onNavigate: (folderId: string) => void;+ onMove: (folder: TFolderWithSubfolders) => void;+ onPin: (folderId: string) => void;+ onUnpin: (folderId: string) => void;+ onSettings: (folder: TFolderWithSubfolders) => void;+ onDelete: (folder: TFolderWithSubfolders) => void;+};++export const FolderCard = ({+ folder,+ onNavigate,+ onMove,+ onPin,+ onUnpin,+ onSettings,+ onDelete,+}: FolderCardProps) => {+ return (+ <div+ key={folder.id}+ className="border-border hover:border-muted-foreground/40 group relative flex flex-col rounded-lg border p-4 transition-all hover:shadow-sm"+ >+ <div className="flex items-start justify-between">+ <button+ className="flex items-center space-x-2 text-left"+ onClick={() => onNavigate(folder.id)}+ >+ <FolderIcon className="text-documenso h-6 w-6" />+ <div>+ <div className="flex items-center gap-2">+ <h3 className="font-medium">{folder.name}</h3>+ {folder.pinned && <PinIcon className="text-documenso h-3 w-3" />}+ </div>+ <div className="mt-1 flex space-x-2 text-xs text-gray-500">+ <span>+ {formatFolderCount(+ folder.type === FolderType.TEMPLATE+ ? folder._count.templates+ : folder._count.documents,+ folder.type === FolderType.TEMPLATE ? 'template' : 'document',+ folder.type === FolderType.TEMPLATE ? 'templates' : 'documents',+ )}+ </span>+ <span>•</span>+ <span>{formatFolderCount(folder._count.subfolders, 'folder', 'folders')}</span>+ </div>+ </div>+ </button>++ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button variant="ghost" size="sm" className="opacity-0 group-hover:opacity-100">+ •••+ </Button>+ </DropdownMenuTrigger>++ <DropdownMenuContent align="end">+ <DropdownMenuItem onClick={() => onMove(folder)}>Move</DropdownMenuItem>+ {folder.pinned ? (+ <DropdownMenuItem onClick={() => onUnpin(folder.id)}>Unpin</DropdownMenuItem>+ ) : (+ <DropdownMenuItem onClick={() => onPin(folder.id)}>Pin</DropdownMenuItem>+ )}+ <DropdownMenuItem onClick={() => onSettings(folder)}>Settings</DropdownMenuItem>+ <DropdownMenuItem className="text-red-500" onClick={() => onDelete(folder)}>+ Delete+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>+ </div>+ </div>+ );+};diff --git a/apps/remix/app/components/general/template/template-edit-form.tsx b/apps/remix/app/components/general/template/template-edit-form.tsxindex e7dcc86d8..98449958f 100644--- a/apps/remix/app/components/general/template/template-edit-form.tsx+++ b/apps/remix/app/components/general/template/template-edit-form.tsx@@ -208,7 +208,11 @@ export const TemplateEditForm = ({duration: 5000,});- await navigate(templateRootPath);+ const templatePath = template.folderId+ ? `${templateRootPath}/f/${template.folderId}`+ : templateRootPath;++ await navigate(templatePath);} catch (err) {console.error(err);diff --git a/apps/remix/app/components/tables/documents-table-action-button.tsx b/apps/remix/app/components/tables/documents-table-action-button.tsxindex 20331de97..f3a605907 100644--- a/apps/remix/app/components/tables/documents-table-action-button.tsx+++ b/apps/remix/app/components/tables/documents-table-action-button.tsx@@ -40,6 +40,9 @@ export const DocumentsTableActionButton = ({ row }: DocumentsTableActionButtonPrconst isCurrentTeamDocument = team && row.team?.url === team.url;const documentsPath = formatDocumentsPath(team?.url);+ const formatPath = row.folderId+ ? `${documentsPath}/f/${row.folderId}/${row.id}/edit`+ : `${documentsPath}/${row.id}/edit`;const onDownloadClick = async () => {try {@@ -92,7 +95,7 @@ export const DocumentsTableActionButton = ({ row }: DocumentsTableActionButtonPrisOwner ? { isDraft: true, isOwner: true } : { isDraft: true, isCurrentTeamDocument: true },() => (<Button className="w-32" asChild>- <Link to={`${documentsPath}/${row.id}/edit`}>+ <Link to={formatPath}><Edit className="-ml-1 mr-2 h-4 w-4" /><Trans>Edit</Trans></Link>diff --git a/apps/remix/app/components/tables/documents-table-action-dropdown.tsx b/apps/remix/app/components/tables/documents-table-action-dropdown.tsxindex 73bf010bc..0528d9ca2 100644--- a/apps/remix/app/components/tables/documents-table-action-dropdown.tsx+++ b/apps/remix/app/components/tables/documents-table-action-dropdown.tsx@@ -44,9 +44,13 @@ import { useOptionalCurrentTeam } from '~/providers/team';export type DocumentsTableActionDropdownProps = {row: TDocumentRow;+ onMoveDocument?: () => void;};-export const DocumentsTableActionDropdown = ({ row }: DocumentsTableActionDropdownProps) => {+export const DocumentsTableActionDropdown = ({+ row,+ onMoveDocument,+}: DocumentsTableActionDropdownProps) => {const { user } = useSession();const team = useOptionalCurrentTeam();@@ -69,6 +73,9 @@ export const DocumentsTableActionDropdown = ({ row }: DocumentsTableActionDropdoconst canManageDocument = Boolean(isOwner || isCurrentTeamDocument);const documentsPath = formatDocumentsPath(team?.url);+ const formatPath = row.folderId+ ? `${documentsPath}/f/${row.folderId}/${row.id}/edit`+ : `${documentsPath}/${row.id}/edit`;const onDownloadClick = async () => {try {@@ -163,7 +170,7 @@ export const DocumentsTableActionDropdown = ({ row }: DocumentsTableActionDropdo)}<DropdownMenuItem disabled={!canManageDocument || isComplete} asChild>- <Link to={`${documentsPath}/${row.id}/edit`}>+ <Link to={formatPath}><Edit className="mr-2 h-4 w-4" /><Trans>Edit</Trans></Link>@@ -192,6 +199,13 @@ export const DocumentsTableActionDropdown = ({ row }: DocumentsTableActionDropdo</DropdownMenuItem>)}+ {onMoveDocument && (+ <DropdownMenuItem onClick={onMoveDocument} onSelect={(e) => e.preventDefault()}>+ <MoveRight className="mr-2 h-4 w-4" />+ <Trans>Move to Folder</Trans>+ </DropdownMenuItem>+ )}+{/* No point displaying this if there's no functionality. */}{/* <DropdownMenuItem disabled><XCircle className="mr-2 h-4 w-4" />diff --git a/apps/remix/app/components/tables/documents-table.tsx b/apps/remix/app/components/tables/documents-table.tsxindex 4f6dc0050..4b7cdca3d 100644--- a/apps/remix/app/components/tables/documents-table.tsx+++ b/apps/remix/app/components/tables/documents-table.tsx@@ -29,11 +29,17 @@ export type DocumentsTableProps = {data?: TFindDocumentsResponse;isLoading?: boolean;isLoadingError?: boolean;+ onMoveDocument?: (documentId: number) => void;};type DocumentsTableRow = TFindDocumentsResponse['data'][number];-export const DocumentsTable = ({ data, isLoading, isLoadingError }: DocumentsTableProps) => {+export const DocumentsTable = ({+ data,+ isLoading,+ isLoadingError,+ onMoveDocument,+}: DocumentsTableProps) => {const { _, i18n } = useLingui();const team = useOptionalCurrentTeam();@@ -80,12 +86,15 @@ export const DocumentsTable = ({ data, isLoading, isLoadingError }: DocumentsTab(!row.original.deletedAt || isDocumentCompleted(row.original.status)) && (<div className="flex items-center gap-x-4"><DocumentsTableActionButton row={row.original} />- <DocumentsTableActionDropdown row={row.original} />+ <DocumentsTableActionDropdown+ row={row.original}+ onMoveDocument={onMoveDocument ? () => onMoveDocument(row.original.id) : undefined}+ /></div>),},] satisfies DataTableColumnDef<DocumentsTableRow>[];- }, [team]);+ }, [team, onMoveDocument]);const onPaginationChange = (page: number, perPage: number) => {startTransition(() => {@@ -171,6 +180,9 @@ const DataTableTitle = ({ row, teamUrl }: DataTableTitleProps) => {const isCurrentTeamDocument = teamUrl && row.team?.url === teamUrl;const documentsPath = formatDocumentsPath(isCurrentTeamDocument ? teamUrl : undefined);+ const formatPath = row.folderId+ ? `${documentsPath}/f/${row.folderId}/${row.id}`+ : `${documentsPath}/${row.id}`;return match({isOwner,@@ -179,7 +191,7 @@ const DataTableTitle = ({ row, teamUrl }: DataTableTitleProps) => {}).with({ isOwner: true }, { isCurrentTeamDocument: true }, () => (<Link- to={`${documentsPath}/${row.id}`}+ to={formatPath}title={row.title}className="block max-w-[10rem] truncate font-medium hover:underline md:max-w-[20rem]">diff --git a/apps/remix/app/components/tables/templates-table-action-dropdown.tsx b/apps/remix/app/components/tables/templates-table-action-dropdown.tsxindex a1c12e34b..ff33a0c53 100644--- a/apps/remix/app/components/tables/templates-table-action-dropdown.tsx+++ b/apps/remix/app/components/tables/templates-table-action-dropdown.tsx@@ -2,7 +2,16 @@ import { useState } from 'react';import { Trans } from '@lingui/react/macro';import type { Recipient, Template, TemplateDirectLink } from '@prisma/client';-import { Copy, Edit, MoreHorizontal, MoveRight, Share2Icon, Trash2, Upload } from 'lucide-react';+import {+ Copy,+ Edit,+ FolderIcon,+ MoreHorizontal,+ MoveRight,+ Share2Icon,+ Trash2,+ Upload,+} from 'lucide-react';import { Link } from 'react-router';import { useSession } from '@documenso/lib/client-only/providers/session';@@ -19,6 +28,7 @@ import { TemplateDeleteDialog } from '../dialogs/template-delete-dialog';import { TemplateDirectLinkDialog } from '../dialogs/template-direct-link-dialog';import { TemplateDuplicateDialog } from '../dialogs/template-duplicate-dialog';import { TemplateMoveDialog } from '../dialogs/template-move-dialog';+import { TemplateMoveToFolderDialog } from '../dialogs/template-move-to-folder-dialog';export type TemplatesTableActionDropdownProps = {row: Template & {@@ -50,13 +60,20 @@ export const TemplatesTableActionDropdown = ({const [isTemplateDirectLinkDialogOpen, setTemplateDirectLinkDialogOpen] = useState(false);const [isDuplicateDialogOpen, setDuplicateDialogOpen] = useState(false);const [isMoveDialogOpen, setMoveDialogOpen] = useState(false);+ const [isMoveToFolderDialogOpen, setMoveToFolderDialogOpen] = useState(false);const isOwner = row.userId === user.id;const isTeamTemplate = row.teamId === teamId;+ const formatPath = row.folderId+ ? `${templateRootPath}/f/${row.folderId}/${row.id}/edit`+ : `${templateRootPath}/${row.id}/edit`;+++return (<DropdownMenu>- <DropdownMenuTrigger>+ <DropdownMenuTrigger data-testid="template-table-action-btn"><MoreHorizontal className="text-muted-foreground h-5 w-5" /></DropdownMenuTrigger>@@ -64,7 +81,7 @@ export const TemplatesTableActionDropdown = ({<DropdownMenuLabel>Action</DropdownMenuLabel><DropdownMenuItem disabled={!isOwner && !isTeamTemplate} asChild>- <Link to={`${templateRootPath}/${row.id}/edit`}>+ <Link to={formatPath}><Edit className="mr-2 h-4 w-4" /><Trans>Edit</Trans></Link>@@ -83,6 +100,11 @@ export const TemplatesTableActionDropdown = ({<Trans>Direct link</Trans></DropdownMenuItem>+ <DropdownMenuItem onClick={() => setMoveToFolderDialogOpen(true)}>+ <FolderIcon className="mr-2 h-4 w-4" />+ <Trans>Move to Folder</Trans>+ </DropdownMenuItem>+{!teamId && !row.teamId && (<DropdownMenuItem onClick={() => setMoveDialogOpen(true)}><MoveRight className="mr-2 h-4 w-4" />@@ -135,6 +157,14 @@ export const TemplatesTableActionDropdown = ({onOpenChange={setDeleteDialogOpen}onDelete={onDelete}/>++ <TemplateMoveToFolderDialog+ templateId={row.id}+ templateTitle={row.title}+ isOpen={isMoveToFolderDialogOpen}+ onOpenChange={setMoveToFolderDialogOpen}+ currentFolderId={row.folderId}+ /></DropdownMenu>);};diff --git a/apps/remix/app/components/tables/templates-table.tsx b/apps/remix/app/components/tables/templates-table.tsxindex 08f46fe40..10ff18ef7 100644--- a/apps/remix/app/components/tables/templates-table.tsx+++ b/apps/remix/app/components/tables/templates-table.tsx@@ -54,6 +54,11 @@ export const TemplatesTable = ({const formatTemplateLink = (row: TemplatesTableRow) => {const isCurrentTeamTemplate = team?.url && row.team?.url === team?.url;const path = formatTemplatesPath(isCurrentTeamTemplate ? team?.url : undefined);++ if (row.folderId) {+ return `${path}/f/${row.folderId}/${row.id}`;+ }+return `${path}/${row.id}`;};diff --git a/apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx b/apps/remix/app/routes/_authenticated+/admin+/documents._index.tsxindex 3f37ca728..35640b28e 100644--- a/apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx+++ b/apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx@@ -90,7 +90,7 @@ export default function AdminDocumentsPage() {<TooltipTrigger><Link to={`/admin/users/${row.original.user.id}`}><Avatar className="dark:border-border h-12 w-12 border-2 border-solid border-white">- <AvatarFallback className="text-xs text-gray-400">+ <AvatarFallback className="text-muted-foreground text-xs">{avatarFallbackText}</AvatarFallback></Avatar>@@ -99,7 +99,7 @@ export default function AdminDocumentsPage() {<TooltipContent className="flex max-w-xs items-center gap-2"><Avatar className="dark:border-border h-12 w-12 border-2 border-solid border-white">- <AvatarFallback className="text-xs text-gray-400">+ <AvatarFallback className="text-muted-foreground text-xs">{avatarFallbackText}</AvatarFallback></Avatar>diff --git a/apps/remix/app/routes/_authenticated+/documents.$id._index.tsx b/apps/remix/app/routes/_authenticated+/documents.$id._index.tsxindex d382ce76e..ac513d5df 100644--- a/apps/remix/app/routes/_authenticated+/documents.$id._index.tsx+++ b/apps/remix/app/routes/_authenticated+/documents.$id._index.tsx@@ -64,6 +64,10 @@ export async function loader({ params, request }: Route.LoaderArgs) {throw redirect(documentRootPath);}+ if (document?.folderId) {+ throw redirect(documentRootPath);+ }+const documentVisibility = document?.visibility;const currentTeamMemberRole = team?.currentTeamMember?.role;const isRecipient = document?.recipients.find((recipient) => recipient.email === user.email);diff --git a/apps/remix/app/routes/_authenticated+/documents.$id.edit.tsx b/apps/remix/app/routes/_authenticated+/documents.$id.edit.tsxindex ad87cdee2..6606f5593 100644--- a/apps/remix/app/routes/_authenticated+/documents.$id.edit.tsx+++ b/apps/remix/app/routes/_authenticated+/documents.$id.edit.tsx@@ -49,6 +49,10 @@ export async function loader({ params, request }: Route.LoaderArgs) {throw redirect(documentRootPath);}+ if (document?.folderId) {+ throw redirect(documentRootPath);+ }+const documentVisibility = document?.visibility;const currentTeamMemberRole = team?.currentTeamMember?.role;const isRecipient = document?.recipients.find((recipient) => recipient.email === user.email);@@ -83,7 +87,10 @@ export async function loader({ params, request }: Route.LoaderArgs) {});return superLoaderJson({- document,+ document: {+ ...document,+ folder: null,+ },documentRootPath,isDocumentEnterprise,});diff --git a/apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx b/apps/remix/app/routes/_authenticated+/documents.$id.logs.tsxindex d59b2bba6..f3aa0e92e 100644--- a/apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx+++ b/apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx@@ -43,24 +43,26 @@ export async function loader({ params, request }: Route.LoaderArgs) {throw redirect(documentRootPath);}- // Todo: Get full document instead?- const [document, recipients] = await Promise.all([- getDocumentById({- documentId,- userId: user.id,- teamId: team?.id,- }).catch(() => null),- getRecipientsForDocument({- documentId,- userId: user.id,- teamId: team?.id,- }),- ]);+ const document = await getDocumentById({+ documentId,+ userId: user.id,+ teamId: team?.id,+ }).catch(() => null);if (!document || !document.documentData) {throw redirect(documentRootPath);}+ if (document.folderId) {+ throw redirect(documentRootPath);+ }++ const recipients = await getRecipientsForDocument({+ documentId,+ userId: user.id,+ teamId: team?.id,+ });+return {document,documentRootPath,diff --git a/apps/remix/app/routes/_authenticated+/documents._index.tsx b/apps/remix/app/routes/_authenticated+/documents._index.tsxindex e8aa3b8db..392bd67cb 100644--- a/apps/remix/app/routes/_authenticated+/documents._index.tsx+++ b/apps/remix/app/routes/_authenticated+/documents._index.tsx@@ -1,10 +1,12 @@import { useEffect, useMemo, useState } from 'react';import { Trans } from '@lingui/react/macro';-import { useSearchParams } from 'react-router';+import { FolderIcon, HomeIcon, Loader2 } from 'lucide-react';+import { useNavigate, useSearchParams } from 'react-router';import { Link } from 'react-router';import { z } from 'zod';+import { FolderType } from '@documenso/lib/types/folder-type';import { formatAvatarUrl } from '@documenso/lib/utils/avatars';import { parseToIntegerArray } from '@documenso/lib/utils/params';import { formatDocumentsPath } from '@documenso/lib/utils/teams';@@ -14,12 +16,21 @@ import {type TFindDocumentsInternalResponse,ZFindDocumentsInternalRequestSchema,} from '@documenso/trpc/server/document-router/schema';+import { type TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';+import { Button } from '@documenso/ui/primitives/button';import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';+import { DocumentMoveToFolderDialog } from '~/components/dialogs/document-move-to-folder-dialog';+import { CreateFolderDialog } from '~/components/dialogs/folder-create-dialog';+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 { DocumentSearch } from '~/components/general/document/document-search';import { DocumentStatus } from '~/components/general/document/document-status';import { DocumentUploadDropzone } from '~/components/general/document/document-upload';+import { FolderCard } from '~/components/general/folder/folder-card';import { PeriodSelector } from '~/components/general/period-selector';import { DocumentsTable } from '~/components/tables/documents-table';import { DocumentsTableEmptyState } from '~/components/tables/documents-table-empty-state';@@ -43,9 +54,22 @@ const ZSearchParamsSchema = ZFindDocumentsInternalRequestSchema.pick({export default function DocumentsPage() {const [searchParams] = useSearchParams();+ const navigate = useNavigate();++ const [isMovingDocument, setIsMovingDocument] = useState(false);+ const [documentToMove, setDocumentToMove] = useState<number | null>(null);+ const [isMovingFolder, setIsMovingFolder] = useState(false);+ const [folderToMove, setFolderToMove] = useState<TFolderWithSubfolders | null>(null);+ const [isDeletingFolder, setIsDeletingFolder] = useState(false);+ const [folderToDelete, setFolderToDelete] = useState<TFolderWithSubfolders | null>(null);+ const [isSettingsFolderOpen, setIsSettingsFolderOpen] = useState(false);+ const [folderToSettings, setFolderToSettings] = useState<TFolderWithSubfolders | null>(null);const team = useOptionalCurrentTeam();+ const { mutateAsync: pinFolder } = trpc.folder.pinFolder.useMutation();+ const { mutateAsync: unpinFolder } = trpc.folder.unpinFolder.useMutation();+const [stats, setStats] = useState<TFindDocumentsInternalResponse['stats']>({[ExtendedDocumentStatus.DRAFT]: 0,[ExtendedDocumentStatus.PENDING]: 0,@@ -66,9 +90,18 @@ export default function DocumentsPage() {},);- // Refetch the documents when the team URL changes.+ const {+ data: foldersData,+ isLoading: isFoldersLoading,+ refetch: refetchFolders,+ } = trpc.folder.getFolders.useQuery({+ type: FolderType.DOCUMENT,+ parentId: null,+ });+useEffect(() => {void refetch();+ void refetchFolders();}, [team?.url]);const getTabHref = (value: keyof typeof ExtendedDocumentStatus) => {@@ -93,76 +126,265 @@ export default function DocumentsPage() {}}, [data?.stats]);+ const navigateToFolder = (folderId?: string | null) => {+ const documentsPath = formatDocumentsPath(team?.url);++ if (folderId) {+ void navigate(`${documentsPath}/f/${folderId}`);+ } else {+ void navigate(documentsPath);+ }+ };++ const handleViewAllFolders = () => {+ void navigate(`${formatDocumentsPath(team?.url)}/folders`);+ };+return (- <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">- <DocumentUploadDropzone />-- <div className="mt-12 flex flex-wrap items-center justify-between gap-x-4 gap-y-8">- <div className="flex flex-row items-center">- {team && (- <Avatar className="dark:border-border mr-3 h-12 w-12 border-2 border-solid border-white">- {team.avatarImageId && <AvatarImage src={formatAvatarUrl(team.avatarImageId)} />}- <AvatarFallback className="text-xs text-gray-400">- {team.name.slice(0, 1)}- </AvatarFallback>- </Avatar>- )}-- <h1 className="text-4xl font-semibold">- <Trans>Documents</Trans>- </h1>- </div>+ <DocumentDropZoneWrapper>+ <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">+ <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">+ <div className="flex flex-1 items-center">+ <Button+ variant="ghost"+ size="sm"+ className="flex items-center space-x-2 pl-0 hover:bg-transparent"+ onClick={() => navigateToFolder(null)}+ >+ <HomeIcon className="h-4 w-4" />+ <span>Home</span>+ </Button>- <div className="-m-1 flex flex-wrap gap-x-4 gap-y-6 overflow-hidden p-1">- <Tabs value={findDocumentSearchParams.status || 'ALL'} className="overflow-x-auto">- <TabsList>- {[- ExtendedDocumentStatus.INBOX,- ExtendedDocumentStatus.PENDING,- ExtendedDocumentStatus.COMPLETED,- ExtendedDocumentStatus.DRAFT,- ExtendedDocumentStatus.ALL,- ].map((value) => (- <TabsTrigger- key={value}- className="hover:text-foreground min-w-[60px]"- value={value}- asChild+ {foldersData?.breadcrumbs.map((folder) => (+ <div key={folder.id} className="flex items-center space-x-2">+ <span>/</span>+ <Button+ variant="ghost"+ size="sm"+ className="flex items-center space-x-2 pl-1 hover:bg-transparent"+ onClick={() => navigateToFolder(folder.id)}>- <Link to={getTabHref(value)} preventScrollReset>- <DocumentStatus status={value} />-- {value !== ExtendedDocumentStatus.ALL && (- <span className="ml-1 inline-block opacity-50">{stats[value]}</span>- )}- </Link>- </TabsTrigger>- ))}- </TabsList>- </Tabs>-- {team && <DocumentsTableSenderFilter teamId={team.id} />}-- <div className="flex w-48 flex-wrap items-center justify-between gap-x-2 gap-y-4">- <PeriodSelector />+ <FolderIcon className="h-4 w-4" />+ <span>{folder.name}</span>+ </Button>+ </div>+ ))}</div>- <div className="flex w-48 flex-wrap items-center justify-between gap-x-2 gap-y-4">- <DocumentSearch initialValue={findDocumentSearchParams.query} />++ <div className="flex gap-4 sm:flex-row sm:justify-end">+ <DocumentUploadDropzone />+ <CreateFolderDialog /></div></div>- </div>- <div className="mt-8">- <div>- {data && data.count === 0 ? (- <DocumentsTableEmptyState- status={findDocumentSearchParams.status || ExtendedDocumentStatus.ALL}- />- ) : (- <DocumentsTable data={data} isLoading={isLoading} isLoadingError={isLoadingError} />- )}+ {isFoldersLoading ? (+ <div className="mt-6 flex justify-center">+ <Loader2 className="text-muted-foreground h-8 w-8 animate-spin" />+ </div>+ ) : (+ <>+ {foldersData?.folders?.some((folder) => folder.pinned) && (+ <div className="mt-6">+ <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">+ {foldersData.folders+ .filter((folder) => folder.pinned)+ .map((folder) => (+ <FolderCard+ key={folder.id}+ folder={folder}+ onNavigate={navigateToFolder}+ onMove={(folder) => {+ setFolderToMove(folder);+ setIsMovingFolder(true);+ }}+ onPin={(folderId) => void pinFolder({ folderId })}+ onUnpin={(folderId) => void unpinFolder({ folderId })}+ onSettings={(folder) => {+ setFolderToSettings(folder);+ setIsSettingsFolderOpen(true);+ }}+ onDelete={(folder) => {+ setFolderToDelete(folder);+ setIsDeletingFolder(true);+ }}+ />+ ))}+ </div>+ </div>+ )}++ <div className="mt-6">+ <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">+ {foldersData?.folders+ ?.filter((folder) => !folder.pinned)+ .slice(0, 12)+ .map((folder) => (+ <FolderCard+ key={folder.id}+ folder={folder}+ onNavigate={navigateToFolder}+ onMove={(folder) => {+ setFolderToMove(folder);+ setIsMovingFolder(true);+ }}+ onPin={(folderId) => void pinFolder({ folderId })}+ onUnpin={(folderId) => void unpinFolder({ folderId })}+ onSettings={(folder) => {+ setFolderToSettings(folder);+ setIsSettingsFolderOpen(true);+ }}+ onDelete={(folder) => {+ setFolderToDelete(folder);+ setIsDeletingFolder(true);+ }}+ />+ ))}+ </div>++ <div className="mt-6 flex items-center justify-center">+ {foldersData && foldersData.folders?.length > 12 && (+ <Button+ variant="link"+ size="sm"+ className="text-muted-foreground hover:text-foreground"+ onClick={() => void handleViewAllFolders()}+ >+ View all folders+ </Button>+ )}+ </div>+ </div>+ </>+ )}++ <div className="mt-12 flex flex-wrap items-center justify-between gap-x-4 gap-y-8">+ <div className="flex flex-row items-center">+ {team && (+ <Avatar className="dark:border-border mr-3 h-12 w-12 border-2 border-solid border-white">+ {team.avatarImageId && <AvatarImage src={formatAvatarUrl(team.avatarImageId)} />}+ <AvatarFallback className="text-muted-foreground text-xs">+ {team.name.slice(0, 1)}+ </AvatarFallback>+ </Avatar>+ )}++ <h2 className="text-4xl font-semibold">+ <Trans>Documents</Trans>+ </h2>+ </div>++ <div className="-m-1 flex flex-wrap gap-x-4 gap-y-6 overflow-hidden p-1">+ <Tabs value={findDocumentSearchParams.status || 'ALL'} className="overflow-x-auto">+ <TabsList>+ {[+ ExtendedDocumentStatus.INBOX,+ ExtendedDocumentStatus.PENDING,+ ExtendedDocumentStatus.COMPLETED,+ ExtendedDocumentStatus.DRAFT,+ ExtendedDocumentStatus.ALL,+ ].map((value) => (+ <TabsTrigger+ key={value}+ className="hover:text-foreground min-w-[60px]"+ value={value}+ asChild+ >+ <Link to={getTabHref(value)} preventScrollReset>+ <DocumentStatus status={value} />++ {value !== ExtendedDocumentStatus.ALL && (+ <span className="ml-1 inline-block opacity-50">{stats[value]}</span>+ )}+ </Link>+ </TabsTrigger>+ ))}+ </TabsList>+ </Tabs>++ {team && <DocumentsTableSenderFilter teamId={team.id} />}++ <div className="flex w-48 flex-wrap items-center justify-between gap-x-2 gap-y-4">+ <PeriodSelector />+ </div>+ <div className="flex w-48 flex-wrap items-center justify-between gap-x-2 gap-y-4">+ <DocumentSearch initialValue={findDocumentSearchParams.query} />+ </div>+ </div>+ </div>++ <div className="mt-8">+ <div>+ {data &&+ data.count === 0 &&+ (!foldersData?.folders.length || foldersData.folders.length === 0) ? (+ <DocumentsTableEmptyState+ status={findDocumentSearchParams.status || ExtendedDocumentStatus.ALL}+ />+ ) : (+ <DocumentsTable+ data={data}+ isLoading={isLoading}+ isLoadingError={isLoadingError}+ onMoveDocument={(documentId) => {+ setDocumentToMove(documentId);+ setIsMovingDocument(true);+ }}+ />+ )}+ </div></div>++ {documentToMove && (+ <DocumentMoveToFolderDialog+ documentId={documentToMove}+ open={isMovingDocument}+ onOpenChange={(open) => {+ setIsMovingDocument(open);++ if (!open) {+ setDocumentToMove(null);+ }+ }}+ />+ )}++ <FolderMoveDialog+ foldersData={foldersData?.folders}+ folder={folderToMove}+ isOpen={isMovingFolder}+ onOpenChange={(open) => {+ setIsMovingFolder(open);++ if (!open) {+ setFolderToMove(null);+ }+ }}+ />++ <FolderSettingsDialog+ folder={folderToSettings}+ isOpen={isSettingsFolderOpen}+ onOpenChange={(open) => {+ setIsSettingsFolderOpen(open);++ if (!open) {+ setFolderToSettings(null);+ }+ }}+ />++ <FolderDeleteDialog+ folder={folderToDelete}+ isOpen={isDeletingFolder}+ onOpenChange={(open) => {+ setIsDeletingFolder(open);++ if (!open) {+ setFolderToDelete(null);+ }+ }}+ /></div>- </div>+ </DocumentDropZoneWrapper>);}diff --git a/apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx b/apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsxnew file mode 100644index 000000000..f17826f5d--- /dev/null+++ b/apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx@@ -0,0 +1,272 @@+import { useLingui } from '@lingui/react';+import { Plural, Trans } from '@lingui/react/macro';+import { DocumentStatus, TeamMemberRole } from '@prisma/client';+import { ChevronLeft, Clock9, Users2 } from 'lucide-react';+import { Link, redirect } from 'react-router';+import { match } from 'ts-pattern';++import { getSession } from '@documenso/auth/server/lib/utils/get-session';+import { useSession } from '@documenso/lib/client-only/providers/session';+import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';+import { getFieldsForDocument } from '@documenso/lib/server-only/field/get-fields-for-document';+import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';+import { type TGetTeamByUrlResponse, getTeamByUrl } from '@documenso/lib/server-only/team/get-team';+import { DocumentVisibility } from '@documenso/lib/types/document-visibility';+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';+import { Button } from '@documenso/ui/primitives/button';+import { Card, CardContent } from '@documenso/ui/primitives/card';+import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';++import { DocumentHistorySheet } from '~/components/general/document/document-history-sheet';+import { DocumentPageViewButton } from '~/components/general/document/document-page-view-button';+import { DocumentPageViewDropdown } from '~/components/general/document/document-page-view-dropdown';+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 { DocumentRecipientLinkCopyDialog } from '~/components/general/document/document-recipient-link-copy-dialog';+import {+ DocumentStatus as DocumentStatusComponent,+ FRIENDLY_STATUS_MAP,+} from '~/components/general/document/document-status';+import { StackAvatarsWithTooltip } from '~/components/general/stack-avatars-with-tooltip';+import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';++import type { Route } from './+types/documents.f.$folderId.$id._index';++export async function loader({ params, request }: Route.LoaderArgs) {+ const { user } = await getSession(request);++ let team: TGetTeamByUrlResponse | null = null;++ if (params.teamUrl) {+ team = await getTeamByUrl({ userId: user.id, teamUrl: params.teamUrl });+ }++ const { id, folderId } = params;++ const documentId = Number(id);++ const documentRootPath = formatDocumentsPath(team?.url);++ if (!documentId || !folderId) {+ throw redirect(folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath);+ }++ const document = await getDocumentById({+ documentId,+ userId: user.id,+ teamId: team?.id,+ folderId,+ }).catch(() => null);++ if (document?.teamId && !team?.url) {+ throw redirect(folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath);+ }++ const documentVisibility = document?.visibility;+ const currentTeamMemberRole = team?.currentTeamMember?.role;+ const isRecipient = document?.recipients.find((recipient) => recipient.email === user.email);+ let canAccessDocument = true;++ if (team && !isRecipient && document?.userId !== user.id) {+ canAccessDocument = match([documentVisibility, currentTeamMemberRole])+ .with([DocumentVisibility.EVERYONE, TeamMemberRole.ADMIN], () => true)+ .with([DocumentVisibility.EVERYONE, TeamMemberRole.MANAGER], () => true)+ .with([DocumentVisibility.EVERYONE, TeamMemberRole.MEMBER], () => true)+ .with([DocumentVisibility.MANAGER_AND_ABOVE, TeamMemberRole.ADMIN], () => true)+ .with([DocumentVisibility.MANAGER_AND_ABOVE, TeamMemberRole.MANAGER], () => true)+ .with([DocumentVisibility.ADMIN, TeamMemberRole.ADMIN], () => true)+ .otherwise(() => false);+ }++ if (!document || !document.documentData || (team && !canAccessDocument)) {+ throw redirect(folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath);+ }++ if (team && !canAccessDocument) {+ throw redirect(folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath);+ }++ if (document.folderId !== folderId) {+ throw redirect(folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath);+ }++ // Todo: Get full document instead?+ const [recipients, fields] = await Promise.all([+ getRecipientsForDocument({+ documentId,+ teamId: team?.id,+ userId: user.id,+ }),+ getFieldsForDocument({+ documentId,+ userId: user.id,+ teamId: team?.id,+ }),+ ]);++ const documentWithRecipients = {+ ...document,+ recipients,+ };++ return superLoaderJson({+ document: documentWithRecipients,+ documentRootPath,+ fields,+ folderId,+ });+}++export default function DocumentPage() {+ const loaderData = useSuperLoaderData<typeof loader>();++ const { _ } = useLingui();+ const { user } = useSession();++ const { document, documentRootPath, fields, folderId } = loaderData;++ const { recipients, documentData, documentMeta } = document;++ // This was a feature flag. Leave to false since it's not ready.+ const isDocumentHistoryEnabled = false;++ return (+ <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">+ {document.status === DocumentStatus.PENDING && (+ <DocumentRecipientLinkCopyDialog recipients={recipients} />+ )}++ <Link+ to={folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath}+ className="flex items-center text-[#7AC455] hover:opacity-80"+ >+ <ChevronLeft className="mr-2 inline-block h-5 w-5" />+ <Trans>Documents</Trans>+ </Link>++ <div className="flex flex-row justify-between truncate">+ <div>+ <h1+ className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"+ title={document.title}+ >+ {document.title}+ </h1>++ <div className="mt-2.5 flex items-center gap-x-6">+ <DocumentStatusComponent+ inheritColor+ status={document.status}+ className="text-muted-foreground"+ />++ {recipients.length > 0 && (+ <div className="text-muted-foreground flex items-center">+ <Users2 className="mr-2 h-5 w-5" />++ <StackAvatarsWithTooltip+ recipients={recipients}+ documentStatus={document.status}+ position="bottom"+ >+ <span>+ <Trans>{recipients.length} Recipient(s)</Trans>+ </span>+ </StackAvatarsWithTooltip>+ </div>+ )}++ {document.deletedAt && (+ <Badge variant="destructive">+ <Trans>Document deleted</Trans>+ </Badge>+ )}+ </div>+ </div>++ {isDocumentHistoryEnabled && (+ <div className="self-end">+ <DocumentHistorySheet documentId={document.id} userId={user.id}>+ <Button variant="outline">+ <Clock9 className="mr-1.5 h-4 w-4" />+ <Trans>Document history</Trans>+ </Button>+ </DocumentHistorySheet>+ </div>+ )}+ </div>++ <div className="mt-6 grid w-full grid-cols-12 gap-8">+ <Card+ className="relative col-span-12 rounded-xl before:rounded-xl lg:col-span-6 xl:col-span-7"+ gradient+ >+ <CardContent className="p-2">+ <PDFViewer document={document} key={documentData.id} documentData={documentData} />+ </CardContent>+ </Card>++ {document.status === DocumentStatus.PENDING && (+ <DocumentReadOnlyFields fields={fields} documentMeta={documentMeta || undefined} />+ )}++ <div className="col-span-12 lg:col-span-6 xl:col-span-5">+ <div className="space-y-6">+ <section className="border-border bg-widget flex flex-col rounded-xl border pb-4 pt-6">+ <div className="flex flex-row items-center justify-between px-4">+ <h3 className="text-foreground text-2xl font-semibold">+ {_(FRIENDLY_STATUS_MAP[document.status].labelExtended)}+ </h3>++ <DocumentPageViewDropdown document={document} />+ </div>++ <p className="text-muted-foreground mt-2 px-4 text-sm">+ {match(document.status)+ .with(DocumentStatus.COMPLETED, () => (+ <Trans>This document has been signed by all recipients</Trans>+ ))+ .with(DocumentStatus.REJECTED, () => (+ <Trans>This document has been rejected by a recipient</Trans>+ ))+ .with(DocumentStatus.DRAFT, () => (+ <Trans>This document is currently a draft and has not been sent</Trans>+ ))+ .with(DocumentStatus.PENDING, () => {+ const pendingRecipients = recipients.filter(+ (recipient) => recipient.signingStatus === 'NOT_SIGNED',+ );++ return (+ <Plural+ value={pendingRecipients.length}+ one="Waiting on 1 recipient"+ other="Waiting on # recipients"+ />+ );+ })+ .exhaustive()}+ </p>++ <div className="mt-4 border-t px-4 pt-4">+ <DocumentPageViewButton document={document} />+ </div>+ </section>++ {/* Document information section. */}+ <DocumentPageViewInformation document={document} userId={user.id} />++ {/* Recipients section. */}+ <DocumentPageViewRecipients document={document} documentRootPath={documentRootPath} />++ {/* Recent activity section. */}+ <DocumentPageViewRecentActivity documentId={document.id} userId={user.id} />+ </div>+ </div>+ </div>+ </div>+ );+}diff --git a/apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.edit.tsx b/apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.edit.tsxnew file mode 100644index 000000000..b3b5067b3--- /dev/null+++ b/apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.edit.tsx@@ -0,0 +1,155 @@+import { Plural, Trans } from '@lingui/react/macro';+import { TeamMemberRole } from '@prisma/client';+import { ChevronLeft, Users2 } from 'lucide-react';+import { Link, redirect } from 'react-router';+import { match } from 'ts-pattern';++import { getSession } from '@documenso/auth/server/lib/utils/get-session';+import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';+import { getDocumentWithDetailsById } from '@documenso/lib/server-only/document/get-document-with-details-by-id';+import { type TGetTeamByUrlResponse, getTeamByUrl } from '@documenso/lib/server-only/team/get-team';+import { DocumentVisibility } from '@documenso/lib/types/document-visibility';+import { isDocumentCompleted } from '@documenso/lib/utils/document';+import { formatDocumentsPath } from '@documenso/lib/utils/teams';++import { DocumentEditForm } from '~/components/general/document/document-edit-form';+import { DocumentStatus } from '~/components/general/document/document-status';+import { StackAvatarsWithTooltip } from '~/components/general/stack-avatars-with-tooltip';+import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';++import type { Route } from './+types/documents.$id.edit';++export async function loader({ params, request }: Route.LoaderArgs) {+ const { user } = await getSession(request);++ let team: TGetTeamByUrlResponse | null = null;++ if (params.teamUrl) {+ team = await getTeamByUrl({ userId: user.id, teamUrl: params.teamUrl });+ }++ const { id, folderId } = params;++ const documentId = Number(id);++ const documentRootPath = formatDocumentsPath(team?.url);++ if (!documentId || Number.isNaN(documentId)) {+ throw redirect(documentRootPath);+ }++ if (!folderId) {+ throw redirect(documentRootPath);+ }++ const document = await getDocumentWithDetailsById({+ documentId,+ userId: user.id,+ teamId: team?.id,+ folderId,+ }).catch(() => null);++ if (document?.teamId && !team?.url) {+ throw redirect(documentRootPath);+ }++ const documentVisibility = document?.visibility;+ const currentTeamMemberRole = team?.currentTeamMember?.role;+ const isRecipient = document?.recipients.find((recipient) => recipient.email === user.email);+ let canAccessDocument = true;++ if (!isRecipient && document?.userId !== user.id) {+ canAccessDocument = match([documentVisibility, currentTeamMemberRole])+ .with([DocumentVisibility.EVERYONE, TeamMemberRole.ADMIN], () => true)+ .with([DocumentVisibility.EVERYONE, TeamMemberRole.MANAGER], () => true)+ .with([DocumentVisibility.EVERYONE, TeamMemberRole.MEMBER], () => true)+ .with([DocumentVisibility.MANAGER_AND_ABOVE, TeamMemberRole.ADMIN], () => true)+ .with([DocumentVisibility.MANAGER_AND_ABOVE, TeamMemberRole.MANAGER], () => true)+ .with([DocumentVisibility.ADMIN, TeamMemberRole.ADMIN], () => true)+ .otherwise(() => false);+ }++ if (!document) {+ throw redirect(documentRootPath);+ }++ if (team && !canAccessDocument) {+ throw redirect(documentRootPath);+ }++ if (document.folderId !== folderId) {+ throw redirect(folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath);+ }++ if (isDocumentCompleted(document.status)) {+ throw redirect(`${documentRootPath}/${documentId}`);+ }++ const isDocumentEnterprise = await isUserEnterprise({+ userId: user.id,+ teamId: team?.id,+ });++ return superLoaderJson({+ document: {+ ...document,+ folder: null,+ },+ documentRootPath,+ isDocumentEnterprise,+ folderId,+ });+}++export default function DocumentEditPage() {+ const { document, documentRootPath, isDocumentEnterprise, folderId } =+ useSuperLoaderData<typeof loader>();++ const { recipients } = document;++ return (+ <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">+ <Link+ to={`${documentRootPath}/f/${folderId}`}+ className="flex items-center text-[#7AC455] hover:opacity-80"+ >+ <ChevronLeft className="mr-2 inline-block h-5 w-5" />+ <Trans>Documents</Trans>+ </Link>++ <h1+ className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"+ title={document.title}+ >+ {document.title}+ </h1>++ <div className="mt-2.5 flex items-center gap-x-6">+ <DocumentStatus inheritColor status={document.status} className="text-muted-foreground" />++ {recipients.length > 0 && (+ <div className="text-muted-foreground flex items-center">+ <Users2 className="mr-2 h-5 w-5" />++ <StackAvatarsWithTooltip+ recipients={recipients}+ documentStatus={document.status}+ position="bottom"+ >+ <span>+ <Plural one="1 Recipient" other="# Recipients" value={recipients.length} />+ </span>+ </StackAvatarsWithTooltip>+ </div>+ )}+ </div>++ <DocumentEditForm+ className="mt-6"+ initialDocument={document}+ documentRootPath={documentRootPath}+ isDocumentEnterprise={isDocumentEnterprise}+ />+ </div>+ );+}diff --git a/apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx b/apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsxnew file mode 100644index 000000000..cee9a0c45--- /dev/null+++ b/apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx@@ -0,0 +1,199 @@+import type { MessageDescriptor } from '@lingui/core';+import { msg } from '@lingui/core/macro';+import { useLingui } from '@lingui/react';+import { Trans } from '@lingui/react/macro';+import type { Recipient } from '@prisma/client';+import { ChevronLeft } from 'lucide-react';+import { DateTime } from 'luxon';+import { Link, redirect } from 'react-router';++import { getSession } from '@documenso/auth/server/lib/utils/get-session';+import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';+import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';+import { type TGetTeamByUrlResponse, getTeamByUrl } from '@documenso/lib/server-only/team/get-team';+import { formatDocumentsPath } from '@documenso/lib/utils/teams';+import { Card } from '@documenso/ui/primitives/card';++import { DocumentAuditLogDownloadButton } from '~/components/general/document/document-audit-log-download-button';+import { DocumentCertificateDownloadButton } from '~/components/general/document/document-certificate-download-button';+import {+ DocumentStatus as DocumentStatusComponent,+ FRIENDLY_STATUS_MAP,+} from '~/components/general/document/document-status';+import { DocumentLogsTable } from '~/components/tables/document-logs-table';++import type { Route } from './+types/documents.f.$folderId.$id.logs';++export async function loader({ params, request }: Route.LoaderArgs) {+ const { user } = await getSession(request);++ let team: TGetTeamByUrlResponse | null = null;++ if (params.teamUrl) {+ team = await getTeamByUrl({ userId: user.id, teamUrl: params.teamUrl });+ }++ const { id, folderId } = params;++ const documentId = Number(id);++ const documentRootPath = formatDocumentsPath(team?.url);++ if (!documentId || Number.isNaN(documentId)) {+ throw redirect(folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath);+ }++ if (!folderId) {+ throw redirect(documentRootPath);+ }++ // Todo: Get full document instead?+ const [document, recipients] = await Promise.all([+ getDocumentById({+ documentId,+ userId: user.id,+ teamId: team?.id,+ folderId,+ }).catch(() => null),+ getRecipientsForDocument({+ documentId,+ userId: user.id,+ teamId: team?.id,+ }),+ ]);++ if (!document || !document.documentData) {+ throw redirect(folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath);+ }++ if (document.folderId !== folderId) {+ throw redirect(documentRootPath);+ }++ return {+ document,+ documentRootPath,+ recipients,+ folderId,+ };+}++export default function DocumentsLogsPage({ loaderData }: Route.ComponentProps) {+ const { document, documentRootPath, recipients, folderId } = loaderData;++ const { _, i18n } = useLingui();++ const documentInformation: { description: MessageDescriptor; value: string }[] = [+ {+ description: msg`Document title`,+ value: document.title,+ },+ {+ description: msg`Document ID`,+ value: document.id.toString(),+ },+ {+ description: msg`Document status`,+ value: _(FRIENDLY_STATUS_MAP[document.status].label),+ },+ {+ description: msg`Created by`,+ value: document.user.name+ ? `${document.user.name} (${document.user.email})`+ : document.user.email,+ },+ {+ description: msg`Date created`,+ value: DateTime.fromJSDate(document.createdAt)+ .setLocale(i18n.locales?.[0] || i18n.locale)+ .toLocaleString(DateTime.DATETIME_MED_WITH_SECONDS),+ },+ {+ description: msg`Last updated`,+ value: DateTime.fromJSDate(document.updatedAt)+ .setLocale(i18n.locales?.[0] || i18n.locale)+ .toLocaleString(DateTime.DATETIME_MED_WITH_SECONDS),+ },+ {+ description: msg`Time zone`,+ value: document.documentMeta?.timezone ?? 'N/A',+ },+ ];++ const formatRecipientText = (recipient: Recipient) => {+ let text = recipient.email;++ if (recipient.name) {+ text = `${recipient.name} (${recipient.email})`;+ }++ return `[${recipient.role}] ${text}`;+ };++ return (+ <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">+ <Link+ to={`${documentRootPath}/f/${folderId}/${document.id}`}+ className="flex items-center text-[#7AC455] hover:opacity-80"+ >+ <ChevronLeft className="mr-2 inline-block h-5 w-5" />+ <Trans>Document</Trans>+ </Link>++ <div className="flex flex-col">+ <div>+ <h1+ className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"+ title={document.title}+ >+ {document.title}+ </h1>+ </div>+ <div className="mt-1 flex flex-col justify-between sm:flex-row">+ <div className="mt-2.5 flex items-center gap-x-6">+ <DocumentStatusComponent+ inheritColor+ status={document.status}+ className="text-muted-foreground"+ />+ </div>+ <div className="mt-4 flex w-full flex-row sm:mt-0 sm:w-auto sm:self-end">+ <DocumentCertificateDownloadButton+ className="mr-2"+ documentId={document.id}+ documentStatus={document.status}+ />++ <DocumentAuditLogDownloadButton documentId={document.id} />+ </div>+ </div>+ </div>++ <section className="mt-6">+ <Card className="grid grid-cols-1 gap-4 p-4 sm:grid-cols-2" degrees={45} gradient>+ {documentInformation.map((info, i) => (+ <div className="text-foreground text-sm" key={i}>+ <h3 className="font-semibold">{_(info.description)}</h3>+ <p className="text-muted-foreground truncate">{info.value}</p>+ </div>+ ))}++ <div className="text-foreground text-sm">+ <h3 className="font-semibold">Recipients</h3>+ <ul className="text-muted-foreground list-inside list-disc">+ {recipients.map((recipient) => (+ <li key={`recipient-${recipient.id}`}>+ <span className="-ml-2">{formatRecipientText(recipient)}</span>+ </li>+ ))}+ </ul>+ </div>+ </Card>+ </section>++ <section className="mt-6">+ <DocumentLogsTable documentId={document.id} />+ </section>+ </div>+ );+}diff --git a/apps/remix/app/routes/_authenticated+/documents.f.$folderId._index.tsx b/apps/remix/app/routes/_authenticated+/documents.f.$folderId._index.tsxnew file mode 100644index 000000000..ad5f40700--- /dev/null+++ b/apps/remix/app/routes/_authenticated+/documents.f.$folderId._index.tsx@@ -0,0 +1,374 @@+import { useEffect, useMemo, useState } from 'react';++import { Trans } from '@lingui/react/macro';+import { FolderIcon, HomeIcon, Loader2 } from 'lucide-react';+import { useNavigate, useParams, useSearchParams } from 'react-router';+import { Link } from 'react-router';+import { z } from 'zod';++import { formatAvatarUrl } from '@documenso/lib/utils/avatars';+import { parseToIntegerArray } from '@documenso/lib/utils/params';+import { formatDocumentsPath } from '@documenso/lib/utils/teams';+import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';+import { trpc } from '@documenso/trpc/react';+import {+ type TFindDocumentsInternalResponse,+ ZFindDocumentsInternalRequestSchema,+} from '@documenso/trpc/server/document-router/schema';+import { type TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';+import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';+import { Button } from '@documenso/ui/primitives/button';+import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';++import { DocumentMoveToFolderDialog } from '~/components/dialogs/document-move-to-folder-dialog';+import { CreateFolderDialog } from '~/components/dialogs/folder-create-dialog';+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 { DocumentSearch } from '~/components/general/document/document-search';+import { DocumentStatus } from '~/components/general/document/document-status';+import { DocumentUploadDropzone } from '~/components/general/document/document-upload';+import { FolderCard } from '~/components/general/folder/folder-card';+import { PeriodSelector } from '~/components/general/period-selector';+import { DocumentsTable } from '~/components/tables/documents-table';+import { DocumentsTableEmptyState } from '~/components/tables/documents-table-empty-state';+import { DocumentsTableSenderFilter } from '~/components/tables/documents-table-sender-filter';+import { useOptionalCurrentTeam } from '~/providers/team';+import { appMetaTags } from '~/utils/meta';++export function meta() {+ return appMetaTags('Documents');+}++const ZSearchParamsSchema = ZFindDocumentsInternalRequestSchema.pick({+ status: true,+ period: true,+ page: true,+ perPage: true,+ query: true,+}).extend({+ senderIds: z.string().transform(parseToIntegerArray).optional().catch([]),+});++export default function DocumentsPage() {+ const [searchParams] = useSearchParams();+ const navigate = useNavigate();++ const [isMovingDocument, setIsMovingDocument] = useState(false);+ const [documentToMove, setDocumentToMove] = useState<number | null>(null);+ const [isMovingFolder, setIsMovingFolder] = useState(false);+ const [folderToMove, setFolderToMove] = useState<TFolderWithSubfolders | null>(null);+ const [isDeletingFolder, setIsDeletingFolder] = useState(false);+ const [folderToDelete, setFolderToDelete] = useState<TFolderWithSubfolders | null>(null);+ const [isSettingsFolderOpen, setIsSettingsFolderOpen] = useState(false);+ const [folderToSettings, setFolderToSettings] = useState<TFolderWithSubfolders | null>(null);++ const { folderId } = useParams();++ const team = useOptionalCurrentTeam();++ const { mutateAsync: pinFolder } = trpc.folder.pinFolder.useMutation();+ const { mutateAsync: unpinFolder } = trpc.folder.unpinFolder.useMutation();++ const [stats, setStats] = useState<TFindDocumentsInternalResponse['stats']>({+ [ExtendedDocumentStatus.DRAFT]: 0,+ [ExtendedDocumentStatus.PENDING]: 0,+ [ExtendedDocumentStatus.COMPLETED]: 0,+ [ExtendedDocumentStatus.REJECTED]: 0,+ [ExtendedDocumentStatus.INBOX]: 0,+ [ExtendedDocumentStatus.ALL]: 0,+ });++ const findDocumentSearchParams = useMemo(+ () => ZSearchParamsSchema.safeParse(Object.fromEntries(searchParams.entries())).data || {},+ [searchParams],+ );++ const { data, isLoading, isLoadingError, refetch } = trpc.document.findDocumentsInternal.useQuery(+ {+ ...findDocumentSearchParams,+ folderId,+ },+ );++ const {+ data: foldersData,+ isLoading: isFoldersLoading,+ refetch: refetchFolders,+ } = trpc.folder.getFolders.useQuery({+ parentId: folderId,+ });++ useEffect(() => {+ void refetch();+ void refetchFolders();+ }, [team?.url]);++ const getTabHref = (value: keyof typeof ExtendedDocumentStatus) => {+ const params = new URLSearchParams(searchParams);++ params.set('status', value);++ if (value === ExtendedDocumentStatus.ALL) {+ params.delete('status');+ }++ if (params.has('page')) {+ params.delete('page');+ }++ return `${formatDocumentsPath(team?.url)}/f/${folderId}?${params.toString()}`;+ };++ useEffect(() => {+ if (data?.stats) {+ setStats(data.stats);+ }+ }, [data?.stats]);++ const navigateToFolder = (folderId?: string | null) => {+ const documentsPath = formatDocumentsPath(team?.url);++ if (folderId) {+ void navigate(`${documentsPath}/f/${folderId}`);+ } else {+ void navigate(documentsPath);+ }+ };++ return (+ <DocumentDropZoneWrapper>+ <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">+ <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">+ <div className="flex flex-1 items-center">+ <Button+ variant="ghost"+ size="sm"+ className="flex items-center space-x-2 pl-0 hover:bg-transparent"+ onClick={() => navigateToFolder(null)}+ >+ <HomeIcon className="h-4 w-4" />+ <span>Home</span>+ </Button>++ {foldersData?.breadcrumbs.map((folder) => (+ <div key={folder.id} className="flex items-center space-x-2">+ <span>/</span>+ <Button+ variant="ghost"+ size="sm"+ className="flex items-center space-x-2 pl-1 hover:bg-transparent"+ onClick={() => navigateToFolder(folder.id)}+ >+ <FolderIcon className="h-4 w-4" />+ <span>{folder.name}</span>+ </Button>+ </div>+ ))}+ </div>++ <div className="flex gap-4 sm:flex-row sm:justify-end">+ <DocumentUploadDropzone />+ <CreateFolderDialog />+ </div>+ </div>++ {isFoldersLoading ? (+ <div className="mt-6 flex justify-center">+ <Loader2 className="text-muted-foreground h-8 w-8 animate-spin" />+ </div>+ ) : (+ <>+ {foldersData?.folders && foldersData.folders.some((folder) => folder.pinned) && (+ <div className="mt-6">+ <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">+ {foldersData.folders+ .filter((folder) => folder.pinned)+ .map((folder) => (+ <FolderCard+ key={folder.id}+ folder={folder}+ onNavigate={navigateToFolder}+ onMove={(folder) => {+ setFolderToMove(folder);+ setIsMovingFolder(true);+ }}+ onPin={(folderId) => void pinFolder({ folderId })}+ onUnpin={(folderId) => void unpinFolder({ folderId })}+ onSettings={(folder) => {+ setFolderToSettings(folder);+ setIsSettingsFolderOpen(true);+ }}+ onDelete={(folder) => {+ setFolderToDelete(folder);+ setIsDeletingFolder(true);+ }}+ />+ ))}+ </div>+ </div>+ )}++ <div className="mt-6">+ <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">+ {foldersData?.folders+ .filter((folder) => !folder.pinned)+ .map((folder) => (+ <FolderCard+ key={folder.id}+ folder={folder}+ onNavigate={navigateToFolder}+ onMove={(folder) => {+ setFolderToMove(folder);+ setIsMovingFolder(true);+ }}+ onPin={(folderId) => void pinFolder({ folderId })}+ onUnpin={(folderId) => void unpinFolder({ folderId })}+ onSettings={(folder) => {+ setFolderToSettings(folder);+ setIsSettingsFolderOpen(true);+ }}+ onDelete={(folder) => {+ setFolderToDelete(folder);+ setIsDeletingFolder(true);+ }}+ />+ ))}+ </div>+ </div>+ </>+ )}++ <div className="mt-12 flex flex-wrap items-center justify-between gap-x-4 gap-y-8">+ <div className="flex flex-row items-center">+ {team && (+ <Avatar className="dark:border-border mr-3 h-12 w-12 border-2 border-solid border-white">+ {team.avatarImageId && <AvatarImage src={formatAvatarUrl(team.avatarImageId)} />}+ <AvatarFallback className="text-muted-foreground text-xs">+ {team.name.slice(0, 1)}+ </AvatarFallback>+ </Avatar>+ )}++ <h2 className="text-4xl font-semibold">+ <Trans>Documents</Trans>+ </h2>+ </div>++ <div className="-m-1 flex flex-wrap gap-x-4 gap-y-6 overflow-hidden p-1">+ <Tabs value={findDocumentSearchParams.status || 'ALL'} className="overflow-x-auto">+ <TabsList>+ {[+ ExtendedDocumentStatus.INBOX,+ ExtendedDocumentStatus.PENDING,+ ExtendedDocumentStatus.COMPLETED,+ ExtendedDocumentStatus.DRAFT,+ ExtendedDocumentStatus.ALL,+ ].map((value) => (+ <TabsTrigger+ key={value}+ className="hover:text-foreground min-w-[60px]"+ value={value}+ asChild+ >+ <Link to={getTabHref(value)} preventScrollReset>+ <DocumentStatus status={value} />++ {value !== ExtendedDocumentStatus.ALL && (+ <span className="ml-1 inline-block opacity-50">{stats[value]}</span>+ )}+ </Link>+ </TabsTrigger>+ ))}+ </TabsList>+ </Tabs>++ {team && <DocumentsTableSenderFilter teamId={team.id} />}++ <div className="flex w-48 flex-wrap items-center justify-between gap-x-2 gap-y-4">+ <PeriodSelector />+ </div>+ <div className="flex w-48 flex-wrap items-center justify-between gap-x-2 gap-y-4">+ <DocumentSearch initialValue={findDocumentSearchParams.query} />+ </div>+ </div>+ </div>++ <div className="mt-8">+ <div>+ {data &&+ data.count === 0 &&+ (!foldersData?.folders.length || foldersData.folders.length === 0) ? (+ <DocumentsTableEmptyState+ status={findDocumentSearchParams.status || ExtendedDocumentStatus.ALL}+ />+ ) : (+ <DocumentsTable+ data={data}+ isLoading={isLoading}+ isLoadingError={isLoadingError}+ onMoveDocument={(documentId) => {+ setDocumentToMove(documentId);+ setIsMovingDocument(true);+ }}+ />+ )}+ </div>+ </div>++ {documentToMove && (+ <DocumentMoveToFolderDialog+ documentId={documentToMove}+ open={isMovingDocument}+ onOpenChange={(open) => {+ setIsMovingDocument(open);++ if (!open) {+ setDocumentToMove(null);+ }+ }}+ currentFolderId={folderId}+ />+ )}++ <FolderMoveDialog+ foldersData={foldersData?.folders}+ folder={folderToMove}+ isOpen={isMovingFolder}+ onOpenChange={(open) => {+ setIsMovingFolder(open);++ if (!open) {+ setFolderToMove(null);+ }+ }}+ />++ <FolderSettingsDialog+ folder={folderToSettings}+ isOpen={isSettingsFolderOpen}+ onOpenChange={(open) => {+ setIsSettingsFolderOpen(open);++ if (!open) {+ setFolderToSettings(null);+ }+ }}+ />++ <FolderDeleteDialog+ folder={folderToDelete}+ isOpen={isDeletingFolder}+ onOpenChange={(open) => {+ setIsDeletingFolder(open);++ if (!open) {+ setFolderToDelete(null);+ }+ }}+ />+ </div>+ </DocumentDropZoneWrapper>+ );+}diff --git a/apps/remix/app/routes/_authenticated+/documents.folders._index.tsx b/apps/remix/app/routes/_authenticated+/documents.folders._index.tsxnew file mode 100644index 000000000..335502781--- /dev/null+++ b/apps/remix/app/routes/_authenticated+/documents.folders._index.tsx@@ -0,0 +1,181 @@+import { useState } from 'react';++import { Trans } from '@lingui/react/macro';+import { HomeIcon, Loader2 } from 'lucide-react';+import { useNavigate } from 'react-router';++import { FolderType } from '@documenso/lib/types/folder-type';+import { formatDocumentsPath } from '@documenso/lib/utils/teams';+import { trpc } from '@documenso/trpc/react';+import { type TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';+import { Button } from '@documenso/ui/primitives/button';++import { CreateFolderDialog } from '~/components/dialogs/folder-create-dialog';+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 { FolderCard } from '~/components/general/folder/folder-card';+import { appMetaTags } from '~/utils/meta';++export function meta() {+ return appMetaTags('Documents');+}++export default function DocumentsFoldersPage() {+ const navigate = useNavigate();+ const [isMovingFolder, setIsMovingFolder] = useState(false);+ const [folderToMove, setFolderToMove] = useState<TFolderWithSubfolders | null>(null);+ const [isDeletingFolder, setIsDeletingFolder] = useState(false);+ const [folderToDelete, setFolderToDelete] = useState<TFolderWithSubfolders | null>(null);+ const [isSettingsFolderOpen, setIsSettingsFolderOpen] = useState(false);+ const [folderToSettings, setFolderToSettings] = useState<TFolderWithSubfolders | null>(null);++ const { data: foldersData, isLoading: isFoldersLoading } = trpc.folder.getFolders.useQuery({+ type: FolderType.DOCUMENT,+ parentId: null,+ });++ const { mutateAsync: pinFolder } = trpc.folder.pinFolder.useMutation();+ const { mutateAsync: unpinFolder } = trpc.folder.unpinFolder.useMutation();++ const navigateToFolder = (folderId?: string | null) => {+ const documentsPath = formatDocumentsPath();++ if (folderId) {+ void navigate(`${documentsPath}/f/${folderId}`);+ } else {+ void navigate(documentsPath);+ }+ };++ return (+ <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">+ <div className="flex w-full items-center justify-between">+ <div className="flex flex-1 items-center">+ <Button+ variant="ghost"+ size="sm"+ className="flex items-center space-x-2 pl-0 hover:bg-transparent"+ onClick={() => navigateToFolder(null)}+ >+ <HomeIcon className="h-4 w-4" />+ <span>Home</span>+ </Button>+ </div>++ <div className="flex flex-col gap-y-4 sm:flex-row sm:justify-end sm:gap-x-4">+ <CreateFolderDialog />+ </div>+ </div>++ <div className="mt-6">+ {isFoldersLoading ? (+ <div className="mt-6 flex justify-center">+ <Loader2 className="text-muted-foreground h-8 w-8 animate-spin" />+ </div>+ ) : (+ <>+ {foldersData?.folders?.some((folder) => folder.pinned) && (+ <div className="mt-6">+ <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">+ {foldersData.folders+ .filter((folder) => folder.pinned)+ .map((folder) => (+ <FolderCard+ key={folder.id}+ folder={folder}+ onNavigate={navigateToFolder}+ onMove={(folder) => {+ setFolderToMove(folder);+ setIsMovingFolder(true);+ }}+ onPin={(folderId) => void pinFolder({ folderId })}+ onUnpin={(folderId) => void unpinFolder({ folderId })}+ onSettings={(folder) => {+ setFolderToSettings(folder);+ setIsSettingsFolderOpen(true);+ }}+ onDelete={(folder) => {+ setFolderToDelete(folder);+ setIsDeletingFolder(true);+ }}+ />+ ))}+ </div>+ </div>+ )}++ <div className="mt-12">+ <h1 className="truncate text-2xl font-semibold md:text-3xl">+ <Trans>All Folders</Trans>+ </h1>++ <div className="mt-6 grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">+ {foldersData?.folders+ .filter((folder) => !folder.pinned)+ .map((folder) => (+ <FolderCard+ key={folder.id}+ folder={folder}+ onNavigate={navigateToFolder}+ onMove={(folder) => {+ setFolderToMove(folder);+ setIsMovingFolder(true);+ }}+ onPin={(folderId) => void pinFolder({ folderId })}+ onUnpin={(folderId) => void unpinFolder({ folderId })}+ onSettings={(folder) => {+ setFolderToSettings(folder);+ setIsSettingsFolderOpen(true);+ }}+ onDelete={(folder) => {+ setFolderToDelete(folder);+ setIsDeletingFolder(true);+ }}+ />+ ))}+ </div>+ </div>+ </>+ )}+ </div>++ <FolderMoveDialog+ foldersData={foldersData?.folders}+ folder={folderToMove}+ isOpen={isMovingFolder}+ onOpenChange={(open) => {+ setIsMovingFolder(open);++ if (!open) {+ setFolderToMove(null);+ }+ }}+ />++ <FolderSettingsDialog+ folder={folderToSettings}+ isOpen={isSettingsFolderOpen}+ onOpenChange={(open) => {+ setIsSettingsFolderOpen(open);++ if (!open) {+ setFolderToSettings(null);+ }+ }}+ />++ <FolderDeleteDialog+ folder={folderToDelete}+ isOpen={isDeletingFolder}+ onOpenChange={(open) => {+ setIsDeletingFolder(open);++ if (!open) {+ setFolderToDelete(null);+ }+ }}+ />+ </div>+ );+}diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId.$id._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId.$id._index.tsxnew file mode 100644index 000000000..35c8104c4--- /dev/null+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId.$id._index.tsx@@ -0,0 +1,5 @@+import DocumentPage, { loader } from '~/routes/_authenticated+/documents.f.$folderId.$id._index';++export { loader };++export default DocumentPage;diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId.$id.edit.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId.$id.edit.tsxnew file mode 100644index 000000000..1227e088f--- /dev/null+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId.$id.edit.tsx@@ -0,0 +1,5 @@+import DocumentEditPage, { loader } from '~/routes/_authenticated+/documents.f.$folderId.$id.edit';++export { loader };++export default DocumentEditPage;diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId.$id.logs.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId.$id.logs.tsxnew file mode 100644index 000000000..ed1abe1e0--- /dev/null+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId.$id.logs.tsx@@ -0,0 +1,5 @@+import DocumentLogsPage, { loader } from '~/routes/_authenticated+/documents.f.$folderId.$id.logs';++export { loader };++export default DocumentLogsPage;diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId._index.tsxnew file mode 100644index 000000000..05707e676--- /dev/null+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId._index.tsx@@ -0,0 +1,5 @@+import DocumentsPage, { meta } from '~/routes/_authenticated+/documents.f.$folderId._index';++export { meta };++export default DocumentsPage;diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.folders._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.folders._index.tsxnew file mode 100644index 000000000..0dd6e5103--- /dev/null+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.folders._index.tsx@@ -0,0 +1,5 @@+import DocumentsFoldersPage, { meta } from '~/routes/_authenticated+/documents.folders._index';++export { meta };++export default DocumentsFoldersPage;diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId.$id._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId.$id._index.tsxnew file mode 100644index 000000000..581561fc9--- /dev/null+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId.$id._index.tsx@@ -0,0 +1,5 @@+import TemplatePage, { loader } from '~/routes/_authenticated+/templates.f.$folderId.$id._index';++export { loader };++export default TemplatePage;diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId.$id.edit.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId.$id.edit.tsxnew file mode 100644index 000000000..0de6a0574--- /dev/null+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId.$id.edit.tsx@@ -0,0 +1,5 @@+import TemplateEditPage, { loader } from '~/routes/_authenticated+/templates.f.$folderId.$id.edit';++export { loader };++export default TemplateEditPage;diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsxnew file mode 100644index 000000000..5bacbff06--- /dev/null+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx@@ -0,0 +1,5 @@+import TemplatesPage, { meta } from '~/routes/_authenticated+/templates.f.$folderId._index';++export { meta };++export default TemplatesPage;diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.folders._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.folders._index.tsxnew file mode 100644index 000000000..55c8ef207--- /dev/null+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.folders._index.tsx@@ -0,0 +1,5 @@+import TemplatesFoldersPage, { meta } from '~/routes/_authenticated+/templates.folders._index';++export { meta };++export default TemplatesFoldersPage;diff --git a/apps/remix/app/routes/_authenticated+/templates.$id._index.tsx b/apps/remix/app/routes/_authenticated+/templates.$id._index.tsxindex e315b87cc..9000938cf 100644--- a/apps/remix/app/routes/_authenticated+/templates.$id._index.tsx+++ b/apps/remix/app/routes/_authenticated+/templates.$id._index.tsx@@ -55,6 +55,10 @@ export async function loader({ params, request }: Route.LoaderArgs) {throw redirect(templateRootPath);}+ if (template.folderId) {+ throw redirect(`${templateRootPath}/f/${template.folderId}/${templateId}`);+ }+return superLoaderJson({user,team,diff --git a/apps/remix/app/routes/_authenticated+/templates.$id.edit.tsx b/apps/remix/app/routes/_authenticated+/templates.$id.edit.tsxindex 75c0c8f12..b746b6ba5 100644--- a/apps/remix/app/routes/_authenticated+/templates.$id.edit.tsx+++ b/apps/remix/app/routes/_authenticated+/templates.$id.edit.tsx@@ -45,13 +45,20 @@ export async function loader({ params, request }: Route.LoaderArgs) {throw redirect(templateRootPath);}+ if (template.folderId) {+ throw redirect(`${templateRootPath}/f/${template.folderId}/${templateId}/edit`);+ }+const isTemplateEnterprise = await isUserEnterprise({userId: user.id,teamId: team?.id,});return superLoaderJson({- template,+ template: {+ ...template,+ folder: null,+ },isTemplateEnterprise,templateRootPath,});@@ -65,7 +72,11 @@ export default function TemplateEditPage() {<div className="flex flex-col justify-between sm:flex-row"><div><Link- to={`${templateRootPath}/${template.id}`}+ to={+ template.folderId+ ? `${templateRootPath}/f/${template.folderId}/${template.id}`+ : `${templateRootPath}/${template.id}`+ }className="flex items-center text-[#7AC455] hover:opacity-80"><ChevronLeft className="mr-2 inline-block h-5 w-5" />diff --git a/apps/remix/app/routes/_authenticated+/templates._index.tsx b/apps/remix/app/routes/_authenticated+/templates._index.tsxindex edca92697..649620173 100644--- a/apps/remix/app/routes/_authenticated+/templates._index.tsx+++ b/apps/remix/app/routes/_authenticated+/templates._index.tsx@@ -1,15 +1,23 @@-import { useEffect } from 'react';+import { useEffect, useState } from 'react';import { Trans } from '@lingui/react/macro';-import { Bird } from 'lucide-react';-import { useSearchParams } from 'react-router';+import { Bird, FolderIcon, HomeIcon, Loader2 } from 'lucide-react';+import { useNavigate, useSearchParams } from 'react-router';+import { FolderType } from '@documenso/lib/types/folder-type';import { formatAvatarUrl } from '@documenso/lib/utils/avatars';import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams';import { trpc } from '@documenso/trpc/react';+import type { TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';+import { Button } from '@documenso/ui/primitives/button';import { TemplateCreateDialog } from '~/components/dialogs/template-create-dialog';+import { TemplateFolderCreateDialog } from '~/components/dialogs/template-folder-create-dialog';+import { TemplateFolderDeleteDialog } from '~/components/dialogs/template-folder-delete-dialog';+import { TemplateFolderMoveDialog } from '~/components/dialogs/template-folder-move-dialog';+import { TemplateFolderSettingsDialog } from '~/components/dialogs/template-folder-settings-dialog';+import { FolderCard } from '~/components/general/folder/folder-card';import { TemplatesTable } from '~/components/tables/templates-table';import { useOptionalCurrentTeam } from '~/providers/team';import { appMetaTags } from '~/utils/meta';@@ -19,10 +27,21 @@ export function meta() {}export default function TemplatesPage() {+ const navigate = useNavigate();const [searchParams] = useSearchParams();+ const [isMovingFolder, setIsMovingFolder] = useState(false);+ const [folderToMove, setFolderToMove] = useState<TFolderWithSubfolders | null>(null);+ const [isDeletingFolder, setIsDeletingFolder] = useState(false);+ const [folderToDelete, setFolderToDelete] = useState<TFolderWithSubfolders | null>(null);+ const [isSettingsFolderOpen, setIsSettingsFolderOpen] = useState(false);+ const [folderToSettings, setFolderToSettings] = useState<TFolderWithSubfolders | null>(null);+const team = useOptionalCurrentTeam();+ const { mutateAsync: pinFolder } = trpc.folder.pinFolder.useMutation();+ const { mutateAsync: unpinFolder } = trpc.folder.unpinFolder.useMutation();+const page = Number(searchParams.get('page')) || 1;const perPage = Number(searchParams.get('perPage')) || 10;@@ -34,19 +53,165 @@ export default function TemplatesPage() {perPage: perPage,});- // Refetch the templates when the team URL changes.+ const {+ data: foldersData,+ isLoading: isFoldersLoading,+ refetch: refetchFolders,+ } = trpc.folder.getFolders.useQuery({+ type: FolderType.TEMPLATE,+ parentId: null,+ });+useEffect(() => {void refetch();+ void refetchFolders();}, [team?.url]);+ const navigateToFolder = (folderId?: string | null) => {+ const templatesPath = formatTemplatesPath(team?.url);++ if (folderId) {+ void navigate(`${templatesPath}/f/${folderId}`);+ } else {+ void navigate(templatesPath);+ }+ };++ const handleNavigate = (folderId: string) => {+ navigateToFolder(folderId);+ };++ const handleMove = (folder: TFolderWithSubfolders) => {+ setFolderToMove(folder);+ setIsMovingFolder(true);+ };++ const handlePin = (folderId: string) => {+ void pinFolder({ folderId });+ };++ const handleUnpin = (folderId: string) => {+ void unpinFolder({ folderId });+ };++ const handleSettings = (folder: TFolderWithSubfolders) => {+ setFolderToSettings(folder);+ setIsSettingsFolderOpen(true);+ };++ const handleDelete = (folder: TFolderWithSubfolders) => {+ setFolderToDelete(folder);+ setIsDeletingFolder(true);+ };++ const handleViewAllFolders = () => {+ void navigate(`${formatTemplatesPath(team?.url)}/folders`);+ };+return (<div className="mx-auto max-w-screen-xl px-4 md:px-8">- <div className="flex items-baseline justify-between">+ <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">+ <div className="flex flex-1 items-center">+ <Button+ variant="ghost"+ size="sm"+ className="flex items-center space-x-2 pl-0 hover:bg-transparent"+ onClick={() => navigateToFolder(null)}+ >+ <HomeIcon className="h-4 w-4" />+ <span>Home</span>+ </Button>++ {foldersData?.breadcrumbs.map((folder) => (+ <div key={folder.id} className="flex items-center space-x-2">+ <span>/</span>+ <Button+ variant="ghost"+ size="sm"+ className="flex items-center space-x-2 pl-1 hover:bg-transparent"+ onClick={() => navigateToFolder(folder.id)}+ >+ <FolderIcon className="h-4 w-4" />+ <span>{folder.name}</span>+ </Button>+ </div>+ ))}+ </div>++ <div className="flex gap-4 sm:flex-row sm:justify-end">+ <TemplateCreateDialog templateRootPath={templateRootPath} />+ <TemplateFolderCreateDialog />+ </div>+ </div>++ {isFoldersLoading ? (+ <div className="mt-6 flex justify-center">+ <Loader2 className="text-muted-foreground h-8 w-8 animate-spin" />+ </div>+ ) : (+ <>+ {foldersData?.folders && foldersData.folders.some((folder) => folder.pinned) && (+ <div className="mt-6">+ <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">+ {foldersData.folders+ .filter((folder) => folder.pinned)+ .map((folder) => (+ <FolderCard+ key={folder.id}+ folder={folder}+ onNavigate={handleNavigate}+ onMove={handleMove}+ onPin={handlePin}+ onUnpin={handleUnpin}+ onSettings={handleSettings}+ onDelete={handleDelete}+ />+ ))}+ </div>+ </div>+ )}++ <div className="mt-6">+ <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">+ {foldersData?.folders+ ?.filter((folder) => !folder.pinned)+ .slice(0, 12)+ .map((folder) => (+ <FolderCard+ key={folder.id}+ folder={folder}+ onNavigate={handleNavigate}+ onMove={handleMove}+ onPin={handlePin}+ onUnpin={handleUnpin}+ onSettings={handleSettings}+ onDelete={handleDelete}+ />+ ))}+ </div>++ <div className="mt-6 flex items-center justify-center">+ {foldersData && foldersData.folders?.length > 12 && (+ <Button+ variant="link"+ size="sm"+ className="text-muted-foreground hover:text-foreground"+ onClick={() => void handleViewAllFolders()}+ >+ View all folders+ </Button>+ )}+ </div>+ </div>+ </>+ )}++ <div className="mt-12"><div className="flex flex-row items-center">{team && (<Avatar className="dark:border-border mr-3 h-12 w-12 border-2 border-solid border-white">{team.avatarImageId && <AvatarImage src={formatAvatarUrl(team.avatarImageId)} />}- <AvatarFallback className="text-xs text-gray-400">+ <AvatarFallback className="text-muted-foreground text-xs">{team.name.slice(0, 1)}</AvatarFallback></Avatar>@@ -57,38 +222,71 @@ export default function TemplatesPage() {</h1></div>- <div>- <TemplateCreateDialog templateRootPath={templateRootPath} teamId={team?.id} />- </div>- </div>+ <div className="mt-8">+ {data && data.count === 0 ? (+ <div className="text-muted-foreground/60 flex h-96 flex-col items-center justify-center gap-y-4">+ <Bird className="h-12 w-12" strokeWidth={1.5} />- <div className="relative mt-5">- {data && data.count === 0 ? (- <div className="text-muted-foreground/60 flex h-96 flex-col items-center justify-center gap-y-4">- <Bird className="h-12 w-12" strokeWidth={1.5} />-- <div className="text-center">- <h3 className="text-lg font-semibold">- <Trans>We're all empty</Trans>- </h3>-- <p className="mt-2 max-w-[50ch]">- <Trans>- You have not yet created any templates. To create a template please upload one.- </Trans>- </p>+ <div className="text-center">+ <h3 className="text-lg font-semibold">+ <Trans>We're all empty</Trans>+ </h3>++ <p className="mt-2 max-w-[50ch]">+ <Trans>+ You have not yet created any templates. To create a template please upload one.+ </Trans>+ </p>+ </div></div>- </div>- ) : (- <TemplatesTable- data={data}- isLoading={isLoading}- isLoadingError={isLoadingError}- documentRootPath={documentRootPath}- templateRootPath={templateRootPath}- />- )}+ ) : (+ <TemplatesTable+ data={data}+ isLoading={isLoading}+ isLoadingError={isLoadingError}+ documentRootPath={documentRootPath}+ templateRootPath={templateRootPath}+ />+ )}+ </div></div>++ <TemplateFolderMoveDialog+ foldersData={foldersData?.folders}+ folder={folderToMove}+ isOpen={isMovingFolder}+ onOpenChange={(open) => {+ setIsMovingFolder(open);++ if (!open) {+ setFolderToMove(null);+ }+ }}+ />++ <TemplateFolderSettingsDialog+ folder={folderToSettings}+ isOpen={isSettingsFolderOpen}+ onOpenChange={(open) => {+ setIsSettingsFolderOpen(open);++ if (!open) {+ setFolderToSettings(null);+ }+ }}+ />++ <TemplateFolderDeleteDialog+ folder={folderToDelete}+ isOpen={isDeletingFolder}+ onOpenChange={(open) => {+ setIsDeletingFolder(open);++ if (!open) {+ setFolderToDelete(null);+ }+ }}+ /></div>);}diff --git a/apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx b/apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsxnew file mode 100644index 000000000..9aa257824--- /dev/null+++ b/apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx@@ -0,0 +1,230 @@+import { Trans } from '@lingui/react/macro';+import { DocumentSigningOrder, SigningStatus } from '@prisma/client';+import { ChevronLeft, LucideEdit } from 'lucide-react';+import { Link, redirect, useNavigate } from 'react-router';++import { getSession } from '@documenso/auth/server/lib/utils/get-session';+import { type TGetTeamByUrlResponse, getTeamByUrl } from '@documenso/lib/server-only/team/get-team';+import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';+import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams';+import { DocumentReadOnlyFields } from '@documenso/ui/components/document/document-read-only-fields';+import { Button } from '@documenso/ui/primitives/button';+import { Card, CardContent } from '@documenso/ui/primitives/card';+import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';++import { TemplateBulkSendDialog } from '~/components/dialogs/template-bulk-send-dialog';+import { TemplateDirectLinkDialogWrapper } from '~/components/dialogs/template-direct-link-dialog-wrapper';+import { TemplateUseDialog } from '~/components/dialogs/template-use-dialog';+import { TemplateDirectLinkBadge } from '~/components/general/template/template-direct-link-badge';+import { TemplatePageViewDocumentsTable } from '~/components/general/template/template-page-view-documents-table';+import { TemplatePageViewInformation } from '~/components/general/template/template-page-view-information';+import { TemplatePageViewRecentActivity } from '~/components/general/template/template-page-view-recent-activity';+import { TemplatePageViewRecipients } from '~/components/general/template/template-page-view-recipients';+import { TemplateType } from '~/components/general/template/template-type';+import { TemplatesTableActionDropdown } from '~/components/tables/templates-table-action-dropdown';+import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';++import type { Route } from './+types/templates.$id._index';++export async function loader({ params, request }: Route.LoaderArgs) {+ const { user } = await getSession(request);++ let team: TGetTeamByUrlResponse | null = null;++ if (params.teamUrl) {+ team = await getTeamByUrl({ userId: user.id, teamUrl: params.teamUrl });+ }++ const { id, folderId } = params;++ const templateId = Number(id);+ const templateRootPath = formatTemplatesPath(team?.url);+ const documentRootPath = formatDocumentsPath(team?.url);++ if (!templateId || Number.isNaN(templateId)) {+ throw redirect(folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath);+ }++ const template = await getTemplateById({+ id: templateId,+ userId: user.id,+ teamId: team?.id,+ folderId,+ }).catch(() => null);++ if (!template || !template.templateDocumentData || (template?.teamId && !team?.url)) {+ throw redirect(folderId ? `${templateRootPath}/f/${folderId}` : templateRootPath);+ }++ if (!template.folderId) {+ throw redirect(`${templateRootPath}/${templateId}`);+ }++ if (template.folderId !== folderId) {+ throw redirect(`${templateRootPath}/f/${template.folderId}/${templateId}`);+ }++ return superLoaderJson({+ user,+ team,+ template,+ templateRootPath,+ documentRootPath,+ });+}++export default function TemplatePage() {+ const { user, team, template, templateRootPath, documentRootPath } =+ useSuperLoaderData<typeof loader>();++ const { templateDocumentData, fields, recipients, templateMeta } = template;++ const navigate = useNavigate();++ // Remap to fit the DocumentReadOnlyFields component.+ const readOnlyFields = fields.map((field) => {+ const recipient = recipients.find((recipient) => recipient.id === field.recipientId) || {+ name: '',+ email: '',+ signingStatus: SigningStatus.NOT_SIGNED,+ };++ return {+ ...field,+ recipient,+ signature: null,+ };+ });++ const mockedDocumentMeta = templateMeta+ ? {+ ...templateMeta,+ signingOrder: templateMeta.signingOrder || DocumentSigningOrder.SEQUENTIAL,+ documentId: 0,+ }+ : undefined;++ return (+ <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">+ <Link to={templateRootPath} className="flex items-center text-[#7AC455] hover:opacity-80">+ <ChevronLeft className="mr-2 inline-block h-5 w-5" />+ <Trans>Templates</Trans>+ </Link>++ <div className="flex flex-row justify-between truncate">+ <div>+ <h1+ className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"+ title={template.title}+ >+ {template.title}+ </h1>++ <div className="mt-2.5 flex items-center">+ <TemplateType inheritColor className="text-muted-foreground" type={template.type} />++ {template.directLink?.token && (+ <TemplateDirectLinkBadge+ className="ml-4"+ token={template.directLink.token}+ enabled={template.directLink.enabled}+ />+ )}+ </div>+ </div>++ <div className="mt-2 flex flex-row space-x-4 sm:mt-0 sm:self-end">+ <TemplateDirectLinkDialogWrapper template={template} />++ <TemplateBulkSendDialog templateId={template.id} recipients={template.recipients} />++ <Button className="w-full" asChild>+ <Link to={`${templateRootPath}/${template.id}/edit`}>+ <LucideEdit className="mr-1.5 h-3.5 w-3.5" />+ <Trans>Edit Template</Trans>+ </Link>+ </Button>+ </div>+ </div>++ <div className="mt-6 grid w-full grid-cols-12 gap-8">+ <Card+ className="relative col-span-12 rounded-xl before:rounded-xl lg:col-span-6 xl:col-span-7"+ gradient+ >+ <CardContent className="p-2">+ <PDFViewer document={template} key={template.id} documentData={templateDocumentData} />+ </CardContent>+ </Card>++ <DocumentReadOnlyFields+ fields={readOnlyFields}+ showFieldStatus={false}+ documentMeta={mockedDocumentMeta}+ />++ <div className="col-span-12 lg:col-span-6 xl:col-span-5">+ <div className="space-y-6">+ <section className="border-border bg-widget flex flex-col rounded-xl border pb-4 pt-6">+ <div className="flex flex-row items-center justify-between px-4">+ <h3 className="text-foreground text-2xl font-semibold">+ <Trans>Template</Trans>+ </h3>++ <div>+ <TemplatesTableActionDropdown+ row={template}+ teamId={team?.id}+ templateRootPath={templateRootPath}+ onDelete={async () => navigate(templateRootPath)}+ onMove={async ({ teamUrl, templateId }) =>+ navigate(`${formatTemplatesPath(teamUrl)}/${templateId}`)+ }+ />+ </div>+ </div>++ <p className="text-muted-foreground mt-2 px-4 text-sm">+ <Trans>Manage and view template</Trans>+ </p>++ <div className="mt-4 border-t px-4 pt-4">+ <TemplateUseDialog+ templateId={template.id}+ templateSigningOrder={template.templateMeta?.signingOrder}+ recipients={template.recipients}+ documentRootPath={documentRootPath}+ trigger={+ <Button className="w-full">+ <Trans>Use</Trans>+ </Button>+ }+ />+ </div>+ </section>++ {/* Template information section. */}+ <TemplatePageViewInformation template={template} userId={user.id} />++ {/* Recipients section. */}+ <TemplatePageViewRecipients template={template} templateRootPath={templateRootPath} />++ {/* Recent activity section. */}+ <TemplatePageViewRecentActivity+ documentRootPath={documentRootPath}+ templateId={template.id}+ />+ </div>+ </div>+ </div>++ <div className="mt-16" id="documents">+ <h1 className="mb-4 text-2xl font-bold">+ <Trans>Documents created from template</Trans>+ </h1>++ <TemplatePageViewDocumentsTable templateId={template.id} />+ </div>+ </div>+ );+}diff --git a/apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id.edit.tsx b/apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id.edit.tsxnew file mode 100644index 000000000..2c24f0df7--- /dev/null+++ b/apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id.edit.tsx@@ -0,0 +1,122 @@+import { Trans } from '@lingui/react/macro';+import { ChevronLeft } from 'lucide-react';+import { Link, redirect } from 'react-router';++import { getSession } from '@documenso/auth/server/lib/utils/get-session';+import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';+import { type TGetTeamByUrlResponse, getTeamByUrl } from '@documenso/lib/server-only/team/get-team';+import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';+import { formatTemplatesPath } from '@documenso/lib/utils/teams';++import { TemplateDirectLinkBadge } from '~/components/general/template/template-direct-link-badge';+import { TemplateEditForm } from '~/components/general/template/template-edit-form';+import { TemplateType } from '~/components/general/template/template-type';+import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';++import { TemplateDirectLinkDialogWrapper } from '../../components/dialogs/template-direct-link-dialog-wrapper';+import type { Route } from './+types/templates.$id.edit';++export async function loader({ params, request }: Route.LoaderArgs) {+ const { user } = await getSession(request);++ let team: TGetTeamByUrlResponse | null = null;++ if (params.teamUrl) {+ team = await getTeamByUrl({ userId: user.id, teamUrl: params.teamUrl });+ }++ const { id } = params;++ const templateId = Number(id);+ const templateRootPath = formatTemplatesPath(team?.url);++ if (!templateId || Number.isNaN(templateId)) {+ throw redirect(templateRootPath);+ }++ const template = await getTemplateById({+ id: templateId,+ userId: user.id,+ teamId: team?.id,+ }).catch(() => null);++ if (!template || !template.templateDocumentData) {+ throw redirect(templateRootPath);+ }++ if (!template.folderId) {+ throw redirect(`${templateRootPath}/${templateId}/edit`);+ }++ if (template.folderId !== params.folderId) {+ throw redirect(`${templateRootPath}/f/${template.folderId}/${templateId}/edit`);+ }++ const isTemplateEnterprise = await isUserEnterprise({+ userId: user.id,+ teamId: team?.id,+ });++ return superLoaderJson({+ template: {+ ...template,+ folder: null,+ },+ isTemplateEnterprise,+ templateRootPath,+ });+}++export default function TemplateEditPage() {+ const { template, isTemplateEnterprise, templateRootPath } = useSuperLoaderData<typeof loader>();++ return (+ <div className="mx-auto -mt-4 max-w-screen-xl px-4 md:px-8">+ <div className="flex flex-col justify-between sm:flex-row">+ <div>+ <Link+ to={+ template.folderId+ ? `${templateRootPath}/f/${template.folderId}/${template.id}`+ : `${templateRootPath}/${template.id}`+ }+ className="flex items-center text-[#7AC455] hover:opacity-80"+ >+ <ChevronLeft className="mr-2 inline-block h-5 w-5" />+ <Trans>Template</Trans>+ </Link>++ <h1+ className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"+ title={template.title}+ >+ {template.title}+ </h1>++ <div className="mt-2.5 flex items-center">+ <TemplateType inheritColor className="text-muted-foreground" type={template.type} />++ {template.directLink?.token && (+ <TemplateDirectLinkBadge+ className="ml-4"+ token={template.directLink.token}+ enabled={template.directLink.enabled}+ />+ )}+ </div>+ </div>++ <div className="mt-2 sm:mt-0 sm:self-end">+ <TemplateDirectLinkDialogWrapper template={template} />+ </div>+ </div>++ <TemplateEditForm+ className="mt-6"+ initialTemplate={template}+ templateRootPath={templateRootPath}+ isEnterprise={isTemplateEnterprise}+ />+ </div>+ );+}diff --git a/apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx b/apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsxnew file mode 100644index 000000000..f341e7a83--- /dev/null+++ b/apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx@@ -0,0 +1,369 @@+import { useEffect, useState } from 'react';++import { Trans } from '@lingui/react/macro';+import { Bird, FolderIcon, HomeIcon, Loader2, PinIcon } from 'lucide-react';+import { useNavigate, useParams, useSearchParams } from 'react-router';++import { FolderType } from '@documenso/lib/types/folder-type';+import { formatAvatarUrl } from '@documenso/lib/utils/avatars';+import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams';+import { trpc } from '@documenso/trpc/react';+import type { TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';+import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';+import { Button } from '@documenso/ui/primitives/button';+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from '@documenso/ui/primitives/dropdown-menu';++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 { TemplateCreateDialog } from '~/components/dialogs/template-create-dialog';+import { TemplateFolderCreateDialog } from '~/components/dialogs/template-folder-create-dialog';+import { TemplatesTable } from '~/components/tables/templates-table';+import { useOptionalCurrentTeam } from '~/providers/team';+import { appMetaTags } from '~/utils/meta';++export function meta() {+ return appMetaTags('Templates');+}++export default function TemplatesPage() {+ const [searchParams] = useSearchParams();+ const { folderId } = useParams();+ const navigate = useNavigate();++ const team = useOptionalCurrentTeam();++ const page = Number(searchParams.get('page')) || 1;+ const perPage = Number(searchParams.get('perPage')) || 10;++ const documentRootPath = formatDocumentsPath(team?.url);+ const templateRootPath = formatTemplatesPath(team?.url);++ const { data, isLoading, isLoadingError, refetch } = trpc.template.findTemplates.useQuery({+ page: page,+ perPage: perPage,+ folderId: folderId,+ });++ const {+ data: foldersData,+ isLoading: isFoldersLoading,+ refetch: refetchFolders,+ } = trpc.folder.getFolders.useQuery({+ parentId: folderId,+ type: FolderType.TEMPLATE,+ });++ const { mutateAsync: pinFolder } = trpc.folder.pinFolder.useMutation();+ const { mutateAsync: unpinFolder } = trpc.folder.unpinFolder.useMutation();++ const [folderToMove, setFolderToMove] = useState<TFolderWithSubfolders | null>(null);+ const [isMovingFolder, setIsMovingFolder] = useState(false);+ const [folderToSettings, setFolderToSettings] = useState<TFolderWithSubfolders | null>(null);+ const [isSettingsFolderOpen, setIsSettingsFolderOpen] = useState(false);+ const [folderToDelete, setFolderToDelete] = useState<TFolderWithSubfolders | null>(null);+ const [isDeletingFolder, setIsDeletingFolder] = useState(false);++ useEffect(() => {+ void refetch();+ void refetchFolders();+ }, [team?.url]);++ const navigateToFolder = (folderId?: string) => {+ const templatesPath = formatTemplatesPath(team?.url);++ if (folderId) {+ void navigate(`${templatesPath}/f/${folderId}`);+ } else {+ void navigate(templatesPath);+ }+ };++ return (+ <div className="mx-auto max-w-screen-xl px-4 md:px-8">+ <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">+ <div className="flex flex-1 items-center">+ <Button+ variant="ghost"+ size="sm"+ className="flex items-center space-x-2 pl-0 hover:bg-transparent"+ onClick={() => navigateToFolder()}+ >+ <HomeIcon className="h-4 w-4" />+ <span>Home</span>+ </Button>++ {foldersData?.breadcrumbs.map((folder) => (+ <div key={folder.id} className="flex items-center space-x-2">+ <span>/</span>+ <Button+ variant="ghost"+ size="sm"+ className="flex items-center space-x-2 pl-1 hover:bg-transparent"+ onClick={() => navigateToFolder(folder.id)}+ >+ <FolderIcon className="h-4 w-4" />+ <span>{folder.name}</span>+ </Button>+ </div>+ ))}+ </div>++ <div className="flex gap-4 sm:flex-row sm:justify-end">+ <TemplateFolderCreateDialog />+ <TemplateCreateDialog templateRootPath={templateRootPath} folderId={folderId} />+ </div>+ </div>++ {isFoldersLoading ? (+ <div className="mt-6 flex justify-center">+ <Loader2 className="text-muted-foreground h-8 w-8 animate-spin" />+ </div>+ ) : (+ <>+ {foldersData?.folders.some((folder) => folder.pinned) && (+ <div className="mt-6">+ <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">+ {foldersData?.folders+ .filter((folder) => folder.pinned)+ .map((folder) => (+ <div+ key={folder.id}+ className="border-border hover:border-muted-foreground/40 group relative flex flex-col rounded-lg border p-4 transition-all hover:shadow-sm"+ >+ <div className="flex items-start justify-between">+ <button+ className="flex items-center space-x-2 text-left"+ onClick={() => navigateToFolder(folder.id)}+ >+ <FolderIcon className="text-documenso h-6 w-6" />+ <div>+ <div className="flex items-center gap-2">+ <h3 className="font-medium">{folder.name}</h3>+ <PinIcon className="text-documenso h-3 w-3" />+ </div>+ <div className="mt-1 flex space-x-2 text-xs text-gray-500">+ <span>{folder._count.templates || 0} templates</span>+ <span>•</span>+ <span>{folder._count.subfolders} folders</span>+ </div>+ </div>+ </button>++ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button+ variant="ghost"+ size="sm"+ className="opacity-0 group-hover:opacity-100"+ >+ •••+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent align="end">+ <DropdownMenuItem+ onClick={() => {+ setFolderToMove(folder);+ setIsMovingFolder(true);+ }}+ >+ Move+ </DropdownMenuItem>+ <DropdownMenuItem+ onClick={() => {+ void unpinFolder({ folderId: folder.id });+ }}+ >+ Unpin+ </DropdownMenuItem>+ <DropdownMenuItem+ onClick={() => {+ setFolderToSettings(folder);+ setIsSettingsFolderOpen(true);+ }}+ >+ Settings+ </DropdownMenuItem>+ <DropdownMenuItem+ className="text-red-500"+ onClick={() => {+ setFolderToDelete(folder);+ setIsDeletingFolder(true);+ }}+ >+ Delete+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>+ </div>+ </div>+ ))}+ </div>+ </div>+ )}++ <div className="mt-6 grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">+ {foldersData?.folders+ .filter((folder) => !folder.pinned)+ .map((folder) => (+ <div+ key={folder.id}+ className="border-border hover:border-muted-foreground/40 group relative flex flex-col rounded-lg border p-4 transition-all hover:shadow-sm"+ >+ <div className="flex items-start justify-between">+ <button+ className="flex items-center space-x-2 text-left"+ onClick={() => navigateToFolder(folder.id)}+ >+ <FolderIcon className="text-documenso h-6 w-6" />+ <div>+ <h3 className="font-medium">{folder.name}</h3>+ <div className="mt-1 flex space-x-2 text-xs text-gray-500">+ <span>{folder._count.templates || 0} templates</span>+ <span>•</span>+ <span>{folder._count.subfolders} folders</span>+ </div>+ </div>+ </button>++ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button+ variant="ghost"+ size="sm"+ className="opacity-0 group-hover:opacity-100"+ >+ •••+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent align="end">+ <DropdownMenuItem+ onClick={() => {+ setFolderToMove(folder);+ setIsMovingFolder(true);+ }}+ >+ Move+ </DropdownMenuItem>+ <DropdownMenuItem+ onClick={() => {+ void pinFolder({ folderId: folder.id });+ }}+ >+ Pin+ </DropdownMenuItem>+ <DropdownMenuItem+ onClick={() => {+ setFolderToSettings(folder);+ setIsSettingsFolderOpen(true);+ }}+ >+ Settings+ </DropdownMenuItem>+ <DropdownMenuItem+ className="text-red-500"+ onClick={() => {+ setFolderToDelete(folder);+ setIsDeletingFolder(true);+ }}+ >+ Delete+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>+ </div>+ </div>+ ))}+ </div>+ </>+ )}++ <div className="relative mt-12">+ <div className="flex flex-row items-center">+ {team && (+ <Avatar className="dark:border-border mr-3 h-12 w-12 border-2 border-solid border-white">+ {team.avatarImageId && <AvatarImage src={formatAvatarUrl(team.avatarImageId)} />}+ <AvatarFallback className="text-muted-foreground text-xs">+ {team.name.slice(0, 1)}+ </AvatarFallback>+ </Avatar>+ )}++ <h1 className="truncate text-2xl font-semibold md:text-3xl">+ <Trans>Templates</Trans>+ </h1>+ </div>++ <div className="mt-8">+ {data && data.count === 0 ? (+ <div className="text-muted-foreground/60 flex h-96 flex-col items-center justify-center gap-y-4">+ <Bird className="h-12 w-12" strokeWidth={1.5} />++ <div className="text-center">+ <h3 className="text-lg font-semibold">+ <Trans>We're all empty</Trans>+ </h3>++ <p className="mt-2 max-w-[50ch]">+ <Trans>+ You have not yet created any templates. To create a template please upload one.+ </Trans>+ </p>+ </div>+ </div>+ ) : (+ <TemplatesTable+ data={data}+ isLoading={isLoading}+ isLoadingError={isLoadingError}+ documentRootPath={documentRootPath}+ templateRootPath={templateRootPath}+ />+ )}+ </div>+ </div>++ <FolderMoveDialog+ foldersData={foldersData?.folders}+ folder={folderToMove}+ isOpen={isMovingFolder}+ onOpenChange={(open) => {+ setIsMovingFolder(open);++ if (!open) {+ setFolderToMove(null);+ }+ }}+ />++ <FolderSettingsDialog+ folder={folderToSettings}+ isOpen={isSettingsFolderOpen}+ onOpenChange={(open) => {+ setIsSettingsFolderOpen(open);++ if (!open) {+ setFolderToSettings(null);+ }+ }}+ />++ <FolderDeleteDialog+ folder={folderToDelete}+ isOpen={isDeletingFolder}+ onOpenChange={(open) => {+ setIsDeletingFolder(open);++ if (!open) {+ setFolderToDelete(null);+ }+ }}+ />+ </div>+ );+}diff --git a/apps/remix/app/routes/_authenticated+/templates.folders._index.tsx b/apps/remix/app/routes/_authenticated+/templates.folders._index.tsxnew file mode 100644index 000000000..b58194098--- /dev/null+++ b/apps/remix/app/routes/_authenticated+/templates.folders._index.tsx@@ -0,0 +1,181 @@+import { useState } from 'react';++import { Trans } from '@lingui/react/macro';+import { HomeIcon, Loader2 } from 'lucide-react';+import { useNavigate } from 'react-router';++import { FolderType } from '@documenso/lib/types/folder-type';+import { formatTemplatesPath } from '@documenso/lib/utils/teams';+import { trpc } from '@documenso/trpc/react';+import { type TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';+import { Button } from '@documenso/ui/primitives/button';++import { TemplateFolderCreateDialog } from '~/components/dialogs/template-folder-create-dialog';+import { TemplateFolderDeleteDialog } from '~/components/dialogs/template-folder-delete-dialog';+import { TemplateFolderMoveDialog } from '~/components/dialogs/template-folder-move-dialog';+import { TemplateFolderSettingsDialog } from '~/components/dialogs/template-folder-settings-dialog';+import { FolderCard } from '~/components/general/folder/folder-card';+import { appMetaTags } from '~/utils/meta';++export function meta() {+ return appMetaTags('Templates');+}++export default function TemplatesFoldersPage() {+ const navigate = useNavigate();+ const [isMovingFolder, setIsMovingFolder] = useState(false);+ const [folderToMove, setFolderToMove] = useState<TFolderWithSubfolders | null>(null);+ const [isDeletingFolder, setIsDeletingFolder] = useState(false);+ const [folderToDelete, setFolderToDelete] = useState<TFolderWithSubfolders | null>(null);+ const [isSettingsFolderOpen, setIsSettingsFolderOpen] = useState(false);+ const [folderToSettings, setFolderToSettings] = useState<TFolderWithSubfolders | null>(null);++ const { data: foldersData, isLoading: isFoldersLoading } = trpc.folder.getFolders.useQuery({+ type: FolderType.TEMPLATE,+ parentId: null,+ });++ const { mutateAsync: pinFolder } = trpc.folder.pinFolder.useMutation();+ const { mutateAsync: unpinFolder } = trpc.folder.unpinFolder.useMutation();++ const navigateToFolder = (folderId?: string | null) => {+ const templatesPath = formatTemplatesPath();++ if (folderId) {+ void navigate(`${templatesPath}/f/${folderId}`);+ } else {+ void navigate(templatesPath);+ }+ };++ return (+ <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">+ <div className="flex w-full items-center justify-between">+ <div className="flex flex-1 items-center">+ <Button+ variant="ghost"+ size="sm"+ className="flex items-center space-x-2 pl-0 hover:bg-transparent"+ onClick={() => navigateToFolder(null)}+ >+ <HomeIcon className="h-4 w-4" />+ <span>Home</span>+ </Button>+ </div>++ <div className="flex flex-col gap-y-4 sm:flex-row sm:justify-end sm:gap-x-4">+ <TemplateFolderCreateDialog />+ </div>+ </div>++ <div className="mt-6">+ {isFoldersLoading ? (+ <div className="mt- flex justify-center">+ <Loader2 className="text-muted-foreground h-8 w-8 animate-spin" />+ </div>+ ) : (+ <>+ {foldersData?.folders?.some((folder) => folder.pinned) && (+ <div className="mt-6">+ <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">+ {foldersData.folders+ .filter((folder) => folder.pinned)+ .map((folder) => (+ <FolderCard+ key={folder.id}+ folder={folder}+ onNavigate={navigateToFolder}+ onMove={(folder) => {+ setFolderToMove(folder);+ setIsMovingFolder(true);+ }}+ onPin={(folderId) => void pinFolder({ folderId })}+ onUnpin={(folderId) => void unpinFolder({ folderId })}+ onSettings={(folder) => {+ setFolderToSettings(folder);+ setIsSettingsFolderOpen(true);+ }}+ onDelete={(folder) => {+ setFolderToDelete(folder);+ setIsDeletingFolder(true);+ }}+ />+ ))}+ </div>+ </div>+ )}++ <div className="mt-12">+ <h1 className="truncate text-2xl font-semibold md:text-3xl">+ <Trans>All Folders</Trans>+ </h1>++ <div className="mt-6 grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">+ {foldersData?.folders+ .filter((folder) => !folder.pinned)+ .map((folder) => (+ <FolderCard+ key={folder.id}+ folder={folder}+ onNavigate={navigateToFolder}+ onMove={(folder) => {+ setFolderToMove(folder);+ setIsMovingFolder(true);+ }}+ onPin={(folderId) => void pinFolder({ folderId })}+ onUnpin={(folderId) => void unpinFolder({ folderId })}+ onSettings={(folder) => {+ setFolderToSettings(folder);+ setIsSettingsFolderOpen(true);+ }}+ onDelete={(folder) => {+ setFolderToDelete(folder);+ setIsDeletingFolder(true);+ }}+ />+ ))}+ </div>+ </div>+ </>+ )}+ </div>++ <TemplateFolderMoveDialog+ foldersData={foldersData?.folders}+ folder={folderToMove}+ isOpen={isMovingFolder}+ onOpenChange={(open: boolean) => {+ setIsMovingFolder(open);++ if (!open) {+ setFolderToMove(null);+ }+ }}+ />++ <TemplateFolderSettingsDialog+ folder={folderToSettings}+ isOpen={isSettingsFolderOpen}+ onOpenChange={(open: boolean) => {+ setIsSettingsFolderOpen(open);++ if (!open) {+ setFolderToSettings(null);+ }+ }}+ />++ <TemplateFolderDeleteDialog+ folder={folderToDelete}+ isOpen={isDeletingFolder}+ onOpenChange={(open: boolean) => {+ setIsDeletingFolder(open);++ if (!open) {+ setFolderToDelete(null);+ }+ }}+ />+ </div>+ );+}diff --git a/apps/remix/app/routes/_recipient+/d.$token+/_index.tsx b/apps/remix/app/routes/_recipient+/d.$token+/_index.tsxindex a93a01560..21bfab597 100644--- a/apps/remix/app/routes/_recipient+/d.$token+/_index.tsx+++ b/apps/remix/app/routes/_recipient+/d.$token+/_index.tsx@@ -60,7 +60,10 @@ export async function loader({ params, request }: Route.LoaderArgs) {return superLoaderJson({isAccessAuthValid: true,- template,+ template: {+ ...template,+ folder: null,+ },directTemplateRecipient,} as const);}diff --git a/packages/app-tests/e2e/document-flow/stepper-component.spec.ts b/packages/app-tests/e2e/document-flow/stepper-component.spec.tsindex 94bb5320f..169b5abce 100644--- a/packages/app-tests/e2e/document-flow/stepper-component.spec.ts+++ b/packages/app-tests/e2e/document-flow/stepper-component.spec.ts@@ -45,11 +45,14 @@ test('[DOCUMENT_FLOW]: should be able to upload a PDF document', async ({ page }// Upload document.const [fileChooser] = await Promise.all([page.waitForEvent('filechooser'),- page.locator('input[type=file]').evaluate((e) => {- if (e instanceof HTMLInputElement) {- e.click();- }- }),+ page+ .locator('input[type=file]')+ .nth(1)+ .evaluate((e) => {+ if (e instanceof HTMLInputElement) {+ e.click();+ }+ }),]);await fileChooser.setFiles(path.join(__dirname, '../../../../assets/example.pdf'));@@ -641,7 +644,7 @@ test('[DOCUMENT_FLOW]: should prevent out-of-order signing in sequential mode',}) => {const user = await seedUser();- const { document, recipients } = await seedPendingDocumentWithFullFields({+ const { recipients } = await seedPendingDocumentWithFullFields({owner: user,fields: [FieldType.SIGNATURE],diff --git a/packages/app-tests/e2e/folders/individual-account-folders.spec.ts b/packages/app-tests/e2e/folders/individual-account-folders.spec.tsnew file mode 100644index 000000000..db65bc7b9--- /dev/null+++ b/packages/app-tests/e2e/folders/individual-account-folders.spec.ts@@ -0,0 +1,842 @@+import { expect, test } from '@playwright/test';+import path from 'node:path';++import { FolderType } from '@documenso/prisma/client';+import { seedBlankDocument } from '@documenso/prisma/seed/documents';+import { seedBlankFolder } from '@documenso/prisma/seed/folders';+import { seedBlankTemplate } from '@documenso/prisma/seed/templates';+import { seedUser } from '@documenso/prisma/seed/users';++import { apiSignin } from '../fixtures/authentication';++test.describe.configure({ mode: 'parallel' });++test('create folder button is visible on documents page', async ({ page }) => {+ const user = await seedUser();++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/',+ });++ await expect(page.getByRole('button', { name: 'Create Folder' })).toBeVisible();+});++test('user can create a document folder', async ({ page }) => {+ const user = await seedUser();++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/',+ });++ await page.getByRole('button', { name: 'Create Folder' }).click();+ await expect(page.getByRole('dialog', { name: 'Create New folder' })).toBeVisible();++ await page.getByLabel('Folder name').fill('My folder');+ await page.getByRole('button', { name: 'Create' }).click();++ await page.waitForTimeout(1000);++ await expect(page.getByText('My folder')).toBeVisible();++ await page.goto('/documents');+ await expect(page.locator('div').filter({ hasText: 'My folder' }).nth(3)).toBeVisible();+});++test('user can create a document subfolder inside a document folder', async ({ page }) => {+ const user = await seedUser();++ const folder = await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Client Contracts',+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: `/documents/f/${folder.id}`,+ });++ await expect(page.getByText('Client Contracts')).toBeVisible();++ await page.getByRole('button', { name: 'Create Folder' }).click();+ await expect(page.getByRole('dialog', { name: 'Create New folder' })).toBeVisible();++ await page.getByLabel('Folder name').fill('Invoices');+ await page.getByRole('button', { name: 'Create' }).click();++ await page.waitForTimeout(1000);++ await expect(page.getByText('Invoices')).toBeVisible();+});++test('user can create a document inside a document folder', async ({ page }) => {+ const user = await seedUser();++ const folder = await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Client Contracts',+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: `/documents/f/${folder.id}`,+ });++ const fileInput = page.locator('input[type="file"]').nth(1);+ await fileInput.waitFor({ state: 'attached' });++ await fileInput.setInputFiles(+ path.join(__dirname, '../../../assets/documenso-supporter-pledge.pdf'),+ );++ await page.waitForTimeout(3000);++ await expect(page.getByText('documenso-supporter-pledge.pdf')).toBeVisible();++ await page.goto(`/documents/f/${folder.id}`);++ await expect(page.getByText('documenso-supporter-pledge.pdf')).toBeVisible();+});++test('user can pin a document folder', async ({ page }) => {+ const user = await seedUser();++ await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Contracts',+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/documents',+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Pin' }).click();++ await page.reload();++ await expect(page.locator('svg.text-documenso.h-3.w-3')).toBeVisible();+});++test('user can unpin a document folder', async ({ page }) => {+ const user = await seedUser();++ await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Contracts',+ pinned: true,+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/documents',+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Unpin' }).click();++ await page.reload();++ await expect(page.locator('svg.text-documenso.h-3.w-3')).not.toBeVisible();+});++test('user can rename a document folder', async ({ page }) => {+ const user = await seedUser();++ await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Contracts',+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/documents',+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Settings' }).click();++ await page.getByLabel('Name').fill('Archive');+ await page.getByRole('button', { name: 'Save Changes' }).click();++ await expect(page.getByText('Archive')).toBeVisible();+});++test('document folder visibility is not visible to user', async ({ page }) => {+ const user = await seedUser();++ await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Contracts',+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/documents',+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Settings' }).click();++ await expect(page.getByRole('menuitem', { name: 'Visibility' })).not.toBeVisible();+});++test('document folder can be moved to another document folder', async ({ page }) => {+ const user = await seedUser();++ const folder = await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Clients',+ },+ });++ await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Contracts',+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/documents',+ });++ await page.getByRole('button', { name: '•••' }).nth(0).click();+ await page.getByRole('menuitem', { name: 'Move' }).click();++ await page.getByRole('button', { name: 'Clients' }).click();+ await page.getByRole('button', { name: 'Move Folder' }).click();++ await page.waitForTimeout(1000);++ await page.goto(`/documents/f/${folder.id}`);++ await expect(page.getByText('Contracts')).toBeVisible();+});++test('document folder can be moved to the root', async ({ page }) => {+ const user = await seedUser();++ const parentFolder = await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Clients',+ },+ });++ await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Contracts',+ parentId: parentFolder.id,+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/documents',+ });++ await page.getByText('Clients').click();++ await page.getByRole('button', { name: '•••' }).nth(0).click();+ await page.getByRole('menuitem', { name: 'Move' }).click();++ await page.getByRole('button', { name: 'Root' }).click();+ await page.getByRole('button', { name: 'Move Folder' }).click();++ await page.waitForTimeout(1000);++ await page.goto('/documents');++ await expect(page.getByText('Clients')).toBeVisible();+});++test('document folder and its contents can be deleted', async ({ page }) => {+ const user = await seedUser();++ const folder = await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Proposals',+ },+ });++ const proposal = await seedBlankDocument(user, {+ createDocumentOptions: {+ title: 'Proposal 1',+ folderId: folder.id,+ },+ });++ const reportsFolder = await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Reports',+ parentId: folder.id,+ },+ });++ const report = await seedBlankDocument(user, {+ createDocumentOptions: {+ title: 'Report 1',+ folderId: reportsFolder.id,+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/documents',+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Delete' }).click();++ await page.getByRole('textbox').fill(`delete ${folder.name}`);+ await page.getByRole('button', { name: 'Delete' }).click();++ await page.goto('/documents');++ await expect(page.locator('div').filter({ hasText: folder.name })).not.toBeVisible();+ await expect(page.getByText(proposal.title)).not.toBeVisible();++ await page.goto(`/documents/f/${folder.id}`);++ await expect(page.getByText(report.title)).not.toBeVisible();+ await expect(page.locator('div').filter({ hasText: reportsFolder.name })).not.toBeVisible();+});++test('user can move a document to a document folder', async ({ page }) => {+ const user = await seedUser();++ const folder = await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Proposals',+ },+ });++ await seedBlankDocument(user, {+ createDocumentOptions: {+ title: 'Proposal 1',+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/documents',+ });++ await page.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await page.getByRole('button', { name: 'Proposals' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);++ await page.goto(`/documents/f/${folder.id}`);++ await expect(page.getByText('Proposal 1')).toBeVisible();+});++test('user can move a document from folder to the root', async ({ page }) => {+ const user = await seedUser();++ const folder = await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Proposals',+ },+ });++ await seedBlankDocument(user, {+ createDocumentOptions: {+ title: 'Proposal 1',+ folderId: folder.id,+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/documents',+ });++ await page.getByText('Proposals').click();++ await page.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await page.getByRole('button', { name: 'Root' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);++ await page.goto('/documents');++ await expect(page.getByText('Proposal 1')).toBeVisible();+});++test('create folder button is visible on templates page', async ({ page }) => {+ const user = await seedUser();++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/templates',+ });++ await expect(page.getByRole('button', { name: 'Create folder' })).toBeVisible();+});++test('user can create a template folder', async ({ page }) => {+ const user = await seedUser();++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/templates',+ });++ await page.getByRole('button', { name: 'Create folder' }).click();+ await expect(page.getByRole('dialog', { name: 'Create New folder' })).toBeVisible();++ await page.getByLabel('Folder name').fill('My template folder');+ await page.getByRole('button', { name: 'Create' }).click();++ await page.waitForTimeout(1000);++ await expect(page.getByText('My template folder')).toBeVisible();++ await page.goto('/templates');+ await expect(page.locator('div').filter({ hasText: 'My template folder' }).nth(3)).toBeVisible();+});++test('user can create a template subfolder inside a template folder', async ({ page }) => {+ const user = await seedUser();++ const folder = await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Client Templates',+ type: FolderType.TEMPLATE,+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: `/templates/f/${folder.id}`,+ });++ await expect(page.getByText('Client Templates')).toBeVisible();++ await page.getByRole('button', { name: 'Create folder' }).click();+ await expect(page.getByRole('dialog', { name: 'Create New folder' })).toBeVisible();++ await page.getByLabel('Folder name').fill('Contract Templates');+ await page.getByRole('button', { name: 'Create' }).click();++ await page.waitForTimeout(1000);++ await expect(page.getByText('Contract Templates')).toBeVisible();+});++test('user can create a template inside a template folder', async ({ page }) => {+ const user = await seedUser();++ const folder = await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Client Templates',+ type: FolderType.TEMPLATE,+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: `/templates/f/${folder.id}`,+ });++ await expect(page.getByText('Client Templates')).toBeVisible();++ await page.getByRole('button', { name: 'New Template' }).click();+ // await expect(page.getByRole('dialog', { name: 'New Template' })).toBeVisible();++ await page+ .locator('div')+ .filter({ hasText: /^Upload Template DocumentDrag & drop your PDF here\.$/ })+ .nth(2)+ .click();+ await page.locator('input[type="file"]').waitFor({ state: 'attached' });++ await page+ .locator('input[type="file"]')+ .setInputFiles(path.join(__dirname, '../../../assets/documenso-supporter-pledge.pdf'));++ await page.waitForTimeout(3000);++ await page.getByRole('button', { name: 'Create' }).click();++ await page.waitForTimeout(1000);++ await expect(page.getByText('documenso-supporter-pledge.pdf')).toBeVisible();++ await page.goto(`/templates/f/${folder.id}`);+ await expect(page.getByText('documenso-supporter-pledge.pdf')).toBeVisible();+});++test('user can pin a template folder', async ({ page }) => {+ const user = await seedUser();++ await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Contract Templates',+ type: FolderType.TEMPLATE,+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/templates',+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Pin' }).click();++ await page.reload();++ await expect(page.locator('svg.text-documenso.h-3.w-3')).toBeVisible();+});++test('user can unpin a template folder', async ({ page }) => {+ const user = await seedUser();++ await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Contract Templates',+ pinned: true,+ type: FolderType.TEMPLATE,+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/templates',+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Unpin' }).click();++ await page.reload();++ await expect(page.locator('svg.text-documenso.h-3.w-3')).not.toBeVisible();+});++test('user can rename a template folder', async ({ page }) => {+ const user = await seedUser();++ await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Contract Templates',+ type: FolderType.TEMPLATE,+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/templates',+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Settings' }).click();++ await page.getByLabel('Name').fill('Updated Template Folder');+ await page.getByRole('button', { name: 'Save Changes' }).click();++ await expect(page.getByText('Updated Template Folder')).toBeVisible();+});++test('template folder visibility is not visible to user', async ({ page }) => {+ const user = await seedUser();++ await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Contract Templates',+ type: FolderType.TEMPLATE,+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/templates',+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Settings' }).click();++ await expect(page.getByRole('menuitem', { name: 'Visibility' })).not.toBeVisible();+});++test('template folder can be moved to another template folder', async ({ page }) => {+ const user = await seedUser();++ const folder = await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Client Templates',+ type: FolderType.TEMPLATE,+ },+ });++ await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Contract Templates',+ type: FolderType.TEMPLATE,+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/templates',+ });++ await page.getByRole('button', { name: '•••' }).nth(0).click();+ await page.getByRole('menuitem', { name: 'Move' }).click();++ await page.getByRole('button', { name: 'Client Templates' }).click();+ await page.getByRole('button', { name: 'Move Folder' }).click();++ await page.waitForTimeout(1000);++ await page.goto(`/templates/f/${folder.id}`);++ await expect(page.getByText('Contract Templates')).toBeVisible();+});++test('template folder can be moved to the root', async ({ page }) => {+ const user = await seedUser();++ const parentFolder = await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Client Templates',+ type: FolderType.TEMPLATE,+ },+ });++ await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Contract Templates',+ parentId: parentFolder.id,+ type: FolderType.TEMPLATE,+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/templates',+ });++ await page.getByText('Client Templates').click();+ await page.getByRole('button', { name: '•••' }).nth(0).click();+ await page.getByRole('menuitem', { name: 'Move' }).click();++ await page.getByRole('button', { name: 'Root' }).click();+ await page.getByRole('button', { name: 'Move Folder' }).click();++ await page.waitForTimeout(1000);++ await page.goto('/templates');++ await expect(page.getByText('Contract Templates')).toBeVisible();+});++test('template folder and its contents can be deleted', async ({ page }) => {+ const user = await seedUser();++ const folder = await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Proposal Templates',+ type: FolderType.TEMPLATE,+ },+ });++ const template = await seedBlankTemplate(user, {+ createTemplateOptions: {+ title: 'Proposal Template 1',+ folderId: folder.id,+ },+ });++ const subfolder = await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Report Templates',+ parentId: folder.id,+ type: FolderType.TEMPLATE,+ },+ });++ const reportTemplate = await seedBlankTemplate(user, {+ createTemplateOptions: {+ title: 'Report Template 1',+ folderId: subfolder.id,+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/templates',+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Delete' }).click();++ await page.getByRole('textbox').fill(`delete ${folder.name}`);+ await page.getByRole('button', { name: 'Delete' }).click();++ await page.goto('/templates');++ await expect(page.locator('div').filter({ hasText: folder.name })).not.toBeVisible();+ await expect(page.getByText(template.title)).not.toBeVisible();++ await page.goto(`/templates/f/${folder.id}`);++ await expect(page.getByText(reportTemplate.title)).not.toBeVisible();+ await expect(page.locator('div').filter({ hasText: subfolder.name })).not.toBeVisible();+});++test('user can navigate between template folders', async ({ page }) => {+ const user = await seedUser();++ const parentFolder = await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Client Templates',+ type: FolderType.TEMPLATE,+ },+ });++ const subfolder = await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Contract Templates',+ parentId: parentFolder.id,+ type: FolderType.TEMPLATE,+ },+ });++ await seedBlankTemplate(user, {+ createTemplateOptions: {+ title: 'Contract Template 1',+ folderId: subfolder.id,+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/templates',+ });++ await page.getByText('Client Templates').click();+ await expect(page.getByText('Contract Templates')).toBeVisible();++ await page.getByText('Contract Templates').click();+ await expect(page.getByText('Contract Template 1')).toBeVisible();++ await page.getByRole('button', { name: parentFolder.name }).click();+ await expect(page.getByText('Contract Templates')).toBeVisible();++ await page.getByRole('button', { name: subfolder.name }).click();+ await expect(page.getByText('Contract Template 1')).toBeVisible();+});++test('user can move a template to a template folder', async ({ page }) => {+ const user = await seedUser();++ const folder = await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Client Templates',+ type: FolderType.TEMPLATE,+ },+ });++ await seedBlankTemplate(user, {+ createTemplateOptions: {+ title: 'Proposal Template 1',+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/templates',+ });++ await page.getByTestId('template-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await page.getByRole('button', { name: 'Client Templates' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.goto(`/templates/f/${folder.id}`);+ await page.waitForTimeout(1000);++ await expect(page.getByText('Proposal Template 1')).toBeVisible();+});++test('user can move a template from a folder to the root', async ({ page }) => {+ const user = await seedUser();++ const folder = await seedBlankFolder(user, {+ createFolderOptions: {+ name: 'Client Templates',+ type: FolderType.TEMPLATE,+ },+ });++ await seedBlankTemplate(user, {+ createTemplateOptions: {+ title: 'Proposal Template 1',+ folderId: folder.id,+ },+ });++ await apiSignin({+ page,+ email: user.email,+ redirectPath: '/templates',+ });++ await page.getByText('Client Templates').click();++ await page.getByTestId('template-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await page.getByRole('button', { name: 'Root' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);++ await page.goto('/templates');++ await expect(page.getByText('Proposal Template 1')).toBeVisible();+});diff --git a/packages/app-tests/e2e/folders/team-account-folders.spec.ts b/packages/app-tests/e2e/folders/team-account-folders.spec.tsnew file mode 100644index 000000000..e908adfd3--- /dev/null+++ b/packages/app-tests/e2e/folders/team-account-folders.spec.ts@@ -0,0 +1,2873 @@+import { expect, test } from '@playwright/test';+import path from 'node:path';++import { prisma } from '@documenso/prisma';+import { DocumentVisibility, FolderType, TeamMemberRole } from '@documenso/prisma/client';+import { seedTeamDocuments } from '@documenso/prisma/seed/documents';+import { seedBlankDocument } from '@documenso/prisma/seed/documents';+import { seedBlankFolder } from '@documenso/prisma/seed/folders';+import { seedTeamMember } from '@documenso/prisma/seed/teams';+import { seedTeam } from '@documenso/prisma/seed/teams';+import { seedBlankTemplate } from '@documenso/prisma/seed/templates';++import { apiSignin } from '../fixtures/authentication';++test.describe.configure({ mode: 'parallel' });++test('[TEAMS]: create document folder button is visible', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}`,+ });++ await expect(page.getByRole('button', { name: 'Create Folder' })).toBeVisible();+});++test('[TEAMS]: can create document folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}`,+ });++ await page.getByRole('button', { name: 'Create Folder' }).click();++ await page.getByLabel('Folder name').fill('Team Folder');+ await page.getByRole('button', { name: 'Create' }).click();++ await expect(page.getByText('Team Folder')).toBeVisible();+});++test('[TEAMS]: can create document subfolder within a document folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}`,+ });++ const teamFolder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Folder',+ teamId: team.id,+ },+ });++ await page.goto(`/t/${team.url}/documents/f/${teamFolder.id}`);++ await page.getByRole('button', { name: 'Create Folder' }).click();++ await page.getByLabel('Folder name').fill('Subfolder');+ await page.getByRole('button', { name: 'Create' }).click();++ await expect(page.getByText('Subfolder')).toBeVisible();+});++test('[TEAMS]: can create a document inside a document folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamFolder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Documents',+ teamId: team.id,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents/f/${teamFolder.id}`,+ });++ const fileInput = page.locator('input[type="file"]').nth(1);+ await fileInput.waitFor({ state: 'attached' });++ await fileInput.setInputFiles(+ path.join(__dirname, '../../../assets/documenso-supporter-pledge.pdf'),+ );++ await page.waitForTimeout(3000);++ await expect(page.getByText('documenso-supporter-pledge.pdf')).toBeVisible();++ await page.goto(`/t/${team.url}/documents/f/${teamFolder.id}`);++ await expect(page.getByText('documenso-supporter-pledge.pdf')).toBeVisible();+});++test('[TEAMS]: can pin a document folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Contracts',+ teamId: team.id,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Pin' }).click();++ await page.reload();++ await expect(page.locator('svg.text-documenso.h-3.w-3')).toBeVisible();+});++test('[TEAMS]: can unpin a document folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Contracts',+ pinned: true,+ teamId: team.id,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Unpin' }).click();++ await page.reload();++ await expect(page.locator('svg.text-documenso.h-3.w-3')).not.toBeVisible();+});++test('[TEAMS]: can rename a document folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Contracts',+ teamId: team.id,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Settings' }).click();++ await page.getByLabel('Name').fill('Team Archive');+ await page.getByRole('button', { name: 'Save Changes' }).click();++ await expect(page.getByText('Team Archive')).toBeVisible();+});++test('[TEAMS]: document folder visibility is visible to team member', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Contracts',+ teamId: team.id,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Settings' }).click();++ await expect(page.getByRole('combobox', { name: 'Visibility' })).toBeVisible();+});++test('[TEAMS]: document folder can be moved to another document folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const folder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Clients',+ teamId: team.id,+ },+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Contracts',+ teamId: team.id,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await page.getByRole('button', { name: '•••' }).nth(0).click();+ await page.getByRole('menuitem', { name: 'Move' }).click();++ await page.getByRole('button', { name: 'Team Clients' }).click();+ await page.getByRole('button', { name: 'Move Folder' }).click();++ await page.waitForTimeout(1000);++ await page.goto(`/t/${team.url}/documents/f/${folder.id}`);++ await expect(page.getByText('Team Contracts')).toBeVisible();+});++test('[TEAMS]: document folder and its contents can be deleted', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const folder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Proposals',+ teamId: team.id,+ },+ });++ const proposal = await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Team Proposal 1',+ folderId: folder.id,+ },+ });++ const reportsFolder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Reports',+ parentId: folder.id,+ teamId: team.id,+ },+ });++ const report = await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Team Report 1',+ folderId: reportsFolder.id,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Delete' }).click();++ await page.getByRole('textbox').fill(`delete ${folder.name}`);+ await page.getByRole('button', { name: 'Delete' }).click();++ await page.goto(`/t/${team.url}/documents`);++ await expect(page.locator('div').filter({ hasText: folder.name })).not.toBeVisible();+ await expect(page.getByText(proposal.title)).not.toBeVisible();++ await page.goto(`/t/${team.url}/documents/f/${folder.id}`);++ await expect(page.getByText(report.title)).not.toBeVisible();+ await expect(page.locator('div').filter({ hasText: reportsFolder.name })).not.toBeVisible();+});++test('[TEAMS]: create folder button is visible on templates page', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/templates`,+ });++ await expect(page.getByRole('button', { name: 'Create Folder' })).toBeVisible();+});++test('[TEAMS]: can create a template folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/templates`,+ });++ await page.getByRole('button', { name: 'Create Folder' }).click();+ await expect(page.getByRole('dialog', { name: 'Create New folder' })).toBeVisible();++ await page.getByLabel('Folder name').fill('Team template folder');+ await page.getByRole('button', { name: 'Create' }).click();++ await page.waitForTimeout(1000);++ await expect(page.getByText('Team template folder')).toBeVisible();++ await page.goto(`/t/${team.url}/templates`);+ await expect(+ page.locator('div').filter({ hasText: 'Team template folder' }).nth(3),+ ).toBeVisible();+});++test('[TEAMS]: can create a template subfolder inside a template folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const folder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Client Templates',+ type: FolderType.TEMPLATE,+ teamId: team.id,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/templates/f/${folder.id}`,+ });++ await expect(page.getByText('Team Client Templates')).toBeVisible();++ await page.getByRole('button', { name: 'Create Folder' }).click();+ await expect(page.getByRole('dialog', { name: 'Create New folder' })).toBeVisible();++ await page.getByLabel('Folder name').fill('Team Contract Templates');+ await page.getByRole('button', { name: 'Create' }).click();++ await page.waitForTimeout(1000);++ await expect(page.getByText('Team Contract Templates')).toBeVisible();+});++test('[TEAMS]: can create a template inside a template folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const folder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Client Templates',+ type: FolderType.TEMPLATE,+ teamId: team.id,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/templates/f/${folder.id}`,+ });++ await expect(page.getByText('Team Client Templates')).toBeVisible();++ await page.getByRole('button', { name: 'New Template' }).click();++ await page+ .locator('div')+ .filter({ hasText: /^Upload Template DocumentDrag & drop your PDF here\.$/ })+ .nth(2)+ .click();+ await page.locator('input[type="file"]').waitFor({ state: 'attached' });++ await page+ .locator('input[type="file"]')+ .setInputFiles(path.join(__dirname, '../../../assets/documenso-supporter-pledge.pdf'));++ await page.waitForTimeout(3000);++ await page.getByRole('button', { name: 'Create' }).click();++ await page.waitForTimeout(1000);++ await expect(page.getByText('documenso-supporter-pledge.pdf')).toBeVisible();++ await page.goto(`/t/${team.url}/templates/f/${folder.id}`);+ await expect(page.getByText('documenso-supporter-pledge.pdf')).toBeVisible();+});++test('[TEAMS]: can pin a template folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Contract Templates',+ type: FolderType.TEMPLATE,+ teamId: team.id,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/templates`,+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Pin' }).click();++ await page.reload();++ await expect(page.locator('svg.text-documenso.h-3.w-3')).toBeVisible();+});++test('[TEAMS]: can unpin a template folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Contract Templates',+ pinned: true,+ type: FolderType.TEMPLATE,+ teamId: team.id,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/templates`,+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Unpin' }).click();++ await page.reload();+ await page.waitForTimeout(1000);++ await expect(page.locator('svg.text-documenso.h-3.w-3')).not.toBeVisible();+});++test('[TEAMS]: can rename a template folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Contract Templates',+ type: FolderType.TEMPLATE,+ teamId: team.id,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/templates`,+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Settings' }).click();++ await page.getByLabel('Name').fill('Updated Team Template Folder');+ await page.getByRole('button', { name: 'Save Changes' }).click();++ await expect(page.getByText('Updated Team Template Folder')).toBeVisible();+});++test('[TEAMS]: template folder visibility is not visible to team member', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Contract Templates',+ type: FolderType.TEMPLATE,+ teamId: team.id,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/templates`,+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Settings' }).click();++ await expect(page.getByRole('menuitem', { name: 'Visibility' })).not.toBeVisible();+});++test('[TEAMS]: template folder can be moved to another template folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const folder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Client Templates',+ type: FolderType.TEMPLATE,+ teamId: team.id,+ },+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Contract Templates',+ type: FolderType.TEMPLATE,+ teamId: team.id,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/templates`,+ });++ await page.getByRole('button', { name: '•••' }).nth(0).click();+ await page.getByRole('menuitem', { name: 'Move' }).click();++ await page.getByRole('button', { name: 'Team Client Templates' }).click();+ await page.getByRole('button', { name: 'Move Folder' }).click();++ await page.waitForTimeout(1000);++ await page.goto(`/t/${team.url}/templates/f/${folder.id}`);++ await expect(page.getByText('Team Contract Templates')).toBeVisible();+});++test('[TEAMS]: template folder and its contents can be deleted', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const folder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Proposal Templates',+ type: FolderType.TEMPLATE,+ teamId: team.id,+ },+ });++ const template = await seedBlankTemplate(team.owner, {+ createTemplateOptions: {+ title: 'Team Proposal Template 1',+ folderId: folder.id,+ },+ });++ const subfolder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Report Templates',+ parentId: folder.id,+ type: FolderType.TEMPLATE,+ teamId: team.id,+ },+ });++ const reportTemplate = await seedBlankTemplate(team.owner, {+ createTemplateOptions: {+ title: 'Team Report Template 1',+ folderId: subfolder.id,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/templates`,+ });++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Delete' }).click();++ await page.getByRole('textbox').fill(`delete ${folder.name}`);+ await page.getByRole('button', { name: 'Delete' }).click();++ await page.goto(`/t/${team.url}/templates`);++ await expect(page.locator('div').filter({ hasText: folder.name })).not.toBeVisible();+ await expect(page.getByText(template.title)).not.toBeVisible();++ await page.goto(`/t/${team.url}/templates/f/${folder.id}`);++ await expect(page.getByText(reportTemplate.title)).not.toBeVisible();+ await expect(page.locator('div').filter({ hasText: subfolder.name })).not.toBeVisible();+});++test('[TEAMS]: can navigate between template folders', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const parentFolder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Client Templates',+ type: FolderType.TEMPLATE,+ teamId: team.id,+ },+ });++ const subfolder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Contract Templates',+ parentId: parentFolder.id,+ type: FolderType.TEMPLATE,+ teamId: team.id,+ },+ });++ await seedBlankTemplate(team.owner, {+ createTemplateOptions: {+ title: 'Team Contract Template 1',+ folderId: subfolder.id,+ teamId: team.id,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/templates`,+ });++ await page.getByText('Team Client Templates').click();+ await expect(page.getByText('Team Contract Templates')).toBeVisible();++ await page.getByText('Team Contract Templates').click();+ await expect(page.getByText('Team Contract Template 1')).toBeVisible();++ await page.getByRole('button', { name: parentFolder.name }).click();+ await expect(page.getByText('Team Contract Templates')).toBeVisible();++ await page.getByRole('button', { name: subfolder.name }).click();+ await expect(page.getByText('Team Contract Template 1')).toBeVisible();+});++test('[TEAMS]: folder visibility is properly applied based on team member roles', async ({+ page,+}) => {+ const { team } = await seedTeamDocuments();++ const teamMember1 = await seedTeamMember({+ teamId: team.id,+ name: 'Team Member 1',+ role: TeamMemberRole.MEMBER,+ });++ const teamMember2 = await seedTeamMember({+ teamId: team.id,+ name: 'Team Member 2',+ role: TeamMemberRole.MANAGER,+ });++ const teamMember3 = await seedTeamMember({+ teamId: team.id,+ name: 'Team Member 3',+ role: TeamMemberRole.ADMIN,+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Admin Only Folder',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Manager Folder',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Everyone Folder',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Admin Only Folder')).toBeVisible();+ await expect(page.getByText('Manager Folder')).toBeVisible();+ await expect(page.getByText('Everyone Folder')).toBeVisible();++ await apiSignin({+ page,+ email: teamMember1.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Admin Only Folder')).not.toBeVisible();+ await expect(page.getByText('Manager Folder')).not.toBeVisible();+ await expect(page.getByText('Everyone Folder')).toBeVisible();++ await apiSignin({+ page,+ email: teamMember2.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Admin Only Folder')).not.toBeVisible();+ await expect(page.getByText('Manager Folder')).toBeVisible();+ await expect(page.getByText('Everyone Folder')).toBeVisible();++ await apiSignin({+ page,+ email: teamMember3.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Admin Only Folder')).toBeVisible();+ await expect(page.getByText('Manager Folder')).toBeVisible();+ await expect(page.getByText('Everyone Folder')).toBeVisible();+});++test('[TEAMS]: folder inherits team visibility settings', async ({ page }) => {+ const team = await seedTeam();++ await prisma.teamGlobalSettings.create({+ data: {+ teamId: team.id,+ documentVisibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await page.getByRole('button', { name: 'Create Folder' }).click();+ await page.getByLabel('Name').fill('Admin Only Folder');+ await page.getByRole('button', { name: 'Create' }).click();++ await expect(page.getByText('Admin Only Folder')).toBeVisible();++ await page.goto(`/t/${team.url}/documents/`);++ await page.getByRole('button', { name: '•••' }).click();+ await page.getByRole('menuitem', { name: 'Settings' }).click();++ await expect(page.getByRole('combobox', { name: 'Visibility' })).toHaveText('Admins only');++ await prisma.teamGlobalSettings.update({+ where: { teamId: team.id },+ data: { documentVisibility: DocumentVisibility.MANAGER_AND_ABOVE },+ });++ await page.reload();++ await page.getByRole('button', { name: 'Create Folder' }).click();+ await page.getByLabel('Name').fill('Manager and above Folder');+ await page.getByRole('button', { name: 'Create' }).click();++ await expect(page.getByText('Manager and above Folder')).toBeVisible();++ await page.goto(`/t/${team.url}/documents/`);++ await page.getByRole('button', { name: '•••' }).nth(0).click();+ await page.getByRole('menuitem', { name: 'Settings' }).click();++ await expect(page.getByRole('combobox', { name: 'Visibility' })).toHaveText('Managers and above');++ await prisma.teamGlobalSettings.update({+ where: { teamId: team.id },+ data: { documentVisibility: DocumentVisibility.EVERYONE },+ });++ await page.reload();++ await page.getByRole('button', { name: 'Create Folder' }).click();+ await page.getByLabel('Name').fill('Everyone Folder');+ await page.getByRole('button', { name: 'Create' }).click();++ await expect(page.getByText('Everyone Folder')).toBeVisible();++ await page.goto(`/t/${team.url}/documents/`);++ await page.getByRole('button', { name: '•••' }).nth(0).click();+ await page.getByRole('menuitem', { name: 'Settings' }).click();++ await expect(page.getByRole('combobox', { name: 'Visibility' })).toHaveText('Everyone');+});++test('[TEAMS]: documents inherit folder visibility', async ({ page }) => {+ const team = await seedTeam();++ await prisma.teamGlobalSettings.create({+ data: {+ teamId: team.id,+ documentVisibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await page.getByRole('button', { name: 'Create Folder' }).click();+ await page.getByLabel('Name').fill('Admin Only Folder');+ await page.getByRole('button', { name: 'Create' }).click();++ await expect(page.getByText('Admin Only Folder')).toBeVisible();++ await page.getByText('Admin Only Folder').click();++ const fileInput = page.locator('input[type="file"]').nth(1);+ await fileInput.waitFor({ state: 'attached' });++ await fileInput.setInputFiles(+ path.join(__dirname, '../../../assets/documenso-supporter-pledge.pdf'),+ );++ await page.waitForTimeout(3000);++ await expect(page.getByText('documenso-supporter-pledge.pdf')).toBeVisible();++ await expect(page.getByRole('combobox').filter({ hasText: 'Admins only' })).toBeVisible();+});++test('[TEAMS]: documents are properly organized within folders', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const folder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Team Folder',+ teamId: team.id,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Folder Document',+ folderId: folder.id,+ teamId: team.id,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Folder Document')).not.toBeVisible();++ await page.getByText('Team Folder').click();+ await page.waitForTimeout(1000);++ await expect(page.getByText('Folder Document')).toBeVisible();+});++test('[TEAMS]: team member can move documents to everyone folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamMember = await seedTeamMember({+ teamId: team.id,+ name: 'Team Member',+ role: TeamMemberRole.MEMBER,+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Admin Only Folder',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Manager Folder',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Everyone Folder',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Admin Document',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Manager Document',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Everyone Document',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await apiSignin({+ page,+ email: teamMember.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Admin Only Folder')).not.toBeVisible();+ await expect(page.getByText('Manager Folder')).not.toBeVisible();+ await expect(page.getByText('Everyone Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Admin Document')).not.toBeVisible();+ await expect(page.getByText('[TEST] Manager Document')).not.toBeVisible();+ await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();++ const everyoneDocRow = page.getByRole('row', { name: /\[TEST\] Everyone Document/ });+ await everyoneDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move' }).click();++ await expect(page.getByRole('button', { name: 'Everyone Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Everyone Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(3000);+ await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(3000);++ await expect(page.getByText('[TEST] Everyone Document')).not.toBeVisible();+});++test('[TEAMS]: team manager can move manager document to manager folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamManager = await seedTeamMember({+ teamId: team.id,+ name: 'Team Manager',+ role: TeamMemberRole.MANAGER,+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Manager Folder',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Manager Document',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await apiSignin({+ page,+ email: teamManager.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Manager Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Manager Document')).toBeVisible();++ const managerDocRow = page.getByRole('row', { name: /\[TEST\] Manager Document/ });+ await managerDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Manager Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Manager Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);++ await expect(page.getByText('[TEST] Manager Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);++ await expect(page.getByText('[TEST] Manager Document')).not.toBeVisible();+});++test('[TEAMS]: team manager can move manager document to everyone folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamManager = await seedTeamMember({+ teamId: team.id,+ name: 'Team Manager',+ role: TeamMemberRole.MANAGER,+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Everyone Folder',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Manager Document',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await apiSignin({+ page,+ email: teamManager.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Everyone Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Manager Document')).toBeVisible();++ const managerDocRow = page.getByRole('row', { name: /\[TEST\] Manager Document/ });+ await managerDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Everyone Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Everyone Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);++ await expect(page.getByText('[TEST] Manager Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);++ await expect(page.getByText('[TEST] Manager Document')).not.toBeVisible();+});++test('[TEAMS]: team manager can move everyone document to manager folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamManager = await seedTeamMember({+ teamId: team.id,+ name: 'Team Manager',+ role: TeamMemberRole.MANAGER,+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Manager Folder',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Everyone Document',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await apiSignin({+ page,+ email: teamManager.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Manager Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();++ const everyoneDocRow = page.getByRole('row', { name: /\[TEST\] Everyone Document/ });+ await everyoneDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Manager Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Manager Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);++ await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);++ await expect(page.getByText('[TEST] Everyone Document')).not.toBeVisible();+});++test('[TEAMS]: team admin can move admin document to admin folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamAdmin = await seedTeamMember({+ teamId: team.id,+ name: 'Team Admin',+ role: TeamMemberRole.ADMIN,+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Admin Folder',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Admin Document',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: teamAdmin.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Admin Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Admin Document')).toBeVisible();++ const adminDocRow = page.getByRole('row', { name: /\[TEST\] Admin Document/ });+ await adminDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Admin Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Admin Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Admin Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Admin Document')).not.toBeVisible();+});++test('[TEAMS]: team admin can move admin document to manager folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamAdmin = await seedTeamMember({+ teamId: team.id,+ name: 'Team Admin',+ role: TeamMemberRole.ADMIN,+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Manager Folder',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Admin Document',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: teamAdmin.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Manager Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Admin Document')).toBeVisible();++ const adminDocRow = page.getByRole('row', { name: /\[TEST\] Admin Document/ });+ await adminDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Manager Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Manager Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Admin Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Admin Document')).not.toBeVisible();+});++test('[TEAMS]: team admin can move admin document to everyone folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamAdmin = await seedTeamMember({+ teamId: team.id,+ name: 'Team Admin',+ role: TeamMemberRole.ADMIN,+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Everyone Folder',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Admin Document',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: teamAdmin.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Everyone Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Admin Document')).toBeVisible();++ const adminDocRow = page.getByRole('row', { name: /\[TEST\] Admin Document/ });+ await adminDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Everyone Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Everyone Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Admin Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Admin Document')).not.toBeVisible();+});++test('[TEAMS]: team admin can move manager document to admin folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamAdmin = await seedTeamMember({+ teamId: team.id,+ name: 'Team Admin',+ role: TeamMemberRole.ADMIN,+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Admin Folder',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Manager Document',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await apiSignin({+ page,+ email: teamAdmin.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Admin Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Manager Document')).toBeVisible();++ const managerDocRow = page.getByRole('row', { name: /\[TEST\] Manager Document/ });+ await managerDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Admin Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Admin Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Manager Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Manager Document')).not.toBeVisible();+});++test('[TEAMS]: team admin can move manager document to manager folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamAdmin = await seedTeamMember({+ teamId: team.id,+ name: 'Team Admin',+ role: TeamMemberRole.ADMIN,+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Manager Folder',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Manager Document',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await apiSignin({+ page,+ email: teamAdmin.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Manager Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Manager Document')).toBeVisible();++ const managerDocRow = page.getByRole('row', { name: /\[TEST\] Manager Document/ });+ await managerDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Manager Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Manager Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Manager Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Manager Document')).not.toBeVisible();+});++test('[TEAMS]: team admin can move manager document to everyone folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamAdmin = await seedTeamMember({+ teamId: team.id,+ name: 'Team Admin',+ role: TeamMemberRole.ADMIN,+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Everyone Folder',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Manager Document',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await apiSignin({+ page,+ email: teamAdmin.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Everyone Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Manager Document')).toBeVisible();++ const managerDocRow = page.getByRole('row', { name: /\[TEST\] Manager Document/ });+ await managerDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Everyone Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Everyone Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Manager Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Manager Document')).not.toBeVisible();+});++test('[TEAMS]: team admin can move everyone document to admin folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamAdmin = await seedTeamMember({+ teamId: team.id,+ name: 'Team Admin',+ role: TeamMemberRole.ADMIN,+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Admin Folder',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Everyone Document',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await apiSignin({+ page,+ email: teamAdmin.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Admin Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();++ const everyoneDocRow = page.getByRole('row', { name: /\[TEST\] Everyone Document/ });+ await everyoneDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Admin Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Admin Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Everyone Document')).not.toBeVisible();+});++test('[TEAMS]: team admin can move everyone document to manager folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamAdmin = await seedTeamMember({+ teamId: team.id,+ name: 'Team Admin',+ role: TeamMemberRole.ADMIN,+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Manager Folder',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Everyone Document',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await apiSignin({+ page,+ email: teamAdmin.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Manager Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();++ const everyoneDocRow = page.getByRole('row', { name: /\[TEST\] Everyone Document/ });+ await everyoneDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Manager Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Manager Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Everyone Document')).not.toBeVisible();+});++test('[TEAMS]: team admin can move everyone document to everyone folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamAdmin = await seedTeamMember({+ teamId: team.id,+ name: 'Team Admin',+ role: TeamMemberRole.ADMIN,+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Everyone Folder',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Everyone Document',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await apiSignin({+ page,+ email: teamAdmin.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Everyone Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();++ const everyoneDocRow = page.getByRole('row', { name: /\[TEST\] Everyone Document/ });+ await everyoneDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Everyone Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Everyone Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Everyone Document')).not.toBeVisible();+});++test('[TEAMS]: team owner can move admin document to admin folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Admin Folder',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Admin Document',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Admin Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Admin Document')).toBeVisible();++ const adminDocRow = page.getByRole('row', { name: /\[TEST\] Admin Document/ });+ await adminDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Admin Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Admin Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Admin Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Admin Document')).not.toBeVisible();+});++test('[TEAMS]: team owner can move admin document to manager folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Manager Folder',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Admin Document',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Manager Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Admin Document')).toBeVisible();++ const adminDocRow = page.getByRole('row', { name: /\[TEST\] Admin Document/ });+ await adminDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Manager Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Manager Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Admin Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Admin Document')).not.toBeVisible();+});++test('[TEAMS]: team owner can move admin document to everyone folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Everyone Folder',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Admin Document',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Everyone Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Admin Document')).toBeVisible();++ const adminDocRow = page.getByRole('row', { name: /\[TEST\] Admin Document/ });+ await adminDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Everyone Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Everyone Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Admin Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Admin Document')).not.toBeVisible();+});++test('[TEAMS]: team owner can move manager document to admin folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Admin Folder',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Manager Document',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Admin Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Manager Document')).toBeVisible();++ const managerDocRow = page.getByRole('row', { name: /\[TEST\] Manager Document/ });+ await managerDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Admin Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Admin Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Manager Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Manager Document')).not.toBeVisible();+});++test('[TEAMS]: team owner can move manager document to manager folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Manager Folder',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Manager Document',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Manager Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Manager Document')).toBeVisible();++ const managerDocRow = page.getByRole('row', { name: /\[TEST\] Manager Document/ });+ await managerDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Manager Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Manager Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Manager Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Manager Document')).not.toBeVisible();+});++test('[TEAMS]: team owner can move manager document to everyone folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Everyone Folder',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Manager Document',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Everyone Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Manager Document')).toBeVisible();++ const managerDocRow = page.getByRole('row', { name: /\[TEST\] Manager Document/ });+ await managerDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Everyone Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Everyone Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Manager Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Manager Document')).not.toBeVisible();+});++test('[TEAMS]: team owner can move everyone document to admin folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Admin Folder',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Everyone Document',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Admin Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();++ const everyoneDocRow = page.getByRole('row', { name: /\[TEST\] Everyone Document/ });+ await everyoneDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Admin Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Admin Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Everyone Document')).not.toBeVisible();+});++test('[TEAMS]: team owner can move everyone document to manager folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Manager Folder',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Everyone Document',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Manager Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();++ const everyoneDocRow = page.getByRole('row', { name: /\[TEST\] Everyone Document/ });+ await everyoneDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Manager Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Manager Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Everyone Document')).not.toBeVisible();+});++test('[TEAMS]: team owner can move everyone document to everyone folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Everyone Folder',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ type: FolderType.DOCUMENT,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: '[TEST] Everyone Document',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Everyone Folder')).toBeVisible();+ await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();++ const everyoneDocRow = page.getByRole('row', { name: /\[TEST\] Everyone Document/ });+ await everyoneDocRow.getByTestId('document-table-action-btn').click();+ await page.getByRole('menuitem', { name: 'Move to Folder' }).click();++ await expect(page.getByRole('button', { name: 'Everyone Folder' })).toBeVisible();+ await page.getByRole('button', { name: 'Everyone Folder' }).click();+ await page.getByRole('button', { name: 'Move' }).click();++ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();++ await page.goto(`/t/${team.url}/documents`);+ await page.waitForTimeout(1000);+ await expect(page.getByText('[TEST] Everyone Document')).not.toBeVisible();+});++test('[TEAMS]: team member cannot see admin folder in folder list', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamMember = await seedTeamMember({+ teamId: team.id,+ name: 'Team Member',+ role: TeamMemberRole.MEMBER,+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Admin Only Folder',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: teamMember.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Admin Only Folder')).not.toBeVisible();+});++test('[TEAMS]: team member can access admin folder via URL and see everyone documents', async ({+ page,+}) => {+ const { team } = await seedTeamDocuments();++ const teamMember = await seedTeamMember({+ teamId: team.id,+ name: 'Team Member',+ role: TeamMemberRole.MEMBER,+ });++ const adminFolder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Admin Only Folder',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Admin Folder - Everyone Document',+ folderId: adminFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Admin Folder - Manager Document',+ folderId: adminFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Admin Folder - Admin Document',+ folderId: adminFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: teamMember.email,+ redirectPath: `/t/${team.url}/documents/f/${adminFolder.id}`,+ });++ await expect(page.getByRole('button', { name: 'Admin Only Folder' })).not.toBeVisible();+ await expect(page.getByText('Admin Folder - Everyone Document')).toBeVisible();+ await expect(page.getByText('Admin Folder - Manager Document')).not.toBeVisible();+ await expect(page.getByText('Admin Folder - Admin Document')).not.toBeVisible();+});++test('[TEAMS]: team member cannot see manager folder in folder list', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamMember = await seedTeamMember({+ teamId: team.id,+ name: 'Team Member',+ role: TeamMemberRole.MEMBER,+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Manager Folder',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await apiSignin({+ page,+ email: teamMember.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Manager Folder')).not.toBeVisible();+});++test('[TEAMS]: team member can access manager folder via URL and see everyone documents', async ({+ page,+}) => {+ const { team } = await seedTeamDocuments();++ const teamMember = await seedTeamMember({+ teamId: team.id,+ name: 'Team Member',+ role: TeamMemberRole.MEMBER,+ });++ const managerFolder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Manager Folder',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Manager Folder - Everyone Document',+ folderId: managerFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Manager Folder - Manager Document',+ folderId: managerFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Manager Folder - Admin Document',+ folderId: managerFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: teamMember.email,+ redirectPath: `/t/${team.url}/documents/f/${managerFolder.id}`,+ });++ await expect(page.getByRole('button', { name: 'Manager Folder' })).not.toBeVisible();+ await expect(page.getByText('Manager Folder - Everyone Document')).toBeVisible();+ await expect(page.getByText('Manager Folder - Manager Document')).not.toBeVisible();+ await expect(page.getByText('Manager Folder - Admin Document')).not.toBeVisible();+});++test('[TEAMS]: team member can see everyone folders', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamMember = await seedTeamMember({+ teamId: team.id,+ name: 'Team Member',+ role: TeamMemberRole.MEMBER,+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Admin Only Folder',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Manager Folder',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Everyone Folder',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await apiSignin({+ page,+ email: teamMember.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Admin Only Folder')).not.toBeVisible();+ await expect(page.getByText('Manager Folder')).not.toBeVisible();+ await expect(page.getByText('Everyone Folder')).toBeVisible();+});++test('[TEAMS]: team member can only see everyone documents in everyone folder', async ({+ page,+}) => {+ const { team } = await seedTeamDocuments();++ const teamMember = await seedTeamMember({+ teamId: team.id,+ name: 'Team Member',+ role: TeamMemberRole.MEMBER,+ });++ const everyoneFolder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Everyone Folder',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Everyone Document',+ folderId: everyoneFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Manager Document',+ folderId: everyoneFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Admin Document',+ folderId: everyoneFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: teamMember.email,+ redirectPath: `/t/${team.url}/documents/f/${everyoneFolder.id}`,+ });++ await expect(page.getByText('Everyone Document')).toBeVisible();+ await expect(page.getByText('Manager Document')).not.toBeVisible();+ await expect(page.getByText('Admin Document')).not.toBeVisible();+});++test('[TEAMS]: team manager can see manager and everyone folders in folder list', async ({+ page,+}) => {+ const { team } = await seedTeamDocuments();++ const teamManager = await seedTeamMember({+ teamId: team.id,+ name: 'Team Manager',+ role: TeamMemberRole.MANAGER,+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Admin Only Folder',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Manager Folder',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Everyone Folder',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await apiSignin({+ page,+ email: teamManager.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Admin Only Folder')).not.toBeVisible();+ await expect(page.getByText('Manager Folder')).toBeVisible();+ await expect(page.getByText('Everyone Folder')).toBeVisible();+});++test('[TEAMS]: team manager can see manager and everyone documents in manager folder', async ({+ page,+}) => {+ const { team } = await seedTeamDocuments();++ const teamManager = await seedTeamMember({+ teamId: team.id,+ name: 'Team Manager',+ role: TeamMemberRole.MANAGER,+ });++ const managerFolder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Manager Folder',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Manager Folder - Everyone Document',+ folderId: managerFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Manager Folder - Manager Document',+ folderId: managerFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Manager Folder - Admin Document',+ folderId: managerFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: teamManager.email,+ redirectPath: `/t/${team.url}/documents/f/${managerFolder.id}`,+ });++ await expect(page.getByRole('button', { name: 'Manager Folder' })).toBeVisible();+ await expect(page.getByText('Manager Folder - Everyone Document')).toBeVisible();+ await expect(page.getByText('Manager Folder - Manager Document')).toBeVisible();+ await expect(page.getByText('Manager Folder - Admin Document')).not.toBeVisible();+});++test('[TEAMS]: team manager can see manager and everyone documents in everyone folder', async ({+ page,+}) => {+ const { team } = await seedTeamDocuments();++ const teamManager = await seedTeamMember({+ teamId: team.id,+ name: 'Team Manager',+ role: TeamMemberRole.MANAGER,+ });++ const everyoneFolder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Everyone Folder',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Everyone Folder - Everyone Document',+ folderId: everyoneFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Everyone Folder - Manager Document',+ folderId: everyoneFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Everyone Folder - Admin Document',+ folderId: everyoneFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: teamManager.email,+ redirectPath: `/t/${team.url}/documents/f/${everyoneFolder.id}`,+ });++ await expect(page.getByRole('button', { name: 'Everyone Folder' })).toBeVisible();+ await expect(page.getByText('Everyone Folder - Everyone Document')).toBeVisible();+ await expect(page.getByText('Everyone Folder - Manager Document')).toBeVisible();+ await expect(page.getByText('Everyone Folder - Admin Document')).not.toBeVisible();+});++test('[TEAMS]: team manager can access admin folder via URL and see manager and everyone documents', async ({+ page,+}) => {+ const { team } = await seedTeamDocuments();++ const teamManager = await seedTeamMember({+ teamId: team.id,+ name: 'Team Manager',+ role: TeamMemberRole.MANAGER,+ });++ const adminFolder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Admin Only Folder',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Admin Folder - Everyone Document',+ folderId: adminFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Admin Folder - Manager Document',+ folderId: adminFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Admin Folder - Admin Document',+ folderId: adminFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: teamManager.email,+ redirectPath: `/t/${team.url}/documents/f/${adminFolder.id}`,+ });++ await expect(page.getByRole('button', { name: 'Admin Only Folder' })).not.toBeVisible();+ await expect(page.getByText('Admin Folder - Everyone Document')).toBeVisible();+ await expect(page.getByText('Admin Folder - Manager Document')).toBeVisible();+ await expect(page.getByText('Admin Folder - Admin Document')).not.toBeVisible();+});++test('[TEAMS]: team owner can see all folders in folder list', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Admin Only Folder',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Manager Folder',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Everyone Folder',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Admin Only Folder')).toBeVisible();+ await expect(page.getByText('Manager Folder')).toBeVisible();+ await expect(page.getByText('Everyone Folder')).toBeVisible();+});++test('[TEAMS]: team owner can see all documents in admin folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const adminFolder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Admin Only Folder',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Admin Folder - Everyone Document',+ folderId: adminFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Admin Folder - Manager Document',+ folderId: adminFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Admin Folder - Admin Document',+ folderId: adminFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents/f/${adminFolder.id}`,+ });++ await expect(page.getByRole('button', { name: 'Admin Only Folder' })).toBeVisible();+ await expect(page.getByText('Admin Folder - Everyone Document')).toBeVisible();+ await expect(page.getByText('Admin Folder - Manager Document')).toBeVisible();+ await expect(page.getByText('Admin Folder - Admin Document')).toBeVisible();+});++test('[TEAMS]: team owner can see all documents in manager folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const managerFolder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Manager Folder',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Manager Folder - Everyone Document',+ folderId: managerFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Manager Folder - Manager Document',+ folderId: managerFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Manager Folder - Admin Document',+ folderId: managerFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents/f/${managerFolder.id}`,+ });++ await expect(page.getByRole('button', { name: 'Manager Folder' })).toBeVisible();+ await expect(page.getByText('Manager Folder - Everyone Document')).toBeVisible();+ await expect(page.getByText('Manager Folder - Manager Document')).toBeVisible();+ await expect(page.getByText('Manager Folder - Admin Document')).toBeVisible();+});++test('[TEAMS]: team owner can see all documents in everyone folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const everyoneFolder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Everyone Folder',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Everyone Folder - Everyone Document',+ folderId: everyoneFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Everyone Folder - Manager Document',+ folderId: everyoneFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Everyone Folder - Admin Document',+ folderId: everyoneFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: team.owner.email,+ redirectPath: `/t/${team.url}/documents/f/${everyoneFolder.id}`,+ });++ await expect(page.getByRole('button', { name: 'Everyone Folder' })).toBeVisible();+ await expect(page.getByText('Everyone Folder - Everyone Document')).toBeVisible();+ await expect(page.getByText('Everyone Folder - Manager Document')).toBeVisible();+ await expect(page.getByText('Everyone Folder - Admin Document')).toBeVisible();+});++test('[TEAMS]: team admin can see all folders in folder list', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamAdmin = await seedTeamMember({+ teamId: team.id,+ name: 'Team Admin',+ role: TeamMemberRole.ADMIN,+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Admin Only Folder',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Manager Folder',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Everyone Folder',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await apiSignin({+ page,+ email: teamAdmin.email,+ redirectPath: `/t/${team.url}/documents`,+ });++ await expect(page.getByText('Admin Only Folder')).toBeVisible();+ await expect(page.getByText('Manager Folder')).toBeVisible();+ await expect(page.getByText('Everyone Folder')).toBeVisible();+});++test('[TEAMS]: team admin can see all documents in admin folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamAdmin = await seedTeamMember({+ teamId: team.id,+ name: 'Team Admin',+ role: TeamMemberRole.ADMIN,+ });++ const adminFolder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Admin Only Folder',+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Admin Folder - Everyone Document',+ folderId: adminFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Admin Folder - Manager Document',+ folderId: adminFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Admin Folder - Admin Document',+ folderId: adminFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: teamAdmin.email,+ redirectPath: `/t/${team.url}/documents/f/${adminFolder.id}`,+ });++ await expect(page.getByRole('button', { name: 'Admin Only Folder' })).toBeVisible();+ await expect(page.getByText('Admin Folder - Everyone Document')).toBeVisible();+ await expect(page.getByText('Admin Folder - Manager Document')).toBeVisible();+ await expect(page.getByText('Admin Folder - Admin Document')).toBeVisible();+});++test('[TEAMS]: team admin can see all documents in manager folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamAdmin = await seedTeamMember({+ teamId: team.id,+ name: 'Team Admin',+ role: TeamMemberRole.ADMIN,+ });++ const managerFolder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Manager Folder',+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Manager Folder - Everyone Document',+ folderId: managerFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Manager Folder - Manager Document',+ folderId: managerFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Manager Folder - Admin Document',+ folderId: managerFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: teamAdmin.email,+ redirectPath: `/t/${team.url}/documents/f/${managerFolder.id}`,+ });++ await expect(page.getByRole('button', { name: 'Manager Folder' })).toBeVisible();+ await expect(page.getByText('Manager Folder - Everyone Document')).toBeVisible();+ await expect(page.getByText('Manager Folder - Manager Document')).toBeVisible();+ await expect(page.getByText('Manager Folder - Admin Document')).toBeVisible();+});++test('[TEAMS]: team admin can see all documents in everyone folder', async ({ page }) => {+ const { team } = await seedTeamDocuments();++ const teamAdmin = await seedTeamMember({+ teamId: team.id,+ name: 'Team Admin',+ role: TeamMemberRole.ADMIN,+ });++ const everyoneFolder = await seedBlankFolder(team.owner, {+ createFolderOptions: {+ name: 'Everyone Folder',+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Everyone Folder - Everyone Document',+ folderId: everyoneFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.EVERYONE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Everyone Folder - Manager Document',+ folderId: everyoneFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.MANAGER_AND_ABOVE,+ },+ });++ await seedBlankDocument(team.owner, {+ createDocumentOptions: {+ title: 'Everyone Folder - Admin Document',+ folderId: everyoneFolder.id,+ teamId: team.id,+ visibility: DocumentVisibility.ADMIN,+ },+ });++ await apiSignin({+ page,+ email: teamAdmin.email,+ redirectPath: `/t/${team.url}/documents/f/${everyoneFolder.id}`,+ });++ await expect(page.getByRole('button', { name: 'Everyone Folder' })).toBeVisible();+ await expect(page.getByText('Everyone Folder - Everyone Document')).toBeVisible();+ await expect(page.getByText('Everyone Folder - Manager Document')).toBeVisible();+ await expect(page.getByText('Everyone Folder - Admin Document')).toBeVisible();+});diff --git a/packages/app-tests/package.json b/packages/app-tests/package.jsonindex 516a8f844..eff48e063 100644--- a/packages/app-tests/package.json+++ b/packages/app-tests/package.json@@ -21,4 +21,4 @@"dependencies": {"start-server-and-test": "^2.0.1"}-}\ No newline at end of file+}diff --git a/packages/lib/server-only/document/create-document-v2.ts b/packages/lib/server-only/document/create-document-v2.tsindex 77babbba4..a87860488 100644--- a/packages/lib/server-only/document/create-document-v2.ts+++ b/packages/lib/server-only/document/create-document-v2.ts@@ -233,6 +233,7 @@ export const createDocumentV2 = async ({documentMeta: true,recipients: true,fields: true,+ folder: true,},});diff --git a/packages/lib/server-only/document/create-document.ts b/packages/lib/server-only/document/create-document.tsindex 8ca98ca29..866b0e2f9 100644--- a/packages/lib/server-only/document/create-document.ts+++ b/packages/lib/server-only/document/create-document.ts@@ -1,5 +1,5 @@import { DocumentSource, WebhookTriggerEvents } from '@prisma/client';-import type { Team, TeamGlobalSettings } from '@prisma/client';+import type { DocumentVisibility, Team, TeamGlobalSettings } from '@prisma/client';import { TeamMemberRole } from '@prisma/client';import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';@@ -29,6 +29,7 @@ export type CreateDocumentOptions = {normalizePdf?: boolean;timezone?: string;requestMetadata: ApiRequestMetadata;+ folderId?: string;};export const createDocument = async ({@@ -41,6 +42,7 @@ export const createDocument = async ({formValues,requestMetadata,timezone,+ folderId,}: CreateDocumentOptions) => {const user = await prisma.user.findFirstOrThrow({where: {@@ -89,6 +91,29 @@ export const createDocument = async ({userTeamRole = teamWithUserRole.members[0]?.role;}+ let folderVisibility: DocumentVisibility | undefined;++ if (folderId) {+ const folder = await prisma.folder.findFirst({+ where: {+ id: folderId,+ userId,+ teamId,+ },+ select: {+ visibility: true,+ },+ });++ if (!folder) {+ throw new AppError(AppErrorCode.NOT_FOUND, {+ message: 'Folder not found',+ });+ }++ folderVisibility = folder.visibility;+ }+if (normalizePdf) {const documentData = await prisma.documentData.findFirst({where: {@@ -121,10 +146,13 @@ export const createDocument = async ({documentDataId,userId,teamId,- visibility: determineDocumentVisibility(- team?.teamGlobalSettings?.documentVisibility,- userTeamRole ?? TeamMemberRole.MEMBER,- ),+ folderId,+ visibility:+ folderVisibility ??+ determineDocumentVisibility(+ team?.teamGlobalSettings?.documentVisibility,+ userTeamRole ?? TeamMemberRole.MEMBER,+ ),formValues,source: DocumentSource.DOCUMENT,documentMeta: {diff --git a/packages/lib/server-only/document/find-documents.ts b/packages/lib/server-only/document/find-documents.tsindex a7a689ee0..cd5694d65 100644--- a/packages/lib/server-only/document/find-documents.ts+++ b/packages/lib/server-only/document/find-documents.ts@@ -27,6 +27,7 @@ export type FindDocumentsOptions = {period?: PeriodSelectorValue;senderIds?: number[];query?: string;+ folderId?: string;};export const findDocuments = async ({@@ -41,6 +42,7 @@ export const findDocuments = async ({period,senderIds,query = '',+ folderId,}: FindDocumentsOptions) => {const user = await prisma.user.findFirstOrThrow({where: {@@ -120,10 +122,10 @@ export const findDocuments = async ({},];- let filters: Prisma.DocumentWhereInput | null = findDocumentsFilter(status, user);+ let filters: Prisma.DocumentWhereInput | null = findDocumentsFilter(status, user, folderId);if (team) {- filters = findTeamDocumentsFilter(status, team, visibilityFilters);+ filters = findTeamDocumentsFilter(status, team, visibilityFilters, folderId);}if (filters === null) {@@ -227,6 +229,12 @@ export const findDocuments = async ({};}+ if (folderId !== undefined) {+ whereClause.folderId = folderId;+ } else {+ whereClause.folderId = null;+ }+const [data, count] = await Promise.all([prisma.document.findMany({where: whereClause,@@ -273,13 +281,18 @@ export const findDocuments = async ({} satisfies FindResultResponse<typeof data>;};-const findDocumentsFilter = (status: ExtendedDocumentStatus, user: User) => {+const findDocumentsFilter = (+ status: ExtendedDocumentStatus,+ user: User,+ folderId?: string | null,+) => {return match<ExtendedDocumentStatus, Prisma.DocumentWhereInput>(status).with(ExtendedDocumentStatus.ALL, () => ({OR: [{userId: user.id,teamId: null,+ folderId: folderId,},{status: ExtendedDocumentStatus.COMPLETED,@@ -288,6 +301,7 @@ const findDocumentsFilter = (status: ExtendedDocumentStatus, user: User) => {email: user.email,},},+ folderId: folderId,},{status: ExtendedDocumentStatus.PENDING,@@ -296,6 +310,7 @@ const findDocumentsFilter = (status: ExtendedDocumentStatus, user: User) => {email: user.email,},},+ folderId: folderId,},],}))@@ -324,6 +339,7 @@ const findDocumentsFilter = (status: ExtendedDocumentStatus, user: User) => {userId: user.id,teamId: null,status: ExtendedDocumentStatus.PENDING,+ folderId: folderId,},{status: ExtendedDocumentStatus.PENDING,@@ -336,6 +352,7 @@ const findDocumentsFilter = (status: ExtendedDocumentStatus, user: User) => {},},},+ folderId: folderId,},],}))@@ -345,6 +362,7 @@ const findDocumentsFilter = (status: ExtendedDocumentStatus, user: User) => {userId: user.id,teamId: null,status: ExtendedDocumentStatus.COMPLETED,+ folderId: folderId,},{status: ExtendedDocumentStatus.COMPLETED,@@ -353,6 +371,7 @@ const findDocumentsFilter = (status: ExtendedDocumentStatus, user: User) => {email: user.email,},},+ folderId: folderId,},],}))@@ -362,6 +381,7 @@ const findDocumentsFilter = (status: ExtendedDocumentStatus, user: User) => {userId: user.id,teamId: null,status: ExtendedDocumentStatus.REJECTED,+ folderId: folderId,},{status: ExtendedDocumentStatus.REJECTED,@@ -371,6 +391,7 @@ const findDocumentsFilter = (status: ExtendedDocumentStatus, user: User) => {signingStatus: SigningStatus.REJECTED,},},+ folderId: folderId,},],}))@@ -410,6 +431,7 @@ const findTeamDocumentsFilter = (status: ExtendedDocumentStatus,team: Team & { teamEmail: TeamEmail | null },visibilityFilters: Prisma.DocumentWhereInput[],+ folderId?: string,) => {const teamEmail = team.teamEmail?.email ?? null;@@ -420,6 +442,7 @@ const findTeamDocumentsFilter = (OR: [{teamId: team.id,+ folderId: folderId,OR: visibilityFilters,},],@@ -437,6 +460,7 @@ const findTeamDocumentsFilter = (},},OR: visibilityFilters,+ folderId: folderId,});// Filter to display all documents that have been sent by the team email.@@ -445,6 +469,7 @@ const findTeamDocumentsFilter = (email: teamEmail,},OR: visibilityFilters,+ folderId: folderId,});}@@ -470,6 +495,7 @@ const findTeamDocumentsFilter = (},},OR: visibilityFilters,+ folderId: folderId,};}).with(ExtendedDocumentStatus.DRAFT, () => {@@ -479,6 +505,7 @@ const findTeamDocumentsFilter = (teamId: team.id,status: ExtendedDocumentStatus.DRAFT,OR: visibilityFilters,+ folderId: folderId,},],};@@ -490,6 +517,7 @@ const findTeamDocumentsFilter = (email: teamEmail,},OR: visibilityFilters,+ folderId: folderId,});}@@ -502,6 +530,7 @@ const findTeamDocumentsFilter = (teamId: team.id,status: ExtendedDocumentStatus.PENDING,OR: visibilityFilters,+ folderId: folderId,},],};@@ -521,12 +550,14 @@ const findTeamDocumentsFilter = (},},OR: visibilityFilters,+ folderId: folderId,},{user: {email: teamEmail,},OR: visibilityFilters,+ folderId: folderId,},],});diff --git a/packages/lib/server-only/document/get-document-by-id.ts b/packages/lib/server-only/document/get-document-by-id.tsindex 5d06a7405..8925a6915 100644--- a/packages/lib/server-only/document/get-document-by-id.ts+++ b/packages/lib/server-only/document/get-document-by-id.ts@@ -12,9 +12,15 @@ export type GetDocumentByIdOptions = {documentId: number;userId: number;teamId?: number;+ folderId?: string;};-export const getDocumentById = async ({ documentId, userId, teamId }: GetDocumentByIdOptions) => {+export const getDocumentById = async ({+ documentId,+ userId,+ teamId,+ folderId,+}: GetDocumentByIdOptions) => {const documentWhereInput = await getDocumentWhereInput({documentId,userId,@@ -22,7 +28,10 @@ export const getDocumentById = async ({ documentId, userId, teamId }: GetDocumen});const document = await prisma.document.findFirst({- where: documentWhereInput,+ where: {+ ...documentWhereInput,+ folderId,+ },include: {documentData: true,documentMeta: true,diff --git a/packages/lib/server-only/document/get-document-with-details-by-id.ts b/packages/lib/server-only/document/get-document-with-details-by-id.tsindex 9cabb6838..1898ca29b 100644--- a/packages/lib/server-only/document/get-document-with-details-by-id.ts+++ b/packages/lib/server-only/document/get-document-with-details-by-id.ts@@ -7,12 +7,14 @@ export type GetDocumentWithDetailsByIdOptions = {documentId: number;userId: number;teamId?: number;+ folderId?: string;};export const getDocumentWithDetailsById = async ({documentId,userId,teamId,+ folderId,}: GetDocumentWithDetailsByIdOptions) => {const documentWhereInput = await getDocumentWhereInput({documentId,@@ -21,12 +23,16 @@ export const getDocumentWithDetailsById = async ({});const document = await prisma.document.findFirst({- where: documentWhereInput,+ where: {+ ...documentWhereInput,+ folderId,+ },include: {documentData: true,documentMeta: true,recipients: true,fields: true,+ folder: true,},});diff --git a/packages/lib/server-only/document/get-stats.ts b/packages/lib/server-only/document/get-stats.tsindex 7b12f72c5..754da367a 100644--- a/packages/lib/server-only/document/get-stats.ts+++ b/packages/lib/server-only/document/get-stats.ts@@ -15,9 +15,16 @@ export type GetStatsInput = {team?: Omit<GetTeamCountsOption, 'createdAt'>;period?: PeriodSelectorValue;search?: string;+ folderId?: string;};-export const getStats = async ({ user, period, search = '', ...options }: GetStatsInput) => {+export const getStats = async ({+ user,+ period,+ search = '',+ folderId,+ ...options+}: GetStatsInput) => {let createdAt: Prisma.DocumentWhereInput['createdAt'];if (period) {@@ -37,8 +44,9 @@ export const getStats = async ({ user, period, search = '', ...options }: GetStacurrentUserEmail: user.email,userId: user.id,search,+ folderId,})- : getCounts({ user, createdAt, search }));+ : getCounts({ user, createdAt, search, folderId }));const stats: Record<ExtendedDocumentStatus, number> = {[ExtendedDocumentStatus.DRAFT]: 0,@@ -84,9 +92,10 @@ type GetCountsOption = {user: User;createdAt: Prisma.DocumentWhereInput['createdAt'];search?: string;+ folderId?: string | null;};-const getCounts = async ({ user, createdAt, search }: GetCountsOption) => {+const getCounts = async ({ user, createdAt, search, folderId }: GetCountsOption) => {const searchFilter: Prisma.DocumentWhereInput = {OR: [{ title: { contains: search, mode: 'insensitive' } },@@ -95,6 +104,8 @@ const getCounts = async ({ user, createdAt, search }: GetCountsOption) => {],};+ const rootPageFilter = folderId === undefined ? { folderId: null } : {};+return Promise.all([// Owner counts.prisma.document.groupBy({@@ -107,7 +118,7 @@ const getCounts = async ({ user, createdAt, search }: GetCountsOption) => {createdAt,teamId: null,deletedAt: null,- AND: [searchFilter],+ AND: [searchFilter, rootPageFilter, folderId ? { folderId } : {}],},}),// Not signed counts.@@ -126,7 +137,7 @@ const getCounts = async ({ user, createdAt, search }: GetCountsOption) => {},},createdAt,- AND: [searchFilter],+ AND: [searchFilter, rootPageFilter, folderId ? { folderId } : {}],},}),// Has signed counts.@@ -164,7 +175,7 @@ const getCounts = async ({ user, createdAt, search }: GetCountsOption) => {},},],- AND: [searchFilter],+ AND: [searchFilter, rootPageFilter, folderId ? { folderId } : {}],},}),]);@@ -179,10 +190,11 @@ type GetTeamCountsOption = {createdAt: Prisma.DocumentWhereInput['createdAt'];currentTeamMemberRole?: TeamMemberRole;search?: string;+ folderId?: string | null;};const getTeamCounts = async (options: GetTeamCountsOption) => {- const { createdAt, teamId, teamEmail } = options;+ const { createdAt, teamId, teamEmail, folderId } = options;const senderIds = options.senderIds ?? [];@@ -206,6 +218,7 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {createdAt,teamId,deletedAt: null,+ folderId,};let notSignedCountsGroupByArgs = null;@@ -278,6 +291,7 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {where: {userId: userIdWhereClause,createdAt,+ folderId,status: ExtendedDocumentStatus.PENDING,recipients: {some: {@@ -298,6 +312,7 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {where: {userId: userIdWhereClause,createdAt,+ folderId,OR: [{status: ExtendedDocumentStatus.PENDING,diff --git a/packages/lib/server-only/folder/create-folder.ts b/packages/lib/server-only/folder/create-folder.tsnew file mode 100644index 000000000..a92b986de--- /dev/null+++ b/packages/lib/server-only/folder/create-folder.ts@@ -0,0 +1,86 @@+import { TeamMemberRole } from '@prisma/client';+import type { Team, TeamGlobalSettings } from '@prisma/client';++import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { prisma } from '@documenso/prisma';++import type { TFolderType } from '../../types/folder-type';+import { FolderType } from '../../types/folder-type';+import { determineDocumentVisibility } from '../../utils/document-visibility';++export interface CreateFolderOptions {+ userId: number;+ teamId?: number;+ name: string;+ parentId?: string | null;+ type?: TFolderType;+}++export const createFolder = async ({+ userId,+ teamId,+ name,+ parentId,+ type = FolderType.DOCUMENT,+}: CreateFolderOptions) => {+ const user = await prisma.user.findFirstOrThrow({+ where: {+ id: userId,+ },+ include: {+ teamMembers: {+ select: {+ teamId: true,+ },+ },+ },+ });++ if (+ teamId !== undefined &&+ !user.teamMembers.some((teamMember) => teamMember.teamId === teamId)+ ) {+ throw new AppError(AppErrorCode.NOT_FOUND, {+ message: 'Team not found',+ });+ }++ let team: (Team & { teamGlobalSettings: TeamGlobalSettings | null }) | null = null;+ let userTeamRole: TeamMemberRole | undefined;++ if (teamId) {+ const teamWithUserRole = await prisma.team.findFirstOrThrow({+ where: {+ id: teamId,+ },+ include: {+ teamGlobalSettings: true,+ members: {+ where: {+ userId: userId,+ },+ select: {+ role: true,+ },+ },+ },+ });++ team = teamWithUserRole;+ userTeamRole = teamWithUserRole.members[0]?.role;+ }++ return await prisma.folder.create({+ data: {+ name,+ userId,+ teamId,+ parentId,+ type,+ visibility: determineDocumentVisibility(+ team?.teamGlobalSettings?.documentVisibility,+ userTeamRole ?? TeamMemberRole.MEMBER,+ ),+ },+ });+};diff --git a/packages/lib/server-only/folder/delete-folder.ts b/packages/lib/server-only/folder/delete-folder.tsnew file mode 100644index 000000000..76ac8a62b--- /dev/null+++ b/packages/lib/server-only/folder/delete-folder.ts@@ -0,0 +1,85 @@+import { DocumentVisibility, TeamMemberRole } from '@prisma/client';+import { match } from 'ts-pattern';++import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { prisma } from '@documenso/prisma';++export interface DeleteFolderOptions {+ userId: number;+ teamId?: number;+ folderId: string;+}++export const deleteFolder = async ({ userId, teamId, folderId }: DeleteFolderOptions) => {+ let teamMemberRole: TeamMemberRole | null = null;++ if (teamId) {+ const team = await prisma.team.findFirst({+ where: {+ id: teamId,+ members: {+ some: {+ userId,+ },+ },+ },+ include: {+ members: {+ where: {+ userId,+ },+ select: {+ role: true,+ },+ },+ },+ });++ if (!team) {+ throw new AppError(AppErrorCode.NOT_FOUND, {+ message: 'Team not found',+ });+ }++ teamMemberRole = team.members[0]?.role ?? null;+ }++ const folder = await prisma.folder.findFirst({+ where: {+ id: folderId,+ userId,+ teamId,+ },+ include: {+ documents: true,+ subfolders: true,+ templates: true,+ },+ });++ if (!folder) {+ throw new AppError(AppErrorCode.NOT_FOUND, {+ message: 'Folder not found',+ });+ }++ if (teamId && teamMemberRole) {+ const hasPermission = match(teamMemberRole)+ .with(TeamMemberRole.ADMIN, () => true)+ .with(TeamMemberRole.MANAGER, () => folder.visibility !== DocumentVisibility.ADMIN)+ .with(TeamMemberRole.MEMBER, () => folder.visibility === DocumentVisibility.EVERYONE)+ .otherwise(() => false);++ if (!hasPermission) {+ throw new AppError(AppErrorCode.UNAUTHORIZED, {+ message: 'You do not have permission to delete this folder',+ });+ }+ }++ return await prisma.folder.delete({+ where: {+ id: folderId,+ },+ });+};diff --git a/packages/lib/server-only/folder/find-folders.ts b/packages/lib/server-only/folder/find-folders.tsnew file mode 100644index 000000000..ec4df30d3--- /dev/null+++ b/packages/lib/server-only/folder/find-folders.ts@@ -0,0 +1,152 @@+import { TeamMemberRole } from '@prisma/client';+import { match } from 'ts-pattern';++import { prisma } from '@documenso/prisma';++import { DocumentVisibility } from '../../types/document-visibility';+import type { TFolderType } from '../../types/folder-type';++export interface FindFoldersOptions {+ userId: number;+ teamId?: number;+ parentId?: string | null;+ type?: TFolderType;+}++export const findFolders = async ({ userId, teamId, parentId, type }: FindFoldersOptions) => {+ let team = null;+ let teamMemberRole = null;++ if (teamId !== undefined) {+ try {+ team = await prisma.team.findFirstOrThrow({+ where: {+ id: teamId,+ members: {+ some: {+ userId,+ },+ },+ },+ include: {+ members: {+ where: {+ userId,+ },+ select: {+ role: true,+ },+ },+ },+ });++ teamMemberRole = team.members[0].role;+ } catch (error) {+ console.error('Error finding team:', error);+ throw error;+ }+ }++ const visibilityFilters = match(teamMemberRole)+ .with(TeamMemberRole.ADMIN, () => ({+ visibility: {+ in: [+ DocumentVisibility.EVERYONE,+ DocumentVisibility.MANAGER_AND_ABOVE,+ DocumentVisibility.ADMIN,+ ],+ },+ }))+ .with(TeamMemberRole.MANAGER, () => ({+ visibility: {+ in: [DocumentVisibility.EVERYONE, DocumentVisibility.MANAGER_AND_ABOVE],+ },+ }))+ .otherwise(() => ({ visibility: DocumentVisibility.EVERYONE }));++ const whereClause = {+ AND: [+ { parentId },+ teamId+ ? {+ OR: [+ { teamId, ...visibilityFilters },+ { userId, teamId },+ ],+ }+ : { userId, teamId: null },+ ],+ };++ try {+ const folders = await prisma.folder.findMany({+ where: {+ ...whereClause,+ ...(type ? { type } : {}),+ },+ orderBy: [{ pinned: 'desc' }, { createdAt: 'desc' }],+ });++ const foldersWithDetails = await Promise.all(+ folders.map(async (folder) => {+ try {+ const [subfolders, documentCount, templateCount, subfolderCount] = await Promise.all([+ prisma.folder.findMany({+ where: {+ parentId: folder.id,+ ...(teamId ? { teamId, ...visibilityFilters } : { userId, teamId: null }),+ },+ orderBy: {+ createdAt: 'desc',+ },+ }),+ prisma.document.count({+ where: {+ folderId: folder.id,+ },+ }),+ prisma.template.count({+ where: {+ folderId: folder.id,+ },+ }),+ prisma.folder.count({+ where: {+ parentId: folder.id,+ ...(teamId ? { teamId, ...visibilityFilters } : { userId, teamId: null }),+ },+ }),+ ]);++ const subfoldersWithEmptySubfolders = subfolders.map((subfolder) => ({+ ...subfolder,+ subfolders: [],+ _count: {+ documents: 0,+ templates: 0,+ subfolders: 0,+ },+ }));++ return {+ ...folder,+ subfolders: subfoldersWithEmptySubfolders,+ _count: {+ documents: documentCount,+ templates: templateCount,+ subfolders: subfolderCount,+ },+ };+ } catch (error) {+ console.error('Error processing folder:', folder.id, error);+ throw error;+ }+ }),+ );++ return foldersWithDetails;+ } catch (error) {+ console.error('Error in findFolders:', error);+ throw error;+ }+};diff --git a/packages/lib/server-only/folder/get-folder-breadcrumbs.ts b/packages/lib/server-only/folder/get-folder-breadcrumbs.tsnew file mode 100644index 000000000..c5d7327b0--- /dev/null+++ b/packages/lib/server-only/folder/get-folder-breadcrumbs.ts@@ -0,0 +1,112 @@+import { TeamMemberRole } from '@prisma/client';+import { match } from 'ts-pattern';++import { prisma } from '@documenso/prisma';++import { DocumentVisibility } from '../../types/document-visibility';+import type { TFolderType } from '../../types/folder-type';++export interface GetFolderBreadcrumbsOptions {+ userId: number;+ teamId?: number;+ folderId: string;+ type?: TFolderType;+}++export const getFolderBreadcrumbs = async ({+ userId,+ teamId,+ folderId,+ type,+}: GetFolderBreadcrumbsOptions) => {+ let teamMemberRole = null;++ if (teamId !== undefined) {+ try {+ const team = await prisma.team.findFirstOrThrow({+ where: {+ id: teamId,+ members: {+ some: {+ userId,+ },+ },+ },+ include: {+ members: {+ where: {+ userId,+ },+ select: {+ role: true,+ },+ },+ },+ });++ teamMemberRole = team.members[0].role;+ } catch (error) {+ console.error('Error finding team:', error);+ return [];+ }+ }++ const visibilityFilters = match(teamMemberRole)+ .with(TeamMemberRole.ADMIN, () => ({+ visibility: {+ in: [+ DocumentVisibility.EVERYONE,+ DocumentVisibility.MANAGER_AND_ABOVE,+ DocumentVisibility.ADMIN,+ ],+ },+ }))+ .with(TeamMemberRole.MANAGER, () => ({+ visibility: {+ in: [DocumentVisibility.EVERYONE, DocumentVisibility.MANAGER_AND_ABOVE],+ },+ }))+ .otherwise(() => ({ visibility: DocumentVisibility.EVERYONE }));++ const whereClause = (folderId: string) => ({+ id: folderId,+ ...(type ? { type } : {}),+ ...(teamId+ ? {+ OR: [+ { teamId, ...visibilityFilters },+ { userId, teamId },+ ],+ }+ : { userId, teamId: null }),+ });++ const breadcrumbs = [];+ let currentFolderId = folderId;++ const currentFolder = await prisma.folder.findFirst({+ where: whereClause(currentFolderId),+ });++ if (!currentFolder) {+ return [];+ }++ breadcrumbs.push(currentFolder);++ while (currentFolder?.parentId) {+ const parentFolder = await prisma.folder.findFirst({+ where: whereClause(currentFolder.parentId),+ });++ if (!parentFolder) {+ break;+ }++ breadcrumbs.unshift(parentFolder);+ currentFolderId = parentFolder.id;+ currentFolder.parentId = parentFolder.parentId;+ }++ return breadcrumbs;+};diff --git a/packages/lib/server-only/folder/get-folder-by-id.ts b/packages/lib/server-only/folder/get-folder-by-id.tsnew file mode 100644index 000000000..c4a069f90--- /dev/null+++ b/packages/lib/server-only/folder/get-folder-by-id.ts@@ -0,0 +1,92 @@+import { TeamMemberRole } from '@prisma/client';+import { match } from 'ts-pattern';++import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { prisma } from '@documenso/prisma';++import { DocumentVisibility } from '../../types/document-visibility';+import type { TFolderType } from '../../types/folder-type';++export interface GetFolderByIdOptions {+ userId: number;+ teamId?: number;+ folderId?: string;+ type?: TFolderType;+}++export const getFolderById = async ({ userId, teamId, folderId, type }: GetFolderByIdOptions) => {+ let teamMemberRole = null;++ if (teamId !== undefined) {+ try {+ const team = await prisma.team.findFirstOrThrow({+ where: {+ id: teamId,+ members: {+ some: {+ userId,+ },+ },+ },+ include: {+ members: {+ where: {+ userId,+ },+ select: {+ role: true,+ },+ },+ },+ });++ teamMemberRole = team.members[0].role;+ } catch (error) {+ throw new AppError(AppErrorCode.NOT_FOUND, {+ message: 'Team not found',+ });+ }+ }++ const visibilityFilters = match(teamMemberRole)+ .with(TeamMemberRole.ADMIN, () => ({+ visibility: {+ in: [+ DocumentVisibility.EVERYONE,+ DocumentVisibility.MANAGER_AND_ABOVE,+ DocumentVisibility.ADMIN,+ ],+ },+ }))+ .with(TeamMemberRole.MANAGER, () => ({+ visibility: {+ in: [DocumentVisibility.EVERYONE, DocumentVisibility.MANAGER_AND_ABOVE],+ },+ }))+ .otherwise(() => ({ visibility: DocumentVisibility.EVERYONE }));++ const whereClause = {+ id: folderId,+ ...(type ? { type } : {}),+ ...(teamId+ ? {+ OR: [+ { teamId, ...visibilityFilters },+ { userId, teamId },+ ],+ }+ : { userId, teamId: null }),+ };++ const folder = await prisma.folder.findFirst({+ where: whereClause,+ });++ if (!folder) {+ throw new AppError(AppErrorCode.NOT_FOUND, {+ message: 'Folder not found',+ });+ }++ return folder;+};diff --git a/packages/lib/server-only/folder/move-document-to-folder.ts b/packages/lib/server-only/folder/move-document-to-folder.tsnew file mode 100644index 000000000..d0ecb3188--- /dev/null+++ b/packages/lib/server-only/folder/move-document-to-folder.ts@@ -0,0 +1,130 @@+import { TeamMemberRole } from '@prisma/client';+import { match } from 'ts-pattern';++import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { DocumentVisibility } from '@documenso/lib/types/document-visibility';+import { FolderType } from '@documenso/lib/types/folder-type';+import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';+import { prisma } from '@documenso/prisma';++export interface MoveDocumentToFolderOptions {+ userId: number;+ teamId?: number;+ documentId: number;+ folderId?: string | null;+ requestMetadata?: ApiRequestMetadata;+}++export const moveDocumentToFolder = async ({+ userId,+ teamId,+ documentId,+ folderId,+}: MoveDocumentToFolderOptions) => {+ let teamMemberRole = null;++ if (teamId !== undefined) {+ try {+ const team = await prisma.team.findFirstOrThrow({+ where: {+ id: teamId,+ members: {+ some: {+ userId,+ },+ },+ },+ include: {+ members: {+ where: {+ userId,+ },+ select: {+ role: true,+ },+ },+ },+ });++ teamMemberRole = team.members[0].role;+ } catch (error) {+ console.error('Error finding team:', error);+ throw new AppError(AppErrorCode.NOT_FOUND, {+ message: 'Team not found',+ });+ }+ }++ const visibilityFilters = match(teamMemberRole)+ .with(TeamMemberRole.ADMIN, () => ({+ visibility: {+ in: [+ DocumentVisibility.EVERYONE,+ DocumentVisibility.MANAGER_AND_ABOVE,+ DocumentVisibility.ADMIN,+ ],+ },+ }))+ .with(TeamMemberRole.MANAGER, () => ({+ visibility: {+ in: [DocumentVisibility.EVERYONE, DocumentVisibility.MANAGER_AND_ABOVE],+ },+ }))+ .otherwise(() => ({ visibility: DocumentVisibility.EVERYONE }));++ const documentWhereClause = {+ id: documentId,+ ...(teamId+ ? {+ OR: [+ { teamId, ...visibilityFilters },+ { userId, teamId },+ ],+ }+ : { userId, teamId: null }),+ };++ const document = await prisma.document.findFirst({+ where: documentWhereClause,+ });++ if (!document) {+ throw new AppError(AppErrorCode.NOT_FOUND, {+ message: 'Document not found',+ });+ }++ if (folderId) {+ const folderWhereClause = {+ id: folderId,+ type: FolderType.DOCUMENT,+ ...(teamId+ ? {+ OR: [+ { teamId, ...visibilityFilters },+ { userId, teamId },+ ],+ }+ : { userId, teamId: null }),+ };++ const folder = await prisma.folder.findFirst({+ where: folderWhereClause,+ });++ if (!folder) {+ throw new AppError(AppErrorCode.NOT_FOUND, {+ message: 'Folder not found',+ });+ }+ }++ return await prisma.document.update({+ where: {+ id: documentId,+ },+ data: {+ folderId,+ },+ });+};diff --git a/packages/lib/server-only/folder/move-folder.ts b/packages/lib/server-only/folder/move-folder.tsnew file mode 100644index 000000000..84372a5d7--- /dev/null+++ b/packages/lib/server-only/folder/move-folder.ts@@ -0,0 +1,85 @@+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';+import { prisma } from '@documenso/prisma';++export interface MoveFolderOptions {+ userId: number;+ teamId?: number;+ folderId?: string;+ parentId?: string | null;+ requestMetadata?: ApiRequestMetadata;+}++export const moveFolder = async ({ userId, teamId, folderId, parentId }: MoveFolderOptions) => {+ return await prisma.$transaction(async (tx) => {+ const folder = await tx.folder.findFirst({+ where: {+ id: folderId,+ userId,+ teamId,+ },+ });++ if (!folder) {+ throw new AppError(AppErrorCode.NOT_FOUND, {+ message: 'Folder not found',+ });+ }++ if (parentId) {+ const parentFolder = await tx.folder.findFirst({+ where: {+ id: parentId,+ userId,+ teamId,+ type: folder.type,+ },+ });++ if (!parentFolder) {+ throw new AppError(AppErrorCode.NOT_FOUND, {+ message: 'Parent folder not found',+ });+ }++ if (parentId === folderId) {+ throw new AppError(AppErrorCode.INVALID_REQUEST, {+ message: 'Cannot move a folder into itself',+ });+ }++ let currentParentId = parentFolder.parentId;+ while (currentParentId) {+ if (currentParentId === folderId) {+ throw new AppError(AppErrorCode.INVALID_REQUEST, {+ message: 'Cannot move a folder into its descendant',+ });+ }++ const currentParent = await tx.folder.findUnique({+ where: {+ id: currentParentId,+ },+ select: {+ parentId: true,+ },+ });++ if (!currentParent) {+ break;+ }++ currentParentId = currentParent.parentId;+ }+ }++ return await tx.folder.update({+ where: {+ id: folderId,+ },+ data: {+ parentId,+ },+ });+ });+};diff --git a/packages/lib/server-only/folder/move-template-to-folder.ts b/packages/lib/server-only/folder/move-template-to-folder.tsnew file mode 100644index 000000000..f826fac3e--- /dev/null+++ b/packages/lib/server-only/folder/move-template-to-folder.ts@@ -0,0 +1,59 @@+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { FolderType } from '@documenso/lib/types/folder-type';+import { prisma } from '@documenso/prisma';++export interface MoveTemplateToFolderOptions {+ userId: number;+ teamId?: number;+ templateId: number;+ folderId?: string | null;+}++export const moveTemplateToFolder = async ({+ userId,+ teamId,+ templateId,+ folderId,+}: MoveTemplateToFolderOptions) => {+ return await prisma.$transaction(async (tx) => {+ const template = await tx.template.findFirst({+ where: {+ id: templateId,+ userId,+ teamId,+ },+ });++ if (!template) {+ throw new AppError(AppErrorCode.NOT_FOUND, {+ message: 'Template not found',+ });+ }++ if (folderId !== null) {+ const folder = await tx.folder.findFirst({+ where: {+ id: folderId,+ userId,+ teamId,+ type: FolderType.TEMPLATE,+ },+ });++ if (!folder) {+ throw new AppError(AppErrorCode.NOT_FOUND, {+ message: 'Folder not found',+ });+ }+ }++ return await tx.template.update({+ where: {+ id: templateId,+ },+ data: {+ folderId,+ },+ });+ });+};diff --git a/packages/lib/server-only/folder/pin-folder.ts b/packages/lib/server-only/folder/pin-folder.tsnew file mode 100644index 000000000..5ef38ece6--- /dev/null+++ b/packages/lib/server-only/folder/pin-folder.ts@@ -0,0 +1,37 @@+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { prisma } from '@documenso/prisma';++import type { TFolderType } from '../../types/folder-type';++export interface PinFolderOptions {+ userId: number;+ teamId?: number;+ folderId: string;+ type?: TFolderType;+}++export const pinFolder = async ({ userId, teamId, folderId, type }: PinFolderOptions) => {+ const folder = await prisma.folder.findFirst({+ where: {+ id: folderId,+ userId,+ teamId,+ type,+ },+ });++ if (!folder) {+ throw new AppError(AppErrorCode.NOT_FOUND, {+ message: 'Folder not found',+ });+ }++ return await prisma.folder.update({+ where: {+ id: folderId,+ },+ data: {+ pinned: true,+ },+ });+};diff --git a/packages/lib/server-only/folder/unpin-folder.ts b/packages/lib/server-only/folder/unpin-folder.tsnew file mode 100644index 000000000..b7a244bed--- /dev/null+++ b/packages/lib/server-only/folder/unpin-folder.ts@@ -0,0 +1,37 @@+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { prisma } from '@documenso/prisma';++import type { TFolderType } from '../../types/folder-type';++export interface UnpinFolderOptions {+ userId: number;+ teamId?: number;+ folderId: string;+ type?: TFolderType;+}++export const unpinFolder = async ({ userId, teamId, folderId, type }: UnpinFolderOptions) => {+ const folder = await prisma.folder.findFirst({+ where: {+ id: folderId,+ userId,+ teamId,+ type,+ },+ });++ if (!folder) {+ throw new AppError(AppErrorCode.NOT_FOUND, {+ message: 'Folder not found',+ });+ }++ return await prisma.folder.update({+ where: {+ id: folderId,+ },+ data: {+ pinned: false,+ },+ });+};diff --git a/packages/lib/server-only/folder/update-folder.ts b/packages/lib/server-only/folder/update-folder.tsnew file mode 100644index 000000000..064047752--- /dev/null+++ b/packages/lib/server-only/folder/update-folder.ts@@ -0,0 +1,53 @@+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { prisma } from '@documenso/prisma';+import { DocumentVisibility } from '@documenso/prisma/generated/types';++import type { TFolderType } from '../../types/folder-type';+import { FolderType } from '../../types/folder-type';++export interface UpdateFolderOptions {+ userId: number;+ teamId?: number;+ folderId: string;+ name: string;+ visibility: DocumentVisibility;+ type?: TFolderType;+}++export const updateFolder = async ({+ userId,+ teamId,+ folderId,+ name,+ visibility,+ type,+}: UpdateFolderOptions) => {+ const folder = await prisma.folder.findFirst({+ where: {+ id: folderId,+ userId,+ teamId,+ type,+ },+ });++ if (!folder) {+ throw new AppError(AppErrorCode.NOT_FOUND, {+ message: 'Folder not found',+ });+ }++ const isTemplateFolder = folder.type === FolderType.TEMPLATE;+ const effectiveVisibility =+ isTemplateFolder && teamId !== null ? DocumentVisibility.EVERYONE : visibility;++ return await prisma.folder.update({+ where: {+ id: folderId,+ },+ data: {+ name,+ visibility: effectiveVisibility,+ },+ });+};diff --git a/packages/lib/server-only/template/create-template.ts b/packages/lib/server-only/template/create-template.tsindex 8e884cce4..d2725eb41 100644--- a/packages/lib/server-only/template/create-template.ts+++ b/packages/lib/server-only/template/create-template.ts@@ -20,6 +20,7 @@ export const createTemplate = async ({userId,teamId,templateDocumentDataId,+ folderId,}: CreateTemplateOptions) => {let team = null;@@ -43,12 +44,38 @@ export const createTemplate = async ({}}+ const folder = await prisma.folder.findFirstOrThrow({+ where: {+ id: folderId,+ ...(teamId+ ? {+ team: {+ id: teamId,+ members: {+ some: {+ userId,+ },+ },+ },+ }+ : {+ userId,+ teamId: null,+ }),+ },+ });++ if (!team) {+ throw new AppError(AppErrorCode.NOT_FOUND);+ }+return await prisma.template.create({data: {title,userId,templateDocumentDataId,teamId,+ folderId: folder.id,templateMeta: {create: {language: team?.teamGlobalSettings?.documentLanguage,diff --git a/packages/lib/server-only/template/find-templates.ts b/packages/lib/server-only/template/find-templates.tsindex 94ba44fa2..206178eb4 100644--- a/packages/lib/server-only/template/find-templates.ts+++ b/packages/lib/server-only/template/find-templates.ts@@ -12,6 +12,7 @@ export type FindTemplatesOptions = {type?: Template['type'];page?: number;perPage?: number;+ folderId?: string;};export const findTemplates = async ({@@ -20,6 +21,7 @@ export const findTemplates = async ({type,page = 1,perPage = 10,+ folderId,}: FindTemplatesOptions) => {const whereFilter: Prisma.TemplateWhereInput[] = [];@@ -67,6 +69,12 @@ export const findTemplates = async ({);}+ if (folderId) {+ whereFilter.push({ folderId });+ } else {+ whereFilter.push({ folderId: null });+ }+const [data, count] = await Promise.all([prisma.template.findMany({where: {diff --git a/packages/lib/server-only/template/get-template-by-id.ts b/packages/lib/server-only/template/get-template-by-id.tsindex e978d75bb..3652d1643 100644--- a/packages/lib/server-only/template/get-template-by-id.ts+++ b/packages/lib/server-only/template/get-template-by-id.ts@@ -6,9 +6,15 @@ export type GetTemplateByIdOptions = {id: number;userId: number;teamId?: number;+ folderId?: string | null;};-export const getTemplateById = async ({ id, userId, teamId }: GetTemplateByIdOptions) => {+export const getTemplateById = async ({+ id,+ userId,+ teamId,+ folderId = null,+}: GetTemplateByIdOptions) => {const template = await prisma.template.findFirst({where: {id,@@ -27,6 +33,7 @@ export const getTemplateById = async ({ id, userId, teamId }: GetTemplateByIdOptuserId,teamId: null,}),+ ...(folderId ? { folderId } : {}),},include: {directLink: true,@@ -41,6 +48,7 @@ export const getTemplateById = async ({ id, userId, teamId }: GetTemplateByIdOptemail: true,},},+ folder: true,},});diff --git a/packages/lib/types/document.ts b/packages/lib/types/document.tsindex 0835f8ce7..2b2fe8284 100644--- a/packages/lib/types/document.ts+++ b/packages/lib/types/document.ts@@ -3,6 +3,7 @@ import type { z } from 'zod';import { DocumentDataSchema } from '@documenso/prisma/generated/zod/modelSchema/DocumentDataSchema';import { DocumentMetaSchema } from '@documenso/prisma/generated/zod/modelSchema/DocumentMetaSchema';import { DocumentSchema } from '@documenso/prisma/generated/zod/modelSchema/DocumentSchema';+import { FolderSchema } from '@documenso/prisma/generated/zod/modelSchema/FolderSchema';import { TeamSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';import { UserSchema } from '@documenso/prisma/generated/zod/modelSchema/UserSchema';@@ -31,6 +32,7 @@ export const ZDocumentSchema = DocumentSchema.pick({deletedAt: true,teamId: true,templateId: true,+ folderId: true,}).extend({// Todo: Maybe we want to alter this a bit since this returns a lot of data.documentData: DocumentDataSchema.pick({@@ -57,6 +59,18 @@ export const ZDocumentSchema = DocumentSchema.pick({language: true,emailSettings: true,}).nullable(),+ folder: FolderSchema.pick({+ id: true,+ name: true,+ type: true,+ visibility: true,+ userId: true,+ teamId: true,+ pinned: true,+ parentId: true,+ createdAt: true,+ updatedAt: true,+ }).nullable(),recipients: ZRecipientLiteSchema.array(),fields: ZFieldSchema.array(),});@@ -83,6 +97,7 @@ export const ZDocumentLiteSchema = DocumentSchema.pick({deletedAt: true,teamId: true,templateId: true,+ folderId: true,useLegacyFieldInsertion: true,});@@ -108,6 +123,7 @@ export const ZDocumentManySchema = DocumentSchema.pick({deletedAt: true,teamId: true,templateId: true,+ folderId: true,useLegacyFieldInsertion: true,}).extend({user: UserSchema.pick({diff --git a/packages/lib/types/folder-type.ts b/packages/lib/types/folder-type.tsnew file mode 100644index 000000000..fd169c4b0--- /dev/null+++ b/packages/lib/types/folder-type.ts@@ -0,0 +1,9 @@+import { z } from 'zod';++export const FolderType = {+ DOCUMENT: 'DOCUMENT',+ TEMPLATE: 'TEMPLATE',+} as const;++export const ZFolderTypeSchema = z.enum([FolderType.DOCUMENT, FolderType.TEMPLATE]);+export type TFolderType = z.infer<typeof ZFolderTypeSchema>;diff --git a/packages/lib/types/template.ts b/packages/lib/types/template.tsindex 2f36336c4..f5f5dd6f0 100644--- a/packages/lib/types/template.ts+++ b/packages/lib/types/template.ts@@ -1,6 +1,7 @@import type { z } from 'zod';import { DocumentDataSchema } from '@documenso/prisma/generated/zod/modelSchema/DocumentDataSchema';+import { FolderSchema } from '@documenso/prisma/generated/zod/modelSchema/FolderSchema';import TeamSchema from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';import { TemplateDirectLinkSchema } from '@documenso/prisma/generated/zod/modelSchema/TemplateDirectLinkSchema';import { TemplateMetaSchema } from '@documenso/prisma/generated/zod/modelSchema/TemplateMetaSchema';@@ -29,6 +30,7 @@ export const ZTemplateSchema = TemplateSchema.pick({updatedAt: true,publicTitle: true,publicDescription: true,+ folderId: true,}).extend({// Todo: Maybe we want to alter this a bit since this returns a lot of data.templateDocumentData: DocumentDataSchema.pick({@@ -62,6 +64,18 @@ export const ZTemplateSchema = TemplateSchema.pick({}),recipients: ZRecipientLiteSchema.array(),fields: ZFieldSchema.array(),+ folder: FolderSchema.pick({+ id: true,+ name: true,+ type: true,+ visibility: true,+ userId: true,+ teamId: true,+ pinned: true,+ parentId: true,+ createdAt: true,+ updatedAt: true,+ }).nullable(),});export type TTemplate = z.infer<typeof ZTemplateSchema>;@@ -83,6 +97,7 @@ export const ZTemplateLiteSchema = TemplateSchema.pick({updatedAt: true,publicTitle: true,publicDescription: true,+ folderId: true,useLegacyFieldInsertion: true,});@@ -103,6 +118,7 @@ export const ZTemplateManySchema = TemplateSchema.pick({updatedAt: true,publicTitle: true,publicDescription: true,+ folderId: true,useLegacyFieldInsertion: true,}).extend({team: TeamSchema.pick({diff --git a/packages/lib/utils/format-folder-count.ts b/packages/lib/utils/format-folder-count.tsnew file mode 100644index 000000000..ebd822554--- /dev/null+++ b/packages/lib/utils/format-folder-count.ts@@ -0,0 +1,5 @@+export function formatFolderCount(count: number, singular: string, plural?: string): string {+ const itemLabel = count === 1 ? singular : plural || `${singular}s`;++ return `${count} ${itemLabel}`;+}diff --git a/packages/prisma/migrations/20250318072444_add_document_folders/migration.sql b/packages/prisma/migrations/20250318072444_add_document_folders/migration.sqlnew file mode 100644index 000000000..a29ece39d--- /dev/null+++ b/packages/prisma/migrations/20250318072444_add_document_folders/migration.sql@@ -0,0 +1,39 @@+-- AlterTable+ALTER TABLE "Document" ADD COLUMN "folderId" INTEGER;++-- CreateTable+CREATE TABLE "Folder" (+ "id" SERIAL NOT NULL,+ "name" TEXT NOT NULL,+ "userId" INTEGER NOT NULL,+ "teamId" INTEGER,+ "parentId" INTEGER,+ "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,+ "updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,++ CONSTRAINT "Folder_pkey" PRIMARY KEY ("id")+);++-- CreateIndex+CREATE INDEX "Folder_userId_idx" ON "Folder"("userId");++-- CreateIndex+CREATE INDEX "Folder_teamId_idx" ON "Folder"("teamId");++-- CreateIndex+CREATE INDEX "Folder_parentId_idx" ON "Folder"("parentId");++-- CreateIndex+CREATE INDEX "Document_folderId_idx" ON "Document"("folderId");++-- AddForeignKey+ALTER TABLE "Folder" ADD CONSTRAINT "Folder_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;++-- AddForeignKey+ALTER TABLE "Folder" ADD CONSTRAINT "Folder_teamId_fkey" FOREIGN KEY ("teamId") REFERENCES "Team"("id") ON DELETE CASCADE ON UPDATE CASCADE;++-- AddForeignKey+ALTER TABLE "Folder" ADD CONSTRAINT "Folder_parentId_fkey" FOREIGN KEY ("parentId") REFERENCES "Folder"("id") ON DELETE CASCADE ON UPDATE CASCADE;++-- AddForeignKey+ALTER TABLE "Document" ADD CONSTRAINT "Document_folderId_fkey" FOREIGN KEY ("folderId") REFERENCES "Folder"("id") ON DELETE SET NULL ON UPDATE CASCADE;diff --git a/packages/prisma/migrations/20250324135010_model_folder_update_id_type_and_add_pinned_property/migration.sql b/packages/prisma/migrations/20250324135010_model_folder_update_id_type_and_add_pinned_property/migration.sqlnew file mode 100644index 000000000..a7a232d4a--- /dev/null+++ b/packages/prisma/migrations/20250324135010_model_folder_update_id_type_and_add_pinned_property/migration.sql@@ -0,0 +1,29 @@+/*+ Warnings:++ - The primary key for the `Folder` table will be changed. If it partially fails, the table could be left without primary key constraint.++*/+-- DropForeignKey+ALTER TABLE "Document" DROP CONSTRAINT "Document_folderId_fkey";++-- DropForeignKey+ALTER TABLE "Folder" DROP CONSTRAINT "Folder_parentId_fkey";++-- AlterTable+ALTER TABLE "Document" ALTER COLUMN "folderId" SET DATA TYPE TEXT;++-- AlterTable+ALTER TABLE "Folder" DROP CONSTRAINT "Folder_pkey",+ADD COLUMN "pinned" BOOLEAN NOT NULL DEFAULT false,+ALTER COLUMN "id" DROP DEFAULT,+ALTER COLUMN "id" SET DATA TYPE TEXT,+ALTER COLUMN "parentId" SET DATA TYPE TEXT,+ADD CONSTRAINT "Folder_pkey" PRIMARY KEY ("id");+DROP SEQUENCE "Folder_id_seq";++-- AddForeignKey+ALTER TABLE "Folder" ADD CONSTRAINT "Folder_parentId_fkey" FOREIGN KEY ("parentId") REFERENCES "Folder"("id") ON DELETE CASCADE ON UPDATE CASCADE;++-- AddForeignKey+ALTER TABLE "Document" ADD CONSTRAINT "Document_folderId_fkey" FOREIGN KEY ("folderId") REFERENCES "Folder"("id") ON DELETE SET NULL ON UPDATE CASCADE;diff --git a/packages/prisma/migrations/20250328135807_add_folder_visibility/migration.sql b/packages/prisma/migrations/20250328135807_add_folder_visibility/migration.sqlnew file mode 100644index 000000000..0b21867ee--- /dev/null+++ b/packages/prisma/migrations/20250328135807_add_folder_visibility/migration.sql@@ -0,0 +1,2 @@+-- AlterTable+ALTER TABLE "Folder" ADD COLUMN "visibility" "DocumentVisibility" NOT NULL DEFAULT 'EVERYONE';diff --git a/packages/prisma/migrations/20250404111643_add_folder_type_and_template_folders/migration.sql b/packages/prisma/migrations/20250404111643_add_folder_type_and_template_folders/migration.sqlnew file mode 100644index 000000000..8d9bb1471--- /dev/null+++ b/packages/prisma/migrations/20250404111643_add_folder_type_and_template_folders/migration.sql@@ -0,0 +1,20 @@+/*+ Warnings:++ - Added the required column `type` to the `Folder` table without a default value. This is not possible if the table is not empty.++*/+-- CreateEnum+CREATE TYPE "FolderType" AS ENUM ('DOCUMENT', 'TEMPLATE');++-- AlterTable+ALTER TABLE "Folder" ADD COLUMN "type" "FolderType" NOT NULL;++-- AlterTable+ALTER TABLE "Template" ADD COLUMN "folderId" TEXT;++-- CreateIndex+CREATE INDEX "Folder_type_idx" ON "Folder"("type");++-- AddForeignKey+ALTER TABLE "Template" ADD CONSTRAINT "Template_folderId_fkey" FOREIGN KEY ("folderId") REFERENCES "Folder"("id") ON DELETE SET NULL ON UPDATE CASCADE;diff --git a/packages/prisma/migrations/20250407124054_add_delete_oncascade_folder/migration.sql b/packages/prisma/migrations/20250407124054_add_delete_oncascade_folder/migration.sqlnew file mode 100644index 000000000..5ba34c882--- /dev/null+++ b/packages/prisma/migrations/20250407124054_add_delete_oncascade_folder/migration.sql@@ -0,0 +1,11 @@+-- DropForeignKey+ALTER TABLE "Document" DROP CONSTRAINT "Document_folderId_fkey";++-- DropForeignKey+ALTER TABLE "Template" DROP CONSTRAINT "Template_folderId_fkey";++-- AddForeignKey+ALTER TABLE "Document" ADD CONSTRAINT "Document_folderId_fkey" FOREIGN KEY ("folderId") REFERENCES "Folder"("id") ON DELETE CASCADE ON UPDATE CASCADE;++-- AddForeignKey+ALTER TABLE "Template" ADD CONSTRAINT "Template_folderId_fkey" FOREIGN KEY ("folderId") REFERENCES "Folder"("id") ON DELETE CASCADE ON UPDATE CASCADE;diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prismaindex c5b0069b0..56558ad6c 100644--- a/packages/prisma/schema.prisma+++ b/packages/prisma/schema.prisma@@ -56,6 +56,7 @@ model User {accounts Account[]sessions Session[]documents Document[]+ folders Folder[]subscriptions Subscription[]passwordResetTokens PasswordResetToken[]ownedTeams Team[]@@ -312,6 +313,35 @@ enum DocumentVisibility {ADMIN}+enum FolderType {+ DOCUMENT+ TEMPLATE+}++model Folder {+ id String @id @default(cuid())+ name String+ userId Int+ user User @relation(fields: [userId], references: [id], onDelete: Cascade)+ teamId Int?+ team Team? @relation(fields: [teamId], references: [id], onDelete: Cascade)+ pinned Boolean @default(false)+ parentId String?+ parent Folder? @relation("FolderToFolder", fields: [parentId], references: [id], onDelete: Cascade)+ documents Document[]+ templates Template[]+ createdAt DateTime @default(now())+ updatedAt DateTime @default(now()) @updatedAt+ subfolders Folder[] @relation("FolderToFolder")+ visibility DocumentVisibility @default(EVERYONE)+ type FolderType++ @@index([userId])+ @@index([teamId])+ @@index([parentId])+ @@index([type])+}+/// @zod.import(["import { ZDocumentAuthOptionsSchema } from '@documenso/lib/types/document-auth';", "import { ZDocumentFormValuesSchema } from '@documenso/lib/types/document-form-values';"])model Document {id Int @id @default(autoincrement())@@ -344,10 +374,13 @@ model Document {template Template? @relation(fields: [templateId], references: [id], onDelete: SetNull)auditLogs DocumentAuditLog[]+ folder Folder? @relation(fields: [folderId], references: [id], onDelete: Cascade)+ folderId String?@@unique([documentDataId])@@index([userId])@@index([status])+ @@index([folderId])}model DocumentAuditLog {@@ -593,6 +626,7 @@ model Team {documents Document[]templates Template[]+ folders Folder[]apiTokens ApiToken[]webhooks Webhook[]}@@ -721,6 +755,8 @@ model Template {fields Field[]directLink TemplateDirectLink?documents Document[]+ folder Folder? @relation(fields: [folderId], references: [id], onDelete: Cascade)+ folderId String?@@unique([templateDocumentDataId])}diff --git a/packages/prisma/seed/folders.ts b/packages/prisma/seed/folders.tsnew file mode 100644index 000000000..d388eaca9--- /dev/null+++ b/packages/prisma/seed/folders.ts@@ -0,0 +1,33 @@+import type { User } from '@prisma/client';+import { DocumentStatus, FolderType } from '@prisma/client';++import { prisma } from '..';+import type { Prisma } from '../client';+import { seedDocuments } from './documents';++type CreateFolderOptions = {+ type?: string;+ createFolderOptions?: Partial<Prisma.FolderUncheckedCreateInput>;+};++export const seedBlankFolder = async (user: User, options: CreateFolderOptions = {}) => {+ return await prisma.folder.create({+ data: {+ name: 'My folder',+ userId: user.id,+ type: FolderType.DOCUMENT,+ ...options.createFolderOptions,+ },+ });+};++export const seedFolderWithDocuments = async (user: User, options: CreateFolderOptions = {}) => {+ const folder = await seedBlankFolder(user, options);+ await seedDocuments([+ {+ sender: user,+ recipients: [user],+ type: DocumentStatus.DRAFT,+ },+ ]);+};diff --git a/packages/trpc/server/document-router/router.ts b/packages/trpc/server/document-router/router.tsindex 53b5bbd30..2a14ed30e 100644--- a/packages/trpc/server/document-router/router.ts+++ b/packages/trpc/server/document-router/router.ts@@ -107,8 +107,17 @@ export const documentRouter = router({.query(async ({ input, ctx }) => {const { user, teamId } = ctx;- const { query, templateId, page, perPage, orderByDirection, orderByColumn, source, status } =- input;+ const {+ query,+ templateId,+ page,+ perPage,+ orderByDirection,+ orderByColumn,+ source,+ status,+ folderId,+ } = input;const documents = await findDocuments({userId: user.id,@@ -119,6 +128,7 @@ export const documentRouter = router({status,page,perPage,+ folderId,orderBy: orderByColumn ? { column: orderByColumn, direction: orderByDirection } : undefined,});@@ -147,12 +157,14 @@ export const documentRouter = router({status,period,senderIds,+ folderId,} = input;const getStatOptions: GetStatsInput = {user,period,search: query,+ folderId,};if (teamId) {@@ -181,6 +193,7 @@ export const documentRouter = router({status,period,senderIds,+ folderId,orderBy: orderByColumn? { column: orderByColumn, direction: orderByDirection }: undefined,@@ -212,12 +225,13 @@ export const documentRouter = router({.output(ZGetDocumentWithDetailsByIdResponseSchema).query(async ({ input, ctx }) => {const { teamId, user } = ctx;- const { documentId } = input;+ const { documentId, folderId } = input;return await getDocumentWithDetailsById({userId: user.id,teamId,documentId,+ folderId,});}),@@ -290,6 +304,7 @@ export const documentRouter = router({return {document: createdDocument,+ folder: createdDocument.folder,uploadUrl: url,};}),@@ -311,7 +326,7 @@ export const documentRouter = router({.input(ZCreateDocumentRequestSchema).mutation(async ({ input, ctx }) => {const { teamId } = ctx;- const { title, documentDataId, timezone } = input;+ const { title, documentDataId, timezone, folderId } = input;const { remaining } = await getServerLimits({ email: ctx.user.email, teamId });@@ -330,6 +345,7 @@ export const documentRouter = router({normalizePdf: true,timezone,requestMetadata: ctx.metadata,+ folderId,});}),diff --git a/packages/trpc/server/document-router/schema.ts b/packages/trpc/server/document-router/schema.tsindex 2b5e06a3d..ac977de28 100644--- a/packages/trpc/server/document-router/schema.ts+++ b/packages/trpc/server/document-router/schema.ts@@ -130,6 +130,7 @@ export const ZFindDocumentsRequestSchema = ZFindSearchParamsSchema.extend({.nativeEnum(DocumentStatus).describe('Filter documents by the current status').optional(),+ folderId: z.string().describe('Filter documents by folder ID').optional(),orderByColumn: z.enum(['createdAt']).optional(),orderByDirection: z.enum(['asc', 'desc']).describe('').default('desc'),});@@ -144,6 +145,7 @@ export const ZFindDocumentsInternalRequestSchema = ZFindDocumentsRequestSchema.eperiod: z.enum(['7d', '14d', '30d']).optional(),senderIds: z.array(z.number()).optional(),status: z.nativeEnum(ExtendedDocumentStatus).optional(),+ folderId: z.string().optional(),});export const ZFindDocumentsInternalResponseSchema = ZFindResultResponse.extend({@@ -188,6 +190,7 @@ export type TGetDocumentByTokenQuerySchema = z.infer<typeof ZGetDocumentByTokenQexport const ZGetDocumentWithDetailsByIdRequestSchema = z.object({documentId: z.number(),+ folderId: z.string().describe('Filter documents by folder ID').optional(),});export const ZGetDocumentWithDetailsByIdResponseSchema = ZDocumentSchema;@@ -196,6 +199,7 @@ export const ZCreateDocumentRequestSchema = z.object({title: ZDocumentTitleSchema,documentDataId: z.string().min(1),timezone: ZDocumentMetaTimezoneSchema.optional(),+ folderId: z.string().describe('The ID of the folder to create the document in').optional(),});export const ZCreateDocumentV2RequestSchema = z.object({diff --git a/packages/trpc/server/folder-router/router.ts b/packages/trpc/server/folder-router/router.tsnew file mode 100644index 000000000..fb3883481--- /dev/null+++ b/packages/trpc/server/folder-router/router.ts@@ -0,0 +1,354 @@+import { TRPCError } from '@trpc/server';++import { createFolder } from '@documenso/lib/server-only/folder/create-folder';+import { deleteFolder } from '@documenso/lib/server-only/folder/delete-folder';+import { findFolders } from '@documenso/lib/server-only/folder/find-folders';+import { getFolderBreadcrumbs } from '@documenso/lib/server-only/folder/get-folder-breadcrumbs';+import { getFolderById } from '@documenso/lib/server-only/folder/get-folder-by-id';+import { moveDocumentToFolder } from '@documenso/lib/server-only/folder/move-document-to-folder';+import { moveFolder } from '@documenso/lib/server-only/folder/move-folder';+import { moveTemplateToFolder } from '@documenso/lib/server-only/folder/move-template-to-folder';+import { pinFolder } from '@documenso/lib/server-only/folder/pin-folder';+import { unpinFolder } from '@documenso/lib/server-only/folder/unpin-folder';+import { updateFolder } from '@documenso/lib/server-only/folder/update-folder';+import { FolderType } from '@documenso/lib/types/folder-type';++import { authenticatedProcedure, router } from '../trpc';+import {+ ZCreateFolderSchema,+ ZDeleteFolderSchema,+ ZFindFoldersRequestSchema,+ ZFindFoldersResponseSchema,+ ZGenericSuccessResponse,+ ZGetFoldersResponseSchema,+ ZGetFoldersSchema,+ ZMoveDocumentToFolderSchema,+ ZMoveFolderSchema,+ ZMoveTemplateToFolderSchema,+ ZPinFolderSchema,+ ZSuccessResponseSchema,+ ZUnpinFolderSchema,+ ZUpdateFolderSchema,+} from './schema';++export const folderRouter = router({+ /**+ * @private+ */+ getFolders: authenticatedProcedure+ .input(ZGetFoldersSchema)+ .output(ZGetFoldersResponseSchema)+ .query(async ({ input, ctx }) => {+ const { teamId, user } = ctx;+ const { parentId, type } = input;++ const folders = await findFolders({+ userId: user.id,+ teamId,+ parentId,+ type,+ });++ const breadcrumbs = parentId+ ? await getFolderBreadcrumbs({+ userId: user.id,+ teamId,+ folderId: parentId,+ type,+ })+ : [];++ return {+ folders,+ breadcrumbs,+ type,+ };+ }),++ /**+ * @private+ */+ findFolders: authenticatedProcedure+ .input(ZFindFoldersRequestSchema)+ .output(ZFindFoldersResponseSchema)+ .query(async ({ input, ctx }) => {+ const { teamId, user } = ctx;+ const { parentId, type } = input;++ const folders = await findFolders({+ userId: user.id,+ teamId,+ parentId,+ type,+ });++ const breadcrumbs = parentId+ ? await getFolderBreadcrumbs({+ userId: user.id,+ teamId,+ folderId: parentId,+ type,+ })+ : [];++ return {+ data: folders,+ breadcrumbs,+ type,+ };+ }),++ /**+ * @private+ */+ createFolder: authenticatedProcedure+ .input(ZCreateFolderSchema)+ .mutation(async ({ input, ctx }) => {+ const { teamId, user } = ctx;+ const { name, parentId, type } = input;++ if (parentId) {+ try {+ await getFolderById({+ userId: user.id,+ teamId,+ folderId: parentId,+ type,+ });+ } catch (error) {+ throw new TRPCError({+ code: 'NOT_FOUND',+ message: 'Parent folder not found',+ });+ }+ }++ const result = await createFolder({+ userId: user.id,+ teamId,+ name,+ parentId,+ type,+ });++ return {+ ...result,+ type,+ };+ }),++ /**+ * @private+ */+ updateFolder: authenticatedProcedure+ .input(ZUpdateFolderSchema)+ .mutation(async ({ input, ctx }) => {+ const { teamId, user } = ctx;+ const { id, name, visibility } = input;++ const currentFolder = await getFolderById({+ userId: user.id,+ teamId,+ folderId: id,+ });++ const result = await updateFolder({+ userId: user.id,+ teamId,+ folderId: id,+ name,+ visibility,+ type: currentFolder.type,+ });++ return {+ ...result,+ type: currentFolder.type,+ };+ }),++ /**+ * @private+ */+ deleteFolder: authenticatedProcedure+ .input(ZDeleteFolderSchema)+ .output(ZSuccessResponseSchema)+ .mutation(async ({ input, ctx }) => {+ const { teamId, user } = ctx;+ const { id } = input;++ await deleteFolder({+ userId: user.id,+ teamId,+ folderId: id,+ });++ return ZGenericSuccessResponse;+ }),++ /**+ * @private+ */+ moveFolder: authenticatedProcedure.input(ZMoveFolderSchema).mutation(async ({ input, ctx }) => {+ const { teamId, user } = ctx;+ const { id, parentId } = input;++ const currentFolder = await getFolderById({+ userId: user.id,+ teamId,+ folderId: id,+ });++ if (parentId !== null) {+ try {+ await getFolderById({+ userId: user.id,+ teamId,+ folderId: parentId,+ type: currentFolder.type,+ });+ } catch (error) {+ throw new TRPCError({+ code: 'NOT_FOUND',+ message: 'Parent folder not found',+ });+ }+ }++ const result = await moveFolder({+ userId: user.id,+ teamId,+ folderId: id,+ parentId,+ requestMetadata: ctx.metadata,+ });++ return {+ ...result,+ type: currentFolder.type,+ };+ }),++ /**+ * @private+ */+ moveDocumentToFolder: authenticatedProcedure+ .input(ZMoveDocumentToFolderSchema)+ .mutation(async ({ input, ctx }) => {+ const { teamId, user } = ctx;+ const { documentId, folderId } = input;++ if (folderId !== null) {+ try {+ await getFolderById({+ userId: user.id,+ teamId,+ folderId,+ type: FolderType.DOCUMENT,+ });+ } catch (error) {+ throw new TRPCError({+ code: 'NOT_FOUND',+ message: 'Folder not found',+ });+ }+ }++ const result = await moveDocumentToFolder({+ userId: user.id,+ teamId,+ documentId,+ folderId,+ requestMetadata: ctx.metadata,+ });++ return {+ ...result,+ type: FolderType.DOCUMENT,+ };+ }),++ /**+ * @private+ */+ moveTemplateToFolder: authenticatedProcedure+ .input(ZMoveTemplateToFolderSchema)+ .mutation(async ({ input, ctx }) => {+ const { teamId, user } = ctx;+ const { templateId, folderId } = input;++ if (folderId !== null) {+ try {+ await getFolderById({+ userId: user.id,+ teamId,+ folderId,+ type: FolderType.TEMPLATE,+ });+ } catch (error) {+ throw new TRPCError({+ code: 'NOT_FOUND',+ message: 'Folder not found',+ });+ }+ }++ const result = await moveTemplateToFolder({+ userId: user.id,+ teamId,+ templateId,+ folderId,+ });++ return {+ ...result,+ type: FolderType.TEMPLATE,+ };+ }),++ /**+ * @private+ */+ pinFolder: authenticatedProcedure.input(ZPinFolderSchema).mutation(async ({ ctx, input }) => {+ const currentFolder = await getFolderById({+ userId: ctx.user.id,+ teamId: ctx.teamId,+ folderId: input.folderId,+ });++ const result = await pinFolder({+ userId: ctx.user.id,+ teamId: ctx.teamId,+ folderId: input.folderId,+ type: currentFolder.type,+ });++ return {+ ...result,+ type: currentFolder.type,+ };+ }),++ /**+ * @private+ */+ unpinFolder: authenticatedProcedure.input(ZUnpinFolderSchema).mutation(async ({ ctx, input }) => {+ const currentFolder = await getFolderById({+ userId: ctx.user.id,+ teamId: ctx.teamId,+ folderId: input.folderId,+ });++ const result = await unpinFolder({+ userId: ctx.user.id,+ teamId: ctx.teamId,+ folderId: input.folderId,+ type: currentFolder.type,+ });++ return {+ ...result,+ type: currentFolder.type,+ };+ }),+});diff --git a/packages/trpc/server/folder-router/schema.ts b/packages/trpc/server/folder-router/schema.tsnew file mode 100644index 000000000..72d8e17d9--- /dev/null+++ b/packages/trpc/server/folder-router/schema.ts@@ -0,0 +1,132 @@+import { z } from 'zod';++import { ZFolderTypeSchema } from '@documenso/lib/types/folder-type';+import { DocumentVisibility } from '@documenso/prisma/generated/types';++/**+ * Required for empty responses since we currently can't 201 requests for our openapi setup.+ *+ * Without this it will throw an error in Speakeasy SDK when it tries to parse an empty response.+ */+export const ZSuccessResponseSchema = z.object({+ success: z.boolean(),+ type: ZFolderTypeSchema.optional(),+});++export const ZGenericSuccessResponse = {+ success: true,+} satisfies z.infer<typeof ZSuccessResponseSchema>;++export const ZFolderSchema = z.object({+ id: z.string(),+ name: z.string(),+ userId: z.number(),+ teamId: z.number().nullable(),+ parentId: z.string().nullable(),+ pinned: z.boolean(),+ createdAt: z.date(),+ updatedAt: z.date(),+ visibility: z.nativeEnum(DocumentVisibility),+ type: ZFolderTypeSchema,+});++export type TFolder = z.infer<typeof ZFolderSchema>;++const ZFolderCountSchema = z.object({+ documents: z.number(),+ templates: z.number(),+ subfolders: z.number(),+});++const ZSubfolderSchema = ZFolderSchema.extend({+ subfolders: z.array(z.any()),+ _count: ZFolderCountSchema,+});++export const ZFolderWithSubfoldersSchema = ZFolderSchema.extend({+ subfolders: z.array(ZSubfolderSchema),+ _count: ZFolderCountSchema,+});++export type TFolderWithSubfolders = z.infer<typeof ZFolderWithSubfoldersSchema>;++export const ZCreateFolderSchema = z.object({+ name: z.string(),+ parentId: z.string().optional(),+ type: ZFolderTypeSchema.optional(),+});++export const ZUpdateFolderSchema = z.object({+ id: z.string(),+ name: z.string(),+ visibility: z.nativeEnum(DocumentVisibility),+ type: ZFolderTypeSchema.optional(),+});++export type TUpdateFolderSchema = z.infer<typeof ZUpdateFolderSchema>;++export const ZDeleteFolderSchema = z.object({+ id: z.string(),+ type: ZFolderTypeSchema.optional(),+});++export const ZMoveFolderSchema = z.object({+ id: z.string(),+ parentId: z.string().nullable(),+ type: ZFolderTypeSchema.optional(),+});++export const ZMoveDocumentToFolderSchema = z.object({+ documentId: z.number(),+ folderId: z.string().nullable().optional(),+ type: z.enum(['DOCUMENT']).optional(),+});++export const ZMoveTemplateToFolderSchema = z.object({+ templateId: z.number(),+ folderId: z.string().nullable().optional(),+ type: z.enum(['TEMPLATE']).optional(),+});++export const ZPinFolderSchema = z.object({+ folderId: z.string(),+ type: ZFolderTypeSchema.optional(),+});++export const ZUnpinFolderSchema = z.object({+ folderId: z.string(),+ type: ZFolderTypeSchema.optional(),+});++export const ZGetFoldersSchema = z.object({+ parentId: z.string().nullable().optional(),+ type: ZFolderTypeSchema.optional(),+});++export const ZGetFoldersResponseSchema = z.object({+ folders: z.array(ZFolderWithSubfoldersSchema),+ breadcrumbs: z.array(ZFolderSchema),+ type: ZFolderTypeSchema.optional(),+});++export type TGetFoldersResponse = z.infer<typeof ZGetFoldersResponseSchema>;++export const ZFindSearchParamsSchema = z.object({+ query: z.string().optional(),+ page: z.number().optional(),+ perPage: z.number().optional(),+ type: ZFolderTypeSchema.optional(),+});++export const ZFindFoldersRequestSchema = ZFindSearchParamsSchema.extend({+ parentId: z.string().nullable().optional(),+ type: ZFolderTypeSchema.optional(),+});++export const ZFindFoldersResponseSchema = z.object({+ data: z.array(ZFolderWithSubfoldersSchema),+ breadcrumbs: z.array(ZFolderSchema),+ type: ZFolderTypeSchema.optional(),+});++export type TFindFoldersResponse = z.infer<typeof ZFindFoldersResponseSchema>;diff --git a/packages/trpc/server/router.ts b/packages/trpc/server/router.tsindex 8096bd121..efd133547 100644--- a/packages/trpc/server/router.ts+++ b/packages/trpc/server/router.ts@@ -4,6 +4,7 @@ import { authRouter } from './auth-router/router';import { documentRouter } from './document-router/router';import { embeddingPresignRouter } from './embedding-router/_router';import { fieldRouter } from './field-router/router';+import { folderRouter } from './folder-router/router';import { profileRouter } from './profile-router/router';import { recipientRouter } from './recipient-router/router';import { shareLinkRouter } from './share-link-router/router';@@ -17,6 +18,7 @@ export const appRouter = router({profile: profileRouter,document: documentRouter,field: fieldRouter,+ folder: folderRouter,recipient: recipientRouter,admin: adminRouter,shareLink: shareLinkRouter,diff --git a/packages/trpc/server/template-router/router.ts b/packages/trpc/server/template-router/router.tsindex 3b3f13218..b11fae91a 100644--- a/packages/trpc/server/template-router/router.ts+++ b/packages/trpc/server/template-router/router.ts@@ -121,13 +121,14 @@ export const templateRouter = router({.output(ZCreateTemplateResponseSchema).mutation(async ({ input, ctx }) => {const { teamId } = ctx;- const { title, templateDocumentDataId } = input;+ const { title, templateDocumentDataId, folderId } = input;return await createTemplate({userId: ctx.user.id,teamId,title,templateDocumentDataId,+ folderId,});}),diff --git a/packages/trpc/server/template-router/schema.ts b/packages/trpc/server/template-router/schema.tsindex 2d8481395..fc193abd7 100644--- a/packages/trpc/server/template-router/schema.ts+++ b/packages/trpc/server/template-router/schema.ts@@ -33,6 +33,7 @@ import { ZSignFieldWithTokenMutationSchema } from '../field-router/schema';export const ZCreateTemplateMutationSchema = z.object({title: z.string().min(1).trim(),templateDocumentDataId: z.string().min(1),+ folderId: z.string().optional(),});export const ZCreateDocumentFromDirectTemplateRequestSchema = z.object({@@ -179,6 +180,7 @@ export const ZUpdateTemplateResponseSchema = ZTemplateLiteSchema;export const ZFindTemplatesRequestSchema = ZFindSearchParamsSchema.extend({type: z.nativeEnum(TemplateType).describe('Filter templates by type.').optional(),+ folderId: z.string().describe('The ID of the folder to filter templates by.').optional(),});export const ZFindTemplatesResponseSchema = ZFindResultResponse.extend({diff --git a/packages/ui/primitives/document-upload.tsx b/packages/ui/primitives/document-upload.tsxnew file mode 100644index 000000000..57fb24a0a--- /dev/null+++ b/packages/ui/primitives/document-upload.tsx@@ -0,0 +1,88 @@+import type { MessageDescriptor } from '@lingui/core';+import { msg } from '@lingui/core/macro';+import { useLingui } from '@lingui/react';+import { Trans } from '@lingui/react/macro';+import { Upload } from 'lucide-react';+import { useDropzone } from 'react-dropzone';+import { Link } from 'react-router';++import { APP_DOCUMENT_UPLOAD_SIZE_LIMIT, IS_BILLING_ENABLED } from '@documenso/lib/constants/app';+import { megabytesToBytes } from '@documenso/lib/universal/unit-convertions';++import { Button } from './button';+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './tooltip';++export type DocumentDropzoneProps = {+ className?: string;+ disabled?: boolean;+ disabledMessage?: MessageDescriptor;+ onDrop?: (_file: File) => void | Promise<void>;+ onDropRejected?: () => void | Promise<void>;+ type?: 'document' | 'template';+ [key: string]: unknown;+};++export const DocumentDropzone = ({+ className,+ onDrop,+ onDropRejected,+ disabled,+ disabledMessage = msg`You cannot upload documents at this time.`,+ type = 'document',+ ...props+}: DocumentDropzoneProps) => {+ const { _ } = useLingui();++ const { getRootProps, getInputProps } = useDropzone({+ accept: {+ 'application/pdf': ['.pdf'],+ },+ multiple: false,+ disabled,+ onDrop: ([acceptedFile]) => {+ if (acceptedFile && onDrop) {+ void onDrop(acceptedFile);+ }+ },+ onDropRejected: () => {+ if (onDropRejected) {+ void onDropRejected();+ }+ },+ maxSize: megabytesToBytes(APP_DOCUMENT_UPLOAD_SIZE_LIMIT),+ });++ const heading = {+ document: msg`Upload Document`,+ template: msg`Upload Template Document`,+ };++ if (disabled && IS_BILLING_ENABLED()) {+ return (+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <Button className="hover:bg-warning/80 bg-warning" asChild>+ <Link to="/settings/billing">+ <Trans>Upgrade</Trans>+ </Link>+ </Button>+ </TooltipTrigger>+ <TooltipContent>+ <p className="text-sm">{_(disabledMessage)}</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>+ );+ }++ return (+ <Button aria-disabled={disabled} {...getRootProps()} {...props}>+ <div className="flex items-center gap-2">+ <input {...getInputProps()} />+ <Upload className="h-4 w-4" />+ {disabled ? _(disabledMessage) : _(heading[type])}+ </div>+ </Button>+ );+};