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

src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html

@@ -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>

src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html

@@ -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>

src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html

@@ -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>

src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html

@@ -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>

src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html

@@ -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>

src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html

@@ -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>

src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html

@@ -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>

src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html

@@ -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>

src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html

@@ -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>

src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html

@@ -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'"

src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html

@@ -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'"

src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html

@@ -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'"

src/app/home-page/recent-item-list/recent-item-list.component.html

@@ -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>
+      <h2> {{ 'home.recent-submissions.head' | translate }}</h2>
-      @for (item of itemRD?.payload?.page; track item) {
+      <ul class="list-unstyled m-0 p-0">
-        <div class="my-4">
+        @for (item of itemRD?.payload?.page; track item) {
-          <ds-listable-object-component-loader [object]="item" [viewMode]="viewMode" class="pb-4">
+          <li class="my-4">
-          </ds-listable-object-component-loader>
+            <ds-listable-object-component-loader [object]="item" [viewMode]="viewMode" class="pb-4">
-        </div>
+            </ds-listable-object-component-loader>
-      }
+          </li>
-      <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>
+        }
+      </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) {

src/app/shared/lang-switch/lang-switch.component.html

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

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 {

src/app/shared/lang-switch/lang-switch.component.spec.ts

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

src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html

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

src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts

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

src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html

@@ -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>

src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html

@@ -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>
 }

src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html

@@ -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>
 }

src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html

@@ -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>

src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html

@@ -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>

src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html

@@ -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>

src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html

@@ -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>

src/app/submission/import-external/submission-import-external.component.html

@@ -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>

src/app/submission/import-external/submission-import-external.component.spec.ts

@@ -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();

src/assets/i18n/en.json5

@@ -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",