@eeacms/volto-eea-map 2.0.2 → 2.0.5

package/CHANGELOG.md

@@ -4,6 +4,27 @@ 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.5](https://github.com/eea/volto-eea-map/compare/2.0.4...2.0.5) - 23 August 2023
+
+#### :bug: Bug Fixes
+
+- fix: remove height on PP [Andrei Grigore - [`9039dd5`](https://github.com/eea/volto-eea-map/commit/9039dd5b037c0f3dcdf44bc74f2b58bbb525f0e4)]
+
+### [2.0.4](https://github.com/eea/volto-eea-map/compare/2.0.3...2.0.4) - 23 August 2023
+
+#### :bug: Bug Fixes
+
+- fix: remove height on PP [Andrei Grigore - [`ee786bf`](https://github.com/eea/volto-eea-map/commit/ee786bf82281acac87050916992fe4735b2e94a7)]
+
+#### :hammer_and_wrench: Others
+
+- test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`ce5c385`](https://github.com/eea/volto-eea-map/commit/ce5c3857ebbeac1d3e9e53dbbcd432a796bdee9c)]
+### [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)]
+
 ### [2.0.2](https://github.com/eea/volto-eea-map/compare/2.0.1...2.0.2) - 14 August 2023
 
 #### :bug: Bug Fixes

package/docker-compose.yml

@@ -1,11 +1,12 @@
 version: "3"
 services:
   backend:
-    image: plone/plone-backend:${PLONE_VERSION:-6}
+    image: eeacms/plone-backend
     ports:
       - "8080:8080"
     environment:
       SITE: "Plone"
+      PROFILES: "eea.kitkat:testing"
 
   frontend: 
     build:
@@ -23,6 +24,9 @@ services:
     volumes:
       - ./:/app/src/addons/${ADDON_PATH}
     environment:
+      CI: "true"
+      NODE_ENV: "development"
+      RAZZLE_JEST_CONFIG: "src/addons/${ADDON_PATH}/jest-addon.config.js"
       RAZZLE_INTERNAL_API_PATH: "http://backend:8080/Plone"
       RAZZLE_DEV_PROXY_API_PATH: "http://backend:8080/Plone"
       HOST: "0.0.0.0"

package/package.json

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

@@ -21,6 +21,29 @@ const Edit = (props) => {
   const [mapData, setMapData] = React.useState('');
   const data = React.useMemo(() => props.data, [props.data]);
   const { height = '' } = data;
+
+  React.useEffect(() => {
+    if (!Object.hasOwn(data, 'show_legend')) {
+      onChangeBlock(block, {
+        ...data,
+        show_legend: true,
+      });
+    }
+    if (!Object.hasOwn(data, 'show_sources')) {
+      onChangeBlock(block, {
+        ...data,
+        show_sources: true,
+      });
+    }
+    if (!Object.hasOwn(data, 'dataprotection')) {
+      onChangeBlock(block, {
+        ...data,
+        dataprotection: { enabled: true },
+      });
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [data.show_legend, data.show_sources, data.dataprotection]);
+
   React.useEffect(() => {
     if (props.data.vis_url) {
       props.getVisualization(expandToBackendURL(props.data.vis_url));

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

@@ -111,12 +111,10 @@ export const Schema = (props) => {
         title: 'Show sources',
         description: 'Will show sources set in this page Data provenance',
         type: 'boolean',
-        defaultValue: true,
       },
       show_legend: {
         title: 'Show legend',
         type: 'boolean',
-        defaultValue: true,
       },
       show_viewer: {
         title: 'Show API link',

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

@@ -44,7 +44,7 @@ const View = (props) => {
   ]);
 
   return (
-    <PrivacyProtection data={data} height={height} {...props}>
+    <PrivacyProtection data={data} {...props}>
       {mapData && (
         <div>
           <Webmap data={mapData} height={height} />

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>
   );
 };