Skip to content

Commit

Permalink
Merge pull request #21 from eea/develop
Browse files Browse the repository at this point in the history
fix(countTextInBlocks): Don't count text if maxChars is not set
  • Loading branch information
avoinea authored Aug 22, 2022
2 parents c8bc9d4 + 09a553e commit 3e9759f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,15 @@ 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)

Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pipeline {
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,demo-www.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,circularity.eea.europa.eu"
DEPENDENCIES = ""
VOLTO = "alpha"
VOLTO = "16.0.0-alpha.14"
}

stages {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eeacms/volto-group-block",
"version": "4.3.6",
"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",
Expand Down
3 changes: 3 additions & 0 deletions src/components/manage/Blocks/Group/Edit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3e9759f

Please sign in to comment.