design-comuni-plone-theme 11.20.3 → 11.21.0

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 
 
+## [11.21.0](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.20.4...v11.21.0) (2024-08-14)
+
+
+### Features
+
+* contextualvocabularies [#6236](https://github.com/RedTurtle/design-comuni-plone-theme/issues/6236) backport ([#738](https://github.com/RedTurtle/design-comuni-plone-theme/issues/738)) ([29f5c2e](https://github.com/RedTurtle/design-comuni-plone-theme/commit/29f5c2e7f2849dbc5d03fbc31d216a2920564116))
+
+
+### Bug Fixes
+
+* metadata field in EventSearch ([#744](https://github.com/RedTurtle/design-comuni-plone-theme/issues/744)) ([0b255e6](https://github.com/RedTurtle/design-comuni-plone-theme/commit/0b255e6569573e557622de6afaa6f9d260bb7efe))
+
+
+### Documentation
+
+* updated publiccode and release log ([1bc0699](https://github.com/RedTurtle/design-comuni-plone-theme/commit/1bc0699fcf0a234929f5b960c1a0305878fe2db4))
+
+## [11.20.4](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.20.3...v11.20.4) (2024-08-14)
+
+
+### Bug Fixes
+
+* changed rrule translation in PageHeaderEventDates ([#743](https://github.com/RedTurtle/design-comuni-plone-theme/issues/743)) ([9a7d59f](https://github.com/RedTurtle/design-comuni-plone-theme/commit/9a7d59f0927f34dbab74c44d09029904e07d5067))
+
+
+### Documentation
+
+* updated publiccode ([e0c1f3c](https://github.com/RedTurtle/design-comuni-plone-theme/commit/e0c1f3ceaf1134cd0b5eec8352eeab2a2632e154))
+
 ## [11.20.3](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.20.2...v11.20.3) (2024-08-14)
 
 

package/RELEASE.md

@@ -41,6 +41,12 @@
 - ...
 -->
 
+## Versione 11.21.0 (14/08/2024)
+
+### Fix
+
+- Le date delle card nella Ricerca Eventi vengono mostrate correttamente come impostate nell'evento.
+
 ## Versione 11.20.2 (12/08/2024)
 
 ### Fix

package/package.json

@@ -2,7 +2,7 @@
   "name": "design-comuni-plone-theme",
   "description": "Volto Theme for Italia design guidelines",
   "license": "GPL-v3",
-  "version": "11.20.3",
+  "version": "11.21.0",
   "main": "src/index.js",
   "repository": {
     "type": "git",

package/publiccode.yml

@@ -229,7 +229,7 @@ platforms:
   - web
 releaseDate: '2024-08-14'
 softwareType: standalone/web
-softwareVersion: 11.20.3
+softwareVersion: 11.21.0
 url: 'https://github.com/italia/design-comuni-plone-theme'
 usedBy:
   - ASP Comuni Modenesi Area Nord

package/src/components/ItaliaTheme/Blocks/EventSearch/Body.jsx

@@ -99,7 +99,7 @@ const Body = ({ data, id, inEditMode, path, onChangeBlock }) => {
         subsite ? flattenToAppURL(subsite['@id']) : '',
         {
           query: query,
-          metadata: '_all',
+          metadata_fields: '_all',
           b_size: b_size,
           sort_order: 'ascending',
           sort_on: 'start',

package/src/components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates.jsx

@@ -34,6 +34,10 @@ const PageHeaderEventDates = ({ content, moment, rrule }) => {
 
   if (content['@type'] === 'Event') {
     if (content.recurrence) {
+      const isRecurrenceByDay = content.recurrence.includes('BYDAY=+');
+      const isWeekdaySunday = content.recurrence
+        .split('BYDAY')[1]
+        ?.includes('SU');
       const rruleSet = rrulestr(content.recurrence, {
         compatible: true, //If set to True, the parser will operate in RFC-compatible mode. Right now it means that unfold will be turned on, and if a DTSTART is found, it will be considered the first recurrence instance, as documented in the RFC.
         forceset: true,
@@ -41,6 +45,16 @@ const PageHeaderEventDates = ({ content, moment, rrule }) => {
       const RRULE_LANGUAGE = rrulei18n(intl, Moment);
       eventRecurrenceText = rruleSet.rrules()[0]?.toText(
         (t) => {
+          if (Moment.locale(intl.locale) === 'it' && isRecurrenceByDay) {
+            RRULE_LANGUAGE.strings.th = '°';
+            RRULE_LANGUAGE.strings.nd = '°';
+            RRULE_LANGUAGE.strings.rd = '°';
+            RRULE_LANGUAGE.strings.st = '°';
+
+            if (isWeekdaySunday) {
+              RRULE_LANGUAGE.strings['on the'] = 'la';
+            }
+          }
           return RRULE_LANGUAGE.strings[t];
         },
         RRULE_LANGUAGE,

package/src/config/italiaConfig.js

@@ -89,6 +89,7 @@ export default function applyConfig(voltoConfig) {
   config.experimental.addBlockButton.enabled = true; //per spostare il bottone di aggiunta dei blocchi in basso, e fare in modo che i bottoni di edit dei blocchi siano usabili anche da tablet/mobile
   config.settings = {
     ...config.settings,
+    contextualVocabularies: config.settings.contextualVocabularies || [],
     openExternalLinkInNewTab: true,
     sentryOptions: (libraries) => ({
       ...voltoSentryOptions(libraries),

package/src/customizations/volto/actions/vocabularies/vocabularies.js

@@ -0,0 +1,98 @@
+/**
+
+ * original from volto 17.18.2
+ * backport https://github.com/plone/volto/pull/6236
+
+ * Vocabularies actions.
+ * @module actions/vocabularies/vocabularies
+ */
+
+import {
+  GET_VOCABULARY,
+  GET_VOCABULARY_TOKEN_TITLE,
+} from '@plone/volto/constants/ActionTypes';
+import config from '@plone/volto/registry';
+import { flattenToAppURL } from '@plone/volto/helpers';
+import { getVocabName } from '@plone/volto/helpers/Vocabularies/Vocabularies';
+import qs from 'query-string';
+
+/**
+ * Get vocabulary given a URL (coming from a Schema) or from a vocabulary name.
+ * @function getVocabulary
+ * @param {string} vocabNameOrURL Full API URL of vocabulary or vocabulary name
+ * @param {string} query Only include results containing this string.
+ * @param {number} start Start of result batch.
+ * @param {number} b_size The size of the batch.
+ * @param {string} subrequest Name of the subrequest.
+ * @returns {Object} Get vocabulary action.
+ */
+export function getVocabulary({
+  vocabNameOrURL,
+  query = null,
+  start = 0,
+  size,
+  subrequest,
+}) {
+  const vocabulary = getVocabName(vocabNameOrURL);
+  const contextualVocabularies = config.settings.contextualVocabularies;
+  const vocabPath =
+    contextualVocabularies && contextualVocabularies.includes(vocabulary)
+      ? flattenToAppURL(vocabNameOrURL)
+      : `/@vocabularies/${vocabulary}`;
+  let queryString = `b_start=${start}${size ? '&b_size=' + size : ''}`;
+
+  if (query) {
+    queryString = `${queryString}&title=${query}`;
+  }
+  return {
+    type: GET_VOCABULARY,
+    vocabulary: vocabNameOrURL,
+    start,
+    request: {
+      op: 'get',
+      path: `${vocabPath}?${queryString}`,
+    },
+    subrequest,
+  };
+}
+
+/**
+ * Get the title value given a token from vocabulary given a vocabulary URL
+ * (coming from a Schema) or from a vocabulary name.
+ * @function getVocabularyTokenTitle
+ * @param {string} vocabNameOrURL Full API URL of vocabulary or vocabulary name
+ * @param {string} token Only include results containing this string.
+ * @returns {Object} Get vocabulary action.
+ */
+export function getVocabularyTokenTitle({
+  vocabNameOrURL,
+  token = null,
+  tokens = null,
+  subrequest,
+}) {
+  // In case we have a URL, we have to get the vocabulary name
+  const vocabulary = getVocabName(vocabNameOrURL);
+  const contextualVocabularies = config.settings.contextualVocabularies;
+  const vocabPath =
+    contextualVocabularies && contextualVocabularies.includes(vocabulary)
+      ? flattenToAppURL(vocabNameOrURL)
+      : `/@vocabularies/${vocabulary}`;
+  const queryString = {
+    ...(token && { token }),
+    ...(tokens && { tokens }),
+  };
+
+  return {
+    type: GET_VOCABULARY_TOKEN_TITLE,
+    vocabulary: vocabNameOrURL,
+    token,
+    tokens,
+    subrequest,
+    request: {
+      op: 'get',
+      path: `${vocabPath}}?b_size=-1&${qs.stringify(queryString, {
+        encode: false,
+      })}`,
+    },
+  };
+}