From e9940f4005899f4ead5146b4ec162767e1baf426 Mon Sep 17 00:00:00 2001 From: wout Date: Mon, 5 May 2025 15:30:55 +0200 Subject: [PATCH 1/5] 130479: add aria-selected to selected language + globe button uses a button element --- .../lang-switch/lang-switch.component.html | 29 ++++++++++--------- .../lang-switch/lang-switch.component.scss | 1 + .../lang-switch/lang-switch.component.spec.ts | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/app/shared/lang-switch/lang-switch.component.html b/src/app/shared/lang-switch/lang-switch.component.html index d9a5efaa81..c299eaf2f5 100644 --- a/src/app/shared/lang-switch/lang-switch.component.html +++ b/src/app/shared/lang-switch/lang-switch.component.html @@ -1,17 +1,18 @@
- + +
+
+ {{ langLabel(lang) }} +
+
diff --git a/src/app/shared/lang-switch/lang-switch.component.scss b/src/app/shared/lang-switch/lang-switch.component.scss index 7b593a9bb5..b7ce1e67a3 100644 --- a/src/app/shared/lang-switch/lang-switch.component.scss +++ b/src/app/shared/lang-switch/lang-switch.component.scss @@ -3,6 +3,7 @@ } .dropdown-toggle { + all: unset; color: var(--ds-header-icon-color); &:hover, &:focus { diff --git a/src/app/shared/lang-switch/lang-switch.component.spec.ts b/src/app/shared/lang-switch/lang-switch.component.spec.ts index 6d3c847086..3a0cfada40 100644 --- a/src/app/shared/lang-switch/lang-switch.component.spec.ts +++ b/src/app/shared/lang-switch/lang-switch.component.spec.ts @@ -109,7 +109,7 @@ describe('LangSwitchComponent', () => { })); it('should define the main A HREF in the UI', (() => { - expect(langSwitchElement.querySelector('a')).not.toBeNull(); + expect(langSwitchElement.querySelector('button.dropdown-toggle')).not.toBeNull(); })); describe('when selecting a language', () => { From 163cc75437ca669a91763b14714acde01e717f1c Mon Sep 17 00:00:00 2001 From: wout Date: Mon, 5 May 2025 15:59:11 +0200 Subject: [PATCH 2/5] 130479: using ul > li in recent-item + "Load more ..." to "" element --- .../recent-item-list.component.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.html b/src/app/home-page/recent-item-list/recent-item-list.component.html index cd14891b3f..56b6b8d3bb 100644 --- a/src/app/home-page/recent-item-list/recent-item-list.component.html +++ b/src/app/home-page/recent-item-list/recent-item-list.component.html @@ -2,11 +2,15 @@

{{'home.recent-submissions.head' | translate}}

-
- - -
- +
    +
  • + + +
    • +
+
From 545b2ff8a72eecd606aa3623c155db4542969537 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Wed, 7 May 2025 16:43:37 +0200 Subject: [PATCH 3/5] 130479: Hide no results status when query is empty --- .../submission-import-external.component.html | 2 +- .../submission-import-external.component.spec.ts | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/submission/import-external/submission-import-external.component.html b/src/app/submission/import-external/submission-import-external.component.html index dc46e6758f..48ce75e9b5 100644 --- a/src/app/submission/import-external/submission-import-external.component.html +++ b/src/app/submission/import-external/submission-import-external.component.html @@ -24,7 +24,7 @@ -
+
{{ 'search.results.empty' | translate }}
diff --git a/src/app/submission/import-external/submission-import-external.component.spec.ts b/src/app/submission/import-external/submission-import-external.component.spec.ts index 29b75bab44..b0946bfb7d 100644 --- a/src/app/submission/import-external/submission-import-external.component.spec.ts +++ b/src/app/submission/import-external/submission-import-external.component.spec.ts @@ -469,6 +469,12 @@ describe('SubmissionImportExternalComponent test suite', () => { if (param === 'entity') { return observableOf('Publication'); } + if (param === 'query') { + return observableOf('test'); + } + if (param === 'sourceId') { + return observableOf('pubmed'); + } return observableOf({}); }); fixture.detectChanges(); From 8ff943b08488022f41815020ea1d565be65e6775 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Wed, 7 May 2025 17:51:54 +0200 Subject: [PATCH 4/5] 129964: Made DSO badges more screen-reader friendly - Added commas between the labels to prevent screen readers from reading it as a sentence - Added hidden text describing what the badges represent --- .../access-status-badge.component.html | 6 +++++- .../access-status-badge.component.spec.ts | 2 +- .../my-dspace-status-badge.component.html | 2 ++ .../badges/status-badge/status-badge.component.html | 8 ++++++-- .../shared/badges/type-badge/type-badge.component.html | 6 +++++- src/assets/i18n/en.json5 | 8 ++++++++ 6 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html index a0180a761a..805b86f66d 100644 --- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html +++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html @@ -1,5 +1,9 @@ - {{ accessStatus | translate }} + + {{ 'listelement.badge.access-status' | translate }} + {{ accessStatus | translate }} + , + diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts index f661ed6e00..9faba30c84 100644 --- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts +++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts @@ -77,7 +77,7 @@ describe('ItemAccessStatusBadgeComponent', () => { function lookForAccessStatusBadge(status: string) { const badge = fixture.debugElement.query(By.css('span.badge')); - expect(badge.nativeElement.textContent).toEqual(`access-status.${status.toLowerCase()}.listelement.badge`); + expect(badge.nativeElement.textContent).toContain(`access-status.${status.toLowerCase()}.listelement.badge`); } describe('init', () => { diff --git a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html index 4cf93cbd1d..be85e8d2f3 100644 --- a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html +++ b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html @@ -1,5 +1,7 @@
+ {{ 'mydspace.status' | translate }} {{('mydspace.status.' + badgeContent) | translate}} + ,
diff --git a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html index c864f22afa..136a4055e0 100644 --- a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html +++ b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html @@ -1,6 +1,10 @@
- {{ "item.badge.private" | translate }} + {{ 'item.badge.status' | translate }} + {{ "item.badge.private" | translate }} + ,
- {{ "item.badge.withdrawn" | translate }} + {{ 'item.badge.status' | translate }} + {{ "item.badge.withdrawn" | translate }} + ,
diff --git a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html index 119702c375..a77e6fbba5 100644 --- a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html +++ b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html @@ -1,3 +1,7 @@ - {{ typeMessage | translate }} + + {{ 'listelement.badge.dso-type' | translate}} + {{ typeMessage | translate }} + , + diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 6c91bae4c1..a1ebb99057 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -34,6 +34,8 @@ "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with DSpace. If the error persists, contact the administrator", + "listelement.badge.access-status": "Access status:", + "access-status.embargo.listelement.badge": "Embargo", "access-status.metadata.only.listelement.badge": "Metadata only", @@ -1898,6 +1900,8 @@ "item.edit.authorizations.title": "Edit item's Policies", + "item.badge.status": "Item status:", + "item.badge.private": "Non-discoverable", "item.badge.withdrawn": "Withdrawn", @@ -3012,6 +3016,8 @@ "mydspace.show.supervisedWorkspace": "Supervised items", + "mydspace.status": "My DSpace status:", + "mydspace.status.mydspaceArchived": "Archived", "mydspace.status.mydspaceValidation": "Validation", @@ -3068,6 +3074,8 @@ "nav.user.description": "User profile bar", + "listelement.badge.dso-type": "Item type:", + "none.listelement.badge": "Item", "orgunit.listelement.badge": "Organizational Unit", From 830be1f15af33556f1940c9562fb9e8dd48c05dc Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Tue, 13 May 2025 18:59:04 +0200 Subject: [PATCH 5/5] 129964: Hide duplicate links for keyboard navigators --- .../journal-issue-search-result-grid-element.component.html | 2 +- .../journal-volume-search-result-grid-element.component.html | 2 +- .../journal/journal-search-result-grid-element.component.html | 2 +- .../journal-issue-search-result-list-element.component.html | 2 +- .../journal-volume-search-result-list-element.component.html | 2 +- .../journal/journal-search-result-list-element.component.html | 2 +- .../org-unit/org-unit-search-result-grid-element.component.html | 2 +- .../person/person-search-result-grid-element.component.html | 2 +- .../project/project-search-result-grid-element.component.html | 2 +- .../org-unit/org-unit-search-result-list-element.component.html | 2 +- .../person/person-search-result-list-element.component.html | 2 +- .../project/project-search-result-list-element.component.html | 2 +- .../collection-search-result-grid-element.component.html | 2 +- .../community-search-result-grid-element.component.html | 2 +- .../item/item-search-result-grid-element.component.html | 2 +- .../item/item-search-result-list-element.component.html | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html index 13c5286e71..f26c1035d1 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html +++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html @@ -6,7 +6,7 @@ + class="card-img-top full-width" tabindex="-1" [attr.title]="'search.results.view-result' | translate">
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html index c64da0b632..ff9a78d23a 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html +++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html @@ -6,7 +6,7 @@ + class="card-img-top full-width" tabindex="-1" [attr.title]="'search.results.view-result' | translate">
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html index 9037e364d8..17b038fafd 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html +++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html @@ -6,7 +6,7 @@ + class="card-img-top full-width" tabindex="-1" [attr.title]="'search.results.view-result' | translate">
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html index e3293be3a0..e2dfdf269b 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html @@ -2,7 +2,7 @@
+ [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" tabindex="-1"> diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html index 8d7fbda4af..7c156e308e 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html @@ -2,7 +2,7 @@
+ [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" tabindex="-1"> diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html index 6d7f9293ec..a778d071f6 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html @@ -1,7 +1,7 @@
+ [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" tabindex="-1"> diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html index 502365e60a..321650276b 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html +++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html @@ -6,7 +6,7 @@ + class="card-img-top full-width" tabindex="-1" [attr.title]="'search.results.view-result' | translate">
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html index 0cbe19c1e0..3e4dcd3081 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html +++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html @@ -6,7 +6,7 @@ + class="card-img-top full-width" tabindex="-1" [attr.title]="'search.results.view-result' | translate">
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html index 97d4016ec4..0254b17b55 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html +++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html @@ -6,7 +6,7 @@ + class="card-img-top full-width" tabindex="-1" [attr.title]="'search.results.view-result' | translate">
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html index 07c7c5bb89..0308def41d 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html @@ -2,7 +2,7 @@
+ [routerLink]="[itemPageRoute]" class="dont-break-out" tabindex="-1"> + [routerLink]="[itemPageRoute]" class="dont-break-out" tabindex="-1"> + [routerLink]="[itemPageRoute]" class="dont-break-out" tabindex="-1"> - + diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html index 478db93c34..11f8351ab5 100644 --- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html +++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html @@ -1,5 +1,5 @@
- + diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html index 3e6efbf765..9aa511cb41 100644 --- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html +++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html @@ -3,7 +3,7 @@
+ class="card-img-top full-width" tabindex="-1" [attr.title]="'search.results.view-result' | translate">