From 12ee95b98c1da927cdb131ccdb0e4260ab840eea Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 2 Aug 2023 12:32:27 +0300 Subject: [PATCH 01/29] Update typescript to version 4.9.5 --- explore/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/package.json b/explore/package.json index cd0a248b..843be94f 100644 --- a/explore/package.json +++ b/explore/package.json @@ -69,6 +69,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 7ada3160f2562803b49b15056ac39f94bb734cb5 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 2 Aug 2023 12:46:06 +0300 Subject: [PATCH 02/29] Migrate angular core and cli to version 15 and update dependencies to be compatible with the newer version. --- explore/angular.json | 3 ++- explore/package.json | 34 ++++++++++++++++---------------- explore/src/app/openaireLibrary | 2 +- explore/src/assets/common-assets | 2 +- explore/src/main.server.ts | 2 +- explore/src/test.ts | 6 ------ explore/src/tsconfig.server.json | 1 - explore/tsconfig.json | 5 +++-- 8 files changed, 25 insertions(+), 30 deletions(-) diff --git a/explore/angular.json b/explore/angular.json index 0262983e..10d67fb3 100644 --- a/explore/angular.json +++ b/explore/angular.json @@ -280,7 +280,8 @@ "development": { "outputHashing": "media", "sourceMap": false, - "optimization": true + "optimization": true, + "vendorChunk": true }, "test": { "outputHashing": "media", diff --git a/explore/package.json b/explore/package.json index 843be94f..2af22759 100644 --- a/explore/package.json +++ b/explore/package.json @@ -23,24 +23,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", @@ -49,11 +49,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/compression": "^1.7.0", "@types/express": "^4.17.0", "@types/jasmine": "~3.6.0", diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index a53c4e90..3b6822c7 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit a53c4e90d099d0bf3919df55edceaf7f793427d0 +Subproject commit 3b6822c71f32512533793e6b57f6ff017f4c874e diff --git a/explore/src/assets/common-assets b/explore/src/assets/common-assets index 2fd57843..9cb1f835 160000 --- a/explore/src/assets/common-assets +++ b/explore/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 2fd57843f85125e54adfb95b35776755037ea359 +Subproject commit 9cb1f835a93501d9566ea2a3123d92eecd73f27d diff --git a/explore/src/main.server.ts b/explore/src/main.server.ts index d2b1d6d1..708bb70f 100644 --- a/explore/src/main.server.ts +++ b/explore/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/explore/src/test.ts b/explore/src/test.ts index 6b03dbe8..ae25f27c 100644 --- a/explore/src/test.ts +++ b/explore/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/explore/src/tsconfig.server.json b/explore/src/tsconfig.server.json index 39f85aac..56015022 100644 --- a/explore/src/tsconfig.server.json +++ b/explore/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/explore/tsconfig.json b/explore/tsconfig.json index f7c5a9bf..282861fd 100644 --- a/explore/tsconfig.json +++ b/explore/tsconfig.json @@ -10,14 +10,15 @@ "moduleResolution": "node", "experimentalDecorators": true, "importHelpers": true, - "target": "es2020", + "target": "ES2022", "typeRoots": [ "node_modules/@types" ], "lib": [ "es2018", "dom" - ] + ], + "useDefineForClassFields": false }, // "angularCompilerOptions": { // "strictTemplates": true From 986aecfe2a56710091e5a6fce5509817535d5904 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 2 Aug 2023 12:48:36 +0300 Subject: [PATCH 03/29] Update material to angular 15. --- explore/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/explore/package.json b/explore/package.json index 2af22759..b1b1e52c 100644 --- a/explore/package.json +++ b/explore/package.json @@ -24,13 +24,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", @@ -71,4 +71,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} +} \ No newline at end of file From 89788f660d679dab6c7a8f57be001899c59ec164 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 2 Aug 2023 13:57:33 +0300 Subject: [PATCH 04/29] Update Zone to 0.13.1 --- explore/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/explore/package.json b/explore/package.json index b1b1e52c..c0fd456a 100644 --- a/explore/package.json +++ b/explore/package.json @@ -46,7 +46,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", @@ -71,4 +71,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} \ No newline at end of file +} From eb15f07ef0b3a0aed91b3753da5b9f7f0afb07ae Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 2 Aug 2023 14:02:11 +0300 Subject: [PATCH 05/29] Update angular to angular 16. --- explore/angular.json | 15 ++++++++++----- explore/package.json | 34 ++++++++++++++++----------------- explore/src/app/app.module.ts | 5 +++-- explore/src/app/openaireLibrary | 2 +- 4 files changed, 31 insertions(+), 25 deletions(-) diff --git a/explore/angular.json b/explore/angular.json index 10d67fb3..6f089df1 100644 --- a/explore/angular.json +++ b/explore/angular.json @@ -274,14 +274,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 }, "test": { "outputHashing": "media", @@ -292,7 +294,8 @@ } ], "sourceMap": false, - "optimization": true + "optimization": true, + "buildOptimizer": true }, "beta": { "outputHashing": "media", @@ -303,7 +306,8 @@ } ], "sourceMap": false, - "optimization": true + "optimization": true, + "buildOptimizer": true }, "production": { "outputHashing": "media", @@ -314,7 +318,8 @@ } ], "sourceMap": false, - "optimization": true + "optimization": true, + "buildOptimizer": true } }, "defaultConfiguration": "" diff --git a/explore/package.json b/explore/package.json index c0fd456a..781ac12b 100644 --- a/explore/package.json +++ b/explore/package.json @@ -23,24 +23,24 @@ }, "private": true, "dependencies": { - "@angular/animations": "^15.2.9", + "@angular/animations": "^16.1.7", "@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.7", + "@angular/compiler": "^16.1.7", + "@angular/core": "^16.1.7", + "@angular/forms": "^16.1.7", + "@angular/localize": "^16.1.7", "@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.7", + "@angular/platform-browser-dynamic": "^16.1.7", + "@angular/platform-server": "^16.1.7", + "@angular/router": "^16.1.7", + "@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", @@ -49,11 +49,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.6", + "@angular/cli": "^16.1.6", + "@angular/compiler-cli": "^16.1.7", + "@angular/language-service": "^16.1.7", + "@nguniversal/builders": "^16.1.1", "@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 75a1a717..028168c8 100755 --- a/explore/src/app/app.module.ts +++ b/explore/src/app/app.module.ts @@ -1,4 +1,4 @@ -import {NgModule} from '@angular/core'; +import {APP_ID, NgModule} from '@angular/core'; import {SharedModule} from './openaireLibrary/shared/shared.module'; import {BrowserModule, BrowserTransferStateModule} from '@angular/platform-browser'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; @@ -28,7 +28,7 @@ import {AlertModalModule} from './openaireLibrary/utils/modal/alertModal.module' ErrorModule, NavigationBarModule, BottomModule, CookieLawModule, - BrowserModule.withServerTransition({ appId: 'explore' }), + BrowserModule, AppRoutingModule, BrowserTransferStateModule, BrowserAnimationsModule, PageURLResolverModule, @@ -39,6 +39,7 @@ import {AlertModalModule} from './openaireLibrary/utils/modal/alertModal.module' declarations: [AppComponent, OpenaireErrorPageComponent], exports: [AppComponent], providers: [ + {provide: APP_ID, useValue: 'explore'}, { provide: HTTP_INTERCEPTORS, useClass: CacheInterceptorService, diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 3b6822c7..51e39801 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3b6822c71f32512533793e6b57f6ff017f4c874e +Subproject commit 51e39801796e6c49c97cc721c7b1e797a45a8880 From 3011294f5b2e7d1ea37dfd6339e2bdf4bce4ea24 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 2 Aug 2023 14:02:51 +0300 Subject: [PATCH 06/29] Update material to angular 16. --- explore/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/explore/package.json b/explore/package.json index 781ac12b..b3bb13ca 100644 --- a/explore/package.json +++ b/explore/package.json @@ -24,13 +24,13 @@ "private": true, "dependencies": { "@angular/animations": "^16.1.7", - "@angular/cdk": "^15.2.9", + "@angular/cdk": "^16.1.6", "@angular/common": "^16.1.7", "@angular/compiler": "^16.1.7", "@angular/core": "^16.1.7", "@angular/forms": "^16.1.7", "@angular/localize": "^16.1.7", - "@angular/material": "^15.2.9", + "@angular/material": "^16.1.6", "@angular/platform-browser": "^16.1.7", "@angular/platform-browser-dynamic": "^16.1.7", "@angular/platform-server": "^16.1.7", @@ -71,4 +71,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} +} \ No newline at end of file From cffe2a09676da9fad3e45640fc0b37bd5c70f983 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 2 Aug 2023 14:04:32 +0300 Subject: [PATCH 07/29] Remove BrowserStateModule --- explore/src/app/app.module.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/explore/src/app/app.module.ts b/explore/src/app/app.module.ts index 028168c8..81d561fc 100755 --- a/explore/src/app/app.module.ts +++ b/explore/src/app/app.module.ts @@ -1,6 +1,6 @@ import {APP_ID, NgModule} from '@angular/core'; import {SharedModule} from './openaireLibrary/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'; @@ -30,7 +30,6 @@ import {AlertModalModule} from './openaireLibrary/utils/modal/alertModal.module' CookieLawModule, BrowserModule, AppRoutingModule, - BrowserTransferStateModule, BrowserAnimationsModule, PageURLResolverModule, Schema2jsonldModule, QuickContactModule, From 15cd6a2fb6833350b6a03985489145cc68c04e4b Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 2 Aug 2023 14:08:49 +0300 Subject: [PATCH 08/29] Update library --- explore/src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 51e39801..e7429881 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 51e39801796e6c49c97cc721c7b1e797a45a8880 +Subproject commit e7429881ca7788fb218cc0063a0bc1e3bdb626f4 From 3a463f9bab553e21f6daa20081c74037895df1b9 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 13:54:46 +0300 Subject: [PATCH 09/29] Update dependencies and node version in cache and utils-service --- services/cache/mecache/package.json | 4 ++-- services/utils-service/package.json | 12 ++++++------ services/utils-service/properties.file | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/services/cache/mecache/package.json b/services/cache/mecache/package.json index e98c7edb..e7530a97 100644 --- a/services/cache/mecache/package.json +++ b/services/cache/mecache/package.json @@ -11,14 +11,14 @@ }, "dependencies": { "cors": "^2.8.5", - "express": "^4.15.2", + "express": "^4.18.2", "memory-cache": "^0.2.0", "prom-client": "^11.3.0", "properties-reader": "^2.2.0", "superagent": "^5.0.5" }, "engines": { - "node": ">=16.3.0" + "node": ">=16.14.0" }, "author": "Argiro Kokogiannaki ", "license": "NKUA" diff --git a/services/utils-service/package.json b/services/utils-service/package.json index 6965d570..5ef016df 100644 --- a/services/utils-service/package.json +++ b/services/utils-service/package.json @@ -13,14 +13,14 @@ "author": "", "license": "ISC", "dependencies": { - "body-parser": "^1.15.2", - "cookie-parser": "^1.4.4", - "cors": "^2.8.4", - "express": "^4.15.2", - "multer": "1.4.5-lts.1", + "body-parser": "^1.20.2", + "cookie-parser": "^1.4.6", + "cors": "^2.8.5", + "express": "^4.18.2", + "multer": "^1.4.5-lts.1", "properties-reader": "^2.2.0" }, "engines": { - "node": ">=16.3.0" + "node": ">=16.14.0" } } diff --git a/services/utils-service/properties.file b/services/utils-service/properties.file index 4f43d8fc..fcf8ca6f 100644 --- a/services/utils-service/properties.file +++ b/services/utils-service/properties.file @@ -5,4 +5,4 @@ localPath = true max.size = 200 # file size in KB big-max.size = 1000 -port = 8000 +port = 8001 From 95f749e9f0a9f9a2f2f0f340d6e3e3508a7cde4b Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 15:45:18 +0300 Subject: [PATCH 10/29] Update versions in sitemaps. Need to be checked. --- services/sitemaps/extractUrlsFromSearch.ts | 2 +- services/sitemaps/package.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/sitemaps/extractUrlsFromSearch.ts b/services/sitemaps/extractUrlsFromSearch.ts index 383bcd70..d773f4a6 100644 --- a/services/sitemaps/extractUrlsFromSearch.ts +++ b/services/sitemaps/extractUrlsFromSearch.ts @@ -260,7 +260,7 @@ function parseAllUrls(response: any, allUrls: any, resultsType: string, subject: } else { let resultLandingComponent = new ResultLandingComponent(null, null, null, null, null, null, null, null, null, - null, null, null, null, null); + null, null, null, null, null, null, null, null); if(!resultLandingComponent.checkIfAllowed(resultLandingInfo)) { noIndexedUrls++; diff --git a/services/sitemaps/package.json b/services/sitemaps/package.json index 2aa7c51f..07a619f6 100644 --- a/services/sitemaps/package.json +++ b/services/sitemaps/package.json @@ -10,12 +10,12 @@ "superagent": "^5.0.5" }, "devDependencies": { - "@types/node": "^8.0.30", - "ts-node": "^10.4.0", - "typescript": "^3.2.4" + "@types/node": "^16.18.39", + "ts-node": "^10.9.1", + "typescript": "^4.9.5" }, "engines": { - "node": "16.3.0" + "node": ">=16.14.0" }, "author": "Konstantina Galouni ", "license": "NKUA" From c8967dd92b6d014aa4641950fda2cd562d587e62 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 15:53:10 +0300 Subject: [PATCH 11/29] Delete ServerTransferStateModule --- explore/src/app/app.server.module.ts | 5 ++--- explore/src/app/openaireLibrary | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/explore/src/app/app.server.module.ts b/explore/src/app/app.server.module.ts index cc86a559..561695a4 100644 --- a/explore/src/app/app.server.module.ts +++ b/explore/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], }) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index e7429881..758f2f10 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit e7429881ca7788fb218cc0063a0bc1e3bdb626f4 +Subproject commit 758f2f10ffe6623fb55606ca2e9c29abf89b9b4f From 1602407c413e3e5bb62e4688368b68fc8b04e241 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 23 Aug 2023 16:57:51 +0300 Subject: [PATCH 12/29] Update uikit to version 3.16.24 --- explore/package.json | 4 ++-- explore/src/app/home/home.component.html | 4 ++-- explore/src/app/openaireLibrary | 2 +- explore/src/assets/common-assets | 2 +- explore/src/assets/openaire-theme | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/explore/package.json b/explore/package.json index b3bb13ca..6842634e 100644 --- a/explore/package.json +++ b/explore/package.json @@ -45,7 +45,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": { @@ -71,4 +71,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} \ No newline at end of file +} diff --git a/explore/src/app/home/home.component.html b/explore/src/app/home/home.component.html index b2903a90..f48c82d3 100644 --- a/explore/src/app/home/home.component.html +++ b/explore/src/app/home/home.component.html @@ -180,7 +180,7 @@

