Merged in task/dspace-cris-2025_02_x/DSC-2694 (pull request DSpace#4076)

[CST-2694] fix accessibility settings retrieval after editing and saving them

Approved-by: Andrea Barbasso

Author: Mattia Vianelli

src/app/accessibility/accessibility-settings.service.spec.ts

@@ -2,9 +2,11 @@ import {
   fakeAsync,
   flush,
 } from '@angular/core/testing';
+import { Store } from '@ngrx/store';
 import { of } from 'rxjs';
 
 import { AppConfig } from '../../config/app-config.interface';
+import { AppState } from '../app.reducer';
 import { AuthService } from '../core/auth/auth.service';
 import { EPersonDataService } from '../core/eperson/eperson-data.service';
 import { EPerson } from '../core/eperson/models/eperson.model';
@@ -32,12 +34,14 @@ describe('accessibilitySettingsService', () => {
   let authService: AuthServiceStub;
   let ePersonService: EPersonDataService;
   let orejimeService: OrejimeServiceStub;
+  let store: Store<AppState>;
   let appConfig: AppConfig;
 
   beforeEach(() => {
     cookieService = new CookieServiceMock();
     authService = new AuthServiceStub();
     orejimeService = new OrejimeServiceStub();
+    store = jasmine.createSpyObj('store', ['dispatch', 'pipe']);
     appConfig = { accessibility: { cookieExpirationDuration: 10 } } as AppConfig;
 
     orejimeService.getSavedPreferences.and.returnValue(of({ accessibility: true }));
@@ -56,6 +60,7 @@ describe('accessibilitySettingsService', () => {
       ePersonService,
       orejimeService,
       appConfig,
+      store,
     );
   });
 
@@ -336,6 +341,7 @@ describe('accessibilitySettingsService', () => {
 
     it('should emit "metadata" when the update succeeded', fakeAsync(() => {
       ePersonService.patch = jasmine.createSpy().and.returnValue(createSuccessfulRemoteDataObject$({}));
+      store.pipe = jasmine.createSpy().and.returnValue(of('metadata'));
 
       service.setSettingsInMetadata(ePerson, { ['liveRegionTimeOut']: '500' })
         .subscribe(value => {

src/app/accessibility/accessibility-settings.service.ts

@@ -3,6 +3,10 @@ import {
   Injectable,
   Optional,
 } from '@angular/core';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
 import cloneDeep from 'lodash/cloneDeep';
 import {
   combineLatest,
@@ -11,6 +15,7 @@ import {
   switchMap,
 } from 'rxjs';
 import {
+  filter,
   map,
   take,
 } from 'rxjs/operators';
@@ -20,7 +25,10 @@ import {
   AppConfig,
 } from '../../config/app-config.interface';
 import { environment } from '../../environments/environment';
+import { AppState } from '../app.reducer';
+import { RetrieveAuthenticatedEpersonSuccessAction } from '../core/auth/auth.actions';
 import { AuthService } from '../core/auth/auth.service';
+import { getAuthenticatedUser } from '../core/auth/selectors';
 import { EPersonDataService } from '../core/eperson/eperson-data.service';
 import { EPerson } from '../core/eperson/models/eperson.model';
 import { CookieService } from '../core/services/cookie.service';
@@ -91,6 +99,7 @@ export class AccessibilitySettingsService {
     protected ePersonService: EPersonDataService,
     @Optional() protected orejimeService: OrejimeService,
     @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    private store: Store<AppState>,
   ) {
   }
 
@@ -234,7 +243,19 @@ export class AccessibilitySettingsService {
       switchMap(operations =>
         isNotEmpty(operations) ? this.ePersonService.patch(user, operations) : createSuccessfulRemoteDataObject$({})),
       getFirstCompletedRemoteData(),
-      switchMap(rd => rd.hasSucceeded ? ofMetadata() : ofFailed()),
+      switchMap(rd => {
+        if (rd.hasSucceeded) {
+          this.store.dispatch(new RetrieveAuthenticatedEpersonSuccessAction(user));
+          return this.store.pipe(
+            select(getAuthenticatedUser),
+            filter((u) => !!u && u.id === user.id && u.firstMetadataValue(ACCESSIBILITY_SETTINGS_METADATA_KEY) === user.firstMetadataValue(ACCESSIBILITY_SETTINGS_METADATA_KEY)),
+            take(1),
+            switchMap(() => ofMetadata()),
+          );
+        } else {
+          return ofFailed();
+        }
+      }),
     );
   }