@eeacms/volto-cca-policy 1.0.24 → 1.0.26

package/locales/ro/LC_MESSAGES/volto.po

@@ -845,11 +845,6 @@ msgstr "Află mai multe"
 msgid "Legal aspects"
 msgstr "Aspecte juridice"
 
-#. Default: "License"
-#: components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem
-msgid "License"
-msgstr ""
-
 #. Default: "Lifetime"
 #: components/theme/Views/AdaptationOptionView
 #: components/theme/Views/CaseStudyView
@@ -1493,11 +1488,6 @@ msgstr "Subiecte:"
 msgid "Transnational regions"
 msgstr "Regiunile transnaționale"
 
-#. Default: "Type"
-#: components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem
-msgid "Type"
-msgstr ""
-
 #. Default: "Type of item"
 #: search/common
 #: search/mission_all/facets-all

package/locales/sk/LC_MESSAGES/volto.po

@@ -845,11 +845,6 @@ msgstr "Zistite viac"
 msgid "Legal aspects"
 msgstr "Právne aspekty"
 
-#. Default: "License"
-#: components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem
-msgid "License"
-msgstr ""
-
 #. Default: "Lifetime"
 #: components/theme/Views/AdaptationOptionView
 #: components/theme/Views/CaseStudyView
@@ -1493,11 +1488,6 @@ msgstr "témy:"
 msgid "Transnational regions"
 msgstr "Nadnárodné regióny"
 
-#. Default: "Type"
-#: components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem
-msgid "Type"
-msgstr ""
-
 #. Default: "Type of item"
 #: search/common
 #: search/mission_all/facets-all

package/locales/sl/LC_MESSAGES/volto.po

@@ -845,11 +845,6 @@ msgstr "Več o tem"
 msgid "Legal aspects"
 msgstr "Pravni vidiki"
 
-#. Default: "License"
-#: components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem
-msgid "License"
-msgstr ""
-
 #. Default: "Lifetime"
 #: components/theme/Views/AdaptationOptionView
 #: components/theme/Views/CaseStudyView
@@ -1493,11 +1488,6 @@ msgstr "Teme:"
 msgid "Transnational regions"
 msgstr "Transnacionalne regije"
 
-#. Default: "Type"
-#: components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem
-msgid "Type"
-msgstr ""
-
 #. Default: "Type of item"
 #: search/common
 #: search/mission_all/facets-all

package/locales/sv/LC_MESSAGES/volto.po

@@ -845,11 +845,6 @@ msgstr "Läs mer"
 msgid "Legal aspects"
 msgstr "Juridiska aspekter"
 
-#. Default: "License"
-#: components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem
-msgid "License"
-msgstr ""
-
 #. Default: "Lifetime"
 #: components/theme/Views/AdaptationOptionView
 #: components/theme/Views/CaseStudyView
@@ -1493,11 +1488,6 @@ msgstr "Ämnen:"
 msgid "Transnational regions"
 msgstr "Transnationella regioner"
 
-#. Default: "Type"
-#: components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem
-msgid "Type"
-msgstr ""
-
 #. Default: "Type of item"
 #: search/common
 #: search/mission_all/facets-all

package/locales/tr/LC_MESSAGES/volto.po

@@ -845,11 +845,6 @@ msgstr "Daha fazla bilgi edin"
 msgid "Legal aspects"
 msgstr "Yasal yönler"
 
-#. Default: "License"
-#: components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem
-msgid "License"
-msgstr ""
-
 #. Default: "Lifetime"
 #: components/theme/Views/AdaptationOptionView
 #: components/theme/Views/CaseStudyView
@@ -1493,11 +1488,6 @@ msgstr "Konular:"
 msgid "Transnational regions"
 msgstr "Ulusötesi bölgeler"
 
-#. Default: "Type"
-#: components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem
-msgid "Type"
-msgstr ""
-
 #. Default: "Type of item"
 #: search/common
 #: search/mission_all/facets-all

package/locales/volto.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2026-09-16T07:51:35.558Z\n"
+"POT-Creation-Date: 2026-09-17T11:25:27.854Z\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"
@@ -847,11 +847,6 @@ msgstr ""
 msgid "Legal aspects"
 msgstr ""
 
-#. Default: "License"
-#: components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem
-msgid "License"
-msgstr ""
-
 #. Default: "Lifetime"
 #: components/theme/Views/AdaptationOptionView
 #: components/theme/Views/CaseStudyView
