design-comuni-plone-theme 11.25.4 → 11.26.1

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/files.js

@@ -119,12 +119,19 @@ export const FILE_EXTENSIONS = {
     icon: { lib: '', name: faFileOdp, svg_format: true },
     format_name: 'ODP',
   },
+  pdf: {
+    icon: { lib: 'far', name: 'file-pdf' },
+    format_name: 'PDF',
+  },
 };
 
 export const getFileViewFormat = (file) => {
-  const regexEx = /(?:\.([^.]+))?$/;
-  const fileExtension = regexEx.exec(file.filename)[1];
-  const typeOfContent = file['content-type'];
+  const cleanedFilename = (file.filename || '').split(/\/[@?#]/)[0];
+  const regexEx = /\.([a-zA-Z0-9]+)$/;
+
+  const match = regexEx.exec(cleanedFilename);
+  const fileExtension = match ? match[1] : null;
+  const typeOfContent = file['content-type'] ?? file['mime_type'];
 
   const viewFormat = {
     icon: null,

package/src/helpers/files.test.js

@@ -0,0 +1,90 @@
+import { getFileViewFormat, FILE_EXTENSIONS, FILE_FORMATS } from './files';
+
+describe('getFileViewFormat', () => {
+  test('should correctly extract the extension and match the icon for a valid PDF URL with multiple segments after the extension', () => {
+    const file = {
+      filename:
+        'https://example.com/amministrazione/documenti-e-dati/modulistica/area-servizi-educativi-e-scolastici/intestazione-ripartizione-rette/modulo_intestazione_ripartizione_rette_nona_784_9690.pdf/@@download/file_principale',
+      'content-type': 'application/pdf',
+    };
+
+    const result = getFileViewFormat(file);
+
+    expect(result.icon).toEqual(FILE_EXTENSIONS.pdf.icon); // Verifica che l'icona sia corretta
+    expect(result.label).toEqual(FILE_EXTENSIONS.pdf.format_name); // Verifica che il formato sia corretto
+  });
+
+  test('should correctly handle a PDF URL without multiple segments after the extension', () => {
+    const file = {
+      filename:
+        'https://example.com/amministrazione/documenti-e-dati/modulistica/area-servizi-educativi-e-scolastici/intestazione-ripartizione-rette/modulo_intestazione_ripartizione_rette_nona_784_9690.pdf/@@download/filehttps://example.com/amministrazione/documenti-e-dati/modulistica/area-servizi-educativi-e-scolastici/intestazione-ripartizione-rette/modulo_intestazione_ripartizione_rette_nona_784_9690.pdf',
+      'content-type': 'application/pdf',
+    };
+
+    const result = getFileViewFormat(file);
+
+    expect(result.icon).toEqual(FILE_EXTENSIONS.pdf.icon);
+    expect(result.label).toEqual(FILE_EXTENSIONS.pdf.format_name);
+  });
+
+  test('should return correct format for a non-PDF file extension', () => {
+    const file = {
+      filename: 'https://example.com/file/example.xsd',
+      'content-type': 'application/xml',
+    };
+
+    const result = getFileViewFormat(file);
+
+    expect(result.icon).toEqual(FILE_EXTENSIONS.xsd.icon);
+    expect(result.label).toEqual(FILE_EXTENSIONS.xsd.format_name);
+  });
+
+  test('should return correct format for a non-PDF content-type', () => {
+    const file = {
+      filename: 'https://example.com/file/example.xml',
+      'content-type': 'application/xml',
+    };
+
+    const result = getFileViewFormat(file);
+
+    expect(result.icon).toEqual(FILE_FORMATS['application/xml'].icon);
+    expect(result.label).toEqual(FILE_FORMATS['application/xml'].format_name);
+  });
+
+  test('should return null format when extension or content-type is not found', () => {
+    const file = {
+      filename: 'https://example.com/file/unknown.xyz',
+      'content-type': 'application/unknown',
+    };
+
+    const result = getFileViewFormat(file);
+
+    expect(result.icon).toBeNull();
+    expect(result.label).toBeNull();
+  });
+
+  test('should handle file URLs without an extension', () => {
+    const file = {
+      filename: 'https://example.com/file/no-extension/',
+      'content-type': 'text/plain',
+    };
+
+    const result = getFileViewFormat(file);
+
+    expect(result.icon).toEqual(FILE_FORMATS['text/plain'].icon);
+    expect(result.label).toEqual(FILE_FORMATS['text/plain'].format_name);
+  });
+
+  test('should handle case where URL is .pdf but content-type is text/plain', () => {
+    const file = {
+      filename: 'https://example.com/file/example.pdf',
+      'content-type': 'text/plain',
+    };
+
+    const result = getFileViewFormat(file);
+
+    // La funzione dovrebbe comunque dare priorità all'estensione ".pdf" rispetto al content-type "text/plain"
+    expect(result.icon).toEqual(FILE_EXTENSIONS.pdf.icon); // Verifica che l'icona PDF venga restituita
+    expect(result.label).toEqual(FILE_EXTENSIONS.pdf.format_name); // Verifica che il formato PDF venga restituito
+  });
+});

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;