@eeacms/volto-eea-map 0.1.3 → 0.1.6

package/CHANGELOG.md

@@ -4,8 +4,39 @@ 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).
 
+#### [0.1.6](https://github.com/eea/volto-eea-map/compare/0.1.5...0.1.6)
+
+- Lint fix [`f5561d1`](https://github.com/eea/volto-eea-map/commit/f5561d1581201bd635b4e53e8a46decaf684438f)
+- Map improvements [`c75d16c`](https://github.com/eea/volto-eea-map/commit/c75d16c265136d9f676e194540e613bb742fb51b)
+
+#### [0.1.5](https://github.com/eea/volto-eea-map/compare/0.1.4...0.1.5)
+
+> 4 August 2022
+
+- Develop [`#5`](https://github.com/eea/volto-eea-map/pull/5)
+- Center on extent only on map load [`b63f586`](https://github.com/eea/volto-eea-map/commit/b63f586e0df68faa755bb0d25e297530e36ef7c9)
+- Configure proxy for all map subdomains [`0f19030`](https://github.com/eea/volto-eea-map/commit/0f19030569e1f77b1ff7657669e876519712840f)
+- Prevent unnecessary rerenders of ma [`8752384`](https://github.com/eea/volto-eea-map/commit/8752384b3bbd7b564a25b3e4347c47692106f556)
+- Prevent unnecessary rerenders of map [`00a3e64`](https://github.com/eea/volto-eea-map/commit/00a3e64585748a36ef476b2d75540bdd43778486)
+- Clear print schema [`29ed979`](https://github.com/eea/volto-eea-map/commit/29ed9795812d6673f8fb91ac73e53e4e132ed55a)
+- Move zoom & print in general tab [`06c4996`](https://github.com/eea/volto-eea-map/commit/06c499651217715e1793d2a75fb72668dc1de223)
+- Clear [`9aa7bf1`](https://github.com/eea/volto-eea-map/commit/9aa7bf1591b22a2941ce0f269ef133d687affc15)
+- Disable url for screenshot atm [`1ef18fc`](https://github.com/eea/volto-eea-map/commit/1ef18fc8b7516c88c743cffb10b5eb340161d58d)
+
+#### [0.1.4](https://github.com/eea/volto-eea-map/compare/0.1.3...0.1.4)
+
+> 3 August 2022
+
+- Map updates [`#4`](https://github.com/eea/volto-eea-map/pull/4)
+- Configure Privacy protection screenshot data [`49097c0`](https://github.com/eea/volto-eea-map/commit/49097c0b7aa8657e626d5a49dd0eed84f5e71e78)
+- Expandable Legend [`6edda2f`](https://github.com/eea/volto-eea-map/commit/6edda2fafd8a2a61f3f1f10c47a9ca5bb35a0355)
+- Catch for no data [`7cef4e6`](https://github.com/eea/volto-eea-map/commit/7cef4e641650ede23e37ca9116130db1ef0a18db)
+
 #### [0.1.3](https://github.com/eea/volto-eea-map/compare/0.1.2...0.1.3)
 
+> 2 August 2022
+
+- Center map on first layer [`#3`](https://github.com/eea/volto-eea-map/pull/3)
 - Icons & download/viewer change [`321f538`](https://github.com/eea/volto-eea-map/commit/321f538e9582f9a12db3f64beb26588616e867e2)
 - Inline inputs actions & styles [`1f4787e`](https://github.com/eea/volto-eea-map/commit/1f4787e3b3f0dc1328ff23cca2459db816188e3a)
 - more updates for cy10 [`4d5c6a1`](https://github.com/eea/volto-eea-map/commit/4d5c6a1925413b44acc70b5ad3753378830dba2d)
@@ -18,7 +49,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Clear schema [`4b22f0a`](https://github.com/eea/volto-eea-map/commit/4b22f0aee58cca2bbcd2a8bee9864a01d65e7738)
 - Center on extent control [`9e8b13d`](https://github.com/eea/volto-eea-map/commit/9e8b13dfd5bbfa5eb2419c54444a15fefa384de4)
 - Clear consoles [`798bc2f`](https://github.com/eea/volto-eea-map/commit/798bc2fbf6f77ffadcedcf1e4666b315bc71ea6c)
-- Center map on first layer [`8fbc1ca`](https://github.com/eea/volto-eea-map/commit/8fbc1ca711ceba09e38e841cd7f551c1a8787027)
 
 #### [0.1.2](https://github.com/eea/volto-eea-map/compare/0.1.1...0.1.2)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-map",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "description": "@eeacms/volto-eea-map: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/components/Blocks/EEAMap/Edit.jsx

@@ -2,27 +2,18 @@ import React from 'react';
 import { SidebarPortal } from '@plone/volto/components';
 import BlockDataForm from '@plone/volto/components/manage/Form/BlockDataForm';
 import { Schema } from './Schema';
-import Webmap from './components/Webmap';
+import View from './View';
+import { addPrivacyProtectionToSchema } from '@eeacms/volto-embed';
 import './styles/map.css';
-import ExtraViews from './components/widgets/ExtraViews';
-import {
-  PrivacyProtection,
-  addPrivacyProtectionToSchema,
-} from '@eeacms/volto-embed';
 
 const Edit = (props) => {
   const { block, data, onChangeBlock, selected } = props;
   const schema = React.useMemo(() => Schema(props), [props]);
 
-  const { map_data = {}, height } = data;
   if (__SERVER__) return '';
-
   return (
     <div>
-      <PrivacyProtection data={data} {...props}>
-        <Webmap data={map_data} height={height} />
-        <ExtraViews data={data} />
-      </PrivacyProtection>
+      <View data={data} />
       <SidebarPortal selected={selected}>
         <BlockDataForm
           block={block}

package/src/components/Blocks/EEAMap/components/Webmap.jsx

@@ -15,15 +15,11 @@ const MODULES = [
 ];
 
 const Webmap = (props) => {
-  const { data = {}, editMode, height } = props;
-  const {
-    base = {},
-    layers = {},
-    id,
-    legend = {},
-    print = {},
-    zoom = {},
-  } = data;
+  const { editMode, height } = props;
+
+  const data = React.useMemo(() => props.data || {}, [props.data]);
+
+  const { base = {}, layers = {}, legend = {}, general = {} } = data;
 
   const { base_layer = '' } = base;
 
@@ -39,6 +35,7 @@ const Webmap = (props) => {
 
   const mapRef = React.useRef();
   const [modules, setModules] = React.useState({});
+
   const modules_loaded = React.useRef(false);
 
   React.useEffect(() => {
@@ -71,6 +68,7 @@ const Webmap = (props) => {
     }
   }, [setModules, options]);
 
+  // eslint-disable-next-line no-unused-vars
   const esri = React.useMemo(() => {
     if (Object.keys(modules).length === 0) return {};
     const {
@@ -122,30 +120,28 @@ const Webmap = (props) => {
     const view = new MapView({
       container: mapRef.current,
       map,
-      center: zoom?.long && zoom?.lat ? [zoom.long, zoom.lat] : [0, 40],
-      zoom: zoom?.zoom_level ? zoom?.zoom_level : 2,
+      center:
+        general?.long && general?.lat ? [general.long, general.lat] : [0, 40],
+      zoom: general?.zoom_level ? general?.zoom_level : 2,
       ui: {
         components: ['attribution'],
       },
     });
 
-    if (layers && layers[0] && zoom && zoom.centerOnExtent) {
-      view.whenLayerView(layers[0]).then(function (layerView) {
-        layerView.watch('updating', function (val) {
-          //  view.goTo(response.extent);
-
-          if (!val && layerView) {
-            layerView.queryExtent().then(function (response) {
-              ///go to the extent of all the graphics in the layer view
-              if (response.extent) view.goTo(response.extent);
-            });
-          }
+    if (layers && layers[0] && general && general.centerOnExtent) {
+      const firstLayer = layers[0];
+      firstLayer
+        .when(() => {
+          return firstLayer.queryExtent();
+        })
+        .then((response) => {
+          view.goTo(response.extent);
         });
-      });
     }
 
-    if (zoom?.show_zoom) {
-      const zoomPosition = zoom && zoom.position ? zoom.position : 'top-right';
+    if (general?.show_zoom) {
+      const zoomPosition =
+        general && general.zoom_position ? general.zoom_position : 'top-right';
       const zoomWidget = new Zoom({
         view: view,
       });
@@ -161,7 +157,7 @@ const Webmap = (props) => {
       const legendWidget = new Expand({
         content: new Legend({
           view: view,
-          style: 'classic', // other styles include 'classic'
+          style: 'classic',
         }),
         view: view,
         expanded: false,
@@ -172,9 +168,11 @@ const Webmap = (props) => {
       view.ui.add(legendWidget, legendPosition);
     }
 
-    if (print?.show_print) {
+    if (general?.show_print) {
       const printPosition =
-        print && print.position ? print.position : 'top-right';
+        general && general.print_position
+          ? general.print_position
+          : 'top-right';
       const printWidget = new Expand({
         content: new Print({
           view: view,
@@ -193,9 +191,8 @@ const Webmap = (props) => {
       });
     }
     return { view, map };
-  }, [modules, base_layer, map_layers]);
+  }, [modules, base_layer, map_layers, general, legend]);
 
-  const currentLayerView = esri.view?.layerViews?.items?.[0];
   return (
     <div>
       <div
@@ -209,4 +206,4 @@ const Webmap = (props) => {
   );
 };
 
-export default Webmap;
+export default React.memo(Webmap);

package/src/components/Blocks/EEAMap/components/widgets/ExtraViews.jsx

@@ -16,9 +16,10 @@ const ExtraViews = ({ data }) => {
     show_download,
     show_viewer,
   } = data;
+
   return (
-    <>
-      {(show_download || show_viewer) && (
+    <div className="extra-eea-map-content">
+      {map_data.layers?.map_layers[0] && (show_download || show_viewer) && (
         <div
           style={{ display: 'flex', justifyContent: 'end', margin: '10px 0' }}
         >
@@ -55,7 +56,7 @@ const ExtraViews = ({ data }) => {
       )}
       {show_legend && <LegendWidget data={map_data} />}
       {description && serializeNodes(description)}
-    </>
+    </div>
   );
 };
 

package/src/components/Blocks/EEAMap/components/widgets/LayerSelectWidget.jsx

@@ -9,7 +9,9 @@ import aheadSVG from '@plone/volto/icons/ahead.svg';
 import { fetchArcgisData } from '../../utils';
 
 const LayerSelectWidget = (props) => {
-  const { onChange, value = {}, id } = props;
+  const { onChange, id } = props;
+
+  const value = React.useMemo(() => props.value || {}, [props.value]);
 
   const {
     available_layers,

package/src/components/Blocks/EEAMap/components/widgets/LayersPanel.jsx

@@ -3,7 +3,9 @@ import { Button } from 'semantic-ui-react';
 import LayerSelectWidget from './LayerSelectWidget';
 
 const LayersPanel = ({ data, onChange, block }) => {
-  const { map_layers } = data || {};
+  const map_layers = React.useMemo(() => data.map_layers || [], [
+    data.map_layers,
+  ]);
 
   React.useEffect(() => {
     if (!data.map_layers) {

package/src/components/Blocks/EEAMap/components/widgets/LegendWidget.jsx

@@ -1,30 +1,62 @@
 import React from 'react';
 import { Grid } from 'semantic-ui-react';
 import { fetchArcgisData } from '../../utils';
+import { Icon } from '@plone/volto/components';
+
+import rightKeySVG from '@plone/volto/icons/right-key.svg';
+import downKeySVG from '@plone/volto/icons/down-key.svg';
+
+const LayerLegend = ({ data, name }) => {
+  const [expand, setExpand] = React.useState(true);
 
-const LayerLegend = ({ data }) => {
   return (
     <div style={{ display: 'flex', flexDirection: 'column' }}>
-      {data.length > 0 &&
-        data.map((item, i) => {
-          return (
-            <span key={i} style={{ display: 'flex', alignItems: 'center' }}>
-              <img alt="alt" src={`data:image/png;base64,${item.imageData}`} />
-              <span style={{ fontSize: '13px' }}>{item.label}</span>
-            </span>
-          );
-        })}
+      <h5
+        role="presentation"
+        onClick={() => setExpand(!expand)}
+        style={{
+          marginTop: '10px',
+          marginBottom: '5px',
+          cursor: 'pointer',
+          display: 'flex',
+        }}
+      >
+        <Icon
+          name={expand ? downKeySVG : rightKeySVG}
+          title={expand ? 'Collapse' : 'Expand'}
+          size="17px"
+        />
+        {name}
+      </h5>
+      <div style={{ display: 'flex', flexDirection: 'column' }}>
+        {expand &&
+          data.length > 0 &&
+          data.map((item, i) => {
+            return (
+              <span key={i} style={{ display: 'flex', alignItems: 'center' }}>
+                <img
+                  alt="alt"
+                  src={`data:image/png;base64,${item.imageData}`}
+                />
+                <span style={{ fontSize: '13px', marginLeft: '5px' }}>
+                  {item.label}
+                </span>
+              </span>
+            );
+          })}
+      </div>
     </div>
   );
 };
 
 const LegendWidget = (props) => {
-  const { data = {} } = props;
+  const data = React.useMemo(() => props.data, [props.data]);
   const { layers = {} } = data;
   const { map_layers = [] } = layers;
   const [legendLayers, setLegendLayers] = React.useState([]);
 
   const activeLayer = map_layers.length > 0 ? map_layers[0]?.map_layer : '';
+
   const fetchLegend = async (url) => {
     let legendData = await fetchArcgisData(url);
 
@@ -37,10 +69,11 @@ const LegendWidget = (props) => {
   };
 
   React.useEffect(() => {
-    fetchLegend(`${activeLayer.map_service_url}/legend`);
+    if (activeLayer) {
+      fetchLegend(`${activeLayer.map_service_url}/legend`);
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [data, activeLayer.map_service_url]);
-
   return (
     <>
       <div style={{ margin: '10px 0' }}>
@@ -48,18 +81,19 @@ const LegendWidget = (props) => {
           <Grid.Row>
             <Grid.Column>
               <h3>Legend:</h3>
+              {!activeLayer && (
+                <p>
+                  No layer found for legend. Please add a map layer from editor.
+                </p>
+              )}
               {legendLayers.length > 0 &&
                 legendLayers.map((layer, i) => {
                   return (
-                    <div
+                    <LayerLegend
                       key={i}
-                      style={{ display: 'flex', flexDirection: 'column' }}
-                    >
-                      <h5 style={{ marginTop: '10px', marginBottom: '5px' }}>
-                        {layer?.layerName}
-                      </h5>
-                      <LayerLegend data={layer.legend} />
-                    </div>
+                      name={layer?.layerName}
+                      data={layer?.legend}
+                    />
                   );
                 })}
             </Grid.Column>
@@ -70,4 +104,4 @@ const LegendWidget = (props) => {
   );
 };
 
-export default LegendWidget;
+export default React.memo(LegendWidget);

package/src/components/Blocks/EEAMap/components/widgets/MapEditorWidget.jsx

@@ -7,13 +7,23 @@ import PanelsSchema from './panelsSchema';
 
 const MapEditorWidget = (props) => {
   const [open, setOpen] = React.useState(false);
-  const { onChange = {}, block = {}, value = {}, id } = props;
+  const { onChange = {}, id } = props;
+  const block = React.useMemo(() => props.block, [props.block]);
+  const value = React.useMemo(() => props.value, [props.value]);
+
   const [intValue, setIntValue] = React.useState(value);
 
   const dataForm = { map_data: intValue };
-
   const handleApplyChanges = () => {
     onChange(id, intValue);
+
+    //set map data for screenshot
+    // if (intValue.layers?.map_layers[0].map_layer?.map_service_url) {
+    //   onChange(
+    //     'url',
+    //     `${intValue.layers?.map_layers[0].map_layer?.map_service_url}?f=jsapi`,
+    //   );
+    // }
     setOpen(false);
   };
 

package/src/components/Blocks/EEAMap/components/widgets/panelsSchema.js

@@ -56,45 +56,21 @@ const MapLayersSchema = {
   required: [],
 };
 
-const PrintSchema = {
-  title: 'Print',
-  fieldsets: [
-    {
-      id: 'default',
-      title: 'Print',
-      fields: ['show_print', 'position'],
-    },
-  ],
-  properties: {
-    show_print: {
-      title: 'Show print',
-      type: 'boolean',
-    },
-    position: {
-      title: 'Print position',
-      choices: ['bottom-right', 'bottom-left', 'top-right', 'top-left'].map(
-        (n) => {
-          return [n, n];
-        },
-      ),
-    },
-  },
-  required: [],
-};
-
-const ZoomSchema = ({ data = {} }) => {
-  const centerOnExtent = data?.map_data?.zoom?.centerOnExtent;
+const GeneralSchema = ({ data = {} }) => {
+  const centerOnExtent = data?.map_data?.general?.centerOnExtent;
 
   return {
-    title: 'Zoom',
+    title: 'General',
     fieldsets: [
       {
         id: 'default',
         title: 'Zoom',
         fields: [
+          'show_print',
+          'print_position',
           'show_zoom',
           'centerOnExtent',
-          'position',
+          'zoom_position',
           ...(!centerOnExtent ? ['zoom_level', 'long', 'lat'] : []),
         ],
       },
@@ -107,9 +83,10 @@ const ZoomSchema = ({ data = {} }) => {
       centerOnExtent: {
         title: 'Center on extent',
         type: 'boolean',
-        description: 'This will override latitude/longitude/zoom level',
+        description:
+          'This will override latitude/longitude/zoom level and will lock zoom/moving the map.',
       },
-      position: {
+      zoom_position: {
         title: 'Zoom position',
         choices: ['bottom-right', 'bottom-left', 'top-right', 'top-left'].map(
           (n) => {
@@ -129,13 +106,25 @@ const ZoomSchema = ({ data = {} }) => {
         title: 'Latitude',
         type: 'number',
       },
+      show_print: {
+        title: 'Show print',
+        type: 'boolean',
+      },
+      print_position: {
+        title: 'Print position',
+        choices: ['bottom-right', 'bottom-left', 'top-right', 'top-left'].map(
+          (n) => {
+            return [n, n];
+          },
+        ),
+      },
     },
     required: [],
   };
 };
 
 export default ({ data = {} }) => {
-  const zoomSchema = ZoomSchema({ data });
+  const generalSchema = GeneralSchema({ data });
 
   return {
     title: 'Map Editor',
@@ -151,6 +140,10 @@ export default ({ data = {} }) => {
         title: 'Panels',
         widget: 'object_types_widget',
         schemas: [
+          {
+            id: 'general',
+            schema: generalSchema,
+          },
           {
             id: 'base',
             schema: BaseLayerSchema,
@@ -159,14 +152,6 @@ export default ({ data = {} }) => {
             id: 'layers',
             schema: MapLayersSchema,
           },
-          {
-            id: 'print',
-            schema: PrintSchema,
-          },
-          {
-            id: 'zoom',
-            schema: zoomSchema,
-          },
         ],
       },
     },

package/src/index.js

@@ -5,6 +5,21 @@ import MapEditorWidget from './components/Blocks/EEAMap/components/widgets/MapEd
 import ObjectTypesWidget from './components/Blocks/EEAMap/components/widgets/ObjectTypesWidget';
 
 export default (config) => {
+  config.settings.allowed_cors_destinations = [
+    ...(config.settings.allowed_cors_destinations || []),
+    'land.discomap.eea.europa.eu',
+    'marine.discomap.eea.europa.eu',
+    'climate.discomap.eea.europa.eu',
+    'image.discomap.eea.europa.eu',
+    'ldp.discomap.eea.europa.eu',
+    'bio.discomap.eea.europa.eu',
+    'air.discomap.eea.europa.eu',
+    'maratlas.discomap.eea.europa.eu',
+    'forest.discomap.eea.europa.eu',
+    'water.discomap.eea.europa.eu',
+    'noise.discomap.eea.europa.eu',
+    'copernicus.discomap.eea.europa.eu',
+  ];
   config.blocks.blocksConfig.eea_map_block = {
     id: 'eea_map_block', // The name (id) of the block
     title: 'EEA Map', // The display name of the block