Update communication view to be an independent page (#4414)

Depends on: 
- #3944
- #4413

What's changed: 
- project and submission to use the same communication page
- update urls to point to the new page
- update urls in email. 
- Cleanup the old comment view page code
- new permission check added "view_comments" -- anyone with either
access to project or submission will have access to it's comments page.

Other updates:
- Global activity feed has updated text for the comments
- New function based view is use to show and add comment
- Remove the use of tab.js on the submisison/project detail page, all
the tabs are server-rendered full-page now.

Fixes #4355

Author: theskumar

.test_durations

@@ -205,7 +205,7 @@ def handle_paf_assignment(self, source, paf_approvals, **kwargs):
                 ]
             )
             users_sentence = " and".join(users.rsplit(",", 1))
-            return _("Project form assigned to {}").format(users_sentence)
+            return _("assigned Project form to {}").format(users_sentence)
         return None
 
     def handle_task_removal(self, source, task, **kwargs):

hypha/apply/activity/adapters/activity_feed.py

@@ -252,7 +252,7 @@ def notify_comment(self, **kwargs):
         # Pass the user object to render_message rather than the email string
         recipient_obj = User.objects.get(email__exact=recipient)
         kwargs["recipient"] = recipient_obj
-        if not comment.priviledged:
+        if not comment.privileged:
             return self.render_message("messages/email/comment.html", **kwargs)
 
     def recipients(self, message_type, source, user, **kwargs):

hypha/apply/activity/adapters/emails.py

@@ -241,10 +241,16 @@ class Meta:
         base_manager_name = "objects"
 
     def get_absolute_url(self):
-        return f"{self.source.get_absolute_url()}#communications--{self.id}"
+        # coverup for both submission and project as source.
+        submission_id = (
+            self.source.submission.id
+            if hasattr(self.source, "submission")
+            else self.source.id
+        )
+        return f"{reverse('funds:submissions:comments', args=[submission_id])}#communications--{self.id}"
 
     @property
-    def priviledged(self):
+    def privileged(self):
         # Not visible to applicant
         return self.visibility not in [APPLICANT, PARTNER, APPLICANT_PARTNERS, ALL]
 

hypha/apply/activity/models.py

