From c72b81bf07b9a3e3d309a697d449ae1b48b53977 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:09:47 +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 9c09b8b..cb7f997 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" } } -- 2.17.1 From c0e2e3f315ba6e32ca5f6e62c511f0ec6fabed15 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:10:52 +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 2d725a1..6f03d7e 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 cb7f997..b6c7a21 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 } } -- 2.17.1 From 5fd848575f47325712a7d0b15ad820b0ed1aac63 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:13:13 +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 b6c7a21..b62a538 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 -- 2.17.1 From d7e4383b7e46228bcfefc181765a514e4052faa2 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:13:44 +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 b62a538..3f516f1 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 +} -- 2.17.1 From 9f4fd02157661f514f7f0e81aa603d3a9081dd9a Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:16:41 +0300 Subject: [PATCH 05/15] Update angular to angular 16. --- angular.json | 13 ++++++++----- package.json | 34 +++++++++++++++++----------------- src/app/app.module.ts | 8 ++++---- src/app/openaireLibrary | 2 +- 4 files changed, 30 insertions(+), 27 deletions(-) diff --git a/angular.json b/angular.json index 6f03d7e..c3b1a28 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": "" @@ -302,7 +306,6 @@ } } }, - "defaultProject": "aggregator", "cli": { "analytics": false } diff --git a/package.json b/package.json index 3f516f1..6a5117a 100644 --- a/package.json +++ b/package.json @@ -21,24 +21,24 @@ }, "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", - "@nguniversal/express-engine": "^15.2.1", + "@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": "^16.1.1", "clipboard": "^1.5.16", "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", @@ -47,11 +47,11 @@ "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", - "@nguniversal/builders": "^15.2.1", + "@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": "^16.1.1", "@types/express": "^4.17.0", "@types/compression": "^1.7.0", "@types/node": "^12.11.1", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d696edb..fa46475 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: 'aggregator'}), + BrowserModule, AppRoutingModule ], declarations: [AppComponent, OpenaireErrorPageComponent], exports: [AppComponent], providers: [ ConfigurationService, + {provide: APP_ID, useValue: 'aggregator'}, { provide: HTTP_INTERCEPTORS, useClass: HttpInterceptorService, diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 3b6822c..e742988 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3b6822c71f32512533793e6b57f6ff017f4c874e +Subproject commit e7429881ca7788fb218cc0063a0bc1e3bdb626f4 -- 2.17.1 From 39602cbd952f16e0f2aa372060894cbc33d7dd5a Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:17:32 +0300 Subject: [PATCH 06/15] Update material to angular 16. --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 6a5117a..172a84b 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", @@ -69,4 +69,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} +} \ No newline at end of file -- 2.17.1 From e6aa6cc8e53fe6f4c5089768445e30a6c0fad20c Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 15:50:03 +0300 Subject: [PATCH 07/15] DeleteTransferStateModule --- src/app/app.server.module.ts | 3 +-- src/app/openaireLibrary | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/app.server.module.ts b/src/app/app.server.module.ts index cc86a55..9c8c71e 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'; @@ -8,7 +8,6 @@ import { AppComponent } from './app.component'; imports: [ AppModule, ServerModule, - ServerTransferStateModule ], bootstrap: [AppComponent], }) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index e742988..758f2f1 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit e7429881ca7788fb218cc0063a0bc1e3bdb626f4 +Subproject commit 758f2f10ffe6623fb55606ca2e9c29abf89b9b4f -- 2.17.1 From 91d4c0d24f3648ade7ee5941b2f9a300152835f6 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 23 Aug 2023 18:18:18 +0300 Subject: [PATCH 08/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 172a84b..3cb3851 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..40ef950 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 758f2f10ffe6623fb55606ca2e9c29abf89b9b4f +Subproject commit 40ef9507150f90d9e50298adb23c29b3d5a9745b 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 -- 2.17.1 From 8b9df4000ab0849e571f90693d028a9d049ac555 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 6 Oct 2023 15:34:18 +0300 Subject: [PATCH 09/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 3cb3851..ee4984e 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 40ef950..5a92373 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 40ef9507150f90d9e50298adb23c29b3d5a9745b +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 -- 2.17.1 From 2426e042ba3071962cfc2b22173413f72c70f074 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 20 Oct 2023 10:24:31 +0300 Subject: [PATCH 10/15] Updating openaireLibrary and 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 -- 2.17.1 From 1b236d826df3cf8eeb80424e667960880fbe0ed8 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 20 Oct 2023 11:53:01 +0300 Subject: [PATCH 11/15] remove unused imports to deleted searchZenodoCommunitiesService --- src/app/deposit/deposit.module.ts | 3 +-- src/app/deposit/searchDataprovidersToDeposit.module.ts | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/app/deposit/deposit.module.ts b/src/app/deposit/deposit.module.ts index e32cbaa..79e96a6 100644 --- a/src/app/deposit/deposit.module.ts +++ b/src/app/deposit/deposit.module.ts @@ -12,7 +12,6 @@ import {DepositFirstPageModule} from "../openaireLibrary/deposit/depositFirstPag import {ZenodoCommunitiesService} from "../openaireLibrary/connect/zenodoCommunities/zenodo-communities.service"; import {CommunityService} from "../openaireLibrary/connect/community/community.service"; -import {SearchZenodoCommunitiesService} from "../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunities.service"; @NgModule({ imports: [ @@ -26,6 +25,6 @@ import {SearchZenodoCommunitiesService} from "../openaireLibrary/connect/zenodoC OpenaireDepositComponent, ], providers: [PreviousRouteRecorder, IsRouteEnabled, - ZenodoCommunitiesService, CommunityService, SearchZenodoCommunitiesService] + ZenodoCommunitiesService, CommunityService] }) export class LibDepositModule { } diff --git a/src/app/deposit/searchDataprovidersToDeposit.module.ts b/src/app/deposit/searchDataprovidersToDeposit.module.ts index 2e76ce7..1d92c9f 100644 --- a/src/app/deposit/searchDataprovidersToDeposit.module.ts +++ b/src/app/deposit/searchDataprovidersToDeposit.module.ts @@ -9,7 +9,6 @@ import {SearchDataprovidersToDepositModule} from '../openaireLibrary/deposit/sea import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard'; import {ZenodoCommunitiesServiceModule} from '../openaireLibrary/connect/zenodoCommunities/zenodo-communitiesService.module'; -import {SearchZenodoCommunitiesServiceModule} from '../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunitiesService.module'; import {CommunityService} from '../openaireLibrary/connect/community/community.service'; @@ -18,7 +17,7 @@ import {CommunityService} from '../openaireLibrary/connect/community/community.s CommonModule, FormsModule, SearchDataprovidersToDepositModule, SearchDataprovidersToDepositRoutingModule, - ZenodoCommunitiesServiceModule, SearchZenodoCommunitiesServiceModule + ZenodoCommunitiesServiceModule ], declarations: [ OpenaireSearchDataprovidersToDepositComponent -- 2.17.1 From 70e344702609a34600f4064848f94bcdbb8721e8 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 20 Oct 2023 12:01:26 +0300 Subject: [PATCH 12/15] environment.beta.ts: Updated claimsAPI property to call new-claims --- 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 8dfde6c..7efdc4e 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -13,7 +13,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=", -- 2.17.1 From 9410b61cc7e3754a3b25c8dbb2df31cae20f5062 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 30 Oct 2023 19:14:03 +0200 Subject: [PATCH 13/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 7efdc4e..615cbd8 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -1,6 +1,7 @@ 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: "aggregator", dashboard: "aggregator", @@ -126,3 +127,7 @@ export let properties: EnvProperties = { footerGrantText : "This OpenAIRE gateway is part of a project that has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452" }; + +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 b1e4e50..a746309 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,6 +1,7 @@ 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: "aggregator", dashboard: "aggregator", @@ -128,3 +129,7 @@ export let properties: EnvProperties = { footerGrantText : "This OpenAIRE gateway is part of a project that has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452" }; + +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 778bc92..05f36a0 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,8 +4,9 @@ // The list 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: "aggregator", dashboard: "aggregator", @@ -130,3 +131,7 @@ export let properties: EnvProperties = { reCaptchaSiteKey: null, footerGrantText : "This OpenAIRE gateway is part of a project that has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452" }; + +export let properties: EnvProperties = { + ...props, ...common, ...commonDev +} \ No newline at end of file -- 2.17.1 From 655cbd069fd66a725f22a65defa766f1bbadf9a3 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 30 Oct 2023 19:15:08 +0200 Subject: [PATCH 14/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 ee4984e..c2eb3e5 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": { -- 2.17.1 From a49f94a58a0525dd9bd3aeb31d26da35c13b13e1 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 30 Oct 2023 21:24:27 +0200 Subject: [PATCH 15/15] [angular-16 | DONE | UPDATED] environment.prod.ts: Updated claimsAPIURL property to call new claims API. --- src/environments/environment.prod.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index a746309..21ff33c 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -14,7 +14,7 @@ let props: EnvProperties = { statisticsFrameAPIURL: "https://www.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/", useNewStatistisTool: true, - claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/", + claimsAPIURL: "https://beta.services.openaire.eu/claims-new/rest/claimsService/", searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/", searchResourcesAPIURL: "https://services.openaire.eu/search/v2/api/resources", openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=", -- 2.17.1