@eeacms/volto-group-block 6.3.4 → 6.3.5

package/CHANGELOG.md

@@ -4,11 +4,34 @@ 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.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
+
+- chore: [JENKINS] Refactor automated testing [valentinab25 - [`616f6eb`](https://github.com/eea/volto-group-block/commit/616f6ebe0385d82a827c6679eabdcf4e92a18c11)]
 
 #### :hammer_and_wrench: Others
 
-- Update README.md [ana-oprea - [`2a956b7`](https://github.com/eea/volto-group-block/commit/2a956b73cf19c1d0ef173bf647fb5fa8d698fb83)]
+- 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)]
+- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`25030fb`](https://github.com/eea/volto-group-block/commit/25030fbd69108f90df02130e5010e56398941ad2)]
+- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`1517dbb`](https://github.com/eea/volto-group-block/commit/1517dbb81cf9128752d835ae59dc22b251f4b035)]
+- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`b0ba5f9`](https://github.com/eea/volto-group-block/commit/b0ba5f9c6d37526411a7a984595ac624401f8ac5)]
+- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`8dbdfeb`](https://github.com/eea/volto-group-block/commit/8dbdfeb89fe53c6dc2f476b183a53c9266ab2bdf)]
+- test: [JENKINS] Improve cypress time [valentinab25 - [`d0324f4`](https://github.com/eea/volto-group-block/commit/d0324f4aad6d94233ca8ce3645ca5162f39d9834)]
+### [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

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.3.5",
   "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.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);
+  });
+});