@eeacms/volto-cca-policy 1.0.29 → 1.0.31

package/CHANGELOG.md

@@ -4,6 +4,14 @@ 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).
 
+### [1.0.31](https://github.com/eea/volto-cca-policy/compare/1.0.30...1.0.31) - 29 September 2026
+
+### [1.0.30](https://github.com/eea/volto-cca-policy/compare/1.0.29...1.0.30) - 25 September 2026
+
+#### :nail_care: Enhancements
+
+- change(navigator): reorder facets [kreafox - [`97f3aff`](https://github.com/eea/volto-cca-policy/commit/97f3afffc6b41b7655e586367257ac6c87663ec7)]
+
 ### [1.0.29](https://github.com/eea/volto-cca-policy/compare/1.0.28...1.0.29) - 25 September 2026
 
 #### :rocket: New Features

package/package.json

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

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

@@ -223,6 +223,14 @@ const NavigatorGeographicCoverageFacet = ({
           />
         ))}
       </div>
+      <ExpandableFacetGroup
+        field={COUNTRIES_FIELD}
+        id="navigator-geographic-countries"
+        label={intl.formatMessage(messages.countries)}
+        emptyMessage={intl.formatMessage(messages.noOptionsAvailable)}
+        options={countryOptions}
+        onChange={(option) => updateChildFilter(COUNTRIES_FIELD, option)}
+      />
       <ExpandableFacetGroup
         field={TRANSNATIONAL_REGION_FIELD}
         id="navigator-geographic-transnational-regions"
@@ -233,14 +241,6 @@ const NavigatorGeographicCoverageFacet = ({
           updateChildFilter(TRANSNATIONAL_REGION_FIELD, option)
         }
       />
-      <ExpandableFacetGroup
-        field={COUNTRIES_FIELD}
-        id="navigator-geographic-countries"
-        label={intl.formatMessage(messages.countries)}
-        emptyMessage={intl.formatMessage(messages.noOptionsAvailable)}
-        options={countryOptions}
-        onChange={(option) => updateChildFilter(COUNTRIES_FIELD, option)}
-      />
       <NavigatorActiveFilters
         filters={filters}
         onRemove={(field, value, type) => removeFilter(field, value, type)}

package/src/components/manage/Blocks/ChatbotCatalogue/DocumentCard.jsx

@@ -24,7 +24,8 @@ export function cleanDocumentTitle(title) {
   if (!title || typeof title !== 'string') return '';
   const pipeIndex = title.indexOf('|');
   const firstPart = pipeIndex === -1 ? title : title.slice(0, pipeIndex);
-  return firstPart.trim() || title.trim();
+  const normalizedTitle = title.replace(/\s+/g, ' ').trim();
+  return firstPart.replace(/\s+/g, ' ').trim() || normalizedTitle;
 }
 
 /**
@@ -33,8 +34,8 @@ export function cleanDocumentTitle(title) {
  */
 export function matchesDocumentTitle(docTitle, searchTitle) {
   if (!docTitle || !searchTitle) return false;
-  const d1 = docTitle.trim().toLowerCase();
-  const s1 = searchTitle.trim().toLowerCase();
+  const d1 = docTitle.replace(/\s+/g, ' ').trim().toLowerCase();
+  const s1 = searchTitle.replace(/\s+/g, ' ').trim().toLowerCase();
   if (d1 === s1) return true;
 
   const dClean = cleanDocumentTitle(docTitle).toLowerCase();

package/src/components/manage/Blocks/ChatbotCatalogue/DocumentCard.test.jsx

@@ -78,6 +78,15 @@ describe('matchesDocumentTitle', () => {
     ).toBe(true);
   });
 
+  it('matches a single-line marker title to a newline-bearing catalogue title', () => {
+    expect(
+      matchesDocumentTitle(
+        'EFFIS \n- European Forest Fire Information System – Fire Hazard and Wildfire risk views. | Tool catalogue',
+        'EFFIS - European Forest Fire Information System – Fire Hazard and Wildfire risk views.',
+      ),
+    ).toBe(true);
+  });
+
   it('returns false for non-matching or empty titles', () => {
     expect(matchesDocumentTitle('Alpha', 'Beta')).toBe(false);
     expect(matchesDocumentTitle(null, 'Beta')).toBe(false);

package/src/components/manage/Blocks/ChatbotCatalogue/astUtils.js

@@ -4,7 +4,17 @@
  */
 
 export const DOC_MARKER_RE =
-  /!?\[\[?\s*(?:doc|document|tool|tools)\s*[:-]\s*([^\]\r\n]+)\]?\]/gi;
+  /!?\[\[?\s*(?:doc|document|tool|tools)\s*[:-]\s*([^\]]+)\]?\]/gi;
+
+export function normalizeDocMarkerWhitespace(markdown) {
+  if (typeof markdown !== 'string') return markdown;
+  DOC_MARKER_RE.lastIndex = 0;
+  const normalized = markdown.replace(DOC_MARKER_RE, (marker) =>
+    marker.replace(/\s+/g, ' '),
+  );
+  DOC_MARKER_RE.lastIndex = 0;
+  return normalized;
+}
 
 export const NEXT_STEPS_HEADING_RE =
   /^(suggested\s+next\s+steps|next\s+steps|recommended\s+next\s+steps|recommended\s+workflow|suggested\s+workflow|action\s+plan|how\s+to\s+use(\s+(them|these|this|the\s+tools))?|how\s+to\s+apply(\s+(them|these|this|the\s+tools))?|how\s+to\s+get\s+started|step-by-step\s+guidance)\b/i;

package/src/components/manage/Blocks/ChatbotCatalogue/docCards.js

@@ -22,6 +22,7 @@ import {
   cleanStrayLeadingAsterisks,
   deduplicateAdjacentHeadings,
   normalizeCitationParagraphsToLists,
+  normalizeDocMarkerWhitespace,
   parseMarkdownLines,
   shouldUnwrapCodeNode,
   unwrapCardLists,
@@ -75,11 +76,19 @@ export const remarkCcaDocCards = function () {
   const parseFn =
     typeof this?.parse === 'function' ? (str) => this.parse(str) : null;
 
-  return (tree) => {
+  return (tree, file) => {
     if (!tree || !Array.isArray(tree.children)) {
       return tree;
     }
 
+    const markdown = file?.value;
+    if (typeof markdown === 'string' && typeof parseFn === 'function') {
+      const normalizedMarkdown = normalizeDocMarkerWhitespace(markdown);
+      if (normalizedMarkdown !== markdown) {
+        tree = parseFn(normalizedMarkdown);
+      }
+    }
+
     // 1. Pre-pass: unwrap code blocks that contain markdown sections or doc markers
     for (let i = 0; i < tree.children.length; i += 1) {
       const node = tree.children[i];

package/src/components/manage/Blocks/ChatbotCatalogue/docCards.test.js

@@ -45,6 +45,27 @@ describe('remarkCcaDocCards', () => {
     expect(cards(result)).toEqual(['Climate Action Plan']);
   });
 
+  it('normalizes line breaks in a catalogue title before parsing markdown', () => {
+    const markdown =
+      '![[doc: EFFIS \n- European Forest Fire Information System – Fire Hazard and Wildfire risk views.]]';
+    const parse = jest.fn((source) => ({
+      type: 'root',
+      children: [{ type: 'text', value: source }],
+    }));
+    const transform = remarkCcaDocCards.call({ parse });
+    const result = transform(
+      { type: 'root', children: [] },
+      { value: markdown },
+    );
+
+    expect(parse).toHaveBeenCalledWith(
+      '![[doc: EFFIS - European Forest Fire Information System – Fire Hazard and Wildfire risk views.]]',
+    );
+    expect(cards(result)).toEqual([
+      'EFFIS - European Forest Fire Information System – Fire Hazard and Wildfire risk views.',
+    ]);
+  });
+
   it('keeps text before and after a mid-sentence marker', () => {
     const tree = {
       type: 'root',