From 2b466bb382553907d743a2cdbed2df3f90782814 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 9 Oct 2024 14:16:47 +0200
Subject: [PATCH] [CST-15592] add interceptor for edit group, fix
 landmark-unique accessibility issue in pagination component

---
 cypress/e2e/edit-group.cy.ts                        | 3 +++
 src/app/shared/pagination/pagination.component.html | 3 ++-
 src/assets/i18n/en.json5                            | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cypress/e2e/edit-group.cy.ts b/cypress/e2e/edit-group.cy.ts
index e43ede978ad..ef5adbb89d9 100644
--- a/cypress/e2e/edit-group.cy.ts
+++ b/cypress/e2e/edit-group.cy.ts
@@ -5,6 +5,9 @@ describe('Edit Group', () => {
     // Must login as an Admin to see the page
     cy.visit('/access-control/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP')).concat('/edit'));
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+    // Wait for all search components to be loaded
+    cy.intercept('GET', '/server/api/eperson/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP').concat('/subgroups*'))).as('subGroups');
+    cy.wait('@subGroups');
   });
 
   it('should pass accessibility tests', () => {
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index 9ae978c41b9..63a95beacd8 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -39,7 +39,8 @@
 
   <div *ngIf="shouldShowBottomPager | async">
     <div *ngIf="showPaginator" class="pagination justify-content-center clearfix bottom">
-      <ngb-pagination [boundaryLinks]="paginationOptions.boundaryLinks"
+      <ngb-pagination [attr.aria-label]="('pagination-control.page-number-bar' | translate) + paginationOptions.id"
+                      [boundaryLinks]="paginationOptions.boundaryLinks"
                       [collectionSize]="collectionSize"
                       [disabled]="paginationOptions.disabled"
                       [ellipses]="paginationOptions.ellipses"
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 31e45d46246..05f528af072 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1048,6 +1048,8 @@
 
   "pagination.next.button.disabled.tooltip": "No more pages of results",
 
+  "pagination.page-number-bar": "Control bar for page navigation, relative to element with ID: ",
+
   "browse.startsWith": ", starting with {{ startsWith }}",
 
   "browse.startsWith.choose_start": "(Choose start)",