umap-project 2.8.0a2__py3-none-any.whl → 2.8.1__py3-none-any.whl

umap/tests/test_dashboard.py

@@ -0,0 +1,82 @@
+import pytest
+from django.contrib.auth import get_user_model
+from django.urls import reverse
+
+from umap.models import Map
+
+from .base import MapFactory, UserFactory
+
+User = get_user_model()
+
+pytestmark = pytest.mark.django_db
+
+
+def test_user_dashboard_is_restricted_to_logged_in(client):
+    response = client.get(reverse("user_dashboard"))
+    assert response.status_code == 302
+    assert response["Location"] == "/en/login/?next=/en/me"
+
+
+def test_user_dashboard_display_user_maps(client, map):
+    client.login(username=map.owner.username, password="123123")
+    response = client.get(reverse("user_dashboard"))
+    assert response.status_code == 200
+    body = response.content.decode()
+    assert map.name in body
+    assert f"{map.get_absolute_url()}?edit" in body
+    assert f"{map.get_absolute_url()}?share" in body
+    assert f"/map/{map.pk}/download" in body
+    assert "Everyone (public)" in body
+    assert "Owner only" in body
+
+
+def test_user_dashboard_do_not_display_blocked_user_maps(client, map):
+    map.share_status = Map.BLOCKED
+    map.save()
+    client.login(username=map.owner.username, password="123123")
+    response = client.get(reverse("user_dashboard"))
+    assert response.status_code == 200
+    body = response.content.decode()
+    assert map.name not in body
+
+
+def test_user_dashboard_do_not_display_deleted_user_maps(client, map):
+    map.share_status = Map.DELETED
+    map.save()
+    client.login(username=map.owner.username, password="123123")
+    response = client.get(reverse("user_dashboard"))
+    assert response.status_code == 200
+    body = response.content.decode()
+    assert map.name not in body
+
+
+@pytest.mark.parametrize("share_status", [Map.DRAFT, Map.PRIVATE, Map.PUBLIC, Map.OPEN])
+def test_user_dashboard_display_user_team_maps(client, map, team, user, share_status):
+    user.teams.add(team)
+    user.save()
+    map.team = team
+    map.share_status = share_status
+    map.save()
+    assert map.owner != user
+    client.login(username=user.username, password="123123")
+    response = client.get(reverse("user_dashboard"))
+    assert response.status_code == 200
+    body = response.content.decode()
+    assert map.name in body
+    assert map.get_absolute_url() in body
+
+
+def test_user_dashboard_display_user_maps_distinct(client, map):
+    # cf https://github.com/umap-project/umap/issues/1325
+    anonymap = MapFactory(name="Map witout owner should not appear")
+    user1 = UserFactory(username="user1")
+    user2 = UserFactory(username="user2")
+    map.editors.add(user1)
+    map.editors.add(user2)
+    map.save()
+    client.login(username=map.owner.username, password="123123")
+    response = client.get(reverse("user_dashboard"))
+    assert response.status_code == 200
+    body = response.content.decode()
+    assert body.count(f'<a href="/en/map/test-map_{map.pk}">test map</a>') == 1
+    assert body.count(anonymap.name) == 0

umap/tests/test_team_views.py

@@ -1,7 +1,7 @@
 import pytest
 from django.urls import reverse
 
-from umap.models import Team
+from umap.models import Map, Team
 
 pytestmark = pytest.mark.django_db
 
@@ -15,6 +15,40 @@ def test_can_see_team_maps(client, map, team):
     assert map.name in response.content.decode()
 
 
+@pytest.mark.parametrize("share_status", [Map.PRIVATE, Map.DRAFT])
+def test_others_cannot_see_team_private_maps_in_team_page(
+    client, map, team, user, share_status
+):
+    map.team = team
+    map.share_status = share_status
+    map.save()
+    url = reverse("team_maps", args=(team.pk,))
+    response = client.get(url)
+    assert response.status_code == 200
+    assert map.name not in response.content.decode()
+    # User is not in team
+    client.login(username=user.username, password="123123")
+    response = client.get(url)
+    assert response.status_code == 200
+    assert map.name not in response.content.decode()
+
+
+@pytest.mark.parametrize("share_status", [Map.PRIVATE, Map.DRAFT])
+def test_members_can_see_private_maps_in_team_page(
+    client, map, team, user, share_status
+):
+    map.team = team
+    map.share_status = share_status
+    map.save()
+    user.teams.add(team)
+    user.save()
+    url = reverse("team_maps", args=(team.pk,))
+    client.login(username=user.username, password="123123")
+    response = client.get(url)
+    assert response.status_code == 200
+    assert map.name in response.content.decode()
+
+
 def test_user_can_see_their_teams(client, team, user):
     user.teams.add(team)
     user.save()

umap/tests/test_views.py

@@ -267,80 +267,6 @@ def test_change_user_slug(client, user, settings):
     assert f"/en/user/{user.pk}/" in response.content.decode()
 
 
