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

[deploy] Optimization: Remove Comment Count From Aysnc user_data (#8174)

Browse source
This commit is contained in:
Molly Struve 2020-06-01 10:38:57 -05:00 • committed by GitHub
parent 23d7fa6ac1
commit 38634e5316
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/assets/javascripts/initializers/initializeCommentsPage.js.erb
View file

@ -154,9 +154,8 @@ function toggleCodeOfConduct() {
return;
}
var codeOfConduct = user.checked_code_of_conduct
var commentCount = user.number_of_comments
var checkboxWrapper = document.getElementById('toggle-code-of-conduct-checkbox');
if (checkboxWrapper && !codeOfConduct && commentCount < 1) {
if (checkboxWrapper && !codeOfConduct) {
checkboxWrapper.innerHTML = '<input type="checkbox" name="checked_code_of_conduct" class="checkbox" required/>\
<label for="checked_code_of_conduct">I\'ve read the <a href="<%= URL.url('code-of-conduct') %>">code of conduct</a></label>'
}
@ -298,18 +297,8 @@ function handleSubmit(event) {
return;
}
var commentCount = user.number_of_comments;
// var codeOfConduct = user.checked_code_of_conduct;
// Code of conduct is false the first time even if the user has accepted it
// so we are not using it in the check below
// It also seems unnecessary if comment count >= 1 indicates that
// it was previously accepted
// Ensure that user has commented at least once
// and we have a non-empty comment to post
if (commentCount >= 1 &&
event.target.value.trim() !== '') {
var codeOfConduct = user.checked_code_of_conduct;
if (codeOfConduct && event.target.value.trim() !== '') {
// get a reference to the submit button for the text area (first level comment vs. reply comment)
var parentFormId = event.target.parentElement.parentElement.id || event.target.parentElement.id;
var submitButton = document.querySelector('#' + parentFormId + ' input[type="submit"].comment-action-button');

2
app/controllers/async_info_controller.rb
View file

@ -52,7 +52,6 @@ class AsyncInfoController < ApplicationController
saw_onboarding: @user.saw_onboarding,
checked_code_of_conduct: @user.checked_code_of_conduct,
checked_terms_and_conditions: @user.checked_terms_and_conditions,
number_of_comments: @user.comments.count,
display_sponsors: @user.display_sponsors,
trusted: @user.trusted,
moderator_for_tags: @user.moderator_for_tags,
@ -69,7 +68,6 @@ class AsyncInfoController < ApplicationController
#{current_user&.last_followed_at}__
#{current_user&.updated_at}__
#{current_user&.reactions_count}__
#{current_user&.comments_count}__
#{current_user&.saw_onboarding}__
#{current_user&.checked_code_of_conduct}__
#{current_user&.articles_count}__

1
app/javascript/chat/__tests__/util.test.js
View file

@ -85,7 +85,6 @@ describe('Chat utilities', () => {
reading_list_ids: [48, 49, 34, 51, 64, 56],
saw_onboarding: true,
checked_code_of_conduct: false,
number_of_comments: 0,
display_sponsors: true,
trusted: false,
};