@eeacms/volto-eea-map 0.1.24 → 0.1.26

package/CHANGELOG.md

@@ -4,12 +4,31 @@ 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.26](https://github.com/eea/volto-eea-map/compare/0.1.25...0.1.26) - 4 October 2022
+
+#### :hammer_and_wrench: Others
+
+- add integration to cypress [andreiggr - [`b92ab76`](https://github.com/eea/volto-eea-map/commit/b92ab764603088013894a0be6f84824fb6586464)]
+- fix plugins cypress [andreiggr - [`61e3194`](https://github.com/eea/volto-eea-map/commit/61e319434b1e877dbb4fd29d5ca3d2028d9b5e0b)]
+- use volto vers from env [andreiggr - [`52db93f`](https://github.com/eea/volto-eea-map/commit/52db93f8561e6b90e5d7569b3005e3ebb5274b26)]
+- replace all alpha with specific alpha version [andreiggr - [`f0f1802`](https://github.com/eea/volto-eea-map/commit/f0f18026298e1cc061d62d82e320bf2066496c77)]
+- update jenkins dependencies [andreiggr - [`d2bc043`](https://github.com/eea/volto-eea-map/commit/d2bc043f4039192d0b18bccb0c26ae8cae3d1089)]
+- use specific volto alpha version [andreiggr - [`209988d`](https://github.com/eea/volto-eea-map/commit/209988df8e23fb5bc4631b8326740ea9d2969195)]
+- Raster layer different centering mechanism [andreiggr - [`74c5fa5`](https://github.com/eea/volto-eea-map/commit/74c5fa57522197e621c9c4ba05f6b9cbed2b0e8f)]
+- show raster layer [andreiggr - [`3193689`](https://github.com/eea/volto-eea-map/commit/3193689982db041ac343389e456db7a79447361d)]
+- changes for hide layer in legend [andreiggr - [`5176df9`](https://github.com/eea/volto-eea-map/commit/5176df9971efb308f1e02f510021bf42d9a7c05c)]
+- clean code [andreiggr - [`be3b1b8`](https://github.com/eea/volto-eea-map/commit/be3b1b86db7e5b243d3650cda17332bbbc70c71b)]
+- hide layer in legend [andreiggr - [`675f1ba`](https://github.com/eea/volto-eea-map/commit/675f1ba4aec7037b2a7c28b73a075c0a93616546)]
+### [0.1.25](https://github.com/eea/volto-eea-map/compare/0.1.24...0.1.25) - 27 September 2022
+
+#### :hammer_and_wrench: Others
+
+- Edit privacy schema [andreiggr - [`be71616`](https://github.com/eea/volto-eea-map/commit/be716166e61a11ab76a0081bf4c578f1ff748819)]
 ### [0.1.24](https://github.com/eea/volto-eea-map/compare/0.1.23...0.1.24) - 21 September 2022
 
 #### :hammer_and_wrench: Others
 
 - remove renderer module [andreiggr - [`d55e99c`](https://github.com/eea/volto-eea-map/commit/d55e99c189b79727f6e076ded737b920bead4c7d)]
-- map layer proper url [andreiggr - [`297186d`](https://github.com/eea/volto-eea-map/commit/297186daeb52c7a01f134bd4c2f0ed778aa01238)]
 ### [0.1.23](https://github.com/eea/volto-eea-map/compare/0.1.22...0.1.23) - 15 September 2022
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-map",
-  "version": "0.1.24",
+  "version": "0.1.26",
   "description": "@eeacms/volto-eea-map: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -31,7 +31,8 @@
   "devDependencies": {
     "@cypress/code-coverage": "^3.9.5",
     "babel-plugin-transform-class-properties": "^6.24.1",
-    "cypress": "10.3.1"
+    "cypress": "10.3.1",
+    "md5": "^2.3.0"
   },
   "scripts": {
     "release": "release-it",

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

@@ -9,7 +9,6 @@ import { getContent } from '@plone/volto/actions';
 import BlockDataForm from '@plone/volto/components/manage/Form/BlockDataForm';
 import View from './View';
 import { Schema } from './Schema';
-import { addPrivacyProtectionToSchema } from '@eeacms/volto-embed';
 import '../../../styles/map.css';
 
 import _ from 'lodash';
@@ -42,7 +41,7 @@ const Edit = (props) => {
         <BlockDataForm
           block={block}
           title={schema.title}
-          schema={addPrivacyProtectionToSchema(schema)}
+          schema={schema}
           onChangeField={(id, value) => {
             onChangeBlock(block, {
               ...data,

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

@@ -1,3 +1,68 @@
+const ProtectionSchema = () => ({
+  title: 'Data Protection',
+
+  fieldsets: [
+    {
+      id: 'default',
+      title: 'Default',
+      fields: [
+        'privacy_statement',
+        'privacy_cookie_key',
+        'enabled',
+        'background_image',
+      ],
+    },
+  ],
+
+  properties: {
+    privacy_statement: {
+      title: 'Privacy statement',
+      description: 'Defined in template. Change only if necessary',
+      widget: 'slate_richtext',
+      className: 'slate-Widget',
+      defaultValue: [
+        {
+          children: [
+            {
+              text:
+                'This map is hosted by a third party, Environmental Systems Research Institute. By showing the external content you accept the terms and conditions of ',
+            },
+            {
+              type: 'a',
+              url: 'https://www.esri.com',
+              children: [
+                {
+                  text: 'esri.com',
+                },
+              ],
+            },
+            {
+              text:
+                '. This includes their cookie policies, which we have no control over.',
+            },
+          ],
+        },
+      ],
+    },
+    privacy_cookie_key: {
+      title: 'Privacy cookie key',
+      description: 'Use default for Esri maps, otherwise change',
+      defaultValue: 'esri-maps',
+    },
+    enabled: {
+      title: 'Data protection disclaimer enabled',
+      description: 'Enable/disable the privacy protection',
+      type: 'boolean',
+    },
+    background_image: {
+      title: 'Static map preview image',
+      widget: 'file',
+    },
+  },
+
+  required: [],
+});
+
 export const Schema = (props) => {
   return {
     title: 'Embed EEA Map Block',
@@ -14,6 +79,7 @@ export const Schema = (props) => {
           'show_sources',
           'enable_queries',
           ...(props.data.enable_queries ? ['data_query_params'] : []),
+          'dataprotection',
         ],
       },
     ],
@@ -56,6 +122,10 @@ export const Schema = (props) => {
           'When using page level parameters to filter the map, please map those to the corresponding field name from the ArcGIS service',
         widget: 'data_query_widget',
       },
+      dataprotection: {
+        widget: 'object',
+        schema: ProtectionSchema(),
+      },
     },
     required: [],
   };

package/src/components/Webmap.jsx

@@ -17,6 +17,50 @@ const MODULES = [
   'esri/widgets/ScaleBar',
 ];
 
+//TODO: set group layers sublayers, for direct group import. Maybe also
+// const setGroupLayers = async (ids, data, modules) => {
+//   const { map_service_url, sublayerDatalayer, fullLayer, query = '' } =
+//     data || {};
+//   const { FeatureLayer, MapImageLayer, GroupLayer } = modules;
+
+//   const glLayers = await Promise.all(
+//     ids.map(async (id) => {
+//       const sublayerUrl = `${map_service_url}/${id}`;
+//       let sublayerData = await fetchArcGISData(sublayerUrl);
+//       let sublayer;
+//       switch (sublayerData.type) {
+//         case 'Raster Layer':
+//           sublayer = new MapImageLayer({
+//             url: map_service_url,
+//             minScale: sublayerData?.minScale,
+//             maxScale: sublayerData?.maxScale,
+//             sublayers: [
+//               {
+//                 id: sublayerData.id,
+//                 visible: true,
+//                 definitionExpression: query ? formatQuery(query, 'sql') : '',
+//               },
+//             ],
+//           });
+//           break;
+//         case 'Feature Layer':
+//           sublayer = new FeatureLayer({
+//             layerId: sublayerData.id,
+//             url: `${map_service_url}/${sublayerData.id}`,
+//             definitionExpression: query ? formatQuery(query, 'sql') : '',
+//             minScale: sublayerData?.minScale,
+//             maxScale: sublayerData?.maxScale,
+//           });
+//           break;
+//         default:
+//           break;
+//       }
+//       return sublayer;
+//     }),
+//   );
+//   return glLayers;
+// };
+
 const Webmap = (props) => {
   const { editMode, height, id } = props;
 
@@ -101,8 +145,16 @@ const Webmap = (props) => {
                 case 'Raster Layer':
                   mapLayer = new MapImageLayer({
                     url: map_service_url,
-                    minScale: layer?.minScale,
-                    maxScale: layer?.maxScale,
+                    sublayers: [
+                      {
+                        id: layer.id,
+                        minScale: layer?.minScale,
+                        maxScale: layer?.maxScale,
+                        definitionExpression: query
+                          ? formatQuery(query, 'sql')
+                          : '',
+                      },
+                    ],
                   });
                   break;
                 case 'Feature Layer':
@@ -116,8 +168,15 @@ const Webmap = (props) => {
                     maxScale: layer?.maxScale,
                   });
                   break;
-                case 'Group Layer':
-                  mapLayer = new GroupLayer({ url });
+                  //// case 'Group Layer':
+                  //   mapLayer = new GroupLayer({ title: layer.title });
+                  //   // mapLayer.addMany(
+                  //   //   setGroupLayers(
+                  //   //     layer.sublayersIds,
+                  //   //     { map_service_url, layer, fullLayer, query },
+                  //   //     modules,
+                  //   //   ),
+                  //   // );
                   break;
                 default:
                   break;
@@ -152,13 +211,20 @@ const Webmap = (props) => {
 
     if (layers && layers[0] && general && general.centerOnExtent) {
       const firstLayer = layers[0];
-      firstLayer
-        .when(() => {
-          return firstLayer.queryExtent();
-        })
-        .then((response) => {
-          view.goTo(response.extent);
+      if (firstLayer.type === 'feature') {
+        firstLayer
+          .when(() => {
+            return firstLayer.queryExtent();
+          })
+          .then((response) => {
+            view.goTo(response.extent);
+          });
+      }
+      if (firstLayer.type === 'map-image') {
+        firstLayer.when(() => {
+          view.goTo(firstLayer.fullExtent);
         });
+      }
     }
 
     const zoomPosition =

package/src/components/visualization/VisualizationEditorWidget.jsx

@@ -39,6 +39,7 @@ const VisualizationEditorWidget = (props) => {
           print_position: 'top-right',
           zoom_position: 'top-right',
           centerOnExtent: true,
+          scalebar: 'metric',
         },
       });
     }

package/src/components/widgets/LayerSelectWidget.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Icon } from '@plone/volto/components';
-import { Input, Select, Button, Grid } from 'semantic-ui-react';
+import { Input, Select, Button, Grid, Checkbox } from 'semantic-ui-react';
 import { QueryBuilder } from 'react-querybuilder';
 import 'react-querybuilder/dist/query-builder.css';
 
@@ -31,6 +31,7 @@ const LayerSelectWidget = (props) => {
     fields = [],
     query = '',
     description = '',
+    hide = false,
   } = value;
 
   const [mapData, setMapData] = React.useState(map_data);
@@ -53,11 +54,18 @@ const LayerSelectWidget = (props) => {
       setMapData(mapData);
       setServiceUrlError('');
       if (mapData.layers && mapData.layers.length > 0) {
-        setAvailableLayers(
-          mapData.layers.map((layer, i) => {
-            return { key: layer.id, value: layer, text: layer.name };
-          }),
-        );
+        const mappedLayers = mapData.layers
+          .filter(
+            (layer) => layer && layer.type && layer.type !== 'Group Layer',
+          )
+          .map((layer, i) => {
+            return {
+              key: layer.id,
+              value: layer,
+              text: `${layer.name} (${layer.type})`,
+            };
+          });
+        setAvailableLayers(mappedLayers);
       }
       onChange(id, {
         ...value,
@@ -66,6 +74,7 @@ const LayerSelectWidget = (props) => {
         available_layers: availableLayers,
         map_data: mapData,
         description,
+        hide,
       });
     } catch (e) {
       setCheckColor('youtube');
@@ -183,6 +192,14 @@ const LayerSelectWidget = (props) => {
     setSelectedLayer(layer);
     setMapData(map_data);
   };
+
+  const handleHideInLegend = (v) => {
+    onChange(id, {
+      ...value,
+      hide: v,
+    });
+  };
+
   return (
     <div
       style={{
@@ -266,7 +283,7 @@ const LayerSelectWidget = (props) => {
             </Grid.Row>
           </div>
         )}
-        {availableLayers && availableLayers.length > 0 && (
+        {availableLayers && availableLayers.length > 0 && selectedLayer && (
           <div className="spaced-row">
             <Grid.Row stretched>
               <h5 style={{ padding: '0', margin: '15px 0px 5px 0px' }}>
@@ -285,6 +302,14 @@ const LayerSelectWidget = (props) => {
                 />
               </div>
             </Grid.Row>
+            <Grid.Row stretched>
+              <h5>Hide in legend:</h5>{' '}
+              <Checkbox
+                label="Layer will be hidden in legend"
+                checked={hide}
+                onChange={(e, { checked }) => handleHideInLegend(checked)}
+              />
+            </Grid.Row>
           </div>
         )}
         {availableLayers && fields && fields.length > 0 && (

package/src/components/widgets/LegendWidget.jsx

@@ -107,8 +107,12 @@ const LegendWidget = (props) => {
       ? layers?.map_layers.slice(0, 3)
       : layers?.map_layers;
 
+  const visible_layers = map_layers
+    ? map_layers.filter((l) => !l?.map_layer?.hide)
+    : '';
+
   const legendColumns =
-    map_layers && setLegendColumns(map_layers.length, device);
+    visible_layers && setLegendColumns(visible_layers.length, device);
   return (
     <>
       <div className="legend-container">
@@ -123,16 +127,16 @@ const LegendWidget = (props) => {
           </h3>
         </button>
         <Grid columns={legendColumns}>
-          {(!map_layers || map_layers.length === 0) && (
+          {(!visible_layers || visible_layers.length === 0) && (
             <p>
               No layer found for legend. Please add a map layer from editor.
             </p>
           )}
           {expand && (
             <Grid.Row divided>
-              {map_layers &&
-                map_layers.length > 0 &&
-                map_layers.map((l, i) => (
+              {visible_layers &&
+                visible_layers.length > 0 &&
+                visible_layers.map((l, i) => (
                   <LayerLegend
                     key={i}
                     data={l.map_layer}