@eeacms/volto-cca-policy 0.3.85 → 0.3.87

package/CHANGELOG.md

@@ -4,7 +4,7 @@ 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).
 
-### [0.3.85](https://github.com/eea/volto-cca-policy/compare/1.0.0-alpha.1...0.3.85) - 14 October 2025
+### [0.3.87](https://github.com/eea/volto-cca-policy/compare/1.0.0-alpha.1...0.3.87) - 10 November 2025
 
 #### :rocket: Dependency updates
 
@@ -14,6 +14,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :bug: Bug Fixes
 
+- fix(tests): increase code coverage [kreafox - [`66cd2b3`](https://github.com/eea/volto-cca-policy/commit/66cd2b39a9b7b026c171d99e2bf3b8a47b7cddd2)]
+- fix(tests): update hyperlink text in PlanningTab [kreafox - [`05080e0`](https://github.com/eea/volto-cca-policy/commit/05080e0727730a5fe7c67d884ad6453eaf82081a)]
+- fix(mission): adjust margins for nested lists and accordion padding [kreafox - [`1abf18f`](https://github.com/eea/volto-cca-policy/commit/1abf18fabe9efffa552ed2e6a8b57f9b1d59f7a6)]
+- fix(mission): improve URL extraction logic - refs #291190 [kreafox - [`8e4c6e4`](https://github.com/eea/volto-cca-policy/commit/8e4c6e42dc35b4c940c39f9f25d587f66d0b242d)]
 - fix(mission): fix assessment risk numbering to match sorted order [kreafox - [`9ecea88`](https://github.com/eea/volto-cca-policy/commit/9ecea885394f1ae6ad63ffb03d8a10cd706caffb)]
 - fix: duplicated code - make ItemsSection reusable [kreafox - [`52e2625`](https://github.com/eea/volto-cca-policy/commit/52e2625914f699c194f75d561f97959ab6c21fbf)]
 - fix: add missing props for title block [kreafox - [`1d8efa0`](https://github.com/eea/volto-cca-policy/commit/1d8efa0136960261196e7585f89f4ff7db75ae17)]
@@ -21,6 +25,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :nail_care: Enhancements
 
+- change(mission): update download fields for CSV export for mission funding search - refs #293691 [kreafox - [`7451c66`](https://github.com/eea/volto-cca-policy/commit/7451c6698a4160e580e39cb4b38a87cf38dd49d8)]
+- change(mission): add third level for sectors and hazards - refs #291189 [kreafox - [`5cf352c`](https://github.com/eea/volto-cca-policy/commit/5cf352ce46284b3cbd106276b60a1d4fea89235d)]
+- refactor(mission): simplify sector rendering logic in Action tab [kreafox - [`8413ccc`](https://github.com/eea/volto-cca-policy/commit/8413cccfd67e9a598f88474b8a034e7998063d23)]
 - change(mission): improve AccordionList [kreafox - [`cf1497f`](https://github.com/eea/volto-cca-policy/commit/cf1497ff50ff45cdb0bb8e995683969bb3e3c065)]
 - refactor(mission): remove unnecessary line breaks and simplify message rendering - refs #291190 [kreafox - [`430a123`](https://github.com/eea/volto-cca-policy/commit/430a12371b6e1c6a77ea65b6a434eda883568c64)]
 - refactor(mission): use ItemsSection in PlanningTab - refs #291190 [kreafox - [`9e96aaa`](https://github.com/eea/volto-cca-policy/commit/9e96aaac0686f6688b3406aca578b598882a9c29)]
@@ -40,6 +47,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- test: try to use specific version for plone-backend [kreafox - [`79c542e`](https://github.com/eea/volto-cca-policy/commit/79c542e8d55d2f1663b768c555880599634ae527)]
 - test(mission): add unit tests for NoDataReported and StatisticSection components [kreafox - [`36c6e36`](https://github.com/eea/volto-cca-policy/commit/36c6e36278124759240c896786f2ac0c20674730)]
 - test: resolve Jest errors in component tests [kreafox - [`6dbb735`](https://github.com/eea/volto-cca-policy/commit/6dbb73540e8301fcb42a4d52db7004f5a42db4d8)]
 - test: fix PlanningTab mock data to match component structure [kreafox - [`48e76e1`](https://github.com/eea/volto-cca-policy/commit/48e76e1e50e0c6d8a6a500fec3d1831419faeee9)]
@@ -129,8 +137,39 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Add some loadable for components [Tiberiu Ichim - [`1793962`](https://github.com/eea/volto-cca-policy/commit/179396211c66a6a2465b2d1b6c0f2afc40fc7189)]
 - Refs #284961 - test [Tripon Eugen - [`c989f1f`](https://github.com/eea/volto-cca-policy/commit/c989f1f8638c0c5233c5c49f8673c9a2cdc7937e)]
 - Refs #284961 - add translations [Tripon Eugen - [`04ee988`](https://github.com/eea/volto-cca-policy/commit/04ee988c086d393b9b37ce1ea8d24f5e84f266aa)]
-### [1.0.0-alpha.0](https://github.com/eea/volto-cca-policy/compare/0.3.84...1.0.0-alpha.0) - 15 July 2025
+### [1.0.0-alpha.0](https://github.com/eea/volto-cca-policy/compare/0.3.86...1.0.0-alpha.0) - 15 July 2025
 
+### [0.3.86](https://github.com/eea/volto-cca-policy/compare/0.3.85...0.3.86) - 31 October 2025
+
+#### :bug: Bug Fixes
+
+- fix(tests): increase code coverage [kreafox - [`66cd2b3`](https://github.com/eea/volto-cca-policy/commit/66cd2b39a9b7b026c171d99e2bf3b8a47b7cddd2)]
+- fix(tests): update hyperlink text in PlanningTab [kreafox - [`05080e0`](https://github.com/eea/volto-cca-policy/commit/05080e0727730a5fe7c67d884ad6453eaf82081a)]
+- fix(mission): adjust margins for nested lists and accordion padding [kreafox - [`1abf18f`](https://github.com/eea/volto-cca-policy/commit/1abf18fabe9efffa552ed2e6a8b57f9b1d59f7a6)]
+- fix(mission): improve URL extraction logic - refs #291190 [kreafox - [`8e4c6e4`](https://github.com/eea/volto-cca-policy/commit/8e4c6e42dc35b4c940c39f9f25d587f66d0b242d)]
+
+#### :nail_care: Enhancements
+
+- change(mission): add third level for sectors and hazards - refs #291189 [kreafox - [`5cf352c`](https://github.com/eea/volto-cca-policy/commit/5cf352ce46284b3cbd106276b60a1d4fea89235d)]
+- refactor(mission): simplify sector rendering logic in Action tab [kreafox - [`8413ccc`](https://github.com/eea/volto-cca-policy/commit/8413cccfd67e9a598f88474b8a034e7998063d23)]
+
+#### :hammer_and_wrench: Others
+
+- test: try to use specific version for plone-backend [kreafox - [`79c542e`](https://github.com/eea/volto-cca-policy/commit/79c542e8d55d2f1663b768c555880599634ae527)]
+### [0.3.85](https://github.com/eea/volto-cca-policy/compare/0.3.84...0.3.85) - 14 October 2025
+
+#### :bug: Bug Fixes
+
+- fix(mission): fix assessment risk numbering to match sorted order [kreafox - [`9ecea88`](https://github.com/eea/volto-cca-policy/commit/9ecea885394f1ae6ad63ffb03d8a10cd706caffb)]
+
+#### :nail_care: Enhancements
+
+- change(mission): improve AccordionList [kreafox - [`cf1497f`](https://github.com/eea/volto-cca-policy/commit/cf1497ff50ff45cdb0bb8e995683969bb3e3c065)]
+- refactor(mission): remove unnecessary line breaks and simplify message rendering - refs #291190 [kreafox - [`430a123`](https://github.com/eea/volto-cca-policy/commit/430a12371b6e1c6a77ea65b6a434eda883568c64)]
+
+#### :hammer_and_wrench: Others
+
+- test(mission): add unit tests for NoDataReported and StatisticSection components [kreafox - [`36c6e36`](https://github.com/eea/volto-cca-policy/commit/36c6e36278124759240c896786f2ac0c20674730)]
 ### [0.3.84](https://github.com/eea/volto-cca-policy/compare/0.3.83...0.3.84) - 7 October 2025
 
 #### :bug: Bug Fixes

package/package.json

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

package/src/components/theme/ImageGallery/ImageGallery.test.jsx

@@ -2,7 +2,12 @@ import '@testing-library/jest-dom';
 import { render, screen, fireEvent } from '@testing-library/react';
 import ImageGallery from './ImageGallery';
 
-jest.mock('react-slick', () => (props) => <div>React Slick Gallery</div>);
+jest.mock('react-slick', () => {
+  const React = require('react');
+  return React.forwardRef((props, ref) => (
+    <div ref={ref}>React Slick Gallery</div>
+  ));
+});
 
 const mockItems = [
   {

package/src/components/theme/MissionSignatoryProfile/ItemsSection.test.jsx

@@ -0,0 +1,70 @@
+import '@testing-library/jest-dom';
+import { render, screen } from '@testing-library/react';
+import ItemsSection from './ItemsSection';
+import defaultImage from '@eeacms/volto-cca-policy/../theme/assets/images/image-narrow.svg';
+
+jest.mock('@eeacms/volto-cca-policy/utils', () => ({
+  normalizeImageFileName: (filename) => filename?.toLowerCase() || '',
+}));
+
+describe('ItemsSection', () => {
+  it('renders nothing when items is empty or undefined', () => {
+    const { container, rerender } = render(<ItemsSection items={[]} />);
+    expect(container.firstChild).toBeNull();
+
+    rerender(<ItemsSection />);
+    expect(container.firstChild).toBeNull();
+  });
+
+  it('renders default image when item has no icon', () => {
+    const mockItems = [{ Sector: 'Water' }];
+    render(<ItemsSection items={mockItems} field="Sector" iconPath="sector" />);
+
+    const image = screen.getByRole('img');
+    expect(image).toHaveAttribute('src', defaultImage);
+    expect(screen.getByText('Water')).toBeInTheDocument();
+  });
+
+  it('renders custom image when icon is provided', () => {
+    const mockItems = [{ Sector: 'Energy', Icon: 'Solar' }];
+    render(<ItemsSection items={mockItems} field="Sector" iconPath="sector" />);
+
+    const image = screen.getByRole('img');
+    expect(image).toHaveAttribute(
+      'src',
+      '/en/mission/icons/signatory-reporting/sector/solar/@@images/image',
+    );
+    expect(screen.getByText('Energy')).toBeInTheDocument();
+  });
+
+  it('applies "column" class when more than 3 items exist', () => {
+    const mockItems = [
+      { Sector: 'Water' },
+      { Sector: 'Energy' },
+      { Sector: 'Agriculture' },
+      { Sector: 'Transport' },
+    ];
+
+    const { container } = render(
+      <ItemsSection items={mockItems} field="Sector" iconPath="sector" />,
+    );
+
+    const group = container.querySelector('.items-group');
+    expect(group).toHaveClass('column');
+  });
+
+  it('does not apply "column" class when 3 or fewer items', () => {
+    const mockItems = [
+      { Sector: 'Water' },
+      { Sector: 'Energy' },
+      { Sector: 'Agriculture' },
+    ];
+
+    const { container } = render(
+      <ItemsSection items={mockItems} field="Sector" iconPath="sector" />,
+    );
+
+    const group = container.querySelector('.items-group');
+    expect(group).not.toHaveClass('column');
+  });
+});

package/src/components/theme/MissionSignatoryProfile/TabSections/ActionTab.jsx

@@ -1,4 +1,3 @@
-import { useLocation } from 'react-router-dom';
 import { Tab, Grid } from 'semantic-ui-react';
 import { Callout } from '@eeacms/volto-eea-design-system/ui';
 import { HTMLField } from '@eeacms/volto-cca-policy/helpers';
@@ -8,15 +7,10 @@ import NoDataReported from '../NoDataReported';
 import ItemsSection from '../ItemsSection';
 
 const ActionTabContent = ({ action }) => {
-  const location = useLocation();
   const hasHazards = action?.Climate_Hazards?.length > 0;
   const hasSectors = action?.Sectors?.length > 0;
   const hasBenefits = action?.Co_Benefits?.length > 0;
 
-  const isSandbox = location.pathname.includes(
-    '/mission/sandbox/eea-sandbox/signatory-reporting',
-  );
-
   return (
     <>
       <Grid columns="12">
@@ -34,7 +28,8 @@ const ActionTabContent = ({ action }) => {
           {hasSectors && (
             <>
               <h5 className="small-label">{action.Sectors_Label}</h5>
-              {isSandbox ? (
+
+              {action.Sectors.some((s) => s.Icon) ? (
                 <ItemsSection
                   items={action.Sectors}
                   field="Sector"

package/src/components/theme/MissionSignatoryProfile/TabSections/AssessmentTab.jsx

@@ -110,18 +110,52 @@ const AssessmentTab = ({ result, general_text }) => {
 
       <br />
 
-      {assessment_hazards_sectors.length > 0 && (
+      {assessment_hazards_sectors?.length > 0 && (
         <AccordionList
-          accordions={assessment_hazards_sectors.map((category) => ({
-            title: category.Hazard,
-            content: (
-              <ul>
-                {category.Sectors.map((sector, idx) => (
-                  <li key={idx}>{sector}</li>
-                ))}
-              </ul>
-            ),
-          }))}
+          accordions={assessment_hazards_sectors.flatMap((item) => {
+            // Beta data (Category > Hazards > Sectors)
+            if (item.Category && Array.isArray(item.Hazards)) {
+              return [
+                {
+                  title: item.Category,
+                  content: (
+                    <ul>
+                      {item.Hazards.map((hazard, index) => (
+                        <li key={index}>
+                          <strong>{hazard.Hazard}</strong>
+                          {Array.isArray(hazard.Sectors) &&
+                            hazard.Sectors.length > 0 && (
+                              <ul>
+                                {hazard.Sectors.map((sector, sIndex) => (
+                                  <li key={sIndex}>{sector}</li>
+                                ))}
+                              </ul>
+                            )}
+                        </li>
+                      ))}
+                    </ul>
+                  ),
+                },
+              ];
+            }
+
+            // Production data (Category=null but has Hazards array)
+            if (item.Category === null && Array.isArray(item.Hazards)) {
+              return item.Hazards.map((hazard) => ({
+                title: hazard.Hazard,
+                content: (
+                  <ul>
+                    {Array.isArray(hazard.Sectors) &&
+                      hazard.Sectors.map((sector, index) => (
+                        <li key={index}>{sector}</li>
+                      ))}
+                  </ul>
+                ),
+              }));
+            }
+
+            return [];
+          })}
         />
       )}
     </Tab.Pane>

package/src/components/theme/MissionSignatoryProfile/TabSections/AssessmentTab.test.jsx

@@ -6,6 +6,14 @@ jest.mock('@eeacms/volto-eea-design-system/ui', () => ({
   Callout: ({ children }) => <div>{children}</div>,
 }));
 
+jest.mock('@eeacms/volto-cca-policy/helpers', () => ({
+  HTMLField: ({ value }) => <div>{value.data}</div>,
+}));
+
+jest.mock('../NoDataReported', () => ({ label }) => (
+  <div data-testid="no-data">{label}</div>
+));
+
 jest.mock('@eeacms/volto-cca-policy/utils', () => ({
   isEmpty: (arr) => !arr || arr.length === 0,
   formatTextToHTML: (text) => text,
@@ -38,13 +46,28 @@ const mockData = {
       Please_Explain: 'Explanation content here.',
     },
   ],
+  assessment_hazards_sectors: [
+    {
+      Category: 'Water Management',
+      Hazards: [
+        { Hazard: 'Flooding', Sectors: ['Agriculture', 'Health'] },
+        { Hazard: 'Drought', Sectors: ['Energy'] },
+      ],
+    },
+    {
+      Category: null,
+      Hazards: [
+        { Hazard: 'Storms', Sectors: ['Transport', 'Tourism'] },
+        { Hazard: 'Heatwaves', Sectors: ['Health'] },
+      ],
+    },
+  ],
 };
 
 describe('AssessmentTab', () => {
-  it('renders core sections and nested tabs', () => {
+  it('renders all major sections correctly', () => {
     render(<AssessmentTab result={mockData} />);
 
-    // General headings
     expect(screen.getByText('Assessment Title')).toBeInTheDocument();
     expect(screen.getByText('Assessment Subheading')).toBeInTheDocument();
     expect(
@@ -56,8 +79,54 @@ describe('AssessmentTab', () => {
     expect(screen.getByText('Hazards')).toBeInTheDocument();
     expect(screen.getByText('Hazards abstract text.')).toBeInTheDocument();
 
-    // Items section
     expect(screen.getByText('Factor A')).toBeInTheDocument();
     expect(screen.getByText('Factor B')).toBeInTheDocument();
   });
+
+  it('renders assessment risks accordion with link and details', () => {
+    render(<AssessmentTab result={mockData} />);
+
+    expect(
+      screen.getByText('1. Risk Attachment Title - 2023'),
+    ).toBeInTheDocument();
+
+    expect(screen.getByText('Explore this risk')).toBeInTheDocument();
+    expect(screen.getByText('Details')).toBeInTheDocument();
+    expect(screen.getByText('Explanation content here.')).toBeInTheDocument();
+
+    const link = screen.getByRole('link', { name: 'Explore this risk' });
+    expect(link).toHaveAttribute('href', 'https://example.com');
+  });
+
+  it('renders beta-style hazards (Category > Hazard > Sector)', () => {
+    render(<AssessmentTab result={mockData} />);
+
+    expect(screen.getByText('Water Management')).toBeInTheDocument();
+    expect(screen.getByText('Flooding')).toBeInTheDocument();
+    expect(screen.getByText('Drought')).toBeInTheDocument();
+
+    expect(screen.getByText('Agriculture')).toBeInTheDocument();
+    expect(screen.getAllByText('Health').length).toBeGreaterThanOrEqual(1);
+    expect(screen.getByText('Energy')).toBeInTheDocument();
+  });
+
+  it('renders production-style hazards (Hazard > Sectors)', () => {
+    render(<AssessmentTab result={mockData} />);
+
+    expect(screen.getByText('Storms')).toBeInTheDocument();
+    expect(screen.getByText('Heatwaves')).toBeInTheDocument();
+    expect(screen.getByText('Transport')).toBeInTheDocument();
+    expect(screen.getByText('Tourism')).toBeInTheDocument();
+    expect(screen.getAllByText('Health').length).toBeGreaterThanOrEqual(1);
+  });
+
+  it('renders NoDataReported when no data available', () => {
+    render(
+      <AssessmentTab
+        result={{}}
+        general_text={{ No_Data_Reported_Label: 'No info' }}
+      />,
+    );
+    expect(screen.getByTestId('no-data')).toHaveTextContent('No info');
+  });
 });

package/src/components/theme/MissionSignatoryProfile/TabSections/PlanningTab.jsx

@@ -159,27 +159,27 @@ const PlanningTab = ({ result, general_text }) => {
             </p>
           )}
 
-          {action?.Name_Of_Plan_And_Hyperlink && (
-            <p>
-              {(() => {
-                const { name, url } = extractPlanNameAndURL(
-                  action.Name_Of_Plan_And_Hyperlink,
-                );
-                return url ? (
-                  <a href={url} title={name} target="_blank" rel="noreferrer">
-                    <strong>
-                      {action.Further_Information_Link_Text}
-                      {name && ` [${name}]`}
-                    </strong>
+          {(() => {
+            const { url } = extractPlanNameAndURL(
+              action?.Name_Of_Plan_And_Hyperlink,
+            );
+
+            if (url && action?.Further_Information_Link_Text) {
+              return (
+                <p>
+                  <a href={url} target="_blank" rel="noreferrer">
+                    <strong>{action.Further_Information_Link_Text}</strong>
                   </a>
-                ) : null;
-              })()}
-            </p>
-          )}
+                </p>
+              );
+            }
+
+            return null;
+          })()}
 
           {action?.Attachment && (
             <p>
-              <a href={action.Attachment}>
+              <a href={action.Attachment} target="_blank" rel="noreferrer">
                 <strong>{action.Explore_Plan_Link_Text}</strong>
               </a>
             </p>

package/src/components/theme/MissionSignatoryProfile/TabSections/PlanningTab.test.jsx

@@ -105,7 +105,7 @@ describe('PlanningTab', () => {
   it('renders hyperlink with extracted name and URL', () => {
     const { getByText } = render(<PlanningTab result={mockResult} />);
 
-    const link = getByText(/More Info \[Plan Example\]/);
+    const link = getByText('More Info');
     expect(link).toBeInTheDocument();
     expect(link.closest('a')).toHaveAttribute('href', 'https://plan-link.com');
   });

package/src/constants.js

@@ -21,6 +21,73 @@ export const download_fields = [
   { field: 'cca_partner_contributors', name: 'Observatory impacts' },
 ];
 
+export const download_mission_funding_fields = [
+  { field: 'about', name: 'About' },
+  { field: 'title', name: 'Title' },
+  { field: 'created', name: 'Creation Date' },
+  { field: 'issued', name: 'Issued Date' },
+  {
+    field: 'cca_objective_funding_programme',
+    name: 'Objective of the funding programme',
+  },
+  {
+    field: 'cca_funding_type',
+    name: 'Type of funding',
+  },
+  {
+    field: 'cca_funding_rate',
+    name: 'Funding rate (percentage of covered costs)',
+  },
+  {
+    field: 'cca_budget_range',
+    name: 'Expected budget range of proposals',
+  },
+  {
+    field: 'cca_is_blended',
+    name: 'Can the received funding be combined with other funding sources (blended)?',
+  },
+  {
+    field: 'cca_is_consortium_required',
+    name: 'Is a Consortium required to apply for the funding?',
+  },
+  {
+    field: 'cca_administering_authority',
+    name: 'Administering authority',
+  },
+  {
+    field: 'cca_publication_page',
+    name: 'Publication page',
+  },
+  {
+    field: 'cca_general_information',
+    name: 'General information',
+  },
+  {
+    field: 'cca_further_information',
+    name: 'Further information',
+  },
+  {
+    field: 'spatial',
+    name: 'Countries where the funding opportunity is offered',
+  },
+  {
+    field: 'cca_funding_region',
+    name: 'Region where the funding is offered',
+  },
+  {
+    field: 'cca_rast_steps',
+    name: 'RAST step(s) of relevance',
+  },
+  {
+    field: 'cca_eligible_entities',
+    name: 'Eligible to receive funding',
+  },
+  {
+    field: 'cca_adaptation_sectors',
+    name: 'Adaptation Sectors',
+  },
+];
+
 export const eea_languages = [
   { name: 'български', code: 'bg' },
   { name: 'Español', code: 'es' },

package/src/search/mission_funding/config-funding.js

@@ -1,5 +1,6 @@
 import { mergeConfig } from '@eeacms/search';
 import { getClientProxyAddress } from '../utils';
+import { download_mission_funding_fields } from '../../constants';
 
 import facets from './facets-funding';
 
@@ -29,6 +30,9 @@ export default function installMissionFundingSearch(config) {
     },
   };
 
+  config.searchui.missionFundingSearch.download_fields =
+    download_mission_funding_fields;
+
   const { missionFundingSearch } = config.searchui;
   missionFundingSearch.permanentFilters.push({
     bool: {

package/src/utils.js

@@ -113,24 +113,29 @@ const trimTrailingChars = (str) => {
 export const extractPlanNameAndURL = (text) => {
   if (!text) return { name: '', url: '' };
 
-  // Match URL inside parentheses
-  const parenthesisMatch = text.match(/\((https?:\/\/[^\s)]+)\)/);
-  // Match first direct URL not inside parentheses
-  const directMatch = text.match(/https?:\/\/[^\s,;)]+/);
-  const url = parenthesisMatch?.[1] || directMatch?.[0] || '';
+  // Match all URLs
+  const urls = text.match(/https?:\/\/[^\s,;)]+/g) || [];
 
   let name = text;
+  let url = '';
 
-  if (url) {
-    // Remove URL and any punctuation before it
-    name = name.replace(`(${url})`, '').replace(url, '');
-    name = trimTrailingChars(name).trim();
+  if (urls.length > 1) {
+    // Edge case like Rotterdam: use second URL as the actual link
+    name = text.split(urls[0])[0] || urls[0]; // name is before or equals first URL
+    url = urls[1];
+  } else {
+    const parenthesisMatch = text.match(/\((https?:\/\/[^\s)]+)\)/);
+    const directMatch = text.match(/https?:\/\/[^\s,;)]+/);
+    url = parenthesisMatch?.[1] || directMatch?.[0] || '';
+
+    if (url) {
+      name = text.replace(`(${url})`, '').replace(url, '');
+    }
   }
 
-  return {
-    name: name,
-    url,
-  };
+  name = trimTrailingChars(name).trim();
+
+  return { name, url };
 };
 
 export const isEmpty = (arr) => !Array.isArray(arr) || arr.length === 0;

package/theme/globals/mission.less

@@ -112,6 +112,11 @@ body.subsite-mkh {
       margin: 2em 0;
     }
 
+    ul > li > ul {
+      margin-top: 0.3em;
+      margin-bottom: 1em;
+    }
+
     .sectors-introduction {
       margin-top: 3em;
     }
@@ -178,6 +183,12 @@ body.subsite-mkh {
       margin-bottom: 1em;
     }
 
+    .ui.accordion {
+      .content.active {
+        padding: 1rem 1rem !important;
+      }
+    }
+
     .tab-section-wrapper {
       padding: 1.5em;
       margin: 2em 0;