From 6297e9b12596eaaad9eaf06e638ec80be86153fe Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 26 Jun 2024 15:40:06 +0300 Subject: [PATCH 1/8] [develop]: Update release.sh --- release.sh | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/release.sh b/release.sh index 27c8843..84c23f6 100755 --- a/release.sh +++ b/release.sh @@ -1,4 +1,6 @@ -rm -f v*.zip +rm -f *.zip + +# Portal git clone https://code-repo.d4science.org/MaDgIK/irish-monitor.git cd irish-monitor git checkout master @@ -11,7 +13,27 @@ cd ../openaire-theme git checkout master cd ../../../ npm run after-build-clean -cd ../ version=$(npm pkg get version | xargs) -zip -r v$version.zip irish-monitor +cd ../ +zip -r irish-monitor-$version.zip irish-monitor rm -rf irish-monitor + +# Service +git clone https://code-repo.d4science.org/MaDgIK/irish-monitor-service.git +cd irish-monitor-service +git checkout production +rm -rf .git* +version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) +# Remove the '-SNAPSHOT' suffix +version=${version%-SNAPSHOT} +# Split the version string into major, minor, and patch components +IFS='.' read -r major minor patch < Date: Fri, 28 Jun 2024 11:51:59 +0300 Subject: [PATCH 2/8] [develop]: Update library and fix condition for divContents in app component. --- src/app/app.component.ts | 2 +- src/app/openaireLibrary | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index b3eb689..156ae3f 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -22,7 +22,7 @@ import {HelperService} from "./openaireLibrary/utils/helper/helper.service"; selector: 'app-root', template: `
-
+
Date: Tue, 2 Jul 2024 20:39:14 +0300 Subject: [PATCH 3/8] Update libraries --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index e463080..c97c542 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit e463080109aa00935370c61dce668174aa4800c4 +Subproject commit c97c54208f6cdcbdcc1f01939a6f13242b0b20c2 diff --git a/src/assets/common-assets b/src/assets/common-assets index c5ba870..ee1a55a 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit c5ba8700be5b8fcf98522fe167246281545d7985 +Subproject commit ee1a55a529fde844f54761633e59f3be791717e3 From 8e469436344ed22e81aaa735c2f39fca1053725a Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 15 Jul 2024 21:17:01 +0300 Subject: [PATCH 4/8] [develop]: Update libraries --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index c97c542..92f799e 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit c97c54208f6cdcbdcc1f01939a6f13242b0b20c2 +Subproject commit 92f799e63b8f2075278faf460852776e5fbe5704 diff --git a/src/assets/common-assets b/src/assets/common-assets index ee1a55a..6bc0212 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit ee1a55a529fde844f54761633e59f3be791717e3 +Subproject commit 6bc02125166daa907d39ff523cd635088bdb63c2 From 4677a7c5ddabb2d66b0e257a4458437fe271b0fc Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 23 Jul 2024 14:30:42 +0300 Subject: [PATCH 5/8] Updating openaireLibrary --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 92f799e..7bb45fe 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 92f799e63b8f2075278faf460852776e5fbe5704 +Subproject commit 7bb45fefa04f7dea80d7679b507030fb22ac7cba From 519abb2e6d551d0354a12958985f5a90ecc270e2 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 24 Jul 2024 15:18:12 +0300 Subject: [PATCH 6/8] [develop | DONE | CHANGED]: newSearchPage.component.html: Reordered buttons - moved compact results button before download button. --- angular.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/angular.json b/angular.json index b0baae0..402aff0 100644 --- a/angular.json +++ b/angular.json @@ -305,5 +305,8 @@ } } } + }, + "cli": { + "analytics": false } } From 9e4c68454011b95b9e557d2d15b93292d1bac12d Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 24 Jul 2024 15:21:13 +0300 Subject: [PATCH 7/8] [develop | DONE | FIXED]: Changed parameter in "setProperties()" method to set adminToolsCommunity properly with orcid id of the current researcher - problem in ORCID KPIs. --- src/app/researcher/researcher.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/researcher/researcher.component.ts b/src/app/researcher/researcher.component.ts index 8f7d1e7..4e280dc 100644 --- a/src/app/researcher/researcher.component.ts +++ b/src/app/researcher/researcher.component.ts @@ -124,7 +124,7 @@ export class ResearcherComponent extends ResearcherBaseComponent implements OnI ]); this.title = name; this.description = name; - this.setProperties(this.orcid, "researcher", this.configurationService); + this.setProperties(this.authorId, "researcher", this.configurationService); LinksResolver.resetProperties(); LinksResolver.setSearchAndResultLanding("researcher/" + this.authorId); this.setMetadata(); From 561cdfbc23ce8d50ae2637eedffa59bbcfbc5cd0 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 25 Jul 2024 10:54:25 +0300 Subject: [PATCH 8/8] [develop]: Align changes in indicator card with monitor. Update version and changelog --- CHANGELOG.md | 11 + package.json | 2 +- src/app/openaireLibrary | 2 +- src/app/shared/monitor/monitor.component.html | 220 ++++++++++-------- 4 files changed, 134 insertions(+), 101 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 627a10f..0f9fa6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - *Fixed (for any bug fixes)* - *Security (in case of vulnerabilities)* +## v1.0.1 - 25.07.2024 +### Fixed +Problem with ORCID KPIs regarding a researcher. +Reordered action buttons in a search page. +Fix import/export indicators tab title wasn't imported. +Fix the redirection URL after verification of a manager. + +### Changed +Extract a stakeholder in every field of a json in a chart. +Improvements regarding import/export indicators and editing an indicator. + ## v1.0.0 - 26.06.2024 - Official Release ### Added Add banner for announcements. Disabled by default. diff --git a/package.json b/package.json index 27fc01c..790949b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "irish-monitor", - "version": "1.0.0", + "version": "1.0.1", "scripts": { "ng": "ng", "start": "ng serve --port 5500 --disable-host-check --host 0.0.0.0", diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 7bb45fe..310f06b 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 7bb45fefa04f7dea80d7679b507030fb22ac7cba +Subproject commit 310f06b2348977c64825231fff79180f70fb404d diff --git a/src/app/shared/monitor/monitor.component.html b/src/app/shared/monitor/monitor.component.html index 99d5887..8f246db 100644 --- a/src/app/shared/monitor/monitor.component.html +++ b/src/app/shared/monitor/monitor.component.html @@ -4,7 +4,8 @@
- Clear All + Clear + All
@@ -21,23 +22,24 @@
- No {{entities.stakeholder}} yet. + No {{ entities.stakeholder }} yet.
-
+
-
{{number.title}}
+
{{ number.title }}
@@ -78,7 +81,7 @@
-
{{number.title}}
+
{{ number.title }}
@@ -87,7 +90,8 @@
{{indicator.name}}
+ class="uk-text-xsmall uk-text-truncate uk-margin-xsmall-bottom uk-margin-right">{{ indicator.name }} +
@@ -104,101 +108,118 @@
    -
  • - {{getSectionTitle(tab)}} + {{ getSectionTitle(tab) }}
