@eeacms/volto-eea-map 1.0.0 → 1.0.2

package/CHANGELOG.md

@@ -4,7 +4,24 @@ 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).
 
-### [1.0.0](https://github.com/eea/volto-eea-map/compare/0.1.35...1.0.0) - 15 June 2023
+### [1.0.2](https://github.com/eea/volto-eea-map/compare/1.0.1...1.0.2) - 20 July 2023
+
+#### :hammer_and_wrench: Others
+
+- Allow blocks in content type [Tiberiu Ichim - [`2ac09a6`](https://github.com/eea/volto-eea-map/commit/2ac09a613aba07f6cbaf42c386660f2d7d09bd13)]
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`403b4c0`](https://github.com/eea/volto-eea-map/commit/403b4c009e5aaded58203bc292ba3baa4631488b)]
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`aedb654`](https://github.com/eea/volto-eea-map/commit/aedb6544fd45b147a3385425aba46ffba108f5ca)]
+### [1.0.1](https://github.com/eea/volto-eea-map/compare/1.0.0...1.0.1) - 22 June 2023
+
+#### :rocket: New Features
+
+- feat: use map_viz endpoint in eea.api.dataconnector [andreiggr - [`e6ce6dd`](https://github.com/eea/volto-eea-map/commit/e6ce6dd0a87343be8dae945780ef4b9ace6d830a)]
+
+#### :house: Internal changes
+
+- chore: useeffect updates improvements & cleanup unused layer wwidget [andreiggr - [`1b30d99`](https://github.com/eea/volto-eea-map/commit/1b30d99b481262d0184c8e5ad10331f0315d4f2a)]
+
+## [1.0.0](https://github.com/eea/volto-eea-map/compare/0.1.35...1.0.0) - 15 June 2023
 
 #### :bug: Bug Fixes
 
@@ -54,6 +71,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - chore: clear unused #254131 [andreiggr - [`ccec2ea`](https://github.com/eea/volto-eea-map/commit/ccec2eaab173c905cd4ea0190a9c6cfd630250f9)]
 - chore: clear block style #254131 [andreiggr - [`af500bc`](https://github.com/eea/volto-eea-map/commit/af500bc10a5f280eff0335f45bae1596d66a7e6b)]
+- chore: [JENKINS] Remove alpha testing version [valentinab25 - [`76b29e5`](https://github.com/eea/volto-eea-map/commit/76b29e510f5156590723831a524bc39dfba6deba)]
 
 #### :hammer_and_wrench: Others
 
@@ -63,6 +81,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - * versions [andreiggr - [`6d9ff2b`](https://github.com/eea/volto-eea-map/commit/6d9ff2b26a236b6445678e3d84698d1c3c0826f4)]
 - add razzle-plugin-scss dep [andreiggr - [`d74cee5`](https://github.com/eea/volto-eea-map/commit/d74cee51d30c866afe55730e5b25e0bf11d2caea)]
 - volto-object-widget [andreiggr - [`18d0ed7`](https://github.com/eea/volto-eea-map/commit/18d0ed72c1ba7b0f7159a0eefc09ccea9acee5cb)]
+- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`5911d01`](https://github.com/eea/volto-eea-map/commit/5911d01f7f3bc79a2c834fab75a9a4ac05d2d042)]
 ### [0.1.32](https://github.com/eea/volto-eea-map/compare/0.1.31...0.1.32) - 20 February 2023
 
 #### :hammer_and_wrench: Others
@@ -70,6 +89,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - remove console.log [tedw87 - [`3aeb3e8`](https://github.com/eea/volto-eea-map/commit/3aeb3e8ec5474387f3cd22eb9b387c6681e17120)]
 - refactor code [tedw87 - [`6d7830e`](https://github.com/eea/volto-eea-map/commit/6d7830eb934f56c255eea5642bdefba30d892946)]
 - add Blossom basemap layer [tedw87 - [`5226ee2`](https://github.com/eea/volto-eea-map/commit/5226ee218df3401cf467afbc7a4d720dc30719e1)]
+- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`1dad5c6`](https://github.com/eea/volto-eea-map/commit/1dad5c6617096ff85223165a6dd2b1d5d7deea6a)]
 ### [0.1.31](https://github.com/eea/volto-eea-map/compare/0.1.30...0.1.31) - 11 November 2022
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-map",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "@eeacms/volto-eea-map: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

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

@@ -4,8 +4,6 @@ import { SidebarPortal } from '@plone/volto/components';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 
-import { getContent } from '@plone/volto/actions';
-
 import BlockDataForm from '@plone/volto/components/manage/Form/BlockDataForm';
 import Webmap from '@eeacms/volto-eea-map/components/Webmap';
 import ExtraViews from '@eeacms/volto-eea-map/components/ExtraViews';
@@ -16,15 +14,10 @@ import {
   updateBlockQueryFromPageQuery,
 } from '@eeacms/volto-eea-map/utils';
 
+import { getVisualization } from '@eeacms/volto-eea-map/actions';
+
 const Edit = (props) => {
-  const {
-    block,
-    data,
-    onChangeBlock,
-    selected,
-    id,
-    data_provenance = {},
-  } = props;
+  const { block, data, onChangeBlock, selected, data_provenance = {} } = props;
   const { height = '' } = data;
   const schema = Schema(props);
   const [mapData, setMapData] = React.useState('');
@@ -52,7 +45,7 @@ const Edit = (props) => {
   }, [data.show_legend, data.show_sources, data.dataprotection]);
 
   React.useEffect(() => {
-    props.getContent(props.data.vis_url, null, id);
+    props.getVisualization(props.data.vis_url);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [props.data.vis_url]);
 
@@ -91,7 +84,11 @@ const Edit = (props) => {
     setMapData(updatedMapData);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [props.map_visualization, props.data]);
+  }, [
+    props.map_visualization,
+    props.data.data_query_params,
+    props.data.enable_queries,
+  ]);
 
   return (
     <>
@@ -132,13 +129,15 @@ export default compose(
   connect(
     (state, props) => ({
       data_query: state.content.data.data_query,
-      data_provenance:
-        state.content.subrequests?.[props.id]?.data?.data_provenance,
-      map_visualization:
-        state.content.subrequests?.[props.id]?.data?.map_visualization_data,
+      map_visualization: props.data.vis_url
+        ? state.map_visualizations?.data[props.data.vis_url]?.data
+        : '',
+      data_provenance: props.data.vis_url
+        ? state.map_visualizations?.data[props.data.vis_url]?.data_provenance
+        : '',
     }),
     {
-      getContent,
+      getVisualization,
     },
   ),
 )(Edit);

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

@@ -5,19 +5,19 @@ import { compose } from 'redux';
 
 import { PrivacyProtection } from '@eeacms/volto-embed';
 
-import { getContent } from '@plone/volto/actions';
 import Webmap from '@eeacms/volto-eea-map/components/Webmap';
 import ExtraViews from '@eeacms/volto-eea-map/components/ExtraViews';
 import { applyQueriesToMapLayers } from '@eeacms/volto-eea-map/utils';
+import { getVisualization } from '@eeacms/volto-eea-map/actions';
 
 const View = (props) => {
-  const { data, id, data_provenance = {} } = props || {};
+  const { data, data_provenance = {} } = props || {};
   const { height = '' } = data;
 
   const [mapData, setMapData] = React.useState('');
 
   React.useEffect(() => {
-    props.getContent(props.data.vis_url, null, id);
+    props.getVisualization(props.data.vis_url);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [props.data.vis_url]);
 
@@ -30,7 +30,11 @@ const View = (props) => {
 
     setMapData(updatedMapData);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [props.map_visualization, props.data]);
+  }, [
+    props.map_visualization,
+    props.data.data_query_params,
+    props.data.enable_queries,
+  ]);
 
   return (
     <PrivacyProtection data={data} height={height} {...props}>
@@ -56,13 +60,15 @@ const View = (props) => {
 export default compose(
   connect(
     (state, props) => ({
-      data_provenance:
-        state.content.subrequests?.[props.id]?.data?.data_provenance,
-      map_visualization:
-        state.content.subrequests?.[props.id]?.data?.map_visualization_data,
+      map_visualization: props.data.vis_url
+        ? state.map_visualizations?.data[props.data.vis_url]?.data
+        : '',
+      data_provenance: props.data.vis_url
+        ? state.map_visualizations?.data[props.data.vis_url]?.data_provenance
+        : '',
     }),
     {
-      getContent,
+      getVisualization,
     },
   ),
 )(View);

package/src/components/Webmap.jsx

@@ -30,9 +30,7 @@ const Webmap = (props) => {
     props.data.layers,
   ]);
   const base = React.useMemo(() => props?.data?.base || {}, [props.data.base]);
-  const legend = React.useMemo(() => props?.data?.legend || {}, [
-    props.data.legend,
-  ]);
+
   const general = React.useMemo(() => props?.data?.general || {}, [
     props.data.general,
   ]);
@@ -49,10 +47,6 @@ const Webmap = (props) => {
       .filter(({ map_layer }) => map_layer)
       .map((l, i) => l.map_layer);
 
-  const options = {
-    css: true,
-  };
-
   const mapRef = React.useRef();
   const [modules, setModules] = React.useState({});
 
@@ -61,7 +55,9 @@ const Webmap = (props) => {
   React.useEffect(() => {
     if (!modules_loaded.current) {
       modules_loaded.current = true;
-      loadModules(MODULES, options).then((modules) => {
+      loadModules(MODULES, {
+        css: true,
+      }).then((modules) => {
         const [
           Map,
           MapView,
@@ -92,7 +88,7 @@ const Webmap = (props) => {
         });
       });
     }
-  }, [setModules, options]);
+  }, [setModules]);
 
   var customFeatureLayerRenderer = {
     type: 'simple', // autocasts as new SimpleRenderer()
@@ -312,27 +308,6 @@ const Webmap = (props) => {
       });
       view.ui.add(zoomWidget, zoomPosition);
     }
-
-    if (legend?.legend?.show_legend) {
-      const legendPosition =
-        legend && legend.legend && legend.legend.position
-          ? legend.legend.position
-          : 'top-right';
-
-      const legendWidget = new Expand({
-        content: new Legend({
-          view: view,
-          style: 'classic',
-        }),
-        view: view,
-        expanded: false,
-        expandIconClass: 'esri-icon-legend',
-        expandTooltip: 'Legend',
-        classNames: 'some-cool-expand',
-      });
-      view.ui.add(legendWidget, legendPosition);
-    }
-
     const printPosition =
       general && general.print_position ? general.print_position : '';
 

package/src/components/visualization/VisualizationView.jsx

@@ -1,5 +1,7 @@
 import React from 'react';
 import Webmap from '../Webmap';
+import { hasBlocksData } from '@plone/volto/helpers';
+import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
 
 const VisualizationView = (props) => {
   const { content = {} } = props;
@@ -7,8 +9,12 @@ const VisualizationView = (props) => {
   const { map_visualization_data = {} } = content;
 
   return (
-    <div>
-      <Webmap data={map_visualization_data} />
+    <div id="page-document" className="view-viewarcgismap">
+      {hasBlocksData(content) ? (
+        <RenderBlocks {...props} />
+      ) : (
+        <Webmap data={map_visualization_data} />
+      )}
     </div>
   );
 };

package/src/components/visualization/VisualizationViewWidget.jsx

@@ -0,0 +1,6 @@
+import Webmap from '../Webmap';
+
+export default function VisualizationViewWidget(props) {
+  const { value: map_visualization_data = {} } = props;
+  return <Webmap data={map_visualization_data} />;
+}

package/src/index.js

@@ -7,6 +7,7 @@ import DataQueryWidget from './components/widgets/DataQueryWidget';
 import LayerSelectWidget from './components/widgets/LayerSelectWidget';
 
 import VisualizationEditorWidget from './components/visualization/VisualizationEditorWidget';
+import VisualizationViewWidget from './components/visualization/VisualizationViewWidget';
 import VisualizationView from './components/visualization/VisualizationView';
 
 import SimpleColorPickerWidget from './components/widgets/SimpleColorPickerWidget';
@@ -61,6 +62,7 @@ export default (config) => {
 
   //map editor for the visualization(content-type)
   config.widgets.id.map_visualization_data = VisualizationEditorWidget;
+  config.widgets.views.id.map_visualization_data = VisualizationViewWidget;
   //map viewer for the visualization(content-type)
   config.views.contentTypesViews.map_visualization = VisualizationView;