umap-project 2.5.0__py3-none-any.whl → 2.6.0__py3-none-any.whl

umap/tests/test_map_views.py

@@ -210,7 +210,7 @@ def test_user_not_allowed_should_not_clone_map(client, map, user, settings):
 
 def test_clone_should_set_cloner_as_owner(client, map, user):
     url = reverse("map_clone", kwargs={"map_id": map.pk})
-    map.edit_status = map.EDITORS
+    map.edit_status = map.COLLABORATORS
     map.editors.add(user)
     map.save()
     client.login(username=user.username, password="123123")
@@ -330,7 +330,7 @@ def test_only_owner_can_delete(client, map, user):
 
 def test_map_editors_do_not_see_owner_change_input(client, map, user):
     map.editors.add(user)
-    map.edit_status = map.EDITORS
+    map.edit_status = map.COLLABORATORS
     map.save()
     url = reverse("map_update_permissions", kwargs={"map_id": map.pk})
     client.login(username=user.username, password="123123")

umap/tests/test_statics.py

@@ -0,0 +1,40 @@
+import json
+import shutil
+import tempfile
+from copy import deepcopy
+from pathlib import Path
+
+import pytest
+from django.core.management import call_command
+
+
+@pytest.fixture
+def staticfiles(settings):
+    static_root = tempfile.mkdtemp(prefix="test_static")
+    settings.STATIC_ROOT = static_root
+    # Make sure settings are properly reset after the test
+    settings.STORAGES = deepcopy(settings.STORAGES)
+    settings.STORAGES["staticfiles"]["BACKEND"] = (
+        "umap.storage.UmapManifestStaticFilesStorage"
+    )
+    try:
+        call_command("collectstatic", "--noinput")
+        yield
+    finally:
+        shutil.rmtree(static_root)
+
+
+def test_collectstatic_ran_successfully_with_hashes(settings, staticfiles):
+    static_root = settings.STATIC_ROOT
+    manifest = Path(static_root) / "staticfiles.json"
+    assert manifest.exists()
+    json_manifest = json.loads(manifest.read_text())
+    assert "hash" in json_manifest.keys()
+    assert "umap/base.css" in json_manifest["paths"]
+    # Hash + the dot ("umap/base.<hash>.css").
+    md5_hash_lenght = 12 + 1
+    # The value of the manifest must contain the hash (length).
+    assert (
+        len(json_manifest["paths"]["umap/base.css"])
+        == len("umap/base.css") + md5_hash_lenght
+    )

umap/tests/test_team_views.py

