From dd5ede27941a872804930b9eff7be565433bade1 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 21 Aug 2023 13:59:20 +0300 Subject: [PATCH 1/7] [Library & common-assets | develop]: Minor updates in mobile screens in icons/ paddings in landing pages. 1. resultLanding.component.html & project.component.html & dataProvider.component.html & organization.component.html: In mobile (small) screens, change ratio of icons in bottom action bar from 2 to 1.4. 2. showIdentifiers.component.ts: In mobile (small) screens, added in fs-modal classTitle="uk-tile-default uk-border-bottom". 3. landing.less: Added variable @landing-action-bar-mobile-border: @global-border; to use it in border-top of landing-action-bar-mobile > div | Changed padding of landing-action-bar-mobile > div to 8px in top and bottom. --- 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 a53c4e90..587297a1 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit a53c4e90d099d0bf3919df55edceaf7f793427d0 +Subproject commit 587297a1c8792aae49153e9c330d21822e174244 From e56c3d82e4359dbd7ac1ccd0b14f6401bd2cf6a1 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 24 Aug 2023 18:20:49 +0300 Subject: [PATCH 2/7] [Library | develop]: alert.ts & full-screen-modal.component.ts: Updated (h6 from h4 or h5) header font size and ratio of icons (make them smaller) - in angular 16 branch, paddings have also changed. --- 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 587297a1..13d04301 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 587297a1c8792aae49153e9c330d21822e174244 +Subproject commit 13d04301090b4ecb370510c2c788163a74b02778 diff --git a/explore/src/assets/common-assets b/explore/src/assets/common-assets index 2fd57843..d18e0a7e 160000 --- a/explore/src/assets/common-assets +++ b/explore/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 2fd57843f85125e54adfb95b35776755037ea359 +Subproject commit d18e0a7e43e5ab74649481ecbf352ba49893c66f diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index 5268f277..f5638b00 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 5268f277246347aad42349a06eecb915a452841b +Subproject commit f5638b009726c3004f7b973d804c045de438e337 From 93777a8079125f90d4cff53e23a01018a29781fa Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 24 Aug 2023 18:31:04 +0300 Subject: [PATCH 3/7] [Library | develop]: [Bug fix] landing-utils/fos.component.ts & fos/fos.component.ts & fos/fos.component.html: Added methods "buildFosQueryParam()" and "buildFosHrefParam()" to build and set in fos links, search param "fos" for production and "foslabel" for beta or dev environments. --- 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 13d04301..2e33c470 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 13d04301090b4ecb370510c2c788163a74b02778 +Subproject commit 2e33c470e9387428713e08e086a4e2408ad06dbc From 1fef8ce8e65695bc7a75dc17cc24abf26fe3c7bf Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 25 Aug 2023 15:56:53 +0300 Subject: [PATCH 4/7] [Library | develop]: resultLanding.component.html & project.component.html & organization.component.html & dataProvider.component.html: In main action bar for mobile (landing-action-bar-mobile), replaced uk-background-default with uk-tile-default uk-blur-background. --- 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 2e33c470..1b989441 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 2e33c470e9387428713e08e086a4e2408ad06dbc +Subproject commit 1b989441db0b1f808d1b626d3588901d54ffaf90 diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index f5638b00..2df4b377 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit f5638b009726c3004f7b973d804c045de438e337 +Subproject commit 2df4b377a3e89b7dd26a011a2e1e1f07fdcedf2a From 14c289b719ed7740e50e02d8e34efefa3180542e Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 30 Aug 2023 13:21:36 +0300 Subject: [PATCH 5/7] [Explore | develop]: server.ts: Added endpoint '/health-check' with basic information. --- explore/server.ts | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/explore/server.ts b/explore/server.ts index 574d87f5..e031ceef 100644 --- a/explore/server.ts +++ b/explore/server.ts @@ -56,7 +56,30 @@ export function app() { res.set('Content-Type', register.contentType); res.end(register.metrics()); }); - + + server.get('/health-check', async (_req, res, _next) => { + var uptime = process.uptime(); + const date = new Date(uptime*1000); + const days = date.getUTCDate() - 1, + hours = date.getUTCHours(), + minutes = date.getUTCMinutes(), + seconds = date.getUTCSeconds(), + milliseconds = date.getUTCMilliseconds(); + + + const healthcheck = { + uptime: days + " days, " + hours + " hours, " + minutes + " minutes, " + seconds + " seconds, " + milliseconds + " milliseconds", + message: 'OK', + timestamp: new Date() + }; + try { + res.send(healthcheck); + } catch (error) { + healthcheck.message = error; + res.status(503).send(); + } + }); + // All regular routes use the Universal engine server.get('*', (req, res) => { if (routes.indexOf(req.path) !== -1) { From 8690029fd02fd186c005d8d3841bab81db024f68 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 4 Sep 2023 15:45:07 +0300 Subject: [PATCH 6/7] [Library | develop]: searchFields.ts: In RESULT_REFINE_FIELDS, query "foslabel" (instead of fos) field in all environments. --- 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 1b989441..e6bdbb2c 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 1b989441db0b1f808d1b626d3588901d54ffaf90 +Subproject commit e6bdbb2c812715561ecf7a3a67f2e24bbaaf7f99 From 3cb7443a2e01711e5bfbb23ce17ab7e38a8a8fe2 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 6 Sep 2023 15:09:24 +0300 Subject: [PATCH 7/7] Updating openaireLibrary before release --- 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 e6bdbb2c..1a960061 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit e6bdbb2c812715561ecf7a3a67f2e24bbaaf7f99 +Subproject commit 1a960061b6674a7f62fb5cfbac3286fb57907f34