Share your research.

-
+
@@ -212,7 +212,7 @@
-
+
ipad Date: Wed, 30 Aug 2023 14:05:20 +0300 Subject: [PATCH 13/29] Add hasStickyHeaderInMobile in home page. --- explore/src/app/app-routing.module.ts | 2 +- explore/src/app/openaireLibrary | 2 +- explore/src/assets/common-assets | 2 +- explore/src/assets/openaire-theme | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/explore/src/app/app-routing.module.ts b/explore/src/app/app-routing.module.ts index 97a827a5..401b51cd 100644 --- a/explore/src/app/app-routing.module.ts +++ b/explore/src/app/app-routing.module.ts @@ -5,7 +5,7 @@ import {PageURLResolverComponent} from "./openaireLibrary/utils/pageURLResolver. const routes: Routes = [ // Other Pages - {path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule)}, + {path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule), data: {hasStickyHeaderOnMobile: true}}, {path: 'home', redirectTo: '', pathMatch: 'full'}, {path: 'mail-preferences', loadChildren: () => import('./userEmailPreferences/mailPrefs.module').then(m => m.LibMailPrefsModule)}, {path: 'sdgs', loadChildren: () => import('./sdg/sdg.module').then(m => m.LibSdgModule)}, diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 40ef9507..f2a2c52d 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 40ef9507150f90d9e50298adb23c29b3d5a9745b +Subproject commit f2a2c52d435629bad2c9af68240d76dfefe4dfd9 diff --git a/explore/src/assets/common-assets b/explore/src/assets/common-assets index ae7e6234..a7e2f988 160000 --- a/explore/src/assets/common-assets +++ b/explore/src/assets/common-assets @@ -1 +1 @@ -Subproject commit ae7e623418e7362e80cf9f65db7a004c0857d239 +Subproject commit a7e2f9882fc3cbb9f14ced3e0600d15bf2ffb887 diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index d52e9292..5feca2d8 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit d52e92929799a1626aff66ad413c6db2be521555 +Subproject commit 5feca2d8457324999557feb662b4355d8cf0df4b From 6d4f7d564522d019c6eeea5802f313dd6422cf06 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 31 Aug 2023 13:53:24 +0300 Subject: [PATCH 14/29] Revert port of Upload to 8000 --- services/utils-service/properties.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/utils-service/properties.file b/services/utils-service/properties.file index fcf8ca6f..4f43d8fc 100644 --- a/services/utils-service/properties.file +++ b/services/utils-service/properties.file @@ -5,4 +5,4 @@ localPath = true max.size = 200 # file size in KB big-max.size = 1000 -port = 8001 +port = 8000 From d8fadf50e693df353810d7d24107203b191b8a6c Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 15 Sep 2023 15:33:14 +0300 Subject: [PATCH 15/29] Update libraries. Update node to version 16 and angular in readme --- explore/README.md | 2 +- explore/package.json | 2 +- explore/src/app/openaireLibrary | 2 +- explore/src/assets/common-assets | 2 +- explore/src/assets/openaire-theme | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/explore/README.md b/explore/README.md index 0f4af8e3..c846f09d 100644 --- a/explore/README.md +++ b/explore/README.md @@ -1,6 +1,6 @@ # Explore -This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.10 and has been updated to 11.2.14. +This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.10 and has been updated to 16.1.7. ## Install packages diff --git a/explore/package.json b/explore/package.json index 6842634e..6b878b15 100644 --- a/explore/package.json +++ b/explore/package.json @@ -58,7 +58,7 @@ "@types/express": "^4.17.0", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", - "@types/node": "^12.11.1", + "@types/node": "^16.18.50", "codelyzer": "^6.0.0", "jasmine-core": "~3.8.0", "jasmine-spec-reporter": "~5.0.0", diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index f2a2c52d..a2f52cf4 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit f2a2c52d435629bad2c9af68240d76dfefe4dfd9 +Subproject commit a2f52cf40ee28cb950dd789cd100fdbba16eb4c0 diff --git a/explore/src/assets/common-assets b/explore/src/assets/common-assets index a7e2f988..9e58421a 160000 --- a/explore/src/assets/common-assets +++ b/explore/src/assets/common-assets @@ -1 +1 @@ -Subproject commit a7e2f9882fc3cbb9f14ced3e0600d15bf2ffb887 +Subproject commit 9e58421a1adf3fbeb361e21616feaea8c7f867af diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index 5feca2d8..3a4aa92c 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 5feca2d8457324999557feb662b4355d8cf0df4b +Subproject commit 3a4aa92c441467994a45a2c6a4f0c21202945404 From d97231ba928852fb5c73e2a8991e271f70659ee3 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 6 Oct 2023 14:50:22 +0300 Subject: [PATCH 16/29] Change scroll-section with slider --- explore/src/app/home/home.component.html | 566 +++++++++++------------ explore/src/app/home/home.component.less | 4 +- explore/src/app/home/home.module.ts | 3 +- explore/src/app/openaireLibrary | 2 +- explore/src/assets/explore-custom.less | 3 +- explore/src/assets/openaire-theme | 2 +- 6 files changed, 280 insertions(+), 300 deletions(-) diff --git a/explore/src/app/home/home.component.html b/explore/src/app/home/home.component.html index f48c82d3..4cd22d85 100644 --- a/explore/src/app/home/home.component.html +++ b/explore/src/app/home/home.component.html @@ -1,337 +1,315 @@ -
-
- {{logo}} logo +
+
+ {{logo}} logo +
-
-
-
-
-
-

