Merge branch 'dspace-cris-2023_02_x' into task/dspace-cris-2023_02_x/DSC-1872

# Conflicts:
#	src/app/shared/shared.module.ts

Author: Simone-Ramundi

src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html

@@ -5,6 +5,7 @@
        [attr.aria-labelledby]="'sidebarName-' + section.id"
        [title]="('menu.section.icon.' + section.id) | translate"
        [routerLink]="itemModel.link"
+       [queryParams]="itemModel.queryParams"
        (keyup.space)="navigate($event)"
        (keyup.enter)="navigate($event)"
        href="javascript:void(0);"
@@ -21,3 +22,4 @@
       </div>
     </a>
 </div>
+

src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts

@@ -49,7 +49,10 @@ export class AdminSidebarSectionComponent extends MenuSectionComponent implement
   navigate(event: any): void {
     event.preventDefault();
     if (!this.isDisabled) {
-      this.router.navigate(this.itemModel.link);
+      const extras = {
+        queryParams: this.itemModel.queryParams
+      };
+      this.router.navigate(this.itemModel.link, extras);
     }
   }
 }

src/app/item-page/item.resolver.ts

@@ -20,6 +20,7 @@ export const ITEM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Item>[] = [
   ),
   followLink('relationships'),
   followLink('version', {}, followLink('versionhistory')),
+  followLink('bundles', {}, followLink('bitstreams')),
   followLink('thumbnail'),
   followLink('metrics')
 ];
