@eeacms/volto-eea-map 2.0.1 → 2.0.2

package/CHANGELOG.md

@@ -4,6 +4,16 @@ 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).
 
+### [2.0.2](https://github.com/eea/volto-eea-map/compare/2.0.1...2.0.2) - 14 August 2023
+
+#### :bug: Bug Fixes
+
+- fix: test use specif backend url for viz #256519 [andreiggr - [`198bdf8`](https://github.com/eea/volto-eea-map/commit/198bdf85f2f847305d08ffd93514f1086868bce9)]
+
+#### :house: Internal changes
+
+- chore: allow request to arcgis utility service #256519 [andreiggr - [`4c517a4`](https://github.com/eea/volto-eea-map/commit/4c517a4a86c7dce094513ce988d6e236f91fbd28)]
+
 ### [2.0.1](https://github.com/eea/volto-eea-map/compare/2.0.0...2.0.1) - 8 August 2023
 
 #### :bug: Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-map",
-  "version": "2.0.1",
+  "version": "2.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

@@ -8,6 +8,8 @@ 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';
 
+import { expandToBackendURL } from '@plone/volto/helpers';
+
 import { Schema } from './Schema';
 import { applyQueriesToMapLayers } from '@eeacms/volto-eea-map/utils';
 
@@ -19,9 +21,13 @@ const Edit = (props) => {
   const [mapData, setMapData] = React.useState('');
   const data = React.useMemo(() => props.data, [props.data]);
   const { height = '' } = data;
-
   React.useEffect(() => {
-    props.getVisualization(props.data.vis_url);
+    if (props.data.vis_url) {
+      props.getVisualization(expandToBackendURL(props.data.vis_url));
+    }
+    if (!props.data.vis_url) {
+      setMapData('');
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [props.data.vis_url]);
 
@@ -76,10 +82,12 @@ export default compose(
     (state, props) => ({
       data_query: state.content.data.data_query,
       map_visualization: props.data.vis_url
-        ? state.map_visualizations?.data[props.data.vis_url]?.data
+        ? state.map_visualizations?.data[expandToBackendURL(props.data.vis_url)]
+            ?.data
         : '',
       data_provenance: props.data.vis_url
-        ? state.map_visualizations?.data[props.data.vis_url]?.data_provenance
+        ? state.map_visualizations?.data[expandToBackendURL(props.data.vis_url)]
+            ?.data_provenance
         : '',
     }),
     {

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

@@ -3,6 +3,8 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 
+import { expandToBackendURL } from '@plone/volto/helpers';
+
 import { PrivacyProtection } from '@eeacms/volto-embed';
 
 import Webmap from '@eeacms/volto-eea-map/components/Webmap';
@@ -17,7 +19,12 @@ const View = (props) => {
   const [mapData, setMapData] = React.useState('');
 
   React.useEffect(() => {
-    props.getVisualization(props.data.vis_url);
+    if (props.data.vis_url) {
+      props.getVisualization(expandToBackendURL(props.data.vis_url));
+    }
+    if (!props.data.vis_url) {
+      setMapData('');
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [props.data.vis_url]);
 
@@ -61,10 +68,12 @@ export default compose(
   connect(
     (state, props) => ({
       map_visualization: props.data.vis_url
-        ? state.map_visualizations?.data[props.data.vis_url]?.data
+        ? state.map_visualizations?.data[expandToBackendURL(props.data.vis_url)]
+            ?.data
         : '',
       data_provenance: props.data.vis_url
-        ? state.map_visualizations?.data[props.data.vis_url]?.data_provenance
+        ? state.map_visualizations?.data[expandToBackendURL(props.data.vis_url)]
+            ?.data_provenance
         : '',
     }),
     {

package/src/index.js

@@ -32,6 +32,7 @@ export default (config) => {
     'water.discomap.eea.europa.eu',
     'noise.discomap.eea.europa.eu',
     'copernicus.discomap.eea.europa.eu',
+    'utility.arcgisonline.com',
   ];
 
   config.blocks.blocksConfig.embed_eea_map_block = {