Merge branch 'release_24.2' into dev

galaxyproject · Feb 6, 2025 · a14e006 · a14e006
2 parents c7cce09 + 3992f0f
commit a14e006
Show file tree

Hide file tree

Showing 20 changed files with 2,113 additions and 19 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);

diff --git a/doc/source/admin/db_migration.md b/doc/source/admin/db_migration.md
@@ -542,6 +542,12 @@ After that, run the upgrade script: `./manage_db.sh upgrade`. And you're done!
 
 ## Troubleshooting
 
+### Deadlock detected
+
+If you see a deadlock error, that may have been caused by a migration script requiring exclusive access
+to a database object, such as a row or a table. To avoid this error, it is recommended to shut down
+all Galaxy processes during database migration.
+
 ### How to handle migrations.IncorrectVersionError
 
 If you see this error, you'll need to upgrade or downgrade your database *before* upgrading to
@@ -552,4 +558,3 @@ is 181. Please see [this issue](https://github.com/galaxyproject/galaxy/issues/1
 
 #### Please help us improve this page:
 If you encounter any migration-related errors or issues, please [open an issue](https://github.com/galaxyproject/galaxy/issues/new?assignees=&labels=&template=bug_report.md&title=), and we will add the solution with any relevant context to this page.
-