@@ -45,7 +46,7 @@ export class ItemResolver implements Resolve<RemoteData<Item>> {
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<Item>> {
     const itemRD$ = this.itemService.findById(route.params.id,
-      true,
+      false,
       false,
       ...ITEM_PAGE_LINKS_TO_FOLLOW
     ).pipe(

src/app/menu.resolver.spec.ts

@@ -19,6 +19,7 @@ import { createSuccessfulRemoteDataObject$ } from './shared/remote-data.utils';
 import { createPaginatedList } from './shared/testing/utils.test';
 import { SectionDataService } from './core/layout/section-data.service';
 import createSpy = jasmine.createSpy;
+import { ConfigurationDataService } from './core/data/configuration-data.service';
 
 const BOOLEAN = { t: true, f: false };
 const MENU_STATE = {
@@ -68,6 +69,7 @@ describe('MenuResolver', () => {
   let sectionsService;
   let authorizationService;
   let scriptService;
+  let configService;
 
   beforeEach(waitForAsync(() => {
     menuService = new MenuServiceStub();
@@ -83,6 +85,9 @@ describe('MenuResolver', () => {
     scriptService = jasmine.createSpyObj('scriptService', {
       scriptWithNameExistsAndCanExecute: observableOf(true)
     });
+    configService = jasmine.createSpyObj('ConfigurationDataService', {
+      findByPropertyName: observableOf({})
+    });
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule, RouterTestingModule],
@@ -92,6 +97,7 @@ describe('MenuResolver', () => {
         { provide: SectionDataService, useValue: sectionsService },
         { provide: AuthorizationDataService, useValue: authorizationService },
         { provide: ScriptDataService, useValue: scriptService },
+        { provide: ConfigurationDataService, useValue: configService },
         {
           provide: NgbModal, useValue: {
             open: () => {/*comment*/

src/app/menu.resolver.ts

@@ -52,6 +52,8 @@ import { environment } from '../environments/environment';
 import { SectionDataService } from './core/layout/section-data.service';
 import { Section } from './core/layout/models/section.model';
 import { NOTIFICATIONS_RECITER_SUGGESTION_PATH } from './admin/admin-notifications/admin-notifications-routing-paths';
+import { ConfigurationDataService } from './core/data/configuration-data.service';
+import { ConfigurationProperty } from './core/shared/configuration-property.model';
 
 /**
  * Creates all of the app's menus
@@ -70,6 +72,7 @@ export class MenuResolver implements Resolve<boolean> {
     protected modalService: NgbModal,
     protected scriptDataService: ScriptDataService,
     protected sectionDataService: SectionDataService,
+    protected configService: ConfigurationDataService,
   ) {
   }
 
@@ -254,6 +257,7 @@ export class MenuResolver implements Resolve<boolean> {
     this.createExportMenuSections();
     this.createImportMenuSections();
     this.createAccessControlMenuSections();
+    this.createDLExporterMenuItem();
 
     return this.waitForMenu$(MenuID.ADMIN);
   }
@@ -609,6 +613,40 @@ export class MenuResolver implements Resolve<boolean> {
     });
   }
 
+  /**
+   * Add the DL Exporter menu item to the admin menu
+   */
+  createDLExporterMenuItem() {
+    observableCombineLatest([
+      this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
+      this.getDLExporterURL(),
+      this.getDLExporterAccessToken()
+    ]).subscribe(([authorized, url, accesstoken]) => {
+      console.log(accesstoken);
+      const urlSegments = url.split('?');
+      const queryParamSegments = urlSegments[1].split('=');
+      this.menuService.addSection(MenuID.ADMIN,
+        {
+          id: 'loginmiur_dlexporter_url',
+          index: 15,
+          active: false,
+          visible: authorized && (hasValue(url) && url.length > 0) && (hasValue(accesstoken) && accesstoken.length > 0),
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.loginmiur_dlexporter_url',
+            disabled: false,
+            link: urlSegments[0],
+            queryParams: {
+              [queryParamSegments[0]]: queryParamSegments[1]
+            }
+          } as LinkMenuItemModel,
+          icon: 'fa-solid fa-arrows-spin',
+          shouldPersistOnRouteChange: true
+        }
+      );
+    });
+  }
+
   /**
    * Create menu sections dependent on whether or not the current user is a site administrator and on whether or not
    * the import scripts exist and the current user is allowed to execute them
@@ -974,4 +1012,25 @@ export class MenuResolver implements Resolve<boolean> {
     const object = data.site ? data.site : data.dso?.payload;
     return object?._links?.self?.href;
   }
+
+  /**
+   * Get the DL Exporter URL from the configuration
+   */
+  getDLExporterURL(): Observable<string> {
+   return this.configService.findByPropertyName('loginmiur.dlexporter.url').pipe(
+      getFirstCompletedRemoteData(),
+      map((res: RemoteData<ConfigurationProperty>) => {
+        return res?.payload?.values[0];
+      })
+    );
+  }
+
+  private getDLExporterAccessToken() {
+    return this.configService.findByPropertyName('loginmiur.dlexporter.accesstoken').pipe(
+      getFirstCompletedRemoteData(),
+      map((res: RemoteData<ConfigurationProperty>) => {
+        return res?.payload?.values[0];
+      })
+    );
+  }
 }

src/app/shared/metadata-link-view/metadata-link-view.component.html

@@ -3,13 +3,12 @@
                   [ngTemplateOutletContext]="{metadataView: metadataView}"></ng-container>
 </div>
 <ng-template class="d-flex" #linkToAuthority let-metadataView="metadataView">
-  <span [ngbPopover]="popContent"
-        [closeDelay]="500"
-        [openDelay]="1000"
+  <span [dsStickyPopover]="popContent"
+        [openDelay]="100"
         [animation]="true"
-        [autoClose]="'outside'"
+        [autoClose]="true"
         container="body"
-        triggers="mouseenter:mouseleave">
+        triggers="mouseenter">
     <a rel="noopener noreferrer" data-test="linkToAuthority"
       [routerLink]="['/items/' + metadataView.authority]">
       <span dsEntityIcon

src/app/shared/metadata-link-view/sticky-popover.directive.ts

@@ -0,0 +1,121 @@
+import {
+  ElementRef,
+  Directive,
+  Input,
+  TemplateRef,
+  Renderer2,
+  OnInit,
+  OnDestroy,
+  Injector,
+  ViewContainerRef,
+  NgZone,
+  ChangeDetectorRef,
+  ApplicationRef, Inject
+} from '@angular/core';
+import {NgbPopover, NgbPopoverConfig} from '@ng-bootstrap/ng-bootstrap';
+import {DOCUMENT} from '@angular/common';
+import {NavigationStart, Router} from '@angular/router';
+import {Subscription} from 'rxjs';
+
+/**
+ * Directive to create a sticky popover using NgbPopover.
+ * The popover remains open when the mouse is over its content and closes when the mouse leaves.
+ */
+@Directive({
+  selector: '[dsStickyPopover]'
+})
+export class StickyPopoverDirective extends NgbPopover implements OnInit, OnDestroy {
+  /** Template for the sticky popover content */
+  @Input() dsStickyPopover: TemplateRef<any>;
+
+  /** Subscriptions to manage router events */
+  subs: Subscription[] = [];
+
+  /** Flag to determine if the popover can be closed */
+  private canClosePopover: boolean;
+
+  /** Reference to the element the directive is applied to */
+  private readonly _elRef;
+
+  /** Renderer to listen to and manipulate DOM elements */
+  private readonly _render;
+
+  constructor(
+    _elementRef: ElementRef<HTMLElement>,
+    _renderer: Renderer2, injector: Injector,
+    viewContainerRef: ViewContainerRef,
+    config: NgbPopoverConfig,
+    _ngZone: NgZone,
+    @Inject(DOCUMENT) _document: Document,
+    _changeDetector: ChangeDetectorRef,
+    applicationRef: ApplicationRef,
+    private router: Router
+  ) {
+    super(_elementRef, _renderer, injector, viewContainerRef, config, _ngZone, document, _changeDetector, applicationRef);
+    this._elRef = _elementRef;
+    this._render = _renderer;
+    this.triggers = 'manual';
+    this.container = 'body';
+  }
+
+  /**
+   * Sets up event listeners for mouse enter, mouse leave, and click events.
+   */
+  ngOnInit(): void {
+    super.ngOnInit();
+    this.ngbPopover = this.dsStickyPopover;
+
+    this._render.listen(this._elRef.nativeElement, 'mouseenter', () => {
+      this.canClosePopover = true;
+      this.open();
+    });
+
+    this._render.listen(this._elRef.nativeElement, 'mouseleave', () => {
+      setTimeout(() => {
+        if (this.canClosePopover) {
+          this.close();
+        }
+      }, 100);
+    });
+
+    this._render.listen(this._elRef.nativeElement, 'click', () => {
+      this.close();
+    });
+
+    this.subs.push(
+      this.router.events.subscribe((event) => {
+        if (event instanceof NavigationStart) {
+          this.close();
+        }
+      })
+    );
+  }
+
+  /**
+   * Opens the popover and sets up event listeners for mouse over and mouse out events on the popover.
+   */
+  open() {
+    super.open();
+    const popover = window.document.querySelector('.popover');
+    this._render.listen(popover, 'mouseover', () => {
+      this.canClosePopover = false;
+    });
+
+    this._render.listen(popover, 'mouseout', () => {
+      this.canClosePopover = true;
+      setTimeout(() => {
+        if (this.canClosePopover) {
+          this.close();
+        }
+      }, 0);
+    });
+  }
+
+  /**
+   * Unsubscribes from all subscriptions when the directive is destroyed.
+   */
+  ngOnDestroy() {
+    super.ngOnDestroy();
+    this.subs.forEach((sub) => sub.unsubscribe());
+  }
+}

src/app/shared/shared.module.ts

@@ -358,6 +358,7 @@ import { MetadataLinkViewPopoverComponent } from './metadata-link-view/metadata-
 import { MetadataLinkViewAvatarPopoverComponent } from './metadata-link-view/metadata-link-view-avatar-popover/metadata-link-view-avatar-popover.component';
 import { MetadataLinkViewOrcidComponent } from './metadata-link-view/metadata-link-view-orcid/metadata-link-view-orcid.component';
 import { SwitchComponent } from './switch/switch.component';
+import {StickyPopoverDirective} from './metadata-link-view/sticky-popover.directive';
 
 const MODULES = [
   CommonModule,
@@ -625,6 +626,7 @@ const DIRECTIVES = [
   ContextHelpDirective,
   EntityIconDirective,
   MarkdownDirective,
+  StickyPopoverDirective
 ];
 
 @NgModule({