design-comuni-plone-theme 8.4.6 → 8.5.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 
 
+## [8.5.0](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v8.4.6...v8.5.0) (2023-09-05)
+
+
+### Features
+
+* added pec to office card info ([#312](https://github.com/RedTurtle/design-comuni-plone-theme/issues/312)) ([a555954](https://github.com/RedTurtle/design-comuni-plone-theme/commit/a555954bbd482f27c711ac314aeda45e01537b06))
+
+
+### Bug Fixes
+
+* fixed videogallery template block and standardized slider styles ([#301](https://github.com/RedTurtle/design-comuni-plone-theme/issues/301)) ([9abe515](https://github.com/RedTurtle/design-comuni-plone-theme/commit/9abe51584c631a75c6145944f8a14a0c187dd625))
+* incorrect logic for determining if search is ongoing, less layout shifts  ([#313](https://github.com/RedTurtle/design-comuni-plone-theme/issues/313)) ([69bc749](https://github.com/RedTurtle/design-comuni-plone-theme/commit/69bc74963760caf6465bdf7cc6e64c0413d8d655))
+* mantiene la querystring nel came_from della login ([#315](https://github.com/RedTurtle/design-comuni-plone-theme/issues/315)) ([5313e8b](https://github.com/RedTurtle/design-comuni-plone-theme/commit/5313e8b4bbcc54b492e07876abf5dc607d5b118b))
+* mostra tutti i campi incarico della persona ([#311](https://github.com/RedTurtle/design-comuni-plone-theme/issues/311)) ([bd9afa2](https://github.com/RedTurtle/design-comuni-plone-theme/commit/bd9afa284f84202fece2f95c6664406bb605d66e))
+* querystring results with additional filters in listing blocks ([#317](https://github.com/RedTurtle/design-comuni-plone-theme/issues/317)) ([ba52c7f](https://github.com/RedTurtle/design-comuni-plone-theme/commit/ba52c7f22b98baf4373ac580cd0a0441dc60ad01))
+* revert SSR redirect backport https://github.com/plone/volto/pull/4854 ([#306](https://github.com/RedTurtle/design-comuni-plone-theme/issues/306)) ([ce80334](https://github.com/RedTurtle/design-comuni-plone-theme/commit/ce803342595693b819e9185990ea4e45777fa055))
+
+
+### Documentation
+
+* updated publiccode ([973363a](https://github.com/RedTurtle/design-comuni-plone-theme/commit/973363a7ca46654cf79a1cfd7e9151cb97c77221))
+
 ## [8.4.6](https://github.com/redturtle/design-comuni-plone-theme/compare/v8.4.5...v8.4.6) (2023-08-31)
 
 

package/locales/de/LC_MESSAGES/volto.po

@@ -3897,6 +3897,16 @@ msgstr ""
 msgid "venues"
 msgstr ""
 
+#: components/ItaliaTheme/Blocks/VideoGallery/Body
+# defaultMessage: Prossimo video
+msgid "videogallery_next_arrow"
+msgstr ""
+
+#: components/ItaliaTheme/Blocks/VideoGallery/Body
+# defaultMessage: Video precedente
+msgid "videogallery_prev_arrow"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/Listing/SliderTemplate
 # defaultMessage: Sei attualmente in un carosello, per navigare usa le frecce sinistra e destra
 msgid "viewImage"

package/locales/en/LC_MESSAGES/volto.po

@@ -3882,6 +3882,16 @@ msgstr "Change in balance sheet"
 msgid "venues"
 msgstr "Venues"
 
+#: components/ItaliaTheme/Blocks/VideoGallery/Body
+# defaultMessage: Prossimo video
+msgid "videogallery_next_arrow"
+msgstr "Next video"
+
+#: components/ItaliaTheme/Blocks/VideoGallery/Body
+# defaultMessage: Video precedente
+msgid "videogallery_prev_arrow"
+msgstr "Previous video"
+
 #: components/ItaliaTheme/Blocks/Listing/SliderTemplate
 # defaultMessage: Sei attualmente in un carosello, per navigare usa le frecce sinistra e destra
 msgid "viewImage"

package/locales/es/LC_MESSAGES/volto.po

@@ -3891,6 +3891,16 @@ msgstr "Cambio en el balance"
 msgid "venues"
 msgstr "Lugares"
 
+#: components/ItaliaTheme/Blocks/VideoGallery/Body
+# defaultMessage: Prossimo video
+msgid "videogallery_next_arrow"
+msgstr ""
+
+#: components/ItaliaTheme/Blocks/VideoGallery/Body
+# defaultMessage: Video precedente
+msgid "videogallery_prev_arrow"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/Listing/SliderTemplate
 # defaultMessage: Sei attualmente in un carosello, per navigare usa le frecce sinistra e destra
 msgid "viewImage"

package/locales/fr/LC_MESSAGES/volto.po

@@ -3899,6 +3899,16 @@ msgstr "Changement de bilan"
 msgid "venues"
 msgstr "Lieux"
 
+#: components/ItaliaTheme/Blocks/VideoGallery/Body
+# defaultMessage: Prossimo video
+msgid "videogallery_next_arrow"
+msgstr "Prochaine vidéo"
+
+#: components/ItaliaTheme/Blocks/VideoGallery/Body
+# defaultMessage: Video precedente
+msgid "videogallery_prev_arrow"
+msgstr "Vidéo précédente"
+
 #: components/ItaliaTheme/Blocks/Listing/SliderTemplate
 # defaultMessage: Sei attualmente in un carosello, per navigare usa le frecce sinistra e destra
 msgid "viewImage"

package/locales/it/LC_MESSAGES/volto.po

@@ -3882,6 +3882,16 @@ msgstr "Variazione situazione patrimoniale"
 msgid "venues"
 msgstr "Luoghi"
 
+#: components/ItaliaTheme/Blocks/VideoGallery/Body
+# defaultMessage: Prossimo video
+msgid "videogallery_next_arrow"
+msgstr "Prossimo video"
+
+#: components/ItaliaTheme/Blocks/VideoGallery/Body
+# defaultMessage: Video precedente
+msgid "videogallery_prev_arrow"
+msgstr "Video precedente"
+
 #: components/ItaliaTheme/Blocks/Listing/SliderTemplate
 # defaultMessage: Sei attualmente in un carosello, per navigare usa le frecce sinistra e destra
 msgid "viewImage"

package/locales/volto.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2023-08-24T08:14:25.576Z\n"
+"POT-Creation-Date: 2023-08-28T07:32:02.134Z\n"
 "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -3884,6 +3884,16 @@ msgstr ""
 msgid "venues"
 msgstr ""
 
+#: components/ItaliaTheme/Blocks/VideoGallery/Body
+# defaultMessage: Prossimo video
+msgid "videogallery_next_arrow"
+msgstr ""
+
+#: components/ItaliaTheme/Blocks/VideoGallery/Body
+# defaultMessage: Video precedente
+msgid "videogallery_prev_arrow"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/Listing/SliderTemplate
 # defaultMessage: Sei attualmente in un carosello, per navigare usa le frecce sinistra e destra
 msgid "viewImage"

package/package.json

@@ -2,7 +2,7 @@
   "name": "design-comuni-plone-theme",
   "description": "Volto Theme for Italia design guidelines",
   "license": "GPL-v3",
-  "version": "8.4.6",
+  "version": "8.5.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-08-25'
+releaseDate: '2023-09-05'
 softwareType: standalone/web
-softwareVersion: 8.4.3
+softwareVersion: 8.5.0
 url: 'https://github.com/italia/design-comuni-plone-theme'
 usedBy:
   - ASP Comuni Modenesi Area Nord
@@ -253,6 +253,7 @@ usedBy:
   - Comune di Mirandola
   - Comune di Modena
   - Comune di Montecchio Emilia
+  - Comune di Novellara
   - Comune di Parma
   - Comune di Piacenza
   - Comune di Reggio Emilia

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

@@ -130,7 +130,9 @@ const PhotogalleryTemplate = ({
             />
           </button>
         </div>
-        <ul style={{ margin: '0px' }}> {dots} </ul>
+        <ul className="slick-dots" style={{ margin: '0px' }}>
+          {dots}
+        </ul>
       </div>
     ),
   };

package/src/components/ItaliaTheme/Blocks/VideoGallery/Body.jsx

@@ -5,11 +5,12 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Container } from 'design-react-kit';
 
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
-
+import { useIntl, defineMessages } from 'react-intl';
 import { Icon } from 'design-comuni-plone-theme/components/ItaliaTheme';
+import { FontAwesomeIcon } from 'design-comuni-plone-theme/components/ItaliaTheme';
+import { Button, Container } from 'design-react-kit';
 import { UniversalLink } from '@plone/volto/components';
 
 /**
@@ -17,11 +18,56 @@ import { UniversalLink } from '@plone/volto/components';
  * @class Body
  * @extends Component
  */
+
+const messages = defineMessages({
+  videogallery_next_arrow: {
+    id: 'videogallery_next_arrow',
+    defaultMessage: 'Prossimo video',
+  },
+  videogallery_prev_arrow: {
+    id: 'videogallery_prev_arrow',
+    defaultMessage: 'Video precedente',
+  },
+});
+
 const Body = ({ data, children, nItems = 0, reactSlick }) => {
+  const intl = useIntl();
+
+  const NextArrow = (props) => {
+    const { onClick, className } = props;
+    return (
+      <Button
+        outline
+        color={'unset'}
+        className={className}
+        onClick={onClick}
+        aria-label={intl.formatMessage(messages.videogallery_next_arrow)}
+      >
+        <FontAwesomeIcon icon={['fas', 'chevron-right']} />
+      </Button>
+    );
+  };
+  const PrevArrow = (props) => {
+    const { onClick, className } = props;
+    return (
+      <Button
+        outline
+        color={'unset'}
+        className={className}
+        onClick={onClick}
+        aria-label={intl.formatMessage(messages.videogallery_prev_arrow)}
+      >
+        <FontAwesomeIcon icon={['fas', 'chevron-left']} />
+      </Button>
+    );
+  };
+
   const Slider = reactSlick.default;
 
   const settings = {
     dots: true,
+    nextArrow: <NextArrow />,
+    prevArrow: <PrevArrow />,
     infinite: true,
     speed: 500,
     slidesToShow: nItems < 3 ? nItems : 3,
@@ -55,7 +101,7 @@ const Body = ({ data, children, nItems = 0, reactSlick }) => {
   };
 
   return (
-    <div className="full-width py-5">
+    <div className="full-width">
       <Container className="px-md-4">
         {data?.title && <h2>{data.title}</h2>}
         {(data?.channel_link || data?.channel_link_title) && (

package/src/components/ItaliaTheme/Blocks/VideoGallery/Edit.jsx

@@ -6,22 +6,24 @@
 import React from 'react';
 import { defineMessages } from 'react-intl';
 import { SidebarPortal } from '@plone/volto/components';
-
 import {
   withDNDContext,
   SubblocksEdit,
   SubblocksWrapper,
 } from 'volto-subblocks';
-import Sidebar from './Sidebar.jsx';
-import EditBlock from './Block/EditBlock';
-import Body from './Body';
+import Sidebar from 'design-comuni-plone-theme/components/ItaliaTheme/Blocks/VideoGallery/Sidebar';
+import Body from 'design-comuni-plone-theme/components/ItaliaTheme/Blocks/VideoGallery/Body';
+import EditBlock from 'design-comuni-plone-theme/components/ItaliaTheme/Blocks/VideoGallery/Block/EditBlock';
 
 const messages = defineMessages({
   addItem: {
     id: 'Add accordion item',
     defaultMessage: 'Aggiungi elemento',
   },
-  titlePlaceholder: { id: 'Title', defaultMessage: 'Titolo' },
+  titlePlaceholder: {
+    id: 'Title',
+    defaultMessage: 'Titolo',
+  },
   noVideos: {
     id: 'noVideos',
     defaultMessage:

package/src/components/ItaliaTheme/LoginAgid/LoginAgid.jsx

@@ -58,7 +58,11 @@ const LoginAgid = (props) => {
     : process.env.RAZZLE_SPID_LOGIN_URL;
   const showFormLogin = !spidLoginUrl || query.get('login_operatore');
   const location = useLocation();
-  const came_from = query.get('came_from') || props.origin || getBaseUrl(location.pathname);
+  const came_from =
+    query.get('came_from') ||
+    props.origin ||
+    `${getBaseUrl(location.pathname)}${location.search}` ||
+    '/';
 
   return (
     <>
@@ -91,7 +95,10 @@ const LoginAgid = (props) => {
                     <Button
                       color="primary"
                       outline
-                      href={`${came_from}/login?login_operatore=1`}
+                      href={`/login?${new URLSearchParams({
+                        login_operatore: 1,
+                        return_url: came_from,
+                      }).toString()}`}
                       tag="button"
                     >
                       <span>{intl.formatMessage(messages.loginPloneUser)}</span>

package/src/components/ItaliaTheme/Search/Search.jsx

@@ -6,7 +6,7 @@
 import React, { useState, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useIntl, defineMessages } from 'react-intl';
-import { values } from 'lodash';
+import { values, isEmpty } from 'lodash';
 import cx from 'classnames';
 import qs from 'query-string';
 import moment from 'moment';
@@ -324,7 +324,7 @@ const Search = () => {
       true,
     );
 
-    searchResults.result &&
+    !isEmpty(searchResults.result) &&
       history.push(
         getSearchParamsURL(
           searchableText,
@@ -349,7 +349,6 @@ const Search = () => {
   }, 0);
   let activeTopics = values(topics).filter((t) => t.value).length;
   let activePortalTypes = values(portalTypes).filter((ct) => ct.value).length;
-
   return (
     <>
       <Helmet title={intl.formatMessage(messages.searchResults)} />
@@ -612,72 +611,82 @@ const Search = () => {
             </aside>
 
             <Col lg={9} tag="section" className="py-lg-5">
-              {searchResults.loadingResults ? (
-                <Spinner active />
-              ) : searchResults?.result?.items_total > 0 ? (
-                <div
-                  className="search-results-wrapper"
-                  role="region"
-                  id="search-results-region"
-                  aria-live="polite"
-                >
-                  <div className="d-block ordering-widget">
-                    <Row className="pb-3 border-bottom">
-                      <Col xs={6} className="align-self-center">
-                        <p className="d-none d-lg-block" aria-live="polite">
-                          {intl.formatMessage(messages.foundNResults, {
-                            total: searchResults.result.items_total,
-                          })}
-                        </p>
-                        <p className="d-block d-lg-none mb-0 text-end">
-                          {intl.formatMessage(messages.orderBy)}
-                        </p>
-                      </Col>
-                      <Col xs={6}>
-                        <SelectInput
-                          id="search-sort-on"
-                          value={
-                            sortOnOptions.filter((o) => o.value === sortOn)[0]
-                          }
-                          label={intl.formatMessage(messages.orderBy)}
-                          placeholder={intl.formatMessage(messages.orderBy)}
-                          onChange={(opt) => setSortOn(opt.value)}
-                          options={sortOnOptions}
-                        />
-                      </Col>
-                    </Row>
-                  </div>
-                  <Row>
-                    {searchResults?.result?.items?.map((item, index) => (
-                      <Col md={12} key={item['@id']} className="p-0">
-                        <SearchResultItem
-                          item={item}
-                          index={index}
-                          searchableText={searchableText}
-                          section={getSectionFromId(item['@id'])}
-                        />
-                      </Col>
-                    ))}
+              <div
+                className="search-results-wrapper"
+                role="region"
+                id="search-results-region"
+                aria-live="polite"
+              >
+                <div className="d-block ordering-widget">
+                  <Row className="pb-3 border-bottom">
+                    <Col xs={6} className="align-self-center">
+                      <p className="d-none d-lg-block" aria-live="polite">
+                        {intl.formatMessage(messages.foundNResults, {
+                          total: searchResults?.result?.items_total || 0,
+                        })}
+                      </p>
+                      <p className="d-block d-lg-none mb-0 text-end">
+                        {intl.formatMessage(messages.orderBy)}
+                      </p>
+                    </Col>
+                    <Col xs={6}>
+                      <SelectInput
+                        id="search-sort-on"
+                        value={
+                          sortOnOptions.filter((o) => o.value === sortOn)[0]
+                        }
+                        label={intl.formatMessage(messages.orderBy)}
+                        placeholder={intl.formatMessage(messages.orderBy)}
+                        onChange={(opt) => setSortOn(opt.value)}
+                        options={sortOnOptions}
+                      />
+                    </Col>
                   </Row>
-                  {searchResults?.result?.batching && (
-                    <Pagination
-                      activePage={currentPage}
-                      totalPages={Math.ceil(
-                        (searchResults?.result?.items_total ?? 0) /
-                          config.settings.defaultPageSize,
-                      )}
-                      onPageChange={handleQueryPaginationChange}
-                    />
-                  )}
                 </div>
-              ) : searchResults.error ? (
-                <Alert color="danger">
-                  <strong>{intl.formatMessage(messages.attenzione)}</strong>{' '}
-                  {intl.formatMessage(messages.errors_occured)}
-                </Alert>
-              ) : (
-                <p>{intl.formatMessage(messages.no_results)}</p>
-              )}
+
+                {searchResults.loadingResults ||
+                (!searchResults.hasError && isEmpty(searchResults.result)) ? (
+                  <div className="searchSpinnerWrapper">
+                    <Spinner active />
+                  </div>
+                ) : searchResults?.result?.items_total > 0 ? (
+                  <>
+                    <Row>
+                      {searchResults?.result?.items?.map((item, index) => (
+                        <Col md={12} key={item['@id']} className="p-0">
+                          <SearchResultItem
+                            item={item}
+                            index={index}
+                            searchableText={searchableText}
+                            section={getSectionFromId(item['@id'])}
+                          />
+                        </Col>
+                      ))}
+                    </Row>
+                    {searchResults?.result?.batching && (
+                      <Pagination
+                        activePage={currentPage}
+                        totalPages={Math.ceil(
+                          (searchResults?.result?.items_total ?? 0) /
+                            config.settings.defaultPageSize,
+                        )}
+                        onPageChange={handleQueryPaginationChange}
+                      />
+                    )}
+                  </>
+                ) : searchResults.error ? (
+                  <Alert color="danger">
+                    <strong>{intl.formatMessage(messages.attenzione)}</strong>{' '}
+                    {intl.formatMessage(messages.errors_occured)}
+                  </Alert>
+                ) : (
+                  !searchResults?.hasError &&
+                  !isEmpty(searchResults?.result) &&
+                  searchResults.result?.items.length === 0 && (
+                    <p>{intl.formatMessage(messages.no_results)}</p>
+                  )
+                )}
+              </div>
             </Col>
           </Row>
         </Container>

package/src/components/ItaliaTheme/Unauthorized/Unauthorized.jsx

@@ -53,6 +53,7 @@ const Unauthorized = (props) => {
     : process.env.RAZZLE_SPID_LOGIN_URL;
   // BBB: per retrocompatibilità con il vecchio config arLoginUrl
   const spidLogin = config.settings.siteProperties?.spidLogin;
+  const came_from = `${getBaseUrl(location.pathname)}${location.search}`;
 
   return (
     <div id="unauthorized-agid" className="view-wrapper">
@@ -88,9 +89,10 @@ const Unauthorized = (props) => {
                     <Button
                       color="primary"
                       outline
-                      href={`${getBaseUrl(
-                        location.pathname,
-                      )}/login?login_operatore=1`}
+                      href={`/login?${new URLSearchParams({
+                        login_operatore: 1,
+                        return_url: came_from,
+                      })}`}
                       tag="button"
                     >
                       <span>{intl.formatMessage(messages.loginPloneUser)}</span>
@@ -117,9 +119,10 @@ const Unauthorized = (props) => {
                   values={{
                     login: (
                       <Link
-                        to={`${getBaseUrl(
-                          location.pathname,
-                        )}/login?login_operatore=1`}
+                        to={`/login?${new URLSearchParams({
+                          login_operatore: 1,
+                          return_url: came_from,
+                        })}`}
                       >
                         <FormattedMessage id="log in" defaultMessage="log in" />
                       </Link>

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

@@ -42,7 +42,6 @@ const OfficeCard = ({
   }, [url]);
 
   let office_fo = load_data ? officeContent?.[key]?.data : office;
-
   return office_fo ? (
     <div
       className={cx(
@@ -86,7 +85,10 @@ const OfficeCard = ({
                             <ContactLink tel={pdc.pdc_value} label={false} />
                           </div>
                         );
-                      } else if (pdc.pdc_type === 'email')
+                      } else if (
+                        pdc.pdc_type === 'email' ||
+                        pdc.pdc_type === 'pec'
+                      )
                         return (
                           <div key={i}>
                             <ContactLink email={pdc.pdc_value} label={false} />

package/src/components/ItaliaTheme/View/PersonaView/PersonaRuolo.jsx

@@ -78,7 +78,6 @@ const messages = defineMessages({
 
 const PersonaRuolo = ({ content }) => {
   const intl = useIntl();
-
   return (
     <>
       {content?.incarichi_persona?.length > 0 && (
@@ -188,18 +187,50 @@ const PersonaRuolo = ({ content }) => {
               )}
             </RichTextSection>
           )}
-          <RichTextSection
-            tag_id="data_insediamento"
-            title={intl.formatMessage(messages.data_insediamento)}
-          >
-            <div className="font-serif">
-              {viewDate(
-                intl.locale,
-                content.incarichi_persona[0].data_inizio_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>
+          )}
+          {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.assessore_di?.length > 0 && (