Merge pull request #357 from eea/develop

Develop
eea · Dec 17, 2024 · f2352f8 · f2352f8
2 parents a7d4127 + 108f7ad
commit f2352f8
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ 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.84](https://github.com/eea/volto-cca-policy/compare/0.2.83...0.2.84) - 17 December 2024
+
+#### :hammer_and_wrench: Others
+
+- Fix eslint [Tiberiu Ichim - [`d2ab8e1`](https://github.com/eea/volto-cca-policy/commit/d2ab8e15c70bf790a40105e9ea994d907b8cfbd5)]
+- Remove console.log [Tiberiu Ichim - [`5a78a19`](https://github.com/eea/volto-cca-policy/commit/5a78a1938470e4d4997cbaf9bee2d08e6a40cf49)]
+- Rework language facets for Mission [Tiberiu Ichim - [`85a611a`](https://github.com/eea/volto-cca-policy/commit/85a611ae595f682b1348936d18750ed4bd209137)]
 ### [0.2.83](https://github.com/eea/volto-cca-policy/compare/0.2.82...0.2.83) - 16 December 2024
 
 #### :rocket: Dependency updates

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.2.83",
+  "version": "0.2.84",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

diff --git a/src/search/mission_all/config-all.js b/src/search/mission_all/config-all.js
@@ -102,5 +102,7 @@ export default function installMainSearch(config) {
       process.env.RAZZLE_ES_PROXY_ADDR || getClientProxyAddress();
   }
 
+  // console.log(config);
+
   return config;
 }
diff --git a/src/search/mission_all/facets-all.js b/src/search/mission_all/facets-all.js
@@ -2,13 +2,13 @@ import globalSearchBaseConfig from '@eeacms/volto-globalsearch/config/global-sea
 import { multiTermFacet } from '@eeacms/search';
 import {
   // objectProvides,
-  // language,
+  language,
   geographic_countries,
   cca_climate_impacts,
   cca_adaptation_sectors,
 } from '../common';
 
-const blacklist = ['IncludeArchived', 'issued.date'];
+const blacklist = ['IncludeArchived', 'issued.date', 'language'];
 let globalFacets = globalSearchBaseConfig.facets.filter(
   (f) => !blacklist.includes(f.field),
 );
@@ -23,6 +23,7 @@ globalFacets = globalFacets.concat(
   cca_climate_impacts,
   cca_adaptation_sectors,
   geographic_countries,
+  language,
   multiTermFacet({
     field: 'cca_adaptation_elements.keyword',
     isFilterable: false,

diff --git a/src/search/mission_funding/facets-funding.js b/src/search/mission_funding/facets-funding.js
@@ -1,7 +1,7 @@
 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 { cca_adaptation_sectors } from './../common';
+import { cca_adaptation_sectors, language } from './../common';
 
 const blacklist = ['IncludeArchived', 'issued.date', 'spatial', 'language'];
 
@@ -21,6 +21,7 @@ const facets = [
     alwaysVisible: false,
   }),
   cca_adaptation_sectors,
+  language,
   // multiTermFacet({
   //   field: 'spatial',
   //   isFilterable: true,

diff --git a/src/search/mission_stories/facets-stories.js b/src/search/mission_stories/facets-stories.js
@@ -1,7 +1,11 @@
 import { multiTermFacet } from '@eeacms/search';
 
 import globalSearchBaseConfig from '@eeacms/volto-globalsearch/config/global-search-base-config.js';
-import { cca_climate_impacts, cca_adaptation_sectors } from './../common';
+import {
+  cca_climate_impacts,
+  cca_adaptation_sectors,
+  language,
+} from './../common';
 
 const facets = [
   cca_climate_impacts,
@@ -31,6 +35,7 @@ const facets = [
     iconsFamily: 'Hazard Type',
     alwaysVisible: false,
   }),
+  language,
 ];
 
 export default facets;
diff --git a/src/search/mission_tools/facets-tools.js b/src/search/mission_tools/facets-tools.js
@@ -1,7 +1,11 @@
 import { multiTermFacet } from '@eeacms/search';
 
-import globalSearchBaseConfig from '@eeacms/volto-globalsearch/config/global-search-base-config.js';
-import { cca_climate_impacts, cca_adaptation_sectors } from './../common';
+// import globalSearchBaseConfig from '@eeacms/volto-globalsearch/config/global-search-base-config.js';
+import {
+  cca_climate_impacts,
+  cca_adaptation_sectors,
+  language,
+} from './../common';
 
 const facets = [
   multiTermFacet({
@@ -41,7 +45,8 @@ const facets = [
     label: 'User requirements',
     alwaysVisible: false,
   }),
-  ...globalSearchBaseConfig.facets,
+  language,
+  // ...globalSearchBaseConfig.facets,
 ];
 
 export default facets;