Merged in task/dspace-cris-2024_02_x/DSC-2860-restore-metrics (pull request DSpace#4636)

[DSC-2860] restore metrics

Approved-by: Andrea Barbasso

Author: FrancescoMolinaro

src/app/app.component.ts

@@ -10,6 +10,7 @@ import {
   Component,
   HostListener,
   Inject,
+  OnDestroy,
   OnInit,
   PLATFORM_ID,
 } from '@angular/core';
@@ -31,13 +32,15 @@ import { TranslateService } from '@ngx-translate/core';
 import {
   BehaviorSubject,
   Observable,
+  Subject,
 } from 'rxjs';
 import {
   delay,
   distinctUntilChanged,
   map,
   switchMap,
   take,
+  takeUntil,
   withLatestFrom,
 } from 'rxjs/operators';
 
@@ -78,10 +81,15 @@ import { SocialService } from './social/social.service';
     SocialComponent,
   ],
 })
-export class AppComponent implements OnInit, AfterViewInit {
+export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
   notificationOptions;
   models;
 
+  /**
+   * Subject to signal component destruction and clean up subscriptions
+   */
+  private destroy$: Subject<void> = new Subject<void>();
+
   /**
    * Whether or not the authentication is currently blocking the UI
    */
@@ -172,6 +180,7 @@ export class AppComponent implements OnInit, AfterViewInit {
         take(1),
         map((currentUrl) => [currentUrl, event]),
       )),
+      takeUntil(this.destroy$),
     ).subscribe(([currentUrl, event]: [string, any]) => {
       if (event instanceof NavigationStart) {
         const nextUrl = event.url;
@@ -188,6 +197,11 @@ export class AppComponent implements OnInit, AfterViewInit {
     });
   }
 
+  ngOnDestroy(): void {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+
   @HostListener('window:resize', ['$event'])
   public onResize(event): void {
     this.dispatchWindowSize(event.target.innerWidth, event.target.innerHeight);
@@ -202,7 +216,10 @@ export class AppComponent implements OnInit, AfterViewInit {
   private trackIdleModal() {
     const isIdle$ = this.authService.isUserIdle();
     const isAuthenticated$ = this.authService.isAuthenticated();
-    isIdle$.pipe(withLatestFrom(isAuthenticated$))
+    isIdle$.pipe(
+      withLatestFrom(isAuthenticated$),
+      takeUntil(this.destroy$),
+    )
       .subscribe(([userIdle, authenticated]) => {
         if (userIdle && authenticated) {
           if (!this.idleModalOpen) {

src/app/search-page/search-page.component.html

@@ -1 +1 @@
-<ds-search [showCharts]="true" [collapseCharts]="true" [showChartsToggle]="true" [showCsvExport]="false" [showExport]="true" [trackStatistics]="true"></ds-search>
+<ds-search [showCharts]="true" [collapseCharts]="true" [showChartsToggle]="true" [showCsvExport]="false" [showExport]="true" [showMetrics]="true" [trackStatistics]="true"></ds-search>

src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.html

@@ -3,5 +3,6 @@
   [showSidebar]="showSidebar$ | async"
   [showScopeSelector]="false"
   [hideScopeInUrl]="true"
+  [showMetrics]="true"
   [scope]="(comcol$ | async)?.id">
 </ds-search>

src/app/shared/mocks/theme-service.mock.ts

@@ -1,4 +1,7 @@
-import { of as observableOf } from 'rxjs';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
 
 import { ThemeConfig } from '../../../config/theme.config';
 import { isNotEmpty } from '../empty.util';
@@ -12,6 +15,8 @@ export function getMockThemeService(themeName = 'base', themes?: ThemeConfig[]):
     listenForRouteChanges: undefined,
   });
 
+  Object.defineProperty(spy, 'isThemeLoading$', { value: new BehaviorSubject(false) });
+
   if (isNotEmpty(themes)) {
     spy.getThemeConfigFor.and.callFake((name: string) => themes.find(theme => theme.name === name));
   }

src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts

@@ -114,7 +114,7 @@ export class ItemSearchResultListElementComponent extends SearchResultListElemen
    * Check if item has Third-party metrics blocked by consents
    */
   ngAfterViewInit() {
-    if (this.showMetrics && this.klaroService && this.klaroService.watchConsentUpdates instanceof Function) {
+    if (this.showMetrics && this.klaroService && this.klaroService.watchConsentUpdates instanceof Function && isNotEmpty(this.dso?.metrics)) {
       this.klaroService.watchConsentUpdates();
 
       this.hasLoadedThirdPartyMetrics$ = combineLatest([