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/angular.json b/angular.json index b0baae0..402aff0 100644 --- a/angular.json +++ b/angular.json @@ -305,5 +305,8 @@ } } } + }, + "cli": { + "analytics": false } } 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/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 < -
+
- 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 }} diff --git a/src/assets/common-assets b/src/assets/common-assets index 5026b8b..014adfe 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 5026b8b38fcae493ec7bcdc272bf167798c18fa3 +Subproject commit 014adfe4588975e499c72b284ce7368fc2cb5d14