Merge branch 'DURACOM-234' into DURACOM-234-ANGULAR-17

Author: atarix83

.github/workflows/build.yml

@@ -38,7 +38,7 @@ jobs:
     strategy:
       # Create a matrix of Node versions to test against (in parallel)
       matrix:
-        node-version: [16.x, 18.x]
+        node-version: [18.x, 20.x]
       # Do NOT exit immediately if one matrix job fails
       fail-fast: false
     # These are the actual CI steps to perform per job

src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts

@@ -1,6 +1,7 @@
 import {
   AsyncPipe,
   NgClass,
+  NgFor,
   NgIf,
 } from '@angular/common';
 import {
@@ -83,6 +84,7 @@ import { ValidateEmailNotTaken } from './validators/email-taken.validator';
   imports: [
     FormComponent,
     NgIf,
+    NgFor,
     AsyncPipe,
     TranslateModule,
     NgClass,

src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts

@@ -1,6 +1,7 @@
 import {
   AsyncPipe,
   NgClass,
+  NgFor,
   NgIf,
 } from '@angular/common';
 import {
@@ -54,6 +55,7 @@ import { LdnService } from '../ldn-services-model/ldn-services.model';
   changeDetection: ChangeDetectionStrategy.Default,
   imports: [
     NgIf,
+    NgFor,
     TranslateModule,
     AsyncPipe,
     PaginationComponent,

src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.spec.ts

@@ -1,35 +1,40 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
-  async,
   ComponentFixture,
   TestBed,
+  waitForAsync,
 } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { NotificationsSuggestionTargetsPageComponent } from '../../../quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component';
+import { PublicationClaimComponent } from '../../../notifications/suggestion-targets/publication-claim/publication-claim.component';
+import { AdminNotificationsPublicationClaimPageComponent } from './admin-notifications-publication-claim-page.component';
 
-describe('NotificationsSuggestionTargetsPageComponent', () => {
-  let component: NotificationsSuggestionTargetsPageComponent;
-  let fixture: ComponentFixture<NotificationsSuggestionTargetsPageComponent>;
+describe('AdminNotificationsPublicationClaimPageComponent', () => {
+  let component: AdminNotificationsPublicationClaimPageComponent;
+  let fixture: ComponentFixture<AdminNotificationsPublicationClaimPageComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
         CommonModule,
         TranslateModule.forRoot(),
-        NotificationsSuggestionTargetsPageComponent,
+        AdminNotificationsPublicationClaimPageComponent,
       ],
       providers: [
-        NotificationsSuggestionTargetsPageComponent,
+        AdminNotificationsPublicationClaimPageComponent,
       ],
       schemas: [NO_ERRORS_SCHEMA],
+    }).overrideComponent(AdminNotificationsPublicationClaimPageComponent, {
+      remove: {
+        imports: [PublicationClaimComponent],
+      },
     })
       .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(NotificationsSuggestionTargetsPageComponent);
+    fixture = TestBed.createComponent(AdminNotificationsPublicationClaimPageComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts

@@ -1,3 +1,4 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
   ComponentFixture,
   TestBed,
@@ -11,6 +12,7 @@ import { SearchService } from '../../core/shared/search/search.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
+import { AdminNotifyMetricsComponent } from './admin-notify-metrics/admin-notify-metrics.component';
 import { AdminNotifyMessage } from './models/admin-notify-message.model';
 import { AdminNotifySearchResult } from './models/admin-notify-message-search-result.model';
 
@@ -46,6 +48,11 @@ describe('AdminNotifyDashboardComponent', () => {
         { provide: SearchService, useValue: { search: () => createSuccessfulRemoteDataObject$(results) } },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
       ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).overrideComponent(AdminNotifyDashboardComponent, {
+      remove: {
+        imports: [AdminNotifyMetricsComponent],
+      },
     })
       .compileComponents();
 

src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts

@@ -16,6 +16,7 @@ import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-conf
 import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock';
 import { getMockRemoteDataBuildService } from '../../../../shared/mocks/remote-data-build.service.mock';
 import { routeServiceStub } from '../../../../shared/testing/route-service.stub';
+import { AdminNotifyLogsResultComponent } from '../admin-notify-logs-result/admin-notify-logs-result.component';
 import { AdminNotifyIncomingComponent } from './admin-notify-incoming.component';
 
 describe('AdminNotifyIncomingComponent', () => {
@@ -48,6 +49,8 @@ describe('AdminNotifyIncomingComponent', () => {
         { provide: APP_DATA_SERVICES_MAP, useValue: {} },
         provideMockStore({}),
       ],
+    }).overrideComponent(AdminNotifyIncomingComponent, {
+      remove: { imports: [AdminNotifyLogsResultComponent] },
     })
       .compileComponents();
 

src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts

@@ -1,7 +1,5 @@
 import { SearchResult } from '../../../shared/search/models/search-result.model';
-import { searchResultFor } from '../../../shared/search/search-result-element-decorator';
 import { AdminNotifyMessage } from './admin-notify-message.model';
 
-@searchResultFor(AdminNotifyMessage)
 export class AdminNotifySearchResult extends SearchResult<AdminNotifyMessage> {
 }

src/app/admin/admin-reports/filtered-items/filtered-items.component.ts

@@ -1,6 +1,7 @@
 import {
   AsyncPipe,
   NgForOf,
+  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -59,6 +60,7 @@ import { QueryPredicate } from './query-predicate.model';
     NgbAccordionModule,
     TranslateModule,
     AsyncPipe,
+    NgIf,
     NgForOf,
     FiltersComponent,
   ],

src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html

@@ -3,7 +3,7 @@
                                           [linkType]="linkType"
                                           [listID]="listID"></ds-collection-search-result-list-element>
 <div>
-    <a class="btn btn-light mt-1" [routerLink]="[editPath]">
+    <a class="btn btn-light mt-1" data-test="coll-link" [routerLink]="[editPath]">
         <i class="fa fa-edit"></i> {{"admin.search.collection.edit" | translate}}
     </a>
 </div>

src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts

@@ -19,6 +19,7 @@ import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucata
 import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
 import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
 import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
+import { CollectionSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component';
 import { ThemeService } from '../../../../../shared/theme-support/theme.service';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { CollectionAdminSearchResultListElementComponent } from './collection-admin-search-result-list-element.component';
@@ -51,8 +52,13 @@ describe('CollectionAdminSearchResultListElementComponent', () => {
         { provide: ThemeService, useValue: getMockThemeService() },
       ],
       schemas: [NO_ERRORS_SCHEMA],
-    })
-      .compileComponents();
+    }).overrideComponent(CollectionAdminSearchResultListElementComponent, {
+      remove: {
+        imports: [
+          CollectionSearchResultListElementComponent,
+        ],
+      },
+    }).compileComponents();
   }));
 
   beforeEach(() => {
@@ -62,18 +68,15 @@ describe('CollectionAdminSearchResultListElementComponent', () => {
     component.linkTypes = CollectionElementLinkType;
     component.index = 0;
     component.viewModes = ViewMode;
-
+    fixture.detectChanges();
   });
 
   it('should create', () => {
     expect(component).toBeTruthy();
   });
 
   it('should render an edit button with the correct link', () => {
-    component.ngOnInit();
-    fixture.detectChanges();
-
-    const a = fixture.debugElement.query(By.css('a'));
+    const a = fixture.debugElement.query(By.css('a[data-test="coll-link"]'));
     const link = a.nativeElement.href;
     expect(link).toContain(getCollectionEditRoute(id));
   });