From b9388f4ed458022d3b69f1d6b7046d68cc956758 Mon Sep 17 00:00:00 2001
From: Alex Ackermann <abackermann91@gmail.com>
Date: Fri, 4 Jul 2025 02:22:46 +0200
Subject: [PATCH 1/4] Add empty trash bin action to trash bin overview

---
 .../InviteCollaborator/RecipientContainer.vue |   2 +-
 .../components/SideBar/TrashNoSelection.vue   |   2 +-
 .../components/Trash/TrashContextActions.vue  |  21 +-
 .../components/Trash/TrashQuickActions.vue    |  38 +++
 .../composables/extensions/useTrashActions.ts |  16 +
 packages/web-app-files/src/extensionPoints.ts |   6 +
 packages/web-app-files/src/extensions.ts      |   3 +
 .../src/views/spaces/GenericTrash.vue         | 233 +++++++-------
 .../src/views/trash/Overview.vue              | 293 +++++++++---------
 .../Trash/TrashContextActions.spec.ts         |  67 ++++
 .../unit/views/spaces/GenericTrash.spec.ts    |  28 +-
 .../tests/unit/views/trash/Overview.spec.ts   |  39 ++-
 .../trash/__snapshots__/Overview.spec.ts.snap |   8 +-
 .../web-client/src/graph/drives/drives.ts     |  10 +-
 packages/web-client/src/graph/drives/types.ts |  14 +-
 .../generated/.openapi-generator/VERSION      |   2 +-
 .../web-client/src/graph/generated/api.ts     |  99 ++++--
 .../web-client/src/graph/generated/common.ts  |   8 +-
 .../web-client/src/helpers/space/functions.ts |   6 +-
 .../web-client/src/helpers/space/types.ts     |   1 +
 .../web-pkg/src/components/AppBar/AppBar.vue  |  31 +-
 .../components/FilesList/ContextActions.vue   |   3 -
 .../FilesList/ResourceStatusIndicators.vue    |  17 +-
 .../components/FilesList/ResourceTable.vue    |  12 +
 .../web-pkg/src/components/ViewOptions.vue    |  56 +++-
 .../files/useFileActionsEmptyTrashBin.ts      |  78 +++--
 .../spaces/useSpaceActionsNavigateToTrash.ts  |   4 +-
 .../src/composables/piniaStores/resources.ts  |   7 +
 .../FilesList/ResourceTable.spec.ts           |   4 +
 .../FilesList/ResourceTiles.spec.ts           |   2 +
 .../files/useFileActionsEmptyTrashBin.spec.ts |  74 ++++-
 .../web-runtime/src/container/bootstrap.ts    |   7 +
 32 files changed, 760 insertions(+), 431 deletions(-)
 create mode 100644 packages/web-app-files/src/components/Trash/TrashQuickActions.vue
 create mode 100644 packages/web-app-files/src/composables/extensions/useTrashActions.ts
 create mode 100644 packages/web-app-files/tests/unit/components/Trash/TrashContextActions.spec.ts

diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/RecipientContainer.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/RecipientContainer.vue
index ee00555716..c528cfd456 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/RecipientContainer.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/RecipientContainer.vue
@@ -9,7 +9,7 @@
         v-if="recipient.shareType === ShareTypes.user.value"
         :user-id="recipient.id"
         :user-name="recipient.displayName"
-        width="16.8"
+        :width="16.8"
       />
     </template>
     <template #append>
diff --git a/packages/web-app-files/src/components/SideBar/TrashNoSelection.vue b/packages/web-app-files/src/components/SideBar/TrashNoSelection.vue
index d5d47a99e7..0ba58e62e9 100644
--- a/packages/web-app-files/src/components/SideBar/TrashNoSelection.vue
+++ b/packages/web-app-files/src/components/SideBar/TrashNoSelection.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="oc-trash-no-selection" class="oc-text-center oc-mt-xl">
     <oc-icon size="xxlarge" name="delete-bin" fill-type="line" />
-    <p data-testid="selectTrashText" v-text="$gettext('Select a trash to view details')" />
+    <p data-testid="selectTrashText" v-text="$gettext('Select a trash bin to view details')" />
   </div>
 </template>
 <script lang="ts">
diff --git a/packages/web-app-files/src/components/Trash/TrashContextActions.vue b/packages/web-app-files/src/components/Trash/TrashContextActions.vue
index fe3935f435..1c24524664 100644
--- a/packages/web-app-files/src/components/Trash/TrashContextActions.vue
+++ b/packages/web-app-files/src/components/Trash/TrashContextActions.vue
@@ -1,5 +1,10 @@
 <template>
-  <context-action-menu :menu-sections="menuSections" :action-options="actionOptions" />
+  <div v-if="loading" class="oc-flex oc-flex-center oc-my-m">
+    <oc-spinner :aria-label="$gettext('Loading actions')" />
+  </div>
+  <div v-else>
+    <context-action-menu :menu-sections="menuSections" :action-options="actionOptions" />
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -7,27 +12,31 @@ import {
   ContextActionMenu,
   MenuSection,
   SpaceActionOptions,
+  useFileActionsEmptyTrashBin,
   useSpaceActionsNavigateToTrash
 } from '@opencloud-eu/web-pkg'
 import { computed, toRef, unref } from 'vue'
 
 const props = defineProps<{
   actionOptions: SpaceActionOptions
+  loading?: boolean
 }>()
 
 const actionOptions = toRef(props, 'actionOptions')
 
 const { actions: navigateToTrashActions } = useSpaceActionsNavigateToTrash()
+const { actions: emptyTrashBinActions } = useFileActionsEmptyTrashBin()
 
