@eeacms/volto-cca-policy 0.3.44 → 0.3.45

package/CHANGELOG.md

@@ -4,6 +4,26 @@ 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.45](https://github.com/eea/volto-cca-policy/compare/0.3.44...0.3.45) - 21 May 2025
+
+#### :rocket: New Features
+
+- feat: add event accordion listing view - refs #286702 [kreafox - [`47b26e1`](https://github.com/eea/volto-cca-policy/commit/47b26e14d80e8a7bb0e067d9ffda87b7c028601a)]
+
+#### :nail_care: Enhancements
+
+- change: add Footer customization - refs #287013 [kreafox - [`875f5ab`](https://github.com/eea/volto-cca-policy/commit/875f5ab3bdf16fd2446757fd6949f9bf65eeaa96)]
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`dc669ad`](https://github.com/eea/volto-cca-policy/commit/dc669ad88e0568b83821e99c3bc31066c3624261)]
+- style: small css adjustments [kreafox - [`b93f7bb`](https://github.com/eea/volto-cca-policy/commit/b93f7bb521fbd2ecbb4245d5c07141ec8f4a74fd)]
+
+#### :hammer_and_wrench: Others
+
+- test: add tests to increase code coverage [kreafox - [`68fb5dc`](https://github.com/eea/volto-cca-policy/commit/68fb5dc83c58a77efa4f87cae4822758c93242e4)]
+- Refs #284995 - add description [Tripon Eugen - [`9a2aa38`](https://github.com/eea/volto-cca-policy/commit/9a2aa38e4d0879acbcdedfdb95b08b1bf8ae6650)]
+- Refs #284995 - add description [Tripon Eugen - [`2378952`](https://github.com/eea/volto-cca-policy/commit/2378952ca23bc4e4eae74445bec9a08869f6b8d7)]
 ### [0.3.44](https://github.com/eea/volto-cca-policy/compare/0.3.43...0.3.44) - 16 May 2025
 
 #### :bug: Bug Fixes
@@ -2387,10 +2407,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Refs #260715 rast-block wip [Tripon Eugen - [`f19d54e`](https://github.com/eea/volto-cca-policy/commit/f19d54e0b9a6a86bf344eb85b6a1cda7f3de91bf)]
 - Refs #260715 rast-block wip [Tripon Eugen - [`2828537`](https://github.com/eea/volto-cca-policy/commit/2828537b6c084cd1a82162d552fb4ef025b71f9f)]
 - Refs #260715 rast-block updates [Tripon Eugen - [`1e803e5`](https://github.com/eea/volto-cca-policy/commit/1e803e5bd3d3fb7558f261c76c68866be7beb8b5)]
+- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`0a15e1b`](https://github.com/eea/volto-cca-policy/commit/0a15e1b2ad081233685e80d5b3c60a8663f6b896)]
+- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`9554e44`](https://github.com/eea/volto-cca-policy/commit/9554e44c92a621a52b2adb5a4830fb084ee5734b)]
 ### [0.1.49](https://github.com/eea/volto-cca-policy/compare/0.1.48...0.1.49) - 15 November 2023
 
 #### :house: Internal changes
 
+- chore: [JENKINS] Refactor automated testing [valentinab25 - [`7b820a6`](https://github.com/eea/volto-cca-policy/commit/7b820a6369c2ddd5203b1a4abe352cb4bb43db7a)]
 - chore: husky, lint-staged use fixed versions [valentinab25 - [`f0a8061`](https://github.com/eea/volto-cca-policy/commit/f0a8061c275c236deb00087c23fac9860a073106)]
 
 #### :hammer_and_wrench: Others
@@ -2407,6 +2430,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Refs #259267 - jenkins test [Tripon Eugen - [`cacd31e`](https://github.com/eea/volto-cca-policy/commit/cacd31e7b1afe0983674ed5c7632d2e1d7fa752e)]
 - Refs #259267 - jenkins [Tripon Eugen - [`5b3affe`](https://github.com/eea/volto-cca-policy/commit/5b3affee8401239de10097884c1b7f2349d15ec0)]
 - Refs #259267 - add When, lead image and title to files [Tripon Eugen - [`2cedb23`](https://github.com/eea/volto-cca-policy/commit/2cedb237f898af9057e13fba94b615ef71077204)]
+- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`4d607a5`](https://github.com/eea/volto-cca-policy/commit/4d607a576e9d0a5c34e48c41b409e7df616ee3d6)]
+- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`b7f74d5`](https://github.com/eea/volto-cca-policy/commit/b7f74d53513a6edbfbca5cb6d19687929bb1e5db)]
+- test: [JENKINS] Improve cypress time [valentinab25 - [`db65617`](https://github.com/eea/volto-cca-policy/commit/db656173391f65157098d95d388c25f6429753d8)]
 - Refs #259267 - cca event blocks attachments and check not mandatoty fields [Tripon Eugen - [`3138e5a`](https://github.com/eea/volto-cca-policy/commit/3138e5afb5bfbdbed14e27ed457b16867b7fa414)]
 - Refs #256681 - Fix error in CCA Event view menu. ([React Intl] An id must be provided to format a message.) [GhitaB - [`517eeb8`](https://github.com/eea/volto-cca-policy/commit/517eeb817264a47bbfd6b9b7d22aaf22d44ed224)]
 - Refs #161485 - Fix ECDE name conflict. [GhitaB - [`8bfd99f`](https://github.com/eea/volto-cca-policy/commit/8bfd99ff68bb82a04d1c0ed625fa514fcf46289e)]
@@ -2623,6 +2649,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
+- chore: [JENKINS] Remove alpha testing version [valentinab25 - [`ad1ced0`](https://github.com/eea/volto-cca-policy/commit/ad1ced0971ba116c13a3b5fcc039172cc915c919)]
 
 #### :hammer_and_wrench: Others
 
@@ -3103,6 +3130,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Refs #158294 - Update supported languages list. [GhitaB - [`0a4f91f`](https://github.com/eea/volto-cca-policy/commit/0a4f91f39b7edc367bd4c127d6a8f273c7788361)]
+- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`8f1f9ce`](https://github.com/eea/volto-cca-policy/commit/8f1f9ce6c22805670cc0800d3c779b6d619d0f31)]
 ### [0.1.1](https://github.com/eea/volto-cca-policy/compare/0.1.0...0.1.1) - 13 December 2022
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/manage/Blocks/Listing/DropdownListingView.test.jsx

@@ -1,35 +1,14 @@
-import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
-import renderer from 'react-test-renderer';
-import '@testing-library/jest-dom/extend-expect';
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
 import { Provider } from 'react-intl-redux';
 import DropdownListingView from './DropdownListingView';
-import config from '@plone/volto/registry';
-
-config.blocks = {
-  blocksConfig: {
-    contentLinks: {
-      variations: [
-        {
-          id: 'default',
-          title: 'Simple list (default)',
-          isDefault: true,
-        },
-        {
-          id: 'navigationList',
-          title: 'Navigation list',
-          isDefault: false,
-        },
-      ],
-    },
-  },
-};
 
 const mockStore = configureStore();
 
 describe('DropdownListingView', () => {
-  it('should render the component', () => {
+  it('renders dropdown with items', () => {
     const data = {
       '@type': 'listing',
       items: [
@@ -54,14 +33,18 @@ describe('DropdownListingView', () => {
       },
     });
 
-    const component = renderer.create(
+    render(
       <Provider store={store}>
         <MemoryRouter>
           <DropdownListingView {...data} />
         </MemoryRouter>
       </Provider>,
     );
-    const json = component.toJSON();
-    expect(json).toMatchSnapshot();
+
+    // Check the placeholder text is present
+    expect(screen.getByText('Select')).toBeInTheDocument();
+
+    expect(screen.getAllByText('Item 1').length).toBeGreaterThan(0);
+    expect(screen.getAllByText('Item 2').length).toBeGreaterThan(0);
   });
 });

package/src/components/manage/Blocks/Listing/EventAccordionListingView.jsx

@@ -0,0 +1,123 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormattedMessage } from 'react-intl';
+import { useSelector } from 'react-redux';
+import { Icon, Accordion, Button } from 'semantic-ui-react';
+import { ConditionalLink } from '@plone/volto/components';
+import { When } from '@plone/volto/components/theme/View/EventDatesInfo';
+
+import './styles.less';
+
+function formatDateRange(startStr, endStr, locale = 'en') {
+  if (!startStr || !endStr) return null;
+
+  const startDate = new Date(startStr);
+  const endDate = new Date(endStr);
+
+  if (isNaN(startDate) || isNaN(endDate)) return null;
+
+  const sameDay = startDate.toDateString() === endDate.toDateString();
+  const sameMonth = startDate.getMonth() === endDate.getMonth();
+  const sameYear = startDate.getFullYear() === endDate.getFullYear();
+
+  const day = (date) => date.toLocaleDateString(locale, { day: 'numeric' });
+
+  const month = (date) => date.toLocaleDateString(locale, { month: 'long' });
+
+  const year = (date) => date.toLocaleDateString(locale, { year: 'numeric' });
+
+  if (sameDay) {
+    return `${day(startDate)} ${month(startDate)} ${year(startDate)}`;
+  }
+
+  if (sameMonth && sameYear) {
+    return `${day(startDate)} - ${day(endDate)} ${month(endDate)} ${year(
+      endDate,
+    )}`;
+  }
+
+  if (sameYear) {
+    return `${day(startDate)} ${month(startDate)} - ${day(endDate)} ${month(
+      endDate,
+    )} ${year(endDate)}`;
+  }
+
+  // Different years
+  return `${day(startDate)} ${month(startDate)} ${year(startDate)} – ${day(
+    endDate,
+  )} ${month(endDate)} ${year(endDate)}`;
+}
+
+const EventAccordionListingView = ({ items, isEditMode }) => {
+  const currentLang = useSelector((state) => state.intl.locale);
+  const [activeIndex, setActiveIndex] = React.useState(-1);
+  const handleAccordionClick = (index) => {
+    setActiveIndex(activeIndex === index ? -1 : index);
+  };
+
+  return (
+    <div className="ui fluid event-accordion-view">
+      <Accordion className="primary">
+        {items.map((item, index) => {
+          const formattedDate = formatDateRange(
+            item.start,
+            item.end,
+            currentLang,
+          );
+          return (
+            <React.Fragment key={item.UID}>
+              <Accordion.Title
+                active={activeIndex === index}
+                onClick={() => handleAccordionClick(index)}
+              >
+                <Icon
+                  className={
+                    activeIndex === index
+                      ? 'ri-arrow-up-s-line'
+                      : 'ri-arrow-down-s-line'
+                  }
+                />
+                <div>
+                  <div className="listing-header">
+                    {item?.start && <span>{formattedDate}</span>}
+                    {item.location && <> - {item.location}</>}
+                  </div>
+                  <div>{item.title}</div>
+                </div>
+              </Accordion.Title>
+              <Accordion.Content active={activeIndex === index}>
+                {item?.description && (
+                  <p className="listing-description">{item.description}</p>
+                )}
+
+                <div className="bottom-info">
+                  <ConditionalLink item={item} condition={!isEditMode}>
+                    <Button inverted primary>
+                      <FormattedMessage
+                        id="Learn more"
+                        defaultMessage="Learn more"
+                      />
+                    </Button>
+                  </ConditionalLink>
+                  <When
+                    start={item.start}
+                    end={item.end}
+                    whole_day={item.whole_day}
+                    open_end={item.open_end}
+                  />
+                </div>
+              </Accordion.Content>
+            </React.Fragment>
+          );
+        })}
+      </Accordion>
+    </div>
+  );
+};
+
+EventAccordionListingView.propTypes = {
+  items: PropTypes.arrayOf(PropTypes.any).isRequired,
+  isEditMode: PropTypes.bool,
+};
+
+export default EventAccordionListingView;

package/src/components/manage/Blocks/Listing/EventAccordionListingView.test.jsx

@@ -0,0 +1,101 @@
+import '@testing-library/jest-dom';
+import { render, screen, fireEvent } from '@testing-library/react';
+import { MemoryRouter } from 'react-router-dom';
+import configureStore from 'redux-mock-store';
+import { Provider } from 'react-intl-redux';
+import EventAccordionListingView from './EventAccordionListingView';
+
+const mockStore = configureStore();
+
+jest.mock('@plone/volto/components', () => ({
+  ConditionalLink: ({ children }) => <div>{children}</div>,
+}));
+
+jest.mock('@plone/volto/components/theme/View/EventDatesInfo', () => ({
+  When: () => <div>Event Date Info</div>,
+}));
+
+describe('EventAccordionListingView', () => {
+  let store;
+  const items = [
+    {
+      UID: 'event-123',
+      title: 'Test Event One',
+      description: 'Details about Event One',
+      start: '2025-05-20T10:00:00',
+      end: '2025-05-20T12:00:00',
+      location: 'Hall A',
+      whole_day: false,
+      open_end: false,
+      '@id': '/event-1',
+    },
+    {
+      UID: 'event-456',
+      title: 'Test Event Two',
+      description: 'Details about Event Two',
+      start: '2025-06-10T09:00:00',
+      end: '2025-06-10T11:00:00',
+      location: 'Room B',
+      whole_day: false,
+      open_end: false,
+      '@id': '/event-2',
+    },
+  ];
+
+  beforeEach(() => {
+    store = mockStore({
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+    });
+  });
+
+  it('renders all event titles', () => {
+    render(
+      <Provider store={store}>
+        <MemoryRouter>
+          <EventAccordionListingView items={items} isEditMode={false} />
+        </MemoryRouter>
+      </Provider>,
+    );
+
+    expect(screen.getByText('Test Event One')).toBeInTheDocument();
+    expect(screen.getByText('Test Event Two')).toBeInTheDocument();
+  });
+
+  it('toggles accordion content on title click', () => {
+    render(
+      <Provider store={store}>
+        <MemoryRouter>
+          <EventAccordionListingView items={items} isEditMode={false} />
+        </MemoryRouter>
+      </Provider>,
+    );
+
+    const title = screen.getByText('Test Event One');
+    expect(title.closest('.title')).toHaveClass('title');
+    expect(title.closest('.title')).not.toHaveClass('active');
+
+    fireEvent.click(title);
+
+    expect(title.closest('.title')).toHaveClass('active');
+
+    expect(screen.getByText('Details about Event One')).toBeInTheDocument();
+
+    fireEvent.click(title);
+    expect(title.closest('.title')).not.toHaveClass('active');
+  });
+
+  it('renders Learn more buttons', () => {
+    render(
+      <Provider store={store}>
+        <MemoryRouter>
+          <EventAccordionListingView items={items} isEditMode={false} />
+        </MemoryRouter>
+      </Provider>,
+    );
+
+    expect(screen.getAllByText('Learn more')).toHaveLength(2);
+  });
+});

package/src/components/manage/Blocks/Listing/index.js

@@ -2,6 +2,7 @@ import OrganisationCardsListingView from './OrganisationCardsListingView';
 import IndicatorCardsListingView from './IndicatorCardsListingView';
 import EventCardsListingView from './EventCardsListingView';
 import DropdownListingView from './DropdownListingView';
+import EventAccordionListingView from './EventAccordionListingView';
 
 export default function installListing(config) {
   config.blocks.blocksConfig.listing = {
@@ -43,6 +44,13 @@ export default function installListing(config) {
         isDefault: false,
         fullobjects: true,
       },
+      {
+        id: 'eventAccordion',
+        title: 'Event Accordion',
+        template: EventAccordionListingView,
+        isDefault: false,
+        fullobjects: true,
+      },
     ],
   };
 

package/src/components/manage/Blocks/Listing/styles.less

@@ -142,3 +142,22 @@ div.indicatorCards {
     }
   }
 }
+
+.event-accordion-view {
+  .listing-header {
+    font-weight: bold;
+  }
+
+  .bottom-info {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    justify-content: flex-start;
+    margin-top: 2em;
+    gap: 1em;
+
+    p {
+      margin: 0;
+    }
+  }
+}

package/src/constants.js

@@ -6,6 +6,7 @@ export const download_fields = [
   { field: 'issued', name: 'Publication Date' },
   { field: 'creators', name: 'Creator' },
   { field: 'objectProvides', name: 'Content type' },
+  { field: 'fulltext', name: 'Description' },
   { field: 'cca_keywords', name: 'Keywords' },
   { field: 'cca_adaptation_sectors', name: 'Sectors' },
   { field: 'cca_climate_impacts', name: 'Climate impact' },
@@ -17,7 +18,6 @@ export const download_fields = [
   { field: 'cca_origin_websites', name: 'Origin website' },
   { field: 'cca_health_impacts', name: 'Health impacts' },
   { field: 'cca_partner_contributors', name: 'Observatory impacts' },
-  // { field: 'fulltext', name: 'Description' },
 ];
 
 export const eea_languages = [

package/src/customizations/volto/components/theme/Footer/Footer.jsx

@@ -0,0 +1,96 @@
+/**
+ * Footer component.
+ * @module components/theme/Footer/Footer
+ */
+
+import React from 'react';
+import { useSelector, shallowEqual } from 'react-redux';
+import { flattenToAppURL } from '@plone/volto/helpers';
+import EEAFooter from '@eeacms/volto-eea-design-system/ui/Footer/Footer';
+import config from '@plone/volto/registry';
+import isArray from 'lodash/isArray';
+
+const Footer = () => {
+  const { eea } = config.settings;
+  const {
+    footerActions,
+    copyrightActions,
+    socialActions,
+    contactActions,
+    contactExtraActions,
+  } = useSelector(
+    (state) => ({
+      footerActions: state.actions?.actions?.footer_actions,
+      copyrightActions: state.actions?.actions?.copyright_actions,
+      socialActions: state.actions?.actions?.social_actions,
+      contactActions: state.actions?.actions?.contact_actions,
+      contactExtraActions: state.actions?.actions?.contact_extra_actions,
+    }),
+    shallowEqual,
+  );
+  // ZMI > portal_actions > footer_actions
+  const actions = isArray(footerActions)
+    ? footerActions.map((action) => ({
+        title: action.title,
+        url: flattenToAppURL(action.url),
+      }))
+    : eea.footerOpts.actions;
+
+  // ZMI > portal_actions > copyright_actions
+  const copyright = isArray(copyrightActions)
+    ? copyrightActions.map((action) => ({
+        title: action.title,
+        site: action.title,
+        url: flattenToAppURL(action.url),
+      }))
+    : eea.footerOpts.copyright;
+
+  // ZMI > portal_actions > social_actions
+  const social = isArray(socialActions)
+    ? socialActions.map((action) => ({
+        name: action.id,
+        icon: action.icon,
+        url: action.url,
+      }))
+    : eea.footerOpts.social;
+
+  // ZMI > portal_actions > contact_actions
+  const contacts = isArray(contactActions)
+    ? contactActions.map((action, idx) => ({
+        text: action.title,
+        icon: action.icon,
+        url: flattenToAppURL(action.url),
+        children:
+          idx === 0
+            ? (contactExtraActions || []).map((child) => ({
+                text: child.title,
+                icon: child.icon,
+                url: flattenToAppURL(child.url),
+              }))
+            : [],
+      }))
+    : eea.footerOpts.contacts;
+
+  // Update options with actions from backend
+  const options = {
+    ...eea.footerOpts,
+    social,
+    contacts,
+  };
+
+  return (
+    <EEAFooter>
+      <EEAFooter.Header>{eea.footerOpts.logosHeader}</EEAFooter.Header>
+      <EEAFooter.SubFooter {...options} />
+      <EEAFooter.Header>{eea.footerOpts.header}</EEAFooter.Header>
+      <EEAFooter.SitesButton
+        buttonName={eea.footerOpts.buttonName}
+        hrefButton={eea.footerOpts.hrefButton}
+      />
+      <EEAFooter.Social {...options} />
+      <EEAFooter.Actions actions={actions} copyright={copyright} />
+    </EEAFooter>
+  );
+};
+
+export default Footer;

package/src/index.js

@@ -158,6 +158,10 @@ const applyConfig = (config) => {
     ],
     footerOpts: {
       ...(config.settings.eea?.footerOpts || {}),
+      buttonName: 'Explore our environmental information systems',
+      hrefButton: 'https://www.eea.europa.eu/en/information-systems#',
+      logosHeader: 'Managed by',
+      header: '',
       description:
         'The European Climate Adaptation Platform Climate-ADAPT is a partnership between the European Commission and the European Environment Agency.',
       managedBy: [

package/src/search/common.js

@@ -62,7 +62,7 @@ export const cca_adaptation_sectors = {
   factory: 'MultiTermFacet',
   label: messages.adaptationSectors,
   showInFacetsList: true,
-  filterType: 'any',
+  filterType: 'all',
   isFilterable: false,
   show: 10000,
   isMulti: true,

package/theme/globals/mission.less

@@ -128,8 +128,10 @@ body.subsite-mkh {
     }
 
     .funding-sources {
-      display: flex;
-      gap: 0.5em;
+      span {
+        float: left;
+        margin-right: 5px;
+      }
     }
 
     .section-wrapper-info {

package/theme/globals/site.overrides

@@ -251,6 +251,16 @@ iframe {
   }
 }
 
+#footer {
+  .theme-sites {
+    padding: 3rem 0 ;
+  }
+
+  .footer-header {
+    margin-bottom: 1.5em;
+  }
+}
+
 #mega-menu {
   .ui.list.has--4--columns {
     a.item {
@@ -303,10 +313,6 @@ iframe {
         padding-left: 0.8em;
         min-width: 10em;
       }
-
-      .noneu-langs-label {
-        // border-bottom: 1px solid black;
-      }
     }
   }
 }