@@ -0,0 +1,131 @@
+import pytest
+from django.urls import reverse
+
+from umap.models import Team
+
+pytestmark = pytest.mark.django_db
+
+
+def test_can_see_team_maps(client, map, team):
+    map.team = team
+    map.save()
+    url = reverse("team_maps", args=(team.pk,))
+    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()
+    url = reverse("user_teams")
+    client.login(username=user.username, password="123123")
+    response = client.get(url)
+    assert response.status_code == 200
+    assert team.name in response.content.decode()
+
+
+def test_can_create_a_team(client, user):
+    assert not Team.objects.count()
+    url = reverse("team_new")
+    client.login(username=user.username, password="123123")
+    response = client.post(url, {"name": "my new team", "members": [user.pk]})
+    assert response.status_code == 302
+    assert response["Location"] == "/en/me/teams"
+    assert Team.objects.count() == 1
+    team = Team.objects.first()
+    assert team.name == "my new team"
+    assert team in user.teams.all()
+
+
+def test_can_edit_a_team_name(client, user, team):
+    user.teams.add(team)
+    user.save()
+    assert Team.objects.count() == 1
+    url = reverse("team_update", args=(team.pk,))
+    client.login(username=user.username, password="123123")
+    response = client.post(url, {"name": "my new team", "members": [user.pk]})
+    assert response.status_code == 302
+    assert response["Location"] == "/en/me/teams"
+    assert Team.objects.count() == 1
+    modified = Team.objects.first()
+    assert modified.name == "my new team"
+    assert modified in user.teams.all()
+
+
+def test_can_add_user_to_team(client, user, user2, team):
+    user.teams.add(team)
+    user.save()
+    assert Team.objects.count() == 1
+    url = reverse("team_update", args=(team.pk,))
+    client.login(username=user.username, password="123123")
+    response = client.post(url, {"name": team.name, "members": [user.pk, user2.pk]})
+    assert response.status_code == 302
+    assert response["Location"] == "/en/me/teams"
+    assert Team.objects.count() == 1
+    modified = Team.objects.first()
+    assert user in modified.users.all()
+    assert user2 in modified.users.all()
+
+
+def test_can_remove_user_from_team(client, user, user2, team):
+    user.teams.add(team)
+    user.save()
+    user2.teams.add(team)
+    user2.save()
+    assert Team.objects.count() == 1
+    url = reverse("team_update", args=(team.pk,))
+    client.login(username=user.username, password="123123")
+    response = client.post(url, {"name": team.name, "members": [user.pk]})
+    assert response.status_code == 302
+    assert response["Location"] == "/en/me/teams"
+    assert Team.objects.count() == 1
+    modified = Team.objects.first()
+    assert user in modified.users.all()
+    assert user2 not in modified.users.all()
+
+
+def test_cannot_edit_a_team_if_not_member(client, user, user2, team):
+    user.teams.add(team)
+    user.save()
+    assert Team.objects.count() == 1
+    url = reverse("team_update", args=(team.pk,))
+    client.login(username=user2.username, password="456456")
+    response = client.post(url, {"name": "my new team", "members": [user.pk]})
+    assert response.status_code == 403
+
+
+def test_can_delete_a_team(client, user, team):
+    user.teams.add(team)
+    user.save()
+    assert Team.objects.count() == 1
+    url = reverse("team_delete", args=(team.pk,))
+    client.login(username=user.username, password="123123")
+    response = client.post(url)
+    assert response.status_code == 302
+    assert response["Location"] == "/en/me/teams"
+    assert Team.objects.count() == 0
+
+
+def test_cannot_delete_a_team_if_not_member(client, user, user2, team):
+    user.teams.add(team)
+    user.save()
+    assert Team.objects.count() == 1
+    url = reverse("team_delete", args=(team.pk,))
+    client.login(username=user2.username, password="456456")
+    response = client.post(url)
+    assert response.status_code == 403
+    assert Team.objects.count() == 1
+
+
+def test_cannot_delete_a_team_if_more_than_one_member(client, user, user2, team):
+    user.teams.add(team)
+    user.save()
+    user2.teams.add(team)
+    user2.save()
+    assert Team.objects.count() == 1
+    url = reverse("team_delete", args=(team.pk,))
+    client.login(username=user.username, password="123123")
+    response = client.post(url)
+    assert response.status_code == 400
+    assert Team.objects.count() == 1

umap/tests/test_views.py

@@ -288,6 +288,20 @@ def test_user_dashboard_display_user_maps(client, map):
     assert "Owner only" 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
