Merge pull request #269 from eea/develop

fix Grid conversion, ref #278618

CHANGELOG.md

@@ -4,7 +4,12 @@ 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).
 
-### [3.0.0](https://github.com/eea/volto-eea-website-theme/compare/2.4.0...3.0.0) - 21 October 2024
+### [3.1.0](https://github.com/eea/volto-eea-website-theme/compare/3.0.0...3.1.0) - 5 November 2024
+
+#### :hammer_and_wrench: Others
+
+- fix Grid conversion, ref #278618 [Miu Razvan - [`f80b786`](https://github.com/eea/volto-eea-website-theme/commit/f80b7869b4ac060bf35250cf5045ab930a0003de)]
+## [3.0.0](https://github.com/eea/volto-eea-website-theme/compare/2.4.0...3.0.0) - 21 October 2024
 
 #### :nail_care: Enhancements
 

Jenkinsfile

@@ -9,7 +9,7 @@ pipeline {
   environment {
     GIT_NAME = "volto-eea-website-theme"
     NAMESPACE = "@eeacms"
-    SONARQUBE_TAGS = "volto.eea.europa.eu,demo-www.eea.europa.eu,prod-www.eea.europa.eu,climate-adapt.eea.europa.eu,climate-advisory-board.devel4cph.eea.europa.eu,climate-advisory-board.europa.eu,www.eea.europa.eu-en,insitu-frontend.eionet.europa.eu,water.europa.eu-freshwater,insitu.copernicus.eu,water.europa.eu-marine"
+    SONARQUBE_TAGS = "volto.eea.europa.eu,demo-www.eea.europa.eu,prod-www.eea.europa.eu,climate-adapt.eea.europa.eu,climate-advisory-board.devel4cph.eea.europa.eu,climate-advisory-board.europa.eu,www.eea.europa.eu-en,insitu-frontend.eionet.europa.eu,water.europa.eu-freshwater,insitu.copernicus.eu,water.europa.eu-marine,biodiversity.europa.eu"
     DEPENDENCIES = ""
     BACKEND_PROFILES = "eea.kitkat:testing"
     BACKEND_ADDONS = ""

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-website-theme",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "@eeacms/volto-eea-website-theme: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

src/customizations/volto/components/manage/Blocks/Grid/View.jsx

@@ -13,7 +13,7 @@ const convertTeaserToGridIfNecessaryAndTransformEmptyBlocksToSlate = (data) => {
       blocks: data?.columns?.reduce((acc, current) => {
         return {
           ...acc,
-          [current?.id]: { current, '@type': current['@type'] || 'slate' },
+          [current?.id]: { ...current, '@type': current['@type'] || 'slate' },
         };
       }, {}),
     };