@eeacms/volto-group-block 4.3.4 → 4.3.7

package/CHANGELOG.md

@@ -4,8 +4,27 @@ 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).
 
+#### [4.3.7](https://github.com/eea/volto-group-block/compare/4.3.6...4.3.7)
+
+- fix(countTextInBlocks): Don't count text if maxChars is not set - refs #153110 [`230298a`](https://github.com/eea/volto-group-block/commit/230298a23f9f67d76721b201cafdfd60c8be0f17)
+
+#### [4.3.6](https://github.com/eea/volto-group-block/compare/4.3.5...4.3.6)
+
+> 30 June 2022
+
+- develop [`#20`](https://github.com/eea/volto-group-block/pull/20)
+
+#### [4.3.5](https://github.com/eea/volto-group-block/compare/4.3.4...4.3.5)
+
+> 4 January 2022
+
+- Fix cypress tests when using with volto-slate [`#18`](https://github.com/eea/volto-group-block/pull/18)
+
 #### [4.3.4](https://github.com/eea/volto-group-block/compare/4.3.3...4.3.4)
 
+> 3 January 2022
+
+- Release [`#17`](https://github.com/eea/volto-group-block/pull/17)
 - add cy tests [`#16`](https://github.com/eea/volto-group-block/pull/16)
 
 #### [4.3.3](https://github.com/eea/volto-group-block/compare/4.3.2...4.3.3)

package/Jenkinsfile

@@ -4,8 +4,9 @@ pipeline {
   environment {
         GIT_NAME = "volto-group-block"
         NAMESPACE = "@eeacms"
-        SONARQUBE_TAGS = "volto.eea.europa.eu,forest.eea.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.europa.eu,biodiversity.europa.eu,clms.land.copernicus.eu,industry.eea.europa.eu,water.europa.eu-freshwater"
+        SONARQUBE_TAGS = "volto.eea.europa.eu,forest.eea.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.europa.eu,biodiversity.europa.eu,clms.land.copernicus.eu,industry.eea.europa.eu,water.europa.eu-freshwater,demo-www.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,circularity.eea.europa.eu"
         DEPENDENCIES = ""
+        VOLTO = "16.0.0-alpha.14"
     }
 
   stages {
@@ -124,8 +125,8 @@ pipeline {
             node(label: 'docker') {
               script {
                 try {
-                  sh '''docker pull plone; docker run -d --rm --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="profile-plone.restapi:blocks" plone fg'''
-                  sh '''docker pull plone/volto-addon-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" plone/volto-addon-ci cypress'''
+                  sh '''docker pull eeacms/plone-backend; docker run --rm -d --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="eea.kitkat:testing" eeacms/plone-backend'''
+                  sh '''docker pull plone/volto-addon-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" -e NODE_ENV=development -e VOLTO="$VOLTO" plone/volto-addon-ci cypress'''
                 } finally {
                   try {
                     sh '''rm -rf cypress-reports cypress-results cypress-coverage'''
@@ -184,10 +185,10 @@ pipeline {
             unstash "xunit-reports"
             unstash "cypress-coverage"
             def scannerHome = tool 'SonarQubeScanner';
-            def nodeJS = tool 'NodeJS11';
+            def nodeJS = tool 'NodeJS';
             withSonarQubeEnv('Sonarqube') {
               sh '''sed -i "s#/opt/frontend/my-volto-project/src/addons/${GIT_NAME}/##g" xunit-reports/coverage/lcov.info'''
-              sh "export PATH=$PATH:${scannerHome}/bin:${nodeJS}/bin; sonar-scanner -Dsonar.javascript.lcov.reportPaths=./xunit-reports/coverage/lcov.info,./cypress-coverage/coverage/lcov.info -Dsonar.sources=./src -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
+              sh "export PATH=${scannerHome}/bin:${nodeJS}/bin:$PATH; sonar-scanner -Dsonar.javascript.lcov.reportPaths=./xunit-reports/coverage/lcov.info,./cypress-coverage/coverage/lcov.info -Dsonar.sources=./src -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
               sh '''try=2; while [ \$try -gt 0 ]; do curl -s -XPOST -u "${SONAR_AUTH_TOKEN}:" "${SONAR_HOST_URL}api/project_tags/set?project=${GIT_NAME}-${BRANCH_NAME}&tags=${SONARQUBE_TAGS},${BRANCH_NAME}" > set_tags_result; if [ \$(grep -ic error set_tags_result ) -eq 0 ]; then try=0; else cat set_tags_result; echo "... Will retry"; sleep 60; try=\$(( \$try - 1 )); fi; done'''
             }
           }

package/cypress/integration/block-basics.js

@@ -22,16 +22,15 @@ describe('Blocks Tests', () => {
     cy.get('.blocks-chooser .title').contains('Common').click();
     cy.get('.content.active.common .button.group').contains('Group').click();
 
-    cy.get('.block.text.selected').type("test");
-    cy.get('.block.text.selected').type("{enter}");
-    cy.get('.block.text.selected').type("test2");
-    cy.get('.block.text.selected').type("{enter}");
-    cy.get('.block.text.selected').type("test3");
-    
-    cy.get('.block-toolbar svg').first()
-      .trigger('mousedown', { button: 0})
-      .trigger('mousemove', 10, -40, { force: true})
-      .trigger('mouseup', 10, -40, {force:true});
+    cy.get('.block-editor-group [contenteditable=true]').focus().click().type('test{enter}');
+    cy.get('.block-editor-group [contenteditable=true]').eq(1).focus().click().type('test2{enter}');
+    cy.get('.block-editor-group [contenteditable=true]').eq(1).focus().click().type('test3');
+
+    cy.get('.block-toolbar svg')
+      .first()
+      .trigger('mousedown', { button: 0 })
+      .trigger('mousemove', 10, -40, { force: true })
+      .trigger('mouseup', 10, -40, { force: true });
 
     // Save
     cy.get('#toolbar-save').click();

package/cypress/support/index.js

@@ -27,7 +27,7 @@ coverage-end */
 export const setupBeforeEach = () => {
   cy.autologin();
   cy.createContent({
-    contentType: 'Folder',
+    contentType: 'Document',
     contentId: 'cypress',
     contentTitle: 'Cypress',
   });

package/cypress.json

@@ -1,9 +1,14 @@
 {
   "baseUrl": "http://localhost:3000",
   "viewportWidth": 1280,
-  "defaultCommandTimeout": 15000,
+  "defaultCommandTimeout": 8888,
+  "chromeWebSecurity": false,
   "reporter": "junit",
   "video": true,
+  "retries": {
+    "runMode": 8,
+    "openMode": 0
+  },
   "reporterOptions": {
     "mochaFile": "cypress/reports/cypress-[hash].xml",
     "jenkinsMode": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-group-block",
-  "version": "4.3.4",
+  "version": "4.3.7",
   "description": "volto-group-block: Volto block to be used to group other blocks",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/components/manage/Blocks/Group/Edit.jsx

@@ -80,6 +80,9 @@ const Edit = (props) => {
    */
   const countTextInBlocks = (blocksObject) => {
     let groupCharCount = 0;
+    if (!props.data.maxChars) {
+      return groupCharCount;
+    }
 
     Object.keys(blocksObject).forEach((blockId) => {
       const foundText = blocksObject[blockId]?.plaintext