@eeacms/volto-cca-policy 0.1.91 → 0.1.92

package/CHANGELOG.md

@@ -4,6 +4,33 @@ 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.1.92](https://github.com/eea/volto-cca-policy/compare/0.1.91...0.1.92) - 6 March 2024
+
+#### :rocket: New Features
+
+- feat: add portal message for archived content [kreafox - [`e430c84`](https://github.com/eea/volto-cca-policy/commit/e430c849011fbf5c09a52a2785898d850c8904ab)]
+
+#### :bug: Bug Fixes
+
+- fix(views): remove RenderBlocks from CCA Event [kreafox - [`b3037d5`](https://github.com/eea/volto-cca-policy/commit/b3037d5f69616ad5542f63f00f8f88749c08d77e)]
+- fix(views): fix condition [kreafox - [`bdf40c9`](https://github.com/eea/volto-cca-policy/commit/bdf40c9ae6c2b8fd9094f6fcb50cf4a5d60e09d7)]
+- fix(tests): more cleanup on db items view [kreafox - [`ea7dbeb`](https://github.com/eea/volto-cca-policy/commit/ea7dbeb1b44295450f8953f6e96ca8a6a1e6cf0a)]
+- fix(test): duplicated code issue [kreafox - [`80027ee`](https://github.com/eea/volto-cca-policy/commit/80027eebc1739bd90976a24b4e1b760d35d7f82a)]
+- fix(views): logo on db items view [kreafox - [`15b7cad`](https://github.com/eea/volto-cca-policy/commit/15b7cadff03dd5532c11209308d58f655131d1ab)]
+- fix(views): add missing fields [kreafox - [`1d50f3d`](https://github.com/eea/volto-cca-policy/commit/1d50f3d5f9497c2591b53ef3b57dd49079ee4224)]
+
+#### :nail_care: Enhancements
+
+- change(views): use DatabaseItemView for Organisation item [kreafox - [`30d0e18`](https://github.com/eea/volto-cca-policy/commit/30d0e18894b6a70ba7b95c8154659b8785128831)]
+- change(views):  Elements -> Adaptation elements [kreafox - [`5575a68`](https://github.com/eea/volto-cca-policy/commit/5575a684253ec32f799d58c613698cd0e3725950)]
+
+#### :hammer_and_wrench: Others
+
+- test: update snapshot [kreafox - [`a8bf420`](https://github.com/eea/volto-cca-policy/commit/a8bf420e9bb62a315ab0eec3c2c37f63312234d4)]
+- Change label for search in observatory [Tiberiu Ichim - [`1d9848f`](https://github.com/eea/volto-cca-policy/commit/1d9848f31d89d9ad969609d4b1f1860b814ad001)]
+- test: WIP on reduce duplicated code by adding a common view for DB items [kreafox - [`92e33e8`](https://github.com/eea/volto-cca-policy/commit/92e33e866c709ab132e78214e2422c8dec914d22)]
+- test: more cleanup [kreafox - [`5b3aa8e`](https://github.com/eea/volto-cca-policy/commit/5b3aa8e4735eb0b02e8142bbebd4b2ae15b89bbd)]
+- tests: update snapshots [kreafox - [`3acbec8`](https://github.com/eea/volto-cca-policy/commit/3acbec8db2f069e2ea62051a43bde563e095d277)]
 ### [0.1.91](https://github.com/eea/volto-cca-policy/compare/0.1.90...0.1.91) - 5 March 2024
 
 #### :bug: Bug Fixes
@@ -13,7 +40,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Add test file [Tiberiu Ichim - [`282e32c`](https://github.com/eea/volto-cca-policy/commit/282e32cde07122150379df996b19d37eed3e0260)]
-- Add override for UniversalLink, see #266263 [Tiberiu Ichim - [`63242f5`](https://github.com/eea/volto-cca-policy/commit/63242f5fc4b0e54d1170b8f8ee31dba46e997eee)]
 ### [0.1.90](https://github.com/eea/volto-cca-policy/compare/0.1.89...0.1.90) - 5 March 2024
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/index.js

@@ -1,2 +1,3 @@
 export ImageGallery from './theme/ImageGallery/ImageGallery';
 export BannerTitle from './theme/BannerTitle/BannerTitle';
+export PortalMessage from './theme/PortalMessage/PortalMessage';

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

@@ -15,30 +15,32 @@ const OrganisationCardsListingView = ({ items, isEditMode, token }) => {
       'european-commission': 'European Commission',
       'european-environment-agency-eea': 'European Environment Agency',
       'european-food-safety-authority': 'European Food Safety Authority',
-      'lancet-countdown': 'Lancet Countdown',
+      'lancet-countdown': 'Lancet Countdown in Europe',
       'who-regional-office-for-europe-who-europe':
         'WHO Regional Office for Europe',
       'world-health-organization': 'World Health Organization',
+      'association-schools-public-health-in-european-region-aspher':
+        'The Association of Schools of Public Health in the European Region',
     };
     const org = mapContributorValues[item['@id'].split('/').pop()] || '';
-    const query = {
-      query: {
-        function_score: {
-          query: {
-            bool: {
-              filter: {
-                bool: {
-                  should: [{ term: { partner_contributors: org } }],
-                },
-              },
-            },
-          },
-        },
-      },
-    };
+    const query =
+      'size=n_10_n' +
+      '&filters[0][field]=cca_partner_contributors.keyword' +
+      '&filters[0][values][0]=' +
+      org +
+      '&filters[0][type]=any' +
+      '&filters[1][field]=issued.date' +
+      '&filters[1][values][0]=Last 5 years' +
+      '&filters[1][type]=any' +
+      '&filters[2][field]=language' +
+      '&filters[2][values][0]=en' +
+      '&filters[2][type]=any' +
+      '&sort-field=issued.date' +
+      '&sort-direction=desc';
 
-    const encodedQuery = encodeURIComponent(JSON.stringify(query));
-    return `/en/observatory/advanced-search/?source=${encodedQuery}`;
+    return `/en/observatory/advanced-search?${query
+      .replaceAll('[', '%5B')
+      .replaceAll(']', '%5D')}`;
   };
 
   return (

package/src/components/theme/PortalMessage/PortalMessage.jsx

@@ -0,0 +1,19 @@
+import { Message, Icon } from 'semantic-ui-react';
+
+const PortalMessage = (props) => {
+  const { content } = props;
+  const { review_state } = content;
+  const isArchivedContent = review_state === 'archived';
+
+  return isArchivedContent ? (
+    <Message info icon>
+      <Icon name="info" />
+      <Message.Content>
+        This object has been archived because its content is outdated. You can
+        still access it as legacy.
+      </Message.Content>
+    </Message>
+  ) : null;
+};
+
+export default PortalMessage;

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

@@ -2,7 +2,7 @@ import React, { Fragment } from 'react';
 import {
   HTMLField,
   ContentMetadata,
-  LinksList,
+  ReferenceInfo,
   PublishedModifiedInfo,
   ShareInfo,
   BannerTitle,
@@ -10,6 +10,7 @@ import {
 } from '@eeacms/volto-cca-policy/helpers';
 import { Segment, Divider, Image, Grid } from 'semantic-ui-react';
 import { UniversalLink } from '@plone/volto/components';
+import { PortalMessage } from '@eeacms/volto-cca-policy/components';
 
 function createDataField(type, field, section, title) {
   return {
@@ -106,8 +107,6 @@ function AdaptationOptionView(props) {
   const {
     related_case_studies,
     long_description,
-    websites,
-    source,
     ipcc_category,
     logo,
     title,
@@ -125,6 +124,7 @@ function AdaptationOptionView(props) {
       />
 
       <div className="ui container">
+        <PortalMessage content={content} />
         <Grid columns="12">
           <div className="row">
             <Grid.Column
@@ -180,16 +180,7 @@ function AdaptationOptionView(props) {
                 </Fragment>
               )}
 
-              <h2>Reference information</h2>
-
-              {websites && websites?.length > 0 && (
-                <LinksList title="Websites:" value={websites} />
-              )}
-
-              <div id="source" className="section">
-                <h5 id="source">References:</h5>
-                <HTMLField value={source} />
-              </div>
+              <ReferenceInfo content={content} />
 
               <PublishedModifiedInfo {...props} />
               <ShareInfo {...props} />
@@ -201,9 +192,8 @@ function AdaptationOptionView(props) {
               computer={4}
               className="col-right"
             >
-              <Segment>
-                <ContentMetadata {...props} />
-              </Segment>
+              <ContentMetadata {...props} />
+
               {related_case_studies?.length > 0 && (
                 <Segment>
                   <h5>Case studies related to this option:</h5>

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

@@ -6,6 +6,7 @@ import {
   LogoWrapper,
 } from '@eeacms/volto-cca-policy/helpers';
 import { Accordion, Icon, Segment, Image } from 'semantic-ui-react';
+import { PortalMessage } from '@eeacms/volto-cca-policy/components';
 
 if (!__SERVER__) {
   window.cds_toolbox = {
@@ -153,6 +154,7 @@ function C3SIndicatorView(props) {
       <BannerTitle content={{ ...content, image: '' }} />
 
       <div className="ui container">
+        <PortalMessage content={content} />
         <LogoWrapper logo={logo}>
           <h2>Background information</h2>
           {logo && (

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

@@ -8,8 +8,9 @@ import {
   ShareInfo,
   BannerTitle,
 } from '@eeacms/volto-cca-policy/helpers';
-import { Divider, Segment, Grid, Icon, Image } from 'semantic-ui-react';
+import { Divider, Grid, Icon, Image } from 'semantic-ui-react';
 import { ImageGallery } from '@eeacms/volto-cca-policy/components';
+import { PortalMessage } from '@eeacms/volto-cca-policy/components';
 
 const PrimaryPhoto = (props) => {
   const { content } = props;
@@ -236,8 +237,7 @@ const SectionContent = (props) => {
 
 function CaseStudyView(props) {
   const { content } = props;
-  const { cca_files, long_description } = content;
-  const hasFiles = cca_files && cca_files.length > 0;
+  const { long_description } = content;
 
   const hasValue = (field) => {
     if (!content.hasOwnProperty(field)) {
@@ -263,6 +263,7 @@ function CaseStudyView(props) {
       <BannerTitle content={{ ...content, image: '' }} type="Case Studies" />
 
       <div className="ui container">
+        <PortalMessage content={content} />
         <Grid columns="12">
           <div className="row">
             <Grid.Column
@@ -343,14 +344,10 @@ function CaseStudyView(props) {
               className="col-right"
             >
               <PhotoGallery {...props} />
-              <Segment>
-                <ContentMetadata {...props} />
-              </Segment>
-              {hasFiles && (
-                <Segment>
-                  <DocumentsList {...props} />
-                </Segment>
-              )}
+
+              <ContentMetadata {...props} />
+
+              <DocumentsList {...props} />
             </Grid.Column>
           </div>
         </Grid>

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

@@ -1,9 +1,12 @@
 import React from 'react';
-import { DocumentsList, HTMLField } from '@eeacms/volto-cca-policy/helpers';
-import { BannerTitle } from '@eeacms/volto-cca-policy/components';
-import { When } from '@plone/volto/components/theme/View/EventDatesInfo';
 import { Grid } from 'semantic-ui-react';
-import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
+import {
+  DocumentsList,
+  HTMLField,
+  BannerTitle,
+} from '@eeacms/volto-cca-policy/helpers';
+import { When } from '@plone/volto/components/theme/View/EventDatesInfo';
+import { PortalMessage } from '@eeacms/volto-cca-policy/components';
 
 function CcaEventView(props) {
   const { content } = props;
@@ -34,6 +37,7 @@ function CcaEventView(props) {
       <BannerTitle content={content} />
 
       <div className="ui container">
+        <PortalMessage content={content} />
         <Grid columns="12">
           <div className="row">
             <Grid.Column
@@ -49,7 +53,6 @@ function CcaEventView(props) {
                 </>
               )}
               <HTMLField value={content.text} className="long_description" />
-              <RenderBlocks {...props} />
 
               <h2>Agenda and supporting documents</h2>
               <HTMLField value={content.agenda} className="long_description" />

package/src/components/theme/Views/{IndicatorView.jsx → DatabaseItemView.jsx}

@@ -1,28 +1,63 @@
 import React from 'react';
+import {
+  TOOL,
+  GUIDANCE,
+  INDICATOR,
+  INFORMATION_PORTAL,
+  PUBICATION_REPORT,
+  ORGANISATION,
+} from '@eeacms/volto-cca-policy/helpers/Constants';
 import {
   HTMLField,
+  ReferenceInfo,
   ContentMetadata,
-  LinksList,
   PublishedModifiedInfo,
+  LogoWrapper,
   ShareInfo,
+  ContentRelatedItems,
+  DocumentsList,
   BannerTitle,
-  LogoWrapper,
 } from '@eeacms/volto-cca-policy/helpers';
-import { Segment, Divider, Image, Grid } from 'semantic-ui-react';
+import { PortalMessage } from '@eeacms/volto-cca-policy/components';
+import { Divider, Image, Grid } from 'semantic-ui-react';
 
-function IndicatorView(props) {
+const DatabaseItemView = (props) => {
   const { content } = props;
+  const type = content['@type'];
   const {
-    long_description,
-    websites,
-    source,
-    contributor_list,
-    other_contributor,
     logo,
     title,
+    long_description,
     map_graphs,
+    organisational_key_activities,
+    organisational_websites,
+    organisational_contact_information,
   } = content;
 
+  let subtitle;
+  switch (type) {
+    case TOOL:
+      subtitle = 'Tools';
+      break;
+    case PUBICATION_REPORT:
+      subtitle = 'Publications and Report';
+      break;
+    case GUIDANCE:
+      subtitle = 'Guidance Document';
+      break;
+    case INDICATOR:
+      subtitle = 'Indicator';
+      break;
+    case INFORMATION_PORTAL:
+      subtitle = 'Information Portal';
+      break;
+    case ORGANISATION:
+      subtitle = 'Organisation';
+      break;
+    default:
+      subtitle = '';
+  }
+
   // https://helpcenter.flourish.studio/hc/en-us/articles/8761537208463-How-to-embed-Flourish-charts-in-your-CMS
   const data_src = (map_graphs) => {
     if (typeof map_graphs === 'string') {
@@ -38,10 +73,11 @@ function IndicatorView(props) {
   };
 
   return (
-    <div className="db-item-view indicator-view">
-      <BannerTitle content={{ ...content, image: '' }} type="Indicator" />
+    <div className="db-item-view">
+      <BannerTitle content={{ ...content, image: '' }} type={subtitle} />
 
       <div className="ui container">
+        <PortalMessage content={content} />
         <Grid columns="12">
           <div className="row">
             <Grid.Column
@@ -62,6 +98,13 @@ function IndicatorView(props) {
               </LogoWrapper>
               <HTMLField value={long_description} />
 
+              {organisational_key_activities && (
+                <>
+                  <h3>Key activities within climate change and health</h3>
+                  <HTMLField value={organisational_key_activities} />
+                </>
+              )}
+
               {!!data_src(map_graphs) && (
                 <iframe
                   height="980"
@@ -71,53 +114,46 @@ function IndicatorView(props) {
                   className="flourish-embed-iframe"
                   frameBorder="0"
                   scrolling="no"
-                  // style="width:100%;height:600px;"
                   sandbox="allow-same-origin allow-forms allow-scripts allow-downloads allow-popups allow-popups-to-escape-sandbox allow-top-navigation-by-user-activation"
                 ></iframe>
               )}
-
               <Divider />
-              <h2>Reference information</h2>
 
-              {websites && websites?.length > 0 && (
-                <LinksList title="Websites:" value={websites} />
+              <ReferenceInfo content={content} />
+
+              {organisational_websites && (
+                <>
+                  <h5>Links to further information</h5>
+                  <HTMLField value={organisational_websites} />
+                </>
               )}
 
-              <h5>Source:</h5>
-              <HTMLField value={source} />
-              {(contributor_list?.length > 0 ||
-                other_contributor?.length > 0) && (
+              {organisational_contact_information && (
                 <>
-                  <h4>Contributor:</h4>
-                  {contributor_list
-                    .map((item) => (
-                      <>
-                        {item.title}
-                        <br />
-                      </>
-                    ))
-                    .sort()}
-                  {other_contributor}
+                  <h5>Contact information for the Observatory</h5>
+                  <HTMLField value={organisational_contact_information} />
                 </>
               )}
+
+              <ContentRelatedItems {...props} />
               <PublishedModifiedInfo {...props} />
               <ShareInfo {...props} />
             </Grid.Column>
+
             <Grid.Column
               mobile={12}
               tablet={12}
               computer={4}
               className="col-right"
             >
-              <Segment>
-                <ContentMetadata {...props} />
-              </Segment>
+              <ContentMetadata {...props} />
+              <DocumentsList {...props} />
             </Grid.Column>
           </div>
         </Grid>
       </div>
     </div>
   );
-}
+};
 
-export default IndicatorView;
+export default DatabaseItemView;

package/src/components/theme/Views/{InformationPortalView.test.jsx → DatabaseItemView.test.jsx}

@@ -3,7 +3,7 @@ import { MemoryRouter } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
 import '@testing-library/jest-dom/extend-expect';
 import { Provider } from 'react-intl-redux';
-import InformationPortalView from './InformationPortalView';
+import DatabaseItemView from './DatabaseItemView';
 import renderer from 'react-test-renderer';
 import config from '@plone/volto/registry';
 
@@ -21,12 +21,20 @@ jest.mock('semantic-ui-react', () => ({
   ...jest.requireActual('semantic-ui-react'),
 }));
 
-describe('InformationPortalView', () => {
+describe('DatabaseItemView', () => {
   it('should render the component', () => {
     const content = {
-      title: 'My InformationPortalView',
+      title: 'My DatabaseItemView',
+      long_description: {
+        'content-type': null,
+        data:
+          '<p>Nam commodo suscipit quam. Praesent egestas neque eu enim. Quisque rutrum.</p>',
+        encoding: 'utf-8',
+      },
       geochars:
         '{\r\n "geoElements":{"element":"GLOBAL",\r\n "macrotrans":null,"biotrans":null,"countries":[],\r\n "subnational":[],"city":""}}',
+      keywords: ['keyword 1', 'keyword 2'],
+      websites: ['https://example.org/'],
     };
 
     const store = mockStore({
@@ -40,7 +48,7 @@ describe('InformationPortalView', () => {
     const component = renderer.create(
       <Provider store={store}>
         <MemoryRouter>
-          <InformationPortalView content={content} />
+          <DatabaseItemView content={content} />
         </MemoryRouter>
       </Provider>,
     );

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

@@ -1,6 +1,9 @@
 import React from 'react';
 import { HTMLField } from '@eeacms/volto-cca-policy/helpers';
-import { BannerTitle } from '@eeacms/volto-cca-policy/components';
+import {
+  BannerTitle,
+  PortalMessage,
+} from '@eeacms/volto-cca-policy/components';
 import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
 import { When } from '@plone/volto/components/theme/View/EventDatesInfo';
 import { Grid } from 'semantic-ui-react';
@@ -14,6 +17,7 @@ function CcaEventView(props) {
       <BannerTitle content={content} />
 
       <div className="ui container">
+        <PortalMessage content={content} />
         <Grid columns="12">
           <div className="row">
             <Grid.Column

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

@@ -3,7 +3,10 @@ import React from 'react';
 import { HTMLField } from '@eeacms/volto-cca-policy/helpers';
 import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
 import { Label } from 'semantic-ui-react';
-import { BannerTitle } from '@eeacms/volto-cca-policy/components';
+import {
+  BannerTitle,
+  PortalMessage,
+} from '@eeacms/volto-cca-policy/components';
 
 // const Date = (props) => {
 //   const date = props.content?.effective;
@@ -33,6 +36,7 @@ function CcaEventView(props) {
     <div className="cca-newsitem-view">
       <BannerTitle content={content} />
       <div className="ui container">
+        <PortalMessage content={content} />
         <p>{content.description}</p>
         <HTMLField value={content.text} className="long_description" />
         <RenderBlocks {...props} />

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

@@ -2,12 +2,13 @@ import React from 'react';
 import {
   HTMLField,
   ContentMetadata,
-  LinksList,
   PublishedModifiedInfo,
   ShareInfo,
+  ReferenceInfo,
   LogoWrapper,
 } from '@eeacms/volto-cca-policy/helpers';
-import { Divider, Segment, Image, Grid } from 'semantic-ui-react';
+import { Divider, Image, Grid } from 'semantic-ui-react';
+import { PortalMessage } from '@eeacms/volto-cca-policy/components';
 
 import config from '@plone/volto/registry';
 
@@ -20,7 +21,6 @@ function ProjectView(props) {
     partners,
     acronym,
     title,
-    websites,
     logo,
   } = content;
 
@@ -51,6 +51,7 @@ function ProjectView(props) {
       />
 
       <div className="ui container">
+        <PortalMessage content={content} />
         <Grid columns="12">
           <div className="row">
             <Grid.Column
@@ -86,12 +87,7 @@ function ProjectView(props) {
               )}
 
               <Divider />
-              <h2>Reference information</h2>
-
-              {websites && websites?.length > 0 && (
-                <LinksList title="Websites:" value={websites} />
-              )}
-
+              <ReferenceInfo content={content} />
               <PublishedModifiedInfo {...props} />
               <ShareInfo {...props} />
             </Grid.Column>
@@ -101,9 +97,7 @@ function ProjectView(props) {
               computer={4}
               className="col-right"
             >
-              <Segment>
-                <ContentMetadata {...props} />
-              </Segment>
+              <ContentMetadata {...props} />
             </Grid.Column>
           </div>
         </Grid>