@eeacms/volto-bise-policy 1.2.45 → 1.2.47

package/src/components/manage/Blocks/CaseStudyExplorer/FeatureDisplay.test.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { render } from '@testing-library/react';
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 
 import FeatureDisplay from './FeatureDisplay';
 

package/src/components/manage/Blocks/CaseStudyExplorer/FeatureInteraction.test.jsx

@@ -2,6 +2,7 @@ import React from 'react';
 import { render } from '@testing-library/react';
 import FeatureInteraction from './FeatureInteraction';
 import { scrollToElement, zoomMapToFeatures } from './utils';
+import { createMockOl } from './testUtils';
 
 jest.mock('@eeacms/volto-openlayers-map', () => ({
   withOpenLayers: (Comp) => Comp,
@@ -25,15 +26,8 @@ jest.mock('./utils', () => ({
   zoomMapToFeatures: jest.fn(),
 }));
 
-const mockOl = {
-  style: {
-    Style: jest.fn(() => ({
-      image_: { getFill: () => ({ setColor: jest.fn() }) },
-    })),
-    Circle: jest.fn(() => ({})),
-    Fill: jest.fn(() => ({})),
-    Stroke: jest.fn(() => ({})),
-  },
+let mockSelectCb;
+const mockOl = createMockOl({
   interaction: {
     Select: jest.fn(() => ({
       on: jest.fn((evt, cb) => {
@@ -43,12 +37,8 @@ const mockOl = {
       }),
     })),
   },
-  condition: {
-    click: jest.fn(),
-  },
-};
+});
 
-let mockSelectCb;
 const mockMap = {
   addInteraction,
   removeInteraction,

package/src/components/manage/Blocks/CaseStudyExplorer/InfoOverlay.test.jsx

@@ -45,6 +45,13 @@ jest.mock('@plone/volto/helpers/Utils/usePrevious', () => ({
   usePrevious: (val) => undefined,
 }));
 
+const defaultProps = {
+  layerId: 'layer1',
+  hideFilters: false,
+  ol: mockOl,
+  onFeatureSelect: jest.fn(),
+};
+
 describe('InfoOverlay', () => {
   let overlayElement;
   beforeEach(() => {
@@ -60,39 +67,21 @@ describe('InfoOverlay', () => {
 
   it('renders FeatureDisplay when selectedFeature is provided', () => {
     const { getByTestId } = render(
-      <InfoOverlay
-        selectedFeature={{ id: 1 }}
-        onFeatureSelect={jest.fn()}
-        layerId="layer1"
-        hideFilters={false}
-        ol={mockOl}
-      />,
+      <InfoOverlay {...defaultProps} selectedFeature={{ id: 1 }} />,
     );
     expect(getByTestId('feature-display')).toBeInTheDocument();
   });
 
   it('does not render FeatureDisplay when selectedFeature is null', () => {
     const { queryByTestId } = render(
-      <InfoOverlay
-        selectedFeature={null}
-        onFeatureSelect={jest.fn()}
-        layerId="layer1"
-        hideFilters={false}
-        ol={mockOl}
-      />,
+      <InfoOverlay {...defaultProps} selectedFeature={null} />,
     );
     expect(queryByTestId('feature-display')).toBeNull();
   });
 
   it('attaches and detaches click handler on map', () => {
     const { unmount } = render(
-      <InfoOverlay
-        selectedFeature={null}
-        onFeatureSelect={jest.fn()}
-        layerId="layer1"
-        hideFilters={false}
-        ol={mockOl}
-      />,
+      <InfoOverlay {...defaultProps} selectedFeature={null} />,
     );
     expect(addOverlay).toHaveBeenCalled();
     expect(onMap).toHaveBeenCalledWith('click', expect.any(Function));
@@ -106,11 +95,9 @@ describe('InfoOverlay', () => {
     const onFeatureSelect = jest.fn();
     render(
       <InfoOverlay
+        {...defaultProps}
         selectedFeature={{}}
         onFeatureSelect={onFeatureSelect}
-        layerId="layer1"
-        hideFilters={false}
-        ol={mockOl}
       />,
     );
 
@@ -131,11 +118,9 @@ describe('InfoOverlay', () => {
     const onFeatureSelect = jest.fn();
     render(
       <InfoOverlay
+        {...defaultProps}
         selectedFeature={{}}
         onFeatureSelect={onFeatureSelect}
-        layerId="layer1"
-        hideFilters={false}
-        ol={mockOl}
       />,
     );
 

package/src/components/manage/Blocks/CaseStudyExplorer/testUtils.js

@@ -0,0 +1,84 @@
+export const createMockMap = (additionalProps = {}) => ({
+  on: jest.fn(),
+  un: jest.fn(),
+  addInteraction: jest.fn(),
+  removeInteraction: jest.fn(),
+  getView: jest.fn(() => ({
+    getZoom: () => 4,
+    getCenter: () => [111, 222],
+  })),
+  getInteractions: jest.fn(() => ({
+    array_: [
+      {},
+      {},
+      {},
+      {},
+      {},
+      {},
+      {},
+      {},
+      {},
+      {
+        getFeatures: jest.fn(() => ({
+          clear: jest.fn(),
+          push: jest.fn(),
+        })),
+      },
+    ],
+  })),
+  getEventPixel: jest.fn(() => [10, 20]),
+  hasFeatureAtPixel: jest.fn(() => true),
+  getViewport: jest.fn(() => ({ style: {} })),
+  getPixelFromCoordinate: jest.fn(() => [100, 200]),
+  getFeaturesAtPixel: jest.fn(() => ['mockFeature']),
+  addOverlay: jest.fn(),
+  removeOverlay: jest.fn(),
+  ...additionalProps,
+});
+
+export const createMockOl = (additionalProps = {}) => ({
+  source: {
+    TileWMS: jest.fn(() => ({ type: 'TileWMS' })),
+    Vector: jest.fn(() => ({
+      clear: jest.fn(),
+      addFeatures: jest.fn(),
+    })),
+    Cluster: jest.fn(() => ({})),
+  },
+  style: {
+    Style: jest.fn(() => ({
+      image_: { getFill: () => ({ setColor: jest.fn() }) },
+    })),
+    Circle: jest.fn(() => ({})),
+    Fill: jest.fn(() => ({})),
+    Stroke: jest.fn(() => ({})),
+    Text: jest.fn(() => ({})),
+  },
+  interaction: {
+    Select: jest.fn(() => ({
+      on: jest.fn(),
+    })),
+  },
+  condition: {
+    click: jest.fn(),
+  },
+  proj: {
+    transform: jest.fn(() => [111, 222]),
+    fromLonLat: jest.fn(() => [333, 444]),
+  },
+  Overlay: jest.fn((config) => ({
+    element: config.element,
+  })),
+  ...additionalProps,
+});
+
+export const createMockPointsSource = (features = []) => ({
+  getFeatures: () => features,
+  clear: jest.fn(),
+  addFeatures: jest.fn(),
+});
+
+export const createMockFilters = () => ({
+  measures_implemented: { m1: 'Measure 1', m2: 'Measure 2' },
+  typology_of_measures: { sector1: 'Sector 1', sector2: 'Sector 2' },
+});

package/src/components/manage/Blocks/CaseStudyExplorer/utils.test.js

@@ -1,5 +1,5 @@
 import './mockJsdom';
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 import { getFeatures, filterCases, getFilters } from './utils';
 
 describe('utils.js', () => {

package/src/components/manage/Blocks/CustomCSS/CustomCSSEdit.jsx

@@ -1,4 +1,4 @@
-import { TextareaWidget } from '@plone/volto/components';
+import TextareaWidget from '@plone/volto/components/manage/Widgets/TextareaWidget';
 
 const CustomCSSBlockEdit = ({ data, onChangeBlock, block }) => {
   return (

package/src/components/manage/Blocks/CustomJS/CustomJSEdit.jsx

@@ -1,4 +1,4 @@
-import { TextareaWidget } from '@plone/volto/components';
+import TextareaWidget from '@plone/volto/components/manage/Widgets/TextareaWidget';
 
 const CustomJSBlockEdit = ({ data, onChangeBlock, block }) => {
   return (

package/src/components/manage/Blocks/FactsheetsListing/FactsheetsListingEdit.jsx

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import FactsheetsListingView from './FactsheetsListingView';
 import schema from './schema';
-import { SidebarPortal } from '@plone/volto/components';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
 
 class Edit extends Component {

package/src/components/manage/Blocks/FactsheetsListing/FactsheetsListingView.jsx

@@ -1,11 +1,11 @@
 import React from 'react';
 import { Container, Accordion } from 'semantic-ui-react';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 
 import upSVG from '@plone/volto/icons/up-key.svg';
 import downSVG from '@plone/volto/icons/down-key.svg';
 import { Link } from 'react-router-dom';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 const FactsheetsListingView = (props) => {
   const { data, properties, id } = props;

package/src/components/manage/Blocks/KeyFacts/KeyFactsEdit.jsx

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import { SidebarPortal } from '@plone/volto/components'; // EditBlock
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal'; // EditBlock
 import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
 
 import schema from './schema';

package/src/components/manage/Blocks/MaesViewer/MaesViewerEdit.jsx

@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import { compose } from 'redux';
 import cx from 'classnames';
-import { SidebarPortal } from '@plone/volto/components'; // EditBlock
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal'; // EditBlock
 import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
 
 import maesViewrSchema from './schema';

package/src/components/manage/Blocks/MaesViewer/MaesViewerView.jsx

@@ -106,12 +106,11 @@ const View = ({ data, provider_data, id, ...rest }) => {
           </div>
           <div className="maes-viewer-charts">
             {provider_data
-              ? multiCharts.map((chart, index) => {
+              ? multiCharts.map((chart) => {
                   return (
-                    <>
+                    <React.Fragment key={chart.title}>
                       <div>{chart.title}</div>
                       <LoadablePlot
-                        key={index}
                         data={chart.data}
                         layout={chart.layout}
                         frames={[]}
@@ -122,7 +121,7 @@ const View = ({ data, provider_data, id, ...rest }) => {
                         }}
                         useResizeHandler={true}
                       />
-                    </>
+                    </React.Fragment>
                   );
                 })
               : ''}

package/src/components/manage/Blocks/MaesViewer/utils.js

@@ -1,4 +1,7 @@
-import _ from 'lodash';
+import uniq from 'lodash/uniq';
+import keys from 'lodash/keys';
+import fromPairs from 'lodash/fromPairs';
+import map from 'lodash/map';
 import { defaultHoverTemplate } from './constants';
 
 export const colorscale = [
@@ -59,7 +62,7 @@ class ProviderData {
   }
 
   getUniqueColumnData(name) {
-    return _.uniq(this.data[name]);
+    return uniq(this.data[name]);
   }
 
   getEcosystems() {
@@ -95,7 +98,7 @@ class ProviderData {
   }
 
   getColumnNames() {
-    return _.keys(this.data);
+    return keys(this.data);
   }
 
   getCellValue(columnName, rowIndex) {
@@ -136,7 +139,7 @@ class ProviderData {
 export function mapByLevel(provider_data) {
   const pd = new ProviderData(provider_data);
 
-  const byLevel = _.fromPairs(pd.getEcosystems().map((l) => [l, {}]));
+  const byLevel = fromPairs(pd.getEcosystems().map((l) => [l, {}]));
 
   pd.forEachCountryAndLevel((country, level) => {
     const filters = [
@@ -168,8 +171,8 @@ export function mapToAllEU(provider_data, byLevel) {
     totalArea += EUByLevel[level];
   });
 
-  const EUByLevelPercents = _.fromPairs(
-    _.map(Array.from(level2), (l) => {
+  const EUByLevelPercents = fromPairs(
+    map(Array.from(level2), (l) => {
       return [l, (EUByLevel[l] / totalArea) * 100];
     }),
   );
@@ -198,7 +201,7 @@ export function makeTrace(
   // first element: country name
   // second element: square kilometers (km2)
   // third element: square megameters (Mm2)
-  const hovertext = _.map(data, (x) => [x[0], x[1] / 100, x[1] / 10000]);
+  const hovertext = map(data, (x) => [x[0], x[1] / 100, x[1] / 10000]);
 
   const text = [
     ...data.slice(0, data.length - 1).map((_) => null),
@@ -335,8 +338,8 @@ export function makeChartTiles(
   const byLevel = mapByLevel(provider_data);
   const { EUByLevel, EUByLevelPercents } = mapToAllEU(provider_data, byLevel);
 
-  const ecosystems = _.uniq(provider_data['Ecosystem_level2']);
-  const countries = _.uniq(provider_data['Country_name']);
+  const ecosystems = uniq(provider_data['Ecosystem_level2']);
+  const countries = uniq(provider_data['Country_name']);
 
   const byArea = Object.fromEntries(ecosystems.map((l) => [l, {}]));
   ecosystems.forEach((level) => {

package/src/components/manage/Blocks/Navigation/Edit.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { SidebarPortal } from '@plone/volto/components';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
 import schema from './schema';
 import View from './View';

package/src/components/manage/Blocks/Navigation/View.jsx

@@ -1,8 +1,8 @@
 import React, { useMemo } from 'react';
 import { connect } from 'react-redux';
 import { Menu } from 'semantic-ui-react';
-import { UniversalLink } from '@plone/volto/components';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 import { getFieldURL } from '@eeacms/volto-bise-policy/helpers';
 
 import './styles.less';

package/src/components/manage/Blocks/schema.js

@@ -1,4 +1,4 @@
-import { cloneDeep } from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
 import imageFitSVG from '@plone/volto/icons/image-fit.svg';
 import imageWideSVG from '@plone/volto/icons/image-wide.svg';
 import imageFullSVG from '@plone/volto/icons/image-full.svg';

package/src/customizations/@eeacms/volto-datablocks/components/manage/Blocks/SimpleDataTable/Edit.jsx

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { compose } from 'redux';
 import { injectIntl } from 'react-intl';
-import { SidebarPortal } from '@plone/volto/components'; // EditBlock
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal'; // EditBlock
 import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
 import config from '@plone/volto/registry';
 import { VisibilitySensor } from '@eeacms/volto-datablocks/components';

package/src/customizations/@eeacms/volto-datablocks/components/manage/Blocks/SimpleDataTable/View.jsx

@@ -12,8 +12,8 @@ const getAlignmentOfColumn = (col, idx) => {
   return typeof col !== 'string' && col.textAlign
     ? col.textAlign
     : idx === 0
-    ? 'left'
-    : 'right';
+      ? 'left'
+      : 'right';
 };
 
 const getNameOfColumn = (col) => {
@@ -52,8 +52,8 @@ const SimpleDataTableView = (props) => {
     (pagination.data[pagination.activePage]
       ? pagination.data[pagination.activePage]
       : pagination.activePage !== pagination.prevPage
-      ? pagination.data[pagination.prevPage]
-      : null) || props.provider_data;
+        ? pagination.data[pagination.prevPage]
+        : null) || props.provider_data;
   const provider_data_length = getProviderDataLength(provider_data);
 
   const TableView =
@@ -66,8 +66,8 @@ const SimpleDataTableView = (props) => {
       ? provider_data_length
       : Math.min(pagination.itemsPerPage, provider_data_length) || 0
     : max_count > 0
-    ? Math.min(max_count, provider_data_length)
-    : provider_data_length;
+      ? Math.min(max_count, provider_data_length)
+      : provider_data_length;
 
   const providerColumns = Object.keys(provider_data || {});
   const showAllColumns = !Array.isArray(columns) || columns.length === 0;

package/src/customizations/@eeacms/volto-datablocks/components/manage/Blocks/SimpleDataTable/templates/colored/View.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { Table, Menu, Loader } from 'semantic-ui-react';
 import RenderComponent from '@eeacms/volto-datablocks/components/manage/Blocks/SimpleDataTable/components';
 import cx from 'classnames';

package/src/customizations/@eeacms/volto-datablocks/components/manage/Blocks/SimpleDataTable/templates/smart/View.jsx

@@ -1,8 +1,9 @@
 import React from 'react';
 import { connect } from 'react-redux';
-import _ from 'lodash';
+import escapeRegExp from 'lodash/escapeRegExp';
+import filter from 'lodash/filter';
 import qs from 'querystring';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { Table, Pagination, Search } from 'semantic-ui-react';
 import RenderComponent from '@eeacms/volto-datablocks/components/manage/Blocks/SimpleDataTable/components';
 
@@ -75,7 +76,7 @@ const View = (props) => {
           props.dispatch({ type: 'TABLE_CLEAN_QUERY' });
           return;
         }
-        const re = new RegExp(_.escapeRegExp(data.value), 'i');
+        const re = new RegExp(escapeRegExp(data.value), 'i');
         const isMatch = (result) => {
           for (let colDef of selectedColumns) {
             if (re.test(result[colDef.column])) {
@@ -86,7 +87,7 @@ const View = (props) => {
         };
         props.dispatch({
           type: 'TABLE_FINISH_SEARCH',
-          results: _.filter(filteredTableData, isMatch),
+          results: filter(filteredTableData, isMatch),
           payload: { activePage: data.activePage, row_size },
         });
       }, time);

package/src/customizations/@eeacms/volto-eea-design-system/ui/Header/HeaderMenuPopUp.js

@@ -1,8 +1,10 @@
+/* eslint-disable react/jsx-filename-extension */
+
 import React from 'react';
 import { Transition } from 'semantic-ui-react';
 import { Container, Grid, List, Icon, Accordion } from 'semantic-ui-react';
 
-import { cloneDeep } from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
 
 import { useClickOutside } from '@eeacms/volto-eea-design-system/helpers';
 

package/src/customizations/@eeacms/volto-eea-website-theme/components/theme/SubsiteClass.jsx

@@ -3,7 +3,8 @@ import cx from 'classnames';
 import { useDispatch, useSelector } from 'react-redux';
 
 import config from '@plone/volto/registry';
-import { BodyClass, flattenToAppURL } from '@plone/volto/helpers';
+import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 import { isSubsiteRoot } from 'volto-subsites/utils';
 import { setSubsite } from 'volto-subsites/actions';
 

package/src/customizations/volto/components/theme/Header/Header.jsx

@@ -10,21 +10,17 @@ import Cookies from 'universal-cookie';
 
 import { matchPath } from 'react-router';
 import { withRouter, useParams } from 'react-router-dom';
-import { UniversalLink } from '@plone/volto/components';
-import {
-  getBaseUrl,
-  hasApiExpander,
-  flattenToAppURL,
-} from '@plone/volto/helpers';
-import { getNavigation } from '@plone/volto/actions';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
+import { getBaseUrl, flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+import { getNavigation } from '@plone/volto/actions/navigation/navigation';
 import { Header, Logo } from '@eeacms/volto-eea-design-system/ui';
 import { usePrevious } from '@eeacms/volto-eea-design-system/helpers';
 import globeIcon from '@eeacms/volto-eea-design-system/../theme/themes/eea/assets/images/Header/global-line.svg';
 import eeaFlag from '@eeacms/volto-eea-design-system/../theme/themes/eea/assets/images/Header/eea.png';
-
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
 import config from '@plone/volto/registry';
 import { compose } from 'recompose';
-import { BodyClass } from '@plone/volto/helpers';
+import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
 import { withScreenSize } from '@eeacms/volto-resize-helper/hocs';
 
 import cx from 'classnames';
@@ -374,8 +370,8 @@ const EEAHeader = ({ token, history, subsite, content, screen, ...props }) => {
                     item.title !== 'GO TO EXPERT VIEW' || !hideExpertView,
                 )
               : isSubsite && !subsite.isRoot && !isN2KSpecies && !isN2KHabitat
-              ? getSubsiteItems()
-              : items.filter((item) => item.url !== '/natura2000')
+                ? getSubsiteItems()
+                : items.filter((item) => item.url !== '/natura2000')
           }
           renderGlobalMenuItem={(item, { onClick }) => (
             <a

package/src/customizations/volto/components/theme/View/View.jsx

@@ -12,20 +12,16 @@ import { Portal } from 'react-portal';
 import { injectIntl } from 'react-intl';
 import qs from 'query-string';
 
-import {
-  ContentMetadataTags,
-  Comments,
-  Tags,
-  Toolbar,
-} from '@plone/volto/components';
-import { listActions, getContent } from '@plone/volto/actions';
-import {
-  BodyClass,
-  getBaseUrl,
-  flattenToAppURL,
-  getLayoutFieldname,
-  hasApiExpander,
-} from '@plone/volto/helpers';
+import ContentMetadataTags from '@plone/volto/components/theme/ContentMetadataTags/ContentMetadataTags';
+import Comments from '@plone/volto/components/theme/Comments/Comments';
+import Tags from '@plone/volto/components/theme/Tags/Tags';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import { listActions } from '@plone/volto/actions/actions/actions';
+import { getContent } from '@plone/volto/actions/content/content';
+import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
+import { getBaseUrl, flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
+import { getLayoutFieldname } from '@plone/volto/helpers/Content/Content';
 
 import config from '@plone/volto/registry';
 

package/src/customizations/volto/reducers/breadcrumbs/breadcrumbs.js

@@ -3,13 +3,10 @@
  * @module reducers/breadcrumbs/breadcrumbs
  */
 
-import { map } from 'lodash';
-import {
-  flattenToAppURL,
-  getBaseUrl,
-  hasApiExpander,
-} from '@plone/volto/helpers';
+import map from 'lodash/map';
+import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers/Url/Url';
 
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
 import {
   GET_BREADCRUMBS,
   GET_CONTENT,

package/src/customizations/volto/reducers/navigation/navigation.js

@@ -3,13 +3,10 @@
  * @module reducers/navigation/navigation
  */
 
-import { map } from 'lodash';
-import {
-  flattenToAppURL,
-  getBaseUrl,
-  hasApiExpander,
-} from '@plone/volto/helpers';
+import map from 'lodash/map';
+import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers/Url/Url';
 
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
 import {
   GET_CONTENT,
   GET_NAVIGATION,

package/src/customizations/volto/reducers/types/types.js

@@ -4,12 +4,9 @@
  */
 
 import { GET_CONTENT, GET_TYPES } from '@plone/volto/constants/ActionTypes';
-import {
-  flattenToAppURL,
-  getBaseUrl,
-  hasApiExpander,
-} from '@plone/volto/helpers';
+import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers/Url/Url';
 
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
 const initialState = {
   error: null,
   loaded: false,

package/src/express-middleware.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { getAPIResourceWithAuth } from '@plone/volto/helpers';
+import { getAPIResourceWithAuth } from '@plone/volto/helpers/Api/APIResourceWithAuth';
 
 const HEADERS = [
   'Accept-Ranges',

package/src/helpers.js

@@ -1,7 +1,7 @@
 import isArray from 'lodash/isArray';
 import isObject from 'lodash/isObject';
 import isString from 'lodash/isString';
-import { isInternalURL, flattenToAppURL } from '@plone/volto/helpers';
+import { isInternalURL, flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 export const getFieldURL = (data) => {
   let url = data;