Merge pull request #17 from eea/develop

Release

CHANGELOG.md

@@ -4,8 +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).
 
+#### [3.3.0](https://github.com/eea/volto-accordion-block/compare/3.2.4...3.3.0)
+
+- use custom title icons [`#16`](https://github.com/eea/volto-accordion-block/pull/16)
+- Release 3.3.0 [`2cbb1d5`](https://github.com/eea/volto-accordion-block/commit/2cbb1d53ce62b9cb42751c4c4997577ba4165649)
+- Add Sonarqube tag using forests-frontend addons list [`ab257ac`](https://github.com/eea/volto-accordion-block/commit/ab257acb0c2c8e38b906fcce8f6e148e4690d473)
+
 #### [3.2.4](https://github.com/eea/volto-accordion-block/compare/3.2.3...3.2.4)
 
+> 21 July 2021
+
+- Set initial values based on default schema properties (#14) [`#15`](https://github.com/eea/volto-accordion-block/pull/15)
 - set initial values based on default schema properties [`#14`](https://github.com/eea/volto-accordion-block/pull/14)
 
 #### [3.2.3](https://github.com/eea/volto-accordion-block/compare/3.2.2...3.2.3)

Jenkinsfile

@@ -4,7 +4,7 @@ pipeline {
   environment {
         GIT_NAME = "volto-accordion-block"
         NAMESPACE = "@eeacms"
-        SONARQUBE_TAGS = "volto.eea.europa.eu"
+        SONARQUBE_TAGS = "volto.eea.europa.eu,forest.eea.europa.eu"
         DEPENDENCIES = ""
     }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-accordion-block",
-  "version": "3.2.4",
+  "version": "3.3.0",
   "description": "volto-accordion-block: Volto accordion block",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

src/components/manage/Blocks/Accordion/AccordionEdit.jsx

@@ -1,10 +1,9 @@
 import { Icon } from '@plone/volto/components';
-import downSVG from '@plone/volto/icons/down-key.svg';
-import rightSVG from '@plone/volto/icons/right-key.svg';
 import cx from 'classnames';
 import React from 'react';
 import AnimateHeight from 'react-animate-height';
 import { Accordion, Input } from 'semantic-ui-react';
+import config from '@plone/volto/registry';
 
 export default (props) => {
   const {
@@ -17,6 +16,7 @@ export default (props) => {
     index,
   } = props;
   const [activeIndex, setActiveIndex] = React.useState([0]);
+  const { titleIcons } = config.blocks.blocksConfig.accordion;
 
   const handleClick = (e, itemProps) => {
     const { index } = itemProps;
@@ -59,11 +59,11 @@ export default (props) => {
           })}
         >
           {isExclusive(index) ? (
-            <Icon name={downSVG} size="24px" />
+            <Icon name={titleIcons.down} size="24px" />
           ) : (
             <Icon
               size="24px"
-              name={rightSVG}
+              name={titleIcons.right}
               className={cx({ 'rotate-arrow': data?.right_arrows })}
             />
           )}

src/components/manage/Blocks/Accordion/Schema.js

@@ -60,7 +60,7 @@ export const accordionBlockSchema = () => ({
       ],
     },
     right_arrows: {
-      title: 'Arrows on the right',
+      title: 'Title Icon on the right',
       type: 'boolean',
       default: false,
     },

src/index.js

@@ -5,6 +5,8 @@ import {
   AccordionLayoutSchema,
 } from './components';
 import { PanelsWidget } from '@eeacms/volto-accordion-block/components';
+import rightSVG from '@plone/volto/icons/right-key.svg';
+import downSVG from '@plone/volto/icons/down-key.svg';
 
 const extendedSchema = (config) => {
   const choices = Object.keys(config.blocks.blocksConfig)
@@ -40,6 +42,10 @@ const applyConfig = (config) => {
     title: 'Accordion',
     icon: accordionSVG,
     group: 'common',
+    titleIcons: {
+      right: rightSVG,
+      down: downSVG,
+    },
     view: AccordionBlockView,
     edit: AccordionBlockEdit,
     restricted: false,