@eeacms/volto-cca-policy 0.1.68 → 0.1.70

package/CHANGELOG.md

@@ -4,6 +4,17 @@ 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.70](https://github.com/eea/volto-cca-policy/compare/0.1.69...0.1.70) - 2 February 2024
+
+#### :hammer_and_wrench: Others
+
+- Refs #161485 - observatory page search description [Tripon Eugen - [`6dd9046`](https://github.com/eea/volto-cca-policy/commit/6dd9046ace2e894e721a1cd65553a6d9435f2ad5)]
+### [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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.1.68",
+  "version": "0.1.70",
   "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/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,4 +1,7 @@
-import { euCountryNames } from '../countryMap.js';
+import {
+  euCountryNames,
+  removeTooltip,
+} from '@eeacms/volto-cca-policy/helpers/country_map/countryMap.js';
 export function getFocusCountryNames() {
   return euCountryNames;
 }
@@ -503,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,22 +1,4 @@
-import { euCountryNames } from '../countryMap.js';
-export function getFocusCountryNames() {
-  return euCountryNames;
-}
-
-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/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,22 +1,4 @@
-import { euCountryNames } from '../countryMap.js';
-export function getFocusCountryNames() {
-  return euCountryNames;
-}
-
-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;
@@ -444,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];

package/src/helpers/country_map/countryMap.js

@@ -0,0 +1,107 @@
+import React, { useEffect } from 'react';
+import flags from './flags.js';
+
+export const euCountryNames = [
+  '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',
+];
+
+export function getFocusCountryNames() {
+  return euCountryNames;
+}
+
+export const 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;
+};
+
+export function removeTooltip() {
+  const elem = document.getElementById('map-tooltip');
+  if (elem) {
+    elem.parentElement.removeChild(elem);
+  }
+}
+
+export 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;
+};