@@ -1495,11 +1490,6 @@ msgstr ""
 msgid "Transnational regions"
 msgstr ""
 
-#. Default: "Type"
-#: components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem
-msgid "Type"
-msgstr ""
-
 #. Default: "Type of item"
 #: search/common
 #: search/mission_all/facets-all

package/package.json

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

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

@@ -1,9 +1,10 @@
 import React from 'react';
-import { Checkbox, Icon, Popup } from 'semantic-ui-react';
+import { Checkbox, Icon } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';
 import ExternalLink from '@eeacms/search/components/Result/ExternalLink';
 import ResultContext from '@eeacms/search/components/Result/ResultContext';
-import ToolThumbnail from '../../theme/ToolThumbnail/ToolThumbnail';
+import TagOverflowPopup from '@eeacms/volto-cca-policy/components/theme/TagOverflowPopup';
+import ToolThumbnail from '@eeacms/volto-cca-policy/components/theme/ToolThumbnail/ToolThumbnail';
 import { getToolThumbnailUrl } from '../../theme/ToolThumbnail/utils';
 import {
   getCompareToolTitle,
@@ -25,14 +26,6 @@ const messages = defineMessages({
     id: 'Cycle',
     defaultMessage: 'Cycle',
   },
-  license: {
-    id: 'License',
-    defaultMessage: 'License',
-  },
-  type: {
-    id: 'Type',
-    defaultMessage: 'Type',
-  },
   typeOfOutput: {
     id: 'Type of outputs',
     defaultMessage: 'Type of outputs',
@@ -71,9 +64,11 @@ const formatPublicationDate = (value) => {
   }
 };
 
-const TagGroup = ({ typeLabel, values, type }) => {
-  const visible = values.slice(0, 3);
-  const hidden = values.slice(3);
+const TagGroup = ({ typeLabel, values, type, maxItems }) => {
+  const visible = Number.isFinite(maxItems)
+    ? values.slice(0, maxItems)
+    : values;
+  const hidden = Number.isFinite(maxItems) ? values.slice(maxItems) : [];
   const remaining = values.length - visible.length;
 
   return (
@@ -84,27 +79,10 @@ const TagGroup = ({ typeLabel, values, type }) => {
         </span>
       ))}
       {remaining > 0 && (
-        <Popup
-          className="catalogue-tag-popup"
-          content={
-            <div className="catalogue-tag-tooltip">
-              <ul>
-                {hidden.map((value) => (
-                  <li key={`${type}-hidden-${value}`}>{value}</li>
-                ))}
-              </ul>
-            </div>
-          }
-          position="bottom left"
-          trigger={
-            <button
-              type="button"
-              className={`navigator-tag ${type} more`}
-              aria-label={`${typeLabel}: ${hidden.join(', ')}`}
-            >
-              + {remaining}
-            </button>
-          }
+        <TagOverflowPopup
+          items={hidden}
+          className={`navigator-tag ${type} more`}
+          ariaLabel={`${typeLabel}: ${hidden.join(', ')}`}
         />
       )}
     </div>
@@ -113,6 +91,7 @@ const TagGroup = ({ typeLabel, values, type }) => {
 
 const CycleElements = ({ intl, values }) => {
   const visible = values.slice(0, 3);
+  const hidden = values.slice(3);
 
   if (!visible.length) return null;
 
@@ -129,6 +108,13 @@ const CycleElements = ({ intl, values }) => {
           {value}
         </span>
       ))}
+      {hidden.length > 0 && (
+        <TagOverflowPopup
+          items={hidden}
+          className="navigator-tag cycle-element more"
+          ariaLabel={`${intl.formatMessage(messages.cycle)}: ${hidden.join(', ')}`}
+        />
+      )}
     </div>
   );
 };
@@ -138,6 +124,7 @@ const NavigatorCatalogueCardItem = (props) => {
   const intl = useIntl();
   const sectors = rawValueAsArray(result.cca_adaptation_sectors);
   const hazards = rawValueAsArray(result.cca_climate_impacts);
+  const keywords = rawValueAsArray(result.cca_keywords);
   const outputs = rawValueAsArray(result.cca_type_of_outputs);
 
   const outputType = outputs
@@ -146,7 +133,7 @@ const NavigatorCatalogueCardItem = (props) => {
     .join(', ');
   const toolProvider = result?._result?.tool_provider?.raw;
   const adaptationSupportCycleSteps = rawValueAsArray(
-    result.adaptation_support_cycle_step,
+    result.cca_adaptation_support_cycle_step,
   )
     .map((value) => {
       const title = value?.title || value;
@@ -156,8 +143,6 @@ const NavigatorCatalogueCardItem = (props) => {
   const publicationDate =
     result.publication_date?.raw || result.publication_date;
   const formattedPublicationDate = formatPublicationDate(publicationDate);
-  const sectorLabel = intl.formatMessage(messages.sector);
-  const hazardLabel = intl.formatMessage(messages.hazard);
   const compareTool = {
     uid: getCompareToolUid(result),
     title: getCompareToolTitle(result),
@@ -197,8 +182,22 @@ const NavigatorCatalogueCardItem = (props) => {
         </p>
 
         <div className="catalogue-taxonomy">
-          <TagGroup typeLabel={sectorLabel} values={sectors} type="sector" />
-          <TagGroup typeLabel={hazardLabel} values={hazards} type="hazard" />
+          <TagGroup
+            typeLabel={intl.formatMessage(messages.sector)}
+            values={sectors}
+            type="sector"
+            maxItems={3}
+          />
+          <TagGroup
+            typeLabel={intl.formatMessage(messages.hazard)}
+            values={hazards}
+            type="hazard"
+            maxItems={3}
+          />
+        </div>
+
+        <div className="catalogue-keywords">
+          <TagGroup values={keywords} type="keyword" />
         </div>
 
         <div className="catalogue-item-footer">

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

@@ -84,6 +84,9 @@ describe('NavigatorCatalogueCardItem', () => {
       cca_climate_impacts: {
         raw: ['Drought', 'Flooding', 'Heat', 'Wildfires'],
       },
+      cca_keywords: {
+        raw: ['Planning', 'Risk assessment', 'Resilience', 'Adaptation'],
+      },
       cca_type_of_outputs: {
         raw: [
           'Maps and graphs',
@@ -91,7 +94,7 @@ describe('NavigatorCatalogueCardItem', () => {
           'Datasets and indicators',
         ],
       },
-      adaptation_support_cycle_step: {
+      cca_adaptation_support_cycle_step: {
         raw: [
           { title: 'Step 1: Preparing the ground' },
           { title: 'Step 2: Assessing risks' },
@@ -123,8 +126,15 @@ describe('NavigatorCatalogueCardItem', () => {
     expect(
       screen.getByRole('button', { name: 'Hazard: Wildfires' }),
     ).toBeInTheDocument();
+    expect(screen.getByText('Planning')).toBeInTheDocument();
+    expect(screen.getByText('Risk assessment')).toBeInTheDocument();
+    expect(screen.getByText('Resilience')).toBeInTheDocument();
+    expect(screen.getByText('Adaptation')).toBeInTheDocument();
     expect(screen.getByText('Step 1')).toBeInTheDocument();
-    expect(screen.queryByText('Step 4')).not.toBeInTheDocument();
+    expect(
+      screen.getByRole('button', { name: 'Cycle: Step 4' }),
+    ).toHaveTextContent('+ 1');
+    expect(screen.getByText('Step 4')).toBeInTheDocument();
     expect(
       screen.getByTitle(
         'Maps and graphs, Reports and decision support, Datasets and indicators',
@@ -145,6 +155,22 @@ describe('NavigatorCatalogueCardItem', () => {
     });
   });
 
+  it('shows the cycle steps from the field used by the catalogue filter', () => {
+    renderCard({
+      title: 'Climate planning tool',
+      href: 'https://example.com/tool',
+      cca_adaptation_support_cycle_step: {
+        raw: ['Step 2: Assessing risks'],
+      },
+      adaptation_support_cycle_step: {
+        raw: [{ title: 'Step 1: Preparing the ground' }],
+      },
+    });
+
+    expect(screen.getByText('Step 2')).toBeInTheDocument();
+    expect(screen.queryByText('Step 1')).not.toBeInTheDocument();
+  });
+
   it('renders sparse results and disables comparison without a UID', () => {
     useCompareTools.mockReturnValue({
       isSelected: true,

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

@@ -78,7 +78,7 @@ export const formatFunctionalityScore = (value) => {
 
 export const escapeCsvValue = (value) => {
   const stringValue = value === undefined || value === null ? '' : `${value}`;
-  return `"${stringValue.replace(/"/g, '""')}"`;
+  return `"${stringValue.replaceAll('"', '""')}"`;
 };
 
 export const downloadCsv = (filename, rows) => {