@eeacms/volto-cca-policy 1.0.19 → 1.0.21

package/locales/tr/LC_MESSAGES/volto.po

@@ -62,13 +62,13 @@ msgid "Adaptation Sectors"
 msgstr "Adaptasyon Sektörleri"
 
 #. Default: "Adaptation Support Cycle Step"
-#: search/navigator_catalogue/facets
 #: search/navigator_guide/facets
 msgid "Adaptation Support Cycle Step"
 msgstr ""
 
 #. Default: "Adaptation approaches"
 #: components/manage/Blocks/CaseStudyExplorer/CaseStudyFilters
+#: search/navigator_catalogue/facets
 msgid "Adaptation approaches"
 msgstr "Adaptasyon yaklaşımları"
 
@@ -82,6 +82,11 @@ msgstr "Uyum seçeneği"
 msgid "Adaptation options"
 msgstr "Adaptasyon seçenekleri"
 
+#. Default: "Adaptation policy cycle"
+#: search/navigator_catalogue/facets
+msgid "Adaptation policy cycle"
+msgstr ""
+
 #. Default: "Adaptation sectors"
 #: components/manage/Blocks/CaseStudyExplorer/CaseStudyFilters
 #: components/manage/Blocks/CaseStudyExplorer/FeatureDisplay
@@ -140,6 +145,11 @@ msgstr "Tüm zamanlar"
 msgid "At least two valid tools are required for comparison. Select tools from the Navigator Catalogue."
 msgstr ""
 
+#. Default: "Available"
+#: components/theme/CompareTools/CompareToolsView
+msgid "Available"
+msgstr ""
+
 #. Default: "Back"
 #: components/Search/NavigatorGuide/NavigatorGuideContentView
 msgid "Back"
@@ -156,6 +166,7 @@ msgid "Background information"
 msgstr "Arka plan bilgisi"
 
 #. Default: "Biogeographical regions:"
+#: components/theme/Content/Sections/ExtendedToolGeographicMetadata
 #: components/theme/Content/Sections/GeographicMetadata
 msgid "Biogeographical regions:"
 msgstr "Biyocoğrafik bölgeler:"
@@ -220,6 +231,11 @@ msgstr "Kategori"
 msgid "Challenges"
 msgstr "Zorluklar"
 
+#. Default: "Check Navigator Catalogue"
+#: components/theme/Views/ExtendedToolView
+msgid "Check Navigator Catalogue"
+msgstr ""
+
 #. Default: "Choose a file"
 #: components/manage/Widgets/PromotionalImageWidget
 msgid "Choose a file"
@@ -240,7 +256,14 @@ msgstr ""
 msgid "Choose thematic map:"
 msgstr "Tematik haritayı seçin:"
 
-#. Default: "City:"
+#. Default: "Municipalities & other:"
+#: components/theme/Content/Sections/ExtendedToolGeographicMetadata
+#: components/theme/Content/Sections/GeographicMetadata
+msgid "Cities:"
+msgstr ""
+
+#. Default: "Municipalities & other:"
+#: components/theme/Content/Sections/ExtendedToolGeographicMetadata
 #: components/theme/Content/Sections/GeographicMetadata
 msgid "City:"
 msgstr "Şehir:"
@@ -350,6 +373,7 @@ msgid "Countries"
 msgstr "Ülkeler"
 
 #. Default: "Countries:"
+#: components/theme/Content/Sections/ExtendedToolGeographicMetadata
 #: components/theme/Content/Sections/GeographicMetadata
 msgid "Countries:"
 msgstr "Ülkeler:"
@@ -510,6 +534,11 @@ msgstr "Finansman teşvik araçları"
 msgid "Find the right tool"
 msgstr ""
 
+#. Default: "Focus areas"
+#: search/navigator_catalogue/facets
+msgid "Focus areas"
+msgstr ""
+
 #. Default: "For more search options"
 #: index
 msgid "For more search options"
