Merge branch 'main' into us_53620_v3_richiesta_prenotazioni_mediateca

RedTurtle · Jul 8, 2024 · c0ad7ad · c0ad7ad
2 parents 010f2c0 + c69efe1
commit c0ad7ad
Show file tree

Hide file tree

Showing 12 changed files with 103 additions and 74 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -31,7 +31,7 @@ jobs:
           build-args: |
             ADDON_NAME=design-comuni-plone-theme
             ADDON_PATH=design-comuni-plone-theme
-            VOLTO_VERSION=17.7.0
+            VOLTO_VERSION=17.18.1
 
       - name: Deploy to rancher
         uses: redturtle/[email protected]

diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
@@ -31,7 +31,7 @@ jobs:
           build-args: |
             ADDON_NAME=design-comuni-plone-theme
             ADDON_PATH=design-comuni-plone-theme
-            VOLTO_VERSION=17.7.0
+            VOLTO_VERSION=17.18.1
 
       - name: Deploy to rancher
         uses: redturtle/[email protected]

diff --git a/.github/workflows/prs.yml b/.github/workflows/prs.yml
@@ -34,4 +34,4 @@ jobs:
           build-args: |
             ADDON_NAME=design-comuni-plone-theme
             ADDON_PATH=design-comuni-plone-theme
-            VOLTO_VERSION=17.7.0
+            VOLTO_VERSION=17.18.1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -35,4 +35,4 @@ jobs:
           build-args: |
             ADDON_NAME=design-comuni-plone-theme
             ADDON_PATH=design-comuni-plone-theme
