Merge pull request #7787 from owncloud/fix-trash-bin-sidebar

Fix sidebar in trash bin
owncloud · Oct 13, 2022 · 6640e05 · 6640e05
2 parents 2ab7e6d + e778968
commit 6640e05
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/changelog/unreleased/bugfix-trash-bin-sidebar b/changelog/unreleased/bugfix-trash-bin-sidebar
@@ -0,0 +1,6 @@
+Bugfix: Trash bin sidebar
+
+We've fixed the sidebar in the trash bin which was throwing errors and not showing the right content.
+
+https://github.com/owncloud/web/issues/7778
+https://github.com/owncloud/web/pull/7787
diff --git a/packages/web-app-files/src/components/SideBar/SideBar.vue b/packages/web-app-files/src/components/SideBar/SideBar.vue
@@ -202,6 +202,9 @@ export default defineComponent({
       if (this.hasShareJail && this.space?.driveType === 'share') {
         return false
       }
+      if (this.isTrashLocation && !this.highlightedFile?.id) {
+        return true
+      }
       return !pathSegments.length
     },
     highlightedFileIsSpace() {

diff --git a/packages/web-app-files/src/helpers/resources.ts b/packages/web-app-files/src/helpers/resources.ts
@@ -483,6 +483,7 @@ export function buildDeletedResource(resource): Resource {
     id,
     parentFolderId: resource.fileInfo[DavProperty.FileParent],
     indicators: [],
+    webDavPath: '',
     canUpload: () => false,
     canDownload: () => false,
     canBeDeleted: () => {