From ddf0f455ac9884769b2c854339b31eb949c10ec5 Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Thu, 19 Nov 2026 13:57:25 -0500 Subject: [PATCH 1/6] Apply suggested fix to django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js from Copilot Autofix Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com> --- .../static/django_forms_workflows/js/workflow-builder.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js b/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js index 7214858..fb0c8a7 100644 --- a/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js +++ b/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js @@ -2794,7 +2794,8 @@ export class WorkflowBuilder { } const badgeHtml = badges ? `${badges}
` : ''; - return `${badgeHtml}${fieldCount} field${fieldCount !== 1 ? 's' : ''} • Edit Form`; + const safeFormBuilderUrl = this.escapeHtmlAttribute(this.sanitizeFormBuilderUrl(node.data.form_builder_url || '#')); + return `${badgeHtml}${fieldCount} field${fieldCount !== 1 ? 's' : ''} • Edit Form`; case 'workflow_settings': const parts_ws = []; if (node.data.name_label) parts_ws.push(this.escapeHtml(node.data.name_label)); From 700a589d9be66bf08112a9a76c736bfd681a62bf Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Thu, 19 Nov 2026 13:57:26 -0500 Subject: [PATCH 2/6] Apply suggested fix to django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js from Copilot Autofix Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com> --- .../static/django_forms_workflows/js/workflow-builder.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js b/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js index fb0c8a7..f7d115b 100644 --- a/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js +++ b/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js @@ -2174,9 +2174,10 @@ export class WorkflowBuilder { if (!node) return; const groups = this.getNormalizedStageApprovalGroups(node.data.approval_groups || []); - const currentIndex = groups.findIndex(group => ( - group.id === groupId && (groupRole === null || group.role === groupRole) - )); + const currentIndex = groups.findIndex(group => { + const normalizedRole = group.role || 'approval'; + return group.id === groupId && (groupRole === null || normalizedRole === groupRole); + }); const targetIndex = currentIndex + direction; if (currentIndex < 0 || targetIndex < 0 || targetIndex >= groups.length) { return; From a7aa32a04b279da41be9ec9fa4757f812112ffa8 Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Thu, 19 Nov 2026 13:57:27 -0500 Subject: [PATCH 3/6] Apply suggested fix to django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js from Copilot Autofix Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com> --- .../static/django_forms_workflows/js/workflow-builder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js b/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js index f7d115b..5f590f5 100644 --- a/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js +++ b/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js @@ -1708,7 +1708,7 @@ export class WorkflowBuilder { return '#'; } - return `${parsed.pathname}${parsed.search}${parsed.hash}`; + return parsed.href; } catch (e) { return '#'; } From 9cdc7cce8646180a12df2e8f6e222e2da49f0fd7 Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Thu, 19 Nov 2026 13:57:27 -0500 Subject: [PATCH 4/6] Apply suggested fix to django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js from Copilot Autofix Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com> --- .../static/django_forms_workflows/js/workflow-builder.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js b/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js index 5f590f5..0c64360 100644 --- a/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js +++ b/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js @@ -1646,8 +1646,10 @@ export class WorkflowBuilder { `; fields.forEach(field => { + const escapedPrefillSourceText = this.escapeHtml(field.prefill_source); + const escapedPrefillSourceTitle = this.escapeHtmlAttribute(field.prefill_source); const prefillBadge = field.prefill_source ? - ` ${this.escapeHtml(field.prefill_source)}` : ''; + ` ${escapedPrefillSourceText}` : ''; const requiredBadge = field.required ? `Required` : ''; From 607f6f976d7205ec13e7b2f95ae34d8f4d1d58f9 Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Thu, 19 Nov 2026 13:57:28 -0500 Subject: [PATCH 5/6] Apply suggested fix to django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js from Copilot Autofix Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com> --- .../static/django_forms_workflows/js/workflow-builder.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js b/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js index 0c64360..2ed0d90 100644 --- a/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js +++ b/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js @@ -242,7 +242,8 @@ export class WorkflowBuilder { /** Zoom to a specific level, centred on the canvas midpoint. */ setZoom(newZoom) { const rect = this.canvas.getBoundingClientRect(); - const cx = rect.width / 2, cy = rect.height / 2; + const cx = this.canvas.scrollLeft + (rect.width / 2); + const cy = this.canvas.scrollTop + (rect.height / 2); const oldZoom = this.zoom; this.zoom = Math.min(this.maxZoom, Math.max(this.minZoom, newZoom)); const scale = this.zoom / oldZoom; From c2cdca660433384f6868f097f2e664c4e57e3fda Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Fri, 20 Nov 2026 01:35:05 -0500 Subject: [PATCH 6/6] Keep safe relative form links and cover builder regressions --- .../js/workflow-builder.js | 4 +- tests_js/workflow-builder/review246.test.js | 39 +++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js b/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js index 2ed0d90..fbce0c5 100644 --- a/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js +++ b/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js @@ -1711,7 +1711,7 @@ export class WorkflowBuilder { return '#'; } - return parsed.href; + return `${parsed.pathname}${parsed.search}${parsed.hash}`; } catch (e) { return '#'; } @@ -2799,7 +2799,7 @@ export class WorkflowBuilder { const badgeHtml = badges ? `${badges}
` : ''; const safeFormBuilderUrl = this.escapeHtmlAttribute(this.sanitizeFormBuilderUrl(node.data.form_builder_url || '#')); - return `${badgeHtml}${fieldCount} field${fieldCount !== 1 ? 's' : ''} • Edit Form`; + return `${badgeHtml}${fieldCount} field${fieldCount !== 1 ? 's' : ''} • Edit Form`; case 'workflow_settings': const parts_ws = []; if (node.data.name_label) parts_ws.push(this.escapeHtml(node.data.name_label)); diff --git a/tests_js/workflow-builder/review246.test.js b/tests_js/workflow-builder/review246.test.js index a8855f1..5cd24de 100644 --- a/tests_js/workflow-builder/review246.test.js +++ b/tests_js/workflow-builder/review246.test.js @@ -48,6 +48,26 @@ describe('workflow builder review fixes', () => { expect(instance.panY).toBeCloseTo(-12); }); + it('keeps the visible canvas center fixed when zooming with the toolbar', () => { + const instance = createInstance(); + instance.canvas = document.createElement('div'); + instance.canvas.scrollLeft = 40; + instance.canvas.scrollTop = 20; + instance.canvas.getBoundingClientRect = () => ({ width: 200, height: 100 }); + instance.zoom = 1; + instance.minZoom = 0.25; + instance.maxZoom = 2; + instance.panX = 0; + instance.panY = 0; + instance.applyTransform = vi.fn(); + instance.updateZoomIndicator = vi.fn(); + + instance.setZoom(1.5); + + expect(instance.panX).toBe(-70); + expect(instance.panY).toBe(-35); + }); + it('allows only same-origin form links and keeps URL text inside href', () => { const instance = createInstance(); const renderLink = url => { @@ -63,6 +83,25 @@ describe('workflow builder review fixes', () => { expect(injected.hasAttribute('onmouseover')).toBe(false); }); + it('sanitizes form links shown inside graph nodes', () => { + const instance = createInstance(); + const wrapper = document.createElement('div'); + wrapper.innerHTML = instance.getNodeDescription({ + type: 'form', + data: { field_count: 1, form_builder_url: '/admin/forms/?q=" onmouseover="alert(1)' }, + }); + const link = wrapper.querySelector('a'); + expect(link.hasAttribute('onmouseover')).toBe(false); + expect(link.getAttribute('href')).toContain('/admin/forms/'); + expect(link.getAttribute('rel')).toBe('noopener noreferrer'); + + wrapper.innerHTML = instance.getNodeDescription({ + type: 'form', + data: { field_count: 1, form_builder_url: 'javascript:alert(1)' }, + }); + expect(wrapper.querySelector('a').getAttribute('href')).toBe('#'); + }); + it('moves the selected role when a group appears in two roles', () => { const instance = createInstance(); const node = {