Merge branch 'main' into new-folder-contents

RedTurtle · Jul 4, 2024 · 302f4ef · 302f4ef
2 parents a6c93a5 + f3d2e72
commit 302f4ef
Show file tree

Hide file tree

Showing 16 changed files with 142 additions and 221 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,50 @@
 
 
+## [11.14.0](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.13.0...v11.14.0) (2024-06-21)
+
+
+### Features
+
+* button block pos editor ([#704](https://github.com/RedTurtle/design-comuni-plone-theme/issues/704)) ([8cf55af](https://github.com/RedTurtle/design-comuni-plone-theme/commit/8cf55afe4d2864ec72a2eba166d9e838b2304899))
+
+
+### Bug Fixes
+
+* megamenu active item ([#703](https://github.com/RedTurtle/design-comuni-plone-theme/issues/703)) ([f6668ef](https://github.com/RedTurtle/design-comuni-plone-theme/commit/f6668ef7e7f6eaf624a3c3bd2eaf557d7f32ac14))
+* volto-form-block form result ([#700](https://github.com/RedTurtle/design-comuni-plone-theme/issues/700)) ([746502f](https://github.com/RedTurtle/design-comuni-plone-theme/commit/746502f827359205374d54eda99ac4efd47502ba))
+
+
+### Documentation
+
+* updated publiccode and release log ([309474a](https://github.com/RedTurtle/design-comuni-plone-theme/commit/309474adfde862d56c35c9b0832925cc157ecef0))
+
+## [11.13.0](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.12.9...v11.13.0) (2024-06-12)
+
+
+### Features
+
+* indicate le rassegne nei listing ([#689](https://github.com/RedTurtle/design-comuni-plone-theme/issues/689)) ([b934e89](https://github.com/RedTurtle/design-comuni-plone-theme/commit/b934e89cf6bab540c729960e1b73d9d4d9638170))
+* show more than one incarico in CT Persona ([#692](https://github.com/RedTurtle/design-comuni-plone-theme/issues/692)) ([34403db](https://github.com/RedTurtle/design-comuni-plone-theme/commit/34403dbddbc208e40a24c0681c31b17caa10768d))
+
+
+### Bug Fixes
+
+* added prefix condition to render solid icons ([#693](https://github.com/RedTurtle/design-comuni-plone-theme/issues/693)) ([145e914](https://github.com/RedTurtle/design-comuni-plone-theme/commit/145e914fad3d9091702530f1ac689d6ab51745ad))
+* better handle /diff route as non-content route because otherwise cms-ui styles are applied also on contents that starts with "diff" like "diffusione". ([#696](https://github.com/RedTurtle/design-comuni-plone-theme/issues/696)) ([027b569](https://github.com/RedTurtle/design-comuni-plone-theme/commit/027b569bdd1d1601d608f9d97904b1564c7c584e))
+* changed default filters in EventSearch DataFilter + query parameters ([#691](https://github.com/RedTurtle/design-comuni-plone-theme/issues/691)) ([6e36884](https://github.com/RedTurtle/design-comuni-plone-theme/commit/6e3688499943dee4d4ecc6ef2a1e4aeb79049727))
+* match path in search filters ([#694](https://github.com/RedTurtle/design-comuni-plone-theme/issues/694)) ([e17199b](https://github.com/RedTurtle/design-comuni-plone-theme/commit/e17199bd29d0854bab8afe5d86cf5227d741215f))
+
+
+### Maintenance
+
+* **perf:** updated dependencies ([5d46f09](https://github.com/RedTurtle/design-comuni-plone-theme/commit/5d46f0921b27f146b0abfe66f2c2e1522932c345))
+* removed unneccessary skiplink styles ([#695](https://github.com/RedTurtle/design-comuni-plone-theme/issues/695)) ([1727b1e](https://github.com/RedTurtle/design-comuni-plone-theme/commit/1727b1e0104a0e6b035d5813462a523c79bce872))
+
+
+### Documentation
+
+* updated publiccode and release log ([455df8d](https://github.com/RedTurtle/design-comuni-plone-theme/commit/455df8dd4ed17b9f9d4a20b96ae478a7d930c5f5))
+
 ## [11.12.9](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.12.8...v11.12.9) (2024-06-06)
 
 

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
@@ -45,6 +45,26 @@
 
 ### Migliorie
 
+- ...
+
+### Novità
+
+- Le informazioni sulla data di inizio e fine incarico sul CT persona vengono ora mostrate subito dopo l'incarico.
+
+### Fix
+
+- ...
+
+## Versione 11.14.0 (21/06/2024)
+
+### Migliorie
+
+- Il pulsante di aggiunta dei blocchi è stato spostato nella parte bassa del blocco (non si trova più alla sua sinistra), per migliorare l'usabilità della gestione dei blocchi anche su mobile/tablet.
+
+## Versione 11.13.0 (12/06/2024)
+
+### Migliorie
+
 - Nel CT Persona viene visualizzato anche il testo del campo "Importi di viaggio e/o servizi" impostato nel CT Incarico collegato e, se presente più di un Incarico collegato, vengono mostrati i link a ciascun Incarico nella sezione "Altri incarichi".
 
 ### Novità

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.12.9",
+  "version": "11.14.0",
   "main": "src/index.js",
   "repository": {
     "type": "git",
@@ -153,7 +153,7 @@
     "volto-dropdownmenu": "4.1.3",
     "volto-editablefooter": "5.1.6",
     "volto-feedback": "0.3.2",
-    "volto-form-block": "3.8.5",
+    "volto-form-block": "3.8.6",
     "volto-gdpr-privacy": "2.2.6",
     "volto-google-analytics": "2.0.0",
     "volto-multilingual-widget": "3.2.1",
@@ -200,7 +200,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-06'
+releaseDate: '2024-06-21'
 softwareType: standalone/web
-softwareVersion: 11.12.9
+softwareVersion: 11.14.0
 url: 'https://github.com/italia/design-comuni-plone-theme'
 usedBy:
   - ASP Comuni Modenesi Area Nord

diff --git a/src/components/ItaliaTheme/MegaMenu/MegaMenu.jsx b/src/components/ItaliaTheme/MegaMenu/MegaMenu.jsx
@@ -66,7 +66,10 @@ const isActive = (item, pathname) => {
   );
 };
 
-const isChildActive = (itemUrl, pathname) => {
+const isChildActive = (itemUrl, pathname, exact = false) => {
+  if (exact) {
+    return itemUrl === pathname;
+  }
   return pathname.indexOf(itemUrl) > -1;
 };
 
@@ -328,6 +331,7 @@ const MegaMenu = ({ item, pathname }) => {
                                     active: isChildActive(
                                       flattenToAppURL(child['@id']),
                                       pathname,
+                                      true,
                                     ),
                                   })}
                                   role="menuitem"

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/config/italiaConfig.js b/src/config/italiaConfig.js
@@ -84,7 +84,7 @@ export default function applyConfig(voltoConfig) {
    * SETTINGS
    ******************************************************************************/
   const voltoSentryOptions = voltoConfig.settings.sentryOptions;
-
+  config.experimental.addBlockButton.enabled = true; //per spostare il bottone di aggiunta dei blocchi in basso, e fare in modo che i bottoni di edit dei blocchi siano usabili anche da tablet/mobile
   config.settings = {
     ...config.settings,
     openExternalLinkInNewTab: true,