Merge pull request #72 from eea/develop

Release 5.0.0

CHANGELOG.md

@@ -4,6 +4,17 @@ 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).
 
+### [5.0.0](https://github.com/eea/volto-block-style/compare/4.1.2...5.0.0) - 7 February 2023
+
+#### :nail_care: Enhancements
+
+- change(theme): Add theme picker widget #70 from eea/color_pick_themes [ichim-david - [`f217995`](https://github.com/eea/volto-block-style/commit/f21799597037c533bf44bf109e88b454dc36964e)]
+
+#### :hammer_and_wrench: Others
+
+- Release 5.0.0 [Alin Voinea - [`ae2cb52`](https://github.com/eea/volto-block-style/commit/ae2cb527fef6593257684b14408636117479e4c2)]
+- Add theme picker widget [dana-cfc4 - [`4bbdec3`](https://github.com/eea/volto-block-style/commit/4bbdec33ac328873758c3a6ee03a41b53e2fb5a8)]
+- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`564c363`](https://github.com/eea/volto-block-style/commit/564c36374879ee6810fed58dc2ef8ee01751ec35)]
 ### [4.1.2](https://github.com/eea/volto-block-style/compare/4.1.1...4.1.2) - 29 November 2022
 
 #### :nail_care: Enhancements
@@ -12,8 +23,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- yarn 3 [Alin Voinea - [`9505f8c`](https://github.com/eea/volto-block-style/commit/9505f8cb21b38586fbe06efd8da353861691bc98)]
-- Add Sonarqube tag using demo-kitkat-frontend addons list [EEA Jenkins - [`831f4fa`](https://github.com/eea/volto-block-style/commit/831f4fadd1b60fe47b9fd5352031fd2cc3462a3d)]
 ### [4.1.1](https://github.com/eea/volto-block-style/compare/4.1.0...4.1.1) - 16 November 2022
 
 #### :nail_care: Enhancements
@@ -41,7 +50,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Bring this up to date [Miu Razvan - [`6d7e7a4`](https://github.com/eea/volto-block-style/commit/6d7e7a46078d858800eb894ffb1eba42bdd384e0)]
-- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`5529469`](https://github.com/eea/volto-block-style/commit/5529469b468e67300ba9cfca415f6b7bbf1ea0e4)]
 ### [3.7.2](https://github.com/eea/volto-block-style/compare/3.7.1...3.7.2) - 27 September 2022
 
 #### :bug: Bug Fixes
@@ -57,7 +65,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`928339f`](https://github.com/eea/volto-block-style/commit/928339ffd2991b24844a9ca3691523d7e692ca91)]
 ### [3.7.0](https://github.com/eea/volto-block-style/compare/3.6.3...3.7.0) - 22 September 2022
 
 #### :hammer_and_wrench: Others
@@ -77,14 +84,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`c8977dc`](https://github.com/eea/volto-block-style/commit/c8977dc8d8f623601c763aff13c1a8df5fd1eb13)]
 ### [3.6.0](https://github.com/eea/volto-block-style/compare/3.5.18...3.6.0) - 9 June 2022
 
 #### :hammer_and_wrench: Others
 
 - Release 3.6.0 [Alin Voinea - [`f0b6eb8`](https://github.com/eea/volto-block-style/commit/f0b6eb885feee2bb02fdd4daf6ee7a4747518b23)]
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`e7a6cf9`](https://github.com/eea/volto-block-style/commit/e7a6cf9ba635161d1222e2d5db4c83cb680e3ce2)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`a648e9b`](https://github.com/eea/volto-block-style/commit/a648e9b7667bc496050c02c2fcc8b4a3a0a7af1c)]
 ### [3.5.18](https://github.com/eea/volto-block-style/compare/3.5.17...3.5.18) - 3 March 2022
 
 ### [3.5.17](https://github.com/eea/volto-block-style/compare/3.5.16...3.5.17) - 2 March 2022
@@ -145,7 +149,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`ccd5b62`](https://github.com/eea/volto-block-style/commit/ccd5b622c05a9ee3d906d6eb5df0288fa25a694b)]
 - added cy tests [Daniela Mormocea - [`ed8dc6f`](https://github.com/eea/volto-block-style/commit/ed8dc6f55f1f48cb84f6c9879eb4a728e1308639)]
 ### [3.5.8](https://github.com/eea/volto-block-style/compare/3.5.7...3.5.8) - 13 December 2021
 
@@ -175,20 +178,17 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`813a0f5`](https://github.com/eea/volto-block-style/commit/813a0f5a2d1f563b184475a3e6ff620a733ba5da)]
 ### [3.5.2](https://github.com/eea/volto-block-style/compare/3.5.1...3.5.2) - 29 October 2021
 
 ### [3.5.1](https://github.com/eea/volto-block-style/compare/3.5.0...3.5.1) - 19 October 2021
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using sustainability-frontend addons list [EEA Jenkins - [`8b20d02`](https://github.com/eea/volto-block-style/commit/8b20d02f809e456af84aaea5ad74115c00e39c3e)]
 ### [3.5.0](https://github.com/eea/volto-block-style/compare/3.4.5...3.5.0) - 25 September 2021
 
 #### :hammer_and_wrench: Others
 
 - Release 3.5.0 [Alin Voinea - [`0a5a98e`](https://github.com/eea/volto-block-style/commit/0a5a98e531f93470956673e50b6c71f37f59b49e)]
-- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`30bb3aa`](https://github.com/eea/volto-block-style/commit/30bb3aa5f49ed5264cf609d6b8f234b07b7988ca)]
 ### [3.4.5](https://github.com/eea/volto-block-style/compare/3.4.4...3.4.5) - 31 August 2021
 
 #### :hammer_and_wrench: Others
@@ -245,10 +245,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Add range slider [Tiberiu Ichim - [`8a91ef1`](https://github.com/eea/volto-block-style/commit/8a91ef168df01e4a0f114596d50a401a14a41251)]
 - Separate block wrapping; don't apply multiple times [Tiberiu Ichim - [`2adffd5`](https://github.com/eea/volto-block-style/commit/2adffd58a99af59bb42d72c54f2a05be3b9b2ea1)]
 - Separate block wrapping; don't apply multiple times [Tiberiu Ichim - [`584e7a9`](https://github.com/eea/volto-block-style/commit/584e7a9859c7d417708f9aa78b83e94547f2f1ab)]
-- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`f6737ef`](https://github.com/eea/volto-block-style/commit/f6737ef68ba906c5fb72e18c77b060aa82ed0a73)]
-- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`6a4c6c1`](https://github.com/eea/volto-block-style/commit/6a4c6c16acc88471279a82a62b92555dc1ac20cc)]
-- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`2101b55`](https://github.com/eea/volto-block-style/commit/2101b550588402b37cd91b5d582e27a6255d6cac)]
-- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`2583c68`](https://github.com/eea/volto-block-style/commit/2583c68ea49ddbedc7b90b9d477cbbe4e2b779fd)]
 - Add hidden toggle [Tiberiu Ichim - [`3b8ed26`](https://github.com/eea/volto-block-style/commit/3b8ed26a82c31ff430301adceea1174e92464a77)]
 - Add a clear button to the box size widget [Tiberiu Ichim - [`4bdf803`](https://github.com/eea/volto-block-style/commit/4bdf8030d7a4d39d3a48b56ed6c8cddc311b3ff7)]
 ### [3.3.3](https://github.com/eea/volto-block-style/compare/3.3.2...3.3.3) - 25 June 2021
@@ -406,7 +402,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - React color ~2.18.1 [Alin Voinea - [`597da25`](https://github.com/eea/volto-block-style/commit/597da253f5266ecc9d0d6e10ee4d365432433416)]
 - Cleanup [Alin Voinea - [`8fb40cf`](https://github.com/eea/volto-block-style/commit/8fb40cf4fe721cc26120ab1231d48c4c9eab88a9)]
 - Fix README screenshot path [Alin Voinea - [`81f09ec`](https://github.com/eea/volto-block-style/commit/81f09ec9d95b3a555d0bc7e0aa3ad08b4ab005db)]
-- yarn prettier [Alin Voinea - [`04f3b9a`](https://github.com/eea/volto-block-style/commit/04f3b9ae36ea8c6d99dad1f6d4cf56e81c032e1a)]
 ### [0.1.1](https://github.com/eea/volto-block-style/compare/0.1.0...0.1.1) - 22 October 2020
 
 #### :hammer_and_wrench: Others

Jenkinsfile

@@ -4,9 +4,9 @@ pipeline {
   environment {
         GIT_NAME = "volto-block-style"
         NAMESPACE = "@eeacms"
-        SONARQUBE_TAGS = "volto.eea.europa.eu,climate-energy.eea.europa.eu,forest.eea.europa.eu,clms.land.copernicus.eu,biodiversity.europa.eu,www.eea.europa.eu-ims,sustainability.eionet.europa.eu,industry.eea.europa.eu,water.europa.eu-freshwater,demo-www.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,circularity.eea.europa.eu,prod-www.eea.europa.eu,water.europa.eu-marine,demo-kitkat.dev2aws.eea.europa.eu"
+        SONARQUBE_TAGS = "volto.eea.europa.eu,climate-energy.eea.europa.eu,forest.eea.europa.eu,clms.land.copernicus.eu,biodiversity.europa.eu,www.eea.europa.eu-ims,sustainability.eionet.europa.eu,industry.eea.europa.eu,water.europa.eu-freshwater,demo-www.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,circularity.eea.europa.eu,prod-www.eea.europa.eu,water.europa.eu-marine,demo-kitkat.dev2aws.eea.europa.eu,climate-adapt.eea.europa.eu,climate-advisory-board.devel4cph.eea.europa.eu,climate-advisory-board.europa.eu"
         DEPENDENCIES = ""
-        VOLTO = "alpha"
+        VOLTO = ""
     }
 
   stages {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-block-style",
-  "version": "4.1.2",
+  "version": "5.0.0",
   "description": "volto-block-style: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -22,13 +22,15 @@
   ],
   "dependencies": {
     "@eeacms/volto-resize-helper": "*",
+    "@eeacms/volto-widget-theme-picker": "*",
     "react-color": "~2.18.1"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.10.0",
     "@plone/scripts": "*",
     "babel-plugin-transform-class-properties": "^6.24.1",
-    "md5": "^2.3.0"
+    "md5": "^2.3.0",
+    "postcss-less": "6.0.0"
   },
   "scripts": {
     "release": "release-it",

src/StyleWrapper/schema.js

@@ -62,9 +62,14 @@ export const StyleSchema = () => {
       theme: {
         title: 'Theme',
         description: 'A predefined theme, applicable just to this block',
-        choices: [
-          ['primary', 'Primary'],
-          ['secondary', 'Secondary'],
+        widget: 'theme_picker',
+        colors: [
+          ...(config.settings && config.settings.themeColors
+            ? config.settings.themeColors.map(({ value, title }) => ({
+                name: value,
+                label: title,
+              }))
+            : []),
         ],
       },
       style_name: {

src/Widgets/StyleSelect.jsx

@@ -40,7 +40,7 @@ const StyleSelectWidget = (props) => {
                     onChange(id, style.id === value ? null : style.id)
                   }
                   key={style.id}
-                  className={cx({ active: style.id === value })}
+                  className={cx({ active: style.id === value }, 'styleCard')}
                 >
                   <Card.Content>
                     <Item.Image>{renderPreview(style)}</Item.Image>

src/styles.less

@@ -39,12 +39,14 @@
     cursor: pointer;
 
     .extra.content {
+      align-self: center;
       padding: 0.4em !important;
     }
   }
 
   .card.active {
     .extra.content {
+      align-self: center;
       background-color: #eee;
       font-weight: bold;
     }
@@ -182,3 +184,7 @@
     transform: translateY(45%);
   }
 }
+
+.styleCard {
+  min-width: unset !important;
+}