@eeacms/volto-eea-map 3.2.0 → 3.3.0

package/CHANGELOG.md

@@ -4,11 +4,25 @@ 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.2.0](https://github.com/eea/volto-eea-map/compare/3.1.0...3.2.0) - 13 December 2023
+### [3.3.0](https://github.com/eea/volto-eea-map/compare/3.2.1...3.3.0) - 17 January 2024
 
 #### :rocket: New Features
 
-- feat: use data_query from connected_data_parameters defined in volto-datablocks [Miu Razvan - [`e755c7d`](https://github.com/eea/volto-eea-map/commit/e755c7d3f3076d751cbace7ac69c19d7fcf37ba9)]
+- feat: show embed error + always show sources [Razvan - [`35f5465`](https://github.com/eea/volto-eea-map/commit/35f546574d347716ce043a482e7eda55a0180d44)]
+
+#### :house: Internal changes
+
+
+#### :hammer_and_wrench: Others
+
+- Release 3.3.0 [Alin Voinea - [`8b21828`](https://github.com/eea/volto-eea-map/commit/8b2182871b3d13d0e9164d99d2964e3999e8cc48)]
+- use arcgis map for screenshot [andreiggr - [`94cc865`](https://github.com/eea/volto-eea-map/commit/94cc8651667ab351fc761b810634f3b124d6e6bb)]
+- update checks to support older javascript engines(screenshoter) [andreiggr - [`7b58516`](https://github.com/eea/volto-eea-map/commit/7b5851628160a8ff474c6405a0285014eb7da05f)]
+- better check map layers [andreiggr - [`d3e7d6b`](https://github.com/eea/volto-eea-map/commit/d3e7d6bfaa2e06b5de40c1e13bf9d39241d2c0c0)]
+- PP screenshot to mapserver jsapi app [andreiggr - [`a0b4dd4`](https://github.com/eea/volto-eea-map/commit/a0b4dd4033e43bc34b11ede95435a7c76a0cb6b8)]
+### [3.2.1](https://github.com/eea/volto-eea-map/compare/3.2.0...3.2.1) - 13 December 2023
+
+### [3.2.0](https://github.com/eea/volto-eea-map/compare/3.1.0...3.2.0) - 13 December 2023
 
 #### :bug: Bug Fixes
 

package/package.json

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

@@ -33,7 +33,6 @@ const Edit = (props) => {
     enable_queries,
     show_legend = true,
     show_note = true,
-    show_sources = true,
     show_more_info = true,
     show_share = true,
     dataprotection = { enabled: true },
@@ -66,7 +65,7 @@ const Edit = (props) => {
 
   useEffect(() => {
     const mapVisId = flattenToAppURL(map_visualization_data['@id'] || '');
-    if (vis_url && vis_url !== mapVisId) {
+    if (!map_visualization_data?.error && vis_url && vis_url !== mapVisId) {
       getContent(vis_url, null, id);
     }
     if (!vis_url) {
@@ -118,7 +117,7 @@ const Edit = (props) => {
               ...data,
               show_legend,
               show_note,
-              show_sources,
+              show_sources: true,
               show_more_info,
               show_share,
               dataprotection,

package/src/components/Blocks/EmbedEEAMap/Schema.js

@@ -86,7 +86,6 @@ export const Schema = (props) => {
           'show_legend',
           'show_viewer',
           'show_note',
-          'show_sources',
           'show_more_info',
           'show_share',
         ],

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

@@ -13,7 +13,6 @@ const View = (props) => {
     enable_queries,
     show_legend = true,
     show_note = true,
-    show_sources = true,
     show_more_info = true,
     show_share = true,
     dataprotection = { enabled: true },
@@ -35,11 +34,22 @@ const View = (props) => {
     setMapData(updatedMapData);
   }, [map_visualization_data, data_query_params, enable_queries]);
 
+  const mapUrl = map_visualization_data?.layers?.map_layers[0]?.map_layer
+    ?.map_service_url
+    ? `${map_visualization_data.layers.map_layers[0].map_layer.map_service_url}?f=jsapi`
+    : '';
+
+  if (map_visualization_data?.error) {
+    return (
+      <p dangerouslySetInnerHTML={{ __html: map_visualization_data.error }} />
+    );
+  }
+
   return (
     <PrivacyProtection
-      data={data}
       className="embed-map-visualization"
       {...props}
+      data={mapUrl ? { ...data, url: mapUrl } : data}
     >
       {!!mapData && (
         <>
@@ -49,7 +59,7 @@ const View = (props) => {
               ...data,
               show_legend,
               show_note,
-              show_sources,
+              show_sources: true,
               show_more_info,
               show_share,
               dataprotection,

package/src/components/LegendView.jsx

@@ -11,7 +11,10 @@ import codeSVG from '@eeacms/volto-eea-map/static/code-line.svg';
 const LayerLegend = ({ data, show_viewer }) => {
   const [legendRows, setLegendRows] = React.useState([]);
 
-  const { map_service_url = '', layer = {} } = data;
+  const map_service_url =
+    data && data.map_service_url ? data.map_service_url : '';
+
+  const layer = data && data.layer ? data.layer : {};
   const { id, name } = layer || {};
 
   const fetchLegend = async (url, activeLayerID) => {
@@ -23,11 +26,11 @@ const LayerLegend = ({ data, show_viewer }) => {
   };
 
   React.useEffect(() => {
-    if (data.map_service_url && id !== undefined) {
+    if (data?.map_service_url && id !== undefined) {
       fetchLegend(`${data.map_service_url}/legend`, id);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [id, data.map_service_url]);
+  }, [id, data]);
 
   return (
     <Grid.Column>
@@ -61,7 +64,7 @@ const LayerLegend = ({ data, show_viewer }) => {
           </a>
         )}
       </div>
-      {data.description && serializeNodes(data.description)}
+      {data?.description && serializeNodes(data.description)}
       <div style={{ display: 'flex', flexDirection: 'column' }}>
         {legendRows.length > 0 &&
           legendRows.map((item, i) => {

package/src/components/Webmap.jsx

@@ -21,25 +21,20 @@ const MODULES = [
 ];
 
 const Webmap = (props) => {
-  const { editMode, height, id } = props;
-
-  const device = React.useMemo(() => props.device || {}, [props.device]);
-
-  const data = React.useMemo(() => props.data || {}, [props.data]);
-
-  const layers = React.useMemo(() => props?.data?.layers || {}, [
-    props.data.layers,
-  ]);
-  const base = React.useMemo(() => props?.data?.base || {}, [props.data.base]);
-
-  const general = React.useMemo(() => props?.data?.general || {}, [
-    props.data.general,
-  ]);
-  const styles = React.useMemo(() => props?.data?.styles || {}, [
-    props.data.styles,
-  ]);
-
-  const { base_layer = '' } = base;
+  const editMode = props && props.editMode ? props.editMode : false;
+  const height = props && props.height ? props.height : '';
+  const id = props && props.id ? props.id : '';
+  const device = props && props.device ? props.device : {};
+  const data = props && props.data ? props.data : {};
+
+  const layers =
+    props && props.data && props.data.layers ? props.data.layers : {};
+  const base = props && props.data && props.data.base ? props.data.base : {};
+  const general =
+    props && props.data && props.data.general ? props.data.general : {};
+  const styles =
+    props && props.data && props.data.styles ? props.data.styles : {};
+  const base_layer = base && base.base_layer ? base.base_layer : '';
 
   const map_layers =
     layers &&
@@ -146,7 +141,7 @@ const Webmap = (props) => {
             .map(
               (
                 {
-                  map_service_url,
+                  map_service_url = '',
                   layer,
                   fullLayer,
                   query = '',

package/src/components/visualization/VisualizationView.jsx

@@ -6,9 +6,12 @@ import Webmap from '../Webmap';
 import ExtraViews from '../ExtraViews';
 
 const VisualizationView = (props) => {
-  const { content = {} } = props;
+  const content = props && props.content ? props.content : {};
 
-  const { map_visualization_data = {} } = content;
+  const map_visualization_data =
+    content && content.map_visualization_data
+      ? content.map_visualization_data
+      : {};
 
   return (
     <div id="page-document" className="view-viewarcgismap">