@@ -647,6 +676,11 @@ msgstr "IPCC uyum seçenekleri kategorileri:"
 msgid "If you have any further questions you can contact"
 msgstr "Başka sorularınız varsa iletişime geçebilirsiniz"
 
+#. Default: "Implementation level"
+#: search/navigator_catalogue/facets
+msgid "Implementation level"
+msgstr ""
+
 #. Default: "Implementation time"
 #: components/theme/Views/AdaptationOptionView
 #: components/theme/Views/CaseStudyView
@@ -811,11 +845,6 @@ msgstr "Yasal yönler"
 msgid "License"
 msgstr ""
 
-#. Default: "License status"
-#: search/navigator_catalogue/facets
-msgid "License status"
-msgstr ""
-
 #. Default: "Lifetime"
 #: components/theme/Views/AdaptationOptionView
 #: components/theme/Views/CaseStudyView
@@ -848,6 +877,7 @@ msgid "Looking for more information?"
 msgstr "Daha fazla bilgi mi arıyorsunuz?"
 
 #. Default: "Macro-Transnational region:"
+#: components/theme/Content/Sections/ExtendedToolGeographicMetadata
 #: components/theme/Content/Sections/GeographicMetadata
 msgid "Macro-Transnational region:"
 msgstr "Makro-Ulusötesi bölge:"
@@ -877,6 +907,12 @@ msgstr "Misyon aracı"
 msgid "Most useful for"
 msgstr "Şunun için en yararlısı:"
 
+#. Default: "Municipalities & other:"
+#: components/theme/Content/Sections/ExtendedToolGeographicMetadata
+#: components/theme/Content/Sections/GeographicMetadata
+msgid "Municipalities & other:"
+msgstr ""
+
 #. Default: "National HHAP"
 #: components/manage/Blocks/CountryMapHeatIndex/Filter
 msgid "National HHAP"
@@ -887,11 +923,6 @@ msgstr "Ulusal HHAP"
 msgid "Nature based Solutions and Ecosystem based approaches"
 msgstr "Doğa temelli çözümler ve ekosistem temelli yaklaşımlar"
 
-#. Default: "Nature-based solution"
-#: search/navigator_catalogue/facets
-msgid "Nature-based solution"
-msgstr ""
-
 #. Default: "Navigate to this item"
 #: components/manage/Workflow/WorkflowLinkIntegrityModal
 msgid "Navigate to this item"
@@ -962,6 +993,11 @@ msgstr "Sonuç yok"
 msgid "Non-EU Languages"
 msgstr "AB Dışı Diller"
 
+#. Default: "Not available"
+#: components/theme/CompareTools/CompareToolsView
+msgid "Not available"
+msgstr ""
+
 #. Default: "Objectives of the adaptation measure"
 #: components/theme/Views/CaseStudyView
 msgid "Objectives of the adaptation measure"
@@ -1226,7 +1262,6 @@ msgstr "Bölümler"
 #. Default: "Sector"
 #: components/manage/Blocks/FilterAceContent/FilterAceContentView
 #: components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem
-#: components/theme/CompareTools/CompareToolsView
 msgid "Sector"
 msgstr "Sektör"
 
@@ -1341,6 +1376,7 @@ msgid "Step {current} of {total}"
 msgstr ""
 
 #. Default: "Sub Nationals:"
+#: components/theme/Content/Sections/ExtendedToolGeographicMetadata
 #: components/theme/Content/Sections/GeographicMetadata
 msgid "Sub Nationals:"
 msgstr "Alt Vatandaşlar:"
@@ -1452,16 +1488,6 @@ msgstr "Ulusötesi bölgeler"
 msgid "Type"
 msgstr ""
 
