From a8421de1ed7f0f7e5ac73de66bc9f8bcb134d685 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 28 Nov 2024 18:45:09 +0100
Subject: [PATCH 1/3] [DSC-2059] remove async functions calls from templates of
 cris item pages and context menus

---
 .../cris-layout-navbar.component.html         |  2 +-
 .../cris-layout-navbar.component.spec.ts      |  7 ++-
 .../cris-layout-navbar.component.ts           |  4 ++
 .../cris-layout-sidebar.component.html        | 18 +++---
 .../cris-layout-sidebar.component.ts          |  4 +-
 .../cris-layout-vertical.component.html       |  4 +-
 .../cris-layout-vertical.component.ts         |  7 ++-
 .../metric-row/metric-row.component.html      |  2 +-
 .../metric-row/metric-row.component.ts        | 12 ++--
 .../alerts/item-alerts.component.html         |  2 +-
 .../alerts/item-alerts.component.spec.ts      | 28 ++++-----
 .../item-page/alerts/item-alerts.component.ts |  4 +-
 .../item-authorizations.component.html        |  2 +-
 .../item-authorizations.component.ts          |  3 +
 .../item-relationships.component.ts           |  5 +-
 .../collections/collections.component.html    |  2 +-
 .../orcid-auth/orcid-auth.component.html      | 20 +++---
 .../orcid-auth/orcid-auth.component.ts        | 62 +++++++------------
 .../orcid-queue/orcid-queue.component.html    |  8 +--
 .../orcid-queue/orcid-queue.component.ts      |  2 +-
 .../item-page-field.component.html            |  2 +-
 .../item-page-field.component.ts              | 23 +++----
 ...item-versions-summary-modal.component.html |  2 +-
 .../versions/item-versions.component.html     |  4 +-
 .../versions/item-versions.component.ts       |  3 +-
 .../item-versions-notice.component.html       |  2 +-
 .../notice/item-versions-notice.component.ts  |  6 ++
 .../comcol-page-handle.component.html         |  2 +-
 .../comcol-page-handle.component.ts           |  3 -
 .../audit-item/audit-item-menu.component.html |  2 +-
 .../audit-item/audit-item-menu.component.ts   | 16 ++---
 .../bulk-import-menu.component.html           |  2 +-
 .../bulk-import/bulk-import-menu.component.ts |  6 +-
 .../claim-item/claim-item-menu.component.html |  2 +-
 .../dso-page-edit-menu.component.ts           |  6 +-
 ...dit-item-relationships-menu.component.html |  2 +-
 .../edit-item-relationships-menu.component.ts |  4 ++
 .../edit-item/edit-item-menu.component.html   |  4 +-
 .../edit-item/edit-item-menu.component.ts     |  8 ++-
 .../export-collection-menu.component.html     |  2 +-
 .../export-collection-menu.component.ts       | 12 ++--
 .../export-item-menu.component.html           |  2 +-
 .../export-item-menu.component.spec.ts        |  9 ++-
 .../export-item/export-item-menu.component.ts | 21 ++++---
 .../request-correction-menu.component.html    |  2 +-
 .../request-correction-menu.component.ts      |  6 +-
 src/app/shared/utils/can-edit-version.pipe.ts | 20 ++++++
 47 files changed, 203 insertions(+), 168 deletions(-)
 create mode 100644 src/app/shared/utils/can-edit-version.pipe.ts

diff --git a/src/app/cris-layout/cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component.html b/src/app/cris-layout/cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component.html
index 2e5cd07b045..ac889721a2b 100644
--- a/src/app/cris-layout/cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component.html
+++ b/src/app/cris-layout/cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component.html
@@ -1,4 +1,4 @@
-<button *ngIf="(windowService.isXsOrSm() | async) && showNav" class="navbar-toggler pl-2 float-right" type="button" (click)="toggleNavbar()"
+<button *ngIf="(isXsOrSm$ | async) && showNav" class="navbar-toggler pl-2 float-right" type="button" (click)="toggleNavbar()"
     aria-controls="collapsingNav" aria-expanded="false" [attr.aria-label]="'nav.toggle' | translate">
     <span class="navbar-toggler-icon fas fa-bars fa-fw" aria-hidden="true"></span>
 </button>
diff --git a/src/app/cris-layout/cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component.spec.ts b/src/app/cris-layout/cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component.spec.ts
index 824d9f4c741..e17cd0bc769 100644
--- a/src/app/cris-layout/cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component.spec.ts
+++ b/src/app/cris-layout/cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component.spec.ts
@@ -13,7 +13,10 @@ import {
   TranslateLoader,
   TranslateModule,
 } from '@ngx-translate/core';
-import { BehaviorSubject } from 'rxjs';
+import {
+  BehaviorSubject,
+  of,
+} from 'rxjs';
 
 import { CrisLayoutTab } from '../../../../core/layout/models/tab.model';
 import { Item } from '../../../../core/shared/item.model';
@@ -101,6 +104,7 @@ describe('CrisLayoutNavbarComponent', () => {
       component.tabs = loaderMultilevelTabs;
       component.item = mockItem;
       component.activeTab$ = new BehaviorSubject<CrisLayoutTab>(loaderMultilevelTabs[0]);
+      component.isXsOrSm$ = of(true);
       component.ngOnInit();
       fixture.detectChanges();
     });
