From a64ffb11984c122dceddb94294c19b17dfd39ead Mon Sep 17 00:00:00 2001 From: laszlocseh Date: Tue, 19 Nov 2024 14:16:23 +0200 Subject: [PATCH 1/5] refs #272894: added permanentFilters to search apps to exclude pages with seo_noindex --- src/search/health_observatory/config-health.js | 11 +++++++++++ src/search/mission_all/config-all.js | 11 +++++++++++ src/search/mission_funding/config-funding.js | 12 +++++++++++- src/search/mission_projects/config-projects.js | 12 ++++++++++++ src/search/mission_stories/config-stories.js | 12 +++++++++++- src/search/mission_tools/config-tools.js | 12 +++++++++++- 6 files changed, 67 insertions(+), 3 deletions(-) diff --git a/src/search/health_observatory/config-health.js b/src/search/health_observatory/config-health.js index b9f34fda..e28a71d2 100644 --- a/src/search/health_observatory/config-health.js +++ b/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', diff --git a/src/search/mission_all/config-all.js b/src/search/mission_all/config-all.js index 57236e6f..a40b5540 100644 --- a/src/search/mission_all/config-all.js +++ b/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: [ diff --git a/src/search/mission_funding/config-funding.js b/src/search/mission_funding/config-funding.js index 51f456bb..0fc354f4 100644 --- a/src/search/mission_funding/config-funding.js +++ b/src/search/mission_funding/config-funding.js @@ -30,7 +30,17 @@ export default function installMissionFundingSearch(config) { }; const { missionFundingSearch } = config.searchui; - + missionFundingSearch.permanentFilters.push({ + bool: { + must_not: [ + { + term: { + 'seo_noindex.keyword': 'true', + }, + }, + ], + }, + }); missionFundingSearch.facets = facets; if (typeof window !== 'undefined') { diff --git a/src/search/mission_projects/config-projects.js b/src/search/mission_projects/config-projects.js index 79fbaa4c..8324c5db 100644 --- a/src/search/mission_projects/config-projects.js +++ b/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') { diff --git a/src/search/mission_stories/config-stories.js b/src/search/mission_stories/config-stories.js index a01d3638..838bb363 100644 --- a/src/search/mission_stories/config-stories.js +++ b/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') { diff --git a/src/search/mission_tools/config-tools.js b/src/search/mission_tools/config-tools.js index 8930467c..504cc571 100644 --- a/src/search/mission_tools/config-tools.js +++ b/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') { From 45bdfacdd22a76005053813a695a7d61404bed23 Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Tue, 19 Nov 2024 12:36:30 +0000 Subject: [PATCH 2/5] Automated release 0.2.81 --- CHANGELOG.md | 5 +++++ package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d57dbd6..584d03ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ 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.81](https://github.com/eea/volto-cca-policy/compare/0.2.80...0.2.81) - 19 November 2024 + +#### :hammer_and_wrench: Others + +- 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 diff --git a/package.json b/package.json index 2414612f..8d8cd38b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-cca-policy", - "version": "0.2.80", + "version": "0.2.81", "description": "@eeacms/volto-cca-policy: Volto add-on", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team", From 5fa406ca4824829fc8700f8172ae52903f39bd55 Mon Sep 17 00:00:00 2001 From: Tiberiu Ichim Date: Mon, 25 Nov 2024 11:56:20 +0200 Subject: [PATCH 3/5] WIP --- src/search/mission_funding/config-funding.js | 5 ++--- src/search/mission_funding/facets-funding.js | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/search/mission_funding/config-funding.js b/src/search/mission_funding/config-funding.js index 0fc354f4..bc74349b 100644 --- a/src/search/mission_funding/config-funding.js +++ b/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) { @@ -41,14 +41,13 @@ export default function installMissionFundingSearch(config) { ], }, }); - missionFundingSearch.facets = facets; if (typeof window !== 'undefined') { config.searchui.missionFundingSearch.host = process.env.RAZZLE_ES_PROXY_ADDR || getClientProxyAddress(); } - // console.log(config.searchui); + console.log(config.searchui); return config; } diff --git a/src/search/mission_funding/facets-funding.js b/src/search/mission_funding/facets-funding.js index 67c4e586..518bffd8 100644 --- a/src/search/mission_funding/facets-funding.js +++ b/src/search/mission_funding/facets-funding.js @@ -3,7 +3,7 @@ import globalSearchBaseConfig from '@eeacms/volto-globalsearch/config/global-sea 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({ From 1c82ad898054a723d47144100139f6880ef5ea0d Mon Sep 17 00:00:00 2001 From: Tiberiu Ichim Date: Mon, 25 Nov 2024 15:48:38 +0200 Subject: [PATCH 4/5] Remove console.log --- src/search/mission_funding/config-funding.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/search/mission_funding/config-funding.js b/src/search/mission_funding/config-funding.js index bc74349b..e42a1b1e 100644 --- a/src/search/mission_funding/config-funding.js +++ b/src/search/mission_funding/config-funding.js @@ -47,7 +47,5 @@ export default function installMissionFundingSearch(config) { process.env.RAZZLE_ES_PROXY_ADDR || getClientProxyAddress(); } - console.log(config.searchui); - return config; } From 7d9e311ad11981530b69c35ca247ec02d583a793 Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Mon, 25 Nov 2024 14:06:21 +0000 Subject: [PATCH 5/5] Automated release 0.2.81 --- CHANGELOG.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 584d03ce..141ca437 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,12 @@ 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.81](https://github.com/eea/volto-cca-policy/compare/0.2.80...0.2.81) - 19 November 2024 +### [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 @@ -1671,13 +1673,10 @@ 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 @@ -1694,9 +1693,6 @@ 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)] @@ -1913,7 +1909,6 @@ 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 @@ -2394,7 +2389,6 @@ 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