From 682933f37b5bf4a1ba7bc2d326e48e13ae084e75 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Wed, 23 Jul 2025 03:04:40 +0300 Subject: [PATCH 1/5] fixed server error when attempting to create threads failing validation --- app/controllers/comments_controller.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index de2bfede1..d6435ab44 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -32,8 +32,12 @@ def create_thread pings = check_for_pings @comment_thread, body success = ActiveRecord::Base.transaction do - @comment_thread.save! - @comment.save! + thread_success = @comment_thread.save + comment_success = @comment.save + + unless thread_success && comment_success + raise ActiveRecord::Rollback + end end if success From cebb33e22f1174ab258c083670f2013a8d9c0f8b Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Wed, 23 Jul 2025 03:22:17 +0300 Subject: [PATCH 2/5] moved new thread modal's char limits to the view's variables section --- app/views/comments/_new_thread_modal.html.erb | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/views/comments/_new_thread_modal.html.erb b/app/views/comments/_new_thread_modal.html.erb index 8ea24575f..4c450c1f6 100644 --- a/app/views/comments/_new_thread_modal.html.erb +++ b/app/views/comments/_new_thread_modal.html.erb @@ -2,6 +2,12 @@ Start new comment thread dialog. %> +<% + # TODO: make configurable + min_chars = 15 + max_chars = 1000 +%> +
Start a new comment thread @@ -18,9 +24,13 @@ <%= label_tag :body, 'Your comment', class: 'form-element' %>
Start the thread with a comment.
- <%= text_area_tag :body, '', class: 'form-element js-comment-field', required: true, - data: { post: post.id, thread: '-1', character_count: ".js-character-count-#{post.id}" } %> - <%= render 'shared/char_count', type: post.id, min: 15, max: 1000 %> + <%= text_area_tag :body, '', + class: 'form-element js-comment-field', + required: true, + data: { post: post.id, + thread: '-1', + character_count: ".js-character-count-#{post.id}" } %> + <%= render 'shared/char_count', type: post.id, min: min_chars, max: max_chars %> <%= label_tag :title, 'Comment thread title (optional)', class: 'form-element' %> From 2ebf34106e5418ed48084e1ce0528deb2380b0e4 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Wed, 23 Jul 2025 03:36:58 +0300 Subject: [PATCH 3/5] ensured comment thread textarea is properly validated for max/min constraints --- app/views/comments/_new_thread_modal.html.erb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/comments/_new_thread_modal.html.erb b/app/views/comments/_new_thread_modal.html.erb index 4c450c1f6..360a81148 100644 --- a/app/views/comments/_new_thread_modal.html.erb +++ b/app/views/comments/_new_thread_modal.html.erb @@ -24,8 +24,10 @@ <%= label_tag :body, 'Your comment', class: 'form-element' %>
Start the thread with a comment.
- <%= text_area_tag :body, '', - class: 'form-element js-comment-field', + <%= text_area_tag :body, '', + class: 'form-element js-comment-field', + minlength: min_chars, + maxlength: max_chars, required: true, data: { post: post.id, thread: '-1', From 670de3e02b4d628e5fba393bcfabd2bb67044c03 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Wed, 23 Jul 2025 03:37:30 +0300 Subject: [PATCH 4/5] fixed logic of character_count listener for changes --- app/assets/javascripts/character_count.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/character_count.js b/app/assets/javascripts/character_count.js index 2c4bcf190..a0f856ea6 100644 --- a/app/assets/javascripts/character_count.js +++ b/app/assets/javascripts/character_count.js @@ -58,7 +58,8 @@ $(() => { $(document).on('keyup change paste', '[data-character-count]', (ev) => { const $tgt = $(ev.target); const $counter = $($tgt.attr('data-character-count')); - const $button = $counter.parents('form').find('input[type="submit"],.js-suggested-edit-approve'); + const $form = $counter.parents('form'); + const $button = $form.find('input[type="submit"],.js-suggested-edit-approve'); const $count = $counter.find('.js-character-count__count'); const $icon = $counter.find('.js-character-count__icon'); @@ -76,19 +77,24 @@ $(() => { if (gtnMax || ltnMin) { setCounterState($counter, 'error'); setCounterIcon($icon, 'fa-times'); - setSubmitButtonDisabledState($button, 'disabled'); setInputValidationState($tgt, 'invalid'); } else if (gteThreshold) { setCounterState($counter, 'warning'); setCounterIcon($icon, 'fa-exclamation-circle'); - setSubmitButtonDisabledState($button, 'enabled'); } else { setCounterState($counter, 'default'); setCounterIcon($icon, 'fa-check'); - setSubmitButtonDisabledState($button, 'enabled'); setInputValidationState($tgt, 'valid'); } + const submittable = $form[0]?.checkValidity() ?? false; + + if (!submittable || gtnMax || ltnMin) { + setSubmitButtonDisabledState($button, 'disabled'); + } else { + setSubmitButtonDisabledState($button, 'enabled'); + } + $count.text(text); }); From 84446c61d2f903147802cb3a7062ffb4c0118f58 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Wed, 23 Jul 2025 04:04:20 +0300 Subject: [PATCH 5/5] that's not how composite transactions work either... (fixed create_thread) --- app/controllers/comments_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index d6435ab44..9e2e4131b 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -34,10 +34,13 @@ def create_thread success = ActiveRecord::Base.transaction do thread_success = @comment_thread.save comment_success = @comment.save + full_success = thread_success && comment_success - unless thread_success && comment_success + unless full_success raise ActiveRecord::Rollback end + + full_success end if success