From 2b92af5a0d448a1691d5745ad9188519e699df54 Mon Sep 17 00:00:00 2001 From: nitely Date: Sat, 3 Oct 2020 06:17:42 -0300 Subject: [PATCH] revert #292 --- spirit/core/templates/spirit/_base.html | 2 +- .../spirit/topic/notification/_top_bar.html | 30 +++++- .../spirit/topic/notification/index.html | 2 +- .../topic/notification/index_unread.html | 29 ++++++ spirit/topic/notification/tests.py | 94 +++++++++---------- spirit/topic/notification/urls.py | 1 + spirit/topic/notification/views.py | 26 ++++- 7 files changed, 126 insertions(+), 58 deletions(-) create mode 100644 spirit/topic/notification/templates/spirit/topic/notification/index_unread.html diff --git a/spirit/core/templates/spirit/_base.html b/spirit/core/templates/spirit/_base.html index a7d03d2b2..ba87c986e 100644 --- a/spirit/core/templates/spirit/_base.html +++ b/spirit/core/templates/spirit/_base.html @@ -25,7 +25,7 @@ {% if user.is_authenticated %} stModules.notification(document.querySelectorAll('.js-tab-notification'), { notificationUrl: "{% url "spirit:topic:notification:index-ajax" %}", - notificationListUrl: "{% url "spirit:topic:notification:index" %}", + notificationListUrl: "{% url "spirit:topic:notification:index-unread" %}", mentionTxt: "{% trans "{user} has mention you on {topic}" %}", commentTxt: "{% trans "{user} has commented on {topic}" %}", showAll: "{% trans "Show all" %}", diff --git a/spirit/topic/notification/templates/spirit/topic/notification/_top_bar.html b/spirit/topic/notification/templates/spirit/topic/notification/_top_bar.html index 7cd21dc66..6577ee960 100644 --- a/spirit/topic/notification/templates/spirit/topic/notification/_top_bar.html +++ b/spirit/topic/notification/templates/spirit/topic/notification/_top_bar.html @@ -1,9 +1,35 @@ {% load i18n %}
-
+
- {% trans "Notifications" %} + {% if active == "notifications" %} + {% trans "Notifications" %} + {% else %} + {% trans "Unread notifications" %} + {% endif %} +
+
diff --git a/spirit/topic/notification/templates/spirit/topic/notification/index.html b/spirit/topic/notification/templates/spirit/topic/notification/index.html index 84257bc2e..d28d7ebe4 100644 --- a/spirit/topic/notification/templates/spirit/topic/notification/index.html +++ b/spirit/topic/notification/templates/spirit/topic/notification/index.html @@ -6,7 +6,7 @@ {% block content %}
- {% include "spirit/topic/notification/_top_bar.html" %} + {% include "spirit/topic/notification/_top_bar.html" with active="notifications" %} {% include "spirit/topic/notification/_render_list.html" %} diff --git a/spirit/topic/notification/templates/spirit/topic/notification/index_unread.html b/spirit/topic/notification/templates/spirit/topic/notification/index_unread.html new file mode 100644 index 000000000..86c5f1da3 --- /dev/null +++ b/spirit/topic/notification/templates/spirit/topic/notification/index_unread.html @@ -0,0 +1,29 @@ +{% extends "spirit/_base.html" %} + +{% load spirit_tags i18n %} + +{% block title %}{% trans "Unread notifications" %}{% endblock %} + +{% block content %} +
+ {% include "spirit/topic/notification/_top_bar.html" with active="unread_notifications" %} + + {% if page %} + {% include "spirit/topic/notification/_render_list.html" with notifications=page %} + {% else %} +

{% trans "There are no new notifications" %}.

