django-forms-workflows 0.76.0__tar.gz → 0.76.3__tar.gz

{django_forms_workflows-0.76.0 → django_forms_workflows-0.76.3}/CHANGELOG.md

@@ -7,6 +7,53 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- **Form builder save logic factored into a standalone helper.**
+  `form_builder_save`'s create/update logic for `FormDefinition` and its
+  `FormField`s now lives in `save_form_definition_from_builder_data()`,
+  mirroring the existing `convert_visual_to_workflow` split already used by
+  the workflow builder. Makes the logic callable (and unit-testable)
+  independently of the `@staff_member_required`-decorated HTTP view — no
+  behavior or API change.
+- **Notification rules identify their workflow in the admin.** The standalone
+  `NotificationRule` list rendered only `workflow.form_definition.name`, so a
+  rule on a parent workflow and a rule on its sub-workflow both displayed the
+  same form name — and for workflow-level rules the Stage column reads
+  "— (all stages)" on either one, giving nothing to tell them apart. The
+  workflow column now appends `WorkflowDefinition.name_label` when set
+  (`Course Development Request — Payment`), `workflow__name_label` was added to
+  `search_fields`, and `workflow` was added to `list_filter`. `name_label` also
+  joins `WorkflowDefinitionAdmin.search_fields` so the rule form's `workflow`
+  autocomplete can match on it, and `WorkflowDefinition.__str__` now carries the
+  label so every FK picker, autocomplete result, and log entry disambiguates.
+
+### Fixed
+- **Browser value suggestions restored on generic text fields.** The
+  password-manager opt-out added in 0.74.15 set `autocomplete="off"` alongside
+  the `data-1p-ignore` / `data-lpignore` / `data-bwignore` / `data-form-type`
+  attributes on every field type in `_PM_OPT_OUT_FIELD_TYPES`. Those `data-*`
+  attributes are what actually silence 1Password, LastPass, Bitwarden, and
+  Dashlane; `autocomplete="off"` additionally disabled the *browser's* own
+  saved-value dropdown, which users relied on for fields like Position/Job
+  Title, Department Name, and Supervisor. `autocomplete` is no longer set, so
+  native suggestions work again while password-manager popovers stay
+  suppressed. Fields with their own suggestion UI (LDAP lookup) are unaffected
+  — `ldap-lookup.js` sets `autocomplete="off"` on them directly.
+- **Diff and sync summaries no longer ignore sub-workflows.** `_build_summary`
+  read only the `"workflow"` key, but `serialize_form` stores the first
+  workflow there and every other one under `"additional_workflows"`. A
+  sub-workflow's stages, settings, and notification rules were therefore
+  serialized into the payload but never compared — invisible in the standalone
+  Diff view and in the Sync **Push** and **Pull** previews, all three of which
+  share this function. Every workflow is now compared. Pairs are matched on
+  `uuid` (creation order, and so list position, need not agree across
+  environments) and fall back to position for payloads predating the field and
+  for the diff view's cross-form comparisons; unpaired workflows are reported
+  as added/removed. Bullets are prefixed with the workflow's `name_label`
+  (`Workflow 'Payment' stages added: Bursar`) so parent and sub-workflow
+  changes are distinguishable. `start_trigger` and `sub_workflow_config` — the
+  two settings that define sub-workflow sequencing — are now compared as well.
+
 ## [0.76.0] - 2026-06-09
 
 ### Removed

