Skip to content

[change] Reuse django-leaflet for dashboard map #709 #794

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.

Sign up for GitHub

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

Draft
kunalverma2512 wants to merge 11 commits into
base: master
Choose a base branch
from
Draft

[change] Reuse django-leaflet for dashboard map #709 #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ad5e8e6
[change] Reuse django-leaflet for dashboard map #709
kunalverma2512 May 18, 2026
7d5383e
Merge branch 'master' into bugfix/709-reuse-django-leaflet
kunalverma2512 May 19, 2026
6d600ec
[qa] Fix CI test failures and code formatting #709
kunalverma2512 May 20, 2026
75a0753
[qa] Fix pip dependency resolution loop in setup.py #709
kunalverma2512 May 20, 2026
04ea4ff
[qa] Revert temporary CI hack to resolve pip conflicts #709
kunalverma2512 May 20, 2026
003bb9a
[tests] Update MapPageAdmin media tests for unbundled netjsongraph
kunalverma2512 May 20, 2026
fd36625
[ci] Use openwisp-utils fork and clean up setup.py #709
kunalverma2512 May 22, 2026
e409812
[change] Fix Leaflet loading order in MapPageAdmin #709
kunalverma2512 May 22, 2026
9bbc0c4
[tests] Update static file paths in admin tests #709
kunalverma2512 May 22, 2026
85db27e
[change] Fix unbundled asset paths for dashboard map #709
kunalverma2512 May 22, 2026
9862322
[tests] Fix static asset assertions for dashboard map #709
kunalverma2512 May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ jobs:
pip install -U -I -e .
pip install -U ${{ matrix.django-version }}
sudo npm install -g prettier
pip install --force-reinstall --no-deps https://github.com/kunalverma2512/openwisp-utils/tarball/feature/517-add-netjsongraph-static

- name: Start InfluxDB
if: ${{ !cancelled() && steps.deps.conclusion == 'success' }}
Expand Down
8 changes: 4 additions & 4 deletions openwisp_monitoring/device/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,15 +588,15 @@ class MapPageAdmin(MultitenantAdminMixin, admin.ModelAdmin):

class Media:
js = [
"monitoring/js/lib/netjsongraph.min.js",
"monitoring/js/lib/leaflet.fullscreen.min.js",
"lib/netjsongraph/js/echarts.min.js",
"lib/netjsongraph/js/netjsongraph.echarts.min.js",
]
css = {
"all": [
"monitoring/css/device-map.css",
"leaflet/leaflet.css",
"monitoring/css/leaflet.fullscreen.css",
"monitoring/css/netjsongraph.css",
"lib/netjsongraph/css/netjsongraph.css",
"lib/netjsongraph/css/netjsongraph-theme.css",
"monitoring/css/monitoring.css",
]
}
Expand Down
7 changes: 5 additions & 2 deletions openwisp_monitoring/device/apps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,10 +375,13 @@ def register_dashboard_items(self):
"monitoring/css/device-map.css",
"leaflet/leaflet.css",
"monitoring/css/leaflet.fullscreen.css",
"monitoring/css/netjsongraph.css",
"lib/netjsongraph/css/netjsongraph.css",
"lib/netjsongraph/css/netjsongraph-theme.css",
),
"js": (
"monitoring/js/lib/netjsongraph.min.js",
"leaflet/leaflet.js",
"lib/netjsongraph/js/echarts.min.js",
"lib/netjsongraph/js/netjsongraph.echarts.min.js",
"monitoring/js/lib/leaflet.fullscreen.min.js",
"monitoring/js/device-map.js",
"monitoring/js/floorplan.js",
Expand Down
101 changes: 0 additions & 101 deletions openwisp_monitoring/device/static/monitoring/css/netjsongraph.css
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions openwisp_monitoring/device/static/monitoring/js/lib/netjsongraph.min.js
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions openwisp_monitoring/device/templates/admin/map/map_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

{% block extrahead %}
{{ block.super }}
{% leaflet_js %}
{% leaflet_css %}
{{ media }}
{% endblock extrahead %}

Expand All @@ -23,6 +25,7 @@

{% block footer %}
{{ block.super }}
<script src="{% static 'monitoring/js/lib/leaflet.fullscreen.min.js' %}"></script>
<script src="{% static 'monitoring/js/device-map.js' %}"></script>
<script src="{% static 'monitoring/js/floorplan.js' %}"></script>
{% endblock footer %}
Expand Down
14 changes: 10 additions & 4 deletions openwisp_monitoring/device/tests/test_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,9 +902,12 @@ def test_dashboard(self):
static_files = [
"monitoring/css/device-map.css",
"monitoring/css/leaflet.fullscreen.css",
"monitoring/css/netjsongraph.css",
"lib/netjsongraph/css/netjsongraph.css",
"lib/netjsongraph/css/netjsongraph-theme.css",
"leaflet/leaflet.css",
"monitoring/js/lib/netjsongraph.min.js",
"leaflet/leaflet.js",
"lib/netjsongraph/js/echarts.min.js",
"lib/netjsongraph/js/netjsongraph.echarts.min.js",
"monitoring/js/lib/leaflet.fullscreen.min.js",
"monitoring/js/device-map.js",
"monitoring/js/floorplan.js",
Expand Down Expand Up @@ -1250,12 +1253,15 @@ def test_mappage_admin_media_files(self):
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
static_files = [
"monitoring/js/lib/netjsongraph.min.js",
"lib/netjsongraph/js/echarts.min.js",
"lib/netjsongraph/js/netjsongraph.echarts.min.js",
"monitoring/js/lib/leaflet.fullscreen.min.js",
"monitoring/css/device-map.css",
"leaflet/leaflet.css",
"monitoring/css/leaflet.fullscreen.css",
"monitoring/css/netjsongraph.css",
"lib/netjsongraph/css/netjsongraph.css",
"lib/netjsongraph/css/netjsongraph-theme.css",
"monitoring/css/monitoring.css",
"monitoring/js/device-map.js",
"monitoring/js/floorplan.js",
]
Expand Down
7 changes: 5 additions & 2 deletions openwisp_monitoring/device/tests/test_apps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,16 @@ def test_device_map_template_registered(self):
"monitoring/css/device-map.css",
"leaflet/leaflet.css",
"monitoring/css/leaflet.fullscreen.css",
"monitoring/css/netjsongraph.css",
"lib/netjsongraph/css/netjsongraph.css",
"lib/netjsongraph/css/netjsongraph-theme.css",
),
)
self.assertEqual(
template_config[0].get("js"),
(
"monitoring/js/lib/netjsongraph.min.js",
"leaflet/leaflet.js",
"lib/netjsongraph/js/echarts.min.js",
"lib/netjsongraph/js/netjsongraph.echarts.min.js",
"monitoring/js/lib/leaflet.fullscreen.min.js",
"monitoring/js/device-map.js",
"monitoring/js/floorplan.js",
Expand Down
Loading