@eeacms/volto-cca-policy 0.2.41 → 0.2.43

package/CHANGELOG.md

@@ -4,15 +4,45 @@ 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.2.41](https://github.com/eea/volto-cca-policy/compare/0.2.40...0.2.41) - 4 June 2024
+### [0.2.43](https://github.com/eea/volto-cca-policy/compare/0.2.42...0.2.43) - 13 June 2024
+
+#### :rocket: New Features
+
+- feat(event): add i18n messages for documents and improve code readability [kreafox - [`f23168a`](https://github.com/eea/volto-cca-policy/commit/f23168ad982317bdf1523cdd42f39ef84b55da0e)]
 
 #### :rocket: Dependency updates
 
-- Release @eeacms/volto-embed@10.0.1 [EEA Jenkins - [`7e807f4`](https://github.com/eea/volto-cca-policy/commit/7e807f45151eb7335a9f690a038bef8a9f1add80)]
+- Release @eeacms/volto-embed@10.0.2 [EEA Jenkins - [`2e0174c`](https://github.com/eea/volto-cca-policy/commit/2e0174c154250e838535e3f9c8b1c8f83fa8ccde)]
+
+#### :bug: Bug Fixes
+
+- fix(event): use email link interpolation correctly [kreafox - [`0527737`](https://github.com/eea/volto-cca-policy/commit/0527737a47ae1e70a5719b160736be9247d68634)]
+
+#### :nail_care: Enhancements
+
+- change(event): simplify component structure and organize imports [kreafox - [`30a7766`](https://github.com/eea/volto-cca-policy/commit/30a7766d33a04d26d17b798d0ef776603c7fe29c)]
+- change(event): use renderBlocks instead of custom BannerTitle component [kreafox - [`0dd267a`](https://github.com/eea/volto-cca-policy/commit/0dd267af20184dbd683671ef1e23dd3d15606667)]
 
 #### :hammer_and_wrench: Others
 
-- Tweak default expands [Tiberiu Ichim - [`e721114`](https://github.com/eea/volto-cca-policy/commit/e7211143178f25279541cf974ce41e8b4ae2c3b3)]
+- test: fix warning message [kreafox - [`4d31ff2`](https://github.com/eea/volto-cca-policy/commit/4d31ff20dcfce88ad96f608409a5e12b20f13c9e)]
+- test: update snapshot [kreafox - [`c8047ca`](https://github.com/eea/volto-cca-policy/commit/c8047ca5d592fea5db728999f1f7a8f96cad6496)]
+- New version [Tiberiu Ichim - [`8617e34`](https://github.com/eea/volto-cca-policy/commit/8617e343ec075259078b533064bb6de2a3005a48)]
+- https://github.com/elastic/search-ui/issues/1046 [Tiberiu Ichim - [`9eb0d03`](https://github.com/eea/volto-cca-policy/commit/9eb0d03aace62b7692033d9e429c42f10e176354)]
+- Pin @eeacms/volto-embed [kreafox - [`0418854`](https://github.com/eea/volto-cca-policy/commit/04188549444a127e041ef98973900814f86e3859)]
+- Let's try something else [Tiberiu Ichim - [`ab847b7`](https://github.com/eea/volto-cca-policy/commit/ab847b7d35448dadf29892bc10f8024dabf6d664)]
+- Remove dependency for search-ui [Tiberiu Ichim - [`f3bf4a4`](https://github.com/eea/volto-cca-policy/commit/f3bf4a42f1dac44c57b6c1557b583112e328d26d)]
+- Refs #271086 - wip tests [Tripon Eugen - [`e2cfdc7`](https://github.com/eea/volto-cca-policy/commit/e2cfdc78dc82b70d147bc1a7505632b9577719b8)]
+- Refs #271086 - package.json resolutions [Tripon Eugen - [`09cce63`](https://github.com/eea/volto-cca-policy/commit/09cce6376cc489d5466981ce1a8e53bb8a994c1e)]
+- Refs #271086 - add elements filter at cse [Tripon Eugen - [`549030c`](https://github.com/eea/volto-cca-policy/commit/549030cde005331f26a9ccde09394fee3f43f049)]
+### [0.2.42](https://github.com/eea/volto-cca-policy/compare/0.2.41...0.2.42) - 4 June 2024
+
+### [0.2.41](https://github.com/eea/volto-cca-policy/compare/0.2.40...0.2.41) - 4 June 2024
+
+#### :rocket: Dependency updates
+
+- Release @eeacms/volto-embed@10.0.1 [EEA Jenkins - [`7e807f4`](https://github.com/eea/volto-cca-policy/commit/7e807f45151eb7335a9f690a038bef8a9f1add80)]
+
 ### [0.2.40](https://github.com/eea/volto-cca-policy/compare/0.2.39...0.2.40) - 31 May 2024
 
 #### :bug: Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.2.41",
+  "version": "0.2.43",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -31,13 +31,13 @@
     "@eeacms/volto-datablocks": "*",
     "@eeacms/volto-eea-design-system": "*",
     "@eeacms/volto-eea-website-theme": "^1.33.2",
-    "@eeacms/volto-embed": "10.0.1",
+    "@eeacms/volto-embed": "^9.1.1",
     "@eeacms/volto-globalsearch": "^1.1.0",
     "@eeacms/volto-openlayers-map": "*",
-    "@eeacms/volto-searchlib": "^0.9.3",
+    "@eeacms/volto-searchlib": "2.0.2",
+    "@elastic/search-ui": "1.21.2",
     "@eeacms/volto-slate-label": "^0.6.0",
     "@eeacms/volto-tabs-block": "^7.5.1",
-    "@elastic/search-ui": "1.21.2",
     "d3-array": "^2.12.1",
     "jotai": "^1.6.0",
     "query-string": "7.1.0",

package/src/components/index.js

@@ -4,6 +4,7 @@ export { default as PortalMessage } from './theme/PortalMessage/PortalMessage';
 export { default as TranslationDisclaimer } from './theme/TranslationDisclaimer/TranslationDisclaimer';
 export { default as ShareInfoButton } from './theme/ShareInfoButton/ShareInfoButton';
 export { default as ASTNavigation } from './theme/ASTNavigation/ASTNavigation';
+export { default as RedirectToLogin } from './theme/RedirectToLogin/RedirectToLogin';
 
 // Widgets
 export { default as RASTWidgetView } from './theme/Widgets/RASTWidgetView';

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

@@ -19,12 +19,14 @@ export default function CaseStudyExplorerView(props) {
   const [activeFilters, setActiveFilters] = React.useState({
     sectors: [],
     impacts: [],
+    elements: [],
     measures: [],
   });
 
   const [activeItems, setActiveItems] = React.useState(cases);
   const [filters, setFilters] = React.useState({
     impacts: [],
+    elements: [],
     sectors: [],
     measures: {},
   });
@@ -44,12 +46,14 @@ export default function CaseStudyExplorerView(props) {
     let _filters = filters;
     _filters.impacts = _filters_data.impacts;
     _filters.sectors = _filters_data.sectors;
+    _filters.elements = _filters_data.elements;
     setFilters(_filters);
   }, [
     filters,
     cases,
     activeFilters.impacts,
     activeFilters.sectors,
+    activeFilters.elements,
     activeFilters.measures,
     activeItems.length,
   ]);

package/src/components/manage/Blocks/CaseStudyExplorer/CaseStudyFilters.jsx

@@ -84,6 +84,31 @@ export default function CaseStudyFilters(props) {
             ),
           )}
         </Accordion.Content>
+        <Accordion.Title
+          active={activeIndex.includes(3)}
+          index={3}
+          onClick={handleClick}
+        >
+          <AccordionIcon active={activeIndex.includes(3)} />
+          <FormattedMessage
+            id="Adaptation elements"
+            defaultMessage="Adaptation elements"
+          />
+        </Accordion.Title>
+        <Accordion.Content active={activeIndex.includes(3)}>
+          {Object.entries(filters?.elements || {}).map(
+            ([value, label], index) => (
+              <Checkbox
+                label={intl.formatMessage({ id: label })}
+                value={value}
+                checked={activeFilters.elements.includes(value)}
+                name="elements"
+                onChange={checkboxChangeHandler}
+                key={'element' + index}
+              />
+            ),
+          )}
+        </Accordion.Content>
         <Accordion.Title
           active={activeIndex.includes(1)}
           index={1}

package/src/components/manage/Blocks/CaseStudyExplorer/CaseStudyFilters.test.jsx

@@ -16,6 +16,7 @@ describe('CaseStudyFilters', () => {
         // impacts: [{ DROUGHT: 'Drought' }],
         sectors: [],
         impacts: [],
+        elements: [],
         measures: {
           //   Measure1: [
           //     { key: 'M11', value: 'm11' },
@@ -26,6 +27,7 @@ describe('CaseStudyFilters', () => {
       activeFilters: {
         sectors: [],
         impacts: [],
+        elements: [],
         measures: [],
       },
     };

package/src/components/manage/Blocks/CaseStudyExplorer/FeatureDisplay.jsx

@@ -43,7 +43,6 @@ export default function FeatureDisplay({ feature }) {
         <span
           dangerouslySetInnerHTML={{
             __html: feature.adaptation_options_links.replaceAll('<>', '; '),
-            // __html: feature.adaptation_options_links,
           }}
         ></span>
       </p>

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

@@ -35,6 +35,7 @@ export function filterCases(cases, activeFilters) {
     if (
       activeFilters.sectors.length === 0 &&
       activeFilters.measures.length === 0 &&
+      activeFilters.elements.length === 0 &&
       activeFilters.impacts.length === 0
     )
       return _case;
@@ -45,6 +46,10 @@ export function filterCases(cases, activeFilters) {
       if (_case.properties.sectors.includes(',' + filter + ',')) flag = true;
     });
 
+    activeFilters.elements.forEach((filter) => {
+      if (_case.properties.elements.includes(',' + filter + ',')) flag = true;
+    });
+
     activeFilters.impacts.forEach((filter) => {
       if (_case.properties.impacts.includes(',' + filter + ',')) flag = true;
     });
@@ -60,7 +65,7 @@ export function filterCases(cases, activeFilters) {
 }
 
 export function getFilters(cases) {
-  let _filters = { sectors: {}, impacts: {}, measures: {} };
+  let _filters = { sectors: {}, impacts: {}, elements: {}, measures: {} };
 
   for (let key of Object.keys(cases)) {
     const _case = cases[key];
@@ -81,6 +86,17 @@ export function getFilters(cases) {
       }
     }
 
+    let elementKeys = _case.properties?.elements?.split(',');
+    let elementNames = _case.properties?.elements_str?.split(',') || [];
+    for (let i = 0; i < elementNames.length; i++) {
+      if (
+        !_filters.elements.hasOwnProperty(elementKeys[i + 1]) &&
+        elementKeys[i + 1].length
+      ) {
+        _filters.elements[elementKeys[i + 1]] = elementNames[i];
+      }
+    }
+
     // let ktmKeys = _case.properties.ktms.split(',');
     // let ktmNames = _case.properties.impacts_str.split(',');
     // for (let i = 0; i < ktmKeys.length; i++) {

package/src/components/manage/Blocks/ContentLinks/DropdownListView.jsx

@@ -12,17 +12,18 @@ const messages = defineMessages({
 });
 
 const getDropdownOptions = (items) => {
-  const options = items?.map((item) => {
-    const source = item?.source?.[0];
-    return {
-      key: source?.id,
-      value: source?.id,
-      text: item.item_title,
-      as: Link,
-      to: flattenToAppURL(source?.['@id']),
-    };
-  });
-  return options;
+  return (
+    items?.map((item, index) => {
+      const source = item?.source?.[0];
+      return {
+        key: source?.id || index,
+        value: source?.id,
+        text: item.item_title,
+        as: Link,
+        to: flattenToAppURL(source?.['@id']),
+      };
+    }) || []
+  );
 };
 
 const DropdownListView = (props) => {

package/src/components/theme/RedirectToLogin/RedirectToLogin.jsx

@@ -0,0 +1,15 @@
+import React from 'react';
+
+export default function RedirectToLogin(props) {
+  const { token, location, history } = props;
+  const { pathname, search } = location;
+
+  React.useEffect(() => {
+    if (!token) {
+      const back = encodeURIComponent(`${pathname}${search}`);
+      history.push(`/login?return_url=${back}`);
+    }
+  }, [token, history, pathname, search]);
+
+  return null;
+}

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

@@ -0,0 +1,75 @@
+import React from 'react';
+import { MemoryRouter } from 'react-router-dom';
+import configureStore from 'redux-mock-store';
+import { Provider } from 'react-intl-redux';
+import RedirectToLogin from './RedirectToLogin';
+import config from '@plone/volto/registry';
+import { render } from '@testing-library/react';
+
+config.blocks = {
+  blocksConfig: {
+    title: {
+      view: () => <div>Title Block Component</div>,
+    },
+  },
+};
+
+const mockStore = configureStore();
+
+describe('RedirectToLogin', () => {
+  it('redirects to login if no token', () => {
+    const store = mockStore({
+      userSession: { token: '1234' },
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+    });
+    const history = { push: jest.fn(() => null) };
+    const location = {
+      pathname: '/en/metadata/add',
+      search: '?type=NewsItem',
+    };
+
+    render(
+      <Provider store={store}>
+        <MemoryRouter>
+          <RedirectToLogin history={history} token={null} location={location} />
+        </MemoryRouter>
+      </Provider>,
+    );
+
+    expect(history.push.mock.calls[0][0]).toBe(
+      '/login?return_url=%2Fen%2Fmetadata%2Fadd%3Ftype%3DNewsItem',
+    );
+  });
+
+  it('does not redirect to login if token', () => {
+    const store = mockStore({
+      userSession: { token: '1234' },
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+    });
+    const history = { push: jest.fn(() => null) };
+    const location = {
+      pathname: '/en/metadata/add',
+      search: '?type=NewsItem',
+    };
+
+    render(
+      <Provider store={store}>
+        <MemoryRouter>
+          <RedirectToLogin
+            history={history}
+            token={'something'}
+            location={location}
+          />
+        </MemoryRouter>
+      </Provider>,
+    );
+
+    expect(history.push.mock.calls).toHaveLength(0);
+  });
+});

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

@@ -1,58 +1,73 @@
 import React from 'react';
+import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 import { Grid, Container, Segment } from 'semantic-ui-react';
 import {
-  DocumentsList,
   HTMLField,
-  BannerTitle,
   EventDetails,
+  DocumentsList,
 } from '@eeacms/volto-cca-policy/helpers';
 import { PortalMessage } from '@eeacms/volto-cca-policy/components';
-import { FormattedMessage } from 'react-intl';
+import { filterBlocks } from '@eeacms/volto-cca-policy/utils';
+import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
+
+const messages = defineMessages({
+  download_agenda: {
+    id: 'Download the detailed agenda',
+    defaultMessage: 'Download the detailed agenda',
+  },
+  download_documents: {
+    id: 'A background document for the event is available',
+    defaultMessage: 'A background document for the event is available',
+  },
+});
+
+const DocumentSection = ({ title, file }) => (
+  <DocumentsList
+    content={{
+      show_counter: false,
+      section_title: title,
+      cca_files: [
+        {
+          url: file?.download,
+          title: file?.filename,
+        },
+      ],
+    }}
+  />
+);
 
 function CcaEventView(props) {
+  const intl = useIntl();
   const { content } = props;
-  const { event_language } = content;
-  // cca_files: [content.agenda_file]}
-  if (content.agenda_file) {
-    content.agenda_file['url'] = content.agenda_file['download'];
-    content.agenda_file['title'] = content.agenda_file['filename'];
-  }
-  if (content.background_documents) {
-    content.background_documents['url'] =
-      content.background_documents['download'];
-    content.background_documents['title'] =
-      content.background_documents['filename'];
-  }
-  const agenda_files = {
-    section_title: 'Download the detailed agenda',
-    cca_files: [content.agenda_file],
-    show_counter: false,
-  };
-  const background_documents = {
-    section_title: 'A background document for the event is available ',
-    cca_files: [content.background_documents],
-    show_counter: false,
-  };
+  const {
+    event_language,
+    agenda_file,
+    background_documents,
+    participation,
+    contact_email,
+  } = content;
+
+  const {
+    blocks: filtered_blocks,
+    blocks_layout: filtered_blocks_layout,
+  } = filterBlocks(content, 'tabs_block');
 
   return (
     <div className="cca-event-view">
-      <BannerTitle
-        content={{ ...content, '@type': 'Climate adapt event' }}
-        data={{
-          info: [{ description: '' }],
-          hideContentType: false,
-          hideCreationDate: false,
-          hideModificationDate: false,
-          hidePublishingDate: false,
-          hideDownloadButton: false,
-          hideShareButton: false,
+      <RenderBlocks
+        {...props}
+        content={{
+          ...content,
+          '@type': 'climate-adapt-event',
+          blocks: filtered_blocks,
+          blocks_layout: filtered_blocks_layout,
         }}
       />
 
       <Container>
         <PortalMessage content={content} />
         <Grid columns="12">
-          <div className="row">
+          <Grid.Row>
             <Grid.Column
               mobile={12}
               tablet={12}
@@ -69,9 +84,18 @@ function CcaEventView(props) {
               </h2>
               <HTMLField value={content.agenda} />
 
-              {content?.agenda_file && <DocumentsList content={agenda_files} />}
-              {content?.background_documents && (
-                <DocumentsList content={background_documents} />
+              {agenda_file && (
+                <DocumentSection
+                  title={intl.formatMessage(messages.download_agenda)}
+                  file={agenda_file}
+                />
+              )}
+
+              {background_documents && (
+                <DocumentSection
+                  title={intl.formatMessage(messages.download_documents)}
+                  file={background_documents}
+                />
               )}
 
               <h2>
@@ -86,20 +110,21 @@ function CcaEventView(props) {
                   defaultMessage="Participation"
                 />
               </h3>
-              <HTMLField value={content.participation} />
+              <HTMLField value={participation} />
 
               <h2>
                 <FormattedMessage id="Contact" defaultMessage="Contact" />
               </h2>
-              <p>
-                <FormattedMessage
-                  id="If you have any further questions you can contact"
-                  defaultMessage="If you have any further questions you can contact"
-                />{' '}
-                <a href="mailto:{content.contact_email}">
-                  {content.contact_email}
-                </a>
-              </p>
+
+              {contact_email && (
+                <p>
+                  <FormattedMessage
+                    id="If you have any further questions you can contact"
+                    defaultMessage="If you have any further questions you can contact"
+                  />{' '}
+                  <a href={`mailto:${contact_email}`}>{contact_email}</a>
+                </p>
+              )}
 
               {event_language && (
                 <>
@@ -123,7 +148,7 @@ function CcaEventView(props) {
                 <EventDetails {...props} />
               </Segment>
             </Grid.Column>
-          </div>
+          </Grid.Row>
         </Grid>
       </Container>
     </div>

package/src/index.js

@@ -4,6 +4,7 @@ import DefaultView from '@plone/volto/components/theme/View/DefaultView';
 import {
   RASTWidgetView,
   TranslationDisclaimer,
+  RedirectToLogin,
 } from '@eeacms/volto-cca-policy/components';
 import { blockAvailableInMission } from '@eeacms/volto-cca-policy/utils';
 
@@ -382,6 +383,12 @@ const applyConfig = (config) => {
       match: '',
       component: TranslationDisclaimer,
     },
+    {
+      match: {
+        path: /(.*)\/add/,
+      },
+      component: RedirectToLogin,
+    },
   ];
 
   config.settings.apiExpanders = [