Merge pull request #96 from eea/develop

Release

.husky/pre-commit

@@ -0,0 +1,2 @@
+[ -n "$CI" ] && exit 0
+yarn lint-staged

CHANGELOG.md

@@ -4,6 +4,21 @@ 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).
 
+### [10.4.0](https://github.com/eea/volto-accordion-block/compare/10.3.0...10.4.0) - 27 September 2023
+
+#### :bug: Bug Fixes
+
+- fix: Inject styleWrapper classnames into the accordion custom EditBlockWrapper and Fix anonymous default export [Víctor Fernández de Alba - [`6f5975a`](https://github.com/eea/volto-accordion-block/commit/6f5975aeba527f2c9c2681bdd1a780cfbf3c24c6)]
+
+#### :house: Internal changes
+
+- style: lint-staged reorder in package.json [Alin Voinea - [`051f584`](https://github.com/eea/volto-accordion-block/commit/051f584e5a5f34912f44551e43d25497b9685b29)]
+
+#### :hammer_and_wrench: Others
+
+- Release 10.4.0 [Alin Voinea - [`26ccf43`](https://github.com/eea/volto-accordion-block/commit/26ccf435f4ac77a48d6e204940136eb9feff9075)]
+- test: EN locales, pre-commit fix, feature PRs checks [valentinab25 - [`96c8cf2`](https://github.com/eea/volto-accordion-block/commit/96c8cf2d65b7bcc682415613ecf8624ce4d48b48)]
+- test: add PR to develop tests [valentinab25 - [`0ae6fc1`](https://github.com/eea/volto-accordion-block/commit/0ae6fc1866ebaeba81afab3803902df50ae16649)]
 ### [10.3.0](https://github.com/eea/volto-accordion-block/compare/10.2.0...10.3.0) - 29 August 2023
 
 #### :rocket: New Features

Jenkinsfile

@@ -62,11 +62,17 @@ pipeline {
 
     stage('Tests') {
       when {
-        allOf {
-          environment name: 'CHANGE_ID', value: ''
-          anyOf {
-           not { changelog '.*^Automated release [0-9\\.]+$' }
-           branch 'master'
+        anyOf {
+          allOf {
+            not { environment name: 'CHANGE_ID', value: '' }
+            environment name: 'CHANGE_TARGET', value: 'develop'
+          }
+          allOf {
+            environment name: 'CHANGE_ID', value: ''
+            anyOf {
+              not { changelog '.*^Automated release [0-9\\.]+$' }
+              branch 'master'
+            }
           }
         }
       }
@@ -110,11 +116,17 @@ pipeline {
 
     stage('Integration tests') {
       when {
-        allOf {
-          environment name: 'CHANGE_ID', value: ''
-          anyOf {
-           not { changelog '.*^Automated release [0-9\\.]+$' }
-           branch 'master'
+        anyOf {
+          allOf {
+            not { environment name: 'CHANGE_ID', value: '' }
+            environment name: 'CHANGE_TARGET', value: 'develop'
+          }
+          allOf {
+            environment name: 'CHANGE_ID', value: ''
+            anyOf {
+              not { changelog '.*^Automated release [0-9\\.]+$' }
+              branch 'master'
+            }
           }
         }
       }
@@ -167,13 +179,19 @@ pipeline {
 
     stage('Report to SonarQube') {
       when {
-        allOf {
-          environment name: 'CHANGE_ID', value: ''
-          anyOf {
-            branch 'master'
-            allOf {
-              branch 'develop'
-              not { changelog '.*^Automated release [0-9\\.]+$' }
+        anyOf {
+          allOf {
+            not { environment name: 'CHANGE_ID', value: '' }
+            environment name: 'CHANGE_TARGET', value: 'develop'
+          }
+          allOf {
+            environment name: 'CHANGE_ID', value: ''
+            anyOf {
+              allOf {
+                branch 'develop'
+                not { changelog '.*^Automated release [0-9\\.]+$' }
+              }
+              branch 'master'
             }
           }
         }
@@ -199,10 +217,16 @@ pipeline {
 
     stage('SonarQube compare to master') {
       when {
-        allOf {
-          environment name: 'CHANGE_ID', value: ''
-          branch 'develop'
-          not { changelog '.*^Automated release [0-9\\.]+$' }
+        anyOf {
+          allOf {
+            not { environment name: 'CHANGE_ID', value: '' }
+            environment name: 'CHANGE_TARGET', value: 'develop'
+          }
+          allOf {
+            environment name: 'CHANGE_ID', value: ''
+            branch 'develop'
+            not { changelog '.*^Automated release [0-9\\.]+$' }
+          }
         }
       }
       steps {

cypress.config.js

@@ -2,12 +2,12 @@ const { defineConfig } = require('cypress');
 
 module.exports = defineConfig({
   viewportWidth: 1280,
-  defaultCommandTimeout: 8888,
+  defaultCommandTimeout: 5000,
   chromeWebSecurity: false,
   reporter: 'junit',
   video: true,
   retries: {
-    runMode: 8,
+    runMode: 1,
     openMode: 0,
   },
   reporterOptions: {

cypress/e2e/02-dexterity-controlpanel-layout.cy.js

@@ -15,11 +15,12 @@ describe('ControlPanel: Dexterity Content-Types Layout', () => {
       'have.text',
       'book',
     );
-
-    cy.visit('/controlpanel/dexterity-types/book/layout');
+    cy.navigate('/controlpanel/dexterity-types/book/layout');
     cy.get('#page-controlpanel-layout').contains(
       'Can not edit Layout for book',
     );
+    cy.wait(1000);
+
     cy.get('#page-controlpanel-layout button').click();
 
     // Wait a bit for draftjs to load, without this the title block
@@ -52,7 +53,6 @@ describe('ControlPanel: Dexterity Content-Types Layout', () => {
       .type('Chapter 1')
       .should('have.value', 'Chapter 1');
 
-    cy.get('.accordion:nth-child(2) > .title > .icon').click();
     cy.wait(500);
 
     cy.get(

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-accordion-block",
-  "version": "10.3.0",
+  "version": "10.4.0",
   "description": "volto-accordion-block: Volto accordion block",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -24,8 +24,31 @@
     "@cypress/code-coverage": "^3.10.0",
     "@plone/scripts": "*",
     "babel-plugin-transform-class-properties": "^6.24.1",
+    "husky": "*",
+    "lint-staged": "*",
     "md5": "^2.3.0"
   },
+  "lint-staged": {
+    "src/**/*.{js,jsx,ts,tsx,json}": [
+      "make lint-fix",
+      "make prettier-fix"
+    ],
+    "src/**/*.{jsx}": [
+      "make i18n"
+    ],
+    "theme/**/*.{css,less}": [
+      "make stylelint-fix"
+    ],
+    "src/**/*.{css,less}": [
+      "make stylelint-fix"
+    ],
+    "theme/**/*.overrides": [
+      "make stylelint-fix"
+    ],
+    "src/**/*.overrides": [
+      "make stylelint-fix"
+    ]
+  },
   "scripts": {
     "release": "release-it",
     "release-major-beta": "release-it major --preRelease=beta",
@@ -43,6 +66,7 @@
     "lint:fix": "make lint-fix",
     "i18n": "make i18n",
     "cypress:run": "make cypress-run",
-    "cypress:open": "make cypress-open"
+    "cypress:open": "make cypress-open",
+    "prepare": "husky install"
   }
 }

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

@@ -1,6 +1,9 @@
 import React from 'react';
 import { Icon } from '@plone/volto/components';
-import { blockHasValue } from '@plone/volto/helpers';
+import {
+  blockHasValue,
+  buildStyleClassNamesFromData,
+} from '@plone/volto/helpers';
 import config from '@plone/volto/registry';
 import { Button } from 'semantic-ui-react';
 import includes from 'lodash/includes';
@@ -61,12 +64,16 @@ class EditBlockWrapper extends React.Component {
       ? data.required
       : includes(config.blocks.requiredBlocks, type);
 
+    const styles = buildStyleClassNamesFromData(data.styles);
+
     return (
       <div>
         <div
           ref={draginfo?.innerRef}
           {...(selected ? draginfo?.draggableProps : null)}
-          className={`block-editor-${data['@type']}`}
+          className={cx(`block-editor-${data['@type']}`, styles, {
+            [data.align]: data.align,
+          })}
         >
           {(!selected || !visible || disabled) && (
             <div

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

@@ -110,7 +110,7 @@ const messages = defineMessages({
   },
 });
 
-export default (intl) => ({
+const layoutSchema = (intl) => ({
   title: intl.formatMessage(messages.AccordionBlockSettings),
   fieldsets: [
     {
@@ -208,3 +208,5 @@ export default (intl) => ({
   },
   required: [],
 });
+
+export default layoutSchema;