Multi-workflow engine, push/pull diffs, clone SubWorkflowDefinition

- Workflow engine: create_workflow_tasks spawns tasks for ALL workflows
  on a form (parallel tracks). handle_approval/handle_rejection derive
  workflow from task.workflow_stage.workflow. Submission only finalizes
  when all tracks complete (_try_finalize_all_tracks).
- Push flow redesigned to mirror pull: standalone 3-step page (pick
  remote → select forms with diff status → push selected). Removed
  push_forms_to_remote admin action.
- Pull flow: added Status column showing New/Identical/N changes with
  expandable diff details per form.
- Clone: both admin and form builder now copy SubWorkflowDefinition.
- Bump version to 0.26.0

Author: matteius

django_forms_workflows/admin.py

@@ -307,7 +307,7 @@ class FormDefinitionAdmin(admin.ModelAdmin):
     inlines = [FormFieldInline, WorkflowDefinitionInline]
     filter_horizontal = ("submit_groups", "view_groups", "admin_groups")
     change_form_template = "admin/django_forms_workflows/formdef_change_form.html"
-    actions = ["clone_forms", "diff_forms", "export_as_json", "push_forms_to_remote"]
+    actions = ["clone_forms", "diff_forms", "export_as_json"]
 
     fieldsets = (
         (
@@ -550,6 +550,20 @@ def clone_forms(self, request, queryset):
                                     group=sag.group,
                                     position=sag.position,
                                 )
+                        # Clone SubWorkflowDefinition if present
+                        try:
+                            swc = wf.sub_workflow_config
+                            SubWorkflowDefinition.objects.create(
+                                parent_workflow=cloned_wf,
+                                sub_workflow=swc.sub_workflow,
+                                count_field=swc.count_field,
+                                section_label=swc.section_label,
+                                label_template=swc.label_template,
+                                trigger=swc.trigger,
+                                data_prefix=swc.data_prefix,
+                            )
+                        except SubWorkflowDefinition.DoesNotExist:
+                            pass
 
                     cloned_count += 1
             except Exception as e:
@@ -654,21 +668,19 @@ def sync_import_admin_view(self, request):
 
     # ── Push/Pull admin actions & views ───────────────────────────────────────
 
-    @admin.action(description="Push selected forms to a remote instance")
-    def push_forms_to_remote(self, request, queryset):
-        """Admin action: redirect to the push view with selected form PKs."""
-        pks = ",".join(str(pk) for pk in queryset.values_list("pk", flat=True))
-        push_url = reverse("admin:formdefinition_sync_push")
-        return HttpResponseRedirect(f"{push_url}?pks={pks}")
-
     def sync_pull_admin_view(self, request):
         """Multi-step admin page for pulling form definitions from a remote instance.
 
         Step 0 (GET)  – show remote picker (configured remotes + manual URL/token)
         Step 1 (POST) – fetch available forms from the remote, show checkbox list
         Step 2 (POST) – import selected forms, show results
         """
-        from .sync_api import fetch_remote_payload, get_sync_remotes, import_payload
+        from .sync_api import (
+            build_export_payload,
+            fetch_remote_payload,
+            get_sync_remotes,
+            import_payload,
+        )
 
         context = dict(self.admin_site.each_context(request))
         context["title"] = "Pull Forms from Remote"
@@ -719,11 +731,46 @@ def sync_pull_admin_view(self, request):
                     )
 
                 remote_forms = payload.get("forms", [])
+
+                # Build per-form diffs: remote vs local
+                import json
+
+                from .diff_views import _build_summary
+
+                form_diffs = []
+                for rf in remote_forms:
+                    slug = rf.get("form", {}).get("slug", "")
+                    local_fd = FormDefinition.objects.filter(slug=slug).first()
+                    if local_fd:
+                        local_payload = build_export_payload(
+                            FormDefinition.objects.filter(pk=local_fd.pk)
+                        )
+                        local_data = (
+                            local_payload["forms"][0]
+                            if local_payload.get("forms")
+                            else {}
+                        )
+                        local_json = json.dumps(local_data, indent=2, default=str)
+                        remote_json = json.dumps(rf, indent=2, default=str)
+                        summary = _build_summary([local_data, rf])
+                        form_diffs.append(
+                            {
+                                "slug": slug,
+                                "local_json": local_json,
+                                "remote_json": remote_json,
+                                "summary": summary[0] if summary else None,
+                                "is_new": False,
+                            }
+                        )
+                    else:
+                        form_diffs.append({"slug": slug, "is_new": True})
+
                 context["step"] = 1
                 context["remote_url"] = remote_url
                 context["remote_token"] = remote_token
                 context["remote_name"] = remote_name
                 context["remote_forms"] = remote_forms
+                context["form_diffs"] = form_diffs
                 return render(
                     request, "admin/django_forms_workflows/sync_pull.html", context
                 )