@@ -474,7 +488,7 @@ def test_websocket_token_returns_a_valid_token_when_authorized(client, user, map
 
 @pytest.mark.django_db
 def test_websocket_token_is_generated_for_editors(client, user, user2, map):
-    map.edit_status = Map.EDITORS
+    map.edit_status = Map.COLLABORATORS
     map.editors.add(user2)
     map.save()
 

umap/urls.py

@@ -16,6 +16,7 @@ from .decorators import (
     can_edit_map,
     can_view_map,
     login_required_if_not_anonymous_allowed,
+    team_members_only,
 )
 from .utils import decorated_patterns
 
@@ -24,6 +25,10 @@ admin.autodiscover()
 urlpatterns = [
     re_path(r"^admin/", admin.site.urls),
     re_path("", include("social_django.urls", namespace="social")),
+    re_path(
+        r"^agnocomplete/",
+        include(("agnocomplete.urls", "agnocomplete"), namespace="agnocomplete"),
+    ),
     re_path(r"^m/(?P<pk>\d+)/$", views.MapShortUrl.as_view(), name="map_short_url"),
     re_path(r"^ajax-proxy/$", cache_page(180)(views.ajax_proxy), name="ajax-proxy"),
     re_path(
@@ -39,7 +44,6 @@ urlpatterns = [
         name="password_change_done",
     ),
     re_path(r"^i18n/", include("django.conf.urls.i18n")),
-    re_path(r"^agnocomplete/", include("agnocomplete.urls")),
     re_path(r"^map/oembed/", views.MapOEmbed.as_view(), name="map_oembed"),
     re_path(
         r"^map/(?P<map_id>\d+)/download/",
@@ -96,12 +100,12 @@ i18n_urls += decorated_patterns(
 )
 i18n_urls += decorated_patterns(
     [ensure_csrf_cookie],
-    re_path(r"^map/$", views.MapPreview.as_view(), name="map_preview"),
-    re_path(r"^map/new/$", views.MapNew.as_view(), name="map_new"),
+    path("map/", views.MapPreview.as_view(), name="map_preview"),
+    path("map/new/", views.MapNew.as_view(), name="map_new"),
 )
 i18n_urls += decorated_patterns(
     [login_required_if_not_anonymous_allowed, never_cache],
-    re_path(r"^map/create/$", views.MapCreate.as_view(), name="map_create"),
+    path("map/create/", views.MapCreate.as_view(), name="map_create"),
 )
 i18n_urls += decorated_patterns(
     [login_required],
@@ -110,9 +114,16 @@ i18n_urls += decorated_patterns(
         views.ToggleMapStarStatus.as_view(),
         name="map_star",
     ),
-    re_path(r"^me$", views.user_dashboard, name="user_dashboard"),
-    re_path(r"^me/profile$", views.user_profile, name="user_profile"),
-    re_path(r"^me/download$", views.user_download, name="user_download"),
+    path("me", views.user_dashboard, name="user_dashboard"),
+    path("me/profile", views.user_profile, name="user_profile"),
+    path("me/download", views.user_download, name="user_download"),
+    path("me/teams", views.UserTeams.as_view(), name="user_teams"),
+    path("team/create/", views.TeamNew.as_view(), name="team_new"),
+)
+i18n_urls += decorated_patterns(
+    [login_required, team_members_only],
+    path("team/<int:pk>/edit/", views.TeamUpdate.as_view(), name="team_update"),
+    path("team/<int:pk>/delete/", views.TeamDelete.as_view(), name="team_delete"),
 )
 map_urls = [
     re_path(
@@ -179,14 +190,13 @@ datalayer_urls = [
 i18n_urls += decorated_patterns([can_edit_map, never_cache], *map_urls)
 i18n_urls += decorated_patterns([never_cache], *datalayer_urls)
 urlpatterns += i18n_patterns(
-    re_path(r"^$", views.home, name="home"),
-    re_path(
-        r"^showcase/$", cache_page(24 * 60 * 60)(views.showcase), name="maps_showcase"
-    ),
-    re_path(r"^search/$", views.search, name="search"),
-    re_path(r"^about/$", views.about, name="about"),
+    path("", views.home, name="home"),
+    path("showcase/", cache_page(24 * 60 * 60)(views.showcase), name="maps_showcase"),
+    path("search/", views.search, name="search"),
+    path("about/", views.about, name="about"),
     re_path(r"^user/(?P<identifier>.+)/stars/$", views.user_stars, name="user_stars"),
     re_path(r"^user/(?P<identifier>.+)/$", views.user_maps, name="user_maps"),
+    path("team/<int:pk>/", views.TeamMaps.as_view(), name="team_maps"),
     re_path(r"", include(i18n_urls)),
 )
 urlpatterns += (

umap/views.py

@@ -62,10 +62,11 @@ from .forms import (
     FlatErrorList,
     MapSettingsForm,
     SendLinkForm,
+    TeamForm,
     UpdateMapPermissionsForm,
     UserProfileForm,
 )
-from .models import DataLayer, Licence, Map, Pictogram, Star, TileLayer
+from .models import DataLayer, Licence, Map, Pictogram, Star, Team, TileLayer
 from .utils import (
     ConflictError,
     _urls_for_js,
@@ -188,6 +189,70 @@ class About(Home):
 about = About.as_view()
 
 
+class TeamNew(CreateView):
+    model = Team
+    fields = ["name", "description"]
+    success_url = reverse_lazy("user_teams")
+
+    def form_valid(self, form):
+        response = super().form_valid(form)
+        self.request.user.teams.add(self.object)
+        self.request.user.save()
+        return response
+
+
+class TeamUpdate(UpdateView):
+    model = Team
+    form_class = TeamForm
+    success_url = reverse_lazy("user_teams")
+
+    def get_initial(self):
+        initial = super().get_initial()
+        initial["members"] = self.object.users.all()
+        return initial
+
+    def form_valid(self, form):
+        actual = self.object.users.all()
+        wanted = form.cleaned_data["members"]
+        for user in wanted:
+            if user not in actual:
+                user.teams.add(self.object)
+                user.save()
+        for user in actual:
+            if user not in wanted:
+                user.teams.remove(self.object)
+                user.save()
+        return super().form_valid(form)
+
+
+class TeamDelete(DeleteView):
+    model = Team
+    success_url = reverse_lazy("user_teams")
+
+    def form_valid(self, form):
+        if self.object.users.count() > 1:
+            return HttpResponseBadRequest(
+                _("Cannot delete a team with more than one member")
+            )
+        messages.info(
+            self.request,
+            _("Team “%(name)s” has been deleted") % {"name": self.object.name},
+        )
+        return super().form_valid(form)
+
+
+class UserTeams(DetailView):
+    model = User
+    template_name = "umap/user_teams.html"
+
+    def get_object(self):
+        return self.get_queryset().get(pk=self.request.user.pk)
+
+    def get_context_data(self, **kwargs):
+        kwargs.update({"teams": self.object.teams.all()})
+        return super().get_context_data(**kwargs)
+
+
 class UserProfile(UpdateView):
     model = User
     form_class = UserProfileForm
@@ -247,6 +312,21 @@ class UserStars(UserMaps):
 user_stars = UserStars.as_view()
 
 
+class TeamMaps(PaginatorMixin, DetailView):
+    model = Team
+    list_template_name = "umap/map_list.html"
+    context_object_name = "current_team"
+
+    def get_maps(self):
+        return Map.public.filter(team=self.object).order_by("-modified_at")
+
+    def get_context_data(self, **kwargs):
+        kwargs.update(
+            {"maps": self.paginate(self.get_maps(), settings.UMAP_MAPS_PER_PAGE)}
+        )
+        return super().get_context_data(**kwargs)
+
+
 class SearchMixin:
     def get_search_queryset(self, **kwargs):
         q = self.request.GET.get("q")
@@ -293,7 +373,12 @@ class UserDashboard(PaginatorMixin, DetailView, SearchMixin):
 
     def get_maps(self):
         qs = self.get_search_queryset() or Map.objects.all()
-        qs = qs.filter(owner=self.object).union(qs.filter(editors=self.object))
+        teams = self.object.teams.all()
+        qs = (
+            qs.filter(owner=self.object)
+            .union(qs.filter(editors=self.object))
+            .union(qs.filter(team__in=teams))
+        )
         return qs.order_by("-modified_at")
 
     def get_context_data(self, **kwargs):
@@ -456,6 +541,23 @@ def simple_json_response(**kwargs):
 # ############## #
 
 
+class SessionMixin:
+    def get_user_data(self):
+        data = {}
+        user = self.request.user
+        if hasattr(self, "object"):
+            data["is_owner"] = self.object.is_owner(user, self.request)
+        if user.is_anonymous:
+            return data
+        return {
+            "id": user.pk,
+            "name": str(self.request.user),
+            "url": reverse("user_dashboard"),
+            "teams": [team.get_metadata() for team in user.teams.all()],
+            **data,
+        }
+
+
 class FormLessEditMixin:
     http_method_names = [
         "post",
@@ -470,7 +572,7 @@ class FormLessEditMixin:
         return self.get_form_class()(**kwargs)
 
 
-class MapDetailMixin:
+class MapDetailMixin(SessionMixin):
     model = Map
     pk_url_kwarg = "map_id"
 
@@ -522,12 +624,7 @@ class MapDetailMixin:
         if self.get_short_url():
             properties["shortUrl"] = self.get_short_url()
 
-        if not user.is_anonymous:
-            properties["user"] = {
-                "id": user.pk,
-                "name": str(user),
-                "url": reverse("user_dashboard"),
-            }
+        properties["user"] = self.get_user_data()
         return properties
 
     def get_context_data(self, **kwargs):
@@ -595,6 +692,8 @@ class PermissionsMixin:
                 {"id": editor.pk, "name": str(editor)}
                 for editor in self.object.editors.all()
             ]
+        if self.object.team:
+            permissions["team"] = self.object.team.get_metadata()
         if not self.object.owner and self.object.is_anonymous_owner(self.request):
             permissions["anonymous_edit_url"] = self.object.get_anonymous_edit_url()
         return permissions
@@ -659,6 +758,12 @@ class MapView(MapDetailMixin, PermissionsMixin, DetailView):
             map_settings["properties"] = {}
         map_settings["properties"]["name"] = self.object.name
         map_settings["properties"]["permissions"] = self.get_permissions()
+        author = self.object.get_author()
+        if author:
+            map_settings["properties"]["author"] = {
+                "name": str(author),
+                "url": author.get_url(),
+            }
         return map_settings
 
     def is_starred(self):
@@ -755,7 +860,7 @@ class MapPreview(MapDetailMixin, TemplateView):
         return properties
 
 
-class MapCreate(FormLessEditMixin, PermissionsMixin, CreateView):
+class MapCreate(FormLessEditMixin, PermissionsMixin, SessionMixin, CreateView):
     model = Map
     form_class = MapSettingsForm
 
@@ -772,6 +877,7 @@ class MapCreate(FormLessEditMixin, PermissionsMixin, CreateView):
             id=self.object.pk,
             url=self.object.get_absolute_url(),
             permissions=permissions,
+            user=self.get_user_data(),
         )
         if not self.request.user.is_authenticated:
             key, value = self.object.signed_cookie_elements

{umap_project-2.5.0.dist-info → umap_project-2.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: umap-project
-Version: 2.5.0
+Version: 2.6.0
 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>
@@ -19,35 +19,35 @@ Requires-Python: >=3.10
 Requires-Dist: django-agnocomplete==2.2.0
 Requires-Dist: django-environ==0.11.2
 Requires-Dist: django-probes==1.7.0
-Requires-Dist: django==5.0.7
+Requires-Dist: django==5.1.1
 Requires-Dist: pillow==10.4.0
 Requires-Dist: psycopg==3.2.1
-Requires-Dist: pydantic==2.8.2
+Requires-Dist: pydantic==2.9.1
 Requires-Dist: rcssmin==1.1.2
 Requires-Dist: requests==2.32.3
 Requires-Dist: rjsmin==1.2.2
-Requires-Dist: social-auth-app-django==5.4.1
+Requires-Dist: social-auth-app-django==5.4.2
 Requires-Dist: social-auth-core==4.5.4
-Requires-Dist: websockets==12.0
+Requires-Dist: websockets==13.0.1
 Provides-Extra: dev
-Requires-Dist: djlint==1.34.1; extra == 'dev'
+Requires-Dist: djlint==1.35.2; extra == 'dev'
 Requires-Dist: hatch==1.12.0; extra == 'dev'
 Requires-Dist: isort==5.13.2; extra == 'dev'
-Requires-Dist: mkdocs-material==9.5.28; extra == 'dev'
+Requires-Dist: mkdocs-material==9.5.34; extra == 'dev'
 Requires-Dist: mkdocs-static-i18n==1.2.3; extra == 'dev'
-Requires-Dist: mkdocs==1.6.0; extra == 'dev'
-Requires-Dist: pymdown-extensions==10.8.1; extra == 'dev'
-Requires-Dist: ruff==0.5.1; extra == 'dev'
+Requires-Dist: mkdocs==1.6.1; extra == 'dev'
+Requires-Dist: pymdown-extensions==10.9; extra == 'dev'
+Requires-Dist: ruff==0.6.4; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uwsgi==2.0.26; extra == 'docker'
 Provides-Extra: test
-Requires-Dist: factory-boy==3.2.1; extra == 'test'
+Requires-Dist: factory-boy==3.3.1; extra == 'test'
 Requires-Dist: playwright>=1.39; extra == 'test'
-Requires-Dist: pytest-django==4.8.0; extra == 'test'
-Requires-Dist: pytest-playwright==0.5.1; extra == 'test'
+Requires-Dist: pytest-django==4.9.0; extra == 'test'
+Requires-Dist: pytest-playwright==0.5.2; extra == 'test'
 Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
-Requires-Dist: pytest==8.2.2; extra == 'test'
+Requires-Dist: pytest==8.3.2; extra == 'test'
 Description-Content-Type: text/markdown
 
 # uMap project