@eeacms/volto-cca-policy 0.2.38 → 0.2.40

package/CHANGELOG.md

@@ -4,6 +4,29 @@ 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.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
+
+- fix: privacy protection [kreafox - [`8c2ecd9`](https://github.com/eea/volto-cca-policy/commit/8c2ecd9677b01b7fe98c22afbf0707e582feb27f)]
+
+#### :hammer_and_wrench: Others
+
+- test: update snapshot [kreafox - [`137a7ec`](https://github.com/eea/volto-cca-policy/commit/137a7ec6b9ddc14265ab8b07d73b9562947ac3b9)]
+- Proper urls [Tiberiu Ichim - [`3fa085b`](https://github.com/eea/volto-cca-policy/commit/3fa085b287d9fe37b19bd626c19b51e73b72d898)]
+- Fix typo [Tiberiu Ichim - [`b2fdb30`](https://github.com/eea/volto-cca-policy/commit/b2fdb30ce29312b6c41687a0aedc45ad2a13c548)]
+- WIP [Tiberiu Ichim - [`cd161ef`](https://github.com/eea/volto-cca-policy/commit/cd161efbd05acec99af576a2132730696e0ed3b6)]
 ### [0.2.38](https://github.com/eea/volto-cca-policy/compare/0.2.37...0.2.38) - 29 May 2024
 
 #### :house: Internal changes

package/package.json

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

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

@@ -16,6 +16,7 @@ import {
 import { PortalMessage } from '@eeacms/volto-cca-policy/components';
 import { Link } from 'react-router-dom';
 import { FormattedMessage } from 'react-intl';
+import { useSelector } from 'react-redux';
 
 if (!__SERVER__) {
   window.cds_toolbox = {
@@ -98,12 +99,10 @@ function C3SIndicatorView(props) {
     logo,
     // c3sjs_overview,
   } = content;
-  // console.log('c3sjs_overview', c3sjs_overview, props);
   const [showDetails, setShowDetails] = useState(false);
-  // const hasIndicatorTitle =
-  //   indicator_title && indicator_title !== '_' && indicator_title !== '-';
 
   const [activeAccordion, setActiveAccordion] = React.useState([true, false]);
+  const currentLanguage = useSelector((state) => state.intl.locale);
 
   function handleAccordionClick(e, index) {
     const _activeAccordion = JSON.parse(JSON.stringify(activeAccordion));
@@ -261,7 +260,13 @@ function C3SIndicatorView(props) {
             implemented by ECMWF.
           </p>
           <p>
-            <a href="/knowledge/european-climate-data-explorer/disclaimer">
+            <a
+              href={
+                '/' +
+                currentLanguage +
+                '/knowledge/european-climate-data-explorer/disclaimer'
+              }
+            >
               <FormattedMessage id="Disclaimer" defaultMessage="Disclaimer" />
             </a>
           </p>

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:
@@ -111,6 +111,10 @@ const DatabaseItemView = (props) => {
     }
     return null;
   };
+  const flourishPath = data_src(map_graphs);
+  const flourishUrl = map_graphs
+    ? `https://flo.uri.sh/${flourishPath}/embed`
+    : null;
 
   const is_cmshare_video = share_eea.some((domain) =>
     content?.embed_url?.includes(domain),
@@ -213,22 +217,23 @@ const DatabaseItemView = (props) => {
                 </>
               )}
 
-              <PrivacyProtection
-                data={{
-                  dataprotection,
-                }}
-              >
-                {!!data_src(map_graphs) && (
+              {!!flourishPath && (
+                <PrivacyProtection
+                  data={{
+                    url: flourishUrl,
+                    dataprotection: dataprotection,
+                  }}
+                >
                   <iframe
                     height="980"
                     width="100%"
-                    src={`https://flo.uri.sh/${data_src(map_graphs)}/embed`}
+                    src={flourishUrl}
                     title="Interactive or visual content"
                     className="flourish-embed-iframe"
                     sandbox="allow-same-origin allow-forms allow-scripts allow-downloads allow-popups allow-popups-to-escape-sandbox allow-top-navigation-by-user-activation"
                   ></iframe>
-                )}
-              </PrivacyProtection>
+                </PrivacyProtection>
+              )}
 
               <Divider />
 

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,
     );