@eeacms/volto-cca-policy 0.1.98 → 0.1.99

package/CHANGELOG.md

@@ -4,11 +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.1.98](https://github.com/eea/volto-cca-policy/compare/0.1.97...0.1.98) - 21 March 2024
+### [0.1.99](https://github.com/eea/volto-cca-policy/compare/0.1.98...0.1.99) - 22 March 2024
+
+#### :bug: Bug Fixes
+
+- fix(test): duplicated code [kreafox - [`c209673`](https://github.com/eea/volto-cca-policy/commit/c209673344363c43fe136bbc5824a2a312de7ae3)]
+- fix: banner on event and update snapshot [kreafox - [`6ad2ea2`](https://github.com/eea/volto-cca-policy/commit/6ad2ea24e013745afa9a71f006cdf7c05106f470)]
+- fix: duplicated title on cca event view as well [kreafox - [`af57d8d`](https://github.com/eea/volto-cca-policy/commit/af57d8d2c00488c82bc57db5d4c6c9e4e39c50d6)]
+- fix: duplicated title on event view [kreafox - [`2892c1d`](https://github.com/eea/volto-cca-policy/commit/2892c1d074de4f49079580b00512a890a50188ea)]
+- fix: events and news duplicated content [kreafox - [`cbca24d`](https://github.com/eea/volto-cca-policy/commit/cbca24d309b51f36478c07cadd7b5da24897f6bd)]
+
+#### :nail_care: Enhancements
+
+- change: hide dates on banner for database items [kreafox - [`2c83574`](https://github.com/eea/volto-cca-policy/commit/2c835749d2cd996fdd5661491e9f292e8115b775)]
 
 #### :hammer_and_wrench: Others
 
-- Fix sync translation link [Tiberiu Ichim - [`1d161e9`](https://github.com/eea/volto-cca-policy/commit/1d161e9a8fe8d6a3734d6d5b8399bb547be8d530)]
+- Add key to migration buttons [Tiberiu Ichim - [`b958ec9`](https://github.com/eea/volto-cca-policy/commit/b958ec999aa193a79ed67834478397681cfd7af7)]
+- i18n on database item [kreafox - [`8341cf3`](https://github.com/eea/volto-cca-policy/commit/8341cf385e9853faa7818ae9abc59665456abda6)]
+### [0.1.98](https://github.com/eea/volto-cca-policy/compare/0.1.97...0.1.98) - 21 March 2024
+
 ### [0.1.97](https://github.com/eea/volto-cca-policy/compare/0.1.96...0.1.97) - 20 March 2024
 
 #### :rocket: New Features

package/package.json

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

package/src/components/MigrationButtons.jsx

@@ -7,6 +7,7 @@ const button = (id, title, label, destination) => (
     id={id}
     onClick={() => window.open(destination, '_blank')}
     title={title}
+    key={id}
   >
     {label}
   </button>

package/src/components/theme/BannerTitle/BannerTitle.jsx

@@ -1,23 +1,5 @@
 import config from '@plone/volto/registry';
-
-const hasTypeOfBlock = (obj, targetKey, targetValue) => {
-  for (const key in obj) {
-    if (obj.hasOwnProperty(key)) {
-      if (key === targetKey && obj[key] === targetValue) {
-        // console.log(`Key "${targetKey}" with value "${targetValue}" found`);
-        return true;
-      }
-
-      if (typeof obj[key] === 'object' && obj[key] !== null) {
-        if (hasTypeOfBlock(obj[key], targetKey, targetValue)) {
-          return true;
-        }
-      }
-    }
-  }
-
-  return false;
-};
+import { hasTypeOfBlock } from '@eeacms/volto-cca-policy/utils';
 
 const BannerTitle = (props) => {
   const { content } = props;
@@ -38,10 +20,10 @@ const BannerTitle = (props) => {
           {...props}
           data={{
             info: [{ description: '' }],
-            hideContentType: true,
-            hideCreationDate: true,
-            hideModificationDate: true,
-            hidePublishingDate: true,
+            hideContentType: false,
+            hideCreationDate: false,
+            hideModificationDate: false,
+            hidePublishingDate: false,
             hideDownloadButton: false,
             hideShareButton: false,
           }}

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

@@ -163,7 +163,16 @@ function AdaptationOptionView(props) {
     <div className="db-item-view adaptation-option-view">
       <BannerTitle
         content={{ ...content, image: '' }}
-        type="Adaptation Option"
+        data={{
+          info: [{ description: '' }],
+          hideContentType: true,
+          hideCreationDate: true,
+          hideModificationDate: true,
+          hidePublishingDate: true,
+          hideDownloadButton: false,
+          hideShareButton: false,
+          subtitle: 'Adaptation Option',
+        }}
       />
       <TranslationDisclaimer />
 

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

@@ -155,7 +155,18 @@ function C3SIndicatorView(props) {
 
   return (
     <div className="db-item-view c3sindicator-view">
-      <BannerTitle content={{ ...content, image: '' }} />
+      <BannerTitle
+        content={{ ...content, image: '' }}
+        data={{
+          info: [{ description: '' }],
+          hideContentType: true,
+          hideCreationDate: true,
+          hideModificationDate: true,
+          hidePublishingDate: true,
+          hideDownloadButton: false,
+          hideShareButton: false,
+        }}
+      />
       <TranslationDisclaimer />
 
       <div className="ui container">

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

@@ -328,7 +328,19 @@ function CaseStudyView(props) {
 
   return (
     <div className="db-item-view case-study-view">
-      <BannerTitle content={{ ...content, image: '' }} type="Case Studies" />
+      <BannerTitle
+        content={{ ...content, image: '' }}
+        data={{
+          info: [{ description: '' }],
+          hideContentType: true,
+          hideCreationDate: true,
+          hideModificationDate: true,
+          hidePublishingDate: true,
+          hideDownloadButton: false,
+          hideShareButton: false,
+          subtitle: 'Case Studies',
+        }}
+      />
       <TranslationDisclaimer />
 
       <div className="ui container">

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

@@ -37,7 +37,18 @@ function CcaEventView(props) {
 
   return (
     <div className="cca-event-view">
-      <BannerTitle content={content} />
+      <BannerTitle
+        content={{ ...content, '@type': 'Climate adapt event' }}
+        data={{
+          info: [{ description: '' }],
+          hideContentType: false,
+          hideCreationDate: false,
+          hideModificationDate: false,
+          hidePublishingDate: false,
+          hideDownloadButton: false,
+          hideShareButton: false,
+        }}
+      />
       <TranslationDisclaimer />
 
       <div className="ui container">
@@ -50,16 +61,11 @@ function CcaEventView(props) {
               computer={9}
               className="col-left"
             >
-              {content?.image === null && (
-                <>
-                  <div className="ui label">Climate adapt event</div>
-                  <h1>{content.title}</h1>
-                </>
-              )}
-              <HTMLField value={content.text} className="long_description" />
+              <HTMLField value={content.text} />
 
               <h2>Agenda and supporting documents</h2>
-              <HTMLField value={content.agenda} className="long_description" />
+              <HTMLField value={content.agenda} />
+
               {content?.agenda_file && <DocumentsList content={agenda_files} />}
               {content?.background_documents && (
                 <DocumentsList content={background_documents} />
@@ -67,10 +73,7 @@ function CcaEventView(props) {
 
               <h2>Practical information</h2>
               <h3>Participation</h3>
-              <HTMLField
-                value={content.participation}
-                className="long_description"
-              />
+              <HTMLField value={content.participation} />
 
               <h2>Contact</h2>
               <p>

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

@@ -6,6 +6,7 @@ import {
   INFORMATION_PORTAL,
   PUBICATION_REPORT,
   ORGANISATION,
+  VIDEO,
 } from '@eeacms/volto-cca-policy/helpers/Constants';
 import {
   HTMLField,
@@ -15,6 +16,7 @@ import {
   ItemLogo,
   ContentRelatedItems,
   DocumentsList,
+  ExternalLink,
   BannerTitle,
 } from '@eeacms/volto-cca-policy/helpers';
 import {
@@ -22,11 +24,16 @@ import {
   PortalMessage,
   TranslationDisclaimer,
 } from '@eeacms/volto-cca-policy/components';
-import { isObservatoryMetadataURL } from '@eeacms/volto-cca-policy/helpers';
+import {
+  isObservatoryMetadataURL,
+  fixEmbedURL,
+} from '@eeacms/volto-cca-policy/helpers';
 import { Divider, Grid } from 'semantic-ui-react';
 import { useLocation } from 'react-router-dom';
 import { FormattedMessage } from 'react-intl';
 
+const share_eea = ['https://cmshare.eea.eu', 'shareit.eea.europa.eu'];
+
 const DatabaseItemView = (props) => {
   const { content } = props;
   const type = content['@type'];
@@ -35,11 +42,13 @@ const DatabaseItemView = (props) => {
   const {
     title,
     acronym,
+    embed_url,
     map_graphs,
     long_description,
     organisational_websites,
     organisational_key_activities,
     organisational_contact_information,
+    related_documents_presentations,
   } = content;
   const item_title = acronym ? title + ' (' + acronym + ')' : title;
 
@@ -63,6 +72,9 @@ const DatabaseItemView = (props) => {
     case ORGANISATION:
       subtitle = 'Organisation';
       break;
+    case VIDEO:
+      subtitle = 'Video';
+      break;
     default:
       subtitle = '';
   }
@@ -81,11 +93,24 @@ const DatabaseItemView = (props) => {
     return null;
   };
 
+  const is_cmshare_video = share_eea.some((domain) =>
+    content?.embed_url?.includes(domain),
+  );
+
   return (
     <div className="db-item-view">
       <BannerTitle
         content={{ ...content, image: '', title: item_title }}
-        type={subtitle}
+        data={{
+          info: [{ description: '' }],
+          hideContentType: true,
+          hideCreationDate: true,
+          hideModificationDate: true,
+          hidePublishingDate: true,
+          hideDownloadButton: false,
+          hideShareButton: false,
+          subtitle: subtitle,
+        }}
       />
       <TranslationDisclaimer />
 
@@ -100,8 +125,60 @@ const DatabaseItemView = (props) => {
               className="col-left"
             >
               <ItemLogo {...props}></ItemLogo>
+
+              {type === VIDEO && (
+                <>
+                  {is_cmshare_video && (
+                    <div className="video-wrapper">
+                      <center>
+                        <video
+                          controls="controls"
+                          preload="metadata"
+                          width="100%"
+                          height="480"
+                          src={fixEmbedURL(embed_url, is_cmshare_video)}
+                        >
+                          <track default kind="captions" srcLang="en" src="" />
+                        </video>
+                      </center>
+                    </div>
+                  )}
+                </>
+              )}
+
               <HTMLField value={long_description} />
 
+              {type === VIDEO && (
+                <>
+                  {!is_cmshare_video && (
+                    <div className="external-video">
+                      <ExternalLink
+                        url={embed_url}
+                        text={
+                          <FormattedMessage
+                            id="See video outside Climate-ADAPT"
+                            defaultMessage="See video outside Climate-ADAPT"
+                          />
+                        }
+                      />
+                    </div>
+                  )}
+                </>
+              )}
+
+              {related_documents_presentations && (
+                <>
+                  <Divider />
+                  <h2 className="reference-title">
+                    <FormattedMessage
+                      id="Related documents and presentations"
+                      defaultMessage="Related documents and presentations"
+                    />
+                  </h2>
+                  <HTMLField value={related_documents_presentations} />
+                </>
+              )}
+
               {isObservatoryItem && (
                 <>
                   {organisational_key_activities && (
@@ -109,7 +186,7 @@ const DatabaseItemView = (props) => {
                       <h3>
                         <FormattedMessage
                           id="Key activities within climate change and health"
-                          defaultMessage=" Key activities within climate change and health"
+                          defaultMessage="Key activities within climate change and health"
                         />
                       </h3>
                       <HTMLField value={organisational_key_activities} />

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

@@ -1,5 +1,4 @@
 import React from 'react';
-import { HTMLField } from '@eeacms/volto-cca-policy/helpers';
 import {
   BannerTitle,
   PortalMessage,
@@ -12,7 +11,6 @@ import { FormattedMessage } from 'react-intl';
 
 function CcaEventView(props) {
   const { content } = props;
-  // cca_files: [content.agenda_file]}
 
   return (
     <div className="cca-event-view">
@@ -29,14 +27,6 @@ function CcaEventView(props) {
               computer={9}
               className="col-left"
             >
-              {content?.image === null && (
-                <>
-                  <div className="ui label">Climate adapt event</div>
-                  <h1>{content.title}</h1>
-                </>
-              )}
-              <p>{content.description}</p>
-              <HTMLField value={content.text} className="long_description" />
               <RenderBlocks {...props} />
             </Grid.Column>
             <Grid.Column

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

@@ -1,6 +1,5 @@
 // import { When } from '@plone/volto/components/theme/View/EventDatesInfo';
 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 {
@@ -30,17 +29,16 @@ const SubjectTags = (props) => {
   ) : null;
 };
 
-function CcaEventView(props) {
+function NewsItemView(props) {
   const { content } = props;
 
   return (
     <div className="cca-newsitem-view">
       <BannerTitle content={content} />
       <TranslationDisclaimer />
+
       <div className="ui container">
         <PortalMessage content={content} />
-        <p>{content.description}</p>
-        <HTMLField value={content.text} className="long_description" />
         <RenderBlocks {...props} />
         {/* <Date {...props} /> */}
         <SubjectTags {...props} />
@@ -49,4 +47,4 @@ function CcaEventView(props) {
   );
 }
 
-export default CcaEventView;
+export default NewsItemView;

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

@@ -34,9 +34,9 @@ function ProjectView(props) {
         data={{
           info: [{ description: '' }],
           hideContentType: true,
-          hideCreationDate: false,
-          hideModificationDate: false,
-          hidePublishingDate: false,
+          hideCreationDate: true,
+          hideModificationDate: true,
+          hidePublishingDate: true,
           hideDownloadButton: false,
           hideShareButton: false,
           subtitle: 'Project',

package/src/helpers/Utils.jsx

@@ -17,6 +17,7 @@ import {
   ORGANISATION,
   ADAPTATION_OPTION,
   ACE_PROJECT,
+  VIDEO,
 } from '@eeacms/volto-cca-policy/helpers/Constants';
 import { makeContributionsSearchQuery } from '@eeacms/volto-cca-policy/helpers';
 
@@ -84,28 +85,13 @@ export const LinksList = (props) => {
 };
 
 export const BannerTitle = (props) => {
-  const { content, type } = props;
+  const { content, data } = props;
   const {
     blocks: { blocksConfig },
   } = config;
   const TitleBlockView = blocksConfig?.title?.view;
 
-  return (
-    <TitleBlockView
-      {...props}
-      data={{
-        info: [{ description: '' }],
-        hideContentType: true,
-        hideCreationDate: false,
-        hideModificationDate: false,
-        hidePublishingDate: false,
-        hideDownloadButton: false,
-        hideShareButton: false,
-        subtitle: type,
-      }}
-      metadata={content}
-    />
-  );
+  return <TitleBlockView {...props} data={data} metadata={content} />;
 };
 
 export const ReferenceInfo = (props) => {
@@ -393,6 +379,7 @@ export const LogoWrapper = ({ logo, children }) =>
 
 export const ItemLogo = (props) => {
   const { content } = props;
+  const type = content['@type'];
   const { image, logo, title } = content;
 
   let logo_image;
@@ -404,7 +391,7 @@ export const ItemLogo = (props) => {
     logo_image = null;
   }
 
-  return (
+  return type !== VIDEO ? (
     <LogoWrapper logo={logo_image}>
       <h2>
         <FormattedMessage id="Description" defaultMessage="Description" />
@@ -417,5 +404,5 @@ export const ItemLogo = (props) => {
         />
       )}
     </LogoWrapper>
-  );
+  ) : null;
 };

package/src/helpers/index.js

@@ -61,3 +61,11 @@ export const isObservatoryMetadataURL = (url) => {
 export const makeObservatoryMetadataURL = (url) => {
   return url.replace('/metadata/', '/observatory/++aq++metadata/');
 };
+
+export const fixEmbedURL = (url, is_cmshare_video) => {
+  const suffix = '/download';
+  if (is_cmshare_video && !url.includes(suffix)) {
+    return url + suffix;
+  }
+  return url;
+};

package/src/index.js

@@ -7,7 +7,6 @@ import EventView from './components/theme/Views/EventView';
 import AdaptationOptionView from './components/theme/Views/AdaptationOptionView';
 import CaseStudyView from './components/theme/Views/CaseStudyView';
 import ProjectView from './components/theme/Views/ProjectView';
-import VideoView from './components/theme/Views/VideoView';
 import C3SIndicatorView from './components/theme/Views/C3SIndicatorView';
 import DatabaseItemView from './components/theme/Views/DatabaseItemView';
 
@@ -268,7 +267,7 @@ const applyConfig = (config) => {
     'eea.climateadapt.guidancedocument': DatabaseItemView,
     'eea.climateadapt.informationportal': DatabaseItemView,
     'eea.climateadapt.publicationreport': DatabaseItemView,
-    'eea.climateadapt.video': VideoView,
+    'eea.climateadapt.video': DatabaseItemView,
     'eea.climateadapt.aceproject': ProjectView,
     'eea.climateadapt.casestudy': CaseStudyView,
     'eea.climateadapt.c3sindicator': C3SIndicatorView,

package/src/search/common.js

@@ -100,7 +100,7 @@ export const issued_date = {
     },
   ],
   default: {
-    values: ['Last 5 years'],
+    values: ['All time'],
     type: 'any',
   },
 };

package/src/utils.js

@@ -31,3 +31,22 @@ export function getBaseUrl(props) {
   }
   return path;
 }
+
+export const hasTypeOfBlock = (obj, type, name) => {
+  for (const key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      if (key === type && obj[key] === name) {
+        // console.log(`Key "${type}" with value "${name}" found`);
+        return true;
+      }
+
+      if (typeof obj[key] === 'object' && obj[key] !== null) {
+        if (hasTypeOfBlock(obj[key], type, name)) {
+          return true;
+        }
+      }
+    }
+  }
+
+  return false;
+};

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

@@ -1,118 +0,0 @@
-import React from 'react';
-import {
-  HTMLField,
-  ReferenceInfo,
-  ContentMetadata,
-  ExternalLink,
-  BannerTitle,
-} from '@eeacms/volto-cca-policy/helpers';
-import { Divider, Image, Grid } from 'semantic-ui-react';
-import {
-  ShareInfoButton,
-  PortalMessage,
-  TranslationDisclaimer,
-} from '@eeacms/volto-cca-policy/components';
-
-function VideoView(props) {
-  const { content } = props;
-  const {
-    logo,
-    title,
-    embed_url,
-    long_description,
-    related_documents_presentations,
-  } = content;
-
-  const share_eea = ['https://cmshare.eea.eu', 'shareit.eea.europa.eu'];
-  const is_cmshare_video = share_eea.some((domain) =>
-    content?.embed_url?.includes(domain),
-  );
-
-  const fixEmbedURL = (url) => {
-    const suffix = '/download';
-    if (is_cmshare_video && !url.includes(suffix)) {
-      return url + suffix;
-    }
-    return url;
-  };
-
-  return (
-    <div className="db-item-view video-view">
-      <BannerTitle content={{ ...content, image: '' }} type="Video" />
-      <TranslationDisclaimer />
-
-      <div className="ui container">
-        <PortalMessage content={content} />
-        <Grid columns="12">
-          <div className="row">
-            <Grid.Column
-              mobile={12}
-              tablet={12}
-              computer={8}
-              className="col-left"
-            >
-              {is_cmshare_video && (
-                <div className="video-wrapper">
-                  <center>
-                    <video
-                      controls="controls"
-                      preload="metadata"
-                      width="100%"
-                      height="480"
-                      src={fixEmbedURL(embed_url)}
-                    >
-                      <track default kind="captions" srcLang="en" src="" />
-                    </video>
-                  </center>
-                </div>
-              )}
-
-              <HTMLField value={long_description} />
-
-              {!is_cmshare_video && (
-                <div className="external-video">
-                  <ExternalLink
-                    url={embed_url}
-                    text="See video outside Climate-ADAPT"
-                  />
-                </div>
-              )}
-
-              <Divider />
-
-              {related_documents_presentations && (
-                <>
-                  <h2 className="reference-title">
-                    Related documents and presentations
-                  </h2>
-                  <HTMLField value={related_documents_presentations} />
-                </>
-              )}
-
-              <ReferenceInfo content={content} />
-              <ShareInfoButton {...props} />
-            </Grid.Column>
-            <Grid.Column
-              mobile={12}
-              tablet={12}
-              computer={4}
-              className="col-right"
-            >
-              <ContentMetadata {...props} />
-
-              {logo && (
-                <Image
-                  src={logo?.scales?.mini?.download}
-                  alt={title}
-                  className="db-logo"
-                />
-              )}
-            </Grid.Column>
-          </div>
-        </Grid>
-      </div>
-    </div>
-  );
-}
-
-export default VideoView;

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

@@ -1,50 +0,0 @@
-import React from 'react';
-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 VideoView from './VideoView';
-import renderer from 'react-test-renderer';
-import config from '@plone/volto/registry';
-
-config.blocks = {
-  blocksConfig: {
-    title: {
-      view: () => <div>Title Block Component</div>,
-    },
-  },
-};
-
-const mockStore = configureStore();
-
-jest.mock('semantic-ui-react', () => ({
-  ...jest.requireActual('semantic-ui-react'),
-}));
-
-describe('VideoView', () => {
-  it('should render the component', () => {
-    const content = {
-      title: 'My VideoView',
-      geochars:
-        '{\r\n "geoElements":{"element":"GLOBAL",\r\n "macrotrans":null,"biotrans":null,"countries":[],\r\n "subnational":[],"city":""}}',
-    };
-
-    const store = mockStore({
-      userSession: { token: '1234' },
-      intl: {
-        locale: 'en',
-        messages: {},
-      },
-    });
-
-    const component = renderer.create(
-      <Provider store={store}>
-        <MemoryRouter>
-          <VideoView content={content} />
-        </MemoryRouter>
-      </Provider>,
-    );
-    const json = component.toJSON();
-    expect(json).toMatchSnapshot();
-  });
-});