Merge pull request #3717 from atmire/w2p-120243_Upgrade-to-Angular-v18

Upgrade to angular v18

cypress/e2e/community-list.cy.ts

@@ -12,6 +12,13 @@ describe('Community List Page', () => {
     cy.get('[data-test="expand-button"]').click({ multiple: true });
 
     // Analyze <ds-community-list-page> for accessibility issues
-    testA11y('ds-community-list-page');
+    testA11y('ds-community-list-page', {
+      rules: {
+        // When expanding a cdk node on the community-list page, the 'aria-posinset' property becomes 0.
+        // 0 is not a valid value for 'aria-posinset' so the test fails.
+        // see https://github.com/DSpace/dspace-angular/issues/4068
+        'aria-valid-attr-value': { enabled: false },
+      },
+    });
   });
 });

package.json

@@ -57,68 +57,62 @@
   "private": true,
   "overrides": {
     "@kolkov/ngx-gallery": {
-      "@angular/animations": "^17.3.11",
+      "@angular/animations": "^18.2.12",
-      "@angular/common": "^17.3.11",
+      "@angular/common": "^18.2.12",
-      "@angular/core": "^17.3.11"
+      "@angular/core": "^18.2.12"
     },
     "@ng-bootstrap/ng-bootstrap": {
-      "@angular/common": "^17.3.11",
+      "@angular/common": "^18.2.12",
-      "@angular/core": "^17.3.11",
+      "@angular/core": "^18.2.12",
-      "@angular/forms": "^17.3.11",
+      "@angular/forms": "^18.2.12",
-      "@angular/localize": "^17.3.11"
+      "@angular/localize": "^18.2.12"
     },
     "@ng-dynamic-forms/core": {
-      "@angular/common": "^17.3.11",
+      "@angular/common": "^18.2.12",
-      "@angular/core": "^17.3.11",
+      "@angular/core": "^18.2.12",
-      "@angular/forms": "^17.3.11"
+      "@angular/forms": "^18.2.12"
     },
     "@ng-dynamic-forms/ui-ng-bootstrap": {
       "ngx-mask": "14.2.4",
       "@ng-bootstrap/ng-bootstrap": "^12.0.0",
       "bootstrap": "^5.3"
     },
-    "@ngtools/webpack": {
-      "@angular/compiler-cli": "^17.3.11",
-      "typescript": "~5.4.5"
-    },
     "@nicky-lenaers/ngx-scroll-to": {
-      "@angular/common": "^17.3.11",
+      "@angular/common": "^18.2.12",
-      "@angular/core": "^17.3.11"
+      "@angular/core": "^18.2.12"
     },
     "eslint-plugin-unused-imports": {
       "@typescript-eslint/eslint-plugin": "^7.2.0"
     },
-    "ng2-file-upload": {
-      "@angular/common": "^17.3.11",
-      "@angular/core": "^17.3.11"
-    },
     "ngx-infinite-scroll": {
-      "@angular/common": "^17.3.11",
+      "@angular/common": "^18.2.12",
-      "@angular/core": "^17.3.11"
+      "@angular/core": "^18.2.12"
-    }
+    },
+    "notistack": "3.0.1"
   },
   "dependencies": {
-    "@angular/animations": "^17.3.12",
+    "@angular/animations": "^18.2.12",
-    "@angular/cdk": "^17.3.10",
+    "@angular/cdk": "^18.2.12",
-    "@angular/common": "^17.3.12",
+    "@angular/common": "^18.2.12",
-    "@angular/compiler": "^17.3.12",
+    "@angular/compiler": "^18.2.12",
-    "@angular/core": "^17.3.12",
+    "@angular/core": "^18.2.12",
-    "@angular/forms": "^17.3.12",
+    "@angular/forms": "^18.2.12",
-    "@angular/localize": "^17.3.12",
+    "@angular/localize": "^18.2.12",
-    "@angular/platform-browser": "^17.3.12",
+    "@angular/platform-browser": "^18.2.12",
-    "@angular/platform-browser-dynamic": "^17.3.12",
+    "@angular/platform-browser-dynamic": "^18.2.12",
-    "@angular/platform-server": "^17.3.12",
+    "@angular/platform-server": "^18.2.12",
-    "@angular/router": "^17.3.12",
+    "@angular/router": "^18.2.12",
-    "@angular/ssr": "^17.3.11",
+    "@angular/ssr": "^18.2.12",
-    "@babel/runtime": "7.26.7",
+    "@babel/runtime": "7.26.0",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@ng-bootstrap/ng-bootstrap": "^12.0.0",
     "@ng-dynamic-forms/core": "^16.0.0",
     "@ng-dynamic-forms/ui-ng-bootstrap": "^16.0.0",
-    "@ngrx/effects": "^17.1.1",
+    "@ngrx/effects": "^18.1.1",
-    "@ngrx/router-store": "^17.1.1",
+    "@ngrx/operators": "^18.0.0",
-    "@ngrx/store": "^17.1.1",
+    "@ngrx/router-store": "^18.1.1",
-    "@ngx-translate/core": "^14.0.0",
+    "@ngrx/store": "^18.1.1",
+    "@ngx-translate/core": "^16.0.3",
     "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
     "angulartics2": "^12.2.0",
     "axios": "^1.7.9",
@@ -152,12 +146,12 @@
     "mirador-dl-plugin": "^0.13.0",
     "mirador-share-plugin": "^0.16.0",
     "morgan": "^1.10.0",
-    "ng2-file-upload": "5.0.0",
+    "ng2-file-upload": "7.0.1",
     "ng2-nouislider": "^2.0.0",
-    "ngx-infinite-scroll": "^16.0.0",
+    "ngx-infinite-scroll": "^18.0.0",
     "ngx-pagination": "6.0.3",
     "ngx-skeleton-loader": "^9.0.0",
-    "ngx-ui-switch": "^14.1.0",
+    "ngx-ui-switch": "^15.0.0",
     "nouislider": "^15.7.1",
     "orejime": "^2.3.1",
     "pem": "1.14.8",
@@ -167,22 +161,22 @@
     "zone.js": "~0.14.10"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "~17.0.2",
+    "@angular-builders/custom-webpack": "~18.0.0",
-    "@angular-devkit/build-angular": "^17.3.11",
+    "@angular-devkit/build-angular": "^18.2.12",
-    "@angular-eslint/builder": "^17.5.3",
+    "@angular-eslint/builder": "^18.4.1",
-    "@angular-eslint/bundled-angular-compiler": "^17.5.3",
+    "@angular-eslint/bundled-angular-compiler": "^18.4.1",
-    "@angular-eslint/eslint-plugin": "^17.5.3",
+    "@angular-eslint/eslint-plugin": "^18.4.1",
-    "@angular-eslint/eslint-plugin-template": "^17.5.3",
+    "@angular-eslint/eslint-plugin-template": "^18.4.1",
-    "@angular-eslint/schematics": "^17.5.3",
+    "@angular-eslint/schematics": "^18.4.1",
-    "@angular-eslint/template-parser": "^17.5.3",
+    "@angular-eslint/template-parser": "^18.4.1",
-    "@angular-eslint/utils": "^17.5.3",
+    "@angular-eslint/utils": "^18.4.1",
-    "@angular/cli": "^17.3.11",
+    "@angular/cli": "^18.2.12",
-    "@angular/compiler-cli": "^17.3.11",
+    "@angular/compiler-cli": "^18.2.12",
-    "@angular/language-service": "^17.3.12",
+    "@angular/language-service": "^18.2.12",
     "@cypress/schematic": "^1.5.0",
     "@fortawesome/fontawesome-free": "^6.7.2",
-    "@ngrx/store-devtools": "^17.1.1",
+    "@ngrx/store-devtools": "^18.1.1",
-    "@ngtools/webpack": "^16.2.16",
+    "@ngtools/webpack": "^18.2.12",
     "@types/deep-freeze": "0.1.5",
     "@types/ejs": "^3.1.2",
     "@types/express": "^4.17.17",

server.ts

@@ -20,10 +20,10 @@ import 'reflect-metadata';
 
 /* eslint-disable import/no-namespace */
 import * as morgan from 'morgan';
-import * as express from 'express';
+import express from 'express';
 import * as ejs from 'ejs';
 import * as compression from 'compression';
-import * as expressStaticGzip from 'express-static-gzip';
+import expressStaticGzip from 'express-static-gzip';
 /* eslint-enable import/no-namespace */
 import axios from 'axios';
 import LRU from 'lru-cache';

src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts

@@ -1,4 +1,8 @@
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import {
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
   ComponentFixture,
@@ -39,22 +43,21 @@ describe('FiltersComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [
+      schemas: [NO_ERRORS_SCHEMA],
-        NgbAccordionModule,
+      imports: [NgbAccordionModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
             useClass: TranslateLoaderMock,
           },
         }),
-        HttpClientTestingModule,
+        FilteredCollectionsComponent],
-        FilteredCollectionsComponent,
-      ],
       providers: [
         FormBuilder,
         DspaceRestService,
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
       ],
