@eeacms/volto-cca-policy 0.2.80 → 0.2.82

package/CHANGELOG.md

@@ -4,6 +4,28 @@ 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.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
+
+- Remove console.log [Tiberiu Ichim - [`1c82ad8`](https://github.com/eea/volto-cca-policy/commit/1c82ad898054a723d47144100139f6880ef5ea0d)]
+- WIP [Tiberiu Ichim - [`5fa406c`](https://github.com/eea/volto-cca-policy/commit/5fa406ca4824829fc8700f8172ae52903f39bd55)]
+- refs #272894: added permanentFilters to search apps to exclude pages with seo_noindex [laszlocseh - [`a64ffb1`](https://github.com/eea/volto-cca-policy/commit/a64ffb11984c122dceddb94294c19b17dfd39ead)]
 ### [0.2.80](https://github.com/eea/volto-cca-policy/compare/0.2.79...0.2.80) - 15 November 2024
 
 #### :rocket: Dependency updates

package/package.json

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

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/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',

package/src/search/health_observatory/config-health.js

@@ -87,6 +87,17 @@ export default function installMainSearch(config) {
       cca_include_in_search_observatory: 'true',
     },
   });
+  ccaHealthSearch.permanentFilters.push({
+    bool: {
+      must_not: [
+        {
+          term: {
+            'seo_noindex.keyword': 'true',
+          },
+        },
+      ],
+    },
+  });
   ccaHealthSearch.contentSectionsParams = {
     enable: true,
     sectionFacetsField: 'op_cluster',

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

@@ -54,6 +54,17 @@ export default function installMainSearch(config) {
       cluster_name: 'cca',
     },
   });
+  missionAll.permanentFilters.push({
+    bool: {
+      must_not: [
+        {
+          term: {
+            'seo_noindex.keyword': 'true',
+          },
+        },
+      ],
+    },
+  });
   // missionAll.permanentFilters.push({
   //   bool: {
   //     must_not: [

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

@@ -5,7 +5,7 @@ import facets from './facets-funding';
 
 const missionFundingSearchConfig = {
   title: 'Mission Funding Search',
-  ...facets,
+  facets,
 };
 
 export default function installMissionFundingSearch(config) {
@@ -30,15 +30,22 @@ export default function installMissionFundingSearch(config) {
   };
 
   const { missionFundingSearch } = config.searchui;
-
-  missionFundingSearch.facets = facets;
+  missionFundingSearch.permanentFilters.push({
+    bool: {
+      must_not: [
+        {
+          term: {
+            'seo_noindex.keyword': 'true',
+          },
+        },
+      ],
+    },
+  });
 
   if (typeof window !== 'undefined') {
     config.searchui.missionFundingSearch.host =
       process.env.RAZZLE_ES_PROXY_ADDR || getClientProxyAddress();
   }
 
-  // console.log(config.searchui);
-
   return config;
 }

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

@@ -1,9 +1,9 @@
 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'];
+const blacklist = ['IncludeArchived', 'issued.date', 'spatial', 'language'];
 
 const facets = [
   multiTermFacet({
@@ -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)),
 ];

package/src/search/mission_projects/config-projects.js

@@ -58,6 +58,18 @@ export default function installMainSearch(config) {
     },
   });
 
+  missionProjects.permanentFilters.push({
+    bool: {
+      must_not: [
+        {
+          term: {
+            'seo_noindex.keyword': 'true',
+          },
+        },
+      ],
+    },
+  });
+
   missionProjects.facets = facets;
 
   if (typeof window !== 'undefined') {

package/src/search/mission_stories/config-stories.js

@@ -29,7 +29,17 @@ export default function installMissionStoriesSearch(config) {
   };
 
   const { missionStoriesSearch } = config.searchui;
-
+  missionStoriesSearch.permanentFilters.push({
+    bool: {
+      must_not: [
+        {
+          term: {
+            'seo_noindex.keyword': 'true',
+          },
+        },
+      ],
+    },
+  });
   missionStoriesSearch.facets = facets;
 
   if (typeof window !== 'undefined') {

package/src/search/mission_tools/config-tools.js

@@ -30,7 +30,17 @@ export default function installMissionToolsSearch(config) {
   };
 
   const { missionToolsSearch } = config.searchui;
-
+  missionToolsSearch.permanentFilters.push({
+    bool: {
+      must_not: [
+        {
+          term: {
+            'seo_noindex.keyword': 'true',
+          },
+        },
+      ],
+    },
+  });
   missionToolsSearch.facets = facets;
 
   if (typeof window !== 'undefined') {