@eeacms/volto-embed 2.0.9 → 2.0.10

package/CHANGELOG.md

@@ -4,10 +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).
 
+#### [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)
 
-- Update package.json [`6e7344d`](https://github.com/eea/volto-embed/commit/6e7344d2bb9ce89de68cd4d1044a665814ad3b54)
-- Update package.json [`e618b5d`](https://github.com/eea/volto-embed/commit/e618b5db3f564f67563c0b7cd9aa5a3200ae1734)
+> 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)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-embed",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "description": "Embed external content",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -20,7 +20,7 @@
     "volto-slate"
   ],
   "dependencies": {
-    "volto-slate": "*",
+    "volto-slate": "4.2.1",
     "@eeacms/volto-datablocks": "*",
     "@eeacms/volto-corsproxy": "*",
     "react-visibility-sensor": "5.1.1"

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) => {
@@ -111,7 +114,6 @@ export default injectIntl(
       height: `${height}px`,
       position: 'relative',
     };
-
     React.useEffect(() => {
       if (bgImg) {
         setImage(createImageUrl(bgImg)); //create imageUrl from uploaded image
@@ -180,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
@@ -224,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

@@ -24,12 +24,13 @@
   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;
 }