From 4a9ea35d0717941e9d96a29e46dc85717140fccf Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Wed, 16 Mar 2022 11:42:00 +0200 Subject: [PATCH 1/5] Add Sonarqube tag using eea-website-frontend addons list --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 66a87e6..b62a321 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { environment { GIT_NAME = "volto-statistic-block" NAMESPACE = "@eeacms" - SONARQUBE_TAGS = "volto.eea.europa.eu" + SONARQUBE_TAGS = "volto.eea.europa.eu,demo-www.eea.europa.eu" DEPENDENCIES = "" } From 0a00fcc32ba0f4c3f92cdf55c35b0eb63e088eec Mon Sep 17 00:00:00 2001 From: valentinab25 Date: Tue, 12 Apr 2022 20:51:59 +0300 Subject: [PATCH 2/5] [JENKINS] Use NodeJS 16 for sonarqube - Refs #111286 --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b62a321..2207d7a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -184,10 +184,10 @@ pipeline { unstash "xunit-reports" unstash "cypress-coverage" def scannerHome = tool 'SonarQubeScanner'; - def nodeJS = tool 'NodeJS11'; + def nodeJS = tool 'NodeJS'; withSonarQubeEnv('Sonarqube') { sh '''sed -i "s#/opt/frontend/my-volto-project/src/addons/${GIT_NAME}/##g" xunit-reports/coverage/lcov.info''' - sh "export PATH=$PATH:${scannerHome}/bin:${nodeJS}/bin; sonar-scanner -Dsonar.javascript.lcov.reportPaths=./xunit-reports/coverage/lcov.info,./cypress-coverage/coverage/lcov.info -Dsonar.sources=./src -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER" + sh "export PATH=${scannerHome}/bin:${nodeJS}/bin:$PATH; sonar-scanner -Dsonar.javascript.lcov.reportPaths=./xunit-reports/coverage/lcov.info,./cypress-coverage/coverage/lcov.info -Dsonar.sources=./src -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER" sh '''try=2; while [ \$try -gt 0 ]; do curl -s -XPOST -u "${SONAR_AUTH_TOKEN}:" "${SONAR_HOST_URL}api/project_tags/set?project=${GIT_NAME}-${BRANCH_NAME}&tags=${SONARQUBE_TAGS},${BRANCH_NAME}" > set_tags_result; if [ \$(grep -ic error set_tags_result ) -eq 0 ]; then try=0; else cat set_tags_result; echo "... Will retry"; sleep 60; try=\$(( \$try - 1 )); fi; done''' } } From a3daf0ad63666d0cd87eef465f42f525a5a307bc Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Mon, 6 Jun 2022 19:26:23 +0300 Subject: [PATCH 3/5] Remove useless from block title --- src/StatisticBlock/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/StatisticBlock/index.js b/src/StatisticBlock/index.js index bb5d897..032bf79 100644 --- a/src/StatisticBlock/index.js +++ b/src/StatisticBlock/index.js @@ -5,7 +5,7 @@ import StatisticBlockView from './View'; export default (config) => { config.blocks.blocksConfig.statistic_block = { id: 'statistic_block', - title: 'Statistic block', + title: 'Statistic', icon: worldSVG, group: 'text', view: StatisticBlockView, From 431851212b3091c4a84854ce060116d26322d7c4 Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Mon, 6 Jun 2022 19:46:57 +0300 Subject: [PATCH 4/5] fix(statistic_block): BlockChooser Icon --- src/StatisticBlock/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/StatisticBlock/index.js b/src/StatisticBlock/index.js index 032bf79..6fad8f2 100644 --- a/src/StatisticBlock/index.js +++ b/src/StatisticBlock/index.js @@ -1,4 +1,4 @@ -import worldSVG from '@plone/volto/icons/world.svg'; +import iconSVG from '@plone/volto/icons/special-character.svg'; import StatisticBlockEdit from './Edit'; import StatisticBlockView from './View'; @@ -6,7 +6,7 @@ export default (config) => { config.blocks.blocksConfig.statistic_block = { id: 'statistic_block', title: 'Statistic', - icon: worldSVG, + icon: iconSVG, group: 'text', view: StatisticBlockView, edit: StatisticBlockEdit, From 8bc35af44182ff40ba65ad4ae68ca34c2ffb83bf Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Wed, 8 Jun 2022 09:08:22 +0000 Subject: [PATCH 5/5] Automated release 0.1.2 --- CHANGELOG.md | 9 ++++++++- package.json | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 435d59f..8d941a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [0.1.2](https://github.com/eea/volto-statistic-block/compare/0.1.1...0.1.2) + +- fix(statistic_block): BlockChooser Icon [`4318512`](https://github.com/eea/volto-statistic-block/commit/431851212b3091c4a84854ce060116d26322d7c4) +- Remove useless from block title [`a3daf0a`](https://github.com/eea/volto-statistic-block/commit/a3daf0ad63666d0cd87eef465f42f525a5a307bc) + #### [0.1.1](https://github.com/eea/volto-statistic-block/compare/0.1.0...0.1.1) -- add statistic block [`df367cb`](https://github.com/eea/volto-statistic-block/commit/df367cbf7912d99ae7fbd0c5f20f1c9f590d1512) +> 10 March 2022 + +- add statistic block [`#1`](https://github.com/eea/volto-statistic-block/pull/1) - Update README.md [`2ecde42`](https://github.com/eea/volto-statistic-block/commit/2ecde424229d79e12d2c91223d56117255f33cfc) - Fix package.json [`91bb2e8`](https://github.com/eea/volto-statistic-block/commit/91bb2e8a0ad0d3bd99165751f319bceb99e181e0) diff --git a/package.json b/package.json index ac2b5de..84014b8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-statistic-block", - "version": "0.1.1", + "version": "0.1.2", "description": "@eeacms/volto-statistic-block: Volto add-on", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team",