From 8f708d0e2898b0bf0eef9ce0d50f07e6f4119d88 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 22 Oct 2024 11:37:47 +0200
Subject: [PATCH 01/41] 119602: Add AccessibilitySettingsService

---
 .../accessibility-settings.service.ts         | 231 ++++++++++++++++++
 src/app/core/auth/auth.service.ts             |  23 +-
 2 files changed, 253 insertions(+), 1 deletion(-)
 create mode 100644 src/app/accessibility/accessibility-settings.service.ts

diff --git a/src/app/accessibility/accessibility-settings.service.ts b/src/app/accessibility/accessibility-settings.service.ts
new file mode 100644
index 00000000000..805d0d5a0b1
--- /dev/null
+++ b/src/app/accessibility/accessibility-settings.service.ts
@@ -0,0 +1,231 @@
+import { Injectable } from '@angular/core';
+import { Observable, of, switchMap } from 'rxjs';
+import { map, take } from 'rxjs/operators';
+import { CookieService } from '../core/services/cookie.service';
+import { hasValue, isNotEmpty, isNotEmptyOperator } from '../shared/empty.util';
+import { AuthService } from '../core/auth/auth.service';
+import { EPerson } from '../core/eperson/models/eperson.model';
+import { EPersonDataService } from '../core/eperson/eperson-data.service';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import cloneDeep from 'lodash/cloneDeep';
+
+/**
+ * Name of the cookie used to store the settings locally
+ */
+export const ACCESSIBILITY_COOKIE = 'dsAccessibilityCookie';
+
+/**
+ * Name of the metadata field to store settings on the ePerson
+ */
+export const ACCESSIBILITY_SETTINGS_METADATA_KEY = 'dspace.accessibility.settings';
+
+/**
+ * The duration in days after which the accessibility settings cookie expires
+ */
+export const ACCESSIBILITY_SETTINGS_COOKIE_STORAGE_DURATION = 7;
+
+/**
+ * Enum containing all possible accessibility settings.
+ * When adding new settings, the {@link AccessibilitySettingsService#getInputType} method and the i18n keys for the
+ * accessibility settings page should be updated.
+ */
+export enum AccessibilitySetting {
+  NotificationTimeOut = 'notificationTimeOut',
+  LiveRegionTimeOut = 'liveRegionTimeOut',
+}
+
+export type AccessibilitySettings = { [key in AccessibilitySetting]?: any };
+
+/**
+ * Service handling the retrieval and configuration of accessibility settings.
+ *
+ * This service stores the configured settings in either a cookie or on the user's metadata depending on whether
+ * the user is authenticated.
+ */
+@Injectable({
+  providedIn: 'root'
+})
+export class AccessibilitySettingsService {
+
+  constructor(
+    protected cookieService: CookieService,
+    protected authService: AuthService,
+    protected ePersonService: EPersonDataService,
+  ) {
+  }
+
+  getAllAccessibilitySettingKeys(): AccessibilitySetting[] {
+    return Object.entries(AccessibilitySetting).map(([_, val]) => val);
+  }
+
+  /**
+   * Get the stored value for the provided {@link AccessibilitySetting}. If the value does not exist or if it is empty,
+   * the provided defaultValue is emitted instead.
+   */
+  get(setting: AccessibilitySetting, defaultValue: string = null): Observable<string> {
+    return this.getAll().pipe(
+      map(settings => settings[setting]),
+      map(value => isNotEmpty(value) ? value : defaultValue),
+    );
+  }
+
+  /**
+   * Get the stored value for the provided {@link AccessibilitySetting} as a number. If the stored value
+   * could not be converted to a number, the value of the defaultValue parameter is emitted instead.
+   */
+  getAsNumber(setting: AccessibilitySetting, defaultValue: number = null): Observable<number> {
+    return this.get(setting).pipe(
+      map(value => hasValue(value) ? parseInt(value, 10) : NaN),
+      map(number => !isNaN(number) ? number : defaultValue),
+    );
+  }
+
+  /**
+   * Get all currently stored accessibility settings
+   */
+  getAll(): Observable<AccessibilitySettings> {
+    return this.getAllSettingsFromAuthenticatedUserMetadata().pipe(
+      map(value => isNotEmpty(value) ? value : this.getAllSettingsFromCookie()),
+      map(value => isNotEmpty(value) ? value : {}),
+    );
+  }
+
+  /**
+   * Get all settings from the accessibility settings cookie
+   */
+  getAllSettingsFromCookie(): AccessibilitySettings {
+    return this.cookieService.get(ACCESSIBILITY_COOKIE);
+  }
+
+  /**
+   * Attempts to retrieve all settings from the authenticated user's metadata.
+   * Returns an empty object when no user is authenticated.
+   */
+  getAllSettingsFromAuthenticatedUserMetadata(): Observable<AccessibilitySettings> {
+    return this.authService.getAuthenticatedUserFromStoreIfAuthenticated().pipe(
+      take(1),
+      map(user => hasValue(user) && hasValue(user.firstMetadataValue(ACCESSIBILITY_SETTINGS_METADATA_KEY)) ?
+        JSON.parse(user.firstMetadataValue(ACCESSIBILITY_SETTINGS_METADATA_KEY)) :
+        {}
+      ),
+    );
+  }
+
+  /**
+   * Set a single accessibility setting value, leaving all other settings unchanged.
+   * When setting all values, {@link AccessibilitySettingsService#setSettings} should be used.
+   * When updating multiple values, {@link AccessibilitySettingsService#updateSettings} should be used.
+   *
+   * Returns 'cookie' when the changes were stored in the cookie.
+   * Returns 'metadata' when the changes were stored in metadata.
+   */
+  set(setting: AccessibilitySetting, value: string): Observable<'cookie' | 'metadata'> {
+    return this.updateSettings({ [setting]: value });
+  }
+
+  /**
+   * Set all accessibility settings simultaneously.
+   * This method removes existing settings if they are missing from the provided {@link AccessibilitySettings} object.
+   * Removes all settings if the provided object is empty.
+   *
+   * Returns 'cookie' when the changes were stored in the cookie.
+   * Returns 'metadata' when the changes were stored in metadata.
+   */
+  setSettings(settings: AccessibilitySettings): Observable<'cookie' | 'metadata'> {
+    return this.setSettingsInAuthenticatedUserMetadata(settings).pipe(
+      take(1),
+      map((succeeded) => {
+        if (!succeeded) {
+          this.setSettingsInCookie(settings);
+          return 'cookie';
+        } else {
+          return 'metadata';
+        }
+      })
+    );
+  }
+
+  /**
+   * Update multiple accessibility settings simultaneously.
+   * This method does not change the settings that are missing from the provided {@link AccessibilitySettings} object.
+   *
+   * Returns 'cookie' when the changes were stored in the cookie.
+   * Returns 'metadata' when the changes were stored in metadata.
+   */
+  updateSettings(settings: AccessibilitySettings): Observable<'cookie' | 'metadata'> {
+    return this.getAll().pipe(
+      take(1),
+      map(currentSettings => Object.assign({}, currentSettings, settings)),
+      switchMap(newSettings => this.setSettings(newSettings))
+    );
+  }
+
+  /**
+   * Attempts to set the provided settings on the currently authorized user's metadata.
+   * Emits false when no user is authenticated or when the metadata update failed.
+   * Emits true when the metadata update succeeded.
+   */
+  setSettingsInAuthenticatedUserMetadata(settings: AccessibilitySettings): Observable<boolean> {
+    return this.authService.getAuthenticatedUserFromStoreIfAuthenticated().pipe(
+      take(1),
+      switchMap(user => {
+        if (hasValue(user)) {
+          // EPerson has to be cloned, otherwise the EPerson's metadata can't be modified
+          const clonedUser = cloneDeep(user);
+          return this.setSettingsInMetadata(clonedUser, settings);
+        } else {
+          return of(false);
+        }
+      })
+    );
+  }
+
+  /**
+   * Attempts to set the provided settings on the user's metadata.
+   * Emits false when the update failed, true when the update succeeded.
+   */
+  setSettingsInMetadata(
+    user: EPerson,
+    settings: AccessibilitySettings,
+  ): Observable<boolean> {
+    if (isNotEmpty(settings)) {
+      user.setMetadata(ACCESSIBILITY_SETTINGS_METADATA_KEY, null, JSON.stringify(settings));
+    } else {
+      user.removeMetadata(ACCESSIBILITY_SETTINGS_METADATA_KEY);
+    }
+
+    return this.ePersonService.createPatchFromCache(user).pipe(
+      take(1),
+      isNotEmptyOperator(),
+      switchMap(operations => this.ePersonService.patch(user, operations)),
+      getFirstCompletedRemoteData(),
+      map(rd => rd.hasSucceeded),
+    );
+  }
+
+  /**
+   * Sets the provided settings in a cookie
+   */
+  setSettingsInCookie(settings: AccessibilitySettings) {
+    if (isNotEmpty(settings)) {
+      this.cookieService.set(ACCESSIBILITY_COOKIE, settings, { expires: ACCESSIBILITY_SETTINGS_COOKIE_STORAGE_DURATION });
+    } else {
+      this.cookieService.remove(ACCESSIBILITY_COOKIE);
+    }
+  }
+
+  /**
+   * Returns the input type that a form should use for the provided {@link AccessibilitySetting}
+   */
+  getInputType(setting: AccessibilitySetting): string {
+    switch (setting) {
+      case AccessibilitySetting.NotificationTimeOut:
+        return 'number';
+      case AccessibilitySetting.LiveRegionTimeOut:
+        return 'number';
+      default:
+        return 'text';
+    }
+  }
+
+}
diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index 6604936cde1..9b0ec277352 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -44,7 +44,11 @@ import {
 import { NativeWindowRef, NativeWindowService } from '../services/window.service';
 import { RouteService } from '../services/route.service';
 import { EPersonDataService } from '../eperson/eperson-data.service';
-import { getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData } from '../shared/operators';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload
+} from '../shared/operators';
 import { AuthMethod } from './models/auth.method';
 import { HardRedirectService } from '../services/hard-redirect.service';
 import { RemoteData } from '../data/remote-data';
@@ -229,6 +233,23 @@ export class AuthService {
     );
   }
 
+  /**
+   * Returns an observable which emits the currently authenticated user from the store,
+   * or null if the user is not authenticated.
+   */
+  public getAuthenticatedUserFromStoreIfAuthenticated(): Observable<EPerson> {
+    return this.store.pipe(
+      select(getAuthenticatedUserId),
+      switchMap((id: string) => {
+        if (hasValue(id)) {
+          return this.epersonService.findById(id).pipe(getFirstSucceededRemoteDataPayload());
+        } else {
+          return observableOf(null);
+        }
+      }),
+    );
+  }
+
   /**
    * Checks if token is present into browser storage and is valid.
    */

From b72ce73931ace11de9c8cb3f8aed4abbf73e1d08 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 22 Oct 2024 14:34:35 +0200
Subject: [PATCH 02/41] 119602: Add Accessibility Settings page

---
 src/app/footer/footer.component.html          |  4 ++
 .../accessibility-settings.component.html     | 26 ++++++++++
 .../accessibility-settings.component.ts       | 47 +++++++++++++++++++
 src/app/info/info-routing-paths.ts            |  5 ++
 src/app/info/info-routing.module.ts           | 16 ++++++-
 src/app/info/info.module.ts                   |  4 +-
 src/assets/i18n/en.json5                      | 20 ++++++++
 7 files changed, 119 insertions(+), 3 deletions(-)
 create mode 100644 src/app/info/accessibility-settings/accessibility-settings.component.html
 create mode 100644 src/app/info/accessibility-settings/accessibility-settings.component.ts

diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
index 13d84e6e2e1..d3534706e88 100644
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@@ -79,6 +79,10 @@ <h5 class="text-uppercase">Footer Content</h5>
           <a class="text-white"
              routerLink="info/feedback">{{ 'footer.link.feedback' | translate}}</a>
         </li>
+        <li>
+          <a class="text-white"
+             routerLink="info/accessibility">{{ 'footer.link.accessibility' | translate }}</a>
+        </li>
       </ul>
     </div>
   </div>
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.html b/src/app/info/accessibility-settings/accessibility-settings.component.html
new file mode 100644
index 00000000000..6550c6a2880
--- /dev/null
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.html
@@ -0,0 +1,26 @@
+<div class="container">
+  <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
+
+  <form>
+    <div *ngFor="let setting of accessibilitySettingsOptions" class="form-group row">
+      <label [for]="setting + 'Input'" class="col-sm-2 col-form-label">
+        {{ 'info.accessibility-settings.' + setting + '.label' | translate }}
+      </label>
+
+      <div class="col-sm-10">
+        <input [type]="getInputType(setting)" [id]="setting + 'Input'" class="form-control"
+               [(ngModel)]="formValues[setting]" [ngModelOptions]="{ standalone: true }"
+               [attr.aria-describedby]="setting + 'Hint'">
+
+        <small [id]="setting + 'Hint'" class="form-text text-muted">
+          {{ 'info.accessibility-settings.' + setting + '.hint' | translate }}
+        </small>
+      </div>
+    </div>
+
+    <button type="submit" (click)="saveSettings()" class="btn btn-primary">
+      {{ 'info.accessibility-settings.submit' | translate }}
+    </button>
+  </form>
+
+</div>
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.ts b/src/app/info/accessibility-settings/accessibility-settings.component.ts
new file mode 100644
index 00000000000..97e3ddb321f
--- /dev/null
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.ts
@@ -0,0 +1,47 @@
+import { Component, OnInit } from '@angular/core';
+import { AuthService } from '../../core/auth/auth.service';
+import {
+  AccessibilitySetting,
+  AccessibilitySettingsService,
+  AccessibilitySettings
+} from '../../accessibility/accessibility-settings.service';
+import { take } from 'rxjs';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+
+@Component({
+  selector: 'ds-accessibility-settings',
+  templateUrl: './accessibility-settings.component.html'
+})
+export class AccessibilitySettingsComponent implements OnInit {
+
+  protected accessibilitySettingsOptions: AccessibilitySetting[];
+
+  protected formValues: AccessibilitySettings = { };
+
+  constructor(
+    protected authService: AuthService,
+    protected settingsService: AccessibilitySettingsService,
+    protected notificationsService: NotificationsService,
+    protected translateService: TranslateService,
+  ) {
+  }
+
+  ngOnInit() {
+    this.accessibilitySettingsOptions = this.settingsService.getAllAccessibilitySettingKeys();
+    this.settingsService.getAll().pipe(take(1)).subscribe(currentSettings => {
+      this.formValues = currentSettings;
+    });
+  }
+
+  getInputType(setting: AccessibilitySetting): string {
+    return this.settingsService.getInputType(setting);
+  }
+
+  saveSettings() {
+    this.settingsService.setSettings(this.formValues).pipe(take(1)).subscribe(location => {
+      this.notificationsService.success(null, this.translateService.instant('info.accessibility-settings.save-notification.' + location));
+    });
+  }
+
+}
diff --git a/src/app/info/info-routing-paths.ts b/src/app/info/info-routing-paths.ts
index a18de2c6111..5210bd7062a 100644
--- a/src/app/info/info-routing-paths.ts
+++ b/src/app/info/info-routing-paths.ts
@@ -3,6 +3,7 @@ import { getInfoModulePath } from '../app-routing-paths';
 export const END_USER_AGREEMENT_PATH = 'end-user-agreement';
 export const PRIVACY_PATH = 'privacy';
 export const FEEDBACK_PATH = 'feedback';
+export const ACCESSIBILITY_SETTINGS_PATH = 'accessibility';
 
 export function getEndUserAgreementPath() {
     return getSubPath(END_USER_AGREEMENT_PATH);
@@ -16,6 +17,10 @@ export function getFeedbackPath() {
     return getSubPath(FEEDBACK_PATH);
 }
 
+export function getAccessibilitySettingsPath() {
+    return getSubPath(ACCESSIBILITY_SETTINGS_PATH);
+}
+
 function getSubPath(path: string) {
     return `${getInfoModulePath()}/${path}`;
 }
diff --git a/src/app/info/info-routing.module.ts b/src/app/info/info-routing.module.ts
index 4c497461e71..45079ba4980 100644
--- a/src/app/info/info-routing.module.ts
+++ b/src/app/info/info-routing.module.ts
@@ -1,12 +1,18 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { PRIVACY_PATH, END_USER_AGREEMENT_PATH, FEEDBACK_PATH } from './info-routing-paths';
+import {
+  PRIVACY_PATH,
+  END_USER_AGREEMENT_PATH,
+  FEEDBACK_PATH,
+  ACCESSIBILITY_SETTINGS_PATH
+} from './info-routing-paths';
 import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component';
 import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
 import { ThemedFeedbackComponent } from './feedback/themed-feedback.component';
 import { FeedbackGuard } from '../core/feedback/feedback.guard';
 import { environment } from '../../environments/environment';
+import { AccessibilitySettingsComponent } from './accessibility-settings/accessibility-settings.component';
 
 
 const imports = [
@@ -17,7 +23,13 @@ const imports = [
       resolve: { breadcrumb: I18nBreadcrumbResolver },
       data: { title: 'info.feedback.title', breadcrumbKey: 'info.feedback' },
       canActivate: [FeedbackGuard]
-    }
+    },
+    {
+      path: ACCESSIBILITY_SETTINGS_PATH,
+      component: AccessibilitySettingsComponent,
+      resolve: { breadcrumb: I18nBreadcrumbResolver },
+      data: { title: 'info.accessibility-settings.title', breadcrumbKey: 'info.accessibility-settings' },
+    },
   ])
 ];
 
diff --git a/src/app/info/info.module.ts b/src/app/info/info.module.ts
index ccc4af0a7dd..d01ded1af09 100644
--- a/src/app/info/info.module.ts
+++ b/src/app/info/info.module.ts
@@ -13,6 +13,7 @@ import { FeedbackFormComponent } from './feedback/feedback-form/feedback-form.co
 import { ThemedFeedbackFormComponent } from './feedback/feedback-form/themed-feedback-form.component';
 import { ThemedFeedbackComponent } from './feedback/themed-feedback.component';
 import { FeedbackGuard } from '../core/feedback/feedback.guard';
