From cbc36c74dfcd5f7cb1013a4c673d9c02e0023766 Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Mon, 3 Jun 2024 12:14:06 +0300 Subject: [PATCH 1/9] Add Sonarqube tag using marine-frontend addons list --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4aa6c428..d7332ca1 100644 --- a/Jenkinsfile +++ b/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" + 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" DEPENDENCIES = "" BACKEND_PROFILES = "eea.kitkat:testing" BACKEND_ADDONS = "" From 6fd7543894bd2c593a1729116befd95c82ea3c8f Mon Sep 17 00:00:00 2001 From: Tripon Eugen Date: Thu, 6 Jun 2024 10:44:21 +0300 Subject: [PATCH 2/9] Refs #269520 - other_organisation token widget --- src/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.js b/src/index.js index d0aa5817..c22d354b 100644 --- a/src/index.js +++ b/src/index.js @@ -329,6 +329,7 @@ const applyConfig = (config) => { } // Custom Widgets + config.widgets.id.other_organisations = TokenWidget; config.widgets.views.id.topics = TopicsWidget; config.widgets.views.id.subjects = TokenWidget; config.widgets.views.widget.tags = TokenWidget; From b6df127bd91b6f55dda8f468e1107037d43752ff Mon Sep 17 00:00:00 2001 From: Tripon Eugen Date: Thu, 6 Jun 2024 11:25:00 +0300 Subject: [PATCH 3/9] Refs #269520 - other_organisation token widget edit mode --- src/index.js | 3 ++- src/index.test.js | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index c22d354b..d9199f06 100644 --- a/src/index.js +++ b/src/index.js @@ -9,6 +9,7 @@ import { TopicsWidget } from '@eeacms/volto-eea-website-theme/components/theme/W import CreatableSelectWidget from '@eeacms/volto-eea-website-theme/components/theme/Widgets/CreatableSelectWidget'; import { Icon } from '@plone/volto/components'; +import { TokenWidget as TokenWidgetEdit} from '@plone/volto/components/manage/Widgets/TokenWidget'; import { serializeNodesToText } from '@plone/volto-slate/editor/render'; import Tag from '@eeacms/volto-eea-design-system/ui/Tag/Tag'; @@ -329,7 +330,7 @@ const applyConfig = (config) => { } // Custom Widgets - config.widgets.id.other_organisations = TokenWidget; + config.widgets.id.other_organisations = TokenWidgetEdit; config.widgets.views.id.topics = TopicsWidget; config.widgets.views.id.subjects = TokenWidget; config.widgets.views.widget.tags = TokenWidget; diff --git a/src/index.test.js b/src/index.test.js index 01a7aee1..36588229 100644 --- a/src/index.test.js +++ b/src/index.test.js @@ -91,7 +91,9 @@ describe('applyConfig', () => { tags: undefined, }, }, - widget: {}, + widget: { + id: {} + }, }, settings: { eea: { From 802d84bdcca495edf59c18ff79b0827b310f555f Mon Sep 17 00:00:00 2001 From: eea-jenkins Date: Thu, 6 Jun 2024 10:31:27 +0200 Subject: [PATCH 4/9] style: Automated code fix --- src/index.js | 2 +- src/index.test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index d9199f06..9bd46545 100644 --- a/src/index.js +++ b/src/index.js @@ -9,7 +9,7 @@ import { TopicsWidget } from '@eeacms/volto-eea-website-theme/components/theme/W import CreatableSelectWidget from '@eeacms/volto-eea-website-theme/components/theme/Widgets/CreatableSelectWidget'; import { Icon } from '@plone/volto/components'; -import { TokenWidget as TokenWidgetEdit} from '@plone/volto/components/manage/Widgets/TokenWidget'; +import { TokenWidget as TokenWidgetEdit } from '@plone/volto/components/manage/Widgets/TokenWidget'; import { serializeNodesToText } from '@plone/volto-slate/editor/render'; import Tag from '@eeacms/volto-eea-design-system/ui/Tag/Tag'; diff --git a/src/index.test.js b/src/index.test.js index 36588229..cfbf3a21 100644 --- a/src/index.test.js +++ b/src/index.test.js @@ -92,7 +92,7 @@ describe('applyConfig', () => { }, }, widget: { - id: {} + id: {}, }, }, settings: { From 7558b27a9d1cd6d3480a32b296c7325c796006c9 Mon Sep 17 00:00:00 2001 From: Tripon Eugen Date: Thu, 6 Jun 2024 12:07:05 +0300 Subject: [PATCH 5/9] Refs #269520 - other_organisation test --- src/index.test.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/index.test.js b/src/index.test.js index cfbf3a21..a79ba672 100644 --- a/src/index.test.js +++ b/src/index.test.js @@ -91,9 +91,8 @@ describe('applyConfig', () => { tags: undefined, }, }, - widget: { - id: {}, - }, + widget: {}, + id: {}, }, settings: { eea: { From e51380f20129d44984ba4249227e24fceb857f7e Mon Sep 17 00:00:00 2001 From: Tiberiu Ichim Date: Thu, 6 Jun 2024 13:11:22 +0300 Subject: [PATCH 6/9] Fix test --- src/index.test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.test.js b/src/index.test.js index a79ba672..3fcdd5bf 100644 --- a/src/index.test.js +++ b/src/index.test.js @@ -246,6 +246,7 @@ describe('applyConfig', () => { }, }, widget: {}, + id: {}, }, settings: { eea: {}, From 4ef7b18ca0437bb664ec83e03a2c07e22e87f0e7 Mon Sep 17 00:00:00 2001 From: Tripon Eugen Date: Fri, 7 Jun 2024 13:39:06 +0300 Subject: [PATCH 7/9] Refs #269520 - import TokenWidgetEdit --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 9bd46545..22d9144b 100644 --- a/src/index.js +++ b/src/index.js @@ -9,7 +9,7 @@ import { TopicsWidget } from '@eeacms/volto-eea-website-theme/components/theme/W import CreatableSelectWidget from '@eeacms/volto-eea-website-theme/components/theme/Widgets/CreatableSelectWidget'; import { Icon } from '@plone/volto/components'; -import { TokenWidget as TokenWidgetEdit } from '@plone/volto/components/manage/Widgets/TokenWidget'; +import { TokenWidget as TokenWidgetEdit } from '@plone/volto/components'; import { serializeNodesToText } from '@plone/volto-slate/editor/render'; import Tag from '@eeacms/volto-eea-design-system/ui/Tag/Tag'; From 956141cbeafd84938742b920ba40ad599eec1b19 Mon Sep 17 00:00:00 2001 From: Tripon Eugen Date: Fri, 7 Jun 2024 14:14:05 +0300 Subject: [PATCH 8/9] Refs #269520 - import TokenWidgetEdit --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 22d9144b..9f70ccc3 100644 --- a/src/index.js +++ b/src/index.js @@ -9,7 +9,7 @@ import { TopicsWidget } from '@eeacms/volto-eea-website-theme/components/theme/W import CreatableSelectWidget from '@eeacms/volto-eea-website-theme/components/theme/Widgets/CreatableSelectWidget'; import { Icon } from '@plone/volto/components'; -import { TokenWidget as TokenWidgetEdit } from '@plone/volto/components'; +import { default as TokenWidgetEdit } from '@plone/volto/components/manage/Widgets/TokenWidget'; import { serializeNodesToText } from '@plone/volto-slate/editor/render'; import Tag from '@eeacms/volto-eea-design-system/ui/Tag/Tag'; From bf06baabf402903088c78e0b021d6b26bd5996f4 Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Fri, 14 Jun 2024 06:19:21 +0000 Subject: [PATCH 9/9] Automated release 2.1.2 --- CHANGELOG.md | 15 +++++++++++++++ package.json | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67e6e955..6b4b3bab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,21 @@ 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). +### [2.1.2](https://github.com/eea/volto-eea-website-theme/compare/2.1.1...2.1.2) - 14 June 2024 + +#### :house: Internal changes + +- style: Automated code fix [eea-jenkins - [`802d84b`](https://github.com/eea/volto-eea-website-theme/commit/802d84bdcca495edf59c18ff79b0827b310f555f)] + +#### :hammer_and_wrench: Others + +- Refs #269520 - import TokenWidgetEdit [Tripon Eugen - [`956141c`](https://github.com/eea/volto-eea-website-theme/commit/956141cbeafd84938742b920ba40ad599eec1b19)] +- Refs #269520 - import TokenWidgetEdit [Tripon Eugen - [`4ef7b18`](https://github.com/eea/volto-eea-website-theme/commit/4ef7b18ca0437bb664ec83e03a2c07e22e87f0e7)] +- Fix test [Tiberiu Ichim - [`e51380f`](https://github.com/eea/volto-eea-website-theme/commit/e51380f20129d44984ba4249227e24fceb857f7e)] +- Refs #269520 - other_organisation test [Tripon Eugen - [`7558b27`](https://github.com/eea/volto-eea-website-theme/commit/7558b27a9d1cd6d3480a32b296c7325c796006c9)] +- Refs #269520 - other_organisation token widget edit mode [Tripon Eugen - [`b6df127`](https://github.com/eea/volto-eea-website-theme/commit/b6df127bd91b6f55dda8f468e1107037d43752ff)] +- Refs #269520 - other_organisation token widget [Tripon Eugen - [`6fd7543`](https://github.com/eea/volto-eea-website-theme/commit/6fd7543894bd2c593a1729116befd95c82ea3c8f)] +- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`cbc36c7`](https://github.com/eea/volto-eea-website-theme/commit/cbc36c74dfcd5f7cb1013a4c673d9c02e0023766)] ### [2.1.1](https://github.com/eea/volto-eea-website-theme/compare/2.1.0...2.1.1) - 28 May 2024 #### :bug: Bug Fixes diff --git a/package.json b/package.json index a5ed7341..2dde2274 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-eea-website-theme", - "version": "2.1.1", + "version": "2.1.2", "description": "@eeacms/volto-eea-website-theme: Volto add-on", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team",