+ {% endif %} + + {# TODO: make this a template tag #} + {% if page.has_next %} + {% spaceless %} + + {% endspaceless %} + {% endif %} +
+{% endblock %} diff --git a/spirit/topic/notification/tests.py b/spirit/topic/notification/tests.py index e705f4326..b1b8c51a9 100644 --- a/spirit/topic/notification/tests.py +++ b/spirit/topic/notification/tests.py @@ -10,6 +10,7 @@ from django.utils import timezone from djconfig.utils import override_djconfig +from infinite_scroll_pagination.serializers import to_page_key from spirit.core.tests import utils from .models import TopicNotification @@ -58,58 +59,6 @@ def test_topic_notification_list(self): list(response.context['notifications']), [self.topic_notification]) - @override_settings(ST_NOTIFICATIONS_PER_PAGE=20) - def test_topic_notification_list_order(self): - TopicNotification.objects.all().delete() - old_date = timezone.now() - datetime.timedelta(days=10) - topic0 = utils.create_topic(self.category) - comment0 = utils.create_comment(topic=topic0) - tn_comment0 = TopicNotification.objects.create( - user=self.user, topic=topic0, - comment=comment0, is_active=True, - action=COMMENT) - topic1 = utils.create_topic(self.category) - comment1 = utils.create_comment(topic=topic1) - tn_comment1 = TopicNotification.objects.create( - user=self.user, topic=topic1, - comment=comment1, is_active=True, - action=COMMENT, - date=old_date) - topic2 = utils.create_topic(self.category) - comment2 = utils.create_comment(topic=topic2) - tn_mention1 = TopicNotification.objects.create( - user=self.user, topic=topic2, - comment=comment2, is_active=True, - action=MENTION, - date=old_date) - topic3 = utils.create_topic(self.category) - comment3 = utils.create_comment(topic=topic3) - tn_mention2_read = TopicNotification.objects.create( - user=self.user, topic=topic3, - comment=comment3, is_active=True, - is_read=True, - action=MENTION) - topic4 = utils.create_topic(self.category) - comment4 = utils.create_comment(topic=topic4) - tn_comment2 = TopicNotification.objects.create( - user=self.user, topic=topic4, - comment=comment4, is_active=True, - action=COMMENT, - date=old_date) - topic5 = utils.create_topic(self.category) - comment5 = utils.create_comment(topic=topic5) - tn_comment3_read = TopicNotification.objects.create( - user=self.user, topic=topic5, - comment=comment5, is_active=True, - is_read=True, - action=COMMENT) - utils.login(self) - response = self.client.get(reverse('spirit:topic:notification:index')) - self.assertEqual( - list(response.context['notifications']), - [tn_mention1, tn_comment0, tn_comment2, - tn_comment1, tn_mention2_read, tn_comment3_read]) - @override_djconfig(topics_per_page=1) def test_topic_notification_list_paginate(self): """ @@ -146,6 +95,11 @@ def test_topic_notification_list_show_private_topic(self): list(response.context['notifications']), [topic_notif, ]) + # list unread should behave the same + response = self.client.get( + reverse('spirit:topic:notification:index-unread')) + self.assertEqual(list(response.context['page']), [topic_notif, ]) + # ajax list should behave the same response = self.client.get( reverse('spirit:topic:notification:index-ajax'), @@ -193,6 +147,11 @@ def test_topic_notification_list_dont_show_topic_removed_or_no_access(self): response = self.client.get(reverse('spirit:topic:notification:index')) self.assertEqual(list(response.context['notifications']), []) + # list unread should behave the same + response = self.client.get( + reverse('spirit:topic:notification:index-unread')) + self.assertEqual(list(response.context['page']), []) + # ajax list should behave the same response = self.client.get( reverse('spirit:topic:notification:index-ajax'), @@ -200,6 +159,37 @@ def test_topic_notification_list_dont_show_topic_removed_or_no_access(self): res = json.loads(response.content.decode('utf-8')) self.assertEqual(len(res['n']), 0) + @override_settings(ST_NOTIFICATIONS_PER_PAGE=10) + def test_topic_notification_list_unread(self): + """ + topic notification list + """ + topic = utils.create_topic(self.category, user=self.user2) + comment = utils.create_comment(topic=topic, user=self.user2) + topic_notification = TopicNotification.objects.create( + user=self.user, + topic=topic, + comment=comment, + is_active=True, + action=COMMENT) + + utils.login(self) + response = self.client.get( + reverse('spirit:topic:notification:index-unread')) + self.assertEqual( + list(response.context['page']), + [topic_notification, self.topic_notification]) + + # fake next page + response = self.client.get( + reverse('spirit:topic:notification:index-unread'), + {'p': to_page_key( + value=topic_notification.date, + pk=topic_notification.pk)}) + self.assertEqual( + list(response.context['page']), + [self.topic_notification, ]) + def test_topic_notification_ajax(self): """ get notifications diff --git a/spirit/topic/notification/urls.py b/spirit/topic/notification/urls.py index 48c669474..b5fb85485 100644 --- a/spirit/topic/notification/urls.py +++ b/spirit/topic/notification/urls.py @@ -8,6 +8,7 @@ app_name = 'notification' urlpatterns = [ re_path(r'^$', views.index, name='index'), + re_path(r'^unread/$', views.index_unread, name='index-unread'), re_path(r'^ajax/$', views.index_ajax, name='index-ajax'), re_path(r'^(?P[0-9]+)/create/$', views.create, name='create'), re_path(r'^(?P[0-9]+)/update/$', views.update, name='update'), diff --git a/spirit/topic/notification/views.py b/spirit/topic/notification/views.py index 364cb8f58..3204a26e8 100644 --- a/spirit/topic/notification/views.py +++ b/spirit/topic/notification/views.py @@ -11,10 +11,12 @@ from django.urls import reverse from djconfig import config +from infinite_scroll_pagination.serializers import to_page_key from spirit.core.conf import settings from spirit.core import utils from spirit.core.utils.paginator import yt_paginate +from spirit.core.utils.paginator.infinite_paginator import paginate from spirit.core.utils.views import is_ajax from spirit.topic.models import Topic from .models import TopicNotification @@ -63,7 +65,7 @@ def index_ajax(request): notifications = ( TopicNotification.objects .for_access(request.user) - .order_by("is_read", "action", "-date", "-pk") + .order_by("is_read", "-date") .with_related_data()) notifications = notifications[:settings.ST_NOTIFICATIONS_PER_PAGE] notifications = [ @@ -79,12 +81,32 @@ def index_ajax(request): content_type="application/json") +@login_required +def index_unread(request): + notifications = ( + TopicNotification.objects + .for_access(request.user) + .filter(is_read=False) + .with_related_data()) + page = paginate( + request, + query_set=notifications, + lookup_field='date', + page_var='p', + per_page=settings.ST_NOTIFICATIONS_PER_PAGE) + return render( + request=request, + template_name='spirit/topic/notification/index_unread.html', + context={ + 'page': page, + 'next_page': to_page_key(**page.next_page())}) + + @login_required def index(request): notifications = yt_paginate( TopicNotification.objects .for_access(request.user) - .order_by("is_read", "action", "-date", "-pk") .with_related_data(), per_page=config.topics_per_page, page_number=request.GET.get('page', 1))