@eeacms/volto-group-block 6.3.4 → 6.4.0

package/CHANGELOG.md

@@ -4,11 +4,37 @@ 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.4](https://github.com/eea/volto-group-block/compare/6.3.3...6.3.4) - 19 October 2023
+### [6.4.0](https://github.com/eea/volto-group-block/compare/6.3.5...6.4.0) - 17 January 2024
+
+#### :rocket: New Features
+
+- feat: wrap section with id and classname if defined in data [Razvan - [`1a08457`](https://github.com/eea/volto-group-block/commit/1a08457db3a5a17bc10d1a2887cd85f9c92faf9a)]
 
 #### :hammer_and_wrench: Others
 
-- Update README.md [ana-oprea - [`2a956b7`](https://github.com/eea/volto-group-block/commit/2a956b73cf19c1d0ef173bf647fb5fa8d698fb83)]
+- Release 6.4.0 [Alin Voinea - [`2ebb40f`](https://github.com/eea/volto-group-block/commit/2ebb40f20fb99806602772d44bfb1fd3f90115c4)]
+### [6.3.5](https://github.com/eea/volto-group-block/compare/6.3.4...6.3.5) - 24 November 2023
+
+#### :bug: Bug Fixes
+
+- fix: Pass location to RenderBlocks [kreafox - [`87ae0df`](https://github.com/eea/volto-group-block/commit/87ae0dff17cb508466b17f959e99d62c6ab69a60)]
+
+#### :house: Internal changes
+
+
+#### :hammer_and_wrench: Others
+
+- test: update cypress test [kreafox - [`f84a866`](https://github.com/eea/volto-group-block/commit/f84a866a313f30f94fd1c0a41737face83dac3e0)]
+- more tests [kreafox - [`7f93774`](https://github.com/eea/volto-group-block/commit/7f93774774119fe1fa5e8266e8ec700cd2bc9427)]
+- test: fix bug reported by sonarqube, add more tests [kreafox - [`3599b0f`](https://github.com/eea/volto-group-block/commit/3599b0f7edf22037729c52e35f29d8919e466e5f)]
+- test: add more tests [kreafox - [`0c5fc63`](https://github.com/eea/volto-group-block/commit/0c5fc63866d6590e64051483ee8ec97e548d0b14)]
+- test: update jest tests [kreafox - [`88d9945`](https://github.com/eea/volto-group-block/commit/88d9945c6f338992247232325a25ea9795c2fe42)]
+- test: increase coverage [kreafox - [`081a2d0`](https://github.com/eea/volto-group-block/commit/081a2d0bb001c980d2023bcce81830d71d23aeca)]
+- Prettier [kreafox - [`0c5d2d1`](https://github.com/eea/volto-group-block/commit/0c5d2d1a494489663cc97c5dc0f4ad13c4b67c8d)]
+- test: mock useLocation [kreafox - [`746887f`](https://github.com/eea/volto-group-block/commit/746887fa0e778f2d4cbe86661fc8c38c8a4bafb5)]
+- test: mock useLocation [kreafox - [`a360401`](https://github.com/eea/volto-group-block/commit/a360401b8ee05e9cb54b253b0e605d0a040c8f78)]
+### [6.3.4](https://github.com/eea/volto-group-block/compare/6.3.3...6.3.4) - 22 October 2023
+
 ### [6.3.3](https://github.com/eea/volto-group-block/compare/6.3.2...6.3.3) - 17 October 2023
 
 #### :house: Internal changes
@@ -54,7 +80,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - 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)]
@@ -85,7 +110,6 @@ 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
 
@@ -102,19 +126,12 @@ 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
@@ -131,8 +148,6 @@ 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
@@ -145,9 +160,6 @@ 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
@@ -156,23 +168,15 @@ 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
@@ -288,7 +292,6 @@ 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
@@ -328,5 +331,4 @@ 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)]

package/cypress.config.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-group-block",
-  "version": "6.3.4",
+  "version": "6.4.0",
   "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/CounterComponent.jsx

@@ -7,15 +7,7 @@ import { visitBlocks } from '@plone/volto/helpers/Blocks/Blocks';
 import { serializeNodesToText } from '@plone/volto-slate/editor/render';
 import delightedSVG from '@plone/volto/icons/delighted.svg';
 import dissatisfiedSVG from '@plone/volto/icons/dissatisfied.svg';
-
-const countCharsWithoutSpaces = (paragraph) => {
-  const regex = /[^\s\\]/g;
-  return (paragraph.match(regex) || []).length;
-};
-
-const countCharsWithSpaces = (paragraph) => {
-  return paragraph?.length || 0;
-};
+import { countCharsWithoutSpaces, countCharsWithSpaces } from './utils';
 
 const countTextInEachBlock = (countTextIn, ignoreSpaces, groupCharCount) => ([
   id,
@@ -36,7 +28,7 @@ const countTextInEachBlock = (countTextIn, ignoreSpaces, groupCharCount) => ([
 };
 
 const countTextInBlocks = (blocksObject, ignoreSpaces, maxChars) => {
-  const { countTextIn } = config.blocks?.blocksConfig?.group;
+  const { countTextIn } = config.blocks?.blocksConfig?.group || [];
   // use obj ref to update value - if you send number it will not be updated
   const groupCharCount = { value: 0 };
 

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

@@ -1,10 +1,12 @@
 import { Button } from 'semantic-ui-react';
 import { BlocksForm, Icon, RenderBlocks } from '@plone/volto/components';
 import EditBlockWrapper from './EditBlockWrapper';
+import { useLocation } from 'react-router-dom';
 
 import helpSVG from '@plone/volto/icons/help.svg';
 
 const GroupBlockDefaultBody = (props) => {
+  const location = useLocation();
   const {
     block,
     data,
@@ -98,7 +100,11 @@ const GroupBlockDefaultBody = (props) => {
       )}
     </BlocksForm>
   ) : (
-    <RenderBlocks metadata={metadata} content={data?.data || {}} />
+    <RenderBlocks
+      location={location}
+      metadata={metadata}
+      content={data?.data || {}}
+    />
   );
 };
 

package/src/components/manage/Blocks/Group/DefaultBody.test.jsx

@@ -0,0 +1,75 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { Provider } from 'react-intl-redux';
+import DefaultBody from './DefaultBody';
+import configureStore from 'redux-mock-store';
+import '@testing-library/jest-dom/extend-expect';
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useLocation: () => ({
+    pathname: '/',
+    hash: '',
+    search: '',
+  }),
+}));
+
+jest.mock('@plone/volto/components', () => ({
+  BlocksForm: jest.fn(() => <div className="blocks-form">RenderBlocks</div>),
+  RenderBlocks: jest.fn(() => <div>RenderBlocks</div>),
+}));
+
+const mockStore = configureStore();
+const store = mockStore({
+  intl: {
+    locale: 'en',
+    messages: {},
+  },
+});
+
+describe('DefaultBody', () => {
+  it('renders children', () => {
+    const props = {
+      data: {
+        variation: {},
+      },
+      metadata: {},
+      properties: {},
+      variation: {},
+    };
+
+    const { getByText } = render(
+      <Provider store={store}>
+        <DefaultBody {...props} />
+      </Provider>,
+    );
+    expect(getByText('RenderBlocks')).toBeInTheDocument();
+  });
+});
+
+describe('DefaultBody Edit', () => {
+  it('renders children', () => {
+    const props = {
+      isEditMode: true,
+      data: {
+        variation: {},
+        allowedBlocks: ['listing'],
+      },
+      metadata: {},
+      properties: {},
+      variation: {},
+      onSelectBlock: jest.fn(),
+      onDeleteBlock: jest.fn(),
+      onMutateBlock: jest.fn(),
+      onInsertBlock: jest.fn(),
+      selected: true,
+    };
+
+    const { getByText } = render(
+      <Provider store={store}>
+        <DefaultBody {...props} />
+      </Provider>,
+    );
+    expect(getByText('RenderBlocks')).toBeInTheDocument();
+  });
+});

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

@@ -1,4 +1,5 @@
 import React, { useState, useCallback } from 'react';
+import cx from 'classnames';
 import { isEmpty, without } from 'lodash';
 import {
   emptyBlocksForm,
@@ -139,7 +140,8 @@ const Edit = (props) => {
   return (
     <fieldset
       role="presentation"
-      className="section-block"
+      id={props.data.id}
+      className={cx('section-block', props.data.className)}
       onKeyDown={(e) => {
         handleKeyDown(e, props.index, props.block, props.blockNode.current);
       }}

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

@@ -30,6 +30,15 @@ jest.mock('@plone/volto/helpers', () => ({
   getBlocksLayoutFieldname: jest.fn(),
 }));
 
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useLocation: () => ({
+    pathname: '/',
+    hash: '',
+    search: '',
+  }),
+}));
+
 describe('Edit', () => {
   const onChangeBlock = jest.fn();
   const onChangeField = jest.fn();

package/src/components/manage/Blocks/Group/View.test.jsx

@@ -14,6 +14,15 @@ jest.mock('@plone/volto/helpers', () => ({
   withBlockExtensions: jest.fn((Component) => Component),
 }));
 
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useLocation: () => ({
+    pathname: '/',
+    hash: '',
+    search: '',
+  }),
+}));
+
 describe('View', () => {
   it('should render without crashing', () => {
     const props = {
@@ -66,12 +75,18 @@ describe('View', () => {
       metadata: { meta: 'data' },
       properties: { prop: 'erty' },
       variation: {},
+      location: {
+        pathname: '/',
+        search: '',
+        hash: '',
+      },
     };
     render(<View {...props} />);
     expect(RenderBlocks).toHaveBeenCalledWith(
       expect.objectContaining({
         metadata: props.metadata,
         content: props.data.data,
+        location: props.location,
       }),
       {},
     );

package/src/components/manage/Blocks/Group/utils.js

@@ -0,0 +1,8 @@
+export function countCharsWithoutSpaces(paragraph) {
+  const regex = /[^\s\\]/g;
+  return (paragraph.match(regex) || []).length;
+}
+
+export function countCharsWithSpaces(paragraph) {
+  return paragraph?.length || 0;
+}

package/src/components/manage/Blocks/Group/utils.test.js

@@ -0,0 +1,15 @@
+import { countCharsWithoutSpaces, countCharsWithSpaces } from './utils';
+
+describe('countCharsWithoutSpaces', () => {
+  it('should return number of charts without spaces', () => {
+    const paragraph = 'Lorem ipsum dolor sit';
+    expect(countCharsWithoutSpaces(paragraph)).toBe(18);
+  });
+});
+
+describe('countCharsWithSpaces', () => {
+  it('should return number of charts with spaces', () => {
+    const paragraph = 'Lorem ipsum dolor sit';
+    expect(countCharsWithSpaces(paragraph)).toBe(21);
+  });
+});