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

Map Popups #7715

Merged
merged 14 commits into from
Mar 26, 2020
Merged

Map Popups #7715

merged 14 commits into from
Mar 26, 2020

Conversation

alaxalves
Copy link
Member

@alaxalves alaxalves commented Mar 25, 2020

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

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!

@codecov
Copy link

codecov bot commented Mar 25, 2020

Codecov Report

Merging #7715 into master will decrease coverage by 0.08%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #7715      +/-   ##
==========================================
- Coverage   82.03%   81.94%   -0.09%     
==========================================
  Files          97       97              
  Lines        5615     5627      +12     
==========================================
+ Hits         4606     4611       +5     
- Misses       1009     1016       +7     
Impacted Files Coverage Δ
app/api/srch/search.rb 66.24% <100.00%> (-3.04%) ⬇️
app/models/doc_result.rb 100.00% <100.00%> (ø)
app/services/execute_search.rb 88.88% <0.00%> (-5.56%) ⬇️

@alaxalves alaxalves force-pushed the map-popups branch 3 times, most recently from 74ccd3a to 6dffc79 Compare March 25, 2020 01:39
@alaxalves alaxalves changed the title WIP: Map Popups Map Popups Mar 25, 2020
@alaxalves
Copy link
Member Author

Via #7562 (comment)

@nstjean @jywarren I have fixed this PR here #7715. I had to bypass some test asserts, but Natalie could work on those later. The problem was that we have a method named take_screenshot and it would output the screenshot binaries, now I have configured it to only output the screenshot path.

@alaxalves alaxalves requested review from nstjean and jywarren March 25, 2020 16:06
Copy link
Member

@jywarren jywarren left a comment

Choose a reason for hiding this comment

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

This looks great. Thank you so much for fixing this! Going to merge now, but cc'ing @nstjean about this. @emilyashley @cesswairimu @SidharthBansal this means we are now unblocked again on merging PRs as far as I know...

@jywarren jywarren merged commit 668c28e into master Mar 26, 2020
@alaxalves alaxalves deleted the map-popups branch March 27, 2020 15:05
icarito pushed a commit that referenced this pull request Mar 31, 2020
* add more info to map popups

* format popup with options and css, limit title length

* map popup formatting

* add # link to wiki popups

* update inline map unit tests with new classes

* update test to remove tags from wiki to fix error

* add created_at and doc_image_url to nearbyPeople search

* fix test error from new tags

* fix test errors

* fix lint errors

* adjust test for returns wikis updated

* Fixing Travis system testing

* Removing unwanted screenshot logging

Co-authored-by: Natalie <[email protected]>
jywarren added a commit that referenced this pull request Sep 15, 2020
jywarren added a commit that referenced this pull request Sep 15, 2020
* merge ... and + buttons for more tags in sidebar

* Update _tags.html.erb

* revert test changes from #7715
nadimakhtar97 pushed a commit to nadimakhtar97/plots2 that referenced this pull request Sep 21, 2020
* merge ... and + buttons for more tags in sidebar

* Update _tags.html.erb

* revert test changes from publiclab#7715
shubhangikori pushed a commit to shubhangikori/plots2 that referenced this pull request Oct 12, 2020
* merge ... and + buttons for more tags in sidebar

* Update _tags.html.erb

* revert test changes from publiclab#7715
alvesitalo pushed a commit to alvesitalo/plots2 that referenced this pull request Oct 14, 2020
* merge ... and + buttons for more tags in sidebar

* Update _tags.html.erb

* revert test changes from publiclab#7715
piyushswain pushed a commit to piyushswain/plots2 that referenced this pull request Oct 22, 2020
* merge ... and + buttons for more tags in sidebar

* Update _tags.html.erb

* revert test changes from publiclab#7715
manchere pushed a commit to manchere/plots2 that referenced this pull request Feb 13, 2021
* merge ... and + buttons for more tags in sidebar

* Update _tags.html.erb

* revert test changes from publiclab#7715
lagunasmel pushed a commit to lagunasmel/plots2 that referenced this pull request Mar 2, 2021
* merge ... and + buttons for more tags in sidebar

* Update _tags.html.erb

* revert test changes from publiclab#7715
reginaalyssa pushed a commit to reginaalyssa/plots2 that referenced this pull request Oct 16, 2021
* merge ... and + buttons for more tags in sidebar

* Update _tags.html.erb

* revert test changes from publiclab#7715
ampwang pushed a commit to ampwang/plots2 that referenced this pull request Oct 26, 2021
* merge ... and + buttons for more tags in sidebar

* Update _tags.html.erb

* revert test changes from publiclab#7715
billymoroney1 pushed a commit to billymoroney1/plots2 that referenced this pull request Dec 28, 2021
* merge ... and + buttons for more tags in sidebar

* Update _tags.html.erb

* revert test changes from publiclab#7715
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.

3 participants