@eeacms/volto-cca-policy 0.2.88 → 0.2.90

package/CHANGELOG.md

@@ -4,11 +4,40 @@ 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.88](https://github.com/eea/volto-cca-policy/compare/0.2.87...0.2.88) - 6 January 2025
+### [0.2.90](https://github.com/eea/volto-cca-policy/compare/0.2.89...0.2.90) - 8 January 2025
+
+#### :rocket: New Features
+
+- feat(view): move health specific metadata to a separate box [kreafox - [`2df42f7`](https://github.com/eea/volto-cca-policy/commit/2df42f755e13db8337e5e06b32b29aefeb964460)]
+
+#### :bug: Bug Fixes
+
+- fix: remove observatory-specific links from listings [kreafox - [`bc8c9a0`](https://github.com/eea/volto-cca-policy/commit/bc8c9a0dc843b04dac90ab91af89c1676b3b3d2e)]
+- fix: cleanup import [kreafox - [`d7ee4bf`](https://github.com/eea/volto-cca-policy/commit/d7ee4bf9e7a5fe7bb3f199f630dc817d0bb73d63)]
+
+#### :nail_care: Enhancements
+
+- change(view): show lead image caption in the title block [kreafox - [`3d529a0`](https://github.com/eea/volto-cca-policy/commit/3d529a05cfc31d3e8e9d10acd3de557d0af254ae)]
+- change: simplify URL construction by removing observatory-specific logic in language switcher [kreafox - [`63f087f`](https://github.com/eea/volto-cca-policy/commit/63f087fbb8b3c83c1bbb8cf546362dd4d402f762)]
+- change(view): show health specific info on database item view [kreafox - [`443eca2`](https://github.com/eea/volto-cca-policy/commit/443eca2acabeada5bb076ce29c15b89ed3442a06)]
+
+#### :house: Internal changes
+
+- style: move styling to theme folder [kreafox - [`8f44461`](https://github.com/eea/volto-cca-policy/commit/8f444616f5cf6dc0ab9b4f95f9e97ae8436be9fc)]
 
 #### :hammer_and_wrench: Others
 
-- Fix facet for mission tools [Tiberiu Ichim - [`a4b5787`](https://github.com/eea/volto-cca-policy/commit/a4b578762eac8da26b01b5fef7cbddbebdd78eb6)]
+- Refs #282067 - search engine remove ++aq link update [Tripon Eugen - [`c9a45bb`](https://github.com/eea/volto-cca-policy/commit/c9a45bb3aadd293746193fd361684e39432d596c)]
+- core: code cleanup [kreafox - [`c6bb867`](https://github.com/eea/volto-cca-policy/commit/c6bb8676b954236279587286052e3b4a7175c31b)]
+### [0.2.89](https://github.com/eea/volto-cca-policy/compare/0.2.88...0.2.89) - 8 January 2025
+
+#### :hammer_and_wrench: Others
+
+- Refs #268762 - update map to allow hover tr update [Tripon Eugen - [`0be2afe`](https://github.com/eea/volto-cca-policy/commit/0be2afed14d855d9bbf7bbaebb0f70688506e692)]
+- Refs #268762 - update map to allow hover tr [Tripon Eugen - [`8a94cf1`](https://github.com/eea/volto-cca-policy/commit/8a94cf1888f34793b8637fe383b923ee196403d8)]
+- Remove prefix condition, will be solved by indexing [Tiberiu Ichim - [`3cf4ed0`](https://github.com/eea/volto-cca-policy/commit/3cf4ed0befde89e8cc3393c8458aa3d5a6d9a70a)]
+### [0.2.88](https://github.com/eea/volto-cca-policy/compare/0.2.87...0.2.88) - 6 January 2025
+
 ### [0.2.87](https://github.com/eea/volto-cca-policy/compare/0.2.86...0.2.87) - 20 December 2024
 
 #### :nail_care: Enhancements

package/package.json

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

package/src/components/Result/ClusterHorizontalCardItem.jsx

@@ -13,13 +13,6 @@ import ExternalLink from '@eeacms/search/components/Result/ExternalLink';
 import ResultContext from '@eeacms/search/components/Result/ResultContext';
 import ContentClusters from '@eeacms/search/components/Result/ContentClusters';
 
-const healthURL = (href, is_observatory) => {
-  if (is_observatory) {
-    return href.replace(/\/metadata\//, '/observatory/++aq++metadata/');
-  }
-  return href;
-};
-
 const healthBreadcrumb = (href, is_observatory) => {
   // It's only cosmetic. We don't want to show ++aq...
   if (is_observatory) {
@@ -52,7 +45,7 @@ const ExtraContent = (props) => {
       <div>
         <div className="result-info result-source">
           <span className="result-info-title">Source: </span>
-          <ExternalLink href={healthURL(result.href, is_observatory)}>
+          <ExternalLink href={result.href}>
             <strong title={result.source} className="source">
               {title}
               {/* {firstWords(
@@ -99,10 +92,7 @@ const ClusterHorizontalCardItem = (props) => {
     '@id': result.href,
     title: (
       <>
-        <ExternalLink
-          href={healthURL(result.href, is_observatory)}
-          title={result.title}
-        >
+        <ExternalLink href={result.href} title={result.title}>
           {result.title}
           {result.isNew && <Label className="new-item">New</Label>}
           {result.isExpired && (

package/src/components/Result/HealthHorizontalCardItem.jsx

@@ -14,10 +14,6 @@ import ExternalLink from '@eeacms/search/components/Result/ExternalLink';
 import ResultContext from '@eeacms/search/components/Result/ResultContext';
 import ContentClusters from '@eeacms/search/components/Result/ContentClusters';
 
-const healthURL = (href) => {
-  return href.replace(/\/metadata\//, '/observatory/++aq++metadata/');
-};
-
 const healthBreadcrumb = (href) => {
   // It's only cosmetic. We don't want to show ++aq...
   return href.replace(/\/metadata\//, '/observatory/');
@@ -40,7 +36,7 @@ const ExtraContent = (props) => {
       <div>
         <div className="result-info result-source">
           <span className="result-info-title">Source: </span>
-          <ExternalLink href={healthURL(result.href)}>
+          <ExternalLink href={result.href}>
             <strong title={result.source} className="source">
               {firstWords(
                 getTermDisplayValue({
@@ -75,7 +71,7 @@ const HealthHorizontalCardItem = (props) => {
     '@id': result.href,
     title: (
       <>
-        <ExternalLink href={healthURL(result.href)} title={result.title}>
+        <ExternalLink href={result.href} title={result.title}>
           {result.title}
           {result.isNew && <Label className="new-item">New</Label>}
           {result.isExpired && (

package/src/components/manage/Blocks/CountryMapObservatory/CountryMapObservatoryOLView.jsx

@@ -37,12 +37,21 @@ const CountryMapObservatoryView = (props) => {
     setOverlaySource(new ol.source.Vector());
 
     const features = new ol.format.GeoJSON().readFeatures(geofeatures);
+    const updateEuCountryNames = euCountryNames.map((countryName) => {
+      if ('Turkey' === countryName) {
+        countryName = 'Türkiye';
+      }
+      return countryName;
+    });
+
     const filtered = features.filter((f) =>
-      euCountryNames.includes(f.get('na')),
+      updateEuCountryNames.includes(f.get('na')),
     );
-
     filtered.forEach((feature) => {
       const img = new Image();
+      if ('Türkiye' === feature.values_.na) {
+        feature.values_.na = 'Turkey';
+      }
       img.onload = function () {
         feature.set('flag', img);
       };
@@ -70,12 +79,14 @@ const CountryMapObservatoryView = (props) => {
 
   const onFeatureClick = React.useCallback(
     (feature) => {
-      const country = feature.get('na');
+      let country = feature.get('na');
+      if ('Türkiye' === country) {
+        country = 'Turkey';
+      }
       history.push(`${baseUrl}/${country.toLowerCase()}`);
     },
     [baseUrl, history],
   );
-  // console.log(geofeatures, projection, euCountriesSource, overlaySource);
 
   return tileWMSSources ? (
     <Map

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

@@ -5,7 +5,6 @@ import { compose } from 'redux';
 import cx from 'classnames';
 import { ConditionalLink } from '@plone/volto/components';
 import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers';
-import { makeObservatoryMetadataURL } from '@eeacms/volto-cca-policy/helpers';
 import './styles.less';
 
 const fixedTitles = {
@@ -28,9 +27,7 @@ const IndicatorCardsListingView = ({ items, isEditMode, token }) => {
           <div className="wrapper">
             <div className="slot-top">
               <ConditionalLink
-                to={flattenToAppURL(
-                  getBaseUrl(makeObservatoryMetadataURL(item['@id'])),
-                )}
+                to={flattenToAppURL(getBaseUrl(item['@id']))}
                 condition={!isEditMode}
               >
                 <div className="listing-body">

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

@@ -1,9 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import {
-  makeContributionsSearchQuery,
-  makeObservatoryMetadataURL,
-} from '@eeacms/volto-cca-policy/helpers';
+import { makeContributionsSearchQuery } from '@eeacms/volto-cca-policy/helpers';
 import { UniversalLink } from '@plone/volto/components';
 
 import './styles.less';
@@ -25,10 +22,7 @@ const OrganisationCardsListingView = ({ items }) => {
         <div className="ui fluid card u-card" key={item['@id']}>
           <div className="content">
             <div className="header">
-              <UniversalLink
-                className="image"
-                href={makeObservatoryMetadataURL(item['@id'])}
-              >
+              <UniversalLink className="image" href={item['@id']}>
                 <div className="img-container">
                   <img
                     src={item['@id'] + '/@@images/logo/preview'}
@@ -39,7 +33,7 @@ const OrganisationCardsListingView = ({ items }) => {
               </UniversalLink>
               <UniversalLink
                 className="header-link org-name"
-                href={makeObservatoryMetadataURL(item['@id'])}
+                href={item['@id']}
               >
                 {item.title}
               </UniversalLink>

package/src/components/theme/Header/LanguageSwitch.jsx

@@ -5,12 +5,7 @@ import { useSelector } from 'react-redux';
 import { Dropdown, Image } from 'semantic-ui-react';
 import { flattenToAppURL } from '@plone/volto/helpers';
 import config from '@plone/volto/registry';
-import { useLocation } from 'react-router-dom';
 import { Header } from '@eeacms/volto-eea-design-system/ui';
-import {
-  isObservatoryMetadataURL,
-  makeObservatoryMetadataURL,
-} from '@eeacms/volto-cca-policy/helpers';
 import cx from 'classnames';
 
 import { selectedLanguageAtom } from '../../../state';
@@ -18,8 +13,6 @@ import globeIcon from '@eeacms/volto-eea-design-system/../theme/themes/eea/asset
 
 export default function LanguageSwitch({ history }) {
   const { eea } = config.settings;
-  const location = useLocation();
-  const isObservatoryItem = isObservatoryMetadataURL(location.pathname);
   const translations = useSelector(
     (state) => state.content.data?.['@components']?.translations?.items,
   );
@@ -39,14 +32,13 @@ export default function LanguageSwitch({ history }) {
     const url = translation
       ? flattenToAppURL(translation['@id'])
       : `/${item.code}`;
-    const to = isObservatoryItem ? makeObservatoryMetadataURL(url) : url;
 
     setLanguage(item.code);
     setSelectedLanguage(item.code);
     searchParams.set('set_language', item.code);
 
     history.push({
-      pathname: to,
+      pathname: url,
       search: searchParams.toString(),
     });
   };

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

@@ -24,8 +24,6 @@ import {
   ListItem,
 } from 'semantic-ui-react';
 
-import './CaseStudyView.less';
-
 const messages = defineMessages({
   References: { id: 'References', defaultMessage: 'References' },
   Challenges: { id: 'Challenges', defaultMessage: 'Challenges' },

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

@@ -1,16 +1,12 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
-import { useLocation } from 'react-router-dom';
 import { PrivacyProtection } from '@eeacms/volto-embed';
 import { Container, Divider, Grid } from 'semantic-ui-react';
 import {
   ShareInfoButton,
   PortalMessage,
 } from '@eeacms/volto-cca-policy/components';
-import {
-  isObservatoryMetadataURL,
-  fixEmbedURL,
-} from '@eeacms/volto-cca-policy/helpers';
+import { fixEmbedURL } from '@eeacms/volto-cca-policy/helpers';
 import {
   TOOL,
   GUIDANCE,
@@ -143,8 +139,6 @@ const MaybeIframeVisualization = ({ content }) => {
 const DatabaseItemView = (props) => {
   const { content } = props;
   const type = content['@type'];
-  const location = useLocation();
-  const isObservatoryItem = isObservatoryMetadataURL(location.pathname);
   const {
     title,
     acronym,
@@ -269,19 +263,15 @@ const DatabaseItemView = (props) => {
                 </>
               )}
 
-              {isObservatoryItem && (
+              {organisational_key_activities && (
                 <>
-                  {organisational_key_activities && (
-                    <>
-                      <h3>
-                        <FormattedMessage
-                          id="Key activities within climate change and health"
-                          defaultMessage="Key activities within climate change and health"
-                        />
-                      </h3>
-                      <HTMLField value={organisational_key_activities} />
-                    </>
-                  )}
+                  <h3>
+                    <FormattedMessage
+                      id="Key activities within climate change and health"
+                      defaultMessage="Key activities within climate change and health"
+                    />
+                  </h3>
+                  <HTMLField value={organisational_key_activities} />
                 </>
               )}
 
@@ -292,31 +282,27 @@ const DatabaseItemView = (props) => {
 
               <ReferenceInfo content={content} />
 
-              {isObservatoryItem && (
+              {organisational_websites && (
                 <>
-                  {organisational_websites && (
-                    <>
-                      <h5>
-                        <FormattedMessage
-                          id="Links to further information"
-                          defaultMessage="Links to further information"
-                        />
-                      </h5>
-                      <HTMLField value={organisational_websites} />
-                    </>
-                  )}
+                  <h5>
+                    <FormattedMessage
+                      id="Links to further information"
+                      defaultMessage="Links to further information"
+                    />
+                  </h5>
+                  <HTMLField value={organisational_websites} />
+                </>
+              )}
 
-                  {organisational_contact_information && (
-                    <>
-                      <h5>
-                        <FormattedMessage
-                          id="Contact information for the Observatory"
-                          defaultMessage="Contact information for the Observatory"
-                        />
-                      </h5>
-                      <HTMLField value={organisational_contact_information} />
-                    </>
-                  )}
+              {organisational_contact_information && (
+                <>
+                  <h5>
+                    <FormattedMessage
+                      id="Contact information for the Observatory"
+                      defaultMessage="Contact information for the Observatory"
+                    />
+                  </h5>
+                  <HTMLField value={organisational_contact_information} />
                 </>
               )}
 

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

@@ -19,6 +19,13 @@ function EventView(props) {
     hasBlockTypes,
   } = filterBlocks(content, ['tabs_block', 'metadataSection']);
 
+  const titleBlock = Object.values(content.blocks).find(
+    (block) => block['@type'] === 'title',
+  );
+  if (titleBlock && !titleBlock.copyright && content.image_caption) {
+    titleBlock.copyright = content.image_caption;
+  }
+
   return (
     <div className="cca-event-view">
       <PortalMessage content={content} />

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

@@ -17,13 +17,12 @@ const DescriptionText = ({ content }) => {
 function NewsItemView(props) {
   const { content } = props;
 
-  // if (content.image_caption) {
-  //   Object.values(content.blocks).forEach((block) => {
-  //     if (block['@type'] === 'title' && !block.copyright?.trim()) {
-  //       block.copyright = content.image_caption;
-  //     }
-  //   });
-  // }
+  const titleBlock = Object.values(content.blocks).find(
+    (block) => block['@type'] === 'title',
+  );
+  if (titleBlock && !titleBlock.copyright && content.image_caption) {
+    titleBlock.copyright = content.image_caption;
+  }
 
   // These blocks are used in the Edit View for dexterity layout.
   // We don't want to display them in the View mode.

package/src/helpers/ContentMetadata.jsx

@@ -1,5 +1,4 @@
 import { Fragment } from 'react';
-import { useLocation } from 'react-router-dom';
 import { Popup, Segment } from 'semantic-ui-react';
 import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 import {
@@ -13,10 +12,7 @@ import {
   INDICATOR,
   PUBLICATION_REPORT,
 } from '@eeacms/volto-cca-policy/helpers/Constants';
-import {
-  isObservatoryMetadataURL,
-  MetadataItemList,
-} from '@eeacms/volto-cca-policy/helpers';
+import { MetadataItemList } from '@eeacms/volto-cca-policy/helpers';
 
 const messages = defineMessages({
   default_info_tooltip: {
@@ -328,8 +324,6 @@ function ContentMetadata(props) {
     funding_programme,
   } = content;
   const type = content['@type'];
-  const location = useLocation();
-  const isObservatoryItem = isObservatoryMetadataURL(location.pathname);
   const hasGeoChars = geochars !== null || spatial_layer.length > 0;
 
   const dateTitles = {
@@ -343,30 +337,14 @@ function ContentMetadata(props) {
   const dateTitle = dateTitles[type] || dateTitles.default;
 
   return (
-    <Segment>
-      <div className="content-metadata">
+    <>
+      <Segment className="content-metadata">
         <PublicationDateInfo
           title={dateTitle}
           value={content?.publication_date}
           portaltype={type}
         />
 
-        {isObservatoryItem && (
-          <>
-            {health_impacts && health_impacts?.length > 0 && (
-              <>
-                <h5>
-                  <FormattedMessage
-                    id="Health impact:"
-                    defaultMessage="Health impact:"
-                  />
-                </h5>
-                <MetadataItemList value={health_impacts} />
-              </>
-            )}
-          </>
-        )}
-
         {keywords && keywords?.length > 0 && (
           <>
             <h5>
@@ -400,40 +378,36 @@ function ContentMetadata(props) {
           </>
         )}
 
-        {!isObservatoryItem && (
+        {climate_impacts && climate_impacts?.length > 0 && (
+          <>
+            <h5>
+              <FormattedMessage
+                id="Climate impacts:"
+                defaultMessage="Climate impacts:"
+              />
+            </h5>
+            <MetadataItemList value={climate_impacts} />
+          </>
+        )}
+
+        {elements && elements?.length > 0 && (
+          <>
+            <h5>
+              <FormattedMessage
+                id="Adaptation Approaches:"
+                defaultMessage="Adaptation Approaches:"
+              />
+            </h5>
+            <MetadataItemList value={elements} />
+          </>
+        )}
+
+        {sectors && sectors?.length > 0 && (
           <>
-            {climate_impacts && climate_impacts?.length > 0 && (
-              <>
-                <h5>
-                  <FormattedMessage
-                    id="Climate impacts:"
-                    defaultMessage="Climate impacts:"
-                  />
-                </h5>
-                <MetadataItemList value={climate_impacts} />
-              </>
-            )}
-
-            {elements && elements?.length > 0 && (
-              <>
-                <h5>
-                  <FormattedMessage
-                    id="Adaptation Approaches:"
-                    defaultMessage="Adaptation Approaches:"
-                  />
-                </h5>
-                <MetadataItemList value={elements} />
-              </>
-            )}
-
-            {sectors && sectors?.length > 0 && (
-              <>
-                <h5>
-                  <FormattedMessage id="Sectors:" defaultMessage="Sectors:" />
-                </h5>
-                <MetadataItemList value={sectors} />
-              </>
-            )}
+            <h5>
+              <FormattedMessage id="Sectors:" defaultMessage="Sectors:" />
+            </h5>
+            <MetadataItemList value={sectors} />
           </>
         )}
 
@@ -449,19 +423,15 @@ function ContentMetadata(props) {
           </>
         )}
 
-        {!isObservatoryItem && (
+        {funding_programme && funding_programme?.title?.length > 0 && (
           <>
-            {funding_programme && funding_programme?.title?.length > 0 && (
-              <>
-                <h5>
-                  <FormattedMessage
-                    id="Funding Programme:"
-                    defaultMessage="Funding Programme:"
-                  />
-                </h5>
-                <span>{funding_programme.title}</span>
-              </>
-            )}
+            <h5>
+              <FormattedMessage
+                id="Funding Programme:"
+                defaultMessage="Funding Programme:"
+              />
+            </h5>
+            <span>{funding_programme.title}</span>
           </>
         )}
 
@@ -485,8 +455,20 @@ function ContentMetadata(props) {
             <GeoChar {...props} />
           </>
         )}
-      </div>
-    </Segment>
+      </Segment>
+
+      {health_impacts && health_impacts?.length > 0 && (
+        <Segment className="content-metadata">
+          <h5>
+            <FormattedMessage
+              id="Health impact:"
+              defaultMessage="Health impact:"
+            />
+          </h5>
+          <MetadataItemList value={health_impacts} />
+        </Segment>
+      )}
+    </>
   );
 }
 

package/src/helpers/index.js

@@ -57,14 +57,6 @@ export const makeContributionsSearchQuery = (props) => {
   return url;
 };
 
-export const isObservatoryMetadataURL = (url) => {
-  return url.indexOf('/observatory/++aq++metadata') > -1;
-};
-
-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)) {

package/src/search/mission_all/config-all.js

@@ -85,11 +85,11 @@ export default function installMainSearch(config) {
             cca_include_in_mission: 'true',
           },
         },
-        {
-          prefix: {
-            'id.keyword': 'https://climate-adapt.eea.europa.eu/en/mission',
-          },
-        },
+        // {
+        //   prefix: {
+        //     'id.keyword': 'https://climate-adapt.eea.europa.eu/en/mission',
+        //   },
+        // },
       ],
       minimum_should_match: 1,
     },

package/theme/globals/views.less

@@ -96,6 +96,15 @@ hr {
 .db-item-view {
   position: relative;
 
+  &.case-study-view {
+    div {
+      img.db-logo {
+        padding-left: 5px;
+        float: right !important;
+      }
+    }
+  }
+
   .privacy-protection-wrapper {
     margin-top: 1.5em;
     margin-bottom: 1.5em;

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

@@ -1,8 +0,0 @@
-.db-item-view.case-study-view {
-  div {
-    img.db-logo {
-      padding-left: 5px;
-      float: right !important;
-    }
-  }
-}