django-forms-workflows 0.71.2__tar.gz → 0.72.0__tar.gz

{django_forms_workflows-0.71.2 → django_forms_workflows-0.72.0}/CHANGELOG.md

@@ -7,6 +7,52 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.72.0] - 2026-04-16
+
+### Changed (potentially breaking)
+- **Sync import now matches `FormField.workflow_stage` strictly by
+  workflow-stage UUID.** Previously, if the source payload's
+  `workflow_stage_uuid` didn't match any destination stage, the importer
+  fell back to ``(workflow_index, stage_order)`` — a lookup that is not
+  unique when a workflow has parallel or conditional stages sharing the
+  same `order`. The fallback silently routed such fields to the wrong
+  stage (e.g. fields for an "Admissions Counselor" stage landed on
+  "Academic Advisor" because both were configured with `order=1`). The
+  fallback is removed: unresolved stage UUIDs now leave `workflow_stage`
+  NULL and log a warning.
+- **Root cause also fixed inside the stage-resolution map.** The
+  per-import `all_stages_by_uuid` lookup was built from
+  `stage_order_maps_by_wf.values()`, which is keyed by `stage.order` and
+  therefore collapses stages that share an order value. It's now built
+  directly from `WorkflowStage.objects.filter(workflow__form_definition=…)`
+  so every destination stage is present in the UUID map regardless of
+  order collisions.
+
+### Migration notes
+- **Run `0091_add_uuid_fields` on both source *and* destination before
+  upgrading.** That migration (shipped earlier in the 0.68 series)
+  backfills `WorkflowStage.uuid` (and the other workflow/form UUID
+  fields) for pre-existing rows. Sync imports under 0.72 require those
+  UUIDs to be present and to match across environments; otherwise
+  fields will import with a NULL `workflow_stage` and will not render
+  in stage-scoped sections until re-assigned manually.
+- If your environments were synced with a pre-UUID importer and the
+  destination has autogenerated UUIDs that don't match the source, a
+  single re-sync of each workflow will converge UUIDs (workflow and
+  stage UUID convergence logic already exists in
+  `_import_single_workflow`). Run that before updating to 0.72.
+
+## [0.71.3] - 2026-04-16
+
+### Fixed
+- **Currency `$` prefix now renders on the approval page.** `approve.html`
+  did not load `form-enhancements.js`, the script that wraps
+  `input[data-input-type="currency"]` in a Bootstrap `input-group` with a
+  leading `$` addon. Currency fields on approver-filled stages were
+  rendering as a plain `0.00` number input. Added the script include so
+  the approval form matches the visual treatment already present on the
+  form-submit page.
+
 ## [0.71.2] - 2026-04-16
 
 ### Fixed

{django_forms_workflows-0.71.2 → django_forms_workflows-0.72.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-forms-workflows
-Version: 0.71.2
+Version: 0.72.0
 Summary: Enterprise-grade, database-driven form builder with approval workflows and external data integration
 License: LGPL-3.0-only
 License-File: LICENSE

{django_forms_workflows-0.71.2 → django_forms_workflows-0.72.0}/django_forms_workflows/sync_api.py

@@ -982,9 +982,6 @@ def import_form(form_data, conflict="update", category_cache=None):
     )
 
     # ── Workflows (created BEFORE fields so stage FKs can be resolved) ─────────
-    stage_order_map = {}  # order → WorkflowStage, used when creating fields
-    # Per-workflow stage maps: wf_index → {order → WorkflowStage}
-    stage_order_maps_by_wf = {}
     wf_data = form_data.get("workflow")
     additional_wf_data = form_data.get("additional_workflows", [])
 
@@ -1002,7 +999,10 @@ def import_form(form_data, conflict="update", category_cache=None):
 
         imported_wf_ids = set()
         for wf_idx, wf_payload in enumerate(all_wf_payloads):
