@eeacms/volto-cca-policy 0.3.38 → 0.3.40

package/CHANGELOG.md

@@ -4,6 +4,39 @@ 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.40](https://github.com/eea/volto-cca-policy/compare/0.3.39...0.3.40) - 13 May 2025
+
+#### :bug: Bug Fixes
+
+- fix: tests [kreafox - [`1852df4`](https://github.com/eea/volto-cca-policy/commit/1852df43cde6f0f173fcd28d79a0576407d9b313)]
+- fix: class -> className [kreafox - [`56124bc`](https://github.com/eea/volto-cca-policy/commit/56124bc768fafcd59fc280d5ed9f8a6840969691)]
+- fix: tests [kreafox - [`4f95457`](https://github.com/eea/volto-cca-policy/commit/4f954579aed4ed94e796be0de712ab1fc025d96a)]
+
+#### :nail_care: Enhancements
+
+- change: update Assessment section to render html tags [kreafox - [`011d752`](https://github.com/eea/volto-cca-policy/commit/011d752a949ca08ece75bed5aed46103216875ba)]
+- change: update mission signatory profile templates - refs #286863, #286151 [kreafox - [`fde31e1`](https://github.com/eea/volto-cca-policy/commit/fde31e1ccb694a6109a49155010edf3fba34e512)]
+- change(view): add footer text - refs #287671 [kreafox - [`864a247`](https://github.com/eea/volto-cca-policy/commit/864a247e754117b56a42608779ea60b0da8b71e2)]
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`b301fff`](https://github.com/eea/volto-cca-policy/commit/b301fff27818a9317be2b6c4a992ddd9d1672663)]
+- style: Automated code fix [eea-jenkins - [`3aa5289`](https://github.com/eea/volto-cca-policy/commit/3aa52897989a36dae14a0f0c00f4addd233eef18)]
+
+#### :hammer_and_wrench: Others
+
+- Refs #287520 - eslint [Tripon Eugen - [`fe3883e`](https://github.com/eea/volto-cca-policy/commit/fe3883ede70439de7f42cc817f9471996ad98696)]
+- Refs #287520 - test resposition [Tripon Eugen - [`3114d1b`](https://github.com/eea/volto-cca-policy/commit/3114d1b8bb2d1017c590b1405f83cddeda5f5d35)]
+### [0.3.39](https://github.com/eea/volto-cca-policy/compare/0.3.38...0.3.39) - 9 May 2025
+
+#### :nail_care: Enhancements
+
+- change: update Assessment bottom section - refs #286757 [kreafox - [`de01613`](https://github.com/eea/volto-cca-policy/commit/de0161390443df084d058a4243492974240b0406)]
+
+#### :house: Internal changes
+
+- style: improvements [kreafox - [`f06cfb9`](https://github.com/eea/volto-cca-policy/commit/f06cfb9867963b304ac8be3cd306ca7eeb575290)]
+
 ### [0.3.38](https://github.com/eea/volto-cca-policy/compare/0.3.37...0.3.38) - 9 May 2025
 
 ### [0.3.37](https://github.com/eea/volto-cca-policy/compare/0.3.36...0.3.37) - 8 May 2025

package/package.json

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

package/src/components/manage/Blocks/CaseStudyExplorer/utils.js

@@ -47,25 +47,38 @@ export function filterCases(cases, activeFilters) {
       impacts: false,
     };
 
-    activeFilters.sectors.forEach((filter) => {
-      if (_case.properties.sectors.includes(',' + filter + ','))
-        flag.sectors = true;
-    });
-
-    activeFilters.elements.forEach((filter) => {
-      if (_case.properties.elements.includes(',' + filter + ','))
-        flag.elements = true;
-    });
-
-    activeFilters.impacts.forEach((filter) => {
-      if (_case.properties.impacts.includes(',' + filter + ','))
-        flag.impacts = true;
-    });
-
-    activeFilters.measures.forEach((filter) => {
-      if (_case.properties.ktms.includes(',' + filter + ','))
-        flag.measures = true;
-    });
+    // activeFilters.sectors.forEach((filter) => {
+    //   if (_case.properties.sectors.includes(',' + filter + ','))
+    //     flag.sectors = true;
+    // });
+    flag.sectors = activeFilters.sectors.every((sub) =>
+      _case.properties.sectors.includes(sub),
+    );
+
+    // ADAPTATION APPROACHES
+    // activeFilters.elements.forEach((filter) => {
+    //   if (_case.properties.elements.includes(',' + filter + ','))
+    //     flag.elements = true;
+    // });
+    flag.elements = activeFilters.elements.every((sub) =>
+      _case.properties.elements.includes(sub),
+    );
+
+    // activeFilters.impacts.forEach((filter) => {
+    //   if (_case.properties.impacts.includes(',' + filter + ','))
+    //     flag.impacts = true;
+    // });
+    flag.impacts = activeFilters.impacts.every((sub) =>
+      _case.properties.impacts.includes(sub),
+    );
+
+    // activeFilters.measures.forEach((filter) => {
+    //   if (_case.properties.ktms.includes(',' + filter + ','))
+    //     flag.measures = true;
+    // });
+    flag.measures = activeFilters.measures.every((sub) =>
+      _case.properties.ktms.includes(sub),
+    );
 
     return (activeFilters.sectors.length ? flag.sectors : true) &&
       (activeFilters.elements.length ? flag.elements : true) &&

package/src/components/manage/Blocks/CountryProfileDetail/View.js

@@ -35,7 +35,7 @@ export default function View(props) {
   return (
     <>
       {isNonEN && (
-        <Message class="eea callout">
+        <Message className="eea callout">
           <FormattedMessage
             id="officiallyInEnglish"
             defaultMessage="Officially reported governmental information is only available in English"
@@ -43,7 +43,7 @@ export default function View(props) {
         </Message>
       )}
       {dataJson.message_top ? (
-        <div class="eea callout">{dataJson.message_top}</div>
+        <div className="eea callout">{dataJson.message_top}</div>
       ) : null}
       {dataJson.top_accordeon ? (
         <div className="top-accordion">

package/src/components/theme/MissionSignatoryProfile/MissionSignatoryProfileView.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Tab, Container } from 'semantic-ui-react';
+import { Tab, Container, Divider } from 'semantic-ui-react';
 import { BannerTitle } from '@eeacms/volto-cca-policy/helpers';
 import GovernanceTab from './TabSections/GovernanceTab';
 import AssessmentTab from './TabSections/AssessmentTab';
@@ -14,10 +14,11 @@ const MissionSignatoryProfileView = (props) => {
     props?.content?.['@components']?.missionsignatoryprofile || {};
 
   const result = dataJson?.result || {};
-  const governance = result?.governance?.[0] || [];
+  const governance = result?.governance?.[0] || {};
   const planning = result?.planning || {};
   const assessment = result?.assessment || {};
   const action = result?.action || {};
+  const footer_text = result?.footer_text || {};
   const tab_labels = result?.tab_labels || {};
   const { Governance_Label, Assessment_Label, Planning_Label, Action_Label } =
     tab_labels || {};
@@ -70,6 +71,14 @@ const MissionSignatoryProfileView = (props) => {
             },
           ]}
         />
+
+        {footer_text.Disclaimer && (
+          <div className="footer-text">
+            <Divider />
+            <strong>{footer_text.Disclaimer_Title}</strong>
+            <p>{footer_text.Disclaimer}</p>
+          </div>
+        )}
       </div>
     </Container>
   );

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

@@ -1,19 +1,21 @@
-import React from 'react';
 import { Tab, Grid } from 'semantic-ui-react';
 import { Callout } from '@eeacms/volto-eea-design-system/ui';
+import { HTMLField } from '@eeacms/volto-cca-policy/helpers';
+import { formatTextToHTML } from '@eeacms/volto-cca-policy/utils';
 import AccordionList from '../AccordionList';
 
 const ActionsTabContent = ({ action }) => {
   const hasHazards = action?.Climate_Hazards?.length > 0;
-  const hasSectors = !!action?.Sectors;
-  const hasBenefits = !!action?.Co_Benefits;
+  const hasSectors = action?.Sectors.length > 0;
+  const hasBenefits = action?.Co_Benefits.length > 0;
+
   return (
     <>
       <Grid columns="12">
         <Grid.Column mobile={12} tablet={12} computer={6}>
           {hasHazards && (
             <>
-              <h5>{action.Hazards_Addressed_Label}</h5>
+              <h5 className="small-label">{action.Hazards_Addressed_Label}</h5>
               <ul>
                 {action.Climate_Hazards.map((hazard, index) => (
                   <li key={index}>{hazard}</li>
@@ -23,7 +25,7 @@ const ActionsTabContent = ({ action }) => {
           )}
           {hasSectors && (
             <>
-              <h5>{action.Sectors_Label}</h5>
+              <h5 className="small-label">{action.Sectors_Label}</h5>
               <ul>
                 {action.Sectors.map((hazard, index) => (
                   <li key={index}>{hazard}</li>
@@ -72,21 +74,23 @@ const ActionPagesTab = ({ result }) => {
   return (
     <Tab.Pane>
       {Title && <h2>{Title}</h2>}
-      {Abstract && <p>{Abstract}</p>}
-      {Abstract_Line && <Callout>{Abstract_Line}</Callout>}
-
-      <br />
+      {Abstract && <HTMLField value={{ data: formatTextToHTML(Abstract) }} />}
+      {Abstract_Line && (
+        <Callout>
+          <HTMLField value={{ data: formatTextToHTML(Abstract_Line) }} />
+        </Callout>
+      )}
 
       {sortedActions.map((action, index) => {
         return (
           <div key={index} className="section-wrapper">
             <h5 className="section-title">
-              <span className="section-number">{action.Order}. </span>
-              <span>{action?.Action}</span>
+              <span className="section-number">{action.Action_Id}. </span>
+              <HTMLField value={{ data: formatTextToHTML(action?.Action) }} />
             </h5>
 
             <AccordionList
-              variation="tertiary"
+              variation="secondary"
               accordions={[
                 {
                   title: action?.More_Details_Label || 'More details',

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

@@ -61,7 +61,7 @@ describe('ActionPagesTab', () => {
   };
 
   it('renders action tab content correctly', () => {
-    const { getByText, getAllByText } = render(
+    const { getByText, container } = render(
       <ActionPagesTab result={mockResult} />,
     );
 
@@ -71,9 +71,7 @@ describe('ActionPagesTab', () => {
     ).toBeInTheDocument();
     expect(getByText('Summary line here.')).toBeInTheDocument();
 
-    const sections = getAllByText(/^\d+\./).map((el) =>
-      el.closest('.section-wrapper'),
-    );
+    const sections = container.querySelectorAll('.section-wrapper');
 
     // First action
     const firstAction = within(sections[0]);

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

@@ -1,6 +1,8 @@
 import React from 'react';
 import { Tab, Image, Segment, Item } from 'semantic-ui-react';
 import { Callout } from '@eeacms/volto-eea-design-system/ui';
+import { HTMLField } from '@eeacms/volto-cca-policy/helpers';
+import { formatTextToHTML } from '@eeacms/volto-cca-policy/utils';
 import AccordionList from '../AccordionList';
 
 import image from '@eeacms/volto-cca-policy/../theme//assets/images/image-narrow.svg';
@@ -38,7 +40,7 @@ const AssessmentAccordionContent = ({ result }) => {
 
       <h5>{result.Further_Details_Label}</h5>
       <Segment className="border">
-        <p>{result.Please_Explain}</p>
+        <HTMLField value={{ data: formatTextToHTML(result.Please_Explain) }} />
       </Segment>
     </>
   );
@@ -56,15 +58,20 @@ const AssessmentTab = ({ result }) => {
     Hazards_Abstract,
   } = result.assessment_text?.[0] || [];
   const assessment_risks = result.assessment_risks || [];
+  const assessment_sectors = result.assessment_sectors || [];
 
-  const [activeIndex, setActiveIndex] = React.useState(0);
+  // const [activeIndex, setActiveIndex] = React.useState(0);
 
   return (
     <Tab.Pane>
       {Title && <h2>{Title}</h2>}
-      {Subheading && <Callout>{Subheading}</Callout>}
+      {Subheading && (
+        <Callout>
+          <HTMLField value={{ data: formatTextToHTML(Subheading) }} />
+        </Callout>
+      )}
 
-      {Abstract && <p>{Abstract}</p>}
+      {Abstract && <HTMLField value={{ data: formatTextToHTML(Abstract) }} />}
 
       <div className="tab-section-wrapper assessment">
         {Cra_Title && <h3>{Cra_Title}</h3>}
@@ -98,11 +105,28 @@ const AssessmentTab = ({ result }) => {
 
       {Hazards_Title && <h3>{Hazards_Title}</h3>}
 
-      {Hazards_Abstract && <p>{Hazards_Abstract}</p>}
+      {Hazards_Abstract && (
+        <HTMLField value={{ data: formatTextToHTML(Hazards_Abstract) }} />
+      )}
 
       <br />
 
-      <Tab
+      {assessment_sectors && (
+        <AccordionList
+          accordions={assessment_sectors.map((category) => ({
+            title: category.Category_Name,
+            content: (
+              <ul>
+                {category.Sectors.map((sector, idx) => (
+                  <li key={idx}>{sector}</li>
+                ))}
+              </ul>
+            ),
+          }))}
+        />
+      )}
+
+      {/* <Tab
         menu={{
           fluid: true,
           className: 'secondary',
@@ -153,7 +177,7 @@ const AssessmentTab = ({ result }) => {
             ),
           },
         ]}
-      />
+      /> */}
     </Tab.Pane>
   );
 };

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

@@ -54,10 +54,5 @@ describe('AssessmentTab', () => {
     // Items section
     expect(screen.getByText('Factor A')).toBeInTheDocument();
     expect(screen.getByText('Factor B')).toBeInTheDocument();
-
-    // Hazard tabs
-    expect(screen.getByText('Water related')).toBeInTheDocument();
-    expect(screen.getByText('Heat related')).toBeInTheDocument();
-    expect(screen.getByText('Other hazards')).toBeInTheDocument();
   });
 });

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

@@ -34,7 +34,9 @@ const PlanningGoalContent = ({ goal }) => {
       <Grid columns="12">
         {hasHazards && (
           <Grid.Column mobile={12} tablet={12} computer={6}>
-            <h5>{goal.Climate_Hazards_Addressed_Label}</h5>
+            <h5 className="small-label">
+              {goal.Climate_Hazards_Addressed_Label}
+            </h5>
             <ul>
               {goal.Climate_Hazards.map((hazard, index) => (
                 <li key={index}>{hazard}</li>
@@ -86,17 +88,25 @@ const PlanningTab = ({ result }) => {
   return (
     <Tab.Pane>
       {titleData?.Title && <h2>{titleData.Title}</h2>}
-      {titleData?.Abstract_Line && <Callout>{titleData.Abstract_Line}</Callout>}
+      {titleData?.Abstract_Line && (
+        <Callout>
+          <HTMLField
+            value={{ data: formatTextToHTML(titleData?.Abstract_Line) }}
+          />
+        </Callout>
+      )}
 
       {sortedGoals.map((goal, index) => {
         return (
           <div key={index} className="section-wrapper">
-            <span className="goal-title-label">{goal?.Title_Label}</span>
+            <h5 className="section-title">
+              <span className="section-number">{goal?.Title_Label} </span>
 
-            <HTMLField value={{ data: formatTextToHTML(goal?.Title) }} />
+              <HTMLField value={{ data: formatTextToHTML(goal?.Title) }} />
+            </h5>
 
             <AccordionList
-              variation="tertiary"
+              variation="secondary"
               accordions={[
                 {
                   title: goal?.More_Details_Label || 'More details',
@@ -113,7 +123,11 @@ const PlanningTab = ({ result }) => {
       )}
 
       {goalData?.Climate_Action_Abstract && (
-        <Callout>{goalData.Climate_Action_Abstract}</Callout>
+        <Callout>
+          <HTMLField
+            value={{ data: formatTextToHTML(goalData.Climate_Action_Abstract) }}
+          />
+        </Callout>
       )}
 
       {planning_climate_action.map((action, index) => {
@@ -122,12 +136,22 @@ const PlanningTab = ({ result }) => {
             <br />
             {action?.Sectors_Introduction && (
               <Message>
-                <p>{action.Sectors_Introduction}</p>
+                <HTMLField
+                  value={{
+                    data: formatTextToHTML(action.Sectors_Introduction),
+                  }}
+                />
               </Message>
             )}
 
             <ItemsSection items={action?.Sectors} />
-            {action?.Description && <p>{action.Description}</p>}
+
+            {action?.Description && (
+              <HTMLField
+                className="description"
+                value={{ data: formatTextToHTML(action.Description) }}
+              />
+            )}
 
             {(action?.Approval_Year || action?.End_Year) && (
               <p>

package/src/components/theme/MissionSignatoryProfile/style.less

@@ -23,6 +23,10 @@
     }
   }
 
+  .description > p {
+    margin-bottom: 1em;
+  }
+
   .tab-section-wrapper {
     padding: 1.5em;
     margin: 2em 0;
@@ -45,20 +49,22 @@
   }
 
   .section-wrapper {
+    padding: 1em;
     margin: 1em 0;
+    background-color: #f9f9f9;
 
-    .goal-title-label {
-      display: inline-block;
-      padding: 0.3em 0.5em;
-      margin: 1em 0;
-      background-color: #dbe7f4;
-      font-size: 14px;
-      font-weight: bold;
-      text-transform: uppercase;
+    .section-title {
+      display: flex;
+      align-items: baseline;
+      gap: 0.5em;
     }
 
     .ui.accordion {
       margin-top: 1em;
+
+      .content.active {
+        padding-bottom: 1rem !important;
+      }
     }
 
     .small-label {
@@ -66,6 +72,10 @@
     }
   }
 
+  .section-number {
+    color: @pineGreen;
+  }
+
   strong.date {
     margin-right: 0.5em;
   }
@@ -83,4 +93,8 @@
       }
     }
   }
+
+  .footer-text {
+    margin-top: 3em;
+  }
 }

package/src/components/theme/Views/AdaptationOptionView.jsx

@@ -9,13 +9,13 @@ import {
 } from '@eeacms/volto-cca-policy/helpers';
 import {
   Container,
-  Segment,
+  // Segment,
   Divider,
   Grid,
   ListItem,
   List,
 } from 'semantic-ui-react';
-import { UniversalLink } from '@plone/volto/components';
+// import { UniversalLink } from '@plone/volto/components';
 import {
   ShareInfoButton,
   PortalMessage,
@@ -253,9 +253,12 @@ function AdaptationOptionView(props) {
               computer={4}
               className="col-right"
             >
-              <ContentMetadata {...props} />
+              <ContentMetadata
+                {...props}
+                related_case_studies={related_case_studies}
+              />
 
-              {related_case_studies?.length > 0 && (
+              {/* {related_case_studies?.length > 0 && (
                 <Segment>
                   <h5>
                     <FormattedMessage
@@ -273,7 +276,7 @@ function AdaptationOptionView(props) {
                     ))}
                   </ul>
                 </Segment>
-              )}
+              )} */}
             </Grid.Column>
           </div>
         </Grid>

package/src/components/theme/Views/BrokenLinks.test.jsx

@@ -1,8 +1,7 @@
-import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
 import '@testing-library/jest-dom/extend-expect';
-import { render } from '@testing-library/react';
+import { render, waitFor } from '@testing-library/react';
 import { Provider } from 'react-intl-redux';
 import { BrokenLinksComponent } from './BrokenLinks';
 
@@ -17,7 +16,18 @@ describe('BrokenLinksComponent', () => {
         messages: {},
       },
     });
+
+    global.fetch = jest.fn(() =>
+      Promise.resolve({
+        json: () =>
+          Promise.resolve({
+            broken_links: {},
+          }),
+      }),
+    );
+
     const reactTable = await import('@tanstack/react-table');
+
     const { container } = render(
       <Provider store={store}>
         <MemoryRouter>
@@ -25,6 +35,9 @@ describe('BrokenLinksComponent', () => {
         </MemoryRouter>
       </Provider>,
     );
-    expect(container).toBeTruthy();
+
+    await waitFor(() => {
+      expect(container).toBeTruthy();
+    });
   });
 });

package/src/helpers/ContentMetadata.jsx

@@ -13,6 +13,7 @@ import {
   PUBLICATION_REPORT,
 } from '@eeacms/volto-cca-policy/helpers/Constants';
 import { MetadataItemList } from '@eeacms/volto-cca-policy/helpers';
+import { UniversalLink } from '@plone/volto/components';
 
 const messages = defineMessages({
   default_info_tooltip: {
@@ -342,6 +343,11 @@ function ContentMetadata(props) {
     key_type_measures,
     funding_programme,
   } = content;
+  // const related_case_studies = props.hasAttribute('related_case_studies')
+  //   ? props['related_case_studies']
+  //   : [];
+  const related_case_studies = props['related_case_studies'];
+
   const type = content['@type'];
   const hasGeoChars = geochars !== null || spatial_layer.length > 0;
 
@@ -364,6 +370,26 @@ function ContentMetadata(props) {
           portaltype={type}
         />
 
+        {related_case_studies?.length > 0 && (
+          <>
+            <h5>
+              <FormattedMessage
+                id="Case studies related to this option:"
+                defaultMessage="Case studies related to this option:"
+              />
+            </h5>
+            <ul className="related-case-studies">
+              {related_case_studies.map((item, index) => (
+                <li key={index}>
+                  <UniversalLink key={index} href={item.url}>
+                    {item.title}
+                  </UniversalLink>
+                </li>
+              ))}
+            </ul>
+          </>
+        )}
+
         {keywords && keywords?.length > 0 && (
           <>
             <h5>