design-comuni-plone-theme 8.4.6 → 8.5.1

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/LocationsMap.jsx

@@ -43,12 +43,7 @@ const LocationsMap = ({ center, locations }) => {
 
   useEffect(() => {
     venues.forEach((loc) => {
-      if (
-        !fetchedLocations?.[loc.key]?.loading &&
-        !fetchedLocations?.[loc.key]?.loaded
-      ) {
-        dispatch(getContent(loc.url, null, loc.key));
-      }
+      dispatch(getContent(loc.url, null, loc.key));
     });
 
     return () =>

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

@@ -48,13 +48,13 @@ const Metadata = ({
         </h4>
       )}
       {children}
-      <p className="font-serif mb-0 mt-4">
+      <p className="font-serif mb-0 mt-4 last-modified">
         <strong>{intl.formatMessage(messages.modified)}:</strong>{' '}
         {viewDate(intl.locale, content.modified, 'DD-MM-Y, HH:MM')}
       </p>
       {content.rights && (
         <>
-          <p className="font-serif mb-0 mt-4">
+          <p className="font-serif mb-0 mt-4 metadata">
             {intl.formatMessage(messages.rights)}
           </p>
           <strong>{content.rights}</strong>

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/Commons/RichText.jsx

@@ -31,7 +31,7 @@ const RichText = ({
     <>
       {title && (
         <Tag
-          className={cx('mt-4', {
+          className={cx('mt-4 it-page-subsection', {
             'fw-bold': title_size === 'h6',
           })}
         >

package/src/components/ItaliaTheme/View/EventoView/EventoCosE.jsx

@@ -45,7 +45,9 @@ const EventoCosE = ({ content }) => {
     >
       {content?.persone_amministrazione?.length > 0 && (
         <>
-          <h5>{intl.formatMessage(messages.parteciperanno)}</h5>
+          <h5 className="parteciperanno-section">
+            {intl.formatMessage(messages.parteciperanno)}
+          </h5>
           {content.persone_amministrazione.map((item, i) => (
             <UniversalLink
               href={flattenToAppURL(item['@id'])}

package/src/components/ItaliaTheme/View/EventoView/EventoUlterioriInformazioni.jsx

@@ -43,7 +43,6 @@ const EventoUlterioriInformazioni = ({ content }) => {
       {richTextHasContent(content?.ulteriori_informazioni) && (
         <HelpBox text={content?.ulteriori_informazioni} />
       )}
-
       {content?.event_url && (
         <div className="mt-4">
           <h5>{intl.formatMessage(messages.event_url)}</h5>
@@ -52,7 +51,6 @@ const EventoUlterioriInformazioni = ({ content }) => {
           </UniversalLink>
         </div>
       )}
-
       {richTextHasContent(content?.patrocinato_da) && (
         <div className="mt-4">
           {richTextHasContent(content?.patrocinato_da) && (
@@ -66,7 +64,6 @@ const EventoUlterioriInformazioni = ({ content }) => {
           )}
         </div>
       )}
-
       {content?.strutture_politiche.length > 0 && (
         <div className="mt-4">
           <h5>{intl.formatMessage(messages.strutture_politiche)}</h5>

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 && (