Merge pull request #2012 from betagouv/feat/files-tab-upload#1967

feat: Restauration de l'upload de document depuis l'onglet Fichiers

Author: alice-telescoop

recoco/apps/conversations/templates/conversations/messages/fragments/type_followup_item.html

@@ -1,10 +1,9 @@
-<div class="observed-element"
-     :data-notifications="JSON.stringify({id: element.id, unread: element.unread, type: element.type})"
-     x-data="TaskStatus()">
+<div x-data="TaskStatus()">
     <div class="fr-mb-0 d-flex align-items-center justify-content-center">
         <div class="d-flex align-items-center"
              x-data="{user: null}"
              x-init="user = getUserById(element.actor.id);">{% include "user/user_card_js.html" %}</div>
-        <span class="followup-item__action fr-ml-1v" x-text="element.verb + ' : ' + element.action_object.feed_label"></span>
+        <span class="followup-item__action fr-ml-1v"
+              x-text="element.verb + ' : ' + element.action_object.feed_label"></span>
     </div>
 </div>

recoco/apps/projects/templates/projects/project/documents.html

@@ -26,22 +26,14 @@
             <div class="col-8">
                 <div class="d-flex align-items-center justify-content-between fr-mb-3w">
                     <h6 class="text-uppercase small fr-mb-0">
-                        {% with public_files.count as files_count %}
+                        {% with all_files.count as files_count %}
                             {% if files_count > 0 %}{{ files_count }}{% endif %}
                             fichier{{ files_count|pluralize }} partagé{{ files_count|pluralize }}
                         {% endwith %}
                     </h6>
                     {% if "manage_documents" in user_project_perms %}
-                        <button class="fr-btn fr-btn--sm fr-btn--secondary"
-                                aria-describedby="tooltip-add-file">Ajouter un fichier</button>
-                        <span class="fr-tooltip fr-placement fr-placement-bottom fr-text--xs z-1001"
-                              role="tooltip"
-                              id="tooltip-add-file">
-                            L'ajout de nouveaux fichiers se fait <a class="fr-link fr-text--xs fr-text--bold"
-    href="{% url 'projects-project-detail-conversations' project.pk %}">dans la conversation</a>.
-                        </span>
-                        {% comment %} {% url 'projects-documents-upload-document' project.pk as upload_action %}
-                        {% include "projects/project/fragments/files_links/file_upload_button.html" with type="project" action=upload_action small=True %} {% endcomment %}
+                        {% url 'projects-documents-upload-document' project.pk as upload_action %}
+                        {% include "projects/project/fragments/files_links/file_upload_button.html" with type="project" action=upload_action small=True %}
                     {% endif %}
                 </div>
                 <!-- Fichiers partagés -->

recoco/apps/projects/tests/test_documents.py

@@ -21,6 +21,7 @@
 from recoco.apps.projects.utils import assign_advisor, assign_collaborator
 from recoco.utils import login
 
+from ...conversations import models as conversation_models
 from .. import models
 
 
@@ -193,13 +194,17 @@ def test_upload_file_available_for_project_collaborators(
 
     assert response.status_code == 302
 
-    document = models.Document.objects.all()[0]
+    document = models.Document.objects.first()
     assert document.project == project
     assert document.description == data["description"]
     assert document.uploaded_by == user
     assert not document.private
     assert document.the_file is not None
 
+    msg = conversation_models.Message.objects.first()
+    assert msg.posted_by == user
+    assert msg.nodes.first().document == document
+
 
 @pytest.mark.django_db
 def test_upload_file_rejects_executables(client, request, project, malicious_file):
@@ -229,9 +234,7 @@ def test_upload_document_is_either_link_or_file(client, request, project):
 
 
 @pytest.mark.django_db
-def test_upload_file_does_not_trigger_notifications(
-    client, request, project, good_file
-):
+def test_upload_file_trigger_msg_trace_notif(client, request, project, good_file):
     data = {"description": "this is some content", "the_file": good_file}
 
     other_user = baker.make(auth_models.User)
@@ -247,10 +250,12 @@ def test_upload_file_does_not_trigger_notifications(
     assert response.status_code == 302
 
     document = models.Document.objects.all()[0]
+    msg = document.documentnode_set.first().message
 
-    assert action_object_stream(document).count() == 1
+    assert action_object_stream(msg).count() == 1
+    assert action_object_stream(document).count() == 0
     assert user.notifications.count() == 0
-    assert other_user.notifications.count() == 0
+    assert other_user.notifications.count() == 1
 
 
 @pytest.mark.django_db

recoco/apps/projects/views/documents.py

@@ -11,6 +11,7 @@
 from django.contrib.auth.decorators import login_required
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import PermissionDenied
+from django.db import transaction
 from django.db.utils import IntegrityError
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
@@ -19,7 +20,9 @@
 from recoco.apps.survey.models import Answer
 from recoco.utils import has_perm, has_perm_or_403
 
-from .. import models, signals
+from ...conversations import models as conversation_models
+from ...conversations import signals as conversation_signals
+from .. import models
 from ..forms import DocumentUploadForm
 from ..utils import get_advising_context_for_project, is_regional_actor_for_project
 
@@ -110,19 +113,29 @@ def document_upload(request, project_id):
             instance.uploaded_by = request.user
             instance.private = False
 
+            msg = conversation_models.Message(
+                posted_by=instance.uploaded_by, project=project
+            )
+            node = conversation_models.DocumentNode(
+                document=instance, position=1, message=msg
+            )
+
             try:
-                instance.save()
+                with transaction.atomic():
+                    instance.save()
+                    msg.save()
+                    node.save()
 
-                signals.document_uploaded.send(
-                    sender=document_upload, instance=instance
+                conversation_signals.message_posted.send(
+                    sender=document_upload, message=msg
                 )
 
                 messages.success(
                     request,
                     "Le document a bien été enregistré",
                 )
 
-            except IntegrityError:
+            except IntegrityError as _e:
                 messages.error(request, "Impossible de sauver le document")
 
     return redirect(reverse("projects-project-detail-documents", args=[project.id]))

recoco/frontend/src/css/projects/conversations_new.scss

@@ -321,6 +321,7 @@
             color: #3a3a3a;
             font-size: 14px;
             font-weight: 700;
+            margin-right: 0.25rem;
           }
           &__filename,
           &__size {
@@ -331,7 +332,7 @@
           &__info-container,
           &__actions-container {
             display: flex;
-            align-items: center;
+            align-items: baseline;
           }
         }
       }