-const menuItemsPrimaryActions = computed(() => {
-  const fileHandlers = [...unref(navigateToTrashActions)]
-  return fileHandlers.filter((item) => item.isVisible(unref(actionOptions)))
-})
+const menuItemsPrimaryActions = computed(() =>
+  [...unref(navigateToTrashActions), ...unref(emptyTrashBinActions)].filter((item) =>
+    item.isVisible(unref(actionOptions))
+  )
+)
 
 const menuSections = computed<MenuSection[]>(() => {
   const sections: MenuSection[] = []
 
-  if (unref(menuItemsPrimaryActions)) {
+  if (unref(menuItemsPrimaryActions).length) {
     sections.push({
       name: 'primaryActions',
       items: unref(menuItemsPrimaryActions)
diff --git a/packages/web-app-files/src/components/Trash/TrashQuickActions.vue b/packages/web-app-files/src/components/Trash/TrashQuickActions.vue
new file mode 100644
index 0000000000..f6f41d5bb9
--- /dev/null
+++ b/packages/web-app-files/src/components/Trash/TrashQuickActions.vue
@@ -0,0 +1,38 @@
+<template>
+  <div v-if="!isEmbedModeEnabled" class="oc-flex">
+    <oc-button
+      v-for="action in filteredActions"
+      :key="action.label()"
+      v-oc-tooltip="action.label()"
+      :aria-label="action.label()"
+      appearance="raw"
+      class="oc-ml-xs quick-action-button oc-p-xs"
+      :class="`files-quick-action-${action.name}`"
+      :disabled="action.isDisabled({ resources: [space] })"
+      @click="action.handler({ resources: [space] })"
+    >
+      <oc-icon :name="action.icon" fill-type="line" />
+    </oc-button>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, unref } from 'vue'
+import { useEmbedMode, useExtensionRegistry } from '@opencloud-eu/web-pkg'
+import { SpaceResource } from '@opencloud-eu/web-client'
+import { trashQuickActionsExtensionPoint } from '../../extensionPoints'
+
+const props = defineProps<{
+  space?: SpaceResource
+}>()
+
+const extensionRegistry = useExtensionRegistry()
+const { isEnabled: isEmbedModeEnabled } = useEmbedMode()
+
+const filteredActions = computed(() => {
+  return unref(extensionRegistry)
+    .requestExtensions(trashQuickActionsExtensionPoint)
+    .map((e) => e.action)
+    .filter(({ isVisible }) => isVisible({ resources: [props.space] }))
+})
+</script>
diff --git a/packages/web-app-files/src/composables/extensions/useTrashActions.ts b/packages/web-app-files/src/composables/extensions/useTrashActions.ts
new file mode 100644
index 0000000000..a0eabd9db9
--- /dev/null
+++ b/packages/web-app-files/src/composables/extensions/useTrashActions.ts
@@ -0,0 +1,16 @@
+import { ActionExtension, useFileActionsEmptyTrashBin } from '@opencloud-eu/web-pkg'
+import { trashQuickActionsExtensionPoint } from '../../extensionPoints'
+import { unref } from 'vue'
+
+export const useTrashActions = (): ActionExtension[] => {
+  const { actions: emptyTrashBinActions } = useFileActionsEmptyTrashBin()
+
+  return [
+    {
+      id: 'com.github.opencloud-eu.web.files.quick-action.empty-trash-bin',
+      extensionPointIds: [trashQuickActionsExtensionPoint.id],
+      type: 'action',
+      action: unref(emptyTrashBinActions)[0]
+    }
+  ]
+}
diff --git a/packages/web-app-files/src/extensionPoints.ts b/packages/web-app-files/src/extensionPoints.ts
index 37610c9744..7547b578fb 100644
--- a/packages/web-app-files/src/extensionPoints.ts
+++ b/packages/web-app-files/src/extensionPoints.ts
@@ -16,6 +16,11 @@ export const quickActionsExtensionPoint: ExtensionPoint<ActionExtension> = {
   extensionType: 'action',
   multiple: true
 }
+export const trashQuickActionsExtensionPoint: ExtensionPoint<ActionExtension> = {
+  id: 'app.files.trash-quick-actions',
+  extensionType: 'action',
+  multiple: true
+}
 export const batchActionsExtensionPoint: ExtensionPoint<ActionExtension> = {
   id: 'global.files.batch-actions',
   extensionType: 'action',
@@ -54,6 +59,7 @@ export const extensionPoints = () => {
     return [
       uploadMenuExtensionPoint,
       quickActionsExtensionPoint,
+      trashQuickActionsExtensionPoint,
       batchActionsExtensionPoint,
       contextActionsExtensionPoint,
       defaultActionsExtensionPoint,
diff --git a/packages/web-app-files/src/extensions.ts b/packages/web-app-files/src/extensions.ts
index 5f162e87f9..e8c4146817 100644
--- a/packages/web-app-files/src/extensions.ts
+++ b/packages/web-app-files/src/extensions.ts
@@ -12,6 +12,7 @@ import { SDKSearch } from './search'
 import { useSideBarPanels } from './composables/extensions/useFileSideBars'
 import { useFolderViews } from './composables/extensions/useFolderViews'
 import { useFileActions } from './composables/extensions/useFileActions'
+import { useTrashActions } from './composables/extensions/useTrashActions'
 import { urlJoin } from '@opencloud-eu/web-client'
 
 export const extensions = (appInfo: ApplicationInformation) => {
@@ -22,11 +23,13 @@ export const extensions = (appInfo: ApplicationInformation) => {
   const { search: searchFunction } = useSearch()
 
   const fileActionExtensions = useFileActions()
+  const trashActionExtensions = useTrashActions()
   const folderViewExtensions = useFolderViews()
   const sideBarPanelExtensions = useSideBarPanels()
 
   return computed<Extension[]>(() => [
     ...fileActionExtensions,
+    ...trashActionExtensions,
     ...folderViewExtensions,
     ...sideBarPanelExtensions,
     {
diff --git a/packages/web-app-files/src/views/spaces/GenericTrash.vue b/packages/web-app-files/src/views/spaces/GenericTrash.vue
index 5d73294dba..8fe058fecb 100644
--- a/packages/web-app-files/src/views/spaces/GenericTrash.vue
+++ b/packages/web-app-files/src/views/spaces/GenericTrash.vue
@@ -6,7 +6,23 @@
         :has-bulk-actions="true"
         :is-side-bar-open="isSideBarOpen"
         :space="space"
-      />
+      >
+        <template #actions>
+          <oc-button
+            v-if="emptyTrashBinAction.isVisible({ resources: [space] })"
+            :disabled="paginatedResources.length === 0"
+            :action-options="{ resources: [space] }"
+            :class="emptyTrashBinAction.class"
+            size="medium"
+            appearance="filled"
+            class="oc-mr-s"
+            @click="emptyTrashBinAction.handler({ resources: [space] })"
+          >
+            <oc-icon :name="emptyTrashBinAction.icon" size="medium" />
+            {{ emptyTrashBinAction.label() }}
+          </oc-button>
+        </template>
+      </app-bar>
       <app-loading-spinner v-if="areResourcesLoading" />
       <template v-else>
         <no-content-message
@@ -17,7 +33,7 @@
           icon-fill-type="line"
         >
           <template #message>
-            <span>{{ noContentMessage }}</span>
+            <span v-text="$gettext('This trash bin is empty')" />
           </template>
         </no-content-message>
         <resource-table
@@ -53,131 +69,116 @@
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
+import { computed, onBeforeUnmount, onMounted, unref } from 'vue'
+import { useGettext } from 'vue3-gettext'
 import { storeToRefs } from 'pinia'
+import {
+  AppBar,
+  AppLoadingSpinner,
+  ContextActions,
+  createLocationTrash,
+  eventBus,
+  FileSideBar,
+  Pagination,
+  NoContentMessage,
+  ResourceTable,
+  useDocumentTitle,
+  useFileActionsEmptyTrashBin,
+  useUserStore
+} from '@opencloud-eu/web-pkg'
 
-import { AppBar, ContextActions, FileSideBar, useUserStore } from '@opencloud-eu/web-pkg'
 import FilesViewWrapper from '../../components/FilesViewWrapper.vue'
 import ListInfo from '../../components/FilesList/ListInfo.vue'
-import { ResourceTable } from '@opencloud-eu/web-pkg'
-import { AppLoadingSpinner } from '@opencloud-eu/web-pkg'
-import { NoContentMessage } from '@opencloud-eu/web-pkg'
-import { Pagination } from '@opencloud-eu/web-pkg'
-
-import { eventBus } from '@opencloud-eu/web-pkg'
 import { useResourcesViewDefaults } from '../../composables'
-import { computed, defineComponent, PropType, onMounted, onBeforeUnmount, unref } from 'vue'
-import { Resource } from '@opencloud-eu/web-client'
-import { createLocationTrash } from '@opencloud-eu/web-pkg'
 import { isProjectSpaceResource, SpaceResource } from '@opencloud-eu/web-client'
-import { useDocumentTitle } from '@opencloud-eu/web-pkg'
-import { useGettext } from 'vue3-gettext'
-
-export default defineComponent({
-  name: 'GenericTrash',
 
-  components: {
-    AppBar,
-    AppLoadingSpinner,
-    ContextActions,
-    FileSideBar,
-    FilesViewWrapper,
-    ListInfo,
-    NoContentMessage,
-    Pagination,
-    ResourceTable
-  },
-
-  props: {
-    space: {
-      type: Object as PropType<SpaceResource>,
-      required: false,
-      default: null
+const props = defineProps<{
+  space?: SpaceResource | null
+  itemId?: string | number | null
+}>()
+
+const { $gettext } = useGettext()
+
+const userStore = useUserStore()
+const { user } = storeToRefs(userStore)
+const resourcesViewDefaults = useResourcesViewDefaults()
+
+const {
+  areResourcesLoading,
+  paginatedResources,
+  paginationPages,
+  paginationPage,
+  selectedResourcesIds,
+  isSideBarOpen,
+  fileListHeaderY,
+  sortBy,
+  sortDir,
+  handleSort,
+  sideBarActivePanel,
+  selectedResources,
+  isResourceInSelection
+} = resourcesViewDefaults
+
+const isEmpty = computed(() => unref(resourcesViewDefaults.paginatedResources).length < 1)
+
+const { actions: emptyTrashBinActions } = useFileActionsEmptyTrashBin()
+const emptyTrashBinAction = computed(() => unref(emptyTrashBinActions)[0])
+
+const breadcrumbs = computed(() => {
+  let currentNodeName = props.space?.name
+  if (props.space?.driveType === 'personal') {
+    currentNodeName = $gettext('Personal')
+  }
+  return [
+    {
+      text: $gettext('Deleted files'),
+      to: createLocationTrash('files-trash-overview')
     },
-    itemId: {
-      type: [String, Number],
-      required: false,
-      default: null
+    {
+      text: currentNodeName,
+      onClick: () => eventBus.publish('app.files.list.load')
     }
-  },
-
-  setup(props) {
-    const { $gettext } = useGettext()
-    const userStore = useUserStore()
-    const { user } = storeToRefs(userStore)
-
-    let loadResourcesEventToken: string
-    const noContentMessage = computed(() => {
-      return props.space.driveType === 'personal'
-        ? $gettext('You have no deleted files')
-        : $gettext('Space has no deleted files')
-    })
-
-    const titleSegments = computed(() => {
-      const segments = [$gettext('Deleted files')]
-      segments.unshift(props.space.name)
-
-      return segments
-    })
-    useDocumentTitle({ titleSegments })
-
-    const resourcesViewDefaults = useResourcesViewDefaults<Resource, any, any[]>()
-    const performLoaderTask = async () => {
-      await resourcesViewDefaults.loadResourcesTask.perform(props.space)
-      resourcesViewDefaults.refreshFileListHeaderPosition()
-      resourcesViewDefaults.scrollToResourceFromRoute(
-        unref(resourcesViewDefaults.paginatedResources),
-        'files-app-bar'
-      )
-    }
-
-    onMounted(() => {
-      performLoaderTask()
-      loadResourcesEventToken = eventBus.subscribe('app.files.list.load', () => {
-        performLoaderTask()
-      })
-    })
-
-    onBeforeUnmount(() => {
-      eventBus.unsubscribe('app.files.list.load', loadResourcesEventToken)
-    })
-
-    return {
-      ...resourcesViewDefaults,
-      user,
-      noContentMessage
-    }
-  },
-
-  computed: {
-    isEmpty() {
-      return this.paginatedResources.length < 1
-    },
+  ]
+})
 
-    breadcrumbs() {
-      let currentNodeName = this.space?.name
-      if (this.space.driveType === 'personal') {
-        currentNodeName = this.$gettext('Personal')
-      }
-      return [
-        {
-          text: this.$gettext('Deleted files'),
-          to: createLocationTrash('files-trash-overview')
-        },
-        {
-          text: currentNodeName,
-          onClick: () => eventBus.publish('app.files.list.load')
-        }
-      ]
-    },
+const showActions = computed(() => {
+  return (
+    !isProjectSpaceResource(props.space) ||
+    props.space.canDeleteFromTrashBin({ user: user.value }) ||
+    props.space.canRestoreFromTrashbin({ user: user.value })
+  )
+})
 
-    showActions() {
-      return (
-        !isProjectSpaceResource(this.space) ||
-        this.space.canDeleteFromTrashBin({ user: this.user }) ||
-        this.space.canRestoreFromTrashbin({ user: this.user })
-      )
-    }
+const titleSegments = computed(() => {
+  const segments = [$gettext('Deleted files')]
+  if (props.space?.name) {
+    segments.unshift(props.space.name)
   }
+  return segments
+})
+useDocumentTitle({ titleSegments })
+
+const performLoaderTask = async () => {
+  if (!props.space) return
+  await resourcesViewDefaults.loadResourcesTask.perform(props.space)
+  resourcesViewDefaults.refreshFileListHeaderPosition()
+  resourcesViewDefaults.scrollToResourceFromRoute(
+    unref(resourcesViewDefaults.paginatedResources),
+    'files-app-bar'
+  )
+}
+
+let loadResourcesEventToken: string
+
+onMounted(() => {
+  performLoaderTask()
+  loadResourcesEventToken = eventBus.subscribe('app.files.list.load', () => {
+    performLoaderTask()
+  })
+})
+
+onBeforeUnmount(() => {
+  eventBus.unsubscribe('app.files.list.load', loadResourcesEventToken)
 })
 </script>
diff --git a/packages/web-app-files/src/views/trash/Overview.vue b/packages/web-app-files/src/views/trash/Overview.vue
index bd95c90cd4..079d999389 100644
--- a/packages/web-app-files/src/views/trash/Overview.vue
+++ b/packages/web-app-files/src/views/trash/Overview.vue
@@ -1,9 +1,9 @@
 <template>
-  <div class="oc-flex">
+  <div v-if="ready" class="oc-flex">
     <files-view-wrapper>
       <app-bar
         :breadcrumbs="breadcrumbs"
-        :has-view-options="false"
+        :has-view-options="true"
         :has-hidden-files="false"
         :has-file-extensions="false"
         :has-pagination="false"
@@ -20,7 +20,7 @@
             class="trash-bin-filters oc-flex oc-flex-right oc-flex-wrap oc-flex-bottom oc-mx-m oc-mb-m"
           >
             <oc-text-input
-              id="spaces-filter"
+              id="trash-filter"
               v-model="filterTerm"
               :label="$gettext('Search')"
               autocomplete="off"
@@ -37,15 +37,20 @@
             :are-thumbnails-displayed="false"
             :are-paths-displayed="false"
             :is-selectable="false"
+            :show-rename-quick-action="false"
             :target-route-callback="resourceTargetRouteCallback"
             @sort="handleSort"
           >
             <template #contextMenu="{ resource, isOpen }">
               <trash-context-actions
                 v-if="isOpen"
+                :loading="resource.graphPermissions === undefined"
                 :action-options="{ resources: [resource] as SpaceResource[] }"
               />
             </template>
+            <template #quickActions="{ resource }">
+              <trash-quick-actions :space="resource" :item="resource" />
+            </template>
             <template #footer>
               <div class="oc-text-center oc-width-1-1 oc-my-s">
                 <p class="oc-text-muted">{{ footerTextTotal }}</p>
@@ -60,8 +65,8 @@
   </div>
 </template>
 
-<script lang="ts">
-import { computed, defineComponent, nextTick, onMounted, ref, unref, watch } from 'vue'
+<script setup lang="ts">
+import { computed, nextTick, onMounted, ref, unref, watch } from 'vue'
 import Mark from 'mark.js'
 import Fuse from 'fuse.js'
 import { useGettext } from 'vue3-gettext'
@@ -90,176 +95,158 @@ import {
   isProjectSpaceResource,
   SpaceResource
 } from '@opencloud-eu/web-client'
-import { FieldType } from '@opencloud-eu/design-system/helpers'
 import { ResourceTable } from '@opencloud-eu/web-pkg/src'
 import { RouteLocationNamedRaw } from 'vue-router'
 import TrashContextActions from '../../components/Trash/TrashContextActions.vue'
-
-export default defineComponent({
-  name: 'TrashOverview',
-  components: {
-    TrashContextActions,
-    ResourceTable,
-    FileSideBar,
-    FilesViewWrapper,
-    AppBar,
-    AppLoadingSpinner,
-    NoContentMessage
-  },
-  setup() {
-    const userStore = useUserStore()
-    const spacesStore = useSpacesStore()
-    const router = useRouter()
-    const { $gettext } = useGettext()
-    const clientService = useClientService()
-    const { y: fileListHeaderY } = useFileListHeaderPosition()
-    const resourcesStore = useResourcesStore()
-
-    const sortBy = ref<keyof SpaceResource>('name')
-    const sortDir = ref<SortDir>(SortDir.Asc)
-    const filterTerm = ref('')
-    const markInstance = ref(undefined)
-
-    const spaces = computed(() =>
-      spacesStore.spaces.filter(
-        (s: SpaceResource) =>
-          (isPersonalSpaceResource(s) && s.isOwner(userStore.user)) || isProjectSpaceResource(s)
-      )
+import TrashQuickActions from '../../components/Trash/TrashQuickActions.vue'
+import { storeToRefs } from 'pinia'
+
+const userStore = useUserStore()
+const spacesStore = useSpacesStore()
+const router = useRouter()
+const { $gettext, $ngettext } = useGettext()
+const clientService = useClientService()
+const { y: fileListHeaderY } = useFileListHeaderPosition()
+const { isSideBarOpen, sideBarActivePanel } = useSideBar()
+const resourcesStore = useResourcesStore()
+
+const { areEmptyTrashesShown } = storeToRefs(resourcesStore)
+
+const ready = ref(false)
+const sortBy = ref<keyof SpaceResource>('name')
+const sortDir = ref<SortDir>(SortDir.Asc)
+const filterTerm = ref('')
+const markInstance = ref<Mark>()
+
+const spaces = computed(() =>
+  spacesStore.spaces.filter(
+    (s: SpaceResource) =>
+      (isPersonalSpaceResource(s) && s.isOwner(userStore.user)) || isProjectSpaceResource(s)
+  )
+)
+
+const loadResourcesTask = useTask(function* (signal) {
+  resourcesStore.clearResourceList()
+
+  const fetchedSpaces = yield clientService.graphAuthenticated.drives.listMyDrives(
+    {
+      select: ['@libre.graph.hasTrashedItems']
+    },
+    { signal }
+  )
+
+  const reloadedSpaces = fetchedSpaces
+    .filter(
+      (fetchedSpace: SpaceResource) =>
+        isPersonalSpaceResource(fetchedSpace) || isProjectSpaceResource(fetchedSpace)
     )
-
-    const loadResourcesTask = useTask(function* (signal) {
-      resourcesStore.clearResourceList()
-      yield spacesStore.reloadProjectSpaces({
-        graphClient: clientService.graphAuthenticated,
-        signal
-      })
-      resourcesStore.initResourceList({ currentFolder: null, resources: unref(spaces) })
-    })
-
-    const areResourcesLoading = computed(() => {
-      return loadResourcesTask.isRunning || !loadResourcesTask.last
-    })
-
-    const footerTextTotal = computed(() => {
-      return $gettext('%{spaceCount} trashes in total', {
-        spaceCount: unref(spaces).length.toString()
-      })
-    })
-    const footerTextFilter = computed(() => {
-      return $gettext('%{spaceCount} matching trashes', {
-        spaceCount: unref(displaySpaces).length.toString()
-      })
+    .map((fetchedSpace: SpaceResource) => {
+      if (isPersonalSpaceResource(fetchedSpace)) {
+        fetchedSpace.name = $gettext('Personal')
+      }
+      return fetchedSpace
     })
 
-    const breadcrumbs = computed(() => [
-      { text: $gettext('Deleted files'), onClick: () => loadResourcesTask.perform() }
-    ])
+  reloadedSpaces.forEach((reloadedSpace) => {
+    spacesStore.upsertSpace(reloadedSpace)
+  })
 
-    const sort = (list: SpaceResource[], propName: keyof SpaceResource, desc: boolean) => {
-      return [...list].sort((s1, s2) => {
-        if (isPersonalSpaceResource(s1)) {
-          return -1
-        }
-        if (isPersonalSpaceResource(s2)) {
-          return +1
-        }
+  yield spacesStore.loadGraphPermissions({
+    ids: unref(spaces).map((space) => space.id),
+    graphClient: clientService.graphAuthenticated
+  })
+  resourcesStore.initResourceList({ currentFolder: null, resources: unref(spaces) })
+})
 
-        const a = s1[propName].toString()
-        const b = s2[propName].toString()
+const areResourcesLoading = computed(() => loadResourcesTask.isRunning || !loadResourcesTask.last)
 
-        return desc ? b.localeCompare(a) : a.localeCompare(b)
-      })
+const footerTextTotal = computed(() =>
+  $ngettext(
+    '%{spaceCount} trash bin in total',
+    '%{spaceCount} trash bins in total',
+    unref(spaces).length,
+    {
+      spaceCount: unref(spaces).length.toString()
     }
-    const displaySpaces = computed(() =>
-      sort(filter(unref(spaces), unref(filterTerm)), unref(sortBy), unref(sortDir) === 'desc')
-    )
-    const handleSort = (event: { sortBy: keyof SpaceResource; sortDir: SortDir }) => {
-      sortBy.value = event.sortBy
-      sortDir.value = event.sortDir
-    }
-    const filter = (spaces: SpaceResource[], filterTerm: string) => {
-      if (!(filterTerm || '').trim()) {
-        return spaces
-      }
-      const searchEngine = new Fuse(spaces, { ...defaultFuseOptions, keys: ['name'] })
-      return searchEngine.search(filterTerm).map((r) => r.item)
+  )
+)
+
+const footerTextFilter = computed(() =>
+  $ngettext(
+    '%{spaceCount} matching trash bin',
+    '%{spaceCount} matching trash bins',
+    unref(displaySpaces).length,
+    {
+      spaceCount: unref(displaySpaces).length.toString()
     }
+  )
+)
+
+const breadcrumbs = computed(() => [
+  { text: $gettext('Deleted files'), onClick: () => loadResourcesTask.perform() }
+])
+
+const sort = (list: SpaceResource[], propName: keyof SpaceResource, desc: boolean) => {
+  return [...list].sort((s1, s2) => {
+    if (isPersonalSpaceResource(s1)) return -1
+    if (isPersonalSpaceResource(s2)) return 1
+    const a = s1[propName].toString()
+    const b = s2[propName].toString()
+    return desc ? b.localeCompare(a) : a.localeCompare(b)
+  })
+}
 
-    const fields = computed((): FieldType[] => [
-      {
-        name: 'icon',
-        title: '',
-        type: 'slot',
-        width: 'shrink'
-      },
-      {
-        name: 'name',
-        title: $gettext('Name'),
-        type: 'slot',
-        sortable: true
-      }
-    ])
-
-    const resourceTargetRouteCallback = ({
-      resource
-    }: CreateTargetRouteOptions): RouteLocationNamedRaw => {
-      return getTrashLink(resource as SpaceResource)
-    }
+const filter = (spaces: SpaceResource[], filterTerm: string) => {
+  if (!unref(areEmptyTrashesShown)) {
+    spaces = spaces.filter((space) => space.hasTrashedItems !== false)
+  }
+  if (!(filterTerm || '').trim()) return spaces
+  const searchEngine = new Fuse(spaces, { ...defaultFuseOptions, keys: ['name'] })
+  return searchEngine.search(filterTerm).map((r) => r.item)
+}
 
-    const getTrashLink = (space: SpaceResource) => {
-      return createLocationTrash('files-trash-generic', {
-        ...createFileRouteOptions(space)
-      })
-    }
+const displaySpaces = computed(() =>
+  sort(filter(unref(spaces), unref(filterTerm)), unref(sortBy), unref(sortDir) === 'desc')
+)
 
-    onMounted(async () => {
-      if (unref(spaces).length === 1 && !isProjectSpaceResource(unref(spaces)[0])) {
-        return router.push(getTrashLink(unref(spaces)[0]))
-      }
+const handleSort = (event: { sortBy: keyof SpaceResource; sortDir: SortDir }) => {
+  sortBy.value = event.sortBy
+  sortDir.value = event.sortDir
+}
 
-      await loadResourcesTask.perform()
-      await nextTick()
-      markInstance.value = new Mark('.trash-table')
-    })
+const getTrashLink = (space: SpaceResource) =>
+  createLocationTrash('files-trash-generic', {
+    ...createFileRouteOptions(space)
+  })
 
-    watch(filterTerm, () => {
-      const instance = unref(markInstance)
-      if (!instance) {
-        return
-      }
-      instance.unmark()
-      instance.mark(unref(filterTerm), {
-        element: 'span',
-        className: 'mark-highlight',
-        exclude: ['th *', 'tfoot *']
-      })
-    })
+const resourceTargetRouteCallback = ({
+  resource
+}: CreateTargetRouteOptions): RouteLocationNamedRaw => getTrashLink(resource as SpaceResource)
 
-    return {
-      sortBy,
-      sortDir,
-      filterTerm,
-      footerTextTotal,
-      footerTextFilter,
-      fields,
-      spaces,
-      filter,
-      handleSort,
-      displaySpaces,
-      breadcrumbs,
-      resourceTargetRouteCallback,
-      loadResourcesTask,
-      areResourcesLoading,
-      isPersonalSpaceResource,
-      fileListHeaderY,
-      ...useSideBar()
-    }
+onMounted(async () => {
+  if (unref(spaces).length === 1 && !isProjectSpaceResource(unref(spaces)[0])) {
+    return router.push(getTrashLink(unref(spaces)[0]))
   }
+  ready.value = true
+  await loadResourcesTask.perform()
+  await nextTick()
+  markInstance.value = new Mark('.trash-table')
+})
+
+watch(filterTerm, () => {
+  const instance = unref(markInstance)
+  if (!instance) return
+  instance.unmark()
+  instance.mark(unref(filterTerm), {
+    element: 'span',
+    className: 'mark-highlight',
+    exclude: ['th *', 'tfoot *']
+  })
 })
 </script>
 
 <style lang="scss">
-#spaces-filter {
+#trash-filter {
   width: 16rem;
 }
 </style>
diff --git a/packages/web-app-files/tests/unit/components/Trash/TrashContextActions.spec.ts b/packages/web-app-files/tests/unit/components/Trash/TrashContextActions.spec.ts
new file mode 100644
index 0000000000..985e6431e3
--- /dev/null
+++ b/packages/web-app-files/tests/unit/components/Trash/TrashContextActions.spec.ts
@@ -0,0 +1,67 @@
+import TrashContextActions from '../../../../src/components/Trash/TrashContextActions.vue'
+import { buildSpace, SpaceResource } from '@opencloud-eu/web-client'
+import {
+  defaultComponentMocks,
+  defaultPlugins,
+  mount,
+  RouteLocation
+} from '@opencloud-eu/web-test-helpers'
+import { mock } from 'vitest-mock-extended'
+import { Drive } from '@opencloud-eu/web-client/graph/generated'
+
+const spaceMock = mock<Drive>({
+  id: '1',
+  root: {
+    permissions: [{ '@libre.graph.permissions.actions': [], grantedToV2: { user: { id: '1' } } }]
+  },
+  driveType: 'project',
+  special: null
+})
+
+describe('TrashContextActions', () => {
+  describe('action handlers', () => {
+    it('renders actions that are always available: "Open trash bin"', () => {
+      const { wrapper } = getWrapper(buildSpace(spaceMock))
+
+      const labels = wrapper.findAll('[data-testid="action-label"]').map((el) => el.text())
+      expect(labels).toContain('Open trash bin')
+      expect(labels).not.toContain('Empty trash bin')
+    })
+    it('renders action "Empty trash bin" if available', () => {
+      const space = {
+        ...buildSpace(spaceMock),
+        hasTrashedItems: true,
+        canDeleteFromTrashBin: vi.fn(() => true)
+      }
+      const { wrapper } = getWrapper(space)
+
+      const labels = wrapper.findAll('[data-testid="action-label"]').map((el) => el.text())
+      expect(labels).toContain('Open trash bin')
+      expect(labels).toContain('Empty trash bin')
+    })
+  })
+})
+
+function getWrapper(space: SpaceResource) {
+  const mocks = defaultComponentMocks({
+    currentRoute: mock<RouteLocation>({ path: '/trash/overview', name: '' })
+  })
+  return {
+    wrapper: mount(TrashContextActions, {
+      props: {
+        actionOptions: {
+          resources: [space]
+        }
+      },
+      global: {
+        mocks,
+        provide: mocks,
+        plugins: [
+          ...defaultPlugins({
+            abilities: [{ action: 'set-quota-all', subject: 'Drive' }]
+          })
+        ]
+      }
+    })
+  }
+}
diff --git a/packages/web-app-files/tests/unit/views/spaces/GenericTrash.spec.ts b/packages/web-app-files/tests/unit/views/spaces/GenericTrash.spec.ts
index be7245f66c..f7a26ef9de 100644
--- a/packages/web-app-files/tests/unit/views/spaces/GenericTrash.spec.ts
+++ b/packages/web-app-files/tests/unit/views/spaces/GenericTrash.spec.ts
@@ -3,18 +3,17 @@ import { useResourcesViewDefaults } from '../../../../src/composables'
 import { useResourcesViewDefaultsMock } from '../../../../tests/mocks/useResourcesViewDefaultsMock'
 import { ref } from 'vue'
 import { mock } from 'vitest-mock-extended'
-import { Resource } from '@opencloud-eu/web-client'
-import { SpaceResource } from '@opencloud-eu/web-client'
+import { Resource, SpaceResource } from '@opencloud-eu/web-client'
 import {
-  defaultPlugins,
-  mount,
+  ComponentProps,
   defaultComponentMocks,
+  defaultPlugins,
   defaultStubs,
-  RouteLocation,
+  mount,
   PartialComponentProps,
-  ComponentProps
+  RouteLocation
 } from '@opencloud-eu/web-test-helpers'
-import { AppBar } from '@opencloud-eu/web-pkg'
+import { AppBar, NoContentMessage, ResourceTable } from '@opencloud-eu/web-pkg'
 
 vi.mock('../../../../src/composables')
 
@@ -48,12 +47,18 @@ describe('GenericTrash view', () => {
     it('shows the no-content-message after loading', () => {
       const { wrapper } = getMountedWrapper()
       expect(wrapper.find('oc-spinner-stub').exists()).toBeFalsy()
-      expect(wrapper.find('.no-content-message').exists()).toBeTruthy()
+      expect(
+        wrapper.findComponent<typeof NoContentMessage>({ name: 'no-content-message' }).exists()
+      ).toBeTruthy()
     })
     it('shows the files table when files are available', () => {
-      const { wrapper } = getMountedWrapper({ files: [mock<Resource>()] })
-      expect(wrapper.find('.no-content-message').exists()).toBeFalsy()
-      expect(wrapper.find('resource-table-stub').exists()).toBeTruthy()
+      const { wrapper } = getMountedWrapper({
+        files: [mock<Resource>({ id: '1', getDomSelector: vi.fn(() => '') })]
+      })
+      expect(
+        wrapper.findComponent<typeof NoContentMessage>({ name: 'no-content-message' }).exists()
+      ).toBeFalsy()
+      expect(wrapper.findComponent<typeof ResourceTable>('.oc-table').exists()).toBeTruthy()
     })
   })
 })
@@ -92,6 +97,7 @@ function getMountedWrapper({
       global: {
         plugins: [...defaultPlugins()],
         mocks: defaultMocks,
+        provide: defaultMocks,
         stubs: { ...defaultStubs, portal: true }
       }
     })
diff --git a/packages/web-app-files/tests/unit/views/trash/Overview.spec.ts b/packages/web-app-files/tests/unit/views/trash/Overview.spec.ts
index 3e7579e290..a0f2b9455a 100644
--- a/packages/web-app-files/tests/unit/views/trash/Overview.spec.ts
+++ b/packages/web-app-files/tests/unit/views/trash/Overview.spec.ts
@@ -14,11 +14,12 @@ import { ResourceTable, SortDir } from '@opencloud-eu/web-pkg'
 const spaceMocks = [
   {
     id: '1',
-    name: 'admin',
+    name: 'Personal',
     disabled: false,
     driveType: 'personal',
     getDriveAliasAndItem: () => '1',
-    isOwner: () => true
+    isOwner: () => true,
+    hasTrashedItems: true
   },
   {
     id: '2',
@@ -26,7 +27,8 @@ const spaceMocks = [
     disabled: false,
     driveType: 'project',
     getDriveAliasAndItem: () => '2',
-    isOwner: () => false
+    isOwner: () => false,
+    hasTrashedItems: true
   },
   {
     id: '3',
@@ -34,14 +36,15 @@ const spaceMocks = [
     disabled: false,
     driveType: 'project',
     getDriveAliasAndItem: () => '3',
-    isOwner: () => false
+    isOwner: () => false,
+    hasTrashedItems: true
   }
 ] as unknown as SpaceResource[]
 
 describe('TrashOverview', () => {
   it('should render no content message if no spaces exist', async () => {
     const { wrapper } = getWrapper({ spaces: [] })
-    await wrapper.vm.loadResourcesTask.last
+    await (wrapper.vm as any).loadResourcesTask.last
     expect(wrapper.find('no-content-message-stub').exists()).toBeTruthy()
   })
   it('should navigate to single space trash if only one space exists', () => {
@@ -53,23 +56,24 @@ describe('TrashOverview', () => {
     })
   })
   describe('view states', () => {
-    it('shows the loading spinner during loading', () => {
+    it('shows the loading spinner during loading', async () => {
       const { wrapper } = getWrapper()
+      await nextTick()
       expect(wrapper.find('oc-spinner-stub').exists()).toBeTruthy()
     })
     it('should render trash list', async () => {
       const { wrapper } = getWrapper()
-      await wrapper.vm.loadResourcesTask.last
+      await (wrapper.vm as any).loadResourcesTask.last
       expect(wrapper.html()).toMatchSnapshot()
     })
   })
   describe('sorting', () => {
     it('sorts by property name', async () => {
       const { wrapper } = getWrapper()
-      await wrapper.vm.loadResourcesTask.last
+      await (wrapper.vm as any).loadResourcesTask.last
       let sortedSpaces = []
+      ;(wrapper.vm as any).sortBy = 'name'
 
-      wrapper.vm.sortBy = 'name'
       await nextTick()
       sortedSpaces = wrapper.findComponent(ResourceTable).props().resources as SpaceResource[]
       expect(sortedSpaces.map((s) => s.id)).toEqual([
@@ -77,8 +81,7 @@ describe('TrashOverview', () => {
         spaceMocks[1].id,
         spaceMocks[2].id
       ])
-
-      wrapper.vm.sortDir = SortDir.Desc
+      ;(wrapper.vm as any).sortDir = SortDir.Desc
       await nextTick()
       sortedSpaces = wrapper.findComponent(ResourceTable).props().resources as SpaceResource[]
       expect(sortedSpaces.map((s) => s.id)).toEqual([
@@ -91,18 +94,18 @@ describe('TrashOverview', () => {
       const { wrapper } = getWrapper({ spaces: [spaceMocks[0]] })
       const sortBy = 'name'
       const sortDir = SortDir.Desc
-      wrapper.vm.handleSort({ sortBy, sortDir })
-      expect(wrapper.vm.sortBy).toEqual(sortBy)
-      expect(wrapper.vm.sortDir).toEqual(sortDir)
+      ;(wrapper.vm as any).handleSort({ sortBy, sortDir })
+      expect((wrapper.vm as any).sortBy).toEqual(sortBy)
+      expect((wrapper.vm as any).sortDir).toEqual(sortDir)
     })
   })
   describe('filtering', () => {
     it('shows only filtered spaces if filter applied', async () => {
       const { wrapper } = getWrapper()
-      wrapper.vm.filterTerm = 'admin'
+      ;(wrapper.vm as any).filterTerm = 'Personal'
       await nextTick()
-      expect(wrapper.vm.displaySpaces.length).toEqual(1)
-      expect(wrapper.vm.displaySpaces[0].id).toEqual(spaceMocks[0].id)
+      expect((wrapper.vm as any).displaySpaces.length).toEqual(1)
+      expect((wrapper.vm as any).displaySpaces[0].id).toEqual(spaceMocks[0].id)
     })
   })
 })
@@ -114,6 +117,8 @@ function getWrapper({ spaces = spaceMocks }: { spaces?: SpaceResource[] } = {})
     })
   }
 
+  mocks.$clientService.graphAuthenticated.drives.listMyDrives.mockResolvedValue(spaceMocks)
+
   return {
     mocks,
     wrapper: mount(TrashOverview, {
diff --git a/packages/web-app-files/tests/unit/views/trash/__snapshots__/Overview.spec.ts.snap b/packages/web-app-files/tests/unit/views/trash/__snapshots__/Overview.spec.ts.snap
index 36fe9c2554..7f9420d419 100644
--- a/packages/web-app-files/tests/unit/views/trash/__snapshots__/Overview.spec.ts.snap
+++ b/packages/web-app-files/tests/unit/views/trash/__snapshots__/Overview.spec.ts.snap
@@ -4,13 +4,13 @@ exports[`TrashOverview > view states > should render trash list 1`] = `
 "<div class="oc-flex">
   <div data-v-39c970be="" class="files-view-wrapper oc-width-expand">
     <div data-v-39c970be="" id="files-view">
-      <app-bar-stub viewmodedefault="resource-table" breadcrumbs="[object Object]" breadcrumbscontextactionsitems="" viewmodes="" hasbulkactions="false" hasviewoptions="false" hashiddenfiles="false" hasfileextensions="false" haspagination="false" showactionsonselection="false" issidebaropen="false" batchactionsloading="false"></app-bar-stub>
+      <app-bar-stub viewmodedefault="resource-table" breadcrumbs="[object Object]" breadcrumbscontextactionsitems="" viewmodes="" hasbulkactions="false" hasviewoptions="true" hashiddenfiles="false" hasfileextensions="false" haspagination="false" showactionsonselection="false" issidebaropen="false" batchactionsloading="false"></app-bar-stub>
       <div class="trash-bin-filters oc-flex oc-flex-right oc-flex-wrap oc-flex-bottom oc-mx-m oc-mb-m">
-        <div class=""><label class="oc-label" for="spaces-filter">Search
+        <div class=""><label class="oc-label" for="trash-filter">Search
             <!--v-if-->
           </label>
           <div class="oc-position-relative">
-            <!--v-if--> <input id="spaces-filter" autocomplete="off" aria-invalid="false" class="oc-text-input oc-input oc-rounded" type="text" value="">
+            <!--v-if--> <input id="trash-filter" autocomplete="off" aria-invalid="false" class="oc-text-input oc-input oc-rounded" type="text" value="">
             <!--v-if-->
           </div>
           <!--v-if-->
@@ -49,7 +49,7 @@ exports[`TrashOverview > view states > should render trash list 1`] = `
               <!-- @slot Footer of the table -->
               <!-- @slot Footer of the files table -->
               <div class="oc-text-center oc-width-1-1 oc-my-s">
-                <p class="oc-text-muted">3 trashes in total</p>
+                <p class="oc-text-muted">3 trash bins in total</p>
                 <!--v-if-->
               </div>
             </td>
diff --git a/packages/web-client/src/graph/drives/drives.ts b/packages/web-client/src/graph/drives/drives.ts
index 2a6b6027d1..1aca2f9328 100644
--- a/packages/web-client/src/graph/drives/drives.ts
+++ b/packages/web-client/src/graph/drives/drives.ts
@@ -11,8 +11,12 @@ export const DrivesFactory = ({ axiosClient, config }: GraphFactoryOptions): Gra
   const allDrivesApi = new DrivesGetDrivesApi(config, config.basePath, axiosClient)
 
   return {
-    async getDrive(id, requestOptions) {
-      const { data: drive } = await drivesApiFactory.getDrive(id, requestOptions)
+    async getDrive(id, options, requestOptions) {
+      const { data: drive } = await drivesApiFactory.getDrive(
+        id,
+        options?.select ? new Set([...options.select]) : null,
+        requestOptions
+      )
       return buildSpace({ ...drive, serverUrl: getServerUrlFromDrive(drive) })
     },
 
@@ -47,6 +51,7 @@ export const DrivesFactory = ({ axiosClient, config }: GraphFactoryOptions): Gra
         options?.orderBy,
         options?.filter,
         options?.expand,
+        options?.select ? new Set([...options.select]) : null,
         requestOptions
       )
       return value.map((d) => buildSpace({ ...d, serverUrl: getServerUrlFromDrive(d) }))
@@ -59,6 +64,7 @@ export const DrivesFactory = ({ axiosClient, config }: GraphFactoryOptions): Gra
         options?.orderBy,
         options?.filter,
         options?.expand,
+        options?.select ? new Set([...options.select]) : null,
         requestOptions
       )
       return value.map((d) => buildSpace({ ...d, serverUrl: getServerUrlFromDrive(d) }))
diff --git a/packages/web-client/src/graph/drives/types.ts b/packages/web-client/src/graph/drives/types.ts
index 04aeb240f9..10e5d52126 100644
--- a/packages/web-client/src/graph/drives/types.ts
+++ b/packages/web-client/src/graph/drives/types.ts
@@ -1,9 +1,19 @@
 import type { SpaceResource } from '../../helpers'
 import type { Drive, DriveUpdate } from '../generated'
+import { ListMyDrivesBetaSelectEnum } from '../generated'
 import type { GraphRequestOptions } from '../types'
 
 export interface GraphDrives {
-  getDrive: (id: string, requestOptions?: GraphRequestOptions) => Promise<SpaceResource>
+  getDrive: (
+    id: string,
+    options?: {
+      orderBy?: string
+      filter?: string
+      expand?: string
+      select?: Array<ListMyDrivesBetaSelectEnum>
+    },
+    requestOptions?: GraphRequestOptions
+  ) => Promise<SpaceResource>
   createDrive: (data: Drive, requestOptions?: GraphRequestOptions) => Promise<SpaceResource>
   updateDrive: (
     id: string,
@@ -21,6 +31,7 @@ export interface GraphDrives {
       orderBy?: string
       filter?: string
       expand?: string
+      select?: Array<ListMyDrivesBetaSelectEnum>
     },
     requestOptions?: GraphRequestOptions
   ) => Promise<SpaceResource[]>
@@ -29,6 +40,7 @@ export interface GraphDrives {
       orderBy?: string
       filter?: string
       expand?: string
+      select?: Array<ListMyDrivesBetaSelectEnum>
     },
     requestOptions?: GraphRequestOptions
   ) => Promise<SpaceResource[]>
diff --git a/packages/web-client/src/graph/generated/.openapi-generator/VERSION b/packages/web-client/src/graph/generated/.openapi-generator/VERSION
index 4c631cf217..e465da4315 100644
--- a/packages/web-client/src/graph/generated/.openapi-generator/VERSION
+++ b/packages/web-client/src/graph/generated/.openapi-generator/VERSION
@@ -1 +1 @@
-7.14.0-SNAPSHOT
+7.14.0
diff --git a/packages/web-client/src/graph/generated/api.ts b/packages/web-client/src/graph/generated/api.ts
index 62b37c3318..0c9be17481 100644
--- a/packages/web-client/src/graph/generated/api.ts
+++ b/packages/web-client/src/graph/generated/api.ts
@@ -729,6 +729,12 @@ export interface Drive {
      * @memberof Drive
      */
     'special'?: Array<DriveItem>;
+    /**
+     * Indicates whether the drive has items in the trash. Read-only.
+     * @type {boolean}
+     * @memberof Drive
+     */
+    '@libre.graph.hasTrashedItems'?: boolean;
 }
 /**
  * Represents a resource inside a drive. Read-only.
@@ -1126,6 +1132,12 @@ export interface DriveUpdate {
      * @memberof DriveUpdate
      */
     'special'?: Array<DriveItem>;
+    /**
+     * Indicates whether the drive has items in the trash. Read-only.
+     * @type {boolean}
+     * @memberof DriveUpdate
+     */
+    '@libre.graph.hasTrashedItems'?: boolean;
 }
 /**
  * And extension of group representing a class or course
@@ -3357,10 +3369,11 @@ export const DrivesApiAxiosParamCreator = function (configuration?: Configuratio
          * 
          * @summary Get drive by id
          * @param {string} driveId key: id of drive
+         * @param {Set<GetDriveSelectEnum>} [$select] Select properties to be returned. By default all properties are returned.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getDrive: async (driveId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getDrive: async (driveId: string, $select?: Set<GetDriveSelectEnum>, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('getDrive', 'driveId', driveId)
             const localVarPath = `/v1.0/drives/{drive-id}`
@@ -3382,6 +3395,10 @@ export const DrivesApiAxiosParamCreator = function (configuration?: Configuratio
             // http basic authentication required
             setBasicAuthToObject(localVarRequestOptions, configuration)
 
+            if ($select) {
+                localVarQueryParameter['$select'] = Array.from($select).join(COLLECTION_FORMATS.csv);
+            }
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -3480,11 +3497,12 @@ export const DrivesApiFp = function(configuration?: Configuration) {
          * 
          * @summary Get drive by id
          * @param {string} driveId key: id of drive
+         * @param {Set<GetDriveSelectEnum>} [$select] Select properties to be returned. By default all properties are returned.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getDrive(driveId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Drive>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.getDrive(driveId, options);
+        async getDrive(driveId: string, $select?: Set<GetDriveSelectEnum>, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Drive>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.getDrive(driveId, $select, options);
             const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
             const localVarOperationServerBasePath = operationServerMap['DrivesApi.getDrive']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
@@ -3538,11 +3556,12 @@ export const DrivesApiFactory = function (configuration?: Configuration, basePat
          * 
          * @summary Get drive by id
          * @param {string} driveId key: id of drive
+         * @param {Set<GetDriveSelectEnum>} [$select] Select properties to be returned. By default all properties are returned.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getDrive(driveId: string, options?: RawAxiosRequestConfig): AxiosPromise<Drive> {
-            return localVarFp.getDrive(driveId, options).then((request) => request(axios, basePath));
+        getDrive(driveId: string, $select?: Set<GetDriveSelectEnum>, options?: RawAxiosRequestConfig): AxiosPromise<Drive> {
+            return localVarFp.getDrive(driveId, $select, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -3594,12 +3613,13 @@ export class DrivesApi extends BaseAPI {
      * 
      * @summary Get drive by id
      * @param {string} driveId key: id of drive
+     * @param {Set<GetDriveSelectEnum>} [$select] Select properties to be returned. By default all properties are returned.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof DrivesApi
      */
-    public getDrive(driveId: string, options?: RawAxiosRequestConfig) {
-        return DrivesApiFp(this.configuration).getDrive(driveId, options).then((request) => request(this.axios, this.basePath));
+    public getDrive(driveId: string, $select?: Set<GetDriveSelectEnum>, options?: RawAxiosRequestConfig) {
+        return DrivesApiFp(this.configuration).getDrive(driveId, $select, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
@@ -3616,6 +3636,13 @@ export class DrivesApi extends BaseAPI {
     }
 }
 
+/**
+ * @export
+ */
+export const GetDriveSelectEnum = {
+    LibreGraphHasTrashedItems: '@libre.graph.hasTrashedItems'
+} as const;
+export type GetDriveSelectEnum = typeof GetDriveSelectEnum[keyof typeof GetDriveSelectEnum];
 
 
 /**
@@ -3676,10 +3703,11 @@ export const DrivesGetDrivesApiAxiosParamCreator = function (configuration?: Con
          * @param {string} [$orderby] The $orderby system query option allows clients to request resources in either ascending order using asc or descending order using desc.
          * @param {string} [$filter] Filter items by property values
          * @param {string} [$expand] Expand related entities
+         * @param {Set<ListAllDrivesBetaSelectEnum>} [$select] Select properties to be returned. By default all properties are returned.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listAllDrivesBeta: async ($orderby?: string, $filter?: string, $expand?: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listAllDrivesBeta: async ($orderby?: string, $filter?: string, $expand?: string, $select?: Set<ListAllDrivesBetaSelectEnum>, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1beta1/drives`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -3710,6 +3738,10 @@ export const DrivesGetDrivesApiAxiosParamCreator = function (configuration?: Con
                 localVarQueryParameter['$expand'] = $expand;
             }
 
+            if ($select) {
+                localVarQueryParameter['$select'] = Array.from($select).join(COLLECTION_FORMATS.csv);
+            }
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -3751,11 +3783,12 @@ export const DrivesGetDrivesApiFp = function(configuration?: Configuration) {
          * @param {string} [$orderby] The $orderby system query option allows clients to request resources in either ascending order using asc or descending order using desc.
          * @param {string} [$filter] Filter items by property values
          * @param {string} [$expand] Expand related entities
+         * @param {Set<ListAllDrivesBetaSelectEnum>} [$select] Select properties to be returned. By default all properties are returned.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listAllDrivesBeta($orderby?: string, $filter?: string, $expand?: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfDrives1>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listAllDrivesBeta($orderby, $filter, $expand, options);
+        async listAllDrivesBeta($orderby?: string, $filter?: string, $expand?: string, $select?: Set<ListAllDrivesBetaSelectEnum>, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfDrives1>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listAllDrivesBeta($orderby, $filter, $expand, $select, options);
             const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
             const localVarOperationServerBasePath = operationServerMap['DrivesGetDrivesApi.listAllDrivesBeta']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
@@ -3787,11 +3820,12 @@ export const DrivesGetDrivesApiFactory = function (configuration?: Configuration
          * @param {string} [$orderby] The $orderby system query option allows clients to request resources in either ascending order using asc or descending order using desc.
          * @param {string} [$filter] Filter items by property values
          * @param {string} [$expand] Expand related entities
+         * @param {Set<ListAllDrivesBetaSelectEnum>} [$select] Select properties to be returned. By default all properties are returned.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listAllDrivesBeta($orderby?: string, $filter?: string, $expand?: string, options?: RawAxiosRequestConfig): AxiosPromise<CollectionOfDrives1> {
-            return localVarFp.listAllDrivesBeta($orderby, $filter, $expand, options).then((request) => request(axios, basePath));
+        listAllDrivesBeta($orderby?: string, $filter?: string, $expand?: string, $select?: Set<ListAllDrivesBetaSelectEnum>, options?: RawAxiosRequestConfig): AxiosPromise<CollectionOfDrives1> {
+            return localVarFp.listAllDrivesBeta($orderby, $filter, $expand, $select, options).then((request) => request(axios, basePath));
         },
     };
 };
@@ -3822,15 +3856,23 @@ export class DrivesGetDrivesApi extends BaseAPI {
      * @param {string} [$orderby] The $orderby system query option allows clients to request resources in either ascending order using asc or descending order using desc.
      * @param {string} [$filter] Filter items by property values
      * @param {string} [$expand] Expand related entities
+     * @param {Set<ListAllDrivesBetaSelectEnum>} [$select] Select properties to be returned. By default all properties are returned.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof DrivesGetDrivesApi
      */
-    public listAllDrivesBeta($orderby?: string, $filter?: string, $expand?: string, options?: RawAxiosRequestConfig) {
-        return DrivesGetDrivesApiFp(this.configuration).listAllDrivesBeta($orderby, $filter, $expand, options).then((request) => request(this.axios, this.basePath));
+    public listAllDrivesBeta($orderby?: string, $filter?: string, $expand?: string, $select?: Set<ListAllDrivesBetaSelectEnum>, options?: RawAxiosRequestConfig) {
+        return DrivesGetDrivesApiFp(this.configuration).listAllDrivesBeta($orderby, $filter, $expand, $select, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
+/**
+ * @export
+ */
+export const ListAllDrivesBetaSelectEnum = {
+    LibreGraphHasTrashedItems: '@libre.graph.hasTrashedItems'
+} as const;
+export type ListAllDrivesBetaSelectEnum = typeof ListAllDrivesBetaSelectEnum[keyof typeof ListAllDrivesBetaSelectEnum];
 
 
 /**
@@ -9056,10 +9098,11 @@ export const MeDrivesApiAxiosParamCreator = function (configuration?: Configurat
          * @param {string} [$orderby] The $orderby system query option allows clients to request resources in either ascending order using asc or descending order using desc.
          * @param {string} [$filter] Filter items by property values
          * @param {string} [$expand] Expand related entities
+         * @param {Set<ListMyDrivesBetaSelectEnum>} [$select] Select properties to be returned. By default all properties are returned.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listMyDrivesBeta: async ($orderby?: string, $filter?: string, $expand?: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listMyDrivesBeta: async ($orderby?: string, $filter?: string, $expand?: string, $select?: Set<ListMyDrivesBetaSelectEnum>, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1beta1/me/drives`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -9090,6 +9133,10 @@ export const MeDrivesApiAxiosParamCreator = function (configuration?: Configurat
                 localVarQueryParameter['$expand'] = $expand;
             }
 
+            if ($select) {
+                localVarQueryParameter['$select'] = Array.from($select).join(COLLECTION_FORMATS.csv);
+            }
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -9131,11 +9178,12 @@ export const MeDrivesApiFp = function(configuration?: Configuration) {
          * @param {string} [$orderby] The $orderby system query option allows clients to request resources in either ascending order using asc or descending order using desc.
          * @param {string} [$filter] Filter items by property values
          * @param {string} [$expand] Expand related entities
+         * @param {Set<ListMyDrivesBetaSelectEnum>} [$select] Select properties to be returned. By default all properties are returned.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listMyDrivesBeta($orderby?: string, $filter?: string, $expand?: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfDrives>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listMyDrivesBeta($orderby, $filter, $expand, options);
+        async listMyDrivesBeta($orderby?: string, $filter?: string, $expand?: string, $select?: Set<ListMyDrivesBetaSelectEnum>, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfDrives>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listMyDrivesBeta($orderby, $filter, $expand, $select, options);
             const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
             const localVarOperationServerBasePath = operationServerMap['MeDrivesApi.listMyDrivesBeta']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
@@ -9167,11 +9215,12 @@ export const MeDrivesApiFactory = function (configuration?: Configuration, baseP
          * @param {string} [$orderby] The $orderby system query option allows clients to request resources in either ascending order using asc or descending order using desc.
          * @param {string} [$filter] Filter items by property values
          * @param {string} [$expand] Expand related entities
+         * @param {Set<ListMyDrivesBetaSelectEnum>} [$select] Select properties to be returned. By default all properties are returned.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listMyDrivesBeta($orderby?: string, $filter?: string, $expand?: string, options?: RawAxiosRequestConfig): AxiosPromise<CollectionOfDrives> {
-            return localVarFp.listMyDrivesBeta($orderby, $filter, $expand, options).then((request) => request(axios, basePath));
+        listMyDrivesBeta($orderby?: string, $filter?: string, $expand?: string, $select?: Set<ListMyDrivesBetaSelectEnum>, options?: RawAxiosRequestConfig): AxiosPromise<CollectionOfDrives> {
+            return localVarFp.listMyDrivesBeta($orderby, $filter, $expand, $select, options).then((request) => request(axios, basePath));
         },
     };
 };
@@ -9202,15 +9251,23 @@ export class MeDrivesApi extends BaseAPI {
      * @param {string} [$orderby] The $orderby system query option allows clients to request resources in either ascending order using asc or descending order using desc.
      * @param {string} [$filter] Filter items by property values
      * @param {string} [$expand] Expand related entities
+     * @param {Set<ListMyDrivesBetaSelectEnum>} [$select] Select properties to be returned. By default all properties are returned.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof MeDrivesApi
      */
-    public listMyDrivesBeta($orderby?: string, $filter?: string, $expand?: string, options?: RawAxiosRequestConfig) {
-        return MeDrivesApiFp(this.configuration).listMyDrivesBeta($orderby, $filter, $expand, options).then((request) => request(this.axios, this.basePath));
+    public listMyDrivesBeta($orderby?: string, $filter?: string, $expand?: string, $select?: Set<ListMyDrivesBetaSelectEnum>, options?: RawAxiosRequestConfig) {
+        return MeDrivesApiFp(this.configuration).listMyDrivesBeta($orderby, $filter, $expand, $select, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
+/**
+ * @export
+ */
+export const ListMyDrivesBetaSelectEnum = {
+    LibreGraphHasTrashedItems: '@libre.graph.hasTrashedItems'
+} as const;
+export type ListMyDrivesBetaSelectEnum = typeof ListMyDrivesBetaSelectEnum[keyof typeof ListMyDrivesBetaSelectEnum];
 
 
 /**
diff --git a/packages/web-client/src/graph/generated/common.ts b/packages/web-client/src/graph/generated/common.ts
index 17852fec95..d195c87d77 100644
--- a/packages/web-client/src/graph/generated/common.ts
+++ b/packages/web-client/src/graph/generated/common.ts
@@ -89,17 +89,17 @@ function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: an
     if (typeof parameter === "object") {
         if (Array.isArray(parameter)) {
             (parameter as any[]).forEach(item => setFlattenedQueryParams(urlSearchParams, item, key));
-        } 
+        }
         else {
-            Object.keys(parameter).forEach(currentKey => 
+            Object.keys(parameter).forEach(currentKey =>
                 setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`)
             );
         }
-    } 
+    }
     else {
         if (urlSearchParams.has(key)) {
             urlSearchParams.append(key, parameter);
-        } 
+        }
         else {
             urlSearchParams.set(key, parameter);
         }
diff --git a/packages/web-client/src/helpers/space/functions.ts b/packages/web-client/src/helpers/space/functions.ts
index e1dcae92a2..4430bec693 100644
--- a/packages/web-client/src/helpers/space/functions.ts
+++ b/packages/web-client/src/helpers/space/functions.ts
@@ -181,6 +181,7 @@ export function buildSpace(
     spaceQuota: data.quota,
     spaceImageData,
     spaceReadmeData,
+    hasTrashedItems: data['@libre.graph.hasTrashedItems'] || false,
     graphPermissions: undefined,
     canUpload: function ({ user }: { user?: User } = {}): boolean {
       if (isPersonalSpaceResource(this) && this.isOwner(user)) {
@@ -255,7 +256,10 @@ export function buildSpace(
     canRestoreFromTrashbin: function () {
       return this.graphPermissions?.includes(GraphSharePermission.updateDeleted)
     },
-    canDeleteFromTrashBin: function () {
+    canDeleteFromTrashBin: function ({ user }: { user?: User } = {}) {
+      if (isPersonalSpaceResource(this) && this.isOwner(user)) {
+        return true
+      }
       // FIXME: server permissions are a mess currently: https://github.com/opencloud-eu/opencloud/issues/10
       return this.graphPermissions?.includes(GraphSharePermission.deletePermissions)
     },
diff --git a/packages/web-client/src/helpers/space/types.ts b/packages/web-client/src/helpers/space/types.ts
index a623db65ba..9eae5544cf 100644
--- a/packages/web-client/src/helpers/space/types.ts
+++ b/packages/web-client/src/helpers/space/types.ts
@@ -22,6 +22,7 @@ export interface SpaceResource extends Resource {
   spaceQuota: Quota
   spaceImageData: DriveItem
   spaceReadmeData: DriveItem
+  hasTrashedItems: boolean
   webDavTrashPath: string
 
   // permissions for the current user. need to be loaded manually at some point via the space store.
diff --git a/packages/web-pkg/src/components/AppBar/AppBar.vue b/packages/web-pkg/src/components/AppBar/AppBar.vue
index 128d26a82f..01a3896d2a 100644
--- a/packages/web-pkg/src/components/AppBar/AppBar.vue
+++ b/packages/web-pkg/src/components/AppBar/AppBar.vue
@@ -65,11 +65,11 @@
 <script lang="ts">
 import last from 'lodash-es/last'
 import { computed, defineComponent, inject, PropType, ref, Ref, unref, useSlots } from 'vue'
-import { Resource } from '@opencloud-eu/web-client'
 import {
   isPersonalSpaceResource,
   isProjectSpaceResource,
   isShareSpaceResource,
+  Resource,
   SpaceResource
 } from '@opencloud-eu/web-client'
 import BatchActions from '../BatchActions.vue'
@@ -78,39 +78,36 @@ import ViewOptions from '../ViewOptions.vue'
 import { isLocationCommonActive, isLocationTrashActive } from '../../router'
 import { FolderView } from '../../ui/types'
 import {
-  useFileActionsEnableSync,
   useFileActionsCopy,
-  useFileActionsDisableSync,
   useFileActionsDelete,
+  useFileActionsDisableSync,
   useFileActionsDownloadArchive,
   useFileActionsDownloadFile,
-  useFileActionsEmptyTrashBin,
+  useFileActionsEnableSync,
   useFileActionsMove,
   useFileActionsRestore,
   useSpaceActionsDuplicate
 } from '../../composables/actions'
 import {
+  ActionExtension,
+  FileAction,
+  FolderViewModeConstants,
   useAbility,
+  useActiveLocation,
+  useExtensionRegistry,
   useFileActionsToggleHideShare,
+  useIsTopBarSticky,
   useResourcesStore,
   useRouteMeta,
-  useSpacesStore,
   useRouter,
-  FolderViewModeConstants,
-  useExtensionRegistry,
-  ActionExtension,
-  useIsTopBarSticky
-} from '../../composables'
-import { BreadcrumbItem, EVENT_ITEM_DROPPED } from '@opencloud-eu/design-system/helpers'
-import { useActiveLocation } from '../../composables'
-import { useGettext } from 'vue3-gettext'
-import {
-  FileAction,
   useSpaceActionsDelete,
   useSpaceActionsDisable,
   useSpaceActionsEditQuota,
-  useSpaceActionsRestore
+  useSpaceActionsRestore,
+  useSpacesStore
 } from '../../composables'
+import { BreadcrumbItem, EVENT_ITEM_DROPPED } from '@opencloud-eu/design-system/helpers'
+import { useGettext } from 'vue3-gettext'
 import { storeToRefs } from 'pinia'
 import { RouteLocationRaw } from 'vue-router'
 
@@ -174,7 +171,6 @@ export default defineComponent({
     const { actions: deleteActions } = useFileActionsDelete()
     const { actions: downloadArchiveActions } = useFileActionsDownloadArchive()
     const { actions: downloadFileActions } = useFileActionsDownloadFile()
-    const { actions: emptyTrashBinActions } = useFileActionsEmptyTrashBin()
     const { actions: moveActions } = useFileActionsMove()
     const { actions: restoreActions } = useFileActionsRestore()
     const { actions: deleteSpaceActions } = useSpaceActionsDelete()
@@ -198,7 +194,6 @@ export default defineComponent({
         ...unref(downloadFileActions),
         ...unref(moveActions),
         ...unref(copyActions),
-        ...unref(emptyTrashBinActions),
         ...unref(deleteActions),
         ...unref(restoreActions)
       ]
diff --git a/packages/web-pkg/src/components/FilesList/ContextActions.vue b/packages/web-pkg/src/components/FilesList/ContextActions.vue
index 9ca9562121..5e17299f42 100644
--- a/packages/web-pkg/src/components/FilesList/ContextActions.vue
+++ b/packages/web-pkg/src/components/FilesList/ContextActions.vue
@@ -17,7 +17,6 @@ import {
   useFileActionsDisableSync,
   useFileActionsDownloadArchive,
   useFileActionsDownloadFile,
-  useFileActionsEmptyTrashBin,
   useFileActionsEnableSync,
   useFileActionsFavorite,
   useFileActionsMove,
@@ -56,7 +55,6 @@ export default defineComponent({
     const { actions: downloadArchiveActions } = useFileActionsDownloadArchive()
     const { actions: downloadFileActions } = useFileActionsDownloadFile()
     const { actions: favoriteActions } = useFileActionsFavorite()
-    const { actions: emptyTrashBinActions } = useFileActionsEmptyTrashBin()
     const { actions: moveActions } = useFileActionsMove()
     const { actions: navigateActions } = useFileActionsNavigate()
     const { actions: pasteActions } = useFileActionsPaste()
@@ -95,7 +93,6 @@ export default defineComponent({
         ...unref(downloadArchiveActions),
         ...unref(moveActions),
         ...unref(copyActions),
-        ...unref(emptyTrashBinActions),
         ...unref(deleteActions),
         ...unref(restoreActions),
         ...unref(createSpaceFromResourceActions),
diff --git a/packages/web-pkg/src/components/FilesList/ResourceStatusIndicators.vue b/packages/web-pkg/src/components/FilesList/ResourceStatusIndicators.vue
index 0e44f34218..8dcf85338e 100644
--- a/packages/web-pkg/src/components/FilesList/ResourceStatusIndicators.vue
+++ b/packages/web-pkg/src/components/FilesList/ResourceStatusIndicators.vue
@@ -1,18 +1,27 @@
 <template>
-  <oc-status-indicators v-if="indicators.length > 0" v-bind="attrs" :indicators="indicators" />
+  <oc-status-indicators
+    v-if="indicators.length > 0"
+    v-bind="attrs"
+    :indicators="indicators"
+    :resource="resource"
+  />
 </template>
 
 <script setup lang="ts">
 import { Resource, SpaceResource } from '@opencloud-eu/web-client'
-import { ResourceIndicator, getIndicators } from '../../helpers'
+import { getIndicators, ResourceIndicator } from '../../helpers'
 import { computed, useAttrs } from 'vue'
 import { useResourcesStore, useUserStore } from '../../composables/piniaStores'
 import { OcStatusIndicators } from '@opencloud-eu/design-system/components'
 
 const attrs = useAttrs() as (typeof OcStatusIndicators)['props']
-const { space, resource, filter } = defineProps<{
-  space: SpaceResource
+const {
+  resource,
+  space = undefined,
+  filter = undefined
+} = defineProps<{
   resource: Resource
+  space?: SpaceResource
   filter?: (indicator: ResourceIndicator) => boolean
 }>()
 
diff --git a/packages/web-pkg/src/components/FilesList/ResourceTable.vue b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
index a6f9803dfb..02f0f6e947 100644
--- a/packages/web-pkg/src/components/FilesList/ResourceTable.vue
+++ b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
@@ -404,6 +404,14 @@ export default defineComponent({
       required: false,
       default: true
     },
+    /**
+     * Asserts whether rename quick action is available
+     */
+    showRenameQuickAction: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     /**
      * Accepts a `path` and a `resource` param and returns a corresponding route object.
      */
@@ -997,6 +1005,10 @@ export default defineComponent({
       return item.id === this.latestSelectedId
     },
     hasRenameAction(item: Resource) {
+      if (!this.showRenameQuickAction) {
+        return false
+      }
+
       if (isProjectSpaceResource(item)) {
         return this.renameActionsSpace.filter((menuItem) =>
           menuItem.isVisible({ resources: [item] })
diff --git a/packages/web-pkg/src/components/ViewOptions.vue b/packages/web-pkg/src/components/ViewOptions.vue
index 2767dac033..3c0ce542ba 100644
--- a/packages/web-pkg/src/components/ViewOptions.vue
+++ b/packages/web-pkg/src/components/ViewOptions.vue
@@ -72,6 +72,14 @@
             @update:checked="updateDisabledSpacesShownModel"
           />
         </li>
+        <li v-if="isTrashOverViewLocation" class="files-view-options-list-item">
+          <oc-switch
+            v-model:checked="emptyTrashesShownModel"
+            data-testid="files-switch-projects-show-disabled"
+            :label="$gettext('Show empty trash bins')"
+            @update:checked="updateEmptyTrashesShownModel"
+          />
+        </li>
         <li
           v-if="viewModeCurrent === FolderViewModeConstants.name.tiles"
           class="files-view-options-list-item oc-flex oc-flex-between oc-flex-middle"
@@ -96,21 +104,21 @@
 import { computed, defineComponent, PropType, ref, unref, watch } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import {
+  FolderViewModeConstants,
+  PaginationConstants,
   queryItemAsString,
+  useActiveLocation,
+  useResourcesStore,
   useRoute,
+  useRouteName,
   useRouteQuery,
   useRouteQueryPersisted,
   useRouter,
-  PaginationConstants,
-  FolderViewModeConstants,
-  useRouteName,
-  useResourcesStore,
-  useViewSizeMax,
-  useActiveLocation
+  useViewSizeMax
 } from '../composables'
 import { FolderView } from '../ui/types'
 import { storeToRefs } from 'pinia'
-import { isLocationSpacesActive } from '../router'
+import { isLocationSpacesActive, isLocationTrashActive } from '../router'
 
 export default defineComponent({
   props: {
@@ -149,10 +157,18 @@ export default defineComponent({
     const { $gettext } = useGettext()
 
     const resourcesStore = useResourcesStore()
-    const { setAreHiddenFilesShown, setAreFileExtensionsShown, setAreDisabledSpacesShown } =
-      resourcesStore
-    const { areHiddenFilesShown, areFileExtensionsShown, areDisabledSpacesShown } =
-      storeToRefs(resourcesStore)
+    const {
+      setAreHiddenFilesShown,
+      setAreFileExtensionsShown,
+      setAreDisabledSpacesShown,
+      setAreEmptyTrashesShown
+    } = resourcesStore
+    const {
+      areHiddenFilesShown,
+      areFileExtensionsShown,
+      areDisabledSpacesShown,
+      areEmptyTrashesShown
+    } = storeToRefs(resourcesStore)
 
     const queryParamsLoading = ref(false)
 
@@ -217,11 +233,14 @@ export default defineComponent({
       areHiddenFilesShown,
       areFileExtensionsShown,
       areDisabledSpacesShown,
+      areEmptyTrashesShown,
       setAreHiddenFilesShown,
       setAreFileExtensionsShown,
       setAreDisabledSpacesShown,
+      setAreEmptyTrashesShown,
       viewOptionsButtonLabel: $gettext('Display customization options of the files list'),
-      isProjectsLocation: useActiveLocation(isLocationSpacesActive, 'files-spaces-projects')
+      isProjectsLocation: useActiveLocation(isLocationSpacesActive, 'files-spaces-projects'),
+      isTrashOverViewLocation: useActiveLocation(isLocationTrashActive, 'files-trash-overview')
     }
   },
   computed: {
@@ -251,6 +270,15 @@ export default defineComponent({
       set(value: boolean) {
         this.setAreDisabledSpacesShown(value)
       }
+    },
+    emptyTrashesShownModel: {
+      get() {
+        return this.areEmptyTrashesShown
+      },
+
+      set(value: boolean) {
+        this.setAreEmptyTrashesShown(value)
+      }
     }
   },
   methods: {
@@ -262,6 +290,9 @@ export default defineComponent({
     },
     updateDisabledSpacesShownModel(event: boolean) {
       this.disabledSpacesShownModel = event
+    },
+    updateEmptyTrashesShownModel(event: boolean) {
+      this.emptyTrashesShownModel = event
     }
   }
 })
@@ -275,6 +306,7 @@ export default defineComponent({
 #files-view-options-btn {
   vertical-align: middle;
   border: 3px solid transparent;
+
   &:hover {
     border-radius: 3px;
   }
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsEmptyTrashBin.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
index 5db8028216..e2aa5ea1b4 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
@@ -1,17 +1,15 @@
-import { isLocationTrashActive } from '../../../router'
-import { SpaceResource } from '@opencloud-eu/web-client'
-import { isProjectSpaceResource } from '@opencloud-eu/web-client'
+import { isSpaceResource, SpaceResource } from '@opencloud-eu/web-client'
 import { computed } from 'vue'
 import { useClientService } from '../../clientService'
-import { useRouter } from '../../router'
 import { useGettext } from 'vue3-gettext'
-import { FileAction, FileActionOptions } from '../types'
+import { SpaceAction, SpaceActionOptions } from '../types'
 import {
+  useCapabilityStore,
   useMessages,
   useModals,
-  useUserStore,
-  useCapabilityStore,
-  useResourcesStore
+  useResourcesStore,
+  useSpacesStore,
+  useUserStore
 } from '../../piniaStores'
 import { useLoadingService } from '../../loadingService'
 
@@ -19,70 +17,70 @@ export const useFileActionsEmptyTrashBin = () => {
   const { showMessage, showErrorMessage } = useMessages()
   const userStore = useUserStore()
   const capabilityStore = useCapabilityStore()
-  const router = useRouter()
   const { $gettext } = useGettext()
   const clientService = useClientService()
   const { dispatchModal } = useModals()
   const resourcesStore = useResourcesStore()
+  const spacesStore = useSpacesStore()
+
   const loadingService = useLoadingService()
 
-  const emptyTrashBin = ({ space }: { space: SpaceResource }) => {
-    return clientService.webdav
-      .clearTrashBin(space)
-      .then(() => {
-        showMessage({ title: $gettext('All deleted files were removed') })
-        resourcesStore.clearResources()
-        resourcesStore.resetSelection()
-      })
-      .catch((error) => {
-        console.error(error)
-        showErrorMessage({
-          title: $gettext('Failed to empty trash bin'),
-          errors: [error]
-        })
+  const emptyTrashBin = async ({ space }: { space: SpaceResource }) => {
+    try {
+      await clientService.webdav.clearTrashBin(space)
+      showMessage({ title: $gettext('All deleted files were removed') })
+      resourcesStore.clearResources()
+      resourcesStore.resetSelection()
+      spacesStore.updateSpaceField({ id: space.id, field: 'hasTrashedItems', value: false })
+    } catch (error) {
+      console.error(error)
+      showErrorMessage({
+        title: $gettext('Failed to empty trash bin'),
+        errors: [error]
       })
+    }
   }
 
-  const handler = ({ space }: FileActionOptions) => {
+  const handler = ({ resources }: SpaceActionOptions) => {
     dispatchModal({
-      title: $gettext('Empty trash bin'),
+      title: $gettext('Empty trash bin for "%{name}"', { name: resources[0].name }),
       confirmText: $gettext('Delete'),
       message: $gettext(
-        'Are you sure you want to permanently delete the listed items? You can’t undo this action.'
+        'Are you sure you want to permanently delete the items in "%{name}"? You can’t undo this action.',
+        {
+          name: resources[0].name
+        }
       ),
       hasInput: false,
-      onConfirm: () => loadingService.addTask(() => emptyTrashBin({ space }))
+      onConfirm: () => loadingService.addTask(() => emptyTrashBin({ space: resources[0] }))
     })
   }
 
-  const actions = computed((): FileAction[] => [
+  const actions = computed((): SpaceAction[] => [
     {
       name: 'empty-trash-bin',
-      icon: 'delete-bin-5',
+      icon: 'delete-bin-2',
       label: () => $gettext('Empty trash bin'),
       handler,
-      isVisible: ({ space }) => {
-        if (!isLocationTrashActive(router, 'files-trash-generic')) {
+      isVisible: ({ resources }) => {
+        if (resources.length !== 1) {
           return false
         }
+
         if (!capabilityStore.filesPermanentDeletion) {
           return false
         }
 
-        if (
-          isProjectSpaceResource(space) &&
-          !space.canDeleteFromTrashBin({ user: userStore.user })
-        ) {
+        if (!isSpaceResource(resources[0])) {
           return false
         }
 
-        return true
+        return resources[0].canDeleteFromTrashBin({ user: userStore.user })
       },
-      isDisabled: () => {
-        return resourcesStore.activeResources.length === 0
+      isDisabled: ({ resources }) => {
+        return !resources[0].hasTrashedItems
       },
-      class: 'oc-files-actions-empty-trash-bin-trigger',
-      appearance: 'filled'
+      class: 'oc-files-actions-empty-trash-bin-trigger'
     }
   ])
 
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsNavigateToTrash.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsNavigateToTrash.ts
index 33fcd2441c..5b90aa63e3 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsNavigateToTrash.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsNavigateToTrash.ts
@@ -23,8 +23,8 @@ export const useSpaceActionsNavigateToTrash = () => {
   const actions = computed((): SpaceAction[] => [
     {
       name: 'navigateToTrash',
-      icon: 'delete-bin',
-      label: () => $gettext('Open Deleted files'),
+      icon: 'delete-bin-5',
+      label: () => $gettext('Open trash bin'),
       handler: ({ resources }) => {
         router.push(getTrashLink(resources[0]))
       },
diff --git a/packages/web-pkg/src/composables/piniaStores/resources.ts b/packages/web-pkg/src/composables/piniaStores/resources.ts
index 2f1dd0a260..40842c955b 100644
--- a/packages/web-pkg/src/composables/piniaStores/resources.ts
+++ b/packages/web-pkg/src/composables/piniaStores/resources.ts
@@ -164,6 +164,7 @@ export const useResourcesStore = defineStore('resources', () => {
   const areFileExtensionsShown = ref(true)
   const areWebDavDetailsShown = ref(false)
   const areDisabledSpacesShown = ref(true)
+  const areEmptyTrashesShown = ref(true)
 
   const setAreHiddenFilesShown = (value: boolean) => {
     areHiddenFilesShown.value = value
@@ -181,6 +182,10 @@ export const useResourcesStore = defineStore('resources', () => {
     areDisabledSpacesShown.value = value
     window.localStorage.setItem('oc_disabledSpacesShown', value.toString())
   }
+  const setAreEmptyTrashesShown = (value: boolean) => {
+    areEmptyTrashesShown.value = value
+    window.localStorage.setItem('oc_emptyTrashesShown', value.toString())
+  }
 
   const setAncestorMetaData = (value: AncestorMetaData) => {
     ancestorMetaData.value = value
@@ -345,10 +350,12 @@ export const useResourcesStore = defineStore('resources', () => {
     areFileExtensionsShown,
     areWebDavDetailsShown,
     areDisabledSpacesShown,
+    areEmptyTrashesShown,
     setAreHiddenFilesShown,
     setAreFileExtensionsShown,
     setAreWebDavDetailsShown,
     setAreDisabledSpacesShown,
+    setAreEmptyTrashesShown,
 
     ancestorMetaData,
     setAncestorMetaData,
diff --git a/packages/web-pkg/tests/unit/components/FilesList/ResourceTable.spec.ts b/packages/web-pkg/tests/unit/components/FilesList/ResourceTable.spec.ts
index 6c581b9ac6..879e4299d2 100644
--- a/packages/web-pkg/tests/unit/components/FilesList/ResourceTable.spec.ts
+++ b/packages/web-pkg/tests/unit/components/FilesList/ResourceTable.spec.ts
@@ -657,6 +657,10 @@ describe('ResourceTable', () => {
       const { wrapper } = getMountedWrapper()
       expect(wrapper.find('.resource-table-edit-name').exists()).toBeTruthy()
     })
+    it('does not show if "showRenameQuickAction" ist set to false', () => {
+      const { wrapper } = getMountedWrapper({ props: { showRenameQuickAction: false } })
+      expect(wrapper.find('.resource-table-edit-name').exists()).toBeFalsy()
+    })
     it('does not show if not available', () => {
       const { wrapper } = getMountedWrapper({ hasRenameAction: false })
       expect(wrapper.find('.resource-table-edit-name').exists()).toBeFalsy()
diff --git a/packages/web-pkg/tests/unit/components/FilesList/ResourceTiles.spec.ts b/packages/web-pkg/tests/unit/components/FilesList/ResourceTiles.spec.ts
index bc79a8d992..5fe9595008 100644
--- a/packages/web-pkg/tests/unit/components/FilesList/ResourceTiles.spec.ts
+++ b/packages/web-pkg/tests/unit/components/FilesList/ResourceTiles.spec.ts
@@ -42,6 +42,7 @@ const spacesResources = [
     type: 'space',
     isFolder: true,
     indicators: [],
+    getDomSelector: vi.fn(),
     getDriveAliasAndItem: () => '1'
   },
   {
@@ -51,6 +52,7 @@ const spacesResources = [
     type: 'space',
     isFolder: true,
     indicators: [],
+    getDomSelector: vi.fn(),
     getDriveAliasAndItem: () => '2'
   }
 ] as unknown as SpaceResource[]
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts
index f0fd98d5f5..dd8a93df91 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts
@@ -1,46 +1,78 @@
-import { useFileActionsEmptyTrashBin } from '../../../../../src/composables/actions'
-import { useMessages, useModals } from '../../../../../src/composables/piniaStores'
-import { mock } from 'vitest-mock-extended'
 import {
-  getComposableWrapper,
+  SpaceActionOptions,
+  useFileActionsEmptyTrashBin
+} from '../../../../../src/composables/actions'
+import {
+  useMessages,
+  useModals,
+  useResourcesStore,
+  useSpacesStore
+} from '../../../../../src/composables/piniaStores'
+import { mock, mockDeep } from 'vitest-mock-extended'
+import {
   defaultComponentMocks,
+  getComposableWrapper,
   RouteLocation
 } from '@opencloud-eu/web-test-helpers'
 import { unref } from 'vue'
-import { ProjectSpaceResource, TrashResource } from '@opencloud-eu/web-client'
-import { FileActionOptions } from '../../../../../src/composables/actions'
+import { ProjectSpaceResource, SpaceResource } from '@opencloud-eu/web-client'
 
 describe('emptyTrashBin', () => {
   describe('isVisible property', () => {
     it('should be false when location is invalid', () => {
       getWrapper({
         invalidLocation: true,
-        setup: ({ actions }, { space }) => {
-          expect(unref(actions)[0].isVisible({ space, resources: [] })).toBe(false)
+        setup: ({ actions }) => {
+          expect(unref(actions)[0].isVisible({ resources: [] })).toBe(false)
         }
       })
     })
     it('should be false in a space trash bin with insufficient permissions', () => {
       getWrapper({
         driveType: 'project',
-        setup: ({ actions }, { space }) => {
+        setup: ({ actions }) => {
           expect(
             unref(actions)[0].isVisible({
-              space,
-              resources: [{ canBeRestored: () => true }] as TrashResource[]
+              resources: [{ canDeleteFromTrashBin: () => false }] as SpaceResource[]
+            })
+          ).toBe(false)
+        }
+      })
+    })
+  })
+  describe('isDisabled property', () => {
+    it('should be false if space property "hasTrashedItems" is true ', () => {
+      getWrapper({
+        driveType: 'project',
+        setup: ({ actions }) => {
+          expect(
+            unref(actions)[0].isDisabled({
+              resources: [{ hasTrashedItems: true }] as SpaceResource[]
             })
           ).toBe(false)
         }
       })
     })
+    it('should be true if space property "hasTrashedItems" is false ', () => {
+      getWrapper({
+        driveType: 'project',
+        setup: ({ actions }) => {
+          expect(
+            unref(actions)[0].isDisabled({
+              resources: [{ hasTrashedItems: false }] as SpaceResource[]
+            })
+          ).toBe(true)
+        }
+      })
+    })
   })
 
-  describe('empty trashbin action', () => {
+  describe('empty trash bin action', () => {
     it('should trigger the empty trash bin modal window', () => {
       getWrapper({
         setup: async ({ actions }) => {
           const { dispatchModal } = useModals()
-          await unref(actions)[0].handler(mock<FileActionOptions>())
+          await unref(actions)[0].handler(mockDeep<SpaceActionOptions>())
 
           expect(dispatchModal).toHaveBeenCalledTimes(1)
         }
@@ -55,7 +87,15 @@ describe('emptyTrashBin', () => {
           await emptyTrashBin({ space })
 
           const { showMessage } = useMessages()
+          const { clearResources, resetSelection } = useResourcesStore()
+          const { updateSpaceField } = useSpacesStore()
+
           expect(showMessage).toHaveBeenCalledTimes(1)
+
+          expect(clearResources).toHaveBeenCalledTimes(1)
+          expect(resetSelection).toHaveBeenCalledTimes(1)
+
+          expect(updateSpaceField).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -69,7 +109,15 @@ describe('emptyTrashBin', () => {
           await emptyTrashBin({ space })
 
           const { showErrorMessage } = useMessages()
+          const { clearResources, resetSelection } = useResourcesStore()
+          const { updateSpaceField } = useSpacesStore()
+
           expect(showErrorMessage).toHaveBeenCalledTimes(1)
+
+          expect(clearResources).not.toHaveBeenCalled()
+          expect(resetSelection).not.toHaveBeenCalled()
+
+          expect(updateSpaceField).not.toHaveBeenCalled()
         }
       })
     })
diff --git a/packages/web-runtime/src/container/bootstrap.ts b/packages/web-runtime/src/container/bootstrap.ts
index 0054a45f11..fff7976fe7 100644
--- a/packages/web-runtime/src/container/bootstrap.ts
+++ b/packages/web-runtime/src/container/bootstrap.ts
@@ -964,4 +964,11 @@ export const setViewOptions = ({ resourcesStore }: { resourcesStore: ResourcesSt
   if (areDisabledSpaceShownBoolean !== resourcesStore.areDisabledSpacesShown) {
     resourcesStore.setAreDisabledSpacesShown(areDisabledSpaceShownBoolean)
   }
+
+  const areEmptyTrashesShown = window.localStorage.getItem('oc_emptyTrashesShown') || 'true'
+  const areEmptyTrashesShownBoolean = areEmptyTrashesShown === 'true'
+
+  if (areEmptyTrashesShownBoolean !== resourcesStore.areEmptyTrashesShown) {
+    resourcesStore.setAreEmptyTrashesShown(areEmptyTrashesShownBoolean)
+  }
 }

From 3a98d4ef75f3a1b522db33005be12bc4f635e21e Mon Sep 17 00:00:00 2001
From: Alex Ackermann <abackermann91@gmail.com>
Date: Tue, 8 Jul 2025 10:06:22 +0200
Subject: [PATCH 2/4] remove duplicated not used status column

---
 packages/web-app-files/src/views/trash/Overview.vue      | 3 ++-
 .../web-pkg/src/components/FilesList/ResourceTable.vue   | 9 ---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/packages/web-app-files/src/views/trash/Overview.vue b/packages/web-app-files/src/views/trash/Overview.vue
index 079d999389..7c9f7f37da 100644
--- a/packages/web-app-files/src/views/trash/Overview.vue
+++ b/packages/web-app-files/src/views/trash/Overview.vue
@@ -138,7 +138,8 @@ const loadResourcesTask = useTask(function* (signal) {
   const reloadedSpaces = fetchedSpaces
     .filter(
       (fetchedSpace: SpaceResource) =>
-        isPersonalSpaceResource(fetchedSpace) || isProjectSpaceResource(fetchedSpace)
+        isPersonalSpaceResource(fetchedSpace) ||
+        (isProjectSpaceResource(fetchedSpace) && !fetchedSpace.disabled)
     )
     .map((fetchedSpace: SpaceResource) => {
       if (isPersonalSpaceResource(fetchedSpace)) {
diff --git a/packages/web-pkg/src/components/FilesList/ResourceTable.vue b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
index 02f0f6e947..0b760b8601 100644
--- a/packages/web-pkg/src/components/FilesList/ResourceTable.vue
+++ b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
@@ -830,15 +830,6 @@ export default defineComponent({
               wrap: 'nowrap',
               width: 'shrink'
             },
-            {
-              name: 'status',
-              prop: 'disabled',
-              title: this.$gettext('Status'),
-              type: 'slot',
-              alignH: 'right',
-              wrap: 'nowrap',
-              width: 'shrink'
-            },
             {
               name: 'tags',
               title: this.$gettext('Tags'),

From 8a955d81c7571a917c751a3bb47bd923fc616411 Mon Sep 17 00:00:00 2001
From: Alex Ackermann <abackermann91@gmail.com>
Date: Tue, 8 Jul 2025 10:09:17 +0200
Subject: [PATCH 3/4] only show active spaces

---
 packages/web-app-files/src/views/trash/Overview.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/web-app-files/src/views/trash/Overview.vue b/packages/web-app-files/src/views/trash/Overview.vue
index 7c9f7f37da..cbe21aae31 100644
--- a/packages/web-app-files/src/views/trash/Overview.vue
+++ b/packages/web-app-files/src/views/trash/Overview.vue
@@ -121,7 +121,8 @@ const markInstance = ref<Mark>()
 const spaces = computed(() =>
   spacesStore.spaces.filter(
     (s: SpaceResource) =>
-      (isPersonalSpaceResource(s) && s.isOwner(userStore.user)) || isProjectSpaceResource(s)
+      (isPersonalSpaceResource(s) && s.isOwner(userStore.user)) ||
+      (isProjectSpaceResource(s) && !s.disabled)
   )
 )
 
@@ -138,8 +139,7 @@ const loadResourcesTask = useTask(function* (signal) {
   const reloadedSpaces = fetchedSpaces
     .filter(
       (fetchedSpace: SpaceResource) =>
-        isPersonalSpaceResource(fetchedSpace) ||
-        (isProjectSpaceResource(fetchedSpace) && !fetchedSpace.disabled)
+        isPersonalSpaceResource(fetchedSpace) || isProjectSpaceResource(fetchedSpace)
     )
     .map((fetchedSpace: SpaceResource) => {
       if (isPersonalSpaceResource(fetchedSpace)) {
@@ -148,6 +148,8 @@ const loadResourcesTask = useTask(function* (signal) {
       return fetchedSpace
     })
 
+  console.log(reloadedSpaces)
+
   reloadedSpaces.forEach((reloadedSpace) => {
     spacesStore.upsertSpace(reloadedSpace)
   })

From f2640a8cb2f698e7c49512a8f27820235f01aed1 Mon Sep 17 00:00:00 2001
From: Alex Ackermann <abackermann91@gmail.com>
Date: Tue, 8 Jul 2025 10:12:57 +0200
Subject: [PATCH 4/4] fix type issue

---
 .../src/views/trash/Overview.vue              | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/web-app-files/src/views/trash/Overview.vue b/packages/web-app-files/src/views/trash/Overview.vue
index cbe21aae31..1b32dc75ee 100644
--- a/packages/web-app-files/src/views/trash/Overview.vue
+++ b/packages/web-app-files/src/views/trash/Overview.vue
@@ -91,6 +91,7 @@ import {
 } from '@opencloud-eu/web-pkg'
 import FilesViewWrapper from '../../components/FilesViewWrapper.vue'
 import {
+  call,
   isPersonalSpaceResource,
   isProjectSpaceResource,
   SpaceResource
@@ -129,27 +130,27 @@ const spaces = computed(() =>
 const loadResourcesTask = useTask(function* (signal) {
   resourcesStore.clearResourceList()
 
-  const fetchedSpaces = yield clientService.graphAuthenticated.drives.listMyDrives(
-    {
-      select: ['@libre.graph.hasTrashedItems']
-    },
-    { signal }
+  const fetchedSpaces = yield* call(
+    clientService.graphAuthenticated.drives.listMyDrives(
+      {
+        select: ['@libre.graph.hasTrashedItems']
+      },
+      { signal }
+    )
   )
 
   const reloadedSpaces = fetchedSpaces
     .filter(
-      (fetchedSpace: SpaceResource) =>
+      (fetchedSpace) =>
         isPersonalSpaceResource(fetchedSpace) || isProjectSpaceResource(fetchedSpace)
     )
-    .map((fetchedSpace: SpaceResource) => {
+    .map((fetchedSpace) => {
       if (isPersonalSpaceResource(fetchedSpace)) {
         fetchedSpace.name = $gettext('Personal')
       }
       return fetchedSpace
     })
 
-  console.log(reloadedSpaces)
-
   reloadedSpaces.forEach((reloadedSpace) => {
     spacesStore.upsertSpace(reloadedSpace)
   })