- Discover open linked research. -

- - -
-
- - Advanced search - -
- - - - -
+
+
+
+
+

+ Discover open linked research. +

+ + +
+
+ + Advanced search + +
+ + + + +
- -
-
-
- Try browsing by: -
-
- + +
+
+
+ Try browsing by: +
+
+ SDGs logo - Sustainable Development Goals (SDGs) + Sustainable Development Goals (SDGs) - - + + FOS logo Fields of Science (FoS) - -
-
+ +
+
+
+
+
+ + +
+
+
-
-
- - -
-
-
-
-
-
-
-
-
-
    - - + +
+
- - + + -
-
-
-
- - -
-

- Deposit your research. -

-

- Whether it’s publications, data or software, - select an OpenAIRE compatible repository and - share using community standards. Alternatively - use Zenodo, a catch-all repository hosted by CERN. - All results will be indexed, discoverable and accessible - via EXPLORE. -

-
- Start Deposit -
-
-
-

- Link your work. -

-

- Connect all your research. If you can't find your research - results in OpenAIRE, don't worry! Use our Link service, - that reaches out to many external sources via APIs, and - claim them to your Grant or ORCID. Use the service to provide - meaningful links between publications-datasets-software. -

-
- Start Linking -
-
- - -
-
-
-

Share your research.

