From f8c904f16f7c4386eea227f29ed5308bbe1b74d6 Mon Sep 17 00:00:00 2001 From: Miu Razvan Date: Mon, 22 May 2023 15:32:40 +0300 Subject: [PATCH 1/2] update --- src/Block/TocView.jsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Block/TocView.jsx b/src/Block/TocView.jsx index c7b1ff8..e6526b2 100644 --- a/src/Block/TocView.jsx +++ b/src/Block/TocView.jsx @@ -8,12 +8,12 @@ import PropTypes from 'prop-types'; import { injectIntl } from 'react-intl'; import cx from 'classnames'; import { Message } from 'semantic-ui-react'; +import config from '@plone/volto/registry'; import { withBlockExtensions, getBlocksFieldname, getBlocksLayoutFieldname, } from '@plone/volto/helpers'; -import config from '@plone/volto/registry'; export const getBlocksTocEntries = (properties, tocData) => { const blocksFieldName = getBlocksFieldname(properties); @@ -35,7 +35,7 @@ export const getBlocksTocEntries = (properties, tocData) => { const block = blocks[id]; const blockConfig = config.blocks.blocksConfig[block['@type']]; - if (!block && !blockConfig) { + if (!block || !blockConfig) { return null; } if (!blockConfig.tocEntries && !blockConfig.tocEntry) { @@ -84,8 +84,7 @@ export const getBlocksTocEntries = (properties, tocData) => { * @extends Component */ const View = (props) => { - const { data } = props; - const { variation } = props; + const { data, variation } = props; const metadata = props.metadata || props.properties; const tocEntries = React.useMemo(() => { From 131a40d64b6de32facfc40df763d868e862b9b41 Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Mon, 22 May 2023 12:47:03 +0000 Subject: [PATCH 2/2] Automated release 3.0.5 --- CHANGELOG.md | 21 ++++++++++++++++++--- package.json | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbcc7a4..b651ea7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,11 +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.4](https://github.com/eea/volto-block-toc/compare/3.0.3...3.0.4) - 27 March 2023 +### [3.0.5](https://github.com/eea/volto-block-toc/compare/3.0.4...3.0.5) - 22 May 2023 -#### :rocket: New Features +#### :hammer_and_wrench: Others -- feat: allow multiple entries for a single block [Miu Razvan - [`c99ccc9`](https://github.com/eea/volto-block-toc/commit/c99ccc99364276c17d10795b7158416d99661473)] +- update [Miu Razvan - [`f8c904f`](https://github.com/eea/volto-block-toc/commit/f8c904f16f7c4386eea227f29ed5308bbe1b74d6)] +### [3.0.4](https://github.com/eea/volto-block-toc/compare/3.0.3...3.0.4) - 22 May 2023 #### :hammer_and_wrench: Others @@ -28,11 +29,14 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). #### :hammer_and_wrench: Others - Update Jenkinsfile [Claudia Ifrim - [`96e0797`](https://github.com/eea/volto-block-toc/commit/96e079736684c7b0fa8e7abaa0486f8b50b31b7c)] +- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`66e274d`](https://github.com/eea/volto-block-toc/commit/66e274da2d5945e78c00c0e1b7a42b8a08966cbc)] +- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`91a49d2`](https://github.com/eea/volto-block-toc/commit/91a49d2712097854d7ba75ffc361f757c5fd2175)] - update(jest): add @plone/volto-slate resolver refs- #153447 [nileshgulia1 - [`c98050d`](https://github.com/eea/volto-block-toc/commit/c98050d7aa3cc48f658a5d498e5232bd7b4b0ae7)] ### [3.0.1](https://github.com/eea/volto-block-toc/compare/3.0.0...3.0.1) - 30 June 2022 #### :hammer_and_wrench: Others +- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`b3c16c6`](https://github.com/eea/volto-block-toc/commit/b3c16c6a31c38a44451b009af271f17244edbc1f)] ## [3.0.0](https://github.com/eea/volto-block-toc/compare/2.3.0...3.0.0) - 17 May 2022 #### :hammer_and_wrench: Others @@ -46,17 +50,27 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - Release 2.3.0 [Alin Voinea - [`693f4bb`](https://github.com/eea/volto-block-toc/commit/693f4bbb13068e0b7c22353de5a451414e4d91a0)] - remove uneeded code [Miu Razvan - [`b554883`](https://github.com/eea/volto-block-toc/commit/b554883f393936e7a1e8e28ec2fcdc954982a4e7)] +- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`9961973`](https://github.com/eea/volto-block-toc/commit/996197359b91c0769f1fd8a1891b55063dd6c1e5)] +- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`a3f1404`](https://github.com/eea/volto-block-toc/commit/a3f1404ec40f9bde18495e0e02eb23609deca78a)] ### [2.2.5](https://github.com/eea/volto-block-toc/compare/2.2.4...2.2.5) - 3 January 2022 ### [2.2.4](https://github.com/eea/volto-block-toc/compare/2.2.3...2.2.4) - 18 December 2021 #### :hammer_and_wrench: Others +- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`1f07faa`](https://github.com/eea/volto-block-toc/commit/1f07faa181ece91cc97fc4087fc0a5bdd83292dc)] ### [2.2.3](https://github.com/eea/volto-block-toc/compare/2.2.2...2.2.3) - 10 December 2021 #### :hammer_and_wrench: Others - Refs #142010 - Optimize Volto-addons gitflow pipelines [valentinab25 - [`6973d84`](https://github.com/eea/volto-block-toc/commit/6973d84e3fe20548be2cb7903d6cb23e93610c0d)] +- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`bf8be2e`](https://github.com/eea/volto-block-toc/commit/bf8be2e0027002150a52b187e08f56b2f0905e54)] +- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`c47d850`](https://github.com/eea/volto-block-toc/commit/c47d850e4feccb6c42ccb0e5463f32af62fed95b)] +- Add Sonarqube tag using forests-frontend addons list [EEA Jenkins - [`5565395`](https://github.com/eea/volto-block-toc/commit/5565395a8b90cd5fd8650a24d0931b84306c0704)] +- Add Sonarqube tag using sustainability-frontend addons list [EEA Jenkins - [`96d69df`](https://github.com/eea/volto-block-toc/commit/96d69dfc20e738c0f9af809a684dcb5b6c33cdf7)] +- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`9509446`](https://github.com/eea/volto-block-toc/commit/950944640e317ac2e375311663a150d0e0166dd8)] +- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`1c96364`](https://github.com/eea/volto-block-toc/commit/1c963640148edbb6978ab518dfa2743044234c91)] +- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`421c23c`](https://github.com/eea/volto-block-toc/commit/421c23cb1ad5add8dc74796d8e93b8c5f88524d1)] ### [2.2.2](https://github.com/eea/volto-block-toc/compare/2.2.1...2.2.2) - 27 May 2021 ### [2.2.1](https://github.com/eea/volto-block-toc/compare/2.2.0...2.2.1) - 14 May 2021 @@ -85,6 +99,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - Release 1.0.0 [Alin Voinea - [`5501bf6`](https://github.com/eea/volto-block-toc/commit/5501bf6e97cd6dae5af9735bea0ab28dee10dd30)] - Release 1.0.0 [Alin Voinea - [`528b2e6`](https://github.com/eea/volto-block-toc/commit/528b2e69303482bdefd240b3d6d95e1690e43a5d)] +- yarn prettier [Alin Voinea - [`18f812b`](https://github.com/eea/volto-block-toc/commit/18f812b776964062054bf6f77710c6a8ece1cc8f)] ### 0.1.0 - 21 October 2020 #### :hammer_and_wrench: Others diff --git a/package.json b/package.json index 3c31415..247bf47 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-block-toc", - "version": "3.0.4", + "version": "3.0.5", "description": "volto-block-toc: Volto add-on", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team",