@eeacms/volto-cca-policy 0.2.81 → 0.2.83

package/CHANGELOG.md

@@ -4,6 +4,34 @@ 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.83](https://github.com/eea/volto-cca-policy/compare/0.2.82...0.2.83) - 16 December 2024
+
+#### :rocket: Dependency updates
+
+- Release @eeacms/volto-searchlib@2.0.5 [EEA Jenkins - [`4adc1dc`](https://github.com/eea/volto-cca-policy/commit/4adc1dc79bca9439b2bd5b79d231c1e2243fc74b)]
+- Release @eeacms/volto-searchlib@2.0.4 [EEA Jenkins - [`3b5547c`](https://github.com/eea/volto-cca-policy/commit/3b5547c8a7be40a44fd978efe9ea4736e3fa7bed)]
+
+#### :hammer_and_wrench: Others
+
+- Don't expose all the languages [Tiberiu Ichim - [`80e20af`](https://github.com/eea/volto-cca-policy/commit/80e20af2f56d164e6efbd90370307f7317c38909)]
+- Add 2 new fields to download [Tiberiu Ichim - [`c8f71ba`](https://github.com/eea/volto-cca-policy/commit/c8f71ba52d8e39568e3ad00cf6e6bc45650e66b8)]
+- Ad Maps/Graphs height, handle iframe src and URL for indicators [kreafox - [`4f314c0`](https://github.com/eea/volto-cca-policy/commit/4f314c0f8b5e316d67f3c871276e92128ebf129b)]
+- Set download fields [Tiberiu Ichim - [`6677ee0`](https://github.com/eea/volto-cca-policy/commit/6677ee0fa1f863387488db9adb2d5730b4099016)]
+### [0.2.82](https://github.com/eea/volto-cca-policy/compare/0.2.81...0.2.82) - 12 December 2024
+
+#### :hammer_and_wrench: Others
+
+- Refs #281176 - test resizable [Tripon Eugen - [`0a6dd6a`](https://github.com/eea/volto-cca-policy/commit/0a6dd6a3a771c554cac251eb1ae22a0fab4c9215)]
+- Refs #281176 - do not show empty fields [Tripon Eugen - [`3c1b1b2`](https://github.com/eea/volto-cca-policy/commit/3c1b1b27505eb17e797362e0703c96c0b27f6769)]
+- Refs #281176 - do not show empty sections [Tripon Eugen - [`4d1ebc2`](https://github.com/eea/volto-cca-policy/commit/4d1ebc2f21c5b2b7381efa290e4ea0265b979009)]
+- Refs #281474 - float image left [Tripon Eugen - [`167561b`](https://github.com/eea/volto-cca-policy/commit/167561be774fdaa1e0fad6f26d1b53b708401138)]
+- Refs #281502 - test wip [Tripon Eugen - [`0145dc5`](https://github.com/eea/volto-cca-policy/commit/0145dc5244c2e1d0deab3c17d623509081ff79e0)]
+- Refs #281502 - test wip [Tripon Eugen - [`da15a99`](https://github.com/eea/volto-cca-policy/commit/da15a99b19331fa177e49dae4acf556bd004a977)]
+- Refs #281502 - test wip [Tripon Eugen - [`3ab8b99`](https://github.com/eea/volto-cca-policy/commit/3ab8b992e7f2b1e79dd710b0ef4a02079c83ede5)]
+- Refs #281502 - lint wip [Tripon Eugen - [`2d1489a`](https://github.com/eea/volto-cca-policy/commit/2d1489a8457d58c34e034be22d943a7bf4c1e404)]
+- Refs #281502 - remuve duplicated country faces on mission funding search [Tripon Eugen - [`324c52e`](https://github.com/eea/volto-cca-policy/commit/324c52eb3c6fe9371caa7797eaf218f2fbc56908)]
+- Refs #281159 - transational regions [Tripon Eugen - [`eb4a98e`](https://github.com/eea/volto-cca-policy/commit/eb4a98e573dc1fb6c91012f54e804df16a136dbb)]
+- Refs #281474 - case study logo [Tripon Eugen - [`ee311cf`](https://github.com/eea/volto-cca-policy/commit/ee311cf2131afa6348abc5cf0a5546cb36f554a6)]
 ### [0.2.81](https://github.com/eea/volto-cca-policy/compare/0.2.80...0.2.81) - 25 November 2024
 
 #### :hammer_and_wrench: Others
@@ -1673,10 +1701,13 @@ 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
@@ -1693,6 +1724,9 @@ 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)]
@@ -1909,6 +1943,7 @@ 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
 
@@ -2389,6 +2424,7 @@ 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.81",
+  "version": "0.2.83",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -35,7 +35,7 @@
     "@eeacms/volto-globalsearch": "^1.1.0",
     "@eeacms/volto-hero-block": "^7.1.0",
     "@eeacms/volto-openlayers-map": "*",
-    "@eeacms/volto-searchlib": "2.0.3",
+    "@eeacms/volto-searchlib": "2.0.5",
     "@eeacms/volto-slate-label": "^0.6.0",
     "@eeacms/volto-tabs-block": "^7.5.1",
     "@elastic/search-ui": "1.21.2",

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

@@ -24,6 +24,8 @@ import {
   ListItem,
 } from 'semantic-ui-react';
 
+import './CaseStudyView.less';
+
 const messages = defineMessages({
   References: { id: 'References', defaultMessage: 'References' },
   Challenges: { id: 'Challenges', defaultMessage: 'Challenges' },
@@ -322,7 +324,7 @@ const SectionContent = ({ sectionData, content }) => {
 function CaseStudyView(props) {
   const intl = useIntl();
   const { content } = props;
-  const { long_description, updating_notes } = content;
+  const { long_description, updating_notes, logo, title } = content;
 
   const hasValue = (field) => {
     if (!content.hasOwnProperty(field)) {
@@ -334,6 +336,12 @@ function CaseStudyView(props) {
     if (Array.isArray(content[field]) && content[field].length === 0) {
       return false;
     }
+    if (
+      typeof content[field]?.data === 'string' &&
+      content[field]?.data.replace('<p></p>', '').length === 0
+    ) {
+      return false;
+    }
     return true;
   };
 
@@ -369,6 +377,15 @@ function CaseStudyView(props) {
               computer={8}
               className="col-left"
             >
+              {logo && (
+                <div>
+                  <Image
+                    src={logo?.scales?.mini?.download}
+                    alt={title}
+                    className="db-logo"
+                  />
+                </div>
+              )}
               <PrimaryPhoto {...props} />
               <HTMLField value={long_description} />
               {updating_notes && updating_notes.length > 0 && (

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

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

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

@@ -94,15 +94,26 @@ const MaybeFlourishVisualization = ({ content }) => {
 };
 
 function getFirstIframeSrc(htmlString) {
-  const regex = /<iframe[^>]+src=["']([^"']+)["']/;
-  const match = htmlString.match(regex);
-  return match ? match[1] : null;
+  const iframeRegex = /<iframe[^>]+src=["']([^"']+)["']/;
+
+  const iframeMatch = htmlString.match(iframeRegex);
+  if (iframeMatch) {
+    return iframeMatch[1];
+  }
+
+  try {
+    const url = new URL(htmlString);
+    return url.href;
+  } catch (e) {
+    return null;
+  }
 }
 
 const MaybeIframeVisualization = ({ content }) => {
-  const { map_graphs } = content;
+  const { map_graphs, map_graphs_height } = content;
 
   const url = getFirstIframeSrc(map_graphs || '');
+  const height = map_graphs_height || 800;
 
   const [isClient, setIsClient] = React.useState();
 
@@ -110,7 +121,6 @@ const MaybeIframeVisualization = ({ content }) => {
 
   if (!(isClient && url)) return null;
 
-  // <div dangerouslySetInnerHTML={{ __html: map_graphs }} />
   return (
     <PrivacyProtection
       data={{
@@ -119,7 +129,7 @@ const MaybeIframeVisualization = ({ content }) => {
       }}
     >
       <iframe
-        height="980"
+        height={height}
         width="100%"
         src={url}
         title="Interactive or visual content"

package/src/helpers/Constants.jsx

@@ -107,16 +107,16 @@ export const BIOREGIONS = {
   TRANS_MACRO_MED: 'Mediterranean (Euro-Med)',
   TRANS_MACRO_DANUBE: 'Danube Area',
   TRANS_MACRO_ADR_IONIAN: 'Adriatic-Ionian',
-  TRANS_MACRO_BALKAN_MED: 'Balkan-Mediterranean',
-  TRANS_MACRO_CAR_AREA: 'Caribbean Area',
-  TRANS_MACRO_AMAZONIA: 'Amazonia',
-  TRANS_MACRO_IND_OCEAN_AREA: 'Indian Ocean Area',
-  TRANS_MACRO_SE_EUR: 'South East Europe',
+  // TRANS_MACRO_BALKAN_MED: 'Balkan-Mediterranean',
+  // TRANS_MACRO_CAR_AREA: 'Caribbean Area',
+  // TRANS_MACRO_AMAZONIA: 'Amazonia',
+  // TRANS_MACRO_IND_OCEAN_AREA: 'Indian Ocean Area',
+  // TRANS_MACRO_SE_EUR: 'South East Europe',
   TRANS_MACRO_MED_BASIN: 'Mediterranean Sea Basin (NEXT)',
-  TRANS_MACRO_MID_ATLANTIC: 'Mid-Atlantic',
-  TRANS_MACRO_ARCTIC: 'Arctic',
-  TRANS_MACRO_BLACKSEA: 'Black Sea',
-  TRANS_MACRO_ATLANTIC: 'Atlantic',
+  // TRANS_MACRO_MID_ATLANTIC: 'Mid-Atlantic',
+  // TRANS_MACRO_ARCTIC: 'Arctic',
+  // TRANS_MACRO_BLACKSEA: 'Black Sea',
+  // TRANS_MACRO_ATLANTIC: 'Atlantic',
   TRANS_MACRO_BLACKSEA_BASIN: 'Black Sea Basin (NEXT)',
   TRANS_BIO_ALPINE: 'Alpine',
   TRANS_BIO_ANATOLIAN: 'Anatolian',
@@ -525,6 +525,7 @@ export const EU_COUNTRIES = [
   'LV',
   'MT',
   'NL',
+  'NO',
   'PL',
   'PT',
   'RO',

package/src/search/common.js

@@ -141,40 +141,40 @@ export const language = {
     type: 'any',
   },
   facetValues: [
-    'ar',
-    'sr',
-    'sq',
-    'bg',
-    'bs',
-    'cs',
-    'hr',
-    'da',
-    'nl',
-    'el',
+    'de',
     'en',
-    'et',
-    'fi',
+    'es',
     'fr',
-    'ga',
-    'de',
-    'hu',
-    'is',
     'it',
-    'lv',
-    'lt',
-    'mk',
-    'mt',
-    'no',
     'pl',
-    'pt',
-    'ro',
-    'ru',
-    'sh',
-    'sk',
-    'sl',
-    'es',
-    'sv',
-    'tr',
+    // 'ar',
+    // 'bg',
+    // 'bs',
+    // 'cs',
+    // 'da',
+    // 'el',
+    // 'et',
+    // 'fi',
+    // 'ga',
+    // 'hr',
+    // 'hu',
+    // 'is',
+    // 'lt',
+    // 'lv',
+    // 'mk',
+    // 'mt',
+    // 'nl',
+    // 'no',
+    // 'pt',
+    // 'ro',
+    // 'ru',
+    // 'sh',
+    // 'sk',
+    // 'sl',
+    // 'sq',
+    // 'sr',
+    // 'sv',
+    // 'tr',
   ],
   sortOn: 'custom',
   sortOnCustomLabel: 'Alphabetical',

package/src/search/config.js

@@ -70,6 +70,22 @@ export default function installMainSearch(config) {
 
   // console.log('config.searchui.ccaSearch clusers', clusters);
   // debugger;
+  config.searchui.globalsearch.download_fields = [
+    { field: 'about', name: 'About' },
+    { field: 'title', name: 'title' },
+    { field: 'issued', name: 'Issued' },
+    { field: 'objectProvides', name: 'Content type' },
+    { field: 'cca_adaptation_sectors', name: 'Sectors' },
+    { field: 'cca_climate_impacts', name: 'Climate impact' },
+    { field: 'transnational_regions', name: 'Transnational regions' },
+    { field: 'cca_adaptation_elements', name: 'Adaptation Approaches' },
+    { field: 'cca_funding_programme', name: 'Funding programme' },
+    { field: 'cca_key_type_measure', name: 'Key type measure' },
+    { field: 'cca_geographic_countries', name: 'Countries' },
+    { field: 'cca_origin_websites', name: 'Origin website' },
+    { field: 'cca_health_impacts', name: 'Health impacts' },
+    { field: 'cca_partner_contributors', name: 'Observatory impacts' },
+  ];
   config.searchui.ccaSearch = {
     ...mergeConfig(envConfig, config.searchui.globalsearchbase),
     elastic_index: '_es/globalsearch',
@@ -206,5 +222,6 @@ export default function installMainSearch(config) {
       process.env.RAZZLE_ES_PROXY_ADDR || getClientProxyAddress();
   }
 
+  // console.log(config);
   return config;
 }

package/src/search/mission_funding/facets-funding.js

@@ -1,6 +1,6 @@
 import { multiTermFacet } from '@eeacms/search';
 import globalSearchBaseConfig from '@eeacms/volto-globalsearch/config/global-search-base-config.js';
-import spatialWhitelist from '@eeacms/volto-globalsearch/config/json/spatialWhitelist';
+// import spatialWhitelist from '@eeacms/volto-globalsearch/config/json/spatialWhitelist';
 import { cca_adaptation_sectors } from './../common';
 
 const blacklist = ['IncludeArchived', 'issued.date', 'spatial', 'language'];
@@ -21,17 +21,17 @@ const facets = [
     alwaysVisible: false,
   }),
   cca_adaptation_sectors,
-  multiTermFacet({
-    field: 'spatial',
-    isFilterable: true,
-    isMulti: true,
-    label: 'Countries',
-    spatialWhitelist: spatialWhitelist,
-    show: 10000,
-    iconsFamily: 'Countries',
-    enableExact: true,
-    alwaysVisible: false,
-  }),
+  // multiTermFacet({
+  //   field: 'spatial',
+  //   isFilterable: true,
+  //   isMulti: true,
+  //   label: 'Countries',
+  //   spatialWhitelist: spatialWhitelist,
+  //   show: 10000,
+  //   iconsFamily: 'Countries',
+  //   enableExact: true,
+  //   alwaysVisible: false,
+  // }),
 
   ...globalSearchBaseConfig.facets.filter((f) => !blacklist.includes(f.field)),
 ];