@@ -114,6 +118,7 @@ describe('CrisLayoutNavbarComponent', () => {
 
       beforeEach(() => {
         windowServiceStub.setWidth(400);
+        component.ngOnInit();
         fixture.detectChanges();
       });
 
diff --git a/src/app/cris-layout/cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component.ts b/src/app/cris-layout/cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component.ts
index ed0c3ed28d3..6ddd34f083f 100644
--- a/src/app/cris-layout/cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component.ts
+++ b/src/app/cris-layout/cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component.ts
@@ -13,6 +13,7 @@ import {
   Output,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
 
 import { CrisLayoutTab } from '../../../../core/layout/models/tab.model';
 import { Item } from '../../../../core/shared/item.model';
@@ -59,8 +60,11 @@ export class CrisLayoutNavbarComponent extends CrisLayoutTabsComponent implement
 
   windowService = inject(HostWindowService);
 
+  isXsOrSm$: Observable<boolean>;
+
   ngOnInit(): void {
     this.init();
+    this.isXsOrSm$ = this.windowService.isXsOrSm();
   }
 
   emitSelected(selectedTab) {
diff --git a/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-sidebar/cris-layout-sidebar.component.html b/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-sidebar/cris-layout-sidebar.component.html
index 250bf88acf0..63fe4ba6e26 100644
--- a/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-sidebar/cris-layout-sidebar.component.html
+++ b/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-sidebar/cris-layout-sidebar.component.html
@@ -1,6 +1,6 @@
-<div class="wrapper d-flex align-items-stretch" [ngClass]="{'wrapper-close': (isSideBarHidden() | async) !== true,
-                                                            'container': (hasSidebar() | async) }">
-  <nav id="sidebar" *ngIf="(hasSidebar() | async) && (isSideBarHidden() | async) !== true && showNav" [ngClass]="{'active': (isSideBarHidden() | async) !== true}">
+<div class="wrapper d-flex align-items-stretch" [ngClass]="{'wrapper-close': (isSideBarHidden$ | async) !== true,
+                                                            'container': (hasSidebar$ | async) }">
+  <nav id="sidebar" *ngIf="(hasSidebar$ | async) && (isSideBarHidden$ | async) !== true && showNav" [ngClass]="{'active': (isSideBarHidden$ | async) !== true}">
     <div>
       <ul class="list-unstyled components mb-5">
         <ng-container *ngIf="!!(activeTab$ |async)">
@@ -11,17 +11,17 @@
     </div>
   </nav>
   <div id="content" class="position-relative w-100 pr-0 pt-3 pb-3" [ngClass]="{
-	    'p-0': (hasSidebar() | async) !== true,
-	    'pl-3': (isSideBarHidden() | async) !== true,
-	    'pl-0': (isSideBarHidden() | async) === true
+	    'p-0': (hasSidebar$ | async) !== true,
+	    'pl-3': (isSideBarHidden$ | async) !== true,
+	    'pl-0': (isSideBarHidden$ | async) === true
 	    }">
 
-    <div *ngIf="(hasSidebar() | async)">
+    <div *ngIf="(hasSidebar$ | async)">
       <button type="button" class="btn btn-link menu-toggle" (click)="toggleSidebar()">
-        <i class="fa fa-chevron-circle-{{(isSideBarHidden() | async) ? 'right' : 'left'}} fa-2x" aria-hidden="true"></i>
+        <i class="fa fa-chevron-circle-{{(isSideBarHidden$ | async) ? 'right' : 'left'}} fa-2x" aria-hidden="true"></i>
       </button>
     </div>
-    <div class="d-flex flex-column" [ngClass]="{'pl-4': (hasSidebar() | async)}">
+    <div class="d-flex flex-column" [ngClass]="{'pl-4': (hasSidebar$ | async)}">
       <ng-content></ng-content>
     </div>
 
diff --git a/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-sidebar/cris-layout-sidebar.component.ts b/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-sidebar/cris-layout-sidebar.component.ts
index 97f0c863150..ac50d69737d 100644
--- a/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-sidebar/cris-layout-sidebar.component.ts
+++ b/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-sidebar/cris-layout-sidebar.component.ts
@@ -60,13 +60,14 @@ export class CrisLayoutSidebarComponent extends CrisLayoutTabsComponent implemen
   /**
    * A boolean representing if to render or not the sidebar menu
    */
-  private hasSidebar$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+  hasSidebar$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   /**
    * This parameter define the status of sidebar (hide/show)
    */
   private sidebarStatus$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
+  isSideBarHidden$: Observable<boolean>;
 
   ngOnInit(): void {
     this.init();
@@ -79,6 +80,7 @@ export class CrisLayoutSidebarComponent extends CrisLayoutTabsComponent implemen
 
     // Init the sidebar status
     this.sidebarStatus$.next(this.hasSidebar$.value);
+    this.isSideBarHidden$ = this.isSideBarHidden();
   }
 
   /**
diff --git a/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-vertical.component.html b/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-vertical.component.html
index a6c02c6ad75..d0571217339 100644
--- a/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-vertical.component.html
+++ b/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-vertical.component.html
@@ -1,5 +1,5 @@
 <div id="cris-layout-loader">
-  <div *ngIf="(windowService.isXsOrSm() | async) !== true" class="vertical-layout">
+  <div *ngIf="(isXsOrSm$ | async) !== true" class="vertical-layout">
     <ds-cris-layout-sidebar (selectedTabChange)="selectedTabChanged($event)" [showNav]="tabs.length > 1" [tabs]="tabs" [item]="item">
       <div *ngIf="showContextMenu" class="container text-right mb-3" [class.px-0]="tabs?.length > 1">
         <ds-context-menu [contextMenuObject]="item" [contextMenuObjectType]="'ITEM'"></ds-context-menu>
@@ -8,7 +8,7 @@
     </ds-cris-layout-sidebar>
   </div>
 
-  <div *ngIf="(windowService.isXsOrSm() | async)" class="horizontal-layout">
+  <div *ngIf="(isXsOrSm$ | async)" class="horizontal-layout">
     <ds-cris-layout-navbar [showNav]="(tabs.length - leadingTabs.length) > 1" (selectedTabChange)="selectedTabChanged($event)"
       [tabs]="tabs" [item]="item"></ds-cris-layout-navbar>
     <div class="container pt-4">
diff --git a/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-vertical.component.ts b/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-vertical.component.ts
index d20e72bb05c..12347bab47e 100644
--- a/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-vertical.component.ts
+++ b/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-vertical.component.ts
@@ -6,7 +6,10 @@ import {
   Component,
   Input,
 } from '@angular/core';
-import { BehaviorSubject } from 'rxjs';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
 
 import { CrisLayoutTab } from '../../../core/layout/models/tab.model';
 import { Item } from '../../../core/shared/item.model';
@@ -54,8 +57,10 @@ export class CrisLayoutVerticalComponent {
 
 
   selectedTab$: BehaviorSubject<CrisLayoutTab> = new BehaviorSubject<CrisLayoutTab>(null);
+  isXsOrSm$: Observable<boolean>;
 
   constructor(public windowService: HostWindowService) {
+    this.isXsOrSm$ = this.windowService.isXsOrSm();
   }
 
   selectedTabChanged(tab: CrisLayoutTab) {
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component.html
index 50584b04c41..f4c1b9f5137 100644
--- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component.html
+++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component.html
@@ -1,7 +1,7 @@
 <ng-container *ngFor="let metric of metricRow.metrics">
   <ng-container *ngIf="metric">
      <ds-metric-loader [metric]="metric"
-                       [class.d-none]="(isHidden(metric.id) | async)"
+                       [class.d-none]="isHidden(metric.id)"
                        (hide)="toggleVisibility(metric.id, $event)"></ds-metric-loader>
   </ng-container>
 </ng-container>
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component.ts
index 97f7f0e47b3..0a05d454870 100644
--- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component.ts
+++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component.ts
@@ -7,11 +7,7 @@ import {
   Component,
   Input,
 } from '@angular/core';
-import {
-  BehaviorSubject,
-  Observable,
-  of,
-} from 'rxjs';
+import { BehaviorSubject } from 'rxjs';
 
 import { CrisLayoutMetricRow } from '../../../../../../core/layout/models/tab.model';
 import { MetricLoaderComponent } from '../../../../../../shared/metric/metric-loader/metric-loader.component';
@@ -46,11 +42,11 @@ export class MetricRowComponent {
     this.isVisible$.next(newMap);
   }
 
-  isHidden(metricId): Observable<boolean> {
+  isHidden(metricId): boolean {
     if (this.isVisible$.value.has(metricId)) {
-      return of(this.isVisible$.value.get(metricId));
+      return this.isVisible$.value.get(metricId);
     } else {
-      return of(false);
+      return false;
     }
   }
 }
diff --git a/src/app/item-page/alerts/item-alerts.component.html b/src/app/item-page/alerts/item-alerts.component.html
index e949cf10ef3..0ad811907cb 100644
--- a/src/app/item-page/alerts/item-alerts.component.html
+++ b/src/app/item-page/alerts/item-alerts.component.html
@@ -8,7 +8,7 @@
                 <span class="align-self-center">{{'item.alerts.withdrawn' | translate}}</span>
                 <div class="gap-2 d-flex">
                   <a *ngIf="(isAdministrator$ | async) !== true" routerLink="/home" class="btn btn-primary btn-sm">{{"404.link.home-page" | translate}}</a>
-                  <a *ngIf="showReinstateButton$() | async" class="btn btn-primary btn-sm" (click)="openReinstateModal()">{{ 'item.alerts.reinstate-request' | translate}}</a>
+                  <a *ngIf="showReinstateButton$ | async" class="btn btn-primary btn-sm" (click)="openReinstateModal()">{{ 'item.alerts.reinstate-request' | translate}}</a>
                 </div>
             </div>
         </ds-alert>
diff --git a/src/app/item-page/alerts/item-alerts.component.spec.ts b/src/app/item-page/alerts/item-alerts.component.spec.ts
index 88229608648..98d160979e7 100644
--- a/src/app/item-page/alerts/item-alerts.component.spec.ts
+++ b/src/app/item-page/alerts/item-alerts.component.spec.ts
@@ -45,7 +45,9 @@ describe('ItemAlertsComponent', () => {
   beforeEach(waitForAsync(() => {
     authorizationService = jasmine.createSpyObj('authorizationService', ['isAuthorized']);
     dsoWithdrawnReinstateModalService = jasmine.createSpyObj('dsoWithdrawnReinstateModalService', ['openCreateWithdrawnReinstateModal']);
-    correctionTypeDataService = jasmine.createSpyObj('correctionTypeDataService',  ['findByItem']);
+    correctionTypeDataService = jasmine.createSpyObj('correctionTypeDataService',  {
+      findByItem: createSuccessfulRemoteDataObject$([]),
+    });
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), ItemAlertsComponent, NoopAnimationsModule],
       providers: [
@@ -73,6 +75,7 @@ describe('ItemAlertsComponent', () => {
         isDiscoverable: true,
       });
       component.item = item;
+      (correctionTypeDataService.findByItem).and.returnValue(createSuccessfulRemoteDataObject$([]));
       fixture.detectChanges();
     });
 
@@ -87,6 +90,7 @@ describe('ItemAlertsComponent', () => {
       item = Object.assign(new Item(), {
         isDiscoverable: false,
       });
+      (correctionTypeDataService.findByItem).and.returnValue(createSuccessfulRemoteDataObject$([]));
       component.item = item;
       fixture.detectChanges();
     });
@@ -146,23 +150,13 @@ describe('ItemAlertsComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should return true when user is not an admin and there is at least one correction with topic REQUEST_REINSTATE', () => {
-      testScheduler.run(({ cold, expectObservable }) => {
-        const isAdminMarble = 'a';
-        const correctionMarble = 'b';
-        const expectedMarble = 'c';
-
-        const isAdminValues = { a: false };
-        const correctionValues = { b: correctionRD };
-        const expectedValues = { c: true };
-
-        const isAdmin$ = cold(isAdminMarble, isAdminValues);
-        const correction$ = cold(correctionMarble, correctionValues);
-
-        (authorizationService.isAuthorized).and.returnValue(isAdmin$);
-        (correctionTypeDataService.findByItem).and.returnValue(correction$);
+    it('should return true when user is not an admin and there is at least one correction with topic REQUEST_REINSTATE', (done) => {
 
-        expectObservable(component.showReinstateButton$()).toBe(expectedMarble, expectedValues);
+      (authorizationService.isAuthorized).and.returnValue(of(false));
+      component.ngOnInit();
+      component.showReinstateButton$.subscribe(value => {
+        expect(value).toBeTruthy();
+        done();
       });
     });
 
diff --git a/src/app/item-page/alerts/item-alerts.component.ts b/src/app/item-page/alerts/item-alerts.component.ts
index 74f6733213e..16595926918 100644
--- a/src/app/item-page/alerts/item-alerts.component.ts
+++ b/src/app/item-page/alerts/item-alerts.component.ts
@@ -59,6 +59,7 @@ export class ItemAlertsComponent implements OnInit {
   public AlertTypeEnum = AlertType;
 
   isAdministrator$: Observable<boolean>;
+  showReinstateButton$: Observable<boolean>;
 
   constructor(
     private authService: AuthorizationDataService,
@@ -69,6 +70,7 @@ export class ItemAlertsComponent implements OnInit {
 
   ngOnInit() {
     this.isAdministrator$ = this.authService.isAuthorized(FeatureID.AdministratorOf);
+    this.showReinstateButton$ = this.showReinstateButton();
   }
 
   /**
@@ -76,7 +78,7 @@ export class ItemAlertsComponent implements OnInit {
    * The button is shown if the user is not an admin and the item has a reinstate request.
    * @returns An Observable that emits a boolean value indicating whether to show the reinstate button.
    */
-  showReinstateButton$(): Observable<boolean>  {
+  showReinstateButton(): Observable<boolean>  {
     const correction$ = this.correctionTypeDataService.findByItem(this.item.uuid, true).pipe(
       getFirstCompletedRemoteData(),
       map((correctionTypeRD: RemoteData<PaginatedList<CorrectionType>>) => correctionTypeRD.hasSucceeded ? correctionTypeRD.payload.page : []),
diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html
index 7f121081f2c..e874663a7ce 100644
--- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html
+++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html
@@ -1,7 +1,7 @@
 <div class="container">
   <ds-alert [type]="'alert-info'" [content]="'item.edit.authorizations.heading'"></ds-alert>
   <ds-resource-policies [resourceType]="'item'" [resourceName]="(getItemName() | async)"
-    [resourceUUID]="(getItemUUID() | async)">
+    [resourceUUID]="(itemUuid$ | async)">
   </ds-resource-policies>
   <ng-container *ngFor="let bundle of (bundles$ | async); trackById">
     <ds-resource-policies [resourceType]="'bundle'" [resourceUUID]="bundle.id" [resourceName]="bundle.name">
diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
index 30d1fce2bce..6ecc3217136 100644
--- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
+++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
@@ -127,6 +127,8 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
    */
   bitstreamSize = 4;
 
+  itemUuid$: Observable<string>;
+
   /**
    * The size of the loaded bitstremas at a certain moment
    * @private
@@ -152,6 +154,7 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
    */
   ngOnInit(): void {
     this.getBundlesPerItem();
+    this.itemUuid$ = this.getItemUUID();
   }
 
   /**
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 7b0cc466474..cfef2f2987e 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -86,9 +86,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
    */
   entityType$: BehaviorSubject<ItemType> = new BehaviorSubject(undefined);
 
-  get isSaving$(): BehaviorSubject<boolean> {
-    return this.editItemRelationshipsService.isSaving$;
-  }
+  isSaving$: BehaviorSubject<boolean>;
 
   readonly AlertType = AlertType;
 
@@ -109,6 +107,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
     protected editItemRelationshipsService: EditItemRelationshipsService,
   ) {
     super(itemService, objectUpdatesService, router, notificationsService, translateService, route);
+    this.isSaving$ = this.editItemRelationshipsService.isSaving$;
   }
 
   /**
diff --git a/src/app/item-page/field-components/collections/collections.component.html b/src/app/item-page/field-components/collections/collections.component.html
index 7c08ce5c1cc..cfcf34a2d2f 100644
--- a/src/app/item-page/field-components/collections/collections.component.html
+++ b/src/app/item-page/field-components/collections/collections.component.html
@@ -1,6 +1,6 @@
 <ds-metadata-field-wrapper [label]="label | translate">
     <div class="collections">
-        <a *ngFor="let collection of (this.collections$ | async); let last=last;" [routerLink]="['/collections', collection.id]">
+        <a *ngFor="let collection of (collections$ | async); let last=last;" [routerLink]="['/collections', collection.id]">
             <span>{{ dsoNameService.getName(collection) }}</span><span *ngIf="!last" [innerHTML]="separator"></span>
         </a>
     </div>
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
index b53c4003853..3751ee41071 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
@@ -1,18 +1,18 @@
 <div class="container mb-5">
   <h1>{{'person.orcid.registry.auth' | translate}}</h1>
-  <ng-container *ngIf="(isLinkedToOrcid() | async); then orcidLinked; else orcidNotLinked"></ng-container>
+  <ng-container *ngIf="(isOrcidLinked$ | async); then orcidLinked; else orcidNotLinked"></ng-container>
 </div>
 
 <ng-template #orcidLinked>
   <div data-test="orcidLinked">
     <div class="row">
-      <div *ngIf="(hasOrcidAuthorizations() | async)" class="col-sm-6 mb-3" data-test="hasOrcidAuthorizations">
+      <div *ngIf="(hasOrcidAuthorizations$ | async)" class="col-sm-6 mb-3" data-test="hasOrcidAuthorizations">
         <div class="card h-100">
           <div class="card-header">{{ 'person.page.orcid.granted-authorizations'| translate }}</div>
           <div class="card-body">
             <div class="container p-0">
               <ul>
-                <li *ngFor="let auth of (getOrcidAuthorizations() | async)" data-test="orcidAuthorization">
+                <li *ngFor="let auth of (profileAuthorizationScopes | async)" data-test="orcidAuthorization">
                   {{getAuthorizationDescription(auth) | translate}}
                 </li>
               </ul>
@@ -25,13 +25,13 @@ <h1>{{'person.orcid.registry.auth' | translate}}</h1>
           <div class="card-header">{{ 'person.page.orcid.missing-authorizations'| translate }}</div>
           <div class="card-body">
             <div class="container">
-              <ds-alert *ngIf="(hasMissingOrcidAuthorizations() | async) !== true" [type]="'alert-success'" data-test="noMissingOrcidAuthorizations">
+              <ds-alert *ngIf="(hasMissingOrcidAuthorizations$ | async) !== true" [type]="'alert-success'" data-test="noMissingOrcidAuthorizations">
                 {{'person.page.orcid.no-missing-authorizations-message' | translate}}
               </ds-alert>
-              <ds-alert *ngIf="(hasMissingOrcidAuthorizations() | async)" [type]="'alert-warning'" data-test="missingOrcidAuthorizations">
+              <ds-alert *ngIf="(hasMissingOrcidAuthorizations$ | async)" [type]="'alert-warning'" data-test="missingOrcidAuthorizations">
                 {{'person.page.orcid.missing-authorizations-message' | translate}}
                 <ul>
-                  <li *ngFor="let auth of (getMissingOrcidAuthorizations() | async)" data-test="missingOrcidAuthorization">
+                  <li *ngFor="let auth of (profileAuthorizationScopes | async)" data-test="missingOrcidAuthorization">
                     {{getAuthorizationDescription(auth) | translate }}
                   </li>
                 </ul>
@@ -41,11 +41,11 @@ <h1>{{'person.orcid.registry.auth' | translate}}</h1>
         </div>
       </div>
     </div>
-    <ds-alert *ngIf="(onlyAdminCanDisconnectProfileFromOrcid() | async) && (ownerCanDisconnectProfileFromOrcid() | async) !== true"
+    <ds-alert *ngIf="(onlyAdminCanDisconnectProfileFromOrcid$ | async) && (ownerCanDisconnectProfileFromOrcid$ | async) !== true"
               [type]="'alert-warning'" data-test="unlinkOnlyAdmin">
       {{ 'person.page.orcid.remove-orcid-message' | translate}}
     </ds-alert>
-    <div class="row" *ngIf="(ownerCanDisconnectProfileFromOrcid() | async)" data-test="unlinkOwner">
+    <div class="row" *ngIf="(ownerCanDisconnectProfileFromOrcid$ | async)" data-test="unlinkOwner">
       <div class="col">
         <button type="submit" class="btn btn-danger float-right" (click)="unlinkOrcid()"
                 [disabled]="(unlinkProcessing | async)">
@@ -54,7 +54,7 @@ <h1>{{'person.orcid.registry.auth' | translate}}</h1>
           <span *ngIf="(unlinkProcessing | async)"><i
             class='fas fa-circle-notch fa-spin'></i> {{'person.page.orcid.unlink.processing' | translate}}</span>
         </button>
-        <button *ngIf="(hasMissingOrcidAuthorizations() | async)" type="submit"
+        <button *ngIf="(hasMissingOrcidAuthorizations$ | async)" type="submit"
                 class="btn btn-primary float-right" (click)="linkOrcid()">
           <span><i class="fas fa-check"></i> {{ 'person.page.orcid.grant-authorizations' | translate }}</span>
         </button>
@@ -68,7 +68,7 @@ <h1>{{'person.orcid.registry.auth' | translate}}</h1>
     <div class="row">
       <div class="col-2"><img alt="orcid-logo" src="../../../../assets/images/orcid.logo.icon.svg"/></div>
       <div class="col">
-        <ds-alert [type]="'alert-info'">{{ getOrcidNotLinkedMessage() | async }}</ds-alert>
+        <ds-alert [type]="'alert-info'">{{ orcidNotLinkedMessage$ | async }}</ds-alert>
       </div>
     </div>
     <div class="row">
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
index 5825ecc4e4d..cf6655ea492 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
@@ -78,18 +78,29 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
   /**
    * A boolean representing if orcid profile is linked
    */
-  private isOrcidLinked$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+  isOrcidLinked$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+
+  /**
+   * A boolean representing if user has authorizations
+   */
+  hasOrcidAuthorizations$: Observable<boolean>;
+
+  /**
+   * A boolean representing if user has missing authorizations
+   */
+  hasMissingOrcidAuthorizations$: Observable<boolean>;
 
   /**
    * A boolean representing if only admin can disconnect orcid profile
    */
-  private onlyAdminCanDisconnectProfileFromOrcid$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+  onlyAdminCanDisconnectProfileFromOrcid$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   /**
    * A boolean representing if owner can disconnect orcid profile
    */
-  private ownerCanDisconnectProfileFromOrcid$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+  ownerCanDisconnectProfileFromOrcid$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
+  orcidNotLinkedMessage$: Observable<string>;
   /**
    * An event emitted when orcid profile is unliked successfully
    */
@@ -116,44 +127,6 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
     }
   }
 
-  /**
-   * Check if the list of exposed orcid authorization scopes for the orcid profile has values
-   */
-  hasOrcidAuthorizations(): Observable<boolean> {
-    return this.profileAuthorizationScopes.asObservable().pipe(
-      map((scopes: string[]) => scopes.length > 0),
-    );
-  }
-
-  /**
-   * Return the list of exposed orcid authorization scopes for the orcid profile
-   */
-  getOrcidAuthorizations(): Observable<string[]> {
-    return this.profileAuthorizationScopes.asObservable();
-  }
-
-  /**
-   * Check if the list of exposed orcid authorization scopes for the orcid profile has values
-   */
-  hasMissingOrcidAuthorizations(): Observable<boolean> {
-    return this.missingAuthorizationScopes.asObservable().pipe(
-      map((scopes: string[]) => scopes.length > 0),
-    );
-  }
-
-  /**
-   * Return the list of exposed orcid authorization scopes for the orcid profile
-   */
-  getMissingOrcidAuthorizations(): Observable<string[]> {
-    return this.profileAuthorizationScopes.asObservable();
-  }
-
-  /**
-   * Return a boolean representing if orcid profile is linked
-   */
-  isLinkedToOrcid(): Observable<boolean> {
-    return this.isOrcidLinked$.asObservable();
-  }
 
   getOrcidNotLinkedMessage(): Observable<string> {
     const orcid = this.item.firstMetadataValue('person.identifier.orcid');
@@ -233,6 +206,13 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
     });
 
     this.isOrcidLinked$.next(this.orcidAuthService.isLinkedToOrcid(this.item));