-            wf_obj, s_map = _import_single_workflow(
+            # _import_single_workflow still returns its legacy stage_order_map
+            # for backwards compat, but we no longer consume it — field FK
+            # resolution below matches purely by stage UUID.
+            wf_obj, _ = _import_single_workflow(
                 form_obj,
                 wf_payload,
                 existing_wfs,
@@ -1010,11 +1010,6 @@ def import_form(form_data, conflict="update", category_cache=None):
                 imported_wf_ids,
             )
             imported_wf_ids.add(wf_obj.pk)
-            stage_order_maps_by_wf[wf_idx] = s_map
-            # Primary workflow's stage map is the default for backward compat
-            # (fields without workflow_index fall back to this).
-            if wf_idx == 0:
-                stage_order_map = s_map
 
         # Now resolve sub-workflow configs (must be done after ALL workflows
         # exist so cross-references can be resolved).
@@ -1066,11 +1061,15 @@ def import_form(form_data, conflict="update", category_cache=None):
         WorkflowDefinition.objects.filter(form_definition=form_obj).delete()
 
     # ── Fields ─────────────────────────────────────────────────────────────────
-    # Build a UUID lookup for all stages across all workflows (for field FK resolution)
-    all_stages_by_uuid = {}
-    for s_map in stage_order_maps_by_wf.values():
-        for stage in s_map.values():
-            all_stages_by_uuid[str(stage.uuid)] = stage
+    # UUID lookup across every stage on every workflow for this form. Pulled
+    # straight from the DB — NOT from ``stage_order_maps_by_wf`` — because
+    # that map is keyed by ``stage.order`` and collapses parallel/conditional
+    # stages that share the same order (the collision drops one stage's
+    # UUID from the lookup, which caused fields to land on the wrong stage).
+    all_stages_by_uuid = {
+        str(s.uuid): s
+        for s in WorkflowStage.objects.filter(workflow__form_definition=form_obj)
+    }
 
     # Delete existing fields so we get a clean ordered set
     form_obj.fields.all().delete()
@@ -1087,21 +1086,22 @@ def import_form(form_data, conflict="update", category_cache=None):
         field_data.pop("show_if_value", None)
         min_val = field_data.pop("min_value", None)
         max_val = field_data.pop("max_value", None)
-        stage_order = field_data.pop("workflow_stage_order", None)
+        # Legacy fallback keys (order / workflow_index) are intentionally
+        # discarded — stage resolution is UUID-only so parallel or
+        # conditional stages at the same order can't be conflated.
+        field_data.pop("workflow_stage_order", None)
+        field_data.pop("workflow_index", None)
         stage_uuid = field_data.pop("workflow_stage_uuid", None)
-        wf_index = field_data.pop("workflow_index", None)
-
-        # UUID-first stage resolution, then workflow_index + order fallback
-        workflow_stage = None
-        if stage_uuid:
-            workflow_stage = all_stages_by_uuid.get(stage_uuid)
-        if workflow_stage is None and stage_order is not None:
-            resolved_map = (
-                stage_order_maps_by_wf.get(wf_index, stage_order_map)
-                if wf_index is not None
-                else stage_order_map
+
+        workflow_stage = all_stages_by_uuid.get(stage_uuid) if stage_uuid else None
+        if stage_uuid and workflow_stage is None:
+            logger.warning(
+                "Sync import: field %r references unknown workflow_stage "
+                "uuid=%s on form %s — stage FK left NULL.",
+                field_data.get("field_name"),
+                stage_uuid,
+                form_obj.slug,
             )
-            workflow_stage = resolved_map.get(stage_order)
         # Resolve shared option list by slug (if present)
         sol_slug = field_data.pop("shared_option_list_slug", None)
         shared_option_list = None

{django_forms_workflows-0.71.2 → django_forms_workflows-0.72.0}/django_forms_workflows/templates/django_forms_workflows/approve.html

@@ -531,5 +531,6 @@
 {% endblock %}
 
 {% block extra_js %}
+<script src="{% static 'django_forms_workflows/js/form-enhancements.js' %}"></script>
 <script src="{% static 'django_forms_workflows/js/signature-pad.js' %}"></script>
 {% endblock %}

{django_forms_workflows-0.71.2 → django_forms_workflows-0.72.0}/pyproject.toml

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