Merge pull request #364 from eea/develop

Develop

CHANGELOG.md

@@ -4,11 +4,15 @@ 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.2.88](https://github.com/eea/volto-cca-policy/compare/0.2.87...0.2.88) - 6 January 2025
+### [0.2.89](https://github.com/eea/volto-cca-policy/compare/0.2.88...0.2.89) - 7 January 2025
 
 #### :hammer_and_wrench: Others
 
-- Fix facet for mission tools [Tiberiu Ichim - [`a4b5787`](https://github.com/eea/volto-cca-policy/commit/a4b578762eac8da26b01b5fef7cbddbebdd78eb6)]
+- Refs #268762 - update map to allow hover tr update [Tripon Eugen - [`0be2afe`](https://github.com/eea/volto-cca-policy/commit/0be2afed14d855d9bbf7bbaebb0f70688506e692)]
+- Refs #268762 - update map to allow hover tr [Tripon Eugen - [`8a94cf1`](https://github.com/eea/volto-cca-policy/commit/8a94cf1888f34793b8637fe383b923ee196403d8)]
+- Remove prefix condition, will be solved by indexing [Tiberiu Ichim - [`3cf4ed0`](https://github.com/eea/volto-cca-policy/commit/3cf4ed0befde89e8cc3393c8458aa3d5a6d9a70a)]
+### [0.2.88](https://github.com/eea/volto-cca-policy/compare/0.2.87...0.2.88) - 6 January 2025
+
 ### [0.2.87](https://github.com/eea/volto-cca-policy/compare/0.2.86...0.2.87) - 20 December 2024
 
 #### :nail_care: Enhancements
@@ -1736,13 +1740,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Refs #260715 rast-block wip [Tripon Eugen - [`f19d54e`](https://github.com/eea/volto-cca-policy/commit/f19d54e0b9a6a86bf344eb85b6a1cda7f3de91bf)]
 - Refs #260715 rast-block wip [Tripon Eugen - [`2828537`](https://github.com/eea/volto-cca-policy/commit/2828537b6c084cd1a82162d552fb4ef025b71f9f)]
 - Refs #260715 rast-block updates [Tripon Eugen - [`1e803e5`](https://github.com/eea/volto-cca-policy/commit/1e803e5bd3d3fb7558f261c76c68866be7beb8b5)]
-- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`0a15e1b`](https://github.com/eea/volto-cca-policy/commit/0a15e1b2ad081233685e80d5b3c60a8663f6b896)]
-- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`9554e44`](https://github.com/eea/volto-cca-policy/commit/9554e44c92a621a52b2adb5a4830fb084ee5734b)]
 ### [0.1.49](https://github.com/eea/volto-cca-policy/compare/0.1.48...0.1.49) - 15 November 2023
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Refactor automated testing [valentinab25 - [`7b820a6`](https://github.com/eea/volto-cca-policy/commit/7b820a6369c2ddd5203b1a4abe352cb4bb43db7a)]
 - chore: husky, lint-staged use fixed versions [valentinab25 - [`f0a8061`](https://github.com/eea/volto-cca-policy/commit/f0a8061c275c236deb00087c23fac9860a073106)]
 
 #### :hammer_and_wrench: Others
@@ -1759,9 +1760,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Refs #259267 - jenkins test [Tripon Eugen - [`cacd31e`](https://github.com/eea/volto-cca-policy/commit/cacd31e7b1afe0983674ed5c7632d2e1d7fa752e)]
 - Refs #259267 - jenkins [Tripon Eugen - [`5b3affe`](https://github.com/eea/volto-cca-policy/commit/5b3affee8401239de10097884c1b7f2349d15ec0)]
 - Refs #259267 - add When, lead image and title to files [Tripon Eugen - [`2cedb23`](https://github.com/eea/volto-cca-policy/commit/2cedb237f898af9057e13fba94b615ef71077204)]
-- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`4d607a5`](https://github.com/eea/volto-cca-policy/commit/4d607a576e9d0a5c34e48c41b409e7df616ee3d6)]
-- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`b7f74d5`](https://github.com/eea/volto-cca-policy/commit/b7f74d53513a6edbfbca5cb6d19687929bb1e5db)]
-- test: [JENKINS] Improve cypress time [valentinab25 - [`db65617`](https://github.com/eea/volto-cca-policy/commit/db656173391f65157098d95d388c25f6429753d8)]
 - Refs #259267 - cca event blocks attachments and check not mandatoty fields [Tripon Eugen - [`3138e5a`](https://github.com/eea/volto-cca-policy/commit/3138e5afb5bfbdbed14e27ed457b16867b7fa414)]
 - Refs #256681 - Fix error in CCA Event view menu. ([React Intl] An id must be provided to format a message.) [GhitaB - [`517eeb8`](https://github.com/eea/volto-cca-policy/commit/517eeb817264a47bbfd6b9b7d22aaf22d44ed224)]
 - Refs #161485 - Fix ECDE name conflict. [GhitaB - [`8bfd99f`](https://github.com/eea/volto-cca-policy/commit/8bfd99ff68bb82a04d1c0ed625fa514fcf46289e)]
@@ -1978,7 +1976,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Remove alpha testing version [valentinab25 - [`ad1ced0`](https://github.com/eea/volto-cca-policy/commit/ad1ced0971ba116c13a3b5fcc039172cc915c919)]
 
 #### :hammer_and_wrench: Others
 
@@ -2459,7 +2456,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Refs #158294 - Update supported languages list. [GhitaB - [`0a4f91f`](https://github.com/eea/volto-cca-policy/commit/0a4f91f39b7edc367bd4c127d6a8f273c7788361)]
-- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`8f1f9ce`](https://github.com/eea/volto-cca-policy/commit/8f1f9ce6c22805670cc0800d3c779b6d619d0f31)]
 ### [0.1.1](https://github.com/eea/volto-cca-policy/compare/0.1.0...0.1.1) - 13 December 2022
 
 #### :hammer_and_wrench: Others

package.json

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

src/components/manage/Blocks/CountryMapObservatory/CountryMapObservatoryOLView.jsx

@@ -37,12 +37,21 @@ const CountryMapObservatoryView = (props) => {
     setOverlaySource(new ol.source.Vector());
 
     const features = new ol.format.GeoJSON().readFeatures(geofeatures);
+    const updateEuCountryNames = euCountryNames.map((countryName) => {
+      if ('Turkey' === countryName) {
+        countryName = 'Türkiye';
+      }
+      return countryName;
+    });
+
     const filtered = features.filter((f) =>
-      euCountryNames.includes(f.get('na')),
+      updateEuCountryNames.includes(f.get('na')),
     );
-
     filtered.forEach((feature) => {
       const img = new Image();
+      if ('Türkiye' === feature.values_.na) {
+        feature.values_.na = 'Turkey';
+      }
       img.onload = function () {
         feature.set('flag', img);
       };
@@ -70,12 +79,14 @@ const CountryMapObservatoryView = (props) => {
 
   const onFeatureClick = React.useCallback(
     (feature) => {
-      const country = feature.get('na');
+      let country = feature.get('na');
+      if ('Türkiye' === country) {
+        country = 'Turkey';
+      }
       history.push(`${baseUrl}/${country.toLowerCase()}`);
     },
     [baseUrl, history],
   );
-  // console.log(geofeatures, projection, euCountriesSource, overlaySource);
 
   return tileWMSSources ? (
     <Map

src/search/mission_all/config-all.js

@@ -85,11 +85,11 @@ export default function installMainSearch(config) {
             cca_include_in_mission: 'true',
           },
         },
-        {
-          prefix: {
-            'id.keyword': 'https://climate-adapt.eea.europa.eu/en/mission',
-          },
-        },
+        // {
+        //   prefix: {
+        //     'id.keyword': 'https://climate-adapt.eea.europa.eu/en/mission',
+        //   },
+        // },
       ],
       minimum_should_match: 1,
     },