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

Task/dspace cris 2025 02 x/DSC-2944

Approved-by: Francesco Molinaro

Author: Francesco Mauto

src/app/info/end-user-agreement/end-user-agreement.component.spec.ts

@@ -23,6 +23,7 @@ import {
 import { AuthService } from '../../core/auth/auth.service';
 import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model';
 import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
@@ -36,6 +37,7 @@ describe('EndUserAgreementComponent', () => {
   let endUserAgreementService: EndUserAgreementService;
   let notificationsService: NotificationsService;
   let authService: AuthService;
+  let ePersonService: EPersonDataService;
   let store;
   let router: Router;
   let route: ActivatedRoute;
@@ -56,6 +58,10 @@ describe('EndUserAgreementComponent', () => {
     authService = jasmine.createSpyObj('authService', {
       isAuthenticated: of(true),
       getToken: token,
+      getAuthenticatedUserIdFromStore: of('user-id'),
+    });
+    ePersonService = jasmine.createSpyObj('ePersonService', {
+      invalidateById: of(true),
     });
     store = jasmine.createSpyObj('store', ['dispatch']);
     router = jasmine.createSpyObj('router', ['navigate', 'navigateByUrl']);
@@ -74,6 +80,7 @@ describe('EndUserAgreementComponent', () => {
         { provide: EndUserAgreementService, useValue: endUserAgreementService },
         { provide: NotificationsService, useValue: notificationsService },
         { provide: AuthService, useValue: authService },
+        { provide: EPersonDataService, useValue: ePersonService },
         { provide: Store, useValue: store },
         { provide: Router, useValue: router },
         { provide: ActivatedRoute, useValue: route },

src/app/info/end-user-agreement/end-user-agreement.component.ts

@@ -34,6 +34,7 @@ import {
 } from '../../core/auth/auth.actions';
 import { AuthService } from '../../core/auth/auth.service';
 import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { isNotEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
@@ -71,6 +72,7 @@ export class EndUserAgreementComponent implements OnInit, OnDestroy {
               protected notificationsService: NotificationsService,
               protected translate: TranslateService,
               protected authService: AuthService,
+              protected ePersonService: EPersonDataService,
               protected store: Store<AppState>,
               protected router: Router,
               protected route: ActivatedRoute,
@@ -120,7 +122,12 @@ export class EndUserAgreementComponent implements OnInit, OnDestroy {
       switchMap((success) => {
         if (success) {
           this.notificationsService.success(this.translate.instant('info.end-user-agreement.accept.success'));
-          return this.route.queryParams.pipe(map((params) => params.redirect));
+          return this.authService.getAuthenticatedUserIdFromStore().pipe(
+            switchMap((userId) => {
+              this.ePersonService.invalidateById(userId);
+              return this.route.queryParams.pipe(map((params) => params.redirect));
+            }),
+          );
         } else {
           this.notificationsService.error(this.translate.instant('info.end-user-agreement.accept.error'));
           return of(undefined);

src/app/shared/menu/providers/explore.menu.spec.ts

@@ -11,7 +11,10 @@ import { TestBed } from '@angular/core/testing';
 import { APP_CONFIG } from '../../../../config/app-config.interface';
 import { environment } from '../../../../environments/environment';
 import { SectionDataService } from '../../../core/layout/section-data.service';
-import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../remote-data.utils';
 import { createPaginatedList } from '../../testing/utils.test';
 import { ExploreMenuProvider } from './explore.menu';
 
@@ -36,4 +39,12 @@ describe('ExploreMenuProvider', () => {
   it('should be created', () => {
     expect(provider).toBeTruthy();
   });
+
+  it('should return empty sections when the API returns an error', (done) => {
+    sectionDataServiceStub.findVisibleSections = () => createFailedRemoteDataObject$('Forbidden', 403);
+    provider.getSections().subscribe((sections) => {
+      expect(sections).toEqual([]);
+      done();
+    });
+  });
 });

src/app/shared/menu/providers/explore.menu.ts

@@ -14,7 +14,7 @@ import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Section } from '../../../core/layout/models/section.model';
 import { SectionDataService } from '../../../core/layout/section-data.service';
-import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { MenuItemType } from '../menu-item-type.model';
 import {
   AbstractMenuProvider,
@@ -37,8 +37,11 @@ export class ExploreMenuProvider extends AbstractMenuProvider {
    */
   getSections(): Observable<PartialMenuSection[]> {
     return this.sectionDataService.findVisibleSections().pipe(
-      getFirstSucceededRemoteData(),
+      getFirstCompletedRemoteData(),
       map((rd: RemoteData<PaginatedList<Section>>) => {
+        if (!rd.hasSucceeded) {
+          return [];
+        }
         return [
           ...rd.payload.page.map((browseDef) => {
             return {