@eeacms/volto-eea-map 3.0.0 → 3.0.1

package/CHANGELOG.md

@@ -4,7 +4,14 @@ 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).
 
-### [3.0.0](https://github.com/eea/volto-eea-map/compare/2.0.7...3.0.0) - 23 November 2023
+### [3.0.1](https://github.com/eea/volto-eea-map/compare/3.0.0...3.0.1) - 24 November 2023
+
+#### :hammer_and_wrench: Others
+
+- fix [Miu Razvan - [`d9267ec`](https://github.com/eea/volto-eea-map/commit/d9267eca557518241ba30f5d525ebd30a606bf94)]
+- fix [Miu Razvan - [`0ad99a6`](https://github.com/eea/volto-eea-map/commit/0ad99a60a3edfd19ad11b0023b456e82bb335dc5)]
+- fix [Miu Razvan - [`fd0260d`](https://github.com/eea/volto-eea-map/commit/fd0260d46e356377ce388b967e78651da8cfa543)]
+## [3.0.0](https://github.com/eea/volto-eea-map/compare/2.0.7...3.0.0) - 23 November 2023
 
 #### :hammer_and_wrench: Others
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-map",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "@eeacms/volto-eea-map: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -81,4 +81,4 @@
     "cypress:open": "make cypress-open",
     "prepare": "husky install"
   }
-}
+}

package/src/components/Blocks/EmbedEEAMap/View.jsx

@@ -7,13 +7,23 @@ import { applyQueriesToMapLayers } from '@eeacms/volto-eea-map/utils';
 import { getMapVisualizationData } from './helpers';
 
 const View = (props) => {
-  const { data_query_params, enable_queries, height = '' } = props.data;
+  const { data } = props;
+  const {
+    data_query_params,
+    enable_queries,
+    show_legend = true,
+    show_note = true,
+    show_sources = true,
+    show_more_info = true,
+    show_share = true,
+    dataprotection = { enabled: true },
+    height = '',
+  } = data;
 
   const map_visualization_data = useMemo(() => getMapVisualizationData(props), [
     props,
   ]);
 
-  const { data_provenance = {}, figure_note = [] } = map_visualization_data;
   const [mapData, setMapData] = React.useState('');
 
   React.useEffect(() => {
@@ -27,7 +37,7 @@ const View = (props) => {
 
   return (
     <PrivacyProtection
-      data={props.data}
+      data={data}
       className="embed-map-visualization"
       {...props}
     >
@@ -36,11 +46,14 @@ const View = (props) => {
           <Webmap data={mapData} height={height} />
           <ExtraViews
             data={{
-              ...props.data,
-              data_provenance,
-              figure_note,
-              map_data: map_visualization_data,
-              '@id': props['@id'],
+              ...data,
+              show_legend,
+              show_note,
+              show_sources,
+              show_more_info,
+              show_share,
+              dataprotection,
+              map_visualization_data,
             }}
           />
         </>

package/src/components/ExtraViews.jsx

@@ -47,12 +47,12 @@ const ExtraViews = ({ data, screen }) => {
       )}
       <div className={cx('visualization-toolbar', { mobile })} ref={toolbar}>
         <div className="left-col">
-          {show_note && <FigureNote note={figure_note || []} />}
+          {show_note && <FigureNote notes={figure_note || []} />}
           {show_sources && <Sources sources={data_provenance?.data} />}
-          {show_more_info && <MoreInfo href={data['@id']} />}
+          {show_more_info && <MoreInfo href={map_visualization_data['@id']} />}
         </div>
         <div className="right-col">
-          {show_share && <Share href={data['@id']} />}
+          {show_share && <Share href={map_visualization_data['@id']} />}
         </div>
       </div>
       {description && serializeNodes(description)}

package/src/components/visualization/VisualizationView.jsx

@@ -1,8 +1,9 @@
 import React from 'react';
-import Webmap from '../Webmap';
-import LegendView from '../LegendView';
 import { hasBlocksData } from '@plone/volto/helpers';
 import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
+import { pickMetadata } from '@eeacms/volto-embed/helpers';
+import Webmap from '../Webmap';
+import ExtraViews from '../ExtraViews';
 
 const VisualizationView = (props) => {
   const { content = {} } = props;
@@ -16,7 +17,20 @@ const VisualizationView = (props) => {
       ) : (
         <>
           <Webmap data={map_visualization_data} />
-          <LegendView data={map_visualization_data} show_viewer={true} />
+          <ExtraViews
+            data={{
+              show_viewer: true,
+              show_legend: true,
+              show_note: false,
+              show_sources: false,
+              show_more_info: false,
+              show_share: true,
+              map_visualization_data: {
+                ...map_visualization_data,
+                ...pickMetadata(content),
+              },
+            }}
+          />
         </>
       )}
     </div>

package/src/components/visualization/VisualizationViewWidget.jsx

@@ -1,12 +1,32 @@
+import { connect } from 'react-redux';
+import { pickMetadata } from '@eeacms/volto-embed/helpers';
 import Webmap from '../Webmap';
-import LegendView from '../LegendView';
+import ExtraViews from '../ExtraViews';
 
-export default function VisualizationViewWidget(props) {
+function VisualizationViewWidget(props) {
   const { value: map_visualization_data = {} } = props;
+
   return (
     <>
       <Webmap data={map_visualization_data} />
-      <LegendView data={map_visualization_data} show_viewer={true} />
+      <ExtraViews
+        data={{
+          show_viewer: true,
+          show_legend: true,
+          show_note: false,
+          show_sources: false,
+          show_more_info: false,
+          show_share: true,
+          map_visualization_data: {
+            ...map_visualization_data,
+            ...pickMetadata(props.content),
+          },
+        }}
+      />
     </>
   );
 }
+
+export default connect((state) => ({
+  content: state.content.data,
+}))(VisualizationViewWidget);