+import { AccessibilitySettingsComponent } from './accessibility-settings/accessibility-settings.component';
 
 
 const DECLARATIONS = [
@@ -25,7 +26,8 @@ const DECLARATIONS = [
   FeedbackComponent,
   FeedbackFormComponent,
   ThemedFeedbackFormComponent,
-  ThemedFeedbackComponent
+  ThemedFeedbackComponent,
+  AccessibilitySettingsComponent,
 ];
 
 @NgModule({
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 6c91bae4c16..1316c8d3cf6 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1618,6 +1618,8 @@
 
   "footer.copyright": "copyright © 2002-{{ year }}",
 
+  "footer.link.accessibility": "Accessibility settings",
+
   "footer.link.dspace": "DSpace software",
 
   "footer.link.lyrasis": "LYRASIS",
@@ -1840,6 +1842,24 @@
 
   "home.top-level-communities.help": "Select a community to browse its collections.",
 
+  "info.accessibility-settings.breadcrumbs": "Accessibility settings",
+
+  "info.accessibility-settings.liveRegionTimeOut.label": "Live region time-out",
+
+  "info.accessibility-settings.liveRegionTimeOut.hint": "The duration in milliseconds after which a message in the live region disappears.",
+
+  "info.accessibility-settings.notificationTimeOut.label": "Notification time-out",
+
+  "info.accessibility-settings.notificationTimeOut.hint": "The duration in milliseconds after which a notification disappears. Set to 0 for notifications to remain indefinitely.",
+
+  "info.accessibility-settings.save-notification.cookie": "Successfully saved settings locally.",
+
+  "info.accessibility-settings.save-notification.metadata": "Successfully saved settings on the user profile.",
+
+  "info.accessibility-settings.submit": "Save accessibility settings",
+
+  "info.accessibility-settings.title": "Accessibility settings",
+
   "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
 
   "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",

From d224a2c47db09d6e202f66f0192afc8ad2ab1ce5 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 22 Oct 2024 15:03:37 +0200
Subject: [PATCH 03/41] 119602: Integrate accessibility settings into
 live-region

---
 .../shared/live-region/live-region.service.ts | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/live-region/live-region.service.ts b/src/app/shared/live-region/live-region.service.ts
index 72940c1a0eb..7a7b99fa6e7 100644
--- a/src/app/shared/live-region/live-region.service.ts
+++ b/src/app/shared/live-region/live-region.service.ts
@@ -1,7 +1,10 @@
 import { Injectable } from '@angular/core';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, map, Observable, switchMap, take, timer } from 'rxjs';
 import { environment } from '../../../environments/environment';
 import { UUIDService } from '../../core/shared/uuid.service';
+import { AccessibilitySettingsService, AccessibilitySetting } from '../../accessibility/accessibility-settings.service';
+
+export const MIN_MESSAGE_DURATION = 200;
 
 /**
  * The LiveRegionService is responsible for handling the messages that are shown by the {@link LiveRegionComponent}.
@@ -14,6 +17,7 @@ export class LiveRegionService {
 
   constructor(
     protected uuidService: UUIDService,
+    protected accessibilitySettingsService: AccessibilitySettingsService,
   ) {
   }
 
@@ -64,7 +68,12 @@ export class LiveRegionService {
   addMessage(message: string): string {
     const uuid = this.uuidService.generate();
     this.messages.push({ message, uuid });
-    setTimeout(() => this.clearMessageByUUID(uuid), this.messageTimeOutDurationMs);
+
+    this.getConfiguredMessageTimeOutMs().pipe(
+      take(1),
+      switchMap(timeOut => timer(timeOut)),
+    ).subscribe(() => this.clearMessageByUUID(uuid));
+
     this.emitCurrentMessages();
     return uuid;
   }
@@ -115,6 +124,17 @@ export class LiveRegionService {
     this.liveRegionIsVisible = isVisible;
   }
 
+  /**
+   * Gets the user-configured timeOut, or the stored timeOut if the user has not configured a timeOut duration.
+   * Emits {@link MIN_MESSAGE_DURATION} if the configured value is smaller.
+   */
+  getConfiguredMessageTimeOutMs(): Observable<number> {
+    return this.accessibilitySettingsService.getAsNumber(
+      AccessibilitySetting.LiveRegionTimeOut,
+      this.getMessageTimeOutMs(),
+    ).pipe(map(timeOut => Math.max(timeOut, MIN_MESSAGE_DURATION)));
+  }
+
   /**
    * Gets the current message timeOut duration in milliseconds
    */

From 6a49df59af0206b1cf2bd8b6cba4a3391ba7eeac Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 25 Oct 2024 13:04:55 +0200
Subject: [PATCH 04/41] 119602: Integrate accessibility settings into
 notifications-board

---
 .../notifications-board.component.ts          | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/app/shared/notifications/notifications-board/notifications-board.component.ts b/src/app/shared/notifications/notifications-board/notifications-board.component.ts
index 97ae09c1a67..20bf7175f6f 100644
--- a/src/app/shared/notifications/notifications-board/notifications-board.component.ts
+++ b/src/app/shared/notifications/notifications-board/notifications-board.component.ts
@@ -9,7 +9,7 @@ import {
 } from '@angular/core';
 
 import { select, Store } from '@ngrx/store';
-import { BehaviorSubject, Subscription } from 'rxjs';
+import { BehaviorSubject, Subscription, take } from 'rxjs';
 import difference from 'lodash/difference';
 
 import { NotificationsService } from '../notifications.service';
@@ -18,6 +18,11 @@ import { notificationsStateSelector } from '../selectors';
 import { INotification } from '../models/notification.model';
 import { NotificationsState } from '../notifications.reducers';
 import { INotificationBoardOptions } from '../../../../config/notifications-config.interfaces';
+import {
+  AccessibilitySettingsService,
+  AccessibilitySetting
+} from '../../../accessibility/accessibility-settings.service';
+import cloneDeep from 'lodash/cloneDeep';
 
 @Component({
   selector: 'ds-notifications-board',
@@ -49,9 +54,12 @@ export class NotificationsBoardComponent implements OnInit, OnDestroy {
    */
   public isPaused$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
-  constructor(private service: NotificationsService,
-              private store: Store<AppState>,
-              private cdr: ChangeDetectorRef) {
+  constructor(
+    protected service: NotificationsService,
+    protected store: Store<AppState>,
+    protected cdr: ChangeDetectorRef,
+    protected accessibilitySettingsService: AccessibilitySettingsService,
+  ) {
   }
 
   ngOnInit(): void {
@@ -84,7 +92,22 @@ export class NotificationsBoardComponent implements OnInit, OnDestroy {
       if (this.notifications.length >= this.maxStack) {
         this.notifications.splice(this.notifications.length - 1, 1);
       }
-      this.notifications.splice(0, 0, item);
+
+      // It would be a bit better to handle the retrieval of configured settings in the NotificationsService.
+      // Due to circular dependencies this is difficult to implement.
+      this.accessibilitySettingsService.getAsNumber(AccessibilitySetting.NotificationTimeOut, item.options.timeOut)
+        .pipe(take(1)).subscribe(timeOut => {
+          if (timeOut < 0) {
+            timeOut = 0;
+          }
+
+          // Deep clone because the unaltered item is read-only
+          const modifiedNotification = cloneDeep(item);
+          modifiedNotification.options.timeOut = timeOut;
+          this.notifications.splice(0, 0, modifiedNotification);
+          this.cdr.detectChanges();
+      });
+
     } else {
       // Remove the notification from the store
       // This notification was in the store, but not in this.notifications

From cad086c94599675b195f2685312c52e8c83e16f8 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 25 Oct 2024 14:39:23 +0200
Subject: [PATCH 05/41] 119602: Add AccessibilitySettingsService stub & fix
 live-region test

---
 .../accessibility-settings.service.stub.ts    | 34 ++++++++++++
 .../live-region/live-region.service.spec.ts   | 55 +++++--------------
 .../notifications-board.component.spec.ts     |  3 +
 3 files changed, 51 insertions(+), 41 deletions(-)
 create mode 100644 src/app/accessibility/accessibility-settings.service.stub.ts

diff --git a/src/app/accessibility/accessibility-settings.service.stub.ts b/src/app/accessibility/accessibility-settings.service.stub.ts
new file mode 100644
index 00000000000..b619a337de9
--- /dev/null
+++ b/src/app/accessibility/accessibility-settings.service.stub.ts
@@ -0,0 +1,34 @@
+import { of } from 'rxjs';
+import { AccessibilitySettingsService } from './accessibility-settings.service';
+
+export function getAccessibilitySettingsServiceStub(): AccessibilitySettingsService {
+  return new AccessibilitySettingsServiceStub() as unknown as AccessibilitySettingsService;
+}
+
+export class AccessibilitySettingsServiceStub {
+  getAllAccessibilitySettingKeys = jasmine.createSpy('getAllAccessibilitySettingKeys').and.returnValue([]);
+
+  get = jasmine.createSpy('get').and.returnValue(of(null));
+
+  getAsNumber = jasmine.createSpy('getAsNumber').and.returnValue(of(0));
+
+  getAll = jasmine.createSpy('getAll').and.returnValue(of({}));
+
+  getAllSettingsFromCookie = jasmine.createSpy('getAllSettingsFromCookie').and.returnValue({});
+
+  getAllSettingsFromAuthenticatedUserMetadata = jasmine.createSpy('getAllSettingsFromAuthenticatedUserMetadata')
+    .and.returnValue(of({}));
+
+  set = jasmine.createSpy('setSettings').and.returnValue(of('cookie'));
+
+  updateSettings = jasmine.createSpy('updateSettings').and.returnValue(of('cookie'));
+
+  setSettingsInAuthenticatedUserMetadata = jasmine.createSpy('setSettingsInAuthenticatedUserMetadata')
+    .and.returnValue(of(false));
+
+  setSettingsInMetadata = jasmine.createSpy('setSettingsInMetadata').and.returnValue(of(false));
+
+  setSettingsInCookie = jasmine.createSpy('setSettingsInCookie');
+
+  getInputType = jasmine.createSpy('getInputType').and.returnValue('text');
+}
diff --git a/src/app/shared/live-region/live-region.service.spec.ts b/src/app/shared/live-region/live-region.service.spec.ts
index 858ef883134..b14fa7abaf2 100644
--- a/src/app/shared/live-region/live-region.service.spec.ts
+++ b/src/app/shared/live-region/live-region.service.spec.ts
@@ -1,13 +1,22 @@
 import { LiveRegionService } from './live-region.service';
-import { fakeAsync, tick, flush } from '@angular/core/testing';
+import { fakeAsync, tick } from '@angular/core/testing';
 import { UUIDService } from '../../core/shared/uuid.service';
+import { getAccessibilitySettingsServiceStub } from '../../accessibility/accessibility-settings.service.stub';
+import { AccessibilitySettingsService } from '../../accessibility/accessibility-settings.service';
+import { of } from 'rxjs';
 
 describe('liveRegionService', () => {
   let service: LiveRegionService;
+  let accessibilitySettingsService: AccessibilitySettingsService;
 
   beforeEach(() => {
+    accessibilitySettingsService = getAccessibilitySettingsServiceStub();
+
+    accessibilitySettingsService.getAsNumber = jasmine.createSpy('getAsNumber').and.returnValue(of(100));
+
     service = new LiveRegionService(
       new UUIDService(),
+      accessibilitySettingsService,
     );
   });
 
@@ -81,13 +90,16 @@ describe('liveRegionService', () => {
       expect(results[2]).toEqual(['Message One', 'Message Two']);
 
       service.clear();
-      flush();
+      tick(200);
 
       expect(results.length).toEqual(4);
       expect(results[3]).toEqual([]);
     }));
 
     it('should not pop messages added after clearing within timeOut period', fakeAsync(() => {
+      // test expects a clear rate of 30 seconds
+      accessibilitySettingsService.getAsNumber = jasmine.createSpy('getAsNumber').and.returnValue(of(30000));
+
       const results: string[][] = [];
 
       service.getMessages$().subscribe((messages) => {
@@ -114,45 +126,6 @@ describe('liveRegionService', () => {
       expect(results.length).toEqual(5);
       expect(results[4]).toEqual([]);
     }));
-
-    it('should respect configured timeOut', fakeAsync(() => {
-      const results: string[][] = [];
-
-      service.getMessages$().subscribe((messages) => {
-        results.push(messages);
-      });
-
-      expect(results.length).toEqual(1);
-      expect(results[0]).toEqual([]);
-
-      const timeOutMs = 500;
-      service.setMessageTimeOutMs(timeOutMs);
-
-      service.addMessage('Message One');
-      tick(timeOutMs - 1);
-
-      expect(results.length).toEqual(2);
-      expect(results[1]).toEqual(['Message One']);
-
-      tick(1);
-
-      expect(results.length).toEqual(3);
-      expect(results[2]).toEqual([]);
-
-      const timeOutMsTwo = 50000;
-      service.setMessageTimeOutMs(timeOutMsTwo);
-
-      service.addMessage('Message Two');
-      tick(timeOutMsTwo - 1);
-
-      expect(results.length).toEqual(4);
-      expect(results[3]).toEqual(['Message Two']);
-
-      tick(1);
-
-      expect(results.length).toEqual(5);
-      expect(results[4]).toEqual([]);
-    }));
   });
 
   describe('liveRegionVisibility', () => {
diff --git a/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts b/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts
index 08b9585a8c7..22d0671d9c7 100644
--- a/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts
+++ b/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts
@@ -15,6 +15,8 @@ import uniqueId from 'lodash/uniqueId';
 import { INotificationBoardOptions } from '../../../../config/notifications-config.interfaces';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
 import { cold } from 'jasmine-marbles';
+import { AccessibilitySettingsService } from '../../../accessibility/accessibility-settings.service';
+import { getAccessibilitySettingsServiceStub } from '../../../accessibility/accessibility-settings.service.stub';
 
 export const bools = { f: false, t: true };
 
@@ -36,6 +38,7 @@ describe('NotificationsBoardComponent', () => {
       declarations: [NotificationsBoardComponent, NotificationComponent], // declare the test component
       providers: [
         { provide: NotificationsService, useClass: NotificationsServiceStub },
+        { provide: AccessibilitySettingsService, useValue: getAccessibilitySettingsServiceStub() },
         ChangeDetectorRef]
     }).compileComponents();  // compile template and css
   }));

From 52eabec70d46649fd97faeee229deaac0da989f5 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 25 Oct 2024 15:27:37 +0200
Subject: [PATCH 06/41] 119602: Add AccessibilitySettingsService tests

---
 .../accessibility-settings.service.spec.ts    | 379 ++++++++++++++++++
 src/app/shared/testing/auth-service.stub.ts   |   4 +
 2 files changed, 383 insertions(+)
 create mode 100644 src/app/accessibility/accessibility-settings.service.spec.ts

diff --git a/src/app/accessibility/accessibility-settings.service.spec.ts b/src/app/accessibility/accessibility-settings.service.spec.ts
new file mode 100644
index 00000000000..d6f61840575
--- /dev/null
+++ b/src/app/accessibility/accessibility-settings.service.spec.ts
@@ -0,0 +1,379 @@
+import {
+  AccessibilitySettingsService,
+  AccessibilitySetting,
+  AccessibilitySettings,
+  ACCESSIBILITY_SETTINGS_METADATA_KEY,
+  ACCESSIBILITY_COOKIE
+} from './accessibility-settings.service';
+import { CookieService } from '../core/services/cookie.service';
+import { AuthService } from '../core/auth/auth.service';
+import { EPersonDataService } from '../core/eperson/eperson-data.service';
+import { CookieServiceMock } from '../shared/mocks/cookie.service.mock';
+import { AuthServiceStub } from '../shared/testing/auth-service.stub';
+import { of } from 'rxjs';
+import { EPerson } from '../core/eperson/models/eperson.model';
+import { fakeAsync, flush } from '@angular/core/testing';
+import { createSuccessfulRemoteDataObject$, createFailedRemoteDataObject$ } from '../shared/remote-data.utils';
+
+
+describe('accessibilitySettingsService', () => {
+  let service: AccessibilitySettingsService;
+  let cookieService: CookieServiceMock;
+  let authService: AuthServiceStub;
+  let ePersonService: EPersonDataService;
+
+  beforeEach(() => {
+    cookieService = new CookieServiceMock();
+    authService = new AuthServiceStub();
+
+    ePersonService = jasmine.createSpyObj('ePersonService', {
+      createPatchFromCache: of([{
+        op: 'add',
+        value: null,
+      }]),
+      patch: of({}),
+    });
+
+    service = new AccessibilitySettingsService(
+      cookieService as unknown as CookieService,
+      authService as unknown as AuthService,
+      ePersonService,
+    );
+  });
+
+  describe('getALlAccessibilitySettingsKeys', () => {
+    it('should return an array containing all accessibility setting names', () => {
+      const settingNames: AccessibilitySetting[] = [
+        AccessibilitySetting.NotificationTimeOut,
+        AccessibilitySetting.LiveRegionTimeOut,
+      ];
+
+      expect(service.getAllAccessibilitySettingKeys()).toEqual(settingNames);
+    });
+  });
+
+  describe('get', () => {
+    it('should return the setting if it is set', () => {
+      const settings: AccessibilitySettings = {
+        notificationTimeOut: '1000',
+      };
+
+      service.getAll = jasmine.createSpy('getAll').and.returnValue(of(settings));
+
+      service.get(AccessibilitySetting.NotificationTimeOut, 'default').subscribe(value =>
+        expect(value).toEqual('1000')
+      );
+    });
+
+    it('should return the default value if the setting is not set', () => {
+      const settings: AccessibilitySettings = {
+        notificationTimeOut: '1000',
+      };
+
+      service.getAll = jasmine.createSpy('getAll').and.returnValue(of(settings));
+
+      service.get(AccessibilitySetting.LiveRegionTimeOut, 'default').subscribe(value =>
+        expect(value).toEqual('default')
+      );
+    });
+  });
+
+  describe('getAsNumber', () => {
+    it('should return the setting as number if the value for the setting can be parsed to a number', () => {
+      service.get = jasmine.createSpy('get').and.returnValue(of('1000'));
+
+      service.getAsNumber(AccessibilitySetting.NotificationTimeOut).subscribe(value =>
+        expect(value).toEqual(1000)
+      );
+    });
+
+    it('should return the default value if no value is set for the setting', () => {
+      service.get = jasmine.createSpy('get').and.returnValue(of(null));
+
+      service.getAsNumber(AccessibilitySetting.NotificationTimeOut, 123).subscribe(value =>
+        expect(value).toEqual(123)
+      );
+    });
+
+    it('should return the default value if the value for the setting can not be parsed to a number', () => {
+      service.get = jasmine.createSpy('get').and.returnValue(of('text'));
+
+      service.getAsNumber(AccessibilitySetting.NotificationTimeOut, 123).subscribe(value =>
+        expect(value).toEqual(123)
+      );
+    });
+  });
+
+  describe('getAll', () => {
+    it('should attempt to get the settings from metadata first', () => {
+      service.getAllSettingsFromAuthenticatedUserMetadata =
+        jasmine.createSpy('getAllSettingsFromAuthenticatedUserMetadata').and.returnValue(of({ }));
+
+      service.getAll().subscribe();
+      expect(service.getAllSettingsFromAuthenticatedUserMetadata).toHaveBeenCalled();
+    });
+
+    it('should attempt to get the settings from the cookie if the settings from metadata are empty', () => {
+      service.getAllSettingsFromAuthenticatedUserMetadata =
+        jasmine.createSpy('getAllSettingsFromAuthenticatedUserMetadata').and.returnValue(of({ }));
+
+      service.getAllSettingsFromCookie = jasmine.createSpy('getAllSettingsFromCookie').and.returnValue({ });
+
+      service.getAll().subscribe();
+      expect(service.getAllSettingsFromCookie).toHaveBeenCalled();
+    });
+
+    it('should not attempt to get the settings from the cookie if the settings from metadata are not empty', () => {
+      const settings: AccessibilitySettings = {
+        notificationTimeOut: '1000',
+      };
+
+      service.getAllSettingsFromAuthenticatedUserMetadata =
+        jasmine.createSpy('getAllSettingsFromAuthenticatedUserMetadata').and.returnValue(of(settings));
+
+      service.getAllSettingsFromCookie = jasmine.createSpy('getAllSettingsFromCookie').and.returnValue({ });
+
+      service.getAll().subscribe();
+      expect(service.getAllSettingsFromCookie).not.toHaveBeenCalled();
+    });
+
+    it('should return an empty object if both are empty', () => {
+      service.getAllSettingsFromAuthenticatedUserMetadata =
+        jasmine.createSpy('getAllSettingsFromAuthenticatedUserMetadata').and.returnValue(of({ }));
+
+      service.getAllSettingsFromCookie = jasmine.createSpy('getAllSettingsFromCookie').and.returnValue({ });
+
+      service.getAll().subscribe(value => expect(value).toEqual({}));
+    });
+  });
+
+  describe('getAllSettingsFromCookie', () => {
+    it('should retrieve the settings from the cookie', () => {
+      cookieService.get = jasmine.createSpy();
+
+      service.getAllSettingsFromCookie();
+      expect(cookieService.get).toHaveBeenCalledWith(ACCESSIBILITY_COOKIE);
+    });
+  });
+
+  describe('getAllSettingsFromAuthenticatedUserMetadata', () => {
+    it('should retrieve all settings from the user\'s metadata', () => {
+      const settings = { 'liveRegionTimeOut': '1000' };
+
+      const user = new EPerson();
+      user.setMetadata(ACCESSIBILITY_SETTINGS_METADATA_KEY, null, JSON.stringify(settings));
+
+      authService.getAuthenticatedUserFromStoreIfAuthenticated =
+        jasmine.createSpy('getAuthenticatedUserFromStoreIfAuthenticated').and.returnValue(of(user));
+
+      service.getAllSettingsFromAuthenticatedUserMetadata().subscribe(value =>
+        expect(value).toEqual(settings)
+      );
+    });
+  });
+
+  describe('set', () => {
+    it('should correctly update the chosen setting', () => {
+      service.updateSettings = jasmine.createSpy('updateSettings');
+
+      service.set(AccessibilitySetting.LiveRegionTimeOut, '500');
+      expect(service.updateSettings).toHaveBeenCalledWith({ liveRegionTimeOut: '500' });
+    });
+  });
+
+  describe('setSettings', () => {
+    beforeEach(() => {
+      service.setSettingsInCookie = jasmine.createSpy('setSettingsInCookie');
+    });
+
+    it('should attempt to set settings in metadata', () => {
+      service.setSettingsInAuthenticatedUserMetadata =
+        jasmine.createSpy('setSettingsInAuthenticatedUserMetadata').and.returnValue(of(false));
+
+      const settings: AccessibilitySettings = {
+        notificationTimeOut: '1000',
+      };
+
+      service.setSettings(settings).subscribe();
+      expect(service.setSettingsInAuthenticatedUserMetadata).toHaveBeenCalledWith(settings);
+    });
+
+    it('should set settings in cookie if metadata failed', () => {
+      service.setSettingsInAuthenticatedUserMetadata =
+        jasmine.createSpy('setSettingsInAuthenticatedUserMetadata').and.returnValue(of(false));
+
+      const settings: AccessibilitySettings = {
+        notificationTimeOut: '1000',
+      };
+
+      service.setSettings(settings).subscribe();
+      expect(service.setSettingsInCookie).toHaveBeenCalled();
+    });
+
+    it('should not set settings in cookie if metadata succeeded', () => {
+      service.setSettingsInAuthenticatedUserMetadata =
+        jasmine.createSpy('setSettingsInAuthenticatedUserMetadata').and.returnValue(of(true));
+
+      const settings: AccessibilitySettings = {
+        notificationTimeOut: '1000',
+      };
+
+      service.setSettings(settings).subscribe();
+      expect(service.setSettingsInCookie).not.toHaveBeenCalled();
+    });
+
+    it('should return \'metadata\' if settings are stored in metadata', () => {
+      service.setSettingsInAuthenticatedUserMetadata =
+        jasmine.createSpy('setSettingsInAuthenticatedUserMetadata').and.returnValue(of(true));
+
+      const settings: AccessibilitySettings = {
+        notificationTimeOut: '1000',
+      };
+
+      service.setSettings(settings).subscribe(value =>
+        expect(value).toEqual('metadata')
+      );
+    });
+
+    it('should return \'cookie\' if settings are stored in cookie', () => {
+      service.setSettingsInAuthenticatedUserMetadata =
+        jasmine.createSpy('setSettingsInAuthenticatedUserMetadata').and.returnValue(of(false));
+
+      const settings: AccessibilitySettings = {
+        notificationTimeOut: '1000',
+      };
+
+      service.setSettings(settings).subscribe(value =>
+        expect(value).toEqual('cookie')
+      );
+    });
+  });
+
+  describe('updateSettings', () => {
+    it('should call setSettings with the updated settings', () => {
+      const beforeSettings: AccessibilitySettings = {
+        notificationTimeOut: '1000',
+      };
+
+      service.getAll = jasmine.createSpy('getAll').and.returnValue(of(beforeSettings));
+      service.setSettings = jasmine.createSpy('setSettings').and.returnValue(of('cookie'));
+
+      const newSettings: AccessibilitySettings = {
+        liveRegionTimeOut: '2000',
+      };
+
+      const combinedSettings: AccessibilitySettings = {
+        notificationTimeOut: '1000',
+        liveRegionTimeOut: '2000',
+      };
+
+      service.updateSettings(newSettings).subscribe();
+      expect(service.setSettings).toHaveBeenCalledWith(combinedSettings);
+    });
+  });
+
+  describe('setSettingsInAuthenticatedUserMetadata', () => {
+    beforeEach(() => {
+      service.setSettingsInMetadata = jasmine.createSpy('setSettingsInMetadata').and.returnValue(of(null));
+    });
+
+    it('should store settings in metadata when the user is authenticated', fakeAsync(() => {
+      const user = new EPerson();
+      authService.getAuthenticatedUserFromStoreIfAuthenticated = jasmine.createSpy().and.returnValue(of(user));
+
+      service.setSettingsInAuthenticatedUserMetadata({}).subscribe();
+      flush();
+
+      expect(service.setSettingsInMetadata).toHaveBeenCalled();
+    }));
+
+    it('should emit false when the user is not authenticated', fakeAsync(() => {
+      authService.getAuthenticatedUserFromStoreIfAuthenticated = jasmine.createSpy().and.returnValue(of(null));
+
+      service.setSettingsInAuthenticatedUserMetadata({})
+        .subscribe(value => expect(value).toBeFalse());
+      flush();
+
+      expect(service.setSettingsInMetadata).not.toHaveBeenCalled();
+    }));
+  });
+
+  describe('setSettingsInMetadata', () => {
+    const ePerson = new EPerson();
+
+    beforeEach(() => {
+      ePerson.setMetadata = jasmine.createSpy('setMetadata');
+      ePerson.removeMetadata = jasmine.createSpy('removeMetadata');
+    });
+
+    it('should set the settings in metadata', () => {
+      service.setSettingsInMetadata(ePerson, { [AccessibilitySetting.LiveRegionTimeOut]: '500' }).subscribe();
+      expect(ePerson.setMetadata).toHaveBeenCalled();
+    });
+
+    it('should remove the metadata when the settings are emtpy', () => {
+      service.setSettingsInMetadata(ePerson, {}).subscribe();
+      expect(ePerson.setMetadata).not.toHaveBeenCalled();
+      expect(ePerson.removeMetadata).toHaveBeenCalled();
+    });
+
+    it('should create a patch with the metadata changes', () => {
+      service.setSettingsInMetadata(ePerson, { [AccessibilitySetting.LiveRegionTimeOut]: '500' }).subscribe();
+      expect(ePersonService.createPatchFromCache).toHaveBeenCalled();
+    });
+
+    it('should send the patch request', () => {
+      service.setSettingsInMetadata(ePerson, { [AccessibilitySetting.LiveRegionTimeOut]: '500' }).subscribe();
+      expect(ePersonService.patch).toHaveBeenCalled();
+    });
+
+    it('should emit true when the update succeeded', fakeAsync(() => {
+      ePersonService.patch = jasmine.createSpy().and.returnValue(createSuccessfulRemoteDataObject$({}));
+
+      service.setSettingsInMetadata(ePerson, { [AccessibilitySetting.LiveRegionTimeOut]: '500' })
+        .subscribe(value => {
+        expect(value).toBeTrue();
+      });
+
+      flush();
+    }));
+
+    it('should emit false when the update failed', fakeAsync(() => {
+      ePersonService.patch = jasmine.createSpy().and.returnValue(createFailedRemoteDataObject$());
+
+      service.setSettingsInMetadata(ePerson, { [AccessibilitySetting.LiveRegionTimeOut]: '500' })
+        .subscribe(value => {
+        expect(value).toBeFalse();
+      });
+
+      flush();
+    }));
+  });
+
+  describe('setSettingsInCookie', () => {
+    beforeEach(() => {
+      cookieService.set = jasmine.createSpy('set');
+      cookieService.remove = jasmine.createSpy('remove');
+    });
+
+    it('should store the settings in a cookie', () => {
+      service.setSettingsInCookie({ [AccessibilitySetting.LiveRegionTimeOut]: '500' });
+      expect(cookieService.set).toHaveBeenCalled();
+    });
+
+    it('should remove the cookie when the settings are empty', () => {
+      service.setSettingsInCookie({});
+      expect(cookieService.set).not.toHaveBeenCalled();
+      expect(cookieService.remove).toHaveBeenCalled();
+    });
+  });
+
+  describe('getInputType', () => {
+    it('should correctly return the input type', () => {
+      expect(service.getInputType(AccessibilitySetting.NotificationTimeOut)).toEqual('number');
+      expect(service.getInputType(AccessibilitySetting.LiveRegionTimeOut)).toEqual('number');
+      expect(service.getInputType('unknownValue' as AccessibilitySetting)).toEqual('text');
+    });
+  });
+
+});
diff --git a/src/app/shared/testing/auth-service.stub.ts b/src/app/shared/testing/auth-service.stub.ts
index 7f3d040042f..d150ac69f4d 100644
--- a/src/app/shared/testing/auth-service.stub.ts
+++ b/src/app/shared/testing/auth-service.stub.ts
@@ -54,6 +54,10 @@ export class AuthServiceStub {
     return observableOf(EPersonMock);
   }
 
+  getAuthenticatedUserFromStoreIfAuthenticated(): Observable<EPerson> {
+    return observableOf(EPersonMock);
+  }
+
   public buildAuthHeader(token?: AuthTokenInfo): string {
     return `Bearer ${token ? token.accessToken : ''}`;
   }

From 82fd9539b7862186f2396a64db8988bc7f38f362 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 5 Nov 2024 15:03:51 +0100
Subject: [PATCH 07/41] 119602: Add AccessibilitySettingsComponent tests

---
 .../accessibility-settings.component.spec.ts  | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 src/app/info/accessibility-settings/accessibility-settings.component.spec.ts

diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts b/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts
new file mode 100644
index 00000000000..f6d3252a384
--- /dev/null
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts
@@ -0,0 +1,79 @@
+import { AccessibilitySettingsComponent } from './accessibility-settings.component';
+import { ComponentFixture, waitForAsync, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
+import { getAccessibilitySettingsServiceStub } from '../../accessibility/accessibility-settings.service.stub';
+import { AccessibilitySettingsService, AccessibilitySetting } from '../../accessibility/accessibility-settings.service';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { AuthService } from '../../core/auth/auth.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { of } from 'rxjs';
+
+
+describe('AccessibilitySettingsComponent', () => {
+  let component: AccessibilitySettingsComponent;
+  let fixture: ComponentFixture<AccessibilitySettingsComponent>;
+
+  let authService: AuthServiceStub;
+  let settingsService: AccessibilitySettingsService;
+  let notificationsService: NotificationsServiceStub;
+
+  beforeEach(waitForAsync(() => {
+    authService = new AuthServiceStub();
+    settingsService = getAccessibilitySettingsServiceStub();
+    notificationsService = new NotificationsServiceStub();
+
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [AccessibilitySettingsComponent],
+      providers: [
+        { provide: AuthService, useValue: authService },
+        { provide: AccessibilitySettingsService, useValue: settingsService },
+        { provide: NotificationsService, useValue: notificationsService },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AccessibilitySettingsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('On Init', () => {
+    it('should retrieve all accessibility settings options', () => {
+      expect(settingsService.getAllAccessibilitySettingKeys).toHaveBeenCalled();
+    });
+
+    it('should retrieve the current settings', () => {
+      expect(settingsService.getAll).toHaveBeenCalled();
+    });
+  });
+
+  describe('getInputType', () => {
+    it('should retrieve the input type for the setting from the service', () => {
+      component.getInputType(AccessibilitySetting.LiveRegionTimeOut);
+      expect(settingsService.getInputType).toHaveBeenCalledWith(AccessibilitySetting.LiveRegionTimeOut);
+    });
+  });
+
+  describe('saveSettings', () => {
+    it('should save the settings in the service', () => {
+      settingsService.setSettings = jasmine.createSpy('setSettings').and.returnValue(of('cookie'));
+      component.saveSettings();
+      expect(settingsService.setSettings).toHaveBeenCalled();
+    });
+
+    it('should give the user a notification mentioning where the settings were saved', () => {
+      settingsService.setSettings = jasmine.createSpy('setSettings').and.returnValue(of('cookie'));
+      component.saveSettings();
+      expect(notificationsService.success).toHaveBeenCalled();
+    });
+  });
+});

From 37455a8b6c8f768b5b8cc7a3f4877740b2ae44bd Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 5 Nov 2024 15:52:11 +0100
Subject: [PATCH 08/41] 119602: Make AccessibilitySettings cookie expiration
 configurable

---
 config/config.example.yml                             |  5 +++++
 .../accessibility/accessibility-settings.config.ts    | 11 +++++++++++
 .../accessibility/accessibility-settings.service.ts   |  8 ++------
 src/config/app-config.interface.ts                    |  2 ++
 src/config/default-app-config.ts                      |  6 ++++++
 src/environments/environment.test.ts                  |  4 ++++
 6 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 src/app/accessibility/accessibility-settings.config.ts

diff --git a/config/config.example.yml b/config/config.example.yml
index 58eb6ff33d2..7b882958f24 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -394,3 +394,8 @@ liveRegion:
   messageTimeOutDurationMs: 30000
   # The visibility of the live region. Setting this to true is only useful for debugging purposes.
   isVisible: false
+
+# Configuration for storing accessibility settings, used by the AccessibilitySettingsService
+accessibility:
+  # The duration in days after which the accessibility settings cookie expires
+  cookieExpirationDuration: 7
diff --git a/src/app/accessibility/accessibility-settings.config.ts b/src/app/accessibility/accessibility-settings.config.ts
new file mode 100644
index 00000000000..1852579c3d3
--- /dev/null
+++ b/src/app/accessibility/accessibility-settings.config.ts
@@ -0,0 +1,11 @@
+import { Config } from '../../config/config.interface';
+
+/**
+ * Configuration interface used by the AccessibilitySettingsService
+ */
+export class AccessibilitySettingsConfig implements Config {
+  /**
+   * The duration in days after which the accessibility settings cookie expires
+   */
+  cookieExpirationDuration: number;
+}
diff --git a/src/app/accessibility/accessibility-settings.service.ts b/src/app/accessibility/accessibility-settings.service.ts
index 805d0d5a0b1..4089fd03b17 100644
--- a/src/app/accessibility/accessibility-settings.service.ts
+++ b/src/app/accessibility/accessibility-settings.service.ts
@@ -8,6 +8,7 @@ import { EPerson } from '../core/eperson/models/eperson.model';
 import { EPersonDataService } from '../core/eperson/eperson-data.service';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
 import cloneDeep from 'lodash/cloneDeep';
+import { environment } from '../../environments/environment';
 
 /**
  * Name of the cookie used to store the settings locally
@@ -19,11 +20,6 @@ export const ACCESSIBILITY_COOKIE = 'dsAccessibilityCookie';
  */
 export const ACCESSIBILITY_SETTINGS_METADATA_KEY = 'dspace.accessibility.settings';
 
-/**
- * The duration in days after which the accessibility settings cookie expires
- */
-export const ACCESSIBILITY_SETTINGS_COOKIE_STORAGE_DURATION = 7;
-
 /**
  * Enum containing all possible accessibility settings.
  * When adding new settings, the {@link AccessibilitySettingsService#getInputType} method and the i18n keys for the
@@ -208,7 +204,7 @@ export class AccessibilitySettingsService {
    */
   setSettingsInCookie(settings: AccessibilitySettings) {
     if (isNotEmpty(settings)) {
-      this.cookieService.set(ACCESSIBILITY_COOKIE, settings, { expires: ACCESSIBILITY_SETTINGS_COOKIE_STORAGE_DURATION });
+      this.cookieService.set(ACCESSIBILITY_COOKIE, settings, { expires: environment.accessibility.cookieExpirationDuration });
     } else {
       this.cookieService.remove(ACCESSIBILITY_COOKIE);
     }
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index aa3033ecec3..6cbcf782af9 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -23,6 +23,7 @@ import { MarkdownConfig } from './markdown-config.interface';
 import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
 import { LiveRegionConfig } from '../app/shared/live-region/live-region.config';
+import { AccessibilitySettingsConfig } from '../app/accessibility/accessibility-settings.config';
 
 interface AppConfig extends Config {
   ui: UIServerConfig;
@@ -50,6 +51,7 @@ interface AppConfig extends Config {
   vocabularies: FilterVocabularyConfig[];
   comcolSelectionSort: DiscoverySortConfig;
   liveRegion: LiveRegionConfig;
+  accessibility: AccessibilitySettingsConfig;
 }
 
 /**
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 1c0f88cf477..c7aac9a2d78 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -23,6 +23,7 @@ import { MarkdownConfig } from './markdown-config.interface';
 import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
 import { LiveRegionConfig } from '../app/shared/live-region/live-region.config';
+import { AccessibilitySettingsConfig } from '../app/accessibility/accessibility-settings.config';
 
 export class DefaultAppConfig implements AppConfig {
   production = false;
@@ -439,4 +440,9 @@ export class DefaultAppConfig implements AppConfig {
     messageTimeOutDurationMs: 30000,
     isVisible: false,
   };
+
+  // Accessibility settings configuration, used by the AccessibilitySettingsService
+  accessibility: AccessibilitySettingsConfig = {
+    cookieExpirationDuration: 7,
+  };
 }
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 498799a454b..77094ada805 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -319,4 +319,8 @@ export const environment: BuildConfig = {
     messageTimeOutDurationMs: 30000,
     isVisible: false,
   },
+
+  accessibility: {
+    cookieExpirationDuration: 7,
+  },
 };

From 04515591e2b1b5bd3d892556d195423913ee8779 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 5 Nov 2024 16:01:05 +0100
Subject: [PATCH 09/41] 119602: Add link to AccessibilitySettings on profile
 page

---
 src/app/profile-page/profile-page.component.html | 10 +++++++++-
 src/assets/i18n/en.json5                         |  6 ++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index 44783da84e8..d8394ac5d4c 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -28,10 +28,18 @@ <h3 class="mb-4">{{'profile.head' | translate}}</h3>
         ></ds-profile-page-security-form>
       </div>
     </div>
-    <div class="col-12 text-right pr-0">
+    <div class="col-12 text-right pr-0 mb-4">
       <button class="btn btn-primary" (click)="updateProfile()"><i class="fas fa-edit"></i> {{'profile.form.submit' | translate}}</button>
     </div>
 
+    <div class="card mb-4">
+      <div class="card-header">{{'profile.card.accessibility.header' | translate}}</div>
+      <div class="card-body">
+        <div class="mb-1">{{'profile.card.accessibility.content' | translate}}</div>
+        <a [routerLink]="'/info/accessibility'">{{'profile.card.accessibility.link' | translate}}</a>
+      </div>
+    </div>
+
     <ng-container *ngVar="(groupsRD$ | async)?.payload?.page as groups">
       <div *ngIf="groups?.length > 0">
         <h3 class="mt-4">{{'profile.groups.head' | translate}}</h3>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 1316c8d3cf6..fc749377a98 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3274,6 +3274,12 @@
 
   "profile.breadcrumbs": "Update Profile",
 
+  "profile.card.accessibility.content": "Accessibility settings can be configured on the accessibility settings page.",
+
+  "profile.card.accessibility.header": "Accessibility",
+
+  "profile.card.accessibility.link": "Accessibility Settings Page",
+
   "profile.card.identify": "Identify",
 
   "profile.card.security": "Security",

From bb7f0cd3a5adb0729a6b979ad0a4562f1ca52761 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Thu, 7 Nov 2024 10:18:11 +0100
Subject: [PATCH 10/41] 119602: Improve profile page link accessibility

---
 src/app/profile-page/profile-page.component.html | 2 +-
 src/assets/i18n/en.json5                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index d8394ac5d4c..d2809a04b64 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -35,7 +35,7 @@ <h3 class="mb-4">{{'profile.head' | translate}}</h3>
     <div class="card mb-4">
       <div class="card-header">{{'profile.card.accessibility.header' | translate}}</div>
       <div class="card-body">
-        <div class="mb-1">{{'profile.card.accessibility.content' | translate}}</div>
+        <ds-alert class="mb-4" [type]="'alert-info'">{{'profile.card.accessibility.content' | translate}}</ds-alert>
         <a [routerLink]="'/info/accessibility'">{{'profile.card.accessibility.link' | translate}}</a>
       </div>
     </div>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index fc749377a98..dc69f0fbe86 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3278,7 +3278,7 @@
 
   "profile.card.accessibility.header": "Accessibility",
 
-  "profile.card.accessibility.link": "Accessibility Settings Page",
+  "profile.card.accessibility.link": "Go to Accessibility Settings Page",
 
   "profile.card.identify": "Identify",
 

From fe90d39943f62d025b0e3ab64d57bcc017ed46b2 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Mon, 18 Nov 2024 11:36:10 +0100
Subject: [PATCH 11/41] 119602: Add placeholder in form

---
 .../accessibility/accessibility-settings.service.ts   | 11 +++++++++++
 .../accessibility-settings.component.html             |  1 +
 .../accessibility-settings.component.ts               |  4 ++++
 3 files changed, 16 insertions(+)

diff --git a/src/app/accessibility/accessibility-settings.service.ts b/src/app/accessibility/accessibility-settings.service.ts
index 4089fd03b17..77b6c91bea8 100644
--- a/src/app/accessibility/accessibility-settings.service.ts
+++ b/src/app/accessibility/accessibility-settings.service.ts
@@ -224,4 +224,15 @@ export class AccessibilitySettingsService {
     }
   }
 
+  getPlaceholder(setting: AccessibilitySetting): string {
+    switch (setting) {
+      case AccessibilitySetting.NotificationTimeOut:
+        return environment.notifications.timeOut.toString();
+      case AccessibilitySetting.LiveRegionTimeOut:
+        return environment.liveRegion.messageTimeOutDurationMs.toString();
+      default:
+        return '';
+    }
+  }
+
 }
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.html b/src/app/info/accessibility-settings/accessibility-settings.component.html
index 6550c6a2880..8a76917462c 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.html
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.html
@@ -9,6 +9,7 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
 
       <div class="col-sm-10">
         <input [type]="getInputType(setting)" [id]="setting + 'Input'" class="form-control"
+               [placeholder]="getPlaceholder(setting)"
                [(ngModel)]="formValues[setting]" [ngModelOptions]="{ standalone: true }"
                [attr.aria-describedby]="setting + 'Hint'">
 
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.ts b/src/app/info/accessibility-settings/accessibility-settings.component.ts
index 97e3ddb321f..ed1d481be61 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.ts
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.ts
@@ -38,6 +38,10 @@ export class AccessibilitySettingsComponent implements OnInit {
     return this.settingsService.getInputType(setting);
   }
 
+  getPlaceholder(setting: AccessibilitySetting): string {
+    return this.settingsService.getPlaceholder(setting);
+  }
+
   saveSettings() {
     this.settingsService.setSettings(this.formValues).pipe(take(1)).subscribe(location => {
       this.notificationsService.success(null, this.translateService.instant('info.accessibility-settings.save-notification.' + location));

From ecb00a95a07424bafa1976e871086585c3374b7a Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Mon, 18 Nov 2024 13:50:46 +0100
Subject: [PATCH 12/41] 119602: Implement converting of accessibility settings
 values

---
 .../accessibility-settings.service.ts         | 105 +++++++++++++++++-
 .../accessibility-settings.component.ts       |  22 +++-
 2 files changed, 122 insertions(+), 5 deletions(-)

diff --git a/src/app/accessibility/accessibility-settings.service.ts b/src/app/accessibility/accessibility-settings.service.ts
index 77b6c91bea8..bdf1d296797 100644
--- a/src/app/accessibility/accessibility-settings.service.ts
+++ b/src/app/accessibility/accessibility-settings.service.ts
@@ -30,7 +30,7 @@ export enum AccessibilitySetting {
   LiveRegionTimeOut = 'liveRegionTimeOut',
 }
 
-export type AccessibilitySettings = { [key in AccessibilitySetting]?: any };
+export type AccessibilitySettings = { [key in AccessibilitySetting]?: string };
 
 /**
  * Service handling the retrieval and configuration of accessibility settings.
@@ -235,4 +235,107 @@ export class AccessibilitySettingsService {
     }
   }
 
+  /**
+   * Returns the converter method for the provided setting.
+   * The converter methods are used to convert the value entered by the user in the form to the format that is used
+   * to store the setting value.
+   */
+  getFormValueToStoredValueConverterMethod(setting: AccessibilitySetting): (value: string) => string {
+    switch (setting) {
+      case AccessibilitySetting.NotificationTimeOut:
+        return secondsToMilliseconds;
+      case AccessibilitySetting.LiveRegionTimeOut:
+        return secondsToMilliseconds;
+      default:
+        return null;
+    }
+  }
+
+  /**
+   * Convert the user-configured value to the format used to store the setting value.
+   * Returns the provided value without conversion if no converter is configured for the provided setting.
+   */
+  convertFormValueToStoredValue(setting: AccessibilitySetting, value: string): string {
+    const converterMethod = this.getFormValueToStoredValueConverterMethod(setting);
+
+    if (hasValue(converterMethod)) {
+      return converterMethod(value);
+    } else {
+      return value;
+    }
+  }
+
+  /**
+   * Convert all values in the provided accessibility settings object to values ready to be stored.
+   */
+  convertAllFormValuesToStoredValues(settings: AccessibilitySettings): AccessibilitySettings {
+    const convertedSettings = {};
+
+    this.getAllAccessibilitySettingKeys().filter(setting => setting in settings).forEach(setting =>
+      convertedSettings[setting] = this.convertFormValueToStoredValue(setting, settings[setting])
+    );
+
+    return convertedSettings;
+  }
+
+  /**
+   * Returns the converter method for the provided setting.
+   * The converter methods are used to convert the value as it is stored to the format visible by the user in the form.
+   */
+  getStoredValueToFormValueConverterMethod(setting: AccessibilitySetting): (value: string) => string {
+    switch (setting) {
+      case AccessibilitySetting.NotificationTimeOut:
+        return millisecondsToSeconds;
+      case AccessibilitySetting.LiveRegionTimeOut:
+        return millisecondsToSeconds;
+      default:
+        return null;
+    }
+  }
+
+  /**
+   * Convert the stored value to the format used in the form.
+   * Returns the provided value without conversion if no converter is configured for the provided setting.
+   */
+  convertStoredValueToFormValue(setting: AccessibilitySetting, value: string): string {
+    const converterMethod = this.getStoredValueToFormValueConverterMethod(setting);
+
+    if (hasValue(converterMethod)) {
+      return converterMethod(value);
+    } else {
+      return value;
+    }
+  }
+
+  /**
+   * Convert all values in the provided accessibility settings object to values ready to show in the form.
+   */
+  convertAllStoredValuesToFormValues(settings: AccessibilitySettings): AccessibilitySettings {
+    const convertedSettings = {};
+
+    this.getAllAccessibilitySettingKeys().filter(setting => setting in settings).forEach(setting =>
+      convertedSettings[setting] = this.convertStoredValueToFormValue(setting, settings[setting])
+    );
+
+    return convertedSettings;
+  }
+
+}
+
+function secondsToMilliseconds(secondsStr: string): string {
+  const seconds = parseFloat(secondsStr);
+  if (isNaN(seconds)) {
+    return null;
+  } else {
+    return (seconds * 1000).toString();
+  }
+}
+
+function millisecondsToSeconds(millisecondsStr: string): string {
+  const milliseconds = parseFloat(millisecondsStr);
+  if (isNaN(milliseconds)) {
+    return null;
+  } else {
+    return (milliseconds / 1000).toString();
+  }
 }
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.ts b/src/app/info/accessibility-settings/accessibility-settings.component.ts
index ed1d481be61..6d325e8f0cf 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.ts
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.ts
@@ -29,9 +29,7 @@ export class AccessibilitySettingsComponent implements OnInit {
 
   ngOnInit() {
     this.accessibilitySettingsOptions = this.settingsService.getAllAccessibilitySettingKeys();
-    this.settingsService.getAll().pipe(take(1)).subscribe(currentSettings => {
-      this.formValues = currentSettings;
-    });
+    this.updateFormValues();
   }
 
   getInputType(setting: AccessibilitySetting): string {
@@ -42,10 +40,26 @@ export class AccessibilitySettingsComponent implements OnInit {
     return this.settingsService.getPlaceholder(setting);
   }
 
+  /**
+   * Saves the user-configured settings
+   */
   saveSettings() {
-    this.settingsService.setSettings(this.formValues).pipe(take(1)).subscribe(location => {
+    const formValues = this.formValues;
+    const convertedValues = this.settingsService.convertAllFormValuesToStoredValues(formValues);
+    this.settingsService.setSettings(convertedValues).pipe(take(1)).subscribe(location => {
       this.notificationsService.success(null, this.translateService.instant('info.accessibility-settings.save-notification.' + location));
     });
+
+    this.updateFormValues();
+  }
+
+  /**
+   * Updates the form values with the currently stored accessibility settings
+   */
+  updateFormValues() {
+    this.settingsService.getAll().pipe(take(1)).subscribe(storedSettings => {
+      this.formValues = this.settingsService.convertAllStoredValuesToFormValues(storedSettings);
+    });
   }
 
 }

From fdfa6e2c06042a22b6055760818406ea6b83ff9f Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Mon, 18 Nov 2024 14:26:48 +0100
Subject: [PATCH 13/41] 119602: Update values after converters implementation

---
 src/app/accessibility/accessibility-settings.service.ts | 4 ++--
 src/assets/i18n/en.json5                                | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/accessibility/accessibility-settings.service.ts b/src/app/accessibility/accessibility-settings.service.ts
index bdf1d296797..8434614434f 100644
--- a/src/app/accessibility/accessibility-settings.service.ts
+++ b/src/app/accessibility/accessibility-settings.service.ts
@@ -227,9 +227,9 @@ export class AccessibilitySettingsService {
   getPlaceholder(setting: AccessibilitySetting): string {
     switch (setting) {
       case AccessibilitySetting.NotificationTimeOut:
-        return environment.notifications.timeOut.toString();
+        return millisecondsToSeconds(environment.notifications.timeOut.toString());
       case AccessibilitySetting.LiveRegionTimeOut:
-        return environment.liveRegion.messageTimeOutDurationMs.toString();
+        return millisecondsToSeconds(environment.liveRegion.messageTimeOutDurationMs.toString());
       default:
         return '';
     }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index dc69f0fbe86..6cf15ed8448 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1846,11 +1846,11 @@
 
   "info.accessibility-settings.liveRegionTimeOut.label": "Live region time-out",
 
-  "info.accessibility-settings.liveRegionTimeOut.hint": "The duration in milliseconds after which a message in the live region disappears.",
+  "info.accessibility-settings.liveRegionTimeOut.hint": "The duration in seconds after which a message in the live region disappears.",
 
   "info.accessibility-settings.notificationTimeOut.label": "Notification time-out",
 
-  "info.accessibility-settings.notificationTimeOut.hint": "The duration in milliseconds after which a notification disappears. Set to 0 for notifications to remain indefinitely.",
+  "info.accessibility-settings.notificationTimeOut.hint": "The duration in seconds after which a notification disappears. Set to 0 for notifications to remain indefinitely.",
 
   "info.accessibility-settings.save-notification.cookie": "Successfully saved settings locally.",
 

From dc8a699e94be3069b1eed53a3f9927d2aa151bec Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 22 Nov 2024 11:55:05 +0100
Subject: [PATCH 14/41] 119602: Rework convertion & form format

---
 .../accessibility-settings.service.ts         | 108 +++---------------
 .../accessibility-settings.component.html     |  35 ++++--
 .../accessibility-settings.component.ts       |  16 +--
 3 files changed, 49 insertions(+), 110 deletions(-)

diff --git a/src/app/accessibility/accessibility-settings.service.ts b/src/app/accessibility/accessibility-settings.service.ts
index 8434614434f..48e2c8f5de9 100644
--- a/src/app/accessibility/accessibility-settings.service.ts
+++ b/src/app/accessibility/accessibility-settings.service.ts
@@ -32,6 +32,11 @@ export enum AccessibilitySetting {
 
 export type AccessibilitySettings = { [key in AccessibilitySetting]?: string };
 
+export interface AccessibilitySettingsFormValues {
+  notificationTimeOut: string,
+  liveRegionTimeOut: string,
+}
+
 /**
  * Service handling the retrieval and configuration of accessibility settings.
  *
@@ -210,20 +215,6 @@ export class AccessibilitySettingsService {
     }
   }
 
-  /**
-   * Returns the input type that a form should use for the provided {@link AccessibilitySetting}
-   */
-  getInputType(setting: AccessibilitySetting): string {
-    switch (setting) {
-      case AccessibilitySetting.NotificationTimeOut:
-        return 'number';
-      case AccessibilitySetting.LiveRegionTimeOut:
-        return 'number';
-      default:
-        return 'text';
-    }
-  }
-
   getPlaceholder(setting: AccessibilitySetting): string {
     switch (setting) {
       case AccessibilitySetting.NotificationTimeOut:
@@ -236,88 +227,23 @@ export class AccessibilitySettingsService {
   }
 
   /**
-   * Returns the converter method for the provided setting.
-   * The converter methods are used to convert the value entered by the user in the form to the format that is used
-   * to store the setting value.
+   * Convert values in the provided accessibility settings object to values ready to be stored.
    */
-  getFormValueToStoredValueConverterMethod(setting: AccessibilitySetting): (value: string) => string {
-    switch (setting) {
-      case AccessibilitySetting.NotificationTimeOut:
-        return secondsToMilliseconds;
-      case AccessibilitySetting.LiveRegionTimeOut:
-        return secondsToMilliseconds;
-      default:
-        return null;
-    }
-  }
-
-  /**
-   * Convert the user-configured value to the format used to store the setting value.
-   * Returns the provided value without conversion if no converter is configured for the provided setting.
-   */
-  convertFormValueToStoredValue(setting: AccessibilitySetting, value: string): string {
-    const converterMethod = this.getFormValueToStoredValueConverterMethod(setting);
-
-    if (hasValue(converterMethod)) {
-      return converterMethod(value);
-    } else {
-      return value;
-    }
+  convertFormValuesToStoredValues(settings: AccessibilitySettingsFormValues): AccessibilitySettings {
+    return {
+      'notificationTimeOut': secondsToMilliseconds(settings.notificationTimeOut),
+      'liveRegionTimeOut': secondsToMilliseconds(settings.liveRegionTimeOut),
+    };
   }
 
   /**
-   * Convert all values in the provided accessibility settings object to values ready to be stored.
+   * Convert values in the provided accessibility settings object to values ready to show in the form.
    */
-  convertAllFormValuesToStoredValues(settings: AccessibilitySettings): AccessibilitySettings {
-    const convertedSettings = {};
-
-    this.getAllAccessibilitySettingKeys().filter(setting => setting in settings).forEach(setting =>
-      convertedSettings[setting] = this.convertFormValueToStoredValue(setting, settings[setting])
-    );
-
-    return convertedSettings;
-  }
-
-  /**
-   * Returns the converter method for the provided setting.
-   * The converter methods are used to convert the value as it is stored to the format visible by the user in the form.
-   */
-  getStoredValueToFormValueConverterMethod(setting: AccessibilitySetting): (value: string) => string {
-    switch (setting) {
-      case AccessibilitySetting.NotificationTimeOut:
-        return millisecondsToSeconds;
-      case AccessibilitySetting.LiveRegionTimeOut:
-        return millisecondsToSeconds;
-      default:
-        return null;
-    }
-  }
-
-  /**
-   * Convert the stored value to the format used in the form.
-   * Returns the provided value without conversion if no converter is configured for the provided setting.
-   */
-  convertStoredValueToFormValue(setting: AccessibilitySetting, value: string): string {
-    const converterMethod = this.getStoredValueToFormValueConverterMethod(setting);
-
-    if (hasValue(converterMethod)) {
-      return converterMethod(value);
-    } else {
-      return value;
-    }
-  }
-
-  /**
-   * Convert all values in the provided accessibility settings object to values ready to show in the form.
-   */
-  convertAllStoredValuesToFormValues(settings: AccessibilitySettings): AccessibilitySettings {
-    const convertedSettings = {};
-
-    this.getAllAccessibilitySettingKeys().filter(setting => setting in settings).forEach(setting =>
-      convertedSettings[setting] = this.convertStoredValueToFormValue(setting, settings[setting])
-    );
-
-    return convertedSettings;
+  convertStoredValuesToFormValues(settings: AccessibilitySettings): AccessibilitySettingsFormValues {
+    return {
+      notificationTimeOut: millisecondsToSeconds(settings.notificationTimeOut),
+      liveRegionTimeOut: millisecondsToSeconds(settings.liveRegionTimeOut),
+    };
   }
 
 }
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.html b/src/app/info/accessibility-settings/accessibility-settings.component.html
index 8a76917462c..947bff495a1 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.html
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.html
@@ -2,19 +2,36 @@
   <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
 
   <form>
-    <div *ngFor="let setting of accessibilitySettingsOptions" class="form-group row">
-      <label [for]="setting + 'Input'" class="col-sm-2 col-form-label">
-        {{ 'info.accessibility-settings.' + setting + '.label' | translate }}
+    <div class="form-group row">
+      <label [for]="'notificationTimeOutInput'" class="col-sm-2 col-form-label">
+        {{ 'info.accessibility-settings.notificationTimeOut.label' | translate }}
       </label>
 
       <div class="col-sm-10">
-        <input [type]="getInputType(setting)" [id]="setting + 'Input'" class="form-control"
-               [placeholder]="getPlaceholder(setting)"
-               [(ngModel)]="formValues[setting]" [ngModelOptions]="{ standalone: true }"
-               [attr.aria-describedby]="setting + 'Hint'">
+        <input [type]="'number'" [id]="'notificationTimeOutInput'" class="form-control"
+               [placeholder]="getPlaceholder(AccessibilitySetting.NotificationTimeOut)"
+               [(ngModel)]="formValues.notificationTimeOut" [ngModelOptions]="{ standalone: true }"
+               [attr.aria-describedby]="'notificationTimeOutHint'">
 
-        <small [id]="setting + 'Hint'" class="form-text text-muted">
-          {{ 'info.accessibility-settings.' + setting + '.hint' | translate }}
+        <small [id]="'notificationTimeOutHint'" class="form-text text-muted">
+          {{ 'info.accessibility-settings.notificationTimeOut.hint' | translate }}
+        </small>
+      </div>
+    </div>
+
+    <div class="form-group row">
+      <label [for]="'liveRegionTimeOutInput'" class="col-sm-2 col-form-label">
+        {{ 'info.accessibility-settings.liveRegionTimeOut.label' | translate }}
+      </label>
+
+      <div class="col-sm-10">
+        <input [type]="'number'" [id]="'liveRegionTimeOutInput'" class="form-control"
+               [placeholder]="getPlaceholder(AccessibilitySetting.LiveRegionTimeOut)"
+               [(ngModel)]="formValues.liveRegionTimeOut" [ngModelOptions]="{ standalone: true }"
+               [attr.aria-describedby]="'liveRegionTimeOutHint'">
+
+        <small [id]="'liveRegionTimeOutHint'" class="form-text text-muted">
+          {{ 'info.accessibility-settings.liveRegionTimeOut.hint' | translate }}
         </small>
       </div>
     </div>
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.ts b/src/app/info/accessibility-settings/accessibility-settings.component.ts
index 6d325e8f0cf..9e2ce300401 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.ts
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.ts
@@ -3,7 +3,7 @@ import { AuthService } from '../../core/auth/auth.service';
 import {
   AccessibilitySetting,
   AccessibilitySettingsService,
-  AccessibilitySettings
+  AccessibilitySettingsFormValues,
 } from '../../accessibility/accessibility-settings.service';
 import { take } from 'rxjs';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
@@ -15,9 +15,10 @@ import { TranslateService } from '@ngx-translate/core';
 })
 export class AccessibilitySettingsComponent implements OnInit {
 
-  protected accessibilitySettingsOptions: AccessibilitySetting[];
+  // Re-export for use in template
+  protected readonly AccessibilitySetting = AccessibilitySetting;
 
-  protected formValues: AccessibilitySettings = { };
+  protected formValues: AccessibilitySettingsFormValues;
 
   constructor(
     protected authService: AuthService,
@@ -28,14 +29,9 @@ export class AccessibilitySettingsComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.accessibilitySettingsOptions = this.settingsService.getAllAccessibilitySettingKeys();
     this.updateFormValues();
   }
 
-  getInputType(setting: AccessibilitySetting): string {
-    return this.settingsService.getInputType(setting);
-  }
-
   getPlaceholder(setting: AccessibilitySetting): string {
     return this.settingsService.getPlaceholder(setting);
   }
@@ -45,7 +41,7 @@ export class AccessibilitySettingsComponent implements OnInit {
    */
   saveSettings() {
     const formValues = this.formValues;
-    const convertedValues = this.settingsService.convertAllFormValuesToStoredValues(formValues);
+    const convertedValues = this.settingsService.convertFormValuesToStoredValues(formValues);
     this.settingsService.setSettings(convertedValues).pipe(take(1)).subscribe(location => {
       this.notificationsService.success(null, this.translateService.instant('info.accessibility-settings.save-notification.' + location));
     });
@@ -58,7 +54,7 @@ export class AccessibilitySettingsComponent implements OnInit {
    */
   updateFormValues() {
     this.settingsService.getAll().pipe(take(1)).subscribe(storedSettings => {
-      this.formValues = this.settingsService.convertAllStoredValuesToFormValues(storedSettings);
+      this.formValues = this.settingsService.convertStoredValuesToFormValues(storedSettings);
     });
   }
 

From b16cec631dbe950f7d6c27f639d426cb79e5cb01 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 22 Nov 2024 13:56:39 +0100
Subject: [PATCH 15/41] 119602: Add automatic notification hiding toggle

---
 .../accessibility-settings.service.ts          |  5 ++++-
 .../accessibility-settings.component.html      | 18 ++++++++++++++++++
 .../accessibility-settings.component.ts        |  3 +--
 src/app/info/info.module.ts                    |  2 ++
 src/assets/i18n/en.json5                       |  6 +++++-
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/app/accessibility/accessibility-settings.service.ts b/src/app/accessibility/accessibility-settings.service.ts
index 48e2c8f5de9..8dd90ef1542 100644
--- a/src/app/accessibility/accessibility-settings.service.ts
+++ b/src/app/accessibility/accessibility-settings.service.ts
@@ -33,6 +33,7 @@ export enum AccessibilitySetting {
 export type AccessibilitySettings = { [key in AccessibilitySetting]?: string };
 
 export interface AccessibilitySettingsFormValues {
+  disableNotificationTimeOut: boolean,
   notificationTimeOut: string,
   liveRegionTimeOut: string,
 }
@@ -231,7 +232,8 @@ export class AccessibilitySettingsService {
    */
   convertFormValuesToStoredValues(settings: AccessibilitySettingsFormValues): AccessibilitySettings {
     return {
-      'notificationTimeOut': secondsToMilliseconds(settings.notificationTimeOut),
+      'notificationTimeOut': settings.disableNotificationTimeOut ? '0'
+        : secondsToMilliseconds(settings.notificationTimeOut),
       'liveRegionTimeOut': secondsToMilliseconds(settings.liveRegionTimeOut),
     };
   }
@@ -241,6 +243,7 @@ export class AccessibilitySettingsService {
    */
   convertStoredValuesToFormValues(settings: AccessibilitySettings): AccessibilitySettingsFormValues {
     return {
+      disableNotificationTimeOut: parseFloat(settings.notificationTimeOut) === 0,
       notificationTimeOut: millisecondsToSeconds(settings.notificationTimeOut),
       liveRegionTimeOut: millisecondsToSeconds(settings.liveRegionTimeOut),
     };
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.html b/src/app/info/accessibility-settings/accessibility-settings.component.html
index 947bff495a1..355d3c94090 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.html
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.html
@@ -2,6 +2,23 @@
   <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
 
   <form>
+    <div class="form-group row">
+      <label [for]="'disableNotificationTimeOutInput'" class="col-sm-2 col-form-label">
+        {{ 'info.accessibility-settings.disableNotificationTimeOut.label' | translate }}
+      </label>
+
+      <div class="col-sm-10">
+        <ui-switch [id]="'disableNotificationTimeOutInput'"
+                   [(ngModel)]="formValues.disableNotificationTimeOut"
+                   [ngModelOptions]="{ standalone: true }"
+        ></ui-switch>
+
+        <small [id]="'disableNotificationTimeOutHint'" class="form-text text-muted">
+          {{ 'info.accessibility-settings.disableNotificationTimeOut.hint' | translate }}
+        </small>
+      </div>
+    </div>
+
     <div class="form-group row">
       <label [for]="'notificationTimeOutInput'" class="col-sm-2 col-form-label">
         {{ 'info.accessibility-settings.notificationTimeOut.label' | translate }}
@@ -10,6 +27,7 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
       <div class="col-sm-10">
         <input [type]="'number'" [id]="'notificationTimeOutInput'" class="form-control"
                [placeholder]="getPlaceholder(AccessibilitySetting.NotificationTimeOut)"
+               [readOnly]="formValues.disableNotificationTimeOut"
                [(ngModel)]="formValues.notificationTimeOut" [ngModelOptions]="{ standalone: true }"
                [attr.aria-describedby]="'notificationTimeOutHint'">
 
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.ts b/src/app/info/accessibility-settings/accessibility-settings.component.ts
index 9e2ce300401..ea7c853a972 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.ts
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.ts
@@ -44,9 +44,8 @@ export class AccessibilitySettingsComponent implements OnInit {
     const convertedValues = this.settingsService.convertFormValuesToStoredValues(formValues);
     this.settingsService.setSettings(convertedValues).pipe(take(1)).subscribe(location => {
       this.notificationsService.success(null, this.translateService.instant('info.accessibility-settings.save-notification.' + location));
+      this.updateFormValues();
     });
-
-    this.updateFormValues();
   }
 
   /**
diff --git a/src/app/info/info.module.ts b/src/app/info/info.module.ts
index d01ded1af09..dc2a16aa5b9 100644
--- a/src/app/info/info.module.ts
+++ b/src/app/info/info.module.ts
@@ -14,6 +14,7 @@ import { ThemedFeedbackFormComponent } from './feedback/feedback-form/themed-fee
 import { ThemedFeedbackComponent } from './feedback/themed-feedback.component';
 import { FeedbackGuard } from '../core/feedback/feedback.guard';
 import { AccessibilitySettingsComponent } from './accessibility-settings/accessibility-settings.component';
+import { UiSwitchModule } from 'ngx-ui-switch';
 
 
 const DECLARATIONS = [
@@ -35,6 +36,7 @@ const DECLARATIONS = [
     CommonModule,
     SharedModule,
     InfoRoutingModule,
+    UiSwitchModule,
   ],
   declarations: [
     ...DECLARATIONS
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 6cf15ed8448..d9533da9c7f 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1844,13 +1844,17 @@
 
   "info.accessibility-settings.breadcrumbs": "Accessibility settings",
 
+  "info.accessibility-settings.disableNotificationTimeOut.label": "Disable automatic notification hiding",
+
+  "info.accessibility-settings.disableNotificationTimeOut.hint": "When this toggle is activated, notifications will remain until manually closed.",
+
   "info.accessibility-settings.liveRegionTimeOut.label": "Live region time-out",
 
   "info.accessibility-settings.liveRegionTimeOut.hint": "The duration in seconds after which a message in the live region disappears.",
 
   "info.accessibility-settings.notificationTimeOut.label": "Notification time-out",
 
-  "info.accessibility-settings.notificationTimeOut.hint": "The duration in seconds after which a notification disappears. Set to 0 for notifications to remain indefinitely.",
+  "info.accessibility-settings.notificationTimeOut.hint": "The duration in seconds after which a notification disappears.",
 
   "info.accessibility-settings.save-notification.cookie": "Successfully saved settings locally.",
 

From cae13942e297065276d065ef3cf22547105fa52e Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 22 Nov 2024 15:54:21 +0100
Subject: [PATCH 16/41] 119602: Allow resetting accessibility settings

---
 .../accessibility-settings.service.ts            | 16 +++++++++++++---
 .../accessibility-settings.component.html        | 12 +++++++++---
 .../accessibility-settings.component.ts          | 10 ++++++++++
 src/assets/i18n/en.json5                         |  4 ++++
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/app/accessibility/accessibility-settings.service.ts b/src/app/accessibility/accessibility-settings.service.ts
index 8dd90ef1542..e86742d76de 100644
--- a/src/app/accessibility/accessibility-settings.service.ts
+++ b/src/app/accessibility/accessibility-settings.service.ts
@@ -2,13 +2,14 @@ import { Injectable } from '@angular/core';
 import { Observable, of, switchMap } from 'rxjs';
 import { map, take } from 'rxjs/operators';
 import { CookieService } from '../core/services/cookie.service';
-import { hasValue, isNotEmpty, isNotEmptyOperator } from '../shared/empty.util';
+import { hasValue, isNotEmpty } from '../shared/empty.util';
 import { AuthService } from '../core/auth/auth.service';
 import { EPerson } from '../core/eperson/models/eperson.model';
 import { EPersonDataService } from '../core/eperson/eperson-data.service';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
 import cloneDeep from 'lodash/cloneDeep';
 import { environment } from '../../environments/environment';
+import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 
 /**
  * Name of the cookie used to store the settings locally
@@ -198,8 +199,8 @@ export class AccessibilitySettingsService {
 
     return this.ePersonService.createPatchFromCache(user).pipe(
       take(1),
-      isNotEmptyOperator(),
-      switchMap(operations => this.ePersonService.patch(user, operations)),
+      switchMap(operations =>
+        isNotEmpty(operations) ? this.ePersonService.patch(user, operations) : createSuccessfulRemoteDataObject$({})),
       getFirstCompletedRemoteData(),
       map(rd => rd.hasSucceeded),
     );
@@ -216,6 +217,15 @@ export class AccessibilitySettingsService {
     }
   }
 
+  /**
+   * Clears all settings in the cookie and attempts to clear settings in metadata.
+   * Emits true if settings in metadata were cleared and false otherwise.
+   */
+  clearSettings(): Observable<boolean> {
+    this.setSettingsInCookie({});
+    return this.setSettingsInAuthenticatedUserMetadata({});
+  }
+
   getPlaceholder(setting: AccessibilitySetting): string {
     switch (setting) {
       case AccessibilitySetting.NotificationTimeOut:
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.html b/src/app/info/accessibility-settings/accessibility-settings.component.html
index 355d3c94090..43371d33366 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.html
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.html
@@ -54,9 +54,15 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
       </div>
     </div>
 
-    <button type="submit" (click)="saveSettings()" class="btn btn-primary">
-      {{ 'info.accessibility-settings.submit' | translate }}
-    </button>
+    <div role="group">
+      <button type="submit" (click)="saveSettings()" class="btn btn-primary mr-2">
+        {{ 'info.accessibility-settings.submit' | translate }}
+      </button>
+      <button type="reset" (click)="resetSettings()" class="btn btn-warning">
+        {{ 'info.accessibility-settings.reset' | translate }}
+      </button>
+    </div>
+
   </form>
 
 </div>
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.ts b/src/app/info/accessibility-settings/accessibility-settings.component.ts
index ea7c853a972..0de18152eef 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.ts
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.ts
@@ -57,4 +57,14 @@ export class AccessibilitySettingsComponent implements OnInit {
     });
   }
 
+  /**
+   * Resets accessibility settings
+   */
+  resetSettings() {
+    this.settingsService.clearSettings().pipe(take(1)).subscribe(() => {
+      this.notificationsService.success(null, this.translateService.instant('info.accessibility-settings.reset-notification'));
+      this.updateFormValues();
+    });
+  }
+
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index d9533da9c7f..69127375cf4 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1860,6 +1860,10 @@
 
   "info.accessibility-settings.save-notification.metadata": "Successfully saved settings on the user profile.",
 
+  "info.accessibility-settings.reset-notification": "Successfully reset settings.",
+
+  "info.accessibility-settings.reset": "Reset accessibility settings",
+
   "info.accessibility-settings.submit": "Save accessibility settings",
 
   "info.accessibility-settings.title": "Accessibility settings",

From 287d0283313beae07b7e8d0fcd47b71c349730c1 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 22 Nov 2024 16:03:52 +0100
Subject: [PATCH 17/41] 119602: Make input boxes smaller

---
 .../accessibility-settings.component.html                   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.html b/src/app/info/accessibility-settings/accessibility-settings.component.html
index 43371d33366..076cfdf9648 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.html
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.html
@@ -7,7 +7,7 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
         {{ 'info.accessibility-settings.disableNotificationTimeOut.label' | translate }}
       </label>
 
-      <div class="col-sm-10">
+      <div class="col-sm-4">
         <ui-switch [id]="'disableNotificationTimeOutInput'"
                    [(ngModel)]="formValues.disableNotificationTimeOut"
                    [ngModelOptions]="{ standalone: true }"
@@ -24,7 +24,7 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
         {{ 'info.accessibility-settings.notificationTimeOut.label' | translate }}
       </label>
 
-      <div class="col-sm-10">
+      <div class="col-sm-4">
         <input [type]="'number'" [id]="'notificationTimeOutInput'" class="form-control"
                [placeholder]="getPlaceholder(AccessibilitySetting.NotificationTimeOut)"
                [readOnly]="formValues.disableNotificationTimeOut"
@@ -42,7 +42,7 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
         {{ 'info.accessibility-settings.liveRegionTimeOut.label' | translate }}
       </label>
 
-      <div class="col-sm-10">
+      <div class="col-sm-4">
         <input [type]="'number'" [id]="'liveRegionTimeOutInput'" class="form-control"
                [placeholder]="getPlaceholder(AccessibilitySetting.LiveRegionTimeOut)"
                [(ngModel)]="formValues.liveRegionTimeOut" [ngModelOptions]="{ standalone: true }"

From 9ac92e019627eb4042729fe3f4335837a73e164d Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 22 Nov 2024 16:09:12 +0100
Subject: [PATCH 18/41] 119602: Add unit after input fields

---
 .../accessibility-settings.component.html                 | 8 ++++++++
 src/assets/i18n/en.json5                                  | 8 ++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.html b/src/app/info/accessibility-settings/accessibility-settings.component.html
index 076cfdf9648..d3c03f556b6 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.html
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.html
@@ -35,6 +35,10 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
           {{ 'info.accessibility-settings.notificationTimeOut.hint' | translate }}
         </small>
       </div>
+
+      <div class="col-sm-2 col-form-label">
+        {{ 'info.accessibility-settings.notificationTimeOut.unit' | translate }}
+      </div>
     </div>
 
     <div class="form-group row">
@@ -52,6 +56,10 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
           {{ 'info.accessibility-settings.liveRegionTimeOut.hint' | translate }}
         </small>
       </div>
+
+      <div class="col-sm-2 col-form-label">
+        {{ 'info.accessibility-settings.liveRegionTimeOut.unit' | translate }}
+      </div>
     </div>
 
     <div role="group">
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 69127375cf4..54286d60744 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1850,11 +1850,15 @@
 
   "info.accessibility-settings.liveRegionTimeOut.label": "Live region time-out",
 
-  "info.accessibility-settings.liveRegionTimeOut.hint": "The duration in seconds after which a message in the live region disappears.",
+  "info.accessibility-settings.liveRegionTimeOut.hint": "The duration after which a message in the live region disappears.",
+
+  "info.accessibility-settings.liveRegionTimeOut.unit": "Seconds",
 
   "info.accessibility-settings.notificationTimeOut.label": "Notification time-out",
 
-  "info.accessibility-settings.notificationTimeOut.hint": "The duration in seconds after which a notification disappears.",
+  "info.accessibility-settings.notificationTimeOut.hint": "The duration after which a notification disappears.",
+
+  "info.accessibility-settings.notificationTimeOut.unit": "Seconds",
 
   "info.accessibility-settings.save-notification.cookie": "Successfully saved settings locally.",
 

From 5a28e66b2f6b6c8335821eb5526f7f347810115d Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Mon, 25 Nov 2024 09:44:27 +0100
Subject: [PATCH 19/41] 119602: Move hints to contextHelp

---
 .../accessibility-settings.component.html     | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.html b/src/app/info/accessibility-settings/accessibility-settings.component.html
index d3c03f556b6..d247b12f949 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.html
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.html
@@ -7,15 +7,19 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
         {{ 'info.accessibility-settings.disableNotificationTimeOut.label' | translate }}
       </label>
 
-      <div class="col-sm-4">
+      <div class="col-sm-5">
         <ui-switch [id]="'disableNotificationTimeOutInput'"
                    [(ngModel)]="formValues.disableNotificationTimeOut"
                    [ngModelOptions]="{ standalone: true }"
         ></ui-switch>
+      </div>
 
-        <small [id]="'disableNotificationTimeOutHint'" class="form-text text-muted">
-          {{ 'info.accessibility-settings.disableNotificationTimeOut.hint' | translate }}
-        </small>
+      <div class="col-sm-1" *dsContextHelp="{
+            content: 'info.accessibility-settings.disableNotificationTimeOut.hint',
+            id: 'disableNotificationTimeOutHelp',
+            iconPlacement: 'right',
+            tooltipPlacement: 'right'
+          }">
       </div>
     </div>
 
@@ -30,15 +34,19 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
                [readOnly]="formValues.disableNotificationTimeOut"
                [(ngModel)]="formValues.notificationTimeOut" [ngModelOptions]="{ standalone: true }"
                [attr.aria-describedby]="'notificationTimeOutHint'">
-
-        <small [id]="'notificationTimeOutHint'" class="form-text text-muted">
-          {{ 'info.accessibility-settings.notificationTimeOut.hint' | translate }}
-        </small>
       </div>
 
-      <div class="col-sm-2 col-form-label">
+      <div class="col-sm-1 col-form-label">
         {{ 'info.accessibility-settings.notificationTimeOut.unit' | translate }}
       </div>
+
+      <div class="col-sm-1" *dsContextHelp="{
+            content: 'info.accessibility-settings.notificationTimeOut.hint',
+            id: 'notificationTimeOutHelp',
+            iconPlacement: 'right',
+            tooltipPlacement: 'right'
+          }">
+      </div>
     </div>
 
     <div class="form-group row">
@@ -51,15 +59,19 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
                [placeholder]="getPlaceholder(AccessibilitySetting.LiveRegionTimeOut)"
                [(ngModel)]="formValues.liveRegionTimeOut" [ngModelOptions]="{ standalone: true }"
                [attr.aria-describedby]="'liveRegionTimeOutHint'">
-
-        <small [id]="'liveRegionTimeOutHint'" class="form-text text-muted">
-          {{ 'info.accessibility-settings.liveRegionTimeOut.hint' | translate }}
-        </small>
       </div>
 
-      <div class="col-sm-2 col-form-label">
+      <div class="col-sm-1 col-form-label">
         {{ 'info.accessibility-settings.liveRegionTimeOut.unit' | translate }}
       </div>
+
+      <div class="col-sm-1" *dsContextHelp="{
+            content: 'info.accessibility-settings.liveRegionTimeOut.hint',
+            id: 'liveRegionTimeOutHelp',
+            iconPlacement: 'right',
+            tooltipPlacement: 'right'
+          }">
+      </div>
     </div>
 
     <div role="group">

From ced163a25f40dabd446c9141f10aa6e69b1460a8 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Mon, 25 Nov 2024 09:49:09 +0100
Subject: [PATCH 20/41] 119602: Remove obsolete tests

---
 .../accessibility-settings.service.spec.ts          |  8 --------
 .../accessibility-settings.component.spec.ts        | 13 +------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/src/app/accessibility/accessibility-settings.service.spec.ts b/src/app/accessibility/accessibility-settings.service.spec.ts
index d6f61840575..5344c31d452 100644
--- a/src/app/accessibility/accessibility-settings.service.spec.ts
+++ b/src/app/accessibility/accessibility-settings.service.spec.ts
@@ -368,12 +368,4 @@ describe('accessibilitySettingsService', () => {
     });
   });
 
-  describe('getInputType', () => {
-    it('should correctly return the input type', () => {
-      expect(service.getInputType(AccessibilitySetting.NotificationTimeOut)).toEqual('number');
-      expect(service.getInputType(AccessibilitySetting.LiveRegionTimeOut)).toEqual('number');
-      expect(service.getInputType('unknownValue' as AccessibilitySetting)).toEqual('text');
-    });
-  });
-
 });
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts b/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts
index f6d3252a384..3ba0e1ab967 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts
@@ -4,7 +4,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
 import { getAccessibilitySettingsServiceStub } from '../../accessibility/accessibility-settings.service.stub';
-import { AccessibilitySettingsService, AccessibilitySetting } from '../../accessibility/accessibility-settings.service';
+import { AccessibilitySettingsService } from '../../accessibility/accessibility-settings.service';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { AuthService } from '../../core/auth/auth.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
@@ -47,22 +47,11 @@ describe('AccessibilitySettingsComponent', () => {
   });
 
   describe('On Init', () => {
-    it('should retrieve all accessibility settings options', () => {
-      expect(settingsService.getAllAccessibilitySettingKeys).toHaveBeenCalled();
-    });
-
     it('should retrieve the current settings', () => {
       expect(settingsService.getAll).toHaveBeenCalled();
     });
   });
 
-  describe('getInputType', () => {
-    it('should retrieve the input type for the setting from the service', () => {
-      component.getInputType(AccessibilitySetting.LiveRegionTimeOut);
-      expect(settingsService.getInputType).toHaveBeenCalledWith(AccessibilitySetting.LiveRegionTimeOut);
-    });
-  });
-
   describe('saveSettings', () => {
     it('should save the settings in the service', () => {
       settingsService.setSettings = jasmine.createSpy('setSettings').and.returnValue(of('cookie'));

From ec016e80fb931f8f9ea25a64e0cbeab8d8c4dc16 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Mon, 25 Nov 2024 10:00:04 +0100
Subject: [PATCH 21/41] 119602: Update AccessibilitySettingsService stub

---
 .../accessibility/accessibility-settings.service.stub.ts    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/app/accessibility/accessibility-settings.service.stub.ts b/src/app/accessibility/accessibility-settings.service.stub.ts
index b619a337de9..4ac965059e6 100644
--- a/src/app/accessibility/accessibility-settings.service.stub.ts
+++ b/src/app/accessibility/accessibility-settings.service.stub.ts
@@ -31,4 +31,10 @@ export class AccessibilitySettingsServiceStub {
   setSettingsInCookie = jasmine.createSpy('setSettingsInCookie');
 
   getInputType = jasmine.createSpy('getInputType').and.returnValue('text');
+
+  convertFormValuesToStoredValues = jasmine.createSpy('convertFormValuesToStoredValues').and.returnValue({});
+
+  convertStoredValuesToFormValues = jasmine.createSpy('convertStoredValuesToFormValues').and.returnValue({});
+
+  getPlaceholder = jasmine.createSpy('getPlaceholder').and.returnValue('placeholder');
 }

From deb4a63c88dce3b9dd906911cfc2cd83a6ffc8e5 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Mon, 25 Nov 2024 10:12:39 +0100
Subject: [PATCH 22/41] 119602: Add additional accessibilitySettingsComponent
 tests

---
 .../accessibility-settings.component.spec.ts           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts b/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts
index 3ba0e1ab967..bcd4ff94c86 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts
@@ -50,6 +50,10 @@ describe('AccessibilitySettingsComponent', () => {
     it('should retrieve the current settings', () => {
       expect(settingsService.getAll).toHaveBeenCalled();
     });
+
+    it('should convert retrieved settings to form format', () => {
+      expect(settingsService.convertStoredValuesToFormValues).toHaveBeenCalled();
+    });
   });
 
   describe('saveSettings', () => {
@@ -59,6 +63,12 @@ describe('AccessibilitySettingsComponent', () => {
       expect(settingsService.setSettings).toHaveBeenCalled();
     });
 
+    it('should convert form settings to stored format', () => {
+      settingsService.setSettings = jasmine.createSpy('setSettings').and.returnValue(of('cookie'));
+      component.saveSettings();
+      expect(settingsService.convertFormValuesToStoredValues).toHaveBeenCalled();
+    });
+
     it('should give the user a notification mentioning where the settings were saved', () => {
       settingsService.setSettings = jasmine.createSpy('setSettings').and.returnValue(of('cookie'));
       component.saveSettings();

From c38352ed22072921469b7c8b7f00ef6bc18a0019 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Mon, 25 Nov 2024 10:29:16 +0100
Subject: [PATCH 23/41] 119602: Update doc comments

---
 .../accessibility-settings.service.ts              | 14 ++++++++++++--
 .../accessibility-settings.component.ts            |  3 +++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/app/accessibility/accessibility-settings.service.ts b/src/app/accessibility/accessibility-settings.service.ts
index e86742d76de..f2151675391 100644
--- a/src/app/accessibility/accessibility-settings.service.ts
+++ b/src/app/accessibility/accessibility-settings.service.ts
@@ -23,16 +23,22 @@ export const ACCESSIBILITY_SETTINGS_METADATA_KEY = 'dspace.accessibility.setting
 
 /**
  * Enum containing all possible accessibility settings.
- * When adding new settings, the {@link AccessibilitySettingsService#getInputType} method and the i18n keys for the
- * accessibility settings page should be updated.
+ * When adding new settings, make sure to add the new setting to the accessibility-settings component.
+ * The converter methods to convert from stored format to form format (and vice-versa) need to be updated as well.
  */
 export enum AccessibilitySetting {
   NotificationTimeOut = 'notificationTimeOut',
   LiveRegionTimeOut = 'liveRegionTimeOut',
 }
 
+/**
+ * Type representing an object that contains accessibility settings values.
+ */
 export type AccessibilitySettings = { [key in AccessibilitySetting]?: string };
 
+/**
+ * The accessibility settings object format used by the accessibility-settings component form.
+ */
 export interface AccessibilitySettingsFormValues {
   disableNotificationTimeOut: boolean,
   notificationTimeOut: string,
@@ -226,6 +232,10 @@ export class AccessibilitySettingsService {
     return this.setSettingsInAuthenticatedUserMetadata({});
   }
 
+  /**
+   * Retrieve the placeholder to be used for the provided AccessibilitySetting.
+   * Returns an empty string when no placeholder is specified for the provided setting.
+   */
   getPlaceholder(setting: AccessibilitySetting): string {
     switch (setting) {
       case AccessibilitySetting.NotificationTimeOut:
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.ts b/src/app/info/accessibility-settings/accessibility-settings.component.ts
index 0de18152eef..cd417393d44 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.ts
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.ts
@@ -9,6 +9,9 @@ import { take } from 'rxjs';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 
+/**
+ * Component providing the form where users can update accessibility settings.
+ */
 @Component({
   selector: 'ds-accessibility-settings',
   templateUrl: './accessibility-settings.component.html'

From cdec4880d2e62c32b7fc40173b936124762163ed Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 29 Nov 2024 10:44:44 +0100
Subject: [PATCH 24/41] 119602: Compare notifications by id to correctly update
 store

---
 .../notifications-board/notifications-board.component.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/notifications/notifications-board/notifications-board.component.ts b/src/app/shared/notifications/notifications-board/notifications-board.component.ts
index 20bf7175f6f..8439a1af16d 100644
--- a/src/app/shared/notifications/notifications-board/notifications-board.component.ts
+++ b/src/app/shared/notifications/notifications-board/notifications-board.component.ts
@@ -10,7 +10,6 @@ import {
 
 import { select, Store } from '@ngrx/store';
 import { BehaviorSubject, Subscription, take } from 'rxjs';
-import difference from 'lodash/difference';
 
 import { NotificationsService } from '../notifications.service';
 import { AppState } from '../../../app.reducer';
@@ -23,6 +22,7 @@ import {
   AccessibilitySetting
 } from '../../../accessibility/accessibility-settings.service';
 import cloneDeep from 'lodash/cloneDeep';
+import differenceWith from 'lodash/differenceWith';
 
 @Component({
   selector: 'ds-notifications-board',
@@ -69,13 +69,13 @@ export class NotificationsBoardComponent implements OnInit, OnDestroy {
           this.notifications = [];
         } else if (state.length > this.notifications.length) {
           // Add
-          const newElem = difference(state, this.notifications);
+          const newElem = differenceWith(state, this.notifications, this.byId);
           newElem.forEach((notification) => {
             this.add(notification);
           });
         } else {
           // Remove
-          const delElem = difference(this.notifications, state);
+          const delElem = differenceWith(this.notifications, state, this.byId);
           delElem.forEach((notification) => {
             this.notifications = this.notifications.filter((item: INotification) => item.id !== notification.id);
 
@@ -85,6 +85,9 @@ export class NotificationsBoardComponent implements OnInit, OnDestroy {
       });
   }
 
+  private byId = (notificationA: INotification, notificationB: INotification) =>
+    notificationA.id === notificationB.id;
+
   // Add the new notification to the notification array
   add(item: INotification): void {
     const toBlock: boolean = this.block(item);

From 010b2f9693da1e6905951118f35aefc2a7f6a3fa Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 11 Dec 2024 09:35:01 +0100
Subject: [PATCH 25/41] 119602: Improve types & docs

---
 .../accessibility-settings.service.spec.ts    | 36 ++++++-----------
 .../accessibility-settings.service.ts         | 40 +++++++++++--------
 .../accessibility-settings.component.html     |  4 +-
 .../accessibility-settings.component.ts       |  3 --
 .../shared/live-region/live-region.service.ts |  4 +-
 .../notifications-board.component.ts          |  5 +--
 6 files changed, 41 insertions(+), 51 deletions(-)

diff --git a/src/app/accessibility/accessibility-settings.service.spec.ts b/src/app/accessibility/accessibility-settings.service.spec.ts
index 5344c31d452..3d58c02d109 100644
--- a/src/app/accessibility/accessibility-settings.service.spec.ts
+++ b/src/app/accessibility/accessibility-settings.service.spec.ts
@@ -1,6 +1,5 @@
 import {
   AccessibilitySettingsService,
-  AccessibilitySetting,
   AccessibilitySettings,
   ACCESSIBILITY_SETTINGS_METADATA_KEY,
   ACCESSIBILITY_COOKIE
@@ -41,17 +40,6 @@ describe('accessibilitySettingsService', () => {
     );
   });
 
-  describe('getALlAccessibilitySettingsKeys', () => {
-    it('should return an array containing all accessibility setting names', () => {
-      const settingNames: AccessibilitySetting[] = [
-        AccessibilitySetting.NotificationTimeOut,
-        AccessibilitySetting.LiveRegionTimeOut,
-      ];
-
-      expect(service.getAllAccessibilitySettingKeys()).toEqual(settingNames);
-    });
-  });
-
   describe('get', () => {
     it('should return the setting if it is set', () => {
       const settings: AccessibilitySettings = {
@@ -60,7 +48,7 @@ describe('accessibilitySettingsService', () => {
 
       service.getAll = jasmine.createSpy('getAll').and.returnValue(of(settings));
 
-      service.get(AccessibilitySetting.NotificationTimeOut, 'default').subscribe(value =>
+      service.get('notificationTimeOut', 'default').subscribe(value =>
         expect(value).toEqual('1000')
       );
     });
@@ -72,7 +60,7 @@ describe('accessibilitySettingsService', () => {
 
       service.getAll = jasmine.createSpy('getAll').and.returnValue(of(settings));
 
-      service.get(AccessibilitySetting.LiveRegionTimeOut, 'default').subscribe(value =>
+      service.get('liveRegionTimeOut', 'default').subscribe(value =>
         expect(value).toEqual('default')
       );
     });
@@ -82,7 +70,7 @@ describe('accessibilitySettingsService', () => {
     it('should return the setting as number if the value for the setting can be parsed to a number', () => {
       service.get = jasmine.createSpy('get').and.returnValue(of('1000'));
 
-      service.getAsNumber(AccessibilitySetting.NotificationTimeOut).subscribe(value =>
+      service.getAsNumber('notificationTimeOut').subscribe(value =>
         expect(value).toEqual(1000)
       );
     });
@@ -90,7 +78,7 @@ describe('accessibilitySettingsService', () => {
     it('should return the default value if no value is set for the setting', () => {
       service.get = jasmine.createSpy('get').and.returnValue(of(null));
 
-      service.getAsNumber(AccessibilitySetting.NotificationTimeOut, 123).subscribe(value =>
+      service.getAsNumber('notificationTimeOut', 123).subscribe(value =>
         expect(value).toEqual(123)
       );
     });
@@ -98,7 +86,7 @@ describe('accessibilitySettingsService', () => {
     it('should return the default value if the value for the setting can not be parsed to a number', () => {
       service.get = jasmine.createSpy('get').and.returnValue(of('text'));
 
-      service.getAsNumber(AccessibilitySetting.NotificationTimeOut, 123).subscribe(value =>
+      service.getAsNumber('notificationTimeOut', 123).subscribe(value =>
         expect(value).toEqual(123)
       );
     });
@@ -176,7 +164,7 @@ describe('accessibilitySettingsService', () => {
     it('should correctly update the chosen setting', () => {
       service.updateSettings = jasmine.createSpy('updateSettings');
 
-      service.set(AccessibilitySetting.LiveRegionTimeOut, '500');
+      service.set('liveRegionTimeOut', '500');
       expect(service.updateSettings).toHaveBeenCalledWith({ liveRegionTimeOut: '500' });
     });
   });
@@ -307,7 +295,7 @@ describe('accessibilitySettingsService', () => {
     });
 
     it('should set the settings in metadata', () => {
-      service.setSettingsInMetadata(ePerson, { [AccessibilitySetting.LiveRegionTimeOut]: '500' }).subscribe();
+      service.setSettingsInMetadata(ePerson, { ['liveRegionTimeOut']: '500' }).subscribe();
       expect(ePerson.setMetadata).toHaveBeenCalled();
     });
 
@@ -318,19 +306,19 @@ describe('accessibilitySettingsService', () => {
     });
 
     it('should create a patch with the metadata changes', () => {
-      service.setSettingsInMetadata(ePerson, { [AccessibilitySetting.LiveRegionTimeOut]: '500' }).subscribe();
+      service.setSettingsInMetadata(ePerson, { ['liveRegionTimeOut']: '500' }).subscribe();
       expect(ePersonService.createPatchFromCache).toHaveBeenCalled();
     });
 
     it('should send the patch request', () => {
-      service.setSettingsInMetadata(ePerson, { [AccessibilitySetting.LiveRegionTimeOut]: '500' }).subscribe();
+      service.setSettingsInMetadata(ePerson, { ['liveRegionTimeOut']: '500' }).subscribe();
       expect(ePersonService.patch).toHaveBeenCalled();
     });
 
     it('should emit true when the update succeeded', fakeAsync(() => {
       ePersonService.patch = jasmine.createSpy().and.returnValue(createSuccessfulRemoteDataObject$({}));
 
-      service.setSettingsInMetadata(ePerson, { [AccessibilitySetting.LiveRegionTimeOut]: '500' })
+      service.setSettingsInMetadata(ePerson, { ['liveRegionTimeOut']: '500' })
         .subscribe(value => {
         expect(value).toBeTrue();
       });
@@ -341,7 +329,7 @@ describe('accessibilitySettingsService', () => {
     it('should emit false when the update failed', fakeAsync(() => {
       ePersonService.patch = jasmine.createSpy().and.returnValue(createFailedRemoteDataObject$());
 
-      service.setSettingsInMetadata(ePerson, { [AccessibilitySetting.LiveRegionTimeOut]: '500' })
+      service.setSettingsInMetadata(ePerson, { ['liveRegionTimeOut']: '500' })
         .subscribe(value => {
         expect(value).toBeFalse();
       });
@@ -357,7 +345,7 @@ describe('accessibilitySettingsService', () => {
     });
 
     it('should store the settings in a cookie', () => {
-      service.setSettingsInCookie({ [AccessibilitySetting.LiveRegionTimeOut]: '500' });
+      service.setSettingsInCookie({ ['liveRegionTimeOut']: '500' });
       expect(cookieService.set).toHaveBeenCalled();
     });
 
diff --git a/src/app/accessibility/accessibility-settings.service.ts b/src/app/accessibility/accessibility-settings.service.ts
index f2151675391..e9e41954c7c 100644
--- a/src/app/accessibility/accessibility-settings.service.ts
+++ b/src/app/accessibility/accessibility-settings.service.ts
@@ -22,19 +22,21 @@ export const ACCESSIBILITY_COOKIE = 'dsAccessibilityCookie';
 export const ACCESSIBILITY_SETTINGS_METADATA_KEY = 'dspace.accessibility.settings';
 
 /**
- * Enum containing all possible accessibility settings.
- * When adding new settings, make sure to add the new setting to the accessibility-settings component.
+ * Type containing all possible accessibility settings.
+ * When adding new settings, make sure to add the new setting to the accessibility-settings component form.
  * The converter methods to convert from stored format to form format (and vice-versa) need to be updated as well.
  */
-export enum AccessibilitySetting {
-  NotificationTimeOut = 'notificationTimeOut',
-  LiveRegionTimeOut = 'liveRegionTimeOut',
-}
+export type AccessibilitySetting = 'notificationTimeOut' | 'liveRegionTimeOut';
 
 /**
- * Type representing an object that contains accessibility settings values.
+ * Type representing an object that contains accessibility settings values for all accessibility settings.
  */
-export type AccessibilitySettings = { [key in AccessibilitySetting]?: string };
+export type FullAccessibilitySettings = { [key in AccessibilitySetting]: string };
+
+/**
+ * Type representing an object that contains accessibility settings values for some accessibility settings.
+ */
+export type AccessibilitySettings = Partial<FullAccessibilitySettings>;
 
 /**
  * The accessibility settings object format used by the accessibility-settings component form.
@@ -63,10 +65,6 @@ export class AccessibilitySettingsService {
   ) {
   }
 
-  getAllAccessibilitySettingKeys(): AccessibilitySetting[] {
-    return Object.entries(AccessibilitySetting).map(([_, val]) => val);
-  }
-
   /**
    * Get the stored value for the provided {@link AccessibilitySetting}. If the value does not exist or if it is empty,
    * the provided defaultValue is emitted instead.
@@ -238,9 +236,9 @@ export class AccessibilitySettingsService {
    */
   getPlaceholder(setting: AccessibilitySetting): string {
     switch (setting) {
-      case AccessibilitySetting.NotificationTimeOut:
+      case 'notificationTimeOut':
         return millisecondsToSeconds(environment.notifications.timeOut.toString());
-      case AccessibilitySetting.LiveRegionTimeOut:
+      case 'liveRegionTimeOut':
         return millisecondsToSeconds(environment.liveRegion.messageTimeOutDurationMs.toString());
       default:
         return '';
@@ -250,11 +248,11 @@ export class AccessibilitySettingsService {
   /**
    * Convert values in the provided accessibility settings object to values ready to be stored.
    */
-  convertFormValuesToStoredValues(settings: AccessibilitySettingsFormValues): AccessibilitySettings {
+  convertFormValuesToStoredValues(settings: AccessibilitySettingsFormValues): FullAccessibilitySettings {
     return {
-      'notificationTimeOut': settings.disableNotificationTimeOut ? '0'
+      notificationTimeOut: settings.disableNotificationTimeOut ? '0'
         : secondsToMilliseconds(settings.notificationTimeOut),
-      'liveRegionTimeOut': secondsToMilliseconds(settings.liveRegionTimeOut),
+      liveRegionTimeOut: secondsToMilliseconds(settings.liveRegionTimeOut),
     };
   }
 
@@ -271,6 +269,10 @@ export class AccessibilitySettingsService {
 
 }
 
+/**
+ * Converts a string representing seconds to a string representing milliseconds
+ * Returns null if the input could not be parsed to a float
+ */
 function secondsToMilliseconds(secondsStr: string): string {
   const seconds = parseFloat(secondsStr);
   if (isNaN(seconds)) {
@@ -280,6 +282,10 @@ function secondsToMilliseconds(secondsStr: string): string {
   }
 }
 
+/**
+ * Converts a string representing milliseconds to a string representing seconds
+ * Returns null if the input could not be parsed to a float
+ */
 function millisecondsToSeconds(millisecondsStr: string): string {
   const milliseconds = parseFloat(millisecondsStr);
   if (isNaN(milliseconds)) {
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.html b/src/app/info/accessibility-settings/accessibility-settings.component.html
index d247b12f949..5a5493f0bea 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.html
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.html
@@ -30,7 +30,7 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
 
       <div class="col-sm-4">
         <input [type]="'number'" [id]="'notificationTimeOutInput'" class="form-control"
-               [placeholder]="getPlaceholder(AccessibilitySetting.NotificationTimeOut)"
+               [placeholder]="getPlaceholder('notificationTimeOut')"
                [readOnly]="formValues.disableNotificationTimeOut"
                [(ngModel)]="formValues.notificationTimeOut" [ngModelOptions]="{ standalone: true }"
                [attr.aria-describedby]="'notificationTimeOutHint'">
@@ -56,7 +56,7 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
 
       <div class="col-sm-4">
         <input [type]="'number'" [id]="'liveRegionTimeOutInput'" class="form-control"
-               [placeholder]="getPlaceholder(AccessibilitySetting.LiveRegionTimeOut)"
+               [placeholder]="getPlaceholder('liveRegionTimeOut')"
                [(ngModel)]="formValues.liveRegionTimeOut" [ngModelOptions]="{ standalone: true }"
                [attr.aria-describedby]="'liveRegionTimeOutHint'">
       </div>
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.ts b/src/app/info/accessibility-settings/accessibility-settings.component.ts
index cd417393d44..d537c363c3f 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.ts
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.ts
@@ -18,9 +18,6 @@ import { TranslateService } from '@ngx-translate/core';
 })
 export class AccessibilitySettingsComponent implements OnInit {
 
-  // Re-export for use in template
-  protected readonly AccessibilitySetting = AccessibilitySetting;
-
   protected formValues: AccessibilitySettingsFormValues;
 
   constructor(
diff --git a/src/app/shared/live-region/live-region.service.ts b/src/app/shared/live-region/live-region.service.ts
index 7a7b99fa6e7..37f58a2795d 100644
--- a/src/app/shared/live-region/live-region.service.ts
+++ b/src/app/shared/live-region/live-region.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { BehaviorSubject, map, Observable, switchMap, take, timer } from 'rxjs';
 import { environment } from '../../../environments/environment';
 import { UUIDService } from '../../core/shared/uuid.service';
-import { AccessibilitySettingsService, AccessibilitySetting } from '../../accessibility/accessibility-settings.service';
+import { AccessibilitySettingsService } from '../../accessibility/accessibility-settings.service';
 
 export const MIN_MESSAGE_DURATION = 200;
 
@@ -130,7 +130,7 @@ export class LiveRegionService {
    */
   getConfiguredMessageTimeOutMs(): Observable<number> {
     return this.accessibilitySettingsService.getAsNumber(
-      AccessibilitySetting.LiveRegionTimeOut,
+      'liveRegionTimeOut',
       this.getMessageTimeOutMs(),
     ).pipe(map(timeOut => Math.max(timeOut, MIN_MESSAGE_DURATION)));
   }
diff --git a/src/app/shared/notifications/notifications-board/notifications-board.component.ts b/src/app/shared/notifications/notifications-board/notifications-board.component.ts
index 8439a1af16d..96319416268 100644
--- a/src/app/shared/notifications/notifications-board/notifications-board.component.ts
+++ b/src/app/shared/notifications/notifications-board/notifications-board.component.ts
@@ -18,8 +18,7 @@ import { INotification } from '../models/notification.model';
 import { NotificationsState } from '../notifications.reducers';
 import { INotificationBoardOptions } from '../../../../config/notifications-config.interfaces';
 import {
-  AccessibilitySettingsService,
-  AccessibilitySetting
+  AccessibilitySettingsService
 } from '../../../accessibility/accessibility-settings.service';
 import cloneDeep from 'lodash/cloneDeep';
 import differenceWith from 'lodash/differenceWith';
@@ -98,7 +97,7 @@ export class NotificationsBoardComponent implements OnInit, OnDestroy {
 
       // It would be a bit better to handle the retrieval of configured settings in the NotificationsService.
       // Due to circular dependencies this is difficult to implement.
-      this.accessibilitySettingsService.getAsNumber(AccessibilitySetting.NotificationTimeOut, item.options.timeOut)
+      this.accessibilitySettingsService.getAsNumber('notificationTimeOut', item.options.timeOut)
         .pipe(take(1)).subscribe(timeOut => {
           if (timeOut < 0) {
             timeOut = 0;

From c71c6667e03cae24b718803363e71b91e83b0c8c Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 11 Dec 2024 10:10:16 +0100
Subject: [PATCH 26/41] 119602: Improve notification hiding toggle useability

---
 src/app/accessibility/accessibility-settings.service.ts   | 8 ++++----
 .../accessibility-settings.component.html                 | 4 ++--
 src/assets/i18n/en.json5                                  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/accessibility/accessibility-settings.service.ts b/src/app/accessibility/accessibility-settings.service.ts
index e9e41954c7c..813bccd4706 100644
--- a/src/app/accessibility/accessibility-settings.service.ts
+++ b/src/app/accessibility/accessibility-settings.service.ts
@@ -42,7 +42,7 @@ export type AccessibilitySettings = Partial<FullAccessibilitySettings>;
  * The accessibility settings object format used by the accessibility-settings component form.
  */
 export interface AccessibilitySettingsFormValues {
-  disableNotificationTimeOut: boolean,
+  notificationTimeOutEnabled: boolean,
   notificationTimeOut: string,
   liveRegionTimeOut: string,
 }
@@ -250,8 +250,8 @@ export class AccessibilitySettingsService {
    */
   convertFormValuesToStoredValues(settings: AccessibilitySettingsFormValues): FullAccessibilitySettings {
     return {
-      notificationTimeOut: settings.disableNotificationTimeOut ? '0'
-        : secondsToMilliseconds(settings.notificationTimeOut),
+      notificationTimeOut: settings.notificationTimeOutEnabled ?
+        secondsToMilliseconds(settings.notificationTimeOut) : '0',
       liveRegionTimeOut: secondsToMilliseconds(settings.liveRegionTimeOut),
     };
   }
@@ -261,7 +261,7 @@ export class AccessibilitySettingsService {
    */
   convertStoredValuesToFormValues(settings: AccessibilitySettings): AccessibilitySettingsFormValues {
     return {
-      disableNotificationTimeOut: parseFloat(settings.notificationTimeOut) === 0,
+      notificationTimeOutEnabled: parseFloat(settings.notificationTimeOut) !== 0,
       notificationTimeOut: millisecondsToSeconds(settings.notificationTimeOut),
       liveRegionTimeOut: millisecondsToSeconds(settings.liveRegionTimeOut),
     };
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.html b/src/app/info/accessibility-settings/accessibility-settings.component.html
index 5a5493f0bea..cacfae61fce 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.html
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.html
@@ -9,7 +9,7 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
 
       <div class="col-sm-5">
         <ui-switch [id]="'disableNotificationTimeOutInput'"
-                   [(ngModel)]="formValues.disableNotificationTimeOut"
+                   [(ngModel)]="formValues.notificationTimeOutEnabled"
                    [ngModelOptions]="{ standalone: true }"
         ></ui-switch>
       </div>
@@ -31,7 +31,7 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
       <div class="col-sm-4">
         <input [type]="'number'" [id]="'notificationTimeOutInput'" class="form-control"
                [placeholder]="getPlaceholder('notificationTimeOut')"
-               [readOnly]="formValues.disableNotificationTimeOut"
+               [readOnly]="!formValues.notificationTimeOutEnabled"
                [(ngModel)]="formValues.notificationTimeOut" [ngModelOptions]="{ standalone: true }"
                [attr.aria-describedby]="'notificationTimeOutHint'">
       </div>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 54286d60744..94126bbc168 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1844,7 +1844,7 @@
 
   "info.accessibility-settings.breadcrumbs": "Accessibility settings",
 
-  "info.accessibility-settings.disableNotificationTimeOut.label": "Disable automatic notification hiding",
+  "info.accessibility-settings.disableNotificationTimeOut.label": "Hide notifications automatically",
 
   "info.accessibility-settings.disableNotificationTimeOut.hint": "When this toggle is activated, notifications will remain until manually closed.",
 

From b55a3186763e863033e567043530782c1bea71da Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 22 Jan 2025 15:47:13 +0100
Subject: [PATCH 27/41] 119602: Reset notificationTimeOut when left on 0

---
 .../accessibility-settings.service.spec.ts    | 25 ++++++++++++++++++-
 .../accessibility-settings.service.ts         | 11 +++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/app/accessibility/accessibility-settings.service.spec.ts b/src/app/accessibility/accessibility-settings.service.spec.ts
index 3d58c02d109..4c720634944 100644
--- a/src/app/accessibility/accessibility-settings.service.spec.ts
+++ b/src/app/accessibility/accessibility-settings.service.spec.ts
@@ -2,7 +2,7 @@ import {
   AccessibilitySettingsService,
   AccessibilitySettings,
   ACCESSIBILITY_SETTINGS_METADATA_KEY,
-  ACCESSIBILITY_COOKIE
+  ACCESSIBILITY_COOKIE, AccessibilitySettingsFormValues, FullAccessibilitySettings
 } from './accessibility-settings.service';
 import { CookieService } from '../core/services/cookie.service';
 import { AuthService } from '../core/auth/auth.service';
@@ -356,4 +356,27 @@ describe('accessibilitySettingsService', () => {
     });
   });
 
+  describe('convertFormValuesToStoredValues', () => {
+    it('should reset the notificationTimeOut when timeOut is enabled but set to "0"', () => {
+      const formValues: AccessibilitySettingsFormValues = {
+        notificationTimeOutEnabled: true,
+        notificationTimeOut: '0',
+        liveRegionTimeOut: null,
+      };
+
+      const storedValues: FullAccessibilitySettings = service.convertFormValuesToStoredValues(formValues);
+      expect('notificationTimeOut' in storedValues).toBeFalse();
+    });
+  });
+
+  it('should keep the notificationTimeOut when timeOut is enabled and differs from "0"', () => {
+    const formValues: AccessibilitySettingsFormValues = {
+      notificationTimeOutEnabled: true,
+      notificationTimeOut: '3',
+      liveRegionTimeOut: null,
+    };
+
+    const storedValues: FullAccessibilitySettings = service.convertFormValuesToStoredValues(formValues);
+    expect('notificationTimeOut' in storedValues).toBeTrue();
+  });
 });
diff --git a/src/app/accessibility/accessibility-settings.service.ts b/src/app/accessibility/accessibility-settings.service.ts
index 813bccd4706..fc8876619d3 100644
--- a/src/app/accessibility/accessibility-settings.service.ts
+++ b/src/app/accessibility/accessibility-settings.service.ts
@@ -249,11 +249,20 @@ export class AccessibilitySettingsService {
    * Convert values in the provided accessibility settings object to values ready to be stored.
    */
   convertFormValuesToStoredValues(settings: AccessibilitySettingsFormValues): FullAccessibilitySettings {
-    return {
+    const storedValues = {
       notificationTimeOut: settings.notificationTimeOutEnabled ?
         secondsToMilliseconds(settings.notificationTimeOut) : '0',
       liveRegionTimeOut: secondsToMilliseconds(settings.liveRegionTimeOut),
     };
+
+    // When the user enables the timeout but does not change the timeout duration from 0,
+    // it is removed from the values to be stored so the default value is used.
+    // Keeping it at 0 would mean the notifications are not automatically removed.
+    if (settings.notificationTimeOutEnabled && settings.notificationTimeOut === '0') {
+      delete storedValues.notificationTimeOut;
+    }
+
+    return storedValues;
   }
 
   /**

From 59cb19ae80ecad76dec655df950f9ac8fffc3e7e Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 7 Feb 2025 14:54:24 +0100
Subject: [PATCH 28/41] 119602: Restructure labels

---
 .../accessibility-settings.component.html          | 14 ++++----------
 src/assets/i18n/en.json5                           | 14 +++++---------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.html b/src/app/info/accessibility-settings/accessibility-settings.component.html
index cacfae61fce..b0d14f99b78 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.html
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.html
@@ -3,11 +3,11 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
 
   <form>
     <div class="form-group row">
-      <label [for]="'disableNotificationTimeOutInput'" class="col-sm-2 col-form-label">
+      <label [for]="'disableNotificationTimeOutInput'" class="col-sm-4 col-form-label">
         {{ 'info.accessibility-settings.disableNotificationTimeOut.label' | translate }}
       </label>
 
-      <div class="col-sm-5">
+      <div class="col-sm-4">
         <ui-switch [id]="'disableNotificationTimeOutInput'"
                    [(ngModel)]="formValues.notificationTimeOutEnabled"
                    [ngModelOptions]="{ standalone: true }"
@@ -24,7 +24,7 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
     </div>
 
     <div class="form-group row">
-      <label [for]="'notificationTimeOutInput'" class="col-sm-2 col-form-label">
+      <label [for]="'notificationTimeOutInput'" class="col-sm-4 col-form-label">
         {{ 'info.accessibility-settings.notificationTimeOut.label' | translate }}
       </label>
 
@@ -36,9 +36,6 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
                [attr.aria-describedby]="'notificationTimeOutHint'">
       </div>
 
-      <div class="col-sm-1 col-form-label">
-        {{ 'info.accessibility-settings.notificationTimeOut.unit' | translate }}
-      </div>
 
       <div class="col-sm-1" *dsContextHelp="{
             content: 'info.accessibility-settings.notificationTimeOut.hint',
@@ -50,7 +47,7 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
     </div>
 
     <div class="form-group row">
-      <label [for]="'liveRegionTimeOutInput'" class="col-sm-2 col-form-label">
+      <label [for]="'liveRegionTimeOutInput'" class="col-sm-4 col-form-label">
         {{ 'info.accessibility-settings.liveRegionTimeOut.label' | translate }}
       </label>
 
@@ -61,9 +58,6 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
                [attr.aria-describedby]="'liveRegionTimeOutHint'">
       </div>
 
-      <div class="col-sm-1 col-form-label">
-        {{ 'info.accessibility-settings.liveRegionTimeOut.unit' | translate }}
-      </div>
 
       <div class="col-sm-1" *dsContextHelp="{
             content: 'info.accessibility-settings.liveRegionTimeOut.hint',
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 94126bbc168..d0f95248102 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1844,22 +1844,18 @@
 
   "info.accessibility-settings.breadcrumbs": "Accessibility settings",
 
-  "info.accessibility-settings.disableNotificationTimeOut.label": "Hide notifications automatically",
+  "info.accessibility-settings.disableNotificationTimeOut.label": "Automatically close notifications after time out",
 
-  "info.accessibility-settings.disableNotificationTimeOut.hint": "When this toggle is activated, notifications will remain until manually closed.",
+  "info.accessibility-settings.disableNotificationTimeOut.hint": "When this toggle is activated, notifications will close automatically after the time out passes. When deactivated, notifications will remain open untill manually closed.",
 
-  "info.accessibility-settings.liveRegionTimeOut.label": "Live region time-out",
+  "info.accessibility-settings.liveRegionTimeOut.label": "ARIA Live region time out (in seconds)",
 
-  "info.accessibility-settings.liveRegionTimeOut.hint": "The duration after which a message in the live region disappears.",
+  "info.accessibility-settings.liveRegionTimeOut.hint": "The duration after which a message in the ARIA live region disappears. ARIA live regions are not visible on the page, but proivde announcements of notifications (or other actions) to screen readers.",
 
-  "info.accessibility-settings.liveRegionTimeOut.unit": "Seconds",
-
-  "info.accessibility-settings.notificationTimeOut.label": "Notification time-out",
+  "info.accessibility-settings.notificationTimeOut.label": "Notification time out (in seconds)",
 
   "info.accessibility-settings.notificationTimeOut.hint": "The duration after which a notification disappears.",
 
-  "info.accessibility-settings.notificationTimeOut.unit": "Seconds",
-
   "info.accessibility-settings.save-notification.cookie": "Successfully saved settings locally.",
 
   "info.accessibility-settings.save-notification.metadata": "Successfully saved settings on the user profile.",

From 80948d98f06138467f5f8d17bdb5b2027ef416c2 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Mon, 10 Feb 2025 16:01:26 +0100
Subject: [PATCH 29/41] 119602: Force minimum time out

---
 .../accessibility-settings.service.stub.ts    |  4 ++++
 .../accessibility-settings.service.ts         | 22 ++++++++++++++++++-
 .../accessibility-settings.component.html     | 10 +++++++++
 .../accessibility-settings.component.ts       | 16 ++++++++++----
 src/assets/i18n/en.json5                      |  6 +++++
 5 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/src/app/accessibility/accessibility-settings.service.stub.ts b/src/app/accessibility/accessibility-settings.service.stub.ts
index 4ac965059e6..5b19d74fa61 100644
--- a/src/app/accessibility/accessibility-settings.service.stub.ts
+++ b/src/app/accessibility/accessibility-settings.service.stub.ts
@@ -37,4 +37,8 @@ export class AccessibilitySettingsServiceStub {
   convertStoredValuesToFormValues = jasmine.createSpy('convertStoredValuesToFormValues').and.returnValue({});
 
   getPlaceholder = jasmine.createSpy('getPlaceholder').and.returnValue('placeholder');
+
+  isValid = jasmine.createSpy('isValid').and.returnValue(true);
+
+  allValid = jasmine.createSpy('allValid').and.returnValue(true);
 }
diff --git a/src/app/accessibility/accessibility-settings.service.ts b/src/app/accessibility/accessibility-settings.service.ts
index fc8876619d3..55f357f255f 100644
--- a/src/app/accessibility/accessibility-settings.service.ts
+++ b/src/app/accessibility/accessibility-settings.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { Observable, of, switchMap } from 'rxjs';
 import { map, take } from 'rxjs/operators';
 import { CookieService } from '../core/services/cookie.service';
-import { hasValue, isNotEmpty } from '../shared/empty.util';
+import { hasValue, isNotEmpty, hasNoValue } from '../shared/empty.util';
 import { AuthService } from '../core/auth/auth.service';
 import { EPerson } from '../core/eperson/models/eperson.model';
 import { EPersonDataService } from '../core/eperson/eperson-data.service';
@@ -276,6 +276,26 @@ export class AccessibilitySettingsService {
     };
   }
 
+  /**
+   * Returns true if the provided value is a valid value for the provided AccessibilitySetting.
+   */
+  isValid(setting: AccessibilitySetting | string, value: string): boolean {
+    switch (setting) {
+      case 'notificationTimeOut':
+        return hasNoValue(value) || parseFloat(value) > 0;
+      case 'liveRegionTimeOut':
+        return hasNoValue(value) || parseFloat(value) > 0;
+      default:
+        throw new Error(`Unhandled accessibility setting during validity check: ${setting}`);
+    }
+  }
+
+  /**
+   * Returns true if all settings in the provided AccessibilitySettings object are valid
+   */
+  allValid(settings: AccessibilitySettings) {
+    return Object.entries(settings).every(([setting, value], _) => this.isValid(setting, value));
+  }
 }
 
 /**
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.html b/src/app/info/accessibility-settings/accessibility-settings.component.html
index b0d14f99b78..2372a8e2e2c 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.html
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.html
@@ -30,10 +30,15 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
 
       <div class="col-sm-4">
         <input [type]="'number'" [id]="'notificationTimeOutInput'" class="form-control"
+               [ngClass]="{'is-invalid': !settingsService.isValid('notificationTimeOut', formValues.notificationTimeOut)}"
+               [min]="1"
                [placeholder]="getPlaceholder('notificationTimeOut')"
                [readOnly]="!formValues.notificationTimeOutEnabled"
                [(ngModel)]="formValues.notificationTimeOut" [ngModelOptions]="{ standalone: true }"
                [attr.aria-describedby]="'notificationTimeOutHint'">
+        <div class="invalid-feedback" [ngClass]="{ 'd-block': !settingsService.isValid('notificationTimeOut', formValues.notificationTimeOut) }">
+          {{ 'info.accessibility-settings.notificationTimeOut.invalid' | translate }}
+        </div>
       </div>
 
 
@@ -53,9 +58,14 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
 
       <div class="col-sm-4">
         <input [type]="'number'" [id]="'liveRegionTimeOutInput'" class="form-control"
+               [ngClass]="{'is-invalid': !settingsService.isValid('liveRegionTimeOut', formValues.liveRegionTimeOut)}"
+               [min]="1"
                [placeholder]="getPlaceholder('liveRegionTimeOut')"
                [(ngModel)]="formValues.liveRegionTimeOut" [ngModelOptions]="{ standalone: true }"
                [attr.aria-describedby]="'liveRegionTimeOutHint'">
+        <div class="invalid-feedback" [ngClass]="{ 'd-block': !settingsService.isValid('liveRegionTimeOut', formValues.liveRegionTimeOut) }">
+          {{ 'info.accessibility-settings.liveRegionTimeOut.invalid' | translate }}
+        </div>
       </div>
 
 
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.ts b/src/app/info/accessibility-settings/accessibility-settings.component.ts
index d537c363c3f..ecdbb543bbd 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.ts
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.ts
@@ -42,10 +42,18 @@ export class AccessibilitySettingsComponent implements OnInit {
   saveSettings() {
     const formValues = this.formValues;
     const convertedValues = this.settingsService.convertFormValuesToStoredValues(formValues);
-    this.settingsService.setSettings(convertedValues).pipe(take(1)).subscribe(location => {
-      this.notificationsService.success(null, this.translateService.instant('info.accessibility-settings.save-notification.' + location));
-      this.updateFormValues();
-    });
+
+    if (this.settingsService.allValid(convertedValues)) {
+      this.settingsService.setSettings(convertedValues).pipe(take(1)).subscribe(location => {
+        this.notificationsService.success(null, this.translateService.instant('info.accessibility-settings.save-notification.' + location));
+        this.updateFormValues();
+      });
+    } else {
+      this.notificationsService.error(
+        null,
+        this.translateService.instant('info.accessibility-settings.invalid-form-notification'),
+      );
+    }
   }
 
   /**
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index d0f95248102..c1822fce335 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1848,14 +1848,20 @@
 
   "info.accessibility-settings.disableNotificationTimeOut.hint": "When this toggle is activated, notifications will close automatically after the time out passes. When deactivated, notifications will remain open untill manually closed.",
 
+  "info.accessibility-settings.invalid-form-notification": "Did not save. The form contains invalid values.",
+
   "info.accessibility-settings.liveRegionTimeOut.label": "ARIA Live region time out (in seconds)",
 
   "info.accessibility-settings.liveRegionTimeOut.hint": "The duration after which a message in the ARIA live region disappears. ARIA live regions are not visible on the page, but proivde announcements of notifications (or other actions) to screen readers.",
 
+  "info.accessibility-settings.liveRegionTimeOut.invalid": "Live region time out must be greater than 0",
+
   "info.accessibility-settings.notificationTimeOut.label": "Notification time out (in seconds)",
 
   "info.accessibility-settings.notificationTimeOut.hint": "The duration after which a notification disappears.",
 
+  "info.accessibility-settings.notificationTimeOut.invalid": "Notification time out must be greater than 0",
+
   "info.accessibility-settings.save-notification.cookie": "Successfully saved settings locally.",
 
   "info.accessibility-settings.save-notification.metadata": "Successfully saved settings on the user profile.",

From e8388732355b59f3ae5e3d869f4ebe9e8e5ff3da Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Mon, 17 Feb 2025 11:41:38 +0100
Subject: [PATCH 30/41] 119602: Set default value as actual value instead of
 placeholder

---
 .../accessibility-settings.service.stub.ts    |  2 +-
 .../accessibility-settings.service.ts         |  6 +++---
 .../accessibility-settings.component.html     |  4 +---
 .../accessibility-settings.component.ts       | 21 +++++++++++++------
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/app/accessibility/accessibility-settings.service.stub.ts b/src/app/accessibility/accessibility-settings.service.stub.ts
index 5b19d74fa61..80b7de1fa3c 100644
--- a/src/app/accessibility/accessibility-settings.service.stub.ts
+++ b/src/app/accessibility/accessibility-settings.service.stub.ts
@@ -36,7 +36,7 @@ export class AccessibilitySettingsServiceStub {
 
   convertStoredValuesToFormValues = jasmine.createSpy('convertStoredValuesToFormValues').and.returnValue({});
 
-  getPlaceholder = jasmine.createSpy('getPlaceholder').and.returnValue('placeholder');
+  getDefaultValue = jasmine.createSpy('getPlaceholder').and.returnValue('placeholder');
 
   isValid = jasmine.createSpy('isValid').and.returnValue(true);
 
diff --git a/src/app/accessibility/accessibility-settings.service.ts b/src/app/accessibility/accessibility-settings.service.ts
index 55f357f255f..2a94179aba1 100644
--- a/src/app/accessibility/accessibility-settings.service.ts
+++ b/src/app/accessibility/accessibility-settings.service.ts
@@ -231,10 +231,10 @@ export class AccessibilitySettingsService {
   }
 
   /**
-   * Retrieve the placeholder to be used for the provided AccessibilitySetting.
-   * Returns an empty string when no placeholder is specified for the provided setting.
+   * Retrieve the default value to be used for the provided AccessibilitySetting.
+   * Returns an empty string when no default value is specified for the provided setting.
    */
-  getPlaceholder(setting: AccessibilitySetting): string {
+  getDefaultValue(setting: AccessibilitySetting): string {
     switch (setting) {
       case 'notificationTimeOut':
         return millisecondsToSeconds(environment.notifications.timeOut.toString());
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.html b/src/app/info/accessibility-settings/accessibility-settings.component.html
index 2372a8e2e2c..75d1863d5e1 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.html
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.html
@@ -32,7 +32,6 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
         <input [type]="'number'" [id]="'notificationTimeOutInput'" class="form-control"
                [ngClass]="{'is-invalid': !settingsService.isValid('notificationTimeOut', formValues.notificationTimeOut)}"
                [min]="1"
-               [placeholder]="getPlaceholder('notificationTimeOut')"
                [readOnly]="!formValues.notificationTimeOutEnabled"
                [(ngModel)]="formValues.notificationTimeOut" [ngModelOptions]="{ standalone: true }"
                [attr.aria-describedby]="'notificationTimeOutHint'">
@@ -60,7 +59,6 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
         <input [type]="'number'" [id]="'liveRegionTimeOutInput'" class="form-control"
                [ngClass]="{'is-invalid': !settingsService.isValid('liveRegionTimeOut', formValues.liveRegionTimeOut)}"
                [min]="1"
-               [placeholder]="getPlaceholder('liveRegionTimeOut')"
                [(ngModel)]="formValues.liveRegionTimeOut" [ngModelOptions]="{ standalone: true }"
                [attr.aria-describedby]="'liveRegionTimeOutHint'">
         <div class="invalid-feedback" [ngClass]="{ 'd-block': !settingsService.isValid('liveRegionTimeOut', formValues.liveRegionTimeOut) }">
@@ -82,7 +80,7 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
       <button type="submit" (click)="saveSettings()" class="btn btn-primary mr-2">
         {{ 'info.accessibility-settings.submit' | translate }}
       </button>
-      <button type="reset" (click)="resetSettings()" class="btn btn-warning">
+      <button (click)="resetSettings()" class="btn btn-warning">
         {{ 'info.accessibility-settings.reset' | translate }}
       </button>
     </div>
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.ts b/src/app/info/accessibility-settings/accessibility-settings.component.ts
index ecdbb543bbd..fc08862fcf6 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.ts
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.ts
@@ -8,6 +8,7 @@ import {
 import { take } from 'rxjs';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
+import { isEmpty } from 'src/app/shared/empty.util';
 
 /**
  * Component providing the form where users can update accessibility settings.
@@ -32,10 +33,6 @@ export class AccessibilitySettingsComponent implements OnInit {
     this.updateFormValues();
   }
 
-  getPlaceholder(setting: AccessibilitySetting): string {
-    return this.settingsService.getPlaceholder(setting);
-  }
-
   /**
    * Saves the user-configured settings
    */
@@ -57,11 +54,23 @@ export class AccessibilitySettingsComponent implements OnInit {
   }
 
   /**
-   * Updates the form values with the currently stored accessibility settings
+   * Updates the form values with the currently stored accessibility settings and sets the default values for settings
+   * that have no stored value.
    */
   updateFormValues() {
     this.settingsService.getAll().pipe(take(1)).subscribe(storedSettings => {
-      this.formValues = this.settingsService.convertStoredValuesToFormValues(storedSettings);
+      const formValues = this.settingsService.convertStoredValuesToFormValues(storedSettings);
+
+      const settingsRequiringDefaultValue: AccessibilitySetting[] = ['notificationTimeOut', 'liveRegionTimeOut'];
+
+      for (const setting of settingsRequiringDefaultValue) {
+        if (isEmpty(formValues[setting])) {
+          const defaultValue = this.settingsService.getDefaultValue(setting);
+          formValues[setting] = defaultValue;
+        }
+      }
+
+      this.formValues = formValues;
     });
   }
 

From b837f63b7c9ccdcb1561262f7f0bd36a0a93a05c Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 18 Feb 2025 10:22:59 +0100
Subject: [PATCH 31/41] 119602: Add 'Accessibility Settings' Klaro option &
 respect user choice

---
 .../accessibility-settings.service.ts         | 79 ++++++++++++-------
 .../accessibility-settings.component.html     |  4 +
 .../accessibility-settings.component.ts       | 47 +++++++++--
 src/app/shared/cookies/klaro-configuration.ts | 10 ++-
 src/assets/i18n/en.json5                      | 10 +++
 5 files changed, 113 insertions(+), 37 deletions(-)

diff --git a/src/app/accessibility/accessibility-settings.service.ts b/src/app/accessibility/accessibility-settings.service.ts
index 2a94179aba1..b8748f0bf96 100644
--- a/src/app/accessibility/accessibility-settings.service.ts
+++ b/src/app/accessibility/accessibility-settings.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Observable, of, switchMap } from 'rxjs';
+import { Observable, of, switchMap, combineLatest } from 'rxjs';
 import { map, take } from 'rxjs/operators';
 import { CookieService } from '../core/services/cookie.service';
 import { hasValue, isNotEmpty, hasNoValue } from '../shared/empty.util';
@@ -10,6 +10,7 @@ import { getFirstCompletedRemoteData } from '../core/shared/operators';
 import cloneDeep from 'lodash/cloneDeep';
 import { environment } from '../../environments/environment';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { KlaroService } from '../shared/cookies/klaro.service';
 
 /**
  * Name of the cookie used to store the settings locally
@@ -62,6 +63,7 @@ export class AccessibilitySettingsService {
     protected cookieService: CookieService,
     protected authService: AuthService,
     protected ePersonService: EPersonDataService,
+    protected klaroService: KlaroService,
   ) {
   }
 
@@ -125,8 +127,9 @@ export class AccessibilitySettingsService {
    *
    * Returns 'cookie' when the changes were stored in the cookie.
    * Returns 'metadata' when the changes were stored in metadata.
+   * Returns 'failed' when both options failed.
    */
-  set(setting: AccessibilitySetting, value: string): Observable<'cookie' | 'metadata'> {
+  set(setting: AccessibilitySetting, value: string): Observable<'metadata' | 'cookie' | 'failed'> {
     return this.updateSettings({ [setting]: value });
   }
 
@@ -137,18 +140,15 @@ export class AccessibilitySettingsService {
    *
    * Returns 'cookie' when the changes were stored in the cookie.
    * Returns 'metadata' when the changes were stored in metadata.
+   * Returns 'failed' when both options failed.
    */
-  setSettings(settings: AccessibilitySettings): Observable<'cookie' | 'metadata'> {
+  setSettings(settings: AccessibilitySettings): Observable<'metadata' | 'cookie' | 'failed'> {
     return this.setSettingsInAuthenticatedUserMetadata(settings).pipe(
       take(1),
-      map((succeeded) => {
-        if (!succeeded) {
-          this.setSettingsInCookie(settings);
-          return 'cookie';
-        } else {
-          return 'metadata';
-        }
-      })
+      map(saveLocation => saveLocation === 'metadata'),
+      switchMap((savedInMetadata) =>
+        savedInMetadata ? ofMetadata() : this.setSettingsInCookie(settings)
+      ),
     );
   }
 
@@ -158,8 +158,9 @@ export class AccessibilitySettingsService {
    *
    * Returns 'cookie' when the changes were stored in the cookie.
    * Returns 'metadata' when the changes were stored in metadata.
+   * Returns 'failed' when both options failed.
    */
-  updateSettings(settings: AccessibilitySettings): Observable<'cookie' | 'metadata'> {
+  updateSettings(settings: AccessibilitySettings): Observable<'metadata' | 'cookie' | 'failed'> {
     return this.getAll().pipe(
       take(1),
       map(currentSettings => Object.assign({}, currentSettings, settings)),
@@ -170,9 +171,9 @@ export class AccessibilitySettingsService {
   /**
    * Attempts to set the provided settings on the currently authorized user's metadata.
    * Emits false when no user is authenticated or when the metadata update failed.
-   * Emits true when the metadata update succeeded.
+   * Emits 'metadata' when the metadata update succeeded, and 'failed' otherwise.
    */
-  setSettingsInAuthenticatedUserMetadata(settings: AccessibilitySettings): Observable<boolean> {
+  setSettingsInAuthenticatedUserMetadata(settings: AccessibilitySettings): Observable<'metadata' | 'failed'> {
     return this.authService.getAuthenticatedUserFromStoreIfAuthenticated().pipe(
       take(1),
       switchMap(user => {
@@ -181,7 +182,7 @@ export class AccessibilitySettingsService {
           const clonedUser = cloneDeep(user);
           return this.setSettingsInMetadata(clonedUser, settings);
         } else {
-          return of(false);
+          return ofFailed();
         }
       })
     );
@@ -194,7 +195,7 @@ export class AccessibilitySettingsService {
   setSettingsInMetadata(
     user: EPerson,
     settings: AccessibilitySettings,
-  ): Observable<boolean> {
+  ): Observable<'metadata' | 'failed'> {
     if (isNotEmpty(settings)) {
       user.setMetadata(ACCESSIBILITY_SETTINGS_METADATA_KEY, null, JSON.stringify(settings));
     } else {
@@ -206,28 +207,42 @@ export class AccessibilitySettingsService {
       switchMap(operations =>
         isNotEmpty(operations) ? this.ePersonService.patch(user, operations) : createSuccessfulRemoteDataObject$({})),
       getFirstCompletedRemoteData(),
-      map(rd => rd.hasSucceeded),
+      switchMap(rd => rd.hasSucceeded ? ofMetadata() : ofFailed()),
     );
   }
 
   /**
-   * Sets the provided settings in a cookie
+   * Attempts to set the provided settings in a cookie.
+   * Emits 'failed' when setting in a cookie failed due to the cookie not being accepted, 'cookie' when it succeeded.
    */
-  setSettingsInCookie(settings: AccessibilitySettings) {
-    if (isNotEmpty(settings)) {
-      this.cookieService.set(ACCESSIBILITY_COOKIE, settings, { expires: environment.accessibility.cookieExpirationDuration });
-    } else {
-      this.cookieService.remove(ACCESSIBILITY_COOKIE);
-    }
+  setSettingsInCookie(settings: AccessibilitySettings): Observable<'cookie' | 'failed'> {
+    return this.klaroService.getSavedPreferences().pipe(
+      map(preferences => preferences.accessibility),
+      map((accessibilityCookieAccepted: boolean) => {
+        if (accessibilityCookieAccepted) {
+          if (isNotEmpty(settings)) {
+            this.cookieService.set(ACCESSIBILITY_COOKIE, settings, { expires: environment.accessibility.cookieExpirationDuration });
+          } else {
+            this.cookieService.remove(ACCESSIBILITY_COOKIE);
+          }
+
+          return 'cookie';
+        } else {
+          return 'failed';
+        }
+      }),
+    );
   }
 
   /**
    * Clears all settings in the cookie and attempts to clear settings in metadata.
-   * Emits true if settings in metadata were cleared and false otherwise.
+   * Emits an array mentioning which settings succeeded or failed.
    */
-  clearSettings(): Observable<boolean> {
-    this.setSettingsInCookie({});
-    return this.setSettingsInAuthenticatedUserMetadata({});
+  clearSettings(): Observable<['cookie' | 'failed', 'metadata' | 'failed']> {
+    return combineLatest([
+      this.setSettingsInCookie({}),
+      this.setSettingsInAuthenticatedUserMetadata({}),
+    ]);
   }
 
   /**
@@ -323,3 +338,11 @@ function millisecondsToSeconds(millisecondsStr: string): string {
     return (milliseconds / 1000).toString();
   }
 }
+
+function ofMetadata(): Observable<'metadata'> {
+  return of('metadata');
+}
+
+function ofFailed(): Observable<'failed'> {
+  return of('failed');
+}
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.html b/src/app/info/accessibility-settings/accessibility-settings.component.html
index 75d1863d5e1..6a0094fc97b 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.html
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.html
@@ -87,4 +87,8 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
 
   </form>
 
+  <div *ngIf="(isAuthenticated | async) === false && (cookieIsAccepted | async) === false" class="mt-2">
+    <ds-alert [type]="AlertType.Warning">{{ 'info.accessibility-settings.cookie-warning' | translate }}</ds-alert>
+  </div>
+
 </div>
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.ts b/src/app/info/accessibility-settings/accessibility-settings.component.ts
index fc08862fcf6..fb1f6141413 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.ts
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.ts
@@ -1,14 +1,16 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { AuthService } from '../../core/auth/auth.service';
 import {
   AccessibilitySetting,
   AccessibilitySettingsService,
   AccessibilitySettingsFormValues,
 } from '../../accessibility/accessibility-settings.service';
-import { take } from 'rxjs';
+import { BehaviorSubject, distinctUntilChanged, map, Subscription, take } from 'rxjs';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { isEmpty } from 'src/app/shared/empty.util';
+import { AlertType } from '../../shared/alert/aletr-type';
+import { KlaroService } from '../../shared/cookies/klaro.service';
 
 /**
  * Component providing the form where users can update accessibility settings.
@@ -17,20 +19,41 @@ import { isEmpty } from 'src/app/shared/empty.util';
   selector: 'ds-accessibility-settings',
   templateUrl: './accessibility-settings.component.html'
 })
-export class AccessibilitySettingsComponent implements OnInit {
+export class AccessibilitySettingsComponent implements OnInit, OnDestroy {
+  // Redeclared for use in template
+  protected readonly AlertType = AlertType;
 
   protected formValues: AccessibilitySettingsFormValues;
 
+  isAuthenticated: BehaviorSubject<boolean> = new BehaviorSubject(false);
+  cookieIsAccepted: BehaviorSubject<boolean> = new BehaviorSubject(false);
+
+  private subscriptions: Subscription[] = [];
+
   constructor(
     protected authService: AuthService,
     protected settingsService: AccessibilitySettingsService,
     protected notificationsService: NotificationsService,
     protected translateService: TranslateService,
+    protected klaroService: KlaroService,
   ) {
   }
 
   ngOnInit() {
     this.updateFormValues();
+
+    this.subscriptions.push(
+      this.authService.isAuthenticated().pipe(distinctUntilChanged())
+        .subscribe(val => this.isAuthenticated.next(val)),
+      this.klaroService.getSavedPreferences().pipe(
+        map(preferences => preferences?.accessibility === true),
+        distinctUntilChanged(),
+      ).subscribe(val => this.cookieIsAccepted.next(val)),
+    );
+  }
+
+  ngOnDestroy() {
+    this.subscriptions.forEach(subscription => subscription.unsubscribe());
   }
 
   /**
@@ -42,8 +65,12 @@ export class AccessibilitySettingsComponent implements OnInit {
 
     if (this.settingsService.allValid(convertedValues)) {
       this.settingsService.setSettings(convertedValues).pipe(take(1)).subscribe(location => {
-        this.notificationsService.success(null, this.translateService.instant('info.accessibility-settings.save-notification.' + location));
-        this.updateFormValues();
+        if (location !== 'failed') {
+          this.notificationsService.success(null, this.translateService.instant('info.accessibility-settings.save-notification.' + location));
+          this.updateFormValues();
+        } else {
+          this.notificationsService.error(null, this.translateService.instant('info.accessibility-settings.failed-notification'));
+        }
       });
     } else {
       this.notificationsService.error(
@@ -78,9 +105,13 @@ export class AccessibilitySettingsComponent implements OnInit {
    * Resets accessibility settings
    */
   resetSettings() {
-    this.settingsService.clearSettings().pipe(take(1)).subscribe(() => {
-      this.notificationsService.success(null, this.translateService.instant('info.accessibility-settings.reset-notification'));
-      this.updateFormValues();
+    this.settingsService.clearSettings().pipe(take(1)).subscribe(([cookieReset, metadataReset]) => {
+      if (cookieReset === 'failed' && metadataReset === 'failed') {
+        this.notificationsService.warning(null, this.translateService.instant('info.accessibility-settings.reset-failed'));
+      } else {
+        this.notificationsService.success(null, this.translateService.instant('info.accessibility-settings.reset-notification'));
+        this.updateFormValues();
+      }
     });
   }
 
diff --git a/src/app/shared/cookies/klaro-configuration.ts b/src/app/shared/cookies/klaro-configuration.ts
index a41b641dec1..af1ccd29277 100644
--- a/src/app/shared/cookies/klaro-configuration.ts
+++ b/src/app/shared/cookies/klaro-configuration.ts
@@ -2,6 +2,7 @@ import { TOKENITEM } from '../../core/auth/models/auth-token-info.model';
 import { IMPERSONATING_COOKIE, REDIRECT_COOKIE } from '../../core/auth/auth.service';
 import { LANG_COOKIE } from '../../core/locale/locale.service';
 import { CAPTCHA_COOKIE, CAPTCHA_NAME } from '../../core/google-recaptcha/google-recaptcha.service';
+import { ACCESSIBILITY_COOKIE } from '../../accessibility/accessibility-settings.service';
 
 /**
  * Cookie for has_agreed_end_user
@@ -189,6 +190,13 @@ export const klaroConfiguration: any = {
       onAccept: `window.refreshCaptchaScript?.call()`,
       onDecline: `window.refreshCaptchaScript?.call()`,
       onlyOnce: true,
-    }
+    },
+    {
+      name: 'accessibility',
+      purposes: ['functional'],
+      required: false,
+      cookies: [ACCESSIBILITY_COOKIE],
+      onlyOnce: false,
+    },
   ],
 };
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index c1822fce335..b03e2bb0cc9 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1350,6 +1350,10 @@
 
   "cookies.consent.content-modal.service": "service",
 
+  "cookies.consent.app.title.accessibility": "Accessibility Settings",
+
+  "cookies.consent.app.description.accessibility": "Required for saving your accessibility settings locally",
+
   "cookies.consent.app.title.authentication": "Authentication",
 
   "cookies.consent.app.description.authentication": "Required for signing you in",
@@ -1844,10 +1848,14 @@
 
   "info.accessibility-settings.breadcrumbs": "Accessibility settings",
 
+  "info.accessibility-settings.cookie-warning": "Saving the accessibility settings is currently not possible. Either log in to save the settings in user data, or accept the 'Accessibility Settings' cookie using the 'Cookie Settings' menu at the bottom of the page. Once the cookie has been accepted, you can reload the page to remove this message.",
+
   "info.accessibility-settings.disableNotificationTimeOut.label": "Automatically close notifications after time out",
 
   "info.accessibility-settings.disableNotificationTimeOut.hint": "When this toggle is activated, notifications will close automatically after the time out passes. When deactivated, notifications will remain open untill manually closed.",
 
+  "info.accessibility-settings.failed-notification": "Failed to save accessibility settings",
+
   "info.accessibility-settings.invalid-form-notification": "Did not save. The form contains invalid values.",
 
   "info.accessibility-settings.liveRegionTimeOut.label": "ARIA Live region time out (in seconds)",
@@ -1866,6 +1874,8 @@
 
   "info.accessibility-settings.save-notification.metadata": "Successfully saved settings on the user profile.",
 
+  "info.accessibility-settings.reset-failed": "Failed to reset. Either log in or accept the 'Accessibility Settings' cookie.",
+
   "info.accessibility-settings.reset-notification": "Successfully reset settings.",
 
   "info.accessibility-settings.reset": "Reset accessibility settings",

From d05096c015bfc82f384053fce58dc9e101ae093b Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 21 Feb 2025 09:16:41 +0100
Subject: [PATCH 32/41] 119602: Add KlaroServiceStub

---
 .../accessibility/accessibility-settings.service.spec.ts | 5 +++++
 src/app/shared/cookies/klaro.service.stub.ts             | 9 +++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 src/app/shared/cookies/klaro.service.stub.ts

diff --git a/src/app/accessibility/accessibility-settings.service.spec.ts b/src/app/accessibility/accessibility-settings.service.spec.ts
index 4c720634944..04ae5b42bef 100644
--- a/src/app/accessibility/accessibility-settings.service.spec.ts
+++ b/src/app/accessibility/accessibility-settings.service.spec.ts
@@ -13,6 +13,8 @@ import { of } from 'rxjs';
 import { EPerson } from '../core/eperson/models/eperson.model';
 import { fakeAsync, flush } from '@angular/core/testing';
 import { createSuccessfulRemoteDataObject$, createFailedRemoteDataObject$ } from '../shared/remote-data.utils';
+import { KlaroService } from '../shared/cookies/klaro.service';
+import { KlaroServiceStub } from '../shared/cookies/klaro.service.stub';
 
 
 describe('accessibilitySettingsService', () => {
@@ -20,10 +22,12 @@ describe('accessibilitySettingsService', () => {
   let cookieService: CookieServiceMock;
   let authService: AuthServiceStub;
   let ePersonService: EPersonDataService;
+  let klaroService: KlaroService;
 
   beforeEach(() => {
     cookieService = new CookieServiceMock();
     authService = new AuthServiceStub();
+    klaroService = new KlaroServiceStub();
 
     ePersonService = jasmine.createSpyObj('ePersonService', {
       createPatchFromCache: of([{
@@ -37,6 +41,7 @@ describe('accessibilitySettingsService', () => {
       cookieService as unknown as CookieService,
       authService as unknown as AuthService,
       ePersonService,
+      klaroService,
     );
   });
 
diff --git a/src/app/shared/cookies/klaro.service.stub.ts b/src/app/shared/cookies/klaro.service.stub.ts
new file mode 100644
index 00000000000..22735636d93
--- /dev/null
+++ b/src/app/shared/cookies/klaro.service.stub.ts
@@ -0,0 +1,9 @@
+import { of } from 'rxjs';
+
+export class KlaroServiceStub {
+  initialize = jasmine.createSpy('initialize');
+
+  showSettings = jasmine.createSpy('showSettings');
+
+  getSavedPreferences = jasmine.createSpy('getSavedPreferences').and.returnValue(of({}));
+}

From 4c30e2d0bee77f539f79d54ad7f28b5ec7c45719 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 21 Feb 2025 09:56:00 +0100
Subject: [PATCH 33/41] 119602: Fix existing accessibility-settings.service
 tests

---
 .../accessibility-settings.service.spec.ts    | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/app/accessibility/accessibility-settings.service.spec.ts b/src/app/accessibility/accessibility-settings.service.spec.ts
index 04ae5b42bef..a0952fc0db8 100644
--- a/src/app/accessibility/accessibility-settings.service.spec.ts
+++ b/src/app/accessibility/accessibility-settings.service.spec.ts
@@ -13,7 +13,6 @@ import { of } from 'rxjs';
 import { EPerson } from '../core/eperson/models/eperson.model';
 import { fakeAsync, flush } from '@angular/core/testing';
 import { createSuccessfulRemoteDataObject$, createFailedRemoteDataObject$ } from '../shared/remote-data.utils';
-import { KlaroService } from '../shared/cookies/klaro.service';
 import { KlaroServiceStub } from '../shared/cookies/klaro.service.stub';
 
 
@@ -22,13 +21,15 @@ describe('accessibilitySettingsService', () => {
   let cookieService: CookieServiceMock;
   let authService: AuthServiceStub;
   let ePersonService: EPersonDataService;
-  let klaroService: KlaroService;
+  let klaroService: KlaroServiceStub;
 
   beforeEach(() => {
     cookieService = new CookieServiceMock();
     authService = new AuthServiceStub();
     klaroService = new KlaroServiceStub();
 
+    klaroService.getSavedPreferences.and.returnValue(of({ accessibility: true }));
+
     ePersonService = jasmine.createSpyObj('ePersonService', {
       createPatchFromCache: of([{
         op: 'add',
@@ -176,12 +177,12 @@ describe('accessibilitySettingsService', () => {
 
   describe('setSettings', () => {
     beforeEach(() => {
-      service.setSettingsInCookie = jasmine.createSpy('setSettingsInCookie');
+      service.setSettingsInCookie = jasmine.createSpy('setSettingsInCookie').and.returnValue(of('cookie'));
     });
 
     it('should attempt to set settings in metadata', () => {
       service.setSettingsInAuthenticatedUserMetadata =
-        jasmine.createSpy('setSettingsInAuthenticatedUserMetadata').and.returnValue(of(false));
+        jasmine.createSpy('setSettingsInAuthenticatedUserMetadata').and.returnValue(of('failed'));
 
       const settings: AccessibilitySettings = {
         notificationTimeOut: '1000',
@@ -205,7 +206,7 @@ describe('accessibilitySettingsService', () => {
 
     it('should not set settings in cookie if metadata succeeded', () => {
       service.setSettingsInAuthenticatedUserMetadata =
-        jasmine.createSpy('setSettingsInAuthenticatedUserMetadata').and.returnValue(of(true));
+        jasmine.createSpy('setSettingsInAuthenticatedUserMetadata').and.returnValue(of('metadata'));
 
       const settings: AccessibilitySettings = {
         notificationTimeOut: '1000',
@@ -217,7 +218,7 @@ describe('accessibilitySettingsService', () => {
 
     it('should return \'metadata\' if settings are stored in metadata', () => {
       service.setSettingsInAuthenticatedUserMetadata =
-        jasmine.createSpy('setSettingsInAuthenticatedUserMetadata').and.returnValue(of(true));
+        jasmine.createSpy('setSettingsInAuthenticatedUserMetadata').and.returnValue(of('metadata'));
 
       const settings: AccessibilitySettings = {
         notificationTimeOut: '1000',
@@ -280,11 +281,11 @@ describe('accessibilitySettingsService', () => {
       expect(service.setSettingsInMetadata).toHaveBeenCalled();
     }));
 
-    it('should emit false when the user is not authenticated', fakeAsync(() => {
+    it('should emit "failed" when the user is not authenticated', fakeAsync(() => {
       authService.getAuthenticatedUserFromStoreIfAuthenticated = jasmine.createSpy().and.returnValue(of(null));
 
       service.setSettingsInAuthenticatedUserMetadata({})
-        .subscribe(value => expect(value).toBeFalse());
+        .subscribe(value => expect(value).toEqual('failed'));
       flush();
 
       expect(service.setSettingsInMetadata).not.toHaveBeenCalled();
@@ -320,23 +321,23 @@ describe('accessibilitySettingsService', () => {
       expect(ePersonService.patch).toHaveBeenCalled();
     });
 
-    it('should emit true when the update succeeded', fakeAsync(() => {
+    it('should emit "metadata" when the update succeeded', fakeAsync(() => {
       ePersonService.patch = jasmine.createSpy().and.returnValue(createSuccessfulRemoteDataObject$({}));
 
       service.setSettingsInMetadata(ePerson, { ['liveRegionTimeOut']: '500' })
         .subscribe(value => {
-        expect(value).toBeTrue();
+        expect(value).toEqual('metadata');
       });
 
       flush();
     }));
 
-    it('should emit false when the update failed', fakeAsync(() => {
+    it('should emit "failed" when the update failed', fakeAsync(() => {
       ePersonService.patch = jasmine.createSpy().and.returnValue(createFailedRemoteDataObject$());
 
       service.setSettingsInMetadata(ePerson, { ['liveRegionTimeOut']: '500' })
         .subscribe(value => {
-        expect(value).toBeFalse();
+        expect(value).toEqual('failed');
       });
 
       flush();
@@ -349,16 +350,20 @@ describe('accessibilitySettingsService', () => {
       cookieService.remove = jasmine.createSpy('remove');
     });
 
-    it('should store the settings in a cookie', () => {
-      service.setSettingsInCookie({ ['liveRegionTimeOut']: '500' });
+    it('should store the settings in a cookie', fakeAsync(() => {
+      service.setSettingsInCookie({ ['liveRegionTimeOut']: '500' }).subscribe();
+      flush();
       expect(cookieService.set).toHaveBeenCalled();
-    });
+    }));
+
+    it('should remove the cookie when the settings are empty', fakeAsync(() => {
+      service.setSettingsInCookie({}).subscribe();
+
+      flush();
 
-    it('should remove the cookie when the settings are empty', () => {
-      service.setSettingsInCookie({});
       expect(cookieService.set).not.toHaveBeenCalled();
       expect(cookieService.remove).toHaveBeenCalled();
-    });
+    }));
   });
 
   describe('convertFormValuesToStoredValues', () => {

From 62904747fc90721bd089d3060e35ffa5837c1eb7 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 21 Feb 2025 10:03:43 +0100
Subject: [PATCH 34/41] 119602: Add accessibility-settings.service tests for
 cookie functionality

---
 .../accessibility-settings.service.spec.ts     | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/app/accessibility/accessibility-settings.service.spec.ts b/src/app/accessibility/accessibility-settings.service.spec.ts
index a0952fc0db8..873621ed620 100644
--- a/src/app/accessibility/accessibility-settings.service.spec.ts
+++ b/src/app/accessibility/accessibility-settings.service.spec.ts
@@ -350,14 +350,28 @@ describe('accessibilitySettingsService', () => {
       cookieService.remove = jasmine.createSpy('remove');
     });
 
+    it('should fail to store settings in the cookie when the user has not accepted the cookie', fakeAsync(() => {
+      klaroService.getSavedPreferences.and.returnValue(of({ accessibility: false }));
+
+      service.setSettingsInCookie({ ['liveRegionTimeOut']: '500' }).subscribe(value => {
+        expect(value).toEqual('failed');
+      });
+      flush();
+      expect(cookieService.set).not.toHaveBeenCalled();
+    }));
+
     it('should store the settings in a cookie', fakeAsync(() => {
-      service.setSettingsInCookie({ ['liveRegionTimeOut']: '500' }).subscribe();
+      service.setSettingsInCookie({ ['liveRegionTimeOut']: '500' }).subscribe(value => {
+        expect(value).toEqual('cookie');
+      });
       flush();
       expect(cookieService.set).toHaveBeenCalled();
     }));
 
     it('should remove the cookie when the settings are empty', fakeAsync(() => {
-      service.setSettingsInCookie({}).subscribe();
+      service.setSettingsInCookie({}).subscribe(value => {
+        expect(value).toEqual('cookie');
+      });
 
       flush();
 

From 4a74a3ac991db9f5cbb54d192f14e6ac32227cb0 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 21 Feb 2025 10:10:35 +0100
Subject: [PATCH 35/41] 119602: Fix existing accessibility-settings.component
 tests

---
 .../accessibility-settings.component.spec.ts                 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts b/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts
index bcd4ff94c86..cd00b8788a9 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts
@@ -9,6 +9,8 @@ import { NotificationsServiceStub } from '../../shared/testing/notifications-ser
 import { AuthService } from '../../core/auth/auth.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { of } from 'rxjs';
+import { KlaroServiceStub } from '../../shared/cookies/klaro.service.stub';
+import { KlaroService } from '../../shared/cookies/klaro.service';
 
 
 describe('AccessibilitySettingsComponent', () => {
@@ -18,11 +20,13 @@ describe('AccessibilitySettingsComponent', () => {
   let authService: AuthServiceStub;
   let settingsService: AccessibilitySettingsService;
   let notificationsService: NotificationsServiceStub;
+  let klaroService: KlaroServiceStub;
 
   beforeEach(waitForAsync(() => {
     authService = new AuthServiceStub();
     settingsService = getAccessibilitySettingsServiceStub();
     notificationsService = new NotificationsServiceStub();
+    klaroService = new KlaroServiceStub();
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
@@ -31,6 +35,7 @@ describe('AccessibilitySettingsComponent', () => {
         { provide: AuthService, useValue: authService },
         { provide: AccessibilitySettingsService, useValue: settingsService },
         { provide: NotificationsService, useValue: notificationsService },
+        { provide: KlaroService, useValue: klaroService },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();

From ca80812d0a20aa3f5c0d142b2e3a3eeb4252ad31 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 21 Feb 2025 10:27:44 +0100
Subject: [PATCH 36/41] 119602: Add additional accessibility-settings.component
 test

---
 .../accessibility-settings.component.spec.ts                | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts b/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts
index cd00b8788a9..cf03ca5c430 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts
@@ -79,5 +79,11 @@ describe('AccessibilitySettingsComponent', () => {
       component.saveSettings();
       expect(notificationsService.success).toHaveBeenCalled();
     });
+
+    it('should give the user a notification mentioning why saving failed, if it failed', () => {
+      settingsService.setSettings = jasmine.createSpy('setSettings').and.returnValue(of('failed'));
+      component.saveSettings();
+      expect(notificationsService.error).toHaveBeenCalled();
+    });
   });
 });

From cd825ac0daf18fab04e1001d5880b5108c8a24c9 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 21 Feb 2025 10:51:30 +0100
Subject: [PATCH 37/41] 119602: Inject AppConfig instead of using environment
 directly

---
 .../accessibility/accessibility-settings.service.spec.ts    | 4 ++++
 src/app/accessibility/accessibility-settings.service.ts     | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/app/accessibility/accessibility-settings.service.spec.ts b/src/app/accessibility/accessibility-settings.service.spec.ts
index 873621ed620..0434aa972dd 100644
--- a/src/app/accessibility/accessibility-settings.service.spec.ts
+++ b/src/app/accessibility/accessibility-settings.service.spec.ts
@@ -14,6 +14,7 @@ import { EPerson } from '../core/eperson/models/eperson.model';
 import { fakeAsync, flush } from '@angular/core/testing';
 import { createSuccessfulRemoteDataObject$, createFailedRemoteDataObject$ } from '../shared/remote-data.utils';
 import { KlaroServiceStub } from '../shared/cookies/klaro.service.stub';
+import { AppConfig } from '../../config/app-config.interface';
 
 
 describe('accessibilitySettingsService', () => {
@@ -22,11 +23,13 @@ describe('accessibilitySettingsService', () => {
   let authService: AuthServiceStub;
   let ePersonService: EPersonDataService;
   let klaroService: KlaroServiceStub;
+  let appConfig: AppConfig;
 
   beforeEach(() => {
     cookieService = new CookieServiceMock();
     authService = new AuthServiceStub();
     klaroService = new KlaroServiceStub();
+    appConfig = { accessibility: { cookieExpirationDuration: 10 }} as AppConfig;
 
     klaroService.getSavedPreferences.and.returnValue(of({ accessibility: true }));
 
@@ -43,6 +46,7 @@ describe('accessibilitySettingsService', () => {
       authService as unknown as AuthService,
       ePersonService,
       klaroService,
+      appConfig,
     );
   });
 
diff --git a/src/app/accessibility/accessibility-settings.service.ts b/src/app/accessibility/accessibility-settings.service.ts
index b8748f0bf96..b97ecbe3ed5 100644
--- a/src/app/accessibility/accessibility-settings.service.ts
+++ b/src/app/accessibility/accessibility-settings.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Inject, Injectable } from '@angular/core';
 import { Observable, of, switchMap, combineLatest } from 'rxjs';
 import { map, take } from 'rxjs/operators';
 import { CookieService } from '../core/services/cookie.service';
@@ -11,6 +11,7 @@ import cloneDeep from 'lodash/cloneDeep';
 import { environment } from '../../environments/environment';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 import { KlaroService } from '../shared/cookies/klaro.service';
+import { AppConfig, APP_CONFIG } from '../../config/app-config.interface';
 
 /**
  * Name of the cookie used to store the settings locally
@@ -64,6 +65,7 @@ export class AccessibilitySettingsService {
     protected authService: AuthService,
     protected ePersonService: EPersonDataService,
     protected klaroService: KlaroService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
   }
 
@@ -221,7 +223,7 @@ export class AccessibilitySettingsService {
       map((accessibilityCookieAccepted: boolean) => {
         if (accessibilityCookieAccepted) {
           if (isNotEmpty(settings)) {
-            this.cookieService.set(ACCESSIBILITY_COOKIE, settings, { expires: environment.accessibility.cookieExpirationDuration });
+            this.cookieService.set(ACCESSIBILITY_COOKIE, settings, { expires: this.appConfig.accessibility.cookieExpirationDuration });
           } else {
             this.cookieService.remove(ACCESSIBILITY_COOKIE);
           }

From dcd32c48c32d56e9c9827642734d353b6bf52d37 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 21 Feb 2025 12:53:44 +0100
Subject: [PATCH 38/41] 119602: Rework settings validation

---
 .../accessibility-settings.service.stub.ts    |  2 +-
 .../accessibility-settings.service.ts         | 25 ++++++++++++-------
 .../accessibility-settings.component.html     |  8 +++---
 .../accessibility-settings.component.ts       |  4 +--
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/app/accessibility/accessibility-settings.service.stub.ts b/src/app/accessibility/accessibility-settings.service.stub.ts
index 80b7de1fa3c..1b8c534010c 100644
--- a/src/app/accessibility/accessibility-settings.service.stub.ts
+++ b/src/app/accessibility/accessibility-settings.service.stub.ts
@@ -40,5 +40,5 @@ export class AccessibilitySettingsServiceStub {
 
   isValid = jasmine.createSpy('isValid').and.returnValue(true);
 
-  allValid = jasmine.createSpy('allValid').and.returnValue(true);
+  formValuesValid = jasmine.createSpy('allValid').and.returnValue(true);
 }
diff --git a/src/app/accessibility/accessibility-settings.service.ts b/src/app/accessibility/accessibility-settings.service.ts
index b97ecbe3ed5..6db4c589772 100644
--- a/src/app/accessibility/accessibility-settings.service.ts
+++ b/src/app/accessibility/accessibility-settings.service.ts
@@ -24,11 +24,16 @@ export const ACCESSIBILITY_COOKIE = 'dsAccessibilityCookie';
 export const ACCESSIBILITY_SETTINGS_METADATA_KEY = 'dspace.accessibility.settings';
 
 /**
- * Type containing all possible accessibility settings.
+ * Array containing all possible accessibility settings.
  * When adding new settings, make sure to add the new setting to the accessibility-settings component form.
  * The converter methods to convert from stored format to form format (and vice-versa) need to be updated as well.
  */
-export type AccessibilitySetting = 'notificationTimeOut' | 'liveRegionTimeOut';
+export const accessibilitySettingKeys = ['notificationTimeOut', 'liveRegionTimeOut'] as const;
+
+/**
+ * Type representing the possible accessibility settings
+ */
+export type AccessibilitySetting = typeof accessibilitySettingKeys[number];
 
 /**
  * Type representing an object that contains accessibility settings values for all accessibility settings.
@@ -294,24 +299,26 @@ export class AccessibilitySettingsService {
   }
 
   /**
-   * Returns true if the provided value is a valid value for the provided AccessibilitySetting.
+   * Returns true if the provided AccessibilitySetting is valid in regard to the provided formValues.
    */
-  isValid(setting: AccessibilitySetting | string, value: string): boolean {
+  isValid(setting: AccessibilitySetting, formValues: AccessibilitySettingsFormValues): boolean {
     switch (setting) {
       case 'notificationTimeOut':
-        return hasNoValue(value) || parseFloat(value) > 0;
+        return formValues.notificationTimeOutEnabled ?
+          hasNoValue(formValues.notificationTimeOut) || parseFloat(formValues.notificationTimeOut) > 0 :
+          true;
       case 'liveRegionTimeOut':
-        return hasNoValue(value) || parseFloat(value) > 0;
+        return hasNoValue(formValues.liveRegionTimeOut) || parseFloat(formValues.liveRegionTimeOut) > 0;
       default:
         throw new Error(`Unhandled accessibility setting during validity check: ${setting}`);
     }
   }
 
   /**
-   * Returns true if all settings in the provided AccessibilitySettings object are valid
+   * Returns true if all settings in the provided AccessibilitySettingsFormValues object are valid
    */
-  allValid(settings: AccessibilitySettings) {
-    return Object.entries(settings).every(([setting, value], _) => this.isValid(setting, value));
+  formValuesValid(formValues: AccessibilitySettingsFormValues) {
+    return accessibilitySettingKeys.every(setting => this.isValid(setting, formValues));
   }
 }
 
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.html b/src/app/info/accessibility-settings/accessibility-settings.component.html
index 6a0094fc97b..9b2eba493b5 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.html
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.html
@@ -30,12 +30,12 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
 
       <div class="col-sm-4">
         <input [type]="'number'" [id]="'notificationTimeOutInput'" class="form-control"
-               [ngClass]="{'is-invalid': !settingsService.isValid('notificationTimeOut', formValues.notificationTimeOut)}"
+               [ngClass]="{'is-invalid': !settingsService.isValid('notificationTimeOut', formValues)}"
                [min]="1"
                [readOnly]="!formValues.notificationTimeOutEnabled"
                [(ngModel)]="formValues.notificationTimeOut" [ngModelOptions]="{ standalone: true }"
                [attr.aria-describedby]="'notificationTimeOutHint'">
-        <div class="invalid-feedback" [ngClass]="{ 'd-block': !settingsService.isValid('notificationTimeOut', formValues.notificationTimeOut) }">
+        <div class="invalid-feedback" [ngClass]="{ 'd-block': !settingsService.isValid('notificationTimeOut', formValues) }">
           {{ 'info.accessibility-settings.notificationTimeOut.invalid' | translate }}
         </div>
       </div>
@@ -57,11 +57,11 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
 
       <div class="col-sm-4">
         <input [type]="'number'" [id]="'liveRegionTimeOutInput'" class="form-control"
-               [ngClass]="{'is-invalid': !settingsService.isValid('liveRegionTimeOut', formValues.liveRegionTimeOut)}"
+               [ngClass]="{'is-invalid': !settingsService.isValid('liveRegionTimeOut', formValues)}"
                [min]="1"
                [(ngModel)]="formValues.liveRegionTimeOut" [ngModelOptions]="{ standalone: true }"
                [attr.aria-describedby]="'liveRegionTimeOutHint'">
-        <div class="invalid-feedback" [ngClass]="{ 'd-block': !settingsService.isValid('liveRegionTimeOut', formValues.liveRegionTimeOut) }">
+        <div class="invalid-feedback" [ngClass]="{ 'd-block': !settingsService.isValid('liveRegionTimeOut', formValues) }">
           {{ 'info.accessibility-settings.liveRegionTimeOut.invalid' | translate }}
         </div>
       </div>
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.ts b/src/app/info/accessibility-settings/accessibility-settings.component.ts
index fb1f6141413..99453e2e292 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.ts
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.ts
@@ -61,9 +61,9 @@ export class AccessibilitySettingsComponent implements OnInit, OnDestroy {
    */
   saveSettings() {
     const formValues = this.formValues;
-    const convertedValues = this.settingsService.convertFormValuesToStoredValues(formValues);
 
-    if (this.settingsService.allValid(convertedValues)) {
+    if (this.settingsService.formValuesValid(formValues)) {
+      const convertedValues = this.settingsService.convertFormValuesToStoredValues(formValues);
       this.settingsService.setSettings(convertedValues).pipe(take(1)).subscribe(location => {
         if (location !== 'failed') {
           this.notificationsService.success(null, this.translateService.instant('info.accessibility-settings.save-notification.' + location));

From 957d4bc77081c06002bbcb934c6a640c8ff585d8 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 21 Feb 2025 13:58:54 +0100
Subject: [PATCH 39/41] 119602: Fix tests after merge

---
 .../models/array-group/dynamic-form-array.component.spec.ts   | 3 +++
 .../search-facet-option/search-facet-option.component.spec.ts | 3 +++
 .../sections/accesses/section-accesses.component.spec.ts      | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts
index 0d9ed6ae74d..707ea485236 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts
@@ -28,6 +28,8 @@ import {
 } from '../../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../../environments/environment.test';
 import { SubmissionService } from '../../../../../../submission/submission.service';
+import { LiveRegionService } from '../../../../../live-region/live-region.service';
+import { getLiveRegionServiceStub } from '../../../../../live-region/live-region.service.stub';
 import { DsDynamicFormControlContainerComponent } from '../../ds-dynamic-form-control-container.component';
 import { dsDynamicFormControlMapFn } from '../../ds-dynamic-form-control-map-fn';
 import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
@@ -63,6 +65,7 @@ describe('DsDynamicFormArrayComponent', () => {
         { provide: SubmissionService, useValue: {} },
         { provide: APP_CONFIG, useValue: environment },
         { provide: DYNAMIC_FORM_CONTROL_MAP_FN, useValue: dsDynamicFormControlMapFn },
+        { provide: LiveRegionService, useValue: getLiveRegionServiceStub() },
       ],
     }).overrideComponent(DsDynamicFormArrayComponent, {
       remove: {
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
index 08e4fc4f682..d5326520974 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
@@ -22,6 +22,8 @@ import { SearchService } from '../../../../../../core/shared/search/search.servi
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
 import { ActivatedRouteStub } from '../../../../../../shared/testing/active-router.stub';
+import { LiveRegionService } from '../../../../../live-region/live-region.service';
+import { getLiveRegionServiceStub } from '../../../../../live-region/live-region.service.stub';
 import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
 import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
 import { RouterStub } from '../../../../../testing/router.stub';
@@ -84,6 +86,7 @@ describe('SearchFacetOptionComponent', () => {
         { provide: SearchConfigurationService, useValue: searchConfigurationService },
         { provide: SearchFilterService, useValue: searchFilterService },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
+        { provide: LiveRegionService, useValue: getLiveRegionServiceStub() },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchFacetOptionComponent, {
diff --git a/src/app/submission/sections/accesses/section-accesses.component.spec.ts b/src/app/submission/sections/accesses/section-accesses.component.spec.ts
index c49bd74e0d6..eb7d1cdaf04 100644
--- a/src/app/submission/sections/accesses/section-accesses.component.spec.ts
+++ b/src/app/submission/sections/accesses/section-accesses.component.spec.ts
@@ -30,6 +30,8 @@ import { DsDynamicTypeBindRelationService } from '../../../shared/form/builder/d
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormComponent } from '../../../shared/form/form.component';
 import { FormService } from '../../../shared/form/form.service';
+import { LiveRegionService } from '../../../shared/live-region/live-region.service';
+import { getLiveRegionServiceStub } from '../../../shared/live-region/live-region.service.stub';
 import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
 import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
 import { getMockFormService } from '../../../shared/mocks/form-service.mock';
@@ -125,6 +127,7 @@ describe('SubmissionSectionAccessesComponent', () => {
           { provide: APP_CONFIG, useValue: environment },
           { provide: APP_DATA_SERVICES_MAP, useValue: {} },
           { provide: DYNAMIC_FORM_CONTROL_MAP_FN, useValue: dsDynamicFormControlMapFn },
+          { provide: LiveRegionService, useValue: getLiveRegionServiceStub },
           FormBuilderService,
           provideMockStore({}),
         ],
@@ -222,6 +225,7 @@ describe('SubmissionSectionAccessesComponent', () => {
           { provide: APP_CONFIG, useValue: environment },
           { provide: APP_DATA_SERVICES_MAP, useValue: {} },
           { provide: DYNAMIC_FORM_CONTROL_MAP_FN, useValue: dsDynamicFormControlMapFn },
+          { provide: LiveRegionService, useValue: getLiveRegionServiceStub() },
           FormBuilderService,
           provideMockStore({}),
 

From a6be9f8a74d8d6381793bb30358eda1607563830 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 26 Feb 2025 10:45:13 +0100
Subject: [PATCH 40/41] 119602: Add new cookie setting to e2e tests

---
 cypress/support/e2e.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index 73d3c76a990..b6bf3288f42 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -56,7 +56,7 @@ before(() => {
 beforeEach(() => {
   // Pre-agree to all Klaro cookies by setting the klaro-anonymous cookie
   // This just ensures it doesn't get in the way of matching other objects in the page.
-  cy.setCookie('klaro-anonymous', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true}');
+  cy.setCookie('klaro-anonymous', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true%22accessibility%22:true}');
 
   // Remove any CSRF cookies saved from prior tests
   cy.clearCookie(DSPACE_XSRF_COOKIE);

From fa4c5dd712f30046af8a03e43fbb2aeb7303077a Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 26 Feb 2025 12:14:53 +0100
Subject: [PATCH 41/41] 119602: Set cookies for all users

---
 cypress.config.ts      | 1 +
 cypress/support/e2e.ts | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cypress.config.ts b/cypress.config.ts
index 36d8120342a..253644deabe 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -34,6 +34,7 @@ export default defineConfig({
     DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME: 'People',
     // Account used to test basic submission process
     DSPACE_TEST_SUBMIT_USER: 'dspacedemo+submit@gmail.com',
+    DSPACE_TEST_SUBMIT_USER_UUID: '914955b1-cf2e-4884-8af7-a166aa24cf73',
     DSPACE_TEST_SUBMIT_USER_PASSWORD: 'dspace',
     // Administrator users group
     DSPACE_ADMINISTRATOR_GROUP: 'e59f5659-bff9-451e-b28f-439e7bd467e4'
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index b6bf3288f42..8d5904bb6e2 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -54,9 +54,11 @@ before(() => {
 
 // Runs once before the first test in each "block"
 beforeEach(() => {
-  // Pre-agree to all Klaro cookies by setting the klaro-anonymous cookie
+  // Pre-agree to all Klaro cookies by setting the klaro-anonymous & user-specific cookies
   // This just ensures it doesn't get in the way of matching other objects in the page.
-  cy.setCookie('klaro-anonymous', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true%22accessibility%22:true}');
+  cy.setCookie('klaro-anonymous', '{"authentication":true,"preferences":true,"acknowledgement":true,"google-analytics":true,"accessibility":true}');
+  cy.setCookie(`klaro-${Cypress.env('DSPACE_TEST_ADMIN_USER_UUID')}`, '{"authentication":true,"preferences":true,"acknowledgement":true,"google-analytics":true,"accessibility":true}');
+  cy.setCookie(`klaro-${Cypress.env('DSPACE_TEST_SUBMIT_USER_UUID')}`, '{"authentication":true,"preferences":true,"acknowledgement":true,"google-analytics":true,"accessibility":true}');
 
   // Remove any CSRF cookies saved from prior tests
   cy.clearCookie(DSPACE_XSRF_COOKIE);