-#. Default: "Type of Data"
-#: search/navigator_catalogue/facets
-msgid "Type of Data"
-msgstr ""
-
-#. Default: "Type of Outputs"
-#: search/navigator_catalogue/facets
-msgid "Type of Outputs"
-msgstr ""
-
 #. Default: "Type of item"
 #: search/common
 #: search/mission_all/facets-all
@@ -1469,7 +1495,9 @@ msgid "Type of item"
 msgstr "Öğe türü"
 
 #. Default: "Type of outputs"
+#: components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem
 #: components/theme/Views/ExtendedToolView
+#: search/navigator_catalogue/facets
 msgid "Type of outputs"
 msgstr ""
 
@@ -1508,11 +1536,6 @@ msgstr ""
 msgid "User Group"
 msgstr ""
 
-#. Default: "User Groups"
-#: search/navigator_catalogue/facets
-msgid "User Groups"
-msgstr ""
-
 #. Default: "User requirements"
 #: search/mission_tools/facets-tools
 msgid "User requirements"

package/locales/volto.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2026-08-19T09:34:02.521Z\n"
+"POT-Creation-Date: 2026-09-14T12:10:53.707Z\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"
@@ -64,13 +64,13 @@ msgid "Adaptation Sectors"
 msgstr ""
 
 #. Default: "Adaptation Support Cycle Step"
-#: search/navigator_catalogue/facets
 #: search/navigator_guide/facets
 msgid "Adaptation Support Cycle Step"
 msgstr ""
 
 #. Default: "Adaptation approaches"
 #: components/manage/Blocks/CaseStudyExplorer/CaseStudyFilters
+#: search/navigator_catalogue/facets
 msgid "Adaptation approaches"
 msgstr ""
 
@@ -84,6 +84,11 @@ msgstr ""
 msgid "Adaptation options"
 msgstr ""
 
+#. Default: "Adaptation policy cycle"
+#: search/navigator_catalogue/facets
+msgid "Adaptation policy cycle"
+msgstr ""
+
 #. Default: "Adaptation sectors"
 #: components/manage/Blocks/CaseStudyExplorer/CaseStudyFilters
 #: components/manage/Blocks/CaseStudyExplorer/FeatureDisplay
@@ -142,6 +147,11 @@ msgstr ""
 msgid "At least two valid tools are required for comparison. Select tools from the Navigator Catalogue."
 msgstr ""
 
+#. Default: "Available"
+#: components/theme/CompareTools/CompareToolsView
+msgid "Available"
+msgstr ""
+
 #. Default: "Back"
 #: components/Search/NavigatorGuide/NavigatorGuideContentView
 msgid "Back"
@@ -158,6 +168,7 @@ msgid "Background information"
 msgstr ""
 
 #. Default: "Biogeographical regions:"
+#: components/theme/Content/Sections/ExtendedToolGeographicMetadata
 #: components/theme/Content/Sections/GeographicMetadata
 msgid "Biogeographical regions:"
 msgstr ""
@@ -222,6 +233,11 @@ msgstr ""
 msgid "Challenges"
 msgstr ""
 
+#. Default: "Check Navigator Catalogue"
+#: components/theme/Views/ExtendedToolView
+msgid "Check Navigator Catalogue"
+msgstr ""
+
 #. Default: "Choose a file"
 #: components/manage/Widgets/PromotionalImageWidget
 msgid "Choose a file"
@@ -242,7 +258,14 @@ msgstr ""
 msgid "Choose thematic map:"
 msgstr ""
 
-#. Default: "City:"
+#. Default: "Municipalities & other:"
+#: components/theme/Content/Sections/ExtendedToolGeographicMetadata
+#: components/theme/Content/Sections/GeographicMetadata
+msgid "Cities:"
+msgstr ""
+
+#. Default: "Municipalities & other:"
+#: components/theme/Content/Sections/ExtendedToolGeographicMetadata
 #: components/theme/Content/Sections/GeographicMetadata
 msgid "City:"
 msgstr ""
