design-comuni-plone-theme 11.26.0 → 11.26.2

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 
 
+## [11.26.2](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.26.1...v11.26.2) (2024-12-27)
+
+
+### Bug Fixes
+
+* theme build bug due to print styles desync ([2aacb6a](https://github.com/RedTurtle/design-comuni-plone-theme/commit/2aacb6a78d6d4c93ef24a4d3b89ff6b587baa698))
+
+
+### Documentation
+
+* updated publiccode ([ba2e5c8](https://github.com/RedTurtle/design-comuni-plone-theme/commit/ba2e5c85bfbc0de260a0d0dc8839b2286500656d))
+
+## [11.26.1](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.26.0...v11.26.1) (2024-12-27)
+
+
+### Bug Fixes
+
+* getFileViewFormat regex inconsistencies with different filenames that included @@download/**, added anti-regression tests ([#847](https://github.com/RedTurtle/design-comuni-plone-theme/issues/847)) ([ea9f76d](https://github.com/RedTurtle/design-comuni-plone-theme/commit/ea9f76df28c82155c4a0dc965b1cdeba4d5fab55))
+
+
+### Documentation
+
+* updated publiccode and release log ([575ad56](https://github.com/RedTurtle/design-comuni-plone-theme/commit/575ad563ff8781d5dd0483c70f1664ba6a46134a))
+
 ## [11.26.0](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.25.4...v11.26.0) (2024-12-20)
 
 

package/RELEASE.md

@@ -41,6 +41,12 @@
 - ...
  -->
 
+## Versione 11.26.1 (27/12/2024)
+
+### Fix
+
+- Risolto un problema riguardante la visualizzazione delle estensioni dei file quando si utilizza un link ad un documento nei blocchi di testo.
+
 ## Versione 11.26.0 (20/12/2024)
 
 ### Migliorie

package/package.json

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

package/publiccode.yml

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

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/theme/ItaliaTheme/Print/_blocks.scss

@@ -187,6 +187,16 @@
     }
   }
 
+  .block.image-text-block {
+    .image-text-card-wrapper {
+      page-break-inside: avoid;
+
+      h2 {
+        page-break-after: avoid;
+      }
+    }
+  }
+
   .block.accordion {
     .public-ui {
       width: 100%;
@@ -219,6 +229,7 @@
         }
       }
     }
+  }
 
   .block.numbersBlock {
     color: #000;
@@ -344,6 +355,7 @@
     }
   }
 
+  // listing variations
   div.block.listing {
     page-break-inside: avoid;