Skip to content

Commit 2b466bb

Browse files
[CST-15592] add interceptor for edit group, fix landmark-unique accessibility issue in pagination component
1 parent 55ab43f commit 2b466bb

3 files changed

Lines changed: 7 additions & 1 deletion

File tree

cypress/e2e/edit-group.cy.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ describe('Edit Group', () => {
55
// Must login as an Admin to see the page
66
cy.visit('/access-control/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP')).concat('/edit'));
77
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
8+
// Wait for all search components to be loaded
9+
cy.intercept('GET', '/server/api/eperson/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP').concat('/subgroups*'))).as('subGroups');
10+
cy.wait('@subGroups');
811
});
912

1013
it('should pass accessibility tests', () => {

src/app/shared/pagination/pagination.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939

4040
<div *ngIf="shouldShowBottomPager | async">
4141
<div *ngIf="showPaginator" class="pagination justify-content-center clearfix bottom">
42-
<ngb-pagination [boundaryLinks]="paginationOptions.boundaryLinks"
42+
<ngb-pagination [attr.aria-label]="('pagination-control.page-number-bar' | translate) + paginationOptions.id"
43+
[boundaryLinks]="paginationOptions.boundaryLinks"
4344
[collectionSize]="collectionSize"
4445
[disabled]="paginationOptions.disabled"
4546
[ellipses]="paginationOptions.ellipses"

src/assets/i18n/en.json5

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,6 +1048,8 @@
10481048

10491049
"pagination.next.button.disabled.tooltip": "No more pages of results",
10501050

1051+
"pagination.page-number-bar": "Control bar for page navigation, relative to element with ID: ",
1052+
10511053
"browse.startsWith": ", starting with {{ startsWith }}",
10521054

10531055
"browse.startsWith.choose_start": "(Choose start)",

0 commit comments

Comments
 (0)