fix(component editor): fix saving data to data_model

Author: amilcarlucas

ardupilot_methodic_configurator/frontend_tkinter_component_editor.py

@@ -188,6 +188,7 @@ def add_entry_or_combobox(
             cb.bind("<FocusOut>", lambda event, path=path: self._validate_combobox(event, path))  # type: ignore[misc]
             cb.bind("<KeyRelease>", lambda event, path=path: self._validate_combobox(event, path))  # type: ignore[misc]
             cb.bind("<Return>", lambda event, path=path: self._validate_combobox(event, path))  # type: ignore[misc]
+            cb.bind("<ButtonRelease>", lambda event, path=path: self._validate_combobox(event, path))  # type: ignore[misc]
 
             # Prevent mouse wheel from changing value when dropdown is not open
             def handle_mousewheel(_event: tk.Event, widget: tk.Widget = cb) -> Optional[str]:
@@ -257,15 +258,27 @@ def _validate_combobox(self, event: tk.Event, path: ComponentPath) -> bool:
         value = combobox.get()  # Get the current value of the combobox
         allowed_values = combobox.cget("values")  # Get the list of allowed values
 
+        # Events that should trigger data model update (when value is valid)
+        should_update_data_model = event.type in {
+            tk.EventType.FocusOut,
+            tk.EventType.KeyPress,  # Return key
+            tk.EventType.KeyRelease,  # Key release events
+            tk.EventType.ButtonRelease,  # Mouse click on dropdown item
+        }
+
+        if should_update_data_model and value in allowed_values:
+            self.data_model.set_component_value(path, value)
+
         if value not in allowed_values:
-            if (
-                (event.type == "10" and getattr(combobox, "dropdown_is_open", False))  # FocusOut events
-                or event.type == "2"  # Return KeyPress event
+            if (  # this is complicated because we only want to issue error messages in particular cases
+                (event.type == tk.EventType.FocusOut and getattr(combobox, "dropdown_is_open", False))  # FocusOut events
+                or event.type == tk.EventType.KeyPress  # KeyPress event (Return key)
             ):
                 paths_str = ">".join(list(path))
                 allowed_str = ", ".join(allowed_values)
                 error_msg = _("Invalid value '{value}' for {paths_str}\nAllowed values are: {allowed_str}")
                 show_error_message(_("Error"), error_msg.format(value=value, paths_str=paths_str, allowed_str=allowed_str))
+
             combobox.configure(style="comb_input_invalid.TCombobox")
             return False
 

ardupilot_methodic_configurator/frontend_tkinter_component_editor_base.py

@@ -222,6 +222,9 @@ def _refresh_component_display(self) -> None:
         for widget in self.scroll_frame.view_port.winfo_children():
             widget.destroy()
 
+        # Clear the entry_widgets dictionary since all widgets have been destroyed
+        self.entry_widgets.clear()
+
         # Repopulate the frame with widgets according to the new complexity setting
         self.populate_frames()
 

tests/test_frontend_tkinter_component_editor.py

@@ -577,7 +577,7 @@ def test_validate_data_with_errors(self, editor_with_mocked_root: ComponentEdito
         editor_with_mocked_root.data_model.get_combobox_values_for_path = MagicMock(return_value=("PWM", "SBUS"))
         editor_with_mocked_root.data_model.validate_entry_limits = MagicMock(return_value=("Value too high", None))
 
-        with patch("ardupilot_methodic_configurator.frontend_tkinter_component_editor.show_error_message") as mock_error:
+        with patch("ardupilot_methodic_configurator.frontend_tkinter_component_editor_base.show_error_message") as mock_error:
             result = editor_with_mocked_root.validate_data_and_highlight_errors_in_red()
 
             # Should configure widgets with invalid styles
@@ -607,7 +607,7 @@ def test_validate_data_combobox_valid_after_correction(self, editor_with_mocked_
         editor_with_mocked_root.data_model.validate_all_data = MagicMock(return_value=(False, ["Some error"]))
         editor_with_mocked_root.data_model.get_combobox_values_for_path = MagicMock(return_value=("PWM", "SBUS"))
 
-        with patch("ardupilot_methodic_configurator.frontend_tkinter_component_editor.show_error_message"):
+        with patch("ardupilot_methodic_configurator.frontend_tkinter_component_editor_base.show_error_message"):
             editor_with_mocked_root.validate_data_and_highlight_errors_in_red()
 
             # Should configure combobox as valid since value is in allowed values