@eeacms/volto-cca-policy 0.2.39 → 0.2.41

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.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)]
+
+#### :hammer_and_wrench: Others
+
+- Tweak default expands [Tiberiu Ichim - [`e721114`](https://github.com/eea/volto-cca-policy/commit/e7211143178f25279541cf974ce41e8b4ae2c3b3)]
+### [0.2.40](https://github.com/eea/volto-cca-policy/compare/0.2.39...0.2.40) - 31 May 2024
+
+#### :bug: Bug Fixes
+
+- fix: wrong tooltip for date info; simplify code [kreafox - [`2aa1bdb`](https://github.com/eea/volto-cca-policy/commit/2aa1bdb0fe380e8f3d0559c215ae0f3006cb2e76)]
+- fix: typo in constants [kreafox - [`2372a2c`](https://github.com/eea/volto-cca-policy/commit/2372a2c0c61c7dd360e74f3cdd997d2afa577c4d)]
+- fix: add missing region to constants [kreafox - [`a89d899`](https://github.com/eea/volto-cca-policy/commit/a89d899e72ae49e655e4ef518b7a1e55f973335b)]
+
+#### :hammer_and_wrench: Others
+
+- test: update snapshots [kreafox - [`9eb9a6c`](https://github.com/eea/volto-cca-policy/commit/9eb9a6c3bdf7db07c07a0472550e71ed314fc4cd)]
 ### [0.2.39](https://github.com/eea/volto-cca-policy/compare/0.2.38...0.2.39) - 30 May 2024
 
 #### :bug: Bug Fixes
@@ -1343,13 +1363,10 @@ 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
@@ -1366,9 +1383,6 @@ 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)]
@@ -1585,7 +1599,6 @@ 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
 
@@ -2066,7 +2079,6 @@ 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.2.39",
+  "version": "0.2.41",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -31,7 +31,7 @@
     "@eeacms/volto-datablocks": "*",
     "@eeacms/volto-eea-design-system": "*",
     "@eeacms/volto-eea-website-theme": "^1.33.2",
-    "@eeacms/volto-embed": "9.1.1",
+    "@eeacms/volto-embed": "10.0.1",
     "@eeacms/volto-globalsearch": "^1.1.0",
     "@eeacms/volto-openlayers-map": "*",
     "@eeacms/volto-searchlib": "^0.9.3",

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

@@ -16,7 +16,7 @@ import {
   GUIDANCE,
   INDICATOR,
   INFORMATION_PORTAL,
-  PUBICATION_REPORT,
+  PUBLICATION_REPORT,
   ORGANISATION,
   VIDEO,
 } from '@eeacms/volto-cca-policy/helpers/Constants';
@@ -76,7 +76,7 @@ const DatabaseItemView = (props) => {
     case TOOL:
       subtitle = 'Tools';
       break;
-    case PUBICATION_REPORT:
+    case PUBLICATION_REPORT:
       subtitle = 'Publications and Report';
       break;
     case GUIDANCE:

package/src/helpers/Constants.jsx

@@ -5,7 +5,7 @@ export const INDICATOR = 'eea.climateadapt.indicator';
 export const INFORMATION_PORTAL = 'eea.climateadapt.informationportal';
 export const ORGANISATION = 'eea.climateadapt.organisation';
 export const ACE_PROJECT = 'eea.climateadapt.aceproject';
-export const PUBICATION_REPORT = 'eea.climateadapt.publicationreport';
+export const PUBLICATION_REPORT = 'eea.climateadapt.publicationreport';
 export const TOOL = 'eea.climateadapt.tool';
 export const VIDEO = 'eea.climateadapt.video';
 export const C3S_INDICATOR = 'eea.climateadapt.c3sindicator';
@@ -95,6 +95,7 @@ export const BIOREGIONS = {
   COUNTRIES: 'Countries',
   SUBNATIONAL: 'Subnational Regions',
   CITY: 'Municipality Name',
+  TRANS_MACRO_OUTERMOST: 'Outermost Regions',
   TRANS_MACRO_NORTHPERI: 'Northern Periphery and Arctic',
   TRANS_MACRO_BACLITC: 'Baltic Sea',
   TRANS_MACRO_NW_EUROPE: 'North West Europe',

package/src/helpers/ContentMetadata.jsx

@@ -11,7 +11,7 @@ import {
   VIDEO,
   GUIDANCE,
   INDICATOR,
-  PUBICATION_REPORT,
+  PUBLICATION_REPORT,
 } from '@eeacms/volto-cca-policy/helpers/Constants';
 import {
   isObservatoryMetadataURL,
@@ -19,30 +19,34 @@ import {
 } from '@eeacms/volto-cca-policy/helpers';
 
 const messages = defineMessages({
-  'The date refers to the moment in which the item has been prepared or updated by contributing experts to be submitted for the publication in Climate ADAPT': {
+  default_info_tooltip: {
     id:
-      'The date refers to the moment in which the item has been prepared or updated by contributing experts to be submitted for the publication in Climate ADAPT',
+      'The date refers to the moment in which the item has been prepared ' +
+      'or updated by contributing experts to be submitted for the publication ' +
+      'in Climate ADAPT',
     defaultMessage:
-      'The date refers to the moment in which the item has been prepared or updated by contributing experts to be submitted for the publication in Climate ADAPT',
+      'The date refers to the moment in which the item has been prepared ' +
+      'or updated by contributing experts to be submitted for the publication ' +
+      'in Climate ADAPT',
   },
-  'The date refers to the date of release of the video': {
+  release_info_tooltip: {
     id: 'The date refers to the date of release of the video',
     defaultMessage: 'The date refers to the date of release of the video',
   },
-  'The date refers to the latest date of publication of the item': {
+  publication_info_tooltip: {
     id: 'The date refers to the latest date of publication of the item',
     defaultMessage:
       'The date refers to the latest date of publication of the item',
   },
-  'Date of release:': {
+  release_date: {
     id: 'Date of release:',
     defaultMessage: 'Date of release:',
   },
-  'Date of publication:': {
+  publication_date: {
     id: 'Date of publication:',
     defaultMessage: 'Date of publication:',
   },
-  'Date of creation:': {
+  creation_date: {
     id: 'Date of creation:',
     defaultMessage: 'Date of creation:',
   },
@@ -266,13 +270,7 @@ function GeoChar(props) {
           section.value && (
             <Fragment key={index}>
               {section.title && (
-                <h5>
-                  {intl.formatMessage(messages[section.title])}
-                  {/* <FormattedMessage
-                    id="{section.title}"
-                    defaultMessage="Countries2344:"
-                  /> */}
-                </h5>
+                <h5>{intl.formatMessage(messages[section.title])}</h5>
               )}
               <p>{section.value.join(', ')}</p>
             </Fragment>
@@ -282,37 +280,34 @@ function GeoChar(props) {
   );
 }
 
-function PublicationDateInfo(props) {
-  const { value, portaltype, title } = props;
-  let tooltipText =
-    'The date refers to the moment in which the item has been prepared or updated by contributing experts to be submitted for the publication in Climate ADAPT';
+function PublicationDateInfo({ value, portaltype, title }) {
+  const intl = useIntl();
+  const publicationYear = new Date(value).getFullYear();
 
-  if (portaltype === VIDEO) {
-    tooltipText = 'The date refers to the date of release of the video';
-  }
-  if (
-    portaltype === GUIDANCE ||
-    portaltype === INDICATOR ||
-    portaltype === PUBICATION_REPORT
-  ) {
-    tooltipText =
-      'The date refers to the latest date of publication of the item';
-  }
+  const tooltipMessages = {
+    [VIDEO]: intl.formatMessage(messages.release_info_tooltip),
+    [GUIDANCE]: intl.formatMessage(messages.publication_info_tooltip),
+    [INDICATOR]: intl.formatMessage(messages.publication_info_tooltip),
+    [PUBLICATION_REPORT]: intl.formatMessage(messages.publication_info_tooltip),
+    default: intl.formatMessage(messages.default_info_tooltip),
+  };
 
-  const publicationYear = new Date(value).getFullYear();
-  const intl = useIntl();
-  return publicationYear > 1970 ? (
+  const tooltipText = tooltipMessages[portaltype] || tooltipMessages.default;
+
+  if (publicationYear <= 1970) return null;
+
+  return (
     <>
       <h5>{title}</h5>
       <p>
         {publicationYear}
         <Popup
-          content={intl.formatMessage(messages[tooltipText])}
+          content={tooltipText}
           trigger={<i className="ri-question-fill"></i>}
         />
       </p>
     </>
-  ) : null;
+  );
 }
 
 function ContentMetadata(props) {
@@ -337,26 +332,23 @@ function ContentMetadata(props) {
   const isObservatoryItem = isObservatoryMetadataURL(location.pathname);
   const hasGeoChars = geochars !== null || spatial_layer.length > 0;
 
-  let date_title;
-  if (type === VIDEO) {
-    date_title = intl.formatMessage(messages['Date of release:']);
-  } else if (
-    type === PUBICATION_REPORT ||
-    type === INDICATOR ||
-    type === GUIDANCE
-  ) {
-    date_title = intl.formatMessage(messages['Date of publication:']);
-  } else {
-    date_title = intl.formatMessage(messages['Date of creation:']);
-  }
+  const dateTitles = {
+    [VIDEO]: intl.formatMessage(messages.release_date),
+    [PUBLICATION_REPORT]: intl.formatMessage(messages.publication_date),
+    [INDICATOR]: intl.formatMessage(messages.publication_date),
+    [GUIDANCE]: intl.formatMessage(messages.publication_date),
+    default: intl.formatMessage(messages.creation_date),
+  };
+
+  const dateTitle = dateTitles[type] || dateTitles.default;
 
   return (
     <Segment>
       <div className="content-metadata">
         <PublicationDateInfo
-          title={date_title}
+          title={dateTitle}
           value={content?.publication_date}
-          portaltype={content?.portal_type}
+          portaltype={type}
         />
 
         {isObservatoryItem && (

package/src/helpers/Utils.jsx

@@ -14,7 +14,7 @@ import {
 } from 'semantic-ui-react';
 import {
   CASE_STUDY,
-  PUBICATION_REPORT,
+  PUBLICATION_REPORT,
   ORGANISATION,
   ADAPTATION_OPTION,
   ACE_PROJECT,
@@ -341,7 +341,7 @@ export const DocumentsList = (props) => {
     section_title = intl.formatMessage(messages.caseStudiesDocuments);
   }
 
-  if (type === PUBICATION_REPORT) {
+  if (type === PUBLICATION_REPORT) {
     section_title = intl.formatMessage(
       messages.publicationsAndReportsDocuments,
     );

package/src/index.js

@@ -392,6 +392,12 @@ const applyConfig = (config) => {
       },
       GET_CONTENT: ['siblings'],
     },
+
+    {
+      match: '',
+      GET_CONTENT: ['navigation', 'breadcrumbs', 'actions'],
+      querystring: { 'expand.navigation.depth': '3' },
+    },
   ];
 
   // plug custom redux middleware