From 86f3b86d9125f2b2cb2773ace4c4487bb4666a57 Mon Sep 17 00:00:00 2001 From: sabrina-bongiovanni <116291154+sabrina-bongiovanni@users.noreply.github.com> Date: Thu, 28 Nov 2024 09:48:22 +0100 Subject: [PATCH 1/8] fix: added conditional chaining to images for uo in argomento view (#822) --- RELEASE.md | 14 ++++++++++++++ .../PaginaArgomentoView/PaginaArgomentoView.jsx | 8 ++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 7ead7c33d..0caa7fc4a 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -45,6 +45,20 @@ ### Migliorie +- ... + +### Novità + +- ... + +### Fix + +- Aggiustato il collegamento alla UO nella pagina Argomento. + +## Versione X.X.X (dd/mm/yyyy) + +### Migliorie + - Rimossa dal CT Evento la data di scadenza del CT per evitare confusione con le date effettive dell'evento - Durante la ricerca nel sito dalla popup che compare cliccando sul bottone 'Cerca' nella testa del sito, viene mostrato un loader in overlay durante il caricamento della pagina dei risultati perchè questo potrebbe richiedere un po' di tempo. Prima di questa modifica non era chiaro se la ricerca fosse iniziata. - Nel CT Evento per una rassegna, se gli eventi figli hanno una ricorrenza o un periodo di date impostato, il range di date verrà mostrato nella card all'interno dell'evento padre. diff --git a/src/components/ItaliaTheme/View/PaginaArgomentoView/PaginaArgomentoView.jsx b/src/components/ItaliaTheme/View/PaginaArgomentoView/PaginaArgomentoView.jsx index f14f19b37..28c35d942 100644 --- a/src/components/ItaliaTheme/View/PaginaArgomentoView/PaginaArgomentoView.jsx +++ b/src/components/ItaliaTheme/View/PaginaArgomentoView/PaginaArgomentoView.jsx @@ -74,15 +74,15 @@ const PaginaArgomentoView = ({ content }) => { const uo_object = u; let alt = u.title; if ( - uo_object.image_scales.preview_image.length > 0 && + uo_object?.image_scales?.preview_image?.length > 0 && uo_object?.preview_caption ) { - alt = uo_object.preview_caption; + alt = uo_object?.preview_caption; } else if ( - uo_object.image_scales.image.length > 0 && + uo_object?.image_scales?.image.length > 0 && uo_object?.image_caption ) { - alt = uo_object.image_caption; + alt = uo_object?.image_caption; } return ( From 3d227300fe5abc079a9a53978c53675fc23d5ce7 Mon Sep 17 00:00:00 2001 From: Martina Bustacchini Date: Thu, 28 Nov 2024 09:54:49 +0100 Subject: [PATCH 2/8] docs: updated publiccode and release log --- RELEASE.md | 12 ++---------- publiccode.yml | 4 ++-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 0caa7fc4a..a97113044 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -41,21 +41,13 @@ - ... --> -## Versione X.X.X (dd/mm/yyyy) - -### Migliorie - -- ... - -### Novità - -- ... +## Versione 11.25.1 (28/11/25) ### Fix - Aggiustato il collegamento alla UO nella pagina Argomento. -## Versione X.X.X (dd/mm/yyyy) +## Versione 11.25.0 (27/11/2024) ### Migliorie diff --git a/publiccode.yml b/publiccode.yml index 02048832d..a1cd97d19 100644 --- a/publiccode.yml +++ b/publiccode.yml @@ -227,9 +227,9 @@ maintenance: name: io-Comune - Il sito AgID per Comuni ed Enti Pubblici platforms: - web -releaseDate: '2024-11-26' +releaseDate: '2024-11-28' softwareType: standalone/web -softwareVersion: 11.25.0 +softwareVersion: 11.25.1 url: 'https://github.com/italia/design-comuni-plone-theme' usedBy: - ASP Comuni Modenesi Area Nord From 2d2261ae5edfe7ac9fd043bd1556853cdd83cbe7 Mon Sep 17 00:00:00 2001 From: Martina Bustacchini Date: Thu, 28 Nov 2024 09:55:44 +0100 Subject: [PATCH 3/8] chore: release v12.0.0-alpha.28 --- CHANGELOG.md | 12 ++++++++++++ package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebc890afb..d78b0a939 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [12.0.0-alpha.28](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v12.0.0-alpha.27...v12.0.0-alpha.28) (2024-11-28) + + +### Bug Fixes + +* added conditional chaining to images for uo in argomento view ([#822](https://github.com/RedTurtle/design-comuni-plone-theme/issues/822)) ([86f3b86](https://github.com/RedTurtle/design-comuni-plone-theme/commit/86f3b86d9125f2b2cb2773ace4c4487bb4666a57)) + + +### Documentation + +* updated publiccode and release log ([3d22730](https://github.com/RedTurtle/design-comuni-plone-theme/commit/3d227300fe5abc079a9a53978c53675fc23d5ce7)) + ## [12.0.0-alpha.27](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v12.0.0-alpha.26...v12.0.0-alpha.27) (2024-11-26) diff --git a/package.json b/package.json index 3f237d96a..8bcd9b1cc 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "design-comuni-plone-theme", "description": "Volto Theme for Italia design guidelines", "license": "GPL-v3", - "version": "12.0.0-alpha.27", + "version": "12.0.0-alpha.28", "main": "src/index.js", "repository": { "type": "git", From be6c982fe191afc4ffa6d091162cbab6e7381084 Mon Sep 17 00:00:00 2001 From: Martina Bustacchini Date: Thu, 28 Nov 2024 10:07:15 +0100 Subject: [PATCH 4/8] chore: amend release.md --- RELEASE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index a97113044..9c4caf121 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -41,13 +41,13 @@ - ... --> -## Versione 11.25.1 (28/11/25) +## Versione 11.25.1 (28/11/2024) ### Fix - Aggiustato il collegamento alla UO nella pagina Argomento. -## Versione 11.25.0 (27/11/2024) +## Versione 11.25.0 (26/11/2024) ### Migliorie From c2f44d8d7043ee26ac33dc26646e46bdeff7f1a8 Mon Sep 17 00:00:00 2001 From: Martina Bustacchini Date: Thu, 28 Nov 2024 10:08:14 +0100 Subject: [PATCH 5/8] chore: release v12.0.0-alpha.29 --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d78b0a939..94aa296dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [12.0.0-alpha.29](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v12.0.0-alpha.28...v12.0.0-alpha.29) (2024-11-28) + + +### Maintenance + +* amend release.md ([be6c982](https://github.com/RedTurtle/design-comuni-plone-theme/commit/be6c982fe191afc4ffa6d091162cbab6e7381084)) + ## [12.0.0-alpha.28](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v12.0.0-alpha.27...v12.0.0-alpha.28) (2024-11-28) diff --git a/package.json b/package.json index 8bcd9b1cc..3cfa884c8 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "design-comuni-plone-theme", "description": "Volto Theme for Italia design guidelines", "license": "GPL-v3", - "version": "12.0.0-alpha.28", + "version": "12.0.0-alpha.29", "main": "src/index.js", "repository": { "type": "git", From eda8b07647be24519c97b4d29b2eb30a71997df4 Mon Sep 17 00:00:00 2001 From: sabrina-bongiovanni <116291154+sabrina-bongiovanni@users.noreply.github.com> Date: Thu, 28 Nov 2024 12:25:27 +0100 Subject: [PATCH 6/8] fix: added conditional chaining to images for uo in argomento view (#824) * fix: added conditional chaining to images for uo in argomento view * fix: removed additional conditional chaining --- .../View/PaginaArgomentoView/PaginaArgomentoView.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/ItaliaTheme/View/PaginaArgomentoView/PaginaArgomentoView.jsx b/src/components/ItaliaTheme/View/PaginaArgomentoView/PaginaArgomentoView.jsx index 28c35d942..8d3a1ac9b 100644 --- a/src/components/ItaliaTheme/View/PaginaArgomentoView/PaginaArgomentoView.jsx +++ b/src/components/ItaliaTheme/View/PaginaArgomentoView/PaginaArgomentoView.jsx @@ -109,8 +109,8 @@ const PaginaArgomentoView = ({ content }) => { {uo_object && - (uo_object.image_scales.image.length > 0 || - uo_object.image_scales.preview_image.length > + (uo_object.image_scales?.image?.length > 0 || + uo_object.image_scales?.preview_image?.length > 0) && (
Date: Thu, 28 Nov 2024 12:41:06 +0100 Subject: [PATCH 7/8] docs: updated publiccode --- publiccode.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publiccode.yml b/publiccode.yml index a1cd97d19..f63b389fe 100644 --- a/publiccode.yml +++ b/publiccode.yml @@ -229,7 +229,7 @@ platforms: - web releaseDate: '2024-11-28' softwareType: standalone/web -softwareVersion: 11.25.1 +softwareVersion: 11.25.2 url: 'https://github.com/italia/design-comuni-plone-theme' usedBy: - ASP Comuni Modenesi Area Nord From b821cce2e4b59ba8892becfca075538b05d9469b Mon Sep 17 00:00:00 2001 From: Martina Bustacchini Date: Thu, 28 Nov 2024 12:41:39 +0100 Subject: [PATCH 8/8] chore: release v12.0.0-alpha.30 --- CHANGELOG.md | 12 ++++++++++++ package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94aa296dd..d136a470e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [12.0.0-alpha.30](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v12.0.0-alpha.29...v12.0.0-alpha.30) (2024-11-28) + + +### Bug Fixes + +* added conditional chaining to images for uo in argomento view ([#824](https://github.com/RedTurtle/design-comuni-plone-theme/issues/824)) ([eda8b07](https://github.com/RedTurtle/design-comuni-plone-theme/commit/eda8b07647be24519c97b4d29b2eb30a71997df4)) + + +### Documentation + +* updated publiccode ([0af8039](https://github.com/RedTurtle/design-comuni-plone-theme/commit/0af8039f55c19023b39464d479dc98f0fce5d304)) + ## [12.0.0-alpha.29](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v12.0.0-alpha.28...v12.0.0-alpha.29) (2024-11-28) diff --git a/package.json b/package.json index 3cfa884c8..c12f84b25 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "design-comuni-plone-theme", "description": "Volto Theme for Italia design guidelines", "license": "GPL-v3", - "version": "12.0.0-alpha.29", + "version": "12.0.0-alpha.30", "main": "src/index.js", "repository": { "type": "git",