Fix map errors with new LEL 2.2.1 #7545

nstjean · 2020-02-19T20:59:25Z

Fixes #7381 (<=== Add issue number here)

Fixes the errors that were still happening after the new LEL version
Using the display param in LEL
Changes the peopleLeaflet inline map over to using the new PLpeople layer in LEL
Cleaned up /people, it also uses the peopleLeaflet template
Fixes a bug where some new code from fix FIX subscription share popover not disappearing #7386 was interfering with maps
Now showing people (using PLpeople layer) and site content on /map
Fixed a bug where layer marker popups weren't appearing when clicked on inline maps, but were appearing on /people and /map
Used webmock to stub out the api used for PLpeople layer - it is currently very slow and was causing test failures

/map showing popup for a content node

/map showing popup for a person

/wiki/inline-maps

/people

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

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

…and /people

…ent it interfering with maps

codecov · 2020-02-19T21:08:39Z

Codecov Report

Merging #7545 into master will increase coverage by 0.15%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #7545      +/-   ##
==========================================
+ Coverage   81.87%   82.03%   +0.15%     
==========================================
  Files          97       97              
  Lines        5612     5615       +3     
==========================================
+ Hits         4595     4606      +11     
+ Misses       1017     1009       -8

Impacted Files	Coverage Δ
app/controllers/users_controller.rb	`82.29% <100%> (+0.18%)`	⬆️
app/channels/application_cable/connection.rb	`100% <0%> (ø)`	⬆️
app/channels/application_cable/channel.rb	`100% <0%> (ø)`	⬆️
app/channels/user_notification_channel.rb	`83.33% <0%> (ø)`	⬆️
app/channels/user_channel.rb	`83.33% <0%> (ø)`	⬆️
app/channels/room_channel.rb	`71.42% <0%> (ø)`	⬆️
app/controllers/openid_controller.rb	`53.84% <0%> (ø)`	⬆️
app/controllers/comment_controller.rb	`87.23% <0%> (ø)`	⬆️
app/controllers/subscription_controller.rb	`69% <0%> (ø)`	⬆️
... and 18 more

nstjean · 2020-02-21T14:32:52Z

The test/system/post_test.rb passes on my local. It's throwing an error in travis. Have to figure out why!

nstjean · 2020-02-21T15:18:07Z

Ok so commenting out the PLpeople layer made the tests pass. I suspect it's because that API takes so long to load. I'm going to try to stub it out for the test.

plotsbot · 2020-02-21T20:59:14Z

	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)

7545-test_questions.png

7545-test_embeddable_grids.png

7545-test_signup.png

7545-test_viewing_the_settings_page.png

7545-test_tag_by_author_page.png

7545-test_wiki_page_with_inline_grids.png

7545-test_stats.png

7545-test_viewing_the_dashboard.png

7545-test_searching_an_item_from_the_homepage.png

7545-test_signup_modal_form_validation.png

7545-test_tag_stats.png

7545-test_login_modal_form_validation.png

7545-test_questions_shadow.png

7545-test_login_modal.png

7545-test_profile_page.png

7545-test_comments.png

7545-test_tags.png

7545-test_signup_modal.png

7545-test_wiki.png

7545-test_methods.png

7545-test_tag_page.png

7545-test_blog_page_with_location_modal.png

7545-test_tag_wildcard.png

7545-test_signup_modal_disabled_submit_button_on_empty_username.png

7545-test_embeddable_thumbnail_grids.png

7545-test_front_page_with_navbar_search_autocomplete.png

7545-test_spam_moderation_page.png

7545-test_login.png

7545-test_viewing_the_dropdown_menu.png

7545-test_viewing_question_post.png

7545-test_mobile_displays.png

7545-test_simple-data-grapher_powertag.png

7545-test_front.png

7545-test_question_page.png

7545-test_tag_contributors_page.png

7545-test_blog.png

7545-test_people.png

7545-test_wiki_revisions.png

Learn about automated screenshots

Generated by 🚫 Danger

nstjean · 2020-02-21T21:00:46Z

test/test_helper.rb

+    body: "{items:[]}",
+    status: 200,
+    :headers => {"Content-Type"=> "application/json"}
+  )


I think this worked!

I think you can mock any testing framework now 😄 🎉 !!!

nstjean · 2020-02-21T21:01:57Z

Ready for review!

cesswairimu

Wow the maps look great 🎉 🎉 Superb 🚀

cesswairimu · 2020-02-22T11:52:11Z

@sagarpreet-chadha checkout these.. Really cool

sagarpreet-chadha · 2020-02-22T15:20:57Z

app/views/map/_peopleLeaflet.html.erb


    var setHash = 1;
    <% if defined? url_hash != nil and url_hash == 0 %>
      setHash = 0;
    <% end %>

    var options<%= unique_id %> = {
-      mainContent: "people",
-      setHash: setHash
+      layers: ["PLpeople"]


sagarpreet-chadha · 2020-02-22T15:21:48Z

test/test_helper.rb

+    body: "{items:[]}",
+    status: 200,
+    :headers => {"Content-Type"=> "application/json"}
+  )


I think you can mock any testing framework now 😄 🎉 !!!

sagarpreet-chadha · 2020-02-22T15:26:00Z

