design-comuni-plone-theme 8.2.0 → 8.3.0

package/.github/workflows/develop.yml

@@ -31,7 +31,7 @@ jobs:
           build-args: |
             ADDON_NAME=design-comuni-plone-theme
             ADDON_PATH=design-comuni-plone-theme
-            VOLTO_VERSION=17.0.0-alpha.17
+            VOLTO_VERSION=17.0.0-alpha.19
 
       - name: Deploy to rancher
         uses: redturtle/rancher-deploy-action@v0.2.0

package/.github/workflows/main.yml

@@ -35,4 +35,4 @@ jobs:
           build-args: |
             ADDON_NAME=design-comuni-plone-theme
             ADDON_PATH=design-comuni-plone-theme
-            VOLTO_VERSION=17.0.0-alpha.17
+            VOLTO_VERSION=17.0.0-alpha.19

package/.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.0.0-alpha.17
+            VOLTO_VERSION=17.0.0-alpha.19

package/CHANGELOG.md

@@ -1,5 +1,40 @@
 
 
+## [8.3.0](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v8.2.1...v8.3.0) (2023-08-04)
+
+
+### Features
+
+* coherent description in card persona everywhere ([#273](https://github.com/RedTurtle/design-comuni-plone-theme/issues/273)) ([137fdd5](https://github.com/RedTurtle/design-comuni-plone-theme/commit/137fdd5a17d36ccb67c736467761d645f446d116))
+* rimosso link a form contatto, aggiunto link a motore di ricerca del sito ([#269](https://github.com/RedTurtle/design-comuni-plone-theme/issues/269)) ([6793855](https://github.com/RedTurtle/design-comuni-plone-theme/commit/67938552ba8829c383757d8415c24861ce729b88))
+* upgrade to volto alpha.19 ([02e3096](https://github.com/RedTurtle/design-comuni-plone-theme/commit/02e3096c61331cb5137003c2782fa07aaed23c32))
+
+
+### Bug Fixes
+
+* equal height for card persona in uo people ([#276](https://github.com/RedTurtle/design-comuni-plone-theme/issues/276)) ([3a5e8d1](https://github.com/RedTurtle/design-comuni-plone-theme/commit/3a5e8d1672b5700e3d1097f43588ecff86efaff1))
+* height of accessibility icon for external links ([#268](https://github.com/RedTurtle/design-comuni-plone-theme/issues/268)) ([8714eb2](https://github.com/RedTurtle/design-comuni-plone-theme/commit/8714eb29ad7a05b6f40058dfdf315e046dff00ef))
+* optional chaining for pdc data in OfficeCard ([#274](https://github.com/RedTurtle/design-comuni-plone-theme/issues/274)) ([88ec896](https://github.com/RedTurtle/design-comuni-plone-theme/commit/88ec896ae9cbbc357ccb8d7a69977562aef3ab1a))
+* z-index moved to a generic block ([#265](https://github.com/RedTurtle/design-comuni-plone-theme/issues/265)) ([c0d729c](https://github.com/RedTurtle/design-comuni-plone-theme/commit/c0d729ceaf50021f5752bfbb961124c3e03e7133))
+
+
+### Documentation
+
+* updated publiccode ([6329a9b](https://github.com/RedTurtle/design-comuni-plone-theme/commit/6329a9b3f47cc43d4958155db52529ce25f16807))
+
+## [8.2.1](https://github.com/redturtle/design-comuni-plone-theme/compare/v8.2.0...v8.2.1) (2023-07-27)
+
+
+### Bug Fixes
+
+* fix LinkEntity error on create link in WysWidget and in edit ([ce16c45](https://github.com/redturtle/design-comuni-plone-theme/commit/ce16c45f0894ce1853f0185c859f85d82ec2d847))
+
+
+### Documentation
+
+* updated publiccode ([d6affcf](https://github.com/redturtle/design-comuni-plone-theme/commit/d6affcf7f1241c4d338e40907747f93c57716343))
+* updated publiccode ([12ce260](https://github.com/redturtle/design-comuni-plone-theme/commit/12ce2605354b0a380ce83d0285e33e1b75bdb5a8))
+
 ## [8.2.0](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v8.1.0...v8.2.0) (2023-07-26)
 
 

package/Makefile

@@ -27,7 +27,7 @@ CURRENT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 # ADDON ?= "design-comuni-plone-theme"
 
 PLONE_VERSION=6
-VOLTO_VERSION=17.0.0-alpha.17
+VOLTO_VERSION=17.0.0-alpha.19
 
 ADDON_NAME='design-comuni-plone-theme'
 ADDON_PATH='design-comuni-plone-theme'

package/README.md

@@ -74,6 +74,7 @@ Si veda ad esempio:
 - [Comune di Canossa](https://www.comune.canossa.re.it/)
 - [Comune di Cantagallo](https://www.comune.cantagallo.po.it/)
 - [Comune di Cavriago](https://www.comune.cavriago.re.it/)
+- [Comune di Gattatico](https://www.comune.gattatico.re.it/)
 - [Comune di Imola](https://www.comune.imola.bo.it)
 - [Comune di Medolla](https://www.comune.medolla.mo.it/)
 - [Comune di Mirandola](https://www.comune.mirandola.mo.it/)

package/package.json

@@ -2,7 +2,7 @@
   "name": "design-comuni-plone-theme",
   "description": "Volto Theme for Italia design guidelines",
   "license": "GPL-v3",
-  "version": "8.2.0",
+  "version": "8.3.0",
   "main": "src/index.js",
   "keywords": [
     "volto-addon",

package/publiccode.yml

@@ -227,9 +227,9 @@ maintenance:
 name: io-Comune - Il sito AgID per Comuni ed Enti Pubblici
 platforms:
   - web
-releaseDate: '2023-07-20'
+releaseDate: '2023-08-04'
 softwareType: standalone/web
-softwareVersion: 8.0.4
+softwareVersion: 8.3.0
 url: 'https://github.com/italia/design-comuni-plone-theme'
 usedBy:
   - ASP Comuni Modenesi Area Nord
@@ -247,6 +247,7 @@ usedBy:
   - Comune di Camposanto
   - Comune di Cantagallo
   - Comune di Cavriago
+  - Comune di Gattatico
   - Comune di Imola
   - Comune di Medolla
   - Comune di Mirandola

package/src/components/ItaliaTheme/Blocks/Listing/CardWithImageTemplate.jsx

@@ -107,7 +107,7 @@ const CardWithImageTemplate = (props) => {
                     className="listing-item card-bg shadow-sm"
                     showImage={showImage}
                     natural_image_size={natural_image_size}
-                    listingText={listingText}
+                    show_description={show_description}
                     icon={icon}
                     type={category}
                     isEditMode={isEditMode}

package/src/components/ItaliaTheme/Blocks/Listing/InEvidenceTemplate.jsx

@@ -92,7 +92,7 @@ const InEvidenceTemplate = (props) => {
                 item={item}
                 className="listing-item card-bg"
                 showImage={image ? true : false}
-                listingText={listingText}
+                show_description={show_description}
                 icon={icon}
                 isEditMode={isEditMode}
                 key={index}

package/src/components/ItaliaTheme/Cards/CardPersona.jsx

@@ -15,7 +15,7 @@ export const CardPersona = ({
   titleClassName = '',
   titleTagName = 'h3',
   showImage,
-  listingText,
+  show_description = true,
   icon,
   type,
   isEditMode,
@@ -53,7 +53,9 @@ export const CardPersona = ({
               {item.title || item.id}
             </UniversalLink>
           </CardTitle>
-          {listingText && <CardText>{listingText}</CardText>}
+          {show_description && (
+            <CardText>{item.incarichi || item.description}</CardText>
+          )}
         </CardBody>
         {showImage && (
           <div className="card-image card-image-rounded">{image}</div>

package/src/components/ItaliaTheme/Cards/CardPersona.test.jsx

@@ -21,6 +21,7 @@ it('renders the title correctly', () => {
           item={{
             '@id': 'http://localhost:3000/persona',
             title: 'Mario Rossi',
+            description: '',
             id: 'persona',
           }}
         />

package/src/components/ItaliaTheme/View/Commons/OfficeCard.jsx

@@ -78,8 +78,8 @@ const OfficeCard = ({
                       {sede.zip_code} {sede.city}
                     </p>
                   )}
-                  {office_fo.contact_info?.map((el) =>
-                    el.value_punto_contatto?.map((pdc, i) => {
+                  {office_fo?.contact_info?.map((el) =>
+                    el?.value_punto_contatto?.map((pdc, i) => {
                       if (pdc.pdc_type === 'telefono') {
                         return (
                           <div key={i}>

package/src/components/ItaliaTheme/View/DocumentoView/DocumentoAutori.jsx

@@ -3,7 +3,6 @@ import { defineMessages, useIntl } from 'react-intl';
 import PropTypes from 'prop-types';
 
 import { Row, Col } from 'design-react-kit';
-import { UniversalLink } from '@plone/volto/components';
 import { CardPersona } from 'design-comuni-plone-theme/components/ItaliaTheme';
 import { RichTextSection } from 'design-comuni-plone-theme/components/ItaliaTheme/View';
 
@@ -40,7 +39,6 @@ const DocumentoAutori = ({ autori, title }) => {
                 className="shadow-sm"
                 titleTagName="h5"
                 showImage={true}
-                listingText={autore?.incarichi ?? ''}
               />
             </Col>
           ))}

package/src/components/ItaliaTheme/View/UOView/UOPeople.jsx

@@ -28,7 +28,7 @@ const UOPeople = ({ content }) => {
       <p className="mt-4">
         {intl.formatMessage(messages.persone_p_description)}:
       </p>
-      <Row className="card-wrapper card-teaser-wrapper  ruolo-persone-struttura">
+      <Row className="card-wrapper card-teaser-wrapper card-teaser-wrapper-equal ruolo-persone-struttura">
         {content?.persone_struttura?.map((p, _i) => {
           return (
             <Col xs="12" lg="12" xl="6" md="12" key={p['@id']}>
@@ -37,7 +37,6 @@ const UOPeople = ({ content }) => {
                 className={'shadow-sm'}
                 showImage={true}
                 titleTagName={'h5'}
-                listingText={p?.incarichi}
               />
             </Col>
           );

package/src/components/ItaliaTheme/View/UOView/UOStructure.jsx

@@ -119,7 +119,6 @@ const UOStructure = ({ content }) => {
                   className={'shadow-sm'}
                   showImage={true}
                   titleTagName={'h5'}
-                  listingText={item.incarichi}
                 />
               </Col>
             ))}

package/src/config/RichTextEditor/LinkEntity.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
+import { IntlProvider } from 'react-intl';
 
 const LinkEntity = connect((state) => ({
   token: state.userSession.token,
@@ -10,14 +11,16 @@ const LinkEntity = connect((state) => ({
   const to = token ? url : targetUrl || url;
 
   return (
-    <UniversalLink
-      href={to}
-      openLinkInNewTab={target === '_blank' || undefined}
-      download={download}
-      data-element={dataElement || props['data-element'] || null}
-    >
-      {children}
-    </UniversalLink>
+    <IntlProvider>
+      <UniversalLink
+        href={to}
+        openLinkInNewTab={target === '_blank' || undefined}
+        download={download}
+        data-element={dataElement || props['data-element'] || null}
+      >
+        {children}
+      </UniversalLink>
+    </IntlProvider>
   );
 });
 

package/src/customizations/volto/components/theme/NotFound/NotFound.jsx

@@ -0,0 +1,77 @@
+/*
+CUSTOMIZATIONS:
+- Removed the "Site Administration" link, added a link to the search page
+*/
+
+import { useEffect } from 'react';
+import { BodyClass, toBackendLang } from '@plone/volto/helpers';
+import { FormattedMessage } from 'react-intl';
+import { Link } from 'react-router-dom';
+import { Container } from 'semantic-ui-react';
+import { withServerErrorCode } from '@plone/volto/helpers/Utils/Utils';
+import { useDispatch, useSelector } from 'react-redux';
+import { getNavigation } from '@plone/volto/actions';
+import config from '@plone/volto/registry';
+
+/**
+ * Not found function.
+ * @function NotFound
+ * @returns {string} Markup of the not found page.
+ */
+const NotFound = () => {
+  const dispatch = useDispatch();
+  const lang = useSelector((state) => state.intl.locale);
+
+  useEffect(() => {
+    dispatch(
+      getNavigation(
+        config.settings.isMultilingual ? `/${toBackendLang(lang)}` : '/',
+        config.settings.navDepth,
+      ),
+    );
+  }, [dispatch, lang]);
+
+  return (
+    <Container className="view-wrapper">
+      <BodyClass className="page-not-found" />
+      <h1>
+        <FormattedMessage
+          id="This page does not seem to exist…"
+          defaultMessage="This page does not seem to exist…"
+        />
+      </h1>
+      <p className="description">
+        <FormattedMessage
+          id="We apologize for the inconvenience, but the page you were trying to access is not at this address. You can use the links below to help you find what you are looking for."
+          defaultMessage="We apologize for the inconvenience, but the page you were trying to access is not at this address. You can use the links below to help you find what you are looking for."
+        />
+      </p>
+      <p>
+        <Link to="/search">
+          <FormattedMessage id="Search Site" defaultMessage="Search Site" />
+        </Link>
+      </p>
+      {/* <p>
+        <FormattedMessage
+          id="If you are certain you have the correct web address but are encountering an error, please contact the {site_admin}."
+          defaultMessage="If you are certain you have the correct web address but are encountering an error, please contact the {site_admin}."
+          values={{
+            site_admin: (
+              <Link to="/contact-form">
+                <FormattedMessage
+                  id="Site Administration"
+                  defaultMessage="Site Administration"
+                />
+              </Link>
+            ),
+          }}
+        />
+      </p> */}
+      <p>
+        <FormattedMessage id="Thank you." defaultMessage="Thank you." />
+      </p>
+    </Container>
+  );
+};
+
+export default withServerErrorCode(404)(NotFound);

package/src/theme/ItaliaTheme/_common.scss

@@ -61,3 +61,7 @@
     fill: $external-link-fill-subfooter !important;
   }
 }
+
+.icon.external-link.icon-xs {
+  height: 1rem;
+}

package/src/theme/_cms-ui.scss

@@ -406,7 +406,12 @@ body.cms-ui {
       .public-DraftStyleDefault-block {
         margin-bottom: unset;
       }
-      // z-index necessario su Volto 17 finché non passiamo ad usare slate
+    }
+  }
+
+  // z-index necessario su Volto 17 finché non passiamo ad usare slate
+  .block {
+    .DraftEditor-root {
       .DraftEditor-editorContainer,
       .public-DraftEditorPlaceholder-root {
         z-index: 0;