@eeacms/volto-cca-policy 1.0.23 → 1.0.24

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.24](https://github.com/eea/volto-cca-policy/compare/1.0.23...1.0.24) - 17 September 2026
+
+#### :bug: Bug Fixes
+
+- fix: unwrap accidental code blocks and add resilience against varied assistant formats [Tiberiu Ichim - [`b245de7`](https://github.com/eea/volto-cca-policy/commit/b245de770a2e6d9a5741d240dc6649d2df7674bc)]
+- fix: hide document card when Elasticsearch lookup returns empty or not found [Tiberiu Ichim - [`6acb0ac`](https://github.com/eea/volto-cca-policy/commit/6acb0acf1ad558cf259a61ed25c6860a08edc1ee)]
+- fix: make catalogue cards and date formatting resilient against malformed data [Tiberiu Ichim - [`858ec4e`](https://github.com/eea/volto-cca-policy/commit/858ec4e2b7c8857ec43f080b9f5368e50bad40d4)]
+
 ### [1.0.23](https://github.com/eea/volto-cca-policy/compare/1.0.22...1.0.23) - 16 September 2026
 
 #### :rocket: New Features

package/package.json

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

@@ -54,6 +54,23 @@ const publicationDateFormatter = new Intl.DateTimeFormat('en-GB', {
   timeZone: 'UTC',
 });
 
+const formatPublicationDate = (value) => {
+  if (!value) return '';
+  const raw =
+    typeof value === 'object' && value !== null && 'raw' in value
+      ? value.raw
+      : value;
+  const val = Array.isArray(raw) ? raw[0] : raw;
+  if (!val || typeof val === 'object') return '';
+  try {
+    const d = new Date(val);
+    if (Number.isNaN(d.getTime())) return '';
+    return publicationDateFormatter.format(d);
+  } catch {
+    return '';
+  }
+};
+
 const TagGroup = ({ typeLabel, values, type }) => {
   const visible = values.slice(0, 3);
   const hidden = values.slice(3);
@@ -117,7 +134,7 @@ const CycleElements = ({ intl, values }) => {
 };
 
 const NavigatorCatalogueCardItem = (props) => {
-  const { result } = props;
+  const { result = {} } = props;
   const intl = useIntl();
   const sectors = rawValueAsArray(result.cca_adaptation_sectors);
   const hazards = rawValueAsArray(result.cca_climate_impacts);
@@ -131,13 +148,14 @@ const NavigatorCatalogueCardItem = (props) => {
   const adaptationSupportCycleSteps = rawValueAsArray(
     result.adaptation_support_cycle_step,
   )
-    .map((value) => value?.title?.split(':')[0])
+    .map((value) => {
+      const title = value?.title || value;
+      return typeof title === 'string' ? title.split(':')[0] : title;
+    })
     .filter(Boolean);
   const publicationDate =
     result.publication_date?.raw || result.publication_date;
-  const formattedPublicationDate = publicationDate
-    ? publicationDateFormatter.format(new Date(publicationDate))
-    : '';
+  const formattedPublicationDate = formatPublicationDate(publicationDate);
   const sectorLabel = intl.formatMessage(messages.sector);
   const hazardLabel = intl.formatMessage(messages.hazard);
   const compareTool = {

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

@@ -175,6 +175,50 @@ describe('NavigatorCatalogueCardItem', () => {
     expect(screen.queryByText('License:')).not.toBeInTheDocument();
   });
 
+  it('safely handles invalid, array, or malformed publication dates without throwing RangeError', () => {
+    // Malformed/invalid date string that would throw RangeError: Invalid time value
+    const { rerender } = renderCard({
+      title: 'Invalid date tool',
+      publication_date: 'N/A',
+    });
+    expect(screen.getByText('Invalid date tool')).toBeInTheDocument();
+    expect(screen.queryByText('N/A')).not.toBeInTheDocument();
+
+    // Array publication date
+    rerender(
+      <IntlProvider locale="en">
+        <NavigatorCatalogueCardItem
+          result={{
+            title: 'Array date tool',
+            publication_date: { raw: ['2026-07-24'] },
+          }}
+        />
+      </IntlProvider>,
+    );
+    expect(screen.getByText('24 Jul 26')).toBeInTheDocument();
+
+    // Malformed object publication date
+    rerender(
+      <IntlProvider locale="en">
+        <NavigatorCatalogueCardItem
+          result={{
+            title: 'Object date tool',
+            publication_date: { raw: { invalid: true } },
+          }}
+        />
+      </IntlProvider>,
+    );
+    expect(screen.getByText('Object date tool')).toBeInTheDocument();
+  });
+
+  it('safely handles non-string adaptationSupportCycleSteps without throwing', () => {
+    renderCard({
+      title: 'Numeric cycle tool',
+      adaptation_support_cycle_step: { raw: [123, null, { title: 456 }] },
+    });
+    expect(screen.getByText('Numeric cycle tool')).toBeInTheDocument();
+  });
+
   describe('thumbnail rendering and fallback', () => {
     it('renders thumbnail image and smoothly transitions from placeholder on load', () => {
       const { container } = renderCard({

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

@@ -1,6 +1,4 @@
 import React, { useContext, memo } from 'react';
-import { Icon } from 'semantic-ui-react';
-import ExternalLink from '@eeacms/search/components/Result/ExternalLink';
 
 import NavigatorCatalogueCardItem from '@eeacms/volto-cca-policy/components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem';
 // The `ChatMessageContext` seam only exists in @eeacms/volto-eea-chatbot from
@@ -54,137 +52,58 @@ export function matchesDocumentTitle(docTitle, searchTitle) {
   return false;
 }
 
-function formatDate(value) {
-  if (!value) return null;
-  const d = new Date(value);
-  if (Number.isNaN(d.getTime())) return null;
-  return d.toLocaleDateString('en-GB', {
-    day: '2-digit',
-    month: 'short',
-    year: '2-digit',
-  });
+function sourcePropsEqual(prev, next) {
+  return prev.source?.link === next.source?.link;
 }
 
-// `InlineDocCard` rebuilds the `source` object on every render (the answer is
-// re-rendered on each streaming tick), so a plain `===` prop comparison would
-// never memoize. Compare the actual fields instead.
-function sourceEqual(prevSource, nextSource) {
-  return (
-    prevSource?.semantic_identifier === nextSource?.semantic_identifier &&
-    prevSource?.blurb === nextSource?.blurb &&
-    prevSource?.updated_at === nextSource?.updated_at &&
-    prevSource?.source_type === nextSource?.source_type &&
-    prevSource?.link === nextSource?.link
-  );
-}
+export class DocCardErrorBoundary extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = { hasError: false };
+  }
 
-function sourcePropsEqual(prev, next) {
-  return prev.index === next.index && sourceEqual(prev.source, next.source);
+  static getDerivedStateFromError() {
+    return { hasError: true };
+  }
+
+  componentDidCatch(error, info) {
+    // eslint-disable-next-line no-console
+    console.warn('DocCard failed to render rich catalogue card:', error, info);
+  }
+
+  render() {
+    if (this.state.hasError) {
+      return this.props.fallback ?? null;
+    }
+    return this.props.children;
+  }
 }
 
 /**
- * Document card styled to match the Navigator catalogue cards
- * (volto-cca-policy NavigatorCatalogueCardItem), used when full searchlib
- * metadata is not yet loaded or for external/unindexed sources.
+ * Document card rendered once the globalsearch ES lookup (by document URL)
+ * resolves as the full Navigator catalogue card.
+ *
+ * If the document is not found in Elasticsearch (or lookup fails), no card
+ * is displayed.
  */
-const DocumentCard = memo(function DocumentCard({ source, index }) {
-  if (!source || typeof source !== 'object' || !source.semantic_identifier) {
+const EnhancedDocCard = memo(function EnhancedDocCard({ source }) {
+  const { result } = useCatalogueDoc(source?.link);
+
+  if (!result) {
     return null;
   }
-  const {
-    semantic_identifier: rawTitle,
-    blurb,
-    updated_at,
-    source_type,
-    link,
-  } = source;
-  const isWeb = source_type === 'web';
-  const title = cleanDocumentTitle(rawTitle);
-  const formattedDate = formatDate(updated_at);
-  const typeLabel = isWeb ? 'Web' : 'Document';
 
   return (
-    <div className="catalogue-chat-navigator-card">
-      <div className="navigator-catalogue-item">
-        <div className="navigator-tool-icon large" aria-hidden="true">
-          <Icon className="ri-file-line" />
-        </div>
-
-        <div className="catalogue-item-main">
-          <div className="catalogue-item-top">
-            <div className="navigator-tool-provider">
-              {typeof index === 'number' && (
-                <span className="chat-citation">{index} </span>
-              )}
-              {typeLabel}
-            </div>
-            {formattedDate && (
-              <span className="catalogue-date">{formattedDate}</span>
-            )}
-          </div>
-
-          <div className="catalogue-item-heading">
-            <h4>
-              {link ? (
-                <ExternalLink href={link} title={title}>
-                  {title}
-                </ExternalLink>
-              ) : (
-                <span title={title}>{title}</span>
-              )}
-            </h4>
-          </div>
-
-          {blurb && <p className="catalogue-description">{blurb}</p>}
-
-          <div className="catalogue-item-footer">
-            <div className="catalogue-meta license-type">
-              <span className="catalogue-type">Type: {typeLabel}</span>
-            </div>
-
-            <div className="catalogue-actions">
-              {link && (
-                <ExternalLink
-                  href={link}
-                  className="ui button primary icon"
-                  labelPosition="left"
-                >
-                  View
-                  <Icon className="ri-arrow-right-line" />
-                </ExternalLink>
-              )}
-            </div>
-          </div>
+    <DocCardErrorBoundary fallback={null}>
+      <div className="catalogue-chat-card-inline">
+        <div className="catalogue-chat-navigator-card">
+          <NavigatorCatalogueCardItem result={result} />
         </div>
       </div>
-    </div>
+    </DocCardErrorBoundary>
   );
 }, sourcePropsEqual);
 
-/**
- * Document card that upgrades itself: while it has only the Onyx-provided
- * fields it renders the basic `DocumentCard`; once the globalsearch ES
- * lookup (by document URL) resolves it re-renders as the full Navigator
- * catalogue card.
- *
- * Memoized: the answer markdown is re-rendered on every streaming tick, but
- * the (already-shown, potentially heavy) card should only re-render when its
- * own data changes, not on every tick. Its own basic→full upgrade is driven
- * by internal state, which still re-renders it exactly once.
- */
-const EnhancedDocCard = memo(function EnhancedDocCard({ source, index }) {
-  const { result } = useCatalogueDoc(source?.link);
-
-  if (result) {
-    return (
-      <div className="catalogue-chat-navigator-card">
-        <NavigatorCatalogueCardItem result={result} />
-      </div>
-    );
-  }
-  return <DocumentCard source={source} index={index} />;
-}, sourcePropsEqual);
-
 /**
  * Inline document card, rendered in the message text where the assistant
  * emitted a `![[doc: Title]]` marker (see docCards.js). Tries to match the
@@ -204,11 +123,7 @@ export function InlineDocCard({ title, documents = [] }) {
     source_type: doc?.source_type,
     link: doc?.link,
   };
-  return (
-    <div className="catalogue-chat-card-inline">
-      <EnhancedDocCard source={source} />
-    </div>
-  );
+  return <EnhancedDocCard source={source} />;
 }
 
 /**

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

@@ -1,10 +1,16 @@
 import React from 'react';
 import '@testing-library/jest-dom';
-import { cleanup, render, screen } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 
 import { ChatMessageContext } from '@eeacms/volto-eea-chatbot/ChatBlock/chat';
 import { useCatalogueDoc } from './useCatalogueDoc';
-import { CcaDocCard, InlineDocCard } from './DocumentCard';
+import {
+  CcaDocCard,
+  DocCardErrorBoundary,
+  InlineDocCard,
+  cleanDocumentTitle,
+  matchesDocumentTitle,
+} from './DocumentCard';
 
 jest.mock('@eeacms/volto-eea-chatbot/ChatBlock/chat', () => ({
   ChatMessageContext:
@@ -12,14 +18,20 @@ jest.mock('@eeacms/volto-eea-chatbot/ChatBlock/chat', () => ({
     require('react').createContext(null),
 }));
 
+let mockNavigatorShouldThrow = false;
+
 jest.mock(
   '@eeacms/volto-cca-policy/components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem',
-  () =>
-    ({ result }) => <div data-testid="navigator-card" />,
+  () => (props) => {
+    if (mockNavigatorShouldThrow) {
+      throw new RangeError('Invalid time value');
+    }
+    return <div data-testid="navigator-card" />;
+  },
 );
 
 jest.mock('./useCatalogueDoc', () => ({
-  useCatalogueDoc: jest.fn(() => ({ result: null, loading: true })),
+  useCatalogueDoc: jest.fn(() => ({ result: null, loading: false })),
 }));
 
 const doc = {
@@ -30,66 +42,75 @@ const doc = {
   link: 'https://example.com/france-nas',
 };
 
-const webDoc = {
-  semantic_identifier: 'Some Web Source',
-  blurb: 'A web page.',
-  updated_at: '2023-05-01T00:00:00Z',
-  source_type: 'web',
-  link: 'https://example.com/web',
-};
+describe('cleanDocumentTitle', () => {
+  it('strips pipe-separated suffixes', () => {
+    expect(
+      cleanDocumentTitle('Climate policy radar | Tools | Something else'),
+    ).toBe('Climate policy radar');
+  });
 
-describe('InlineDocCard', () => {
-  beforeEach(() => {
-    useCatalogueDoc.mockReset();
-    useCatalogueDoc.mockReturnValue({ result: null, loading: true });
+  it('returns trimmed title when no pipe is present', () => {
+    expect(cleanDocumentTitle('  Some Title  ')).toBe('Some Title');
   });
 
-  it('renders a basic card with the marker title when no document matches', () => {
-    render(<InlineDocCard title="Unknown Title" documents={[doc]} />);
-    expect(screen.getByText('Unknown Title')).toBeInTheDocument();
-    expect(screen.getByText('Document')).toBeInTheDocument();
-    expect(screen.queryByText('The French NAS.')).not.toBeInTheDocument();
+  it('handles null and undefined gracefully', () => {
+    expect(cleanDocumentTitle(null)).toBe('');
+    expect(cleanDocumentTitle(undefined)).toBe('');
+    expect(cleanDocumentTitle(123)).toBe('');
   });
+});
 
-  it('matches the title case-insensitively and enriches with the document metadata', () => {
-    render(
-      <InlineDocCard
-        title="  france: NATIONAL adaptation strategy  "
-        documents={[doc]}
-      />,
-    );
-    expect(screen.getByText('The French NAS.')).toBeInTheDocument();
-    expect(screen.getByText('01 May 23')).toBeInTheDocument();
+describe('matchesDocumentTitle', () => {
+  it('matches identical titles', () => {
+    expect(matchesDocumentTitle('Same Title', 'Same Title')).toBe(true);
   });
 
-  it('renders the title as a link for web documents', () => {
-    render(<InlineDocCard title="Some Web Source" documents={[webDoc]} />);
-    const link = screen.getByRole('link', { name: 'Some Web Source' });
-    expect(link).toHaveAttribute('href', 'https://example.com/web');
-    expect(link).toHaveAttribute('target', '_blank');
-    expect(screen.getByText('Web')).toBeInTheDocument();
+  it('matches case-insensitively and with trimmed whitespace', () => {
+    expect(matchesDocumentTitle('  Title One  ', 'title one')).toBe(true);
   });
 
-  it('omits the date when updated_at is missing or invalid', () => {
-    const noDate = { ...doc, updated_at: undefined };
-    render(
-      <InlineDocCard title={doc.semantic_identifier} documents={[noDate]} />,
-    );
-    expect(screen.queryByText('01 May 23')).not.toBeInTheDocument();
-    cleanup();
+  it('matches noisy document titles with clean search titles', () => {
+    expect(
+      matchesDocumentTitle(
+        'Nature DEMO | Tools | Discover the key services',
+        'Nature DEMO',
+      ),
+    ).toBe(true);
+  });
 
-    const badDate = { ...doc, updated_at: 'not-a-date' };
-    render(
-      <InlineDocCard title={doc.semantic_identifier} documents={[badDate]} />,
+  it('returns false for non-matching or empty titles', () => {
+    expect(matchesDocumentTitle('Alpha', 'Beta')).toBe(false);
+    expect(matchesDocumentTitle(null, 'Beta')).toBe(false);
+    expect(matchesDocumentTitle('Alpha', '')).toBe(false);
+  });
+});
+
+describe('InlineDocCard', () => {
+  beforeEach(() => {
+    useCatalogueDoc.mockReset();
+    useCatalogueDoc.mockReturnValue({ result: null, loading: false });
+  });
+
+  it('renders nothing when no document matches', () => {
+    const { container } = render(
+      <InlineDocCard title="Unknown Title" documents={[doc]} />,
     );
-    expect(screen.queryByText('01 May 23')).not.toBeInTheDocument();
-    cleanup();
+    expect(container.firstChild).toBeNull();
+  });
 
-    render(<InlineDocCard title={doc.semantic_identifier} documents={[]} />);
-    expect(screen.getByText(doc.semantic_identifier)).toBeInTheDocument();
+  it('renders nothing when ES lookup returns empty (not found in ES)', () => {
+    useCatalogueDoc.mockReturnValue({
+      result: null,
+      loading: false,
+    });
+    const { container } = render(
+      <InlineDocCard title={doc.semantic_identifier} documents={[doc]} />,
+    );
+    expect(container.firstChild).toBeNull();
+    expect(screen.queryByTestId('navigator-card')).not.toBeInTheDocument();
   });
 
-  it('upgrades to the full Navigator card once the ES lookup resolves', () => {
+  it('renders the Navigator card once the ES lookup resolves with a document', () => {
     useCatalogueDoc.mockReturnValue({
       result: { found: true, uid: 'https://example.com/france-nas' },
       loading: false,
@@ -99,55 +120,123 @@ describe('InlineDocCard', () => {
     expect(useCatalogueDoc).toHaveBeenCalledWith(doc.link);
   });
 
-  it('cleans pipeline title noise and matches cleanly', () => {
+  it('matches title case-insensitively and renders card when ES lookup resolves', () => {
+    useCatalogueDoc.mockReturnValue({
+      result: { found: true, uid: 'https://example.com/france-nas' },
+      loading: false,
+    });
+    render(
+      <InlineDocCard
+        title="  france: NATIONAL adaptation strategy  "
+        documents={[doc]}
+      />,
+    );
+    expect(screen.getByTestId('navigator-card')).toBeInTheDocument();
+    expect(useCatalogueDoc).toHaveBeenCalledWith(doc.link);
+  });
+
+  it('cleans pipeline title noise and matches cleanly when ES lookup resolves', () => {
     const noisyDoc = {
       ...doc,
       semantic_identifier:
         'Climate policy radar | Tools | Discover the key services, thematic features and tools of Climate-ADAPT Climate-ADAPT',
     };
+    useCatalogueDoc.mockReturnValue({
+      result: { found: true, uid: doc.link },
+      loading: false,
+    });
     render(
       <InlineDocCard title="Climate policy radar" documents={[noisyDoc]} />,
     );
-    expect(screen.getByText('Climate policy radar')).toBeInTheDocument();
-    expect(screen.getByText('The French NAS.')).toBeInTheDocument();
-  });
-
-  it('renders a View button when link is present', () => {
-    render(<InlineDocCard title="Some Web Source" documents={[webDoc]} />);
-    const viewButton = screen.getByRole('link', { name: 'View' });
-    expect(viewButton).toHaveAttribute('href', 'https://example.com/web');
-    expect(viewButton).toHaveClass('ui button primary icon');
+    expect(screen.getByTestId('navigator-card')).toBeInTheDocument();
+    expect(useCatalogueDoc).toHaveBeenCalledWith(doc.link);
   });
 
-  it('calls the lookup with the document link (or undefined) from the card', () => {
-    useCatalogueDoc.mockReturnValue({ result: null, loading: true });
-    render(<InlineDocCard title="No Match" documents={[]} />);
+  it('calls useCatalogueDoc with undefined when no match is found, rendering nothing', () => {
+    const { container } = render(
+      <InlineDocCard title="No Match" documents={[]} />,
+    );
     expect(useCatalogueDoc).toHaveBeenCalledWith(undefined);
+    expect(container.firstChild).toBeNull();
   });
 });
 
 describe('CcaDocCard', () => {
-  it('matches the marker against the owning message documents via context', () => {
+  beforeEach(() => {
+    useCatalogueDoc.mockReset();
+    useCatalogueDoc.mockReturnValue({ result: null, loading: false });
+  });
+
+  it('matches the marker against owning message documents and renders when ES resolves', () => {
+    useCatalogueDoc.mockReturnValue({
+      result: { found: true, uid: doc.link },
+      loading: false,
+    });
     render(
       <ChatMessageContext.Provider value={{ documents: [doc] }}>
         <CcaDocCard title={doc.semantic_identifier} />
       </ChatMessageContext.Provider>,
     );
-    expect(screen.getByText('The French NAS.')).toBeInTheDocument();
+    expect(screen.getByTestId('navigator-card')).toBeInTheDocument();
   });
 
-  it('falls back to the basic card when the message context is absent', () => {
-    render(<CcaDocCard title={doc.semantic_identifier} />);
-    expect(screen.getByText(doc.semantic_identifier)).toBeInTheDocument();
-    expect(screen.queryByText('The French NAS.')).not.toBeInTheDocument();
+  it('renders nothing when message context is absent', () => {
+    const { container } = render(
+      <CcaDocCard title={doc.semantic_identifier} />,
+    );
+    expect(container.firstChild).toBeNull();
   });
 
-  it('falls back to the basic card when the message has no documents', () => {
-    render(
+  it('renders nothing when message has no documents', () => {
+    const { container } = render(
       <ChatMessageContext.Provider value={{ documents: [] }}>
         <CcaDocCard title={doc.semantic_identifier} />
       </ChatMessageContext.Provider>,
     );
-    expect(screen.queryByText('The French NAS.')).not.toBeInTheDocument();
+    expect(container.firstChild).toBeNull();
+  });
+
+  it('renders nothing when the rich catalogue card throws an error (caught by error boundary)', () => {
+    const warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
+
+    useCatalogueDoc.mockReturnValue({
+      result: { title: 'Crashing Tool' },
+      loading: false,
+    });
+
+    mockNavigatorShouldThrow = true;
+
+    try {
+      const { container } = render(
+        <ChatMessageContext.Provider value={{ documents: [doc] }}>
+          <CcaDocCard title={doc.semantic_identifier} />
+        </ChatMessageContext.Provider>,
+      );
+
+      expect(container.firstChild).toBeNull();
+      expect(warnSpy).toHaveBeenCalled();
+    } finally {
+      mockNavigatorShouldThrow = false;
+      warnSpy.mockRestore();
+    }
+  });
+});
+
+describe('DocCardErrorBoundary', () => {
+  it('renders custom fallback when provided and an error occurs', () => {
+    const warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
+    const ThrowingComponent = () => {
+      throw new Error('Test error');
+    };
+
+    const { getByText } = render(
+      <DocCardErrorBoundary fallback={<div>Fallback Content</div>}>
+        <ThrowingComponent />
+      </DocCardErrorBoundary>,
+    );
+
+    expect(getByText('Fallback Content')).toBeInTheDocument();
+    expect(warnSpy).toHaveBeenCalled();
+    warnSpy.mockRestore();
   });
 });