From 763044fd7bca372d96cecb786c6a63c590abe6ca Mon Sep 17 00:00:00 2001
From: Emmanuelle Bonnemay <emmanuelle.bonnemay@pix.fr>
Date: Thu, 5 Dec 2024 17:37:07 +0100
Subject: [PATCH 1/5] feat(admin) : add new translation keys

---
 admin/translations/en.json | 19 ++++++++++++++++++-
 admin/translations/fr.json | 19 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/admin/translations/en.json b/admin/translations/en.json
index 25326f60ccc..4b06830b69d 100644
--- a/admin/translations/en.json
+++ b/admin/translations/en.json
@@ -379,6 +379,21 @@
         "authentication-method": {
           "should-change-password-status": "Temporary password :"
         },
+        "cgu": {
+          "title": "CGU",
+          "validation": {
+            "domain": {
+              "pix-app": "Pix App Terms of Service validated:",
+              "pix-certif": "Pix Certif Terms of Service validated:",
+              "pix-orga": "Pix Orga Terms of Service validated:"
+            },
+            "status": {
+              "non-validated": "NO",
+              "validated": "YES",
+              "validated-with-date": "YES, on {formattedDate}"
+            }
+          }
+        },
         "copied": "Copied!"
       }
     }
@@ -722,6 +737,8 @@
       "navbar": {
         "authentication-methods": "Méthodes de connexion",
         "certification-centers-list": "Pix Certif",
+        "cgu": "Terms of service",
+        "cgu-aria-label" : "Terms of service",
         "details": "Informations prescrit",
         "organizations-list": "Pix Orga",
         "participations-list": "Participations",
@@ -739,7 +756,7 @@
       }
     },
     "users-list": {
-      "query":  {
+      "query": {
         "contains": "Contient",
         "exact": "Exacte"
       }
diff --git a/admin/translations/fr.json b/admin/translations/fr.json
index 11ee667d15b..4d88de3f23d 100644
--- a/admin/translations/fr.json
+++ b/admin/translations/fr.json
@@ -389,6 +389,21 @@
         "authentication-method": {
           "should-change-password-status": "Mot de passe temporaire :"
         },
+        "cgu": {
+          "title": "CGU",
+          "validation": {
+            "domain": {
+              "pix-app": "CGU Pix App validé :",
+              "pix-certif": "CGU Pix Certif validé :",
+              "pix-orga": "CGU Pix Orga validé :"
+            },
+            "status": {
+              "non-validated": "NON",
+              "validated": "OUI",
+              "validated-with-date": "OUI, le {formattedDate}"
+            }
+          }
+        },
         "copied": "Copié !"
       }
     }
