diff --git a/.husky/pre-commit b/.husky/pre-commit
new file mode 100755
index 0000000..9183f9d
--- /dev/null
+++ b/.husky/pre-commit
@@ -0,0 +1,2 @@
+[ -n "$CI" ] && exit 0
+yarn lint-staged
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48d016e..d75bbcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,20 @@ 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).
+### [6.3.1](https://github.com/eea/volto-group-block/compare/6.3.0...6.3.1) - 18 September 2023
+
+#### :bug: Bug Fixes
+
+- fix: rendering of listing blocks inside defaultTemplate #257871 [nileshgulia1 - [`40ad609`](https://github.com/eea/volto-group-block/commit/40ad6093fb38acda35f7955795ec4cd90f11378c)]
+
+#### :house: Internal changes
+
+- style: lint-staged reorder in package.json [Alin Voinea - [`f29c1df`](https://github.com/eea/volto-group-block/commit/f29c1df1b8fce6d4a93db08ccc944f1ac8bc8b8b)]
+
+#### :hammer_and_wrench: Others
+
+- test: EN locales, pre-commit fix, feature PRs checks Refs #257193 [valentinab25 - [`2e9d601`](https://github.com/eea/volto-group-block/commit/2e9d60101dfe24420a126dbf360d0f32b6a1f9af)]
+- test: Add cypress test for group block in DX Layout - refs #254894 [Crețu Mihaela - [`06d23ed`](https://github.com/eea/volto-group-block/commit/06d23ed82c959d6569ed57902b2e36bdc0fec970)]
### [6.3.0](https://github.com/eea/volto-group-block/compare/6.2.1...6.3.0) - 5 September 2023
#### :rocket: New Features
@@ -16,7 +30,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :hammer_and_wrench: Others
+- Release #39 from eea/develop [ichim-david - [`283e1e8`](https://github.com/eea/volto-group-block/commit/283e1e8dd1047415bae054cfd502d1691deaeb59)]
- Release 6.3.0 [Alin Voinea - [`3d74bb5`](https://github.com/eea/volto-group-block/commit/3d74bb5342e3882e0ddee1aa8edab7e90949def6)]
+- test: Fix eslint and yarn i18n [Alin Voinea - [`763f764`](https://github.com/eea/volto-group-block/commit/763f76448625e05b53a2bde86ca48dda0cb263cb)]
- i18n: Add en [Alin Voinea - [`f3385cd`](https://github.com/eea/volto-group-block/commit/f3385cd33bfbe3efe514fd82fd140d17e33051e1)]
- test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`3aa996b`](https://github.com/eea/volto-group-block/commit/3aa996b4c115da6f37ca771f07f10d58fbfa33e8)]
- fix eslint warnings [nileshgulia1 - [`cfdf2e9`](https://github.com/eea/volto-group-block/commit/cfdf2e900bcc456fa5a24ce7b03859170ad024ba)]
@@ -47,6 +63,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :house: Internal changes
+- chore: [JENKINS] Deprecate circularity website [valentinab25 - [`ad30e83`](https://github.com/eea/volto-group-block/commit/ad30e832bb869b67dc4e64ed99590b51cb80ab75)]
#### :hammer_and_wrench: Others
@@ -63,12 +80,19 @@ 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 - [`37ffae5`](https://github.com/eea/volto-group-block/commit/37ffae512967b36af22cbed208a3ec9e1ddc392b)]
## [6.0.0](https://github.com/eea/volto-group-block/compare/5.0.1...6.0.0) - 24 March 2023
#### :hammer_and_wrench: Others
- (feat): Possibility to copy/cut/paste blocks within section group block - refs #157469 [dobri1408 - [`e9fc098`](https://github.com/eea/volto-group-block/commit/e9fc09825ba2ae258feb77864491d97d94c585b4)]
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`db4b09a`](https://github.com/eea/volto-group-block/commit/db4b09a6c14a8b271dec0c766886ffbcc3fe205e)]
+- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`b8c2bf4`](https://github.com/eea/volto-group-block/commit/b8c2bf471868bb0394b2dbbf75ccb7917a9ef0bf)]
+- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`b343119`](https://github.com/eea/volto-group-block/commit/b3431196931fd568476fa8bf6fbc508e086229ae)]
- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`2f42e7c`](https://github.com/eea/volto-group-block/commit/2f42e7c19a1da5a9c6a883cb4f101e8fa224ff94)]
+- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`73afcc2`](https://github.com/eea/volto-group-block/commit/73afcc2f417797cedaa78cceefb007001d6c2406)]
+- yarn 3 [Alin Voinea - [`3c00ccc`](https://github.com/eea/volto-group-block/commit/3c00ccc7110bbf12a4d268182313418fb46b1a5d)]
+- Add Sonarqube tag using demo-kitkat-frontend addons list [EEA Jenkins - [`9b9662b`](https://github.com/eea/volto-group-block/commit/9b9662bda1da70ba0c3a7b4b05cebf130ed89e9e)]
### [5.0.1](https://github.com/eea/volto-group-block/compare/5.0.0...5.0.1) - 16 November 2022
#### :nail_care: Enhancements
@@ -85,6 +109,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Prepare 5.0.0 release [Miu Razvan - [`88c0ddd`](https://github.com/eea/volto-group-block/commit/88c0ddd569aeda7ee34d1eadea6a087f4e7dc257)]
- Update dependencies [Alin Voinea - [`c8405af`](https://github.com/eea/volto-group-block/commit/c8405afb830cdf62e7877bf30b619933519e1d71)]
+- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`18e26c6`](https://github.com/eea/volto-group-block/commit/18e26c6939706d572ab8574e9b1826b9abc76314)]
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`8ed6d21`](https://github.com/eea/volto-group-block/commit/8ed6d21d8489911cc4cb471e3f8823c35f4adc50)]
### [4.3.8](https://github.com/eea/volto-group-block/compare/4.3.7...4.3.8) - 26 August 2022
### [4.3.7](https://github.com/eea/volto-group-block/compare/4.3.6...4.3.7) - 22 August 2022
@@ -97,6 +123,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :hammer_and_wrench: Others
+- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`4e73f8b`](https://github.com/eea/volto-group-block/commit/4e73f8be3c73559557efadc410cb56abc055d82d)]
+- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`3040335`](https://github.com/eea/volto-group-block/commit/3040335002c63b50208c95918413bc958150e7a9)]
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`386f730`](https://github.com/eea/volto-group-block/commit/386f730ed65f73fe1468b9b77351c97fb70edcc5)]
### [4.3.5](https://github.com/eea/volto-group-block/compare/4.3.4...4.3.5) - 4 January 2022
### [4.3.4](https://github.com/eea/volto-group-block/compare/4.3.3...4.3.4) - 3 January 2022
@@ -105,15 +134,23 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :hammer_and_wrench: Others
+- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`3e62d79`](https://github.com/eea/volto-group-block/commit/3e62d79a7ed37d10d623bc845d43e1144f8080f7)]
### [4.3.2](https://github.com/eea/volto-group-block/compare/4.3.1...4.3.2) - 10 December 2021
#### :hammer_and_wrench: Others
- Refs #142010 - Optimize Volto-addons gitflow pipelines [valentinab25 - [`bc36cf5`](https://github.com/eea/volto-group-block/commit/bc36cf58c39e2b43c2fbf5189df6ddefc1260857)]
+- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`8038e78`](https://github.com/eea/volto-group-block/commit/8038e783c1e8ddd71e21f72070fdfa8e7e098993)]
+- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`daccdbc`](https://github.com/eea/volto-group-block/commit/daccdbc733e47be7d6536eb67f8f2eea038dc94b)]
### [4.3.1](https://github.com/eea/volto-group-block/compare/4.3.0...4.3.1) - 11 October 2021
#### :hammer_and_wrench: Others
+- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`b0092e4`](https://github.com/eea/volto-group-block/commit/b0092e4f78a1a0184e22e32bb9806cd57417dfb2)]
+- Add Sonarqube tag using sustainability-frontend addons list [EEA Jenkins - [`ff8889c`](https://github.com/eea/volto-group-block/commit/ff8889cb7b0761b1df43b201984ce40b14e1561b)]
+- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`0375c28`](https://github.com/eea/volto-group-block/commit/0375c28ed1ffe9186a4790b454795c0ca8039f72)]
+- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`c392190`](https://github.com/eea/volto-group-block/commit/c392190f044f5d9397bd2fb8c3d6a357f84960d0)]
+- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`9694501`](https://github.com/eea/volto-group-block/commit/9694501141e6780eba89464d36406e3c93629fd8)]
### [4.3.0](https://github.com/eea/volto-group-block/compare/4.2.3...4.3.0) - 24 June 2021
#### :hammer_and_wrench: Others
@@ -229,6 +266,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Release 1.0.0 [Alin Voinea - [`b6ef873`](https://github.com/eea/volto-group-block/commit/b6ef873cb6f61e17db66fdd4de1d9d4902a66fc6)]
- Update package meta info [Alin Voinea - [`143b7d4`](https://github.com/eea/volto-group-block/commit/143b7d44438d7afa5e346a9d21a85352df4e925f)]
- Add Jenkinkins pipeline [Alin Voinea - [`866a4e1`](https://github.com/eea/volto-group-block/commit/866a4e14ea1eb8f5adb01222e576e5ab6dc73a70)]
+- yarn prettier [Alin Voinea - [`e3fe0a3`](https://github.com/eea/volto-group-block/commit/e3fe0a36b89878769341b45198d6c9e2f2584d15)]
### [0.1.3](https://github.com/eea/volto-group-block/compare/0.1.2...0.1.3) - 9 November 2020
#### :hammer_and_wrench: Others
@@ -268,4 +306,5 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Render meta block [Alin Voinea - [`0d44560`](https://github.com/eea/volto-group-block/commit/0d4456011ca56454068a54c610250b02df4ccb3b)]
- Implement meta block allowedBlocks settings [Alin Voinea - [`f24feb1`](https://github.com/eea/volto-group-block/commit/f24feb1a1751f04841c21c7cd52a517fb02074ba)]
- Edit meta block [Alin Voinea - [`236d291`](https://github.com/eea/volto-group-block/commit/236d29156fa835a7aa54eecdb4f120de0d64b271)]
+- yarn bootstrap [Alin Voinea - [`e009dfb`](https://github.com/eea/volto-group-block/commit/e009dfb6b9b74d101a6722f0982a5359fc522b6b)]
- Initial commit [Alin Voinea - [`6a7b0de`](https://github.com/eea/volto-group-block/commit/6a7b0deb8f873d1462fd6a9c61edfc1562b3aace)]
diff --git a/Jenkinsfile b/Jenkinsfile
index 5e1feff..67412d2 100644
--- a/Jenkinsfile
+++ b/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 {
diff --git a/cypress.config.js b/cypress.config.js
index 30be8ac..4846ce9 100644
--- a/cypress.config.js
+++ b/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: {
diff --git a/cypress/e2e/02-dexterity-controlpanel-layout.cy.js b/cypress/e2e/02-dexterity-controlpanel-layout.cy.js
new file mode 100644
index 0000000..b7c3dcb
--- /dev/null
+++ b/cypress/e2e/02-dexterity-controlpanel-layout.cy.js
@@ -0,0 +1,78 @@
+import { slateLayoutBeforeEach, slateLayoutAfterEach } from '../support/e2e';
+
+describe('ControlPanel: Dexterity Content-Types Layout', () => {
+ beforeEach(slateLayoutBeforeEach);
+ afterEach(slateLayoutAfterEach);
+
+ it('Edit Blocks Layout for Book', () => {
+ cy.visit('/controlpanel/dexterity-types');
+ cy.waitForResourceToLoad('@navigation');
+ cy.waitForResourceToLoad('@breadcrumbs');
+ cy.waitForResourceToLoad('@actions');
+ cy.waitForResourceToLoad('@types');
+
+ cy.get('a[href="/controlpanel/dexterity-types/book"]').should(
+ 'have.text',
+ 'book',
+ );
+
+ cy.visit('/controlpanel/dexterity-types/book/layout');
+ cy.get('#page-controlpanel-layout').contains(
+ 'Can not edit Layout for book',
+ );
+ cy.get('#page-controlpanel-layout button').click();
+
+ // Wait a bit for draftjs to load, without this the title block
+ // custom placeholder is missing and cypress gives a timeout error
+ cy.wait(1000);
+ cy.get('input[id="field-placeholder"]').type('Book title');
+ cy.get('label[for="field-required"]').click();
+ cy.get('label[for="field-fixed"]').click();
+
+ cy.getSlate().click();
+
+ cy.get('.ui.basic.icon.button.block-add-button:visible').click();
+ cy.get('.blocks-chooser .title').contains('Common').click();
+ cy.get('.content.active.common .button.group')
+ .contains('Section (Group)')
+ .click({ force: true });
+ cy.get('.ui.basic.icon.button.group-block-add-button:visible').click();
+ cy.get('.blocks-chooser .title').contains('Media').click({ force: true });
+ cy.get('.content.active.media .button.image')
+ .contains('Image')
+ .click({ force: true });
+ cy.get('.block.image .input input')
+ .click()
+ .type(
+ 'https://eea.github.io/volto-eea-design-system/img/eea_icon.png{enter}',
+ );
+
+ cy.get('#toolbar-save').click();
+
+ cy.visit('/cypress');
+ cy.waitForResourceToLoad('@navigation');
+ cy.waitForResourceToLoad('@breadcrumbs');
+ cy.waitForResourceToLoad('@actions');
+ cy.waitForResourceToLoad('@types');
+
+ cy.get('button[class="add"]').click();
+ cy.get('#toolbar-add-book').click();
+ cy.get('.block.title').contains('Book title');
+
+ // Change book title
+ cy.clearSlateTitle();
+ cy.getSlateTitle().type('My First Book');
+ cy.get('.documentFirstHeading').contains('My First Book');
+
+ cy.get('.section-block .text-slate-editor-inner').click().type('My description');
+
+ cy.get('#toolbar-save').click();
+ cy.get('.documentFirstHeading').contains('My First Book');
+ cy.get('.block.image img').should(
+ 'have.attr',
+ 'src',
+ 'https://eea.github.io/volto-eea-design-system/img/eea_icon.png',
+ );
+ cy.get('#page-document').contains('My description');
+ });
+});
diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js
index f696418..90fe032 100644
--- a/cypress/support/e2e.js
+++ b/cypress/support/e2e.js
@@ -61,6 +61,22 @@ export const slateJsonAfterEach = (contentType = 'slate') => {
slateAfterEach();
};
+export const slateLayoutBeforeEach = (contentType = 'book') => {
+ cy.autologin();
+ cy.addContentType(contentType);
+ cy.createContent({
+ contentType: 'Document',
+ contentId: 'cypress',
+ contentTitle: 'Cypress',
+ });
+};
+
+export const slateLayoutAfterEach = (contentType = 'book') => {
+ cy.autologin();
+ cy.removeContentType(contentType);
+ cy.removeContent('cypress');
+};
+
export const getSelectedSlateEditor = () => {
return cy.get('.slate-editor.selected [contenteditable=true]').click();
};
diff --git a/package.json b/package.json
index deadd9a..2ff5005 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@eeacms/volto-group-block",
- "version": "6.3.0",
+ "version": "6.3.1",
"description": "volto-group-block: Volto block to be used to group other blocks",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
@@ -22,8 +22,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",
@@ -41,6 +64,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"
}
}
diff --git a/src/components/manage/Blocks/Group/DefaultBody.jsx b/src/components/manage/Blocks/Group/DefaultBody.jsx
index 753d65f..20690e1 100644
--- a/src/components/manage/Blocks/Group/DefaultBody.jsx
+++ b/src/components/manage/Blocks/Group/DefaultBody.jsx
@@ -98,7 +98,7 @@ const GroupBlockDefaultBody = (props) => {
)}
) : (
-
+
);
};