871650053c
* Fixed bug with templates not being inserted for comments. * Removed some trailing white space from a heading. * Added custom Cypress command to create an article. * Added E2E tests for creating comments on an article. * Fixed adding a comment issue caused by mention auto-complete. * Fixed a selector for the E2E tests. * Removed some unnecessary white space and also making code climate happy. * Updated E2E test. * Added a bit more to the E2E tests. * Now validation for comment doesn't need to loop through textareas. * Merge remote-tracking branch 'origin/master' into nickytonline/fix-comment-template-insertion-bug * Removed a similar spec file and added tests to the other file. * wip * Fixed bug where a response template could not be submitted. * Added/updated E2E tests. * Reverted a small change to condition for showing the combobox popover. * Undoing some white space changes as not related to PR. * Trigger Build * Put back article seed data as it's used in tests outside of comment tests.
36 lines
1.6 KiB
Text
36 lines
1.6 KiB
Text
<% cache("whole-comment-area-#{@article.id}-#{@article.last_comment_at}-#{@article.show_comments}", expires_in: 2.hours) do %>
|
|
<section id="comments" data-updated-at="<%= Time.current %>" class="text-padding mb-4 border-t-1 border-0 border-solid border-base-10">
|
|
<% if @article.show_comments %>
|
|
<header class="relative flex justify-between items-center mb-6">
|
|
<h2 class="crayons-subtitle-1">Discussion <span class="js-comments-count" data-comments-count="<%= @article.comments_count %>">(<%= @article.comments_count %>)</span></h2>
|
|
<div id="comment-subscription">
|
|
<div role="presentation" class="crayons-btn-group">
|
|
<span class="crayons-btn crayons-btn--outlined">Subscribe</span>
|
|
</div>
|
|
</div>
|
|
</header>
|
|
|
|
<div
|
|
id="comments-container"
|
|
data-testid="comments-container"
|
|
data-commentable-id="<%= @article.id %>"
|
|
data-commentable-type="Article"
|
|
data-has-recent-comment-activity="<%= @article.has_recent_comment_activity? %>">
|
|
<%= render "/comments/form", commentable: @article, commentable_type: "Article" %>
|
|
|
|
<div class="comments" id="comment-trees-container">
|
|
<% if @article.comments_count > 0 %>
|
|
<% Comment.tree_for(@article, @comments_to_show_count).each do |comment, sub_comments| %>
|
|
<% cache ["comment_root_cached_tree", comment] do %>
|
|
<%= tree_for(comment, sub_comments, @article) %>
|
|
<% end %>
|
|
<% end %>
|
|
<% end %>
|
|
</div>
|
|
</div>
|
|
|
|
<%= render "articles/comments_actions" %>
|
|
<% end %>
|
|
</section>
|
|
<% end %>
|
|
<% return if @warm_only %>
|