Merge pull request #521 from MiraGeoscience/GEOPY-1286

GEOPY-1286: Make refinement "surface" -> layers optional
MiraGeoscience · Mar 20, 2024 · 880c993 · 880c993
2 parents 9d7453d + 975cd70
commit 880c993
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/geoh5py/ui_json/utils.py b/geoh5py/ui_json/utils.py
@@ -194,7 +194,7 @@ def set_enabled(ui_json: dict, parameter: str, value: bool):
     if group_name:
         group = collect(ui_json, "group", group_name)
         parameters = find_all(group, "groupOptional")
-        if parameters:
+        if parameters and parameters[0] == parameter:
             is_group_optional = True
             for form in group.values():
                 form["enabled"] = value

diff --git a/tests/ui_json_test.py b/tests/ui_json_test.py
@@ -721,7 +721,7 @@ def test_stringify(tmp_path: Path):
 
     assert in_file.ui_json["test"]["value"] is not None
     assert not in_file.ui_json["test"]["enabled"]
-    assert not in_file.ui_json["test_group"]["enabled"]
+    assert in_file.ui_json["test_group"]["enabled"]
     assert "optional" in in_file.ui_json["test"]
 
     ui_json["test_group"] = templates.string_parameter(optional="enabled")

diff --git a/tests/ui_json_utils_test.py b/tests/ui_json_utils_test.py
@@ -214,12 +214,12 @@ def test_set_enabled():
 
     # If parameter is in group and groupOptional: True then disable
     # the parameter containing the groupOptional member.
-    set_enabled(ui_json, "float_parameter", False)
+    set_enabled(ui_json, "string_parameter", False)
     assert not ui_json["string_parameter"]["enabled"]
     assert not ui_json["float_parameter"]["enabled"]
     assert not ui_json["integer_parameter"]["enabled"]
 
-    set_enabled(ui_json, "float_parameter", True)
+    set_enabled(ui_json, "string_parameter", True)
     assert ui_json["string_parameter"]["enabled"]
     assert ui_json["float_parameter"]["enabled"]
     assert ui_json["integer_parameter"]["enabled"]