Merge branch 'release_24.1' into release_24.2

galaxyproject · Feb 6, 2025 · 3992f0f · 3992f0f
2 parents 6e7f487 + 3bf2c26
commit 3992f0f
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
@@ -454,7 +454,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
@@ -90,7 +90,7 @@ const containsFileOrFolder = computed(() => {
     return props.folderContents.find((el) => el.type === "folder" || el.type === "file");
 });
 const canDelete = computed(() => {
-    return !!(containsFileOrFolder.value && props.metadata.can_modify_folder);
+    return !!props.metadata.can_modify_folder;
 });
 const datasetManipulation = computed(() => {
     return !!(containsFileOrFolder.value && userStore.currentUser);