@eeacms/volto-cca-policy 0.1.67 → 0.1.69

package/CHANGELOG.md

@@ -4,6 +4,66 @@ 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.69](https://github.com/eea/volto-cca-policy/compare/0.1.68...0.1.69) - 31 January 2024
+
+#### :hammer_and_wrench: Others
+
+- Refs #161485 - observatory resource catalog menu [Tripon Eugen - [`31bbb1a`](https://github.com/eea/volto-cca-policy/commit/31bbb1a2bf361d7000d11d2f9665a9de50cd240f)]
+- Refs #161485 - observatory resource catalog menu [Tripon Eugen - [`c2c31be`](https://github.com/eea/volto-cca-policy/commit/c2c31be706b255d58d08e2f9210bd2f1dc0b160b)]
+### [0.1.68](https://github.com/eea/volto-cca-policy/compare/0.1.67...0.1.68) - 30 January 2024
+
+#### :bug: Bug Fixes
+
+- fix: preview image in search listing [kreafox - [`77025e2`](https://github.com/eea/volto-cca-policy/commit/77025e2c65e73d2b25a85a3a601195cf5b654a45)]
+- fix: stories search listing + show images [kreafox - [`04eac85`](https://github.com/eea/volto-cca-policy/commit/04eac854b915051534cec0f4c03cd86aca95ef75)]
+
+#### :nail_care: Enhancements
+
+- change: update icon [kreafox - [`5abd305`](https://github.com/eea/volto-cca-policy/commit/5abd305ad658e4a8bd8d2351a86448e4724ee287)]
+- change: color in observatory search [kreafox - [`5711c4f`](https://github.com/eea/volto-cca-policy/commit/5711c4fc08a1e71fe74fb918da41e2f4cc173d7b)]
+- change: separate mission styling [kreafox - [`4b4749a`](https://github.com/eea/volto-cca-policy/commit/4b4749abce6a871d3d595391f72520ae22bfeacf)]
+
+#### :hammer_and_wrench: Others
+
+- Refs #161485 - update icons [Tripon Eugen - [`91f0bee`](https://github.com/eea/volto-cca-policy/commit/91f0bee22c78854b0f4be2dcb56bf0d00a3bd6e5)]
+- Refs #161485 - set portal types icons [Tripon Eugen - [`055f26a`](https://github.com/eea/volto-cca-policy/commit/055f26accc79ed56b10f539449e88d030171df3b)]
+- Compute icons for clusters [Tiberiu Ichim - [`cdbe2cd`](https://github.com/eea/volto-cca-policy/commit/cdbe2cdda3b59110b136b0e947c0c97dc8965df6)]
+- Refs #161485 - health impacts facet default sort order [Tripon Eugen - [`535ab04`](https://github.com/eea/volto-cca-policy/commit/535ab04547c00cdbf109c07a8c6cfe425ab04916)]
+- Refs #161485 - filter test add one more [Tripon Eugen - [`fa93935`](https://github.com/eea/volto-cca-policy/commit/fa93935e380cfe13203a3a241b85102c3d48d36f)]
+- Refs #161485 - filter test change check element [Tripon Eugen - [`e40a029`](https://github.com/eea/volto-cca-policy/commit/e40a02902e61338a1bacec8b1e17171194528c93)]
+- Refs #161485 - filter test for sonarqube [Tripon Eugen - [`f764310`](https://github.com/eea/volto-cca-policy/commit/f7643109e63ebeb881d6ea825ba00eb7a2a18646)]
+- Refs #161485 - filter test for sonarqube [Tripon Eugen - [`2b85fcc`](https://github.com/eea/volto-cca-policy/commit/2b85fcc99aaf5e030a982ea67c796bde28053552)]
+- Refs #161485 - filter test for sonarqube [Tripon Eugen - [`2566360`](https://github.com/eea/volto-cca-policy/commit/25663608f5f851dec8a5d83d740008ebff5df233)]
+- Refs #161485 - filter test for sonarqube [Tripon Eugen - [`b09873c`](https://github.com/eea/volto-cca-policy/commit/b09873c7f3b764030897bd042a3169b411b9deec)]
+- Refs #161485 - filter test for sonarqube [Tripon Eugen - [`7df5146`](https://github.com/eea/volto-cca-policy/commit/7df5146e0f6b27accf8fd5a5964f5454c078900a)]
+- Refs #161485 - sonarqube [Tripon Eugen - [`20b5781`](https://github.com/eea/volto-cca-policy/commit/20b5781e07ed0bbb0017ba4644122171dda4d6c5)]
+- Refs #161485 - sonarqube [Tripon Eugen - [`26eab80`](https://github.com/eea/volto-cca-policy/commit/26eab80e3fd2ef1d8bcf7f7c1fc959598e90474a)]
+- Refs #161485 - duplicated lines [Tripon Eugen - [`0b2f187`](https://github.com/eea/volto-cca-policy/commit/0b2f187771a9c9bb0a4eedb84d5ebdb4ccbe81aa)]
+- Refs #161485 - update health facets [Tripon Eugen - [`2c132bb`](https://github.com/eea/volto-cca-policy/commit/2c132bb71822d8873cda6ffe562c0522e3f0c151)]
+- Refs #161485 - update health facets from develop [Tripon Eugen - [`a974d79`](https://github.com/eea/volto-cca-policy/commit/a974d7988e558e4a02eca9807331740214854ea6)]
+- Refs #161485 - facets comment custom sort [Tripon Eugen - [`80d78c9`](https://github.com/eea/volto-cca-policy/commit/80d78c9c9b9118ea505a42af47263d05748e52bf)]
+- Refs #263399 - Fix eslint errors. [GhitaB - [`d0595d1`](https://github.com/eea/volto-cca-policy/commit/d0595d12018bdec0582370204aa8afce3cb1010b)]
+- Refs #263399 - Fix eslint errors. [GhitaB - [`c881386`](https://github.com/eea/volto-cca-policy/commit/c8813864b93a53d5f581b33fee45140790834d51)]
+- Add physical-breadcrumbs [Tiberiu Ichim - [`3f365f8`](https://github.com/eea/volto-cca-policy/commit/3f365f8c9529ff082b6599d0c425d7ef1bafc951)]
+- Revert "test: Update jest,Jenkinsfile,lint to volto-addons-template PR30". [GhitaB - [`fd821d1`](https://github.com/eea/volto-cca-policy/commit/fd821d1629dca31bb2de6e06752e6e57d3d44651)]
+- Improve code - fix duplicate common facets: objectProvides, language, issued_date. [GhitaB - [`935855a`](https://github.com/eea/volto-cca-policy/commit/935855a9e6a745ca598cf50f7fac216fd11ade08)]
+- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`9533869`](https://github.com/eea/volto-cca-policy/commit/95338695df80637079e3b032cb40e9db8e678635)]
+- Improve code - fix duplicate common facets: include_archived. [GhitaB - [`1a72756`](https://github.com/eea/volto-cca-policy/commit/1a7275684cefae5584a47c2af926bcd93243a934)]
+- Improve code - fix duplicate common facets: include_archived. [GhitaB - [`1a3785a`](https://github.com/eea/volto-cca-policy/commit/1a3785a46cf912588ff68f62bdbf03f17012e550)]
+- Improve code - fix duplicate /Blocks/withResponsiveContainer.js. [GhitaB - [`7d375f2`](https://github.com/eea/volto-cca-policy/commit/7d375f2ed38931be198f8c9d5c40366edc9c3185)]
+- Improve code /components/theme/Views/CaseStudyView.jsx. [GhitaB - [`875f512`](https://github.com/eea/volto-cca-policy/commit/875f512eb1bed848ef76aa90700ba72ac63d01e9)]
+- Clean code in Blocks/TransRegionSelect/countries.js. [GhitaB - [`2af2206`](https://github.com/eea/volto-cca-policy/commit/2af2206154f22a4bbbd8c25f8cd9aec0640a1df2)]
+- Revert "test: Update jest,Jenkinsfile,lint to volto-addons-template PR30" [David Ichim - [`ab43cb2`](https://github.com/eea/volto-cca-policy/commit/ab43cb21236dc39d51e01003807f8f1020a4e64b)]
+- Set main search as default [Tiberiu Ichim - [`2877ce4`](https://github.com/eea/volto-cca-policy/commit/2877ce43b178899df48fc655594a50d696ccc2ea)]
+- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`9c94b78`](https://github.com/eea/volto-cca-policy/commit/9c94b78d04c18691fa04b9fdaaf61a052cbc89a6)]
+- Fix custom facet values in health observatory [Tiberiu Ichim - [`c6ddacf`](https://github.com/eea/volto-cca-policy/commit/c6ddacf318e24b1b32cc58c2cda5b5acabd9ffad)]
+- Comment code [Tiberiu Ichim - [`f552df1`](https://github.com/eea/volto-cca-policy/commit/f552df196f15e4d9726ec5f1060314a6f92f8e0f)]
+- Fix facets for main search [Tiberiu Ichim - [`2defd05`](https://github.com/eea/volto-cca-policy/commit/2defd05596f490dd5b434a4f4a4156d423578f36)]
+- Update menu for translated search menu (fix show children) [Ghiță Bizău - [`d03f8c3`](https://github.com/eea/volto-cca-policy/commit/d03f8c322790e67c91d0e58803640237444bdd52)]
+- Add dependency on volto-searchlib [Tiberiu Ichim - [`955edee`](https://github.com/eea/volto-cca-policy/commit/955edee904da8cb0292b6ffef5c9f493101baf43)]
+- Cleanup facets in cca search [Tiberiu Ichim - [`bf0e7cb`](https://github.com/eea/volto-cca-policy/commit/bf0e7cb7805b7844fe741d44b4b05ec29447d96d)]
+- Refs #161485 - observatory search update settings [Tripon Eugen - [`06f483f`](https://github.com/eea/volto-cca-policy/commit/06f483fe95f1b791cbd20206099730175df945cf)]
+- Refs #161485 - observatory search update settings [Tripon Eugen - [`b4f3530`](https://github.com/eea/volto-cca-policy/commit/b4f353025c52e2a85268750fb97074963bb2dd32)]
 ### [0.1.67](https://github.com/eea/volto-cca-policy/compare/0.1.66...0.1.67) - 26 January 2024
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.1.67",
+  "version": "0.1.69",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/components/manage/Blocks/CountryMapHeatIndex/Filter.test.jsx

@@ -0,0 +1,37 @@
+import React from 'react';
+import { MemoryRouter } from 'react-router-dom';
+import configureStore from 'redux-mock-store';
+import { render } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+import { Provider } from 'react-intl-redux';
+import Filter from './Filter';
+
+const mockStore = configureStore();
+
+describe('Filter', () => {
+  it('should render the component', () => {
+    const data = {
+      thematicMapMode: 'hhap',
+      setThematicMapMode(param) {
+        return param;
+      },
+    };
+
+    const store = mockStore({
+      userSession: { token: '1234' },
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+    });
+
+    const { container } = render(
+      <Provider store={store}>
+        <MemoryRouter>
+          <Filter {...data} />
+        </MemoryRouter>
+      </Provider>,
+    );
+    expect(container.querySelector('#sections-selector')).toBeInTheDocument();
+  });
+});

package/src/components/manage/Blocks/CountryMapHeatIndex/View.js

@@ -7,11 +7,8 @@ import { compose } from 'redux';
 import { clientOnly } from '@eeacms/volto-cca-policy/helpers';
 import withResponsiveContainer from './../withResponsiveContainer.js';
 import { addAppURL } from '@plone/volto/helpers';
-import {
-  getFocusCountriesFeature,
-  getFocusCountryNames,
-  renderCountriesBox,
-} from './map-utils.js';
+import { getFocusCountryNames, renderCountriesBox } from './map-utils.js';
+import { getFocusCountriesFeature } from '@eeacms/volto-cca-policy/helpers/country_map/countryMap.js';
 
 import Filter from './Filter';
 

package/src/components/manage/Blocks/CountryMapHeatIndex/map-utils.js

@@ -1,45 +1,9 @@
+import {
+  euCountryNames,
+  removeTooltip,
+} from '@eeacms/volto-cca-policy/helpers/country_map/countryMap.js';
 export function getFocusCountryNames() {
-  return [
-    'Albania',
-    'Austria',
-    'Belgium',
-    'Bosnia-Herzegovina',
-    'Bosnia and Herzegovina',
-    'Bulgaria',
-    'Cyprus',
-    'Croatia',
-    'Czechia',
-    'Denmark',
-    'Estonia',
-    'Finland',
-    'France',
-    'Germany',
-    'Greece',
-    'Hungary',
-    'Iceland',
-    'Ireland',
-    'Italy',
-    'Latvia',
-    'Lithuania',
-    'Luxembourg',
-    'Malta',
-    'Montenegro',
-    'Netherlands',
-    'North Macedonia',
-    'Poland',
-    'Portugal',
-    'Romania',
-    'Serbia',
-    'Slovakia',
-    'Slovenia',
-    'Spain',
-    'Sweden',
-    'United Kingdom',
-    'Liechtenstein',
-    'Norway',
-    'Switzerland',
-    'Turkey',
-  ];
+  return euCountryNames;
 }
 
 export function getFocusCountriesFeature(world) {
@@ -123,9 +87,175 @@ export function renderCountriesBox(opts, d3, d3Geo) {
     renderCountry(map, country, path, countries, x, y, d3, countries_metadata);
   });
 
+  var mo = {
+    svg: svg,
+    world: world,
+    viewport: [width, height],
+    countries: ['Malta', 'Liechtenstein', 'Luxembourg'],
+    start: [width + 10, 10],
+    side: 'left',
+    // 'size': 80,
+    // 'space': 6,
+  };
+  drawMaplets(mo, d3);
+
   return path;
 }
 
+function filterCountriesByNames(countries, filterIds) {
+  var features = {
+    type: 'FeatureCollection',
+    features: [],
+  };
+
+  // console.log('filterids', filterIds);
+  // filterIds has "Kosovo (under UNSCR 1244/99)" SHRT_ENGL is Kosovo
+  // filterIds has "Bosnia-Herzegovina", SHRT_ENGL is "Bosnia and Herzegovina"
+
+  // debugger;
+  countries.forEach(function (c) {
+    // var correct_name =
+    //   correct_country_names[c.properties.SHRT_ENGL] || c.properties.SHRT_ENGL;
+    if (filterIds.indexOf(c.properties.SHRT_ENGL) === -1) {
+      return;
+    }
+    features.features.push(c);
+  });
+  return features;
+}
+
+function drawMaplets(opts, d3) {
+  var svg = opts.svg;
+  var world = opts.world;
+  var viewport = opts.viewport;
+  var start = opts.start;
+  var side = opts.side;
+
+  var g = svg // the map will be drawn in this group
+    .append('g')
+    .attr('class', 'maplet-container');
+  var countries = opts.countries;
+
+  // debugger;
+
+  countries.forEach(function (name, index) {
+    var feature = filterCountriesByNames(world, [name]);
+    var boxw = 50;
+    var boxh = 50;
+    var space = 10;
+
+    var mapletWorld = world.filter(function (country) {
+      return country.properties.SHRT_ENGL === name;
+    });
+
+    var msp = getMapletStartingPoint(
+      viewport,
+      start,
+      index,
+      side,
+      space,
+      [boxw, boxh],
+      0,
+    );
+
+    var zo = {
+      world: mapletWorld,
+      svg: g,
+      coordinates: {
+        x: msp.x,
+        y: msp.y,
+        width: boxw,
+        height: boxh,
+      },
+      focusCountries: {
+        names: [name],
+        feature: feature,
+      },
+      zoom: 0.5,
+      isMaplet: true,
+    };
+    drawMaplet(zo, d3);
+  });
+}
+
+function drawMaplet(opts, d3) {
+  var msp = opts.coordinates;
+  var svg = opts.svg;
+  svg
+    .append('rect')
+    .attr('class', 'maplet-outline')
+    .attr('x', msp.x)
+    .attr('y', msp.y)
+    .attr('width', msp.width)
+    .attr('height', msp.height);
+
+  // var path = renderCountriesBox(opts, d3);
+  // renderCountryLabel(opts.focusCountries.feature.features[0], path, true);
+}
+
+function getMapletStartingPoint(
+  viewport, // an array of two integers, width and height
+  startPoint, // an array of two numbers, x, y for position in viewport
+  index, // integer, position in layout
+  side, // one of ['top', 'bottom', 'left', right']
+  spacer, // integer with amount of space to leave between Maplets
+  boxDim, // array of two numbers, box width and box height
+  titleHeight, // height of title box
+) {
+  // return value is array of x,y
+  // x: horizontal coordinate
+  // y: vertical coordinate
+
+  var bws = boxDim[0] + spacer; // box width including space to the right
+  var bhs = boxDim[1] + spacer + titleHeight;
+
+  var mutator = travelToOppositeMutator(startPoint, viewport, [bws, bhs]);
+
+  var mutPoint = [startPoint[0], startPoint[1]];
+
+  for (var i = 0; i < index; i++) {
+    mutPoint = mutator(mutPoint, index);
+  }
+
+  // TODO: this could be improved, there are many edge cases
+  switch (side) {
+    case 'top':
+      mutPoint[1] = startPoint[1];
+      break;
+    case 'bottom':
+      mutPoint[1] = startPoint[1] - bhs;
+      break;
+    case 'left':
+      mutPoint[0] = startPoint[0];
+      break;
+    case 'right':
+    default:
+      mutPoint[0] = startPoint[0] - bws;
+      break;
+  }
+
+  return {
+    x: mutPoint[0],
+    y: mutPoint[1],
+  };
+}
+
+function travelToOppositeMutator(start, viewport, delta) {
+  // point: the point we want to mutate
+  // start: starting point (the initial anchor point)
+  // viewport: array of width, height
+  // delta: array of dimensions to travel
+
+  var center = [viewport[0] / 2, viewport[1] / 2];
+
+  var dirx = start[0] > center[0] ? -1 : 1;
+  var diry = start[1] > center[1] ? -1 : 1;
+  return function (point) {
+    var res = [point[0] + delta[0] * dirx, point[1] + delta[1] * diry];
+    return res;
+  };
+}
+
 function renderGraticule(container, klass, steps, pathTransformer, d3Geo) {
   container // draw primary graticule lines
     .append('g')
@@ -376,13 +506,6 @@ function showMapTooltip(d, countries_metadata, d3) {
   d3.event.stopPropagation();
 }
 
-function removeTooltip() {
-  const elem = document.getElementById('map-tooltip');
-  if (elem) {
-    elem.parentElement.removeChild(elem);
-  }
-}
-
 function createTooltip(opts) {
   const x = opts['coords'][0];
   const y = opts['coords'][1];

package/src/components/manage/Blocks/CountryMapObservatory/CountryMapObservatoryView.js

@@ -1,52 +1,15 @@
 import React, { useRef, useEffect } from 'react';
-import flags from './flags.js';
 import './styles.css';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import { compose } from 'redux';
 import { clientOnly } from '@eeacms/volto-cca-policy/helpers';
 import withResponsiveContainer from './../withResponsiveContainer.js';
+import { renderCountriesBox } from './map-utils.js';
 import {
   getFocusCountriesFeature,
   getFocusCountryNames,
-  renderCountriesBox,
-} from './map-utils.js';
-
-const withCountriesData = (WrappedComponent) => {
-  function WithCountriesDataWrapped(props) {
-    let [cpath, setCpath] = React.useState();
-
-    useEffect(() => {
-      if (!cpath) {
-        import('./euro-countries-simplified.js').then((mod) => {
-          const _cpath = mod.default;
-          _cpath.features = _cpath.features.map(function (c) {
-            //console.log(c);
-            var name = c.properties.SHRT_ENGL;
-            if (!name) {
-              // console.log('No flag for', c.properties);
-              return c;
-            } else if (name === 'Czechia') {
-              name = 'Czech Republic';
-            }
-            var cname = name.replace(' ', '_');
-            flags.forEach(function (f) {
-              if (f.indexOf(cname) > -1) {
-                c.url = f;
-                //console.log(c.url);
-              }
-            });
-            return c;
-          });
-
-          setCpath(_cpath);
-        });
-      }
-    }, [cpath]);
-
-    return cpath ? <WrappedComponent {...props} cpath={cpath} /> : null;
-  }
-  return WithCountriesDataWrapped;
-};
+  withCountriesData,
+} from '@eeacms/volto-cca-policy/helpers/country_map/countryMap.js';
 
 const CountryMapObservatoryView = (props) => {
   const svgRef = useRef(null);

package/src/components/manage/Blocks/CountryMapObservatory/map-utils.js

@@ -1,52 +1,4 @@
-export function getFocusCountryNames() {
-  return [
-    'Austria',
-    'Belgium',
-    'Cyprus',
-    'Czechia',
-    'Denmark',
-    'Estonia',
-    'Finland',
-    'France',
-    'Germany',
-    'Greece',
-    'Hungary',
-    'Iceland',
-    'Ireland',
-    'Italy',
-    'Lithuania',
-    'Luxembourg',
-    'Malta',
-    'Netherlands',
-    'Poland',
-    'Portugal',
-    'Romania',
-    'Slovakia',
-    'Slovenia',
-    'Spain',
-    'Sweden',
-    'United Kingdom',
-    'Liechtenstein',
-    'Norway',
-    'Switzerland',
-    'Turkey',
-  ];
-}
-
-export function getFocusCountriesFeature(world) {
-  const focusCountryNames = getFocusCountryNames();
-  let features = {
-    type: 'FeatureCollection',
-    features: [],
-  };
-  world.features.forEach(function (c) {
-    if (focusCountryNames.indexOf(c.properties.SHRT_ENGL) === -1) {
-      return;
-    }
-    features.features.push(c);
-  });
-  return features;
-}
+import { getFocusCountryNames } from '@eeacms/volto-cca-policy/helpers/country_map/countryMap.js';
 
 export function renderCountriesBox(opts, d3, d3Geo) {
   var coords = opts.coordinates;

package/src/components/manage/Blocks/CountryMapProfile/Filter.test.jsx

@@ -0,0 +1,37 @@
+import React from 'react';
+import { MemoryRouter } from 'react-router-dom';
+import configureStore from 'redux-mock-store';
+import { render } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+import { Provider } from 'react-intl-redux';
+import Filter from './Filter';
+
+const mockStore = configureStore();
+
+describe('Filter', () => {
+  it('should render the component', () => {
+    const data = {
+      thematicMapMode: 'hhap',
+      setThematicMapMode(param) {
+        return param;
+      },
+    };
+
+    const store = mockStore({
+      userSession: { token: '1234' },
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+    });
+
+    const { container } = render(
+      <Provider store={store}>
+        <MemoryRouter>
+          <Filter {...data} />
+        </MemoryRouter>
+      </Provider>,
+    );
+    expect(container.querySelector('#sections-selector')).toBeInTheDocument();
+  });
+});

package/src/components/manage/Blocks/CountryMapProfile/View.js

@@ -1,5 +1,4 @@
 import React, { useRef, useEffect } from 'react';
-import flags from './flags.js';
 import './styles.css';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import { Grid } from 'semantic-ui-react';
@@ -7,11 +6,12 @@ import { compose } from 'redux';
 import { clientOnly } from '@eeacms/volto-cca-policy/helpers';
 import withResponsiveContainer from './../withResponsiveContainer.js';
 import { addAppURL } from '@plone/volto/helpers';
+import { renderCountriesBox } from './map-utils.js';
 import {
   getFocusCountriesFeature,
   getFocusCountryNames,
-  renderCountriesBox,
-} from './map-utils.js';
+  withCountriesData,
+} from '@eeacms/volto-cca-policy/helpers/country_map/countryMap.js';
 
 import Filter from './Filter';
 
@@ -20,43 +20,6 @@ import { useCountriesMetadata } from './hooks';
 const countries_metadata_url =
   '/en/countries-regions/countries/@@countries-metadata-extract?langflag=1';
 
-const withCountriesData = (WrappedComponent) => {
-  function WithCountriesDataWrapped(props) {
-    let [cpath, setCpath] = React.useState();
-
-    useEffect(() => {
-      if (!cpath) {
-        import('./euro-countries-simplified.js').then((mod) => {
-          const _cpath = mod.default;
-          _cpath.features = _cpath.features.map(function (c) {
-            //console.log(c);
-            var name = c.properties.SHRT_ENGL;
-            if (!name) {
-              // console.log('No flag for', c.properties);
-              return c;
-            } else if (name === 'Czechia') {
-              name = 'Czech Republic';
-            }
-            var cname = name.replace(' ', '_');
-            flags.forEach(function (f) {
-              if (f.indexOf(cname) > -1) {
-                c.url = f;
-                //console.log(c.url);
-              }
-            });
-            return c;
-          });
-
-          setCpath(_cpath);
-        });
-      }
-    }, [cpath]);
-
-    return cpath ? <WrappedComponent {...props} cpath={cpath} /> : null;
-  }
-  return WithCountriesDataWrapped;
-};
-
 const CountryMapObservatoryView = (props) => {
   const svgRef = useRef(null);
   const { d3, d3Geo, size, cpath } = props;

package/src/components/manage/Blocks/CountryMapProfile/map-utils.js

@@ -1,55 +1,4 @@
-export function getFocusCountryNames() {
-  return [
-    'Austria',
-    'Belgium',
-    'Bulgaria',
-    'Cyprus',
-    'Croatia',
-    'Czechia',
-    'Denmark',
-    'Estonia',
-    'Finland',
-    'France',
-    'Germany',
-    'Greece',
-    'Hungary',
-    'Iceland',
-    'Ireland',
-    'Italy',
-    'Latvia',
-    'Lithuania',
-    'Luxembourg',
-    'Malta',
-    'Netherlands',
-    'Poland',
-    'Portugal',
-    'Romania',
-    'Slovakia',
-    'Slovenia',
-    'Spain',
-    'Sweden',
-    'United Kingdom',
-    'Liechtenstein',
-    'Norway',
-    'Switzerland',
-    'Turkey',
-  ];
-}
-
-export function getFocusCountriesFeature(world) {
-  const focusCountryNames = getFocusCountryNames();
-  let features = {
-    type: 'FeatureCollection',
-    features: [],
-  };
-  world.features.forEach(function (c) {
-    if (focusCountryNames.indexOf(c.properties.SHRT_ENGL) === -1) {
-      return;
-    }
-    features.features.push(c);
-  });
-  return features;
-}
+import { removeTooltip } from '@eeacms/volto-cca-policy/helpers/country_map/countryMap.js';
 
 // tooltip with country names on hover
 let countryNameTooltip = null;
@@ -477,13 +426,6 @@ function showMapTooltip(d, countries_metadata, d3) {
   d3.event.stopPropagation();
 }
 
-function removeTooltip() {
-  const elem = document.getElementById('map-tooltip');
-  if (elem) {
-    elem.parentElement.removeChild(elem);
-  }
-}
-
 function createTooltip(opts) {
   const x = opts['coords'][0];
   const y = opts['coords'][1];