@@ -776,39 +823,31 @@ def sync_pull_admin_view(self, request):
         return render(request, "admin/django_forms_workflows/sync_pull.html", context)
 
     def sync_push_admin_view(self, request):
-        """Admin page for pushing local form definitions to a remote instance.
+        """Multi-step admin page for pushing form definitions to a remote.
 
-        Arrives with ``?pks=1,2,3`` (selected from the changelist action) or
-        without PKs (push all forms).
-
-        Step 0 (GET)  – show forms to be pushed + remote picker
-        Step 1 (POST) – execute push, show results
+        Mirrors the pull flow:
+        Step 0 (GET)  – show remote picker (configured remotes + manual URL/token)
+        Step 1 (POST) – show all local forms with checkboxes + diff status
+        Step 2 (POST) – execute push for selected forms, show results
         """
-        from .sync_api import get_sync_remotes, push_to_remote
+        from .sync_api import (
+            build_export_payload,
+            fetch_remote_payload,
+            get_sync_remotes,
+            push_to_remote,
+        )
 
         context = dict(self.admin_site.each_context(request))
         context["title"] = "Push Forms to Remote"
         context["opts"] = self.model._meta
         context["remotes"] = get_sync_remotes()
         context["step"] = 0
 
-        # Resolve form queryset from ?pks= query param or POST field
-        pks_raw = request.GET.get("pks") or request.POST.get("pks", "")
-        if pks_raw:
-            try:
-                pk_list = [int(p) for p in pks_raw.split(",") if p.strip().isdigit()]
-            except ValueError:
-                pk_list = []
-            queryset = self.model.objects.filter(pk__in=pk_list)
-        else:
-            queryset = self.model.objects.all()
-
-        context["forms_to_push"] = queryset
-        context["pks"] = pks_raw
-
         if request.method == "POST":
-            step = request.POST.get("step", "push")
-            if step == "push":
+            step = request.POST.get("step", "1")
+
+            # ── Step 1: show local forms with diff status ────────────────
+            if step == "1":
                 remote_idx = request.POST.get("remote_idx", "")
                 manual_url = request.POST.get("manual_url", "").strip()
                 manual_token = request.POST.get("manual_token", "").strip()
@@ -836,24 +875,95 @@ def sync_push_admin_view(self, request):
                         "Please select a configured remote or enter a URL and token."
                     )
                     return render(
-                        request, "admin/django_forms_workflows/sync_push.html", context
+                        request,
+                        "admin/django_forms_workflows/sync_push.html",
+                        context,
                     )
 
+                # Build per-form diffs: local vs remote
+
+                from .diff_views import _build_summary
+
+                local_qs = self.model.objects.all()
+                local_payload = build_export_payload(local_qs)
+                local_forms = local_payload.get("forms", [])
+
+                try:
+                    remote_payload = fetch_remote_payload(remote_url, remote_token)
+                    remote_forms_list = remote_payload.get("forms", [])
+                except Exception:
+                    remote_forms_list = []
+
+                remote_by_slug = {
+                    f.get("form", {}).get("slug"): f for f in remote_forms_list
+                }
+                form_diffs = []
+                for lf in local_forms:
+                    slug = lf.get("form", {}).get("slug", "")
+                    name = lf.get("form", {}).get("name", slug)
+                    rf = remote_by_slug.get(slug)
+                    if rf:
+                        summary = _build_summary([rf, lf])
+                        form_diffs.append(
+                            {
+                                "slug": slug,
+                                "name": name,
+                                "summary": summary[0] if summary else None,
+                                "is_new": False,
+                            }
+                        )
+                    else:
+                        form_diffs.append({"slug": slug, "name": name, "is_new": True})
+
+                context["step"] = 1
+                context["remote_url"] = remote_url
+                context["remote_token"] = remote_token
+                context["remote_name"] = remote_name
+                context["conflict"] = conflict
+                context["local_forms"] = local_forms
+                context["form_diffs"] = form_diffs
+                return render(
+                    request,
+                    "admin/django_forms_workflows/sync_push.html",
+                    context,
+                )
+
+            # ── Step 2: push selected forms ──────────────────────────────
+            if step == "2":
+                remote_url = request.POST.get("remote_url", "").strip()
+                remote_token = request.POST.get("remote_token", "").strip()
+                remote_name = request.POST.get("remote_name", remote_url)
+                conflict = request.POST.get("conflict", "update")
+                selected_slugs = request.POST.getlist("slugs")
+
+                if not selected_slugs:
+                    context["error"] = "No forms selected."
+                    return render(
+                        request,
+                        "admin/django_forms_workflows/sync_push.html",
+                        context,
+                    )
+
+                queryset = self.model.objects.filter(slug__in=selected_slugs)
                 try:
                     result = push_to_remote(
                         remote_url, remote_token, queryset, conflict=conflict
                     )
                 except Exception as exc:
                     context["error"] = f"Push failed: {exc}"
                     return render(
-                        request, "admin/django_forms_workflows/sync_push.html", context
+                        request,
+                        "admin/django_forms_workflows/sync_push.html",
+                        context,
                     )
 
-                context["step"] = 1
+                context["step"] = 2
                 context["remote_name"] = remote_name
                 context["push_result"] = result
                 return render(
-                    request, "admin/django_forms_workflows/sync_push.html", context
+                    request,
+                    "admin/django_forms_workflows/sync_push.html",
+                    context,
                 )
 
         return render(request, "admin/django_forms_workflows/sync_push.html", context)

django_forms_workflows/form_builder_views.py

@@ -21,6 +21,7 @@
     FormTemplate,
     PrefillSource,
     StageApprovalGroup,
+    SubWorkflowDefinition,
     WorkflowDefinition,
     WorkflowStage,
 )
@@ -194,6 +195,20 @@ def form_builder_clone(request, form_id):
                             group=sag.group,
                             position=sag.position,
                         )
+                # Clone SubWorkflowDefinition if present
+                try:
+                    swc = wf.sub_workflow_config
+                    SubWorkflowDefinition.objects.create(
+                        parent_workflow=cloned_wf,
+                        sub_workflow=swc.sub_workflow,
+                        count_field=swc.count_field,
+                        section_label=swc.section_label,
+                        label_template=swc.label_template,
+                        trigger=swc.trigger,
+                        data_prefix=swc.data_prefix,
+                    )
+                except SubWorkflowDefinition.DoesNotExist:
+                    pass
 
             return JsonResponse(
                 {

django_forms_workflows/templates/admin/django_forms_workflows/formdefinition/change_list.html

@@ -44,8 +44,8 @@
     </a>
 </li>
 <li>
-    <a href="{% url 'admin:formdefinition_sync_push' %}" class="sync-btn sync-btn-push" title="Push all forms to another instance">
-        ↑ Push All to Remote
+    <a href="{% url 'admin:formdefinition_sync_push' %}" class="sync-btn sync-btn-push" title="Push forms to another instance">
+        ↑ Push to Remote
     </a>
 </li>
 <li>

django_forms_workflows/templates/admin/django_forms_workflows/sync_pull.html

@@ -75,16 +75,34 @@ <h2>Import Results</h2>
                         <th>Slug</th>
                         <th>Name</th>
                         <th>Category</th>
+                        <th>Status</th>
                     </tr>
                 </thead>
                 <tbody>
                     {% for form in remote_forms %}
+                    {% with slug=form.form.slug %}
                     <tr>
-                        <td><input type="checkbox" name="slugs" value="{{ form.form.slug }}" checked></td>
-                        <td><code>{{ form.form.slug }}</code></td>
+                        <td><input type="checkbox" name="slugs" value="{{ slug }}" checked></td>
+                        <td><code>{{ slug }}</code></td>
                         <td>{{ form.form.name }}</td>
                         <td>{{ form.category.name|default:"—" }}</td>
+                        <td>
+                            {% for d in form_diffs %}{% if d.slug == slug %}{% if d.is_new %}<span style="color:#1a7f37;font-weight:600;">New</span>{% elif d.summary.identical %}<span style="color:#6e7781;">Identical</span>{% else %}<a href="#" onclick="document.getElementById('diff-{{slug}}').style.display=document.getElementById('diff-{{slug}}').style.display==='none'?'':'none';return false;" style="font-weight:600;">{{ d.summary.diffs|length }} change{{ d.summary.diffs|length|pluralize }}</a>{% endif %}{% endif %}{% endfor %}
+                        </td>
                     </tr>
+                    {% for d in form_diffs %}{% if d.slug == slug and not d.is_new and not d.summary.identical %}
+                    <tr id="diff-{{ slug }}" style="display:none;">
+                        <td colspan="5" style="padding:8px 16px;background:#f6f8fa;">
+                            {% for item in d.summary.diffs %}
+                            <div style="padding:3px 0;font-size:13px;">
+                                {% if "added" in item|lower %}<span style="background:#1a7f37;color:#fff;padding:1px 6px;border-radius:10px;font-size:11px;font-weight:600;margin-right:6px;">+</span>{% elif "removed" in item|lower %}<span style="background:#cf222e;color:#fff;padding:1px 6px;border-radius:10px;font-size:11px;font-weight:600;margin-right:6px;">−</span>{% else %}<span style="background:#9a6700;color:#fff;padding:1px 6px;border-radius:10px;font-size:11px;font-weight:600;margin-right:6px;">Δ</span>{% endif %}
+                                {{ item }}
+                            </div>
+                            {% endfor %}
+                        </td>
+                    </tr>
+                    {% endif %}{% endfor %}
+                    {% endwith %}
                     {% endfor %}
                 </tbody>
             </table>