Merge pull request #21716 from mvdbeek/fix-collection-error-import-export

[25.1] Fix collection job state not preserved during history export/import

Author: mvdbeek

lib/galaxy/model/store/__init__.py

@@ -1821,6 +1821,9 @@ def _connect_job_io(
                     output_hdca = _find_hdca(output_key)
                     if output_hdca:
                         imported_job.add_output_dataset_collection(output_name, output_hdca)
+                        # Also set the HDCA's job reference so job_state_summary works
+                        if output_hdca.job_id is None:
+                            output_hdca.job = imported_job
 
     def _normalize_job_parameters(
         self,
@@ -2240,12 +2243,10 @@ def export_history(
         collections = sa_session.scalars(stmt_hdca)
 
         for collection in collections:
-            # filter this ?
+            # Skip unpopulated collections (they don't have all elements yet),
+            # but export all others regardless of state to preserve error states
             if not collection.populated:
-                break
-            if collection.state != "ok":
-                break
-
+                continue
             self.export_collection(collection, include_deleted=include_deleted)
 
         # Write datasets' attributes to file.

lib/galaxy_test/api/test_histories.py

@@ -729,6 +729,18 @@ def check_failed(hda_or_job):
             history_id=imported_history_id, hid=1, assert_ok=False, hda_checker=check_failed, job_checker=check_failed
         )
 
+        # Also check collection state is preserved - regression test for issue #20450
+        imported_collection = self.dataset_populator.get_history_collection_details(
+            history_id=imported_history_id,
+            history_content_type="dataset_collection",
+            assert_ok=False,
+        )
+        assert "job_state_summary" in imported_collection, imported_collection
+        assert imported_collection["job_state_summary"].get("error", 0) == 1, (
+            f"Expected error count of 1 after import, got {imported_collection['job_state_summary']}. "
+            "Collection job state was not preserved during history export/import (issue #20450)."
+        )
+
     def test_import_metadata_regeneration(self):
         if self.task_based:
             raise SkipTest("skipping test_import_metadata_regeneration for task based...")