From 90f4aebd722fa74cb1341405722547b898c88724 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 23 Sep 2022 16:12:10 +0300 Subject: [PATCH 01/31] Update angular core and cli to version 12 --- angular.json | 23 ++++++++++++++--------- package.json | 36 ++++++++++++++++++------------------ server.ts | 2 +- src/polyfills.ts | 2 +- src/test.ts | 2 +- tsconfig.json | 1 - 6 files changed, 35 insertions(+), 31 deletions(-) diff --git a/angular.json b/angular.json index ea31ee4..8555277 100644 --- a/angular.json +++ b/angular.json @@ -22,7 +22,6 @@ "skipTests": true }, "@schematics/angular:module": { - "skipTests": true }, "@schematics/angular:pipe": { "skipTests": true @@ -35,7 +34,6 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { - "aot": true, "outputPath": "dist/eosc/browser", "index": "src/index.html", "main": "src/main.ts", @@ -53,7 +51,13 @@ "node_modules/uikit/dist/js/uikit.min.js", "node_modules/uikit/dist/js/uikit-icons.min.js", "node_modules/jquery/dist/jquery.js" - ] + ], + "vendorChunk": true, + "extractLicenses": false, + "buildOptimizer": false, + "sourceMap": true, + "optimization": false, + "namedChunks": true }, "configurations": { "development": { @@ -61,7 +65,6 @@ "outputHashing": "all", "sourceMap": false, "namedChunks": false, - "aot": true, "extractLicenses": true, "vendorChunk": false, "buildOptimizer": true, @@ -100,7 +103,6 @@ "outputHashing": "all", "sourceMap": false, "namedChunks": false, - "aot": true, "extractLicenses": true, "vendorChunk": false, "buildOptimizer": true, @@ -139,7 +141,6 @@ "outputHashing": "all", "sourceMap": false, "namedChunks": false, - "aot": true, "extractLicenses": true, "vendorChunk": false, "buildOptimizer": true, @@ -155,7 +156,8 @@ } ] } - } + }, + "defaultConfiguration": "" }, "serve": { "builder": "@angular-devkit/build-angular:dev-server", @@ -207,7 +209,9 @@ "options": { "outputPath": "dist/eosc/server", "main": "server.ts", - "tsConfig": "src/tsconfig.server.json" + "tsConfig": "src/tsconfig.server.json", + "sourceMap": true, + "optimization": false }, "configurations": { "development": { @@ -237,7 +241,8 @@ "sourceMap": false, "optimization": true } - } + }, + "defaultConfiguration": "" }, "serve-ssr": { "builder": "@nguniversal/builders:ssr-dev-server", diff --git a/package.json b/package.json index 260da22..148c0c2 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "build": "ng build", "build-dev": "ng build --configuration=development", "build-beta": "ng build --configuration=beta", - "build-prod": "ng build --prod", + "build-prod": "ng build --configuration production", "webpack-bundle-analyzer": "ng build --stats-json && webpack-bundle-analyzer dist/eosc/browser/stats-es2015.json --host 0.0.0.0", "test": "ng test", "e2e": "ng e2e", @@ -21,18 +21,18 @@ }, "private": true, "dependencies": { - "@angular/animations": "~11.2.14", + "@angular/animations": "~12.2.16", "@angular/cdk": "^11.2.13", - "@angular/common": "~11.2.14", - "@angular/compiler": "~11.2.14", - "@angular/core": "~11.2.14", - "@angular/forms": "~11.2.14", - "@angular/localize": "^11.2.14", + "@angular/common": "~12.2.16", + "@angular/compiler": "~12.2.16", + "@angular/core": "~12.2.16", + "@angular/forms": "~12.2.16", + "@angular/localize": "^12.2.16", "@angular/material": "^11.2.13", - "@angular/platform-browser": "~11.2.14", - "@angular/platform-browser-dynamic": "~11.2.14", - "@angular/platform-server": "~11.2.14", - "@angular/router": "~11.2.14", + "@angular/platform-browser": "~12.2.16", + "@angular/platform-browser-dynamic": "~12.2.16", + "@angular/platform-server": "~12.2.16", + "@angular/router": "~12.2.16", "@nguniversal/express-engine": "^11.2.1", "clipboard": "^1.5.16", "core-js": "^2.5.4", @@ -44,13 +44,13 @@ "ts-md5": "^1.2.0", "tslib": "^2.0.0", "uikit": "3.12.0", - "zone.js": "~0.10.2" + "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.1102.14", - "@angular/cli": "~11.2.14", - "@angular/compiler-cli": "~11.2.14", - "@angular/language-service": "~11.2.14", + "@angular-devkit/build-angular": "~12.2.18", + "@angular/cli": "~12.2.18", + "@angular/compiler-cli": "~12.2.16", + "@angular/language-service": "~12.2.16", "@nguniversal/builders": "^11.2.1", "@types/express": "^4.17.0", "@types/compression": "^1.7.0", @@ -67,6 +67,6 @@ "karma-jasmine-html-reporter": "^1.6.0", "protractor": "~7.0.0", "ts-node": "~7.0.0", - "typescript": "~4.0.7" + "typescript": "~4.3.5" } -} +} \ No newline at end of file diff --git a/server.ts b/server.ts index a1da728..9b555ed 100644 --- a/server.ts +++ b/server.ts @@ -1,4 +1,4 @@ -import 'zone.js/dist/zone-node'; +import 'zone.js/node'; import { ngExpressEngine } from '@nguniversal/express-engine'; import * as express from 'express'; diff --git a/src/polyfills.ts b/src/polyfills.ts index 7c9e495..f1aacd9 100644 --- a/src/polyfills.ts +++ b/src/polyfills.ts @@ -59,7 +59,7 @@ import '@angular/localize/init'; /*************************************************************************************************** * Zone JS is required by default for Angular itself. */ -import 'zone.js/dist/zone'; // Included with Angular CLI. +import 'zone.js'; // Included with Angular CLI. /*************************************************************************************************** diff --git a/src/test.ts b/src/test.ts index 1631789..a6f15af 100644 --- a/src/test.ts +++ b/src/test.ts @@ -1,6 +1,6 @@ // This file is required by karma.conf.js and loads recursively all the .spec and framework files -import 'zone.js/dist/zone-testing'; +import 'zone.js/testing'; import { getTestBed } from '@angular/core/testing'; import { BrowserDynamicTestingModule, diff --git a/tsconfig.json b/tsconfig.json index 8c693a2..85001d5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,7 +8,6 @@ "declaration": false, "module": "es2020", "moduleResolution": "node", - "emitDecoratorMetadata": true, "experimentalDecorators": true, "importHelpers": true, "target": "es2015", From 83a36614afbf5fc40dda5530bf2053eb34c87acd Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 23 Sep 2022 16:15:57 +0300 Subject: [PATCH 02/31] Delete material.scss from project. Update material and submodules to version 12 --- angular.json | 2 +- package.json | 4 ++-- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/material.scss | 9 --------- 5 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 src/material.scss diff --git a/angular.json b/angular.json index 8555277..8645591 100644 --- a/angular.json +++ b/angular.json @@ -45,7 +45,7 @@ ], "styles": [ "src/styles.css", - "src/material.scss" + "src/assets/common-assets/library-css/material.scss" ], "scripts": [ "node_modules/uikit/dist/js/uikit.min.js", diff --git a/package.json b/package.json index 148c0c2..7ef377a 100644 --- a/package.json +++ b/package.json @@ -22,13 +22,13 @@ "private": true, "dependencies": { "@angular/animations": "~12.2.16", - "@angular/cdk": "^11.2.13", + "@angular/cdk": "^12.2.13", "@angular/common": "~12.2.16", "@angular/compiler": "~12.2.16", "@angular/core": "~12.2.16", "@angular/forms": "~12.2.16", "@angular/localize": "^12.2.16", - "@angular/material": "^11.2.13", + "@angular/material": "^12.2.13", "@angular/platform-browser": "~12.2.16", "@angular/platform-browser-dynamic": "~12.2.16", "@angular/platform-server": "~12.2.16", diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 032b91a..717ead0 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 032b91ae7a78ccad72a3a02a9463f6df5d00d223 +Subproject commit 717ead02b2f154c3a91e799ed5701ea23b54f7e8 diff --git a/src/assets/common-assets b/src/assets/common-assets index 14655ae..fd4dec1 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 14655ae3aa7a50162ef218428a0ccdee35c1aa7b +Subproject commit fd4dec1ab53c0a5f77a5d8717a265cee0688a612 diff --git a/src/material.scss b/src/material.scss deleted file mode 100644 index 50525af..0000000 --- a/src/material.scss +++ /dev/null @@ -1,9 +0,0 @@ -@import '~@angular/material/theming'; -@include mat-core(); -$my-app-primary: mat-palette($mat-gray, 900); -$my-app-accent: mat-palette($mat-light-green, 700); - -$my-app-theme: mat-light-theme($my-app-primary, $my-app-accent); - -@include angular-material-theme($my-app-theme); - From 1223a400a059e37f021a46ada5dbeeeaac08e8c7 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 23 Sep 2022 16:16:37 +0300 Subject: [PATCH 03/31] Update express-engine to version 12 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7ef377a..4e288d5 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@angular/platform-browser-dynamic": "~12.2.16", "@angular/platform-server": "~12.2.16", "@angular/router": "~12.2.16", - "@nguniversal/express-engine": "^11.2.1", + "@nguniversal/express-engine": "^12.1.3", "clipboard": "^1.5.16", "core-js": "^2.5.4", "express": "^4.15.2", @@ -51,7 +51,7 @@ "@angular/cli": "~12.2.18", "@angular/compiler-cli": "~12.2.16", "@angular/language-service": "~12.2.16", - "@nguniversal/builders": "^11.2.1", + "@nguniversal/builders": "^12.1.3", "@types/express": "^4.17.0", "@types/compression": "^1.7.0", "@types/node": "^12.11.1", From 8d97ec9a799a04222bad4a2bc4fc364d54bca30d Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 23 Sep 2022 16:18:50 +0300 Subject: [PATCH 04/31] Update angular core and cli to version 13 --- .gitignore | 1 + angular.json | 21 --------------------- package.json | 30 +++++++++++++++--------------- src/polyfills.ts | 10 ---------- src/test.ts | 4 +++- 5 files changed, 19 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index 164614e..86fae35 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/.angular/cache node_modules/ dist/ .idea/ diff --git a/angular.json b/angular.json index 8645591..8d175b9 100644 --- a/angular.json +++ b/angular.json @@ -192,18 +192,6 @@ ] } }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": [ - "src/tsconfig.app.json", - "src/tsconfig.spec.json" - ], - "exclude": [ - "**/node_modules/**" - ] - } - }, "server": { "builder": "@angular-devkit/build-angular:server", "options": { @@ -288,15 +276,6 @@ "devServerTarget": "eosc:serve:production" } } - }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": "e2e/tsconfig.e2e.json", - "exclude": [ - "**/node_modules/**" - ] - } } } } diff --git a/package.json b/package.json index 4e288d5..2620356 100644 --- a/package.json +++ b/package.json @@ -21,18 +21,18 @@ }, "private": true, "dependencies": { - "@angular/animations": "~12.2.16", + "@angular/animations": "~13.3.11", "@angular/cdk": "^12.2.13", - "@angular/common": "~12.2.16", - "@angular/compiler": "~12.2.16", - "@angular/core": "~12.2.16", - "@angular/forms": "~12.2.16", - "@angular/localize": "^12.2.16", + "@angular/common": "~13.3.11", + "@angular/compiler": "~13.3.11", + "@angular/core": "~13.3.11", + "@angular/forms": "~13.3.11", + "@angular/localize": "^13.3.11", "@angular/material": "^12.2.13", - "@angular/platform-browser": "~12.2.16", - "@angular/platform-browser-dynamic": "~12.2.16", - "@angular/platform-server": "~12.2.16", - "@angular/router": "~12.2.16", + "@angular/platform-browser": "~13.3.11", + "@angular/platform-browser-dynamic": "~13.3.11", + "@angular/platform-server": "~13.3.11", + "@angular/router": "~13.3.11", "@nguniversal/express-engine": "^12.1.3", "clipboard": "^1.5.16", "core-js": "^2.5.4", @@ -47,10 +47,10 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "~12.2.18", - "@angular/cli": "~12.2.18", - "@angular/compiler-cli": "~12.2.16", - "@angular/language-service": "~12.2.16", + "@angular-devkit/build-angular": "~13.3.9", + "@angular/cli": "~13.3.9", + "@angular/compiler-cli": "~13.3.11", + "@angular/language-service": "~13.3.11", "@nguniversal/builders": "^12.1.3", "@types/express": "^4.17.0", "@types/compression": "^1.7.0", @@ -67,6 +67,6 @@ "karma-jasmine-html-reporter": "^1.6.0", "protractor": "~7.0.0", "ts-node": "~7.0.0", - "typescript": "~4.3.5" + "typescript": "~4.6.4" } } \ No newline at end of file diff --git a/src/polyfills.ts b/src/polyfills.ts index f1aacd9..7e1f7ff 100644 --- a/src/polyfills.ts +++ b/src/polyfills.ts @@ -22,16 +22,6 @@ import '@angular/localize/init'; * BROWSER POLYFILLS */ -/** IE10 and IE11 requires the following for NgClass support on SVG elements */ -// import 'classlist.js'; // Run `npm install --save classlist.js`. - -/** - * Web Animations `@angular/platform-browser/animations` - * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari. - * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0). - */ -// import 'web-animations-js'; // Run `npm install --save web-animations-js`. - /** * By default, zone.js will patch all possible macroTask and DomEvents * user can disable parts of macroTask/DomEvents patch by setting following flags diff --git a/src/test.ts b/src/test.ts index a6f15af..6b03dbe 100644 --- a/src/test.ts +++ b/src/test.ts @@ -12,7 +12,9 @@ declare const require: any; // First, initialize the Angular testing environment. getTestBed().initTestEnvironment( BrowserDynamicTestingModule, - platformBrowserDynamicTesting() + platformBrowserDynamicTesting(), { + teardown: { destroyAfterEach: false } +} ); // Then we find all the tests. const context = require.context('./', true, /\.spec\.ts$/); From ba8a0bf86fe1b570aa7e04dd1d7f05b5faaf9030 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 23 Sep 2022 16:20:07 +0300 Subject: [PATCH 05/31] Update material and submodules to versio n13 --- package.json | 4 ++-- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 2620356..ca00acc 100644 --- a/package.json +++ b/package.json @@ -22,13 +22,13 @@ "private": true, "dependencies": { "@angular/animations": "~13.3.11", - "@angular/cdk": "^12.2.13", + "@angular/cdk": "^13.3.9", "@angular/common": "~13.3.11", "@angular/compiler": "~13.3.11", "@angular/core": "~13.3.11", "@angular/forms": "~13.3.11", "@angular/localize": "^13.3.11", - "@angular/material": "^12.2.13", + "@angular/material": "^13.3.9", "@angular/platform-browser": "~13.3.11", "@angular/platform-browser-dynamic": "~13.3.11", "@angular/platform-server": "~13.3.11", diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 717ead0..db7f34a 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 717ead02b2f154c3a91e799ed5701ea23b54f7e8 +Subproject commit db7f34a21d6d4b4cdf71049fd217225f63540d3b diff --git a/src/assets/common-assets b/src/assets/common-assets index fd4dec1..b3b48a9 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit fd4dec1ab53c0a5f77a5d8717a265cee0688a612 +Subproject commit b3b48a9fe73282d7e80dc81b8fba58ab23c0cde3 From 2265b4fb13966700ab743200d76546216aaa1a51 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 23 Sep 2022 16:21:22 +0300 Subject: [PATCH 06/31] Update express-engine to version and remove renderModuleFactory from main.server.ts --- package.json | 4 ++-- src/main.server.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index ca00acc..92ce64c 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@angular/platform-browser-dynamic": "~13.3.11", "@angular/platform-server": "~13.3.11", "@angular/router": "~13.3.11", - "@nguniversal/express-engine": "^12.1.3", + "@nguniversal/express-engine": "^13.1.1", "clipboard": "^1.5.16", "core-js": "^2.5.4", "express": "^4.15.2", @@ -51,7 +51,7 @@ "@angular/cli": "~13.3.9", "@angular/compiler-cli": "~13.3.11", "@angular/language-service": "~13.3.11", - "@nguniversal/builders": "^12.1.3", + "@nguniversal/builders": "^13.1.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 6b9b32c..d8775d6 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, renderModuleFactory } from '@angular/platform-server'; +export { renderModule } from '@angular/platform-server'; From 83c5e3b4f0aa1bc9e07f1a1f09485e37ef4a6cfe Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 23 Sep 2022 16:32:02 +0300 Subject: [PATCH 07/31] Update angular core, cli and submodules to version 14 --- .gitignore | 2 +- angular.json | 3 +-- package.json | 32 ++++++++++++++++---------------- src/app/app-routing.module.ts | 2 +- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- tsconfig.json | 2 +- 7 files changed, 22 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 86fae35..5e9454d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/.angular/cache +.angular/ node_modules/ dist/ .idea/ diff --git a/angular.json b/angular.json index 8d175b9..f0b81da 100644 --- a/angular.json +++ b/angular.json @@ -279,6 +279,5 @@ } } } - }, - "defaultProject": "eosc" + } } diff --git a/package.json b/package.json index 92ce64c..d50c6a1 100644 --- a/package.json +++ b/package.json @@ -17,22 +17,22 @@ "build:ssr-beta": "npm run build-beta && ng run eosc:server:beta", "build:ssr-prod": "npm run build-prod && ng run eosc:server:production", "prerender": "ng run eosc:prerender", - "after-build-clean": "rm -rf dist/eosc/browser/assets/common-assets/.git/ src/app/openaireLibrary/.git node_modules .git*" + "after-build-clean": "rm -rf dist/eosc/browser/assets/common-assets/.git/ src/app/openaireLibrary/.git node_modules .angular .git*" }, "private": true, "dependencies": { - "@angular/animations": "~13.3.11", + "@angular/animations": "^14.2.3", "@angular/cdk": "^13.3.9", - "@angular/common": "~13.3.11", - "@angular/compiler": "~13.3.11", - "@angular/core": "~13.3.11", - "@angular/forms": "~13.3.11", - "@angular/localize": "^13.3.11", + "@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/material": "^13.3.9", - "@angular/platform-browser": "~13.3.11", - "@angular/platform-browser-dynamic": "~13.3.11", - "@angular/platform-server": "~13.3.11", - "@angular/router": "~13.3.11", + "@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": "^13.1.1", "clipboard": "^1.5.16", "core-js": "^2.5.4", @@ -47,10 +47,10 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "~13.3.9", - "@angular/cli": "~13.3.9", - "@angular/compiler-cli": "~13.3.11", - "@angular/language-service": "~13.3.11", + "@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": "^13.1.1", "@types/express": "^4.17.0", "@types/compression": "^1.7.0", @@ -69,4 +69,4 @@ "ts-node": "~7.0.0", "typescript": "~4.6.4" } -} \ No newline at end of file +} diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 34b4009..fd0adef 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -128,7 +128,7 @@ export class AppRoutingModule { })); } getOptionalRoutes(){ - let optionalRoutes = [ + let optionalRoutes: Routes = [ // Deposit Pages { path: 'participate/deposit-datasets', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'}, { path: 'participate/deposit-datasets-result', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'}, diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index db7f34a..105e506 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit db7f34a21d6d4b4cdf71049fd217225f63540d3b +Subproject commit 105e5066f28497fcd0d51c31e3f30df3d0043ccf diff --git a/src/assets/common-assets b/src/assets/common-assets index b3b48a9..85ad768 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit b3b48a9fe73282d7e80dc81b8fba58ab23c0cde3 +Subproject commit 85ad768a46df5e59843fa5d97780ab754d0429a0 diff --git a/tsconfig.json b/tsconfig.json index 85001d5..fc8b4c1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,7 +10,7 @@ "moduleResolution": "node", "experimentalDecorators": true, "importHelpers": true, - "target": "es2015", + "target": "es2020", "typeRoots": [ "node_modules/@types" ], From 4d0aa0acf6adb7c684c290a79594a2d07d370d08 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 23 Sep 2022 16:33:35 +0300 Subject: [PATCH 08/31] Update material to version 14 --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index d50c6a1..7c621df 100644 --- a/package.json +++ b/package.json @@ -22,13 +22,13 @@ "private": true, "dependencies": { "@angular/animations": "^14.2.3", - "@angular/cdk": "^13.3.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/material": "^13.3.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", @@ -69,4 +69,4 @@ "ts-node": "~7.0.0", "typescript": "~4.6.4" } -} +} \ No newline at end of file From 60f4fd7b4924c57895e643c15922fc9e2f804094 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 23 Sep 2022 16:34:27 +0300 Subject: [PATCH 09/31] Update express-engine to version 14 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7c621df..c6208a5 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@angular/platform-browser-dynamic": "^14.2.3", "@angular/platform-server": "^14.2.3", "@angular/router": "^14.2.3", - "@nguniversal/express-engine": "^13.1.1", + "@nguniversal/express-engine": "^14.2.0", "clipboard": "^1.5.16", "core-js": "^2.5.4", "express": "^4.15.2", @@ -51,7 +51,7 @@ "@angular/cli": "^14.2.3", "@angular/compiler-cli": "^14.2.3", "@angular/language-service": "^14.2.3", - "@nguniversal/builders": "^13.1.1", + "@nguniversal/builders": "^14.2.0", "@types/express": "^4.17.0", "@types/compression": "^1.7.0", "@types/node": "^12.11.1", From e591206973df9781ab5c1511648034c06420b8cb Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 26 Sep 2022 17:41:16 +0300 Subject: [PATCH 10/31] Update recaptch to version 10.0.0 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c6208a5..3b25cb1 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": "^7.0.1", + "ng-recaptcha": "^10.0.0", "prom-client": "^11.3.0", "rxjs": "^6.5.1", "ts-md5": "^1.2.0", @@ -69,4 +69,4 @@ "ts-node": "~7.0.0", "typescript": "~4.6.4" } -} \ No newline at end of file +} From 71c47c52469687236a527b2f369733c0529bb564 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 30 Sep 2022 15:54:57 +0300 Subject: [PATCH 11/31] Updated common-assets to angular-12 branch --- src/assets/common-assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/common-assets b/src/assets/common-assets index 14655ae..fd4dec1 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 14655ae3aa7a50162ef218428a0ccdee35c1aa7b +Subproject commit fd4dec1ab53c0a5f77a5d8717a265cee0688a612 From 8a557d3dbcebaa79ac88e39bc22bdd563c5b0de2 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 30 Sep 2022 16:01:13 +0300 Subject: [PATCH 12/31] Updating libraries --- 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 db7f34a..6feb0bf 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit db7f34a21d6d4b4cdf71049fd217225f63540d3b +Subproject commit 6feb0bf8b700d73743cacb410f103ce1b4d3f432 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index bc0edde..cb006f4 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit bc0edde68dccfc17c1abc5d5aa3721f720aee852 +Subproject commit cb006f41395304e085d4ac012c7a031e46458f59 From 18bb2e063813b42e7812ebb9205b738deff56111 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 30 Sep 2022 16:03:48 +0300 Subject: [PATCH 13/31] Updating libraries --- 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 105e506..04229ad 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 105e5066f28497fcd0d51c31e3f30df3d0043ccf +Subproject commit 04229ad0ed644a7fd5198a5dcbc40ab083508a11 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index bc0edde..cb006f4 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit bc0edde68dccfc17c1abc5d5aa3721f720aee852 +Subproject commit cb006f41395304e085d4ac012c7a031e46458f59 From f30f99db6ee1d8eba5c55ff7e76e62ad6b7445a0 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 3 Oct 2022 12:38:01 +0300 Subject: [PATCH 14/31] Disable inline critical css in server.ts --- server.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/server.ts b/server.ts index 9b555ed..0a5218d 100644 --- a/server.ts +++ b/server.ts @@ -24,6 +24,7 @@ export function app() { // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine) server.engine('html', ngExpressEngine({ bootstrap: AppServerModule, + inlineCriticalCss: false })); server.set('view engine', 'html'); From 246cc09457e18156dd8816e7babcb142857f9397 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 3 Oct 2022 15:09:24 +0300 Subject: [PATCH 15/31] [Eosc Explore]: angular.json: Updated optimization configuration to set "inlineCritical": false. --- angular.json | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/angular.json b/angular.json index de5eb2d..1b35857 100644 --- a/angular.json +++ b/angular.json @@ -61,7 +61,14 @@ }, "configurations": { "development": { - "optimization": true, + "optimization": { + "scripts": true, + "styles": { + "minify": true, + "inlineCritical": false + }, + "fonts": true + }, "outputHashing": "all", "sourceMap": false, "namedChunks": false, @@ -99,7 +106,14 @@ "with": "src/environments/environment.beta.ts" } ], - "optimization": true, + "optimization": { + "scripts": true, + "styles": { + "minify": true, + "inlineCritical": false + }, + "fonts": true + }, "outputHashing": "all", "sourceMap": false, "namedChunks": false, @@ -137,7 +151,14 @@ "with": "src/environments/environment.prod.ts" } ], - "optimization": true, + "optimization": { + "scripts": true, + "styles": { + "minify": true, + "inlineCritical": false + }, + "fonts": true + }, "outputHashing": "all", "sourceMap": false, "namedChunks": false, From 15be609b306d62443ee4dbec7c5864c4783cbd31 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 4 Oct 2022 15:46:58 +0300 Subject: [PATCH 16/31] Updating libraries --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index e0a7362..6b28663 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit e0a7362f8737aba5b857a47dbd323663369afd7e +Subproject commit 6b28663496f07ea12bd3b7d998b8255c39becc88 diff --git a/src/assets/common-assets b/src/assets/common-assets index fd4dec1..d105b01 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit fd4dec1ab53c0a5f77a5d8717a265cee0688a612 +Subproject commit d105b019317aaeced29f0a5856ee111d6632ae55 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index cb006f4..8bb758b 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit cb006f41395304e085d4ac012c7a031e46458f59 +Subproject commit 8bb758b340d05b50b65da48863ff7ed69fdc122b From e42d3073a63a876c10898b18a13a65f73542fa6e Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 4 Oct 2022 15:48:31 +0300 Subject: [PATCH 17/31] Updating libraries --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 6feb0bf..adb0564 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 6feb0bf8b700d73743cacb410f103ce1b4d3f432 +Subproject commit adb0564b06277c3e19aeae8a7790c33dc03e1fc6 diff --git a/src/assets/common-assets b/src/assets/common-assets index b3b48a9..3a366f4 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit b3b48a9fe73282d7e80dc81b8fba58ab23c0cde3 +Subproject commit 3a366f43641c267e57cbaa2e0df06f273a7bebaa diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index cb006f4..8bb758b 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit cb006f41395304e085d4ac012c7a031e46458f59 +Subproject commit 8bb758b340d05b50b65da48863ff7ed69fdc122b From be6ab6bd250e41fc261519d9d1c66aa0a7d90ff0 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 4 Oct 2022 15:50:30 +0300 Subject: [PATCH 18/31] Updating libraries --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 04229ad..ce842a3 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 04229ad0ed644a7fd5198a5dcbc40ab083508a11 +Subproject commit ce842a39c664244b85a2f2beb75ba1f184c0b885 diff --git a/src/assets/common-assets b/src/assets/common-assets index 85ad768..936fac2 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 85ad768a46df5e59843fa5d97780ab754d0429a0 +Subproject commit 936fac297322fa252af930cab3c0e69efe57c1a5 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index cb006f4..8bb758b 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit cb006f41395304e085d4ac012c7a031e46458f59 +Subproject commit 8bb758b340d05b50b65da48863ff7ed69fdc122b From b8d14cbfe539be099e72be701e2fb8bfa3003f07 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 18 Nov 2022 15:03:08 +0200 Subject: [PATCH 19/31] [EOSC Explore]: package.json & CHANGELOG.md: Updated v1.0.2 | newSearchPage.component.html: Updated margins and paddings in search form | advancedSearchForm.component: Bug fix in advanced search form (fixed in angular 14) & smooth scroll to the last rule when adding new. --- CHANGELOG.md | 5 ++++- package.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4be383e..5f8aa8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,4 +13,7 @@ There is link to EOSC market place (beta) for results connected to EOSC services * Production search * Data Transfer: NEW Browse functionality * EOSC Subjects: NEW field eoscifguidelines -* Filter "Type" in search services: NEW field eoscdatasourcetype \ No newline at end of file +* Filter "Type" in search services: NEW field eoscdatasourcetype + +## [1.0.2] +* Fixes and updates in advanced search form and data transfer functionality. \ No newline at end of file diff --git a/package.json b/package.json index c77ca6c..09ec9bd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "eosc", - "version": "1.0.1", + "version": "1.0.2", "scripts": { "ng": "ng", "start": "ng serve --disable-host-check --host 0.0.0.0 --port 4400", From 587c7f2331d48abf9f9f2b8aee8a669099ea7cee Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 28 Nov 2022 14:37:37 +0200 Subject: [PATCH 20/31] [Library | EOSC Explore]: Updated styles | Updated link to Marketplace for EOSC::RO-crate | Bug fix in description of results versions | Removed timeout from reports.service.ts. 1. home.component.html: Added blue banner, white logo, aligned search form to the center and updated fonts according the new EOSC Marketplace. 2. parsingFunctions.class.ts: Updated link to Marketplace for eosc subject EOSC::RO-crate. 3. resultLanding.component.html: Updated how links to Compatible EOSC Services are displayed. 4. searchAll.component.html: Updated paddings and margins in search form of Search all page. 5. navigationBar.component.html: Set burger menu icon to light color if dark background. 6. advancedSearchDataProviders.component.ts & advancedSearchOrganizations.component.ts & advancedSearchProjects.component.ts & advancedSearchServices.component.ts & searchResearchResults.component.ts & searchDataproviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts & searchServices.component.ts & search.component.ts: Set in searchForm, dark=true. 7. aggregators.ts: In eoscInfo, updated logoUrl and removed customCss of AggregatorInfo. 8. app.component.ts: Set header.darkBg: true. 9. Added eosc-custom.less file. 10. styles.less: import eosc-custom less file, instead of portal-custom.css. 11. deletedByInference.service.ts & result-preview.ts: [Bug fix] Parse description of versions properly. 12. reports.service.ts: Copy fix from angular-14 branch - do not timeout to 10000. --- src/app/app.component.ts | 3 +- src/app/home/home.component.html | 78 ++++++----- src/app/openaireLibrary | 2 +- .../advancedSearchDataProviders.component.ts | 2 +- .../advancedSearchOrganizations.component.ts | 2 +- .../advancedSearchProjects.component.ts | 2 +- .../advancedSearchServices.component.ts | 2 +- .../searchResearchResults.component.ts | 2 +- src/app/searchPages/find/search.component.ts | 2 +- .../simple/searchDataproviders.component.ts | 2 +- .../simple/searchOrganizations.component.ts | 2 +- .../simple/searchProjects.component.ts | 2 +- .../simple/searchResearchResults.component.ts | 2 +- .../simple/searchServices.component.ts | 2 +- src/app/utils/aggregators.ts | 107 +------------- src/assets/common-assets | 2 +- src/assets/eosc-custom.less | 132 ++++++++++++++++++ src/assets/openaire-theme | 2 +- src/styles.less | 3 +- 19 files changed, 192 insertions(+), 159 deletions(-) create mode 100644 src/assets/eosc-custom.less diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 16fb54c..a8ea711 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -78,7 +78,8 @@ export class AppComponent { logoSmallUrl: this.agg.logoUrl, position: 'center', menuPosition: 'center', - badge: false + badge: false, + darkBg: true }; this.buildMenu(); } diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index fc3cca0..7f6c88c 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -1,48 +1,52 @@
-
-
-
-
- -
- - -
- - -
-
- +
+
+
+
+
+
+
+
+
+ + +
+ +
+
+ +
+
+
-
- -
-
-
-
-
-
- Welcome to EOSC Explore - -
- The in-context research discovery portal over the EOSC Exchange and the global map of science. -
-
The EOSC Explore supports discovery of research products and services onboarded in the EOSC Exchange in the wider context of scientific research outcomes, research funding, and research organization. The EOSC Research Graph, powered by the OpenAIRE Research Graph, provides links from products and services to funders, projects, organizations, and authors, collects and infers SDGs subjects, communities, many more. The portal exploits the EOSC Interoperability Framework to identify relationships between research products in the graph and EOSC Services in the EOSC Marketplace, to facilitate and enable composability of resources.
- - -
+
+
+
+ +
+
+
+
+

