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 deee292..7214858 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 @@ -159,9 +159,9 @@ export class WorkflowBuilder { this.canvas.addEventListener('wheel', (e) => { e.preventDefault(); const rect = this.canvas.getBoundingClientRect(); - // Cursor position relative to canvas element - const cx = e.clientX - rect.left; - const cy = e.clientY - rect.top; + // Cursor position in canvas space (include scroll offsets) + const cx = e.clientX - rect.left + this.canvas.scrollLeft; + const cy = e.clientY - rect.top + this.canvas.scrollTop; const oldZoom = this.zoom; const delta = e.deltaY > 0 ? -0.1 : 0.1; @@ -849,6 +849,7 @@ export class WorkflowBuilder { node.id, Number(button.dataset.stageGroupId), Number(button.dataset.stageGroupDirection), + button.dataset.stageGroupRole, ); }); }); @@ -1147,11 +1148,11 @@ export class WorkflowBuilder {
@@ -1680,9 +1681,11 @@ export class WorkflowBuilder { `; } + const safeFormBuilderUrl = this.sanitizeFormBuilderUrl(data.form_builder_url); + html += `
- + Edit Form in Form Builder
@@ -1691,6 +1694,26 @@ export class WorkflowBuilder { return html; } + sanitizeFormBuilderUrl(url) { + if (!url || typeof url !== 'string') { + return '#'; + } + + try { + const parsed = new URL(url, window.location.origin); + const isHttp = parsed.protocol === 'http:' || parsed.protocol === 'https:'; + const isSameOrigin = parsed.origin === window.location.origin; + + if (!isHttp || !isSameOrigin) { + return '#'; + } + + return `${parsed.pathname}${parsed.search}${parsed.hash}`; + } catch (e) { + return '#'; + } + } + buildApprovalProperties(node) { const data = node.data || {}; let html = ` @@ -2146,12 +2169,14 @@ export class WorkflowBuilder { }); } - moveStageApprovalGroup(nodeId, groupId, direction) { + moveStageApprovalGroup(nodeId, groupId, direction, groupRole = null) { const node = this.nodes.find(n => n.id === nodeId); if (!node) return; const groups = this.getNormalizedStageApprovalGroups(node.data.approval_groups || []); - const currentIndex = groups.findIndex(group => group.id === groupId); + const currentIndex = groups.findIndex(group => ( + group.id === groupId && (groupRole === null || group.role === groupRole) + )); const targetIndex = currentIndex + direction; if (currentIndex < 0 || targetIndex < 0 || targetIndex >= groups.length) { return; diff --git a/tests_js/workflow-builder/review246.test.js b/tests_js/workflow-builder/review246.test.js new file mode 100644 index 0000000..a8855f1 --- /dev/null +++ b/tests_js/workflow-builder/review246.test.js @@ -0,0 +1,87 @@ +import { beforeEach, describe, expect, it, vi } from 'vitest'; +import { WorkflowBuilder } from '../../django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js'; +import { createWorkflowBuilderStore } from '../../django_forms_workflows/static/django_forms_workflows/js/workflow-builder-store.js'; + +function createInstance() { + const instance = Object.create(WorkflowBuilder.prototype); + instance.store = createWorkflowBuilderStore(); + instance.fields = []; + instance.groups = []; + instance.forms = []; + instance.validationState = { nodeIssues: {} }; + instance.render = vi.fn(); + instance.selectNode = vi.fn(); + return instance; +} + +beforeEach(() => { + document.body.innerHTML = '
'; +}); + +describe('workflow builder review fixes', () => { + it('keeps a scrolled canvas cursor fixed while zooming', () => { + document.body.innerHTML = '
'; + const instance = createInstance(); + instance.zoom = 1; + instance.minZoom = 0.25; + instance.maxZoom = 2; + instance.panX = 0; + instance.panY = 0; + instance.updateWorkspaceBounds = vi.fn(); + instance.applyTransform = vi.fn(); + instance.updateZoomIndicator = vi.fn(); + instance.setupCanvas(); + instance.canvas.scrollLeft = 40; + instance.canvas.scrollTop = 20; + instance.canvas.getBoundingClientRect = () => ({ left: 100, top: 50 }); + + instance.canvas.dispatchEvent(new WheelEvent('wheel', { + bubbles: true, + cancelable: true, + clientX: 200, + clientY: 150, + deltaY: -1, + })); + + expect(instance.zoom).toBeCloseTo(1.1); + expect(instance.panX).toBeCloseTo(-14); + expect(instance.panY).toBeCloseTo(-12); + }); + + it('allows only same-origin form links and keeps URL text inside href', () => { + const instance = createInstance(); + const renderLink = url => { + const wrapper = document.createElement('div'); + wrapper.innerHTML = instance.buildFormProperties({ data: { form_builder_url: url } }); + return wrapper.querySelector('a'); + }; + + expect(renderLink('javascript:alert(1)').getAttribute('href')).toBe('#'); + expect(renderLink('https://example.com/edit').getAttribute('href')).toBe('#'); + expect(renderLink('/admin/forms/1/edit/').getAttribute('href')).toBe('/admin/forms/1/edit/'); + const injected = renderLink('/admin/forms/?q=" onmouseover="alert(1)'); + expect(injected.hasAttribute('onmouseover')).toBe(false); + }); + + it('moves the selected role when a group appears in two roles', () => { + const instance = createInstance(); + const node = { + id: 'stage_1', + type: 'stage', + data: { + name: 'Review', + approval_groups: [ + { id: 1, name: 'Reviewers', role: 'approval', position: 0 }, + { id: 1, name: 'Reviewers', role: 'validation', position: 1 }, + ], + }, + }; + instance.nodes = [node]; + instance.groups = [{ id: 1, name: 'Reviewers' }]; + + instance.showNodeProperties(node); + document.querySelector('[data-stage-group-role="validation"][data-stage-group-direction="-1"]').click(); + + expect(node.data.approval_groups.map(group => group.role)).toEqual(['validation', 'approval']); + }); +});