+    this.hasOrcidAuthorizations$ =  this.profileAuthorizationScopes.pipe(
+      map((scopes: string[]) => scopes.length > 0),
+    );
+    this.hasMissingOrcidAuthorizations$ = this.missingAuthorizationScopes.pipe(
+      map((scopes: string[]) => scopes.length > 0),
+    );
+    this.orcidNotLinkedMessage$ = this.getOrcidNotLinkedMessage();
   }
 
   private setMissingOrcidAuthorizations(): void {
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
index e9d9ec035ba..8d33e5bba96 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
@@ -3,13 +3,13 @@
   <div class="container">
     <h2>{{ 'person.orcid.registry.queue' | translate }}</h2>
 
-    <ds-alert *ngIf="(processing$ | async) !== true && (getList() | async)?.payload?.totalElements === 0"
+    <ds-alert *ngIf="(processing$ | async) !== true && (list$ | async)?.payload?.totalElements === 0"
               [type]="AlertTypeEnum.Info">
       {{ 'person.page.orcid.sync-queue.empty-message' | translate}}
     </ds-alert>
-    <ds-pagination *ngIf="(processing$ | async) !== true && (getList() | async)?.payload?.totalElements > 0"
+    <ds-pagination *ngIf="(processing$ | async) !== true && (list$ | async)?.payload?.totalElements > 0"
                    [paginationOptions]="paginationOptions"
-                   [collectionSize]="(getList() | async)?.payload?.totalElements"
+                   [collectionSize]="(list$ | async)?.payload?.totalElements"
                    [retainScrollPosition]="false" [hideGear]="true" (paginationChange)="updateList()">
 
       <div class="table-responsive">
@@ -22,7 +22,7 @@ <h2>{{ 'person.orcid.registry.queue' | translate }}</h2>
           </tr>
           </thead>
           <tbody>
-          <tr *ngFor="let entry of (getList() | async)?.payload?.page" data-test="orcidQueueElementRow">
+          <tr *ngFor="let entry of (list$ | async)?.payload?.page" data-test="orcidQueueElementRow">
             <td style="width: 15%" class="text-center align-middle">
               <i [ngClass]="getIconClass(entry)" [ngbTooltip]="getIconTooltip(entry) | translate"
                  class="fa-2x" aria-hidden="true"></i>
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
index 5205a006ce3..47704c0da74 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
@@ -76,7 +76,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
   /**
    * A list of orcid queue records
    */
-  private list$: BehaviorSubject<RemoteData<PaginatedList<OrcidQueue>>> = new BehaviorSubject<RemoteData<PaginatedList<OrcidQueue>>>({} as any);
+  list$: BehaviorSubject<RemoteData<PaginatedList<OrcidQueue>>> = new BehaviorSubject<RemoteData<PaginatedList<OrcidQueue>>>({} as any);
 
   /**
    * The AlertType enumeration
diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.html b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.html
index f45d4657a46..80264af2b6c 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.html
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.html
@@ -5,7 +5,7 @@
     [label]="label"
     [enableMarkdown]="enableMarkdown"
     [urlRegex]="urlRegex"
-    [browseDefinition]="browseDefinition|async"
+    [browseDefinition]="browseDefinition$ | async"
     [img]="img"
   ></ds-metadata-values>
 </div>
diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
index 58521569f15..af50769347f 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
@@ -2,6 +2,7 @@ import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
+  OnInit,
 } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -28,11 +29,7 @@ import { ImageField } from './image-field';
   ],
   standalone: true,
 })
-export class ItemPageFieldComponent {
-
-  constructor(protected browseDefinitionDataService: BrowseDefinitionDataService) {
-  }
-
+export class ItemPageFieldComponent implements OnInit {
     /**
      * The item to display metadata for
      */
@@ -46,7 +43,7 @@ export class ItemPageFieldComponent {
     /**
      * Fields (schema.element.qualifier) used to render their values.
      */
-    fields: string[];
+    fields: string[] = [];
 
     /**
      * Label i18n key for the rendered metadata
@@ -69,12 +66,16 @@ export class ItemPageFieldComponent {
      */
     img: ImageField;
 
+    browseDefinition$: Observable<BrowseDefinition>;
+
     /**
-     * Return browse definition that matches any field used in this component if it is configured as a browse
-     * link in dspace.cfg (webui.browse.link.<n>)
-     */
-    get browseDefinition(): Observable<BrowseDefinition> {
-      return this.browseDefinitionDataService.findByFields(this.fields).pipe(
+   * Return browse definition that matches any field used in this component if it is configured as a browse
+   * link in dspace.cfg (webui.browse.link.<n>)
+   */
+    constructor(protected browseDefinitionDataService: BrowseDefinitionDataService) {}
+
+    ngOnInit() {
+      this.browseDefinition$ =  this.browseDefinitionDataService.findByFields(this.fields).pipe(
         getFirstCompletedRemoteData(),
         map((def) => def.payload),
       );
diff --git a/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html
index c0e5e83b333..556a78eec52 100644
--- a/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html
+++ b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="(this.submitted$ | async) !== true; else waiting">
+<div *ngIf="(submitted$ | async) !== true; else waiting">
   <div class="modal-header">{{'item.version.create.modal.header' | translate}}
     <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
       <span aria-hidden="true">×</span>
diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
index e9ea3bb0f95..86675bc522a 100644
--- a/src/app/item-page/versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -51,7 +51,7 @@ <h2 *ngIf="displayTitle" class="h4">{{"item.version.history.head" | translate}}<
 
               <div class="float-right btn-group edit-field space-children-mr" *ngIf="displayActions">
                 <!--DISCARD EDIT -->
-                <ng-container *ngIf="(canEditVersion$(version) | async) && isThisBeingEdited(version)">
+                <ng-container *ngIf="(version.self | dsCanEditVersion | async) && isThisBeingEdited(version)">
                   <button class="btn btn-sm"
                           [ngClass]="isThisBeingEdited(version) ? 'btn-outline-warning' : 'btn-outline-primary'"
                           (click)="disableVersionEditing()"
@@ -60,7 +60,7 @@ <h2 *ngIf="displayTitle" class="h4">{{"item.version.history.head" | translate}}<
                   </button>
                 </ng-container>
                 <!--EDIT / SAVE-->
-                <ng-container *ngIf="canEditVersion$(version) | async">
+                <ng-container *ngIf="(version.self | dsCanEditVersion | async)">
                   <button class="btn btn-outline-primary btn-sm version-row-element-edit"
                           *ngIf="!isThisBeingEdited(version)"
                           [disabled]="isAnyBeingEdited()"
diff --git a/src/app/item-page/versions/item-versions.component.ts b/src/app/item-page/versions/item-versions.component.ts
index 2eebbf86552..8daeacfaca4 100644
--- a/src/app/item-page/versions/item-versions.component.ts
+++ b/src/app/item-page/versions/item-versions.component.ts
@@ -62,6 +62,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { CanEditVersionPipe } from '../../shared/utils/can-edit-version.pipe';
 import { followLink } from '../../shared/utils/follow-link-config.model';
 import { VarDirective } from '../../shared/utils/var.directive';
 import {
@@ -76,7 +77,7 @@ import { ItemVersionsRowElementVersionComponent } from './item-versions-row-elem
   templateUrl: './item-versions.component.html',
   styleUrls: ['./item-versions.component.scss'],
   standalone: true,
-  imports: [VarDirective, NgIf, AlertComponent, PaginationComponent, NgFor, RouterLink, NgClass, FormsModule, AsyncPipe, DatePipe, TranslateModule, ItemVersionsRowElementVersionComponent],
+  imports: [VarDirective, NgIf, AlertComponent, PaginationComponent, NgFor, RouterLink, NgClass, FormsModule, AsyncPipe, DatePipe, TranslateModule, ItemVersionsRowElementVersionComponent, CanEditVersionPipe],
 })
 
 /**
diff --git a/src/app/item-page/versions/notice/item-versions-notice.component.html b/src/app/item-page/versions/notice/item-versions-notice.component.html
index 90502c5df78..271d0426a95 100644
--- a/src/app/item-page/versions/notice/item-versions-notice.component.html
+++ b/src/app/item-page/versions/notice/item-versions-notice.component.html
@@ -1,5 +1,5 @@
 <ds-alert *ngIf="(showLatestVersionNotice$ | async) === true"
-          [content]="('item.version.notice' | translate:{ destination: getItemPage(((latestVersion$ | async)?.item | async)?.payload) })"
+          [content]="('item.version.notice' | translate:{ destination: destinationPage$ | async })"
           [dismissible]="false"
           [type]="AlertTypeEnum.Warning">
 </ds-alert>
diff --git a/src/app/item-page/versions/notice/item-versions-notice.component.ts b/src/app/item-page/versions/notice/item-versions-notice.component.ts
index c136d3f06f4..18ec29e1cf6 100644
--- a/src/app/item-page/versions/notice/item-versions-notice.component.ts
+++ b/src/app/item-page/versions/notice/item-versions-notice.component.ts
@@ -84,6 +84,8 @@ export class ItemVersionsNoticeComponent implements OnInit {
    */
   public AlertTypeEnum = AlertType;
 
+  destinationPage$: Observable<string>;
+
   constructor(private versionHistoryService: VersionHistoryDataService) {
   }
 
@@ -125,6 +127,10 @@ export class ItemVersionsNoticeComponent implements OnInit {
         startWith(false),
       );
     }
+    this.destinationPage$ = this.latestVersion$.pipe(
+      switchMap(version => version.item),
+      map(item => this.getItemPage(item.payload)),
+    );
   }
 
   /**
diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
index 01a71ab142b..76f31425c05 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
@@ -1,4 +1,4 @@
 <p *ngIf="content" class="d-flex flex-wrap gapx-2 text-break">
   <span class="mb-0" *ngIf="title">{{ title | translate }}</span>
-  <a [href]="getHandle()">{{getHandle()}}</a>
+  <a [href]="content">{{content}}</a>
 </p>
diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
index 538ed51a328..3addc360a73 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
@@ -27,7 +27,4 @@ export class ComcolPageHandleComponent {
   // The value of "handle"
   @Input() content: string;
 
-  public getHandle(): string {
-    return this.content;
-  }
 }
diff --git a/src/app/shared/context-menu/audit-item/audit-item-menu.component.html b/src/app/shared/context-menu/audit-item/audit-item-menu.component.html
index 6b0c14501ae..d18300bc17b 100644
--- a/src/app/shared/context-menu/audit-item/audit-item-menu.component.html
+++ b/src/app/shared/context-menu/audit-item/audit-item-menu.component.html
@@ -1,4 +1,4 @@
-<button *ngIf="(isAuthorized | async)" class="dropdown-item"
+<button *ngIf="(isAuthorized$ | async)" class="dropdown-item"
         [innerHTML]="'context-menu.actions.audit-item.btn' | translate"
         [routerLink]="['/auditlogs/object/', contextMenuObject.id]">
 </button>
diff --git a/src/app/shared/context-menu/audit-item/audit-item-menu.component.ts b/src/app/shared/context-menu/audit-item/audit-item-menu.component.ts
index 68cab1e113b..d131671f970 100644
--- a/src/app/shared/context-menu/audit-item/audit-item-menu.component.ts
+++ b/src/app/shared/context-menu/audit-item/audit-item-menu.component.ts
@@ -10,10 +10,13 @@ import {
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import {
-  BehaviorSubject,
   combineLatest,
+  Observable,
 } from 'rxjs';
-import { take } from 'rxjs/operators';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
 
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
@@ -38,7 +41,7 @@ import { ContextMenuEntryType } from '../context-menu-entry-type';
 })
 export class AuditItemMenuComponent extends ContextMenuEntryComponent implements OnInit {
 
-  public isAuthorized: BehaviorSubject<boolean> =  new BehaviorSubject<boolean>(false);
+  public isAuthorized$: Observable<boolean>;
 
   constructor(
     @Inject('contextMenuObjectProvider') protected injectedContextMenuObject: DSpaceObject,
@@ -49,7 +52,7 @@ export class AuditItemMenuComponent extends ContextMenuEntryComponent implements
   }
 
   ngOnInit(): void {
-    combineLatest(
+    this.isAuthorized$ = combineLatest(
       [
         this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
         this.authorizationService.isAuthorized(FeatureID.IsCollectionAdmin),
@@ -57,8 +60,7 @@ export class AuditItemMenuComponent extends ContextMenuEntryComponent implements
       ],
     ).pipe(
       take(1),
-    ).subscribe(([isAdmin, isCollectionAdmin, isCommunityAdmin]) => {
-      this.isAuthorized.next(isAdmin || isCommunityAdmin || isCollectionAdmin);
-    });
+      map(([isAdmin, isCollectionAdmin, isCommunityAdmin]) => isAdmin || isCollectionAdmin || isCommunityAdmin),
+    );
   }
 }
diff --git a/src/app/shared/context-menu/bulk-import/bulk-import-menu.component.html b/src/app/shared/context-menu/bulk-import/bulk-import-menu.component.html
index 7b6c3593e86..70ee745beba 100644
--- a/src/app/shared/context-menu/bulk-import/bulk-import-menu.component.html
+++ b/src/app/shared/context-menu/bulk-import/bulk-import-menu.component.html
@@ -1,3 +1,3 @@
-<button *ngIf="(isCollectionAdmin() | async)" class="dropdown-item"
+<button *ngIf="(isCollectionAdmin$ | async)" class="dropdown-item"
         [routerLink]="getBulkImportPageRouterLink()" [innerHTML]="'context-menu.actions.bulk-import.btn' | translate">
 </button>
diff --git a/src/app/shared/context-menu/bulk-import/bulk-import-menu.component.ts b/src/app/shared/context-menu/bulk-import/bulk-import-menu.component.ts
index 663efcce829..1ea828cba5b 100644
--- a/src/app/shared/context-menu/bulk-import/bulk-import-menu.component.ts
+++ b/src/app/shared/context-menu/bulk-import/bulk-import-menu.component.ts
@@ -37,6 +37,8 @@ import { ContextMenuEntryType } from '../context-menu-entry-type';
 })
 export class BulkImportMenuComponent extends ContextMenuEntryComponent implements OnInit {
 
+  isCollectionAdmin$: Observable<boolean>;
+
   /**
    * Initialize instance variables
    *
@@ -54,9 +56,7 @@ export class BulkImportMenuComponent extends ContextMenuEntryComponent implement
     super(injectedContextMenuObject, injectedContextMenuObjectType, ContextMenuEntryType.BulkImport);
   }
   ngOnInit() {
-    this.notificationService.claimedProfile.subscribe(() => {
-      this.isCollectionAdmin(false);
-    });
+    this.isCollectionAdmin$ = this.isCollectionAdmin(false);
   }
 
   /**
diff --git a/src/app/shared/context-menu/claim-item/claim-item-menu.component.html b/src/app/shared/context-menu/claim-item/claim-item-menu.component.html
index 9853f1f6179..34550ac034f 100644
--- a/src/app/shared/context-menu/claim-item/claim-item-menu.component.html
+++ b/src/app/shared/context-menu/claim-item/claim-item-menu.component.html
@@ -1,4 +1,4 @@
-<button *ngIf="(isClaimable() | async)" class="dropdown-item"
+<button *ngIf="(claimable$ | async)" class="dropdown-item"
         (click)="claim()">
   <ng-container *ngIf="(isProcessing$ | async) !== true else spinner">
     {{'context-menu.actions.claim.btn' | translate}}
diff --git a/src/app/shared/context-menu/dso-page-edit/dso-page-edit-menu.component.ts b/src/app/shared/context-menu/dso-page-edit/dso-page-edit-menu.component.ts
index f0216e76cea..71d32d729fd 100644
--- a/src/app/shared/context-menu/dso-page-edit/dso-page-edit-menu.component.ts
+++ b/src/app/shared/context-menu/dso-page-edit/dso-page-edit-menu.component.ts
@@ -15,7 +15,6 @@ import { AuthorizationDataService } from '../../../core/data/feature-authorizati
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
-import { NotificationsService } from '../../notifications/notifications.service';
 import { ContextMenuEntryComponent } from '../context-menu-entry.component';
 import { ContextMenuEntryType } from '../context-menu-entry-type';
 
@@ -53,15 +52,12 @@ export class DsoPageEditMenuComponent extends ContextMenuEntryComponent implemen
     @Inject('contextMenuObjectProvider') protected injectedContextMenuObject: DSpaceObject,
     @Inject('contextMenuObjectTypeProvider') protected injectedContextMenuObjectType: DSpaceObjectType,
     protected authorizationService: AuthorizationDataService,
-    private notificationService: NotificationsService,
   ) {
     super(injectedContextMenuObject, injectedContextMenuObjectType, ContextMenuEntryType.EditDSO);
   }
 
   ngOnInit() {
-    this.notificationService.claimedProfile.subscribe(() => {
-      this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanEditMetadata, this.contextMenuObject.self, undefined, false);
-    });
+    this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanEditMetadata, this.contextMenuObject.self, undefined, false);
   }
 
   /**
diff --git a/src/app/shared/context-menu/edit-item-relationships/edit-item-relationships-menu.component.html b/src/app/shared/context-menu/edit-item-relationships/edit-item-relationships-menu.component.html
index 10d6763a983..2149af28460 100644
--- a/src/app/shared/context-menu/edit-item-relationships/edit-item-relationships-menu.component.html
+++ b/src/app/shared/context-menu/edit-item-relationships/edit-item-relationships-menu.component.html
@@ -1,4 +1,4 @@
-<ng-container *ngIf="(isEditAvailable() | async)">
+<ng-container *ngIf="(isEditAvailable$ | async)">
   <a ngbDropdownItem class="link" *ngFor="let relation of relationships"
      [routerLink]="['/edit-item-relationships', contextMenuObject.id , relation.shortname]"
      [innerHTML]="relation.value ? (relation.value | translate) : ('context-menu.actions.edit-item-relationships.btn.' + relation.shortname | translate)">
diff --git a/src/app/shared/context-menu/edit-item-relationships/edit-item-relationships-menu.component.ts b/src/app/shared/context-menu/edit-item-relationships/edit-item-relationships-menu.component.ts
index 35d99dbcc8a..309cfd5363a 100644
--- a/src/app/shared/context-menu/edit-item-relationships/edit-item-relationships-menu.component.ts
+++ b/src/app/shared/context-menu/edit-item-relationships/edit-item-relationships-menu.component.ts
@@ -66,6 +66,8 @@ import { ContextMenuEntryType } from '../context-menu-entry-type';
 })
 export class EditItemRelationshipsMenuComponent extends ContextMenuEntryComponent implements OnInit, OnDestroy {
 
+  isEditAvailable$: Observable<boolean>;
+
   /**
    * A boolean representing if a request operation is pending
    * @type {BehaviorSubject<boolean>}
@@ -177,5 +179,7 @@ export class EditItemRelationshipsMenuComponent extends ContextMenuEntryComponen
       this.tabs = tabs;
       this.initBoxes();
     }));
+
+    this.isEditAvailable$ = this.isEditAvailable();
   }
 }
diff --git a/src/app/shared/context-menu/edit-item/edit-item-menu.component.html b/src/app/shared/context-menu/edit-item/edit-item-menu.component.html
index b385ad4d41b..1c01505e25d 100644
--- a/src/app/shared/context-menu/edit-item/edit-item-menu.component.html
+++ b/src/app/shared/context-menu/edit-item/edit-item-menu.component.html
@@ -1,6 +1,6 @@
-<ng-container *ngIf="(isEditAvailable() | async)">
+<ng-container *ngIf="(isEditAvailable$ | async)">
   <button ngbDropdownItem
-          *ngFor="let editMode of (getEditModes() | async)"
+          *ngFor="let editMode of (editModes$ | async)"
           [routerLink]="[getEditItemRoute(), contextMenuObject.id + ':' + editMode.name]"
           [innerHTML]="editMode.label ? (editMode.label | translate) : ('context-menu.actions.edit-item.btn.' + editMode.name | translate)">
   </button>
diff --git a/src/app/shared/context-menu/edit-item/edit-item-menu.component.ts b/src/app/shared/context-menu/edit-item/edit-item-menu.component.ts
index 0a5b175fcfc..e958945ac49 100644
--- a/src/app/shared/context-menu/edit-item/edit-item-menu.component.ts
+++ b/src/app/shared/context-menu/edit-item/edit-item-menu.component.ts
@@ -71,6 +71,8 @@ export class EditItemMenuComponent extends ContextMenuEntryComponent implements
    */
   public processing$ = new BehaviorSubject<boolean>(false);
 
+  isEditAvailable$: Observable<boolean>;
+
   /**
    * Reference to NgbModal
    */
@@ -80,7 +82,7 @@ export class EditItemMenuComponent extends ContextMenuEntryComponent implements
    * List of Edit Modes available on this item
    * for the current user
    */
-  private editModes$: BehaviorSubject<EditItemMode[]> = new BehaviorSubject<EditItemMode[]>([]);
+  editModes$: BehaviorSubject<EditItemMode[]> = new BehaviorSubject<EditItemMode[]>([]);
 
   /**
    * Variable to track subscription and unsubscribe it onDestroy
@@ -109,6 +111,10 @@ export class EditItemMenuComponent extends ContextMenuEntryComponent implements
     this.notificationService.claimedProfile.subscribe(() => {
       this.getData();
     });
+
+    this.isEditAvailable$ = this.editModes$.pipe(
+      map((editModes) => isNotEmpty(editModes) && editModes.length > 0),
+    );
   }
 
   /**
diff --git a/src/app/shared/context-menu/export-collection/export-collection-menu.component.html b/src/app/shared/context-menu/export-collection/export-collection-menu.component.html
index ce5aeca4f11..34c3acd34ac 100644
--- a/src/app/shared/context-menu/export-collection/export-collection-menu.component.html
+++ b/src/app/shared/context-menu/export-collection/export-collection-menu.component.html
@@ -1,4 +1,4 @@
-<button *ngIf="(isCollectionAdmin() | async)" class="dropdown-item"
+<button *ngIf="(isCollectionAdmin$ | async)" class="dropdown-item"
         [innerHTML]="'context-menu.actions.export-item.btn' | translate"
         (click)="$event.preventDefault();exportCollection();">
 </button>
diff --git a/src/app/shared/context-menu/export-collection/export-collection-menu.component.ts b/src/app/shared/context-menu/export-collection/export-collection-menu.component.ts
index 8b65ca6ae31..cbe773f6f06 100644
--- a/src/app/shared/context-menu/export-collection/export-collection-menu.component.ts
+++ b/src/app/shared/context-menu/export-collection/export-collection-menu.component.ts
@@ -5,6 +5,7 @@ import {
 import {
   Component,
   Inject,
+  OnInit,
 } from '@angular/core';
 import { Router } from '@angular/router';
 import {
@@ -43,7 +44,9 @@ import { ContextMenuEntryType } from '../context-menu-entry-type';
     TranslateModule,
   ],
 })
-export class ExportCollectionMenuComponent extends ContextMenuEntryComponent {
+export class ExportCollectionMenuComponent extends ContextMenuEntryComponent implements OnInit {
+
+  isCollectionAdmin$: Observable<boolean>;
 
   /**
    * Initialize instance variables
@@ -70,6 +73,10 @@ export class ExportCollectionMenuComponent extends ContextMenuEntryComponent {
     super(injectedContextMenuObject, injectedContextMenuObjectType, ContextMenuEntryType.ExportCollection);
   }
 
+  ngOnInit() {
+    this.isCollectionAdmin$ = this.isCollectionAdmin(false);
+  }
+
   /**
    * Launch a process to export collection
    */
@@ -88,9 +95,6 @@ export class ExportCollectionMenuComponent extends ContextMenuEntryComponent {
           this.notificationService.error(this.translationService.get('collection-export.error'));
         }
       });
