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.

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

Fix tagging user profiles and add JS ajax function #6886

Merged
merged 3 commits into from
Dec 2, 2019

Conversation

nstjean
Copy link
Contributor

@nstjean nstjean commented Dec 2, 2019

Fixes #6724 (<=== Add issue number here)
@jywarren This references what we talked about in #6422 - do I need to create an issue for this?

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • PR is descriptively titled 📑 and links the original issue above 🔗
  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts 📁
  • screenshots/GIFs are attached 📎 in case of UI updation
  • ask @publiclab/reviewers for help, in a comment below

+++

In this PR:

  • fixed the form to add tags to a user profile, which wasn't working
  • added a test to ensure that adding tags via the existing javascript methods work
  • added styling to all badge tags based on what was already done for some node tags - added a FA icon instead of an x
  • also added a link to the tag badge so when it is clicked on it will go to the tag page

The badges for the node tags:
FireShot Capture 081 - 🎈 Public Lab_ Where can I find information on caves_ - localhost

Badges for the user profile tags:
FireShot Capture 082 - 🎈 Public Lab_ admin - localhost

@@ -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?

@jywarren
Copy link
Member

jywarren commented Dec 2, 2019

And noting, I think this will have an effect on #5882 - perhaps solving it? Or maybe 5882 can be solved by refactoring to use this method?

Thanks @nstjean !!! Great work!

@nstjean
Copy link
Contributor Author

nstjean commented Dec 2, 2019

Oops, no I didn't mean to leave those uncommented! Pushed up the fix.

Oh that would be great if it solved that! I'll check it out!

@plotsbot
Copy link
Collaborator

plotsbot commented Dec 2, 2019

1 Warning
⚠️ There was an error with Danger bot’s Junit parsing: No JUnit file was found at output.xml
3 Messages
📖 @nstjean Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And don’t be discouraged if you see errors – we’re here to help.
📖 It looks like you haven’t marked all the checkboxes. Help us review and accept your suggested changes by going through the steps one by one. If it is still a ‘Work in progress’, please include ‘[WIP]’ in the title.
📖 #
Screenshots 📸 (click to expand)

6886-test_questions.png

6886-test_embeddable_grids.png

6886-test_signup.png

6886-test_viewing_the_settings_page.png

6886-test_tag_by_author_page.png

6886-test_wiki_page_with_inline_grids.png

6886-test_stats.png

6886-test_viewing_the_dashboard.png

6886-test_searching_an_item_from_the_homepage.png

6886-test_questions_shadow.png

6886-test_login_modal.png

6886-test_profile_page.png

6886-test_comments.png

6886-test_tags.png

6886-test_signup_modal.png

6886-test_wiki.png

6886-test_methods.png

6886-test_tag_page.png

6886-test_blog_page_with_location_modal.png

6886-test_tag_wildcard.png

6886-test_embeddable_thumbnail_grids.png

6886-test_front_page_with_navbar_search_autocomplete.png

6886-test_login.png

6886-test_viewing_the_dropdown_menu.png

6886-test_viewing_question_post.png

6886-test_mobile_displays.png

6886-test_simple-data-grapher_powertag.png

6886-test_front.png

6886-test_question_page.png

6886-test_tag_contributors_page.png

6886-test_blog.png

6886-test_people.png

6886-test_wiki_revisions.png

Learn about automated screenshots

Generated by 🚫 Danger

@jywarren jywarren merged commit bc3d4db into publiclab:master Dec 2, 2019
@jywarren
Copy link
Member

jywarren commented Dec 2, 2019

Merging! Thanks -- you're killing it on the system tests! This is super!!!

@jywarren
Copy link
Member

jywarren commented Dec 2, 2019

Aha, this issue may also be solved by your new code, though it may also need some tweaking now!

#5882

@jywarren
Copy link
Member

jywarren commented Dec 2, 2019

Oh sorry that is the exact same issue. Just doing some cleanup and... made it worse! Ignore!!!

vinitshahdeo pushed a commit to vinitshahdeo/plots2 that referenced this pull request Feb 1, 2020
* add correct url to user tag form and add test for adding user tag with JS

* fix styling of delete button on badges in tags

* uncomment tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Center align the Pagination Bar (for additional pages of content)
3 participants