@eeacms/volto-cca-policy 1.0.4 → 1.0.6

package/locales/volto.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2026-07-30T09:06:34.881Z\n"
+"POT-Creation-Date: 2026-08-04T16:14:30.812Z\n"
 "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -290,6 +290,11 @@ msgstr ""
 msgid "Climate-ADAPT page for this event"
 msgstr ""
 
+#. Default: "Close"
+#: components/Search/NavigatorCatalogue/NavigatorCatalogueMapView
+msgid "Close"
+msgstr ""
+
 #. Default: "Compare"
 #: components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem
 msgid "Compare"
@@ -894,11 +899,6 @@ msgstr ""
 msgid "Most useful for"
 msgstr ""
 
-#. Default: "NO"
-#: components/theme/Views/ExtendedToolView
-msgid "NO"
-msgstr ""
-
 #. Default: "National HHAP"
 #: components/manage/Blocks/CountryMapHeatIndex/Filter
 msgid "National HHAP"
@@ -936,7 +936,7 @@ msgid "Navigator Guide preview empty state"
 msgstr ""
 
 #. Default: "New"
-#: components/Result/ClusterHorizontalCardItem
+#: components/Search/Result/ClusterHorizontalCardItem
 msgid "New"
 msgstr ""
 
@@ -955,6 +955,11 @@ msgstr ""
 msgid "Next step"
 msgstr ""
 
+#. Default: "No"
+#: components/theme/Views/ExtendedToolView
+msgid "No"
+msgstr ""
+
 #. Default: "No HHAP"
 #: components/manage/Blocks/CountryMapHeatIndex/Filter
 msgid "No HHAP"
@@ -1101,11 +1106,6 @@ msgstr ""
 msgid "Project information"
 msgstr ""
 
-#. Default: "Public/private"
-#: components/theme/Views/ExtendedToolView
-msgid "Public/private"
-msgstr ""
-
 #. Default: "Publications and reports"
 #: search/vocabulary
 msgid "Publication reference"
@@ -1213,6 +1213,11 @@ msgstr ""
 msgid "Remove {title}"
 msgstr ""
 
+#. Default: "Remove {title} from comparison"
+#: components/theme/CompareTools/CompareToolsView
+msgid "Remove {title} from comparison"
+msgstr ""
+
 #. Default: "Replace existing file"
 #: components/theme/Widgets/PromotionalImageWidget
 msgid "Replace existing file"
@@ -1337,8 +1342,8 @@ msgid "Source of funding"
 msgstr ""
 
 #. Default: "Source:"
-#: components/Result/ClusterHorizontalCardItem
-#: components/Result/HealthHorizontalCardItem
+#: components/Search/Result/ClusterHorizontalCardItem
+#: components/Search/Result/HealthHorizontalCardItem
 msgid "Source:"
 msgstr ""
 
@@ -1464,14 +1469,24 @@ msgstr ""
 msgid "Tool provider"
 msgstr ""
 
+#. Default: "Tool provider mode"
+#: components/theme/Views/ExtendedToolView
+msgid "Tool provider mode"
+msgstr ""
+
 #. Default: "Tool validation use"
 #: components/theme/Views/ExtendedToolView
 msgid "Tool validation use"
 msgstr ""
 
+#. Default: "Tools per country"
+#: components/Search/NavigatorCatalogue/NavigatorCatalogueMapView
+msgid "Tools per country"
+msgstr ""
+
 #. Default: "Topics:"
-#: components/Result/ClusterHorizontalCardItem
-#: components/Result/HealthHorizontalCardItem
+#: components/Search/Result/ClusterHorizontalCardItem
+#: components/Search/Result/HealthHorizontalCardItem
 msgid "Topics:"
 msgstr ""
 
@@ -1571,6 +1586,11 @@ msgstr ""
 msgid "Videos and podcasts"
 msgstr ""
 
+#. Default: "View"
+#: components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem
+msgid "View"
+msgstr ""
+
 #. Default: "View all contributions in the resource catalogue"
 #: helpers/Utils
 msgid "View all contributions in the resource catalogue"
