Merge pull request #37 from eea/develop

Release

CHANGELOG.md

@@ -4,6 +4,15 @@ 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).
 
+### [5.0.4](https://github.com/eea/volto-embed/compare/5.0.3...5.0.4) - 13 June 2023
+
+#### :hammer_and_wrench: Others
+
+- test: jest should look for addons in node_modules Refs #253277 [valentinab25 - [`43a3461`](https://github.com/eea/volto-embed/commit/43a34615c31e53da84d68afe8bb9312729e72b4d)]
+- test: Fix test config, coverage Refs #253277 [valentinab25 - [`2d7757a`](https://github.com/eea/volto-embed/commit/2d7757ad98ac23785851f564f1f7cd635e9ace0b)]
+- fix cypress [Dobricean Ioan Dorian - [`7620358`](https://github.com/eea/volto-embed/commit/762035851ca5bdad7b4522740895809ddea6337e)]
+- fix cypress [Dobricean Ioan Dorian - [`e13959e`](https://github.com/eea/volto-embed/commit/e13959e8a910f18682620479f0b069557896e794)]
+- check if url is undefined [Dobricean Ioan Dorian - [`0c50d92`](https://github.com/eea/volto-embed/commit/0c50d920feb3fb69278dbaf2f1a06b0c85121077)]
 ### [5.0.3](https://github.com/eea/volto-embed/compare/5.0.2...5.0.3) - 29 May 2023
 
 #### :hammer_and_wrench: Others

Jenkinsfile

@@ -188,6 +188,7 @@ pipeline {
             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 '''sed -i "s#src/addons/${GIT_NAME}/##g" xunit-reports/coverage/lcov.info'''
               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'''
             }

jest-addon.config.js

@@ -5,19 +5,19 @@ 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',
     '@package/(.*)$': '<rootDir>/src/$1',
     '@root/(.*)$': '<rootDir>/src/$1',
     '@plone/volto-quanta/(.*)$': '<rootDir>/src/addons/volto-quanta/src/$1',
-    '@eeacms/(.*?)/(.*)$': '<rootDir>/src/addons/$1/src/$2',
+    '@eeacms/(.*?)/(.*)$': '<rootDir>/node_modules/@eeacms/$1/src/$2',
     '@plone/volto-slate':
       '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src',
     '~/(.*)$': '<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-embed",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "description": "Embed external content",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

src/PrivacyProtection/PrivacyProtection.jsx

@@ -129,7 +129,7 @@ const PrivacyProtection = (props) => {
 
   //screenshot api
   React.useEffect(() => {
-    if (enabled && !bgImg && !show) {
+    if (enabled && !bgImg && !show && url) {
       fetch(
         `${getBaseUrl(
           '',