From 98e76f91a594ccdb1180886bee14bf87937deb4e Mon Sep 17 00:00:00 2001 From: Miu Razvan Date: Mon, 13 Dec 2021 14:01:21 +0200 Subject: [PATCH 1/5] [Webscore fix] Correct expresion - Check https://sonarqube.eea.europa.eu/project/issues?id=volto-forests-theme-develop&open=AX0ng2g3IYbZY8mbWxoS&resolved=false&types=BUG --- src/customizations/volto/components/theme/Search/Search.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/customizations/volto/components/theme/Search/Search.jsx b/src/customizations/volto/components/theme/Search/Search.jsx index 587c6a5..967e0c2 100644 --- a/src/customizations/volto/components/theme/Search/Search.jsx +++ b/src/customizations/volto/components/theme/Search/Search.jsx @@ -30,7 +30,7 @@ const toSearchOptions = (searchableText, subject, queryOptions) => { ...(subject && { Subject: subject, }), - ...(queryOptions && queryOptions), + ...(queryOptions ? queryOptions : {}), }; }; From 77022adf3a0be30513b6c30827877e3e483085ec Mon Sep 17 00:00:00 2001 From: valentinab25 Date: Mon, 13 Dec 2021 21:41:24 +0200 Subject: [PATCH 2/5] [JENKINS] Refs #142010 - Optimize Volto-addons gitflow pipelines --- Jenkinsfile | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0d69753..d6675b5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,8 +31,8 @@ pipeline { when { allOf { environment name: 'CHANGE_ID', value: '' - not { branch 'master' } not { changelog '.*^Automated release [0-9\\.]+$' } + not { branch 'master' } } } steps { @@ -63,7 +63,10 @@ pipeline { when { allOf { environment name: 'CHANGE_ID', value: '' - not { changelog '.*^Automated release [0-9\\.]+$' } + anyOf { + not { changelog '.*^Automated release [0-9\\.]+$' } + branch 'master' + } } } steps { @@ -108,7 +111,10 @@ pipeline { when { allOf { environment name: 'CHANGE_ID', value: '' - not { changelog '.*^Automated release [0-9\\.]+$' } + anyOf { + not { changelog '.*^Automated release [0-9\\.]+$' } + branch 'master' + } } } steps { @@ -159,12 +165,16 @@ pipeline { stage('Report to SonarQube') { when { + allOf { environment name: 'CHANGE_ID', value: '' anyOf { branch 'master' - branch 'develop' + allOf { + branch 'develop' + not { changelog '.*^Automated release [0-9\\.]+$' } + } } - not { changelog '.*^Automated release [0-9\\.]+$' } + } } steps { node(label: 'swarm') { From 5b0966a0f3a004341196f2446081bb4f9093a52f Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Tue, 14 Dec 2021 13:28:11 +0000 Subject: [PATCH 3/5] Automated release 0.1.30 --- CHANGELOG.md | 8 +++++++- package.json | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cce833..6ecbf1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,19 @@ 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.30](https://github.com/eea/volto-forests-theme/compare/0.1.29...0.1.30) + +- [Webscore fix] Correct expresion [`98e76f9`](https://github.com/eea/volto-forests-theme/commit/98e76f91a594ccdb1180886bee14bf87937deb4e) + #### [0.1.29](https://github.com/eea/volto-forests-theme/compare/0.1.28...0.1.29) +> 13 December 2021 + +- Custom Block & add stretch class in block wrapper [`#39`](https://github.com/eea/volto-forests-theme/pull/39) - Prettier fix [`fccfd6f`](https://github.com/eea/volto-forests-theme/commit/fccfd6f35ad1f525127c7eb22f8f3dc124daa423) - Lint fix MD [`7a5d5bb`](https://github.com/eea/volto-forests-theme/commit/7a5d5bba075ded2c5b02562db7a3ab31a2f3133c) - Document customization [`2eb3624`](https://github.com/eea/volto-forests-theme/commit/2eb36241380c8077a4f5a0614d395f3b22b745bd) - Customized block container cleanup [`6907ae2`](https://github.com/eea/volto-forests-theme/commit/6907ae2f199a844b36bf2e171dc8e89d3a4b8a98) -- Custom Block & add stretch class in block wrapper [`7755c15`](https://github.com/eea/volto-forests-theme/commit/7755c157dab2a0a2e222c4440547b192daeda97d) #### [0.1.28](https://github.com/eea/volto-forests-theme/compare/0.1.27...0.1.28) diff --git a/package.json b/package.json index 997596a..f77f630 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-forests-theme", - "version": "0.1.29", + "version": "0.1.30", "description": "@eeacms/volto-forests-theme: Volto add-on", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team", From e76c224dac6fbe3f8acfef4c7349d15a5977c100 Mon Sep 17 00:00:00 2001 From: nileshgulia1 Date: Tue, 14 Dec 2021 20:14:57 +0530 Subject: [PATCH 4/5] fix edge case in browser detection --- .../volto/components/theme/OutdatedBrowser/OutdatedBrowser.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/customizations/volto/components/theme/OutdatedBrowser/OutdatedBrowser.jsx b/src/customizations/volto/components/theme/OutdatedBrowser/OutdatedBrowser.jsx index 4eea3f0..22cff7d 100644 --- a/src/customizations/volto/components/theme/OutdatedBrowser/OutdatedBrowser.jsx +++ b/src/customizations/volto/components/theme/OutdatedBrowser/OutdatedBrowser.jsx @@ -8,6 +8,7 @@ import { BodyClass } from '@plone/volto/helpers'; const OutdatedBrowser = () => { const browserdetect = useSelector((state) => state.browserdetect); return ( + browserdetect && config.settings.notSupportedBrowsers.includes(browserdetect.name) && ( From a8d9ee3b0f483ab073f47ec6f09a3e5289774213 Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Tue, 14 Dec 2021 14:59:11 +0000 Subject: [PATCH 5/5] Automated release 0.1.30 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ecbf1a..9e32680 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). #### [0.1.30](https://github.com/eea/volto-forests-theme/compare/0.1.29...0.1.30) +- fix edge case in browser detection [`e76c224`](https://github.com/eea/volto-forests-theme/commit/e76c224dac6fbe3f8acfef4c7349d15a5977c100) - [Webscore fix] Correct expresion [`98e76f9`](https://github.com/eea/volto-forests-theme/commit/98e76f91a594ccdb1180886bee14bf87937deb4e) #### [0.1.29](https://github.com/eea/volto-forests-theme/compare/0.1.28...0.1.29)