Merge branch 'w2p-130479_fix-accessibility-issues-for-the-language-toggle-and-recent-submissions'

This commit is contained in:
Alexandre Vryghem
2025-05-13 19:28:52 +02:00
28 changed files with 87 additions and 50 deletions

View File

@@ -7,7 +7,7 @@
<a
[target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" role="link" tabindex="0">
class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" tabindex="-1">
<div>
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
</ds-thumbnail>

View File

@@ -7,7 +7,7 @@
<a
[target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" role="link" tabindex="0">
class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" tabindex="-1">
<div>
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
</ds-thumbnail>

View File

@@ -7,7 +7,7 @@
<a
[target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" role="link" tabindex="0">
class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" tabindex="-1">
<div>
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
</ds-thumbnail>

View File

@@ -4,7 +4,7 @@
@if (linkType !== linkTypes.None) {
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" role="link" tabindex="0">
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" tabindex="-1">
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
</ds-thumbnail>
</a>

View File

@@ -4,7 +4,7 @@
@if (linkType !== linkTypes.None) {
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" role="link" tabindex="0">
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" tabindex="-1">
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
</ds-thumbnail>
</a>

View File

@@ -3,7 +3,7 @@
<div class="col-3 col-md-2">
@if (linkType !== linkTypes.None) {
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" role="link" tabindex="0">
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" tabindex="-1">
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
</ds-thumbnail>
</a>

View File

@@ -7,7 +7,7 @@
<a
[target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" role="link" tabindex="0">
class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" tabindex="-1">
<div>
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
</ds-thumbnail>

View File

@@ -7,7 +7,7 @@
<a
[target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" role="link" tabindex="0">
class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" tabindex="-1">
<div>
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
</ds-thumbnail>

View File

@@ -7,7 +7,7 @@
<a
[target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" role="link" tabindex="0">
class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" tabindex="-1">
<div>
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
</ds-thumbnail>

View File

@@ -4,7 +4,7 @@
@if (linkType !== linkTypes.None) {
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
[routerLink]="[itemPageRoute]" class="dont-break-out" role="link" tabindex="0">
[routerLink]="[itemPageRoute]" class="dont-break-out" tabindex="-1">
<ds-thumbnail [thumbnail]="dso?.thumbnail | async"
[defaultImage]="'assets/images/orgunit-placeholder.svg'"
[alt]="'thumbnail.orgunit.alt'"

View File

@@ -4,7 +4,7 @@
@if (linkType !== linkTypes.None) {
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
[routerLink]="[itemPageRoute]" class="dont-break-out" role="link" tabindex="0">
[routerLink]="[itemPageRoute]" class="dont-break-out" tabindex="-1">
<ds-thumbnail [thumbnail]="dso?.thumbnail | async"
[defaultImage]="'assets/images/person-placeholder.svg'"
[alt]="'thumbnail.person.alt'"

View File

@@ -4,7 +4,7 @@
@if (linkType !== linkTypes.None) {
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
[routerLink]="[itemPageRoute]" class="dont-break-out" role="link" tabindex="0">
[routerLink]="[itemPageRoute]" class="dont-break-out" tabindex="-1">
<ds-thumbnail [thumbnail]="dso?.thumbnail | async"
[defaultImage]="'assets/images/project-placeholder.svg'"
[alt]="'thumbnail.project.alt'"

View File

@@ -2,14 +2,18 @@
@if (itemRD?.hasSucceeded && itemRD?.payload?.page.length > 0) {
<div class="mt-4" [ngClass]="placeholderFontClass" @fadeIn>
<div class="d-flex flex-row border-bottom mb-4 pb-4"></div>
<h2> {{'home.recent-submissions.head' | translate}}</h2>
@for (item of itemRD?.payload?.page; track item) {
<div class="my-4">
<ds-listable-object-component-loader [object]="item" [viewMode]="viewMode" class="pb-4">
</ds-listable-object-component-loader>
</div>
}
<button (click)="onLoadMore()" class="btn btn-primary search-button mt-4 float-start ng-tns-c290-40" role="button" tabindex="0"> {{'vocabulary-treeview.load-more' | translate }} ...</button>
<h2> {{ 'home.recent-submissions.head' | translate }}</h2>
<ul class="list-unstyled m-0 p-0">
@for (item of itemRD?.payload?.page; track item) {
<li class="my-4">
<ds-listable-object-component-loader [object]="item" [viewMode]="viewMode" class="pb-4">
</ds-listable-object-component-loader>
</li>
}
</ul>
<button (click)="onLoadMore()" class="btn btn-primary search-button mt-4 float-start" role="link" tabindex="0">
{{ 'vocabulary-treeview.load-more' | translate }} ...
</button>
</div>
}
@if (itemRD?.hasFailed) {

View File

@@ -1,25 +1,28 @@
@if (moreThanOneLanguage) {
<div ngbDropdown class="navbar-nav" display="dynamic" placement="bottom-right">
<a href="javascript:void(0);" role="menuitem"
[attr.aria-label]="'nav.language' |translate"
aria-controls="language-menu-list"
aria-haspopup="menu"
[title]="'nav.language' | translate"
(click)="$event.preventDefault()" data-toggle="dropdown" ngbDropdownToggle
data-test="lang-switch"
tabindex="0">
<button role="button"
[attr.aria-label]="'nav.language' |translate"
aria-controls="language-menu-list"
aria-haspopup="menu"
class="dropdown-toggle"
[title]="'nav.language' | translate"
(click)="$event.preventDefault()" data-toggle="dropdown" ngbDropdownToggle
data-test="lang-switch"
tabindex="0">
<i class="fas fa-globe-asia fa-lg fa-fw"></i>
</a>
<ul ngbDropdownMenu class="dropdown-menu" [attr.aria-label]="'nav.language' |translate" id="language-menu-list" role="menu">
</button>
<div ngbDropdownMenu class="dropdown-menu" [attr.aria-label]="'nav.language' |translate" id="language-menu-list"
role="listbox">
@for (lang of translate.getLangs(); track lang) {
<li class="dropdown-item" tabindex="0" #langSelect
role="menuitem"
(keyup.enter)="useLang(lang)"
(click)="useLang(lang)"
[class.active]="lang === translate.currentLang">
<div class="dropdown-item" tabindex="0"
role="option"
(keyup.enter)="useLang(lang)"
(click)="useLang(lang)"
[attr.aria-selected]="lang === translate.currentLang"
[class.active]="lang === translate.currentLang">
{{ langLabel(lang) }}
</li>
</div>
}
</ul>
</div>
</div>
}

View File

@@ -3,6 +3,7 @@
}
.dropdown-toggle {
all: unset;
color: var(--ds-header-icon-color);
&:hover, &:focus {

View File

@@ -128,7 +128,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', () => {

View File

@@ -1,5 +1,10 @@
@if (showAccessStatus) {
@if ({ status: accessStatus$ | async, date: embargoDate$ | async }; as accessStatus) {
<span [class]="'badge bg-secondary dont-break-out access-status-list-element-badge ' + accessStatusClass">{{ accessStatus.status | translate: {date: accessStatus.date} }}</span>
@if ((accessStatus$ | async); as status) {
@let date = embargoDate$ | async;
<span [class]="'badge bg-secondary dont-break-out access-status-list-element-badge ' + accessStatusClass">
<span class="sr-only">{{ 'listelement.badge.access-status' | translate }}</span>
{{ status | translate: { date: date } }}
<span class="sr-only">, </span>
</span>
}
}

View File

@@ -19,7 +19,7 @@ import { TruncatePipe } from '../../../../utils/truncate.pipe';
import { AccessStatusObject } from './access-status.model';
import { AccessStatusBadgeComponent } from './access-status-badge.component';
describe('ItemAccessStatusBadgeComponent', () => {
describe('AccessStatusBadgeComponent', () => {
let component: AccessStatusBadgeComponent;
let fixture: ComponentFixture<AccessStatusBadgeComponent>;
@@ -100,17 +100,17 @@ describe('ItemAccessStatusBadgeComponent', () => {
function lookForAccessStatusBadgeForItem(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`);
}
function lookForAccessStatusBadgeForBitstream() {
const badge = fixture.debugElement.query(By.css('span.badge'));
expect(badge.nativeElement.textContent).toEqual(`embargo.listelement.badge`);
expect(badge.nativeElement.textContent).toContain('embargo.listelement.badge');
}
function lookForNoAccessStatusBadgeForBitstream() {
const badge = fixture.debugElement.query(By.css('span.badge'));
expect(badge.nativeElement.textContent).toEqual(``);
expect(badge).toBeNull();
}
describe('init with item', () => {

View File

@@ -1,5 +1,7 @@
<div>
<span [className]="badgeClass">
<span class="sr-only">{{ 'mydspace.status' | translate }}</span>
{{('mydspace.status.' + badgeContent) | translate}}
<span class="sr-only">, </span>
</span>
</div>

View File

@@ -1,10 +1,16 @@
@if (privateBadge) {
<div class="private-badge">
<span class="badge bg-danger">{{ "item.badge.private" | translate }}</span>
<span class="badge bg-danger">
<span class="sr-only">{{ 'item.badge.status' | translate }}</span>
{{ "item.badge.private" | translate }}
<span class="sr-only">, </span>
</span>
</div>
}
@if (withdrawnBadge) {
<div class="withdrawn-badge">
<span class="sr-only">{{ 'item.badge.status' | translate }}</span>
<span class="badge bg-warning">{{ "item.badge.withdrawn" | translate }}</span>
<span class="sr-only">, </span>
</div>
}

View File

@@ -1,5 +1,7 @@
@if (typeMessage) {
<span>
<span class="sr-only">{{ 'listelement.badge.dso-type' | translate }}</span>
<span class="badge bg-info">{{ typeMessage | translate }}</span>
<span class="sr-only">, </span>
</span>
}

View File

@@ -1,6 +1,6 @@
<div class="card">
@if (linkType !== linkTypes.None) {
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', dso.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', dso.id]" class="card-img-top" tabindex="-1" [attr.title]="'search.results.view-result' | translate">
<ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
</ds-thumbnail>
</a>

View File

@@ -1,6 +1,6 @@
<div class="card">
@if (linkType !== linkTypes.None) {
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', dso.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', dso.id]" class="card-img-top" tabindex="-1" [attr.title]="'search.results.view-result' | translate">
<ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
</ds-thumbnail>
</a>

View File

@@ -4,7 +4,7 @@
</div>
@if (linkType !== linkTypes.None) {
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
class="card-img-top full-width" tabindex="-1" [attr.title]="'search.results.view-result' | translate">
<div>
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
</ds-thumbnail>

View File

@@ -3,7 +3,7 @@
<div class="col-3 col-md-2">
@if (linkType !== linkTypes.None) {
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
[routerLink]="[itemPageRoute]" class="dont-break-out" role="button" tabindex="0">
[routerLink]="[itemPageRoute]" class="dont-break-out" tabindex="-1">
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
</ds-thumbnail>
</a>

View File

@@ -32,7 +32,7 @@
<ds-loading
message="{{'loading.search-results' | translate}}"></ds-loading>
}
@if ((isLoading$ | async) !== true && entriesRD?.payload?.page?.length === 0) {
@if ((isLoading$ | async) !== true && entriesRD?.payload?.page?.length === 0 && routeData?.query?.length > 0) {
<div data-test="empty-external-entry-list">
<ds-alert [type]="AlertType.Info">{{ 'search.results.empty' | translate }}</ds-alert>
</div>

View File

@@ -503,6 +503,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();

View File

@@ -33,6 +33,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",
@@ -2251,6 +2253,8 @@
"item.edit.authorizations.title": "Edit item's Policies",
"item.badge.status": "Item status:",
"item.badge.private": "Non-discoverable",
"item.badge.withdrawn": "Withdrawn",
@@ -3591,6 +3595,8 @@
"mydspace.show.supervisedWorkspace": "Supervised items",
"mydspace.status": "My DSpace status:",
"mydspace.status.mydspaceArchived": "Archived",
"mydspace.status.mydspaceValidation": "Validation",
@@ -3655,6 +3661,8 @@
"nav.user.description": "User profile bar",
"listelement.badge.dso-type": "Item type:",
"none.listelement.badge": "Item",
"publication-claim.title": "Publication claim",