Full screen button added in inline maps, Multiple maps in Wiki page works now. #6699

sagarpreet-chadha · 2019-11-06T18:02:02Z

Leaflet upgraded to latest version.
Full Screen button in inline maps.
Code refactoring.
Multiple maps in Wiki page works now.
LEL @2.0.3 version is used now.
Inline map layers are now ON by default.
API taglocations changed to include authorname and imageUrl.
Popup content changed.

sagarpreet-chadha · 2019-11-06T18:58:46Z

Multiple maps in Wiki page works now.
Also solves #5678

sagarpreet-chadha · 2019-11-06T18:59:38Z

app/assets/javascripts/wikis.js

-    $('#content').html(shortCodePrompt($('#content')[0], {
-      submitUrl: '/wiki/replace/' + node_id
-    }));
+    // $('#content').html(shortCodePrompt($('#content')[0], {


@jywarren ... commenting this code does the tricks for wiki page.

Do we need this?

Um, let me look at this code to see what it's supposed to do!

OK, strangely I can't find this code in our codebase but I definitely wrote it.

OMG ok i chased this SUPER DEEP - back to https://github.com/publiclab/plots2/pull/1224/files

where I had made this library:

https://github.com/jywarren/short-code-forms

whoaaaaa

It looks for: [prompt:_______] style inline tags: https://github.com/jywarren/short-code-forms/blob/master/examples/index.html#L39

The code that drives this is not complex: https://github.com/jywarren/short-code-forms/blob/master/dist/short-code-prompts.js

I think we do need this, but i'm not sure why this is causing trouble because it's supposed to look for the word "prompt":

/\[prompt:(\w*):*([\s\w]*):*(\w*)\]/g; is the regex.

Strange!

I'm not sure how you're testing it but could this help to debug?

Oh cool, I was just looking on how /wiki code is different from /note and found this to be different. I commented this code and the maps are now working!

jywarren · 2019-11-07T18:26:03Z

This is great, does it now also make the specified layers visible, as opposed to only available in the menu? Thanks!

jywarren · 2019-11-08T23:43:35Z

Just tested and this looks great, but the layers aren't enabled by default -- let's try to fix that!

sagarpreet-chadha · 2019-11-09T07:47:05Z

Yes on it!

sagarpreet-chadha · 2019-11-09T09:32:53Z

Hey @crisner ,
I have added your Layer in the new LEL version @2.0.3 . It look great!!!

sagarpreet-chadha · 2019-11-09T09:39:04Z

inline map layers are ON by default now :

crisner · 2019-11-09T11:28:06Z

@sagarpreet-chadha Awesome! 😃

sagarpreet-chadha · 2019-11-09T20:14:27Z

Popup:

jywarren · 2019-11-10T18:36:02Z

Just reporting back here, i reformatted a lot of code and followed the bug from the shortCodePrompt() function. I think the error is on this line:

setupWiki(52, "test", false, true);

And it's within the AJAX call that this function is making. So I think it's unrelated but it's causing an error before the map gets to load, and JS gets stalled at the error.

jywarren · 2019-11-10T19:04:56Z

OMG awesome!!! Are you still seeing the error related to the wikis.js line? If you uncomment it? I'd like to try to resolve that as part of this although if we really can't solve it we can do it in follow-up!

It's failing during the...

whoa, ok, what I found was that I hadn't installed the fullscreen library with yarn install, but once I did, the shortCodePrompt() error disappeared...

However, I also realized that that library replaces the entire wiki page content with a filtered version of itself. So it pulls $('#content').html() and replaces it with a copy of itself, filtered. This has the effect of making the map load 2x, which may have complicated things.

@sagarpreet-chadha can you check if you're able to uncomment this code and if it still errors for you? If it does, maybe we could turn off this code for now until we figure out a way to do this prompt code stuff without replacing the #content div in its entirety each time. That is not very efficient, esp. for complex JS and interactive stuff in the wiki page content.

I hope this helps with the debugging!

jywarren · 2019-11-12T17:00:59Z

