@eeacms/volto-eea-map 0.1.2 → 0.1.5

package/CHANGELOG.md

@@ -4,8 +4,49 @@ 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.5](https://github.com/eea/volto-eea-map/compare/0.1.4...0.1.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)
+- updates for cy10 [`30e0293`](https://github.com/eea/volto-eea-map/commit/30e0293ed79cad3cf3f62bcacd3c14a5627543bd)
+- upgrade to cypress 10 [`fe9ca3e`](https://github.com/eea/volto-eea-map/commit/fe9ca3e6a98dd02c6b774f931fe73f18712e0e7b)
+- padding & menu dimension [`da27ccd`](https://github.com/eea/volto-eea-map/commit/da27ccd2b0b42fb5c325a76bdde63e92216b1c93)
+- general tab settings move to block schema [`075baed`](https://github.com/eea/volto-eea-map/commit/075baed1629964b40d355c8612498e02a16eedfc)
+- enable conditional editor schema [`801f3c1`](https://github.com/eea/volto-eea-map/commit/801f3c1999b9b7373d1093d3835d62df8bd2fbca)
+- run cypress on latest alpha [`0935ace`](https://github.com/eea/volto-eea-map/commit/0935aceedb0963b770aa9579c2c21a4f543513c3)
+- 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)
+
 #### [0.1.2](https://github.com/eea/volto-eea-map/compare/0.1.1...0.1.2)
 
+> 29 July 2022
+
+- Develop [`#2`](https://github.com/eea/volto-eea-map/pull/2)
 - Legend only selected layer [`3474d79`](https://github.com/eea/volto-eea-map/commit/3474d7989321f656397c292bddc289f8f6329a8e)
 - Query layer by existing fields [`52363f5`](https://github.com/eea/volto-eea-map/commit/52363f57a9ab4e49c7418e883bdf0c5bb30c1734)
 - Cleanup [`d4e07b2`](https://github.com/eea/volto-eea-map/commit/d4e07b2fb89a5a27f5e4411047cb43e1c8add769)

package/cypress.config.js

@@ -0,0 +1,36 @@
+const { defineConfig } = require('cypress');
+
+module.exports = defineConfig({
+  viewportWidth: 1280,
+  defaultCommandTimeout: 8888,
+  chromeWebSecurity: false,
+  reporter: 'junit',
+  video: true,
+
+  retries: {
+    runMode: 8,
+    openMode: 0,
+  },
+
+  reporterOptions: {
+    mochaFile: 'cypress/reports/cypress-[hash].xml',
+    jenkinsMode: true,
+    toConsole: true,
+  },
+
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    // setupNodeEvents(on, config) {
+    //   return require('./cypress/plugins/index.js')(on, config);
+    // },
+    baseUrl: 'http://localhost:3000',
+  },
+
+  component: {
+    devServer: {
+      framework: 'react',
+      bundler: 'webpack',
+    },
+  },
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-map",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "description": "@eeacms/volto-eea-map: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -21,14 +21,15 @@
     "volto-slate"
   ],
   "dependencies": {
-    "esri-loader": "3.5.0",
-    "@plone/scripts": "*",
     "@eeacms/volto-embed": "^2.0.1",
+    "@plone/scripts": "*",
+    "esri-loader": "3.5.0",
     "volto-slate": "*"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.9.5",
-    "babel-plugin-transform-class-properties": "^6.24.1"
+    "babel-plugin-transform-class-properties": "^6.24.1",
+    "cypress": "10.3.1"
   },
   "scripts": {
     "release": "release-it",

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

@@ -16,7 +16,6 @@ const Edit = (props) => {
 
   const { map_data = {}, height } = data;
   if (__SERVER__) return '';
-
   return (
     <div>
       <PrivacyProtection data={data} {...props}>

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

@@ -5,7 +5,15 @@ export const Schema = () => {
       {
         id: 'default',
         title: 'Default',
-        fields: ['description', 'height', 'map_data'],
+        fields: [
+          'description',
+          'height',
+          'map_data',
+          'show_sources',
+          'show_legend',
+          'show_download',
+          'show_viewer',
+        ],
       },
     ],
     properties: {
@@ -22,6 +30,22 @@ export const Schema = () => {
         description: 'Open the map customization interface',
         widget: 'map_edit_widget',
       },
+      show_sources: {
+        title: 'Show sources',
+        type: 'boolean',
+      },
+      show_legend: {
+        title: 'Show legend',
+        type: 'boolean',
+      },
+      show_download: {
+        title: 'Show download',
+        type: 'boolean',
+      },
+      show_viewer: {
+        title: 'Show web viewer',
+        type: 'boolean',
+      },
     },
     required: [],
   };

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 = {}, id, 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(() => {
@@ -114,13 +111,6 @@ const Webmap = (props) => {
           return mapLayer;
         });
 
-    // //this next layer will be used to filter country and intersect with existing layer
-    // const allCountriesLayer = new FeatureLayer({
-    //   url:
-    //     'https://trial.discomap.eea.europa.eu/arcgis/rest/services/CLMS/WorldCountries/MapServer/1',
-    //   definitionExpression: `(CNTR_ID = 'BG')`,
-    // });
-
     const map = new Map({
       basemap: base_layer || 'hybrid',
       layers,
@@ -129,15 +119,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 (zoom?.show_zoom) {
-      const zoomPosition = zoom && zoom.position ? zoom.position : 'top-right';
+    if (layers && layers[0] && general && general.centerOnExtent) {
+      const firstLayer = layers[0];
+      firstLayer
+        .when(() => {
+          return firstLayer.queryExtent();
+        })
+        .then((response) => {
+          view.goTo(response.extent);
+        });
+    }
+
+    if (general?.show_zoom) {
+      const zoomPosition =
+        general && general.zoom_position ? general.zoom_position : 'top-right';
       const zoomWidget = new Zoom({
         view: view,
       });
@@ -164,9 +167,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,
@@ -201,4 +206,4 @@ const Webmap = (props) => {
   );
 };
 
-export default Webmap;
+export default React.memo(Webmap);

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

@@ -9,28 +9,34 @@ import worldSVG from '@plone/volto/icons/world.svg';
 import downloadSVG from '@plone/volto/icons/download.svg';
 
 const ExtraViews = ({ data }) => {
-  const { map_data = {}, description } = data;
-  const { general = {} } = map_data;
+  const {
+    map_data = {},
+    description,
+    show_legend,
+    show_download,
+    show_viewer,
+  } = data;
+
   return (
     <>
-      {general.show_legend && <LegendWidget data={map_data} />}
-      {description && serializeNodes(description)}
-      {(general.show_download || general.show_viewer) && (
+      {map_data.layers?.map_layers[0] && (show_download || show_viewer) && (
         <div
           style={{ display: 'flex', justifyContent: 'end', margin: '10px 0' }}
         >
-          {general.show_download && (
+          {show_download && (
             <a
               target="_blank"
               rel="noreferrer"
               href={`${map_data.layers.map_layers[0].map_layer.map_service_url}?f=lyr&v=9.3`}
             >
               <Button size="tiny">
-                <Icon name={downloadSVG} title="Download" size="25px" />
+                <Button.Content>
+                  <Icon name={downloadSVG} title="Download" size="25px" />
+                </Button.Content>
               </Button>
             </a>
           )}
-          {general.show_viewer && (
+          {show_viewer && (
             <a
               target="_blank"
               rel="noreferrer"
@@ -40,12 +46,16 @@ const ExtraViews = ({ data }) => {
               }
             >
               <Button size="tiny">
-                <Icon name={worldSVG} title="Check Url" size="25px" />
+                <Button.Content>
+                  <Icon name={worldSVG} title="View map" size="25px" />
+                </Button.Content>
               </Button>
             </a>
           )}
         </div>
       )}
+      {show_legend && <LegendWidget data={map_data} />}
+      {description && serializeNodes(description)}
     </>
   );
 };

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

@@ -4,11 +4,14 @@ import { Input, Select, Button, Grid } from 'semantic-ui-react';
 
 import checkSVG from '@plone/volto/icons/check.svg';
 import closeSVG from '@plone/volto/icons/clear.svg';
+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,
@@ -97,30 +100,26 @@ const LayerSelectWidget = (props) => {
           <Input
             type="text"
             onChange={(e, { value }) => setServiceUrl(value)}
-            style={{ width: '100%' }}
+            style={{ width: '70%' }}
             value={serviceUrl}
-          />
-          <Grid.Row>
+            action
+            actionPosition="right"
+          >
+            <input />
             <Button
-              style={{
-                margin: '10px 0',
-                display: 'flex',
-                alignItems: 'center',
-              }}
+              type="submit"
+              size="tiny"
+              compact
               color={checkColor}
               onClick={handleServiceUrlCheck}
             >
-              <p style={{ fontSize: '14px', margin: '0', marginRight: '5px' }}>
-                Check Url
-              </p>
               <Icon
                 name={serviceUrlError ? closeSVG : checkSVG}
-                style={{ marginLeft: '5px' }}
                 title="Check Url"
                 size="17px"
               />
             </Button>
-          </Grid.Row>
+          </Input>
         </Grid.Row>
         <h4>Layer</h4>
         <Grid.Row>
@@ -137,26 +136,28 @@ const LayerSelectWidget = (props) => {
           <Input
             type="text"
             onChange={(e, { value }) => setLayerQuery(value)}
-            style={{ width: '100%' }}
+            style={{ width: '70%' }}
             value={layerQuery}
-          />
-          <Button
-            style={{
-              margin: '10px 0',
-              display: 'flex',
-              alignItems: 'center',
-            }}
-            color={checkColor}
-            onClick={handleQueryLayer}
+            action
+            actionPosition="right"
           >
-            <p style={{ fontSize: '14px', margin: '0', marginRight: '5px' }}>
-              Query Layer
-            </p>
-          </Button>
+            <input />
+            <Button
+              type="submit"
+              size="tiny"
+              compact
+              color={'green'}
+              onClick={handleQueryLayer}
+            >
+              <Icon name={aheadSVG} title="Check Url" size="17px" />
+            </Button>
+          </Input>
+        </Grid.Row>
+        <Grid.Row>
+          <p style={{ fontSize: '12px', fontWeight: 'bold' }}>
+            Available Fields:
+          </p>
         </Grid.Row>
-        <p style={{ fontSize: '12px', fontWeight: 'bold' }}>
-          Available Fields:
-        </p>
         {fields &&
           fields.length > 0 &&
           fields.map((field, id) => (

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,19 +1,50 @@
 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 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>
   );
 };
@@ -37,10 +68,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,15 +80,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, index) => {
+                legendLayers.map((layer, i) => {
                   return (
-                    <div style={{ display: 'flex', flexDirection: 'column' }}>
-                      <h5 style={{ marginTop: '10px', marginBottom: '5px' }}>
-                        {layer?.layerName}
-                      </h5>
-                      <LayerLegend data={layer.legend} />
-                    </div>
+                    <LayerLegend
+                      key={i}
+                      name={layer?.layerName}
+                      data={layer?.legend}
+                    />
                   );
                 })}
             </Grid.Column>
@@ -67,4 +103,4 @@ const LegendWidget = (props) => {
   );
 };
 
-export default LegendWidget;
+export default React.memo(LegendWidget);

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

@@ -3,7 +3,7 @@ import { Modal, Button, Grid } from 'semantic-ui-react';
 import Webmap from '../Webmap';
 import { FormFieldWrapper, InlineForm } from '@plone/volto/components';
 
-import { panelsSchema } from './panelsSchema';
+import PanelsSchema from './panelsSchema';
 
 const MapEditorWidget = (props) => {
   const [open, setOpen] = React.useState(false);
@@ -11,9 +11,16 @@ const MapEditorWidget = (props) => {
   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);
   };
 
@@ -26,6 +33,8 @@ const MapEditorWidget = (props) => {
     setIntValue(fieldVal);
   };
 
+  let schema = PanelsSchema({ data: dataForm });
+
   return (
     <FormFieldWrapper {...props}>
       <Modal
@@ -46,8 +55,8 @@ const MapEditorWidget = (props) => {
               <Grid.Column width={4}>
                 <InlineForm
                   block={block}
-                  title={panelsSchema.title}
-                  schema={panelsSchema}
+                  title={schema.title}
+                  schema={schema}
                   onChangeField={(id, value) => {
                     handleChangeField(id, value);
                   }}

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

@@ -24,7 +24,7 @@ export const ObjectTypesWidget = (props) => {
       ),
       render: () => {
         return (
-          <Tab.Pane>
+          <Tab.Pane style={{ padding: '0' }}>
             <ObjectWidget
               schema={schema}
               id={id}
@@ -45,7 +45,7 @@ export const ObjectTypesWidget = (props) => {
       menu={{ fluid: true, vertical: true, tabular: true }}
       panes={schemas.map(createTab)}
       activeIndex={activeTab}
-      grid={{ paneWidth: 8, tabWidth: 4 }}
+      grid={{ paneWidth: 9, tabWidth: 3 }}
     />
   );
 };

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

@@ -55,136 +55,106 @@ 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 = {
-  title: 'Zoom',
-  fieldsets: [
-    {
-      id: 'default',
-      title: 'Zoom',
-      fields: ['show_zoom', 'position', 'zoom_level', 'long', 'lat'],
-    },
-  ],
-  properties: {
-    show_zoom: {
-      title: 'Show zoom',
-      type: 'boolean',
-    },
-    position: {
-      title: 'Zoom position',
-      choices: ['bottom-right', 'bottom-left', 'top-right', 'top-left'].map(
-        (n) => {
-          return [n, n];
-        },
-      ),
-    },
-    zoom_level: {
-      title: 'Zoom level',
-      type: 'number',
-    },
-    long: {
-      title: 'Longitude',
-      type: 'number',
-    },
-    lat: {
-      title: 'Latitude',
-      type: 'number',
-    },
-  },
-  required: [],
-};
+const GeneralSchema = ({ data = {} }) => {
+  const centerOnExtent = data?.map_data?.general?.centerOnExtent;
 
-const GeneralSchema = {
-  title: 'General',
-  fieldsets: [
-    {
-      id: 'default',
-      title: 'General',
-      fields: ['show_sources', 'show_legend', 'show_download', 'show_viewer'],
-    },
-  ],
-  properties: {
-    show_sources: {
-      title: 'Show sources',
-      type: 'boolean',
-    },
-    show_legend: {
-      title: 'Show legend',
-      type: 'boolean',
-    },
-    show_download: {
-      title: 'Show download',
-      type: 'boolean',
-    },
-    show_viewer: {
-      title: 'Show web viewer',
-      type: 'boolean',
-    },
-  },
-  required: [],
+  return {
+    title: 'General',
+    fieldsets: [
+      {
+        id: 'default',
+        title: 'Zoom',
+        fields: [
+          'show_print',
+          'print_position',
+          'show_zoom',
+          'centerOnExtent',
+          'zoom_position',
+          ...(!centerOnExtent ? ['zoom_level', 'long', 'lat'] : []),
+        ],
+      },
+    ],
+    properties: {
+      show_zoom: {
+        title: 'Show zoom',
+        type: 'boolean',
+      },
+      centerOnExtent: {
+        title: 'Center on extent',
+        type: 'boolean',
+        description:
+          'This will override latitude/longitude/zoom level and will lock zoom/moving the map.',
+      },
+      zoom_position: {
+        title: 'Zoom position',
+        choices: ['bottom-right', 'bottom-left', 'top-right', 'top-left'].map(
+          (n) => {
+            return [n, n];
+          },
+        ),
+      },
+      zoom_level: {
+        title: 'Zoom level',
+        type: 'number',
+      },
+      long: {
+        title: 'Longitude',
+        type: 'number',
+      },
+      lat: {
+        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 const panelsSchema = {
-  title: 'Map Editor',
-  fieldsets: [
-    {
-      id: 'default',
-      title: 'Map Editor Sections',
-      fields: ['map_data'],
-    },
-  ],
-  properties: {
-    map_data: {
-      title: 'Panels',
-      widget: 'object_types_widget',
-      schemas: [
-        {
-          id: 'general',
-          schema: GeneralSchema,
-        },
-        {
-          id: 'base',
-          schema: BaseLayerSchema,
-        },
-        {
-          id: 'layers',
-          schema: MapLayersSchema,
-        },
-        {
-          id: 'print',
-          schema: PrintSchema,
-        },
-        {
-          id: 'zoom',
-          schema: ZoomSchema,
-        },
-      ],
-    },
-  },
-  required: [],
+export default ({ data = {} }) => {
+  const generalSchema = GeneralSchema({ data });
+
+  return {
+    title: 'Map Editor',
+    fieldsets: [
+      {
+        id: 'default',
+        title: 'Map Editor Sections',
+        fields: ['map_data'],
+      },
+    ],
+    properties: {
+      map_data: {
+        title: 'Panels',
+        widget: 'object_types_widget',
+        schemas: [
+          {
+            id: 'general',
+            schema: generalSchema,
+          },
+          {
+            id: 'base',
+            schema: BaseLayerSchema,
+          },
+          {
+            id: 'layers',
+            schema: MapLayersSchema,
+          },
+        ],
+      },
+    },
+    required: [],
+  };
 };

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

package/cypress.json

@@ -1,17 +0,0 @@
-{
-  "baseUrl": "http://localhost:3000",
-  "viewportWidth": 1280,
-  "defaultCommandTimeout": 8888,
-  "chromeWebSecurity": false,
-  "reporter": "junit",
-  "video": true,
-  "retries": {
-    "runMode": 8,
-    "openMode": 0
-  },
-  "reporterOptions": {
-    "mochaFile": "cypress/reports/cypress-[hash].xml",
-    "jenkinsMode": true,
-    "toConsole": true
-  }
-}