opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-08-31 01:02:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix HDCA shown as unavailable on tool form rerun

Browse Source 
After 6a9323a79 (Fix HDCA lost in tool form on rerun), visible HDCAs
in the current history were incorrectly added to the job_input_values
fallback section with a "(not in current history)" label. This happened
because active_visible_datasets_and_roles only iterates HDAs, so HDCAs
were never removed from job_input_values during matching. The HDCA then
appeared twice in the form: once correctly from the dataset collections
section, and once as a "keep" option with wrong state.

Skip HDCAs in the fallback loop when they are active, visible, and in
the current history — they are already properly handled by the
active_visible_dataset_collections loop below.

Fixes `lib/galaxy_test/selenium/test_tool_form.py::TestToolForm::test_rerun_dataset_collection_element - selenium.common.exceptions.TimeoutException: Message: Timeout waiting on CSS selector [.dataset-collection-panel] to become present.`
This commit is contained in:
mvdbeek
2026-03-29 13:17:12 +02:00
parent ee12b2a096
commit 8b4e488319
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/parameters/basic.py
+13 -3
View File
@@ -2452,15 +2452,25 @@ class DataToolParameter(BaseDataToolParameter):
# Route each to the correct options list by type so the client can
# match them by id *and* src.
for value in job_input_values:
if isinstance(value, (HistoryDatasetCollectionAssociation, HistoryDatasetAssociation)):
if isinstance(value, HistoryDatasetCollectionAssociation):
# HDCAs are handled by the dataset collections section below;
# only add here if not visible in the current history.
if value.deleted or not value.visible or value.history != history:
if value.deleted:
state = "deleted"
elif not value.visible:
state = "hidden"
else:
state = "not in current history"
append(d["options"]["hdca"], value, f"({state}) {value.name}", "hdca", True)
elif isinstance(value, HistoryDatasetAssociation):
if value.deleted:
state = "deleted"
elif not value.visible:
state = "hidden"
else:
state = "not in current history"
src = "hdca" if isinstance(value, HistoryDatasetCollectionAssociation) else "hda"
append(d["options"][src], value, f"({state}) {value.name}", src, True)
append(d["options"]["hda"], value, f"({state}) {value.name}", "hda", True)
elif isinstance(value, DatasetCollectionElement):
append_dce(value)
elif isinstance(value, LibraryDatasetDatasetAssociation):