Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions django_forms_workflows/workflow_builder_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ def _collect_visual_workflow_errors(workflow_data, form_definition, workflow=Non
field_names = {field["field_name"] for field in field_records}
field_ids = {field["id"] for field in field_records}
field_name_to_id = {
field["field_name"].strip().lower(): field["id"] for field in field_records
field["field_name"].strip(): field["id"] for field in field_records
}
group_ids = set(Group.objects.values_list("id", flat=True))
existing_stage_ids = (
Expand Down Expand Up @@ -541,9 +541,7 @@ def is_valid_field_name(value):
if key_type == "id":
canonical_field_id = key_value
else:
canonical_field_id = field_name_to_id.get(
str(key_value).strip().lower()
)
canonical_field_id = field_name_to_id.get(str(key_value).strip())

if not canonical_field_id:
continue
Expand Down Expand Up @@ -2814,9 +2812,11 @@ def save_action(node_data, action_name, action_data):

data = node.get("data", {})
action_name = data.get("name", "Email Notification")
normalized_action_name = (
action_name.strip() if isinstance(action_name, str) else action_name
)
if not isinstance(action_name, str):
raise ValidationError("Email action name must be a string.")
normalized_action_name = action_name.strip()
if not normalized_action_name:
raise ValidationError("Email action name cannot be blank.")
generated_description = (
f"Email to: {data.get('email_to', '') or data.get('email_to_field', '')}, "
f"Subject: {data.get('email_subject_template', '')}"
Expand Down
24 changes: 23 additions & 1 deletion tests/test_builders.py
Original file line number Diff line number Diff line change
Expand Up @@ -2176,6 +2176,23 @@ def test_legacy_email_node_preserves_description_by_name(
assert action.name == "Notice"
assert form_definition.post_actions.count() == 1

@pytest.mark.parametrize("node_name", [None, 7, [], "", " "])
def test_rejects_invalid_email_action_name(self, form_definition, node_name):
visual = self._make_visual()
visual["nodes"].insert(
1,
{
"type": "email",
"data": {"name": node_name, "email_to": "recipient@example.com"},
},
)

with pytest.raises(ValidationError, match="Email action name"):
convert_visual_to_workflow(visual, form_definition)

assert not form_definition.post_actions.exists()
assert not form_definition.workflows.exists()

def test_action_id_from_another_form_is_rejected(self, form_definition):
other_form = FormDefinition.objects.create(name="Other", slug="other")
foreign_action = PostSubmissionAction.objects.create(
Expand Down Expand Up @@ -2804,10 +2821,15 @@ def test_save_assigns_stage_approval_fields(
assert email_field.workflow_stage_id == stage.id
assert notes_field.workflow_stage_id == stage.id

@pytest.mark.parametrize("field_name", ["notes", "Notes"])
def test_save_rejects_duplicate_stage_approval_fields(
self, client, superuser, form_with_fields, approval_group
self, client, superuser, form_with_fields, approval_group, field_name
):
notes_field = form_with_fields.fields.get(field_name="notes")
if field_name != notes_field.field_name:
form_with_fields.fields.filter(pk=notes_field.pk).update(
field_name=field_name
)
notes_field.refresh_from_db()
initial_notes_workflow_stage_id = notes_field.workflow_stage_id
initial_workflow_count = WorkflowDefinition.objects.count()
Expand Down
Loading