@eeacms/volto-embed 4.0.1 → 4.0.2

package/CHANGELOG.md

@@ -4,8 +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).
 
+#### [4.0.2](https://github.com/eea/volto-embed/compare/4.0.1...4.0.2)
+
+- Fix destructure of undefined [`a15b86f`](https://github.com/eea/volto-embed/commit/a15b86f71f4a5ccf3a37b7a8b98683d669c18d14)
+- Backward compatibility [`68abd0e`](https://github.com/eea/volto-embed/commit/68abd0eea6635f104b4668edc1fba33a9322f71b)
+
 #### [4.0.1](https://github.com/eea/volto-embed/compare/4.0.0...4.0.1)
 
+> 29 April 2022
+
+- Release: fix and use `getfilteredUrl` method from datablocks [`#23`](https://github.com/eea/volto-embed/pull/23)
 - 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)

package/Jenkinsfile

@@ -6,6 +6,7 @@ pipeline {
         NAMESPACE = "@eeacms"
         SONARQUBE_TAGS = "volto.eea.europa.eu,climate-energy.eea.europa.eu,forest.eea.europa.eu,water.europa.eu-freshwater"
         DEPENDENCIES = "volto-slate"
+        VOLTO = "alpha"
     }
 
   stages {
@@ -124,8 +125,8 @@ pipeline {
             node(label: 'docker') {
               script {
                 try {
-                  sh '''docker pull plone; docker run -d --rm --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="profile-plone.restapi:blocks" plone fg'''
-                  sh '''docker pull plone/volto-addon-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" plone/volto-addon-ci cypress'''
+                  sh '''docker pull eeacms/plone-backend; docker run -d --rm --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="eea.kitkat:testing" eeacms/plone-backend'''
+                  sh '''docker pull plone/volto-addon-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" -e NODE_ENV=development -e VOLTO="$VOLTO" plone/volto-addon-ci cypress'''
                 } finally {
                   try {
                     sh '''rm -rf cypress-reports cypress-results cypress-coverage'''

package/cypress/support/index.js

@@ -27,7 +27,7 @@ coverage-end */
 export const setupBeforeEach = () => {
   cy.autologin();
   cy.createContent({
-    contentType: 'Folder',
+    contentType: 'Document',
     contentId: 'cypress',
     contentTitle: 'Cypress',
   });

package/cypress.json

@@ -1,12 +1,17 @@
 {
   "baseUrl": "http://localhost:3000",
   "viewportWidth": 1280,
-  "defaultCommandTimeout": 15000,
+  "defaultCommandTimeout": 8888,
   "reporter": "junit",
   "video": true,
   "reporterOptions": {
     "mochaFile": "cypress/reports/cypress-[hash].xml",
     "jenkinsMode": true,
     "toConsole": true
+  },
+  "chromeWebSecurity": false,
+  "retries": {
+    "runMode": 8,
+    "openMode": 0
   }
 }

package/package.json

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

package/src/Iframe/EditIframe.jsx

@@ -4,6 +4,7 @@
  */
 
 import React, { Component } from 'react';
+import { isString } from 'lodash';
 import PropTypes from 'prop-types';
 import { Button, Input, Message } from 'semantic-ui-react';
 import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
@@ -87,6 +88,32 @@ class Edit extends Component {
     this.onKeyDownVariantMenuForm = this.onKeyDownVariantMenuForm.bind(this);
   }
 
+  /**
+   * Backward compatibility
+   * @method componentDidMount
+   * @returns {undefined}
+   */
+  componentDidMount() {
+    const { privacy_statement } = this.props.data.dataprotection || {};
+    if (isString(privacy_statement)) {
+      this.props.onChangeBlock(this.props.block, {
+        ...this.props.data,
+        dataprotection: {
+          ...(this.props.data.dataprotection || {}),
+          privacy_statement: [
+            {
+              children: [
+                {
+                  text: privacy_statement,
+                },
+              ],
+            },
+          ],
+        },
+      });
+    }
+  }
+
   /**
    * Change url handler
    * @method onChangeUrl