diff --git a/app/assets/javascripts/comments.js b/app/assets/javascripts/comments.js index 05229bce5..73cd64218 100644 --- a/app/assets/javascripts/comments.js +++ b/app/assets/javascripts/comments.js @@ -14,6 +14,9 @@ $(this).text(new_val); }); }, + update_responses_count: function(comment_id, responses_count_html) { + $(comment_id + "_reply .responses-count").html(responses_count_html); + }, display_error: function(field_with_errors, error_html) { $(error_html).insertAfter($("" + field_with_errors)); }, diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb index 382555b62..545b379b4 100644 --- a/app/views/comments/_comment.html.erb +++ b/app/views/comments/_comment.html.erb @@ -85,15 +85,9 @@ <% end %> - <% if comment.children.size > 0 %> - <%= link_to "", class: "js-toggle-children relative" do %> - - - <%= t("comments.comment.responses_collapse", count: comment.children.size) %> - <% end %> - <% else %> - <%= t("comments.comment.responses", count: 0) %> - <% end %> + + <%= render "comments/responses_count", count: comment.children.size %> + <% if user_signed_in? && !comments_closed_for_commentable?(comment.commentable) && !require_verified_resident_for_commentable?(comment.commentable, current_user) %>  |  diff --git a/app/views/comments/_responses_count.html.erb b/app/views/comments/_responses_count.html.erb new file mode 100644 index 000000000..62b4103ac --- /dev/null +++ b/app/views/comments/_responses_count.html.erb @@ -0,0 +1,9 @@ +<% if count > 0 %> + <%= link_to "", class: "js-toggle-children relative" do %> + + + <%= t("comments.comment.responses_collapse", count: count) %> + <% end %> +<% else %> + <%= t("comments.comment.responses", count: 0) %> +<% end %> diff --git a/app/views/comments/create.js.erb b/app/views/comments/create.js.erb index 1492140f0..a57b91126 100644 --- a/app/views/comments/create.js.erb +++ b/app/views/comments/create.js.erb @@ -2,6 +2,8 @@ var parent_id = ""; <% else -%> var parent_id = "#" + "<%= "comment_#{@comment.parent_id}" %>"; + var responses_count_html = "<%= j(render "comments/responses_count", count: @comment.parent.children.size) %>" + App.Comments.update_responses_count(parent_id, responses_count_html); <% end -%> App.Comments.reset_form(parent_id); diff --git a/spec/system/comments/budget_investments_spec.rb b/spec/system/comments/budget_investments_spec.rb index 7364c4698..e268004d0 100644 --- a/spec/system/comments/budget_investments_spec.rb +++ b/spec/system/comments/budget_investments_spec.rb @@ -242,6 +242,21 @@ describe "Commenting Budget::Investments" do expect(page).not_to have_selector("#js-comment-form-comment_#{comment.id}", visible: true) end + scenario "Reply update parent comment responses count", :js do + comment = create(:comment, commentable: investment) + + login_as(create(:user)) + visit budget_investment_path(investment.budget, investment) + + within ".comment", text: comment.body do + click_link "Reply" + fill_in "Leave your comment", with: "It will be done next week." + click_button "Publish reply" + + expect(page).to have_content("1 response (collapse)") + end + end + scenario "Errors on reply", :js do comment = create(:comment, commentable: investment, user: user) diff --git a/spec/system/comments/budget_investments_valuation_spec.rb b/spec/system/comments/budget_investments_valuation_spec.rb index c4d3c7990..bf605a928 100644 --- a/spec/system/comments/budget_investments_valuation_spec.rb +++ b/spec/system/comments/budget_investments_valuation_spec.rb @@ -216,6 +216,21 @@ describe "Internal valuation comments on Budget::Investments" do expect(page).not_to have_content("It will be done next week.") end + scenario "Reply update parent comment responses count", :js do + comment = create(:comment, :valuation, author: admin_user, commentable: investment) + + login_as(valuator_user) + visit valuation_budget_budget_investment_path(budget, investment) + + within ".comment", text: comment.body do + click_link "Reply" + fill_in "Leave your comment", with: "It will be done next week." + click_button "Publish reply" + + expect(page).to have_content("1 response (collapse)") + end + end + scenario "Errors on reply without comment text", :js do comment = create(:comment, :valuation, author: admin_user, commentable: investment) diff --git a/spec/system/comments/debates_spec.rb b/spec/system/comments/debates_spec.rb index 2b8bbc3e8..963a74e54 100644 --- a/spec/system/comments/debates_spec.rb +++ b/spec/system/comments/debates_spec.rb @@ -281,6 +281,21 @@ describe "Commenting debates" do end end + scenario "Reply update parent comment responses count", :js do + comment = create(:comment, commentable: debate) + + login_as(create(:user)) + visit debate_path(debate) + + within ".comment", text: comment.body do + click_link "Reply" + fill_in "Leave your comment", with: "It will be done next week." + click_button "Publish reply" + + expect(page).to have_content("1 response (collapse)") + end + end + scenario "Errors on reply", :js do comment = create(:comment, commentable: debate, user: user) diff --git a/spec/system/comments/legislation_annotations_spec.rb b/spec/system/comments/legislation_annotations_spec.rb index bb1788660..7060fd3ad 100644 --- a/spec/system/comments/legislation_annotations_spec.rb +++ b/spec/system/comments/legislation_annotations_spec.rb @@ -278,6 +278,25 @@ describe "Commenting legislation questions" do expect(page).not_to have_selector("#js-comment-form-comment_#{comment.id}", visible: true) end + scenario "Reply update parent comment responses count", :js do + manuela = create(:user, :level_two, username: "Manuela") + legislation_annotation = create(:legislation_annotation) + comment = legislation_annotation.comments.first + + login_as(manuela) + visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, + legislation_annotation.draft_version, + legislation_annotation) + + within ".comment", text: comment.body do + click_link "Reply" + fill_in "Leave your comment", with: "It will be done next week." + click_button "Publish reply" + + expect(page).to have_content("1 response (collapse)") + end + end + scenario "Errors on reply", :js do comment = legislation_annotation.comments.first diff --git a/spec/system/comments/legislation_questions_spec.rb b/spec/system/comments/legislation_questions_spec.rb index 87167555f..f7a10b02a 100644 --- a/spec/system/comments/legislation_questions_spec.rb +++ b/spec/system/comments/legislation_questions_spec.rb @@ -260,6 +260,22 @@ describe "Commenting legislation questions" do expect(page).not_to have_selector("#js-comment-form-comment_#{comment.id}", visible: true) end + scenario "Reply update parent comment responses count", :js do + manuela = create(:user, :level_two, username: "Manuela") + comment = create(:comment, commentable: legislation_question) + + login_as(manuela) + visit legislation_process_question_path(legislation_question.process, legislation_question) + + within ".comment", text: comment.body do + click_link "Reply" + fill_in "Leave your answer", with: "It will be done next week." + click_button "Publish reply" + + expect(page).to have_content("1 response (collapse)") + end + end + scenario "Errors on reply", :js do comment = create(:comment, commentable: legislation_question, user: user) diff --git a/spec/system/comments/polls_spec.rb b/spec/system/comments/polls_spec.rb index 298e8cb1f..745c8a3be 100644 --- a/spec/system/comments/polls_spec.rb +++ b/spec/system/comments/polls_spec.rb @@ -240,6 +240,21 @@ describe "Commenting polls" do expect(page).not_to have_selector("#js-comment-form-comment_#{comment.id}", visible: true) end + scenario "Reply update parent comment responses count", :js do + comment = create(:comment, commentable: poll) + + login_as(create(:user)) + visit poll_path(poll) + + within ".comment", text: comment.body do + click_link "Reply" + fill_in "Leave your comment", with: "It will be done next week." + click_button "Publish reply" + + expect(page).to have_content("1 response (collapse)") + end + end + scenario "Errors on reply", :js do comment = create(:comment, commentable: poll, user: user) diff --git a/spec/system/comments/proposals_spec.rb b/spec/system/comments/proposals_spec.rb index d23aad2b4..1f1e5a38b 100644 --- a/spec/system/comments/proposals_spec.rb +++ b/spec/system/comments/proposals_spec.rb @@ -238,6 +238,21 @@ describe "Commenting proposals" do expect(page).not_to have_selector("#js-comment-form-comment_#{comment.id}", visible: true) end + scenario "Reply update parent comment responses count", :js do + comment = create(:comment, commentable: proposal) + + login_as(create(:user)) + visit proposal_path(proposal) + + within ".comment", text: comment.body do + click_link "Reply" + fill_in "Leave your comment", with: "It will be done next week." + click_button "Publish reply" + + expect(page).to have_content("1 response (collapse)") + end + end + scenario "Errors on reply", :js do comment = create(:comment, commentable: proposal, user: user) diff --git a/spec/system/comments/topics_spec.rb b/spec/system/comments/topics_spec.rb index a00698047..5001927c2 100644 --- a/spec/system/comments/topics_spec.rb +++ b/spec/system/comments/topics_spec.rb @@ -264,6 +264,23 @@ describe "Commenting topics from proposals" do expect(page).not_to have_selector("#js-comment-form-comment_#{comment.id}", visible: true) end + scenario "Reply update parent comment responses count", :js do + community = proposal.community + topic = create(:topic, community: community) + comment = create(:comment, commentable: topic) + + login_as(create(:user)) + visit community_topic_path(community, topic) + + within ".comment", text: comment.body do + click_link "Reply" + fill_in "Leave your comment", with: "It will be done next week." + click_button "Publish reply" + + expect(page).to have_content("1 response (collapse)") + end + end + scenario "Errors on reply", :js do community = proposal.community topic = create(:topic, community: community)