diff --git a/umap/templates/umap/user_dashboard.html b/umap/templates/umap/user_dashboard.html
new file mode 100644
index 00000000..1f96a3c7
--- /dev/null
+++ b/umap/templates/umap/user_dashboard.html
@@ -0,0 +1,25 @@
+{% extends "umap/content.html" %}
+{% load i18n %}
+
+{% block head_title %}
+ {{ SITE_NAME }} - {% trans "My dashboard" %}
+{% endblock head_title %}
+
+{% block maincontent %}
+ {% trans "Search my maps" as placeholder %}
+
+
{% trans "My dashboard" %}
+ {% include "umap/search_bar.html" with action=request.get_full_path placeholder=placeholder %}
+
+
+
+ {% if maps %}
+ {% include "umap/map_table.html" %}
+ {% else %}
+
+ {% endif %}
+
+
+{% endblock maincontent %}
diff --git a/umap/tests/test_views.py b/umap/tests/test_views.py
index fc05b4b4..f8522d39 100644
--- a/umap/tests/test_views.py
+++ b/umap/tests/test_views.py
@@ -240,3 +240,22 @@ def test_change_user_slug(client, user, settings):
settings.USER_URL_FIELD = "pk"
response = client.get(reverse("home"))
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.get_absolute_url()}?download" in body
diff --git a/umap/urls.py b/umap/urls.py
index f770425a..10e111dc 100644
--- a/umap/urls.py
+++ b/umap/urls.py
@@ -98,6 +98,11 @@ i18n_urls += decorated_patterns(
views.ToggleMapStarStatus.as_view(),
name="map_star",
),
+ re_path(
+ r"^me$",
+ views.user_dashboard,
+ name="user_dashboard",
+ ),
)
map_urls = [
re_path(
diff --git a/umap/views.py b/umap/views.py
index 9a956961..3459e49e 100644
--- a/umap/views.py
+++ b/umap/views.py
@@ -77,7 +77,7 @@ PRIVATE_IP = re.compile(
ANONYMOUS_COOKIE_MAX_AGE = 60 * 60 * 24 * 30 # One month
-class PaginatorMixin(object):
+class PaginatorMixin:
per_page = 5
def paginate(self, qs, per_page=None):
@@ -94,9 +94,20 @@ class PaginatorMixin(object):
qs = paginator.page(paginator.num_pages)
return qs
+ def get_context_data(self, **kwargs):
+ kwargs.update({"is_ajax": is_ajax(self.request)})
+ return super().get_context_data(**kwargs)
+
+ def get_template_names(self):
+ """
+ Dispatch template according to the kind of request: ajax or normal.
+ """
+ if is_ajax(self.request):
+ return [self.list_template_name]
+ return super().get_template_names()
+
class PublicMapsMixin(object):
-
def get_public_maps(self):
qs = Map.public
if (
@@ -109,7 +120,7 @@ class PublicMapsMixin(object):
return maps
-class Home(TemplateView, PublicMapsMixin, PaginatorMixin):
+class Home(PaginatorMixin, TemplateView, PublicMapsMixin):
template_name = "umap/home.html"
list_template_name = "umap/map_list.html"
@@ -142,15 +153,6 @@ class Home(TemplateView, PublicMapsMixin, PaginatorMixin):
"showcase_map": showcase_map,
}
- def get_template_names(self):
- """
- Dispatch template according to the kind of request: ajax or normal.
- """
- if is_ajax(self.request):
- return [self.list_template_name]
- else:
- return [self.template_name]
-
home = Home.as_view()
@@ -162,7 +164,7 @@ class About(Home):
about = About.as_view()
-class UserMaps(DetailView, PaginatorMixin):
+class UserMaps(PaginatorMixin, DetailView):
model = User
slug_url_kwarg = "identifier"
slug_field = settings.USER_URL_FIELD
@@ -190,15 +192,6 @@ class UserMaps(DetailView, PaginatorMixin):
kwargs.update({"maps": self.paginate(self.get_maps(), self.per_page)})
return super().get_context_data(**kwargs)
- def get_template_names(self):
- """
- Dispatch template according to the kind of request: ajax or normal.
- """
- if is_ajax(self.request):
- return [self.list_template_name]
- else:
- return super(UserMaps, self).get_template_names()
-
user_maps = UserMaps.as_view()
@@ -216,37 +209,34 @@ class UserStars(UserMaps):
user_stars = UserStars.as_view()
-class Search(TemplateView, PublicMapsMixin, PaginatorMixin):
- template_name = "umap/search.html"
- list_template_name = "umap/map_list.html"
-
- def get_context_data(self, **kwargs):
+class SearchMixin:
+ def get_search_queryset(self, **kwargs):
q = self.request.GET.get("q")
- qs_count = 0
- results = []
if q:
vector = SearchVector("name", config=settings.UMAP_SEARCH_CONFIGURATION)
query = SearchQuery(
q, config=settings.UMAP_SEARCH_CONFIGURATION, search_type="websearch"
)
- qs = Map.objects.annotate(search=vector).filter(search=query)
+ return Map.objects.annotate(search=vector).filter(search=query)
+
+
+class Search(PaginatorMixin, TemplateView, PublicMapsMixin, SearchMixin):
+ template_name = "umap/search.html"
+ list_template_name = "umap/map_list.html"
+
+ def get_context_data(self, **kwargs):
+ qs = self.get_search_queryset()
+ qs_count = 0
+ results = []
+ if qs is not None:
qs = qs.filter(share_status=Map.PUBLIC).order_by("-modified_at")
qs_count = qs.count()
results = self.paginate(qs)
else:
- results = self.get_public_maps()[:settings.UMAP_MAPS_PER_SEARCH]
- kwargs.update({"maps": results, "count": qs_count, "q": q})
+ results = self.get_public_maps()[: settings.UMAP_MAPS_PER_SEARCH]
+ kwargs.update({"maps": results, "count": qs_count})
return kwargs
- def get_template_names(self):
- """
- Dispatch template according to the kind of request: ajax or normal.
- """
- if is_ajax(self.request):
- return [self.list_template_name]
- else:
- return super(Search, self).get_template_names()
-
@property
def per_page(self):
return settings.UMAP_MAPS_PER_SEARCH
@@ -255,6 +245,29 @@ class Search(TemplateView, PublicMapsMixin, PaginatorMixin):
search = Search.as_view()
+class UserDashboard(PaginatorMixin, DetailView, SearchMixin):
+ model = User
+ template_name = "umap/user_dashboard.html"
+ list_template_name = "umap/map_table.html"
+
+ def get_object(self):
+ return self.get_queryset().get(pk=self.request.user.pk)
+
+ def get_maps(self):
+ qs = self.get_search_queryset() or Map.objects.all()
+ qs = qs.filter(Q(owner=self.object) | Q(editors=self.object))
+ return qs.order_by("-modified_at")
+
+ def get_context_data(self, **kwargs):
+ kwargs.update(
+ {"maps": self.paginate(self.get_maps(), settings.UMAP_MAPS_PER_PAGE_OWNER)}
+ )
+ return super().get_context_data(**kwargs)
+
+
+user_dashboard = UserDashboard.as_view()
+
+
class MapsShowCase(View):
def get(self, *args, **kwargs):
maps = Map.public.filter(center__distance_gt=(DEFAULT_CENTER, D(km=1)))
@@ -436,7 +449,7 @@ class MapDetailMixin:
properties["user"] = {
"id": user.pk,
"name": str(user),
- "url": user.get_url(),
+ "url": reverse("user_dashboard"),
}
map_settings = self.get_geojson()
if "properties" not in map_settings: