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 01/11] 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 cacfae61fc..b0d14f99b7 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 @@
 
   <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 @@
     </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 @@
                [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 @@
     </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 @@
                [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 94126bbc16..d0f9524810 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 02/11] 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 4ac965059e..5b19d74fa6 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 fc8876619d..55f357f255 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 b0d14f99b7..2372a8e2e2 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 @@
 
       <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 @@
 
       <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 d537c363c3..ecdbb543bb 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 d0f9524810..c1822fce33 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 03/11] 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 5b19d74fa6..80b7de1fa3 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 55f357f255..2a94179aba 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 2372a8e2e2..75d1863d5e 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 @@
         <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 @@
         <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 @@
       <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 ecdbb543bb..fc08862fcf 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 04/11] 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 2a94179aba..b8748f0bf9 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 75d1863d5e..6a0094fc97 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 @@
 
   </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 fc08862fcf..fb1f614141 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 a41b641dec..af1ccd2927 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 c1822fce33..b03e2bb0cc 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 05/11] 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 4c72063494..04ae5b42be 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 0000000000..22735636d9
--- /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 06/11] 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 04ae5b42be..a0952fc0db 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 07/11] 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 a0952fc0db..873621ed62 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 08/11] 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 bcd4ff94c8..cd00b8788a 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 09/11] 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 cd00b8788a..cf03ca5c43 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 10/11] 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 873621ed62..0434aa972d 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 b8748f0bf9..b97ecbe3ed 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 11/11] 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 80b7de1fa3..1b8c534010 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 b97ecbe3ed..6db4c58977 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 6a0094fc97..9b2eba493b 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 @@
 
       <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 @@
 
       <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 fb1f614141..99453e2e29 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));