Webscore fix

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)
 

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') {

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",

src/customizations/volto/components/theme/Search/Search.jsx

@@ -30,7 +30,7 @@ const toSearchOptions = (searchableText, subject, queryOptions) => {
     ...(subject && {
       Subject: subject,
     }),
-    ...(queryOptions && queryOptions),
+    ...(queryOptions ? queryOptions : {}),
   };
 };