feat: Fix visual editors and add approval_step support to form builder

Workflow Visual Editor:
- Fixed handling of legacy visual_workflow_data format (stages array)
- Now regenerates visual layout when old format is detected

Form Visual Editor:
- Added approval_step field to form_builder_load API
- Added approval_step field to form_builder_save API
- Added Approval Step dropdown in field properties UI
- Allows assigning fields to approval steps 1-4 for sequential workflows

Bump version to 0.7.5

Author: matteius

django_forms_workflows/__init__.py

@@ -3,7 +3,7 @@
 Enterprise-grade, database-driven form builder with approval workflows
 """
 
-__version__ = "0.7.4"
+__version__ = "0.7.5"
 __author__ = "Django Forms Workflows Contributors"
 __license__ = "LGPL-3.0-only"
 

django_forms_workflows/form_builder_views.py

@@ -230,6 +230,7 @@ def form_builder_load(request, form_id):
                 "show_if_field": field.show_if_field,
                 "show_if_value": field.show_if_value or "",
             },
+            "approval_step": field.approval_step,
         }
         fields_data.append(field_data)
 
@@ -391,6 +392,15 @@ def form_builder_save(request):
                     }
                 )
 
+                # Add approval step (for sequential approval workflows)
+                approval_step = field_data.get("approval_step")
+                if approval_step is not None:
+                    field_props["approval_step"] = (
+                        int(approval_step) if approval_step else None
+                    )
+                else:
+                    field_props["approval_step"] = None
+
                 # Create or update field
                 if field_id and isinstance(field_id, int):
                     # Update existing field

django_forms_workflows/static/django_forms_workflows/js/form-builder.js

@@ -594,6 +594,17 @@ class FormBuilder {
                     <label class="form-label">CSS Class</label>
                     <input type="text" class="form-control" id="propCssClass" value="${this.escapeHtml(field.css_class)}">
                 </div>
+                <div class="col-12">
+                    <label class="form-label">Approval Step</label>
+                    <select class="form-select" id="propApprovalStep">
+                        <option value="" ${!field.approval_step ? 'selected' : ''}>None (Student-facing)</option>
+                        <option value="1" ${field.approval_step === 1 ? 'selected' : ''}>Step 1</option>
+                        <option value="2" ${field.approval_step === 2 ? 'selected' : ''}>Step 2</option>
+                        <option value="3" ${field.approval_step === 3 ? 'selected' : ''}>Step 3</option>
+                        <option value="4" ${field.approval_step === 4 ? 'selected' : ''}>Step 4</option>
+                    </select>
+                    <small class="text-muted">Assign to an approval step for sequential approval workflows</small>
+                </div>
             </div>
         `;
     }
@@ -1387,6 +1398,10 @@ class FormBuilder {
         const prefillSelect = document.getElementById('propPrefillSource');
         field.prefill_source_id = prefillSelect.value ? parseInt(prefillSelect.value) : null;
 
+        // Save approval step
+        const approvalStepSelect = document.getElementById('propApprovalStep');
+        field.approval_step = approvalStepSelect.value ? parseInt(approvalStepSelect.value) : null;
+
         const choicesEl = document.getElementById('propChoices');
         if (choicesEl) {
             field.choices = choicesEl.value;

django_forms_workflows/workflow_builder_views.py

@@ -156,12 +156,20 @@ def convert_workflow_to_visual(workflow, form_definition):
     """
     Convert WorkflowDefinition model to visual workflow format.
     """
-    # If visual workflow data exists, return it directly
+    # Check if visual workflow data exists AND has the correct format (nodes array)
     if workflow.visual_workflow_data:
-        logger.info("Loading saved visual workflow data")
-        return workflow.visual_workflow_data
+        visual_data = workflow.visual_workflow_data
+        # Check if it has the new format with nodes array
+        if isinstance(visual_data, dict) and "nodes" in visual_data:
+            logger.info("Loading saved visual workflow data (new format)")
+            return visual_data
+        else:
+            # Old format (e.g., stages array) - regenerate
+            logger.info(
+                "Found legacy visual_workflow_data format, regenerating visual layout"
+            )
 
-    # Otherwise, generate default layout from workflow configuration
+    # Generate default layout from workflow configuration
     logger.info("Generating default visual workflow layout")
     nodes = []
     connections = []

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-forms-workflows"
-version = "0.7.4"
+version = "0.7.5"
 description = "Enterprise-grade, database-driven form builder with approval workflows and external data integration"
 license = "LGPL-3.0-only"
 readme = "README.md"