From 86c2a5042c6fd53f10b6844db08f0c79aeb92511 Mon Sep 17 00:00:00 2001
From: Alex Martzios <alexandros.martzios@gmail.com>
Date: Mon, 15 Jul 2024 11:34:10 +0300
Subject: [PATCH] [angular-18 | WIP] upgrade angular core and cli to v18,
 change submodules to angular 18 as well

---
 explore/package.json             | 30 ++++++-------
 explore/src/app/app.module.ts    | 74 +++++++++++++++-----------------
 explore/src/assets/common-assets |  2 +-
 3 files changed, 50 insertions(+), 56 deletions(-)

diff --git a/explore/package.json b/explore/package.json
index e70dcf23..dbaa680e 100644
--- a/explore/package.json
+++ b/explore/package.json
@@ -23,19 +23,19 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^17.3.11",
+    "@angular/animations": "^18.1.0",
     "@angular/cdk": "^17.3.10",
-    "@angular/common": "^17.3.11",
-    "@angular/compiler": "^17.3.11",
-    "@angular/core": "^17.3.11",
-    "@angular/forms": "^17.3.11",
-    "@angular/localize": "^17.3.11",
+    "@angular/common": "^18.1.0",
+    "@angular/compiler": "^18.1.0",
+    "@angular/core": "^18.1.0",
+    "@angular/forms": "^18.1.0",
+    "@angular/localize": "^18.1.0",
     "@angular/material": "^17.3.10",
-    "@angular/platform-browser": "^17.3.11",
-    "@angular/platform-browser-dynamic": "^17.3.11",
-    "@angular/platform-server": "^17.3.11",
-    "@angular/router": "^17.3.11",
-    "@angular/ssr": "^17.3.8",
+    "@angular/platform-browser": "^18.1.0",
+    "@angular/platform-browser-dynamic": "^18.1.0",
+    "@angular/platform-server": "^18.1.0",
+    "@angular/router": "^18.1.0",
+    "@angular/ssr": "^18.1.0",
     "clipboard": "^1.5.16",
     "core-js": "^2.5.4",
     "express": "^4.15.2",
@@ -50,10 +50,10 @@
     "zone.js": "~0.14.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^17.3.8",
-    "@angular/cli": "^17.3.8",
-    "@angular/compiler-cli": "^17.3.11",
-    "@angular/language-service": "^17.3.11",
+    "@angular-devkit/build-angular": "^18.1.0",
+    "@angular/cli": "^18.1.0",
+    "@angular/compiler-cli": "^18.1.0",
+    "@angular/language-service": "^18.1.0",
     "@types/compression": "^1.7.0",
     "@types/express": "^4.17.0",
     "@types/jasmine": "~3.6.0",
diff --git a/explore/src/app/app.module.ts b/explore/src/app/app.module.ts
index 16371cb7..65b319b2 100755
--- a/explore/src/app/app.module.ts
+++ b/explore/src/app/app.module.ts
@@ -3,7 +3,7 @@ import {SharedModule} from './openaireLibrary/shared/shared.module';
 import {BrowserModule} from '@angular/platform-browser';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {CommonModule} from '@angular/common';
-import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
+import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import {AppComponent} from './app.component';
 import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigationBar.module';
 import {CookieLawModule} from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module';
@@ -20,45 +20,39 @@ import {QuickContactModule} from './openaireLibrary/sharedComponents/quick-conta
 import {AlertModalModule} from './openaireLibrary/utils/modal/alertModal.module';
 import {LoadingModule} from "./openaireLibrary/utils/loading/loading.module";
 
-@NgModule({
-  imports: [
-    SharedModule,
-    CommonModule,
-    HttpClientModule,
-    ErrorModule,
-    NavigationBarModule, BottomModule,
-    CookieLawModule,
-    BrowserModule,
-    AppRoutingModule,
-    BrowserAnimationsModule, PageURLResolverModule,
-    Schema2jsonldModule,
-    QuickContactModule,
-    AlertModalModule, LoadingModule
-  ],
-  declarations: [AppComponent],
-  exports: [AppComponent],
-  providers: [
-    {provide: APP_ID, useValue: 'explore'},
-    // {
-    //   provide: HTTP_INTERCEPTORS,
-    //   useClass: CacheInterceptorService,
-    //   multi: true
-    // },
-    {
-      provide: HTTP_INTERCEPTORS,
-      useClass: HttpInterceptorService,
-      multi: true
-    },
-    {
-      provide: HTTP_INTERCEPTORS,
-      useClass: ErrorInterceptorService,
-      multi: true
-    },
-    [{provide: HTTP_INTERCEPTORS, useClass: TimeoutInterceptor, multi: true}],
-    [{provide: DEFAULT_TIMEOUT, useValue: 3000}]
-  ],
-  bootstrap: [AppComponent]
-})
+@NgModule({ declarations: [AppComponent],
+    exports: [AppComponent],
+    bootstrap: [AppComponent], imports: [SharedModule,
+        CommonModule,
+        ErrorModule,
+        NavigationBarModule, BottomModule,
+        CookieLawModule,
+        BrowserModule,
+        AppRoutingModule,
+        BrowserAnimationsModule, PageURLResolverModule,
+        Schema2jsonldModule,
+        QuickContactModule,
+        AlertModalModule, LoadingModule], providers: [
+        { provide: APP_ID, useValue: 'explore' },
+        // {
+        //   provide: HTTP_INTERCEPTORS,
+        //   useClass: CacheInterceptorService,
+        //   multi: true
+        // },
+        {
+            provide: HTTP_INTERCEPTORS,
+            useClass: HttpInterceptorService,
+            multi: true
+        },
+        {
+            provide: HTTP_INTERCEPTORS,
+            useClass: ErrorInterceptorService,
+            multi: true
+        },
+        [{ provide: HTTP_INTERCEPTORS, useClass: TimeoutInterceptor, multi: true }],
+        [{ provide: DEFAULT_TIMEOUT, useValue: 3000 }],
+        provideHttpClient(withInterceptorsFromDi())
+    ] })
 //
 export class AppModule {
 }
diff --git a/explore/src/assets/common-assets b/explore/src/assets/common-assets
index ee1a55a5..eb0051dc 160000
--- a/explore/src/assets/common-assets
+++ b/explore/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit ee1a55a529fde844f54761633e59f3be791717e3
+Subproject commit eb0051dc347cdaa44476048dea9f6b61200f257f