-@pytest.mark.django_db
-def test_user_dashboard_is_restricted_to_logged_in(client):
-    response = client.get(reverse("user_dashboard"))
-    assert response.status_code == 302
-    assert response["Location"] == "/en/login/?next=/en/me"
-
-
-@pytest.mark.django_db
-def test_user_dashboard_display_user_maps(client, map):
-    client.login(username=map.owner.username, password="123123")
-    response = client.get(reverse("user_dashboard"))
-    assert response.status_code == 200
-    body = response.content.decode()
-    assert map.name in body
-    assert f"{map.get_absolute_url()}?edit" in body
-    assert f"{map.get_absolute_url()}?share" in body
-    assert f"/map/{map.pk}/download" in body
-    assert "Everyone (public)" in body
-    assert "Owner only" in body
-
-
-@pytest.mark.django_db
-def test_user_dashboard_do_not_display_blocked_user_maps(client, map):
-    map.share_status = Map.BLOCKED
-    map.save()
-    client.login(username=map.owner.username, password="123123")
-    response = client.get(reverse("user_dashboard"))
-    assert response.status_code == 200
-    body = response.content.decode()
-    assert map.name not in body
-
-
-@pytest.mark.django_db
-def test_user_dashboard_do_not_display_deleted_user_maps(client, map):
-    map.share_status = Map.DELETED
-    map.save()
-    client.login(username=map.owner.username, password="123123")
-    response = client.get(reverse("user_dashboard"))
-    assert response.status_code == 200
-    body = response.content.decode()
-    assert map.name not in body
-
-
-@pytest.mark.django_db
-def test_user_dashboard_display_user_team_maps(client, map, team, user):
-    user.teams.add(team)
-    user.save()
-    map.team = team
-    map.save()
-    client.login(username=user.username, password="123123")
-    response = client.get(reverse("user_dashboard"))
-    assert response.status_code == 200
-    body = response.content.decode()
-    assert map.name in body
-    assert map.get_absolute_url() in body
-
-
-@pytest.mark.django_db
-def test_user_dashboard_display_user_maps_distinct(client, map):
-    # cf https://github.com/umap-project/umap/issues/1325
-    anonymap = MapFactory(name="Map witout owner should not appear")
-    user1 = UserFactory(username="user1")
-    user2 = UserFactory(username="user2")
-    map.editors.add(user1)
-    map.editors.add(user2)
-    map.save()
-    client.login(username=map.owner.username, password="123123")
-    response = client.get(reverse("user_dashboard"))
-    assert response.status_code == 200
-    body = response.content.decode()
-    assert body.count(f'<a href="/en/map/test-map_{map.pk}">test map</a>') == 1
-    assert body.count(anonymap.name) == 0
-
-
 @pytest.mark.django_db
 def test_logout_should_return_redirect(client, user, settings):
     client.login(username=user.username, password="123123")

umap/views.py

@@ -317,7 +317,11 @@ class TeamMaps(PaginatorMixin, DetailView):
     context_object_name = "current_team"
 
     def get_maps(self):
-        return Map.public.filter(team=self.object).order_by("-modified_at")
+        qs = Map.public
+        user = self.request.user
+        if user.is_authenticated and user in self.object.users.all():
+            qs = Map.objects
+        return qs.filter(team=self.object).order_by("-modified_at")
 
     def get_context_data(self, **kwargs):
         kwargs.update(

umap/websocket_server.py

@@ -126,6 +126,10 @@ async def join_and_listen(
 
     try:
         async for raw_message in websocket:
+            if raw_message == "ping":
+                await websocket.send("pong")
+                continue
+
             # recompute the peers list at the time of message-sending.
             # as doing so beforehand would miss new connections
             other_peers = connections.get_other_peers(websocket)
@@ -192,4 +196,7 @@ def run(host: str, port: int):
             logging.debug(f"Waiting for connections on {host}:{port}")
             await asyncio.Future()  # run forever
 
-    asyncio.run(_serve())
+    try:
+        asyncio.run(_serve())
+    except KeyboardInterrupt:
+        print("Closing WebSocket server")

{umap_project-2.8.0a2.dist-info → umap_project-2.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: umap-project
-Version: 2.8.0a2
+Version: 2.8.1
 Summary: Create maps with OpenStreetMap layers in a minute and embed them in your site.
 Author-email: Yohan Boniface <yb@enix.org>
 Maintainer-email: David Larlet <david@larlet.fr>
@@ -28,13 +28,13 @@ Requires-Dist: social-auth-app-django==5.4.2
 Requires-Dist: social-auth-core==4.5.4
 Provides-Extra: dev
 Requires-Dist: djlint==1.36.3; extra == 'dev'
-Requires-Dist: hatch==1.13.0; extra == 'dev'
+Requires-Dist: hatch==1.14.0; extra == 'dev'
 Requires-Dist: isort==5.13.2; extra == 'dev'
 Requires-Dist: mkdocs-material==9.5.48; extra == 'dev'
 Requires-Dist: mkdocs-static-i18n==1.2.3; extra == 'dev'
 Requires-Dist: mkdocs==1.6.1; extra == 'dev'
-Requires-Dist: pymdown-extensions==10.12; extra == 'dev'
-Requires-Dist: ruff==0.8.2; extra == 'dev'
+Requires-Dist: pymdown-extensions==10.13; extra == 'dev'
+Requires-Dist: ruff==0.8.4; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uwsgi==2.0.28; extra == 'docker'
@@ -47,7 +47,7 @@ Requires-Dist: pydantic==2.10.3; extra == 'sync'
 Requires-Dist: websockets==13.1; extra == 'sync'
 Provides-Extra: test
 Requires-Dist: factory-boy==3.3.1; extra == 'test'
-Requires-Dist: moto[s3]==5.0.21; extra == 'test'
+Requires-Dist: moto[s3]==5.0.24; extra == 'test'
 Requires-Dist: playwright>=1.39; extra == 'test'
 Requires-Dist: pytest-django==4.9.0; extra == 'test'
 Requires-Dist: pytest-playwright==0.6.2; extra == 'test'