From dd65e4af091b37ca2c1378108a36d02c1f429ff0 Mon Sep 17 00:00:00 2001
From: Xavier Carron <33637571+xav-car@users.noreply.github.com>
Date: Tue, 24 Dec 2024 14:07:30 +0100
Subject: [PATCH] refactor(orga): use PixPagination when possible

---
 .../campaign/activity/participants-list.gjs   | 21 +++++++++++++++++--
 .../campaign/results/assessment-list.gjs      | 20 ++++++++++++++++--
 .../campaign/results/profile-list.gjs         | 16 ++++++++++++--
 .../app/components/mission/activity-table.gjs | 21 ++++++++++++++++---
 orga/app/components/mission/result-table.gjs  | 20 ++++++++++++++++--
 orga/app/components/statistics/index.gjs      | 16 +++++++++++++-
 orga/app/components/team/members-list.hbs     |  2 +-
 orga/app/components/team/members-list.js      | 14 +++++++++++++
 .../styles/components/pagination-control.scss |  1 -
 orga/app/styles/globals/panels.scss           |  1 +
 10 files changed, 118 insertions(+), 14 deletions(-)

diff --git a/orga/app/components/campaign/activity/participants-list.gjs b/orga/app/components/campaign/activity/participants-list.gjs
index 740be59c98c..e69af7554a5 100644
--- a/orga/app/components/campaign/activity/participants-list.gjs
+++ b/orga/app/components/campaign/activity/participants-list.gjs
@@ -1,4 +1,5 @@
 import PixIconButton from '@1024pix/pix-ui/components/pix-icon-button';
+import PixPagination from '@1024pix/pix-ui/components/pix-pagination';
 import { array, fn } from '@ember/helper';
 import { on } from '@ember/modifier';
 import { action } from '@ember/object';
@@ -9,7 +10,6 @@ import { tracked } from '@glimmer/tracking';
 import { t } from 'ember-intl';
 
 import TableHeader from '../../table/header';
-import PaginationControl from '../../table/pagination-control';
 import ParticipationStatus from '../../ui/participation-status';
 import ParticipationFilters from '../filter/participation-filters';
 import DeleteParticipationModal from './delete-participation-modal';
