From 2dee7e133088e8c0e6f26c3436fe06f7ead1e83b Mon Sep 17 00:00:00 2001 From: davelopez <46503462+davelopez@users.noreply.github.com> Date: Thu, 6 Feb 2025 10:30:43 +0100 Subject: [PATCH 1/2] Display "include deleted" for admins regardless of current content --- .../Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue b/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue index 41353ebb30d0..7293ce33ea75 100644 --- a/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue +++ b/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue @@ -203,7 +203,7 @@ export default { return this.folderContents.find((el) => el.type === "folder" || el.type === "file"); }, canDelete: function () { - return !!(this.contains_file_or_folder && this.is_admin); + return !!this.is_admin; }, dataset_manipulation: function () { const Galaxy = getGalaxyInstance(); From 260b55eb35509a722492537720eeba14529b6d4a Mon Sep 17 00:00:00 2001 From: davelopez <46503462+davelopez@users.noreply.github.com> Date: Thu, 6 Feb 2025 10:49:20 +0100 Subject: [PATCH 2/2] Fix selection logic in LibraryFolder component to handle empty states --- .../components/Libraries/LibraryFolder/LibraryFolder.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue b/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue index 6e2e6138ca00..5f52120c4ca0 100644 --- a/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue +++ b/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue @@ -450,7 +450,12 @@ export default { } }); - return this.selected.length + unselectable === this.$refs.folder_content_table.computedItems.length; + const numComputedItems = this.$refs.folder_content_table.computedItems.length; + if (numComputedItems === 0 || numComputedItems === unselectable) { + return false; + } + + return this.selected.length + unselectable === numComputedItems; }, toggleSelect() { this.unselected = [];