Merge pull request #14 from eea/develop

Release

CHANGELOG.md

@@ -4,12 +4,29 @@ 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.3.1](https://github.com/eea/volto-widget-dataprovenance/compare/0.3.0...0.3.1) - 9 June 2023
+
+#### :bug: Bug Fixes
+
+- fix: move organization to content to fix alignment, in semantic desciption is different - refs #253472 [rexalex - [`1948fc1`](https://github.com/eea/volto-widget-dataprovenance/commit/1948fc18a117ff01333fd0b70a7e460717e02437)]
+
+#### :hammer_and_wrench: Others
+
+- test: Fix test config, coverage Refs #253277 [valentinab25 - [`6ec3f22`](https://github.com/eea/volto-widget-dataprovenance/commit/6ec3f222da9112c3a721d8a39ec5926400a06863)]
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`eed0083`](https://github.com/eea/volto-widget-dataprovenance/commit/eed0083cc0dd618028334874fbe00fcdef277b8f)]
+- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`7e058d0`](https://github.com/eea/volto-widget-dataprovenance/commit/7e058d06b1daaa142ecb82ffbc5c2969266e455e)]
 ### [0.3.0](https://github.com/eea/volto-widget-dataprovenance/compare/0.2.1...0.3.0) - 27 March 2023
 
 #### :hammer_and_wrench: Others
 
-- Release 0.3.0 [Alin Voinea - [`e675a58`](https://github.com/eea/volto-widget-dataprovenance/commit/e675a58591c0191ded39a8ca917273f3d19e341a)]
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`01854fa`](https://github.com/eea/volto-widget-dataprovenance/commit/01854fa55af7377ff97b8112f7c5688a70c92907)]
+- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`5c9e9cd`](https://github.com/eea/volto-widget-dataprovenance/commit/5c9e9cd9707b1c952bdf23dc16fae155241de2c1)]
+- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`c63f1bf`](https://github.com/eea/volto-widget-dataprovenance/commit/c63f1bf239245e6808ad30013569f4560b084608)]
+- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`6a23e8b`](https://github.com/eea/volto-widget-dataprovenance/commit/6a23e8bf3906c56b1cac91108c6288f6cbbc5583)]
 - test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`1ea5d6e`](https://github.com/eea/volto-widget-dataprovenance/commit/1ea5d6e33d8e541cfd26de0c91f186221bb15496)]
+- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`263717f`](https://github.com/eea/volto-widget-dataprovenance/commit/263717fd40985ec0ee74fa29ef0f1748435c2024)]
+- yarn 3 [Alin Voinea - [`9123df9`](https://github.com/eea/volto-widget-dataprovenance/commit/9123df9c7eb69d595e9786c456c01cd492983621)]
+- Add Sonarqube tag using demo-kitkat-frontend addons list [EEA Jenkins - [`78e2ba7`](https://github.com/eea/volto-widget-dataprovenance/commit/78e2ba79207d6705231c1c638ccbf81062ff8b92)]
 ### [0.2.1](https://github.com/eea/volto-widget-dataprovenance/compare/0.2.0...0.2.1) - 16 November 2022
 
 #### :house: Internal changes
@@ -26,6 +43,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - Prepare 0.2.0 release [Miu Razvan - [`38018d6`](https://github.com/eea/volto-widget-dataprovenance/commit/38018d6d9b9acd660a35706f22eb5be3ae53a16e)]
 - Update dependencies [Alin Voinea - [`683786f`](https://github.com/eea/volto-widget-dataprovenance/commit/683786f502d19ba83f62cf10c800f61b5fdaed3e)]
+- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`86ae1f1`](https://github.com/eea/volto-widget-dataprovenance/commit/86ae1f1ebe080dc851af85e4de1f33c51c3b643b)]
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`7b38f5f`](https://github.com/eea/volto-widget-dataprovenance/commit/7b38f5fa80a095b5c9529fd63a8cc09cbbf9067c)]
 ### [0.1.7](https://github.com/eea/volto-widget-dataprovenance/compare/0.1.6...0.1.7) - 15 September 2022
 
 #### :hammer_and_wrench: Others
@@ -41,10 +60,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - FIX CYPRESS [Dobricean Ioan Dorian - [`61002d4`](https://github.com/eea/volto-widget-dataprovenance/commit/61002d46536297cde9d3d19c1937e4a4e05209a2)]
 - FIX CYPRESS [Dobricean Ioan Dorian - [`bba26d8`](https://github.com/eea/volto-widget-dataprovenance/commit/bba26d88ea38288fd8d45431a2af56feef6cb718)]
 - FIX Jenkins test [Dobricean Ioan Dorian - [`2f94bdc`](https://github.com/eea/volto-widget-dataprovenance/commit/2f94bdcc5eeee4306e592e95d5869992e234d17e)]
+- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`e3cafb5`](https://github.com/eea/volto-widget-dataprovenance/commit/e3cafb546cd846364cdb9e65f60aa07ec03217a4)]
+- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`dcc61bb`](https://github.com/eea/volto-widget-dataprovenance/commit/dcc61bb61060a9d5227df46d21dfb591ad1a14cd)]
 ### [0.1.4](https://github.com/eea/volto-widget-dataprovenance/compare/0.1.3...0.1.4) - 30 June 2022
 
 #### :hammer_and_wrench: Others
 
+- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`c2e6cc8`](https://github.com/eea/volto-widget-dataprovenance/commit/c2e6cc8e1b1d33c59b57516e213d6d2c0bdcb794)]
 ### [0.1.3](https://github.com/eea/volto-widget-dataprovenance/compare/0.1.2...0.1.3) - 21 June 2022
 
 #### :hammer_and_wrench: Others
@@ -56,6 +78,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - fix organisations widget and title [nileshgulia1 - [`1921866`](https://github.com/eea/volto-widget-dataprovenance/commit/1921866f01a0c2543bb9cd34d42d7aa93c9675f4)]
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`0be7871`](https://github.com/eea/volto-widget-dataprovenance/commit/0be7871ec0b8dc8dbb328604aa0c59e92c116951)]
+- Add Sonarqube tag using forests-frontend addons list [EEA Jenkins - [`75a4bac`](https://github.com/eea/volto-widget-dataprovenance/commit/75a4baca82c4be52df0dfd8927a26ff2fcd868e2)]
+- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`ead018f`](https://github.com/eea/volto-widget-dataprovenance/commit/ead018fbae9cc80468e489199b8df1573b343394)]
 ### [0.1.1](https://github.com/eea/volto-widget-dataprovenance/compare/0.1.0...0.1.1) - 9 June 2022
 
 #### :bug: Bug Fixes
@@ -72,4 +97,5 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- yarn bootstrap [nileshgulia1 - [`93352f9`](https://github.com/eea/volto-widget-dataprovenance/commit/93352f99891aaef0da8b16c32328f0914c3f2e91)]
 - Initial commit [Nilesh - [`bdfc4d5`](https://github.com/eea/volto-widget-dataprovenance/commit/bdfc4d54dcd8673838e81c362e8872d4b7530643)]

Jenkinsfile

@@ -4,7 +4,7 @@ pipeline {
   environment {
         GIT_NAME = "volto-widget-dataprovenance"
         NAMESPACE = "@eeacms"
-        SONARQUBE_TAGS = "volto.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,forest.eea.europa.eu,demo-www.eea.europa.eu,circularity.eea.europa.eu,www.eea.europa.eu-ims,biodiversity.europa.eu,prod-www.eea.europa.eu,water.europa.eu-marine,demo-kitkat.dev2aws.eea.europa.eu,climate-adapt.eea.europa.eu,climate-energy.eea.europa.eu,climate-advisory-board.devel4cph.eea.europa.eu,climate-advisory-board.europa.eu,www.eea.europa.eu-en"
+        SONARQUBE_TAGS = "volto.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,forest.eea.europa.eu,demo-www.eea.europa.eu,www.eea.europa.eu-ims,biodiversity.europa.eu,water.europa.eu-marine,climate-adapt.eea.europa.eu,climate-energy.eea.europa.eu,climate-advisory-board.devel4cph.eea.europa.eu,climate-advisory-board.europa.eu,www.eea.europa.eu-en,industry.eea.europa.eu"
         DEPENDENCIES = ""
         VOLTO = ""
     }
@@ -188,6 +188,7 @@ pipeline {
             def nodeJS = tool 'NodeJS11';
             withSonarQubeEnv('Sonarqube') {
               sh '''sed -i "s#/opt/frontend/my-volto-project/src/addons/${GIT_NAME}/##g" xunit-reports/coverage/lcov.info'''
+              sh '''sed -i "s#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 '''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'''
             }

jest-addon.config.js

@@ -5,6 +5,7 @@ module.exports = {
     '!src/**/*.d.ts',
   ],
   moduleNameMapper: {
+    '\\.(css|less|scss|sass)$': 'identity-obj-proxy',
     '@plone/volto/cypress': '<rootDir>/node_modules/@plone/volto/cypress',
     '@plone/volto/babel': '<rootDir>/node_modules/@plone/volto/babel',
     '@plone/volto/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
@@ -17,7 +18,6 @@ module.exports = {
     '~/(.*)$': '<rootDir>/src/$1',
     'load-volto-addons':
       '<rootDir>/node_modules/@plone/volto/jest-addons-loader.js',
-    '\\.(css|less|scss|sass)$': 'identity-obj-proxy',
   },
   transform: {
     '^.+\\.js(x)?$': 'babel-jest',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-widget-dataprovenance",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "@eeacms/volto-widget-dataprovenance: Volto Data Provenance add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

src/components/theme/Widgets/DataProvenanceView.jsx

@@ -14,10 +14,8 @@ const DataProvenanceWidgetView = ({ value, className }) =>
             ) : (
               item.title
             )}
+            {item.organisation ? `, ${item.organisation}` : null}
           </List.Content>
-          {item.organisation && (
-            <List.Description>{', ' + item.organisation}</List.Description>
-          )}
         </List.Item>
       ))}
     </List>