From 43e4f9de499e3cb19d0193f00b2b592b497a7a44 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Fri, 21 Feb 2025 14:36:04 +0100
Subject: [PATCH] Fix e2e issues

---
 cypress/e2e/item-statistics.cy.ts                      |  2 +-
 .../admin-sidebar-section.component.html               |  4 ++--
 .../admin-sidebar-section.component.ts                 | 10 ++++++----
 .../expandable-admin-sidebar-section.component.html    |  6 +++---
 src/app/shared/menu/providers/edit.menu.spec.ts        |  1 +
 src/app/shared/menu/providers/edit.menu.ts             |  3 ++-
 src/app/shared/menu/providers/export.menu.spec.ts      |  1 +
 src/app/shared/menu/providers/export.menu.ts           |  3 ++-
 src/app/shared/menu/providers/new.menu.spec.ts         |  1 +
 src/app/shared/menu/providers/new.menu.ts              |  3 ++-
 10 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/cypress/e2e/item-statistics.cy.ts b/cypress/e2e/item-statistics.cy.ts
index 6518f595a9..3456e0207b 100644
--- a/cypress/e2e/item-statistics.cy.ts
+++ b/cypress/e2e/item-statistics.cy.ts
@@ -7,7 +7,7 @@ describe('Item Statistics Page', () => {
   it('should load if you click on "Statistics" from an Item/Entity page', () => {
     cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
     cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
-    cy.location('pathname').should('eq', ITEMSTATISTICSPAGE);
+    cy.location('pathname').should('eq', '/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
   });
 
   it('should contain element ds-item-statistics-page when navigating to an item statistics page', () => {
diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
index 30a7a3353b..8d0ac83c32 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
@@ -3,7 +3,7 @@
      [ngClass]="{ disabled: isDisabled }"
      role="menuitem"
      [attr.aria-disabled]="isDisabled"
-     [attr.aria-labelledby]="adminMenuSectionTitleId(section.id)"
+     [attr.aria-labelledby]="adminMenuSectionTitleAccessibilityHandle(section)"
      [routerLink]="itemModel.link"
      (keyup.space)="navigate($event)"
      (keyup.enter)="navigate($event)"
@@ -14,7 +14,7 @@
     </div>
     <div class="sidebar-collapsible-element-outer-wrapper">
       <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
-        <span [id]="adminMenuSectionTitleId(section.id)" [attr.data-test]="adminMenuSectionTitleId(section.id) | dsBrowserOnly">
+        <span [id]="adminMenuSectionTitleAccessibilityHandle(section)" [attr.data-test]="adminMenuSectionTitleAccessibilityHandle(section) | dsBrowserOnly">
           {{itemModel.text | translate}}
         </span>
       </div>
diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
index 85e4aa55c8..66c7762269 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
@@ -66,11 +66,13 @@ export class AdminSidebarSectionComponent extends AbstractMenuSectionComponent i
     }
   }
 
-  adminMenuSectionId(sectionId: string) {
-    return `admin-menu-section-${sectionId}`;
+  adminMenuSectionId(section: MenuSection) {
+    const accessibilityHandle = section.accessibilityHandle ?? section.id;
+    return `admin-menu-section-${accessibilityHandle}`;
   }
 
-  adminMenuSectionTitleId(sectionId: string) {
-    return `admin-menu-section-${sectionId}-title`;
+  adminMenuSectionTitleAccessibilityHandle(section: MenuSection) {
+    const accessibilityHandle = section.accessibilityHandle ?? section.id;
+    return `admin-menu-section-${accessibilityHandle}-title`;
   }
 }
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
index 3555a62787..d73b52d752 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
@@ -7,7 +7,7 @@
   <a class="sidebar-section-wrapper"
      role="menuitem" tabindex="0"
      aria-haspopup="menu"
-     [attr.aria-controls]="adminMenuSectionId(section.id)"
+     [attr.aria-controls]="adminMenuSectionId(section)"
      [attr.aria-expanded]="isExpanded$ | async"
      [attr.aria-label]="('menu.section.toggle.' + section.id) | translate"
      [class.disabled]="section.model?.disabled"
@@ -20,7 +20,7 @@
     </div>
     <div class="sidebar-collapsible-element-outer-wrapper">
       <div class="sidebar-collapsible-element-inner-wrapper sidebar-item toggler-wrapper">
-        <span [id]="adminMenuSectionTitleId(section.id)" [attr.data-test]="adminMenuSectionTitleId(section.id) | dsBrowserOnly">
+        <span [id]="adminMenuSectionTitleAccessibilityHandle(section)" [attr.data-test]="adminMenuSectionTitleAccessibilityHandle(section) | dsBrowserOnly">
           <ng-container
             *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
         </span>
@@ -34,7 +34,7 @@
     <div class="sidebar-fixed-element-wrapper"></div>
     <div class="sidebar-collapsible-element-outer-wrapper">
       <div class="sidebar-collapsible-element-inner-wrapper">
-        <div class="sidebar-sub-level-item-list" role="menu" [id]="adminMenuSectionId(section.id)" [attr.aria-label]="('menu.section.' + section.id) | translate">
+        <div class="sidebar-sub-level-item-list" role="menu" [id]="adminMenuSectionId(section)" [attr.aria-label]="('menu.section.' + section.id) | translate">
           <div class="sidebar-item" *ngFor="let subSection of (subSections$ | async)">
             <ng-container
               *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
diff --git a/src/app/shared/menu/providers/edit.menu.spec.ts b/src/app/shared/menu/providers/edit.menu.spec.ts
index ae22fa4eda..5266eb0103 100644
--- a/src/app/shared/menu/providers/edit.menu.spec.ts
+++ b/src/app/shared/menu/providers/edit.menu.spec.ts
@@ -19,6 +19,7 @@ import { EditMenuProvider } from './edit.menu';
 describe('EditMenuProvider', () => {
 
   const expectedTopSection: PartialMenuSection = {
+    accessibilityHandle: 'edit',
     visible: true,
     model: {
       type: MenuItemType.TEXT,
diff --git a/src/app/shared/menu/providers/edit.menu.ts b/src/app/shared/menu/providers/edit.menu.ts
index fea885498d..5aee52f027 100644
--- a/src/app/shared/menu/providers/edit.menu.ts
+++ b/src/app/shared/menu/providers/edit.menu.ts
@@ -39,6 +39,7 @@ export class EditMenuProvider extends AbstractExpandableMenuProvider {
   public getTopSection(): Observable<PartialMenuSection> {
     return observableOf(
       {
+        accessibilityHandle: 'edit',
         model: {
           type: MenuItemType.TEXT,
           text: 'menu.section.edit',
@@ -55,7 +56,7 @@ export class EditMenuProvider extends AbstractExpandableMenuProvider {
       this.authorizationService.isAuthorized(FeatureID.IsCommunityAdmin),
       this.authorizationService.isAuthorized(FeatureID.CanEditItem),
     ]).pipe(
-      map(([isCollectionAdmin, isCommunityAdmin, canEditItem]) => {
+      map(([isCollectionAdmin, isCommunityAdmin, canEditItem]: [boolean, boolean, boolean]) => {
         return [
           {
             visible: isCommunityAdmin,
diff --git a/src/app/shared/menu/providers/export.menu.spec.ts b/src/app/shared/menu/providers/export.menu.spec.ts
index 722b39a8c6..c547e96692 100644
--- a/src/app/shared/menu/providers/export.menu.spec.ts
+++ b/src/app/shared/menu/providers/export.menu.spec.ts
@@ -19,6 +19,7 @@ import { ExportMenuProvider } from './export.menu';
 
 describe('ExportMenuProvider', () => {
   const expectedTopSection: PartialMenuSection = {
+    accessibilityHandle: 'export',
     visible: true,
     model: {
       type: MenuItemType.TEXT,
diff --git a/src/app/shared/menu/providers/export.menu.ts b/src/app/shared/menu/providers/export.menu.ts
index 8020fea661..e6f47c5f5c 100644
--- a/src/app/shared/menu/providers/export.menu.ts
+++ b/src/app/shared/menu/providers/export.menu.ts
@@ -43,6 +43,7 @@ export class ExportMenuProvider extends AbstractExpandableMenuProvider {
   public getTopSection(): Observable<PartialMenuSection> {
     return observableOf(
       {
+        accessibilityHandle: 'export',
         model: {
           type: MenuItemType.TEXT,
           text: 'menu.section.export',
@@ -58,7 +59,7 @@ export class ExportMenuProvider extends AbstractExpandableMenuProvider {
       this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
       this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_EXPORT_SCRIPT_NAME),
     ]).pipe(
-      map(([authorized, metadataExportScriptExists]) => {
+      map(([authorized, metadataExportScriptExists]: [boolean, boolean]) => {
         return [
           {
             visible: authorized && metadataExportScriptExists,
diff --git a/src/app/shared/menu/providers/new.menu.spec.ts b/src/app/shared/menu/providers/new.menu.spec.ts
index dba6d2311a..ecca5594b2 100644
--- a/src/app/shared/menu/providers/new.menu.spec.ts
+++ b/src/app/shared/menu/providers/new.menu.spec.ts
@@ -18,6 +18,7 @@ import { NewMenuProvider } from './new.menu';
 
 describe('NewMenuProvider', () => {
   const expectedTopSection: PartialMenuSection = {
+    accessibilityHandle: 'new',
     visible: true,
     model: {
       type: MenuItemType.TEXT,
diff --git a/src/app/shared/menu/providers/new.menu.ts b/src/app/shared/menu/providers/new.menu.ts
index bb43d3ee5a..1db687951f 100644
--- a/src/app/shared/menu/providers/new.menu.ts
+++ b/src/app/shared/menu/providers/new.menu.ts
@@ -40,6 +40,7 @@ export class NewMenuProvider extends AbstractExpandableMenuProvider {
   public getTopSection(): Observable<PartialMenuSection> {
     return observableOf(
       {
+        accessibilityHandle: 'new',
         model: {
           type: MenuItemType.TEXT,
           text: 'menu.section.new',
@@ -56,7 +57,7 @@ export class NewMenuProvider extends AbstractExpandableMenuProvider {
       this.authorizationService.isAuthorized(FeatureID.IsCommunityAdmin),
       this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
       this.authorizationService.isAuthorized(FeatureID.CanSubmit),
-    ]).pipe(map(([isCollectionAdmin, isCommunityAdmin, isSiteAdmin, canSubmit]) => {
+    ]).pipe(map(([isCollectionAdmin, isCommunityAdmin, isSiteAdmin, canSubmit]: [boolean, boolean, boolean, boolean]) => {
 
       return [
         {