design-comuni-plone-theme 11.0.0 → 11.0.1

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 
 
+## [11.0.1](https://github.com/redturtle/design-comuni-plone-theme/compare/v11.0.0...v11.0.1) (2023-12-19)
+
+
+### Bug Fixes
+
+* schema.org serviceUrl construction ([93f0f39](https://github.com/redturtle/design-comuni-plone-theme/commit/93f0f39bc817cf40ad506e7dd4b6d8f2ada41e18))
+* youtube preview image ([#441](https://github.com/redturtle/design-comuni-plone-theme/issues/441)) ([93af45c](https://github.com/redturtle/design-comuni-plone-theme/commit/93af45cd2dce0cd6de83174660b665399096e481))
+
+
+### Documentation
+
+* updated publiccode and release log ([13befcb](https://github.com/redturtle/design-comuni-plone-theme/commit/13befcb56bf3a7d527b552369f253efeb5f5cd5a))
+
 ## [11.0.0](https://github.com/redturtle/design-comuni-plone-theme/compare/v10.6.4...v11.0.0) (2023-12-18)
 
 

package/RELEASE.md

@@ -41,7 +41,13 @@
 - ...
 -->
 
-## Versione X.X.X (dd/mm/yyyy)
+## Versione 11.0.1 (19/12/2023)
+
+### Fix
+
+- Risolto un problema con le anteprime dei video embeddati da youtube.
+
+## Versione 11.0.0 (18/12/2023)
 
 ### Novità
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "design-comuni-plone-theme",
   "description": "Volto Theme for Italia design guidelines",
   "license": "GPL-v3",
-  "version": "11.0.0",
+  "version": "11.0.1",
   "main": "src/index.js",
   "keywords": [
     "volto-addon",

package/publiccode.yml

@@ -227,9 +227,9 @@ maintenance:
 name: io-Comune - Il sito AgID per Comuni ed Enti Pubblici
 platforms:
   - web
-releaseDate: '2023-12-18'
+releaseDate: '2023-12-19'
 softwareType: standalone/web
-softwareVersion: 11.0.0
+softwareVersion: 11.0.1
 url: 'https://github.com/italia/design-comuni-plone-theme'
 usedBy:
   - ASP Comuni Modenesi Area Nord

package/src/components/ItaliaTheme/Blocks/VideoGallery/Block/ViewBlock.jsx

@@ -47,7 +47,7 @@ const ViewBlock = ({ data, index, isEditMode = false }) => {
       const videoID = data.url.match(/.be\//)
         ? data.url.match(/^.*\.be\/(.*)/)?.[1]
         : data.url.match(/^.*\?v=(.*)$/)?.[1];
-      placeholder = 'https://img.youtube.com/vi/' + videoID + '/sddefault.jpg';
+      placeholder = 'https://img.youtube.com/vi/' + videoID + '/hqdefault.jpg';
     } else if (data.url.match('vimeo')) {
       const videoID = data.url.match(/^.*\.com\/(.*)/)[1];
       placeholder = 'https://vumbnail.com/' + videoID + '.jpg';

package/src/components/ItaliaTheme/View/Commons/EmbeddedVideo.jsx

@@ -56,7 +56,7 @@ const EmbeddedVideo = ({ video_url, title, id }) => {
     defaultActive: false,
     autoplay: false,
     aspectRatio: '16:9',
-    placeholder: 'https://img.youtube.com/vi/' + video_id + '/sddefault.jpg',
+    placeholder: 'https://img.youtube.com/vi/' + video_id + '/hqdefault.jpg',
     tabIndex: 0,
     onKeyPress: onKeyDown,
     ref: ref,

package/src/components/ItaliaTheme/View/ServizioView/ServizioMetatag.jsx

@@ -1,20 +1,20 @@
-import { Helmet, toPublicURL } from '@plone/volto/helpers';
+import { Helmet, toPublicURL, isInternalURL } from '@plone/volto/helpers';
 import { getSiteProperty } from 'design-comuni-plone-theme/helpers';
 import { richTextHasContent } from 'design-comuni-plone-theme/components/ItaliaTheme/View';
 
+const fieldDataToPlainText = (field) => {
+  return field.blocks_layout.items.reduce((accumulator, item, index) => {
+    if (field.blocks[item]['@type'] === 'text') {
+      if (index > 0) accumulator += ' ';
+      accumulator += field.blocks[item].text?.blocks[0].text ?? '';
+    }
+    return accumulator;
+  }, '');
+};
+
 const ServizioMetatag = ({ content }) => {
   const siteTitle = getSiteProperty('siteTitle');
 
-  const fieldDataToPlainText = (field) => {
-    return field.blocks_layout.items.reduce((accumulator, item, index) => {
-      if (field.blocks[item]['@type'] === 'text') {
-        if (index > 0) accumulator += ' ';
-        accumulator += field.blocks[item].text?.blocks[0].text ?? '';
-      }
-      return accumulator;
-    }, '');
-  };
-
   const schemaOrg = {
     '@context': 'https://schema.org',
     '@type': 'GovernmentService',
@@ -49,9 +49,11 @@ const ServizioMetatag = ({ content }) => {
   }
 
   if (content.canale_digitale_link) {
-    schemaOrg.availableChannel.serviceUrl = toPublicURL(
+    schemaOrg.availableChannel.serviceUrl = isInternalURL(
       content.canale_digitale_link,
-    );
+    )
+      ? toPublicURL(content.canale_digitale_link)
+      : content.canale_digitale_link;
   } else {
     schemaOrg.availableChannel.serviceUrl = toPublicURL(content['@id']);
   }

package/src/helpers/videoUrlHelper.js

@@ -4,13 +4,11 @@ import { isInternalURL, flattenToAppURL } from '@plone/volto/helpers';
 // test against all yt link formats I am aware of, not easy, can't find official docs.
 // Try all possible formats, match an alphanumeric token in the expected position, length should be 10-20 chars, that's the ID.
 // Reference sheet used and improved with support to shorts: https://gist.github.com/rodrigoborgesdeoliveira/987683cfbfcc8d800192da1e73adc486
-const ytReg =
-  /^(?:http|https?:)?(?:\/\/)?(?:(?:www\.|m\.)?youtube(?:-nocookie)?\.com\/(?:(?:watch)?\?(?:feature=\w*&)?vi?=|embed\/|vi?\/|e\/|shorts\/)|youtu.be\/)([\w\-]{10,20})/i;
+const ytReg = /^(?:http|https?:)?(?:\/\/)?(?:(?:www\.|m\.)?youtube(?:-nocookie)?\.com\/(?:(?:watch)?\?(?:feature=\w*&)?vi?=|embed\/|vi?\/|e\/|shorts\/)|youtu.be\/)([\w\-]{10,20})/i;
 
 // Vimeo IDs should be only digits, let's try to get only a group of digits and suppose that's the video ID, scrap everything after.
 // Docs link, watch for changes https://developer.vimeo.com/api/common-formats
-const vimeoReg =
-  /(?:http|https)?:?\/?\/?(?:www\.)?(?:player\.)?vimeo\.com\/(?:(?:channels\/(?:[\w*\/]*\/))|(?:groups\/(?:[\w*\/]*\/))|(?:videos\/|video\/|albums\/))?(\d+)/i;
+const vimeoReg = /(?:http|https)?:?\/?\/?(?:www\.)?(?:player\.)?vimeo\.com\/(?:(?:channels\/(?:[\w*\/]*\/))|(?:groups\/(?:[\w*\/]*\/))|(?:videos\/|video\/|albums\/))?(\d+)/i;
 
 // Use regex against url to get video ID, video urls supported are youtube and vimeo.
 // Return videoID and placeholder (if needed), null if no match found.
@@ -25,7 +23,7 @@ export const videoUrlHelper = (url, previewImage) => {
   if (ytVideoMatch) {
     videoID = ytVideoMatch[1];
     if (!placeholder)
-      placeholder = 'https://img.youtube.com/vi/' + videoID + '/sddefault.jpg';
+      placeholder = 'https://img.youtube.com/vi/' + videoID + '/hqdefault.jpg';
 
     return [videoID, placeholder];
   } else {

package/src/helpers/videoUrlHelper.test.js

@@ -294,7 +294,7 @@ describe('videoUrlHelper', () => {
     );
 
     expect(placeholder).toBe(
-      'https://img.youtube.com/vi/' + YT_TEST_ID + '/sddefault.jpg',
+      'https://img.youtube.com/vi/' + YT_TEST_ID + '/hqdefault.jpg',
     );
   });
   it('generates vimeo placeholder correctly', async () => {