-    this.notificationService.claimedProfile.subscribe(() => {
-      this.isCollectionAdmin(false);
-    });
   }
 
   /**
diff --git a/src/app/shared/context-menu/export-item/export-item-menu.component.html b/src/app/shared/context-menu/export-item/export-item-menu.component.html
index 094fc1aab59..86cc63848f2 100644
--- a/src/app/shared/context-menu/export-item/export-item-menu.component.html
+++ b/src/app/shared/context-menu/export-item/export-item-menu.component.html
@@ -1,4 +1,4 @@
-<button class="btn btn-primary" *ngIf="configuration?.formats?.length > 0"
+<button class="btn btn-primary" *ngIf="(configuration | async)?.formats?.length > 0"
         [innerHTML]="'context-menu.actions.export-item.btn' | translate"
         (click)="$event.preventDefault();openExportModal();">
 </button>
diff --git a/src/app/shared/context-menu/export-item/export-item-menu.component.spec.ts b/src/app/shared/context-menu/export-item/export-item-menu.component.spec.ts
index 5c5437ef29c..811d44db3f5 100644
--- a/src/app/shared/context-menu/export-item/export-item-menu.component.spec.ts
+++ b/src/app/shared/context-menu/export-item/export-item-menu.component.spec.ts
@@ -11,7 +11,10 @@ import {
   TranslateModule,
 } from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
-import { of as observableOf } from 'rxjs';
+import {
+  of as observableOf,
+  of,
+} from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
@@ -88,8 +91,8 @@ describe('ExportItemMenuComponent', () => {
 
   it('should render a button', () => {
     fixture.detectChanges();
-    component.configuration = configuration;
-    component.configuration.formats = [{ type: null, id: '1', mimeType: '1', entityType: 'Patent', molteplicity: '1', _links: null }];
+    const testConfig = { ...configuration, formats: [{ type: null, id: '1', mimeType: '1', entityType: 'Patent', molteplicity: '1', _links: null }] };
+    component.configuration = of(testConfig);
     fixture.detectChanges();
     const link = fixture.debugElement.query(By.css('button'));
     expect(link).not.toBeNull();
diff --git a/src/app/shared/context-menu/export-item/export-item-menu.component.ts b/src/app/shared/context-menu/export-item/export-item-menu.component.ts
index 9e178eaae13..6e244674ab1 100644
--- a/src/app/shared/context-menu/export-item/export-item-menu.component.ts
+++ b/src/app/shared/context-menu/export-item/export-item-menu.component.ts
@@ -1,10 +1,18 @@
-import { NgIf } from '@angular/common';
+import {
+  AsyncPipe,
+  NgIf,
+} from '@angular/common';
 import {
   Component,
   Inject,
+  OnInit,
 } from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
 import { take } from 'rxjs/operators';
 
 import { ItemExportFormatMolteplicity } from '../../../core/itemexportformat/item-export-format.service';
@@ -26,9 +34,9 @@ import { ContextMenuEntryType } from '../context-menu-entry-type';
   selector: 'ds-context-menu-export-item',
   templateUrl: './export-item-menu.component.html',
   standalone: true,
-  imports: [NgIf, TranslateModule],
+  imports: [NgIf, TranslateModule, AsyncPipe],
 })
-export class ExportItemMenuComponent extends ContextMenuEntryComponent {
+export class ExportItemMenuComponent extends ContextMenuEntryComponent implements OnInit {
 
   /**
    * Initialize instance variables
@@ -42,7 +50,7 @@ export class ExportItemMenuComponent extends ContextMenuEntryComponent {
   /**
    * Type of configuration in current component
    */