Hi @sagarpreet-chadha just checking in on this - any last changes (or test on the error above) before we merge this? I want to get it into production for final checks early this week since the last chance we'll have to make changes will be Friday. Thanks!

sagarpreet-chadha · 2019-11-13T03:42:24Z

Okay yes doing testing now.

sagarpreet-chadha · 2019-11-13T04:07:22Z

Hey @jywarren , uncommenting that code still shows error in /wiki page. I think we should go ahead and merge this PR.
Agreed that map is loaded 2 times, which we can notice when we zoom in/out on wiki map. Thanks!

jywarren · 2019-11-13T21:59:10Z

Hooray!!! OK, let's test this out and then publish it to production 👍

jywarren · 2019-11-14T15:54:06Z

Also confirming, [prompt:___] is not working in production, probably the same unrelated bug:

https://publiclab.org/wiki/sandbox-3

jywarren · 2019-11-18T05:00:01Z

Looking great!

https://publiclab.org/wiki/sandbox-3

jywarren · 2019-11-18T05:00:30Z

I did wonder -- is there a way to preserve the /zoom/ of the map in the /post button too? Maybe we need that zoom tag?

jywarren · 2019-11-18T05:00:48Z

Or should it use the number of digits the same way the shortcode does?

* new navbar but should mostly be in a feature * Changed the hyperlink text in Login/Signup Model (#6364) * Changed the hyperlink text in Login/Signup Model Issue Number #6360 * Updated Hyperlink Text * Updated Text in HyperLink * Update _nodes.html.erb * Functional Tests for Ordering aphabetically (#6371) * test ordering of tags * test that wikis are ordered alphabetically based on title * Fix failing test on wiki test * Change 'Read More' blog link to button (#6537) * OpenGraph for Twitter * Update _new_question.html.erb * Add questions and comments to profile cards (#6472) * add # notes, questions, comments to user profile * fix codeclimate errors * display correct node type at top of tag/author page * fix /profile/comments/ to show by username * add route for comments by tagname, link added in profile * add styling to profile page cards * refactored Node.find_by_tag_and_author to use Node.questions * change display of note/question/comment links * add unit test for Comment.find_by_tag_and_author * add unit test for Node.find_by_tag_and_author * add assert for questions type in test find by name and user id * remove light grey footer background * Removed style-breaking classes from table (#6374) * Update 503.html - replace http with https (#6562) * Update 502.html - replace http with https (#6561) * Update 500.html - replace http with https (#6560) * Update 422.html - replace http with https (#6559) * Update 404.html - replace http with https (#6558) * Update index.html - replace http with https (#6557) * change the function named t(...) to translation(...) (#6580) * Flow: Button to post marker + Popup working for multiple maps (#6591) * init * LEL pointed to different branch * popups working * removed forked leaflet * button working great * CSS changes of button * CSS changed to orignal bootstrap button * Updated the user.rb file to bootstrap italic (#6535) * Update README.md file (#6510) Added link to first-timers-only issue template. * Fix comment spelling error (#6521) * Fix icon color on btn-outline-secondary buttons #6518 (#6520) * Bump chart.js from 2.8.0 to 2.9.1 (#6567) Bumps [chart.js](https://github.com/chartjs/Chart.js) from 2.8.0 to 2.9.1. - [Release notes](https://github.com/chartjs/Chart.js/releases) - [Commits](chartjs/Chart.js@v2.8.0...v2.9.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Changed from function t to translation (#6609) Issue resolved: Change function t to translation in dashboard/_node_comment #6600 * Update _edit.html.erb (#6583) * Update _comments.html.erb (#6585) I changed the function named t(....) to be named as translations(...). * Update user.rb (#6587) * Change function t to translation in dashboard/_node_wiki (#6607) * Update_function t to translation in comments/_form (#6608) * wiki/methods: Change t to translation in (#6564) Changes the function name from t to translation in wiki/methods Fixes #6540 * t(....) named as translations(...) on lines 25, 30, 35 and 38 (#6552) * t(....) named as translations(...) on lines 25, 30, 35 and 38 * fix type translations to translation * Change function t to translations in comments/_edit * Revert "Change function t to translations in comments/_edit" This reverts commit e858b75. * changed t function name (#6546) * changed t function name * name fix * change funcion t to translations in users/spamaway (#6545) * change funcion t to translations in users/spamaway * fix typo * Change function t to translations in comments/comments #6538 (#6543) * Change function t to translations Change function t to translations in comments/comments * Change translations to translation * Update _node_meta.html.erb (#6606) Changing method "t" to "translation" * Fix follow button bug on tags (#6576) * Fix bug on issue #6570 * Persist data * Add co-authored posts to profile.html.erb (#6418) * Add co-authored posts to profile.html.erb * Update profile.html.erb * Adjustments to tag graph labeling * Update stats.html.erb * Change function to to translation #6603 (#6659) Change function t to translation in dashboard/_node_question #6603 #6603 * Refresh button (#6507) * added tooltip for refresh button * changes * new changes1 * #6539 Updated t to translations. (#6544) * Updated t to translations. * Updated translations to translation. Error in issue description. * Changed t to translation in _node_moderate (#6695) * some translations adjustments * Add more tests for Node (for note and wiki page titles) (#6366) * Add more tests for Node * Prevent titles that are empty, blank or too short * Update functional tests * Add Redis installation to readme (#6398) * Fix recent questions on shadow page (#6342) * Add package.json, package-lock and test.sqlite-journal to gitingore #6384 (#6385) * Make "choose one" link in comment forms appear underlined (#6401) * Underline "choose one" link Make "choose one" link in comment forms appear underlined #6399 * Add a CSS class to underline text * Add !important to underline CSS class * Fix rubocop errors in app/api & app/channels (#6425) * Fix rubocop errors in app/api & app/channels * Fix rubocop guardclause offenses * Add tag link to show question (#6430) * simple fix for link * not sure what that file was * removed redundant comment count being showed in blog section (#6746) * Update t() function to translation() (#6729) #6728 * Add redis installations for linux (#6751) * Bump rake from 12.3.3 to 13.0.1 (#6764) Bumps [rake](https://github.com/ruby/rake) from 12.3.3 to 13.0.1. - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](ruby/rake@v12.3.3...v13.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Update _comments.html.erb (#6766) * Update _comments.html.erb Changed the t() to translation() in line 4, 18 and 21. * Update _comments.html.erb Changed the two translation() back to t() on line 18. * Full screen button added in inline maps, Multiple maps in Wiki page works now. (#6699) * full screen added * working on wiki page * code refactoring * console logs removed * inline map layers are ON by default now * version bump of LEL to add new Layers * api changed tagslocation init * api taglocations changed * popup content changed * PL.editor shows map if lat,lon passed in URL. (#6788) * pl-editor shows map * indentation * yarn.lock added for PL.editor * safe traverse syntax used * map API using common global variable. (#6802) * done * removed console logs * [Security] Bump https-proxy-agent from 2.2.1 to 2.2.4 (#6803) Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent) from 2.2.1 to 2.2.4. **This update includes security fixes.** - [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases) - [Commits](TooTallNate/proxy-agents@2.2.1...2.2.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Update _thumbnail.html.erb to make it consistent with new card display (#6581) * Update _thumbnail.html.erb * Update style.css * Update node_shared_test.rb * Update _thumbnail.html.erb * Update _notes.html.erb * Update _notes.html.erb * Update _notes.html.erb * added ApplicationController.helpers.logged_in_as * Update _notes.html.erb * self.current_user in application_helper.rb * Update application_helper.rb * switch to "@current_user && ['admin','moderator'].includes?(@current_user.role)" * PL.editor shows map if lat,lon passed in URL. (#6788) * pl-editor shows map * indentation * yarn.lock added for PL.editor * safe traverse syntax used * handle nils * Update _notes.html.erb * new navbar but should mostly be in a feature * some translations adjustments * final navbar * fixes for collapse menu * fixes for collapse menu 2 * rest of menus

…orks now. (publiclab#6699) * full screen added * working on wiki page * code refactoring * console logs removed * inline map layers are ON by default now * version bump of LEL to add new Layers * api changed tagslocation init * api taglocations changed * popup content changed

* new navbar but should mostly be in a feature * Changed the hyperlink text in Login/Signup Model (publiclab#6364) * Changed the hyperlink text in Login/Signup Model Issue Number publiclab#6360 * Updated Hyperlink Text * Updated Text in HyperLink * Update _nodes.html.erb * Functional Tests for Ordering aphabetically (publiclab#6371) * test ordering of tags * test that wikis are ordered alphabetically based on title * Fix failing test on wiki test * Change 'Read More' blog link to button (publiclab#6537) * OpenGraph for Twitter * Update _new_question.html.erb * Add questions and comments to profile cards (publiclab#6472) * add # notes, questions, comments to user profile * fix codeclimate errors * display correct node type at top of tag/author page * fix /profile/comments/ to show by username * add route for comments by tagname, link added in profile * add styling to profile page cards * refactored Node.find_by_tag_and_author to use Node.questions * change display of note/question/comment links * add unit test for Comment.find_by_tag_and_author * add unit test for Node.find_by_tag_and_author * add assert for questions type in test find by name and user id * remove light grey footer background * Removed style-breaking classes from table (publiclab#6374) * Update 503.html - replace http with https (publiclab#6562) * Update 502.html - replace http with https (publiclab#6561) * Update 500.html - replace http with https (publiclab#6560) * Update 422.html - replace http with https (publiclab#6559) * Update 404.html - replace http with https (publiclab#6558) * Update index.html - replace http with https (publiclab#6557) * change the function named t(...) to translation(...) (publiclab#6580) * Flow: Button to post marker + Popup working for multiple maps (publiclab#6591) * init * LEL pointed to different branch * popups working * removed forked leaflet * button working great * CSS changes of button * CSS changed to orignal bootstrap button * Updated the user.rb file to bootstrap italic (publiclab#6535) * Update README.md file (publiclab#6510) Added link to first-timers-only issue template. * Fix comment spelling error (publiclab#6521) * Fix icon color on btn-outline-secondary buttons publiclab#6518 (publiclab#6520) * Bump chart.js from 2.8.0 to 2.9.1 (publiclab#6567) Bumps [chart.js](https://github.com/chartjs/Chart.js) from 2.8.0 to 2.9.1. - [Release notes](https://github.com/chartjs/Chart.js/releases) - [Commits](chartjs/Chart.js@v2.8.0...v2.9.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Changed from function t to translation (publiclab#6609) Issue resolved: Change function t to translation in dashboard/_node_comment publiclab#6600 * Update _edit.html.erb (publiclab#6583) * Update _comments.html.erb (publiclab#6585) I changed the function named t(....) to be named as translations(...). * Update user.rb (publiclab#6587) * Change function t to translation in dashboard/_node_wiki (publiclab#6607) * Update_function t to translation in comments/_form (publiclab#6608) * wiki/methods: Change t to translation in (publiclab#6564) Changes the function name from t to translation in wiki/methods Fixes publiclab#6540 * t(....) named as translations(...) on lines 25, 30, 35 and 38 (publiclab#6552) * t(....) named as translations(...) on lines 25, 30, 35 and 38 * fix type translations to translation * Change function t to translations in comments/_edit * Revert "Change function t to translations in comments/_edit" This reverts commit e858b75. * changed t function name (publiclab#6546) * changed t function name * name fix * change funcion t to translations in users/spamaway (publiclab#6545) * change funcion t to translations in users/spamaway * fix typo * Change function t to translations in comments/comments publiclab#6538 (publiclab#6543) * Change function t to translations Change function t to translations in comments/comments * Change translations to translation * Update _node_meta.html.erb (publiclab#6606) Changing method "t" to "translation" * Fix follow button bug on tags (publiclab#6576) * Fix bug on issue publiclab#6570 * Persist data * Add co-authored posts to profile.html.erb (publiclab#6418) * Add co-authored posts to profile.html.erb * Update profile.html.erb * Adjustments to tag graph labeling * Update stats.html.erb * Change function to to translation publiclab#6603 (publiclab#6659) Change function t to translation in dashboard/_node_question publiclab#6603 publiclab#6603 * Refresh button (publiclab#6507) * added tooltip for refresh button * changes * new changes1 * publiclab#6539 Updated t to translations. (publiclab#6544) * Updated t to translations. * Updated translations to translation. Error in issue description. * Changed t to translation in _node_moderate (publiclab#6695) * some translations adjustments * Add more tests for Node (for note and wiki page titles) (publiclab#6366) * Add more tests for Node * Prevent titles that are empty, blank or too short * Update functional tests * Add Redis installation to readme (publiclab#6398) * Fix recent questions on shadow page (publiclab#6342) * Add package.json, package-lock and test.sqlite-journal to gitingore publiclab#6384 (publiclab#6385) * Make "choose one" link in comment forms appear underlined (publiclab#6401) * Underline "choose one" link Make "choose one" link in comment forms appear underlined publiclab#6399 * Add a CSS class to underline text * Add !important to underline CSS class * Fix rubocop errors in app/api & app/channels (publiclab#6425) * Fix rubocop errors in app/api & app/channels * Fix rubocop guardclause offenses * Add tag link to show question (publiclab#6430) * simple fix for link * not sure what that file was * removed redundant comment count being showed in blog section (publiclab#6746) * Update t() function to translation() (publiclab#6729) publiclab#6728 * Add redis installations for linux (publiclab#6751) * Bump rake from 12.3.3 to 13.0.1 (publiclab#6764) Bumps [rake](https://github.com/ruby/rake) from 12.3.3 to 13.0.1. - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](ruby/rake@v12.3.3...v13.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Update _comments.html.erb (publiclab#6766) * Update _comments.html.erb Changed the t() to translation() in line 4, 18 and 21. * Update _comments.html.erb Changed the two translation() back to t() on line 18. * Full screen button added in inline maps, Multiple maps in Wiki page works now. (publiclab#6699) * full screen added * working on wiki page * code refactoring * console logs removed * inline map layers are ON by default now * version bump of LEL to add new Layers * api changed tagslocation init * api taglocations changed * popup content changed * PL.editor shows map if lat,lon passed in URL. (publiclab#6788) * pl-editor shows map * indentation * yarn.lock added for PL.editor * safe traverse syntax used * map API using common global variable. (publiclab#6802) * done * removed console logs * [Security] Bump https-proxy-agent from 2.2.1 to 2.2.4 (publiclab#6803) Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent) from 2.2.1 to 2.2.4. **This update includes security fixes.** - [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases) - [Commits](TooTallNate/proxy-agents@2.2.1...2.2.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Update _thumbnail.html.erb to make it consistent with new card display (publiclab#6581) * Update _thumbnail.html.erb * Update style.css * Update node_shared_test.rb * Update _thumbnail.html.erb * Update _notes.html.erb * Update _notes.html.erb * Update _notes.html.erb * added ApplicationController.helpers.logged_in_as * Update _notes.html.erb * self.current_user in application_helper.rb * Update application_helper.rb * switch to "@current_user && ['admin','moderator'].includes?(@current_user.role)" * PL.editor shows map if lat,lon passed in URL. (publiclab#6788) * pl-editor shows map * indentation * yarn.lock added for PL.editor * safe traverse syntax used * handle nils * Update _notes.html.erb * new navbar but should mostly be in a feature * some translations adjustments * final navbar * fixes for collapse menu * fixes for collapse menu 2 * rest of menus

sagarpreet-chadha added 2 commits November 6, 2019 23:23

full screen added

4828e7a

working on wiki page

39f1be7

sagarpreet-chadha mentioned this pull request Nov 6, 2019

/inline-maps page showing some errors #5678

Closed

sagarpreet-chadha changed the title ~~Full screen button added in inline maps~~ Full screen button added in inline maps, Multiple maps in Wiki page works now. Nov 6, 2019

sagarpreet-chadha commented Nov 6, 2019

View reviewed changes

code refactoring

0e1a8e9

sagarpreet-chadha changed the title ~~Full screen button added in inline maps, Multiple maps in Wiki page works now.~~ [WIP]Full screen button added in inline maps, Multiple maps in Wiki page works now. Nov 6, 2019

console logs removed

3accc34

sagarpreet-chadha mentioned this pull request Nov 9, 2019

Layers can be on by default on map. publiclab/leaflet-environmental-layers#280

Merged

inline map layers are ON by default now

0d866a1

sagarpreet-chadha added 4 commits November 9, 2019 18:04

version bump of LEL to add new Layers

faa6fba

api changed tagslocation init

fc8642e

api taglocations changed

371915b

popup content changed

f7f4098

sagarpreet-chadha changed the title ~~[WIP]Full screen button added in inline maps, Multiple maps in Wiki page works now.~~ Full screen button added in inline maps, Multiple maps in Wiki page works now. Nov 13, 2019

jywarren merged commit 268352c into master Nov 13, 2019

jywarren mentioned this pull request Nov 14, 2019

Integrate a Prompt button into inline maps #5680

Closed

jywarren mentioned this pull request Nov 22, 2019

Simple editor template #6817

Closed

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Full screen button added in inline maps, Multiple maps in Wiki page works now. #6699

Full screen button added in inline maps, Multiple maps in Wiki page works now. #6699

sagarpreet-chadha commented Nov 6, 2019 •

edited

Loading

sagarpreet-chadha commented Nov 6, 2019

sagarpreet-chadha Nov 6, 2019

sagarpreet-chadha Nov 6, 2019

jywarren Nov 7, 2019

jywarren Nov 7, 2019

jywarren Nov 7, 2019

sagarpreet-chadha Nov 9, 2019

jywarren commented Nov 7, 2019

jywarren commented Nov 8, 2019

sagarpreet-chadha commented Nov 9, 2019

sagarpreet-chadha commented Nov 9, 2019

sagarpreet-chadha commented Nov 9, 2019

crisner commented Nov 9, 2019

sagarpreet-chadha commented Nov 9, 2019

jywarren commented Nov 10, 2019

jywarren commented Nov 10, 2019

jywarren commented Nov 12, 2019

sagarpreet-chadha commented Nov 13, 2019

sagarpreet-chadha commented Nov 13, 2019

jywarren commented Nov 13, 2019

jywarren commented Nov 14, 2019

jywarren commented Nov 18, 2019

jywarren commented Nov 18, 2019

jywarren commented Nov 18, 2019

Full screen button added in inline maps, Multiple maps in Wiki page works now. #6699

Full screen button added in inline maps, Multiple maps in Wiki page works now. #6699

Conversation

sagarpreet-chadha commented Nov 6, 2019 • edited Loading

sagarpreet-chadha commented Nov 6, 2019

sagarpreet-chadha Nov 6, 2019

Choose a reason for hiding this comment

sagarpreet-chadha Nov 6, 2019

Choose a reason for hiding this comment

jywarren Nov 7, 2019

Choose a reason for hiding this comment

jywarren Nov 7, 2019

Choose a reason for hiding this comment

jywarren Nov 7, 2019

Choose a reason for hiding this comment

sagarpreet-chadha Nov 9, 2019

Choose a reason for hiding this comment

jywarren commented Nov 7, 2019

jywarren commented Nov 8, 2019

sagarpreet-chadha commented Nov 9, 2019

sagarpreet-chadha commented Nov 9, 2019

sagarpreet-chadha commented Nov 9, 2019

crisner commented Nov 9, 2019

sagarpreet-chadha commented Nov 9, 2019

jywarren commented Nov 10, 2019

jywarren commented Nov 10, 2019

jywarren commented Nov 12, 2019

sagarpreet-chadha commented Nov 13, 2019

sagarpreet-chadha commented Nov 13, 2019

jywarren commented Nov 13, 2019

jywarren commented Nov 14, 2019

jywarren commented Nov 18, 2019

jywarren commented Nov 18, 2019

jywarren commented Nov 18, 2019

sagarpreet-chadha commented Nov 6, 2019 •

edited

Loading