@@ -352,6 +375,7 @@ msgid "Countries"
 msgstr ""
 
 #. Default: "Countries:"
+#: components/theme/Content/Sections/ExtendedToolGeographicMetadata
 #: components/theme/Content/Sections/GeographicMetadata
 msgid "Countries:"
 msgstr ""
@@ -512,6 +536,11 @@ msgstr ""
 msgid "Find the right tool"
 msgstr ""
 
+#. Default: "Focus areas"
+#: search/navigator_catalogue/facets
+msgid "Focus areas"
+msgstr ""
+
 #. Default: "For more search options"
 #: index
 msgid "For more search options"
@@ -649,6 +678,11 @@ msgstr ""
 msgid "If you have any further questions you can contact"
 msgstr ""
 
+#. Default: "Implementation level"
+#: search/navigator_catalogue/facets
+msgid "Implementation level"
+msgstr ""
+
 #. Default: "Implementation time"
 #: components/theme/Views/AdaptationOptionView
 #: components/theme/Views/CaseStudyView
@@ -813,11 +847,6 @@ msgstr ""
 msgid "License"
 msgstr ""
 
-#. Default: "License status"
-#: search/navigator_catalogue/facets
-msgid "License status"
-msgstr ""
-
 #. Default: "Lifetime"
 #: components/theme/Views/AdaptationOptionView
 #: components/theme/Views/CaseStudyView
@@ -850,6 +879,7 @@ msgid "Looking for more information?"
 msgstr ""
 
 #. Default: "Macro-Transnational region:"
+#: components/theme/Content/Sections/ExtendedToolGeographicMetadata
 #: components/theme/Content/Sections/GeographicMetadata
 msgid "Macro-Transnational region:"
 msgstr ""
@@ -879,6 +909,12 @@ msgstr ""
 msgid "Most useful for"
 msgstr ""
 
+#. Default: "Municipalities & other:"
+#: components/theme/Content/Sections/ExtendedToolGeographicMetadata
+#: components/theme/Content/Sections/GeographicMetadata
+msgid "Municipalities & other:"
+msgstr ""
+
 #. Default: "National HHAP"
 #: components/manage/Blocks/CountryMapHeatIndex/Filter
 msgid "National HHAP"
@@ -889,11 +925,6 @@ msgstr ""
 msgid "Nature based Solutions and Ecosystem based approaches"
 msgstr ""
 
-#. Default: "Nature-based solution"
-#: search/navigator_catalogue/facets
-msgid "Nature-based solution"
-msgstr ""
-
 #. Default: "Navigate to this item"
 #: components/manage/Workflow/WorkflowLinkIntegrityModal
 msgid "Navigate to this item"
@@ -964,6 +995,11 @@ msgstr ""
 msgid "Non-EU Languages"
 msgstr ""
 
+#. Default: "Not available"
+#: components/theme/CompareTools/CompareToolsView
+msgid "Not available"
+msgstr ""
+
 #. Default: "Objectives of the adaptation measure"
 #: components/theme/Views/CaseStudyView
 msgid "Objectives of the adaptation measure"
@@ -1228,7 +1264,6 @@ msgstr ""
 #. Default: "Sector"
 #: components/manage/Blocks/FilterAceContent/FilterAceContentView
 #: components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem
-#: components/theme/CompareTools/CompareToolsView
 msgid "Sector"
 msgstr ""
 
@@ -1343,6 +1378,7 @@ msgid "Step {current} of {total}"
 msgstr ""
 
 #. Default: "Sub Nationals:"
+#: components/theme/Content/Sections/ExtendedToolGeographicMetadata
 #: components/theme/Content/Sections/GeographicMetadata
 msgid "Sub Nationals:"
 msgstr ""