@@ -746,6 +761,8 @@
       "navbar": {
         "authentication-methods": "Méthodes de connexion",
         "certification-centers-list": "Pix Certif",
+        "cgu": "CGU",
+        "cgu-aria-label" : "Conditions générales d'utilisation",
         "details": "Informations prescrit",
         "organizations-list": "Pix Orga",
         "participations-list": "Participations",
@@ -763,7 +780,7 @@
       }
     },
     "users-list": {
-      "query":  {
+      "query": {
         "contains": "Contient",
         "exact": "Exacte"
       }

From f27b341e01202789c2f0d253bc03ce72b39947f1 Mon Sep 17 00:00:00 2001
From: Emmanuelle Bonnemay <emmanuelle.bonnemay@pix.fr>
Date: Thu, 5 Dec 2024 17:37:56 +0100
Subject: [PATCH 2/5] feat(admin): remove CGU information from overview
 component

---
 admin/app/components/users/user-overview.gjs  | 32 +-------
 .../components/users/user-overview-test.gjs   | 78 -------------------
 2 files changed, 1 insertion(+), 109 deletions(-)

diff --git a/admin/app/components/users/user-overview.gjs b/admin/app/components/users/user-overview.gjs
index 6ee9a39d59e..186cf38f015 100644
--- a/admin/app/components/users/user-overview.gjs
+++ b/admin/app/components/users/user-overview.gjs
@@ -64,24 +64,6 @@ export default class UserOverview extends Component {
     return false;
   }
 
-  get userHasValidatePixAppTermsOfService() {
-    return this._formatValidatedTermsOfServiceText(this.args.user.lastTermsOfServiceValidatedAt, this.args.user.cgu);
-  }
-
-  get userHasValidatePixOrgaTermsOfService() {
-    return this._formatValidatedTermsOfServiceText(
-      this.args.user.lastPixOrgaTermsOfServiceValidatedAt,
-      this.args.user.pixOrgaTermsOfServiceAccepted,
-    );
-  }
-
-  get userHasValidatePixCertifTermsOfService() {
-    return this._formatValidatedTermsOfServiceText(
-      this.args.user.lastPixCertifTermsOfServiceValidatedAt,
-      this.args.user.pixCertifTermsOfServiceAccepted,
-    );
-  }
-
   get languageOptions() {
     return this.languages;
   }
@@ -95,11 +77,6 @@ export default class UserOverview extends Component {
     return hasBeenAnonymised || isPixAgent;
   }
 
-  _formatValidatedTermsOfServiceText(date, hasValidatedTermsOfService) {
-    const formattedDateText = date ? `, le ${dayjs(date).format('DD/MM/YYYY')}` : '';
-    return hasValidatedTermsOfService ? `OUI${formattedDateText}` : 'NON';
-  }
-
   _initForm() {
     this.form.firstName = this.args.user.firstName;
     this.form.lastName = this.args.user.lastName;
@@ -346,14 +323,7 @@ export default class UserOverview extends Component {
                   </span>
                 </li>
               </ul>
-              <ul class="user-detail-personal-information-section__infogroup">
-                <li class="user-detail-personal-information-section__user-informations">CGU Pix App validé :
-                  {{this.userHasValidatePixAppTermsOfService}}</li>
-                <li class="user-detail-personal-information-section__user-informations">CGU Pix Orga validé :
-                  {{this.userHasValidatePixOrgaTermsOfService}}</li>
-                <li class="user-detail-personal-information-section__user-informations">CGU Pix Certif validé :
-                  {{this.userHasValidatePixCertifTermsOfService}}</li>
-              </ul>
+
               <ul class="user-detail-personal-information-section__infogroup">
                 <li class="user-detail-personal-information-section__user-informations">Nombre de tentatives de
                   connexion en erreur :
diff --git a/admin/tests/integration/components/users/user-overview-test.gjs b/admin/tests/integration/components/users/user-overview-test.gjs
index e037c3654cd..f01ed04679e 100644
--- a/admin/tests/integration/components/users/user-overview-test.gjs
+++ b/admin/tests/integration/components/users/user-overview-test.gjs
@@ -257,84 +257,6 @@ module('Integration | Component | users | user-overview', function (hooks) {
         });
       });
 
-      module('terms of service', function () {
-        module('displays yes by application', function () {
-          test('displays "OUI" with date when user accepted Pix App terms of service', async function (assert) {
-            // given
-            const user = { cgu: true, lastTermsOfServiceValidatedAt: new Date('2021-12-10') };
-
-            // when
-            const screen = await render(<template><UserOverview @user={{user}} /></template>);
-
-            // then
-            assert.dom(screen.getByText('CGU Pix App validé : OUI, le 10/12/2021')).exists();
-          });
-
-          test('displays "OUI" with date when user accepted Pix Orga terms of service', async function (assert) {
-            // given
-            const user = {
-              pixOrgaTermsOfServiceAccepted: true,
-              lastPixOrgaTermsOfServiceValidatedAt: new Date('2021-12-14'),
-            };
-
-            // when
-            const screen = await render(<template><UserOverview @user={{user}} /></template>);
-
-            // then
-            assert.dom(screen.getByText('CGU Pix Orga validé : OUI, le 14/12/2021')).exists();
-          });
-
-          test('displays "OUI" with date when user accepted Pix Certif terms of service', async function (assert) {
-            // given
-            const user = {
-              pixCertifTermsOfServiceAccepted: true,
-              lastPixCertifTermsOfServiceValidatedAt: new Date('2021-12-14'),
-            };
-
-            // when
-            const screen = await render(<template><UserOverview @user={{user}} /></template>);
-
-            // then
-            assert.dom(screen.getByText('CGU Pix Certif validé : OUI, le 14/12/2021')).exists();
-          });
-        });
-
-        test('displays "NON" when user not accepted Pix App terms of service', async function (assert) {
-          // given
-          const user = { pixCertifTermsOfServiceAccepted: true, pixOrgaTermsOfServiceAccepted: true, cgu: false };
-
-          // when
-          const screen = await render(<template><UserOverview @user={{user}} /></template>);
-
-          // then
-          assert.dom(screen.getByText('CGU Pix App validé : NON')).exists();
-        });
-
-        test('displays "NON" when user not accepted Pix Orga terms of service', async function (assert) {
-          // given
-          const user = { pixCertifTermsOfServiceAccepted: true, pixOrgaTermsOfServiceAccepted: false, cgu: true };
-
-          // when
-          const screen = await render(<template><UserOverview @user={{user}} /></template>);
-
-          // then
-          assert.dom(screen.getByText('CGU Pix Orga validé : NON')).exists();
-        });
-
-        test('displays "NON" when user not accepted Pix Certif terms of service and "OUI" with no date when terms of service for an app are validated but no date provided', async function (assert) {
-          // given
-          const user = { pixCertifTermsOfServiceAccepted: false, pixOrgaTermsOfServiceAccepted: true, cgu: true };
-
-          // when
-          const screen = await render(<template><UserOverview @user={{user}} /></template>);
-
-          // then
-          assert.dom(screen.getByText('CGU Pix Certif validé : NON')).exists();
-          assert.dom(screen.getByText('CGU Pix Orga validé : OUI')).exists();
-          assert.dom(screen.getByText('CGU Pix App validé : OUI')).exists();
-        });
-      });
-
       module('login information', function (hooks) {
         let clock;
         const now = new Date('2022-11-28T12:00:00Z');

From 6268b187415129581e2c7b9c6b92eba4da69ce85 Mon Sep 17 00:00:00 2001
From: Emmanuelle Bonnemay <emmanuelle.bonnemay@pix.fr>
Date: Thu, 5 Dec 2024 17:38:34 +0100
Subject: [PATCH 3/5] feat(admin): add new route, model and and link for CGU

---
 admin/app/router.js                               |  1 +
 admin/app/routes/authenticated/users/get/cgu.js   | 15 +++++++++++++++
 admin/app/templates/authenticated/users/get.hbs   |  9 +++++++++
 .../acceptance/authenticated/users/get-test.js    |  8 +++++++-
 4 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 admin/app/routes/authenticated/users/get/cgu.js

diff --git a/admin/app/router.js b/admin/app/router.js
index 5ee9137d2c8..d14542a48b0 100644
--- a/admin/app/router.js
+++ b/admin/app/router.js
@@ -55,6 +55,7 @@ Router.map(function () {
         this.route('campaign-participations', { path: '/participations' });
         this.route('organizations');
         this.route('certification-center-memberships');
+        this.route('cgu');
       });
     });
 
diff --git a/admin/app/routes/authenticated/users/get/cgu.js b/admin/app/routes/authenticated/users/get/cgu.js
new file mode 100644
index 00000000000..d31aa15ebdb
--- /dev/null
+++ b/admin/app/routes/authenticated/users/get/cgu.js
@@ -0,0 +1,15 @@
+import Route from '@ember/routing/route';
+
+export default class UserCguRoute extends Route {
+  async model() {
+    const user = this.modelFor('authenticated.users.get');
+    return {
+      cgu: user.cgu,
+      pixOrgaTermsOfServiceAccepted: user.pixOrgaTermsOfServiceAccepted,
+      pixCertifTermsOfServiceAccepted: user.pixCertifTermsOfServiceAccepted,
+      lastTermsOfServiceValidatedAt: user.lastTermsOfServiceValidatedAt,
+      lastPixOrgaTermsOfServiceValidatedAt: user.lastPixOrgaTermsOfServiceValidatedAt,
+      lastPixCertifTermsOfServiceValidatedAt: user.lastPixCertifTermsOfServiceValidatedAt,
+    };
+  }
+}
diff --git a/admin/app/templates/authenticated/users/get.hbs b/admin/app/templates/authenticated/users/get.hbs
index dba78e3abe7..a7bd3feb22b 100644
--- a/admin/app/templates/authenticated/users/get.hbs
+++ b/admin/app/templates/authenticated/users/get.hbs
@@ -49,6 +49,15 @@
       {{t "pages.user-details.navbar.certification-centers-list"}}
       ({{@model.certificationCenterMembershipsCount}})
     </LinkTo>
+
+    <LinkTo
+      @route="authenticated.users.get.cgu"
+      @model={{@model}}
+      aria-label={{t "pages.user-details.navbar.cgu-aria-label"}}
+      class="navbar-item"
+    >
+      {{t "pages.user-details.navbar.cgu"}}
+    </LinkTo>
   </nav>
 
   {{outlet}}
diff --git a/admin/tests/acceptance/authenticated/users/get-test.js b/admin/tests/acceptance/authenticated/users/get-test.js
index 6c1d58e30fd..135123ca9a9 100644
--- a/admin/tests/acceptance/authenticated/users/get-test.js
+++ b/admin/tests/acceptance/authenticated/users/get-test.js
@@ -5,9 +5,12 @@ import { setupApplicationTest } from 'ember-qunit';
 import { createAuthenticateSession } from 'pix-admin/tests/helpers/test-init';
 import { module, test } from 'qunit';
 
+import setupIntl from '../../../helpers/setup-intl';
+
 module('Acceptance | authenticated/users/get', function (hooks) {
   setupApplicationTest(hooks);
   setupMirage(hooks);
+  setupIntl(hooks);
 
   test('access to user details page by URL /users/:id', async function (assert) {
     // when
@@ -20,6 +23,7 @@ module('Acceptance | authenticated/users/get', function (hooks) {
 
   test('displays user detail information page', async function (assert) {
     // given
+    this.intl = this.owner.lookup('service:intl');
     const user = await _buildAndAuthenticateUser(this.server, { email: 'john.harry@example.net', username: null });
     const expectedOrganizationMembershipsCount = 2;
     const expectedParticipationCount = 1;
@@ -27,7 +31,6 @@ module('Acceptance | authenticated/users/get', function (hooks) {
 
     // when
     const screen = await visit(`/users/${user.id}`);
-
     // then
     assert.dom(screen.getByRole('heading', { name: "Informations de l'utilisateur" })).exists();
     assert.dom(screen.getByRole('heading', { name: 'Informations prescrit' })).exists();
@@ -43,6 +46,9 @@ module('Acceptance | authenticated/users/get', function (hooks) {
     assert
       .dom(userNavigation.getByLabelText('Organisations de l’utilisateur'))
       .hasText(`Pix Orga (${expectedOrganizationMembershipsCount})`);
+    assert
+      .dom(userNavigation.getByRole('link', { name: this.intl.t('pages.user-details.navbar.cgu-aria-label') }))
+      .exists();
   });
 
   test('redirects to list users page when click page title', async function (assert) {

From f0879b71ef52eab5568abc83faccb6b958a02568 Mon Sep 17 00:00:00 2001
From: Emmanuelle Bonnemay <emmanuelle.bonnemay@pix.fr>
Date: Thu, 5 Dec 2024 17:45:08 +0100
Subject: [PATCH 4/5] feat(admin): add CGU template and component

---
 admin/app/components/users/cgu.gjs            | 58 ++++++++++++++++++
 .../templates/authenticated/users/get/cgu.hbs | 10 +++
 .../integration/components/users/cgu-test.gjs | 61 +++++++++++++++++++
 3 files changed, 129 insertions(+)
 create mode 100644 admin/app/components/users/cgu.gjs
 create mode 100644 admin/app/templates/authenticated/users/get/cgu.hbs
 create mode 100644 admin/tests/integration/components/users/cgu-test.gjs

diff --git a/admin/app/components/users/cgu.gjs b/admin/app/components/users/cgu.gjs
new file mode 100644
index 00000000000..555b53fe4fe
--- /dev/null
+++ b/admin/app/components/users/cgu.gjs
@@ -0,0 +1,58 @@
+import { service } from '@ember/service';
+import Component from '@glimmer/component';
+import dayjs from 'dayjs';
+import { t } from 'ember-intl';
+
+export default class Cgu extends Component {
+  @service accessControl;
+  @service intl;
+
+  get userHasValidatePixAppTermsOfService() {
+    return this._formatValidatedTermsOfServiceText(this.args.lastTermsOfServiceValidatedAt, this.args.cgu);
+  }
+
+  get userHasValidatePixOrgaTermsOfService() {
+    return this._formatValidatedTermsOfServiceText(
+      this.args.lastPixOrgaTermsOfServiceValidatedAt,
+      this.args.pixOrgaTermsOfServiceAccepted,
+    );
+  }
+
+  get userHasValidatePixCertifTermsOfService() {
+    return this._formatValidatedTermsOfServiceText(
+      this.args.lastPixCertifTermsOfServiceValidatedAt,
+      this.args.pixCertifTermsOfServiceAccepted,
+    );
+  }
+  _formatValidatedTermsOfServiceText(date, hasValidatedTermsOfService) {
+    if (!hasValidatedTermsOfService) {
+      return this.intl.t('components.users.user-detail-personal-information.cgu.validation.status.non-validated');
+    }
+
+    return date
+      ? this.intl.t('components.users.user-detail-personal-information.cgu.validation.status.validated-with-date', {
+          formattedDate: dayjs(date).format('DD/MM/YYYY'),
+        })
+      : this.intl.t('components.users.user-detail-personal-information.cgu.validation.status.validated');
+  }
+
+  <template>
+    <header class="page-section__header">
+      <h2 class="page-section__title">{{t "components.users.user-detail-personal-information.cgu.title"}}</h2>
+    </header>
+
+    <ul class="cgu__cgu-list">
+      <li class="cgu__cgu-information">
+        {{t "components.users.user-detail-personal-information.cgu.validation.domain.pix-app"}}
+        {{this.userHasValidatePixAppTermsOfService}}</li>
+
+      <li class="cgu__cgu-information">
+        {{t "components.users.user-detail-personal-information.cgu.validation.domain.pix-orga"}}
+        {{this.userHasValidatePixOrgaTermsOfService}}</li>
+
+      <li class="cgu__cgu-information">
+        {{t "components.users.user-detail-personal-information.cgu.validation.domain.pix-certif"}}
+        {{this.userHasValidatePixCertifTermsOfService}}</li>
+    </ul>
+  </template>
+}
diff --git a/admin/app/templates/authenticated/users/get/cgu.hbs b/admin/app/templates/authenticated/users/get/cgu.hbs
new file mode 100644
index 00000000000..d5eb3d7f7e0
--- /dev/null
+++ b/admin/app/templates/authenticated/users/get/cgu.hbs
@@ -0,0 +1,10 @@
+<section class="page-section">
+  <Users::Cgu
+    @cgu={{@model.cgu}}
+    @pixOrgaTermsOfServiceAccepted={{@model.pixOrgaTermsOfServiceAccepted}}
+    @pixCertifTermsOfServiceAccepted={{@model.pixCertifTermsOfServiceAccepted}}
+    @lastTermsOfServiceValidatedAt={{@model.lastTermsOfServiceValidatedAt}}
+    @lastPixOrgaTermsOfServiceValidatedAt={{@model.lastPixOrgaTermsOfServiceValidatedAt}}
+    @lastPixCertifTermsOfServiceValidatedAt={{@model.lastPixCertifTermsOfServiceValidatedAt}}
+  />
+</section>
\ No newline at end of file
diff --git a/admin/tests/integration/components/users/cgu-test.gjs b/admin/tests/integration/components/users/cgu-test.gjs
new file mode 100644
index 00000000000..f5e0d904d42
--- /dev/null
+++ b/admin/tests/integration/components/users/cgu-test.gjs
@@ -0,0 +1,61 @@
+import { render } from '@1024pix/ember-testing-library';
+import { setupRenderingTest } from 'ember-qunit';
+import Cgu from 'pix-admin/components/users/cgu';
+import { module, test } from 'qunit';
+
+import setupIntl from '../../../helpers/setup-intl';
+
+module('Integration | Component | cgu', function (hooks) {
+  setupRenderingTest(hooks);
+  setupIntl(hooks);
+
+  hooks.beforeEach(function () {
+    this.intl = this.owner.lookup('service:intl');
+  });
+
+  test('displays correct Terms of Service status for Pix App, Pix Orga and Pix Certif', async function (assert) {
+    //Given
+
+    const cgu = true;
+    const lastTermsOfServiceValidatedAt = new Date('2021-12-10');
+    const pixOrgaTermsOfServiceAccepted = true;
+    const lastPixOrgaTermsOfServiceValidatedAt = null;
+    const pixCertifTermsOfServiceAccepted = false;
+    const lastPixCertifTermsOfServiceValidatedAt = null;
+
+    const appDomain = this.intl.t('components.users.user-detail-personal-information.cgu.validation.domain.pix-app');
+    const validatedWithDate = this.intl.t(
+      'components.users.user-detail-personal-information.cgu.validation.status.validated-with-date',
+      { formattedDate: '10/12/2021' },
+    );
+
+    const orgaDomain = this.intl.t('components.users.user-detail-personal-information.cgu.validation.domain.pix-orga');
+    const validated = this.intl.t('components.users.user-detail-personal-information.cgu.validation.status.validated');
+
+    const certifDomain = this.intl.t(
+      'components.users.user-detail-personal-information.cgu.validation.domain.pix-certif',
+    );
+    const nonValidated = this.intl.t(
+      'components.users.user-detail-personal-information.cgu.validation.status.non-validated',
+    );
+
+    //When
+    const screen = await render(
+      <template>
+        <Cgu
+          @lastTermsOfServiceValidatedAt={{lastTermsOfServiceValidatedAt}}
+          @cgu={{cgu}}
+          @lastPixOrgaTermsOfServiceValidatedAt={{lastPixOrgaTermsOfServiceValidatedAt}}
+          @pixOrgaTermsOfServiceAccepted={{pixOrgaTermsOfServiceAccepted}}
+          @lastPixCertifTermsOfServiceValidatedAt={{lastPixCertifTermsOfServiceValidatedAt}}
+          @pixCertifTermsOfServiceAccepted={{pixCertifTermsOfServiceAccepted}}
+        />
+      </template>,
+    );
+
+    //Then
+    assert.dom(screen.queryByText(`${appDomain} ${validatedWithDate}`)).exists();
+    assert.dom(screen.queryByText(`${orgaDomain} ${validated}`)).exists();
+    assert.dom(screen.queryByText(`${certifDomain} ${nonValidated}`)).exists();
+  });
+});

From a74e9758e2ae06b9e3d9273be37ea9d8a8b714fc Mon Sep 17 00:00:00 2001
From: Emmanuelle Bonnemay <emmanuelle.bonnemay@pix.fr>
Date: Thu, 5 Dec 2024 17:45:22 +0100
Subject: [PATCH 5/5] feat(admin): add style

---
 admin/app/styles/app.scss                  | 1 +
 admin/app/styles/components/users/cgu.scss | 9 +++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 admin/app/styles/components/users/cgu.scss

diff --git a/admin/app/styles/app.scss b/admin/app/styles/app.scss
index 6c9063a269d..4750977db45 100644
--- a/admin/app/styles/app.scss
+++ b/admin/app/styles/app.scss
@@ -98,6 +98,7 @@
 @import 'components/trainings/training-triggers-tab';
 @import 'components/ui';
 @import 'components/users/authentication-method';
+@import 'components/users/cgu';
 @import 'components/users/organization-learners-table';
 @import 'components/users/user-overview';
 @import 'components/users/user-profile';
diff --git a/admin/app/styles/components/users/cgu.scss b/admin/app/styles/components/users/cgu.scss
new file mode 100644
index 00000000000..41d2e06fdc9
--- /dev/null
+++ b/admin/app/styles/components/users/cgu.scss
@@ -0,0 +1,9 @@
+.cgu {
+  &__cgu-list {
+    margin-top: var(--pix-spacing-6x);
+  }
+
+  &__cgu-information {
+    margin-bottom: var(--pix-spacing-3x);
+  }
+}