-
-
{{getSectionTitle(chart)}}
-
{{getSectionDescription(chart)}}
-
{{getSectionTitle(chart)}}
- +
+
{{ getSectionTitle(chart) }}
+
{{ getSectionDescription(chart) }} +
+
{{ getSectionTitle(chart) }}
+
-
- {{indicator.name + " "}} -
- -
- + +
+
+ {{ indicator.name + " " }} +
+ +
+ +
+
- - - + + + -
-
- - - - Note - - - - - - Embed - - -
-
-
-
-
- -
-
-

- {{indicator.description}} -

-

- {{indicator.additionalDescription}} -

+
+ + + + Note + + + + + + Embed + + +
+
+
+
+
+ +
+
+

+ {{ indicator.description }} +

+

+ {{ indicator.additionalDescription }} +

+
-
-
-
-
- -
-
- 
<iframe width="500" height="500" 
 src="{{getActiveIndicatorPath(indicator).safeResourceUrl.changingThisBreaksApplicationSecurity}}"
 allowfullscreen="true" mozallowfullscreen="true">
</iframe>
-
-
- - - +
+
+
+ +
+
+ 
<iframe width="500" height="500" 
 src="{{ getActiveIndicatorPath(indicator).safeResourceUrl.changingThisBreaksApplicationSecurity }}
+                                                        "
 allowfullscreen="true" mozallowfullscreen="true">
</iframe>
+
+
+ + + +
@@ -206,7 +227,7 @@
- +
@@ -217,7 +238,7 @@ - {{countSelectedFilters()}} + {{ countSelectedFilters() }}
{{periodFilter.selectedFromAndToValues}} + class="uk-margin-small-right uk-width-expand uk-text-truncate">{{ periodFilter.selectedFromAndToValues }}