@eeacms/volto-eea-map 5.0.8 → 6.0.1

package/.eslintrc.js

@@ -16,16 +16,16 @@ if (configFile) {
     voltoPath = `./${jsConfig.baseUrl}/${pathsConfig['@plone/volto'][0]}`;
 }
 
-const AddonConfigurationRegistry = require(`${voltoPath}/addon-registry.js`);
-const reg = new AddonConfigurationRegistry(projectRootPath);
+const { AddonRegistry } = require('@plone/registry/addon-registry');
+const { registry } = AddonRegistry.init(projectRootPath);
 
 // Extends ESlint configuration for adding the aliases to `src` directories in Volto addons
-const addonAliases = Object.keys(reg.packages).map((o) => [
+const addonAliases = Object.keys(registry.packages).map((o) => [
   o,
-  reg.packages[o].modulePath,
+  registry.packages[o].modulePath,
 ]);
 
-const addonExtenders = reg.getEslintExtenders().map((m) => require(m));
+const addonExtenders = registry.getEslintExtenders().map((m) => require(m));
 
 const defaultConfig = {
   extends: `${voltoPath}/.eslintrc`,
@@ -34,7 +34,7 @@ const defaultConfig = {
       alias: {
         map: [
           ['@plone/volto', '@plone/volto/src'],
-          ['@plone/volto-slate', '@plone/volto/packages/volto-slate/src'],
+          ['@plone/volto-slate', '@plone/volto-slate/src'],
           ...addonAliases,
           ['@package', `${__dirname}/src`],
           ['@root', `${__dirname}/src`],

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).
 
+### [6.0.1](https://github.com/eea/volto-eea-map/compare/6.0.0...6.0.1) - 8 April 2026
+
+#### :bug: Bug Fixes
+
+- fix: make test [Alin V. (Claudiu) - [`cdd10aa`](https://github.com/eea/volto-eea-map/commit/cdd10aa38e58f4c38643ed99b7a603685d3b2074)]
+
+## [6.0.0](https://github.com/eea/volto-eea-map/compare/5.0.8...6.0.0) - 25 March 2026
+
+#### :rocket: New Features
+
+- feat: Volto 18 support - refs #287700 [Alin Voinea - [`1282044`](https://github.com/eea/volto-eea-map/commit/12820446f44bbdb052d0cd7b05745825e049baf6)]
+
+#### :house: Internal changes
+
+- chore: [JENKINSFILE] add package version in sonarqube [valentinab25 - [`488ddb3`](https://github.com/eea/volto-eea-map/commit/488ddb3bf14ba7564a7619fdebd086f4d3f6b70f)]
+- chore: [JENKINSFILE] use sonarqube branches [EEA Jenkins - [`0d503ea`](https://github.com/eea/volto-eea-map/commit/0d503ea78bbb5ed77c0d7cfa0e0247a77953e822)]
+
+#### :hammer_and_wrench: Others
+
+- test: Fix SonarQube bugs [Alin Voinea - [`d7e712d`](https://github.com/eea/volto-eea-map/commit/d7e712d3997ca6d0f908928b7f6e05c6e5355898)]
+- tests: Fix Sonar Qube tags - refs #297339 [Alin Voinea - [`e1ae40d`](https://github.com/eea/volto-eea-map/commit/e1ae40dfaad699ad116245abf220bafb3f945dae)]
 ### [5.0.8](https://github.com/eea/volto-eea-map/compare/5.0.7...5.0.8) - 18 December 2024
 
 #### :hammer_and_wrench: Others

package/DEVELOP.md

@@ -26,21 +26,20 @@
 
 ### Or add @eeacms/volto-eea-map to your Volto project
 
-Before starting make sure your development environment is properly set. See [Volto Developer Documentation](https://docs.voltocms.com/getting-started/install/)
+Before starting make sure your development environment is properly set. See the official Plone documentation for [creating a project with Cookieplone](https://6.docs.plone.org/install/create-project-cookieplone.html) and [installing an add-on in development mode in Volto 18 and 19](https://6.docs.plone.org/volto/development/add-ons/install-an-add-on-dev-18.html).
 
-1.  Make sure you have installed `yo`, `@plone/generator-volto` and `mrs-developer`
+For new Volto 18+ projects, use Cookieplone. It includes `mrs-developer` by default.
 
-        npm install -g yo @plone/generator-volto mrs-developer
+1.  Create a new Volto project with Cookieplone
 
-1.  Create new volto app
-
-        yo @plone/volto my-volto-project --addon @eeacms/volto-eea-map --skip-install
-        cd my-volto-project
+        uvx cookieplone project
+        cd project-title
 
 1.  Add the following to `mrs.developer.json`:
 
         {
             "volto-eea-map": {
+                "output": "packages",
                 "url": "https://github.com/eea/volto-eea-map.git",
                 "package": "@eeacms/volto-eea-map",
                 "branch": "develop",
@@ -48,28 +47,31 @@ Before starting make sure your development environment is properly set. See [Vol
             }
         }
 
-1.  Install
+1.  Add `@eeacms/volto-eea-map` to the `addons` key in your project `volto.config.js`
+
+1.  Install or refresh the project setup
 
-        make develop
-        yarn
+        make install
 
-1.  Start backend
+1.  Start backend in one terminal
 
-        docker run --pull always -it --rm --name plone -p 8080:8080 -e SITE=Plone plone/plone-backend
+        make backend-start
 
-    ...wait for backend to setup and start - `Ready to handle requests`:
+    ...wait for backend to setup and start, ending with `Ready to handle requests`
 
     ...you can also check http://localhost:8080/Plone
 
-1.  Start frontend
+1.  Start frontend in a second terminal
 
-        yarn start
+        make frontend-start
 
 1.  Go to http://localhost:3000
 
 1.  Happy hacking!
 
-        cd src/addons/volto-eea-map/
+        cd packages/volto-eea-map
+
+For legacy Volto 17 projects, keep using the yarn-based workflow from the Volto 17 documentation.
 
 ## Cypress
 
@@ -81,7 +83,7 @@ project where you added `volto-eea-map` to `mrs.developer.json`
 Go to:
 
   ```BASH
-  cd src/addons/volto-eea-map/
+  cd packages/volto-eea-map/
   ```
 
 Start:

package/README.md

@@ -3,16 +3,16 @@
 [![Releases](https://img.shields.io/github/v/release/eea/volto-eea-map)](https://github.com/eea/volto-eea-map/releases)
 
 [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto-addons%2Fvolto-eea-map%2Fmaster&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto-addons/job/volto-eea-map/job/master/display/redirect)
-[![Lines of Code](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map-master&metric=ncloc)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map-master)
-[![Coverage](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map-master&metric=coverage)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map-master)
-[![Bugs](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map-master&metric=bugs)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map-master)
-[![Duplicated Lines (%)](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map-master&metric=duplicated_lines_density)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map-master)
+[![Lines of Code](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map&metric=ncloc)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map)
+[![Coverage](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map&metric=coverage)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map)
+[![Bugs](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map&metric=bugs)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map)
+[![Duplicated Lines (%)](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map&metric=duplicated_lines_density)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map)
 
 [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto-addons%2Fvolto-eea-map%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto-addons/job/volto-eea-map/job/develop/display/redirect)
-[![Lines of Code](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map-develop&metric=ncloc)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map-develop)
-[![Coverage](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map-develop&metric=coverage)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map-develop)
-[![Bugs](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map-develop&metric=bugs)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map-develop)
-[![Duplicated Lines (%)](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map-develop&metric=duplicated_lines_density)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map-develop)
+[![Lines of Code](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map&branch=develop&metric=ncloc)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map&branch=develop)
+[![Coverage](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map&branch=develop&metric=coverage)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map&branch=develop)
+[![Bugs](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map&branch=develop&metric=bugs)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map&branch=develop)
+[![Duplicated Lines (%)](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map&branch=develop&metric=duplicated_lines_density)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map&branch=develop)
 
 [Volto](https://github.com/plone/volto) add-on
 
@@ -51,6 +51,11 @@ After this, sources can be added from the visualization edit interface. "Data Pr
 
 Go to http://localhost:3000
 
+`make start` now defaults to Volto 18. To run the same setup against Volto 17, use:
+
+      VOLTO_VERSION=17 make
+      VOLTO_VERSION=17 make start
+
 ### Add volto-eea-map to your Volto project
 
 1. Make sure you have a [Plone backend](https://plone.org/download) up-and-running at http://localhost:8080/Plone
@@ -64,30 +69,39 @@ Go to http://localhost:3000
 - If you already have a volto project, just update `package.json`:
 
   ```JSON
-  "addons": [
-      "@eeacms/volto-eea-map"
-  ],
-
   "dependencies": {
       "@eeacms/volto-eea-map": "*"
   }
   ```
 
-- If not, create one:
+   and `volto.config.js`:
+
+   ```JavaScript
+   const addons = ['@eeacms/volto-eea-map'];
+   ```
+
+- If not, create one with Cookieplone, as recommended by the official Plone documentation for Volto 18+:
 
   ```
-  npm install -g yo @plone/generator-volto
-  yo @plone/volto my-volto-project --canary --addon @eeacms/volto-eea-map
-  cd my-volto-project
+  uvx cookieplone project
+  cd project-title
   ```
 
-1. Install new add-ons and restart Volto:
+1. Install or update dependencies, then start the project:
 
    ```
-   yarn
-   yarn start
+   make install
    ```
 
+   For a Cookieplone project, start the backend and frontend in separate terminals:
+
+   ```
+   make backend-start
+   make frontend-start
+   ```
+
+   For a legacy Volto 17 project, install the package with `yarn` and restart the frontend as usual.
+
 1. Go to http://localhost:3000
 
 1. Happy editing!

package/docker-compose.yml

@@ -15,7 +15,7 @@ services:
       args:
         ADDON_NAME: "${ADDON_NAME}"
         ADDON_PATH: "${ADDON_PATH}"
-        VOLTO_VERSION: ${VOLTO_VERSION:-16}
+        VOLTO_VERSION: ${VOLTO_VERSION:-18-yarn}
     ports:
     - "3000:3000"
     - "3001:3001"

package/jest-addon.config.js

@@ -1,5 +1,14 @@
 require('dotenv').config({ path: __dirname + '/.env' })
 
+const fs = require('fs')
+const path = require('path')
+
+const voltoSlatePath = fs.existsSync(
+  path.join(__dirname, '../../../node_modules/@plone/volto-slate/src'),
+)
+  ? '<rootDir>/node_modules/@plone/volto-slate/src'
+  : '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src'
+
 module.exports = {
   testMatch: ['**/src/addons/**/?(*.)+(spec|test).[jt]s?(x)'],
   collectCoverageFrom: [
@@ -17,10 +26,8 @@ module.exports = {
     '@eeacms/search/(.*)$': '<rootDir>/src/addons/volto-searchlib/searchlib/$1',
     '@eeacms/search': '<rootDir>/src/addons/volto-searchlib/searchlib',
     '@eeacms/(.*?)/(.*)$': '<rootDir>/node_modules/@eeacms/$1/src/$2',
-    '@plone/volto-slate$':
-      '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src',
-    '@plone/volto-slate/(.*)$':
-      '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src/$1',
+    '@plone/volto-slate$': voltoSlatePath,
+    '@plone/volto-slate/(.*)$': `${voltoSlatePath}/$1`,
     '~/(.*)$': '<rootDir>/src/$1',
     'load-volto-addons':
       '<rootDir>/node_modules/@plone/volto/jest-addons-loader.js',

package/package.json

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

package/src/Arcgis/Editor/Editor.jsx

@@ -1,9 +1,9 @@
 import { memo, useRef, useState, useMemo } from 'react';
-import { isNil } from 'lodash';
+import isNil from 'lodash/isNil';
 
 import SidebarGroup from './SidebarGroup';
 
-import _MapBuilder from '../Map/MapBuilder';
+import _MapBuilder from '@eeacms/volto-eea-map/Arcgis/Map/MapBuilder';
 
 import {
   StructureBaseLayerPanel,

package/src/Arcgis/Editor/Fold/Fold.jsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import cx from 'classnames';
 
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 
 import clearSVG from '@plone/volto/icons/clear.svg';
 import upKeySVG from '@plone/volto/icons/up-key.svg';

package/src/Arcgis/Editor/Panels/SettingsGeneralPanel.jsx

@@ -1,7 +1,7 @@
-import { toNumber } from 'lodash';
-import { InlineForm } from '@plone/volto/components';
+import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
+import toNumber from 'lodash/toNumber';
 import Panel from './Panel';
-import Fold from '../Fold/Fold';
+import Fold from '@eeacms/volto-eea-map/Arcgis/Editor/Fold/Fold';
 import { getDefaultWidgets } from '@eeacms/volto-eea-map/constants';
 
 const mapSchema = {

package/src/Arcgis/Editor/Panels/SettingsLayersPanel.jsx

@@ -1,8 +1,9 @@
 import { useState, useEffect, useContext, useMemo } from 'react';
 import { Segment, Dimmer, Loader } from 'semantic-ui-react';
-import { isNil, toNumber } from 'lodash';
+import isNil from 'lodash/isNil';
+import toNumber from 'lodash/toNumber';
 import { v4 as uuid } from 'uuid';
-import { InlineForm } from '@plone/volto/components';
+import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
 import {
   debounce,
   getLayers,
@@ -11,7 +12,7 @@ import {
 import { blendModes } from '@eeacms/volto-eea-map/constants';
 import EditorContext from '@eeacms/volto-eea-map/Arcgis/Editor/EditorContext';
 import Panel from './Panel';
-import Fold from '../Fold/Fold';
+import Fold from '@eeacms/volto-eea-map/Arcgis/Editor/Fold/Fold';
 
 function Layer({ $map, layer, layers, index, value, onChangeValue }) {
   const uid = useState(uuid());

package/src/Arcgis/Editor/Panels/StructureBaseLayerPanel.jsx

@@ -1,8 +1,8 @@
 import { useMemo } from 'react';
-import { InlineForm } from '@plone/volto/components';
+import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
 import { basemaps } from '@eeacms/volto-eea-map/constants';
 import { getBasemap } from '@eeacms/volto-eea-map/Arcgis/helpers';
-import Fold from '../Fold/Fold';
+import Fold from '@eeacms/volto-eea-map/Arcgis/Editor/Fold/Fold';
 
 import Panel from './Panel';
 

package/src/Arcgis/Editor/Panels/StructureLayersPanel.jsx

@@ -1,10 +1,12 @@
 import { memo, useState, useEffect, useContext, useMemo } from 'react';
 import { compose } from 'redux';
-import { isNil, toNumber } from 'lodash';
+import isNil from 'lodash/isNil';
+import toNumber from 'lodash/toNumber';
 import { v4 as uuid } from 'uuid';
 import { QueryBuilder, Rule as QBRule, useRule } from 'react-querybuilder';
 import { Dimmer, Loader } from 'semantic-ui-react';
-import { Icon, InlineForm } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import addSVG from '@plone/volto/icons/add.svg';
 import {
@@ -14,7 +16,7 @@ import {
 } from '@eeacms/volto-eea-map/Arcgis/helpers';
 import EditorContext from '@eeacms/volto-eea-map/Arcgis/Editor/EditorContext';
 import Panel from './Panel';
-import Fold from '../Fold/Fold';
+import Fold from '@eeacms/volto-eea-map/Arcgis/Editor/Fold/Fold';
 
 function getLayersChoices(layers = []) {
   return layers.map((layer) => [

package/src/Arcgis/Editor/Panels/StructureWidgetsPanel.jsx

@@ -1,10 +1,11 @@
 import { useState } from 'react';
-import { Icon, InlineForm } from '@plone/volto/components';
-import { withVariationSchemaEnhancer } from '@plone/volto/helpers';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
+import { withVariationSchemaEnhancer } from '@plone/volto/helpers//Extensions';
 import addSVG from '@plone/volto/icons/add.svg';
 import Panel from './Panel';
-import Fold from '../Fold/Fold';
-import { debounce, getWidgets } from '../../helpers';
+import Fold from '@eeacms/volto-eea-map/Arcgis/Editor/Fold/Fold';
+import { debounce, getWidgets } from '@eeacms/volto-eea-map/Arcgis/helpers';
 import {
   expandKeys,
   positions,

package/src/Arcgis/Editor/SidebarGroup.jsx

@@ -1,7 +1,7 @@
 import { useEffect, useState, useMemo } from 'react';
 import cx from 'classnames';
 
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 
 import upKeySVG from '@plone/volto/icons/up-key.svg';
 

package/src/Arcgis/Layer/Layer.jsx

@@ -1,6 +1,8 @@
 import { useContext, useEffect, useMemo, memo } from 'react';
 import { EventEmitter } from 'events';
-import { uniq, isObject, isNaN } from 'lodash';
+import uniq from 'lodash/uniq';
+import isObject from 'lodash/isObject';
+import isNaN from 'lodash/isNaN';
 
 import useClass from '@eeacms/volto-eea-map/hooks/useClass';
 import useChangedProps from '@eeacms/volto-eea-map/hooks/useChangedProps';

package/src/Arcgis/Map/Map.jsx

@@ -7,7 +7,8 @@ import {
   useMemo,
 } from 'react';
 import { EventEmitter } from 'events';
-import { isNaN, isObject } from 'lodash';
+import isNaN from 'lodash/isNaN';
+import isObject from 'lodash/isObject';
 
 import useClass from '@eeacms/volto-eea-map/hooks/useClass';
 import useChangedProps from '@eeacms/volto-eea-map/hooks/useChangedProps';
@@ -76,6 +77,7 @@ class $Map extends EventEmitter {
   #props = {};
   #map = null;
   #view = null;
+  #withCustomViewpoint = undefined;
   reactiveUtils = null;
 
   constructor(props) {
@@ -104,12 +106,16 @@ class $Map extends EventEmitter {
     return this.#props;
   }
 
+  get withCustomViewpoint() {
+    return this.#withCustomViewpoint;
+  }
+
   set props(props) {
     this.#props = props;
   }
 
   set withCustomViewpoint(value) {
-    this.withCustomViewpoint = value;
+    this.#withCustomViewpoint = value;
   }
 
   async loadModules() {

package/src/Arcgis/Map/MapBuilder.jsx

@@ -8,10 +8,14 @@ import React, {
   useRef,
 } from 'react';
 import Map from './Map';
-import Layer from '../Layer/Layer';
-import Widget from '../Widget/Widget';
+import Layer from '@eeacms/volto-eea-map/Arcgis/Layer/Layer';
+import Widget from '@eeacms/volto-eea-map/Arcgis/Widget/Widget';
 
-import { getBasemap, getLayers, getWidgets } from '../helpers';
+import {
+  getBasemap,
+  getLayers,
+  getWidgets,
+} from '@eeacms/volto-eea-map/Arcgis/helpers';
 
 const MapBuilder = forwardRef((props, ref) => {
   const { data, properties } = props || {};

package/src/Arcgis/Widget/Widget.jsx

@@ -1,7 +1,7 @@
 import { useContext, useEffect, useMemo, memo } from 'react';
 import { EventEmitter } from 'events';
 
-import MapContext from '../Map/MapContext';
+import MapContext from '@eeacms/volto-eea-map/Arcgis/Map/MapContext';
 
 import useClass from '@eeacms/volto-eea-map/hooks/useClass';
 

package/src/Arcgis/helpers.js

@@ -1,4 +1,4 @@
-import { isArray } from 'lodash';
+import isArray from 'lodash/isArray';
 import { formatQuery as $formatQuery } from 'react-querybuilder';
 import { getDefaultWidgets } from '@eeacms/volto-eea-map/constants';
 

package/src/Blocks/EmbedEEAMap/Edit.jsx

@@ -1,8 +1,8 @@
 import React, { useMemo } from 'react';
 import { Message } from 'semantic-ui-react';
 
-import { SidebarPortal } from '@plone/volto/components';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 import BlockDataForm from '@plone/volto/components/manage/Form/BlockDataForm';
 
 import { schema } from './schema';

package/src/Blocks/EmbedEEAMap/View.jsx

@@ -2,8 +2,8 @@ import React, { useMemo, useEffect } from 'react';
 import { v4 as uuid } from 'uuid';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
-import { flattenToAppURL } from '@plone/volto/helpers';
-import { getContent } from '@plone/volto/actions';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+import { getContent } from '@plone/volto/actions/content/content';
 import { PrivacyProtection } from '@eeacms/volto-embed';
 import { getLayers } from '@eeacms/volto-eea-map/Arcgis/helpers';
 import MapBuilder from '@eeacms/volto-eea-map/Arcgis/Map/MapBuilder';

package/src/Toolbar/FigureNote.jsx

@@ -5,7 +5,7 @@ import {
   serializeNodes,
   serializeNodesToText,
 } from '@plone/volto-slate/editor/render';
-import { isArray } from 'lodash';
+import isArray from 'lodash/isArray';
 
 export const serializeText = (note) => {
   if (!serializeNodesToText(note))

package/src/Toolbar/MoreInfoLink.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import cx from 'classnames';
-import { UniversalLink } from '@plone/volto/components';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 
 const Link = ({ children, ...props }) => {
   if (props.href) {

package/src/Toolbar/Sources.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import cx from 'classnames';
 import { Popup } from 'semantic-ui-react';
-import { UniversalLink } from '@plone/volto/components';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 
 const Link = ({ children, ...props }) => {
   if (props.href) {

package/src/Views/VisualizationView.jsx

@@ -1,9 +1,9 @@
 import React from 'react';
-import { hasBlocksData } from '@plone/volto/helpers';
+import { hasBlocksData } from '@plone/volto/helpers/Blocks/Blocks';
 import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
 import { pickMetadata } from '@eeacms/volto-embed/helpers';
 import MapBuilder from '@eeacms/volto-eea-map/Arcgis/Map/MapBuilder';
-import Toolbar from '../Toolbar/Toolbar';
+import Toolbar from '@eeacms/volto-eea-map/Toolbar/Toolbar';
 
 const VisualizationView = (props) => {
   const content = props && props.content ? props.content : {};

package/src/Widgets/ArcgisColorPickerWidget.jsx

@@ -1,5 +1,6 @@
 import { useEffect, useState, useRef } from 'react';
-import { FormFieldWrapper, Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
 import { Button } from 'semantic-ui-react';
 import loadable from '@loadable/component';
 import clearSVG from '@plone/volto/icons/clear.svg';

package/src/Widgets/ArcgisRendererWidget/ArcgisRendererWidget.jsx

@@ -1,7 +1,8 @@
 import { useState } from 'react';
 import { compose } from 'redux';
 import { injectIntl } from 'react-intl';
-import { FormFieldWrapper, Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import {
   customSelectStyles,

package/src/Widgets/ArcgisRendererWidget/RendererEditor/Simple.jsx

@@ -1,10 +1,9 @@
-import { toNumber } from 'lodash';
-
-import { InlineForm } from '@plone/volto/components';
+import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
+import toNumber from 'lodash/toNumber';
 
 import { simpleSymbols as simpleSymbolsOptions } from '@eeacms/volto-eea-map/constants';
 
-import { simpleSymbols } from '../RendererEditor/_defaults';
+import { simpleSymbols } from '@eeacms/volto-eea-map/Widgets/ArcgisRendererWidget/RendererEditor/_defaults';
 
 export default function Simple(props) {
   const { $map, value, id, onChange } = props;

package/src/Widgets/ArcgisRendererWidget/RendererEditor/_EditorModal.jsx

@@ -1,7 +1,7 @@
 import { useEffect, useRef } from 'react';
 import { Modal, Button } from 'semantic-ui-react';
 import { toast } from 'react-toastify';
-import { Toast } from '@plone/volto/components';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 import {
   initEditor,
   destroyEditor,

package/src/Widgets/ArcgisSliderWidget.jsx

@@ -5,7 +5,7 @@
 
 import React, { Component } from 'react';
 
-import { FormFieldWrapper } from '@plone/volto/components';
+import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
 
 /**
  * The simple slider widget.

package/src/Widgets/ArcgisViewpointWidget.jsx

@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';
-import { toNumber } from 'lodash';
-import { FormFieldWrapper, InlineForm } from '@plone/volto/components';
+import toNumber from 'lodash/toNumber';
+import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
+import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
 
 export default function ArcgisViewpointWidget(props) {
   const [watchViewpoint, setWatchViewpoint] = useState(false);

package/src/Widgets/VisualizationViewWidget.jsx

@@ -1,7 +1,7 @@
 import { connect } from 'react-redux';
 import { pickMetadata } from '@eeacms/volto-embed/helpers';
 import MapBuilder from '@eeacms/volto-eea-map/Arcgis/Map/MapBuilder';
-import Toolbar from '../Toolbar/Toolbar';
+import Toolbar from '@eeacms/volto-eea-map/Toolbar/Toolbar';
 
 function VisualizationViewWidget(props) {
   const { value, content } = props;

package/src/Widgets/VisualizationWidget.jsx

@@ -1,7 +1,9 @@
 import React, { useState, useRef, useEffect } from 'react';
 import { Modal, Button, Grid } from 'semantic-ui-react';
 import { toast } from 'react-toastify';
-import { FormFieldWrapper, Icon, Toast } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
+import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
 import MapBuilder from '@eeacms/volto-eea-map/Arcgis/Map/MapBuilder';
 import {
   initEditor,
@@ -11,8 +13,8 @@ import {
 } from '@eeacms/volto-eea-map/jsoneditor';
 import editSVG from '@plone/volto/icons/editing.svg';
 import '@eeacms/volto-eea-map/styles/editor.less';
-import MapEditor from '../Arcgis/Editor/Editor';
-import { debounce } from '../Arcgis/helpers';
+import MapEditor from '@eeacms/volto-eea-map/Arcgis/Editor/Editor';
+import { debounce } from '@eeacms/volto-eea-map/Arcgis/helpers';
 
 function JsonEditorModal(props) {
   const { value, onClose, onChange } = props;

package/src/constants.js

@@ -1,4 +1,4 @@
-import { capitalize } from 'lodash';
+import capitalize from 'lodash/capitalize';
 
 export const positions = [
   'top-left',

package/src/hooks/useChangedProps.jsx

@@ -1,5 +1,6 @@
 import { useEffect, useRef } from 'react';
-import { isFunction, isEqual } from 'lodash';
+import isFunction from 'lodash/isFunction';
+import isEqual from 'lodash/isEqual';
 
 export default function useChangedEffect(callback, props) {
   const prevPropsRef = useRef(props);

package/src/index.js

@@ -1,4 +1,4 @@
-import { uniqBy } from 'lodash';
+import uniqBy from 'lodash/uniqBy';
 
 import EmbedMapView from './Blocks/EmbedEEAMap/View';
 import EmbedMapEdit from './Blocks/EmbedEEAMap/Edit';

package/src/{jsoneditor.js → jsoneditor.jsx}

@@ -1,6 +1,6 @@
-import { isString } from 'lodash';
+import isString from 'lodash/isString';
 import { toast } from 'react-toastify';
-import { Toast } from '@plone/volto/components';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 
 import loadable from '@loadable/component';