design-comuni-plone-theme 11.25.3 → 11.26.0

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}

package/src/customizations/volto-form-block/components/View.jsx

@@ -1,5 +1,6 @@
 // CUSTOMIZATION:
 // - added warning state to form
+// - backport for https://github.com/collective/volto-form-block/pull/122
 
 import React, { useState, useEffect, useReducer, useRef } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
@@ -8,7 +9,6 @@ import { useIntl, defineMessages } from 'react-intl';
 import { submitForm, resetOTP } from 'volto-form-block/actions';
 import { getFieldName } from 'volto-form-block/components/utils';
 import FormView from 'volto-form-block/components/FormView';
-import { formatDate } from '@plone/volto/helpers/Utils/Date';
 import config from '@plone/volto/registry';
 import { Captcha } from 'volto-form-block/components/Widget';
 import { isValidEmail } from 'volto-form-block/helpers/validators';
@@ -260,20 +260,21 @@ const View = ({ data, id, path }) => {
                 config.blocks.blocksConfig.form.attachment_fields.includes(
                   subblock.field_type,
                 );
-              const isDate = subblock.field_type === 'date';
+              // const isDate = subblock.field_type === 'date';
 
               if (isAttachment) {
                 attachments[name] = formattedFormData[name].value;
                 delete formattedFormData[name];
               }
 
-              if (isDate) {
-                formattedFormData[name].value = formatDate({
-                  date: formattedFormData[name].value,
-                  format: 'DD-MM-YYYY',
-                  locale: intl.locale,
-                });
-              }
+              // XXX: dates should be sent as ISO format, not DD-MM-YYYY !
+              // if (isDate) {
+              //   formattedFormData[name].value = formatDate({
+              //     date: formattedFormData[name].value,
+              //     format: 'DD-MM-YYYY',
+              //     locale: intl.locale,
+              //   });
+              // }
             }
           });
           dispatch(
@@ -323,7 +324,7 @@ const View = ({ data, id, path }) => {
 
   useEffect(() => {
     if (submitResults?.loaded) {
-      if (submitResults?.result?.data?.waiting_list) {
+      if (submitResults?.result?.waiting_list) {
         setFormState({
           type: FORM_STATES.warning,
           result: {

package/src/helpers/dates.js

@@ -48,8 +48,28 @@ export const getRealStartAndEndWithRecurrence = (
 
 export const getRealEventEnd = (content, rruleSet) => {
   let actualEndDate = content.end;
-  if (content.recurrence) {
+
+  if (content.recurrence && rruleSet.rrules()[0].options.until) {
     actualEndDate = rruleSet.rrules()[0].options.until;
   }
   return actualEndDate;
 };
+
+export const getRecurrenceExceptionDates = (rruleSet) => {
+  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 exceptionDates = {
+    additionalDates: additionalDates,
+    removedDates: exdates,
+  };
+
+  return exceptionDates;
+};

package/src/helpers/index.js

@@ -22,6 +22,7 @@ export {
   viewDate,
   getRealStartAndEndWithRecurrence,
   getRealEventEnd,
+  getRecurrenceExceptionDates,
 } from 'design-comuni-plone-theme/helpers/dates';
 export { getSiteProperty } from 'design-comuni-plone-theme/helpers/config';
 export { useDebouncedEffect } from 'design-comuni-plone-theme/helpers/debounce';

package/src/theme/ItaliaTheme/Blocks/_contacts.scss

@@ -112,6 +112,8 @@
     }
 
     .contact-title {
+
+      margin-bottom: 1rem;
       font-size: 1.35rem;
       font-weight: bold;
       line-height: 1.4em;
@@ -123,20 +125,11 @@
 
     .contact-info {
       display: flex;
-
-      &:first-of-type {
-        align-items: center;
-
-        .icon-wrapper {
-          margin-top: 0;
-        }
-      }
-
-      &:not(:last-of-type) {
-        margin-bottom: 1rem;
-      }
+      align-items: center;
 
       .icon-wrapper {
+        display: flex;
+        align-items: center;
         margin-top: 0.2rem;
         margin-right: 1rem;
       }

package/src/theme/ItaliaTheme/Print/_all_pages.scss

@@ -1,13 +1,26 @@
 @media print {
+  @page {
+    margin: 0 !important;
+  }
+
   body {
     display: block !important;
   }
 
   .public-ui {
-    // removed underlining from links
     a {
       font-weight: 600 !important;
-      text-decoration: none !important;
+      // text-decoration: none !important;
+      /* i link che non devono essere sottolineati hanno già regole specifiche,
+          a video è necessario mostare che i tag a sono link */
+
+      &.read-more {
+        display: none !important; // omesso il read more nelle card
+      }
+    }
+
+    .text-secondary {
+      color: $body-color !important;
     }
 
     .content-area,
@@ -17,6 +30,24 @@
       page-break-inside: avoid;
     }
 
+    .container {
+      max-width: 98%;
+    }
+
+    // padding/margin
+    .py-5 {
+      padding-top: 20px !important;
+      padding-bottom: 20px !important;
+    }
+
+    .pb-5 {
+      padding-bottom: 20px !important;
+    }
+
+    .pt-5 {
+      padding-top: 20px !important;
+    }
+
     // removed part of header header
     .it-header-slim-wrapper {
       display: none;
@@ -41,10 +72,8 @@
             }
 
             .it-brand-text {
-              .no_toc {
-                color: $link-color;
-                font-size: 2rem !important;
-              }
+              color: $link-color;
+              font-size: 2rem !important;
             }
           }
         }
@@ -76,6 +105,10 @@
       }
     }
 
+    .section {
+      padding: 1.2rem;
+    }
+
     /* Removed shadow and card's padding. Add border*/
     .card {
       border: 1px solid $gray-border !important;
@@ -89,15 +122,34 @@
         border: none !important;
         border-left-width: 0 !important;
       }
+
+      &::after {
+        display: none;
+      }
+
+      &.card-bg {
+        background-color: white !important;
+        color: $body-color !important;
+      }
     }
 
-    //card teaser 3
+    // Card teaser
     .card-wrapper.card-teaser-wrapper.card-teaser-block-3 {
       > .card-teaser {
-        flex: 0 0 32%;
+        flex: 0 0 32.5%;
       }
     }
 
+    .card.card-teaser.simple-card-default-item .card-body .card-title a,
+    .card.card-teaser .card-body .card-title a,
+    .card .card-title a {
+      font-size: 1.1rem !important;
+    }
+
+    .card .card-body .category-top {
+      flex-wrap: wrap;
+    }
+
     #text-tempi_e_scadenze > div > p {
       padding: 1rem 0 0 0 !important;
       box-shadow: none !important;
@@ -155,7 +207,7 @@
       .it-page-sections-container {
         border-top: none;
 
-        .it-carousel-wrapper {
+        .it-carousel-wrapper:not(#galleria) {
           display: none;
         }
 
@@ -223,18 +275,49 @@
       box-shadow: none;
       font-size: 1rem;
     }
+
+    .callout {
+      page-break-inside: avoid;
+
+      .callout-inner {
+        // padding-top: 0px;
+        p {
+          margin-top: -2rem;
+        }
+      }
+    }
+    // buttons
+    button.btn,
+    .btn.btn-primary,
+    .draftjs-buttons a {
+      padding: 0.5rem 1rem;
+      border: 1px solid $link-color;
+      background-color: white;
+      color: $link-color;
+
+      svg.icon {
+        color: $link-color;
+        fill: $link-color;
+      }
+    }
+
+    // blockquote text
+    blockquote.blockquote-card.dark,
+    .blockquote.blockquote-card.dark {
+      border: 1px solid $body-color;
+      background-color: white;
+      color: $body-color;
+
+      a:not(.btn) {
+        color: $body-color;
+      }
+    }
   }
 
   .draft-text-larger {
     font-size: 1.2rem;
   }
 
-  .public-ui .draftjs-buttons a {
-    padding: 0rem;
-    background-color: white;
-    color: $link-color;
-  }
-
   //external link icon
   svg.external-link {
     display: none;