-            VOLTO_VERSION=17.7.0
+            VOLTO_VERSION=17.18.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,24 @@
 
 
+## [11.15.0](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.14.0...v11.15.0) (2024-07-05)
+
+
+### Features
+
+* moved start and end date of incarico after incarico name ([#715](https://github.com/RedTurtle/design-comuni-plone-theme/issues/715)) ([c07c1ea](https://github.com/RedTurtle/design-comuni-plone-theme/commit/c07c1ea41b3534ad0c05ba2b9990c7b1c8f226ff))
+* update to volto 17.18.1 ([8896926](https://github.com/RedTurtle/design-comuni-plone-theme/commit/889692614b5728bd812754dea9191c5bcb127a0a))
+
+
+### Bug Fixes
+
+* updated form validation customization ([f3d2e72](https://github.com/RedTurtle/design-comuni-plone-theme/commit/f3d2e72b47c8ce33326d0b4b5ca87daf9e874668))
+* upgrade dependencies ([4ea3806](https://github.com/RedTurtle/design-comuni-plone-theme/commit/4ea38067018f2bbd35566b4d70ed87e9362988ef))
+
+
+### Documentation
+
+* updated publiccode and release log ([91a58b6](https://github.com/RedTurtle/design-comuni-plone-theme/commit/91a58b6f124da03e10437c0ee4f48b9545d51ddf))
+
 ## [11.14.0](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.13.0...v11.14.0) (2024-06-21)
 
 

diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ CURRENT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 # ADDON ?= "design-comuni-plone-theme"
 
 PLONE_VERSION=6
-VOLTO_VERSION=17.7.0
+VOLTO_VERSION=17.18.1
 
 ADDON_NAME='design-comuni-plone-theme'
 ADDON_PATH='design-comuni-plone-theme'

diff --git a/RELEASE.md b/RELEASE.md
@@ -55,6 +55,12 @@
 
 - ...
 
+## Versione 11.15.0 (05/07/2024)
+
+### Novità
+
+- Le informazioni sulla data di inizio e fine incarico sul CT persona vengono ora mostrate subito dopo l'incarico.
+
 ## Versione 11.14.0 (21/06/2024)
 
 ### Migliorie

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "design-comuni-plone-theme",
   "description": "Volto Theme for Italia design guidelines",
   "license": "GPL-v3",
-  "version": "11.14.0",
+  "version": "11.15.0",
   "main": "src/index.js",
   "repository": {
     "type": "git",
@@ -149,10 +149,10 @@
     "volto-blocks-widget": "3.4.1",
     "volto-data-grid-widget": "2.3.1",
     "volto-dropdownmenu": "4.1.3",
-    "volto-editablefooter": "5.1.6",
+    "volto-editablefooter": "5.1.7",
     "volto-feedback": "0.3.2",
-    "volto-form-block": "3.8.6",
-    "volto-gdpr-privacy": "2.2.6",
+    "volto-form-block": "3.8.7",
+    "volto-gdpr-privacy": "2.2.7",
     "volto-google-analytics": "2.0.0",
     "volto-multilingual-widget": "3.2.1",
     "volto-querywidget-with-browser": "0.4.2",
@@ -198,7 +198,7 @@
     "stylelint-prettier": "4.0.2"
   },
   "peerDependencies": {
-    "@plone/volto": "17.7.0"
+    "@plone/volto": "17.18.1"
   },
   "packageManager": "[email protected]"
 }
diff --git a/publiccode.yml b/publiccode.yml
@@ -227,9 +227,9 @@ maintenance:
 name: io-Comune - Il sito AgID per Comuni ed Enti Pubblici
 platforms:
   - web
-releaseDate: '2024-06-21'
+releaseDate: '2024-07-05'
 softwareType: standalone/web
-softwareVersion: 11.14.0
+softwareVersion: 11.15.0
 url: 'https://github.com/italia/design-comuni-plone-theme'
 usedBy:
   - ASP Comuni Modenesi Area Nord

diff --git a/src/components/ItaliaTheme/View/PersonaView/PersonaRuolo.jsx b/src/components/ItaliaTheme/View/PersonaView/PersonaRuolo.jsx
@@ -90,7 +90,10 @@ const PersonaRuolo = ({ content }) => {
             tag_id="incarico"
             title={intl.formatMessage(messages.ruolo)}
           >
-            <div className="font-serif" key={content?.incarichi_persona[0]?.id}>
+            <div
+              className="font-serif mb-3"
+              key={content?.incarichi_persona[0]?.id}
+            >
               <p>{content?.incarichi_persona[0]?.title}</p>
               {content?.incarichi_persona[0]?.atto_di_nomina && (
                 <UniversalLink
@@ -100,6 +103,51 @@ const PersonaRuolo = ({ content }) => {
                 </UniversalLink>
               )}
             </div>
+
+            {content.incarichi_persona[0].data_inizio_incarico && (
+              <RichTextSection
+                tag_id="data_inizio_incarico"
+                title={intl.formatMessage(messages.data_inizio_incarico)}
+              >
+                <div className="font-serif">
+                  {viewDate(
+                    intl.locale,
+                    content.incarichi_persona[0].data_inizio_incarico,
+                    'DD MMMM Y',
+                  )}
+                </div>
+              </RichTextSection>
+            )}
+            {content.incarichi_persona[0].data_conclusione_incarico && (
+              <RichTextSection
+                tag_id="data_conclusione_incarico"
+                title={intl.formatMessage(messages.data_conclusione_incarico, {
+                  incarico: content.incarichi_persona[0].title,
+                })}
+              >
+                <div className="font-serif">
+                  {viewDate(
+                    intl.locale,
+                    content.incarichi_persona[0].data_conclusione_incarico,
+                    'DD MMMM Y',
+                  )}
+                </div>
+              </RichTextSection>
+            )}
+            {content.incarichi_persona[0].data_insediamento && (
+              <RichTextSection
+                tag_id="data_insediamento"
+                title={intl.formatMessage(messages.data_insediamento)}
+              >
+                <div className="font-serif">
+                  {viewDate(
+                    intl.locale,
+                    content.incarichi_persona[0].data_insediamento,
+                    'DD MMMM Y',
+                  )}
+                </div>
+              </RichTextSection>
+            )}
           </RichTextSection>
           {content.incarichi_persona[0]?.tipologia_incarico?.title && (
             <RichTextSection
@@ -191,50 +239,6 @@ const PersonaRuolo = ({ content }) => {
               )}
             </RichTextSection>
           )}
-          {content.incarichi_persona[0].data_insediamento && (
-            <RichTextSection
-              tag_id="data_insediamento"
-              title={intl.formatMessage(messages.data_insediamento)}
-            >
-              <div className="font-serif">
-                {viewDate(
-                  intl.locale,
-                  content.incarichi_persona[0].data_insediamento,
-                  'DD MMMM Y',
-                )}
-              </div>
-            </RichTextSection>
-          )}
-          {content.incarichi_persona[0].data_inizio_incarico && (
-            <RichTextSection
-              tag_id="data_inizio_incarico"
-              title={intl.formatMessage(messages.data_inizio_incarico)}
-            >
-              <div className="font-serif">
-                {viewDate(
-                  intl.locale,
-                  content.incarichi_persona[0].data_inizio_incarico,
-                  'DD MMMM Y',
-                )}
-              </div>
-            </RichTextSection>
-          )}
-          {content.incarichi_persona[0].data_conclusione_incarico && (
-            <RichTextSection
-              tag_id="data_conclusione_incarico"
-              title={intl.formatMessage(messages.data_conclusione_incarico, {
-                incarico: content.incarichi_persona[0].title,
-              })}
-            >
-              <div className="font-serif">
-                {viewDate(
-                  intl.locale,
-                  content.incarichi_persona[0].data_conclusione_incarico,
-                  'DD MMMM Y',
-                )}
-              </div>
-            </RichTextSection>
-          )}
         </>
       )}
 

diff --git a/src/customizations/volto/helpers/FormValidation/FormValidation.js b/src/customizations/volto/helpers/FormValidation/FormValidation.js
@@ -188,7 +188,7 @@ const widgetValidation = {
  * The string that comes my not be a valid JSON
  * @param {string} requestItem
  */
-const tryParseJSON = (requestItem) => {
+export const tryParseJSON = (requestItem) => {
   let resultObj = null;
   try {
     resultObj = JSON.parse(requestItem);

diff --git a/yarn.lock b/yarn.lock
@@ -8214,10 +8214,10 @@ __metadata:
     volto-blocks-widget: 3.4.1
     volto-data-grid-widget: 2.3.1
     volto-dropdownmenu: 4.1.3
-    volto-editablefooter: 5.1.6
+    volto-editablefooter: 5.1.7
     volto-feedback: 0.3.2
-    volto-form-block: 3.8.6
-    volto-gdpr-privacy: 2.2.6
+    volto-form-block: 3.8.7
+    volto-gdpr-privacy: 2.2.7
     volto-google-analytics: 2.0.0
     volto-multilingual-widget: 3.2.1
     volto-querywidget-with-browser: 0.4.2
@@ -8231,7 +8231,7 @@ __metadata:
     volto-venue: 4.1.0
     webpack-image-resize-loader: ^5.0.0
   peerDependencies:
-    "@plone/volto": 17.7.0
+    "@plone/volto": 17.18.1
   languageName: unknown
   linkType: soft
 
@@ -16104,15 +16104,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"volto-editablefooter@npm:5.1.6":
-  version: 5.1.6
-  resolution: "volto-editablefooter@npm:5.1.6"
+"volto-editablefooter@npm:5.1.7":
+  version: 5.1.7
+  resolution: "volto-editablefooter@npm:5.1.7"
   dependencies:
     react-outside-click-handler: 1.3.0
   peerDependencies:
     "@plone/volto": ">=16.0.0-alpha.38"
     volto-blocks-widget: ">=3.4.0"
-  checksum: 0e479d49c417e4eac3d15d49752bab794647b24b7eb800dbfd841d351a681d34b1353a03a2c681c53c8be4cc4336b14b07a1320d4bae29ee2112402ce90edac4
+  checksum: ad5642959ba751a6a805bff372d29fd228abf210e744f6cc5d3cc0e5c9b00570fde9c3b151057924e91156ef1f9d26e0703b533e05d7011ce215eb841e300b2b
   languageName: node
   linkType: hard
 
@@ -16128,9 +16128,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"volto-form-block@npm:3.8.6":
-  version: 3.8.6
-  resolution: "volto-form-block@npm:3.8.6"
+"volto-form-block@npm:3.8.7":
+  version: 3.8.7
+  resolution: "volto-form-block@npm:3.8.7"
   dependencies:
     "@hcaptcha/react-hcaptcha": ^0.3.6
     file-saver: ^2.0.5
@@ -16139,19 +16139,19 @@ __metadata:
   peerDependencies:
     "@plone/volto": ">=16.0.0-alpha.38"
     volto-subblocks: ^2.1.0
-  checksum: b038d1b89ea93da7780a0ff20b6a34a3386ecd86a77fe049c3a2dbab593a7560b4f60b4c22e9bed52253bbd76c3313f05fdba1401aa7353773902e5ed729d133
+  checksum: 8c014bdf2dc8774d7298466e9f7941df72be19172562dfdffefa125d85d802af5ff97d6764bdf8e5fa6aa07c29dd2e9634a104f9e1abaef562c4be647c680fd5
   languageName: node
   linkType: hard
 
-"volto-gdpr-privacy@npm:2.2.6":
-  version: 2.2.6
-  resolution: "volto-gdpr-privacy@npm:2.2.6"
+"volto-gdpr-privacy@npm:2.2.7":
+  version: 2.2.7
+  resolution: "volto-gdpr-privacy@npm:2.2.7"
   dependencies:
     react-focus-lock: 2.9.4
     volto-multilingual-widget: 3.2.1
   peerDependencies:
     "@plone/volto": ">=16.0.0-alpha.38"
-  checksum: 604badfe7225ccc6783c05bada9fb03c07a66e673de6ca8bb681b9aedb48c2dd25213001f60a31e288811686dd41e28c0d38d95c8793df0b56ce5abe3b022087
+  checksum: beb301d21ff8f831fd1c1b924830e2b23fea91050f139d0211c2f91a009e81ac336334df77a636245cb50c199fba8d88ba9742048c81befad20ef7c9d995b1b0
   languageName: node
   linkType: hard