Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions biosimdb_interface/form/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,12 @@ def form_to_json(form):
value = bool(value)
converted_values.append(value)

# For repeated keys keep list (after dropping empty placeholders);
# for single keys keep scalar to preserve existing behavior.
if len(converted_values) > 1:
value_out = [v for v in converted_values if v != ""]
else:
value_out = converted_values[0] if converted_values else ""
# HTML names ending in [] represent schema multivalued fields, even when
# the user selects only one option.
if key.endswith("[]"):
value_out = [value for value in converted_values if value != ""]
else:
value_out = converted_values[0] if converted_values else ""

_set_nested(data, parts, value_out)
return data
Expand Down
2 changes: 1 addition & 1 deletion biosimdb_interface/form/webform.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def webform():

if action == "save":
json_form["files"] = extract_uploaded_file_metadata(tmpdir)

print(json_form)
biosimschema_path = os.getenv("BIOSIM_SCHEMA_PATH", "")

validation_errors = []
Expand Down
11 changes: 11 additions & 0 deletions tests/test_form/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,14 @@ def test_form_to_json_direct_list_assignment():
d = {}
_set_nested(d, ["items", "1"], "val")
assert d == {"items": ["val"]}


def test_form_to_json_multiselect_single_value_stays_list():
"""A single selection from a multivalued HTML field remains a list."""
result = form_to_json(
{"stages[minimisation][1][minimisation_algorithm][]": "Steepest Descent"}
)

assert result == {
"stages": {"minimisation": [{"minimisation_algorithm": ["Steepest Descent"]}]}
}
Loading