Merge branch 'develop'

Author: glibersat

frontend_tests/README.md

@@ -190,6 +190,7 @@ Merci de mettre à jour la colonne `Utilisé` en fonction de l'utilisation du co
 | Projet - Paramètres        | `/project/{id}/administration` | Mettre projet en pause                             | `// @page-projet-parametres-pause-projet`           |      ❌ |
 | Projet - Paramètres        | `/project/{id}/administration` | Quitter le projet                                  | `// @page-projet-parametres-quitter-projet`         |      ❌ |
 | Déposer un projet          | `/onboarding/project`          | Page                                               | `// @deposer-projet`                                |      🚧 |
+| Demande compte conseiller  | `/advisor-access-request`      | Demande de compte conseiller                       | `// @demande-compte-conseiller`                     |      🚧 |
 
 Le code est a positionner dans les fichiers de tests Cypress dans le nom du test pour permettre de retrouver facilement les tests concernés et de les executer selectivement à l'aide du package @cypress/grep.
 

frontend_tests/cypress/e2e/auth/advisorSignup.cy.js

@@ -0,0 +1,47 @@
+describe('Signup advisor @demande-compte-conseiller', () => {
+  const userToSignup = {
+    '[name=first_name]': 'Signupuser',
+    '[name=last_name]': 'Successful',
+    '[name=organization]': 'Signup Corp',
+    '[name=organization_position]': 'Tester',
+    '[name=email]': 'signup4@success.test',
+    '[name=phone_no]': '0102030405',
+    '[name=password1]': 'derpderp',
+    '[name=password2]': 'derpderp',
+  };
+
+  it('signup a new advisor', function () {
+    cy.visit('/acteurs-locaux');
+    cy.get('[data-test-id="button-advisor-access-request"]').click();
+
+    cy.url().should('include', '/advisor-access-request');
+
+    for (const key in userToSignup) {
+      if (Object.prototype.hasOwnProperty.call(userToSignup, key)) {
+        const element = userToSignup[key];
+        cy.get(key).type(element, { delay: 0 });
+      }
+    }
+    cy.document().then((doc) => {
+      var iframe = doc.getElementById('id_captcha').querySelector('iframe');
+      var innerDoc = iframe.contentDocument || iframe.contentWindow.document;
+      innerDoc.querySelector('.recaptcha-checkbox').click();
+      cy.wait(500);
+      cy.get('[type=submit]').click();
+
+      cy.location().should((loc) => {
+        expect(loc.pathname).to.eq('/advisor-access-request');
+      });
+
+      cy.get('[type=submit]').click();
+      cy.url().should('include', '/advisor-access-request');
+
+      cy.get('[name="comment"]').type("Tester c'est douter");
+      cy.get('[type=submit]').click();
+
+      cy.get('[data-test-id="pending-advisor-request-confirmation"]').should(
+        'be.visible'
+      );
+    });
+  });
+});

recoco/apps/home/forms.py

@@ -135,7 +135,7 @@ class AdvisorAccessRequestForm(forms.Form):
         label="Commentaire",
         help_text="Expliquez brièvement pourquoi vous demandez l’accès à ces dossiers et en quoi cela est pertinent pour votre rôle, afin de nous aider à examiner votre demande.",
         widget=forms.Textarea(attrs={"rows": 3}),
-        required=False,
+        required=True,
     )
 
 

recoco/apps/home/templates/home/regional_actors.html

@@ -34,7 +34,9 @@ <h1 class="fr-h1">
                             {% if is_switchtender %}
                                 <a href="{% url 'projects-project-list' %}" class="fr-btn fr-text--xl">Accéder à la liste des dossiers</a>
                             {% else %}
-                                <a href="{% url 'advisor-access-request' %}" class="fr-btn fr-text--xl">Demander un accès</a>
+                                <a href="{% url 'advisor-access-request' %}"
+                                   class="fr-btn fr-text--xl"
+                                   data-test-id="button-advisor-access-request">Demander un accès</a>
                             {% endif %}
                         </li>
                     </ul>

recoco/apps/home/tests/test_views_advisor_access.py

@@ -72,7 +72,7 @@ def test_post_request(self, client, current_site):
 
         response = client.post(
             reverse("advisor-access-request"),
-            data={"departments": ["64", "33"]},
+            data={"departments": ["64", "33"], "comment": "Merci pour votre aide !"},
         )
         assert response.status_code == 200
 