@@ -23,10 +23,23 @@ export default class ParticipantsList extends Component {
   @tracked isModalOpen = false;
   @tracked participationToDelete;
 
+  get currentLocale() {
+    return this.intl.primaryLocale;
+  }
+
   get canDeleteParticipation() {
     return this.currentUser.isAdminInOrganization || this.args.campaign.ownerId == this.currentUser.prescriber?.id;
   }
 
+  get pageOptions() {
+    return [
+      { label: '10', value: 10 },
+      { label: '25', value: 25 },
+      { label: '50', value: 50 },
+      { label: '100', value: 100 },
+    ];
+  }
+
   @action
   openModal(participation, event) {
     event.stopPropagation();
@@ -165,7 +178,11 @@ export default class ParticipantsList extends Component {
       </div>
 
       {{#if @participations}}
-        <PaginationControl @pagination={{@participations.meta}} />
+        <PixPagination
+          @pagination={{@participations.meta}}
+          @locale={{this.getCurrentLocale}}
+          @pageOptions={{this.pageOptions}}
+        />
       {{/if}}
 
       <DeleteParticipationModal
diff --git a/orga/app/components/campaign/results/assessment-list.gjs b/orga/app/components/campaign/results/assessment-list.gjs
index 259f0b7f1e8..5282431a39f 100644
--- a/orga/app/components/campaign/results/assessment-list.gjs
+++ b/orga/app/components/campaign/results/assessment-list.gjs
@@ -1,11 +1,21 @@
+import PixPagination from '@1024pix/pix-ui/components/pix-pagination';
 import { t } from 'ember-intl';
 
+import getService from '../../../helpers/get-service.js';
 import TableHeader from '../../table/header';
-import TablePaginationControl from '../../table/pagination-control';
 import CampaignParticipationFilters from '../filter/participation-filters';
 import CampaignAssessmentRow from '../results/assessment-row';
 import EvolutionHeader from './evolution-header';
 
+function pageOptions() {
+  return [
+    { label: '10', value: 10 },
+    { label: '25', value: 25 },
+    { label: '50', value: 50 },
+    { label: '100', value: 100 },
+  ];
+}
+
 <template>
   <section ...attributes>
     <h3 class="screen-reader-only">{{t "pages.campaign-results.table.title"}}</h3>
@@ -87,7 +97,13 @@ import EvolutionHeader from './evolution-header';
     </div>
 
     {{#if @participations}}
-      <TablePaginationControl @pagination={{@participations.meta}} />
+      {{#let (getService "service:intl") as |intl|}}
+        <PixPagination
+          @pagination={{@participations.meta}}
+          @locale={{intl.primaryLocale}}
+          @pageOptions={{(pageOptions)}}
+        />
+      {{/let}}
     {{/if}}
   </section>
 </template>
diff --git a/orga/app/components/campaign/results/profile-list.gjs b/orga/app/components/campaign/results/profile-list.gjs
index e8e61a81390..31ea350efc1 100644
--- a/orga/app/components/campaign/results/profile-list.gjs
+++ b/orga/app/components/campaign/results/profile-list.gjs
@@ -1,3 +1,4 @@
+import PixPagination from '@1024pix/pix-ui/components/pix-pagination';
 import PixTag from '@1024pix/pix-ui/components/pix-tag';
 import { array, fn } from '@ember/helper';
 import { on } from '@ember/modifier';
@@ -6,12 +7,21 @@ import dayjsFormat from 'ember-dayjs/helpers/dayjs-format';
 import { t } from 'ember-intl';
 import { gt } from 'ember-truth-helpers';
 
+import getService from '../../../helpers/get-service.js';
 import TableHeader from '../../table/header';
-import TablePaginationControl from '../../table/pagination-control';
 import CampaignParticipationFilters from '../filter/participation-filters';
 import EvolutionHeader from './evolution-header';
 import ParticipationEvolutionIcon from './participation-evolution-icon';
 
+function pageOptions() {
+  return [
+    { label: '10', value: 10 },
+    { label: '25', value: 25 },
+    { label: '50', value: 50 },
+    { label: '100', value: 100 },
+  ];
+}
+
 <template>
   <section ...attributes>
     <h3 class="screen-reader-only">{{t "pages.profiles-list.table.title"}}</h3>
@@ -144,7 +154,9 @@ import ParticipationEvolutionIcon from './participation-evolution-icon';
     </div>
 
     {{#if (gt @profiles.length 0)}}
-      <TablePaginationControl @pagination={{@profiles.meta}} />
+      {{#let (getService "service:intl") as |intl|}}
+        <PixPagination @pagination={{@profiles.meta}} @locale={{intl.primaryLocale}} @pageOptions={{(pageOptions)}} />
+      {{/let}}
     {{/if}}
   </section>
 </template>
diff --git a/orga/app/components/mission/activity-table.gjs b/orga/app/components/mission/activity-table.gjs
index 027bca4f5a3..4f28e4692f8 100644
--- a/orga/app/components/mission/activity-table.gjs
+++ b/orga/app/components/mission/activity-table.gjs
@@ -1,9 +1,9 @@
+import PixPagination from '@1024pix/pix-ui/components/pix-pagination';
 import PixTag from '@1024pix/pix-ui/components/pix-tag';
 import { t } from 'ember-intl';
 
+import getService from '../../helpers/get-service.js';
 import Header from '../table/header';
-import PaginationControl from '../table/pagination-control';
-
 function statusColor(status) {
   return {
     'not-started': 'tertiary',
@@ -12,6 +12,15 @@ function statusColor(status) {
   }[status];
 }
 
+function pageOptions() {
+  return [
+    { label: '10', value: 10 },
+    { label: '25', value: 25 },
+    { label: '50', value: 50 },
+    { label: '100', value: 100 },
+  ];
+}
+
 <template>
   {{#if @missionLearners}}
     <div class="panel">
@@ -51,7 +60,13 @@ function statusColor(status) {
         </tbody>
       </table>
     </div>
-    <PaginationControl @pagination={{@missionLearners.meta}} />
+    {{#let (getService "service:intl") as |intl|}}
+      <PixPagination
+        @pagination={{@missionLearners.meta}}
+        @locale={{intl.primaryLocale}}
+        @pageOptions={{(pageOptions)}}
+      />
+    {{/let}}
   {{else}}
     <div class="table__empty content-text">
       {{t "pages.missions.mission.table.activities.no-data"}}
diff --git a/orga/app/components/mission/result-table.gjs b/orga/app/components/mission/result-table.gjs
index 6a09e8884c9..2bf9fd1cb51 100644
--- a/orga/app/components/mission/result-table.gjs
+++ b/orga/app/components/mission/result-table.gjs
@@ -1,10 +1,11 @@
 import PixIcon from '@1024pix/pix-ui/components/pix-icon';
+import PixPagination from '@1024pix/pix-ui/components/pix-pagination';
 import PixTag from '@1024pix/pix-ui/components/pix-tag';
 import PixTooltip from '@1024pix/pix-ui/components/pix-tooltip';
 import { t } from 'ember-intl';
 
+import getService from '../../helpers/get-service.js';
 import Header from '../table/header';
-import PaginationControl from '../table/pagination-control';
 
 function indexNumber(index) {
   return { number: index + 1 };
@@ -25,6 +26,15 @@ function getMissionResultColor(result) {
   }[result];
 }
 
+function pageOptions() {
+  return [
+    { label: '10', value: 10 },
+    { label: '25', value: 25 },
+    { label: '50', value: 50 },
+    { label: '100', value: 100 },
+  ];
+}
+
 <template>
   {{#if @missionLearners}}
     <div class="panel">
@@ -98,7 +108,13 @@ function getMissionResultColor(result) {
         </tbody>
       </table>
     </div>
-    <PaginationControl @pagination={{@missionLearners.meta}} />
+    {{#let (getService "service:intl") as |intl|}}
+      <PixPagination
+        @pagination={{@missionLearners.meta}}
+        @locale={{intl.primaryLocale}}
+        @pageOptions={{(pageOptions)}}
+      />
+    {{/let}}
   {{else}}
     <div class="table__empty content-text">
       {{t "pages.missions.mission.table.result.no-data"}}
diff --git a/orga/app/components/statistics/index.gjs b/orga/app/components/statistics/index.gjs
index 65f027296b4..1018dcfbe0a 100644
--- a/orga/app/components/statistics/index.gjs
+++ b/orga/app/components/statistics/index.gjs
@@ -14,9 +14,14 @@ import TagLevel from './tag-level';
 
 export default class Statistics extends Component {
   @service router;
+  @service intl;
 
   @tracked currentDomainFilter = null;
 
+  get currentLocale() {
+    return this.intl.primaryLocale;
+  }
+
   get analysisByTubes() {
     return this.args.model.data.sort(
       (a, b) => a.competence_code.localeCompare(b.competence_code) || a.sujet?.localeCompare(b.sujet),
@@ -74,6 +79,15 @@ export default class Statistics extends Component {
     };
   }
 
+  get pageOptions() {
+    return [
+      { label: '10', value: 10 },
+      { label: '25', value: 25 },
+      { label: '50', value: 50 },
+      { label: '100', value: 100 },
+    ];
+  }
+
   handleDomainFilter = (domain) => {
     this.currentDomainFilter = domain;
     this.router.replaceWith({ queryParams: { pageNumber: 1 } });
@@ -152,6 +166,6 @@ export default class Statistics extends Component {
       </table>
     </section>
 
-    <PixPagination @pagination={{this.pagination}} />
+    <PixPagination @pagination={{this.pagination}} @locale={{this.currentLocale}} @pageOptions={{this.pageOptions}} />
   </template>
 }
diff --git a/orga/app/components/team/members-list.hbs b/orga/app/components/team/members-list.hbs
index 957e20e4af4..11854bcb73d 100644
--- a/orga/app/components/team/members-list.hbs
+++ b/orga/app/components/team/members-list.hbs
@@ -36,5 +36,5 @@
 </div>
 
 {{#if @members}}
-  <Table::PaginationControl @pagination={{@members.meta}} />
+  <PixPagination @pagination={{@members.meta}} @locale={{this.currentLocale}} @pageOptions={{this.pageOptions}} />
 {{/if}}
\ No newline at end of file
diff --git a/orga/app/components/team/members-list.js b/orga/app/components/team/members-list.js
index 17123d4a952..bf33d926d4d 100644
--- a/orga/app/components/team/members-list.js
+++ b/orga/app/components/team/members-list.js
@@ -3,6 +3,11 @@ import Component from '@glimmer/component';
 
 export default class MembersList extends Component {
   @service currentUser;
+  @service intl;
+
+  get currentLocale() {
+    return this.intl.primaryLocale;
+  }
 
   get displayManagingColumn() {
     return this.currentUser.isAdminInOrganization;
@@ -11,4 +16,13 @@ export default class MembersList extends Component {
   get isMultipleAdminsAvailable() {
     return this.args.members?.filter((member) => member.isAdmin).length > 1;
   }
+
+  get pageOptions() {
+    return [
+      { label: '10', value: 10 },
+      { label: '25', value: 25 },
+      { label: '50', value: 50 },
+      { label: '100', value: 100 },
+    ];
+  }
 }
diff --git a/orga/app/styles/components/pagination-control.scss b/orga/app/styles/components/pagination-control.scss
index 3cb020bda1b..ef618136ce4 100644
--- a/orga/app/styles/components/pagination-control.scss
+++ b/orga/app/styles/components/pagination-control.scss
@@ -1,7 +1,6 @@
 .pagination-control {
   display: flex;
   justify-content: space-between;
-  margin: 16px 0;
   color: var(--pix-neutral-500);
   font-size: 0.875rem;
   font-family: $font-roboto;
diff --git a/orga/app/styles/globals/panels.scss b/orga/app/styles/globals/panels.scss
index b1b55b217dd..31a8216010a 100644
--- a/orga/app/styles/globals/panels.scss
+++ b/orga/app/styles/globals/panels.scss
@@ -1,6 +1,7 @@
 .panel {
   @extend %pix-shadow-xs;
 
+  margin-bottom: var(--pix-spacing-8x);
   background-color: var(--pix-neutral-0);
   border: none;
   border-radius: 4px;