From 39f7ee5a0a8c208e43ba92aa9951664aad8969a0 Mon Sep 17 00:00:00 2001
From: Tobias Kunze <r@rixx.de>
Date: Thu, 4 Sep 2025 00:57:52 +0200
Subject: [PATCH 1/3] Improve error placement in instance form

---
 .../includes/tabbed_fieldset_form.html        |  1 +
 src/servala/frontend/views/service.py         | 20 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/servala/frontend/templates/includes/tabbed_fieldset_form.html b/src/servala/frontend/templates/includes/tabbed_fieldset_form.html
index c36f06f..c9d947a 100644
--- a/src/servala/frontend/templates/includes/tabbed_fieldset_form.html
+++ b/src/servala/frontend/templates/includes/tabbed_fieldset_form.html
@@ -4,6 +4,7 @@
       method="post"
       {% if form_action %}action="{{ form_action }}"{% endif %}>
     {% csrf_token %}
+    {% include "frontend/forms/errors.html" %}
     <ul class="nav nav-tabs" id="myTab" role="tablist">
         {% for fieldset in form.get_fieldsets %}
             {% if not fieldset.hidden %}
diff --git a/src/servala/frontend/views/service.py b/src/servala/frontend/views/service.py
index 7e3f162..63420f3 100644
--- a/src/servala/frontend/views/service.py
+++ b/src/servala/frontend/views/service.py
@@ -163,14 +163,12 @@ class ServiceOfferingDetailView(OrganizationViewMixin, HtmxViewMixin, DetailView
                 )
                 return redirect(service_instance.urls.base)
             except ValidationError as e:
-                messages.error(self.request, e.message or str(e))
+                form.add_error(None, e.message or str(e))
             except Exception as e:
