Merge branch 'main' into us_60372_search_block_plone_ranking

RedTurtle · Dec 3, 2024 · 2c2c753 · 2c2c753
2 parents b445720 + b821cce
commit 2c2c753
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,36 @@
 # 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)
+
+
+### 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)
+
+
+### 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/RELEASE.md b/RELEASE.md
@@ -41,7 +41,13 @@
 - ...
  -->
 
-## Versione X.X.X (dd/mm/yyyy)
+## Versione 11.25.1 (28/11/2024)
+
+### Fix
+
+- Aggiustato il collegamento alla UO nella pagina Argomento.
+
+## Versione 11.25.0 (26/11/2024)
 
 ### Migliorie
 

diff --git 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.30",
   "main": "src/index.js",
   "repository": {
     "type": "git",

diff --git 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.2
 url: 'https://github.com/italia/design-comuni-plone-theme'
 usedBy:
   - ASP Comuni Modenesi Area Nord

diff --git 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 (
@@ -109,8 +109,8 @@ const PaginaArgomentoView = ({ content }) => {
                               </CardText>
                             </CardBody>
                             {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) && (
                                 <div className="image-container me-3">
                                   <Image