design-comuni-plone-theme 11.25.4 → 11.26.0

package/.github/workflows/npm.yml

@@ -36,7 +36,7 @@ jobs:
         run: |
           curl --fail --request POST \
           --form token=${{ secrets.TOKEN }} \
-          --form ref=main \
+          --form ref=3.2.x \
           --form "variables[ADDON_NAME]=design-comuni-plone-theme" \
           --form "variables[ADDON_TAG]=${{ steps.get_version.outputs.VERSION }}" \
           "https://gitlab.com/api/v4/projects/${{ secrets.PROJECT_ID }}/trigger/pipeline"

package/CHANGELOG.md

@@ -1,5 +1,43 @@
 
 
+## [11.26.0](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.25.4...v11.26.0) (2024-12-20)
+
+
+### Features
+
+* added information on recurrence exception dates in event subtitle ([#830](https://github.com/RedTurtle/design-comuni-plone-theme/issues/830)) ([f9d7f09](https://github.com/RedTurtle/design-comuni-plone-theme/commit/f9d7f09f763ad6214bbd35fa5e890a4e192056a2))
+* added usePloneRanking option in Search Block ([#820](https://github.com/RedTurtle/design-comuni-plone-theme/issues/820)) ([7b12ae3](https://github.com/RedTurtle/design-comuni-plone-theme/commit/7b12ae399db201acedbbd8321b3338a08e59722a))
+
+
+### Bug Fixes
+
+* "ci: fix npm release script" ([ac69380](https://github.com/RedTurtle/design-comuni-plone-theme/commit/ac6938038a8341cae08a7cc45b1effc8c7afd37e))
+* a11y in cms-ui and links color in cms-ui ([#840](https://github.com/RedTurtle/design-comuni-plone-theme/issues/840)) ([9965f50](https://github.com/RedTurtle/design-comuni-plone-theme/commit/9965f50f50a6df38aa8cd59bd646f2e2a2061f53))
+* backport from https://github.com/collective/volto-form-block/pull/122 ([#834](https://github.com/RedTurtle/design-comuni-plone-theme/issues/834)) ([8312f5e](https://github.com/RedTurtle/design-comuni-plone-theme/commit/8312f5e60c695cfe2bf0ebc8aced4ec5a83a8055))
+* cambiato colore del font per il pulsante creato con draftJS ([#836](https://github.com/RedTurtle/design-comuni-plone-theme/issues/836)) ([ef62472](https://github.com/RedTurtle/design-comuni-plone-theme/commit/ef62472607aee7aadba01f951ac1709193000e1e))
+* changed conditions for date range in header subtitle for ct event ([#825](https://github.com/RedTurtle/design-comuni-plone-theme/issues/825)) ([bfc673d](https://github.com/RedTurtle/design-comuni-plone-theme/commit/bfc673df227d556e2e7d54d9bf36ed9a99c1b916))
+* default sort for day-items in Calendar block ([#846](https://github.com/RedTurtle/design-comuni-plone-theme/issues/846)) ([be2f1df](https://github.com/RedTurtle/design-comuni-plone-theme/commit/be2f1df9efbe92b1c4703a1899392de76abf9307))
+* default volto-blocks-widget text block if slate enabled ([#832](https://github.com/RedTurtle/design-comuni-plone-theme/issues/832)) ([43fc8f2](https://github.com/RedTurtle/design-comuni-plone-theme/commit/43fc8f298e154b5542228b579fe6b0062904b0c9))
+* read waiting_list from right data structure ([#835](https://github.com/RedTurtle/design-comuni-plone-theme/issues/835)) ([ef05c69](https://github.com/RedTurtle/design-comuni-plone-theme/commit/ef05c6953979f70687389329a95090f90d276238))
+* removed no_value option from recurrence widget ([#827](https://github.com/RedTurtle/design-comuni-plone-theme/issues/827)) ([0581d8b](https://github.com/RedTurtle/design-comuni-plone-theme/commit/0581d8b5289a5a1c42dd7601e64c194df6604e13))
+* removed query b_size limit for event_location vocabulary ([#843](https://github.com/RedTurtle/design-comuni-plone-theme/issues/843)) ([0116482](https://github.com/RedTurtle/design-comuni-plone-theme/commit/0116482c3506169ed43c48a5e7bc624332d61602))
+* set icon title in CardCategory with content-type name ([#831](https://github.com/RedTurtle/design-comuni-plone-theme/issues/831)) ([ea6e668](https://github.com/RedTurtle/design-comuni-plone-theme/commit/ea6e668f91dba25e43be1490c9ee8042640098f4))
+* ssr conditional embed ([#839](https://github.com/RedTurtle/design-comuni-plone-theme/issues/839)) ([e369991](https://github.com/RedTurtle/design-comuni-plone-theme/commit/e369991fc3a161e6a5697f91c9b0e2c693fb88b7))
+* start date in recurrences ([#845](https://github.com/RedTurtle/design-comuni-plone-theme/issues/845)) ([18777b4](https://github.com/RedTurtle/design-comuni-plone-theme/commit/18777b4580b94cb3ca72aff852b6d9b506314634))
+* table styles in edit mode ([#826](https://github.com/RedTurtle/design-comuni-plone-theme/issues/826)) ([ebef417](https://github.com/RedTurtle/design-comuni-plone-theme/commit/ebef41700558395b5367740cbbdbd6770ea89216))
+* updated print styles ([#838](https://github.com/RedTurtle/design-comuni-plone-theme/issues/838)) ([52fce57](https://github.com/RedTurtle/design-comuni-plone-theme/commit/52fce573fd521deea579744bb6e44f9060bf9d59))
+
+
+### Maintenance
+
+* **deps:** bump cross-spawn from 7.0.3 to 7.0.6 ([#807](https://github.com/RedTurtle/design-comuni-plone-theme/issues/807)) ([0e4293d](https://github.com/RedTurtle/design-comuni-plone-theme/commit/0e4293d8b11c2c6a1bcdb529a037874e93068142))
+* **deps:** bump nanoid from 3.3.6 to 3.3.8 ([#837](https://github.com/RedTurtle/design-comuni-plone-theme/issues/837)) ([0b2de95](https://github.com/RedTurtle/design-comuni-plone-theme/commit/0b2de959496f767fdf7dd9e80f3e23fd3774225d))
+
+
+### Documentation
+
+* updated publiccode and release log ([ef94ad6](https://github.com/RedTurtle/design-comuni-plone-theme/commit/ef94ad6577531df4fefdd3e85a3b328dbfdeac26))
+
 ## [11.25.4](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.25.3...v11.25.4) (2024-12-16)
 
 

package/RELEASE.md

@@ -41,6 +41,25 @@
 - ...
  -->
 
+## Versione 11.26.0 (20/12/2024)
+
+### Migliorie
+
+- Se vengono aggiunte o rimosse date dalla ricorrenza di un CT evento, nel sottotitolo viene aggiunta l'indicazione di controllare le eccezioni nella sezione apposita.
+- Il sottotitolo del CT Evento mostra il range di date per tutti gli eventi con ricorrenza o con una data di fine diversa dalla data di inizio.
+- Sistemata l'accessibilità riguardante il focus lato operatore.
+
+### Novità
+
+- Nel blocco 'Cerca' è stata aggiunta l'opzione "Usa l'ordinamento dei risultati di Plone" nella sezione 'Controlli'.
+
+### Fix
+
+- Il menu a tendina da cui è possibile filtrare i luoghi nel blocco Ricerca Eventi mostra tutti i luoghi collegati agli eventi presenti nel percorso selezionato dalla Sidebar, senza limitarne il numero.
+- Risolto un problema con il colore del testo del bottone nell'editor.
+- Rimossa l'opzione non selezionabile "nessun valore" dal widget ricorrenza.
+- La pagina non dà più errore quando si imposta una ricorrenza con impostazione "Termina dopo tot. ricorrenze".
+
 ## Versione 11.25.3 (12/12/2024)
 
 ### Migliorie

package/locales/de/LC_MESSAGES/volto.po

@@ -1998,6 +1998,11 @@ msgstr ""
 msgid "exceeded_chars"
 msgstr ""
 
+#: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates
+# defaultMessage: con alcune eccezioni. Per maggiori informazioni controllare la sezione dedicata.
+msgid "exceptionDates"
+msgstr ""
+
 #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderDates
 # defaultMessage: Scadenza
 msgid "expire"

package/locales/en/LC_MESSAGES/volto.po

@@ -1983,6 +1983,11 @@ msgstr "Read more"
 msgid "exceeded_chars"
 msgstr ""
 
+#: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates
+# defaultMessage: con alcune eccezioni. Per maggiori informazioni controllare la sezione dedicata.
+msgid "exceptionDates"
+msgstr "with some exceptions. Please see the dedicated section for more information."
+
 #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderDates
 # defaultMessage: Scadenza
 msgid "expire"

package/locales/es/LC_MESSAGES/volto.po

@@ -1992,6 +1992,11 @@ msgstr ""
 msgid "exceeded_chars"
 msgstr "El texto excede la longitud recomendada"
 
+#: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates
+# defaultMessage: con alcune eccezioni. Per maggiori informazioni controllare la sezione dedicata.
+msgid "exceptionDates"
+msgstr ""
+
 #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderDates
 # defaultMessage: Scadenza
 msgid "expire"

package/locales/fr/LC_MESSAGES/volto.po

@@ -2000,6 +2000,11 @@ msgstr ""
 msgid "exceeded_chars"
 msgstr ""
 
+#: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates
+# defaultMessage: con alcune eccezioni. Per maggiori informazioni controllare la sezione dedicata.
+msgid "exceptionDates"
+msgstr ""
+
 #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderDates
 # defaultMessage: Scadenza
 msgid "expire"

package/locales/it/LC_MESSAGES/volto.po

@@ -1983,6 +1983,11 @@ msgstr "Leggi di più"
 msgid "exceeded_chars"
 msgstr "Il testo supera la lunghezza consigliata perciò verrà tagliato."
 
+#: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates
+# defaultMessage: con alcune eccezioni. Per maggiori informazioni controllare la sezione dedicata.
+msgid "exceptionDates"
+msgstr "con alcune eccezioni. Per maggiori informazioni controllare la sezione dedicata."
+
 #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderDates
 # defaultMessage: Scadenza
 msgid "expire"

package/locales/volto.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2024-11-25T14:46:11.571Z\n"
+"POT-Creation-Date: 2024-12-12T10:58:07.184Z\n"
 "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -1985,6 +1985,11 @@ msgstr ""
 msgid "exceeded_chars"
 msgstr ""
 
+#: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates
+# defaultMessage: con alcune eccezioni. Per maggiori informazioni controllare la sezione dedicata.
+msgid "exceptionDates"
+msgstr ""
+
 #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderDates
 # defaultMessage: Scadenza
 msgid "expire"

package/package.json

@@ -2,7 +2,7 @@
   "name": "design-comuni-plone-theme",
   "description": "Volto Theme for Italia design guidelines",
   "license": "GPL-v3",
-  "version": "11.25.4",
+  "version": "11.26.0",
   "main": "src/index.js",
   "repository": {
     "type": "git",
@@ -147,13 +147,13 @@
     "typeface-lora": "0.0.72",
     "typeface-roboto-mono": "0.0.75",
     "typeface-titillium-web": "0.0.72",
-    "volto-blocks-widget": "3.4.1",
+    "volto-blocks-widget": "3.4.3",
     "volto-data-grid-widget": "2.3.1",
     "volto-dropdownmenu": "4.1.3",
     "volto-editablefooter": "5.1.7",
-    "volto-feedback": "0.3.2",
+    "volto-feedback": "0.5.2",
     "volto-form-block": "3.10.0",
-    "volto-gdpr-privacy": "2.2.9",
+    "volto-gdpr-privacy": "2.2.12",
     "volto-google-analytics": "2.0.0",
     "volto-multilingual-widget": "3.2.1",
     "volto-querywidget-with-browser": "0.4.2",

package/publiccode.yml

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

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

@@ -123,6 +123,7 @@ const Body = ({ data, block, inEditMode, path, onChangeBlock, reactSlick }) => {
   const adaptedQuery = Object.assign(
     {
       fullobjects: 1,
+      sort_on: !Object.keys(_querystring).includes('sort_on') ? 'start' : null,
     },
     ...copyFields.map((name) =>
       Object.keys(_querystring).includes(name)

package/src/components/ItaliaTheme/Blocks/Common/SearchFilters/SelectFilter.jsx

@@ -11,6 +11,7 @@ const SelectFilter = ({
   onChange,
   placeholder,
   isSearchable = false,
+  optionsQuerySize = 25,
 }) => {
   const dispatch = useDispatch();
 
@@ -52,15 +53,20 @@ const SelectFilter = ({
         );
       }
     } else if (options.vocabulary) {
-      dispatch(getVocabulary({ vocabNameOrURL: options.vocabulary }));
+      dispatch(
+        getVocabulary({
+          vocabNameOrURL: options.vocabulary,
+          size: optionsQuerySize,
+        }),
+      );
     }
   }, []);
 
   const select_options = options?.choices
     ? options.choices
     : options?.vocabulary
-      ? vocabularies?.[options.vocabulary]?.items
-      : selectOptions;
+    ? vocabularies?.[options.vocabulary]?.items
+    : selectOptions;
 
   return (
     <div className="me-lg-3 my-2 my-lg-1 filter-wrapper select-filter">

package/src/components/ItaliaTheme/Blocks/EventSearch/DefaultFilters.js

@@ -72,6 +72,7 @@ const DefaultFilters = () => {
             vocabulary: 'design.plone.vocabularies.event_location',
             placeholder: intl.formatMessage(messages.venues),
           },
+          optionsQuerySize: -1,
         },
       },
       query: (value, query) => {

package/src/components/ItaliaTheme/Cards/CardCategory.jsx

@@ -38,9 +38,8 @@ const CardCategory = (props) => {
   const categoryText = !href && children && (
     <span className="text">{children}</span>
   );
-  const categoryIcon = iconName && (
-    <Icon icon={iconName} title={intl.formatMessage(messages.categoryIcon)} />
-  );
+  const iconTitle = rest.title || intl.formatMessage(messages.categoryIcon);
+  const categoryIcon = iconName && <Icon icon={iconName} title={iconTitle} />;
 
   return (
     <div className={classes} {...rest}>

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

@@ -4,7 +4,11 @@ import { rrulei18n } from '@plone/volto/components/manage/Widgets/RecurrenceWidg
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import { Card, CardTitle, CardBody } from 'design-react-kit';
 import PropTypes from 'prop-types';
-import { viewDate, getRealEventEnd } from 'design-comuni-plone-theme/helpers';
+import {
+  viewDate,
+  getRealEventEnd,
+  getRecurrenceExceptionDates,
+} from 'design-comuni-plone-theme/helpers';
 
 const messages = defineMessages({
   start: {
@@ -85,16 +89,12 @@ const Dates = ({ content, show_image, moment: momentlib, rrule }) => {
   const start = viewDate(intl.locale, content.start);
   // format and save date into new variable depending on recurrence of event
   const end = viewDate(intl.locale, actualEndDate);
+
   const openEnd = content?.open_end;
   const wholeDay = content?.whole_day;
-  const rdates = rruleSet?.rdates() ?? [];
-  const exdates = rruleSet?.exdates() ?? [];
-  const additionalDates = rdates.reduce((acc, curr) => {
-    const isExdate = exdates.some((b) => b.toString() === curr.toString());
-    if (!isExdate) {
-      return [...acc, curr];
-    } else return acc;
-  }, []);
+
+  const { additionalDates, removedDates } =
+    getRecurrenceExceptionDates(rruleSet);
 
   return content ? (
     <>
@@ -133,11 +133,11 @@ const Dates = ({ content, show_image, moment: momentlib, rrule }) => {
           <div className="point-list">
             <div className="point-list-aside point-list-warning">
               <span className="point-date font-monospace">
-                {end.format('DD')}
+                {end?.format('DD')}
               </span>
-              <span className="point-month">{end.format('MMMM')}</span>
-              {!end.isSame(start, 'year') && (
-                <span className="point-month">{end.format('YYYY')}</span>
+              <span className="point-month">{end?.format('MMMM')}</span>
+              {!end?.isSame(start, 'year') && (
+                <span className="point-month">{end?.format('YYYY')}</span>
               )}
             </div>
             <div className="point-list-content">
@@ -148,7 +148,7 @@ const Dates = ({ content, show_image, moment: momentlib, rrule }) => {
               >
                 <CardBody tag="div" className={'card-body'}>
                   <CardTitle tag="p">
-                    {!content.whole_day && `${end.format('HH:mm')} - `}
+                    {!content.whole_day && `${end?.format('HH:mm')} - `}
                     {intl.formatMessage(messages.end)}
                   </CardTitle>
                 </CardBody>
@@ -172,10 +172,10 @@ const Dates = ({ content, show_image, moment: momentlib, rrule }) => {
           ))}
         </div>
       )}
-      {exdates.length > 0 && (
+      {removedDates.length > 0 && (
         <div className="mt-4">
           <h5>{intl.formatMessage(messages.excluded_dates)}</h5>
-          {exdates.map((exDate) => (
+          {removedDates.map((exDate) => (
             <div className="font-serif">
               {viewDate(intl.locale, exDate, 'dddd DD MMMM YYYY')}
             </div>

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

@@ -4,13 +4,21 @@ import PropTypes from 'prop-types';
 
 import { rrulei18n } from '@plone/volto/components/manage/Widgets/RecurrenceWidget/Utils';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
-import { getRealEventEnd } from 'design-comuni-plone-theme/helpers';
+import {
+  getRealEventEnd,
+  getRecurrenceExceptionDates,
+} from 'design-comuni-plone-theme/helpers';
 
 const messages = defineMessages({
   dateStart: {
     id: 'dal {dateStart} fino a conclusione',
     defaultMessage: 'dal {dateStart} fino a conclusione',
   },
+  exceptionDates: {
+    id: 'exceptionDates',
+    defaultMessage:
+      'con alcune eccezioni. Per maggiori informazioni controllare la sezione dedicata.',
+  },
 });
 
 /**
@@ -36,18 +44,20 @@ const PageHeaderEventDates = ({ content, moment, rrule }) => {
 
   const actualEndDate = getRealEventEnd(content, rruleSet);
 
-  const wholeDay = content?.whole_day;
+  // const wholeDay = content?.whole_day;
   const openEnd = content?.open_end;
   // show only start when event starts and ends in same day or if a recurrence is set
   // because to set a recurrence, the event must have the same date as start and end date
   const renderOnlyStart =
     Moment(content.end).format('DD-MM-Y') ===
-      Moment(content.start).format('DD-MM-Y') && !content.recurrence;
+    Moment(content.start).format('DD-MM-Y');
+
   let eventRecurrenceText = null;
 
   if (content['@type'] === 'Event') {
     if (content.recurrence) {
       const isRecurrenceByDay = content.recurrence.includes('BYDAY=+');
+      const isRecurrenceByMonthDay = content.recurrence.includes('BYMONTHDAY=');
       const isWeekdaySunday = content.recurrence
         .split('BYDAY')[1]
         ?.includes('SU');
@@ -55,7 +65,10 @@ const PageHeaderEventDates = ({ content, moment, rrule }) => {
       const RRULE_LANGUAGE = rrulei18n(intl, Moment);
       eventRecurrenceText = rruleSet.rrules()[0]?.toText(
         (t) => {
-          if (Moment.locale(intl.locale) === 'it' && isRecurrenceByDay) {
+          if (
+            Moment.locale(intl.locale) === 'it' &&
+            (isRecurrenceByDay || isRecurrenceByMonthDay)
+          ) {
             RRULE_LANGUAGE.strings.th = '°';
             RRULE_LANGUAGE.strings.nd = '°';
             RRULE_LANGUAGE.strings.rd = '°';
@@ -77,13 +90,17 @@ const PageHeaderEventDates = ({ content, moment, rrule }) => {
   // format and save date into new variable depending on recurrence of event
   const endDate = Moment(actualEndDate).format('DD-MM-Y');
 
+  // check if there are exception dates added to the recurrence to add info
+  const { additionalDates, removedDates } =
+    getRecurrenceExceptionDates(rruleSet);
+
   return content['@type'] === 'Event' ? (
     <p className="h4 py-2">
-      {!Moment(content.end).isSame(actualEndDate) &&
+      {(content.recurrence || !renderOnlyStart) &&
         !openEnd &&
-        !renderOnlyStart &&
         `dal ${Moment(content.start).format('DD-MM-Y')} al ${endDate}`}
-      {(renderOnlyStart || Moment(content.end).isSame(actualEndDate)) &&
+      {!content.recurrence &&
+        renderOnlyStart &&
         !openEnd &&
         `${Moment(content.start).format('DD-MM-Y')}`}
       {openEnd &&
@@ -91,7 +108,12 @@ const PageHeaderEventDates = ({ content, moment, rrule }) => {
           dateStart: `${Moment(content.start).format('DD-MM-Y')}`,
         })}
       {eventRecurrenceText && (
-        <div className="recurrence small">{eventRecurrenceText}</div>
+        <div className="recurrence small">
+          <span>{eventRecurrenceText}</span>
+          {(additionalDates.length > 0 || removedDates.length > 0) && (
+            <span> {intl.formatMessage(messages.exceptionDates)}</span>
+          )}
+        </div>
       )}
     </p>
   ) : null;

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

@@ -36,7 +36,9 @@ export function getVocabulary({
   const vocabulary = getVocabName(vocabNameOrURL);
   const contextualVocabularies = config.settings.contextualVocabularies;
   const vocabPath =
-    contextualVocabularies && contextualVocabularies.includes(vocabulary) && vocabulary !== vocabNameOrURL
+    contextualVocabularies &&
+    contextualVocabularies.includes(vocabulary) &&
+    vocabulary !== vocabNameOrURL
       ? flattenToAppURL(vocabNameOrURL)
       : `/@vocabularies/${vocabulary}`;
   let queryString = `b_start=${start}${size ? '&b_size=' + size : ''}`;
@@ -74,7 +76,9 @@ export function getVocabularyTokenTitle({
   const vocabulary = getVocabName(vocabNameOrURL);
   const contextualVocabularies = config.settings.contextualVocabularies;
   const vocabPath =
-    contextualVocabularies && contextualVocabularies.includes(vocabulary) && vocabulary !== vocabNameOrURL
+    contextualVocabularies &&
+    contextualVocabularies.includes(vocabulary) &&
+    vocabulary !== vocabNameOrURL
       ? flattenToAppURL(vocabNameOrURL)
       : `/@vocabularies/${vocabulary}`;
   const queryString = {

package/src/customizations/volto/components/manage/Blocks/Search/SearchBlockView.jsx

@@ -4,7 +4,7 @@
     existing listing template styles
   - Inspired from
     https://github.com/plone/volto/commit/211d9bea13119cc430db9d53a4740a860781ca2e
-    the way to handle search sort
+    the way to handle search sort. If searchableText is setted, discard default sorting and uses plone's ranking only if is configured from sidebar. (Changed applyDefaults fn passing usePloneRanking)
 */
 
 import React from 'react';
@@ -52,7 +52,7 @@ const blockPropsAreChanged = (prevProps, nextProps) => {
   return isEqual(prev, next);
 };
 
-const applyDefaults = (data, root) => {
+const applyDefaults = (data, root, usePloneRanking) => {
   const defaultQuery = [
     {
       i: 'path',
@@ -65,19 +65,13 @@ const applyDefaults = (data, root) => {
     (item) => item['i'] === 'SearchableText',
   ).length;
 
-  const sort_on =
-    searchBySearchableText === 0
-      ? data?.sort_on
-        ? { sort_on: data.sort_on }
-        : { sort_on: 'effective' }
-      : undefined;
+  let sort_on = { sort_on: data?.sort_on ?? 'effective' };
+  let sort_order = { sort_order: data?.sort_order ?? 'descending' };
 
-  const sort_order =
-    searchBySearchableText === 0
-      ? data?.sort_order
-        ? { sort_order: data.sort_order }
-        : { sort_order: 'descending' }
-      : undefined;
+  if (usePloneRanking && searchBySearchableText > 0) {
+    sort_on = undefined;
+    sort_order = undefined;
+  }
 
   const result = {
     ...data,
@@ -115,7 +109,7 @@ const SearchBlockView = (props) => {
   }, [dataListingBodyVariation, mode]);
 
   const root = useSelector((state) => state.breadcrumbs.root);
-  const listingBodyData = applyDefaults(searchData, root);
+  const listingBodyData = applyDefaults(searchData, root, data.usePloneRanking);
   const { variations } = config.blocks.blocksConfig.listing;
   const listingBodyVariation = variations.find(({ id }) => id === selectedView);
   if (!Layout) return null;

package/src/customizations/volto/components/manage/Blocks/Search/schema.js

@@ -153,6 +153,15 @@ const messages = defineMessages({
     id: 'Link to',
     defaultMessage: 'Link to',
   },
+  usePloneRanking: {
+    id: "Usa l'ordinamento dei risultati di Plone",
+    defaultMessage: "Usa l'ordinamento dei risultati di Plone",
+  },
+  usePloneRankingDescription: {
+    id: "Usa l'ordinamento dei risultati di Plone - descrizione",
+    defaultMessage:
+      "Se impostato, nel momento in cui un utente effettua una ricerca testuale per parola chiave, non viene usato l'ordinamento di default impostato nella sezione 'Ricerca iniziale', ma l'ordinamento di Plone in base all'ordine di importanza dei risultati da esso stabilito.",
+  },
 });
 
 const enhanceSchema = (originalSchema, formData) => {
@@ -285,6 +294,7 @@ const SearchSchema = ({ data = {}, intl }) => {
           ...(data.showSearchInput ?? true ? ['showSearchButton'] : []),
           // ...(data.showSearchInput ? ['searchInputPrompt'] : []),
           // ...(data.showSearchButton ? ['searchButtonLabel'] : []),
+          'usePloneRanking',
           'showTotalResults',
         ],
       },
@@ -316,6 +326,12 @@ const SearchSchema = ({ data = {}, intl }) => {
         title: intl.formatMessage(messages.showTotalResults),
         default: true,
       },
+      usePloneRanking: {
+        type: 'boolean',
+        title: intl.formatMessage(messages.usePloneRanking),
+        description: intl.formatMessage(messages.usePloneRankingDescription),
+        default: false,
+      },
       searchButtonLabel: {
         title: intl.formatMessage(messages.searchButtonLabel),
         placeholder: intl.formatMessage(messages.searchButtonPlaceholder),

package/src/customizations/volto/components/manage/Widgets/RecurrenceWidget/RecurrenceWidget.jsx

@@ -409,8 +409,8 @@ class RecurrenceWidget extends Component {
                 formValues['freq'] = FREQUENCES.MONDAYFRIDAY;
               } else
                 formValues[option] = value.map((d) => {
-                  return this.getWeekday(d);
-                });
+                      return this.getWeekday(d);
+                    });
             }
             break;
           case 'bymonthday':
@@ -538,7 +538,7 @@ class RecurrenceWidget extends Component {
     }
     let exdates = Object.assign([], rruleSet.exdates());
     let rdates = Object.assign([], rruleSet.rdates());
-    if (field === 'dstart') dstart = value;
+    if (field === 'dtstart') dstart = value;
     else if (field === 'exdates') exdates = value;
     else if (field === 'rdates') rdates = value;
     else if (field === 'freq') {
@@ -990,6 +990,7 @@ class RecurrenceWidget extends Component {
                             )}
                             value={formValues.freq}
                             onChange={this.onChangeRule}
+                            noValueOption={false}
                           />
                           {OPTIONS.frequences[formValues.freq].interval && (
                             <IntervalField
@@ -1004,7 +1005,6 @@ class RecurrenceWidget extends Component {
                               onChange={this.onChangeRule}
                             />
                           )}
-
                           {/***** byday *****/}
                           {OPTIONS.frequences[formValues.freq].byday && (
                             <ByDayField
@@ -1013,7 +1013,6 @@ class RecurrenceWidget extends Component {
                               onChange={this.onChangeRule}
                             />
                           )}
-
                           {/***** bymonth *****/}
                           {OPTIONS.frequences[formValues.freq].bymonth && (
                             <ByMonthField
@@ -1027,7 +1026,6 @@ class RecurrenceWidget extends Component {
                               onChange={this.onChangeRule}
                             />
                           )}
-
                           {/***** byyear *****/}
                           {OPTIONS.frequences[formValues.freq].byyear && (
                             <ByYearField
@@ -1042,7 +1040,6 @@ class RecurrenceWidget extends Component {
                               onChange={this.onChangeRule}
                             />
                           )}
-
                           {/*-- ends after N recurrence or date --*/}
                           <EndField
                             value={formValues.recurrenceEnds}