@eeacms/volto-eea-map 3.0.0 → 3.0.2

package/CHANGELOG.md

@@ -4,7 +4,20 @@ 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.2](https://github.com/eea/volto-eea-map/compare/3.0.1...3.0.2) - 28 November 2023
+
+#### :bug: Bug Fixes
+
+- fix: handle error when map_layers has no value [laszlocseh - [`0412974`](https://github.com/eea/volto-eea-map/commit/041297417dc1f1fd077983faedba90260e1616d7)]
+
+### [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
 
@@ -17,6 +30,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix prettier [Dobricean Ioan Dorian - [`78fc2ba`](https://github.com/eea/volto-eea-map/commit/78fc2baa2f5264ca1bba61b70bc0bdc5b2788e67)]
 - Fix Sonorqube [dobri1408 - [`e04011a`](https://github.com/eea/volto-eea-map/commit/e04011aa811422f865d0bbb1e66af558a4310e77)]
 - adapt embedeeamap to use serialized data [Dobricean Ioan Dorian - [`005965c`](https://github.com/eea/volto-eea-map/commit/005965c6793a9a9977fef52c08ba9a3173eec348)]
+- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`de2f4f6`](https://github.com/eea/volto-eea-map/commit/de2f4f6f516c2c9f7c2b4ea84373f4b1a21cd0af)]
+- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`4722984`](https://github.com/eea/volto-eea-map/commit/47229842132b406101c340ab200c193925b784ad)]
 ### [2.0.7](https://github.com/eea/volto-eea-map/compare/2.0.6...2.0.7) - 10 November 2023
 
 #### :rocket: New Features
@@ -33,6 +48,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
+- chore: [JENKINS] Refactor automated testing [valentinab25 - [`7afd81a`](https://github.com/eea/volto-eea-map/commit/7afd81a76bf407b07a94228daf3ab0415fbe4621)]
 - chore: husky, lint-staged use fixed versions [valentinab25 - [`0ee38a7`](https://github.com/eea/volto-eea-map/commit/0ee38a7bee84694a5e0230e2d17083fbc071f0c8)]
 - chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`8efeb44`](https://github.com/eea/volto-eea-map/commit/8efeb4423da70e421a88cabdeb559eb3613fb96e)]
 - chore: display legend for content type item, fix case when no note is set [dana-cfc4 - [`ae630a8`](https://github.com/eea/volto-eea-map/commit/ae630a88cffa2a8ef60e0bbfead392508b015497)]
@@ -42,7 +58,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`335133d`](https://github.com/eea/volto-eea-map/commit/335133dc5186a53c1077bbead36100101bd9af45)]
 - Refs #260203: make background_image required [laszlocseh - [`baa5c4f`](https://github.com/eea/volto-eea-map/commit/baa5c4fa2fe618af51df12d48b4512ecafc357a8)]
+- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`4874649`](https://github.com/eea/volto-eea-map/commit/48746492a2b32a82d33d1c6415eab8a6f6b9f5be)]
+- test: [JENKINS] Improve cypress time [valentinab25 - [`7fa0b83`](https://github.com/eea/volto-eea-map/commit/7fa0b837b24f41a01285fd1b17daeefde99a9c76)]
 - use toolbar from volto-embed [Miu Razvan - [`29b73fb`](https://github.com/eea/volto-eea-map/commit/29b73fb8378ca56b3634bf1f7d57ce69a242b18e)]
 ### [2.0.6](https://github.com/eea/volto-eea-map/compare/2.0.5...2.0.6) - 29 September 2023
 
@@ -59,6 +78,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - test: EN locales, pre-commit fix, feature PRs checks Refs #257193 [valentinab25 - [`4c6d141`](https://github.com/eea/volto-eea-map/commit/4c6d1413b67ffc3fe27a7d09dcc99ef98867cec9)]
 - test: Fix package.json scripts to use makefile [Alin Voinea - [`1cd6751`](https://github.com/eea/volto-eea-map/commit/1cd675118165d8631c41d35c00a8c902c7edd803)]
+- test: Fix eslint and yarn i18n [Alin Voinea - [`0184641`](https://github.com/eea/volto-eea-map/commit/018464116ba5b86b2c1e0a4ebc9b2fd95b772b66)]
 - i18n: Add en [Alin Voinea - [`1d29304`](https://github.com/eea/volto-eea-map/commit/1d293049a21e138fa933cd5ed9a04cceac1a5cff)]
 ### [2.0.5](https://github.com/eea/volto-eea-map/compare/2.0.4...2.0.5) - 23 August 2023
 
@@ -115,11 +135,14 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Release 2.0.0 [Alin Voinea - [`7be280d`](https://github.com/eea/volto-eea-map/commit/7be280d4809186e663f422687aca3c33dd732904)]
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`ba6ed22`](https://github.com/eea/volto-eea-map/commit/ba6ed22118406db979457384d4739cced2096137)]
 ### [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)]
+- 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
@@ -180,6 +203,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
 
@@ -189,6 +213,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
@@ -196,6 +221,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": "3.0.0",
+  "version": "3.0.2",
   "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/LegendView.jsx

@@ -128,13 +128,15 @@ const LegendView = (props) => {
                 </p>
               </Grid.Column>
             )}
-            {map_layers?.map((l, i) => (
-              <LayerLegend
-                key={i}
-                data={l.map_layer}
-                show_viewer={show_viewer}
-              />
-            ))}
+            {map_layers &&
+              map_layers.length > 0 &&
+              map_layers?.map((l, i) => (
+                <LayerLegend
+                  key={i}
+                  data={l.map_layer}
+                  show_viewer={show_viewer}
+                />
+              ))}
           </Grid.Row>
         </Grid>
       )}

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);