@@ -1454,16 +1490,6 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#. Default: "Type of Data"
-#: search/navigator_catalogue/facets
-msgid "Type of Data"
-msgstr ""
-
-#. Default: "Type of Outputs"
-#: search/navigator_catalogue/facets
-msgid "Type of Outputs"
-msgstr ""
-
 #. Default: "Type of item"
 #: search/common
 #: search/mission_all/facets-all
@@ -1471,7 +1497,9 @@ msgid "Type of item"
 msgstr ""
 
 #. Default: "Type of outputs"
+#: components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem
 #: components/theme/Views/ExtendedToolView
+#: search/navigator_catalogue/facets
 msgid "Type of outputs"
 msgstr ""
 
@@ -1510,11 +1538,6 @@ msgstr ""
 msgid "User Group"
 msgstr ""
 
-#. Default: "User Groups"
-#: search/navigator_catalogue/facets
-msgid "User Groups"
-msgstr ""
-
 #. Default: "User requirements"
 #: search/mission_tools/facets-tools
 msgid "User requirements"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "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

@@ -33,6 +33,10 @@ const messages = defineMessages({
     id: 'Type',
     defaultMessage: 'Type',
   },
+  typeOfOutput: {
+    id: 'Type of outputs',
+    defaultMessage: 'Type of outputs',
+  },
   compare: {
     id: 'Compare',
     defaultMessage: 'Compare',
@@ -117,7 +121,9 @@ const NavigatorCatalogueCardItem = (props) => {
   const intl = useIntl();
   const sectors = rawValueAsArray(result.cca_adaptation_sectors);
   const hazards = rawValueAsArray(result.cca_climate_impacts);
-  const licenseStatus = rawValueAsArray(result.cca_license_status)
+  const outputs = rawValueAsArray(result.cca_type_of_outputs);
+
+  const outputType = outputs
     .map((value) => value?.title || value)
     .filter(Boolean)
     .join(', ');
@@ -181,19 +187,15 @@ const NavigatorCatalogueCardItem = (props) => {
           <div className="catalogue-meta">
             <CycleElements intl={intl} values={adaptationSupportCycleSteps} />
           </div>
-
           <div className="catalogue-meta license-type">
-            {licenseStatus && (
+            {outputType && (
               <>
-                <span className="catalogue-licence" title={licenseStatus}>
-                  {intl.formatMessage(messages.license)}: {licenseStatus}
+                <span className="catalogue-output" title={outputType}>
+                  {intl.formatMessage(messages.typeOfOutput)}: {outputType}
                 </span>
                 <span aria-hidden="true">·</span>
               </>
             )}
-            <span className="catalogue-type">
-              {intl.formatMessage(messages.type)}: Tool
-            </span>
           </div>
 
           <div className="catalogue-actions">

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

@@ -84,10 +84,11 @@ describe('NavigatorCatalogueCardItem', () => {
       cca_climate_impacts: {
         raw: ['Drought', 'Flooding', 'Heat', 'Wildfires'],
       },
-      cca_license_status: {
+      cca_type_of_outputs: {
         raw: [
-          'Open data with attribution requirements',
-          { title: 'Restricted' },
+          'Maps and graphs',
+          'Reports and decision support',
+          'Datasets and indicators',
         ],
       },
       adaptation_support_cycle_step: {
@@ -125,11 +126,12 @@ describe('NavigatorCatalogueCardItem', () => {
     expect(screen.getByText('Step 1')).toBeInTheDocument();
     expect(screen.queryByText('Step 4')).not.toBeInTheDocument();
     expect(
-      screen.getByTitle('Open data with attribution requirements, Restricted'),
+      screen.getByTitle(
+        'Maps and graphs, Reports and decision support, Datasets and indicators',
+      ),
     ).toHaveTextContent(
-      'License: Open data with attribution requirements, Restricted',
+      'Type of outputs: Maps and graphs, Reports and decision support, Datasets and indicators',
     );
-    expect(screen.getByText('Type: Tool')).toBeInTheDocument();
 
     fireEvent.click(screen.getByLabelText('compare'));
     expect(setSelected).toHaveBeenCalledWith(true);

package/src/components/theme/Content/Sections/ExtendedToolGeographicMetadata.jsx

@@ -1,14 +1,57 @@
-import { Fragment } from 'react';
+import { useIntl, defineMessages } from 'react-intl';
 import MetadataItemList from './MetadataItemList';
 import { renderGeochar } from './geographicMetadataUtils';
 
-const sectionOrder = [0, 3, 1, 2, 4, 5];
+const messages = defineMessages({
+  'Macro-Transnational region:': {
+    id: 'Macro-Transnational region:',
+    defaultMessage: 'Macro-Transnational region:',
+  },
+  'Biogeographical regions:': {
+    id: 'Biogeographical regions:',
+    defaultMessage: 'Biogeographical regions:',
+  },
+  'Countries:': { id: 'Countries:', defaultMessage: 'Countries:' },
+  'Sub Nationals:': { id: 'Sub Nationals:', defaultMessage: 'Sub Nationals:' },
+  'Municipalities & other:': {
+    id: 'Municipalities & other:',
+    defaultMessage: 'Municipalities & other:',
+  },
+  'Cities:': { id: 'Cities:', defaultMessage: 'Municipalities & other:' },
+  'City:': { id: 'City:', defaultMessage: 'Municipalities & other:' },
+});
+
+const specificSectionKeys = [
+  'countries',
+  'macrotrans',
+  'biotrans',
+  'subnational',
+  'city',
+];
 
 const getSections = (content) => {
   const { geochars, spatial_layer, spatial_values } = content;
 
   if (!geochars) {
-    return [spatial_layer ? [spatial_layer] : [], spatial_values || []];
+    if (spatial_values?.length) {
+      return [
+        {
+          key: 'spatial_values',
+          title: spatial_layer ? `${spatial_layer}:` : null,
+          value: spatial_values,
+        },
+      ];
+    }
+    if (spatial_layer) {
+      return [
+        {
+          key: 'spatial_layer',
+          title: null,
+          value: [spatial_layer],
+        },
+      ];
+    }
+    return [];
   }
 
   let parsedGeochars;
@@ -20,25 +63,47 @@ const getSections = (content) => {
 
   const renderedSections = renderGeochar(parsedGeochars?.geoElements) || [];
 
-  return sectionOrder.map((index) => renderedSections[index]?.value || []);
+  const specificSections = specificSectionKeys
+    .map((key) => renderedSections.find((section) => section.key === key))
+    .filter((section) => section?.value?.length);
+
+  if (specificSections.length > 0) {
+    return specificSections;
+  }
+
+  const elementSection = renderedSections.find(
+    (section) => section.key === 'element',
+  );
+  return elementSection?.value?.length ? [elementSection] : [];
 };
 
 const ExtendedToolGeographicMetadata = ({ content = {} }) => {
-  const sections = getSections(content).filter((values) => values?.length);
+  const intl = useIntl();
+  const sections = getSections(content);
 
   if (!sections.length) return null;
 
   return (
     <div className="extended-tool-geographic-metadata">
-      {sections.map((values, index) => (
-        <Fragment
-          key={values
-            .map((item) => item?.token || item?.title || item)
-            .join('-')}
+      {sections.map((section) => (
+        <div
+          className="geographic-category"
+          key={
+            section.key ||
+            section.title ||
+            (section.value && section.value[0]) ||
+            'geo'
+          }
         >
-          <MetadataItemList asInline value={values} />
-          {index < sections.length - 1 && ' · '}
-        </Fragment>
+          {section.title && (
+            <div className="geographic-category-title">
+              {messages[section.title]
+                ? intl.formatMessage(messages[section.title])
+                : section.title}
+            </div>
+          )}
+          <MetadataItemList asTags maxItems={3} value={section.value} />
+        </div>
       ))}
     </div>
   );