[feature] Setting url fragments and applying to that data on both maps #703
Conversation
dee077
changed the base branch from
master
to
feature/662-improve-ui-device-list-popup-above-geo-map
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
dee077
force-pushed
the
feature/662-improve-ui-device-list-popup-above-geo-map
branch
2 times, most recently
from
1ed30c3 to
acec94b
Compare
dee077
force-pushed
the
feature/562-bookmark-url
branch
from
f570034 to
e533011
Compare
dee077
moved this to In progress
in [GSoC25] General Map: Indoor, Mobile, Linkable URLs
dee077
moved this from In progress
to In review
in [GSoC25] General Map: Indoor, Mobile, Linkable URLs
Set URL fragments when clicking nodes in geo and indoor maps, and apply state from URL on load. Fixes #562
dee077
force-pushed
the
feature/562-bookmark-url
branch
from
e533011 to
b5cd494
Compare
dee077
force-pushed
the
feature/562-bookmark-url
branch
from
632f83b to
0fa8b29
Compare
dee077
force-pushed
the
feature/562-bookmark-url
branch
2 times, most recently
from
ef9e7c4 to
0fa8b29
Compare
dee077
force-pushed
the
feature/562-bookmark-url
branch
from
34da180 to
af11750
Compare
dee077
force-pushed
the
feature/562-bookmark-url
branch
from
af11750 to
838bb84
Compare
There was a problem hiding this comment.
@dee077 Good work with adding the buttons to the device page. But, these buttons are redirecting the user to /admin/ page. The end goal is to create a dedicated page for the map.
I'm unsure if we need field label for the button. I'm attaching the screenshot so @nemesifier can confirm quickly.
| return super(admin.ModelAdmin, self).has_delete_permission(request, obj) | ||
|
|
||
|
|
||
| def patch_device_location_inline(self): |
There was a problem hiding this comment.
Let's add a comment here explaining why we are doing this.
| const location_parent = $("fieldset.module.aligned.loci.coords"); | ||
| const floorplan_parent = $("fieldset.module.aligned.indoor.coords"); |
There was a problem hiding this comment.
nit pick: the variable naming convention is not right for JS. We use camelCase.
| current_hash = self.web_driver.execute_script( | ||
| "return window.location.hash;" | ||
| ) | ||
| expected_hash = f"#id={mapId}&nodeId={location.id}" | ||
| self.assertEqual(expected_hash, current_hash) |
There was a problem hiding this comment.
You can use url_to_be expected condition https://www.selenium.dev/selenium/docs/api/py/selenium_webdriver_support/selenium.webdriver.support.expected_conditions.html#selenium.webdriver.support.expected_conditions.url_to_be
This will ensure that the user is redirected to /admin/.
| logs = self.get_browser_logs() | ||
| self.assertEqual(len(logs), 0) | ||
| self.assertTrue(popup.is_displayed()) | ||
| self.assertIn(device.name, popup.get_attribute("innerHTML")) |
There was a problem hiding this comment.
Can we also verify the location name in the pop-up?
| current_hash = self.web_driver.execute_script( | ||
| "return window.location.hash;" | ||
| ) | ||
| expected_hash = f"#id={indoorMapId}&nodeId={device_location.id}" | ||
| self.assertEqual(expected_hash, current_hash) |
| logs = self.get_browser_logs() | ||
| self.assertEqual(len(logs), 0) | ||
| self.assertTrue(popup.is_displayed()) | ||
| self.assertIn(device.name, popup.get_attribute("innerHTML")) |
There was a problem hiding this comment.
It should be possible to also verify the floorplan-title.
Checklist
Reference to Existing Issue
Closes #562.
Description of Changes
urlFragementsfrom config on both maps to allow fragments to set and apply from netjsongraph.jsfloorplan.jsto parse the params first, and if it exists for the indoor map open the floorplan overlayBlockers