From 3ff5b7ac75437a34e19403cb9835faa68ad42f83 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Fri, 3 Jul 2026 16:22:48 +0200 Subject: [PATCH 1/5] chore: disable custom schemaorg when @redturtle/volto-schemaorg is active --- .../ItaliaTheme/View/ServizioView/ServizioMetatag.jsx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/components/ItaliaTheme/View/ServizioView/ServizioMetatag.jsx b/src/components/ItaliaTheme/View/ServizioView/ServizioMetatag.jsx index c51d552b7f..d649f723cc 100644 --- a/src/components/ItaliaTheme/View/ServizioView/ServizioMetatag.jsx +++ b/src/components/ItaliaTheme/View/ServizioView/ServizioMetatag.jsx @@ -1,9 +1,14 @@ import { useIntl } from 'react-intl'; import { Helmet, toPublicURL, isInternalURL } from '@plone/volto/helpers'; +import config from '@plone/volto/registry'; import { SiteProperty } from 'volto-site-settings'; import { getSiteProperty } from 'design-comuni-plone-theme/helpers'; import { richTextHasContent } from 'design-comuni-plone-theme/components/ItaliaTheme/View'; +const isVoltoSchemaorgInstalled = config.settings.addonsInfo.some( + (addon) => addon.name === '@redturtle/volto-schemaorg', +); + const fieldDataToPlainText = (field) => { return field.blocks_layout.items.reduce((accumulator, item, index) => { if (field.blocks[item]['@type'] === 'text') { @@ -20,6 +25,11 @@ const fieldDataToPlainText = (field) => { const ServizioMetatag = ({ content }) => { const intl = useIntl(); + + if (isVoltoSchemaorgInstalled) { + return null; + } + let siteTitle = SiteProperty({ property: 'site_title', getValue: true, From 25c2c15f21b9ce77dee8a320136a6bdcffb27782 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Fri, 3 Jul 2026 16:35:22 +0200 Subject: [PATCH 2/5] ci: upgrade nodejs --- .github/workflows/unit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 90cf085568..661ae8db98 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [20.x] + node-version: [22.x] steps: - name: Main checkout From 33d2f4f12f776328412f55d9a64cfcaf2e98e592 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Fri, 3 Jul 2026 16:38:19 +0200 Subject: [PATCH 3/5] fix --- .../ItaliaTheme/View/ServizioView/ServizioMetatag.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/ItaliaTheme/View/ServizioView/ServizioMetatag.jsx b/src/components/ItaliaTheme/View/ServizioView/ServizioMetatag.jsx index d649f723cc..6d160bd56e 100644 --- a/src/components/ItaliaTheme/View/ServizioView/ServizioMetatag.jsx +++ b/src/components/ItaliaTheme/View/ServizioView/ServizioMetatag.jsx @@ -5,10 +5,6 @@ import { SiteProperty } from 'volto-site-settings'; import { getSiteProperty } from 'design-comuni-plone-theme/helpers'; import { richTextHasContent } from 'design-comuni-plone-theme/components/ItaliaTheme/View'; -const isVoltoSchemaorgInstalled = config.settings.addonsInfo.some( - (addon) => addon.name === '@redturtle/volto-schemaorg', -); - const fieldDataToPlainText = (field) => { return field.blocks_layout.items.reduce((accumulator, item, index) => { if (field.blocks[item]['@type'] === 'text') { @@ -26,6 +22,10 @@ const fieldDataToPlainText = (field) => { const ServizioMetatag = ({ content }) => { const intl = useIntl(); + const isVoltoSchemaorgInstalled = config.settings.addonsInfo?.some( + (addon) => addon.name === '@redturtle/volto-schemaorg', + ); + if (isVoltoSchemaorgInstalled) { return null; } From efbbec3f1c007a05867c4db91301bcaaecb1a8fb Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Fri, 3 Jul 2026 16:39:39 +0200 Subject: [PATCH 4/5] ci --- .github/workflows/unit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 661ae8db98..30991d1a04 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [22.x] + node-version: [20.x,22.x] steps: - name: Main checkout From 016de411e7b7ea06f8b2b6c311ca58e46e29d972 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Fri, 3 Jul 2026 16:47:26 +0200 Subject: [PATCH 5/5] ci --- .github/workflows/unit.yml | 8 +++++--- dockerfiles/docker-compose.yml | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 30991d1a04..bf4d29bbdb 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -4,13 +4,15 @@ jobs: unit: name: Unit Tests runs-on: ubuntu-latest - strategy: - matrix: - node-version: [20.x,22.x] steps: - name: Main checkout uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Run unit tests + env: + COMPOSE_BAKE: 'true' run: make test-ci diff --git a/dockerfiles/docker-compose.yml b/dockerfiles/docker-compose.yml index a375ee77ea..e1eea1db2d 100644 --- a/dockerfiles/docker-compose.yml +++ b/dockerfiles/docker-compose.yml @@ -9,6 +9,10 @@ services: ADDON_NAME: '${ADDON_NAME}' ADDON_PATH: '${ADDON_PATH}' VOLTO_VERSION: ${VOLTO_VERSION:-17} + cache_from: + - type=gha + cache_to: + - type=gha,mode=max volumes: - ${CURRENT_DIR}:/app/src/addons/${ADDON_PATH}/ environment: