Skip to content

Commit 2bfd283

Browse files
committed
Fix single data element identifier to be a regular string
These must adhere to the input parameter they belong to.
1 parent 400a9f6 commit 2bfd283

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

lib/galaxy/tools/parameters/wrapped_json.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,8 @@ def data_input_to_staging_path_and_source_path(
7878
v: "DatasetFilenameWrapper", invalid_chars: Sequence[str] = ("/",)
7979
) -> Dict[str, Any]:
8080
staging_path = v.get_staging_path(invalid_chars=invalid_chars)
81-
# note that the element identifier should be always a list
8281
return {
83-
"element_identifier": [v.element_identifier],
82+
"element_identifier": v.element_identifier,
8483
"ext": v.file_ext,
8584
"staging_path": staging_path,
8685
"source_path": data_input_to_path(v),

test/functional/tools/inputs_as_json_with_staging_path_and_source_path.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ input_json_path = sys.argv[1]
1212
as_dict = json.load(open(input_json_path, "r"))
1313
1414
data_input_with_staging_details = as_dict["data_input"]
15-
assert data_input_with_staging_details['element_identifier'] == ["1.tabular"]
15+
assert data_input_with_staging_details['element_identifier'] == "1.tabular"
1616
assert data_input_with_staging_details['ext'] == "tabular"
1717
assert data_input_with_staging_details['staging_path'] == "1.tabular.tabular"
1818
assert len(data_input_with_staging_details['metadata_files']) == 0
1919
2020
multiple_data_input_with_staging_details = as_dict["multiple_data_input"]
2121
assert len(multiple_data_input_with_staging_details) == 2
22-
assert multiple_data_input_with_staging_details[0]['element_identifier'] == ["simple_line.txt"]
22+
assert multiple_data_input_with_staging_details[0]['element_identifier'] == "simple_line.txt"
2323
assert multiple_data_input_with_staging_details[0]['ext'] == "txt"
2424
assert multiple_data_input_with_staging_details[0]['staging_path'] == "simple_line.txt.txt"
2525
assert len(multiple_data_input_with_staging_details[0]['metadata_files']) == 0

0 commit comments

Comments
 (0)