From f093b490c64c9ddc19efcc1ca049c364faa35756 Mon Sep 17 00:00:00 2001 From: yiling Date: Thu, 11 Jun 2026 16:19:35 +0800 Subject: [PATCH] feat(trash): add recently-deleted banner and empty trash option for admin - Added emptyTrash method in AssetService to purge trashed assets from DB and S3 - Added POST /projects/:projectId/empty-trash endpoint in project API - Implemented unit and integration tests for service and API - Prevented double click redirect in recently deleted folder - Added top banner with Delete Now option in recently-deleted folder with confirmation dialog --- packages/api/src/api/project.test.ts | 19 +++ packages/api/src/api/project.ts | 15 +++ packages/core/src/asset/asset.test.ts | 114 ++++++++++++++++++ packages/core/src/asset/asset.ts | 30 +++++ .../components/file-browser/file-browser.tsx | 67 +++++++++- .../webui/components/file-system-manager.tsx | 6 +- 6 files changed, 247 insertions(+), 4 deletions(-) diff --git a/packages/api/src/api/project.test.ts b/packages/api/src/api/project.test.ts index dba8bf0d..0f2db192 100644 --- a/packages/api/src/api/project.test.ts +++ b/packages/api/src/api/project.test.ts @@ -177,4 +177,23 @@ describe('project api', () => { creatorId: 'user1', }) }) + + it('POST /projects/:projectId/empty-trash', async () => { + vi.mocked(assetService.emptyTrash).mockResolvedValue(undefined) + + const res = await app.request('/projects/p1/empty-trash', { + method: 'POST', + }) + + expect(res.status).toBe(200) + const json = await res.json() + expect(json).toEqual({ success: true }) + expect(authzService.hasPermission).toHaveBeenCalledWith({ + user: expect.anything(), + permission: Permission.Admin, + type: ResourceType.Project, + id: 'p1', + }) + expect(assetService.emptyTrash).toHaveBeenCalledWith('p1') + }) }) diff --git a/packages/api/src/api/project.ts b/packages/api/src/api/project.ts index 22155e40..d493453a 100644 --- a/packages/api/src/api/project.ts +++ b/packages/api/src/api/project.ts @@ -80,6 +80,21 @@ const route = new Hono<{ Variables: { user: User } }>() return c.json(resp) }, ) + .post('/projects/:projectId/empty-trash', async (c) => { + const projectId = c.req.param('projectId') + const user = c.get('user') + + await authzService.hasPermission({ + user, + permission: Permission.Admin, + type: ResourceType.Project, + id: projectId, + }) + + await assetService.emptyTrash(projectId) + + return c.json({ success: true }) + }) .get('/teams/:teamId/projects', zValidator('query', listProjectsRequestSchema), async (c) => { const teamId = c.req.param('teamId') const user = c.get('user') diff --git a/packages/core/src/asset/asset.test.ts b/packages/core/src/asset/asset.test.ts index 76299020..16eece58 100644 --- a/packages/core/src/asset/asset.test.ts +++ b/packages/core/src/asset/asset.test.ts @@ -1883,4 +1883,118 @@ describe('AssetService — natural sort by name', () => { expect(result).toHaveLength(1) }) }) + + describe('emptyTrash', () => { + it('should permanently delete trashed assets of the target project only', async () => { + const { s3Service } = await import('../s3/s3') + + const team = await prisma.team.create({ data: { name: 'Empty Trash Team' } }) + const project1 = await prisma.project.create({ + data: { name: 'Project 1', teamId: team.id }, + }) + const project2 = await prisma.project.create({ + data: { name: 'Project 2', teamId: team.id }, + }) + const user = await prisma.user.create({ + data: { name: 'Test User', email: `test-${Date.now()}@example.com` }, + }) + + // 1. Create a trashed folder with a child file in Project 1 + const folderA = await prisma.asset.create({ + data: { + name: 'Folder A', + type: AssetType.folder, + status: 'trashed', + isDeleted: true, + project: { connect: { id: project1.id } }, + creator: { connect: { id: user.id } }, + deletedAt: new Date(), + }, + }) + + const fileA1 = await prisma.asset.create({ + data: { + name: 'File A1', + type: AssetType.file, + status: 'uploaded', + isDeleted: true, + project: { connect: { id: project1.id } }, + parent: { connect: { id: folderA.id } }, + creator: { connect: { id: user.id } }, + storageKey: { + create: { + key: 'files/project1-trashed/raw', + createdAt: new Date(Date.now() - 25 * 60 * 60 * 1000), + }, + }, + }, + }) + + // 2. Create an active file in Project 1 + const fileActive = await prisma.asset.create({ + data: { + name: 'File Active', + type: AssetType.file, + status: 'uploaded', + isDeleted: false, + project: { connect: { id: project1.id } }, + creator: { connect: { id: user.id } }, + storageKey: { + create: { + key: 'files/project1-active/raw', + createdAt: new Date(Date.now() - 25 * 60 * 60 * 1000), + }, + }, + }, + }) + + // 3. Create a trashed file in Project 2 + const fileOtherTrashed = await prisma.asset.create({ + data: { + name: 'File Other Trashed', + type: AssetType.file, + status: 'trashed', + isDeleted: true, + project: { connect: { id: project2.id } }, + creator: { connect: { id: user.id } }, + deletedAt: new Date(), + storageKey: { + create: { + key: 'files/project2-trashed/raw', + createdAt: new Date(Date.now() - 25 * 60 * 60 * 1000), + }, + }, + }, + }) + + // Act + await assetService.emptyTrash(project1.id) + + // Assert: Project 1 trashed assets are deleted from DB + expect(await prisma.asset.findUnique({ where: { id: folderA.id } })).toBeNull() + expect(await prisma.asset.findUnique({ where: { id: fileA1.id } })).toBeNull() + + // Assert: Project 1 active assets are NOT deleted + expect(await prisma.asset.findUnique({ where: { id: fileActive.id } })).not.toBeNull() + + // Assert: Project 2 trashed assets are NOT deleted + expect(await prisma.asset.findUnique({ where: { id: fileOtherTrashed.id } })).not.toBeNull() + + // Assert: S3 deletion was called for Project 1's trashed file + expect(s3Service.deletePrefix).toHaveBeenCalledWith( + expect.any(String), + 'files/project1-trashed/', + ) + + // Assert: S3 deletion was NOT called for Project 1's active file or Project 2's trashed file + expect(s3Service.deletePrefix).not.toHaveBeenCalledWith( + expect.any(String), + 'files/project1-active/', + ) + expect(s3Service.deletePrefix).not.toHaveBeenCalledWith( + expect.any(String), + 'files/project2-trashed/', + ) + }) + }) }) diff --git a/packages/core/src/asset/asset.ts b/packages/core/src/asset/asset.ts index 56e55792..11122aab 100644 --- a/packages/core/src/asset/asset.ts +++ b/packages/core/src/asset/asset.ts @@ -1033,6 +1033,36 @@ export class AssetService { } } + async emptyTrash(projectId: string): Promise { + const trashedRoots = await this.prismaClient.asset.findMany({ + where: { + projectId, + status: 'trashed', + isDeleted: true, + }, + select: { id: true }, + }) + + for (const root of trashedRoots) { + await this.prismaClient.$transaction(async (tx) => { + // Use recursive CTE to find all descendants and mark them all as pending_purge + await tx.$executeRaw` + WITH RECURSIVE descendant AS ( + SELECT id FROM assets WHERE id = ${root.id} + UNION ALL + SELECT a.id FROM assets a + INNER JOIN descendant d ON a.parent_id = d.id + ) + UPDATE assets SET status = 'pending_purge', updated_at = NOW() + WHERE id IN (SELECT id FROM descendant); + ` + }) + } + + await this.purgePendingAssets() + await this.purgeUnreferencedStorageKeys() + } + private cleanupJobsRunning = false async startCleanupJob() { diff --git a/packages/webui/components/file-browser/file-browser.tsx b/packages/webui/components/file-browser/file-browser.tsx index a1f74655..fca547dd 100644 --- a/packages/webui/components/file-browser/file-browser.tsx +++ b/packages/webui/components/file-browser/file-browser.tsx @@ -349,6 +349,28 @@ export function FileBrowser({ selectedIds, }) + const [isEmptyTrashDialogOpen, setIsEmptyTrashDialogOpen] = useState(false) + const { mutate: emptyTrash, isPending: isEmptyingTrash } = useMutation({ + mutationFn: async () => { + const res = await client.api.projects[':projectId']['empty-trash'].$post({ + param: { projectId }, + }) + if (!res.ok) throw new Error('Failed to empty trash') + return await res.json() + }, + onSuccess: () => { + toast.success('Trash emptied successfully') + queryClient.invalidateQueries({ + queryKey: ['projects', projectId, 'recently-deleted'], + }) + onClearSelection() + setIsEmptyTrashDialogOpen(false) + }, + onError: (err) => { + toast.error(`Error emptying trash: ${err.message}`) + }, + }) + const $confirmUpload = client.api.teams[':teamId'].upload.tasks[':taskId'].$patch const { mutateAsync: confirmUpload } = useMutation< InferResponseType, @@ -431,7 +453,7 @@ export function FileBrowser({ const newVersionInputRef = useRef(null) const [targetVersionFileId, setTargetVersionFileId] = useState(null) const fileContextMenu = useRef(false) - const { canEdit } = usePermissions() + const { canEdit, canAdmin } = usePermissions() const scrollContainerRef = useRef(null) @@ -806,6 +828,25 @@ export function FileBrowser({ rootFolderId={rootFolderId} /> )} + {isRecentlyDeleted && ( +
+
+ + Items are automatically deleted after 30 days. +
+ {canAdmin && ( + + )} +
+ )}
+ + + + Empty Trash? + + All items in the recently deleted folder will be permanently removed both from the + database and from storage. This action cannot be undone. + + + + Cancel + { + emptyTrash() + }} + className="bg-destructive text-destructive-foreground hover:bg-destructive/90" + disabled={isEmptyingTrash} + > + {isEmptyingTrash ? 'Deleting...' : 'Delete Now'} + + + + + diff --git a/packages/webui/components/file-system-manager.tsx b/packages/webui/components/file-system-manager.tsx index 64448b72..e8e055e4 100644 --- a/packages/webui/components/file-system-manager.tsx +++ b/packages/webui/components/file-system-manager.tsx @@ -301,10 +301,10 @@ export default function FileSystemManager({ }, [selectedIds, files]) const handleItemDoubleClick = (item: AssetInfo) => { + if (isRecentlyDeleted) { + return + } if (item.type === 'folder') { - if (isRecentlyDeleted) { - return - } setFilterConditions([]) navigate({ to: '/projects/$projectId/folders/$folderId',