Merge branch 'release_24.0' into release_24.1

nsoranzo · Feb 6, 2025 · 3bf2c26 · 3bf2c26
2 parents 13f9977 + 1dcfdec
commit 3bf2c26
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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 = [];

diff --git 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();