{django_forms_workflows-0.76.0 → django_forms_workflows-0.76.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-forms-workflows
-Version: 0.76.0
+Version: 0.76.3
 Summary: Enterprise-grade, database-driven form builder with approval workflows and external data integration
 License: LGPL-3.0-only
 License-File: LICENSE
@@ -418,6 +418,7 @@ graph TB
 - Optional: `openpyxl` for Excel spreadsheet field support (`pip install django-forms-workflows[excel]`)
 - Optional: `django-auth-ldap` for LDAP/AD integration (`pip install django-forms-workflows[ldap]`)
 - Optional: WeasyPrint for PDF export (`pip install django-forms-workflows[pdf]`)
+- Optional: Node.js ^20.19.0 or >=22.12.0 / npm, to run the JS test suite (`npm test`) covering the visual Form/Workflow Builder's client-side code (an `.nvmrc` is committed at the repo root)
 
 ## Testing
 
@@ -429,6 +430,17 @@ python -m pytest tests/ -v
 
 The test suite covers models, forms, workflow engine (including dynamic assignees, conditional stages, multi-workflow parallel tracks, sub-workflows), sync API, post-submission action executor, views, signals, conditions, and utilities — **298 tests**.
 
+### JavaScript tests
+
+The visual Form Builder's client-side JS (`django_forms_workflows/static/django_forms_workflows/js/form-builder.js`) has its own suite, run with [Vitest](https://vitest.dev/):
+
+```bash
+npm install
+npm test
+```
+
+`npm run test:watch` re-runs on file changes. Coverage is still minimal (tooling was just added) — see [CONTRIBUTING.md](CONTRIBUTING.md) if you're adding to it.
+
 ## Contributing
 
 We welcome contributions! Please see [CONTRIBUTING.md](CONTRIBUTING.md) for details.

{django_forms_workflows-0.76.0 → django_forms_workflows-0.76.3}/README.md

@@ -351,6 +351,7 @@ graph TB
 - Optional: `openpyxl` for Excel spreadsheet field support (`pip install django-forms-workflows[excel]`)
 - Optional: `django-auth-ldap` for LDAP/AD integration (`pip install django-forms-workflows[ldap]`)
 - Optional: WeasyPrint for PDF export (`pip install django-forms-workflows[pdf]`)
+- Optional: Node.js ^20.19.0 or >=22.12.0 / npm, to run the JS test suite (`npm test`) covering the visual Form/Workflow Builder's client-side code (an `.nvmrc` is committed at the repo root)
 
 ## Testing
 
@@ -362,6 +363,17 @@ python -m pytest tests/ -v
 
 The test suite covers models, forms, workflow engine (including dynamic assignees, conditional stages, multi-workflow parallel tracks, sub-workflows), sync API, post-submission action executor, views, signals, conditions, and utilities — **298 tests**.
 
+### JavaScript tests
+
+The visual Form Builder's client-side JS (`django_forms_workflows/static/django_forms_workflows/js/form-builder.js`) has its own suite, run with [Vitest](https://vitest.dev/):
+
+```bash
+npm install
+npm test
+```
+
+`npm run test:watch` re-runs on file changes. Coverage is still minimal (tooling was just added) — see [CONTRIBUTING.md](CONTRIBUTING.md) if you're adding to it.
+
 ## Contributing
 
 We welcome contributions! Please see [CONTRIBUTING.md](CONTRIBUTING.md) for details.

{django_forms_workflows-0.76.0 → django_forms_workflows-0.76.3}/django_forms_workflows/admin.py

@@ -1770,7 +1770,7 @@ class WorkflowDefinitionAdmin(nested_admin.NestedModelAdmin):
         "allow_bulk_export",
         "allow_bulk_pdf_export",
     )
