enhancements embed eea

eea · Nov 3, 2022 · f01cf33 · f01cf33
1 parent 5dbca0b
commit f01cf33
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 5 deletions.
diff --git a/src/Blocks/EmbedEEAVisualization/Edit.jsx b/src/Blocks/EmbedEEAVisualization/Edit.jsx
@@ -2,6 +2,8 @@ import React from 'react';
 import { SidebarPortal } from '@plone/volto/components';
 import BlockDataForm from '@plone/volto/components/manage/Form/BlockDataForm';
 import ConnectedChart2 from '@eeacms/volto-plotlycharts/ConnectedChart2';
+import { connect } from 'react-redux';
+import { compose } from 'redux';
 
 import '@eeacms/volto-plotlycharts/less/visualization.less';
 import Schema from './schema';
@@ -24,7 +26,6 @@ const Edit = (props) => {
       });
     }
   }, [block, data, onChangeBlock]);
-
   return (
     <>
       <ConnectedChart2
@@ -39,6 +40,10 @@ const Edit = (props) => {
           vis_url: data.vis_url,
           with_sources: data.show_sources,
           include_core_metadata_download: data.include_core_metadata_download,
+          include_sources_download: data?.include_sources_download,
+          include_other_org_download: data?.include_other_org_download,
+          include_temporal_coverage_download:
+            data?.include_temporal_coverage_download,
         }}
         hoverFormatXY={data.hover_format_xy}
         withSources={data.show_sources}
@@ -64,4 +69,18 @@ const Edit = (props) => {
   );
 };
 
-export default Edit;
+export default compose(
+  connect(
+    (state, props) => ({
+      //mapped core metadata data to props. Include more if needed
+      temporal_coverage:
+        state.content.subrequests?.[props.id]?.data?.temporal_coverage,
+      other_organisations:
+        state.content.subrequests?.[props.id]?.data?.other_organisations,
+      data_provenance:
+        state.content.subrequests?.[props.id]?.data?.data_provenance,
+    }),
+    {},
+  ),
+  //add extra hoc here
+)(Edit);
diff --git a/src/Blocks/EmbedEEAVisualization/View.jsx b/src/Blocks/EmbedEEAVisualization/View.jsx
@@ -59,6 +59,10 @@ const View = (props) => {
                 with_sources: data.show_sources,
                 include_core_metadata_download:
                   data.include_core_metadata_download,
+                include_sources_download: data?.include_sources_download,
+                include_other_org_download: data?.include_other_org_download,
+                include_temporal_coverage_download:
+                  data?.include_temporal_coverage_download,
               }}
               hoverFormatXY={data.hover_format_xy}
               withSources={data.show_sources}

diff --git a/src/Blocks/EmbedEEAVisualization/schema.js b/src/Blocks/EmbedEEAVisualization/schema.js
@@ -1,6 +1,17 @@
 import React from 'react';
 
 const Schema = (props) => {
+  const hasSources =
+    props.data_provenance &&
+    props.data_provenance.data &&
+    props.data_provenance.data.length > 0;
+  const hasOtherOrg =
+    props.other_organisations && props.other_organisations.length > 0;
+  const hasTemporalCoverage =
+    props.temporal_coverage &&
+    props.temporal_coverage.temporal &&
+    props.temporal_coverage.temporal.length > 0;
+
   return {
     title: 'Embed EEA visualization',
 
@@ -17,6 +28,16 @@ const Schema = (props) => {
           ...(props.data.download_button
             ? ['include_core_metadata_download']
             : []),
+          ...(props.data.download_button &&
+          props.data.include_core_metadata_download
+            ? [
+                ...(hasSources ? ['include_sources_download'] : []),
+                ...(hasOtherOrg ? ['include_other_org_download'] : []),
+                ...(hasTemporalCoverage
+                  ? ['include_temporal_coverage_download']
+                  : []),
+              ]
+            : []),
         ],
       },
       {
@@ -67,6 +88,21 @@ const Schema = (props) => {
         description: 'Include core metadata in the dowloaded CSV',
         type: 'boolean',
       },
+      include_sources_download: {
+        title: 'Download sources',
+        description: 'Include sources in the dowloaded CSV',
+        type: 'boolean',
+      },
+      include_other_org_download: {
+        title: 'Download other organisations',
+        description: 'Include other organisations in the dowloaded CSV',
+        type: 'boolean',
+      },
+      include_temporal_coverage_download: {
+        title: 'Download temporal coverage',
+        description: 'Include temporal coverage in the dowloaded CSV',
+        type: 'boolean',
+      },
       show_sources: {
         title: 'Toggle sources',
         type: 'boolean',

diff --git a/src/ConnectedChart2/ConnectedChart2.jsx b/src/ConnectedChart2/ConnectedChart2.jsx
@@ -136,9 +136,15 @@ function ConnectedChart2(props) {
             props.data.include_core_metadata_download
           }
           core_metadata={{
-            data_provenance: data_provenance?.data,
-            other_organisations,
-            temporal_coverage: temporal_coverage?.temporal,
+            data_provenance: props.data?.include_sources_download
+              ? data_provenance?.data
+              : '',
+            other_organisations: props.data?.include_other_org_download
+              ? other_organisations
+              : '',
+            temporal_coverage: props.data?.include_temporal_coverage_download
+              ? temporal_coverage?.temporal
+              : '',
           }}
         />
       )}