@eeacms/volto-cca-policy 0.2.54 → 0.2.55

package/CHANGELOG.md

@@ -4,11 +4,16 @@ 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.54](https://github.com/eea/volto-cca-policy/compare/0.2.53...0.2.54) - 12 July 2024
+### [0.2.55](https://github.com/eea/volto-cca-policy/compare/0.2.54...0.2.55) - 18 July 2024
 
 #### :hammer_and_wrench: Others
 
-- Refs #271901 - allow all events path [Tripon Eugen - [`854acb4`](https://github.com/eea/volto-cca-policy/commit/854acb467008ee11272de953d22eb1f7628b1d23)]
+- Refs #271901 - datablocks version back [Tripon Eugen - [`7ebd292`](https://github.com/eea/volto-cca-policy/commit/7ebd29257ebb11d85d72730e77b8ec48d3fa2a90)]
+- Refs #271901 - datablocks pin version [Tripon Eugen - [`913ef74`](https://github.com/eea/volto-cca-policy/commit/913ef74b7abc324a733700dffe115606d570bd18)]
+- Refs #271901 - typo and filters update [Tripon Eugen - [`242d273`](https://github.com/eea/volto-cca-policy/commit/242d27372a4d7b9361b8e09dbf47c923281183c3)]
+- Refs #271901 - typo and filters update [Tripon Eugen - [`1069116`](https://github.com/eea/volto-cca-policy/commit/1069116d582905d3a9794cead6f1a8a78b386062)]
+### [0.2.54](https://github.com/eea/volto-cca-policy/compare/0.2.53...0.2.54) - 12 July 2024
+
 ### [0.2.53](https://github.com/eea/volto-cca-policy/compare/0.2.52...0.2.53) - 11 July 2024
 
 #### :house: Internal changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.2.54",
+  "version": "0.2.55",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -33,12 +33,12 @@
     "@eeacms/volto-eea-website-theme": "^1.33.2",
     "@eeacms/volto-embed": "^9.1.1",
     "@eeacms/volto-globalsearch": "^1.1.0",
+    "@eeacms/volto-hero-block": "^7.1.0",
     "@eeacms/volto-openlayers-map": "*",
     "@eeacms/volto-searchlib": "2.0.2",
-    "@elastic/search-ui": "1.21.2",
     "@eeacms/volto-slate-label": "^0.6.0",
     "@eeacms/volto-tabs-block": "^7.5.1",
-    "@eeacms/volto-hero-block": "^7.1.0",
+    "@elastic/search-ui": "1.21.2",
     "d3-array": "^2.12.1",
     "jotai": "^1.6.0",
     "query-string": "7.1.0",

package/razzle.extend.js

@@ -1,4 +1,8 @@
 const path = require('path');
+
+const makeLoaderFinder = require('razzle-dev-utils/makeLoaderFinder');
+const babelLoaderFinder = makeLoaderFinder('babel-loader');
+
 const plugins = (defaultPlugins) => {
   return defaultPlugins;
 };
@@ -20,6 +24,16 @@ const modify = (config, { target, dev }, webpack) => {
     ? themeLessPath
     : semanticLessPath;
 
+  const babelLoader = config.module.rules.find(babelLoaderFinder);
+  const sanitizePath = path.join(
+    path.dirname(require.resolve('sanitize-html')),
+  );
+  const { include } = babelLoader;
+  const htmlParserPath = `${sanitizePath}/node_modules/htmlparser2/lib/esm/`;
+
+  include.push(sanitizePath);
+  include.push(htmlParserPath);
+
   return config;
 };
 

package/src/components/manage/Blocks/CaseStudyExplorer/utils.js

@@ -40,25 +40,39 @@ export function filterCases(cases, activeFilters) {
     )
       return _case;
 
-    let flag = false;
+    let flag = {
+      sectors: false,
+      elements: false,
+      measures: false,
+      impacts: false,
+    };
 
     activeFilters.sectors.forEach((filter) => {
-      if (_case.properties.sectors.includes(',' + filter + ',')) flag = true;
+      if (_case.properties.sectors.includes(',' + filter + ','))
+        flag.sectors = true;
     });
 
     activeFilters.elements.forEach((filter) => {
-      if (_case.properties.elements.includes(',' + filter + ',')) flag = true;
+      if (_case.properties.elements.includes(',' + filter + ','))
+        flag.elements = true;
     });
 
     activeFilters.impacts.forEach((filter) => {
-      if (_case.properties.impacts.includes(',' + filter + ',')) flag = true;
+      if (_case.properties.impacts.includes(',' + filter + ','))
+        flag.impacts = true;
     });
 
     activeFilters.measures.forEach((filter) => {
-      if (_case.properties.ktms.includes(',' + filter + ',')) flag = true;
+      if (_case.properties.ktms.includes(',' + filter + ','))
+        flag.measures = true;
     });
 
-    return flag ? _case : false;
+    return (activeFilters.sectors.length ? flag.sectors : true) &&
+      (activeFilters.elements.length ? flag.elements : true) &&
+      (activeFilters.impacts.length ? flag.impacts : true) &&
+      (activeFilters.measures.length ? flag.measures : true)
+      ? _case
+      : false;
   });
 
   return data;

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