-    search_fields = ("form_definition__name",)
+    search_fields = ("form_definition__name", "name_label")
     readonly_fields = ("uuid",)
     fieldsets = (
         (
@@ -1891,10 +1891,12 @@ class NotificationRuleAdmin(admin.ModelAdmin):
         "notify_stage_assignees",
         "notify_stage_groups",
         "workflow__form_definition",
+        "workflow",
     )
     list_select_related = ("workflow__form_definition", "stage")
     search_fields = (
         "workflow__form_definition__name",
+        "workflow__name_label",
         "stage__name",
         "email_field",
         "static_emails",
@@ -1950,7 +1952,15 @@ class NotificationRuleAdmin(admin.ModelAdmin):
         description="Form / Workflow", ordering="workflow__form_definition__name"
     )
     def workflow_form(self, obj):
-        return obj.workflow.form_definition.name if obj.workflow_id else "—"
+        if not obj.workflow_id:
+            return "—"
+        # Append ``name_label`` so a rule on a parent workflow and one on its
+        # sub-workflow are distinguishable here — both share a form name, and
+        # for workflow-level rules the Stage column reads "— (all stages)" on
+        # either one.
+        name = obj.workflow.form_definition.name
+        label = obj.workflow.name_label
+        return f"{name} — {label}" if label else name
 
     @admin.display(description="Stage", ordering="stage__name")
     def stage_name(self, obj):

{django_forms_workflows-0.76.0 → django_forms_workflows-0.76.3}/django_forms_workflows/diff_views.py

@@ -11,6 +11,74 @@ from .models import FormDefinition
 from .sync_api import build_export_payload
 
 
+def _payload_workflows(payload):
+    """Return every workflow in a serialized payload, primary first.
+
+    ``serialize_form`` splits a form's workflows across two keys — ``workflow``
+    holds the first one by id, ``additional_workflows`` holds the rest — so
+    anything reading only ``workflow`` is blind to sub-workflows.
+    """
+    workflows = []
+    primary = payload.get("workflow")
+    if primary:
+        workflows.append(primary)
+    workflows.extend(wf for wf in (payload.get("additional_workflows") or []) if wf)
+    return workflows
+
+
+def _pair_workflows(b_wfs, o_wfs):
+    """Pair base/other workflows, yielding ``(index, base_wf, other_wf)`` tuples.
+
+    Matched on ``uuid`` first, because creation order — and therefore position
+    in the list — is not guaranteed to agree between environments. Whatever
+    uuid matching leaves over is paired by position, which covers payloads
+    predating the uuid field and the standalone diff view, where two *different*
+    forms are compared and no uuid will ever match. Anything still unpaired is
+    reported as added or removed.
+    """
+    o_by_uuid = {}
+    for idx, wf in enumerate(o_wfs):
+        uid = wf.get("uuid")
+        if uid:
+            o_by_uuid.setdefault(uid, []).append(idx)
+
+    pairs = []
+    matched_o = set()
+    unmatched_b = []
+    for idx, wf in enumerate(b_wfs):
+        candidates = o_by_uuid.get(wf.get("uuid")) or []
+        match = next((c for c in candidates if c not in matched_o), None)
+        if match is None:
+            unmatched_b.append(idx)
+        else:
+            matched_o.add(match)
+            pairs.append((idx, wf, o_wfs[match]))
+
+    leftover_o = [i for i in range(len(o_wfs)) if i not in matched_o]
+    for b_idx, o_idx in zip(unmatched_b, leftover_o, strict=False):
+        pairs.append((b_idx, b_wfs[b_idx], o_wfs[o_idx]))
+    overlap = min(len(unmatched_b), len(leftover_o))
+    for b_idx in unmatched_b[overlap:]:
+        pairs.append((b_idx, b_wfs[b_idx], None))
+    for o_idx in leftover_o[overlap:]:
+        pairs.append((o_idx, None, o_wfs[o_idx]))
+
+    pairs.sort(key=lambda p: p[0])
+    return pairs
+
+
+def _workflow_label(wf, index):
+    """Label a workflow in the summary bullets.
+
+    ``name_label`` is what distinguishes a parent workflow from its
+    sub-workflows on the same form, so it is preferred when set.
+    """
+    name_label = (wf or {}).get("name_label")
+    if name_label:
+        return f"Workflow '{name_label}'"
+    return "Workflow" if index == 0 else f"Workflow #{index + 1}"
+
+
 def _build_summary(forms_data):
     """Build a supplemental summary of key differences between serialized forms."""
     if len(forms_data) < 2:
@@ -49,19 +117,21 @@ def _build_summary(forms_data):
         if changed_fields:
             diffs.append(f"Fields modified: {', '.join(changed_fields)}")
 
-        # Workflow differences
-        b_wf = base.get("workflow")
-        o_wf = other.get("workflow")
-        if (b_wf is None) != (o_wf is None):
-            diffs.append(
-                f"Workflow: {'present' if b_wf else 'absent'}"
-                f" → {'present' if o_wf else 'absent'}"
-            )
-        elif b_wf and o_wf:
+        # Workflow differences — every workflow, not only the primary one.
+        for wf_index, b_wf, o_wf in _pair_workflows(
+            _payload_workflows(base), _payload_workflows(other)
+        ):
+            wf_label = _workflow_label(b_wf or o_wf, wf_index)
+            if b_wf is None or o_wf is None:
+                diffs.append(
+                    f"{wf_label}: {'present' if b_wf else 'absent'}"
+                    f" → {'present' if o_wf else 'absent'}"
+                )
+                continue
             b_stages = b_wf.get("stages", [])
             o_stages = o_wf.get("stages", [])
             if len(b_stages) != len(o_stages):
-                diffs.append(f"Workflow stages: {len(b_stages)} → {len(o_stages)}")
+                diffs.append(f"{wf_label} stages: {len(b_stages)} → {len(o_stages)}")
 
             # Per-stage comparison keyed on (order, name) to handle parallel stages
             b_stage_map = {(s.get("order"), s.get("name")): s for s in b_stages}
@@ -69,10 +139,13 @@ def _build_summary(forms_data):
             added_stages = sorted(o_stage_map.keys() - b_stage_map.keys())
             removed_stages = sorted(b_stage_map.keys() - o_stage_map.keys())
             if added_stages:
-                diffs.append(f"Stages added: {', '.join(n for _, n in added_stages)}")
+                diffs.append(
+                    f"{wf_label} stages added: {', '.join(n for _, n in added_stages)}"
+                )
             if removed_stages:
                 diffs.append(
-                    f"Stages removed: {', '.join(n for _, n in removed_stages)}"
+                    f"{wf_label} stages removed: "
+                    f"{', '.join(n for _, n in removed_stages)}"
                 )
             stage_field_keys = [
                 "assignee_form_field",
@@ -91,7 +164,8 @@ def _build_summary(forms_data):
                 for sk in stage_field_keys:
                     if bs.get(sk) != os_.get(sk):
                         diffs.append(
-                            f"Stage '{key[1]}' {sk}: {bs.get(sk)!r} → {os_.get(sk)!r}"
+                            f"{wf_label} stage '{key[1]}' {sk}: "
+                            f"{bs.get(sk)!r} → {os_.get(sk)!r}"
                         )
                 b_notifs = bs.get(
                     "notification_rules", bs.get("form_field_notifications", [])
@@ -101,7 +175,8 @@ def _build_summary(forms_data):
                 )
                 if len(b_notifs) != len(o_notifs):
                     diffs.append(
-                        f"Stage '{key[1]}' notifications: {len(b_notifs)} → {len(o_notifs)}"
+                        f"{wf_label} stage '{key[1]}' notifications: "
+                        f"{len(b_notifs)} → {len(o_notifs)}"
                     )
                 elif b_notifs != o_notifs:
                     for idx, (bn, on) in enumerate(
@@ -114,8 +189,8 @@ def _build_summary(forms_data):
                         )
                         label = bn.get("event") or on.get("event") or f"#{idx}"
                         diffs.append(
-                            f"Stage '{key[1]}' notification '{label}' changed: "
-                            f"{', '.join(changed_keys)}"
+                            f"{wf_label} stage '{key[1]}' notification "
+                            f"'{label}' changed: {', '.join(changed_keys)}"
                         )
                 # Approval groups: support both old string lists and new dict lists
                 b_groups = {
@@ -135,12 +210,14 @@ def _build_summary(forms_data):
                     if removed_g:
                         parts.append(f"-{', '.join(sorted(removed_g))}")
                     diffs.append(
-                        f"Stage '{key[1]}' approval_groups: {'; '.join(parts)}"
+                        f"{wf_label} stage '{key[1]}' approval_groups: "
+                        f"{'; '.join(parts)}"
                     )
 
             wf_setting_keys = [
                 "requires_approval",
                 "name_label",
+                "start_trigger",
                 "hide_approval_history",
                 "collapse_parallel_stages",
                 "allow_bulk_export",
@@ -156,14 +233,34 @@ def _build_summary(forms_data):
             ]
             for key in wf_setting_keys:
                 if b_wf.get(key) != o_wf.get(key):
-                    diffs.append(f"Workflow {key}: {b_wf.get(key)} → {o_wf.get(key)}")
+                    diffs.append(f"{wf_label} {key}: {b_wf.get(key)} → {o_wf.get(key)}")
+
+            # Sub-workflow wiring. Compared by changed key rather than dumped
+            # whole — the config is a nested dict and printing both sides makes
+            # the summary unreadable.
+            b_swc = b_wf.get("sub_workflow_config")
+            o_swc = o_wf.get("sub_workflow_config")
+            if (b_swc is None) != (o_swc is None):
+                diffs.append(
+                    f"{wf_label} sub_workflow_config: "
+                    f"{'present' if b_swc else 'absent'}"
+                    f" → {'present' if o_swc else 'absent'}"
+                )
+            elif b_swc and o_swc and b_swc != o_swc:
+                swc_keys = sorted(
+                    k for k in set(b_swc) | set(o_swc) if b_swc.get(k) != o_swc.get(k)
+                )
+                diffs.append(
+                    f"{wf_label} sub_workflow_config changed: {', '.join(swc_keys)}"
+                )
 
             # Workflow-level notification rules (stage=null)
             b_wf_notifs = b_wf.get("notification_rules", [])
             o_wf_notifs = o_wf.get("notification_rules", [])
             if len(b_wf_notifs) != len(o_wf_notifs):
                 diffs.append(
-                    f"Workflow notification rules: {len(b_wf_notifs)} → {len(o_wf_notifs)}"
+                    f"{wf_label} notification rules: "
+                    f"{len(b_wf_notifs)} → {len(o_wf_notifs)}"
                 )
             elif b_wf_notifs != o_wf_notifs:
                 # Same count but content differs — surface what changed.
@@ -178,12 +275,12 @@ def _build_summary(forms_data):
                     )
                     label = br.get("event") or or_.get("event") or f"#{idx}"
                     diffs.append(
-                        f"Workflow notification rule '{label}' changed: "
+                        f"{wf_label} notification rule '{label}' changed: "
                         f"{', '.join(changed_keys)}"
                     )
                     changed.append(label)
                 if not changed:
-                    diffs.append("Workflow notification rules: order changed")
+                    diffs.append(f"{wf_label} notification rules: order changed")
 
         # Form metadata
         meta_keys = [