[DSC-2434] Fix build after merge

atarix83 · atarix83 · commit e47bc3284708 · 2025-07-09T19:26:00.000+02:00
diff --git a/src/app/admin/admin-workflow-page/admin-workflow.module.ts b/src/app/admin/admin-workflow-page/admin-workflow.module.ts
diff --git a/src/app/collection-page/collection-page.component.spec.ts b/src/app/collection-page/collection-page.component.spec.ts
@@ -12,9 +12,9 @@ import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import {
   ActivatedRoute,
+  provideRouter,
   Router,
 } from '@angular/router';
-import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
 import { of } from 'rxjs';
@@ -44,7 +44,6 @@ import {
 import { ActivatedRouteStub } from '../shared/testing/active-router.stub';
 import { RouterStub } from '../shared/testing/router.stub';
 import { VarDirective } from '../shared/utils/var.directive';
-import { ViewTrackerComponent } from '../statistics/angulartics/dspace/view-tracker.component';
 import { CollectionPageComponent } from './collection-page.component';
 
 describe('CollectionPageComponent', () => {
@@ -78,8 +77,9 @@ describe('CollectionPageComponent', () => {
     dsoNameServiceSpy = jasmine.createSpyObj('DSONameService', ['getName']);
 
     await TestBed.configureTestingModule({
-      imports: [RouterTestingModule, FormsModule, TranslateModule.forRoot(), BrowserAnimationsModule, CollectionPageComponent, VarDirective],
+      imports: [FormsModule, TranslateModule.forRoot(), BrowserAnimationsModule, CollectionPageComponent, VarDirective],
       providers: [
+        provideRouter([]),
         { provide: ActivatedRoute, useValue: aroute },
         { provide: Router, useValue: router },
         { provide: AuthService, useValue: authServiceSpy },
@@ -90,7 +90,7 @@ describe('CollectionPageComponent', () => {
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })
-      .overrideComponent(CollectionPageComponent, { remove: { imports: [ThemedComcolPageContentComponent, ErrorComponent, ThemedLoadingComponent, ViewTrackerComponent, ComcolPageHeaderComponent, ComcolPageLogoComponent, ThemedComcolPageHandleComponent, DsoEditMenuComponent, ThemedComcolPageBrowseByComponent, ObjectCollectionComponent, ContextMenuComponent] } }).compileComponents();
+      .overrideComponent(CollectionPageComponent, { remove: { imports: [ThemedComcolPageContentComponent, ErrorComponent, ThemedLoadingComponent, ComcolPageHeaderComponent, ComcolPageLogoComponent, ThemedComcolPageHandleComponent, DsoEditMenuComponent, ThemedComcolPageBrowseByComponent, ObjectCollectionComponent, ContextMenuComponent] } }).compileComponents();
   });
 
   beforeEach(() => {
diff --git a/src/app/community-page/community-page.component.spec.ts b/src/app/community-page/community-page.component.spec.ts
@@ -9,9 +9,9 @@ import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import {
   ActivatedRoute,
+  provideRouter,
   Router,
 } from '@angular/router';
-import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
 import { of } from 'rxjs';
@@ -38,7 +38,6 @@ import {
 import { ActivatedRouteStub } from '../shared/testing/active-router.stub';
 import { RouterStub } from '../shared/testing/router.stub';
 import { VarDirective } from '../shared/utils/var.directive';
-import { ViewTrackerComponent } from '../statistics/angulartics/dspace/view-tracker.component';
 import { CommunityPageComponent } from './community-page.component';
 import { ThemedCollectionPageSubCollectionListComponent } from './sections/sub-com-col-section/sub-collection-list/themed-community-page-sub-collection-list.component';
 import { ThemedCommunityPageSubCommunityListComponent } from './sections/sub-com-col-section/sub-community-list/themed-community-page-sub-community-list.component';
@@ -90,16 +89,17 @@ describe('CommunityPageComponent', () => {
     authorizationDataServiceSpy = jasmine.createSpyObj('AuthorizationDataService', ['isAuthorized']);
     dsoNameServiceSpy = jasmine.createSpyObj('DSONameService', ['getName']);
     await TestBed.configureTestingModule({
-      imports: [RouterTestingModule, FormsModule, TranslateModule.forRoot(), BrowserAnimationsModule, CommunityPageComponent, VarDirective],
+      imports: [FormsModule, TranslateModule.forRoot(), BrowserAnimationsModule, CommunityPageComponent, VarDirective],
       providers: [
+        provideRouter([]),
         { provide: ActivatedRoute, useValue: aroute },
         { provide: Router, useValue: router },
         { provide: AuthService, useValue: authServiceSpy },
         { provide: AuthorizationDataService, useValue: authorizationDataServiceSpy },
         { provide: DSONameService, useValue: dsoNameServiceSpy },
       ],
       schemas: [NO_ERRORS_SCHEMA],
-    }).overrideComponent(CommunityPageComponent, { remove: { imports: [ThemedComcolPageContentComponent, ErrorComponent, ThemedLoadingComponent, ThemedCommunityPageSubCommunityListComponent, ThemedCollectionPageSubCollectionListComponent, ThemedComcolPageBrowseByComponent, DsoEditMenuComponent, ThemedComcolPageHandleComponent, ComcolPageLogoComponent, ComcolPageHeaderComponent, ViewTrackerComponent, ContextMenuComponent] } }).compileComponents();
+    }).overrideComponent(CommunityPageComponent, { remove: { imports: [ThemedComcolPageContentComponent, ErrorComponent, ThemedLoadingComponent, ThemedCommunityPageSubCommunityListComponent, ThemedCollectionPageSubCollectionListComponent, ThemedComcolPageBrowseByComponent, DsoEditMenuComponent, ThemedComcolPageHandleComponent, ComcolPageLogoComponent, ComcolPageHeaderComponent, ContextMenuComponent] } }).compileComponents();
   });
 
   beforeEach(() => {
diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
@@ -55,7 +55,6 @@ import { NoContent } from '../shared/NoContent.model';
 import {
   getAllSucceededRemoteDataPayload,
   getFirstCompletedRemoteData,
-  getFirstSucceededRemoteDataPayload,
 } from '../shared/operators';
 import { PageInfo } from '../shared/page-info.model';
 import { URLCombiner } from '../url-combiner/url-combiner';
@@ -263,14 +262,8 @@ export class AuthService {
    */
   public getAuthenticatedUserFromStoreIfAuthenticated(): Observable<EPerson> {
     return this.store.pipe(
-      select(getAuthenticatedUserId),
-      switchMap((id: string) => {
-        if (hasValue(id)) {
-          return this.epersonService.findById(id).pipe(getFirstSucceededRemoteDataPayload());
-        } else {
-          return observableOf(null);
-        }
-      }),
+      select(getAuthenticatedUser),
+      switchMap(() => this.getAuthenticatedUserFromStore()),
     );
   }
 
diff --git a/src/app/core/shared/search/search.service.spec.ts b/src/app/core/shared/search/search.service.spec.ts
@@ -32,6 +32,7 @@ import SpyObj = jasmine.SpyObj;
 import { Component } from '@angular/core';
 
 import { APP_DATA_SERVICES_MAP } from '../../../../config/app-config.interface';
+import { CommunityDataService } from '../../../core/data/community-data.service';
 
 @Component({
   template: '',
@@ -55,6 +56,10 @@ describe('SearchService', () => {
   let msToLive: number;
   let remoteDataTimestamp: number;
 
+  const options: PaginatedSearchOptions = new PaginatedSearchOptions({
+    forcedEmbeddedKeys: [],
+  });
+
   beforeEach(() => {
     halService = new HALEndpointServiceStub(environment.rest.baseUrl);
     paginationService = new PaginationServiceStub();
@@ -74,6 +79,7 @@ describe('SearchService', () => {
         { provide: RequestService, useValue: requestService },
         { provide: RemoteDataBuildService, useValue: remoteDataBuildService },
         { provide: HALEndpointService, useValue: halService },
+        { provide: CommunityDataService, useValue: {} },
         { provide: DSpaceObjectDataService, useValue: {} },
         { provide: PaginationService, useValue: paginationService },
         { provide: SearchConfigurationService, useValue: searchConfigService },
@@ -176,7 +182,7 @@ describe('SearchService', () => {
             e: remoteDataMocks.SuccessStale,
           };
 
-          expectObservable(service.search(undefined, msToLive, true)).toBe(expected, values);
+          expectObservable(service.search(options, msToLive, true)).toBe(expected, values);
         });
       });
     });
@@ -204,7 +210,7 @@ describe('SearchService', () => {
             e: remoteDataMocks.SuccessStale,
           };
 
-          expectObservable(service.search(undefined, msToLive, false)).toBe(expected, values);
+          expectObservable(service.search(options, msToLive, false)).toBe(expected, values);
         });
       });
 
@@ -219,7 +225,7 @@ describe('SearchService', () => {
             a: remoteDataMocks.Success,
             b: remoteDataMocks.SuccessStale,
           };
-          expectObservable(service.search(undefined, msToLive, false)).toBe(expected, values);
+          expectObservable(service.search(options, msToLive, false)).toBe(expected, values);
         });
       });
     });
diff --git a/src/app/cris-item-page/cris-item-page.component.html b/src/app/cris-item-page/cris-item-page.component.html
@@ -3,7 +3,6 @@
   <div class="container">
     <ds-item-alerts [item]="(itemRD$ | async)?.payload"></ds-item-alerts>
   </div>
-  <ds-view-tracker [object]="(itemRD$ | async)?.payload"></ds-view-tracker>
   <ds-cris-layout *ngIf="!((itemRD$ | async)?.payload?.isWithdrawn) || (isAdmin$|async)"
                   [item]="(itemRD$ | async)?.payload"></ds-cris-layout>
 </ng-container>
diff --git a/src/app/cris-item-page/cris-item-page.component.spec.ts b/src/app/cris-item-page/cris-item-page.component.spec.ts
@@ -34,7 +34,6 @@ import {
 import { ActivatedRouteStub } from '../shared/testing/active-router.stub';
 import { createPaginatedList } from '../shared/testing/utils.test';
 import { VarDirective } from '../shared/utils/var.directive';
-import { ViewTrackerComponent } from '../statistics/angulartics/dspace/view-tracker.component';
 import { CrisItemPageComponent } from './cris-item-page.component';
 
 const mockItem: Item = Object.assign(new Item(), {
@@ -77,7 +76,7 @@ describe('CrisItemPageComponent', () => {
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })
-      .overrideComponent(CrisItemPageComponent, { remove: { imports: [ThemedLoadingComponent, ThemedItemAlertsComponent, ViewTrackerComponent, CrisLayoutComponent] } }).compileComponents();
+      .overrideComponent(CrisItemPageComponent, { remove: { imports: [ThemedLoadingComponent, ThemedItemAlertsComponent, CrisLayoutComponent] } }).compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/app/cris-item-page/cris-item-page.component.ts b/src/app/cris-item-page/cris-item-page.component.ts
@@ -19,7 +19,6 @@ import { CrisLayoutComponent } from '../cris-layout/cris-layout.component';
 import { ThemedItemAlertsComponent } from '../item-page/alerts/themed-item-alerts.component';
 import { fadeInOut } from '../shared/animations/fade';
 import { ThemedLoadingComponent } from '../shared/loading/themed-loading.component';
-import { ViewTrackerComponent } from '../statistics/angulartics/dspace/view-tracker.component';
 
 /**
  * This component is the entry point for the page that renders items.
@@ -34,7 +33,6 @@ import { ViewTrackerComponent } from '../statistics/angulartics/dspace/view-trac
     NgIf,
     ThemedLoadingComponent,
     ThemedItemAlertsComponent,
-    ViewTrackerComponent,
     CrisLayoutComponent,
     AsyncPipe,
     TranslateModule,
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts
@@ -10,7 +10,7 @@ import {
 } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { RouterTestingModule } from '@angular/router/testing';
+import { provideRouter } from '@angular/router';
 import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
 import {
   TranslateLoader,
@@ -145,11 +145,11 @@ describe('OrcidAuthComponent test suite', () => {
             useClass: TranslateLoaderMock,
           },
         }),
-        RouterTestingModule.withRoutes([]),
         OrcidAuthComponent,
         NoopAnimationsModule,
       ],
       providers: [
+        provideRouter([]),
         { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
         { provide: NotificationsService, useClass: NotificationsServiceStub },
         { provide: OrcidAuthService, useValue: orcidAuthService },
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
@@ -63,7 +63,7 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
   /**
    * The list of exposed orcid authorization scopes for the orcid profile
    */
-  profileAuthorizationScopes$: BehaviorSubject<string[]> = new BehaviorSubject([]);
+  profileAuthorizationScopes$: BehaviorSubject<string[]> = new BehaviorSubject<string[]>([]);
 
   /**
    * A boolean representing if user has authorizations
@@ -73,7 +73,7 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
   /**
    * The list of all orcid authorization scopes missing in the orcid profile
    */
-  missingAuthorizationScopes: BehaviorSubject<string[]> = new BehaviorSubject([]);
+  missingAuthorizationScopes: BehaviorSubject<string[]> = new BehaviorSubject<string[]>([]);
 
   /**
    * A boolean representing if user has missing authorizations
@@ -83,12 +83,12 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
   /**
    * The list of all orcid authorization scopes available
    */
-  orcidAuthorizationScopes: BehaviorSubject<string[]> = new BehaviorSubject([]);
+  orcidAuthorizationScopes: BehaviorSubject<string[]> = new BehaviorSubject<string[]>([]);
 
   /**
    * A boolean representing if unlink operation is processing
    */
-  unlinkProcessing: BehaviorSubject<boolean> = new BehaviorSubject(false);
+  unlinkProcessing: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   /**
    * A boolean representing if orcid profile is linked
@@ -157,9 +157,9 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
   getOrcidNotLinkedMessage(): Observable<string> {
     const orcid = this.item.firstMetadataValue('person.identifier.orcid');
     if (orcid) {
-      return this.translateService.instant('person.page.orcid.orcid-not-linked-message', { 'orcid': orcid });
+      return this.translateService.get('person.page.orcid.orcid-not-linked-message', { 'orcid': orcid });
     } else {
-      return this.translateService.instant('person.page.orcid.no-orcid-message');
+      return this.translateService.get('person.page.orcid.no-orcid-message');
     }
   }
 
diff --git a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.spec.ts b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.spec.ts
@@ -20,6 +20,8 @@ import {
   TranslateModule,
 } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
+import { APP_CONFIG } from 'src/config/app-config.interface';
+import { environment } from 'src/environments/environment.test';
 
 import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
@@ -93,6 +95,7 @@ describe('ComcolPageBrowseByComponent', () => {
           },
         }), ComcolPageBrowseByComponent],
       providers: [ComcolPageBrowseByComponent,
+        { provide: APP_CONFIG, useValue: environment },
         { provide: ConfigurationDataService, useValue: configurationServiceStub },
         { provide: CollectionDataService, useValue: collectionServiceStub }],
       schemas: [NO_ERRORS_SCHEMA],
@@ -118,7 +121,7 @@ describe('ComcolPageBrowseByComponent', () => {
       const firstOption = component.allOptions[0];
       expect(firstOption.id).toEqual('search');
       expect(firstOption.label).toEqual('community.page.browse.search.head');
-      expect(firstOption.routerLink).toEqual('/communities/' + communityId);
+      expect(firstOption.routerLink).toEqual('/communities/' + communityId + '/search');
 
       const secondOption = component.allOptions[1];
       expect(secondOption.id).toEqual('comcols');
@@ -145,7 +148,7 @@ describe('ComcolPageBrowseByComponent', () => {
       const firstOption = component.allOptions[0];
       expect(firstOption.id).toEqual('search');
       expect(firstOption.label).toEqual('collection.page.browse.search.head');
-      expect(firstOption.routerLink).toEqual('/collections/' + publicationId);
+      expect(firstOption.routerLink).toEqual('/collections/' + publicationId + '/search');
       const secondOption = component.allOptions[1];
       expect(secondOption.id).toEqual('author');
       expect(secondOption.label).toEqual('browse.comcol.by.author');
@@ -167,7 +170,7 @@ describe('ComcolPageBrowseByComponent', () => {
       const firstOption = component.allOptions[0];
       expect(firstOption.id).toEqual('search');
       expect(firstOption.label).toEqual('collection.page.browse.search.head');
-      expect(firstOption.routerLink).toEqual('/collections/' + orgUnitId);
+      expect(firstOption.routerLink).toEqual('/collections/' + orgUnitId + '/search');
       const secondOption = component.allOptions[1];
       expect(secondOption.id).toEqual('ouname');
       expect(secondOption.label).toEqual('browse.comcol.by.ouname');
diff --git a/src/app/shared/eperson-group-list/eperson-group-list.component.ts b/src/app/shared/eperson-group-list/eperson-group-list.component.ts
@@ -19,7 +19,10 @@ import {
   BehaviorSubject,
   Observable,
 } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
 
 import {
   APP_DATA_SERVICES_MAP,
@@ -42,6 +45,7 @@ import {
   getRemoteDataPayload,
 } from '../../core/shared/operators';
 import { ResourceType } from '../../core/shared/resource-type';
+import { isNotEmpty } from '../../shared/empty.util';
 import { fadeInOut } from '../animations/fade';
 import { PaginationComponent } from '../pagination/pagination.component';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
@@ -162,6 +166,18 @@ export class EpersonGroupListComponent implements OnInit, OnDestroy {
     this.entrySelectedId$.next(entry.id);
   }
 
+  /**
+   * Return a boolean representing if a table row is selected
+   *
+   * @return {boolean}
+   */
+  isSelected(entry: DSpaceObject): Observable<boolean> {
+    return this.entrySelectedId$.asObservable().pipe(
+      map((selectedId) => isNotEmpty(selectedId) && selectedId === entry.id),
+    );
+  }
+
+
   /**
    * Method called on search
    */
@@ -207,6 +223,6 @@ export class EpersonGroupListComponent implements OnInit, OnDestroy {
    */
   emitDeselect(entry: DSpaceObject) {
     this.deselect.emit(entry);
-    this.entrySelectedId.next(null);
+    this.entrySelectedId$.next(null);
   }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-inline-group/dynamic-relation-inline-group.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-inline-group/dynamic-relation-inline-group.component.spec.ts
diff --git a/src/app/shared/metadata-link-view/metadata-link-view-avatar-popover/metadata-link-view-avatar-popover.component.html b/src/app/shared/metadata-link-view/metadata-link-view-avatar-popover/metadata-link-view-avatar-popover.component.html
diff --git a/src/app/shared/switch/switch.component.ts b/src/app/shared/switch/switch.component.ts
diff --git a/src/app/submission/form/submission-form.component.spec.ts b/src/app/submission/form/submission-form.component.spec.ts