-  configuration: ItemExportFormConfiguration;
+  configuration: Observable<ItemExportFormConfiguration> = of(null);
   constructor(
     @Inject('contextMenuObjectProvider') protected injectedContextMenuObject: DSpaceObject,
     @Inject('contextMenuObjectTypeProvider') protected injectedContextMenuObjectType: DSpaceObjectType,
@@ -54,10 +62,7 @@ export class ExportItemMenuComponent extends ContextMenuEntryComponent {
 
   ngOnInit() {
     if (this.contextMenuObject) {
-      this.itemExportService.initialItemExportFormConfiguration(this.contextMenuObject as Item).pipe(take(1))
-        .subscribe( configuration => {
-          this.configuration = configuration;
-        });
+      this.configuration =  this.itemExportService.initialItemExportFormConfiguration(this.contextMenuObject as Item).pipe(take(1));
     }
   }
 
diff --git a/src/app/shared/context-menu/request-correction/request-correction-menu.component.html b/src/app/shared/context-menu/request-correction/request-correction-menu.component.html
index cd99e1a01ec..d7436c1d26b 100644
--- a/src/app/shared/context-menu/request-correction/request-correction-menu.component.html
+++ b/src/app/shared/context-menu/request-correction/request-correction-menu.component.html
@@ -1,4 +1,4 @@
-<button *ngIf="canCreateCorrection() | async" class="dropdown-item"
+<button *ngIf="canCreateCorrection$ | async" class="dropdown-item"
         [innerHTML]="'context-menu.actions.request-correction.btn' | translate"
         (click)="$event.preventDefault();openRequestModal(requestCorrectionModal);">
 </button>
diff --git a/src/app/shared/context-menu/request-correction/request-correction-menu.component.ts b/src/app/shared/context-menu/request-correction/request-correction-menu.component.ts
index ed42ba59b8a..d591f7712e6 100644
--- a/src/app/shared/context-menu/request-correction/request-correction-menu.component.ts
+++ b/src/app/shared/context-menu/request-correction/request-correction-menu.component.ts
@@ -57,6 +57,7 @@ import { ContextMenuEntryType } from '../context-menu-entry-type';
 })
 export class RequestCorrectionMenuComponent extends ContextMenuEntryComponent implements OnDestroy {
 
+  canCreateCorrection$: Observable<boolean>;
   /**
    * A boolean representing if a request operation is pending
    * @type {BehaviorSubject<boolean>}
@@ -132,9 +133,8 @@ export class RequestCorrectionMenuComponent extends ContextMenuEntryComponent im
         this.router.navigate(['workspaceitems', response.id, 'edit']);
       }
     });
-    this.notificationService.claimedProfile.subscribe(() => {
-      this.canCreateCorrection(false);
-    });
+
+    this.canCreateCorrection$ = this.canCreateCorrection(false);
   }
 
   /**
diff --git a/src/app/shared/utils/can-edit-version.pipe.ts b/src/app/shared/utils/can-edit-version.pipe.ts
new file mode 100644
index 00000000000..68069fa167a
--- /dev/null
+++ b/src/app/shared/utils/can-edit-version.pipe.ts
@@ -0,0 +1,20 @@
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+
+@Pipe({
+  name: 'dsCanEditVersion',
+  standalone: true,
+})
+export class CanEditVersionPipe implements PipeTransform {
+  constructor(private authorizationServcie: AuthorizationDataService) {
+  }
+  transform(href: string): Observable<boolean> {
+    return this.authorizationServcie.isAuthorized(FeatureID.CanEditVersion, href);
+  }
+}

From 731683a150fa25afca3f9d216b353a8abee831c0 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Fri, 29 Nov 2024 15:24:13 +0100
Subject: [PATCH 2/3] [DSC-2059] Fix unintentional changes

---
 .../audit-item/audit-item-menu.component.ts      | 16 +++++++---------
 .../bulk-import/bulk-import-menu.component.ts    |  5 ++++-
 .../export-collection-menu.component.ts          |  5 ++++-
 .../export-item/export-item-menu.component.html  |  2 +-
 .../export-item-menu.component.spec.ts           |  2 +-
 .../export-item/export-item-menu.component.ts    | 11 +++++------
 .../request-correction-menu.component.ts         |  5 ++++-
 7 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/app/shared/context-menu/audit-item/audit-item-menu.component.ts b/src/app/shared/context-menu/audit-item/audit-item-menu.component.ts
index d131671f970..071d749abcd 100644
--- a/src/app/shared/context-menu/audit-item/audit-item-menu.component.ts
+++ b/src/app/shared/context-menu/audit-item/audit-item-menu.component.ts
@@ -10,13 +10,10 @@ import {
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import {
+  BehaviorSubject,
   combineLatest,
-  Observable,
 } from 'rxjs';
-import {
-  map,
-  take,
-} from 'rxjs/operators';
+import { take } from 'rxjs/operators';
 
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
@@ -41,7 +38,7 @@ import { ContextMenuEntryType } from '../context-menu-entry-type';
 })
 export class AuditItemMenuComponent extends ContextMenuEntryComponent implements OnInit {
 
-  public isAuthorized$: Observable<boolean>;
+  public isAuthorized$: BehaviorSubject<boolean> =  new BehaviorSubject<boolean>(false);
 
   constructor(
     @Inject('contextMenuObjectProvider') protected injectedContextMenuObject: DSpaceObject,
@@ -52,7 +49,7 @@ export class AuditItemMenuComponent extends ContextMenuEntryComponent implements
   }
 
   ngOnInit(): void {
-    this.isAuthorized$ = combineLatest(
+    combineLatest(
       [
         this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
         this.authorizationService.isAuthorized(FeatureID.IsCollectionAdmin),
@@ -60,7 +57,8 @@ export class AuditItemMenuComponent extends ContextMenuEntryComponent implements
       ],
     ).pipe(
       take(1),
-      map(([isAdmin, isCollectionAdmin, isCommunityAdmin]) => isAdmin || isCollectionAdmin || isCommunityAdmin),
-    );
+    ).subscribe(([isAdmin, isCollectionAdmin, isCommunityAdmin]) => {
+      this.isAuthorized$.next(isAdmin || isCommunityAdmin || isCollectionAdmin);
+    });
   }
 }
diff --git a/src/app/shared/context-menu/bulk-import/bulk-import-menu.component.ts b/src/app/shared/context-menu/bulk-import/bulk-import-menu.component.ts
index 1ea828cba5b..fb4456e6067 100644
--- a/src/app/shared/context-menu/bulk-import/bulk-import-menu.component.ts
+++ b/src/app/shared/context-menu/bulk-import/bulk-import-menu.component.ts
@@ -10,6 +10,7 @@ import {
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
 
 import { getBulkImportRoute } from '../../../app-routing-paths';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
@@ -56,7 +57,9 @@ export class BulkImportMenuComponent extends ContextMenuEntryComponent implement
     super(injectedContextMenuObject, injectedContextMenuObjectType, ContextMenuEntryType.BulkImport);
   }
   ngOnInit() {
-    this.isCollectionAdmin$ = this.isCollectionAdmin(false);
+    this.isCollectionAdmin$ = this.notificationService.claimedProfile.pipe(
+      switchMap(() => this.isCollectionAdmin(false)),
+    );
   }
 
   /**
diff --git a/src/app/shared/context-menu/export-collection/export-collection-menu.component.ts b/src/app/shared/context-menu/export-collection/export-collection-menu.component.ts
index cbe773f6f06..0bab2468898 100644
--- a/src/app/shared/context-menu/export-collection/export-collection-menu.component.ts
+++ b/src/app/shared/context-menu/export-collection/export-collection-menu.component.ts
@@ -13,6 +13,7 @@ import {
   TranslateService,
 } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
 
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
@@ -74,7 +75,9 @@ export class ExportCollectionMenuComponent extends ContextMenuEntryComponent imp
   }
 
   ngOnInit() {
-    this.isCollectionAdmin$ = this.isCollectionAdmin(false);
+    this.isCollectionAdmin$ = this.notificationService.claimedProfile.pipe(
+      switchMap(() => this.isCollectionAdmin(false)),
+    );
   }
 
   /**
diff --git a/src/app/shared/context-menu/export-item/export-item-menu.component.html b/src/app/shared/context-menu/export-item/export-item-menu.component.html
index 86cc63848f2..63fe2296d06 100644
--- a/src/app/shared/context-menu/export-item/export-item-menu.component.html
+++ b/src/app/shared/context-menu/export-item/export-item-menu.component.html
@@ -1,4 +1,4 @@
-<button class="btn btn-primary" *ngIf="(configuration | async)?.formats?.length > 0"
+<button class="btn btn-primary" *ngIf="(configuration$ | async)?.formats?.length > 0"
         [innerHTML]="'context-menu.actions.export-item.btn' | translate"
         (click)="$event.preventDefault();openExportModal();">
 </button>
diff --git a/src/app/shared/context-menu/export-item/export-item-menu.component.spec.ts b/src/app/shared/context-menu/export-item/export-item-menu.component.spec.ts
index 811d44db3f5..5c03ca1ea79 100644
--- a/src/app/shared/context-menu/export-item/export-item-menu.component.spec.ts
+++ b/src/app/shared/context-menu/export-item/export-item-menu.component.spec.ts
@@ -92,7 +92,7 @@ describe('ExportItemMenuComponent', () => {
   it('should render a button', () => {
     fixture.detectChanges();
     const testConfig = { ...configuration, formats: [{ type: null, id: '1', mimeType: '1', entityType: 'Patent', molteplicity: '1', _links: null }] };
-    component.configuration = of(testConfig);
+    component.configuration$.next(testConfig);
     fixture.detectChanges();
     const link = fixture.debugElement.query(By.css('button'));
     expect(link).not.toBeNull();
diff --git a/src/app/shared/context-menu/export-item/export-item-menu.component.ts b/src/app/shared/context-menu/export-item/export-item-menu.component.ts
index 6e244674ab1..55b01d184e2 100644
--- a/src/app/shared/context-menu/export-item/export-item-menu.component.ts
+++ b/src/app/shared/context-menu/export-item/export-item-menu.component.ts
@@ -9,10 +9,7 @@ import {
 } from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
-import {
-  Observable,
-  of,
-} from 'rxjs';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { take } from 'rxjs/operators';
 
 import { ItemExportFormatMolteplicity } from '../../../core/itemexportformat/item-export-format.service';
@@ -50,7 +47,8 @@ export class ExportItemMenuComponent extends ContextMenuEntryComponent implement
   /**
    * Type of configuration in current component
    */
-  configuration: Observable<ItemExportFormConfiguration> = of(null);
+  configuration$: BehaviorSubject<ItemExportFormConfiguration> = new BehaviorSubject<ItemExportFormConfiguration>(null);
+
   constructor(
     @Inject('contextMenuObjectProvider') protected injectedContextMenuObject: DSpaceObject,
     @Inject('contextMenuObjectTypeProvider') protected injectedContextMenuObjectType: DSpaceObjectType,
@@ -62,7 +60,8 @@ export class ExportItemMenuComponent extends ContextMenuEntryComponent implement
 
   ngOnInit() {
     if (this.contextMenuObject) {
-      this.configuration =  this.itemExportService.initialItemExportFormConfiguration(this.contextMenuObject as Item).pipe(take(1));
+      this.itemExportService.initialItemExportFormConfiguration(this.contextMenuObject as Item).pipe(take(1))
+        .subscribe((config: ItemExportFormConfiguration) => this.configuration$.next(config));
     }
   }
 
diff --git a/src/app/shared/context-menu/request-correction/request-correction-menu.component.ts b/src/app/shared/context-menu/request-correction/request-correction-menu.component.ts
index d591f7712e6..2649e5fc03e 100644
--- a/src/app/shared/context-menu/request-correction/request-correction-menu.component.ts
+++ b/src/app/shared/context-menu/request-correction/request-correction-menu.component.ts
@@ -41,6 +41,7 @@ import {
 import { NotificationsService } from '../../notifications/notifications.service';
 import { ContextMenuEntryComponent } from '../context-menu-entry.component';
 import { ContextMenuEntryType } from '../context-menu-entry-type';
+import { switchMap } from 'rxjs/internal/operators/switchMap';
 
 /**
  * This component renders a context menu option that provides the request a correction functionality.
@@ -134,7 +135,9 @@ export class RequestCorrectionMenuComponent extends ContextMenuEntryComponent im
       }
     });
 
-    this.canCreateCorrection$ = this.canCreateCorrection(false);
+    this.canCreateCorrection$ = this.notificationService.claimedProfile.pipe(
+      switchMap(() => this.canCreateCorrection(false))
+    );
   }
 
   /**

From 113a5f81373aeef14a3dfe1f510c778e0205f4e7 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Fri, 29 Nov 2024 16:33:54 +0100
Subject: [PATCH 3/3] [DSC-2059] Fix lint

---
 .../export-item/export-item-menu.component.spec.ts           | 5 +----
 .../context-menu/export-item/export-item-menu.component.ts   | 2 +-
 .../request-correction/request-correction-menu.component.ts  | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/context-menu/export-item/export-item-menu.component.spec.ts b/src/app/shared/context-menu/export-item/export-item-menu.component.spec.ts
index 5c03ca1ea79..ee96580576e 100644
--- a/src/app/shared/context-menu/export-item/export-item-menu.component.spec.ts
+++ b/src/app/shared/context-menu/export-item/export-item-menu.component.spec.ts
@@ -11,10 +11,7 @@ import {
   TranslateModule,
 } from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
-import {
-  of as observableOf,
-  of,
-} from 'rxjs';
+import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
diff --git a/src/app/shared/context-menu/export-item/export-item-menu.component.ts b/src/app/shared/context-menu/export-item/export-item-menu.component.ts
index 55b01d184e2..8040d86df58 100644
--- a/src/app/shared/context-menu/export-item/export-item-menu.component.ts
+++ b/src/app/shared/context-menu/export-item/export-item-menu.component.ts
@@ -9,7 +9,7 @@ import {
 } from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
-import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { BehaviorSubject } from 'rxjs';
 import { take } from 'rxjs/operators';
 
 import { ItemExportFormatMolteplicity } from '../../../core/itemexportformat/item-export-format.service';
diff --git a/src/app/shared/context-menu/request-correction/request-correction-menu.component.ts b/src/app/shared/context-menu/request-correction/request-correction-menu.component.ts
index 2649e5fc03e..c0552cc6480 100644
--- a/src/app/shared/context-menu/request-correction/request-correction-menu.component.ts
+++ b/src/app/shared/context-menu/request-correction/request-correction-menu.component.ts
@@ -24,6 +24,7 @@ import {
 } from 'rxjs';
 import {
   catchError,
+  switchMap,
   take,
 } from 'rxjs/operators';
 
@@ -41,7 +42,6 @@ import {
 import { NotificationsService } from '../../notifications/notifications.service';
 import { ContextMenuEntryComponent } from '../context-menu-entry.component';
 import { ContextMenuEntryType } from '../context-menu-entry-type';
-import { switchMap } from 'rxjs/internal/operators/switchMap';
 
 /**
  * This component renders a context menu option that provides the request a correction functionality.
@@ -136,7 +136,7 @@ export class RequestCorrectionMenuComponent extends ContextMenuEntryComponent im
     });
 
     this.canCreateCorrection$ = this.notificationService.claimedProfile.pipe(
-      switchMap(() => this.canCreateCorrection(false))
+      switchMap(() => this.canCreateCorrection(false)),
     );
   }