@@ -85,6 +85,7 @@ def test_post_request(self, client, current_site):
         assert advisor_access_request.user == user
         assert advisor_access_request.status == "PENDING"
         assert advisor_access_request.departments.count() == 2
+        assert advisor_access_request.comment == "Merci pour votre aide !"
 
         response = client.post(
             reverse("advisor-access-request"),
@@ -181,7 +182,10 @@ def test_post_request(self, client, current_site):
         assert response.status_code == 200
         assert response.context["form"].errors is not None
 
-        response = client.post(url, data={"departments": ["64", "33"]})
+        response = client.post(
+            url,
+            data={"departments": ["64", "33"], "comment": "Merci pour votre aide !"},
+        )
         assert response.status_code == 302
         assert response.url == reverse("projects-moderation-list")
 

recoco/apps/projects/serializers.py

@@ -214,6 +214,7 @@ def to_representation(self, data):
                 and self.current_user.has_perm("projects.use_private_notes", data)
                 else None
             ),
+            "owner": format_owner(data),
         }
 
 
@@ -259,6 +260,28 @@ def to_representation(self, data):
         }
 
 
+def format_owner(project):
+    owner = project.owner
+    if not owner:
+        return None
+    return {
+        "id": owner.id,
+        "first_name": owner.first_name,
+        "last_name": owner.last_name,
+        "username": owner.username,
+        "email": owner.email,
+        "profile": {
+            "organization": {
+                "name": (
+                    owner.profile.organization.name
+                    if owner.profile.organization
+                    else ""
+                ),
+            }
+        },
+    }
+
+
 def format_commune(commune):
     if not commune:
         return None

recoco/apps/projects/templates/projects/project/list-kanban.html

@@ -147,9 +147,9 @@ <h5 x-text="board.title" class="font-medium text-gray-800 fr-mb-0"></h5>
                                                                 <div class="kanban-card__project-container fr-mb-2v">
                                                                     <span class="kanban-card__project-name project-link"
                                                                           x-text="truncate(t.name)"></span>
-                                                                    <template x-if="t.org_name">
+                                                                    <template x-if="t.owner.profile.organization">
                                                                         <span class="kanban-card__project-organization"
-                                                                                x-text="t.org_name"></span>
+                                                                                x-text="t.owner.profile.organization.name"></span>
                                                                     </template>
                                                                 </div>
                                                                 <template x-if="t.origin">

recoco/apps/projects/tests/test_rest.py

@@ -142,11 +142,12 @@ def test_project_list_includes_only_projects_in_switchtender_departments(
         "name",
         "notifications",
         "org_name",
-        "status",
+        "owner",
         "switchtenders",
         "updated_on",
         "description",
         "project_sites",
+        "status",
         "tags",
         "advisors_note",
     ]

recoco/templates/default_site/account/fragments/departements_select_form.html

@@ -16,9 +16,20 @@ <h4 class="fr-mb-3w d-block">Sélectionnez vos départements d'action</h4>
                     </template>
                 </div>
                 <div class="fr-input-group fr-mt-4v">
-                    <label for="comment" class="fr-label">{{ form.comment.label }} (facultatif)</label>
-                    <helptext>{{ form.comment.help_text }}</helptext>
-                    <textarea name="comment" class="fr-input" id="comment" rows="3"></textarea>
+                    <label for="comment" class="fr-label">
+                        {{ form.fields.comment.label }}
+                        {% if form.fields.comment.required %}
+                            <span class="fr-text--bold">(obligatoire)</span>
+                        {% else %}
+                            <span>(facultatif)</span>
+                        {% endif %}
+                    </label>
+                    <helptext>{{ form.fields.comment.help_text }}</helptext>
+                    <textarea name="comment"
+                              class="fr-input"
+                              id="comment"
+                              rows="3"
+                              {% if form.fields.comment.required %}required{% endif %}></textarea>
                 </div>
                 <button class="fr-btn custom-login-button w-100" type="submit">S'inscrire</button>
             </div>

recoco/templates/default_site/account/fragments/pending_advisor_request_redirect.html

@@ -1,7 +1,8 @@
 {% extends "account/layout/layout.html" %}
 {% load static %}
 {% block layout_content %}
-    <fieldset class="fr-fieldset">
+    <fieldset class="fr-fieldset"
+              data-test-id="pending-advisor-request-confirmation">
         <div class="fr-fieldset__content">
             {% comment %} TODO: add when the feature will be implemented {% endcomment %}
             {% comment %} <p class="text-red-light fw-semibold fr-mb-1w">