@@ -6,7 +6,7 @@
 {# fmt:off #}
 {% block more_info %}{% trans "Link to your application" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
 
-{% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
+{% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{% if source.submission %}{% url 'funds:submissions:comments' pk=source.submission.pk %}{% else %}{% url 'funds:submissions:comments' pk=source.pk %}{% endif %}
 
 {% trans "See our guide for more information" %}: {{ ORG_GUIDE_URL }}
 

hypha/apply/activity/templates/activity/include/comment_form.html

@@ -9,7 +9,7 @@
 {% display_name_for_email user as display_user %}
 {% blocktrans with title=source.title user=comment.user %}There has been a new comment on "{{ title }}" by {{ display_user }}.{% endblocktrans %}
 
-{% trans "Read the full comment here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
+{% trans "Read the full comment here" %}: {{ request.scheme }}://{{ request.get_host }}{{ comment.get_absolute_url }}
 {% endblock %}
 
 {% block more_info %}

hypha/apply/activity/templates/messages/email/applicant_base.html

@@ -26,7 +26,7 @@
 {% block more_info %}
 {% if request.user != source.user %}
 {% trans "Link to your application" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
-{% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
+{% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'funds:submissions:comments' pk=source.submission.pk %}
 
 {% trans "See our guide for more information" %}: {{ ORG_GUIDE_URL }}
 

hypha/apply/activity/templates/messages/email/comment.html

@@ -8,7 +8,7 @@
 
 {% block more_info %}
 {% trans "Here is the link to start creating your proposal" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
-{% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
+{% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'funds:submissions:comments' pk=source.pk %}
 
 {% blocktrans %}The system will allow you to save a draft of your proposal as you work on it. When you feel it is ready for our review, please click the “Submit” button and we’ll know to take a look at it. We’ll reply to you with feedback on your Proposal as quickly as possible.{% endblocktrans %}
 

hypha/apply/activity/templates/messages/email/contract_uploaded.html

@@ -8,7 +8,7 @@
 
 {% block more_info %}
 {% trans "Link to your project" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
-{% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
+{% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'funds:submissions:comments' pk=source.submission.pk %}
 
 {% trans "See our guide for more information" %}: {{ ORG_GUIDE_URL }}
 

hypha/apply/activity/templates/messages/email/invited_to_proposal.html

@@ -7,7 +7,7 @@
 
 {% if source.is_draft %}{% trans "Please note that it is not submitted for review because it's still in draft." %} {% trans "You can access the draft at" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}{% else %}{% trans "We will review and reply to your submission as quickly as possible." %}{% endif %}
 
-{% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
+{% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'funds:submissions:comments' pk=source.pk %}
 
 {% blocktrans %}If you have issues accessing the submission system or general inquiries, please email us at {{ ORG_EMAIL }}.{% endblocktrans %}
 

hypha/apply/activity/templates/messages/email/ready_for_invoicing.html

@@ -5,5 +5,5 @@
 {% block content %}{# fmt:off #}
 {% blocktrans with old_status=old_phase.public_name new_status=source.phase.public_name %}Your application is now in "{{ new_status }}" status (progressed from "{{ old_status }}").{% endblocktrans %}
 
-{% trans "Please submit any questions related to your application here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
+{% trans "Please submit any questions related to your application here" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'funds:submissions:comments' pk=source.pk %}
 {% endblock %}{# fmt:on #}

hypha/apply/activity/templates/messages/email/submission_confirmation.html

@@ -1,23 +1,18 @@
-from django.conf import settings
 from django.contrib.auth.decorators import login_required
+from django.core.exceptions import PermissionDenied
 from django.core.paginator import Paginator
 from django.shortcuts import get_object_or_404, render
-from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.http import require_http_methods
-from django.views.generic import CreateView, ListView
-from django_ratelimit.decorators import ratelimit
+from django.views.generic import ListView
+from rolepermissions.checkers import has_object_permission
 
 from hypha.apply.funds.models.submissions import ApplicationSubmission
-from hypha.apply.funds.permissions import has_permission as has_funds_permission
 from hypha.apply.users.decorators import staff_required
 from hypha.apply.utils.storage import PrivateMediaView
-from hypha.apply.utils.views import DelegatedViewMixin
 
 from . import services
 from .filters import NotificationFilter
-from .forms import CommentForm
-from .messaging import MESSAGES, messenger
 from .models import COMMENT, Activity, ActivityAttachment
 
 
@@ -39,13 +34,13 @@ def partial_comments(request, pk: int):
     Returns:
         HttpResponse: The rendered 'activity_list' template with the context data.
     """
-    obj = get_object_or_404(ApplicationSubmission, pk=pk)
-    has_funds_permission(
-        "submission_view", request.user, object=obj, raise_exception=True
-    )
-    editable = not obj.is_archive
+    submission = get_object_or_404(ApplicationSubmission, pk=pk)
+    if not has_object_permission("view_comments", request.user, submission):
+        raise PermissionDenied
 
-    qs = services.get_related_activities_for_user(obj, request.user)
+    editable = not submission.is_archive
+
+    qs = services.get_related_activities_for_user(submission, request.user)
     page = Paginator(qs, per_page=10, orphans=5).page(request.GET.get("page", 1))
 
     ctx = {
@@ -87,66 +82,20 @@ class ActivityContextMixin:
     """Mixin to add related 'comments' of the current view's 'self.object'"""
 
     def get_context_data(self, **kwargs):
-        # Do not prefetch on the related_object__author as the models
-        # are not homogeneous and this will fail
-        activities = services.get_related_activities_for_user(
-            self.object, self.request.user
-        )
-
         # Comments for both projects and applications exist under the original application
         if isinstance(self.object, ApplicationSubmission):
             application_obj = self.object
         else:
             application_obj = self.object.submission
 
-        comments_count = services.get_comment_count(application_obj, self.request.user)
-
-        extra = {"activities": activities, "comments_count": comments_count}
+        extra = {
+            "comments_count": services.get_comment_count(
+                application_obj, self.request.user
+            )
+        }
         return super().get_context_data(**extra, **kwargs)
 
 
-@method_decorator(
-    ratelimit(key="user", rate=settings.DEFAULT_RATE_LIMIT, method="POST"),
-    name="dispatch",
-)
-class CommentFormView(DelegatedViewMixin, CreateView):
-    form_class = CommentForm
-    context_name = "comment_form"
-
-    def form_valid(self, form):
-        source = self.kwargs["object"]
-        form.instance.user = self.request.user
-        form.instance.source = source
-        form.instance.type = COMMENT
-        form.instance.timestamp = timezone.now()
-        response = super().form_valid(form)
-        messenger(
-            MESSAGES.COMMENT,
-            request=self.request,
-            user=self.request.user,
-            source=source,
-            related=self.object,
-        )
-        return response
-
-    def get_success_url(self):
-        return self.object.source.get_absolute_url() + "#communications"
-
-    def get_form_kwargs(self) -> dict:
-        """Get the kwargs for the [`CommentForm`][hypha.apply.activity.forms.CommentForm].
-
-        Returns:
-            A dict of kwargs to be passed to [`CommentForm`][hypha.apply.activity.forms.CommentForm].
-            The submission instance is removed from this return, while a boolean of `has_partners` is
-            added based off the submission.
-        """
-        kwargs = super().get_form_kwargs()
-        instance = kwargs.pop("instance")
-        if isinstance(instance, ApplicationSubmission):
-            kwargs["submission_partner_list"] = instance.partners.all()
-        return kwargs
-
-
 class AttachmentView(PrivateMediaView):
     model = ActivityAttachment
 

hypha/apply/activity/templates/messages/email/transition.html

@@ -27,6 +27,22 @@ def can_edit_submission(user, submission):
     return True, ""
 
 
+@register_object_checker()
+def view_comments(role, user, submission) -> bool:
+    from hypha.apply.projects.permissions import can_access_project
+
+    if role == StaffAdmin:
+        return True
+
+    if is_user_has_access_to_view_submission(user, submission):
+        return True
+
+    if submission.project and can_access_project(user, submission.project):
+        return True
+
+    return False
+
+
 @register_object_checker()
 def delete_submission(role, user, submission) -> bool:
     """