-      schemas: [NO_ERRORS_SCHEMA],
     });
   }));
 

src/app/core/auth/auth.interceptor.spec.ts

@@ -1,7 +1,11 @@
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import {
-  HttpClientTestingModule,
+  HTTP_INTERCEPTORS,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
   HttpTestingController,
+  provideHttpClientTesting,
 } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
@@ -28,7 +32,7 @@ describe(`AuthInterceptor`, () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      imports: [],
       providers: [
         DspaceRestService,
         { provide: AuthService, useValue: authServiceStub },
@@ -39,6 +43,8 @@ describe(`AuthInterceptor`, () => {
           multi: true,
         },
         { provide: Store, useValue: store },
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
       ],
     });
 

src/app/core/cache/object-cache.reducer.spec.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 import { Operation } from 'fast-json-patch';
 
 import { Item } from '../shared/item.model';

src/app/core/cache/server-sync-buffer.reducer.spec.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import { RestRequestMethod } from '../data/rest-request-method';
 import { RemoveFromObjectCacheAction } from './object-cache.actions';

src/app/core/data/object-updates/object-updates.reducer.spec.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import { Relationship } from '../../shared/item-relationships/relationship.model';
 import { FieldChangeType } from './field-change-type.model';

src/app/core/data/request.reducer.spec.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import {
   RequestConfigureAction,

src/app/core/dspace-rest/dspace-rest.service.spec.ts

@@ -1,10 +1,12 @@
 import {
   HttpErrorResponse,
   HttpHeaders,
+  provideHttpClient,
+  withInterceptorsFromDi,
 } from '@angular/common/http';
 import {
-  HttpClientTestingModule,
   HttpTestingController,
+  provideHttpClientTesting,
 } from '@angular/common/http/testing';
 import {
   inject,
@@ -33,8 +35,12 @@ describe('DspaceRestService', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      imports: [],
-      providers: [DspaceRestService],
+      providers: [
+        DspaceRestService,
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
+      ],
     });
 
     dspaceRestService = TestBed.inject(DspaceRestService);

src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts

@@ -1,7 +1,11 @@
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import {
-  HttpClientTestingModule,
+  HTTP_INTERCEPTORS,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
   HttpTestingController,
+  provideHttpClientTesting,
 } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 
@@ -21,7 +25,7 @@ describe('ForwardClientIpInterceptor', () => {
     clientIp = '1.2.3.4';
 
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      imports: [],
       providers: [
         DspaceRestService,
         {
@@ -30,6 +34,8 @@ describe('ForwardClientIpInterceptor', () => {
           multi: true,
         },
         { provide: REQUEST, useValue: { get: () => undefined, connection: { remoteAddress: clientIp } } },
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
       ],
     });
 

src/app/core/index/index.reducer.spec.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import {
   AddToIndexAction,

src/app/core/json-patch/json-patch-operations.reducer.spec.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import {
   CommitPatchOperationsAction,

src/app/core/locale/locale.interceptor.spec.ts

@@ -1,7 +1,11 @@
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import {
-  HttpClientTestingModule,
+  HTTP_INTERCEPTORS,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
   HttpTestingController,
+  provideHttpClientTesting,
 } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
@@ -25,7 +29,7 @@ describe(`LocaleInterceptor`, () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      imports: [],
       providers: [
         DspaceRestService,
         {
@@ -34,6 +38,8 @@ describe(`LocaleInterceptor`, () => {
           multi: true,
         },
         { provide: LocaleService, useValue: mockLocaleService },
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
       ],
     });
 

src/app/core/log/log.interceptor.spec.ts

@@ -1,7 +1,11 @@
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import {
-  HttpClientTestingModule,
+  HTTP_INTERCEPTORS,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
   HttpTestingController,
+  provideHttpClientTesting,
 } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
@@ -39,10 +43,7 @@ describe('LogInterceptor', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [
+      imports: [StoreModule.forRoot(appReducers, storeModuleConfig)],
-        HttpClientTestingModule,
-        StoreModule.forRoot(appReducers, storeModuleConfig),
-      ],
       providers: [
         DspaceRestService,
         // LogInterceptor,
@@ -55,6 +56,8 @@ describe('LogInterceptor', () => {
         { provide: Router, useValue: router },
         { provide: CorrelationIdService, useClass: CorrelationIdService },
         { provide: UUIDService, useClass: UUIDService },
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
       ],
     });
 

src/app/core/xsrf/browser-xsrf.service.spec.ts

@@ -1,7 +1,11 @@
-import { HttpClient } from '@angular/common/http';
 import {
-  HttpClientTestingModule,
+  HttpClient,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
   HttpTestingController,
+  provideHttpClientTesting,
 } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 
@@ -17,8 +21,12 @@ describe(`BrowserXSRFService`, () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [ HttpClientTestingModule ],
+      imports: [],
-      providers: [ BrowserXSRFService ],
+      providers: [
+        BrowserXSRFService,
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
+      ],
     });
     httpClient = TestBed.inject(HttpClient);
     httpTestingController = TestBed.inject(HttpTestingController);

src/app/core/xsrf/xsrf.interceptor.spec.ts

@@ -2,10 +2,12 @@ import {
   HTTP_INTERCEPTORS,
   HttpHeaders,
   HttpXsrfTokenExtractor,
+  provideHttpClient,
+  withInterceptorsFromDi,
 } from '@angular/common/http';
 import {
-  HttpClientTestingModule,
   HttpTestingController,
+  provideHttpClientTesting,
 } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 
@@ -20,7 +22,7 @@ import { XsrfInterceptor } from './xsrf.interceptor';
 describe(`XsrfInterceptor`, () => {
   let service: DspaceRestService;
   let httpMock: HttpTestingController;
-  let cookieService: CookieService;
+  let cookieService: CookieServiceMock;
 
   // mock XSRF token
   const testToken = 'test-token';
@@ -33,45 +35,52 @@ describe(`XsrfInterceptor`, () => {
   const mockStatusCode = 200;
   const mockStatusText = 'SUCCESS';
 
+  const testUrl = 'https://rest.com/server/api/core/items';
+
   beforeEach(() => {
+    const tokenExtractor = new HttpXsrfTokenExtractorMock(testToken);
+    cookieService = new CookieServiceMock();
+    const interceptor = new XsrfInterceptor(tokenExtractor,cookieService as any);
+
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      imports: [],
       providers: [
         DspaceRestService,
         {
           provide: HTTP_INTERCEPTORS,
-          useClass: XsrfInterceptor,
+          useValue: interceptor,
           multi: true,
         },
-        { provide: HttpXsrfTokenExtractor, useValue: new HttpXsrfTokenExtractorMock(testToken) },
+        { provide: HttpXsrfTokenExtractor, useValue: tokenExtractor },
-        { provide: CookieService, useValue: new CookieServiceMock() },
+        { provide: CookieService, useValue: cookieService },
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
       ],
     });
 
     service = TestBed.get(DspaceRestService);
     httpMock = TestBed.get(HttpTestingController);
-    cookieService = TestBed.get(CookieService);
   });
 
   it('should change withCredentials to true at all times', (done) => {
-    service.request(RestRequestMethod.POST, 'server/api/core/items', 'test', { withCredentials: false }).subscribe((response) => {
+    service.request(RestRequestMethod.POST, testUrl, 'test', { withCredentials: false }).subscribe((response) => {
       expect(response).toBeTruthy();
       done();
     });
 
-    const httpRequest = httpMock.expectOne('server/api/core/items');
+    const httpRequest = httpMock.expectOne(testUrl);
     expect(httpRequest.request.withCredentials).toBeTrue();
 
     httpRequest.flush(mockPayload, { status: mockStatusCode, statusText: mockStatusText });
   });
 
   it('should add an X-XSRF-TOKEN header when we are sending an HTTP POST request', (done) => {
-    service.request(RestRequestMethod.POST, 'server/api/core/items', 'test').subscribe((response) => {
+    service.request(RestRequestMethod.POST, testUrl, 'test').subscribe((response) => {
       expect(response).toBeTruthy();
       done();
     });
 
-    const httpRequest = httpMock.expectOne('server/api/core/items');
+    const httpRequest = httpMock.expectOne(testUrl);
 
     expect(httpRequest.request.headers.has('X-XSRF-TOKEN')).toBeTrue();
     expect(httpRequest.request.withCredentials).toBeTrue();
@@ -83,12 +92,12 @@ describe(`XsrfInterceptor`, () => {
   });
 
   it('should NOT add an X-XSRF-TOKEN header when we are sending an HTTP GET request', (done) => {
-    service.request(RestRequestMethod.GET, 'server/api/core/items').subscribe((response) => {
+    service.request(RestRequestMethod.GET, testUrl).subscribe((response) => {
       expect(response).toBeTruthy();
       done();
     });
 
-    const httpRequest = httpMock.expectOne('server/api/core/items');
+    const httpRequest = httpMock.expectOne(testUrl);
 
     expect(httpRequest.request.headers.has('X-XSRF-TOKEN')).toBeFalse();
     expect(httpRequest.request.withCredentials).toBeTrue();
@@ -115,7 +124,7 @@ describe(`XsrfInterceptor`, () => {
     // Create a mock XSRF token to be returned in response within DSPACE-XSRF-TOKEN header
     const mockNewXSRFToken = '123456789abcdefg';
 
-    service.request(RestRequestMethod.GET, 'server/api/core/items').subscribe((response) => {
+    service.request(RestRequestMethod.GET, testUrl).subscribe((response) => {
       expect(response).toBeTruthy();
 
       // ensure mock data (added in below flush() call) is returned.
@@ -135,7 +144,7 @@ describe(`XsrfInterceptor`, () => {
       done();
     });
 
-    const httpRequest = httpMock.expectOne('server/api/core/items');
+    const httpRequest = httpMock.expectOne(testUrl);
 
     // Flush & create mock response (including sending back a new XSRF token in header)
     httpRequest.flush(mockPayload, {
@@ -153,7 +162,7 @@ describe(`XsrfInterceptor`, () => {
     const mockErrorText = 'Forbidden';
     const mockErrorMessage = 'CSRF token mismatch';
 
-    service.request(RestRequestMethod.GET, 'server/api/core/items').subscribe({
+    service.request(RestRequestMethod.GET, testUrl).subscribe({
       error: (error: unknown) => {
         expect(error).toBeTruthy();
         expect(error instanceof RequestError).toBeTrue();
@@ -170,7 +179,7 @@ describe(`XsrfInterceptor`, () => {
       },
     });
 
-    const httpRequest = httpMock.expectOne('server/api/core/items');
+    const httpRequest = httpMock.expectOne(testUrl);
 
     // Flush & create mock error response (including sending back a new XSRF token in header)
     httpRequest.flush(mockErrorMessage, {

src/app/header/context-help-toggle/context-help-toggle.component.spec.ts

@@ -56,11 +56,9 @@ describe('ContextHelpToggleComponent', () => {
     });
 
     it('clicking the button should toggle context help icon visibility', fakeAsync(() => {
-      fixture.whenStable().then(() => {
       fixture.debugElement.query(By.css('a')).nativeElement.click();
       tick();
       expect(contextHelpService.toggleIcons).toHaveBeenCalled();
-      });
     }));
   });
 

src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts

@@ -4,10 +4,10 @@ import {
   NO_ERRORS_SCHEMA,
 } from '@angular/core';
 import {
-  async,
   ComponentFixture,
   inject,
   TestBed,
+  waitForAsync,
 } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
@@ -86,7 +86,7 @@ describe('ProjectEntryImportModalComponent test suite', () => {
   const searchServiceStub: any = getMockSearchService();
 
 
-  beforeEach(async (() => {
+  beforeEach(waitForAsync (() => {
     TestBed.configureTestingModule({
       imports: [
         CommonModule,

src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts

@@ -1,8 +1,8 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
-  async,
   ComponentFixture,
   TestBed,
+  waitForAsync,
 } from '@angular/core/testing';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +22,7 @@ describe('SuggestionListElementComponent', () => {
   let scheduler: TestScheduler;
 
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot(),

src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts

@@ -1,8 +1,8 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
-  async,
   ComponentFixture,
   TestBed,
+  waitForAsync,
 } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -31,7 +31,7 @@ describe('SuggestionsPopupComponent', () => {
       jasmine.createSpy('getNotificationSuggestionInterpolation').and.returnValue(mockNotificationInterpolation),
   });
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), SuggestionsPopupComponent],
       providers: [

src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.spec.ts

@@ -1,8 +1,8 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
-  async,
   ComponentFixture,
   TestBed,
+  waitForAsync,
 } from '@angular/core/testing';
 
 import { QualityAssuranceEventsComponent } from '../../notifications/qa/events/quality-assurance-events.component';
@@ -12,7 +12,7 @@ describe('QualityAssuranceEventsPageComponent', () => {
   let component: QualityAssuranceEventsPageComponent;
   let fixture: ComponentFixture<QualityAssuranceEventsPageComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [QualityAssuranceEventsPageComponent],
       schemas: [NO_ERRORS_SCHEMA],

src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.spec.ts

@@ -1,8 +1,8 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
-  async,
   ComponentFixture,
   TestBed,
+  waitForAsync,
 } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
@@ -14,7 +14,7 @@ describe('QualityAssuranceTopicsPageComponent', () => {
   let component: QualityAssuranceTopicsPageComponent;
   let fixture: ComponentFixture<QualityAssuranceTopicsPageComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [QualityAssuranceTopicsPageComponent],
       providers: [

src/app/shared/host-window.reducer.spec.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import { HostWindowResizeAction } from './host-window.actions';
 import { hostWindowReducer } from './search/host-window.reducer';

src/app/shared/lang-switch/lang-switch.component.spec.ts

@@ -1,6 +1,10 @@
 import {
-  HttpClientTestingModule,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
   HttpTestingController,
+  provideHttpClientTesting,
 } from '@angular/common/http/testing';
 import {
   DebugElement,
@@ -83,13 +87,15 @@ describe('LangSwitchComponent', () => {
       };
 
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, TranslateModule.forRoot({
+        schemas: [NO_ERRORS_SCHEMA],
+        imports: [TranslateModule.forRoot({
           loader: { provide: TranslateLoader, useClass: CustomLoader },
         }), LangSwitchComponent],
-        schemas: [NO_ERRORS_SCHEMA],
         providers: [
           TranslateService,
           { provide: LocaleService, useValue: getMockLocaleService() },
+          provideHttpClient(withInterceptorsFromDi()),
+          provideHttpClientTesting(),
         ],
       }).compileComponents()
         .then(() => {
@@ -166,13 +172,15 @@ describe('LangSwitchComponent', () => {
       };
 
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, TranslateModule.forRoot({
+        schemas: [NO_ERRORS_SCHEMA],
+        imports: [TranslateModule.forRoot({
           loader: { provide: TranslateLoader, useClass: CustomLoader },
         }), LangSwitchComponent],
-        schemas: [NO_ERRORS_SCHEMA],
         providers: [
           TranslateService,
           { provide: LocaleService, useValue: getMockLocaleService() },
+          provideHttpClient(withInterceptorsFromDi()),
+          provideHttpClientTesting(),
         ],
       }).compileComponents();
       translate = TestBed.inject(TranslateService);

src/app/shared/menu/menu.reducer.spec.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import { initialMenusState } from './initial-menus-state';
 import {

src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import {
   SearchFilterCollapseAction,

src/app/shared/sidebar/sidebar.reducer.spec.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import {
   SidebarCollapseAction,

src/app/shared/truncatable/truncatable.reducer.spec.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import {
   TruncatableCollapseAction,

src/app/shared/utils/file-size-pipe.ts

@@ -3,7 +3,7 @@ import {
   PipeTransform,
 } from '@angular/core';
 // eslint-disable-next-line import/no-namespace
-import * as fileSize from 'filesize';
+import fileSize from 'filesize';
 
 /*
  * Convert bytes into largest possible unit.

src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts

@@ -278,7 +278,7 @@ export class SystemWideAlertFormComponent implements OnInit {
           this.back();
         }
       } else {
-        this.notificationsService.error(this.translateService.get(`${messagePrefix}.error`, response.errorMessage));
+        this.notificationsService.error(this.translateService.get(`${messagePrefix}.error`));
       }
     });
   }

src/environments/environment.test.ts

@@ -42,7 +42,7 @@ export const environment: BuildConfig = {
     port: 443,
     // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
     nameSpace: '/api',
-    baseUrl: 'https://rest.com/api',
+    baseUrl: 'https://rest.com/server',
   },
 
   actuators: {

src/themes/custom/lazy-theme.module.ts

@@ -1,6 +1,9 @@
 import { DragDropModule } from '@angular/cdk/drag-drop';
 import { CommonModule } from '@angular/common';
-import { HttpClientModule } from '@angular/common/http';
+import {
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
@@ -204,12 +207,10 @@ const DECLARATIONS = [
 ];
 
 @NgModule({
-  imports: [
+  imports: [RootModule,
-    RootModule,
     CommonModule,
     DragDropModule,
     FormsModule,
-    HttpClientModule,
     NgbModule,
     RouterModule,
     ScrollToModule,
@@ -218,7 +219,9 @@ const DECLARATIONS = [
     TranslateModule,
     FormsModule,
     NgxGalleryModule,
-    ...DECLARATIONS,
+    ...DECLARATIONS],
+  providers: [
+    provideHttpClient(withInterceptorsFromDi()),
   ],
 })
 

src/themes/dspace/lazy-theme.module.ts

@@ -1,6 +1,9 @@
 import { DragDropModule } from '@angular/cdk/drag-drop';
 import { CommonModule } from '@angular/common';
-import { HttpClientModule } from '@angular/common/http';
+import {
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
@@ -16,12 +19,12 @@ const DECLARATIONS = [
 ];
 
 @NgModule({
+  declarations: DECLARATIONS,
   imports: [
     RootModule,
     CommonModule,
     DragDropModule,
     FormsModule,
-    HttpClientModule,
     NgbModule,
     RouterModule,
     ScrollToModule,
@@ -30,7 +33,9 @@ const DECLARATIONS = [
     TranslateModule,
     FormsModule,
   ],
-  declarations: DECLARATIONS,
+  providers: [
+    provideHttpClient(withInterceptorsFromDi()),
+  ],
 })
 
 /**

tsconfig.json

@@ -8,8 +8,8 @@
     "baseUrl": "./",
     "outDir": "./dist/out-tsc",
     "declaration": false,
-    "downlevelIteration": true,
     "emitDecoratorMetadata": true,
+    "esModuleInterop": true,
     "experimentalDecorators": true,
     "sourceMap": true,
     "module": "es2020",
@@ -20,7 +20,6 @@
     "strictNullChecks": false,
     "skipDefaultLibCheck": true,
     "pretty": true,
-    "allowSyntheticDefaultImports": true,
     "target": "ES2022",
     "typeRoots": [
       "node_modules/@types",