@eeacms/volto-bise-policy 1.2.45 → 1.2.47

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`],
@@ -54,7 +54,7 @@ const defaultConfig = {
         allowReferrer: true,
       },
     ],
-  }
+  },
 };
 
 const config = addonExtenders.reduce(

package/CHANGELOG.md

@@ -4,7 +4,44 @@ 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).
 
-### [1.2.45](https://github.com/eea/volto-bise-policy/compare/1.2.44...1.2.45) - 4 May 2026
+### [1.2.47](https://github.com/eea/volto-bise-policy/compare/1.3.0-beta.1...1.2.47) - 17 June 2026
+
+#### :rocket: Dependency updates
+
+- Release @eeacms/volto-openlayers-map@2.0.1 [EEA Jenkins - [`89854c4`](https://github.com/eea/volto-bise-policy/commit/89854c42c4d04ecb53876eac41c52a53ec8547ad)]
+
+#### :hammer_and_wrench: Others
+
+- update jenkinsfile [nileshgulia1 - [`84315d2`](https://github.com/eea/volto-bise-policy/commit/84315d29e36427a50fcc1a939c9e650b69bd81f2)]
+- fix sonarqube [nileshgulia1 - [`2da4f19`](https://github.com/eea/volto-bise-policy/commit/2da4f1921027093a95d9011ef3ff8d2977fc0dcc)]
+- fix duplicated code [nileshgulia1 - [`91cdb7a`](https://github.com/eea/volto-bise-policy/commit/91cdb7ad2221506a15ed988e28c7e918b07bcbbf)]
+- fix slashmenu styles on content box [nileshgulia1 - [`13765ad`](https://github.com/eea/volto-bise-policy/commit/13765ad26acc9af1f1066b164b4c58393b902c01)]
+### [1.3.0-beta.1](https://github.com/eea/volto-bise-policy/compare/1.2.46...1.3.0-beta.1) - 27 May 2026
+
+#### :bug: Bug Fixes
+
+- fix: pathname undefined in Aapp.jsx [nileshgulia1 - [`0d1285c`](https://github.com/eea/volto-bise-policy/commit/0d1285c898d4c7a280b0dc611b76efa9e7d41b3b)]
+- fix(CaseStudyExplorer): reduce code duplication [nileshgulia1 - [`95e3682`](https://github.com/eea/volto-bise-policy/commit/95e3682eeaeb4e37bc5849e927c20e374e6944d7)]
+- fix(CaseStudyExplorer): reduce code duplication [nileshgulia1 - [`a9b307c`](https://github.com/eea/volto-bise-policy/commit/a9b307caaa7ecd93ae18fc5478642c2a74d571ed)]
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`c116337`](https://github.com/eea/volto-bise-policy/commit/c1163379eaf659ae075eb9e552555498c38dfa88)]
+- style: Automated code fix [eea-jenkins - [`120388e`](https://github.com/eea/volto-bise-policy/commit/120388e0eae779dac0af2d416819be787158082c)]
+- style: Automated code fix [eea-jenkins - [`32bdad2`](https://github.com/eea/volto-bise-policy/commit/32bdad20d0e5eeced3d7026c6e2e2b5c7d7ebf22)]
+
+#### :hammer_and_wrench: Others
+
+- remove App.js customization [nileshgulia1 - [`488d6e1`](https://github.com/eea/volto-bise-policy/commit/488d6e187a376224177dbabb5b662b33fe7877d1)]
+- refactor code as per sonarQube [nileshgulia1 - [`5e96d28`](https://github.com/eea/volto-bise-policy/commit/5e96d288bf13fd6644e61e47c210ce73fbd00607)]
+- bump querystring in package.json [nileshgulia1 - [`299b753`](https://github.com/eea/volto-bise-policy/commit/299b753d62a487cc162581a4252691e7a3c03f62)]
+- fix useEffect [nileshgulia1 - [`40e0f1f`](https://github.com/eea/volto-bise-policy/commit/40e0f1f871945a08115301c4aea7a57197adfc34)]
+- cosmetics [nileshgulia1 - [`202e2b2`](https://github.com/eea/volto-bise-policy/commit/202e2b29b07f1f6764f7732f2eb056bedfa14fff)]
+- eslint . [nileshgulia1 - [`dc50e42`](https://github.com/eea/volto-bise-policy/commit/dc50e426426cf162b9ace7cd727ab9e656c5b88c)]
+- upgrade to Volto 18 refs #302160 [nileshgulia1 - [`ef610e6`](https://github.com/eea/volto-bise-policy/commit/ef610e64f45288043a848bde7a335475fb6f6dd4)]
+### [1.2.46](https://github.com/eea/volto-bise-policy/compare/1.2.45...1.2.46) - 5 May 2026
+
+### [1.2.45](https://github.com/eea/volto-bise-policy/compare/1.2.44...1.2.45) - 5 May 2026
 
 #### :rocket: Dependency updates
 

package/jest-addon.config.js

@@ -1,4 +1,23 @@
-require('dotenv').config({ path: __dirname + '/.env' })
+require('dotenv').config({ path: __dirname + '/.env' });
+
+const fs = require('fs');
+const path = require('path');
+
+// Volto 18 exposes @plone/volto-slate as a top-level package.
+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)'],
@@ -8,25 +27,27 @@ module.exports = {
   ],
   moduleNameMapper: {
     '\\.(css|less|scss|sass)$': 'identity-obj-proxy',
+    '@plone-collective/volto-authomatic/(.*)$':
+      '<rootDir>/node_modules/@plone-collective/volto-authomatic/src/$1',
     '@plone/volto/cypress': '<rootDir>/node_modules/@plone/volto/cypress',
     '@plone/volto/babel': '<rootDir>/node_modules/@plone/volto/babel',
     '@plone/volto/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
     '@package/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
     '@root/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
     '@plone/volto-quanta/(.*)$': '<rootDir>/src/addons/volto-quanta/src/$1',
-    '@eeacms/search/(.*)$': '<rootDir>/src/addons/volto-searchlib/searchlib/$1',
-    '@eeacms/search': '<rootDir>/src/addons/volto-searchlib/searchlib',
+    '@eeacms/search/(.*)$':
+      '<rootDir>/node_modules/@eeacms/volto-searchlib/searchlib/$1',
+    '@eeacms/search':
+      '<rootDir>/node_modules/@eeacms/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',
   },
   transformIgnorePatterns: [
-    '/node_modules/(?!(@plone|@root|@package|@eeacms)/).*/',
+    '/node_modules/(?!(@plone|@root|@package|@eeacms|@plone-collective)/).*/',
   ],
   transform: {
     '^.+\\.js(x)?$': 'babel-jest',
@@ -37,10 +58,10 @@ module.exports = {
   },
   coverageThreshold: {
     global: {
-      branches: 5,
-      functions: 5,
-      lines: 5,
-      statements: 5,
+      branches: 0,
+      functions: 0,
+      lines: 0,
+      statements: 0,
     },
   },
   ...(process.env.JEST_USE_SETUP === 'ON' && {
@@ -48,4 +69,4 @@ module.exports = {
       '<rootDir>/node_modules/@eeacms/volto-bise-policy/jest.setup.js',
     ],
   }),
-}
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-bise-policy",
-  "version": "1.2.45",
+  "version": "1.2.47",
   "description": "@eeacms/volto-bise-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -30,11 +30,12 @@
     "@eeacms/volto-datablocks": "*",
     "@eeacms/volto-eea-design-system": "*",
     "@eeacms/volto-eea-website-theme": "*",
-    "@eeacms/volto-openlayers-map": "2.0.0",
+    "@eeacms/volto-openlayers-map": "2.0.1",
     "@eeacms/volto-resize-helper": "*",
     "@plone-collective/volto-authomatic": "2.0.1",
     "esri-loader": "3.7.0",
     "plotly.js": "^2.28.0",
+    "querystring": "0.2.1",
     "react-plotly.js": "2.6.0"
   },
   "devDependencies": {

package/src/components/Widgets/EUNISObjectListWidget.jsx

@@ -1,8 +1,11 @@
 import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { Accordion, Button, Segment } from 'semantic-ui-react';
-import { DragDropList, FormFieldWrapper, Icon } from '@plone/volto/components';
-import { applySchemaDefaults, reorderArray } from '@plone/volto/helpers';
+import DragDropList from '@plone/volto/components/manage/DragDropList/DragDropList';
+import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import { reorderArray } from '@plone/volto/helpers/Utils/Utils';
+import { applySchemaDefaults } from '@plone/volto/helpers/Blocks/Blocks';
 import ObjectWidget from '@plone/volto/components/manage/Widgets/ObjectWidget';
 
 import upSVG from '@plone/volto/icons/up-key.svg';
@@ -420,11 +423,9 @@ export const EUNISCountryCodeView = ({ value }) => {
 
   if (!items || items.length === 0) return null;
 
-  return items.map((country) => (
-    <div>
-      <div key={country['@id']} className="country-item">
-        {country.countryCode?.join(', ')}
-      </div>
+  return items.map((country, index) => (
+    <div key={country['@id'] ?? index}>
+      <div className="country-item">{country.countryCode?.join(', ')}</div>
       <div className="eunis-widget-view">
         {country.national.map((item) => (
           <div key={item['@id']} className="eunis-widget-item">

package/src/components/Widgets/GeolocationWidget.jsx

@@ -4,7 +4,7 @@ import { Input, Label, Button } from 'semantic-ui-react';
 import config from '@plone/volto/registry';
 
 import { injectIntl } from 'react-intl';
-import { FormFieldWrapper } from '@plone/volto/components';
+import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
 import MapContainer from './GeolocationWidgetMapContainer';
 
 const defaultValue = {

package/src/components/Widgets/NRRWidgets.jsx

@@ -1,4 +1,4 @@
-import { UniversalLink } from '@plone/volto/components';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import { Popup } from 'semantic-ui-react';
 export const NRRTypologyOfMeasuresView = ({ value }) => {
   let parsedValue = value;

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { BodyClass } from '@plone/volto/helpers';
+import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
 
 const View = (props) => {
   return (

package/src/components/manage/Blocks/CaseStudyExplorer/CaseStudyExplorerView.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Grid } from 'semantic-ui-react'; // Dropdown,
-import { addAppURL } from '@plone/volto/helpers';
+import { addAppURL } from '@plone/volto/helpers/Url/Url';
 // import config from '@plone/volto/registry';
 import CaseStudyMap from './CaseStudyMap';
 import { ActiveFilters, CaseStudyFilters, SearchBox } from './CaseStudyFilters';

package/src/components/manage/Blocks/CaseStudyExplorer/CaseStudyExplorerView.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 { useCases } from './hooks';
 import CaseStudyExplorerView from './CaseStudyExplorerView';
 

package/src/components/manage/Blocks/CaseStudyExplorer/CaseStudyFilters.jsx

@@ -72,7 +72,7 @@ export function CaseStudyFilter(props) {
               <label
                 htmlFor={label + index}
                 className="filter-input"
-                key={index}
+                key={value}
               >
                 <input
                   value={value}
@@ -221,15 +221,42 @@ function SearchBoxComponent(props) {
   );
 }
 
+function FilterGroup({
+  filterName,
+  filterLabel,
+  activeFilterCodes,
+  filters,
+  onRemoveFilter,
+}) {
+  return activeFilterCodes.length > 0 ? (
+    <div className="filter-wrapper">
+      <div className="filter-label">{filterLabel}</div>
+      {activeFilterCodes.map((filterCode) => {
+        const label = filters[filterName][filterCode];
+        return (
+          <div className="ui basic label filter-value" key={filterCode}>
+            <span>{label}</span>
+            <i
+              tabIndex="0"
+              onKeyPress={() => {}}
+              onClick={() => {
+                onRemoveFilter(filterName, filterCode);
+                scrollToElement('search-input');
+              }}
+              role="button"
+              className="close icon"
+            ></i>
+          </div>
+        );
+      })}
+    </div>
+  ) : null;
+}
+
 function ActiveFiltersComponent(props) {
   const { filters, activeFilters, setActiveFilters } = props;
   const hasActiveFilters = Object.entries(activeFilters).some(
-    ([filterName, filterList]) => {
-      if (filterList.length > 0) {
-        return true;
-      }
-      return false;
-    },
+    ([_, filterList]) => filterList.length > 0,
   );
 
   const clearFilters = () => {
@@ -245,10 +272,7 @@ function ActiveFiltersComponent(props) {
 
   const removeFilter = (filterName, filterCode) => {
     const temp = JSON.parse(JSON.stringify(activeFilters));
-    temp[filterName] = temp[filterName].filter((value) => {
-      if (value !== filterCode) return value;
-      return null;
-    });
+    temp[filterName] = temp[filterName].filter((value) => value !== filterCode);
 
     const filterInputs = document.querySelectorAll(
       '#cse-filter .filter-input input',
@@ -276,62 +300,24 @@ function ActiveFiltersComponent(props) {
       </div>
       <div className="filter-list-content">
         <div className="filter">
-          {activeFilters.measures_implemented.length > 0 ? (
-            <div className="filter-wrapper">
-              <div className="filter-label">Measures implemented:</div>
-              {activeFilters.measures_implemented.map((filterCode) => {
-                const filterLabel = filters.measures_implemented[filterCode];
-                return (
-                  <div className="ui basic label filter-value">
-                    <span>{filterLabel}</span>
-                    <i
-                      tabIndex="0"
-                      onKeyPress={() => {}}
-                      onClick={() => {
-                        removeFilter('measures_implemented', filterCode);
-                        scrollToElement('search-input');
-                      }}
-                      role="button"
-                      className="close icon"
-                    ></i>
-                  </div>
-                );
-              })}
-            </div>
-          ) : (
-            ''
-          )}
-          {activeFilters.typology_of_measures.length > 0 ? (
-            <div className="filter-wrapper">
-              <div className="filter-label">Typology of measures:</div>
-              {activeFilters.typology_of_measures.map((filterCode) => {
-                const filterLabel = filters.typology_of_measures[filterCode];
-                return (
-                  <div className="ui basic label filter-value">
-                    <span>{filterLabel}</span>
-                    <i
-                      tabIndex="0"
-                      onKeyPress={() => {}}
-                      onClick={() => {
-                        removeFilter('typology_of_measures', filterCode);
-                        scrollToElement('search-input');
-                      }}
-                      role="button"
-                      className="close icon"
-                    ></i>
-                  </div>
-                );
-              })}
-            </div>
-          ) : (
-            ''
-          )}
+          <FilterGroup
+            filterName="measures_implemented"
+            filterLabel="Measures implemented:"
+            activeFilterCodes={activeFilters.measures_implemented}
+            filters={filters}
+            onRemoveFilter={removeFilter}
+          />
+          <FilterGroup
+            filterName="typology_of_measures"
+            filterLabel="Typology of measures:"
+            activeFilterCodes={activeFilters.typology_of_measures}
+            filters={filters}
+            onRemoveFilter={removeFilter}
+          />
         </div>
       </div>
     </div>
-  ) : (
-    ''
-  );
+  ) : null;
 }
 
 export const CaseStudyFilters = withOpenLayers(CaseStudyFiltersComponent);

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

@@ -1,6 +1,6 @@
 import './mockJsdom';
 import React from 'react';
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 import { render } from '@testing-library/react';
 
 import {
@@ -9,6 +9,7 @@ import {
   SearchBox,
   CaseStudyFilter,
 } from './CaseStudyFilters';
+import { createMockFilters } from './testUtils';
 
 jest.mock('@eeacms/volto-openlayers-map', () => ({
   openlayers: {
@@ -28,41 +29,32 @@ jest.mock('@eeacms/volto-openlayers-map', () => ({
   ),
 }));
 
-describe('CaseStudyFilters', () => {
-  const mockSetActiveFilters = jest.fn();
-  window.URL.createObjectURL = function () {};
-  global.URL.createObjectURL = jest.fn();
+window.URL.createObjectURL = function () {};
+global.URL.createObjectURL = jest.fn();
 
-  const mockFilters = {
-    typology_of_measures: { sector1: 'Sector 1', sector2: 'Sector 2' },
-  };
+const mockFilters = createMockFilters();
+const mockSetActiveFilters = jest.fn();
 
+describe('CaseStudyFilters', () => {
   it('renders without crashing', () => {
     const { container } = render(
       <CaseStudyFilters
         filters={mockFilters}
-        activeFilters={{ typology_of_measures: [] }}
+        activeFilters={{ measures_implemented: [], typology_of_measures: [] }}
         setActiveFilters={mockSetActiveFilters}
       />,
     );
 
-    // CaseStudyFilters component returns empty content (commented out filters)
-    // Just verify it renders without error
     expect(container).toBeTruthy();
   });
 });
 
 describe('ActiveFilters', () => {
-  const mockSetActiveFilters = jest.fn();
-  const mockFilters = {
-    typology_of_measures: { sector1: 'Sector 1', sector2: 'Sector 2' },
-  };
-
   it('renders without crashing', () => {
     render(
       <ActiveFilters
         filters={mockFilters}
-        activeFilters={{ typology_of_measures: [] }}
+        activeFilters={{ measures_implemented: [], typology_of_measures: [] }}
         setActiveFilters={mockSetActiveFilters}
       />,
     );
@@ -70,41 +62,28 @@ describe('ActiveFilters', () => {
 });
 
 describe('SearchBox', () => {
-  const mockSetActiveFilters = jest.fn();
-  const mockFilters = {
-    typology_of_measures: { sector1: 'Sector 1', sector2: 'Sector 2' },
-  };
-
-  const mockSetSearchInput = jest.fn();
-  const mockSearchInput = 'bise';
-
   it('renders without crashing', () => {
     render(
       <SearchBox
         filters={mockFilters}
-        activeFilters={{ typology_of_measures: [] }}
+        activeFilters={{ measures_implemented: [], typology_of_measures: [] }}
         setActiveFilters={mockSetActiveFilters}
-        searchInput={mockSearchInput}
-        setSearchInput={mockSetSearchInput}
+        searchInput="bise"
+        setSearchInput={jest.fn()}
       />,
     );
   });
 });
 
 describe('CaseStudyFilter', () => {
-  const mockSetActiveFilters = jest.fn();
-  const mockFilters = {
-    typology_of_measures: { sector1: 'Sector 1', sector2: 'Sector 2' },
-  };
-
   it('renders without crashing', () => {
     render(
       <CaseStudyFilter
-        filterTitle={'Case study filter'}
+        filterTitle="Case study filter"
         filters={mockFilters}
-        activeFilters={{ typology_of_measures: [] }}
+        activeFilters={{ measures_implemented: [], typology_of_measures: [] }}
         setActiveFilters={mockSetActiveFilters}
-        filterName={'Filter name'}
+        filterName="measures_implemented"
       />,
     );
   });

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

@@ -7,6 +7,7 @@ import {
   scrollToElement,
   zoomMapToFeatures,
 } from './utils';
+import { createMockMap, createMockPointsSource } from './testUtils';
 
 jest.mock('@eeacms/volto-openlayers-map', () => ({
   withOpenLayers: (Component) => Component,
@@ -18,44 +19,19 @@ jest.mock('./utils', () => ({
   zoomMapToFeatures: jest.fn(),
 }));
 
-const mockMap = {
-  getInteractions: () => ({
-    array_: [
-      {},
-      {},
-      {},
-      {},
-      {},
-      {},
-      {},
-      {},
-      {},
-      {
-        getFeatures: () => ({
-          clear: jest.fn(),
-          push: jest.fn(),
-        }),
-      },
-    ],
-  }),
-  getPixelFromCoordinate: jest.fn(() => [100, 200]),
-  getFeaturesAtPixel: jest.fn(() => ['mockFeature']),
-};
-
-const mockPointsSource = {
-  getFeatures: () => [
-    {
-      values_: {
-        title: 'Feature 1',
-        path: '/feature1',
-        description: 'Description 1',
-        typology_of_measures: ['SectorA'],
-        measures_implemented: [{ title: 'M1', path: '/m1' }],
-        geometry: { flatCoordinates: [0, 0] },
-      },
+const mockMap = createMockMap();
+const mockPointsSource = createMockPointsSource([
+  {
+    values_: {
+      title: 'Feature 1',
+      path: '/feature1',
+      description: 'Description 1',
+      typology_of_measures: ['SectorA'],
+      measures_implemented: [{ title: 'M1', path: '/m1' }],
+      geometry: { flatCoordinates: [0, 0] },
     },
-  ],
-};
+  },
+]);
 
 const selectedCase = {
   title: 'Selected Title',

package/src/components/manage/Blocks/CaseStudyExplorer/CaseStudyMap.jsx

@@ -75,7 +75,7 @@ function CaseStudyMap(props) {
   }, [activeItems, pointsSource, ol]);
 
   React.useEffect(() => {
-    if (!map) return null;
+    if (!map) return;
 
     const moveendListener = (e) => {
       // console.log('map.getView()', map.getView());

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

@@ -3,6 +3,7 @@ import { render, screen, fireEvent } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import CaseStudyMap from './CaseStudyMap';
 import { getFeatures, centerAndResetMapZoom, scrollToElement } from './utils';
+import { createMockMap, createMockOl } from './testUtils';
 
 jest.mock('@eeacms/volto-openlayers-map', () => ({
   withOpenLayers: (Comp) => Comp,
@@ -34,57 +35,8 @@ jest.mock('./utils', () => ({
   scrollToElement: jest.fn(),
 }));
 
-const mockOl = {
-  source: {
-    TileWMS: jest.fn(() => ({ type: 'TileWMS' })),
-    Vector: jest.fn(() => ({
-      clear: jest.fn(),
-      addFeatures: jest.fn(),
-    })),
-    Cluster: jest.fn(() => ({})),
-  },
-  style: {
-    Style: jest.fn(() => ({})),
-    Circle: jest.fn(() => ({})),
-    Stroke: jest.fn(() => ({})),
-    Fill: jest.fn(() => ({})),
-    Text: jest.fn(() => ({})),
-  },
-  proj: {
-    transform: jest.fn(() => [111, 222]),
-    fromLonLat: jest.fn(() => [333, 444]),
-  },
-};
-
-const mockMap = {
-  on: jest.fn(),
-  un: jest.fn(),
-  getView: jest.fn(() => ({
-    getZoom: () => 4,
-    getCenter: () => [111, 222],
-  })),
-  getInteractions: jest.fn(() => ({
-    array_: [
-      {},
-      {},
-      {},
-      {},
-      {},
-      {},
-      {},
-      {},
-      {},
-      {
-        getFeatures: jest.fn(() => ({
-          clear: jest.fn(),
-          push: jest.fn(),
-        })),
-      },
-    ],
-  })),
-  getPixelFromCoordinate: jest.fn(() => [10, 20]),
-  getFeaturesAtPixel: jest.fn(() => ['f']),
-};
+const mockOl = createMockOl();
+const mockMap = createMockMap();
 
 describe('CaseStudyMap', () => {
   beforeEach(() => {