@@ -40,18 +40,15 @@ export default function installMainSearch(config) {
       cluster_name: {
         cca: 'Mission Portal',
       },
+      objectProvides: {
+        'Funding oportunity': 'Funding opportunity',
+      },
     },
     runtime_mappings: build_runtime_mappings(clusters),
   };
 
   const { missionAll } = config.searchui;
 
-  // missionAll.permanentFilters.push({
-  //   term: {
-  //     cca_include_in_mission: 'true',
-  //   },
-  // });
-
   missionAll.permanentFilters.push({
     term: {
       cluster_name: 'cca',
@@ -68,38 +65,10 @@ export default function installMainSearch(config) {
   //     ],
   //   },
   // });
-  // missionAll.permanentFilters.push({
-  //   prefix: {
-  //     'id.keyword': 'https://climate-adapt.eea.europa.eu/en/mission',
-  //   },
-  // });
 
   missionAll.permanentFilters.push({
     bool: {
       should: [
-        // {
-        //   terms: {
-        //     objectProvides: [
-        //       'Funding oportunity',
-        //       'Mission tool',
-        //       'Mission story',
-        //       'News',
-        //       'Events',
-        //       'Webpage',
-        //       // '',
-        //       // 'Adaptation option',
-        //       // 'Case study',
-        //       // 'Guidance',
-        //       // 'Video',
-        //       // 'Indicator',
-        //       // 'Information portal',
-        //       // 'Organisation',
-        //       // 'Publication reference',
-        //       // 'Research and knowledge project',
-        //       // 'Tool',
-        //     ],
-        //   },
-        // },
         {
           term: {
             cca_include_in_mission: 'true',
@@ -115,30 +84,6 @@ export default function installMainSearch(config) {
     },
   });
 
-  // missionAll.permanentFilters.push({
-  //   terms: {
-  //     objectProvides: [
-  //       'Funding oportunity',
-  //       'Mission tool',
-  //       'Mission story',
-  //       'News',
-  //       'Events',
-  //       'Webpage',
-  //       // '',
-  //       'Adaptation option',
-  //       'Case study',
-  //       'Guidance',
-  //       'Video',
-  //       'Indicator',
-  //       'Information portal',
-  //       'Organisation',
-  //       'Publication reference',
-  //       'Research and knowledge project',
-  //       'Tool',
-  //     ],
-  //   },
-  // });
-
   missionAll.facets = facets;
 
   if (typeof window !== 'undefined') {

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

@@ -8,8 +8,18 @@ import {
   cca_adaptation_sectors,
 } from '../common';
 
+let globalFacets = globalSearchBaseConfig.facets;
+for (let i = 0; i < globalFacets.length; i++) {
+  if (globalFacets[i]['field'] === 'IncludeArchived') {
+    globalFacets[i]['showInSecondaryFacetsList'] = false;
+  }
+  if (globalFacets[i]['field'] === 'issued.date') {
+    globalFacets[i]['showInSecondaryFacetsList'] = false;
+  }
+}
+
 const facets = [
-  ...globalSearchBaseConfig.facets,
+  ...globalFacets,
   cca_climate_impacts,
   cca_adaptation_sectors,
   multiTermFacet({