From 80c0f8cbffdcb8c02ca0e6e117a44efb75e2358c Mon Sep 17 00:00:00 2001
From: Xavier Fernandez <xavier.fernandez@beta.gouv.fr>
Date: Thu, 17 Oct 2024 11:51:33 +0200
Subject: [PATCH 1/2] apply: merge cancel confirmation view with modal

---
 itou/templates/apply/process_base.html        |  1 +
 itou/templates/apply/process_cancel.html      | 33 --------
 .../apply/process_details_company.html        | 61 ++++++++++-----
 itou/www/apply/views/process_views.py         | 28 +++----
 .../www/apply/__snapshots__/test_process.ambr | 58 ++++++--------
 tests/www/apply/test_process.py               | 76 +++++++++----------
 6 files changed, 118 insertions(+), 139 deletions(-)
 delete mode 100644 itou/templates/apply/process_cancel.html

diff --git a/itou/templates/apply/process_base.html b/itou/templates/apply/process_base.html
index 629962bbf6..ce90d4fdfa 100644
--- a/itou/templates/apply/process_base.html
+++ b/itou/templates/apply/process_base.html
@@ -28,6 +28,7 @@ <h1 class="mb-1 mb-md-0 me-3">
                 aria-label="Imprimer la candidature de {{ job_application.job_seeker.get_full_name|mask_unless:can_view_personal_information }}">
             <i class="ri-printer-line fw-normal" aria-hidden="true"></i>
         </button>
+        {% block title_inline_actions %}{% endblock %}
     </div>
     {% block actions %}{% endblock %}
 {% endblock %}
diff --git a/itou/templates/apply/process_cancel.html b/itou/templates/apply/process_cancel.html
deleted file mode 100644
index d4f641189d..0000000000
--- a/itou/templates/apply/process_cancel.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% extends "apply/process_base.html" %}
-{% load django_bootstrap5 %}
-{% load buttons_form %}
-
-{% block content_extend %}
-    <div class="alert alert-warning alert-dismissible fade show" role="status">
-        <div class="row">
-            <div class="col-auto pe-0">
-                <i class="ri-information-line ri-xl text-warning" aria-hidden="true"></i>
-            </div>
-            <div class="col">
-                <p class="mb-0">
-                    {% if job_application.to_company.is_subject_to_eligibility_rules %}
-                        En validant, <b>vous renoncez aux aides au poste</b> liées à cette candidature pour tous les jours travaillés de ce salarié. Si ce salarié a travaillé dans votre structure, il est préférable de suspendre son PASS IAE ci-dessus.
-                    {% else %}
-                        En annulant cette embauche, vous confirmez que le salarié n’avait pas encore commencé à travailler dans votre structure.
-                    {% endif %}
-                </p>
-            </div>
-        </div>
-    </div>
-
-    <form method="post" class="js-prevent-multiple-submit">
-
-        {% csrf_token %}
-
-        <input type="hidden" name="confirm" value="true">
-
-        {% url 'apply:details_for_company' job_application_id=job_application.id as reset_url %}
-        {% itou_buttons_form primary_label="Confirmer l'annulation de l'embauche" reset_url=reset_url show_mandatory_fields_mention=False %}
-
-    </form>
-{% endblock %}
diff --git a/itou/templates/apply/process_details_company.html b/itou/templates/apply/process_details_company.html
index 9d7d88035a..50dce768d9 100644
--- a/itou/templates/apply/process_details_company.html
+++ b/itou/templates/apply/process_details_company.html
@@ -43,6 +43,15 @@
     </ul>
 {% endblock %}
 
+{% block title_inline_actions %}
+    {% if can_be_cancelled %}
+        <button class="btn btn-danger btn-lg btn-ico ms-auto" data-bs-toggle="modal" data-bs-target="#cancel_hire_modal">
+            <i class="ri-arrow-go-back-line fw-medium" aria-hidden="true"></i>
+            <span>Annuler l’embauche</span>
+        </button>
+    {% endif %}
+{% endblock %}
+
 {% block actions %}
     {% include "apply/includes/siae_hiring_actions.html" with job_application=job_application %}
 {% endblock %}
