@eeacms/volto-embed 2.0.6 → 2.0.10

package/CHANGELOG.md

@@ -4,8 +4,41 @@ 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).
 
+#### [2.0.10](https://github.com/eea/volto-embed/compare/2.0.9...2.0.10)
+
+- improve arcgis map view [`#14`](https://github.com/eea/volto-embed/pull/14)
+- no hardcoded text [`4001bb4`](https://github.com/eea/volto-embed/commit/4001bb414df05c1516f95e4dcec4a328406dc63f)
+- fix [`a41ca9a`](https://github.com/eea/volto-embed/commit/a41ca9a2795a59f2633fb97938244e335dca8c43)
+- Update package.json [`a95b014`](https://github.com/eea/volto-embed/commit/a95b014a26651e11224b2f6531add7a599812d2a)
+
+#### [2.0.9](https://github.com/eea/volto-embed/compare/2.0.8...2.0.9)
+
+> 11 November 2021
+
+- Update package.json [`#13`](https://github.com/eea/volto-embed/pull/13)
+
+#### [2.0.8](https://github.com/eea/volto-embed/compare/2.0.7...2.0.8)
+
+> 28 October 2021
+
+- Develop [`#12`](https://github.com/eea/volto-embed/pull/12)
+- Style [`#11`](https://github.com/eea/volto-embed/pull/11)
+- encode url to have the right country screenshot [`#9`](https://github.com/eea/volto-embed/pull/9)
+- correctly center center page [`cb47367`](https://github.com/eea/volto-embed/commit/cb47367aa3a4ab87c5e0bacde93d7cc27fca7723)
+- style [`878f9ad`](https://github.com/eea/volto-embed/commit/878f9adadc4cee17cd63a89144d3d702222cf08a)
+- style privacy div in center of map [`cf05b57`](https://github.com/eea/volto-embed/commit/cf05b570fc5ffbcc79e3c75587fe4ce46c75fe15)
+
+#### [2.0.7](https://github.com/eea/volto-embed/compare/2.0.6...2.0.7)
+
+> 13 October 2021
+
+- Develop sync [`#10`](https://github.com/eea/volto-embed/pull/10)
+
 #### [2.0.6](https://github.com/eea/volto-embed/compare/2.0.5...2.0.6)
 
+> 12 October 2021
+
+- `waitforselector` attribute while querying factsheet pages in screenshot api [`#8`](https://github.com/eea/volto-embed/pull/8)
 - decreased wait time [`0686e19`](https://github.com/eea/volto-embed/commit/0686e19518dfb8e53a64300badb13887575b031a)
 - more specific selector [`9707bab`](https://github.com/eea/volto-embed/commit/9707bab87cad8bb98b9ff780b501e6b32882bddc)
 - add param to dep array [`6927395`](https://github.com/eea/volto-embed/commit/6927395bd8ee3535768d211895b503787de5a63e)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-embed",
-  "version": "2.0.6",
+  "version": "2.0.10",
   "description": "Embed external content",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -17,12 +17,12 @@
   "addons": [
     "@eeacms/volto-corsproxy",
     "@eeacms/volto-datablocks",
-    "volto-slate:asDefault"
+    "volto-slate"
   ],
   "dependencies": {
-    "volto-slate": "2.9.1",
+    "volto-slate": "4.2.1",
     "@eeacms/volto-datablocks": "*",
-    "@eeacms/volto-corsproxy": "2.1.2",
+    "@eeacms/volto-corsproxy": "*",
     "react-visibility-sensor": "5.1.1"
   },
   "devDependencies": {

package/src/PrivacyProtection/PrivacyProtection.jsx

@@ -17,6 +17,7 @@ import { createImageUrl } from './helpers';
 import { getBaseUrl } from '@plone/volto/helpers';
 import { Toast } from '@plone/volto/components';
 import { getConnectedDataParametersForContext } from '@eeacms/volto-datablocks/helpers';
+import { ProtectionSchema } from './schema';
 
 const messages = defineMessages({
   success: {
@@ -85,7 +86,9 @@ export default injectIntl(
     const [visible, setVisibility] = useState(false);
     const defaultShow = canShow(dataprotection.privacy_cookie_key);
     const [show, setShow] = useState(defaultShow);
-    const [remember, setRemember] = useState(defaultShow);
+    const [remember, setRemember] = useState(
+      cookieExist(dataprotection.privacy_cookie_key) ? defaultShow : true,
+    );
     const dispatch = useDispatch();
     const checkExistance = CookieWatcher(dataprotection.privacy_cookie_key);
     const queryParam = useSelector((state) => {
@@ -109,8 +112,8 @@ export default injectIntl(
 
     const styles = {
       height: `${height}px`,
+      position: 'relative',
     };
-
     React.useEffect(() => {
       if (bgImg) {
         setImage(createImageUrl(bgImg)); //create imageUrl from uploaded image
@@ -134,9 +137,9 @@ export default injectIntl(
         fetch(
           `${getBaseUrl(
             '',
-          )}/cors-proxy/https://screenshot.eea.europa.eu/api/v1/retrieve_image_for_url?url=${url}&w=1920&waitfor=4000${
-            param ? `&waitforselector=img[src*=${param}]` : ''
-          }`,
+          )}/cors-proxy/https://screenshot.eea.europa.eu/api/v1/retrieve_image_for_url?url=${encodeURIComponent(
+            url,
+          )}&w=1920&waitfor=4000`,
         )
           .then((e) => e.blob())
           .then((blob) => {
@@ -152,7 +155,7 @@ export default injectIntl(
             }
           });
       }
-    }, [enabled, url, path, param, dispatch, bgImg, show, intl, isEditMode]);
+    }, [enabled, url, path, dispatch, bgImg, show, intl, isEditMode]);
 
     return (
       <VisibilitySensor
@@ -179,17 +182,14 @@ export default injectIntl(
                     ? {
                         backgroundImage: `url(${image})`,
                         backgroundRepeat: 'no-repeat',
-                        backgroundPosition: 'center',
                         backgroundSize: 'cover',
+                        backgroundPosition: 'center -70px',
                       }
                     : {}
                 }
               >
                 <div className="overlay">
                   <div className="wrapped">
-                    <div className="privacy-statement">
-                      {serializeNodes(dataprotection.privacy_statement || [])}
-                    </div>
                     <div className="privacy-button">
                       <Button
                         primary
@@ -223,6 +223,13 @@ export default injectIntl(
                       {config.settings.ownDomain || '.eea.europa.eu'} that will
                       expire in {getExpDays()} days.
                     </p>
+                    <p className="discreet">
+                      {serializeNodes(
+                        dataprotection.privacy_statement ||
+                          ProtectionSchema().properties.privacy_statement
+                            .defaultValue,
+                      )}
+                    </p>
                   </div>
                 </div>
               </div>

package/src/PrivacyProtection/schema.js

@@ -20,6 +20,29 @@ export const ProtectionSchema = () => ({
       description: 'Defined in template. Change only if necessary',
       widget: 'slate_richtext',
       className: 'slate-Widget',
+      defaultValue: [
+        {
+          children: [
+            {
+              text:
+                'This map is hosted by a third party, Environmental Systems Research Institute. By showing the external content you accept the terms and conditions of ',
+            },
+            {
+              type: 'a',
+              url: 'https://www.esri.com',
+              children: [
+                {
+                  text: 'esri.com',
+                },
+              ],
+            },
+            {
+              text:
+                '. This includes their cookie policies, which we have no control over.',
+            },
+          ],
+        },
+      ],
     },
     privacy_cookie_key: {
       title: 'Privacy cookie key',

package/src/css/embed-styles.css

@@ -16,15 +16,21 @@
 }
 
 .wrapped {
+  position: absolute;
+  top: 50%;
+  left: 50%;
   width: 300px;
   padding: 1.4rem;
   margin: 0 auto;
   background: white;
   border-radius: 5px;
-  opacity: 0.6;
+  opacity: 0.8;
+  -ms-transform: translate(-50%, -50%);
+  transform: translate(-50%, -50%);
 }
 
-.discreet {
+.discreet,
+.discreet > p {
   color: grey;
   font-size: 14px;
 }