-                messages.error(
-                    self.request,
-                    self.organization.add_support_message(
-                        _(f"Error creating instance: {str(e)}.")
-                    ),
+                error_message = self.organization.add_support_message(
+                    _(f"Error creating instance: {str(e)}.")
                 )
+                form.add_error(None, error_message)
 
         # If the form is not valid or if the service creation failed, we render it again
         context["service_form"] = form
@@ -362,15 +360,13 @@ class ServiceInstanceUpdateView(
             )
             return redirect(self.object.urls.base)
         except ValidationError as e:
-            messages.error(self.request, e.message or str(e))
+            form.add_error(None, e.message or str(e))
             return self.form_invalid(form)
         except Exception as e:
-            messages.error(
-                self.request,
-                self.organization.add_support_message(
-                    _(f"Error updating instance: {str(e)}.")
-                ),
+            error_message = self.organization.add_support_message(
+                _(f"Error updating instance: {str(e)}.")
             )
+            form.add_error(None, error_message)
             return self.form_invalid(form)
 
     def get_success_url(self):

From 5933352f5ff8fc1f3b8b3cb042f20d763cf3f4b7 Mon Sep 17 00:00:00 2001
From: Tobias Kunze <r@rixx.de>
Date: Thu, 4 Sep 2025 01:02:03 +0200
Subject: [PATCH 2/3] Skip duplicate error message

---
 src/servala/frontend/views/service.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/servala/frontend/views/service.py b/src/servala/frontend/views/service.py
index 63420f3..6a58a0f 100644
--- a/src/servala/frontend/views/service.py
+++ b/src/servala/frontend/views/service.py
@@ -344,10 +344,6 @@ class ServiceInstanceUpdateView(
         kwargs["instance"] = self.object.spec_object
         return kwargs
 
-    def form_invalid(self, form):
-        messages.error(self.request, form.errors)
-        return super().form_invalid(form)
-
     def form_valid(self, form):
         try:
             spec_data = form.get_nested_data().get("spec")

From 1a2a75880d038b514687fdfdaee1a336c72132da Mon Sep 17 00:00:00 2001
From: Tobias Kunze <r@rixx.de>
Date: Thu, 11 Sep 2025 14:58:08 +0200
Subject: [PATCH 3/3] Fix JSON re-parsing in re-rendered invalid form

---
 src/servala/frontend/forms/widgets.py  | 49 ++++++++++++++++++++------
 src/servala/static/js/dynamic-array.js |  5 ++-
 2 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/src/servala/frontend/forms/widgets.py b/src/servala/frontend/forms/widgets.py
index 16e19bf..d67030f 100644
--- a/src/servala/frontend/forms/widgets.py
+++ b/src/servala/frontend/forms/widgets.py
@@ -48,18 +48,31 @@ class DynamicArrayWidget(forms.Widget):
 
     def value_from_datadict(self, data, files, name):
         value = data.get(name)
-        if value:
+        if value is None:
+            return []
+        if value == "":
+            return []
+
+        if isinstance(value, list):
+            return [item for item in value if item is not None and str(item).strip()]
+
+        if isinstance(value, str):
+            if value.strip() == "" or value.strip().lower() == "null":
+                return []
             try:
                 parsed = json.loads(value)
-                if parsed:
+                if parsed is None:
+                    return []
+                if isinstance(parsed, list):
                     return [
                         item
                         for item in parsed
                         if item is not None and str(item).strip()
                     ]
-                return []
+                return [parsed] if str(parsed).strip() else []
             except (json.JSONDecodeError, TypeError):
-                pass
+                return [value] if value.strip() else []
+
         return []
 
 
@@ -104,11 +117,17 @@ class DynamicArrayField(forms.JSONField):
         if value is None:
             return []
         if isinstance(value, list):
-            return value
+            return [item for item in value if item is not None]
         if isinstance(value, str):
+            if value.strip() == "" or value.strip().lower() == "null":
+                return []
             try:
                 parsed = json.loads(value)
-                return parsed if isinstance(parsed, list) else [parsed]
+                if parsed is None:
+                    return []
+                if isinstance(parsed, list):
+                    return [item for item in parsed if item is not None]
+                return [parsed]
             except (json.JSONDecodeError, TypeError):
                 return [value] if value else []
         return [str(value)]
@@ -117,16 +136,24 @@ class DynamicArrayField(forms.JSONField):
         """Handle bound data properly to avoid JSON parsing issues"""
         if data is None:
             return initial
-        # If data is already a list (from our widget), return it as-is
         if isinstance(data, list):
-            return data
-        # If data is a string, try to parse it as JSON
+            return [item for item in data if item is not None and str(item).strip()]
         if isinstance(data, str):
+            if data.strip() == "" or data.strip().lower() == "null":
+                return []
             try:
                 parsed = json.loads(data)
-                return parsed if isinstance(parsed, list) else [parsed]
+                if parsed is None:
+                    return []
+                if isinstance(parsed, list):
+                    return [
+                        item
+                        for item in parsed
+                        if item is not None and str(item).strip()
+                    ]
+                return [parsed] if str(parsed).strip() else []
             except (json.JSONDecodeError, TypeError):
-                return [data] if data else []
+                return [data] if data and data.strip() else []
         return data
 
     def validate(self, value):
diff --git a/src/servala/static/js/dynamic-array.js b/src/servala/static/js/dynamic-array.js
index d038fdc..c198ddf 100644
--- a/src/servala/static/js/dynamic-array.js
+++ b/src/servala/static/js/dynamic-array.js
@@ -19,6 +19,9 @@ const initDynamicArrayWidget = () => {
         addRemoveEventListeners(container)
         addInputEventListeners(container)
         updateRemoveButtonVisibility(container)
+
+        // Ensure hidden input is synced with visible inputs on initialization
+        updateHiddenInput(container)
     })
 }
 
@@ -94,7 +97,7 @@ const updateHiddenInput = (container) => {
     if (!hiddenInput) return
 
     const values = Array.from(inputs)
-        .map(input => input.value.trim())
+        .map(input => input.value ? input.value.trim() : '')
         .filter(value => value !== '')
 
     hiddenInput.value = JSON.stringify(values)