From 3aa8e9b31a2040b0e974289a101e41a8833f2f83 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:53:53 +0300 Subject: [PATCH 01/15] Update typescript to version 4.9.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 74e0151..17878c8 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,6 @@ "karma-jasmine-html-reporter": "^1.6.0", "protractor": "~7.0.0", "ts-node": "~7.0.0", - "typescript": "~4.6.4" + "typescript": "~4.9.5" } } From 3efc55f006f240616a26333d2f12e82582fd60a1 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:55:19 +0300 Subject: [PATCH 02/15] Migrate angular core and cli to version 15 and update dependencies to be compatible with the newer version. --- angular.json | 3 ++- package.json | 34 +++++++++++++++++----------------- src/main.server.ts | 2 +- src/test.ts | 6 ------ src/tsconfig.server.json | 1 - tsconfig.json | 5 +++-- 6 files changed, 23 insertions(+), 28 deletions(-) diff --git a/angular.json b/angular.json index 1b35857..028a14a 100644 --- a/angular.json +++ b/angular.json @@ -226,7 +226,8 @@ "development": { "outputHashing": "media", "sourceMap": false, - "optimization": true + "optimization": true, + "vendorChunk": true }, "beta": { "outputHashing": "media", diff --git a/package.json b/package.json index 17878c8..7a6bbd8 100644 --- a/package.json +++ b/package.json @@ -21,24 +21,24 @@ }, "private": true, "dependencies": { - "@angular/animations": "^14.2.3", + "@angular/animations": "^15.2.9", "@angular/cdk": "^14.2.2", - "@angular/common": "^14.2.3", - "@angular/compiler": "^14.2.3", - "@angular/core": "^14.2.3", - "@angular/forms": "^14.2.3", - "@angular/localize": "^14.2.3", + "@angular/common": "^15.2.9", + "@angular/compiler": "^15.2.9", + "@angular/core": "^15.2.9", + "@angular/forms": "^15.2.9", + "@angular/localize": "^15.2.9", "@angular/material": "^14.2.2", - "@angular/platform-browser": "^14.2.3", - "@angular/platform-browser-dynamic": "^14.2.3", - "@angular/platform-server": "^14.2.3", - "@angular/router": "^14.2.3", - "@nguniversal/express-engine": "^14.2.0", + "@angular/platform-browser": "^15.2.9", + "@angular/platform-browser-dynamic": "^15.2.9", + "@angular/platform-server": "^15.2.9", + "@angular/router": "^15.2.9", + "@nguniversal/express-engine": "^15.2.1", "clipboard": "^1.5.16", "core-js": "^2.5.4", "express": "^4.15.2", "jquery": "^3.4.1", - "ng-recaptcha": "^10.0.0", + "ng-recaptcha": "^11.0.0", "prom-client": "^11.3.0", "rxjs": "^6.5.1", "ts-md5": "^1.2.0", @@ -47,11 +47,11 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "^14.2.3", - "@angular/cli": "^14.2.3", - "@angular/compiler-cli": "^14.2.3", - "@angular/language-service": "^14.2.3", - "@nguniversal/builders": "^14.2.0", + "@angular-devkit/build-angular": "^15.2.9", + "@angular/cli": "^15.2.9", + "@angular/compiler-cli": "^15.2.9", + "@angular/language-service": "^15.2.9", + "@nguniversal/builders": "^15.2.1", "@types/express": "^4.17.0", "@types/compression": "^1.7.0", "@types/node": "^12.11.1", diff --git a/src/main.server.ts b/src/main.server.ts index d8775d6..0930b37 100644 --- a/src/main.server.ts +++ b/src/main.server.ts @@ -12,4 +12,4 @@ if (properties.environment !== "development") { } export { AppServerModule } from './app/app.server.module'; -export { renderModule } from '@angular/platform-server'; + diff --git a/src/test.ts b/src/test.ts index 6b03dbe..ae25f27 100644 --- a/src/test.ts +++ b/src/test.ts @@ -7,8 +7,6 @@ import { platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; -declare const require: any; - // First, initialize the Angular testing environment. getTestBed().initTestEnvironment( BrowserDynamicTestingModule, @@ -16,7 +14,3 @@ getTestBed().initTestEnvironment( teardown: { destroyAfterEach: false } } ); -// Then we find all the tests. -const context = require.context('./', true, /\.spec\.ts$/); -// And load the modules. -context.keys().map(context); diff --git a/src/tsconfig.server.json b/src/tsconfig.server.json index 39f85aa..5601502 100644 --- a/src/tsconfig.server.json +++ b/src/tsconfig.server.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.app.json", "compilerOptions": { "outDir": "../out-tsc/app-server", - "target": "es2016", "types": [ "node" ] diff --git a/tsconfig.json b/tsconfig.json index fc8b4c1..668d981 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,13 +10,14 @@ "moduleResolution": "node", "experimentalDecorators": true, "importHelpers": true, - "target": "es2020", + "target": "ES2022", "typeRoots": [ "node_modules/@types" ], "lib": [ "es2018", "dom" - ] + ], + "useDefineForClassFields": false } } From 9e8fb8b764ce08e53daeb05cf2ad3e5c527ed66b Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:56:56 +0300 Subject: [PATCH 03/15] Update material to angular 15. --- package.json | 6 +++--- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 7a6bbd8..7368c56 100644 --- a/package.json +++ b/package.json @@ -22,13 +22,13 @@ "private": true, "dependencies": { "@angular/animations": "^15.2.9", - "@angular/cdk": "^14.2.2", + "@angular/cdk": "^15.2.9", "@angular/common": "^15.2.9", "@angular/compiler": "^15.2.9", "@angular/core": "^15.2.9", "@angular/forms": "^15.2.9", "@angular/localize": "^15.2.9", - "@angular/material": "^14.2.2", + "@angular/material": "^15.2.9", "@angular/platform-browser": "^15.2.9", "@angular/platform-browser-dynamic": "^15.2.9", "@angular/platform-server": "^15.2.9", @@ -69,4 +69,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} +} \ No newline at end of file diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index a53c4e9..3b6822c 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit a53c4e90d099d0bf3919df55edceaf7f793427d0 +Subproject commit 3b6822c71f32512533793e6b57f6ff017f4c874e diff --git a/src/assets/common-assets b/src/assets/common-assets index 2fd5784..9cb1f83 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 2fd57843f85125e54adfb95b35776755037ea359 +Subproject commit 9cb1f835a93501d9566ea2a3123d92eecd73f27d From c76aaf4d6e8b46c92f50ddf4d817b9a5d5e37e73 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:57:14 +0300 Subject: [PATCH 04/15] Update Zone to 0.13.1 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7368c56..1786c7e 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "ts-md5": "^1.2.0", "tslib": "^2.0.0", "uikit": "3.13.10", - "zone.js": "~0.11.4" + "zone.js": "~0.13.1" }, "devDependencies": { "@angular-devkit/build-angular": "^15.2.9", @@ -69,4 +69,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} \ No newline at end of file +} From 819666a45dc311d50471be0f9123025fd29938d1 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:58:38 +0300 Subject: [PATCH 05/15] Update angular to version 16 --- angular.json | 12 ++++++++---- package.json | 30 +++++++++++++++--------------- src/app/openaireLibrary | 2 +- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/angular.json b/angular.json index 028a14a..05ad3e6 100644 --- a/angular.json +++ b/angular.json @@ -220,14 +220,16 @@ "main": "server.ts", "tsConfig": "src/tsconfig.server.json", "sourceMap": true, - "optimization": false + "optimization": false, + "buildOptimizer": false }, "configurations": { "development": { "outputHashing": "media", "sourceMap": false, "optimization": true, - "vendorChunk": true + "vendorChunk": true, + "buildOptimizer": true }, "beta": { "outputHashing": "media", @@ -238,7 +240,8 @@ } ], "sourceMap": false, - "optimization": true + "optimization": true, + "buildOptimizer": true }, "production": { "outputHashing": "media", @@ -249,7 +252,8 @@ } ], "sourceMap": false, - "optimization": true + "optimization": true, + "buildOptimizer": true } }, "defaultConfiguration": "" diff --git a/package.json b/package.json index 1786c7e..512ff8e 100644 --- a/package.json +++ b/package.json @@ -21,18 +21,18 @@ }, "private": true, "dependencies": { - "@angular/animations": "^15.2.9", + "@angular/animations": "^16.1.8", "@angular/cdk": "^15.2.9", - "@angular/common": "^15.2.9", - "@angular/compiler": "^15.2.9", - "@angular/core": "^15.2.9", - "@angular/forms": "^15.2.9", - "@angular/localize": "^15.2.9", + "@angular/common": "^16.1.8", + "@angular/compiler": "^16.1.8", + "@angular/core": "^16.1.8", + "@angular/forms": "^16.1.8", + "@angular/localize": "^16.1.8", "@angular/material": "^15.2.9", - "@angular/platform-browser": "^15.2.9", - "@angular/platform-browser-dynamic": "^15.2.9", - "@angular/platform-server": "^15.2.9", - "@angular/router": "^15.2.9", + "@angular/platform-browser": "^16.1.8", + "@angular/platform-browser-dynamic": "^16.1.8", + "@angular/platform-server": "^16.1.8", + "@angular/router": "^16.1.8", "@nguniversal/express-engine": "^15.2.1", "clipboard": "^1.5.16", "core-js": "^2.5.4", @@ -47,10 +47,10 @@ "zone.js": "~0.13.1" }, "devDependencies": { - "@angular-devkit/build-angular": "^15.2.9", - "@angular/cli": "^15.2.9", - "@angular/compiler-cli": "^15.2.9", - "@angular/language-service": "^15.2.9", + "@angular-devkit/build-angular": "^16.1.7", + "@angular/cli": "^16.1.7", + "@angular/compiler-cli": "^16.1.8", + "@angular/language-service": "^16.1.8", "@nguniversal/builders": "^15.2.1", "@types/express": "^4.17.0", "@types/compression": "^1.7.0", @@ -69,4 +69,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} +} \ No newline at end of file diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 3b6822c..758f2f1 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3b6822c71f32512533793e6b57f6ff017f4c874e +Subproject commit 758f2f10ffe6623fb55606ca2e9c29abf89b9b4f From ccc3e97c5512a4f96b47dd25b603aefee0273c31 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:59:48 +0300 Subject: [PATCH 06/15] Update server to version 16 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 512ff8e..4bd099f 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@angular/platform-browser-dynamic": "^16.1.8", "@angular/platform-server": "^16.1.8", "@angular/router": "^16.1.8", - "@nguniversal/express-engine": "^15.2.1", + "@nguniversal/express-engine": "^16.1.1", "clipboard": "^1.5.16", "core-js": "^2.5.4", "express": "^4.15.2", @@ -51,7 +51,7 @@ "@angular/cli": "^16.1.7", "@angular/compiler-cli": "^16.1.8", "@angular/language-service": "^16.1.8", - "@nguniversal/builders": "^15.2.1", + "@nguniversal/builders": "^16.1.1", "@types/express": "^4.17.0", "@types/compression": "^1.7.0", "@types/node": "^12.11.1", From 34f56291e5eb9bb913be1c662404053dbf0f4f8c Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 15:01:59 +0300 Subject: [PATCH 07/15] Update angular to angular 16. --- package.json | 2 +- src/app/app.module.ts | 8 ++++---- src/app/app.server.module.ts | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 4bd099f..acf9c2f 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "core-js": "^2.5.4", "express": "^4.15.2", "jquery": "^3.4.1", - "ng-recaptcha": "^11.0.0", + "ng-recaptcha": "^12.0.2", "prom-client": "^11.3.0", "rxjs": "^6.5.1", "ts-md5": "^1.2.0", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0534261..900df59 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,6 +1,6 @@ -import {NgModule} from '@angular/core'; +import {APP_ID, NgModule} from '@angular/core'; import {SharedModule} from './shared/shared.module'; -import {BrowserModule, BrowserTransferStateModule} from '@angular/platform-browser'; +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'; @@ -27,14 +27,14 @@ import {ConfigurationService} from "./openaireLibrary/utils/configuration/config NavigationBarModule, FeedbackModule, BottomModule, CookieLawModule, BrowserAnimationsModule, - BrowserTransferStateModule, - BrowserModule.withServerTransition({appId: 'eosc'}), + BrowserModule, AppRoutingModule ], declarations: [AppComponent, OpenaireErrorPageComponent], exports: [AppComponent], providers: [ ConfigurationService, + {provide: APP_ID, useValue: 'eosc'}, { provide: HTTP_INTERCEPTORS, useClass: HttpInterceptorService, diff --git a/src/app/app.server.module.ts b/src/app/app.server.module.ts index cc86a55..561695a 100644 --- a/src/app/app.server.module.ts +++ b/src/app/app.server.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import {ServerModule, ServerTransferStateModule} from '@angular/platform-server'; +import {ServerModule} from '@angular/platform-server'; import { AppModule } from './app.module'; import { AppComponent } from './app.component'; @@ -7,8 +7,7 @@ import { AppComponent } from './app.component'; @NgModule({ imports: [ AppModule, - ServerModule, - ServerTransferStateModule + ServerModule ], bootstrap: [AppComponent], }) From d432ae446cfa523b95619953ef6ee9653abb7816 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 15:02:43 +0300 Subject: [PATCH 08/15] Update material to angular 16. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index acf9c2f..b59ee52 100644 --- a/package.json +++ b/package.json @@ -22,13 +22,13 @@ "private": true, "dependencies": { "@angular/animations": "^16.1.8", - "@angular/cdk": "^15.2.9", + "@angular/cdk": "^16.1.7", "@angular/common": "^16.1.8", "@angular/compiler": "^16.1.8", "@angular/core": "^16.1.8", "@angular/forms": "^16.1.8", "@angular/localize": "^16.1.8", - "@angular/material": "^15.2.9", + "@angular/material": "^16.1.7", "@angular/platform-browser": "^16.1.8", "@angular/platform-browser-dynamic": "^16.1.8", "@angular/platform-server": "^16.1.8", From 5f3118831d10446de89ca1f5eaddd9264c0251f2 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 23 Aug 2023 16:44:49 +0300 Subject: [PATCH 09/15] Update uikit to version 3.16.24 --- package.json | 4 ++-- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b59ee52..697aff8 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "rxjs": "^6.5.1", "ts-md5": "^1.2.0", "tslib": "^2.0.0", - "uikit": "3.13.10", + "uikit": "3.16.24", "zone.js": "~0.13.1" }, "devDependencies": { @@ -69,4 +69,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} \ No newline at end of file +} diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 758f2f1..7906b05 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 758f2f10ffe6623fb55606ca2e9c29abf89b9b4f +Subproject commit 7906b056c919a95d9edbe6bcc00e364f2af4dab7 diff --git a/src/assets/common-assets b/src/assets/common-assets index 9cb1f83..ae7e623 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 9cb1f835a93501d9566ea2a3123d92eecd73f27d +Subproject commit ae7e623418e7362e80cf9f65db7a004c0857d239 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 5268f27..d52e929 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 5268f277246347aad42349a06eecb915a452841b +Subproject commit d52e92929799a1626aff66ad413c6db2be521555 From 97811e9854a02769ef0bd098edf7a4efc74f1b14 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 6 Oct 2023 15:35:47 +0300 Subject: [PATCH 10/15] Update types/node to version 16 --- package.json | 2 +- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 697aff8..5423f47 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "@nguniversal/builders": "^16.1.1", "@types/express": "^4.17.0", "@types/compression": "^1.7.0", - "@types/node": "^12.11.1", + "@types/node": "^16.18.50", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", "codelyzer": "^6.0.0", diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 7906b05..5a92373 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 7906b056c919a95d9edbe6bcc00e364f2af4dab7 +Subproject commit 5a9237399e1eb1e04fb5ba485955b02b09bc6eeb diff --git a/src/assets/common-assets b/src/assets/common-assets index ae7e623..9e58421 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit ae7e623418e7362e80cf9f65db7a004c0857d239 +Subproject commit 9e58421a1adf3fbeb361e21616feaea8c7f867af diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index d52e929..fd101a6 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit d52e92929799a1626aff66ad413c6db2be521555 +Subproject commit fd101a6b54f7b8b36bdef015d77365fb41a353df From ef725e7ab44af6e3993163b8859a781dc6c22a3e Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 20 Oct 2023 11:55:07 +0300 Subject: [PATCH 11/15] Updating openaireLibrary & openaire-theme --- src/app/openaireLibrary | 2 +- src/assets/openaire-theme | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 5a92373..f6e927f 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 5a9237399e1eb1e04fb5ba485955b02b09bc6eeb +Subproject commit f6e927f4c2e9fee5518182d3b770548ccd2c8d37 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index fd101a6..2dadcf8 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit fd101a6b54f7b8b36bdef015d77365fb41a353df +Subproject commit 2dadcf85926bc0f11fff22ed94dc197ddd8587c6 From d78d7acbaab123541bd02b2ce81d3f8af0274a6c Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 20 Oct 2023 12:14:44 +0300 Subject: [PATCH 12/15] environment.beta.ts: Updated claimsAPI property to call claims-new --- src/environments/environment.beta.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 155ef95..9445667 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -19,7 +19,7 @@ export let properties: EnvProperties = { statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", useNewStatistisTool: true, - claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/", + claimsAPIURL: "https://beta.services.openaire.eu/claims-new/rest/claimsService/", searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/", searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources", openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=", From a9fb9c5651aa9f7f60572913be23ea9b8c05bf80 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 20 Oct 2023 14:21:09 +0300 Subject: [PATCH 13/15] [angular-16 | DONE | ADDED] environments/: Added property bipFrameAPIURL --- src/environments/environment.beta.ts | 1 + src/environments/environment.prod.ts | 1 + src/environments/environment.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 9445667..7a546b8 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -18,6 +18,7 @@ export let properties: EnvProperties = { statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", + bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", useNewStatistisTool: true, claimsAPIURL: "https://beta.services.openaire.eu/claims-new/rest/claimsService/", searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/", diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 2ce71db..2403203 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -18,6 +18,7 @@ export let properties: EnvProperties = { statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://www.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/", + bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", useNewStatistisTool: true, claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/", searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/", diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 93bc491..2b26d4a 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -18,6 +18,7 @@ export let properties: EnvProperties = { statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", + bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", useNewStatistisTool: true, claimsAPIURL: "http://dl170.madgik.di.uoa.gr:8180/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/", searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/", From 6a9448f4d8331f020c505ba8a6b88ff4bb4c0235 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 30 Oct 2023 19:08:48 +0200 Subject: [PATCH 14/15] [angular-16 | DONE | UPDATED] environments/: Updated how properties are built - use common properties from library. --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/environments/environment.beta.ts | 7 ++++++- src/environments/environment.prod.ts | 7 ++++++- src/environments/environment.ts | 7 ++++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index f6e927f..5184ffa 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit f6e927f4c2e9fee5518182d3b770548ccd2c8d37 +Subproject commit 5184ffad194e23864411f989f9403cd984afb4a3 diff --git a/src/assets/common-assets b/src/assets/common-assets index 9e58421..d1b2d5e 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 9e58421a1adf3fbeb361e21616feaea8c7f867af +Subproject commit d1b2d5e585722751792d12645d17f820cd6a7860 diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 7a546b8..fe967b9 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -4,8 +4,9 @@ // The eoscInfo of which env maps to which file can be found in `.angular-cli.json`. import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; +import {common, commonBeta} from "../app/openaireLibrary/utils/properties/environments/environment"; -export let properties: EnvProperties = { +let props: EnvProperties = { environment: "beta", adminToolsPortalType: "eosc", dashboard: "eosc", @@ -119,3 +120,7 @@ export let properties: EnvProperties = { loginUrl : "https://explore.eosc-portal.eu/egi-login-service/openid_connect_login", cookieName: "EGIAccessToken"} }] }; + +export let properties: EnvProperties = { + ...props, ...common, ...commonBeta +} \ No newline at end of file diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 2403203..ab0ff8b 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -4,8 +4,9 @@ // The eoscInfo of which env maps to which file can be found in `.angular-cli.json`. import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; +import {common, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment"; -export let properties: EnvProperties = { +let props: EnvProperties = { environment: "production", adminToolsPortalType: "eosc", dashboard: "eosc", @@ -125,3 +126,7 @@ export let properties: EnvProperties = { {label : "S3", id: "s3", auth: "keys"} }] }; + +export let properties: EnvProperties = { + ...props, ...common, ...commonProd +} \ No newline at end of file diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 2b26d4a..2949356 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,8 +4,9 @@ // The eoscInfo of which env maps to which file can be found in `.angular-cli.json`. import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; +import {common, commonDev} from "../app/openaireLibrary/utils/properties/environments/environment"; -export let properties: EnvProperties = { +let props: EnvProperties = { environment: "development", adminToolsPortalType: "eosc", dashboard: "eosc", @@ -147,3 +148,7 @@ export let properties: EnvProperties = { } ] }; + +export let properties: EnvProperties = { + ...props, ...common, ...commonDev +} \ No newline at end of file From 71a18c2d89a0cb3acebc65ecfc6c8a3e5912e39e Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 30 Oct 2023 19:09:39 +0200 Subject: [PATCH 15/15] [angular-16 | DONE | FIXED] package.json: Downgraded version of uikit from 3.16.24 to 3.16.14 (parallax not working). --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5423f47..19c7908 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "rxjs": "^6.5.1", "ts-md5": "^1.2.0", "tslib": "^2.0.0", - "uikit": "3.16.24", + "uikit": "3.16.14", "zone.js": "~0.13.1" }, "devDependencies": {