@@ -1581,11 +1601,6 @@ msgstr ""
 msgid "View latest version"
 msgstr ""
 
-#. Default: "View tool"
-#: components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem
-msgid "View tool"
-msgstr ""
-
 #. Default: "Visit external website"
 #: helpers/Utils
 msgid "Visit external website"
@@ -1647,9 +1662,9 @@ msgstr ""
 msgid "Which spatial coverage do you need?"
 msgstr ""
 
-#. Default: "YES"
+#. Default: "Yes"
 #: components/theme/Views/ExtendedToolView
-msgid "YES"
+msgid "Yes"
 msgstr ""
 
 #. Default: "You are viewing an archived version."
@@ -1737,16 +1752,16 @@ msgstr ""
 msgid "refers to"
 msgstr ""
 
-#. Default: "tools available"
-#: components/Search/NavigatorCatalogue/NavigatorCatalogueMapView
-msgid "tools available"
-msgstr ""
-
 #. Default: "Upload an image from your computer"
 #: components/theme/Widgets/ImageWidget
 msgid "uploadAnImage"
 msgstr ""
 
+#. Default: "{count, plural, =0 {No tools available} one {# tool available} other {# tools available}}"
+#: components/Search/NavigatorCatalogue/NavigatorCatalogueMapView
+msgid "{count, plural, =0 {No tools available} one {# tool available} other {# tools available}}"
+msgstr ""
+
 #. Default: "{count, plural, one {tool matches} other {tools match}}"
 #: components/Search/NavigatorGuide/NavigatorGuideContentView
 msgid "{count, plural, one {tool matches} other {tools match}}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -32,7 +32,7 @@
     "@eeacms/volto-eea-design-system": "*",
     "@eeacms/volto-eea-website-theme": "*",
     "@eeacms/volto-embed": "*",
-    "@eeacms/volto-globalsearch": "4.0.1",
+    "@eeacms/volto-globalsearch": "4.1.0",
     "@eeacms/volto-group-block": "^9.0.0",
     "@eeacms/volto-openlayers-map": "2.0.1",
     "@eeacms/volto-searchlib": "^2.1.10",

package/src/components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem.jsx

@@ -8,6 +8,7 @@ import {
   getCompareToolUid,
   useCompareTools,
 } from '../../theme/CompareTools/utils';
