From 37358b14dbe757d7e98e9ae2c8641bf003011d6e Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 5 Mar 2024 13:59:37 +0200 Subject: [PATCH 1/7] [develop | DONE | FIXED]: CHANGELOG.md: Spelling error fix. --- explore/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/CHANGELOG.md b/explore/CHANGELOG.md index 085a61d6..e05296d3 100644 --- a/explore/CHANGELOG.md +++ b/explore/CHANGELOG.md @@ -29,7 +29,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Fixed * z-index issue in dropdowns inside modals * Change search tab from menu -* Requests in bulk DOIs upload in linkinh +* Requests in bulk DOIs upload in linking * View all for search filters * Research products detailed page: Provenance label in funded by -- 2.17.1 From d42a3973bd8822ee6ec5bb773b193a9f3ac0bf5a Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Thu, 28 Mar 2024 13:07:54 +0200 Subject: [PATCH 2/7] [develop | DONE | ADDED] update submodules for bulk deletion functionality for claims --- explore/src/app/openaireLibrary | 2 +- explore/src/assets/common-assets | 2 +- explore/src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index e0de8929..cafe0e49 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit e0de892998d76b2236babf3439ed532e4501145d +Subproject commit cafe0e4926f0d9762cd59a71ce1779743db34771 diff --git a/explore/src/assets/common-assets b/explore/src/assets/common-assets index 651102a5..8d2f8348 160000 --- a/explore/src/assets/common-assets +++ b/explore/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 651102a5ba049b71bed8eb6a85a8d02cefcb24cc +Subproject commit 8d2f8348d8a601fad14844d920791fe7370bd4a2 diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index 37639eab..954a1fe8 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 37639eab68c63a506b7df10c42e3379c4a05d94d +Subproject commit 954a1fe8af0653740882c7db4b9bf92b8f9000f4 -- 2.17.1 From 260b263e6f4a46227fc4c196b8e31e371b300ca3 Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 3 Apr 2024 10:20:58 +0300 Subject: [PATCH 3/7] [develop | DONE | CHANGED] cache.js add compression library, reload content based on forceReload parameter or cache control headers --- services/cache/mecache/cache.js | 21 +++++++++++++++------ services/cache/mecache/package.json | 1 + 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/services/cache/mecache/cache.js b/services/cache/mecache/cache.js index a525742e..18a34898 100644 --- a/services/cache/mecache/cache.js +++ b/services/cache/mecache/cache.js @@ -6,6 +6,7 @@ const { LRUCache } = require('lru-cache'); const request = require('superagent'); const prom = require('prom-client'); const URL = require('url'); +let compression = require("compression"); const PropertiesReader = require('properties-reader'); const properties = PropertiesReader('./properties.file'); const environment = properties.get("environment"); @@ -14,6 +15,7 @@ const preloadRequests = properties.get("preloadRequests").split(',');; const cacheMaxSize = 1000; let cors = require('cors'); app.use(cors()); +app.use(compression()); const lruCache = new LRUCache({ max: cacheMaxSize }); const register = new prom.Registry(); prom.collectDefaultMetrics({register: register}); @@ -42,18 +44,25 @@ const histogram = new prom.Histogram({ let cache = () => { return (req, res, next) => { if (req.query.url) { - let key = '__express__' + req.query.url; + let key = req.query.url; const url = new URL.parse(req.query.url); + // console.log(req.headers.origin, req.headers.referrer, req.headers.origin) + const cacheControlHeader = req.headers['cache-control']; + // Log the Cache-Control header + // console.log('Cache-Control header sent by client:', cacheControlHeader); + let forceReload = req.query.forceReload && req.query.forceReload == 'true'?true:false; + forceReload = forceReload || (cacheControlHeader && (cacheControlHeader.indexOf("no-cache") || cacheControlHeader.indexOf("no-store") || cacheControlHeader.indexOf("must-revalidate")))?true:false; + const target = url.host + '/' + url.pathname.split('/')[1]; const scheme = url.protocol.replace(':', ''); - if (lruCache.has(key)) { -// console.log( key, "hit") + if (lruCache.has(key) && !forceReload) { + // console.log( key, "hit") const end = histogram.startTimer({scheme: scheme, target: target, cache: 'hit'}); res.send(JSON.parse(lruCache.get(key))); responses.inc({scheme: scheme, target: target, code: res.statusCode}); end(); } else { - // console.log( key, "miss") + // console.log( key, "miss", forceReload) const end = histogram.startTimer({scheme: scheme, target: target, cache: 'miss'}); res.sendResponse = res.send; res.send = (body) => { @@ -85,9 +94,9 @@ let cache = () => { }; function isAllowedToBeCached(scheme, target){ if(environment != "development"){ - return scheme.indexOf("https")!=-1 && ( target.indexOf(".openaire.eu/") !=-1 || target.indexOf(".zenodo.org/api/") !=-1 || target.indexOf("lab.idiap.ch/enermaps" != -1)) + return scheme.indexOf("https")!=-1 && ( target.indexOf(".openaire.eu/") !=-1 || target.indexOf("zenodo.org/api") !=-1 || target.indexOf("lab.idiap.ch/enermaps" != -1)) } else if(environment == "development"){ - return target.indexOf(".openaire.eu/") !=-1 || target.indexOf(".di.uoa.gr") !=-1 || target.indexOf("dev-openaire.d4science.org") !=-1 || target.indexOf("lab.idiap.ch/enermaps") != -1 + return target.indexOf(".openaire.eu/") !=-1 || target.indexOf(".di.uoa.gr") !=-1 || target.indexOf("zenodo.org/api") !=-1 || target.indexOf("dev-openaire.d4science.org") !=-1 || target.indexOf("lab.idiap.ch/enermaps") != -1 } return true; } diff --git a/services/cache/mecache/package.json b/services/cache/mecache/package.json index c5b9a32e..f35341f4 100644 --- a/services/cache/mecache/package.json +++ b/services/cache/mecache/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "axios": "^1.6.7", + "compression": "^1.7.4", "cors": "^2.8.5", "express": "^4.18.2", "lru-cache": "^10.2.0", -- 2.17.1 From 09b7435243d947906cc79139482cc04fb2e6daae Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Mon, 8 Apr 2024 19:10:44 +0300 Subject: [PATCH 4/7] [develop | DONE | ADDED] funders page: update cards and lists to prepare for new data to be shown --- .../src/app/funders/funders.component.html | 240 +++++++++++------- .../src/app/funders/funders.component.less | 16 +- explore/src/app/openaireLibrary | 2 +- explore/src/assets/openaire-theme | 2 +- 4 files changed, 153 insertions(+), 107 deletions(-) diff --git a/explore/src/app/funders/funders.component.html b/explore/src/app/funders/funders.component.html index 24667eab..b00053cf 100644 --- a/explore/src/app/funders/funders.component.html +++ b/explore/src/app/funders/funders.component.html @@ -121,88 +121,105 @@ No funders available
+ uk-grid uk-height-match="target: .data;">
- - -
-
-
- - - -
{{funder.openAccessPercentage}}%
+ + +
+ + + OpenAIRE placeholder logo +
-
- -
- - - OpenAIRE placeholder logo - -
- +
+
{{funder.alias}}
- -
- - {{funder.name}} - +
+
+ + {{funder.name}} + +
+
-
- -
- - - - OpenAIRE logo - Monitor Dashboard - - - - - OpenAIRE logo - Monitor Dashboard - - -
- +
+
+
- -
+
+ + + OpenAIRE logo + Monitor Dashboard + + + + OpenAIRE logo + Monitor Dashboard + + +
@@ -216,19 +233,22 @@ OpenAIRE placeholder logo
-
-
- - {{funder.name}} - - - - ({{funder.alias}}) - - -
-
- -
-
-
- - - -
{{funder.openAccessPercentage}}%
+
+ Date: Thu, 11 Apr 2024 16:34:50 +0300 Subject: [PATCH 5/7] [develop | DONE | CHANGED] update submodules --- explore/src/app/openaireLibrary | 2 +- explore/src/assets/openaire-theme | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 4f9f2f25..31e61d55 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 4f9f2f25057d4d0933f34488960b50286971b587 +Subproject commit 31e61d55a033197e23acdfe532578e398f1d1104 diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index 9171ec2a..886854fc 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 9171ec2a63d1fb53f239cfbff26f9b3a1ed9cc61 +Subproject commit 886854fcba4c9ed20630ae3ca8da3d2014442672 -- 2.17.1 From ccae7b03a5a03dee6194407442d28a82c5af3671 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 16 Apr 2024 12:41:13 +0300 Subject: [PATCH 6/7] [develop | DONE | CHANGED]: funders.component.ts: Added alt attribute on funders image and removed loading="lazy" | home.component.html: Updated header elements to make them as sequential as possible (SEO & PageSpeed). --- explore/src/app/funders/funders.component.html | 2 +- explore/src/app/home/home.component.html | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/explore/src/app/funders/funders.component.html b/explore/src/app/funders/funders.component.html index b00053cf..d45e11c3 100644 --- a/explore/src/app/funders/funders.component.html +++ b/explore/src/app/funders/funders.component.html @@ -62,7 +62,7 @@
- + Funders advertisement image
diff --git a/explore/src/app/home/home.component.html b/explore/src/app/home/home.component.html index cdb91938..be596575 100644 --- a/explore/src/app/home/home.component.html +++ b/explore/src/app/home/home.component.html @@ -81,7 +81,7 @@