@@ -100,24 +109,6 @@ <h3>Action préalable à l'embauche</h3>
                         <div class="col-12 col-lg-4 order-1 order-lg-2 mt-lg-6">
                             {% block sidebar %}
                                 {{ block.super }}
-                                {# Job application accepted: cancel --------------------------------------------------------------------- #}
-                                {% if job_application.state.is_accepted and job_application.can_be_cancelled %}
-                                    <div class="c-box mb-4">
-                                        {% if job_application.to_company.is_subject_to_eligibility_rules %}
-                                            <h4>Rétractation</h4>
-                                            <p>
-                                                Si vous annulez cette embauche, vous ne pourrez pas prétendre à l'aide au poste pour les jours éventuellement travaillés.
-                                            </p>
-                                            <p>
-                                                {{ job_application.job_seeker.get_full_name }} restera éligible à l'IAE et pourra de nouveau vous envoyer une candidature dans le futur.
-                                            </p>
-                                        {% endif %}
-                                        <a href="{% url 'apply:cancel' job_application_id=job_application.id %}" class="btn btn-danger btn-block btn-ico text-decoration-none">
-                                            <i class="ri-arrow-go-back-line fw-medium" aria-hidden="true"></i>
-                                            <span>Annuler l'embauche</span>
-                                        </a>
-                                    </div>
-                                {% endif %}
                                 {% if job_application.to_company.is_subject_to_eligibility_rules and request.user.is_employer and job_application.state.is_accepted and job_application.approval %}
                                     <div class="c-box mb-4">
                                         <h4>PASS IAE</h4>
@@ -199,6 +190,40 @@ <h5 class="modal-title" id="modal_title_{{ siae.pk }}">Confirmation du transfert
             {% endif %}
         {% endfor %}
     {% endif %}
+    {% if can_be_cancelled %}
+        <div id="cancel_hire_modal" class="modal" tabindex="-1" aria-labelledby="cancel_hire_modal_title" aria-hidden="true">
+            <div class="modal-dialog modal-dialog-centered">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title" id="cancel_hire_modal_title">
+                            Annuler l’embauche de {{ job_application.job_seeker.get_full_name }}
+                        </h5>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Fermer"></button>
+                    </div>
+                    <div class="modal-body">
+                        {% if job_application.to_company.is_subject_to_eligibility_rules %}
+                            <p>
+                                En validant, <strong>vous renoncez aux aides au poste</strong> liées à cette candidature pour tous les jours travaillés de ce salarié.
+                                Si ce salarié a travaillé dans votre structure, il est préférable de suspendre son PASS IAE.
+                            </p>
+                            <p>
+                                {{ job_application.job_seeker.get_full_name }} restera éligible à l'IAE et pourra de nouveau vous envoyer une candidature dans le futur.
+                            </p>
+                        {% else %}
+                            <p>En validant, vous confirmez que le salarié n’avait pas encore commencé à travailler dans votre structure.</p>
+                        {% endif %}
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-sm btn-outline-secondary" data-bs-dismiss="modal">Annuler</button>
+                        <form method="post" action="{% url 'apply:cancel' job_application_id=job_application.id %}" class="js-prevent-multiple-submit">
+                            {% csrf_token %}
+                            <button class="btn btn-sm btn-danger">Confirmer l’annulation de l’embauche</button>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    {% endif %}
 
     {# GEIQ SIAE without valid geiq_eligibility_diagnosis. Modal triggered by apply/includes/buttons/accept.html #}
     {% if job_application.to_company.kind == CompanyKind.GEIQ and not geiq_eligibility_diagnosis.is_valid %}
diff --git a/itou/www/apply/views/process_views.py b/itou/www/apply/views/process_views.py
index 442dd27e82..ef79887b75 100644
--- a/itou/www/apply/views/process_views.py
+++ b/itou/www/apply/views/process_views.py
@@ -230,7 +230,10 @@ def details_for_company(request, job_application_id, template_name="apply/proces
             hiring_start_at=job_application.hiring_start_at
         )
 
+    can_be_cancelled = job_application.state.is_accepted and job_application.can_be_cancelled
+
     context = {
+        "can_be_cancelled": can_be_cancelled,
         "can_view_personal_information": True,  # SIAE members have access to personal info
         "can_edit_personal_information": request.user.can_edit_personal_information(job_application.job_seeker),
         "display_refusal_info": False,
@@ -578,7 +581,8 @@ class ReloadJobDescriptionFields(AcceptHTMXFragmentView):
 
 
 @login_required
-def cancel(request, job_application_id, template_name="apply/process_cancel.html"):
+@require_POST
+def cancel(request, job_application_id):
     """
     Trigger the `cancel` transition.
     """
@@ -591,21 +595,13 @@ def cancel(request, job_application_id, template_name="apply/process_cancel.html
         messages.error(request, "Vous ne pouvez pas annuler cette embauche.")
         return HttpResponseRedirect(next_url)
 
-    if request.method == "POST" and request.POST.get("confirm") == "true":
-        try:
-            # After each successful transition, a save() is performed by django-xworkflows.
-            job_application.cancel(user=request.user)
-            messages.success(request, "L'embauche a bien été annulée.", extra_tags="toast")
-        except xwf_models.InvalidTransitionError:
-            messages.error(request, "Action déjà effectuée.", extra_tags="toast")
-        return HttpResponseRedirect(next_url)
-
-    context = {
-        "can_view_personal_information": True,  # SIAE members have access to personal info
-        "job_application": job_application,
-        "matomo_custom_title": "Candidature annulée",
-    }
-    return render(request, template_name, context)
+    try:
+        # After each successful transition, a save() is performed by django-xworkflows.
+        job_application.cancel(user=request.user)
+        messages.success(request, "L'embauche a bien été annulée.", extra_tags="toast")
+    except xwf_models.InvalidTransitionError:
+        messages.error(request, "Action déjà effectuée.", extra_tags="toast")
+    return HttpResponseRedirect(next_url)
 
 
 @login_required
diff --git a/tests/www/apply/__snapshots__/test_process.ambr b/tests/www/apply/__snapshots__/test_process.ambr
index 8e755b1357..08d500bdca 100644
--- a/tests/www/apply/__snapshots__/test_process.ambr
+++ b/tests/www/apply/__snapshots__/test_process.ambr
@@ -1712,6 +1712,18 @@
           ORDER BY "approvals_approval"."created_at" DESC
         ''',
       }),
+      dict({
+        'origin': list([
+          'JobApplication.can_be_cancelled[job_applications/models.py]',
+          'details_for_company[www/apply/views/process_views.py]',
+        ]),
+        'sql': '''
+          SELECT %s AS "a"
+          FROM "employee_record_employeerecord"
+          WHERE "employee_record_employeerecord"."job_application_id" = %s
+          LIMIT 1
+        ''',
+      }),
       dict({
         'origin': list([
           'Company.has_admin[common_apps/organizations/models.py]',
@@ -1809,23 +1821,6 @@
           ORDER BY "approvals_approval"."created_at" DESC
         ''',
       }),
-      dict({
-        'origin': list([
-          'JobApplication.can_be_cancelled[job_applications/models.py]',
-          'IfNode[apply/process_details_company.html]',
-          'BlockNode[apply/process_details_company.html]',
-          'BlockNode[layout/base.html]',
-          'ExtendsNode[apply/process_base.html]',
-          'ExtendsNode[apply/process_details_company.html]',
-          'details_for_company[www/apply/views/process_views.py]',
-        ]),
-        'sql': '''
-          SELECT %s AS "a"
-          FROM "employee_record_employeerecord"
-          WHERE "employee_record_employeerecord"."job_application_id" = %s
-          LIMIT 1
-        ''',
-      }),
       dict({
         'origin': list([
           'ForNode[apply/includes/transition_logs.html]',
@@ -2693,6 +2688,18 @@
           ORDER BY "approvals_approval"."created_at" DESC
         ''',
       }),
+      dict({
+        'origin': list([
+          'JobApplication.can_be_cancelled[job_applications/models.py]',
+          'details_for_company[www/apply/views/process_views.py]',
+        ]),
+        'sql': '''
+          SELECT %s AS "a"
+          FROM "employee_record_employeerecord"
+          WHERE "employee_record_employeerecord"."job_application_id" = %s
+          LIMIT 1
+        ''',
+      }),
       dict({
         'origin': list([
           'Company.has_admin[common_apps/organizations/models.py]',
@@ -2790,23 +2797,6 @@
           ORDER BY "approvals_approval"."created_at" DESC
         ''',
       }),
-      dict({
-        'origin': list([
-          'JobApplication.can_be_cancelled[job_applications/models.py]',
-          'IfNode[apply/process_details_company.html]',
-          'BlockNode[apply/process_details_company.html]',
-          'BlockNode[layout/base.html]',
-          'ExtendsNode[apply/process_base.html]',
-          'ExtendsNode[apply/process_details_company.html]',
-          'details_for_company[www/apply/views/process_views.py]',
-        ]),
-        'sql': '''
-          SELECT %s AS "a"
-          FROM "employee_record_employeerecord"
-          WHERE "employee_record_employeerecord"."job_application_id" = %s
-          LIMIT 1
-        ''',
-      }),
       dict({
         'origin': list([
           'ForNode[apply/includes/transition_logs.html]',
diff --git a/tests/www/apply/test_process.py b/tests/www/apply/test_process.py
index fee16e014f..33bee0dbb5 100644
--- a/tests/www/apply/test_process.py
+++ b/tests/www/apply/test_process.py
@@ -80,6 +80,14 @@
     " vous pouvez contacter l’employeur."
 )
 
+IAE_CANCELLATION_CONFIRMATION = (
+    "En validant, <strong>vous renoncez aux aides au poste</strong> liées à cette candidature "
+    "pour tous les jours travaillés de ce salarié."
+)
+NON_IAE_CANCELLATION_CONFIRMATION = (
+    "En validant, vous confirmez que le salarié n’avait pas encore commencé à travailler dans votre structure."
+)
+
 
 @pytest.mark.ignore_unknown_variable_template_error("has_form_error", "with_matomo_event")
 class TestProcessViews:
@@ -1365,50 +1373,35 @@ def test_eligibility_state_for_job_application(self, client):
         assert response.status_code == 404
         client.logout()
 
-    def test_cancel(self, client):
+    @pytest.mark.parametrize(
+        "eligibility_trait,expected_msg",
+        [
+            ("subject_to_eligibility", IAE_CANCELLATION_CONFIRMATION),
+            ("not_subject_to_eligibility", NON_IAE_CANCELLATION_CONFIRMATION),
+        ],
+    )
+    def test_cancel(self, client, eligibility_trait, expected_msg):
         # Hiring date is today: cancellation should be possible.
-        job_application = JobApplicationFactory(with_approval=True, to_company__subject_to_eligibility=True)
+        job_application = JobApplicationFactory(with_approval=True, **{f"to_company__{eligibility_trait}": True})
         employer = job_application.to_company.members.first()
         client.force_login(employer)
-        url = reverse("apply:cancel", kwargs={"job_application_id": job_application.pk})
-        response = client.get(url)
-        assertContains(response, "Confirmer l'annulation de l'embauche")
-        assertContains(
-            response, "En validant, <b>vous renoncez aux aides au poste</b> liées à cette candidature pour tous"
-        )
-        assertNotContains(
-            response,
-            "En annulant cette embauche, vous confirmez que le salarié n’avait pas encore commencé à "
-            "travailler dans votre structure.",
-        )
-
-        post_data = {
-            "confirm": "true",
-        }
-        response = client.post(url, data=post_data)
+        detail_url = reverse("apply:details_for_company", kwargs={"job_application_id": job_application.pk})
+        cancel_url = reverse("apply:cancel", kwargs={"job_application_id": job_application.pk})
+        response = client.get(detail_url)
+        assertContains(response, "Confirmer l’annulation de l’embauche")
+        for msg in [IAE_CANCELLATION_CONFIRMATION, NON_IAE_CANCELLATION_CONFIRMATION]:
+            if msg == expected_msg:
+                assertContains(response, msg)
+            else:
+                assertNotContains(response, msg)
+
+        response = client.post(cancel_url)
         next_url = reverse("apply:details_for_company", kwargs={"job_application_id": job_application.pk})
         assertRedirects(response, next_url)
 
         job_application.refresh_from_db()
         assert job_application.state.is_cancelled
-
-    def test_cancel_saie_not_subject_to_eligibility(self, client):
-        # Hiring date is today: cancellation should be possible.
-        job_application = JobApplicationFactory(with_approval=True, to_company__not_subject_to_eligibility=True)
-        employer = job_application.to_company.members.first()
-        client.force_login(employer)
-        url = reverse("apply:cancel", kwargs={"job_application_id": job_application.pk})
-        response = client.get(url)
-        assertContains(response, "Confirmer l'annulation de l'embauche")
-        assertNotContains(
-            response, "En validant, <b>vous renoncez aux aides au poste</b> liées à cette candidature pour tous"
-        )
-        assertContains(
-            response,
-            "En annulant cette embauche, vous confirmez que le salarié n’avait pas encore commencé à "
-            "travailler dans votre structure.",
-        )
-        # Not need to the form POST, only the warning above changes
+        assertMessages(response, [messages.Message(messages.SUCCESS, "L'embauche a bien été annulée.")])
 
     def test_cannot_cancel(self, client):
         job_application = JobApplicationFactory(
@@ -1420,13 +1413,20 @@ def test_cannot_cancel(self, client):
         EmployeeRecordFactory(job_application=job_application, status=Status.PROCESSED)
 
         client.force_login(employer)
-        url = reverse("apply:cancel", kwargs={"job_application_id": job_application.pk})
-        response = client.get(url)
+        detail_url = reverse("apply:details_for_company", kwargs={"job_application_id": job_application.pk})
+        cancel_url = reverse("apply:cancel", kwargs={"job_application_id": job_application.pk})
+        response = client.get(detail_url)
+        assertNotContains(response, "Confirmer l’annulation de l’embauche")
+        assertNotContains(response, IAE_CANCELLATION_CONFIRMATION)
+        assertNotContains(response, NON_IAE_CANCELLATION_CONFIRMATION)
+
+        response = client.post(cancel_url)
         next_url = reverse("apply:details_for_company", kwargs={"job_application_id": job_application.pk})
         assertRedirects(response, next_url)
 
         job_application.refresh_from_db()
         assert not job_application.state.is_cancelled
+        assertMessages(response, [messages.Message(messages.ERROR, "Vous ne pouvez pas annuler cette embauche.")])
 
     def test_diagoriente_section_as_job_seeker(self, client):
         job_application = JobApplicationFactory(with_approval=True, resume_link="")

From 3064d6748a7dbdc4babbe39658de8ad811560e93 Mon Sep 17 00:00:00 2001
From: hellodeloo <hello@hellodeloo.com>
Date: Thu, 17 Oct 2024 16:32:51 +0200
Subject: [PATCH 2/2] fix: some ui adjustments

---
 itou/templates/apply/process_base.html        | 40 ++++++++++---------
 .../apply/process_details_company.html        |  2 +-
 itou/utils/staticfiles.py                     |  6 +--
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/itou/templates/apply/process_base.html b/itou/templates/apply/process_base.html
index ce90d4fdfa..3132e029ca 100644
--- a/itou/templates/apply/process_base.html
+++ b/itou/templates/apply/process_base.html
@@ -11,24 +11,28 @@
 {% endblock %}
 
 {% block title_content %}
-    <div class="d-md-flex align-items-center">
-        <h1 class="mb-1 mb-md-0 me-3">
-            Candidature de
-            {% if with_job_seeker_detail_url|default:False %}
-                <a href="{% url "job_seekers_views:details" public_id=job_application.job_seeker.public_id %}?back_url={{ request.get_full_path|urlencode }}" class="btn-link">{{ job_application.job_seeker.get_full_name|mask_unless:can_view_personal_information }}</a>
-            {% else %}
-                {{ job_application.job_seeker.get_full_name|mask_unless:can_view_personal_information }}
-            {% endif %}
-        </h1>
-        {% state_badge job_application extra_class="badge-base" %}
-        <button class="btn btn-lg btn-ico-only btn-link"
-                type="button"
-                data-it-action="print"
-                {% matomo_event "candidature" "click" "impression-fiche-candidature" %}
-                aria-label="Imprimer la candidature de {{ job_application.job_seeker.get_full_name|mask_unless:can_view_personal_information }}">
-            <i class="ri-printer-line fw-normal" aria-hidden="true"></i>
-        </button>
-        {% block title_inline_actions %}{% endblock %}
+    <div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
+        <div class="d-xl-flex align-items-xl-center">
+            <h1 class="mb-0 me-3 text-md-nowrap">
+                Candidature de
+                {% if with_job_seeker_detail_url|default:False %}
+                    <a href="{% url "job_seekers_views:details" public_id=job_application.job_seeker.public_id %}?back_url={{ request.get_full_path|urlencode }}" class="btn-link">{{ job_application.job_seeker.get_full_name|mask_unless:can_view_personal_information }}</a>
+                {% else %}
+                    {{ job_application.job_seeker.get_full_name|mask_unless:can_view_personal_information }}
+                {% endif %}
+            </h1>
+            {% state_badge job_application extra_class="badge-base" %}
+            <button class="btn btn-lg btn-ico-only btn-link"
+                    type="button"
+                    data-it-action="print"
+                    {% matomo_event "candidature" "click" "impression-fiche-candidature" %}
+                    aria-label="Imprimer la candidature de {{ job_application.job_seeker.get_full_name|mask_unless:can_view_personal_information }}">
+                <i class="ri-printer-line fw-normal" aria-hidden="true"></i>
+            </button>
+        </div>
+        <div>
+            {% block title_inline_actions %}{% endblock %}
+        </div>
     </div>
     {% block actions %}{% endblock %}
 {% endblock %}
diff --git a/itou/templates/apply/process_details_company.html b/itou/templates/apply/process_details_company.html
index 50dce768d9..131aba840f 100644
--- a/itou/templates/apply/process_details_company.html
+++ b/itou/templates/apply/process_details_company.html
@@ -45,7 +45,7 @@
 
 {% block title_inline_actions %}
     {% if can_be_cancelled %}
-        <button class="btn btn-danger btn-lg btn-ico ms-auto" data-bs-toggle="modal" data-bs-target="#cancel_hire_modal">
+        <button class="btn btn-danger btn-lg btn-ico w-100 w-md-auto" data-bs-toggle="modal" data-bs-target="#cancel_hire_modal">
             <i class="ri-arrow-go-back-line fw-medium" aria-hidden="true"></i>
             <span>Annuler l’embauche</span>
         </button>
diff --git a/itou/utils/staticfiles.py b/itou/utils/staticfiles.py
index d239c62ba0..16ac82901d 100644
--- a/itou/utils/staticfiles.py
+++ b/itou/utils/staticfiles.py
@@ -190,11 +190,11 @@
     },
     "theme-inclusion": {
         "download": {
-            "url": "https://github.com/gip-inclusion/itou-theme/archive/refs/tags/v2.2.8.zip",
-            "sha256": "1af0c0dc979de28e0fd867e43845d925ea4e6f619bae76904110eedb1da87730",
+            "url": "https://github.com/gip-inclusion/itou-theme/archive/refs/tags/v2.2.9.zip",
+            "sha256": "6e750cb96ea6fd378d62539d9984c63f74da46f2d8b4accd70dddabfe4baeffc",
         },
         "extract": {
-            "origin": "itou-theme-2.2.8/dist",
+            "origin": "itou-theme-2.2.9/dist",
             "destination": "vendor/theme-inclusion/",
             "files": [
                 "javascripts/app.js",