Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix tagging user profiles and add JS ajax function #6886

Merged
merged 3 commits into from
Dec 2, 2019
Merged

Fix tagging user profiles and add JS ajax function #6886

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e885446
add correct url to user tag form and add test for adding user tag wit…
nstjean Dec 2, 2019
f1f14fb
fix styling of delete button on badges in tags
nstjean Dec 2, 2019
0687935
uncomment tests
nstjean Dec 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/javascripts/tagging.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function initTagForm(deletion_path, selector) {
var tag_id = tag[1];
$('.tags-list:first').append("<p id='tag_"+tag_id+"' class='badge badge-primary'> \
<a class='tag-name' style='color:white;' href='/tag/"+tag_name+"'>"+tag_name+"</a> <a class='tag-delete' \
data-remote='true' href='"+deletion_path+"/"+tag_id+"' style='color:white' data-tag-id='"+tag_id+"' \
data-remote='true' href='"+deletion_path+"/"+tag_id+"' data-tag-id='"+tag_id+"' \
data-method='delete'><i class='fa fa-times-circle fa-white blue pl-1' aria-hidden='true' ></i></a></p> ")
el.find('.tag-input').val("")
el.find('.control-group').removeClass('has-error')
Expand Down
13 changes: 13 additions & 0 deletions app/assets/stylesheets/tags.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,16 @@
.popover-content {
padding: 9px 14px;
}

.tags-list .badge a {
color: white;
}

.tags-list .badge i {
margin-left: 0;
}

.tags-list i:hover{
transition-duration: .2s;
transform: scale(1.2);
}
2 changes: 1 addition & 1 deletion app/views/tag/_tagging.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ $(function () {
<span style="float:left;color:#666;margin-top:14px;margin-left:5px;">Add tags</a>
<% end %>

<%= render partial: 'tag/form', locals: { node: @node ||= nil, user: user ||= nil } %>
<%= render partial: 'tag/form', locals: { node: @node ||= nil, user: user ||= nil, url: url ||= nil } %>

<% end %>

Expand Down
28 changes: 16 additions & 12 deletions app/views/tag/_tags.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<a class="show-more-tags" href="javascript:void(0);"><p style="float:left; color:#666; margin-top:14px; margin-left:5px;"><u><%= tags.length - 2 %> more</u> &nbsp </p></a>
<% end %>

<p class="badge <%= badge_name %> pop more-tags" style="display:none;cursor:pointer;margin-bottom:3px;" id="tag_<%= tag.tid %>" data-toggle="popover" data-trigger="focus" data-count=0 data-placement="top" data-content="<p style='text-align:center;'><a href='/tag/<%= tag.name %>'><%= Tag.tagged_node_count(tag.name) || 0 %> notes</a> - <a href='/contributors/<%= tag.name %>'><%= Tag.contributors(tag.name).count %> people <br></a></p> <p style='text-align:center;font-size:12px;'><%if tag.description %><%= tag.description %> |<% end %> created by <a href='/profile/<%= tag.try(:author).try(:username) %>'><%= tag.try(:author).try(:username) %></a> <%= time_ago_in_words(Time.at(tag.date)) %> ago </p><div style='text-align:center;' class='text-center'><a href='/subscribe/tag/<%= tag.name %>' class='btn btn-primary'>Follow</a></div>" data-html="true" title="<%= tag.name %>">
<%= tag.name %>
<p class="badge <%= badge_name %> pop more-tags" style="display:none;cursor:pointer;margin-bottom:3px;" id="tag_<%= tag.tid %>" data-toggle="popover" data-trigger="focus" data-count=0 data-placement="top" data-content="<p style='text-align:center;'><a href='/tag/<%= tag.name %>'><%= Tag.tagged_node_count(tag.name) || 0 %> notes</a> - <a href='/contributors/<%= tag.name %>'><%= Tag.contributors(tag.name).count %> people <br></a></p> <p style='text-align:center;font-size:12px;'><%if tag.description %><%= tag.description %> |<% end %> created by <a href='/profile/<%= tag.try(:author).try(:username) %>'><%= tag.try(:author).try(:username) %></a> <%= time_ago_in_words(Time.at(tag.date)) %> ago </p><div class='text-center'><a href='/subscribe/tag/<%= tag.name %>' class='btn btn-primary'>Follow</a></div>" data-html="true" title="<%= tag.name %>">
<a class='tag-name' href='/tag/<%= tag.name %>'><%= tag.name %></a>
<% if logged_in_as(['admin', 'moderator']) || (current_user && ( current_user.uid == @node.uid || current_user.uid == tag.uid)) %>
<% if tag.name.include? ':' %>
<a data-confirm="This is a power tag (see https://publiclab.org/wiki/power-tags) -- and may drive a specific function on this page. Are you sure you want to delete it?" class="tag-delete" data-remote="true" href="/tag/delete/<%= @node.id %>/<%= tag.tid %>" data-tag-id="<%= tag.tid %>" data-method="delete" style="color:white;">x</a>
<a data-confirm="This is a power tag (see https://publiclab.org/wiki/power-tags) -- and may drive a specific function on this page. Are you sure you want to delete it?" class="tag-delete" data-remote="true" href="/tag/delete/<%= @node.id %>/<%= tag.tid %>" data-tag-id="<%= tag.tid %>" data-method="delete"><i class='fa fa-times-circle fa-white blue pl-1' aria-hidden='true' ></i></a>
<% else %>
<a data-confirm="Are you sure you want to delete it?" class="tag-delete" data-remote="true" href="/tag/delete/<%= @node.id %>/<%= tag.tid %>" data-tag-id="<%= tag.tid %>" data-method="delete" style="color:white">x</a>
<a data-confirm="Are you sure you want to delete it?" class="tag-delete" data-remote="true" href="/tag/delete/<%= @node.id %>/<%= tag.tid %>" data-tag-id="<%= tag.tid %>" data-method="delete"><i class='fa fa-times-circle fa-white blue pl-1' aria-hidden='true' ></i></a>
<% end %>
<% end %>
</p>
Expand All @@ -38,16 +38,20 @@

<% elsif tag.class == UserTag && (tag.name[0..4] != "oauth" || (logged_in_as(['admin', 'moderator']) || (current_user && current_user.uid == tag.uid))) %>

<li style="width: 100%;"><span id="tag_<%= tag.id %>" class="badge <%= badge_name %> pop" style="cursor:pointer" data-toggle="popover" data-trigger="manual" data-count=0 data-placement="top" data-content="<a href='/contributors/<%= tag.name %>'><%= Tag.tagged_node_count(tag.name) || 0 %> notes - <%= Tag.contributors(tag.name).count %> people <br></a>" data-html="true" title="<%= tag.name %>">
<% if tag.name[0..4] != "oauth" %>
<%= tag.name %>
<% else %>
<%= tag.name[0..5] + tag.name.split(':')[1] %>
<% end %>
<li style="width: 100%;">
<span id="tag_<%= tag.id %>" class="badge <%= badge_name %> pop" style="cursor:pointer" data-toggle="popover" data-trigger="manual" data-count=0 data-placement="top" data-content="<a href='/contributors/<%= tag.name %>'><%= Tag.tagged_node_count(tag.name) || 0 %> notes - <%= Tag.contributors(tag.name).count %> people <br></a>" data-html="true" title="<%= tag.name %>">
<a class='tag-name' href='/tag/<%= tag.name %>'>
<% if tag.name[0..4] != "oauth" %>
<%= tag.name %>
<% else %>
<%= tag.name[0..5] + tag.name.split(':')[1] %>
<% end %>
</a>
<% if logged_in_as(['admin', 'moderator']) || (current_user && current_user.uid == tag.uid) %>
<a data-confirm="Are you sure you want to delete it?" class="tag-delete" data-remote="true" href="/profile/tags/delete/<%= user.id %>?name=<%= tag.name %>" data-method="delete">x</a>
<a data-confirm="Are you sure you want to delete it?" class="tag-delete" data-remote="true" href="/profile/tags/delete/<%= user.id %>?name=<%= tag.name %>" data-method="delete"><i class='fa fa-times-circle fa-white blue pl-1' aria-hidden='true' ></i></a>
<% end %>
</span></li>
</span>
</li>

<% end %>
<% end %>
Expand Down
61 changes: 43 additions & 18 deletions test/system/tag_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,47 @@
class TagTest < ApplicationSystemTestCase
Capybara.default_max_wait_time = 60

test 'adding a tag via javascript' do
visit '/'
# test 'adding a tag via javascript' do
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just checking, did you want to comment all these out?

# visit '/'

click_on 'Login'
# click_on 'Login'

fill_in("username-login", with: "jeff")
fill_in("password-signup", with: "secretive")
click_on "Log in"
# fill_in("username-login", with: "jeff")
# fill_in("password-signup", with: "secretive")
# click_on "Log in"

visit "/wiki/wiki-page-path"
# visit "/wiki/wiki-page-path"

# run the javascript function
page.evaluate_script("addTag('bluebell')")
# # run the javascript function
# page.evaluate_script("addTag('bluebell')")

# check that the tag showed up on the page
assert_selector('.tags-list .tag-name', text: 'bluebell')
# # check that the tag showed up on the page
# assert_selector('.tags-list .tag-name', text: 'bluebell')

end
# end

# test 'adding a tag via javascript with url only' do
# visit '/'

test 'adding a tag via javascript with url only' do
# click_on 'Login'

# fill_in("username-login", with: "jeff")
# fill_in("password-signup", with: "secretive")
# click_on "Log in"

# visit "/wiki/wiki-page-path"

# # run the javascript function
# page.evaluate_script("addTag('roses', '/tag/create/11')")

# visit "/wiki/wiki-page-path" # refresh page

# # check that the tag showed up on the page
# assert_selector('.tags-list .card-body h5', text: 'roses')

# end

test 'adding a tag to a user profile' do
visit '/'

click_on 'Login'
Expand All @@ -33,15 +54,19 @@ class TagTest < ApplicationSystemTestCase
fill_in("password-signup", with: "secretive")
click_on "Log in"

visit "/wiki/wiki-page-path"
visit "/profile/jeff"

# run the javascript function
page.evaluate_script("addTag('roses', '/tag/create/11')")
page.evaluate_script("addTag('specialgroup', '/profile/tags/create/2')")

visit "/profile/jeff" # refresh page

visit "/wiki/wiki-page-path" # refresh page
find('#tags-section').click

# check that the tag showed up on the page
assert_selector('.tags-list .card-body h5', text: 'roses')
# check that the tag showed up on the page - check last tag in list
within('.tags-list') do
assert_equal('specialgroup', all('.tag-name').last.text.rstrip.lstrip)
end

end

Expand Down