maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only render comment sorting for signed-in users (#20398)

Browse source
This commit is contained in:
Ben Halpern 2023-11-28 10:54:06 -05:00 • committed by GitHub
parent 347fd6d112
commit 88769c6a3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
app/views/articles/_full_comment_area.html.erb
View file

@ -7,31 +7,35 @@
<%= t("views.articles.comments.subtitle.#{@comments_order}_html",
num: tag.span(t("views.articles.comments.num", num: @article.comments_count), class: "js-comments-count", data: { comments_count: @article.comments_count })) %>
</h2>
<button class="c-btn c-btn--ghost crayons-btn--icon-left" id="toggle-comments-sort-dropdown" aria-controls="comments-sort-dropdown-container" aria-expanded="false" aria-label="<%= t("views.articles.comments.sort_button.aria_label") %>" aria-haspopup="true">
<%= inline_svg_tag("expand.svg", aria_hidden: true, title: t("views.moderations.actions.admin.icon"), class: "mt-2") %>
</button>
<% if user_signed_in? %>
<button class="c-btn c-btn--ghost crayons-btn--icon-left" id="toggle-comments-sort-dropdown" aria-controls="comments-sort-dropdown-container" aria-expanded="false" aria-label="<%= t("views.articles.comments.sort_button.aria_label") %>" aria-haspopup="true">
<%= inline_svg_tag("expand.svg", aria_hidden: true, title: t("views.moderations.actions.admin.icon"), class: "mt-2") %>
</button>
<% end %>
</div>
<nav class="crayons-dropdown p-4" id="comments-sort-dropdown-container" aria-labelledby="comments-sort-title">
<h3 id="comments-sort-title" class="mb-3"><%= t("views.articles.comments.sort.heading") %></h3>
<ul class="comments-sort-dropdown__list">
<%= render "comments/sort_option",
sort_order: "top",
sort_title: t("views.articles.comments.sort.title.top"),
sort_description: t("views.articles.comments.sort.desc.top"),
show_selected: @comments_order == "top" %>
<%= render "comments/sort_option",
sort_order: "latest",
sort_title: t("views.articles.comments.sort.title.latest"),
sort_description: t("views.articles.comments.sort.desc.latest"),
show_selected: @comments_order == "latest" %>
<%= render "comments/sort_option",
sort_order: "oldest",
sort_title: t("views.articles.comments.sort.title.oldest"),
sort_description: t("views.articles.comments.sort.desc.oldest"),
show_selected: @comments_order == "oldest" %>
</ul>
</nav>
<% if user_signed_in? %>
<nav class="crayons-dropdown p-4" id="comments-sort-dropdown-container" aria-labelledby="comments-sort-title">
<h3 id="comments-sort-title" class="mb-3"><%= t("views.articles.comments.sort.heading") %></h3>
<ul class="comments-sort-dropdown__list">
<%= render "comments/sort_option",
sort_order: "top",
sort_title: t("views.articles.comments.sort.title.top"),
sort_description: t("views.articles.comments.sort.desc.top"),
show_selected: @comments_order == "top" %>
<%= render "comments/sort_option",
sort_order: "latest",
sort_title: t("views.articles.comments.sort.title.latest"),
sort_description: t("views.articles.comments.sort.desc.latest"),
show_selected: @comments_order == "latest" %>
<%= render "comments/sort_option",
sort_order: "oldest",
sort_title: t("views.articles.comments.sort.title.oldest"),
sort_description: t("views.articles.comments.sort.desc.oldest"),
show_selected: @comments_order == "oldest" %>
</ul>
</nav>
<% end %>
<div id="comment-subscription" class="print-hidden">
<div class="crayons-btn-group">

8
spec/requests/articles/articles_show_spec.rb
View file

@ -139,6 +139,10 @@ RSpec.describe "ArticlesShow" do
it "does not render json ld" do
expect(response.body).not_to include "application/ld+json"
end
it "renders comment sort button" do
expect(response.body).to include "toggle-comments-sort-dropdown"
end
end
end
@ -151,6 +155,10 @@ RSpec.describe "ArticlesShow" do
it "does not render json ld" do
expect(response.body).to include "application/ld+json"
end
it "does not render comment sort button" do
expect(response.body).not_to include "toggle-comments-sort-dropdown"
end
end
end