Merge pull request #65 from eea/develop

Release

Author: avoinea

CHANGELOG.md

@@ -4,6 +4,11 @@ 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.0.0](https://github.com/eea/volto-columns-block/compare/5.2.0...6.0.0) - 7 February 2023
+
+#### :hammer_and_wrench: Others
+
+- Release 6.0.0 [Alin Voinea - [`947cd73`](https://github.com/eea/volto-columns-block/commit/947cd730ac967515e8a508924eab6efb3e485196)]
 ### [5.2.0](https://github.com/eea/volto-columns-block/compare/5.1.0...5.2.0) - 28 December 2022
 
 #### :hammer_and_wrench: Others

Jenkinsfile

@@ -4,7 +4,7 @@ pipeline {
   environment {
         GIT_NAME = "volto-columns-block"
         NAMESPACE = "@eeacms"
-        SONARQUBE_TAGS = "volto.eea.europa.eu,climate-energy.eea.europa.eu,forest.eea.europa.eu,biodiversity.europa.eu,www.eea.europa.eu-ims,sustainability.eionet.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,prod-www.eea.europa.eu,water.europa.eu-marine,demo-kitkat.dev2aws.eea.europa.eu,climate-adapt.eea.europa.eu,climate-advisory-board.devel4cph.eea.europa.eu"
+        SONARQUBE_TAGS = "volto.eea.europa.eu,climate-energy.eea.europa.eu,forest.eea.europa.eu,biodiversity.europa.eu,www.eea.europa.eu-ims,sustainability.eionet.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,prod-www.eea.europa.eu,water.europa.eu-marine,demo-kitkat.dev2aws.eea.europa.eu,climate-adapt.eea.europa.eu,climate-advisory-board.devel4cph.eea.europa.eu,climate-advisory-board.europa.eu"
         DEPENDENCIES = ""
         VOLTO = ""
     }

locales/de/LC_MESSAGES/volto.po

@@ -109,6 +109,11 @@ msgstr "Prozent"
 msgid "Reverse wrap"
 msgstr ""
 
+#: ColumnsBlock/ColumnVariations
+# defaultMessage: Select layout
+msgid "Select layout"
+msgstr ""
+
 #: Widgets/QuadSize
 # defaultMessage: Size
 msgid "Size"

locales/en/LC_MESSAGES/volto.po

@@ -109,6 +109,11 @@ msgstr ""
 msgid "Reverse wrap"
 msgstr ""
 
+#: ColumnsBlock/ColumnVariations
+# defaultMessage: Select layout
+msgid "Select layout"
+msgstr ""
+
 #: Widgets/QuadSize
 # defaultMessage: Size
 msgid "Size"

locales/pt_BR/LC_MESSAGES/volto.po

@@ -109,6 +109,11 @@ msgstr "Percentagem"
 msgid "Reverse wrap"
 msgstr "Quebra reversa"
 
+#: ColumnsBlock/ColumnVariations
+# defaultMessage: Select layout
+msgid "Select layout"
+msgstr "Selecione o layout"
+
 #: Widgets/QuadSize
 # defaultMessage: Size
 msgid "Size"

locales/volto.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2022-12-16T16:09:46.028Z\n"
+"POT-Creation-Date: 2023-01-25T20:23:49.511Z\n"
 "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -111,6 +111,11 @@ msgstr ""
 msgid "Reverse wrap"
 msgstr ""
 
+#: ColumnsBlock/ColumnVariations
+# defaultMessage: Select layout
+msgid "Select layout"
+msgstr ""
+
 #: Widgets/QuadSize
 # defaultMessage: Size
 msgid "Size"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-columns-block",
-  "version": "5.2.0",
+  "version": "6.0.0",
   "description": "volto-columns-block: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

src/ColumnsBlock/ColumnVariations.jsx

@@ -1,11 +1,19 @@
 import React from 'react';
+import { defineMessages, injectIntl } from 'react-intl';
 import { Segment, Card } from 'semantic-ui-react';
 import { Icon } from '@plone/volto/components';
 
-export default ({ data, onChange, children, variants }) => {
+const messages = defineMessages({
+  selectLayout: {
+    id: 'Select layout',
+    defaultMessage: 'Select layout',
+  },
+});
+
+const ColumnVariations = ({ onChange, variants, intl }) => {
   return (
     <Segment>
-      <h4>Select layout:</h4>
+      <h4>{intl.formatMessage(messages.selectLayout)}:</h4>
       <Card.Group centered itemsPerRow={7}>
         {variants.map(({ icon, defaultData, title }, index) => (
           <Card key={index} onClick={() => onChange(defaultData)}>
@@ -19,3 +27,5 @@ export default ({ data, onChange, children, variants }) => {
     </Segment>
   );
 };
+
+export default injectIntl(ColumnVariations);

src/ColumnsBlock/ColumnVariations.test.js

@@ -11,7 +11,7 @@ test('renders column variations component', () => {
   const store = mockStore({
     intl: {
       locale: 'en',
-      messages: {},
+      formatMessage: () => 'Select layout',
     },
   });
 

src/ColumnsBlock/ColumnsBlockEdit.jsx

@@ -337,7 +337,6 @@ class ColumnsBlockEdit extends React.Component {
         {!isInitialized ? (
           <ColumnVariations
             variants={variants.filter((variant) => variant.common)}
-            data={data}
             onChange={(initialData) => {
               onChangeBlock(block, {
                 ...data,