@eeacms/volto-embed 4.0.0 → 4.0.1

package/CHANGELOG.md

@@ -4,8 +4,18 @@ 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).
 
-#### [4.0.0](https://github.com/eea/volto-embed/compare/3.0.1...4.0.0)
+#### [4.0.1](https://github.com/eea/volto-embed/compare/4.0.0...4.0.1)
 
+- dedupe getFiltered method, use from datablocks [`7f7b1b5`](https://github.com/eea/volto-embed/commit/7f7b1b51b280edc856e19d6b02a37f3f8894bd04)
+- fix regex [`1dc059f`](https://github.com/eea/volto-embed/commit/1dc059fa58f7a1789e4b570d1631226b404fa805)
+- early return [`467e6fc`](https://github.com/eea/volto-embed/commit/467e6fc2c053d2e17526ad6fb4cbf34c2bb8abe1)
+- safari: don't use lookbehind [`a4e4ece`](https://github.com/eea/volto-embed/commit/a4e4ece2891a5e2bcbf7f47a4345d0adca5258e6)
+
+### [4.0.0](https://github.com/eea/volto-embed/compare/3.0.1...4.0.0)
+
+> 5 April 2022
+
+- Breaking. Volto 15.x compatibility [`#22`](https://github.com/eea/volto-embed/pull/22)
 - Prettier [`fffa1c9`](https://github.com/eea/volto-embed/commit/fffa1c9f42c9dacc7de1fed730e0a4494c04d2f8)
 - Prettier [`f9ca05d`](https://github.com/eea/volto-embed/commit/f9ca05d3c55d204080f8769bd7d556b4d8f0ce21)
 - Breaking changes. Bumped to version 4.0.0 [`eb78abf`](https://github.com/eea/volto-embed/commit/eb78abf98103ee8831814b3df4c441279c586da2)

package/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'''
             }
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-embed",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Embed external content",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/PrivacyProtection/PrivacyProtection.jsx

@@ -13,7 +13,10 @@ import { toast } from 'react-toastify';
 import config from '@plone/volto/registry';
 import { getBaseUrl } from '@plone/volto/helpers';
 import { Toast } from '@plone/volto/components';
-import { getConnectedDataParametersForContext } from '@eeacms/volto-datablocks/helpers';
+import {
+  getConnectedDataParametersForContext,
+  getFilteredURL,
+} from '@eeacms/volto-datablocks/helpers';
 
 import { createImageUrl } from './helpers';
 import { ProtectionSchema } from './schema';
@@ -69,27 +72,6 @@ const CookieWatcher = (domain_key, cookies, pollingRate = 250) => {
   return exist;
 };
 
-const getFilteredURL = (url, connected_data_parameters = []) => {
-  if (!connected_data_parameters?.length) return url;
-  let decodedURL = decodeURIComponent(url);
-  const queries = decodedURL.match(/(?<=(<<))(.*?)(?=(>>))/g);
-  if (!queries?.length) return url;
-  const keys = connected_data_parameters.map((param) => param.i);
-  for (let poz in queries) {
-    const key = queries[poz];
-    const paramPoz = keys.indexOf(key);
-    if (paramPoz > -1) {
-      decodedURL = decodedURL.replace(
-        `<<${key}>>`,
-        connected_data_parameters[paramPoz].v[0],
-      );
-
-      continue;
-    }
-  }
-  return decodedURL;
-};
-
 const PrivacyProtection = (props) => {
   const { children, data = {}, id, editable, intl, path, cookies } = props;
   const {