Improved validation

- Removed unnecessary message from validation.
- Clear previous validation messages when new validation is run.

Added validation dock to unload

Author: Mtk112

arho_feature_template/gui/validation_dock.py

@@ -30,10 +30,6 @@ def __init__(self):
         self.error_list_view.setModel(self.error_list_model)
         self.validate_button.clicked.connect(self.validate)
 
-    def update_errors(self, errors: list[str]):
-        """Updates the list view with the provided validation errors."""
-        self.error_list_model.setStringList(errors)
-
     def validate(self):
         """Handles the button press to trigger the validation process."""
         active_plan_id = get_active_plan_id()
@@ -44,36 +40,39 @@ def validate(self):
         self.lambda_service.validate_plan(active_plan_id)
 
     def list_validation_errors(self, validation_json):
-        """Slot for listing validation errors."""
+        """Slot for listing validation errors and warnings."""
         if not validation_json:
-            iface.messageBar().pushMessage("Virhe", "Ei virheitä havaittu.", level=1)
+            iface.messageBar().pushMessage("Virhe", "Validaatio json puuttuu.", level=1)
             return
+        # Clear the existing errors from the list view
+        self.error_list_model.setStringList([])
 
-        current_errors = self.error_list_model.stringList()
         new_errors = []
 
-        for plan_id, error_data in validation_json.items():
-            if isinstance(error_data, str):
-                new_errors.append(f"Validaatio epäonnistui Kaavalle id {plan_id}: {error_data}")
-            elif isinstance(error_data, dict):
-                title = error_data.get("title", "Tuntematon virhe")
-                status = error_data.get("status", "Tuntematon status")
-                detail = error_data.get("detail", "Tietoja ei saatavilla")
-                new_errors.append(f"Virhe kaavalla: {plan_id} - {title} ({status}): {detail}")
+        if not validation_json:
+            # If no errors or warnings, display a message and exit
+            iface.messageBar().pushMessage("Virhe", "Ei virheitä havaittu.", level=1)
+            return
 
+        for error_data in validation_json.values():
+            if isinstance(error_data, dict):
+                # Get the errors for this plan
                 errors = error_data.get("errors", [])
                 for error in errors:
                     rule_id = error.get("ruleId", "Tuntematon sääntö")
                     message = error.get("message", "Ei viestiä")
-                    instance = error.get("instance", "Tuntematon instanssi")
-                    error_message = f"  Sääntö: {rule_id}, Viesti: {message}, Tapaus/instanssi: {instance}"
+                    instance = error.get("instance", "Tuntematon instance")
+                    error_message = f"Validointivirhe - Sääntö: {rule_id}, Viesti: {message}, Instance: {instance}"
                     new_errors.append(error_message)
 
+                # Get any warnings for this plan using list comprehension
                 warnings = error_data.get("warnings", [])
                 new_errors.extend([f"Varoitus: {warning}" for warning in warnings])
 
-        # Append the new errors to the existing list
-        current_errors.extend(new_errors)
+        # If no errors or warnings, display a message
+        if not new_errors:
+            new_errors.append("Kaava on validi. Ei virheitä tai varoituksia havaittu.")
+            return
 
-        # Update the model with the combined list of errors
-        self.error_list_model.setStringList(current_errors)
+        # Update the list view with the new errors and warnings
+        self.error_list_model.setStringList(new_errors)

arho_feature_template/gui/validation_dock.ui

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ValidationDock</class>
  <widget class="QDockWidget" name="ValidationDock">
@@ -8,11 +7,15 @@
   <widget class="QWidget" name="dockWidgetContents">
    <layout class="QVBoxLayout" name="verticalLayout">
     <item>
-     <widget class="QPushButton" name="validate_button">
-      <property name="text">
-       <string>Vahvista aktiivinen kaava</string>
-      </property>
-     </widget>
+     <layout class="QHBoxLayout" name="buttonLayout">
+      <item>
+       <widget class="QPushButton" name="validate_button">
+        <property name="text">
+         <string>Validoi aktiivinen kaava</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </item>
     <item>
      <widget class="QListView" name="error_list_view"/>

arho_feature_template/plugin.py

@@ -140,7 +140,7 @@ def initGui(self) -> None:  # noqa N802
 
         # Instantiate and add the Validation Dock Widget
         self.validation_dock = ValidationDock()
-        iface.addDockWidget(Qt.BottomDockWidgetArea, self.validation_dock)
+        iface.addDockWidget(Qt.RightDockWidgetArea, self.validation_dock)
 
         # Connect visibilityChanged signal to sync toggle action
         self.validation_dock.visibilityChanged.connect(self.validation_dock_visibility_changed)
@@ -243,6 +243,7 @@ def unload(self) -> None:
         teardown_logger(Plugin.name)
 
         self.templater.template_dock.close()
+        self.validation_dock.close()
 
     def dock_visibility_changed(self, visible: bool) -> None:  # noqa: FBT001
         self.template_dock_action.setChecked(visible)