@eeacms/volto-embed 9.0.6 → 9.1.0

package/CHANGELOG.md

@@ -4,6 +4,27 @@ 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).
 
+### [9.1.0](https://github.com/eea/volto-embed/compare/9.0.7...9.1.0) - 17 January 2024
+
+#### :rocket: New Features
+
+- feat: show embed error + always show sources [Razvan - [`105d620`](https://github.com/eea/volto-embed/commit/105d6207b244df85eea6d6b9b3bd8e03da0a439b)]
+
+#### :hammer_and_wrench: Others
+
+- Release 9.1.0 [Alin Voinea - [`b9921a5`](https://github.com/eea/volto-embed/commit/b9921a52564c7a1ca5664ca26d10f429c32f0e71)]
+- fix tests [Razvan - [`5c75f20`](https://github.com/eea/volto-embed/commit/5c75f20483de681ff5c8dd39e7f0016771dc4472)]
+### [9.0.7](https://github.com/eea/volto-embed/compare/9.0.6...9.0.7) - 16 January 2024
+
+#### :hammer_and_wrench: Others
+
+- include useeffect dep [andreiggr - [`1c967fa`](https://github.com/eea/volto-embed/commit/1c967faea495f1fea9427a2ce92b6755574dd7fa)]
+- screenshot internal/external url [andreiggr - [`62f2e04`](https://github.com/eea/volto-embed/commit/62f2e04023de461bb83cf5d5f5868146a329e022)]
+- add snapshot [andreiggr - [`dbf1ebc`](https://github.com/eea/volto-embed/commit/dbf1ebc629448f75f2e48cc190742b4b6a00bcd7)]
+- tests update2 [andreiggr - [`1c3c656`](https://github.com/eea/volto-embed/commit/1c3c656ae0868bccf9dac6984d550cd9ab7835b2)]
+- tests update [andreiggr - [`c2483e1`](https://github.com/eea/volto-embed/commit/c2483e1fd2e788f5d990c5a0791beb43dd8ef4cf)]
+- clean console [andreiggr - [`a2da2be`](https://github.com/eea/volto-embed/commit/a2da2beb10ebb00ab257f5992a75c2fedce0f094)]
+- set publicUrl in tests [andreiggr - [`fb9e209`](https://github.com/eea/volto-embed/commit/fb9e209c67745c7053f8f08efe5d4f77d66721a8)]
 ### [9.0.6](https://github.com/eea/volto-embed/compare/9.0.5...9.0.6) - 10 January 2024
 
 #### :rocket: New Features

package/package.json

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

package/src/Blocks/EmbedMaps/View.jsx

@@ -65,7 +65,6 @@ function View(props) {
     parameters,
     useVisibilitySensor = true,
     with_notes = true,
-    with_sources = true,
     with_more_info = true,
     with_share = true,
     with_enlarge = true,
@@ -92,7 +91,7 @@ function View(props) {
 
   useEffect(() => {
     const mapsId = maps['@id'] ? flattenToAppURL(maps['@id']) : undefined;
-    if (url && url !== mapsId) {
+    if (mode === 'edit' && !maps.error && url && url !== mapsId) {
       getContent(url, null, id);
     }
   }, [id, getContent, mode, url, maps]);
@@ -101,6 +100,10 @@ function View(props) {
     return <Message>Please select a map from block editor.</Message>;
   }
 
+  if (maps?.error) {
+    return <p dangerouslySetInnerHTML={{ __html: maps.error }} />;
+  }
+
   if (!maps) {
     return null;
   }
@@ -114,7 +117,7 @@ function View(props) {
           parameters: queryParams,
           height: height || maps.height,
           with_notes,
-          with_sources,
+          with_sources: true,
           with_more_info,
           with_share,
           with_enlarge,

package/src/Blocks/EmbedMaps/schema.js

@@ -39,13 +39,7 @@ export default (props) => {
       {
         id: 'toolbar',
         title: 'Toolbar',
-        fields: [
-          'with_notes',
-          'with_sources',
-          'with_more_info',
-          'with_share',
-          'with_enlarge',
-        ],
+        fields: ['with_notes', 'with_more_info', 'with_share', 'with_enlarge'],
       },
       {
         id: 'parameters',

package/src/Blocks/Maps/View.test.js

@@ -9,6 +9,11 @@ import installEmbedMaps from '.';
 
 installEmbedMaps(config);
 
+config.settings = {
+  ...config.settings,
+  publicURL: 'https://www.eea.europa.eu/',
+};
+
 config.blocks.blocksConfig = {
   ...config.blocks.blocksConfig,
   maps: {

package/src/PrivacyProtection/PrivacyProtection.jsx

@@ -15,7 +15,7 @@ import { serializeNodes } from '@plone/volto-slate/editor/render';
 import { defineMessages, injectIntl } from 'react-intl';
 import { toast } from 'react-toastify';
 import config from '@plone/volto/registry';
-import { getBaseUrl } from '@plone/volto/helpers';
+import { getBaseUrl, toPublicURL, isInternalURL } from '@plone/volto/helpers';
 import { Toast } from '@plone/volto/components';
 import {
   getConnectedDataParametersForContext,
@@ -136,6 +136,8 @@ const PrivacyProtection = (props) => {
     [checkExistance],
   );
 
+  const urlToScreenshot = isInternalURL(url) ? toPublicURL(url) : url;
+
   //screenshot api
   React.useEffect(() => {
     if (enabled && !bgImg && !show && url) {
@@ -143,8 +145,8 @@ const PrivacyProtection = (props) => {
         `${getBaseUrl(
           '',
         )}/cors-proxy/https://screenshot.eea.europa.eu/api/v1/retrieve_image_for_url?url=${encodeURIComponent(
-          url,
-        )}&w=1920&waitfor=4000`,
+          urlToScreenshot,
+        )}&w=1920&h=1000&waitfor=4000`,
       )
         .then((e) => e.blob())
         .then((blob) => {
@@ -166,7 +168,17 @@ const PrivacyProtection = (props) => {
           }
         });
     }
-  }, [enabled, url, path, dispatch, bgImg, show, intl, editable]);
+  }, [
+    enabled,
+    url,
+    path,
+    dispatch,
+    bgImg,
+    show,
+    intl,
+    editable,
+    urlToScreenshot,
+  ]);
 
   return (
     <VisibilitySensor

package/src/Views/MapView.test.js

@@ -5,6 +5,11 @@ import config from '@plone/volto/registry';
 
 import MapView from './MapView';
 
+config.settings = {
+  ...config.settings,
+  publicURL: 'https://www.eea.europa.eu/',
+};
+
 config.blocks.blocksConfig = {
   ...config.blocks.blocksConfig,
   maps: {