From caf929af031895e2599ebcb6768b36c1d583eb59 Mon Sep 17 00:00:00 2001 From: Tiberiu Ichim Date: Thu, 8 Jun 2023 09:55:01 +0300 Subject: [PATCH 1/4] Fix env variable to exclude external routes --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 2e030656..41b27cce 100644 --- a/src/index.js +++ b/src/index.js @@ -25,7 +25,7 @@ import GeolocationWidget from './components/theme/Widgets/GeolocationWidget'; const applyConfig = (config) => { const notInEnMission = /^(?!(\/en\/mission)).*$/; - if (!__DEVELOPMENT__ || process.env.SET_EXTERNAL_ROUTES) { + if (!__DEVELOPMENT__ || !process.env.RAZZLE_SET_EXTERNAL_ROUTES) { config.settings.externalRoutes = [ ...(config.settings.externalRoutes || []), { From ab14e540c9f091d00716220af59a1db7c4772b5b Mon Sep 17 00:00:00 2001 From: Tripon Eugen Date: Thu, 8 Jun 2023 10:52:59 +0300 Subject: [PATCH 2/4] cca cluster test and default filter --- src/search/config.js | 15 +++++++++++++++ src/search/facets.js | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/search/config.js b/src/search/config.js index 3b6ef111..d8b9760e 100644 --- a/src/search/config.js +++ b/src/search/config.js @@ -1,4 +1,5 @@ import { mergeConfig } from '@eeacms/search'; +import { build_runtime_mappings } from '@eeacms/volto-globalsearch/utils'; import facets from './facets'; @@ -17,6 +18,19 @@ const ccaConfig = { title: 'ClimateAdapt Main', }; +export const clusters = { + name: 'op_cluster', + field: 'objectProvides', + clusters: [ + // { + // name: 'Type1', + // icon: { name: 'bullhorn' }, + // values: ['Video', 'Guidance'], + // defaultResultView: 'horizontalCard', + // }, + ], +}; + export default function installMainSearch(config) { const envConfig = process.env.RAZZLE_ENV_CONFIG ? JSON.parse(process.env.RAZZLE_ENV_CONFIG) @@ -37,6 +51,7 @@ export default function installMainSearch(config) { cca: 'MIP4Adapt', }, }, + runtime_mappings: build_runtime_mappings(clusters), }; const { ccaSearch } = config.searchui; diff --git a/src/search/facets.js b/src/search/facets.js index 17a74feb..122e3944 100644 --- a/src/search/facets.js +++ b/src/search/facets.js @@ -61,7 +61,6 @@ const facets = [ ignoreNLPWhenActive: true, blacklist: ['Others', 'Publications'], }, - // { // field: 'moreLikeThis', // factory: 'MoreLikeThis', @@ -1165,6 +1164,7 @@ const facets = [ isMulti: true, sortOn: 'custom', sortOnCustomLabel: 'Alphabetical', + alwaysVisible: true, }, { field: 'cca_geographic_transnational_region.keyword', From 2c0fe52122391e506b366b0074522d9f15ac02bd Mon Sep 17 00:00:00 2001 From: Tripon Eugen Date: Thu, 8 Jun 2023 12:46:19 +0300 Subject: [PATCH 3/4] cca add countries to landing page --- src/search/config.js | 151 +++++++++++++++---------------------------- 1 file changed, 52 insertions(+), 99 deletions(-) diff --git a/src/search/config.js b/src/search/config.js index d8b9760e..15f1c825 100644 --- a/src/search/config.js +++ b/src/search/config.js @@ -96,105 +96,58 @@ export default function installMainSearch(config) { family: 'Content types', }, }, - // { - // id: 'topics', - // title: 'Topics', - // facetField: 'topic', - // sortOn: 'alpha', - // whitelist: [ - // 'Agriculture and food', - // 'Air pollution', - // 'Bathing water quality', - // 'Biodiversity', - // 'Bioeconomy', - // 'Buildings and construction', - // 'Chemicals', - // 'Circular economy', - // 'Climate change adaptation', - // 'Climate change mitigation', - // 'Electric vehicles', - // 'Energy', - // 'Energy efficiency', - // 'Environmental health impacts', - // 'Environmental inequalities', - // 'Extreme weather', - // 'Fisheries and aquaculture', - // 'Forests and forestry', - // 'Industry', - // 'Land use', - // 'Nature protection and restoration', - // 'Nature-based solutions', - // 'Noise', - // 'Plastics', - // 'Pollution', - // 'Production and consumption', - // 'Renewable energy', - // 'Resource use and materials', - // 'Road transport', - // 'Seas and coasts', - // 'Soil', - // 'Sustainability challenges', - // 'Sustainability solutions', - // 'Sustainable finance', - // 'Textiles', - // 'Transport and mobility', - // 'Urban sustainability', - // 'Waste and recycling', - // 'Water', - // ], - // }, - // { - // id: 'countries', - // title: 'Countries', - // facetField: 'spatial', - // filterType: 'any:exact', - // sortOn: 'alpha', - // maxPerSection: 100, - // whitelist: [ - // 'Austria', - // 'Belgium', - // 'Bulgaria', - // 'Croatia', - // 'Cyprus', - // 'Czechia', - // 'Denmark', - // 'Estonia', - // 'Finland', - // 'France', - // 'Germany', - // 'Greece', - // 'Hungary', - // 'Iceland', - // 'Ireland', - // 'Italy', - // 'Latvia', - // 'Liechtenstein', - // 'Lithuania', - // 'Luxembourg', - // 'Malta', - // 'Netherlands', - // 'Norway', - // 'Poland', - // 'Portugal', - // 'Romania', - // 'Slovakia', - // 'Slovenia', - // 'Spain', - // 'Sweden', - // 'Switzerland', - // 'Türkiye', - // 'Albania', - // 'Bosnia and Herzegovina', - // 'Kosovo', - // 'Montenegro', - // 'North Macedonia', - // 'Serbia', - // ], - // icon: { - // family: 'CountryFlags', - // className: 'facet-option-icon', - // }, - // }, + { + id: 'cca_geographic_countries', + title: 'Countries', + facetField: 'cca_geographic_countries.keyword', + // filterType: 'any:exact', + sortOn: 'alpha', + // maxPerSection: 100, + whitelist: [ + 'Austria', + 'Belgium', + 'Bulgaria', + 'Croatia', + 'Cyprus', + 'Czechia', + 'Denmark', + 'Estonia', + 'Finland', + 'France', + 'Germany', + 'Greece', + 'Hungary', + 'Iceland', + 'Ireland', + 'Italy', + 'Latvia', + 'Liechtenstein', + 'Lithuania', + 'Luxembourg', + 'Malta', + 'Netherlands', + 'Norway', + 'Poland', + 'Portugal', + 'Romania', + 'Slovakia', + 'Slovenia', + 'Spain', + 'Sweden', + 'Switzerland', + 'Türkiye', + 'Albania', + 'Bosnia and Herzegovina', + 'Kosovo', + 'Montenegro', + 'North Macedonia', + 'Serbia', + ], + icon: { + family: 'CountryFlags', + className: 'facet-option-icon', + }, + }, // { // id: 'language', // title: 'Languages', From 25b96798c9aa4ab4e652282149673351eaf79cbf Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Thu, 8 Jun 2023 09:54:41 +0000 Subject: [PATCH 4/4] Automated release 0.1.20 --- CHANGELOG.md | 10 +++++++++- package.json | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90a86604..6a7dcf77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,18 @@ 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.1.20](https://github.com/eea/volto-cca-policy/compare/0.1.19...0.1.20) - 8 June 2023 + +#### :hammer_and_wrench: Others + +- cca add countries to landing page [Tripon Eugen - [`2c0fe52`](https://github.com/eea/volto-cca-policy/commit/2c0fe52122391e506b366b0074522d9f15ac02bd)] +- cca cluster test and default filter [Tripon Eugen - [`ab14e54`](https://github.com/eea/volto-cca-policy/commit/ab14e540c9f091d00716220af59a1db7c4772b5b)] +- Fix env variable to exclude external routes [Tiberiu Ichim - [`caf929a`](https://github.com/eea/volto-cca-policy/commit/caf929af031895e2599ebcb6768b36c1d583eb59)] ### [0.1.19](https://github.com/eea/volto-cca-policy/compare/0.1.18...0.1.19) - 7 June 2023 #### :house: Internal changes +- chore: [JENKINS] Remove alpha testing version [valentinab25 - [`ad1ced0`](https://github.com/eea/volto-cca-policy/commit/ad1ced0971ba116c13a3b5fcc039172cc915c919)] #### :hammer_and_wrench: Others @@ -43,7 +51,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - Add responsive container [Tiberiu Ichim - [`a76ca88`](https://github.com/eea/volto-cca-policy/commit/a76ca886e56117d086a28531c9f629a19c6cb9d1)] - Remove layout settings block override on restriction [kreafox - [`e0bf0f8`](https://github.com/eea/volto-cca-policy/commit/e0bf0f80d9475f53d416e79f3da053812a40b514)] - add breadcrumbs to apiExpanders, fixes breadcrumbs in the /contents view [Tiberiu Ichim - [`10a17f2`](https://github.com/eea/volto-cca-policy/commit/10a17f270b267985dd078a9470329d1d15254813)] -- Fix clicking in overlay [Tiberiu Ichim - [`442d726`](https://github.com/eea/volto-cca-policy/commit/442d7264c738179b0411dda6f3ee9341b356d5e1)] - Enable layout settings block [kreafox - [`e7c3741`](https://github.com/eea/volto-cca-policy/commit/e7c37419bb74e3590d3676d83f774bc6923e417e)] - Refs #251121 - facets update [Tripon Eugen - [`80a44c7`](https://github.com/eea/volto-cca-policy/commit/80a44c7a37ce0dd04b82cfdde748aca72c642f38)] - testing volto search [Tripon Eugen - [`0fbe836`](https://github.com/eea/volto-cca-policy/commit/0fbe836345cf0ca8d8765f8df6b8e3914bdc6d3d)] @@ -489,6 +496,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 diff --git a/package.json b/package.json index 610a2d1c..adb3fb0e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-cca-policy", - "version": "0.1.19", + "version": "0.1.20", "description": "@eeacms/volto-cca-policy: Volto add-on", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team",