I am so happy to see PLpeople to go LIVE!!! This layer is one of the best layer i had the opportunity to work on. I think i can take a session on how i implemented this heatmap if you guys are interested 😄 .
Enough of self promotion :P

Thanks @nstjean , @cesswairimu for completing this 🎉

jywarren · 2020-03-10T18:12:26Z

🎉 Broke out a couple follow-ups here!

publiclab/leaflet-blurred-location-display#98 and a little simpler still: https://github.com/publiclab/leaflet-blurred-location-display/issues/97

* fix inline map errors with using new LEL 2.2.1, add plpeople to /map and /people * move subscription popover javascript fix to subscription page to prevent it interfering with maps * calculate lat, lon, zoom for people map using global or local variable * fix bug where map popup doesn't show on inline maps * fix codeclimate error * troubleshooting travis error * add webmock to stub api requests

nstjean added 4 commits February 19, 2020 12:36

fix inline map errors with using new LEL 2.2.1, add plpeople to /map …

7126bfd

…and /people

move subscription popover javascript fix to subscription page to prev…

8aa3a9e

…ent it interfering with maps

calculate lat, lon, zoom for people map using global or local variable

ceea18f

fix bug where map popup doesn't show on inline maps

6ddd72c

nstjean requested review from a team as code owners February 19, 2020 20:59

fix codeclimate error

1c1a9de

nstjean closed this Feb 19, 2020

nstjean reopened this Feb 19, 2020

nstjean force-pushed the map-error-lel branch from b5a1658 to a3ec756 Compare February 21, 2020 14:54

nstjean changed the title ~~Fix map errors with new LEL 2.2.1~~ WIP: Fix map errors with new LEL 2.2.1 Feb 21, 2020

nstjean force-pushed the map-error-lel branch from a3ec756 to 429274d Compare February 21, 2020 15:47

troubleshooting travis error

c233e65

nstjean force-pushed the map-error-lel branch 4 times, most recently from afc799f to fc43734 Compare February 21, 2020 19:17

add webmock to stub api requests

e6fabb4

nstjean force-pushed the map-error-lel branch from fc43734 to e6fabb4 Compare February 21, 2020 20:47

nstjean commented Feb 21, 2020

View reviewed changes

nstjean changed the title ~~WIP: Fix map errors with new LEL 2.2.1~~ Fix map errors with new LEL 2.2.1 Feb 21, 2020

nstjean mentioned this pull request Feb 21, 2020

Outreachy Project Recap: summary, planning & discussion #7432

Closed

cesswairimu approved these changes Feb 22, 2020

View reviewed changes

cesswairimu merged commit d4018a2 into publiclab:master Feb 22, 2020

sagarpreet-chadha reviewed Feb 22, 2020

View reviewed changes

Fix map errors with new LEL 2.2.1 #7545

Fix map errors with new LEL 2.2.1 #7545

Conversation

nstjean commented Feb 19, 2020 • edited

codecov bot commented Feb 19, 2020 • edited

Codecov Report

nstjean commented Feb 21, 2020

nstjean commented Feb 21, 2020

plotsbot commented Feb 21, 2020

7545-test_questions.png

7545-test_embeddable_grids.png

7545-test_signup.png

7545-test_viewing_the_settings_page.png

7545-test_tag_by_author_page.png

7545-test_wiki_page_with_inline_grids.png

7545-test_stats.png

7545-test_viewing_the_dashboard.png

7545-test_searching_an_item_from_the_homepage.png

7545-test_signup_modal_form_validation.png

7545-test_tag_stats.png

7545-test_login_modal_form_validation.png

7545-test_questions_shadow.png

7545-test_login_modal.png

7545-test_profile_page.png

7545-test_comments.png

7545-test_tags.png

7545-test_signup_modal.png

7545-test_wiki.png

7545-test_methods.png

7545-test_tag_page.png

7545-test_blog_page_with_location_modal.png

7545-test_tag_wildcard.png

7545-test_signup_modal_disabled_submit_button_on_empty_username.png

7545-test_embeddable_thumbnail_grids.png

7545-test_front_page_with_navbar_search_autocomplete.png

7545-test_spam_moderation_page.png

7545-test_login.png

7545-test_viewing_the_dropdown_menu.png

7545-test_viewing_question_post.png

7545-test_mobile_displays.png

7545-test_simple-data-grapher_powertag.png

7545-test_front.png

7545-test_question_page.png

7545-test_tag_contributors_page.png

7545-test_blog.png

7545-test_people.png

7545-test_wiki_revisions.png

nstjean Feb 21, 2020

Choose a reason for hiding this comment

sagarpreet-chadha Feb 22, 2020

Choose a reason for hiding this comment

nstjean commented Feb 21, 2020

cesswairimu left a comment

Choose a reason for hiding this comment

cesswairimu commented Feb 22, 2020

sagarpreet-chadha Feb 22, 2020

Choose a reason for hiding this comment

sagarpreet-chadha Feb 22, 2020

Choose a reason for hiding this comment

sagarpreet-chadha commented Feb 22, 2020

jywarren commented Mar 10, 2020

nstjean commented Feb 19, 2020 •

edited

codecov bot commented Feb 19, 2020 •

edited