From 3bf7d819de6d18c087108d63c0dc268b49a5a903 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Sat, 16 Dec 2023 00:55:46 +0100 Subject: [PATCH 01/15] Fixed accessibility issues related to dso selectors - Fixed header ordering - Fixed input field not having a description what it does (because the header isn't always shown I decided to use aria-labels instead of regular labels) --- .../dso-selector/dso-selector/dso-selector.component.html | 1 + .../dso-selector/dso-selector/dso-selector.component.ts | 5 +++++ .../create-community-parent-selector.component.html | 6 +++--- .../create-item-parent-selector.component.html | 2 +- .../dso-selector-modal-wrapper.component.html | 2 +- .../edit-item-selector/edit-item-selector.component.html | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html index c4f5dbc4cd6..295165d171f 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html @@ -2,6 +2,7 @@ diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts index 503e4c44129..4590e05363d 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts @@ -75,6 +75,11 @@ export class DSOSelectorComponent implements OnInit, OnDestroy { */ @Input() sort: SortOptions; + /** + * The id that should be given to the input box, this is required for accessibility reasons + */ + @Input() searchBoxId: string | null = null; + // list of allowed selectable dsoTypes typesString: string; diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html index a13be638803..8ae146b42c4 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html +++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html @@ -6,14 +6,14 @@
-

+
{{'dso-selector.create.community.or-divider' | translate}}
-

+
-
{{'dso-selector.create.community.sub-level' | translate}}
+ {{'dso-selector.create.community.sub-level' | translate}} diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html index 5fccd58f48c..5288f08e02b 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html @@ -5,7 +5,7 @@
-
{{header | translate}}
+ {{header | translate}}
-
{{header | translate}}
+ {{header | translate}}
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html index 85d8797e660..999a96e7301 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html +++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html @@ -5,7 +5,7 @@
-
{{header | translate}}
+ {{header | translate}}
From 6b204b5b535d74f76a837656e30a3a8b1fde1e36 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Sat, 16 Dec 2023 00:56:30 +0100 Subject: [PATCH 02/15] Removed invisible buttons on the CommunityListComponent & fixed content displacement when expanding com/col --- .../community-list.component.html | 46 +++++++++---------- .../community-list.component.scss | 4 ++ .../community-list.component.spec.ts | 35 +++++++------- .../community-list.component.ts | 1 + src/assets/i18n/en.json5 | 4 ++ 5 files changed, 51 insertions(+), 39 deletions(-) create mode 100644 src/app/community-list-page/community-list/community-list.component.scss diff --git a/src/app/community-list-page/community-list/community-list.component.html b/src/app/community-list-page/community-list/community-list.component.html index eed9ca64cad..7ccf24a7619 100644 --- a/src/app/community-list-page/community-list/community-list.component.html +++ b/src/app/community-list-page/community-list/community-list.component.html @@ -4,9 +4,9 @@
- +
+ +
{{ dsoNameService.getName(node.payload) }} @@ -44,10 +47,9 @@
- + {{node.payload.shortDescription}} @@ -56,10 +58,9 @@
- +
@@ -67,9 +68,9 @@
- +
{{ dsoNameService.getName(node.payload) }}
@@ -77,10 +78,9 @@
- + {{node.payload.shortDescription}} diff --git a/src/app/community-list-page/community-list/community-list.component.scss b/src/app/community-list-page/community-list/community-list.component.scss new file mode 100644 index 00000000000..2e33380a29f --- /dev/null +++ b/src/app/community-list-page/community-list/community-list.component.scss @@ -0,0 +1,4 @@ +::ng-deep .fa-chevron-right::before { + display: block; + width: 16px; +} diff --git a/src/app/community-list-page/community-list/community-list.component.spec.ts b/src/app/community-list-page/community-list/community-list.component.spec.ts index fb47f4994d2..cec1b555ab8 100644 --- a/src/app/community-list-page/community-list/community-list.component.spec.ts +++ b/src/app/community-list-page/community-list/community-list.component.spec.ts @@ -5,7 +5,7 @@ import { CommunityListService, showMoreFlatNode, toFlatNode } from '../community import { CdkTreeModule } from '@angular/cdk/tree'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock'; -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core'; import { RouterTestingModule } from '@angular/router/testing'; import { Community } from '../../core/shared/community.model'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; @@ -300,12 +300,14 @@ describe('CommunityListComponent', () => { describe('second top community node is expanded and has more children (collections) than page size of collection', () => { describe('children of second top com are added (page-limited pageSize 2)', () => { - let allNodes; + let allNodes: DebugElement[]; beforeEach(fakeAsync(() => { - const chevronExpand = fixture.debugElement.queryAll(By.css('.expandable-node button')); - const chevronExpandSpan = fixture.debugElement.queryAll(By.css('.expandable-node button span')); - if (chevronExpandSpan[1].nativeElement.classList.contains('fa-chevron-right')) { - chevronExpand[1].nativeElement.click(); + const toggleButtons: DebugElement[] = fixture.debugElement.queryAll(By.css('.expandable-node button')); + const toggleButtonText: DebugElement = toggleButtons[1].query(By.css('span')); + expect(toggleButtonText).not.toBeNull(); + + if (toggleButtonText.nativeElement.classList.contains('fa-chevron-right')) { + toggleButtons[1].nativeElement.click(); tick(); fixture.detectChanges(); } @@ -315,17 +317,18 @@ describe('CommunityListComponent', () => { allNodes = [...expandableNodesFound, ...childlessNodesFound]; })); it('tree contains 2 (page-limited) top com, 2 (page-limited) coll of 2nd top com, a show more for those page-limited coll and show more for page-limited top com', () => { - mockTopFlatnodesUnexpanded.slice(0, 2).map((topFlatnode: FlatNode) => { - expect(allNodes.find((foundEl) => { - return (foundEl.nativeElement.textContent.trim() === topFlatnode.name); - })).toBeTruthy(); - }); - mockCollectionsPage1.map((coll) => { - expect(allNodes.find((foundEl) => { - return (foundEl.nativeElement.textContent.trim() === coll.name); - })).toBeTruthy(); - }); + const allNodeNames: string[] = allNodes.map((node: DebugElement) => node.nativeElement.innerText.trim()); expect(allNodes.length).toEqual(4); + const flatNodes: string[] = mockTopFlatnodesUnexpanded.slice(0, 2).map((flatNode: FlatNode) => flatNode.name); + for (const flatNode of flatNodes) { + expect(allNodeNames).toContain(flatNode); + } + expect(flatNodes.length).toBe(2); + const page1CollectionNames: string[] = mockCollectionsPage1.map((collection: Collection) => collection.name); + for (const collectionName of page1CollectionNames) { + expect(allNodeNames).toContain(collectionName); + } + expect(page1CollectionNames.length).toBe(2); const showMoreEl = fixture.debugElement.queryAll(By.css('.show-more-node')); expect(showMoreEl.length).toEqual(2); }); diff --git a/src/app/community-list-page/community-list/community-list.component.ts b/src/app/community-list-page/community-list/community-list.component.ts index 6b5c6578e1f..031a4224692 100644 --- a/src/app/community-list-page/community-list/community-list.component.ts +++ b/src/app/community-list-page/community-list/community-list.component.ts @@ -19,6 +19,7 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; @Component({ selector: 'ds-community-list', templateUrl: './community-list.component.html', + styleUrls: ['./community-list.component.scss'], }) export class CommunityListComponent implements OnInit, OnDestroy { diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 81924ab5a1b..83661180af9 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1158,6 +1158,10 @@ "communityList.showMore": "Show More", + "communityList.expand": "Expand {{ name }}", + + "communityList.collapse": "Collapse {{ name }}", + "community.create.head": "Create a Community", "community.create.notifications.success": "Successfully created the Community", From cc0501f340402a2955e79d3675125caaa5ee8f4b Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Sat, 16 Dec 2023 01:31:34 +0100 Subject: [PATCH 03/15] Fixed search filters having empty input buttons --- .../org-unit-input-suggestions.component.html | 4 +++- .../org-unit-input-suggestions.component.spec.ts | 2 ++ .../person-input-suggestions.component.html | 4 +++- .../dso-input-suggestions.component.html | 4 +++- .../filter-input-suggestions.component.html | 7 +++---- .../input-suggestions/input-suggestions.component.html | 4 +++- .../validation-suggestions.component.html | 4 +++- .../search-range-filter/search-range-filter.component.html | 7 +++---- 8 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html index c4e31d3d81d..58f39b8d0b8 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html @@ -11,7 +11,9 @@ [dsDebounce]="debounceTime" (onDebounce)="find($event)" [placeholder]="placeholder" [ngModelOptions]="{standalone: true}" autocomplete="off"/> - +
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.spec.ts index 0981d895ec6..a13af0067a6 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.spec.ts +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.spec.ts @@ -2,6 +2,7 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { OrgUnitInputSuggestionsComponent } from './org-unit-input-suggestions.component'; import { FormsModule } from '@angular/forms'; +import { TranslateModule } from '@ngx-translate/core'; let component: OrgUnitInputSuggestionsComponent; let fixture: ComponentFixture; @@ -21,6 +22,7 @@ describe('OrgUnitInputSuggestionsComponent', () => { declarations: [OrgUnitInputSuggestionsComponent], imports: [ FormsModule, + TranslateModule.forRoot(), ], providers: [ ], diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html index b1621dbd2c5..53260ceaa38 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html @@ -12,7 +12,9 @@ [dsDebounce]="debounceTime" (onDebounce)="find($event)" [placeholder]="placeholder" [ngModelOptions]="{standalone: true}" autocomplete="off"/> - +
diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html index 7515b830b94..17e71972615 100644 --- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html +++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html @@ -9,7 +9,9 @@ [dsDebounce]="debounceTime" (onDebounce)="find($event)" [placeholder]="placeholder" [ngModelOptions]="{standalone: true}" autocomplete="off"/> - +
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html index 726dc9ca0e6..d29163e09ae 100644 --- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html +++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html @@ -20,10 +20,9 @@ [ngModelOptions]="{standalone: true}" autocomplete="off" /> - +
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.html b/src/app/shared/input-suggestions/input-suggestions.component.html index f137982fee2..188dcbcb6aa 100644 --- a/src/app/shared/input-suggestions/input-suggestions.component.html +++ b/src/app/shared/input-suggestions/input-suggestions.component.html @@ -9,7 +9,9 @@ [dsDebounce]="debounceTime" (onDebounce)="find($event)" [placeholder]="placeholder" [ngModelOptions]="{standalone: true}" autocomplete="off"/> - +
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html index d6e2ead6ea2..c5d71e33fdc 100644 --- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html +++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html @@ -10,7 +10,9 @@ [placeholder]="placeholder" ng-model-options="{standalone: true}" autocomplete="off"> - +
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html index 251e5ac420b..6d4ba449204 100644 --- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html +++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html @@ -26,10 +26,9 @@ />
- + From b076b989967ceed3fab8f67f7ffb5e1f71c23167 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Sat, 16 Dec 2023 01:57:48 +0100 Subject: [PATCH 04/15] Fixed accessibility issues on SubmissionImportExternalSearchbarComponent - Fixed input not describing itself - Put the items from the dropdown in an ul - Fixed broken aria labels - Removed titles who where identical to the displayed value --- ...n-import-external-searchbar.component.html | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html index 535395e5345..040987d37bd 100644 --- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html +++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html @@ -1,25 +1,28 @@
- +
- -
- -
+
+ +
- + + +
From e0849af9264d51f1bfae13187afa0a1a2d5d2c74 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Sat, 16 Dec 2023 02:08:47 +0100 Subject: [PATCH 05/15] Fix header ordering --- src/app/access-control/bulk-access/bulk-access.component.html | 1 + .../admin-import-batch-page/batch-import-page.component.html | 4 ++-- .../metadata-registry/metadata-registry.component.html | 2 +- .../metadata-schema-form/metadata-schema-form.component.html | 4 ++-- .../metadata-field-form/metadata-field-form.component.html | 4 ++-- .../metadata-schema/metadata-schema.component.html | 4 ++-- src/app/health-page/health-page.component.html | 2 +- src/app/profile-page/profile-page.component.html | 1 + 8 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/app/access-control/bulk-access/bulk-access.component.html b/src/app/access-control/bulk-access/bulk-access.component.html index 382caf85f46..c164cc5c319 100644 --- a/src/app/access-control/bulk-access/bulk-access.component.html +++ b/src/app/access-control/bulk-access/bulk-access.component.html @@ -1,4 +1,5 @@
+

{{ 'admin.access-control.bulk-access.title' | translate }}

diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.html b/src/app/admin/admin-import-batch-page/batch-import-page.component.html index 10924434369..c51ee7597c5 100644 --- a/src/app/admin/admin-import-batch-page/batch-import-page.component.html +++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.html @@ -1,5 +1,5 @@
- +

{{'admin.batch-import.page.header' | translate}}

{{'admin.batch-import.page.help' | translate}}

selected collection: {{getDspaceObjectName()}}  @@ -28,7 +28,7 @@

{{'admin.batch-import.page.toggle.help' | translate}} - +
- +

{{'admin.registries.metadata.head' | translate}}

{{'admin.registries.metadata.description' | translate}}

diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html index a4a4613565e..85d1e90692a 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html +++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html @@ -1,11 +1,11 @@
-

{{messagePrefix + '.create' | translate}}

+

{{messagePrefix + '.create' | translate}}

 -

{{messagePrefix + '.edit' | translate}}

+

{{messagePrefix + '.edit' | translate}}
-

{{messagePrefix + '.create' | translate}}

+

{{messagePrefix + '.create' | translate}}

 -

{{messagePrefix + '.edit' | translate}}

+

{{messagePrefix + '.edit' | translate}}
- +

{{'admin.registries.schema.head' | translate}}: "{{schema?.prefix}}"

{{'admin.registries.schema.description' | translate:{ namespace: schema?.namespace } }}

@@ -10,7 +10,7 @@

{{'admin.registries.schema.fields.head' | translate}}

+

{{'admin.registries.schema.fields.head' | translate}}

-

{{'health-page.heading' | translate}}

+

{{'health-page.heading' | translate}}

  • diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html index 187096b3912..fd7246c08b5 100644 --- a/src/app/profile-page/profile-page.component.html +++ b/src/app/profile-page/profile-page.component.html @@ -1,5 +1,6 @@
    +

    {{'profile.title' | translate}}

    {{'profile.head' | translate}}

    From b0d371045411b7a7d37dec2d2dbfc768799795e8 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Sat, 16 Dec 2023 03:10:06 +0100 Subject: [PATCH 06/15] Fixed accessibility issues with pagination button - Replaced the h6 tags with the role heading - Gave the gear button the roles in order to be detected as an expandable menu - Replaced the dropdown structure to render a menu of listboxes - Added the aria-selected attribute --- .../pagination/pagination.component.html | 30 ++++++++++++++----- .../shared/pagination/pagination.component.ts | 4 +-- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html index 7d90c6a439d..19e4cf94913 100644 --- a/src/app/shared/pagination/pagination.component.html +++ b/src/app/shared/pagination/pagination.component.html @@ -7,13 +7,29 @@
    - -
    -
    {{ 'pagination.results-per-page' | translate}}
    - -
    {{ 'pagination.sort-direction' | translate}}
    - -
    + +
    diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts index 6da813cbc7d..f5e482671be 100644 --- a/src/app/shared/pagination/pagination.component.ts +++ b/src/app/shared/pagination/pagination.component.ts @@ -162,7 +162,7 @@ export class PaginationComponent implements OnDestroy, OnInit { /** * Number of items per page. */ - public pageSize$; + public pageSize$: Observable; /** * Declare SortDirection enumeration to use it in the template @@ -183,7 +183,7 @@ export class PaginationComponent implements OnDestroy, OnInit { /** * Name of the field that's used to sort by */ - public sortField$; + public sortField$: Observable; public defaultSortField = 'name'; /** From 9335c32334c9294262bc1353bf88d36bd01285f6 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Sat, 16 Dec 2023 03:13:01 +0100 Subject: [PATCH 07/15] Fixed accessibility issues on MetadataSchemaComponent - Removed empty label of the select box and replaced it with an aria-label - Fixed empty table header --- .../metadata-schema/metadata-schema.component.html | 13 ++++++------- src/assets/i18n/en.json5 | 6 ++++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html index d51b8a82338..de968d63f23 100644 --- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html +++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html @@ -24,7 +24,7 @@

    {{'admin.registries.schema.fields.head' | translate}}

    - + @@ -33,12 +33,11 @@

    {{'admin.registries.schema.fields.head' | translate}}

    - diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 83661180af9..e47d2919d8a 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -174,6 +174,10 @@ "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".", + "admin.registries.schema.fields.select": "Select", + + "admin.registries.schema.fields.deselect": "Deselect", + "admin.registries.schema.fields.head": "Schema metadata fields", "admin.registries.schema.fields.no-items": "No metadata fields to show.", @@ -182,6 +186,8 @@ "admin.registries.schema.fields.table.field": "Field", + "admin.registries.schema.fields.table.selected": "Selected metadata fields", + "admin.registries.schema.fields.table.id": "ID", "admin.registries.schema.fields.table.scopenote": "Scope Note", From 5173ac3704e7d322836b84d95c01698772acee75 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Sat, 16 Dec 2023 03:29:04 +0100 Subject: [PATCH 08/15] Fixed accessibility issues on MetadataRegistryComponent - Removed empty label of the select box and replaced it with an aria-label - Fixed empty table header --- .../metadata-registry/metadata-registry.component.html | 3 ++- src/assets/i18n/en.json5 | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html index b39e4b8381c..d3be5df08e6 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html +++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html @@ -19,7 +19,7 @@

    {{'admin.registries.metadata.head' |

    {{'admin.registries.schema.fields.table.selected' | translate}} {{'admin.registries.schema.fields.table.id' | translate}} {{'admin.registries.schema.fields.table.field' | translate}} {{'admin.registries.schema.fields.table.scopenote' | translate}}
    - + + {{field.id}} {{schema?.prefix}}.{{field.element}}{{field.qualifier ? '.' + field.qualifier : ''}}
    - + @@ -34,6 +34,7 @@

    {{'admin.registries.metadata.head' | [checked]="isSelected(schema) | async" (change)="selectMetadataSchema(schema, $event)" > + {{((isSelected(schema) | async) ? 'admin.registries.metadata.schemas.deselect' : 'admin.registries.metadata.schemas.select') | translate}}

    diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index e47d2919d8a..ee3de30c430 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -160,8 +160,14 @@ "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.", + "admin.registries.metadata.schemas.select": "Select", + + "admin.registries.metadata.schemas.deselect": "Deselect", + "admin.registries.metadata.schemas.table.delete": "Delete selected", + "admin.registries.metadata.schemas.table.selected": "Selected schemas", + "admin.registries.metadata.schemas.table.id": "ID", "admin.registries.metadata.schemas.table.name": "Name", From 949e55235a4cae36f90287b7d4b1a2740bc3dc3a Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Sat, 16 Dec 2023 03:34:28 +0100 Subject: [PATCH 09/15] Fixed accessibility issues on BitstreamFormatsComponent - Removed empty label of the select box and replaced it with an aria-label - Fixed empty table header --- .../bitstream-formats/bitstream-formats.component.html | 3 ++- src/assets/i18n/en.json5 | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html index 37323d41d0e..894ef3dc7e7 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html @@ -19,7 +19,7 @@

    {{'admin.registries.bitstream-formats

    {{'admin.registries.metadata.schemas.table.selected' | translate}} {{'admin.registries.metadata.schemas.table.id' | translate}} {{'admin.registries.metadata.schemas.table.namespace' | translate}} {{'admin.registries.metadata.schemas.table.name' | translate}}{{schema.id}}
    - + @@ -35,6 +35,7 @@

    {{'admin.registries.bitstream-formats [checked]="isSelected(bitstreamFormat) | async" (change)="selectBitStreamFormat(bitstreamFormat, $event)" > + {{'admin.registries.bitstream-formats.select' | translate}}}

    diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index ee3de30c430..71090f70ac3 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -128,6 +128,8 @@ "admin.registries.bitstream-formats.table.name": "Name", + "admin.registries.bitstream-formats.table.selected": "Selected bitstream formats", + "admin.registries.bitstream-formats.table.id": "ID", "admin.registries.bitstream-formats.table.return": "Back", @@ -142,7 +144,9 @@ "admin.registries.bitstream-formats.title": "Bitstream Format Registry", - "admin.registries.bitstream-formats.select": "Select bitstream format", + "admin.registries.bitstream-formats.select": "Select", + + "admin.registries.bitstream-formats.deselect": "Deselect", "admin.registries.metadata.breadcrumbs": "Metadata registry", From 8b5cd79bdcf12b45288efaaf322e9b2e46cafffa Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Sat, 16 Dec 2023 04:44:22 +0100 Subject: [PATCH 10/15] Fixed accessibility issues on AccessControlFormContainerComponent - Replaced invisible label in AccessControlArrayFormComponent that was only used for styling with span - Fixed radio buttons not being part of a fieldset - Fixed empty table header --- .../access-control-array-form.component.html | 2 +- ...cess-control-form-container.component.html | 26 +++++++++---------- .../collection-select.component.html | 2 +- .../item-select/item-select.component.html | 2 +- src/assets/i18n/en.json5 | 4 +++ 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html index e6ebabd707b..2ec3b512197 100644 --- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html +++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html @@ -88,7 +88,7 @@
    - +
    -
    -
    +
    + {{ 'access-control-mode' | translate }} -
    +
    -
    +
    @@ -78,10 +78,10 @@

    -
    - {{'access-control-limit-to-specific' | translate}} -
    -
    +
    + + {{'access-control-limit-to-specific' | translate}} +
    -
    +
    -
    -
    +
    + {{'access-control-mode' | translate}} -
    +
    -
    +

    {{'access-control-access-conditions' | translate}}

    diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html index 7d4dadb2e32..135579aff7b 100644 --- a/src/app/shared/object-select/collection-select/collection-select.component.html +++ b/src/app/shared/object-select/collection-select/collection-select.component.html @@ -11,7 +11,7 @@
    {{'admin.registries.bitstream-formats.table.selected' | translate}} {{'admin.registries.bitstream-formats.table.id' | translate}} {{'admin.registries.bitstream-formats.table.name' | translate}} {{'admin.registries.bitstream-formats.table.mimetype' | translate}}{{bitstreamFormat.id}}
    - + diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html index 8cdc8ffb2d3..d1d454b2e43 100644 --- a/src/app/shared/object-select/item-select/item-select.component.html +++ b/src/app/shared/object-select/item-select/item-select.component.html @@ -11,7 +11,7 @@
    {{'collection.select.table.selected' | translate}} {{'collection.select.table.title' | translate}}
    - + diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 71090f70ac3..d736efb9e08 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1110,6 +1110,8 @@ "collection.select.empty": "No collections to show", + "collection.select.table.selected": "Selected collections", + "collection.select.table.select": "Select collection", "collection.select.table.deselect": "Deselect collection", @@ -2544,6 +2546,8 @@ "item.select.empty": "No items to show", + "item.select.table.selected": "Selected items", + "item.select.table.select": "Select item", "item.select.table.deselect": "Deselect item", From 37803e9330c769085106dcd033bc8dbf7733448b Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Sat, 16 Dec 2023 15:25:44 +0100 Subject: [PATCH 11/15] Fixed remaining community/collection page accessibility issues - Hide fontawesome icons for screen readers - Replaced dangling labels with spans and added more descriptive aria label to browse link - Fixed empty label/missing header in edit resource policy table - Added missing comcol logo al text - Refactored dso-edit-menu-section to not display empty link buttons and duplicate titles --- .../collection-page.component.html | 2 +- .../collection-metadata.component.html | 8 +++--- .../community-page.component.html | 2 +- .../delete-community-page.component.html | 6 ++--- .../comcol-form/comcol-form.component.html | 9 ++++--- .../edit-comcol-page.component.html | 4 +-- .../dso-edit-menu-section.component.html | 26 ++++++++----------- .../dso-edit-menu-section.component.spec.ts | 11 +++----- src/app/shared/form/form.component.html | 5 ++-- .../resource-policy-entry.component.html | 8 +++--- .../resource-policies.component.html | 10 +++---- .../upload/uploader/uploader.component.html | 2 +- .../upload/uploader/uploader.component.ts | 5 ++++ src/assets/i18n/en.json5 | 8 ++++++ 14 files changed, 57 insertions(+), 49 deletions(-) diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html index 3cbd08f1325..9a5414952f1 100644 --- a/src/app/collection-page/collection-page.component.html +++ b/src/app/collection-page/collection-page.component.html @@ -13,7 +13,7 @@ + [alternateText]="'collection.logo' | translate"> diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html index ffd8f713436..1cf40159ec9 100644 --- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html +++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html @@ -1,17 +1,17 @@
    - + {{ 'collection.edit.template.label' | translate}}
    diff --git a/src/app/community-page/community-page.component.html b/src/app/community-page/community-page.component.html index 671bf28fd1c..194fb747d0c 100644 --- a/src/app/community-page/community-page.component.html +++ b/src/app/community-page/community-page.component.html @@ -7,7 +7,7 @@ - + diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.html b/src/app/community-page/delete-community-page/delete-community-page.component.html index ef5fdade73b..1e71fb7f494 100644 --- a/src/app/community-page/delete-community-page/delete-community-page.component.html +++ b/src/app/community-page/delete-community-page/delete-community-page.component.html @@ -7,11 +7,11 @@

    {{ 'community.delete.head' | translat
    diff --git a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html index b7b3d344b1e..c79dba42b78 100644 --- a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html +++ b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html @@ -1,13 +1,13 @@
    -
    - +
    + {{type.value + '.edit.logo.label' | translate}}
    - +
    @@ -27,6 +27,7 @@
    diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html index d7f15ce06b4..a8ca674c263 100644 --- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html +++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html @@ -7,7 +7,7 @@

    {{ type + '.edit.head' | translate }}

    - {{type + '.edit.delete' | translate}} + {{type + '.edit.delete' | translate}}
    @@ -27,7 +27,7 @@

    {{ type + '.edit.head' | translate }}

    - {{ type + '.edit.return' | translate }} + {{ type + '.edit.return' | translate }}
    diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html index 16fda1caa83..bbc388a6014 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html @@ -1,25 +1,21 @@
    - - + + + {{itemModel.text | translate}} -
    - -
    +
    -
    diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts index f0815c54150..bdf121f7995 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts @@ -96,7 +96,7 @@ describe('DsoEditMenuSectionComponent', () => { }); describe('when the section model in a disabled link or text', () => { it('should show just the button', () => { - const textButton = fixture.debugElement.query(By.css('div div button')); + const textButton = fixture.debugElement.query(By.css('div a')); expect(textButton.nativeElement.innerHTML).toContain('fa-' + iconString); }); }); @@ -144,7 +144,7 @@ describe('DsoEditMenuSectionComponent', () => { }); - describe('link model', () => { + describe('when the section model in a non disabled link', () => { initAsync(dummySectionLink, menuService); beforeEach(() => { spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([])); @@ -154,11 +154,8 @@ describe('DsoEditMenuSectionComponent', () => { fixture.detectChanges(); }); - describe('when the section model in a non disabled link', () => { - it('should show a link element with the button in it', () => { - const link = fixture.debugElement.query(By.css('a')); - expect(link.nativeElement.innerHTML).toContain('button'); - }); + it('should show the link element', () => { + expect(fixture.debugElement.query(By.css('a'))).not.toBeNull(); }); }); diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html index 1b27c9d308d..5b39068ae22 100644 --- a/src/app/shared/form/form.component.html +++ b/src/app/shared/form/form.component.html @@ -58,11 +58,12 @@
    diff --git a/src/app/shared/resource-policies/entry/resource-policy-entry.component.html b/src/app/shared/resource-policies/entry/resource-policy-entry.component.html index a14dde366e6..9ad019c8c68 100644 --- a/src/app/shared/resource-policies/entry/resource-policy-entry.component.html +++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.html @@ -5,8 +5,8 @@ [id]="entry.id" [ngModel]="entry.checked" (ngModelChange)="this.toggleCheckbox.emit($event);"> -
    @@ -30,12 +30,12 @@
    diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html index b3dda9091d9..485166aabf8 100644 --- a/src/app/shared/resource-policies/resource-policies.component.html +++ b/src/app/shared/resource-policies/resource-policies.component.html @@ -17,10 +17,10 @@ [title]="'resource-policies.delete.btn.title' | translate" (click)="deleteSelectedResourcePolicies()"> - {{'submission.workflow.tasks.generic.processing' | translate}} + {{'submission.workflow.tasks.generic.processing' | translate}} - + {{'resource-policies.delete.btn' | translate}} @@ -28,7 +28,7 @@ [disabled]="(isProcessingDelete() | async)" [title]="'resource-policies.add.for.' + resourceType | translate" (click)="redirectToResourcePolicyCreatePage()"> - + {{'resource-policies.add.button' | translate}}
    @@ -42,8 +42,8 @@ class="custom-control-input" [id]="'selectAll_' + resourceUUID" (change)="selectAllCheckbox($event)"> -
    diff --git a/src/app/shared/upload/uploader/uploader.component.html b/src/app/shared/upload/uploader/uploader.component.html index 88dc5926e42..b1fd8199d83 100644 --- a/src/app/shared/upload/uploader/uploader.component.html +++ b/src/app/shared/upload/uploader/uploader.component.html @@ -23,7 +23,7 @@ {{dropMsg | translate}}{{'uploader.or' | translate}} diff --git a/src/app/shared/upload/uploader/uploader.component.ts b/src/app/shared/upload/uploader/uploader.component.ts index ef4ce4ee451..2072cb4c83b 100644 --- a/src/app/shared/upload/uploader/uploader.component.ts +++ b/src/app/shared/upload/uploader/uploader.component.ts @@ -53,6 +53,11 @@ export class UploaderComponent { */ @Input() uploadProperties: UploaderProperties; + /** + * The aria label to describe what kind of files need to be uploaded + */ + @Input() ariaLabel: string; + /** * The function to call when upload is completed */ diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index d736efb9e08..b237d6e7d1b 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -898,6 +898,8 @@ "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow", + "collection.browse.logo": "Browse for a collection logo", + "collection.create.head": "Create a Collection", "collection.create.notifications.success": "Successfully created the Collection", @@ -1094,6 +1096,8 @@ "collection.listelement.badge": "Collection", + "collection.logo": "Collection logo", + "collection.page.browse.recent.head": "Recent Submissions", "collection.page.browse.recent.empty": "No items to show", @@ -1180,6 +1184,8 @@ "communityList.collapse": "Collapse {{ name }}", + "community.browse.logo": "Browse for a community logo", + "community.create.head": "Create a Community", "community.create.notifications.success": "Successfully created the Community", @@ -1256,6 +1262,8 @@ "community.listelement.badge": "Community", + "community.logo": "Community logo", + "comcol-role.edit.no-group": "None", "comcol-role.edit.create": "Create", From ac743c513878065c6a9b3bf7950036b46531bcbb Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Sat, 16 Dec 2023 15:33:07 +0100 Subject: [PATCH 12/15] Fixed feedback form page accessibility issue - The form used a fieldset tag instead of a form tag --- .../feedback-form.component.html | 68 +++++++++---------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.html b/src/app/info/feedback/feedback-form/feedback-form.component.html index 25be4ba4458..a5de0588546 100644 --- a/src/app/info/feedback/feedback-form/feedback-form.component.html +++ b/src/app/info/feedback/feedback-form/feedback-form.component.html @@ -1,45 +1,43 @@
    -
    -

    {{ 'info.feedback.head' | translate }}

    -

    {{ 'info.feedback.info' | translate }}

    -
    -
    -
    - - - {{ 'info.feedback.email_help' | translate }} -
    +

    {{ 'info.feedback.head' | translate }}

    +

    {{ 'info.feedback.info' | translate }}

    + +
    +
    + + + {{ 'info.feedback.email_help' | translate }}
    +
    - - - - -
    -
    - - -
    + + + + +
    +
    + +
    - - - -
    -
    - - - {{ 'info.feedback.page_help' | translate }} -
    +
    + + + +
    +
    + + + {{ 'info.feedback.page_help' | translate }}
    -
    -
    - -
    +
    +
    +
    +
    -
    +

    From 138e163fa85d771bb8617e65ea7025e566f7eb94 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Sat, 16 Dec 2023 16:01:46 +0100 Subject: [PATCH 13/15] Fixed edit metadata page accessibility issue - Hide fontawesome icons for screen readers - Added missing aria-label to metadata field input --- .../dso-edit-metadata.component.html | 17 ++++++++++------- .../metadata-field-selector.component.html | 5 +++-- src/assets/i18n/en.json5 | 4 ++++ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html index 24c3dc5cd7a..8fb676a7247 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html @@ -2,23 +2,23 @@
    @@ -74,16 +74,19 @@
    diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html index 4c310bd81bd..3f5af76051e 100644 --- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html +++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html @@ -1,6 +1,7 @@
    diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index b237d6e7d1b..f238b1c7980 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2162,6 +2162,8 @@ "item.edit.metadata.headers.value": "Value", + "item.edit.metadata.metadatafield": "Edit field", + "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field", "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field", @@ -2686,6 +2688,8 @@ "itemtemplate.edit.metadata.headers.value": "Value", + "itemtemplate.edit.metadata.metadatafield": "Edit field", + "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field", "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field", From 63fa8f39f593193e35446d1335ce37b377847921 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Wed, 20 Dec 2023 21:18:56 +0100 Subject: [PATCH 14/15] Fixed user authentication/registration accessibility issue - Added the correct autocomplete value - Removed dangling labels, because aria labels already describe those input fields & we can't use ids in this component because otherwise there are duplicate ids on the /login page --- .../forgot-password-form.component.html | 8 ++++---- .../forgot-password-form.component.spec.ts | 8 ++++++-- .../profile-page-metadata-form.component.ts | 8 ++++++-- .../profile-page-security-form.component.ts | 9 ++++++--- src/app/profile-page/profile-page.component.html | 3 +-- .../methods/password/log-in-password.component.html | 6 ++---- src/assets/i18n/en.json5 | 4 +--- 7 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html index 5fb00062793..189d0bee40c 100644 --- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html +++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html @@ -1,13 +1,13 @@
    -

    {{'forgot-password.form.head' | translate}}

    +

    {{'forgot-password.form.head' | translate}}

    {{'forgot-password.form.identification.header' | translate}}
    - - {{(registration$ |async).email}}
    + {{'forgot-password.form.identification.email' | translate}} + {{(registration$ |async).email}} +
    diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts index 92d72d83df6..05f5df72f17 100644 --- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts +++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts @@ -21,6 +21,7 @@ import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { CoreState } from '../../core/core-state.model'; +import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe'; describe('ForgotPasswordFormComponent', () => { let comp: ForgotPasswordFormComponent; @@ -54,7 +55,10 @@ describe('ForgotPasswordFormComponent', () => { TestBed.configureTestingModule({ imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), ReactiveFormsModule], - declarations: [ForgotPasswordFormComponent], + declarations: [ + BrowserOnlyPipe, + ForgotPasswordFormComponent, + ], providers: [ {provide: Router, useValue: router}, {provide: ActivatedRoute, useValue: route}, @@ -75,7 +79,7 @@ describe('ForgotPasswordFormComponent', () => { describe('init', () => { it('should initialise mail address', () => { - const elem = fixture.debugElement.queryAll(By.css('span#email'))[0].nativeElement; + const elem = fixture.debugElement.queryAll(By.css('span[data-test="email"]'))[0].nativeElement; expect(elem.innerHTML).toContain('test@email.org'); }); }); diff --git a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts index c4e164a7e8b..53f9acdb458 100644 --- a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts +++ b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts @@ -43,7 +43,8 @@ export class ProfilePageMetadataFormComponent implements OnInit { new DynamicInputModel({ id: 'email', name: 'email', - readOnly: true + readOnly: true, + disabled: true, }), new DynamicInputModel({ id: 'firstname', @@ -55,6 +56,7 @@ export class ProfilePageMetadataFormComponent implements OnInit { errorMessages: { required: 'This field is required' }, + autoComplete: 'given-name', }), new DynamicInputModel({ id: 'lastname', @@ -66,10 +68,12 @@ export class ProfilePageMetadataFormComponent implements OnInit { errorMessages: { required: 'This field is required' }, + autoComplete: 'family-name', }), new DynamicInputModel({ id: 'phone', - name: 'eperson.phone' + name: 'eperson.phone', + autoComplete: 'tel', }), new DynamicSelectModel({ id: 'language', diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts index 04292ea96ea..940e382c784 100644 --- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts +++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts @@ -39,12 +39,14 @@ export class ProfilePageSecurityFormComponent implements OnInit { new DynamicInputModel({ id: 'password', name: 'password', - inputType: 'password' + inputType: 'password', + autoComplete: 'new-password', }), new DynamicInputModel({ id: 'passwordrepeat', name: 'passwordrepeat', - inputType: 'password' + inputType: 'password', + autoComplete: 'new-password', }) ]; @@ -79,7 +81,8 @@ export class ProfilePageSecurityFormComponent implements OnInit { id: 'current-password', name: 'current-password', inputType: 'password', - required: true + required: true, + autoComplete: 'current-password', })); } if (this.passwordCanBeEmpty) { diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html index fd7246c08b5..331c3600543 100644 --- a/src/app/profile-page/profile-page.component.html +++ b/src/app/profile-page/profile-page.component.html @@ -1,8 +1,7 @@

    {{'profile.title' | translate}}

    - -

    {{'profile.head' | translate}}

    +
    {{'profile.card.researcher' | translate}}
    diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.html b/src/app/shared/log-in/methods/password/log-in-password.component.html index 60477d141de..94f6ef870d1 100644 --- a/src/app/shared/log-in/methods/password/log-in-password.component.html +++ b/src/app/shared/log-in/methods/password/log-in-password.component.html @@ -1,9 +1,8 @@ - - Date: Tue, 26 Dec 2023 11:26:08 +0100 Subject: [PATCH 15/15] Fixed dropdown accessibility issue - Removed non-existing dropdownMenuButton references - Added appropriate roles to dropdown menus --- ...space-new-external-dropdown.component.html | 4 +-- ...ace-new-submission-dropdown.component.html | 4 +-- .../collection-dropdown.component.html | 22 +++++++++------- .../collection-dropdown.component.scss | 3 ++- .../shared/ds-select/ds-select.component.html | 2 +- .../entity-dropdown.component.html | 26 ++++++++++--------- .../entity-dropdown.component.scss | 10 ++++--- .../entity-dropdown.component.spec.ts | 2 +- .../lookup/dynamic-lookup.component.html | 1 - .../submission-form-collection.component.html | 2 +- src/assets/i18n/en.json5 | 2 ++ 11 files changed, 44 insertions(+), 34 deletions(-) diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html index 392134dbce5..23438c205f3 100644 --- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html @@ -15,10 +15,10 @@ [attr.data-test]="'import-dropdown' | dsBrowserOnly" title="{{'mydspace.new-submission-external' | translate}}"> - +
    {{'item.select.table.selected' | translate}} {{'item.select.table.collection' | translate}} {{'item.select.table.author' | translate}} {{'item.select.table.title' | translate}}