+import { rawValueAsArray } from './utils';
 
 const messages = defineMessages({
   sector: {
@@ -35,18 +36,11 @@ const messages = defineMessages({
     defaultMessage: 'Compare',
   },
   viewTool: {
-    id: 'View tool',
-    defaultMessage: 'View tool',
+    id: 'View',
+    defaultMessage: 'View',
   },
 });
 
-const asArray = (value) => {
-  if (!value) return [];
-  const raw = value.raw !== undefined ? value.raw : value;
-  if (!raw) return [];
-  return Array.isArray(raw) ? raw.filter(Boolean) : [raw].filter(Boolean);
-};
-
 const publicationDateFormatter = new Intl.DateTimeFormat('en-GB', {
   day: '2-digit',
   month: 'short',
@@ -119,14 +113,14 @@ const CycleElements = ({ intl, values }) => {
 const NavigatorCatalogueCardItem = (props) => {
   const { result } = props;
   const intl = useIntl();
-  const sectors = asArray(result.cca_adaptation_sectors);
-  const hazards = asArray(result.cca_climate_impacts);
-  const licenseStatus = asArray(result.cca_license_status)
+  const sectors = rawValueAsArray(result.cca_adaptation_sectors);
+  const hazards = rawValueAsArray(result.cca_climate_impacts);
+  const licenseStatus = rawValueAsArray(result.cca_license_status)
     .map((value) => value?.title || value)
     .filter(Boolean)
     .join(', ');
   const toolProvider = result?._result?.tool_provider?.raw;
-  const adaptationSupportCycleSteps = asArray(
+  const adaptationSupportCycleSteps = rawValueAsArray(
     result.adaptation_support_cycle_step,
   )
     .map((value) => value?.title?.split(':')[0])

package/src/components/Search/NavigatorCatalogue/NavigatorCatalogueMapView.jsx

@@ -1,17 +1,21 @@
 import React from 'react';
 import { compose } from 'redux';
-import { Icon, Button } from 'semantic-ui-react';
+import { Icon, Button, Loader } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';
 import { useSearchContext, useViews } from '@eeacms/search/lib/hocs';
 import { withOpenLayers } from '@eeacms/volto-openlayers-map';
-import { useMapContext } from '@eeacms/volto-openlayers-map/api';
-import { Map, Layer, Layers, Controls } from '@eeacms/volto-openlayers-map/api';
-import { withGeoJsonData } from '@eeacms/volto-cca-policy/helpers/country_map/hocs';
-import { euCountryNames } from '@eeacms/volto-cca-policy/helpers/country_map/countryMap';
-import { clientOnly } from '@eeacms/volto-cca-policy/helpers';
+import {
+  Map,
+  Layer,
+  Layers,
+  Controls,
+  useMapContext,
+} from '@eeacms/volto-openlayers-map/api';
+import { euCountryNames, clientOnly } from '@eeacms/volto-cca-policy/helpers';
 import {
   withResponsiveContainer,
   withVisibilitySensor,
+  withGeoJsonData,
 } from '@eeacms/volto-cca-policy/hocs';
 import {
   getColorForCount,
@@ -210,8 +214,8 @@ const NavigatorCatalogueMapViewInner = (props) => {
   if (!tileWMSSources || !euCountriesSource) {
     return (
       <div className="navigator-catalogue-map-loading">
-        <i className="icon loading" />
-        Loading map...
+        <Loader active inline="centered" />
+        <span>Loading map...</span>
       </div>
     );
   }

package/src/components/Search/NavigatorCatalogue/NavigatorCatalogueMapView.test.jsx

@@ -8,33 +8,33 @@ import {
 
 describe('getColorForCount', () => {
   it('returns darkest green for 10+ tools', () => {
-    expect(getColorForCount(10)).toBe('#0a5c4e');
-    expect(getColorForCount(15)).toBe('#0a5c4e');
-    expect(getColorForCount(100)).toBe('#0a5c4e');
+    expect(getColorForCount(10)).toBe('#0F6B3F');
+    expect(getColorForCount(15)).toBe('#0F6B3F');
+    expect(getColorForCount(100)).toBe('#0F6B3F');
   });
 
   it('returns dark green for 7-9 tools', () => {
-    expect(getColorForCount(7)).toBe('#0d7a68');
-    expect(getColorForCount(8)).toBe('#0d7a68');
-    expect(getColorForCount(9)).toBe('#0d7a68');
+    expect(getColorForCount(7)).toBe('#007B6C');
+    expect(getColorForCount(8)).toBe('#007B6C');
+    expect(getColorForCount(9)).toBe('#007B6C');
   });
 
   it('returns base accent green for 4-6 tools', () => {
-    expect(getColorForCount(4)).toBe('#289588');
-    expect(getColorForCount(5)).toBe('#289588');
-    expect(getColorForCount(6)).toBe('#289588');
+    expect(getColorForCount(4)).toBe('#84C79A');
+    expect(getColorForCount(5)).toBe('#84C79A');
+    expect(getColorForCount(6)).toBe('#84C79A');
   });
 
   it('returns light green for 1-3 tools', () => {
-    expect(getColorForCount(1)).toBe('#6fc4b8');
-    expect(getColorForCount(2)).toBe('#6fc4b8');
-    expect(getColorForCount(3)).toBe('#6fc4b8');
+    expect(getColorForCount(1)).toBe('#C2E3CD');
+    expect(getColorForCount(2)).toBe('#C2E3CD');
+    expect(getColorForCount(3)).toBe('#C2E3CD');
   });
 
   it('returns lightest gray-green for 0 or falsy counts', () => {
-    expect(getColorForCount(0)).toBe('#e8eded');
-    expect(getColorForCount(null)).toBe('#e8eded');
-    expect(getColorForCount(undefined)).toBe('#e8eded');
+    expect(getColorForCount(0)).toBe('#E1E7DF');
+    expect(getColorForCount(null)).toBe('#E1E7DF');
+    expect(getColorForCount(undefined)).toBe('#E1E7DF');
   });
 });
 
@@ -140,20 +140,20 @@ describe('mapLegendItems', () => {
     expect(mapLegendItems).toHaveLength(5);
   });
 
-  it('colors match getColorForCount scale', () => {
-    expect(mapLegendItems[0].color).toBe(getColorForCount(10));
-    expect(mapLegendItems[1].color).toBe(getColorForCount(7));
-    expect(mapLegendItems[2].color).toBe(getColorForCount(4));
-    expect(mapLegendItems[3].color).toBe(getColorForCount(1));
-    expect(mapLegendItems[4].color).toBe(getColorForCount(0));
+  it('uses the current legend color palette', () => {
+    expect(mapLegendItems[0].color).toBe('#0F6B3F');
+    expect(mapLegendItems[1].color).toBe('#007B6C');
+    expect(mapLegendItems[2].color).toBe('#84C79A');
+    expect(mapLegendItems[3].color).toBe('#C2E3CD');
+    expect(mapLegendItems[4].color).toBe('#E1E7DF');
   });
 
   it('has correct labels', () => {
     expect(mapLegendItems.map((item) => item.label)).toEqual([
-      '10+',
-      '7–9',
-      '4–6',
-      '1–3',
+      '10 or more',
+      '7 - 9',
+      '4 - 6',
+      '1 - 3',
       'None',
     ]);
   });

package/src/components/Search/NavigatorCatalogue/utils.js

@@ -2,13 +2,17 @@
  * Color scale for tool counts (EEA green tones)
  * Used by the map view to color-code countries
  */
-export const getColorForCount = (count) => {
-  if (count >= 10) return '#0a5c4e'; // darkest
-  if (count >= 7) return '#0d7a68';
-  if (count >= 4) return '#289588'; // base accent
-  if (count >= 1) return '#6fc4b8'; // light
-  return '#e8eded'; // none (very light gray-green)
-};
+export const mapColorScale = [
+  { minimum: 10, label: '10 or more', color: '#0F6B3F' },
+  { minimum: 7, label: '7 - 9', color: '#007B6C' },
+  { minimum: 4, label: '4 - 6', color: '#84C79A' },
+  { minimum: 1, label: '1 - 3', color: '#C2E3CD' },
+  { minimum: 0, label: 'None', color: '#E1E7DF' },
+];
+
+export const getColorForCount = (count) =>
+  mapColorScale.find(({ minimum }) => count >= minimum)?.color ||
+  mapColorScale.at(-1).color;
 
 /**
  * Normalize country names between GeoJSON and facet data
@@ -46,29 +50,27 @@ export const buildCountryCounts = (facets) => {
 /**
  * Legend items for the map view
  */
-export const mapLegendItems = [
-  { label: '10+', color: '#0a5c4e' },
-  { label: '7–9', color: '#0d7a68' },
-  { label: '4–6', color: '#289588' },
-  { label: '1–3', color: '#6fc4b8' },
-  { label: 'None', color: '#e8eded' },
-];
+export const mapLegendItems = mapColorScale.map(({ label, color }) => ({
+  label,
+  color,
+}));
 
-export const asArray = (value) => {
-  if (!value) return [];
-  const raw = value.raw !== undefined ? value.raw : value;
-  if (!raw) return [];
-  const values = Array.isArray(raw)
-    ? raw.filter(Boolean)
-    : [raw].filter(Boolean);
+const unwrapRawValue = (value) =>
+  value?.raw === undefined ? value : value.raw;
 
-  return values.map((value) => value?.title || value?.token || value);
+export const rawValueAsArray = (value) => {
+  const raw = unwrapRawValue(value);
+  if (!raw) return [];
+  return Array.isArray(raw) ? raw.filter(Boolean) : [raw].filter(Boolean);
 };
 
+export const asArray = (value) =>
+  rawValueAsArray(value).map((value) => value?.title || value?.token || value);
+
 export const arrayFieldToString = (value) => asArray(value).join(', ');
 
 export const formatFunctionalityScore = (value) => {
-  const raw = value?.raw !== undefined ? value.raw : value;
+  const raw = unwrapRawValue(value);
   const score = raw === null || raw === undefined ? Number.NaN : Number(raw);
 
   return Number.isFinite(score) ? `${Math.min(6, Math.max(0, score))}/6` : '—';

package/src/components/Search/NavigatorCatalogue/utils.test.js

@@ -7,6 +7,7 @@ import {
   formatFunctionalityScore,
   getComparePageURL,
   getLocalizedLandingPageURL,
+  rawValueAsArray,
 } from './utils';
 
 describe('Navigator Catalogue utilities', () => {
@@ -40,6 +41,10 @@ describe('Navigator Catalogue utilities', () => {
   });
 
   it('normalizes raw, scalar, title, token, and empty values', () => {
+    expect(rawValueAsArray({ raw: ['One', null, { title: 'Two' }] })).toEqual([
+      'One',
+      { title: 'Two' },
+    ]);
     expect(asArray()).toEqual([]);
     expect(asArray({ raw: null })).toEqual([]);
     expect(asArray({ raw: ['One', null, { title: 'Two' }] })).toEqual([

package/src/components/manage/Blocks/CountryMapHeatIndex/Interactions.jsx

@@ -4,7 +4,7 @@ import {
   euCountryNames,
   setTooltipVisibility,
   getClosestFeatureToCoordinate,
-} from '@eeacms/volto-cca-policy/helpers/country_map/countryMap';
+} from '@eeacms/volto-cca-policy/helpers';
 import { useMapContext } from '@eeacms/volto-openlayers-map/api';
 
 export const Interactions = ({

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

@@ -1,19 +1,18 @@
 import React from 'react';
 import { compose } from 'redux';
-import { clientOnly } from '@eeacms/volto-cca-policy/helpers';
-
-import { Map, Layer, Layers, Controls } from '@eeacms/volto-openlayers-map/api';
-import { withOpenLayers } from '@eeacms/volto-openlayers-map';
 import {
+  clientOnly,
   euCountryNames as euCountryNamesRaw,
   tooltipStyle,
   getImageUrl,
   adjustEuCountryNames,
-} from '@eeacms/volto-cca-policy/helpers/country_map/countryMap';
-import { withGeoJsonData } from '@eeacms/volto-cca-policy/helpers/country_map/hocs';
+} from '@eeacms/volto-cca-policy/helpers';
+import { Map, Layer, Layers, Controls } from '@eeacms/volto-openlayers-map/api';
+import { withOpenLayers } from '@eeacms/volto-openlayers-map';
 import {
   withResponsiveContainer,
   withVisibilitySensor,
+  withGeoJsonData,
 } from '@eeacms/volto-cca-policy/hocs';
 import { makeStyles } from './mapstyle';
 import { Interactions } from './Interactions';

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

@@ -1,20 +1,19 @@
 import { getBaseUrl } from '@eeacms/volto-cca-policy/utils';
 import React from 'react';
 import { compose } from 'redux';
-import { clientOnly } from '@eeacms/volto-cca-policy/helpers';
-import { useHistory } from 'react-router-dom';
-
-import { withOpenLayers } from '@eeacms/volto-openlayers-map';
-import { Map, Layer, Layers, Controls } from '@eeacms/volto-openlayers-map/api';
 import {
+  clientOnly,
   euCountryNames,
   tooltipStyle,
   getImageUrl,
-} from '@eeacms/volto-cca-policy/helpers/country_map/countryMap';
-import { withGeoJsonData } from '@eeacms/volto-cca-policy/helpers/country_map/hocs';
+} from '@eeacms/volto-cca-policy/helpers';
+import { useHistory } from 'react-router-dom';
+import { withOpenLayers } from '@eeacms/volto-openlayers-map';
+import { Map, Layer, Layers, Controls } from '@eeacms/volto-openlayers-map/api';
 import {
   withResponsiveContainer,
   withVisibilitySensor,
+  withGeoJsonData,
 } from '@eeacms/volto-cca-policy/hocs';
 import { makeStyles } from './mapstyle';
 import { Interactions } from './Interactions';

package/src/components/manage/Blocks/CountryMapObservatory/Interactions.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { euCountryNames } from '@eeacms/volto-cca-policy/helpers/country_map/countryMap';
+import { euCountryNames } from '@eeacms/volto-cca-policy/helpers';
 import { useMapContext } from '@eeacms/volto-openlayers-map/api';
 
 let highlight = null; // easy global

package/src/components/manage/Blocks/CountryMapProfile/Interactions.jsx

@@ -3,7 +3,7 @@ import {
   euCountryNames,
   setTooltipVisibility,
   getClosestFeatureToCoordinate,
-} from '@eeacms/volto-cca-policy/helpers/country_map/countryMap';
+} from '@eeacms/volto-cca-policy/helpers';
 import { useMapContext } from '@eeacms/volto-openlayers-map/api';
 
 export const Interactions = ({

package/src/components/manage/Blocks/CountryMapProfile/OLView.jsx

@@ -2,13 +2,12 @@ import React from 'react';
 import { compose } from 'redux';
 import { Grid } from 'semantic-ui-react';
 import {
+  clientOnly,
   getImageUrl,
   tooltipStyle,
   adjustEuCountryNames,
   euCountryNamesIncludingEnergy as euCountryNamesRaw,
-} from '@eeacms/volto-cca-policy/helpers/country_map/countryMap';
-import { withGeoJsonData } from '@eeacms/volto-cca-policy/helpers/country_map/hocs';
-import { clientOnly } from '@eeacms/volto-cca-policy/helpers';
+} from '@eeacms/volto-cca-policy/helpers';
 import { withOpenLayers } from '@eeacms/volto-openlayers-map';
 import { Map, Layer, Layers, Controls } from '@eeacms/volto-openlayers-map/api';
 import { makeStyles } from './mapstyle';
@@ -18,6 +17,7 @@ import Filter from './Filter';
 import {
   withResponsiveContainer,
   withVisibilitySensor,
+  withGeoJsonData,
 } from '@eeacms/volto-cca-policy/hocs';
 import { addAppURL } from '@plone/volto/helpers/Url/Url';
 

package/src/components/manage/Blocks/FlourishEmbedBlock/FlourishEmbedBlockView.jsx

@@ -10,6 +10,7 @@ import './style.less';
 const FlourishEmbedBlockView = ({ data, mode }) => {
   const isEditMode = mode === 'edit';
   const embed_code = data?.embed_code || '';
+  const height = data?.height || '980';
   const flourishPath = getDataSrcFromEmbedCode(embed_code);
   const flourishUrl = buildFlourishUrl(flourishPath);
 
@@ -26,7 +27,7 @@ const FlourishEmbedBlockView = ({ data, mode }) => {
       }}
     >
       <iframe
-        height="980"
+        height={height}
         width="100%"
         src={flourishUrl}
         title="Flourish visualization"

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

@@ -4,7 +4,7 @@ const schema = {
     {
       id: 'default',
       title: 'Default',
-      fields: ['embed_code'],
+      fields: ['embed_code', 'height'],
     },
   ],
   properties: {
@@ -12,6 +12,12 @@ const schema = {
       title: 'Flourish embed code',
       widget: 'textarea',
     },
+    height: {
+      title: 'Embed height',
+      description:
+        'Height of the Flourish iframe in pixels. If left empty, the default height is 980 px.',
+      type: 'number',
+    },
   },
   required: [],
 };