From ba244bf6b14bfed06f1b1052cc6407f2537a175b Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 29 Aug 2023 11:44:03 -0500
Subject: [PATCH] Fix heading order issue with item page & update accessibility
 tests to prove it now passes

---
 cypress/e2e/item-page.cy.ts                   | 20 ++++++++++---------
 .../item-page-title-field.component.html      |  4 ++--
 .../metadata-field-wrapper.component.html     |  2 +-
 .../metadata-field-wrapper.component.scss     |  3 +++
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/cypress/e2e/item-page.cy.ts b/cypress/e2e/item-page.cy.ts
index 9eed711776e..9dba6eb8cea 100644
--- a/cypress/e2e/item-page.cy.ts
+++ b/cypress/e2e/item-page.cy.ts
@@ -1,4 +1,3 @@
-import { Options } from 'cypress-axe';
 import { TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
@@ -19,13 +18,16 @@ describe('Item  Page', () => {
         cy.get('ds-item-page').should('be.visible');
 
         // Analyze <ds-item-page> for accessibility issues
-        // Disable heading-order checks until it is fixed
-        testA11y('ds-item-page',
-            {
-                rules: {
-                    'heading-order': { enabled: false }
-                }
-            } as Options
-        );
+        testA11y('ds-item-page');
+    });
+
+    it('should pass accessibility tests on full item page', () => {
+        cy.visit(ENTITYPAGE + '/full');
+
+        // <ds-full-item-page> tag must be loaded
+        cy.get('ds-full-item-page').should('be.visible');
+
+        // Analyze <ds-full-item-page> for accessibility issues
+        testA11y('ds-full-item-page');
     });
 });
diff --git a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
index 15960bdc9d7..85975d45335 100644
--- a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
+++ b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
@@ -1,6 +1,6 @@
-<h2 class="item-page-title-field">
+<h1 class="item-page-title-field">
   <div *ngIf="item.firstMetadataValue('dspace.entity.type') as type" class="d-inline">
     {{ type.toLowerCase() + '.page.titleprefix' | translate }}
   </div>
   <span class="dont-break-out">{{ dsoNameService.getName(item) }}</span>
-</h2>
+</h1>
diff --git a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html
index d69f87883bb..7748e385ca4 100644
--- a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html
+++ b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html
@@ -1,5 +1,5 @@
 <div class="simple-view-element" [class.d-none]="hideIfNoTextContent && content.textContent.trim().length === 0">
-  <h5 class="simple-view-element-header" *ngIf="label">{{ label }}</h5>
+  <h2 class="simple-view-element-header" *ngIf="label">{{ label }}</h2>
   <div #content class="simple-view-element-body">
     <ng-content></ng-content>
   </div>
diff --git a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss
index 75dfd09d0d9..bf17d63d6c6 100644
--- a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss
+++ b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss
@@ -2,4 +2,7 @@
   .simple-view-element {
     margin-bottom: 15px;
   }
+  .simple-view-element-header {
+    font-size: 1.25rem;
+  }
 }