Merge branch 'develop'

Author: glibersat

frontend_tests/cypress/e2e/project/tasks/canPublishTaskWithRessource.cy.js

@@ -1,7 +1,13 @@
 describe('I can attach miscellanious ressource to task @page-projet-recommandations-creation', () => {
   it('publishes a task with resource comment / no comment', () => {
     cy.login('conseiller1');
-    cy.visit(`/projects/action/?project_id=25`);
+    cy.visit('/project/1');
+    cy.visit('/project/25');
+
+    cy.visit(`/projects/action/?resource_id=2`);
+    cy.get('[data-cy="reco-pusher-selected-project"]').contains(
+      'commune de test - Projet avec une reco qui a une resource qui a des contacts'
+    );
 
     cy.get('[data-cy="radio-push-reco-single-resource"]').should('be.checked');
 

frontend_tests/cypress/e2e/project/tasks/contact/canCreateContactOrgaAndGroup.cy.js

@@ -1,4 +1,6 @@
+from django.contrib.sites.shortcuts import get_current_site
 from rest_framework.filters import BaseFilterBackend
+from rest_framework.response import Response
 from rest_framework.viewsets import ModelViewSet
 
 from recoco.rest_api.filters import (
@@ -44,6 +46,16 @@ def get_serializer_class(self):
             case _:
                 return serializers.OrganizationSerializer
 
+    def create(self, request, *args, **kwargs):
+        instance = Organization.objects.filter(name=request.data["name"]).first()
+        if instance is not None:
+            # if someone create an organization that exists in another site we just enable this one to the new one
+            instance.sites.add(get_current_site(request))
+            serializer = self.get_serializer(instance)
+            # todo handle potential new data from creation request. Now it is discarded
+            return Response(serializer.data)
+        return super().create(request, *args, **kwargs)
+
 
 class OrgaStartswithFilterBackend(BaseFilterBackend):
     def filter_queryset(self, request, queryset, view):

…ject/tasks/contact/canShareContact.cy.js …sks/contact/canEditAndShareContact.cy.jsfrontend_tests/cypress/e2e/project/tasks/contact/canShareContact.cy.js renamed to frontend_tests/cypress/e2e/project/tasks/contact/canEditAndShareContact.cy.js frontend_tests/cypress/e2e/project/tasks/contact/canShareContact.cy.js renamed to frontend_tests/cypress/e2e/project/tasks/contact/canEditAndShareContact.cy.js

@@ -7,7 +7,7 @@
       .actions {
         &__search-bar {
           position: relative;
-          width: 75%;
+          width: 50%;
           max-width: 852px;
           span {
             position: absolute;

recoco/apps/addressbook/rest.py

@@ -51,7 +51,8 @@ <h2>Contact</h2>
                            placeholder="Rechercher">
                 </div>
                 <button class="actions__add-contact no-wrap fr-btn fr-btn--icon-left fr-icon-add-line"
-                        @click="openModalCreateContact()">Créer un contact</button>
+                        @click="openModalCreateContact()"
+                        data-test-id="button-create-contact">Créer un contact</button>
             </div>
             <div class="header__filter d-flex">
                 <template x-for="letter of letters">
@@ -76,11 +77,12 @@ <h2>Contact</h2>
                         x-text="nationalGroup.name"></h3>
                     <template x-for="organization in nationalGroup.organizations" :key="index">
                         <div class="organization-container">
-                            <div class="d-flex align-items-center">
+                            <div class="d-flex align-items-center" data-test-id="organization-header">
                                 <h3 class="organization__name fr-mb-0 no-wrap" x-text="organization.name"></h3>
                                 <button class="fr-btn fr-btn--tertiary-no-outline fr-btn--sm fr-icon-pencil-line button__actions-edit"
-                                        @click="openModalCreateOrganization(organization, nationalGroup)">
-                                    Éditer l'organisation'
+                                        @click="openModalCreateOrganization(organization, nationalGroup)"
+                                        data-test-id="button-edit-organization">
+                                    Éditer l'organisation
                                 </button>
                                 <template x-if="organization.departments?.length > 0">
                                     <div class="organization__departments"

recoco/apps/addressbook/static/addressbook/css/contact_list.scss

@@ -1,4 +1,5 @@
 import pytest
+from django.contrib.sites.models import Site
 from django.urls import reverse
 from model_bakery import baker
 
@@ -70,3 +71,16 @@ def test_update_use_given_group(api_client, staff_user, current_site):
     api_client.force_authenticate(staff_user)
     response = api_client.patch(url, {"group": group.id, "name": "orga_name"})
     assert response.data["group"] == group.id
+
+
+@pytest.mark.django_db
+def test_add_sites_to_orga_when_created_same_name(api_client, staff_user):
+    site = baker.make(Site)
+    organization = baker.make(Organization, name="Services Secrets 91", sites=[site])
+    url = reverse("api-addressbook-organization-list")
+    api_client.force_authenticate(staff_user)
+    response = api_client.post(url, {"name": organization.name})
+    assert response.data["id"] == organization.id
+    assert response.status_code == 200
+    organization.refresh_from_db()
+    assert site in organization.sites.all()

recoco/apps/addressbook/templates/addressbook/contact_list.html

@@ -407,10 +407,7 @@ def test_crm_user_update_profile_information_and_email_address(request, client):
 
     # the confirmation email has been sent
     assert len(django.core.mail.outbox) == 1
-    assert (
-        "Pour activer votre compte, vous pouvez copier-coller le lien ci-dessous dans votre navigateur internet"
-        in django.core.mail.outbox[0].subject
-    )
+    assert "Confirmez votre adresse email" in django.core.mail.outbox[0].subject
 
 
 @pytest.mark.django_db

recoco/apps/addressbook/tests/test_rest_organization.py

@@ -764,6 +764,10 @@ form > p {
   font-size: 18px !important;
 }
 
+.h2-rework {
+  font-size: 28px;
+}
+
 .size-20px {
   font-size: 20px;
 }
@@ -805,3 +809,11 @@ form > p {
   color: white !important;
   text-decoration: none !important;
 }
+
+/* ¯¯¯¯¯¯¯¯ *\
+  Espacement
+\* ˍˍˍˍˍˍˍˍ */
+
+.fr-pt-05v {
+  padding-top: 2px;
+}

recoco/apps/crm/tests/test_user.py

@@ -148,12 +148,19 @@ def test_invite_available_for_everyone(request, client):
 def test_invite_404_if_already_accepted(request, client):
     current_site = get_current_site(request)
     baker.make(home_models.SiteConfiguration, site=current_site)
-    invite = Recipe(models.Invite, site=current_site, accepted_on=timezone.now()).make()
 
-    url = reverse("invites-invite-details", args=[invite.pk])
-    response = client.get(url)
-
-    assert response.status_code == 404
+    with login(client) as user:
+        invite = baker.make(
+            models.Invite, site=current_site, accepted_on=timezone.now()
+        )
+        invite.project.members.add(user, through_defaults={"is_owner": False})
+        url = reverse("invites-invite-details", args=[invite.pk])
+        response = client.get(url, follow=True)
+        last_url, status_code = response.redirect_chain[-1]
+        assert status_code == 302
+        assert last_url == reverse(
+            "projects-project-detail-overview", args=(invite.project_id,)
+        )
 
 
 @pytest.mark.django_db
@@ -729,16 +736,19 @@ def test_user_cannot_access_already_refused_invitation(
     baker.make(home_models.SiteConfiguration, site=current_site)
 
     with login(client, email="invited@here.tld") as user:
-        invite = Recipe(
+        invite = baker.make(
             models.Invite,
             site=current_site,
             email=user.email,
             refused_on=timezone.now(),
-        ).make()
+        )
         url = reverse("invites-invite-accept", args=[invite.pk])
-        response = client.post(url)
-
-    assert response.status_code == 404
+        response = client.post(url, follow=True)
+        last_url, status_code = response.redirect_chain[-1]
+        assert status_code == 302
+        assert last_url == reverse(
+            "projects-project-detail-overview", args=(invite.project_id,)
+        )
 
 
 @pytest.mark.django_db