@eeacms/volto-group-block 10.0.2 → 10.0.3

package/CHANGELOG.md

@@ -4,6 +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).
 
+### [10.0.3](https://github.com/eea/volto-group-block/compare/10.0.2...10.0.3) - 21 April 2026
+
+#### :bug: Bug Fixes
+
+- fix(sections): deep‑clone blocks on copy/paste, ref #302532 [Miu Razvan - [`66b0820`](https://github.com/eea/volto-group-block/commit/66b0820a68cf2650dd9d8fd500b4608aaf898a62)]
+
+#### :hammer_and_wrench: Others
+
+- add tests for utils [Miu Razvan - [`6c01680`](https://github.com/eea/volto-group-block/commit/6c01680aa43157926062a5b18721500d0abb5d13)]
 ### [10.0.2](https://github.com/eea/volto-group-block/compare/10.0.1...10.0.2) - 15 April 2026
 
 ### [10.0.1](https://github.com/eea/volto-group-block/compare/10.0.0...10.0.1) - 9 April 2026

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-group-block",
-  "version": "10.0.2",
+  "version": "10.0.3",
   "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/index.js

@@ -8,6 +8,8 @@ import {
 import codeSVG from '@plone/volto/icons/row.svg';
 import { defineMessages } from 'react-intl';
 
+import { cloneData } from './utils';
+
 defineMessages({
   sectionGroup: {
     id: 'Section (Group)',
@@ -64,6 +66,7 @@ const applyConfig = (config) => {
     schema: schema,
     restricted: false,
     mostUsed: false,
+    cloneData,
     blockHasOwnFocusManagement: true,
     sidebarTab: 1,
     security: {

package/src/utils.js

@@ -0,0 +1,51 @@
+import { v4 as uuid } from 'uuid';
+import {
+  getBlocksFieldname,
+  getBlocksLayoutFieldname,
+  getBlocks,
+  hasBlocksData,
+} from '@plone/volto/helpers/Blocks/Blocks';
+import config from '@plone/volto/registry';
+
+/* Inline deep‑clone helpers – used only by the Group block */
+function deepCloneFormData(formData) {
+  const blocksField = getBlocksFieldname(formData);
+  const layoutField = getBlocksLayoutFieldname(formData);
+  const childBlocks = getBlocks(formData);
+
+  const cloned = childBlocks
+    .map(([_, child]) => {
+      const childCfg = config.blocks.blocksConfig[child['@type']] || {};
+      if (childCfg.cloneData) {
+        return childCfg.cloneData(child);
+      }
+      return hasBlocksData(child) ? deepCloneFormData(child) : [uuid(), child];
+    })
+    .filter(Boolean);
+
+  const newData = {
+    ...formData,
+    [blocksField]: {
+      ...Object.fromEntries(cloned.map(([newId, data]) => [newId, data])),
+    },
+    [layoutField]: {
+      items: cloned.map(([newId]) => newId),
+    },
+  };
+
+  // Return a fresh UUID for the *parent* block and its cloned content
+  return [uuid(), newData];
+}
+
+export function cloneData(blockData) {
+  const columnsData = blockData.data;
+  const cloneWithIds = deepCloneFormData(columnsData);
+  const [id, newBlockData] = cloneWithIds;
+  return [
+    id,
+    {
+      ...blockData,
+      data: newBlockData,
+    },
+  ];
+}

package/src/utils.test.js

@@ -0,0 +1,113 @@
+import { v4 as uuid } from 'uuid';
+import { getBlocks } from '@plone/volto/helpers/Blocks/Blocks';
+import config from '@plone/volto/registry';
+import { cloneData } from './utils';
+
+jest.mock('@plone/volto/helpers/Blocks/Blocks', () => ({
+  getBlocks: jest.fn(),
+  getBlocksFieldname: jest.fn(() => 'blocks'),
+  getBlocksLayoutFieldname: jest.fn(() => 'blocks_layout'),
+  hasBlocksData: jest.fn((block) => !!block.blocks),
+}));
+
+describe('cloneData', () => {
+  it('should clone the blockData with calling cloneData directly', () => {
+    const blockId = uuid();
+    const mockBlockData = {
+      data: {
+        '@type': 'group',
+        blocks: {
+          [blockId]: {
+            '@type': 'test',
+          },
+        },
+        blocks_layout: {
+          items: [blockId],
+        },
+      },
+    };
+
+    getBlocks.mockReturnValue([[blockId, mockBlockData.data.blocks[blockId]]]);
+
+    const [id, clonedBlockData] = cloneData(mockBlockData);
+    const clonedBlockId = clonedBlockData.data.blocks_layout.items[0];
+    const clonedBlock = clonedBlockData.data.blocks[clonedBlockId];
+    expect(clonedBlock).toBeDefined();
+    expect(clonedBlockId).not.toEqual(blockId);
+    expect(clonedBlock).toEqual(mockBlockData.data.blocks[blockId]);
+    expect(id).not.toBeNull();
+  });
+
+  it('should clone the blockData with calling cloneData from block config', () => {
+    const blockId = uuid();
+    const mockBlockData = {
+      data: {
+        '@type': 'group',
+        blocks: {
+          [blockId]: {
+            '@type': 'test',
+            blocks: {},
+          },
+        },
+        blocks_layout: {
+          items: [blockId],
+        },
+      },
+    };
+
+    getBlocks.mockReturnValue([[blockId, mockBlockData.data.blocks[blockId]]]);
+
+    config.blocks.blocksConfig = {
+      test: {
+        cloneData: jest.fn(() => [
+          'test_uuid',
+          mockBlockData.data.blocks[blockId],
+        ]),
+      },
+    };
+    const [id, clonedBlockData] = cloneData(mockBlockData);
+    expect(id).not.toEqual('test_uuid');
+    expect(clonedBlockData.data.blocks['test_uuid']).toEqual(
+      mockBlockData.data.blocks[blockId],
+    );
+  });
+
+  it('should recursively clone nested blocks', () => {
+    const outerBlockId = uuid();
+    const innerBlockId = uuid();
+    const innerBlock = {
+      '@type': 'inner',
+      blocks: {
+        [innerBlockId]: { '@type': 'leaf' },
+      },
+      blocks_layout: { items: [innerBlockId] },
+    };
+    const mockBlockData = {
+      data: {
+        '@type': 'group',
+        blocks: {
+          [outerBlockId]: innerBlock,
+        },
+        blocks_layout: {
+          items: [outerBlockId],
+        },
+      },
+    };
+
+    getBlocks
+      .mockReturnValueOnce([[outerBlockId, innerBlock]])
+      .mockReturnValueOnce([[innerBlockId, innerBlock.blocks[innerBlockId]]]);
+
+    const [id, clonedBlockData] = cloneData(mockBlockData);
+    const newOuterId = clonedBlockData.data.blocks_layout.items[0];
+    expect(newOuterId).not.toEqual(outerBlockId);
+    expect(id).not.toBeNull();
+    const newOuterBlock = clonedBlockData.data.blocks[newOuterId];
+    expect(newOuterBlock).toBeDefined();
+    const newInnerId = newOuterBlock.blocks_layout.items[0];
+    expect(newInnerId).not.toEqual(innerBlockId);
+    expect(newOuterBlock.blocks[newInnerId]).toEqual(
+      innerBlock.blocks[innerBlockId],
+    );
+  });
+});