From f66223569bfd9e623bddbf043aeabcc9394eb049 Mon Sep 17 00:00:00 2001
From: nileshgulia1 <nileshgulia@gmail.com>
Date: Tue, 17 Aug 2021 12:51:58 +0530
Subject: [PATCH 01/10] use slate editor in privacy_statement

---
 src/PrivacyProtection/PrivacyProtection.jsx | 10 ++++------
 src/PrivacyProtection/schema.js             |  4 +---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/PrivacyProtection/PrivacyProtection.jsx b/src/PrivacyProtection/PrivacyProtection.jsx
index 4ea1bd0..33b80c4 100644
--- a/src/PrivacyProtection/PrivacyProtection.jsx
+++ b/src/PrivacyProtection/PrivacyProtection.jsx
@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 import VisibilitySensor from 'react-visibility-sensor';
 import { Placeholder, Dimmer, Loader } from 'semantic-ui-react';
 import cookie from 'react-cookie';
+import { serializeNodes } from 'volto-slate/editor/render';
 import { Button, Checkbox } from 'semantic-ui-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import { useDispatch } from 'react-redux';
@@ -120,12 +121,9 @@ export default injectIntl(
               >
                 <div className="overlay">
                   <div className="wrapped">
-                    <div
-                      className="privacy-statement"
-                      dangerouslySetInnerHTML={{
-                        __html: dataprotection.privacy_statement,
-                      }}
-                    />
+                    <div className="privacy-statement">
+                      {serializeNodes(dataprotection.privacy_statement || [])}
+                    </div>
                     <div className="privacy-button">
                       <Button
                         primary
diff --git a/src/PrivacyProtection/schema.js b/src/PrivacyProtection/schema.js
index fe525ae..6adb8c6 100644
--- a/src/PrivacyProtection/schema.js
+++ b/src/PrivacyProtection/schema.js
@@ -1,5 +1,3 @@
-import config from '@plone/volto/registry';
-
 export const ProtectionSchema = () => ({
   title: 'Data Protection',
 
@@ -20,7 +18,7 @@ export const ProtectionSchema = () => ({
     privacy_statement: {
       title: 'Privacy statement',
       description: 'Short notification text',
-      widget: config.settings.defaultBlockType, // TODO: is it really applied?
+      widget: 'slate_richtext',
     },
     privacy_cookie_key: {
       title: 'Privacy cookie key',

From 7ce9ab716ab067974f56435d557ee57a30f9a5b7 Mon Sep 17 00:00:00 2001
From: nileshgulia1 <nileshgulia@gmail.com>
Date: Wed, 18 Aug 2021 15:02:34 +0530
Subject: [PATCH 02/10] custom style to slateWidget toolbar

---
 src/PrivacyProtection/schema.js | 1 +
 src/css/embed-styles.css        | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/PrivacyProtection/schema.js b/src/PrivacyProtection/schema.js
index 6adb8c6..1e18b9c 100644
--- a/src/PrivacyProtection/schema.js
+++ b/src/PrivacyProtection/schema.js
@@ -19,6 +19,7 @@ export const ProtectionSchema = () => ({
       title: 'Privacy statement',
       description: 'Short notification text',
       widget: 'slate_richtext',
+      className: 'slate-Widget',
     },
     privacy_cookie_key: {
       title: 'Privacy cookie key',
diff --git a/src/css/embed-styles.css b/src/css/embed-styles.css
index 8c75347..20a109f 100644
--- a/src/css/embed-styles.css
+++ b/src/css/embed-styles.css
@@ -34,3 +34,7 @@
   padding: 2rem;
   background-color: rgba(0, 0, 0, 0.35);
 }
+
+.slate-Widget {
+  left: 855px !important;
+}

From eb130b917d4186cde1dfb49ceb5eed8665ff2e5a Mon Sep 17 00:00:00 2001
From: nileshgulia1 <nileshgulia@gmail.com>
Date: Wed, 18 Aug 2021 15:26:44 +0530
Subject: [PATCH 03/10] pass block id correctly

---
 src/PrivacyProtection/PrivacyProtection.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PrivacyProtection/PrivacyProtection.jsx b/src/PrivacyProtection/PrivacyProtection.jsx
index 33b80c4..9f84a83 100644
--- a/src/PrivacyProtection/PrivacyProtection.jsx
+++ b/src/PrivacyProtection/PrivacyProtection.jsx
@@ -46,7 +46,7 @@ function canShow(domain_key) {
 }
 
 export default injectIntl(
-  ({ children, data = {}, block, isEditMode, intl, path, ...rest }) => {
+  ({ children, data = {}, id, isEditMode, intl, path, ...rest }) => {
     const { dataprotection = {} } = data;
     const { background_image: bgImg, enabled = false } = dataprotection;
     const [image, setImage] = React.useState(null);
@@ -143,7 +143,7 @@ export default injectIntl(
                         <Checkbox
                           toggle
                           label="Remember my choice"
-                          id={`remember-choice-${block}`}
+                          id={`remember-choice-${id}`}
                           onChange={(ev, { checked }) => {
                             setRemember(checked);
                           }}

From 45b9e56b9ced541d174966b2b7d6639237fd6251 Mon Sep 17 00:00:00 2001
From: nileshgulia1 <nileshgulia@gmail.com>
Date: Thu, 19 Aug 2021 17:00:22 +0530
Subject: [PATCH 04/10] enable privacy on maps with identical cookie keys

---
 src/PrivacyProtection/PrivacyProtection.jsx | 38 ++++++++++++++++-----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/PrivacyProtection/PrivacyProtection.jsx b/src/PrivacyProtection/PrivacyProtection.jsx
index 9f84a83..df98e67 100644
--- a/src/PrivacyProtection/PrivacyProtection.jsx
+++ b/src/PrivacyProtection/PrivacyProtection.jsx
@@ -46,7 +46,16 @@ function canShow(domain_key) {
 }
 
 export default injectIntl(
-  ({ children, data = {}, id, isEditMode, intl, path, ...rest }) => {
+  ({
+    children,
+    data = {},
+    id,
+    isEditMode,
+    onChangeBlock,
+    intl,
+    path,
+    ...rest
+  }) => {
     const { dataprotection = {} } = data;
     const { background_image: bgImg, enabled = false } = dataprotection;
     const [image, setImage] = React.useState(null);
@@ -58,8 +67,26 @@ export default injectIntl(
       }
     }, [bgImg]);
 
+    const [visible, setVisibility] = useState(false);
+    const defaultShow = canShow(dataprotection.privacy_cookie_key);
+    const [show, setShow] = useState(defaultShow);
+    const [remember, setRemember] = useState(defaultShow);
+
     React.useEffect(() => {
-      if (enabled && !bgImg) {
+      if (isEditMode && defaultShow && !enabled) {
+        onChangeBlock(id, {
+          ...data,
+          dataprotection: {
+            ...dataprotection,
+            enabled: true,
+          },
+        });
+      }
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [defaultShow]);
+
+    React.useEffect(() => {
+      if (enabled && !bgImg && !show) {
         fetch(
           `${getBaseUrl(
             path || '',
@@ -81,12 +108,7 @@ export default injectIntl(
             }
           });
       }
-    }, [enabled, data.url, path, dispatch, bgImg, intl, isEditMode]);
-
-    const [visible, setVisibility] = useState(false);
-    const defaultShow = canShow(dataprotection.privacy_cookie_key);
-    const [show, setShow] = useState(defaultShow);
-    const [remember, setRemember] = useState(defaultShow);
+    }, [enabled, data.url, path, dispatch, bgImg, show, intl, isEditMode]);
 
     return (
       <VisibilitySensor

From 2edd3cc212c587cff2eaeb0544c71f4ff742ee77 Mon Sep 17 00:00:00 2001
From: nileshgulia1 <nileshgulia@gmail.com>
Date: Thu, 19 Aug 2021 19:34:12 +0530
Subject: [PATCH 05/10] prevent realtime update of block data

---
 src/PrivacyProtection/PrivacyProtection.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PrivacyProtection/PrivacyProtection.jsx b/src/PrivacyProtection/PrivacyProtection.jsx
index df98e67..2799c48 100644
--- a/src/PrivacyProtection/PrivacyProtection.jsx
+++ b/src/PrivacyProtection/PrivacyProtection.jsx
@@ -83,7 +83,7 @@ export default injectIntl(
         });
       }
       // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [defaultShow]);
+    }, []);
 
     React.useEffect(() => {
       if (enabled && !bgImg && !show) {

From fa9c9cb63eb0bd7a3bab2d9eaea09f3896695a0c Mon Sep 17 00:00:00 2001
From: nileshgulia1 <nileshgulia@gmail.com>
Date: Tue, 24 Aug 2021 22:53:25 +0530
Subject: [PATCH 06/10] modified schema, fix style to fit in small width

---
 src/PrivacyProtection/schema.js | 9 +++++----
 src/css/embed-styles.css        | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/PrivacyProtection/schema.js b/src/PrivacyProtection/schema.js
index 1e18b9c..c01b244 100644
--- a/src/PrivacyProtection/schema.js
+++ b/src/PrivacyProtection/schema.js
@@ -17,23 +17,24 @@ export const ProtectionSchema = () => ({
   properties: {
     privacy_statement: {
       title: 'Privacy statement',
-      description: 'Short notification text',
+      description: 'Defined in template. Change only if necessary',
       widget: 'slate_richtext',
       className: 'slate-Widget',
+      value: 'defualt',
     },
     privacy_cookie_key: {
       title: 'Privacy cookie key',
-      description: 'Identifies similar external content',
+      description: 'Use default for Esri maps,otherwise change',
     },
     enabled: {
-      title: 'Use privacy screen?',
+      title: 'Data protection disclaimer enabled',
       description: 'Enable/disable the privacy protection',
       type: 'boolean',
     },
     background_image: {
       title: 'Background image',
       description:
-        'Set a placeholder image. This will override the existing one',
+        'The component will automatically generate a static image as placeholder from the URL of the map defined. This image is refreshed on page edit. To override this, upload an image here',
       widget: 'file',
     },
   },
diff --git a/src/css/embed-styles.css b/src/css/embed-styles.css
index 20a109f..cd2bc10 100644
--- a/src/css/embed-styles.css
+++ b/src/css/embed-styles.css
@@ -16,11 +16,12 @@
 }
 
 .wrapped {
-  width: 400px;
+  width: 300px;
   padding: 1.4rem;
   margin: 0 auto;
   background: white;
   border-radius: 5px;
+  opacity: 0.6;
 }
 
 .discreet {

From 21b8e5f905b6cf4bf24117235ac69282e3b5e6ef Mon Sep 17 00:00:00 2001
From: nileshgulia1 <nileshgulia@gmail.com>
Date: Wed, 25 Aug 2021 16:35:16 +0530
Subject: [PATCH 07/10] defaultValue for cookie

---
 src/PrivacyProtection/PrivacyProtection.jsx | 36 ++++++++++++++++++++-
 src/PrivacyProtection/schema.js             |  3 +-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/PrivacyProtection/PrivacyProtection.jsx b/src/PrivacyProtection/PrivacyProtection.jsx
index 2799c48..4dc5af2 100644
--- a/src/PrivacyProtection/PrivacyProtection.jsx
+++ b/src/PrivacyProtection/PrivacyProtection.jsx
@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 import VisibilitySensor from 'react-visibility-sensor';
 import { Placeholder, Dimmer, Loader } from 'semantic-ui-react';
 import cookie from 'react-cookie';
+//import { find, without } from 'lodash';
 import { serializeNodes } from 'volto-slate/editor/render';
 import { Button, Checkbox } from 'semantic-ui-react';
 import { defineMessages, injectIntl } from 'react-intl';
@@ -10,7 +11,12 @@ import { toast } from 'react-toastify';
 import config from '@plone/volto/registry';
 import '../css/embed-styles.css';
 import { createImageUrl } from './helpers';
-import { getBaseUrl } from '@plone/volto/helpers';
+
+import {
+  getBaseUrl,
+  // getBlocksFieldname,
+  // getBlocksLayoutFieldname,
+} from '@plone/volto/helpers';
 import { Toast } from '@plone/volto/components';
 
 const messages = defineMessages({
@@ -54,6 +60,7 @@ export default injectIntl(
     onChangeBlock,
     intl,
     path,
+    properties,
     ...rest
   }) => {
     const { dataprotection = {} } = data;
@@ -61,6 +68,30 @@ export default injectIntl(
     const [image, setImage] = React.useState(null);
     const dispatch = useDispatch();
 
+    // const blocksFieldname = getBlocksFieldname(properties);
+    // const blocksLayoutFieldname = getBlocksLayoutFieldname(properties);
+
+    // const getPrivacyEnabledBlock = (key) => {
+    //   const en = find(without(key, id), (block) => {
+    //     if (properties[blocksFieldname]?.[block][blocksLayoutFieldname].items) {
+    //       getPrivacyEnabledBlock(
+    //         properties[blocksFieldname]?.[block][blocksLayoutFieldname].items,
+    //       );
+    //     }
+    //     return (
+    //       properties[blocksFieldname]?.[block]?.['@type'] ===
+    //       'data_connected_embed'
+    //     );
+    //   });
+    //   if (en) {
+    //     return (
+    //       properties[blocksFieldname]?.[en].dataprotection.enabled &&
+    //       properties[blocksFieldname]?.[en].dataprotection
+    //         .privacy_cookie_key === key
+    //     );
+    //   }
+    // };
+
     React.useEffect(() => {
       if (bgImg) {
         setImage(createImageUrl(bgImg)); //create imageUrl from uploaded image
@@ -69,6 +100,9 @@ export default injectIntl(
 
     const [visible, setVisibility] = useState(false);
     const defaultShow = canShow(dataprotection.privacy_cookie_key);
+    // const isIdentical = getPrivacyEnabledBlock(
+    //   properties[blocksLayoutFieldname].items,
+    // );
     const [show, setShow] = useState(defaultShow);
     const [remember, setRemember] = useState(defaultShow);
 
diff --git a/src/PrivacyProtection/schema.js b/src/PrivacyProtection/schema.js
index c01b244..5970930 100644
--- a/src/PrivacyProtection/schema.js
+++ b/src/PrivacyProtection/schema.js
@@ -24,7 +24,8 @@ export const ProtectionSchema = () => ({
     },
     privacy_cookie_key: {
       title: 'Privacy cookie key',
-      description: 'Use default for Esri maps,otherwise change',
+      description: 'Use default for Esri maps, otherwise change',
+      defaultValue: 'esri-maps',
     },
     enabled: {
       title: 'Data protection disclaimer enabled',

From a94b4cf9016e322691f399d821f8e247f6534235 Mon Sep 17 00:00:00 2001
From: nileshgulia1 <nileshgulia@gmail.com>
Date: Wed, 25 Aug 2021 17:20:01 +0530
Subject: [PATCH 08/10] fix slate

---
 src/PrivacyProtection/schema.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/PrivacyProtection/schema.js b/src/PrivacyProtection/schema.js
index 5970930..1d7a642 100644
--- a/src/PrivacyProtection/schema.js
+++ b/src/PrivacyProtection/schema.js
@@ -20,7 +20,6 @@ export const ProtectionSchema = () => ({
       description: 'Defined in template. Change only if necessary',
       widget: 'slate_richtext',
       className: 'slate-Widget',
-      value: 'defualt',
     },
     privacy_cookie_key: {
       title: 'Privacy cookie key',

From 3b02319b5b465b97591a8d70c9a8f7b8b6ba18f1 Mon Sep 17 00:00:00 2001
From: nileshgulia1 <nileshgulia@gmail.com>
Date: Wed, 1 Sep 2021 15:08:37 +0530
Subject: [PATCH 09/10] clean embed block

---
 src/PrivacyProtection/PrivacyProtection.jsx | 57 +++++----------------
 1 file changed, 13 insertions(+), 44 deletions(-)

diff --git a/src/PrivacyProtection/PrivacyProtection.jsx b/src/PrivacyProtection/PrivacyProtection.jsx
index 4dc5af2..90e5e4e 100644
--- a/src/PrivacyProtection/PrivacyProtection.jsx
+++ b/src/PrivacyProtection/PrivacyProtection.jsx
@@ -12,11 +12,7 @@ import config from '@plone/volto/registry';
 import '../css/embed-styles.css';
 import { createImageUrl } from './helpers';
 
-import {
-  getBaseUrl,
-  // getBlocksFieldname,
-  // getBlocksLayoutFieldname,
-} from '@plone/volto/helpers';
+import { getBaseUrl } from '@plone/volto/helpers';
 import { Toast } from '@plone/volto/components';
 
 const messages = defineMessages({
@@ -68,30 +64,6 @@ export default injectIntl(
     const [image, setImage] = React.useState(null);
     const dispatch = useDispatch();
 
-    // const blocksFieldname = getBlocksFieldname(properties);
-    // const blocksLayoutFieldname = getBlocksLayoutFieldname(properties);
-
-    // const getPrivacyEnabledBlock = (key) => {
-    //   const en = find(without(key, id), (block) => {
-    //     if (properties[blocksFieldname]?.[block][blocksLayoutFieldname].items) {
-    //       getPrivacyEnabledBlock(
-    //         properties[blocksFieldname]?.[block][blocksLayoutFieldname].items,
-    //       );
-    //     }
-    //     return (
-    //       properties[blocksFieldname]?.[block]?.['@type'] ===
-    //       'data_connected_embed'
-    //     );
-    //   });
-    //   if (en) {
-    //     return (
-    //       properties[blocksFieldname]?.[en].dataprotection.enabled &&
-    //       properties[blocksFieldname]?.[en].dataprotection
-    //         .privacy_cookie_key === key
-    //     );
-    //   }
-    // };
-
     React.useEffect(() => {
       if (bgImg) {
         setImage(createImageUrl(bgImg)); //create imageUrl from uploaded image
@@ -100,24 +72,21 @@ export default injectIntl(
 
     const [visible, setVisibility] = useState(false);
     const defaultShow = canShow(dataprotection.privacy_cookie_key);
-    // const isIdentical = getPrivacyEnabledBlock(
-    //   properties[blocksLayoutFieldname].items,
-    // );
     const [show, setShow] = useState(defaultShow);
     const [remember, setRemember] = useState(defaultShow);
 
-    React.useEffect(() => {
-      if (isEditMode && defaultShow && !enabled) {
-        onChangeBlock(id, {
-          ...data,
-          dataprotection: {
-            ...dataprotection,
-            enabled: true,
-          },
-        });
-      }
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
+    // React.useEffect(() => {
+    //   if (isEditMode && defaultShow && !enabled) {
+    //     onChangeBlock(id, {
+    //       ...data,
+    //       dataprotection: {
+    //         ...dataprotection,
+    //         enabled: true,
+    //       },
+    //     });
+    //   }
+    //   // eslint-disable-next-line react-hooks/exhaustive-deps
+    // }, []);
 
     React.useEffect(() => {
       if (enabled && !bgImg && !show) {

From b622df3686cd40ba0d8517332e0c2a5bec0e912d Mon Sep 17 00:00:00 2001
From: EEA Jenkins <@users.noreply.github.com>
Date: Wed, 1 Sep 2021 09:48:01 +0000
Subject: [PATCH 10/10] Automated release 2.0.3

---
 CHANGELOG.md | 15 +++++++++++++++
 package.json |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec13316..2d7a170 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,23 @@ 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.3](https://github.com/eea/volto-embed/compare/2.0.2...2.0.3)
+
+- clean embed block [`3b02319`](https://github.com/eea/volto-embed/commit/3b02319b5b465b97591a8d70c9a8f7b8b6ba18f1)
+- fix slate [`a94b4cf`](https://github.com/eea/volto-embed/commit/a94b4cf9016e322691f399d821f8e247f6534235)
+- defaultValue for cookie [`21b8e5f`](https://github.com/eea/volto-embed/commit/21b8e5f905b6cf4bf24117235ac69282e3b5e6ef)
+- modified schema, fix style to fit in small width [`fa9c9cb`](https://github.com/eea/volto-embed/commit/fa9c9cb63eb0bd7a3bab2d9eaea09f3896695a0c)
+- prevent realtime update of block data [`2edd3cc`](https://github.com/eea/volto-embed/commit/2edd3cc212c587cff2eaeb0544c71f4ff742ee77)
+- enable privacy on maps with identical cookie keys [`45b9e56`](https://github.com/eea/volto-embed/commit/45b9e56b9ced541d174966b2b7d6639237fd6251)
+- pass block id correctly [`eb130b9`](https://github.com/eea/volto-embed/commit/eb130b917d4186cde1dfb49ceb5eed8665ff2e5a)
+- custom style to slateWidget toolbar [`7ce9ab7`](https://github.com/eea/volto-embed/commit/7ce9ab716ab067974f56435d557ee57a30f9a5b7)
+- use slate editor in privacy_statement [`f662235`](https://github.com/eea/volto-embed/commit/f66223569bfd9e623bddbf043aeabcc9394eb049)
+
 #### [2.0.2](https://github.com/eea/volto-embed/compare/2.0.1...2.0.2)
 
+> 16 August 2021
+
+- Develop [`#3`](https://github.com/eea/volto-embed/pull/3)
 - add volto-slate [`6e5de2f`](https://github.com/eea/volto-embed/commit/6e5de2f0137404acf8d74892f059b44b2ad89244)
 - revert slate widget addition [`4032799`](https://github.com/eea/volto-embed/commit/403279913c6d50212e0d7856fa640fbf1ab3d6e1)
 - add deps [`b9a16f7`](https://github.com/eea/volto-embed/commit/b9a16f7ce3b52b86e7d310190523e043ee3205f9)
diff --git a/package.json b/package.json
index aea4787..10b7b53 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-embed",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Embed external content",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",