-
-
-
-
-
-
-
- ipad - ipad - ipad - ipad - ipad
-
-
-
-
- -
-
-
-
- -
-
-
- ipad - ipad - ipad - ipad - ipad -
-
- -
-
-
-
-
+
+
+
+

Share your research.

+
+ + + + ipad + + + ipad + + + ipad + + + ipad + + + ipad + + + + +
+ Deposit your research. +
+
+ Whether it’s publications, data or software, + select an OpenAIRE compatible repository and + share using community standards. Alternatively + use Zenodo, a catch-all repository hosted by CERN. + All results will be indexed, discoverable and accessible + via EXPLORE. +
+
+ Start + Deposit +
+ + +
+ Link your work. +
+
+ Connect all your research. If you can't find your research + results in OpenAIRE, don't worry! Use our Link service, + that reaches out to many external sources via APIs, and + claim them to your Grant or ORCID. Use the service to provide + meaningful links between publications-datasets-software. +
+
+ Start Linking +
+ + + +
+
- - + + -
-
-
-
-
-
-
-

Linked Open Research.

-
- EXPLORE is built on the OpenAIRE Graph, one of the largest - open scholarly record collections worldwide. Conceived as a public and - transparent good, populated out of data sources trusted by scientists, the - OpenAIRE Graph brings discovery, monitoring, and assessment of science - back in the hands of the scientific community. -
-
-
-
- ipad -
-
-
-
-
-
-
-
- Within a constantly emerging scholarly communication environment, the OpenAIRE Graph is a moving target, continuously integrating new sources, new types or research objects, and embedding access measures. We therefore welcome the community to work with us to improve all its aspects: its coverage (geographic and thematic), quality (disambiguation and semantics) and access (APIs). -
-
- Find information about the OpenAIRE Graph, how to test it and contribute to improving it. -
-
- - Learn more. Contribute - -
-
-
-
-
+
+
+
+
+
+
+
+

