@eeacms/volto-eea-map 1.0.1 → 2.0.0

package/CHANGELOG.md

@@ -4,7 +4,21 @@ 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.1](https://github.com/eea/volto-eea-map/compare/1.0.0...1.0.1) - 19 June 2023
+### [2.0.0](https://github.com/eea/volto-eea-map/compare/1.0.2...2.0.0) - 25 July 2023
+
+#### :nail_care: Enhancements
+
+- refactor: remove countup - refs #254634 [dobri1408 - [`7763f61`](https://github.com/eea/volto-eea-map/commit/7763f612221210283c9c5dc3e15ede991c78f393)]
+
+#### :hammer_and_wrench: Others
+
+- Release 2.0.0 [Alin Voinea - [`7be280d`](https://github.com/eea/volto-eea-map/commit/7be280d4809186e663f422687aca3c33dd732904)]
+### [1.0.2](https://github.com/eea/volto-eea-map/compare/1.0.1...1.0.2) - 21 July 2023
+
+#### :hammer_and_wrench: Others
+
+- Allow blocks in content type [Tiberiu Ichim - [`2ac09a6`](https://github.com/eea/volto-eea-map/commit/2ac09a613aba07f6cbaf42c386660f2d7d09bd13)]
+### [1.0.1](https://github.com/eea/volto-eea-map/compare/1.0.0...1.0.1) - 22 June 2023
 
 #### :rocket: New Features
 
@@ -64,7 +78,6 @@ 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
 
@@ -74,7 +87,6 @@ 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
@@ -82,7 +94,6 @@ 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.1",
+  "version": "2.0.0",
   "description": "@eeacms/volto-eea-map: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -38,9 +38,6 @@
     "cypress-fail-fast": "^5.0.1",
     "md5": "^2.3.0"
   },
-  "resolutions": {
-    "react-countup/countup.js": "2.5.0"
-  },
   "scripts": {
     "release": "release-it",
     "bootstrap": "npm install -g ejs; npm link ejs; node bootstrap",

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;