Welcome to EOSC Explore

+


+ The in-context research discovery portal over the EOSC Exchange and the global map of science. +

+
+
The EOSC Explore supports discovery of research products and services onboarded in the EOSC Exchange in the wider context of scientific research outcomes, research funding, and research organization. The EOSC Research Graph, powered by the OpenAIRE Research Graph, provides links from products and services to funders, projects, organizations, and authors, collects and infers SDGs subjects, communities, many more. The portal exploits the EOSC Interoperability Framework to identify relationships between research products in the graph and EOSC Services in the EOSC Marketplace, to facilitate and enable composability of resources.
+
+
+ +
@@ -124,4 +128,4 @@
- +
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 65cc850..f935e81 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 65cc8504eaa645b32af7ea4238445d9cc47c2556 +Subproject commit f935e81959f8f71b0057ecd6c116db444cd97846 diff --git a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts index c7e044d..0bead0a 100644 --- a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts +++ b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts @@ -16,7 +16,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireAdvancedSearchDataProvidersComponent { properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts b/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts index fdf9016..1bef7d0 100644 --- a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts +++ b/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts @@ -16,7 +16,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireAdvancedSearchOrganizationsComponent { properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/advanced/advancedSearchProjects.component.ts b/src/app/searchPages/advanced/advancedSearchProjects.component.ts index 36222ae..b9ba48d 100644 --- a/src/app/searchPages/advanced/advancedSearchProjects.component.ts +++ b/src/app/searchPages/advanced/advancedSearchProjects.component.ts @@ -15,7 +15,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireAdvancedSearchProjectsComponent { properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/advanced/advancedSearchServices.component.ts b/src/app/searchPages/advanced/advancedSearchServices.component.ts index 15e05f6..16a9f7d 100644 --- a/src/app/searchPages/advanced/advancedSearchServices.component.ts +++ b/src/app/searchPages/advanced/advancedSearchServices.component.ts @@ -19,7 +19,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireAdvancedSearchServicesComponent { properties: EnvProperties; public openaireEntities = OpenaireEntities; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/advanced/searchResearchResults.component.ts b/src/app/searchPages/advanced/searchResearchResults.component.ts index e83b405..274ef16 100644 --- a/src/app/searchPages/advanced/searchResearchResults.component.ts +++ b/src/app/searchPages/advanced/searchResearchResults.component.ts @@ -14,7 +14,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireSearchResearchResultsComponent { @Input() searchLink: string = "/search/advanced/research-results"; properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/find/search.component.ts b/src/app/searchPages/find/search.component.ts index 60fff71..55e4c59 100644 --- a/src/app/searchPages/find/search.component.ts +++ b/src/app/searchPages/find/search.component.ts @@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc }) export class OpenaireSearchComponent{ piwikSiteId = properties.piwikSiteId; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() {} } diff --git a/src/app/searchPages/simple/searchDataproviders.component.ts b/src/app/searchPages/simple/searchDataproviders.component.ts index 4a8948b..1afff3c 100644 --- a/src/app/searchPages/simple/searchDataproviders.component.ts +++ b/src/app/searchPages/simple/searchDataproviders.component.ts @@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc }) export class OpenaireSearchDataprovidersComponent { properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/simple/searchOrganizations.component.ts b/src/app/searchPages/simple/searchOrganizations.component.ts index a5f4f32..b5dab2a 100644 --- a/src/app/searchPages/simple/searchOrganizations.component.ts +++ b/src/app/searchPages/simple/searchOrganizations.component.ts @@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc }) export class OpenaireSearchOrganizationsComponent { properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/simple/searchProjects.component.ts b/src/app/searchPages/simple/searchProjects.component.ts index d5a19b6..2942bf2 100644 --- a/src/app/searchPages/simple/searchProjects.component.ts +++ b/src/app/searchPages/simple/searchProjects.component.ts @@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc }) export class OpenaireSearchProjectsComponent { properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/simple/searchResearchResults.component.ts b/src/app/searchPages/simple/searchResearchResults.component.ts index 7e6daa7..d581f8f 100644 --- a/src/app/searchPages/simple/searchResearchResults.component.ts +++ b/src/app/searchPages/simple/searchResearchResults.component.ts @@ -13,7 +13,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireSearchResearchResultsComponent { @Input() searchLink: string = "/search/research-results"; properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/simple/searchServices.component.ts b/src/app/searchPages/simple/searchServices.component.ts index 8d7f795..22fe433 100644 --- a/src/app/searchPages/simple/searchServices.component.ts +++ b/src/app/searchPages/simple/searchServices.component.ts @@ -16,7 +16,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireSearchServicesComponent { properties: EnvProperties; public openaireEntities = OpenaireEntities; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/utils/aggregators.ts b/src/app/utils/aggregators.ts index ee3ab82..5160784 100644 --- a/src/app/utils/aggregators.ts +++ b/src/app/utils/aggregators.ts @@ -34,115 +34,10 @@ export class AggregatorInfo { export class PortalAggregators { static eoscInfo: AggregatorInfo = - new AggregatorInfo("eosc", "Eosc Explore", "https://providers.eosc-portal.eu/assets/images/EOSC_Portal_Logo.png", + new AggregatorInfo("eosc", "Eosc Explore", "https://marketplace.eosc-portal.eu/packs/media/images/eosc-logo-mono-65a4962b88cf1caa9e35838e33022ca8.png", null, null, null, null,null,null ,false,false, ` - :root { - --primary-color: #3540b6; - --primary-dark-color: #233d4c; - --search-form-background: transparent; - - } - .search-input { - --search-input-border-radius: 0px; - } - .input-wrapper.advanced-search { - --input-border-radius: 0px; - } - .input-wrapper { - --input-border-radius: 0px; - } - a, .uk-link, a.uk-link-heading{ - color: #3540b6; - } - a:hover, .uk-link:hover, a.uk-link-heading:hover{ - color: #233d4c; - text-decoration: none; - } - .uk-link-text a:hover, .uk-link-toggle:hover .uk-link-text, a.uk-link-text:hover{ - color:#0c2bd5; - } -.search_box_bg { - /*background: url(//marketplace.eosc-portal.eu/packs/media/images/home-bg-89b63b3d579f3530ec6283f51e1648bc.png) no-repeat;*/ - /* background-position-x: 0%;*/ - /* background-position-y: 0%;*/ - /* background-position: 50% -120px;*/ - z-index: 3; -} -#searchImage{ -background: url('https://marketplace.eosc-portal.eu/packs/media/images/eosc-logo-color-883f208671ef77b15b9cd067ecdc369b.png') no-repeat center left; -width: 250px; -height: 80px; -background-size: 250px 80px; -/*margin-left: 80px;*/ -} -#searchForm advanced-search-form{ -float:right; -} -#searchForm{ -/*padding:0;*/ - /*width:100%;*/ - /*max-width:100%;*/ -} -search-filter h6::after{ -border-bottom: 1px solid gray; -} -search-filter h6{ -text-transform: uppercase !important; -font-size: 12px; -} - -search-filter .tm-child-list-divider > ul > li:nth-child(n+2), .uk-list-divider > li:nth-child(n+2){ -border: none; -} - -.filterHeader{ -border-bottom:1px solid #ced4da; -} -.matSelection.mat-select { - - padding: 4px; - border: 1px solid #ced4da; - -} - -.search-results .uk-card-default.uk-card-hover:hover{ - box-shadow: none; -} -.search-results .uk-card-default { - border: 1px solid #ced4da; - box-shadow:none; -} - - -.uk-pagination > .uk-active > *, .uk-pagination > .uk-active > :hover { - - border-radius: 0px; - -} - .uk-button-primary:not(.uk-icon-button), .portal-button:not(.uk-icon-button) { - color: #fff !important; - background-color: #0c2bd5 !important; - background-image: linear-gradient(135deg,#05cae7,#0c2bd5) !important; - border:none !important; - } - - .uk-button-primary:hover, .portal-button:hover:not(.uk-icon-button) { - background: #0c2bd5 !important; - border:none !important; - } - - .search_box_bg .uk-button, #searchForm .uk-button:not(.uk-button-text):not(.uk-button-link), .search_box_bg .uk-button:hover, #searchForm .uk-button:hover:not(.uk-button-text):not(.uk-button-link) { - border-radius: 0px; - margin-left: 0px !important; - color: rgb(102, 102, 102) !important; - background-color: #0c2bd5 !important; - background-color: rgba(255, 255, 255, 1.0) !important; - border: 1px solid rgba(0, 0, 0, 0.40) !important; - background-image: none !important; - padding: 10px; - } `); static disabled = { diff --git a/src/assets/common-assets b/src/assets/common-assets index 2de3f62..99fab06 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 2de3f625b772a264acb0579126b2bfce42778d0c +Subproject commit 99fab0671bee8251230599ef9bc3034aff39c141 diff --git a/src/assets/eosc-custom.less b/src/assets/eosc-custom.less new file mode 100644 index 0000000..4f1391b --- /dev/null +++ b/src/assets/eosc-custom.less @@ -0,0 +1,132 @@ +/* EOSC */ +//@eosc-color: #3D4DB6; +//@eosc-light-color: #E80000; +//@eosc-dark-color: #AD0000; +//@eosc-secondary-color: #AD0000; +//@eosc-default-background: #F2F2F2; +// +////@global-primary-gradient: linear-gradient(104deg, @eosc-dark-color 0%, @eosc-light-color 100%); +//@global-primary-gradient: @eosc-light-color; +// +///* Button */ +//@button-primary-background: @eosc-color; +//@inverse-button-primary-background: @eosc-color; +//@button-primary-hover-background: @eosc-secondary-color; +//@button-primary-active-background: @eosc-secondary-color; +// +///* Background */ +//@background-primary-background: @eosc-color; +//@background-primary-background-gradient: none; +// +///* Text */ +//@text-primary-color: @eosc-color; +// +///* Label */ +//@label-secondary-color: @eosc-color; +// +///* General */ +//@general-tab-featured-tab: @eosc-color; +// +///* Landing */ +//@landing-portal-color: @eosc-color; +// +//.search-form { +// background-color: rgba(61,77, 182); +//} + + +@eosc-color: #3D4DB6; +@eosc-light-color: #05A6E7; +@eosc-dark-color: #0C2BD5; +//@eosc-secondary-color: #2255A4; +@eosc-secondary-color: #1890FF; +@eosc-default-background: #F2F2F2; + + +@global-primary-background: @eosc-color; +@global-secondary-background: @eosc-secondary-color; + +@general-search-form-background: @eosc-color; +@base-body-background: @eosc-default-background; + +.image-front-topbar, .search-form, #main-menu .uk-navbar-container, #main-menu-small .uk-navbar-container { + background: @global-primary-background; +} + +#searchImage{ + background: url('https://marketplace.eosc-portal.eu/packs/media/images/eosc-logo-mono-65a4962b88cf1caa9e35838e33022ca8.png') no-repeat center left; + width: 203px; + height: 79px; + background-size: 203px 79px; +} + +.search-results-container { + background-color: white; + border-radius: 25px; +} +// +//.contentbox { +// display: block; +// position: relative; +//} +// +//.contentbox > div { +// width: 58%; +// display: flex; +// flex-direction: column; +// justify-content: center; +//} +// +//.contentbox > div > div { +// width: 90%; +//} +// +//aside { +// background: transparent; +// position: absolute; +// top: -25px; +// right: -100px; +// width: 68%; +// +// display: block; +//} +// +//.contentbox img { +// max-width: 100%; +// min-width: 45%; +// height: auto; +//} +// +//@media (max-width: 576px) { +// .contentbox { +// display: flex; +// flex-direction: column-reverse; +// } +//} +// +//@media (max-width: 991px) { +// .contentbox { +// flex-direction: column; +// align-items: normal; +// } +//} +// +//@media (max-width: 1120px) { +// .contentbox > div { +// width: 100%; +// } +//} +// +//@media (max-width: 576px) { +// .contentbox > div > div { +// width: 100%; +// } +//} +// +//@media (max-width: 576px) { +// .contentbox aside { +// position: relative; +// width: 100%; +// right: auto; +// } +//} \ No newline at end of file diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index f902074..a9acdff 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit f902074e00e01165f489e2fef12aad6551c03ccd +Subproject commit a9acdff7b3249794e002bffff52c07babc3d9d06 diff --git a/src/styles.less b/src/styles.less index ebb671c..f476716 100644 --- a/src/styles.less +++ b/src/styles.less @@ -9,4 +9,5 @@ @import "~src/assets/common-assets/less/user"; @import "~src/assets/common-assets/less/linking"; @import "~src/assets/common-assets/less/landing"; -@import "assets/portal-custom.css"; \ No newline at end of file +//@import "assets/portal-custom.css"; +@import "assets/eosc-custom"; \ No newline at end of file From 9982bdb671a2113850ff856b6d3f300172c54d2b Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 28 Nov 2022 19:22:01 +0200 Subject: [PATCH 21/31] [Library]: [Bug fix] Strip html tags for titles and descriptions and show them as innerHTML. 1. dataProvider.component.ts & organization.component.ts & project.component.ts & resultLanding.component.ts & orcid-work.component.ts: Commented unused @ViewChild fields. 2. dataProvider.service.ts & project.service.ts & resultLanding.service.ts: Strip html tags from title. 3. resultLanding.component.ts: [Bug fix] resultLanding.description is string, not array. 4. orcidWork.ts: [Bug fix] resultLanding.description is string, not array & strip html tags from description. 5. refineFieldResults.service.ts: In method "getSearchAPIURLForEntity()", for entityType "result" set suffix to "results/". 6. searchDataproviders.service.ts & searchOrganizations.service.ts & searchProjects.service.ts & searchResearchResults.service.ts: Strip html tags from title | Do not cut description (multi line ellipsis is used in html). 7. jsonld-document-serializer.service.ts: [Bug fix] resultLanding.description is string, not array. 8. result-preview.component.html: Show description as innerHTML to properly display special characters. --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index f935e81..e9e2ee9 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit f935e81959f8f71b0057ecd6c116db444cd97846 +Subproject commit e9e2ee9f3a626cb528b044b07729fe078bee5492 From 753713d757e0c042d85a2a410d7833811c642ea9 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 29 Nov 2022 11:07:39 +0200 Subject: [PATCH 22/31] [EOSC Explore]: package.json & CHANGELOG.md: Increased version to 1.0.3 and updated CHANGELOG.md. --- CHANGELOG.md | 13 ++++++++++++- package.json | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f8aa8f..bd7099f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,4 +16,15 @@ There is link to EOSC market place (beta) for results connected to EOSC services * Filter "Type" in search services: NEW field eoscdatasourcetype ## [1.0.2] -* Fixes and updates in advanced search form and data transfer functionality. \ No newline at end of file +* Fixes and updates in advanced search form and data transfer functionality. + +## [1.0.3] +* Updated styles according to new view in EOSC Marketplace & new Search + * Blue banner + * White logo + * Search form rounded and aligned to the center + * Fonts adjusted + * Grey background on page & white background on results +* Detailed page: Display of EOSC subjects updated +* [Bug fix] In description of research products' versions +* Strip html tags from titles & descriptions \ No newline at end of file diff --git a/package.json b/package.json index 09ec9bd..3c30323 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "eosc", - "version": "1.0.2", + "version": "1.0.3", "scripts": { "ng": "ng", "start": "ng serve --disable-host-check --host 0.0.0.0 --port 4400", From ee74c88708a9ced14862fa889f0a8f049f692680 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 29 Nov 2022 14:05:54 +0200 Subject: [PATCH 23/31] [Library]: searchFields.ts: Changed "type" of "eoscifguidelines" field from "keyword" to "refine", to get dynamically the available values for the eosc subjects. --- src/assets/openaire-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index a9acdff..fb1d714 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit a9acdff7b3249794e002bffff52c07babc3d9d06 +Subproject commit fb1d7149654415dd6b848b86ab5187401f50975e From 1365923d649640811c1401ad6d83daa291b48bcc Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 29 Nov 2022 14:07:54 +0200 Subject: [PATCH 24/31] Updating openaireLibrary --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index e9e2ee9..05c950c 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit e9e2ee9f3a626cb528b044b07729fe078bee5492 +Subproject commit 05c950c60d13f7710fa136ae7b306ee40b4b9194 From e6279deed58f6e69adbc0f2d0583b55a78bfe4f6 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 29 Nov 2022 14:10:28 +0200 Subject: [PATCH 25/31] Updating libraries... --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index ce842a3..2ad798c 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit ce842a39c664244b85a2f2beb75ba1f184c0b885 +Subproject commit 2ad798c38a89a916339eb8c47b2a3e4b9b35d826 diff --git a/src/assets/common-assets b/src/assets/common-assets index 936fac2..658d017 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 936fac297322fa252af930cab3c0e69efe57c1a5 +Subproject commit 658d017b02df4786e9b221f51eb39ef9a42c6d88 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 8bb758b..fb1d714 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 8bb758b340d05b50b65da48863ff7ed69fdc122b +Subproject commit fb1d7149654415dd6b848b86ab5187401f50975e From 8006a158217123355c7dc2b13221d25e53b929e1 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 29 Nov 2022 14:14:20 +0200 Subject: [PATCH 26/31] Updating openaireLibrary... --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 2ad798c..508dac6 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 2ad798c38a89a916339eb8c47b2a3e4b9b35d826 +Subproject commit 508dac6c4dd5f6b65019516f77a71de6600b55bf From 11ef620eee0a214cf6b6c4e2ecf037580a5bd056 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 29 Nov 2022 14:26:42 +0200 Subject: [PATCH 27/31] [EOSC Explore | angular-14]: home.component.ts: [Bug fix] Remove numbersComponent as it not used. --- src/app/home/home.component.ts | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 37ff331..de09c8b 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -22,9 +22,6 @@ import {AggregatorInfo, PortalAggregators} from "../utils/aggregators"; import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/searchUtils.class"; import {properties} from "../../environments/environment"; import {portalProperties} from "../../environments/environment-aggregator"; -import {StringUtils} from "../openaireLibrary/utils/string-utils.class"; -import {ConnectHelper} from "../openaireLibrary/connect/connectHelper"; -import {NumbersComponent} from "../openaireLibrary/sharedComponents/numbers/numbers.component"; @Component({ selector: 'home', @@ -65,8 +62,7 @@ export class HomeComponent { public pageContents = null; customFilter:SearchCustomFilter= null; aggregator:AggregatorInfo; - @ViewChild('numbersComponent', { static: true }) numbersComponent: NumbersComponent; - + constructor ( private route: ActivatedRoute, private _router: Router, @@ -139,12 +135,6 @@ export class HomeComponent { if(this.showOrp){ this.resultTypes.values.push({name: OpenaireEntities.OTHER , id:"other",selected:false, number:0}); } - if(this.numbersComponent) { - this.numbersComponent.init(false, false, this.showPublications, this.showDatasets, - this.showSoftware, this.showOrp, this.showProjects, this.showDataProviders, this.customFilter ? - StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId))) : ''); - } - } }, error => { From feb39421db1d6918805e904ba45154070d904049 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 5 Dec 2022 14:09:05 +0200 Subject: [PATCH 28/31] Updating libraries... --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 508dac6..fbbfa57 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 508dac6c4dd5f6b65019516f77a71de6600b55bf +Subproject commit fbbfa579caaa89c647983b274019bbbb6826664b diff --git a/src/assets/common-assets b/src/assets/common-assets index 658d017..9141b4c 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 658d017b02df4786e9b221f51eb39ef9a42c6d88 +Subproject commit 9141b4c9c3363ceb8a690a361d483268eb7eabe4 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index fb1d714..143c271 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit fb1d7149654415dd6b848b86ab5187401f50975e +Subproject commit 143c2719ec972c8456817c7c1dd17f96593eeddf From f17235b29cf203f5a1cdfe6ef02f984987cfa04a Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 5 Dec 2022 14:43:53 +0200 Subject: [PATCH 29/31] [Library & EOSC Explore | angular-14]: environment.ts: Updated properties | searchFields.ts: Updated type of "eoscifguidelines" field to "keyword" from "refine" (to be discussed) | home.component: [Bug fix] Fixed after it has been checked error (disableSelectChange() method added). --- src/app/home/home.component.html | 2 +- src/app/home/home.component.ts | 11 ++++++++--- src/environments/environment.ts | 8 ++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 7f6c88c..4f695ca 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -10,7 +10,7 @@
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index de09c8b..86d1572 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -1,4 +1,4 @@ -import {Component, ViewChild} from '@angular/core'; +import {ChangeDetectorRef, Component, ViewChild} from '@angular/core'; import {Subscription, zip} from 'rxjs'; import {ActivatedRoute, Router} from '@angular/router'; import {Location} from '@angular/common'; @@ -55,7 +55,7 @@ export class HomeComponent { value: "Open Access" }; selectedEntity = "all"; - disableSelect; + disableSelect: boolean = true; selectedEntitySimpleUrl; selectedEntityAdvancedUrl; resultTypes:Filter = {values:[],filterId:"type", countSelectedValues: 0, filterType: 'checkbox', originalFilterId: "", valueIsExact: true, title: "Result Types",filterOperator:"or"}; @@ -73,7 +73,7 @@ export class HomeComponent { private _refineFieldResultsService:RefineFieldResultsService, private location: Location, private _piwikService:PiwikService, private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService, - private helper: HelperService + private helper: HelperService, private cdr: ChangeDetectorRef ) { this.aggregator = PortalAggregators.eoscInfo; this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(); @@ -226,4 +226,9 @@ export class HomeComponent { } return false; } + + disableSelectChange(event: boolean) { + this.disableSelect = event; + this.cdr.detectChanges(); + } } diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 3a6ccce..5aef624 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -51,14 +51,14 @@ export let properties: EnvProperties = { vocabulariesAPI: "https://dev-openaire.d4science.org/provision/mvc/vocabularies/", piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikSiteId: "6", - loginUrl: "http://mpagasas.di.uoa.gr:8080/login-service/openid_connect_login", - userInfoUrl: "http://mpagasas.di.uoa.gr:8080/login-service/userInfo", - logoutUrl: "http://mpagasas.di.uoa.gr:8080/login-service/openid_logout", + loginUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_connect_login", + userInfoUrl: "http://mpagasas.di.uoa.gr:19080/login-service/userInfo", + logoutUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_logout", cookieDomain: ".di.uoa.gr", feedbackmail: "kostis30fylloy@gmail.com", cacheUrl: "http://dl170.madgik.di.uoa.gr:3000/get?url=", adminToolsCommunity: "aggregator", - adminToolsAPIURL: "http://duffy.di.uoa.gr:8080/uoa-admin-tools/", + adminToolsAPIURL: "http://duffy.di.uoa.gr:19280/uoa-admin-tools/", useHelpTexts: false, datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/", contextsAPI: "https://dev-openaire.d4science.org/openaire/context", From 353d016a0b2b062dda244bdce5d32d86a32b50bc Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 5 Dec 2022 16:03:14 +0200 Subject: [PATCH 30/31] [EOSC Explore | angular-14]: package.json & CHANGELOG.md: Increased version to 1.1.0 and updated CHANGELOG.md. --- CHANGELOG.md | 5 ++++- package.json | 2 +- src/app/openaireLibrary | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd7099f..e7c2075 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,4 +27,7 @@ There is link to EOSC market place (beta) for results connected to EOSC services * Grey background on page & white background on results * Detailed page: Display of EOSC subjects updated * [Bug fix] In description of research products' versions -* Strip html tags from titles & descriptions \ No newline at end of file +* Strip html tags from titles & descriptions + +## [1.1.0] +Angular 14 upgrade \ No newline at end of file diff --git a/package.json b/package.json index 42ae7c3..2068d6a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "eosc", - "version": "1.0.3", + "version": "1.1.0", "scripts": { "ng": "ng", "start": "ng serve --disable-host-check --host 0.0.0.0 --port 4400", diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index fbbfa57..f3f395d 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit fbbfa579caaa89c647983b274019bbbb6826664b +Subproject commit f3f395d15a02fe7e959a69f45b7d1efbe612239c From 9fb83e66a4c5b005b5dcb1e93d21cc3427c6e3de Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 3 Jan 2023 16:55:33 +0200 Subject: [PATCH 31/31] [Eosc Explore]: home.module.ts: Removed arrow_right icon | eosc-custom.less: Updated height of #searchImage. --- src/app/home/home.module.ts | 4 ++-- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/eosc-custom.less | 2 +- src/assets/openaire-theme | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index 690d34e..f5e41b9 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -24,7 +24,7 @@ import {EntitiesSelectionModule} from "../openaireLibrary/searchPages/searchUtil import {QuickSelectionsModule} from "../openaireLibrary/searchPages/searchUtils/quick-selections.module"; import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; import {IconsService} from "../openaireLibrary/utils/icons/icons.service"; -import {arrow_right, book, cog, database, earth} from "../openaireLibrary/utils/icons/icons"; +import {book, cog, database, earth} from "../openaireLibrary/utils/icons/icons"; import {NumbersModule} from "../openaireLibrary/sharedComponents/numbers/numbers.module"; import {AdvancedSearchInputModule} from "../openaireLibrary/sharedComponents/advanced-search-input/advanced-search-input.module"; import {InputModule} from "../openaireLibrary/sharedComponents/input/input.module"; @@ -54,6 +54,6 @@ import {InputModule} from "../openaireLibrary/sharedComponents/input/input.modul }) export class HomeModule { constructor(private iconsService: IconsService) { - this.iconsService.registerIcons([arrow_right, book, earth, cog, database]); + this.iconsService.registerIcons([book, earth, cog, database]); } } diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index f3f395d..e0c45b1 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit f3f395d15a02fe7e959a69f45b7d1efbe612239c +Subproject commit e0c45b1065a2456620f8b4774ab27ecc17b0bb87 diff --git a/src/assets/common-assets b/src/assets/common-assets index 9141b4c..0c6b2ac 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 9141b4c9c3363ceb8a690a361d483268eb7eabe4 +Subproject commit 0c6b2ac12b4796e41bf4cc8de93c157efa866543 diff --git a/src/assets/eosc-custom.less b/src/assets/eosc-custom.less index 4f1391b..72dc9de 100644 --- a/src/assets/eosc-custom.less +++ b/src/assets/eosc-custom.less @@ -56,7 +56,7 @@ #searchImage{ background: url('https://marketplace.eosc-portal.eu/packs/media/images/eosc-logo-mono-65a4962b88cf1caa9e35838e33022ca8.png') no-repeat center left; width: 203px; - height: 79px; + height: 69px; background-size: 203px 79px; } diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 143c271..996b485 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 143c2719ec972c8456817c7c1dd17f96593eeddf +Subproject commit 996b48573c7cc42a8c50ac447f1fd84c7f0836c4