@eeacms/volto-eea-map 2.0.1 → 2.0.3

package/CHANGELOG.md

@@ -4,6 +4,26 @@ 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.3](https://github.com/eea/volto-eea-map/compare/2.0.2...2.0.3) - 16 August 2023
+
+#### :bug: Bug Fixes
+
+- fix: fullscreen changes parent height #256519 [andreiggr - [`f4c4183`](https://github.com/eea/volto-eea-map/commit/f4c4183a2f7523dd2fc6957e4cc967d100be2b45)]
+
+#### :house: Internal changes
+
+- chore: add map fullscreen widget #256519 [andreiggr - [`f9a2d63`](https://github.com/eea/volto-eea-map/commit/f9a2d63ddd7e09187874339f90fb18833d3f0230)]
+
+### [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
@@ -28,14 +48,11 @@ 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
@@ -96,7 +113,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
 
@@ -106,7 +122,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
@@ -114,7 +129,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": "2.0.1",
+  "version": "2.0.3",
   "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/components/Webmap.jsx

@@ -17,6 +17,7 @@ const MODULES = [
   'esri/widgets/Print',
   'esri/widgets/Zoom',
   'esri/widgets/ScaleBar',
+  'esri/widgets/Fullscreen',
 ];
 
 const Webmap = (props) => {
@@ -71,6 +72,7 @@ const Webmap = (props) => {
           Print,
           Zoom,
           ScaleBar,
+          Fullscreen,
         ] = modules;
         setModules({
           Map,
@@ -85,6 +87,7 @@ const Webmap = (props) => {
           Print,
           Zoom,
           ScaleBar,
+          Fullscreen,
         });
       });
     }
@@ -134,6 +137,7 @@ const Webmap = (props) => {
       Print,
       Zoom,
       ScaleBar,
+      Fullscreen,
     } = modules;
     let layers =
       map_layers && map_layers.length > 0
@@ -281,6 +285,14 @@ const Webmap = (props) => {
       });
     }
 
+    const fullscreenWidget = new Fullscreen({
+      view: view,
+    });
+
+    view.ui.add(fullscreenWidget, 'top-right');
+
+    //detect when fullscreen is on
+
     if (layers && layers[0] && general && general.centerOnExtent) {
       const firstLayer = layers[0];
       if (firstLayer.type === 'feature') {
@@ -334,20 +346,23 @@ const Webmap = (props) => {
     return { view, map };
   }, [modules, data, data.layers, map_layers]);
 
+  const heightPx =
+    height && !editMode
+      ? `${height}px`
+      : device === 'tablet' || device === 'mobile'
+      ? '300px'
+      : '500px';
+
+  const dynamicStyle = `
+  .esri-map {
+    height: ${heightPx} !important
+  }
+  `;
+
   return (
     <div>
-      <div
-        style={{
-          height:
-            height && !editMode
-              ? `${height}px`
-              : device === 'tablet' || device === 'mobile'
-              ? '300px'
-              : '500px',
-        }}
-        ref={mapRef}
-        className="esri-map"
-      ></div>
+      <style>{dynamicStyle}</style>
+      <div ref={mapRef} className="esri-map"></div>
     </div>
   );
 };

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 = {