Linked Open Research.

+
+ EXPLORE is built on the OpenAIRE Graph, one of the largest + open scholarly record collections worldwide. Conceived as a public and + transparent good, populated out of data sources trusted by scientists, the + OpenAIRE Graph brings discovery, monitoring, and assessment of science + back in the hands of the scientific community. +
+
+
+
+ ipad +
+
+
+
+
+
+
+
+ Within a constantly emerging scholarly communication environment, the OpenAIRE Graph is a moving + target, continuously integrating new sources, new types or research objects, and embedding + access measures. We therefore welcome the community to work with us to improve all its aspects: + its coverage (geographic and thematic), quality (disambiguation and semantics) and access (APIs). +
+
+ Find information about the OpenAIRE Graph, how to test it and contribute to improving it. +
+
+ + Learn more. Contribute + +
+
+
+
+
-
-
-

- Did you know that -

-

- you may -

-
-
- - -
-
-
-
+
+
+

+ Did you know that +

+

+ you may +

+
+
+ + +
+
+
+
-
-
-

- Need more information? -

-

- Get in touch and let us help you. -

- Contact us -
-
+
+
+

+ Need more information? +

+

+ Get in touch and let us help you. +

+ Contact us +
+
diff --git a/explore/src/app/home/home.component.less b/explore/src/app/home/home.component.less index 02bb5a94..b4a55974 100644 --- a/explore/src/app/home/home.component.less +++ b/explore/src/app/home/home.component.less @@ -45,7 +45,7 @@ .explore-dark-logo-background { background-image: url("~src/assets/explore-assets/home/explore-dark-logo.svg"); background-repeat: no-repeat; - background-position: left 95%; - background-size: 65%; + background-position: -5% 102%; + background-size: 35%; } } diff --git a/explore/src/app/home/home.module.ts b/explore/src/app/home/home.module.ts index a51ac75b..0116ef4e 100644 --- a/explore/src/app/home/home.module.ts +++ b/explore/src/app/home/home.module.ts @@ -28,6 +28,7 @@ import {NumbersModule} from "../openaireLibrary/sharedComponents/numbers/numbers import {AdvancedSearchInputModule} from "../openaireLibrary/sharedComponents/advanced-search-input/advanced-search-input.module"; import {InputModule} from "../openaireLibrary/sharedComponents/input/input.module"; import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-input/search-input.module"; +import {SliderUtilsModule} from "../openaireLibrary/sharedComponents/slider-utils/slider-utils.module"; @NgModule({ imports: [ @@ -38,7 +39,7 @@ import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-inpu PiwikServiceModule, HomeRoutingModule, HelperModule, - SEOServiceModule, OtherPortalsModule, EntitiesSelectionModule, QuickSelectionsModule, IconsModule, NumbersModule, AdvancedSearchInputModule, InputModule, SearchInputModule + SEOServiceModule, OtherPortalsModule, EntitiesSelectionModule, QuickSelectionsModule, IconsModule, NumbersModule, AdvancedSearchInputModule, InputModule, SearchInputModule, SliderUtilsModule ], declarations: [ HomeComponent diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index a2f52cf4..5a923739 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit a2f52cf40ee28cb950dd789cd100fdbba16eb4c0 +Subproject commit 5a9237399e1eb1e04fb5ba485955b02b09bc6eeb diff --git a/explore/src/assets/explore-custom.less b/explore/src/assets/explore-custom.less index 3109db9f..677957e4 100644 --- a/explore/src/assets/explore-custom.less +++ b/explore/src/assets/explore-custom.less @@ -2,13 +2,14 @@ /* Button */ @button-primary-background: @explore-color; -@inverse-button-primary-background: @explore-color; @button-secondary-border: @explore-color; @button-secondary-color: @explore-color; @button-secondary-hover-background: @global-secondary-background; @button-secondary-hover-background-gradient: none; @button-secondary-active-background: @global-secondary-background; @button-secondary-active-background-gradient: none; +@inverse-button-text-color: @explore-color; +@inverse-button-text-hover-color: @explore-color; /* Background */ diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index 3a4aa92c..fd101a6b 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 3a4aa92c441467994a45a2c6a4f0c21202945404 +Subproject commit fd101a6b54f7b8b36bdef015d77365fb41a353df From 8dfa776e0a029578007c3378db5fee7bc60d18af Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 6 Oct 2023 20:21:07 +0300 Subject: [PATCH 17/29] Change button-link in home page with text-primary --- explore/src/app/home/home.component.html | 4 ++-- explore/src/assets/explore-custom.less | 2 -- explore/src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/explore/src/app/home/home.component.html b/explore/src/app/home/home.component.html index 4cd22d85..e81c12c6 100644 --- a/explore/src/app/home/home.component.html +++ b/explore/src/app/home/home.component.html @@ -182,7 +182,7 @@ via EXPLORE.
- Start + Start Deposit
@@ -198,7 +198,7 @@ meaningful links between publications-datasets-software.
- Start Linking + Start Linking
diff --git a/explore/src/assets/explore-custom.less b/explore/src/assets/explore-custom.less index 677957e4..85b156db 100644 --- a/explore/src/assets/explore-custom.less +++ b/explore/src/assets/explore-custom.less @@ -8,8 +8,6 @@ @button-secondary-hover-background-gradient: none; @button-secondary-active-background: @global-secondary-background; @button-secondary-active-background-gradient: none; -@inverse-button-text-color: @explore-color; -@inverse-button-text-hover-color: @explore-color; /* Background */ diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index fd101a6b..fe7394ea 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit fd101a6b54f7b8b36bdef015d77365fb41a353df +Subproject commit fe7394ea9ed4319a3234a00b0c8ce09023f50799 From e33812c8d8065cc40cc6cd7f91636769d5ad9a3d Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 10 Oct 2023 17:14:45 +0300 Subject: [PATCH 18/29] Slider: CHangfe period to 8s and make it infinite. --- explore/src/app/home/home.component.html | 8 ++++---- explore/src/app/home/home.component.less | 11 +++++++++-- explore/src/app/openaireLibrary | 2 +- explore/src/assets/openaire-theme | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/explore/src/app/home/home.component.html b/explore/src/app/home/home.component.html index e81c12c6..c63b95d2 100644 --- a/explore/src/app/home/home.component.html +++ b/explore/src/app/home/home.component.html @@ -146,10 +146,10 @@
-
+

Share your research.

- + ipad - +
Deposit your research.
Whether it’s publications, data or software, - select an OpenAIRE compatible repository and + select an OpenAIRE compatible repository and share using community standards. Alternatively use Zenodo, a catch-all repository hosted by CERN. All results will be indexed, discoverable and accessible diff --git a/explore/src/app/home/home.component.less b/explore/src/app/home/home.component.less index b4a55974..83252b19 100644 --- a/explore/src/app/home/home.component.less +++ b/explore/src/app/home/home.component.less @@ -38,14 +38,21 @@ color: @global-secondary-background; } } - } -@media only screen and (min-width: @breakpoint-medium) { +.slider-image { + min-width: 550px; +} + +@media only screen and (min-width: @breakpoint-large) { .explore-dark-logo-background { background-image: url("~src/assets/explore-assets/home/explore-dark-logo.svg"); background-repeat: no-repeat; background-position: -5% 102%; background-size: 35%; } + + .slider-nav { + max-width: 650px; + } } diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 5a923739..22366f58 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 5a9237399e1eb1e04fb5ba485955b02b09bc6eeb +Subproject commit 22366f581309493931b0aa67c2ccf5007b0683eb diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index fe7394ea..2dadcf85 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit fe7394ea9ed4319a3234a00b0c8ce09023f50799 +Subproject commit 2dadcf85926bc0f11fff22ed94dc197ddd8587c6 From 88c53b6cc352c13def96426bde557495ededb166 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 16 Oct 2023 13:00:46 +0300 Subject: [PATCH 19/29] Update openaireLibrary --- explore/src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 22366f58..dbbd7ec5 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 22366f581309493931b0aa67c2ccf5007b0683eb +Subproject commit dbbd7ec541d96a5062a769dea2255ad9ccb36b13 From d786a500747ce0856131a4f312b43505fcd78675 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 16 Oct 2023 13:27:31 +0300 Subject: [PATCH 20/29] Updating openaireLibrary --- explore/src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index dbbd7ec5..5948d61a 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit dbbd7ec541d96a5062a769dea2255ad9ccb36b13 +Subproject commit 5948d61a47f17ed4538a23b1b5354ac55d5c5d87 From a5ce147fa1535c3579ff01755ed6409b78177a0d Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 16 Oct 2023 14:56:46 +0300 Subject: [PATCH 21/29] Updating openaireLibrary --- explore/src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 5948d61a..8d652227 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 5948d61a47f17ed4538a23b1b5354ac55d5c5d87 +Subproject commit 8d6522270c26451c7474630fc71e7fa3e31c5c0e From 713e6014c3738cfee9e032e6126b5f17824a4618 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 16 Oct 2023 16:02:32 +0300 Subject: [PATCH 22/29] [Explore | angular-16]: [Bug fix] environment.beta.ts: Updated property "claimsAPIURL" with the new claims API | funders.component.ts: Added check to choose among multiple stakeholders with the same index info (according to the stakeholders' visibility). --- explore/src/app/funders/funders.component.ts | 5 ++++- explore/src/environments/environment.beta.ts | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/explore/src/app/funders/funders.component.ts b/explore/src/app/funders/funders.component.ts index b08f1622..60e3f9ca 100644 --- a/explore/src/app/funders/funders.component.ts +++ b/explore/src/app/funders/funders.component.ts @@ -188,7 +188,10 @@ export class FundersComponent implements OnInit { let queriedFunders4 = data[3]; queriedFunders4.forEach(queriedFunder => { let id = queriedFunder.index_id + '||' + queriedFunder.index_name + '||' + queriedFunder.index_shortName; - if(this.fundersMap.has(id)) { + if(this.fundersMap.has(id) && ( + (this.fundersMap.get(id).monitorDashboardStatus == "RESTRICTED" && queriedFunder.visibility == "PUBLIC") + || + (this.fundersMap.get(id).monitorDashboardStatus == "PRIVATE" && (queriedFunder.visibility == "RESTRICTED" || queriedFunder.visibility == "PUBLIC")))) { this.fundersMap.get(id).alias = queriedFunder.alias; this.fundersMap.get(id).monitorDashboard = queriedFunder.alias; this.fundersMap.get(id).monitorDashboardStatus = queriedFunder.visibility; diff --git a/explore/src/environments/environment.beta.ts b/explore/src/environments/environment.beta.ts index 78c529f4..dfef2f21 100644 --- a/explore/src/environments/environment.beta.ts +++ b/explore/src/environments/environment.beta.ts @@ -16,7 +16,7 @@ let props: EnvProperties = { 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/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 a5beb8ba763ab0f822bbdd6e5e60fb5d4aa0fc06 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 16 Oct 2023 16:07:42 +0300 Subject: [PATCH 23/29] [Explore | angular-16]: [Bug fix] funders.component.ts: Added ADDITIONAL check to the previous commit (about choosing among multiple stakeholders with the same index info). --- explore/src/app/funders/funders.component.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/explore/src/app/funders/funders.component.ts b/explore/src/app/funders/funders.component.ts index 60e3f9ca..12d6a192 100644 --- a/explore/src/app/funders/funders.component.ts +++ b/explore/src/app/funders/funders.component.ts @@ -189,6 +189,8 @@ export class FundersComponent implements OnInit { queriedFunders4.forEach(queriedFunder => { let id = queriedFunder.index_id + '||' + queriedFunder.index_name + '||' + queriedFunder.index_shortName; if(this.fundersMap.has(id) && ( + !this.fundersMap.get(id).monitorDashboardStatus + || (this.fundersMap.get(id).monitorDashboardStatus == "RESTRICTED" && queriedFunder.visibility == "PUBLIC") || (this.fundersMap.get(id).monitorDashboardStatus == "PRIVATE" && (queriedFunder.visibility == "RESTRICTED" || queriedFunder.visibility == "PUBLIC")))) { From ecd21315f418e2dcd4842ff0f59b622d1c1e11ff Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 18 Oct 2023 14:18:04 +0300 Subject: [PATCH 24/29] [Library | angular-16]: [Bug fix] Name of bip metrics accidentally removed in branches merge. --- explore/src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 8d652227..717de55f 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 8d6522270c26451c7474630fc71e7fa3e31c5c0e +Subproject commit 717de55f6e5ee051d3c2618a45bc21f75ca96120 From 16a73b6e29b68fb8b9ac8a99202a81354456acea Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 19 Oct 2023 14:51:21 +0300 Subject: [PATCH 25/29] [angular-16 | DONE | CHANGED] environments/: Updated imports - import all common properties from src/app/openaireLibrary/utils/properties/environments/environment.ts --- explore/src/environments/environment.beta.ts | 3 +-- explore/src/environments/environment.prod.ts | 3 +-- explore/src/environments/environment.test.ts | 3 +-- explore/src/environments/environment.ts | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/explore/src/environments/environment.beta.ts b/explore/src/environments/environment.beta.ts index dfef2f21..ad73e2a9 100644 --- a/explore/src/environments/environment.beta.ts +++ b/explore/src/environments/environment.beta.ts @@ -1,6 +1,5 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; -import {common} from "../app/openaireLibrary/utils/properties/environments/environment.all"; -import {commonBeta} from "../app/openaireLibrary/utils/properties/environments/environment.beta"; +import {common, commonBeta} from "../app/openaireLibrary/utils/properties/environments/environment"; let props: EnvProperties = { environment: "beta", diff --git a/explore/src/environments/environment.prod.ts b/explore/src/environments/environment.prod.ts index 2560b132..26d050ab 100644 --- a/explore/src/environments/environment.prod.ts +++ b/explore/src/environments/environment.prod.ts @@ -1,6 +1,5 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; -import {common} from "../app/openaireLibrary/utils/properties/environments/environment.all"; -import {commonProd} from "../app/openaireLibrary/utils/properties/environments/environment.prod"; +import {common, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment"; let props: EnvProperties = { environment: "production", diff --git a/explore/src/environments/environment.test.ts b/explore/src/environments/environment.test.ts index 6866186d..f8fa5630 100644 --- a/explore/src/environments/environment.test.ts +++ b/explore/src/environments/environment.test.ts @@ -1,6 +1,5 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; -import {common} from "../app/openaireLibrary/utils/properties/environments/environment.all"; -import {commonTest} from "../app/openaireLibrary/utils/properties/environments/environment.test"; +import {common, commonTest} from "../app/openaireLibrary/utils/properties/environments/environment"; let props: EnvProperties = { // export let properties: EnvProperties = { diff --git a/explore/src/environments/environment.ts b/explore/src/environments/environment.ts index 95a82a05..fa480d76 100644 --- a/explore/src/environments/environment.ts +++ b/explore/src/environments/environment.ts @@ -4,8 +4,7 @@ // 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} from "../app/openaireLibrary/utils/properties/environments/environment.all"; -import {commonDev} from "../app/openaireLibrary/utils/properties/environments/environment"; +import {common, commonDev} from "../app/openaireLibrary/utils/properties/environments/environment"; let props: EnvProperties = { environment: "development", From f24e62cad68f89dbf474994de6dd0be96553e499 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 30 Oct 2023 10:53:19 +0200 Subject: [PATCH 26/29] [angular-16 | DONE | FIXED]: In queries of results by pid, do not include pidtype restriction (some handle pids are resolved by doi regex, but no results returned for pidtype exact "doi"). --- explore/src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 717de55f..35b893e0 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 717de55f6e5ee051d3c2618a45bc21f75ca96120 +Subproject commit 35b893e05e7f409767668eb9e362ef521b322251 From aa192044af5c981e9629f0d2dc526318db529ec7 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 30 Oct 2023 14:29:16 +0200 Subject: [PATCH 27/29] Updating openaireLibrary & common-assets --- explore/src/app/openaireLibrary | 2 +- explore/src/assets/common-assets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 35b893e0..5184ffad 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 35b893e05e7f409767668eb9e362ef521b322251 +Subproject commit 5184ffad194e23864411f989f9403cd984afb4a3 diff --git a/explore/src/assets/common-assets b/explore/src/assets/common-assets index 9e58421a..d1b2d5e5 160000 --- a/explore/src/assets/common-assets +++ b/explore/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 9e58421a1adf3fbeb361e21616feaea8c7f867af +Subproject commit d1b2d5e585722751792d12645d17f820cd6a7860 From ce034c1c8cb50e4003bb8374af2ad064ab02baea Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 30 Oct 2023 19:22:24 +0200 Subject: [PATCH 28/29] [angular-16 | DONE | FIXED] package.json: Downgraded version of uikit from 3.16.24 to 3.16.14 (parallax not working). --- explore/package.json | 2 +- explore/src/assets/common-assets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/explore/package.json b/explore/package.json index 6b878b15..2fd22f09 100644 --- a/explore/package.json +++ b/explore/package.json @@ -45,7 +45,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": { diff --git a/explore/src/assets/common-assets b/explore/src/assets/common-assets index 9e58421a..d1b2d5e5 160000 --- a/explore/src/assets/common-assets +++ b/explore/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 9e58421a1adf3fbeb361e21616feaea8c7f867af +Subproject commit d1b2d5e585722751792d12645d17f820cd6a7860 From d83c6148927b757f60a6e7482d2a8ca020aa367d Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 30 Oct 2023 21:22:52 +0200 Subject: [PATCH 29/29] [angular-16 | DONE | UPDATED] environment.prod.ts: Updated claimsAPIURL property to call new claims API. --- explore/src/environments/environment.prod.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/environments/environment.prod.ts b/explore/src/environments/environment.prod.ts index 26d050ab..cd56ccbc 100644 --- a/explore/src/environments/environment.prod.ts +++ b/explore/src/environments/environment.prod.ts @@ -15,7 +15,7 @@ import {common, commonProd} from "../app/openaireLibrary/utils/properties/enviro 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/", + 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=",