Merge pull request #53 from eea/develop

Release

Author: avoinea

.project.eslintrc.js

@@ -1,7 +1,9 @@
 const fs = require('fs');
 const path = require('path');
 
-const projectRootPath = fs.realpathSync('./project');    // __dirname
+const projectRootPath = fs.existsSync('./project')
+  ? fs.realpathSync('./project')
+  : fs.realpathSync('./../../../');
 const packageJson = require(path.join(projectRootPath, 'package.json'));
 const jsConfig = require(path.join(projectRootPath, 'jsconfig.json')).compilerOptions;
 

CHANGELOG.md

@@ -4,7 +4,25 @@ 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).
 
-### [5.0.0](https://github.com/eea/volto-columns-block/compare/4.5.3...5.0.0) - 28 October 2022
+### [5.0.1](https://github.com/eea/volto-columns-block/compare/5.0.0...5.0.1) - 16 November 2022
+
+#### :bug: Bug Fixes
+
+- fix(eslint): config after upgrade to latest alpha of volto [David Ichim - [`f9d2f90`](https://github.com/eea/volto-columns-block/commit/f9d2f90846571b3329d7c1e0390c528ee3406b62)]
+
+#### :nail_care: Enhancements
+
+- change(columns): moved some css values to variables for cleaner customizations [David Ichim - [`bdf653b`](https://github.com/eea/volto-columns-block/commit/bdf653b4a7b493a0300554dcd8aa7c43b6802c9f)]
+- change(column-block): removing styling schema enhancer from current package [David Ichim - [`10a3cab`](https://github.com/eea/volto-columns-block/commit/10a3cab4a4cc177577d36ad56b233386fd4b36e2)]
+- change(column): wip adding styling schema as a block enhancer [David Ichim - [`85574a3`](https://github.com/eea/volto-columns-block/commit/85574a3002c3909c68b61fea40ddcb9c490b26e1)]
+
+#### :hammer_and_wrench: Others
+
+- test(estlint): Fix .project.eslintrc.js [Alin Voinea - [`20078a4`](https://github.com/eea/volto-columns-block/commit/20078a416bc802ef375c3dd299c6ed5a6925d409)]
+- lint fix [David Ichim - [`768f29c`](https://github.com/eea/volto-columns-block/commit/768f29c88d09f7cc9eb514bad7a026405c121396)]
+- Use BlockDataForm [Tiberiu Ichim - [`4df86f7`](https://github.com/eea/volto-columns-block/commit/4df86f76af6c79c1f3053a009d0d3e4d3c17ef85)]
+- test(cypress): Rename [Alin Voinea - [`ce0a4a5`](https://github.com/eea/volto-columns-block/commit/ce0a4a5a2cb4de9c6e9eb34e3feeaa872cc217be)]
+## [5.0.0](https://github.com/eea/volto-columns-block/compare/4.5.3...5.0.0) - 28 October 2022
 
 #### :nail_care: Enhancements
 
@@ -23,6 +41,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Cleanup [Miu Razvan - [`86e202e`](https://github.com/eea/volto-columns-block/commit/86e202eac4bc6ef4e776e79f62c0f96883848fab)]
 - Cleanup [Alin Voinea - [`1baba7f`](https://github.com/eea/volto-columns-block/commit/1baba7f9959a13eb15070311b6f5f07ce396c84e)]
 - Update dependencies [Alin Voinea - [`976c380`](https://github.com/eea/volto-columns-block/commit/976c380bb1ca2d985b2bfb1a88d2144aa2c11028)]
+- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`d978235`](https://github.com/eea/volto-columns-block/commit/d978235da3ab5dff38faba2673bb9a1afa7012a3)]
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`c8daea6`](https://github.com/eea/volto-columns-block/commit/c8daea6cad87650895d063c8d852b01d74cfd326)]
 - update(jest): add @plone/volto-slate resolver refs- #153447 [nileshgulia1 - [`50ab9a0`](https://github.com/eea/volto-columns-block/commit/50ab9a0ff903badb677da43d913fd698f031895c)]
 ### [4.5.3](https://github.com/eea/volto-columns-block/compare/4.5.2...4.5.3) - 17 August 2022
 
@@ -36,6 +56,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`bab4f31`](https://github.com/eea/volto-columns-block/commit/bab4f318a773ff4de42f9e1e095a2e7ae39f6b01)]
 ### [4.5.0](https://github.com/eea/volto-columns-block/compare/4.4.15...4.5.0) - 11 April 2022
 
 #### :hammer_and_wrench: Others
@@ -51,6 +72,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`ff71f20`](https://github.com/eea/volto-columns-block/commit/ff71f2020b724e2dca5d5f5467f51fc619d5f404)]
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`a8becc0`](https://github.com/eea/volto-columns-block/commit/a8becc0159ab140dcf6bb1b2de7429bae81adb78)]
 ### [4.4.14](https://github.com/eea/volto-columns-block/compare/4.4.13...4.4.14) - 21 January 2022
 
 ### [4.4.13](https://github.com/eea/volto-columns-block/compare/4.4.12...4.4.13) - 13 January 2022
@@ -71,11 +94,14 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`a745845`](https://github.com/eea/volto-columns-block/commit/a745845507ed2a32b4f50280439875e7287793e0)]
 ### [4.4.7](https://github.com/eea/volto-columns-block/compare/4.4.6...4.4.7) - 10 December 2021
 
 #### :hammer_and_wrench: Others
 
 - Refs #142010 - Optimize Volto-addons gitflow pipelines [valentinab25 - [`eccf195`](https://github.com/eea/volto-columns-block/commit/eccf19562860a61812187a4e55dd0f03c6a727d7)]
+- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`a04ee43`](https://github.com/eea/volto-columns-block/commit/a04ee430e1407f3aa39886e98f4f11fcbec70b66)]
+- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`946133c`](https://github.com/eea/volto-columns-block/commit/946133c42004febadf2a1c8d330fbac6f820f160)]
 ### [4.4.6](https://github.com/eea/volto-columns-block/compare/4.4.5...4.4.6) - 14 October 2021
 
 #### :hammer_and_wrench: Others
@@ -85,6 +111,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Add missing 40/60 grid [kreafox - [`c30b33c`](https://github.com/eea/volto-columns-block/commit/c30b33c393062f7ac2a09e3bc181224d3e8f921f)]
 - Add padding for columns [kreafox - [`f945477`](https://github.com/eea/volto-columns-block/commit/f945477cd4150d8a570c26774a8afb3989d6fcba)]
 - Add custom class for columns [kreafox - [`0e4783f`](https://github.com/eea/volto-columns-block/commit/0e4783f44d87c526dc0535874f75d41a85c5cf12)]
+- Add Sonarqube tag using sustainability-frontend addons list [EEA Jenkins - [`35aa796`](https://github.com/eea/volto-columns-block/commit/35aa79635a03778819365873fdad2937e79b4f5f)]
+- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`ab3713a`](https://github.com/eea/volto-columns-block/commit/ab3713a9e696b31f90c57b7e39faab03c767196f)]
 ### [4.4.5](https://github.com/eea/volto-columns-block/compare/4.4.4...4.4.5) - 13 August 2021
 
 #### :hammer_and_wrench: Others
@@ -102,6 +130,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - pretty [Tiberiu Ichim - [`53f1ab7`](https://github.com/eea/volto-columns-block/commit/53f1ab7970018f0a6de5ddf09495d1792320949d)]
 - Fix styles in quanta toolbar [Tiberiu Ichim - [`97cfc46`](https://github.com/eea/volto-columns-block/commit/97cfc46e617bc5a22795817f71b1dd826ed1faf5)]
+- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`b26321b`](https://github.com/eea/volto-columns-block/commit/b26321bdf9eb2e4b5c1282210dfc8faa8849487f)]
+- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`0809fcb`](https://github.com/eea/volto-columns-block/commit/0809fcb4bce8611e5e417aa2222a7e9b40ba5936)]
+- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`36a4df2`](https://github.com/eea/volto-columns-block/commit/36a4df2cd83d48ddc2cefe9946a2c604798b9d6c)]
 ### [4.4.3](https://github.com/eea/volto-columns-block/compare/4.4.2...4.4.3) - 27 May 2021
 
 ### [4.4.2](https://github.com/eea/volto-columns-block/compare/4.4.1...4.4.2) - 29 April 2021
@@ -237,6 +268,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - Release 1.0.0 [Alin Voinea - [`b432244`](https://github.com/eea/volto-columns-block/commit/b43224465fc15096fd41c61eee3f4cadffaed57f)]
 - Update docs [Alin Voinea - [`f698f3c`](https://github.com/eea/volto-columns-block/commit/f698f3ca05b3f5a8f240db409cde4d1ddeeed78b)]
+- yarn prettier [Alin Voinea - [`ae092f6`](https://github.com/eea/volto-columns-block/commit/ae092f6a101857cf068ed639c7d4686722db4d58)]
 ### [0.3.7](https://github.com/eea/volto-columns-block/compare/0.3.6...0.3.7) - 9 November 2020
 
 #### :hammer_and_wrench: Others

cypress/e2e/01-block-basics.cy.js cypress/e2e/01-block-columns.cy.jscypress/e2e/01-block-basics.cy.js renamed to cypress/e2e/01-block-columns.cy.js

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

package.json

@@ -4,7 +4,7 @@ import { compose } from 'redux';
 import { Grid, Segment } from 'semantic-ui-react';
 import { isEmpty, without } from 'lodash';
 import { SidebarPortal, BlocksToolbar, Icon } from '@plone/volto/components'; // BlocksForm, Icon,
-import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
+import { BlockDataForm } from '@plone/volto/components';
 import {
   emptyBlocksForm,
   getBlocksLayoutFieldname,
@@ -507,7 +507,7 @@ class ColumnsBlockEdit extends React.Component {
                     />
                   </Button>
                 </Segment>
-                <InlineForm
+                <BlockDataForm
                   schema={ColumnSchema}
                   title={`${this.props.intl.formatMessage(
                     messages.labelColumn,
@@ -524,7 +524,7 @@ class ColumnsBlockEdit extends React.Component {
                 />
               </>
             ) : (
-              <InlineForm
+              <BlockDataForm
                 schema={this.getColumnsBlockSchema()}
                 title={this.props.intl.formatMessage(
                   messages.labelColumnsBlock,

src/ColumnsBlock/ColumnsBlockEdit.jsx

@@ -185,15 +185,15 @@
 
   .ui.grid > .column-blocks-wrapper,
   .ui.grid > .column-blocks-wrapper:not(.row) {
-    padding-top: 0.5em;
-    padding-bottom: 0.5em;
+    padding-top: @columnBlocksWrapperPaddingTop;
+    padding-bottom: @columnBlocksWrapperPaddingBottom;
   }
 }
 
 .ui.grid.column-grid {
   padding: @columnGridPadding;
-  margin-top: 0.8rem;
-  margin-bottom: 0.8rem;
+  margin-top: @columnGridMarginTop;
+  margin-bottom: @columnGridMarginBottom;
 }
 /* remove padding from column-grid when we have styled-with-bg style from volto-block-style */
 .styled-with-bg .grid.column-grid {

src/less/columns.less

@@ -1 +1,9 @@
-@columnGridPadding: 0;
+@columnGridPadding: 0;
+
+// Column block wrapper
+@columnBlocksWrapperPaddingTop: 0.5em;
+@columnBlocksWrapperPaddingBottom: 0.5em;
+
+// Column grid
+@columnGridMarginTop: 0.8rem;
+@columnGridMarginBottom: 0.8rem;