From 0580ed4260520467a4e1e669269e1704759e62bb Mon Sep 17 00:00:00 2001 From: Alexander Ackermann Date: Thu, 2 Oct 2025 15:00:23 +0200 Subject: [PATCH 1/6] feat: tiles view for trash content # Conflicts: # packages/web-app-files/src/composables/extensions/useFolderViews.ts --- .../composables/extensions/useFolderViews.ts | 10 +++-- packages/web-app-files/src/extensionPoints.ts | 8 +++- .../src/views/spaces/GenericTrash.vue | 42 +++++++++++++++--- .../unit/views/spaces/GenericTrash.spec.ts | 43 ++++++++++++++++++- .../src/components/FilesList/ResourceTile.vue | 6 +++ .../components/FilesList/ResourceTiles.vue | 11 ++++- .../components/FilesList/ResourceTile.spec.ts | 37 +++++++++++----- .../FilesList/ResourceTiles.spec.ts | 12 +++++- .../__snapshots__/ResourceTile.spec.ts.snap | 8 ++-- .../objects/app-files/resource/actions.ts | 8 ++-- 10 files changed, 153 insertions(+), 32 deletions(-) diff --git a/packages/web-app-files/src/composables/extensions/useFolderViews.ts b/packages/web-app-files/src/composables/extensions/useFolderViews.ts index f5b98d8b27..7778b10532 100644 --- a/packages/web-app-files/src/composables/extensions/useFolderViews.ts +++ b/packages/web-app-files/src/composables/extensions/useFolderViews.ts @@ -3,7 +3,8 @@ import { useGettext } from 'vue3-gettext' import { folderViewsFavoritesExtensionPoint, folderViewsFolderExtensionPoint, - folderViewsProjectSpacesExtensionPoint + folderViewsProjectSpacesExtensionPoint, + folderViewsTrashExtensionPoint } from '../../extensionPoints' export const useFolderViews = (): FolderViewExtension[] => { @@ -15,6 +16,7 @@ export const useFolderViews = (): FolderViewExtension[] => { type: 'folderView', extensionPointIds: [ folderViewsFolderExtensionPoint.id, + folderViewsTrashExtensionPoint.id, folderViewsProjectSpacesExtensionPoint.id ], folderView: { @@ -33,7 +35,8 @@ export const useFolderViews = (): FolderViewExtension[] => { extensionPointIds: [ folderViewsFolderExtensionPoint.id, folderViewsProjectSpacesExtensionPoint.id, - folderViewsFavoritesExtensionPoint.id + folderViewsFavoritesExtensionPoint.id, + folderViewsTrashExtensionPoint.id ], folderView: { name: 'resource-table', @@ -51,7 +54,8 @@ export const useFolderViews = (): FolderViewExtension[] => { extensionPointIds: [ folderViewsFolderExtensionPoint.id, folderViewsProjectSpacesExtensionPoint.id, - folderViewsFavoritesExtensionPoint.id + folderViewsFavoritesExtensionPoint.id, + folderViewsTrashExtensionPoint.id ], folderView: { name: 'resource-tiles', diff --git a/packages/web-app-files/src/extensionPoints.ts b/packages/web-app-files/src/extensionPoints.ts index 7547b578fb..32beb364f9 100644 --- a/packages/web-app-files/src/extensionPoints.ts +++ b/packages/web-app-files/src/extensionPoints.ts @@ -54,6 +54,11 @@ export const folderViewsProjectSpacesExtensionPoint: ExtensionPoint = { + id: 'app.files.folder-views.trash', + extensionType: 'folderView' +} + export const extensionPoints = () => { return computed[]>(() => { return [ @@ -66,7 +71,8 @@ export const extensionPoints = () => { fileSideBarExtensionPoint, folderViewsFolderExtensionPoint, folderViewsFavoritesExtensionPoint, - folderViewsProjectSpacesExtensionPoint + folderViewsProjectSpacesExtensionPoint, + folderViewsTrashExtensionPoint ] }) } diff --git a/packages/web-app-files/src/views/spaces/GenericTrash.vue b/packages/web-app-files/src/views/spaces/GenericTrash.vue index b15145653b..1c997b8c2e 100644 --- a/packages/web-app-files/src/views/spaces/GenericTrash.vue +++ b/packages/web-app-files/src/views/spaces/GenericTrash.vue @@ -6,6 +6,7 @@ :has-bulk-actions="true" :is-side-bar-open="isSideBarOpen" :space="space" + :view-modes="viewModes" > - - + @@ -69,7 +75,7 @@