design-comuni-plone-theme 8.3.0 → 8.3.1

package/.github/workflows/develop.yml

@@ -33,15 +33,17 @@ jobs:
             ADDON_PATH=design-comuni-plone-theme
             VOLTO_VERSION=17.0.0-alpha.19
 
-      - name: Deploy to rancher
-        uses: redturtle/rancher-deploy-action@v0.2.0
-        with:
-          host: ${{ secrets.RANCHER_HOST }}
-          api-username: ${{ secrets.RANCHER_API_USERNAME }}
-          api-password: ${{ secrets.RANCHER_API_PASSWORD }}
-          cluster-id: ${{ secrets.RANCHER_CLUSTER_ID }}
-          project-id: ${{ secrets.RANCHER_PROJECT_ID }}
-          namespace: ${{ secrets.RANCHER_NAMESPACE_DEVELOP }}
-          workload: ${{ secrets.RANCHER_WORKLOAD_DEVELOP }}
-          image: redturtletech/io-comune-base:develop
-          slack-hook-url: ${{ secrets.RANCHER_SLACK_HOOK_URL }}
+#      deploy disabled. see https://gitlab.com/redturtle/io-comune/io-comune-demo-theme
+#
+#      - name: Deploy to rancher
+#        uses: redturtle/rancher-deploy-action@v0.2.0
+#        with:
+#          host: ${{ secrets.RANCHER_HOST }}
+#          api-username: ${{ secrets.RANCHER_API_USERNAME }}
+#          api-password: ${{ secrets.RANCHER_API_PASSWORD }}
+#          cluster-id: ${{ secrets.RANCHER_CLUSTER_ID }}
+#          project-id: ${{ secrets.RANCHER_PROJECT_ID }}
+#          namespace: ${{ secrets.RANCHER_NAMESPACE_DEVELOP }}
+#          workload: ${{ secrets.RANCHER_WORKLOAD_DEVELOP }}
+#          image: redturtletech/io-comune-base:develop
+#          slack-hook-url: ${{ secrets.RANCHER_SLACK_HOOK_URL }}

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 
 
+## [8.3.1](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v8.3.0...v8.3.1) (2023-08-10)
+
+
+### Bug Fixes
+
+* card persona images now have fixed size ([#275](https://github.com/RedTurtle/design-comuni-plone-theme/issues/275)) ([cfbdbc8](https://github.com/RedTurtle/design-comuni-plone-theme/commit/cfbdbc8c458036864dd5c6c02fa35e85fc87fc63))
+* event card in listing breaking with invalid dates ([94aa154](https://github.com/RedTurtle/design-comuni-plone-theme/commit/94aa154e02f1a48f2afb9757d43767fea5c1f01a))
+* event dates in cards when recurrence is entirely in the past ([#277](https://github.com/RedTurtle/design-comuni-plone-theme/issues/277)) ([5c45415](https://github.com/RedTurtle/design-comuni-plone-theme/commit/5c4541529e276693a7d145d99dfbd6a291a52796))
+* focus on cookie banner toggles ([#282](https://github.com/RedTurtle/design-comuni-plone-theme/issues/282)) ([ccc3c73](https://github.com/RedTurtle/design-comuni-plone-theme/commit/ccc3c7324263058916cbe053131be6ae1add7ea0))
+* querystring results when block ids are the same on different pages ([#278](https://github.com/RedTurtle/design-comuni-plone-theme/issues/278)) ([71db4d3](https://github.com/RedTurtle/design-comuni-plone-theme/commit/71db4d30b2ac0faa0dbe1e06302ceb20b81f5b1c))
+* restored full-width class to listing block ([#280](https://github.com/RedTurtle/design-comuni-plone-theme/issues/280)) ([d19c08a](https://github.com/RedTurtle/design-comuni-plone-theme/commit/d19c08a29cefe3b4a482e3b2546e71f3c4bf0604))
+* wrong layout for external link indicator icon if objects are Plone Links in anonimous view ([#270](https://github.com/RedTurtle/design-comuni-plone-theme/issues/270)) ([4bbb741](https://github.com/RedTurtle/design-comuni-plone-theme/commit/4bbb74110659144e4f398e54b10b9c66b2c41f7a))
+
+
+### Maintenance
+
+* deploy to rancher disabled ([d924ef1](https://github.com/RedTurtle/design-comuni-plone-theme/commit/d924ef133380d2e7b890483bf0c519ecf4c07a78))
+
+
+### Documentation
+
+* updated publiccode ([c8769d2](https://github.com/RedTurtle/design-comuni-plone-theme/commit/c8769d20088300e59b1d0fef70319b4416ef4a97))
+
 ## [8.3.0](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v8.2.1...v8.3.0) (2023-08-04)
 
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "design-comuni-plone-theme",
   "description": "Volto Theme for Italia design guidelines",
   "license": "GPL-v3",
-  "version": "8.3.0",
+  "version": "8.3.1",
   "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-04'
+releaseDate: '2023-08-10'
 softwareType: standalone/web
-softwareVersion: 8.3.0
+softwareVersion: 8.3.1
 url: 'https://github.com/italia/design-comuni-plone-theme'
 usedBy:
   - ASP Comuni Modenesi Area Nord

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

@@ -15,6 +15,10 @@ import {
   ListingLinkMore,
   ListingImage,
 } from 'design-comuni-plone-theme/components/ItaliaTheme';
+import { Icon } from 'design-comuni-plone-theme/components/ItaliaTheme';
+import { isInternalURL } from '@plone/volto/helpers/Url/Url';
+
+import config from '@plone/volto/registry';
 
 const CompleteBlockLinksTemplate = ({
   items,
@@ -61,6 +65,7 @@ const CompleteBlockLinksTemplate = ({
                     item={!isEditMode ? item : null}
                     href={isEditMode ? '#' : null}
                     data-element={id_lighthouse}
+                    className={'no-external-if-link'}
                   >
                     <div className="d-flex">
                       {image && <div className="image-container">{image}</div>}
@@ -68,6 +73,19 @@ const CompleteBlockLinksTemplate = ({
                         <CardBody>
                           <CardTitle tag="h3" className="text-secondary">
                             {item.title}
+                            {item['@type'] === 'Link' &&
+                              !isInternalURL(
+                                item.remoteUrl || item.getRemoteUrl,
+                              ) &&
+                              config.settings.siteProperties
+                                .markSpecialLinks && (
+                                <Icon
+                                  icon="it-external-link"
+                                  title={title}
+                                  size="xs"
+                                  className="align-top ms-1 external-link"
+                                />
+                              )}
                           </CardTitle>
                           {show_description && (
                             <CardText tag="p" className="text-secondary">

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

@@ -166,6 +166,7 @@ const SliderTemplate = ({
                         <UniversalLink
                           item={item}
                           title={intl.formatMessage(messages.viewImage)}
+                          className={'no-external-if-link'}
                         >
                           <div className="slide-title">
                             {full_width ? (

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

@@ -34,7 +34,7 @@ export const CardPersona = ({
         {
           'card-with-image': hasImage,
         },
-        `card-persona card-big-io-comune p-4 card-teaser-image card-flex no-after border border-light rounded`,
+        `card-persona card-big-io-comune card-teaser-image card-flex no-after border border-light rounded`,
         className,
       )}
     >
@@ -57,7 +57,7 @@ export const CardPersona = ({
             <CardText>{item.incarichi || item.description}</CardText>
           )}
         </CardBody>
-        {showImage && (
+        {hasImage && (
           <div className="card-image card-image-rounded">{image}</div>
         )}
       </div>

package/src/customizations/volto/components/manage/Blocks/Listing/ListingBody.jsx

@@ -66,7 +66,7 @@ const ListingBody = React.memo(
         const isSearchBlockResults = variation?.['@type'] === 'search';
         const block = isSearchBlockResults ? variation : data;
 
-        if (!block?.show_block_bg) return '';
+        if (!block?.show_block_bg) return 'full-width';
 
         let bg_color = data.bg_color ? `bg-${data.bg_color}` : '';
 

package/src/customizations/volto/components/manage/Blocks/Listing/withQuerystringResults.jsx

@@ -5,6 +5,7 @@ CUSTOMIZATIONS:
 - added additional filters
 - added additional fields to pass to @querystring-search (config.settings.querystringAdditionalFields)
 - usedeepCompareEffect and integrate custom logic for searchBlock to make it work with our implementation
+- used [subrequestID] instead [id] of block, as id of subrequest to avoid block unload on duplicate contents with blocks with same id's. Volto's pr: https://github.com/plone/volto/pull/5071
 */
 import React, { createRef, useEffect } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
@@ -66,6 +67,7 @@ export default function withQuerystringResults(WrappedComponent) {
     const content = useSelector((state) => state.content.data);
     const { settings } = config;
     const querystring = data.querystring || data; // For backwards compat with data saved before Blocks schema
+    const subrequestID = content.UID + '-' + id;
     const { b_size = settings.defaultPageSize } = querystring;
     const [firstLoading, setFirstLoading] = React.useState(true);
     // save the path so it won't trigger dispatch on eager router location change
@@ -82,44 +84,49 @@ export default function withQuerystringResults(WrappedComponent) {
 
     const originalQuery = useSelector((state) => {
       if (props?.variation?.['@type'] === 'search') {
-        return state.originalQuery?.[path]?.[id];
+        return state.originalQuery?.[path]?.[subrequestID];
       }
-      return state.originalQuery?.[properties['@id']]?.[id]?.toArray?.();
+      return state.originalQuery?.[properties['@id']]?.[
+        subrequestID
+      ]?.toArray?.();
     });
     const folderItems = content?.is_folderish ? content.items : [];
     const hasQuery = querystring?.query?.length > 0;
-    const hasLoaded = hasQuery ? querystringResults?.[id]?.loaded : true;
+    const hasLoaded = hasQuery
+      ? querystringResults?.[subrequestID]?.loaded
+      : true;
     const loadingQuery =
       hasQuery &&
-      (querystringResults?.[id]?.loading || !querystringResults?.[id]?.loaded);
+      (querystringResults?.[subrequestID]?.loading ||
+        !querystringResults?.[subrequestID]?.loaded);
 
     const listingItems = hasQuery
-      ? querystringResults?.[id]?.items || []
+      ? querystringResults?.[subrequestID]?.items || []
       : folderItems;
 
     const showAsFolderListing = !hasQuery && content?.items_total > b_size;
     const showAsQueryListing =
-      hasQuery && querystringResults?.[id]?.total > b_size;
+      hasQuery && querystringResults?.[subrequestID]?.total > b_size;
 
     const itemsTotal = showAsFolderListing
       ? content.items_total
-      : querystringResults?.[id]?.total;
+      : querystringResults?.[subrequestID]?.total;
 
     const totalPages = showAsFolderListing
       ? Math.ceil(content.items_total / b_size)
       : showAsQueryListing
-      ? Math.ceil(querystringResults[id].total / b_size)
+      ? Math.ceil(querystringResults[subrequestID].total / b_size)
       : 0;
 
     const prevBatch = showAsFolderListing
       ? content.batching?.prev
       : showAsQueryListing
-      ? querystringResults[id].batching?.prev
+      ? querystringResults[subrequestID].batching?.prev
       : null;
     const nextBatch = showAsFolderListing
       ? content.batching?.next
       : showAsQueryListing
-      ? querystringResults[id].batching?.next
+      ? querystringResults[subrequestID].batching?.next
       : null;
 
     function handleContentPaginationChange(e, { activePage }) {
@@ -163,7 +170,7 @@ export default function withQuerystringResults(WrappedComponent) {
         );
       }
 
-      if (firstLoading && querystringResults[id] && !loadingQuery) {
+      if (firstLoading && querystringResults[subrequestID] && !loadingQuery) {
         setFirstLoading(false);
       }
       // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -172,7 +179,8 @@ export default function withQuerystringResults(WrappedComponent) {
     useDeepCompareEffect(() => {
       if (
         (hasQuery &&
-          (isEditMode || (!isEditMode && !querystringResults[id]?.loaded))) ||
+          (isEditMode ||
+            (!isEditMode && !querystringResults[subrequestID]?.loaded))) ||
         (hasQuery && props.variation?.['@type'] === 'search')
       ) {
         doSearch(data);
@@ -222,7 +230,7 @@ export default function withQuerystringResults(WrappedComponent) {
           getQueryStringResults(
             path,
             getAdaptedQuery(_querystring, b_size, data.variation),
-            id,
+            subrequestID,
             page,
           ),
         );
@@ -245,7 +253,7 @@ export default function withQuerystringResults(WrappedComponent) {
                 },
               ],
             },
-            id,
+            subrequestID,
           ),
         );
       }
@@ -270,7 +278,7 @@ export default function withQuerystringResults(WrappedComponent) {
             ? handleContentPaginationChange(e, { activePage })
             : handleQueryPaginationChange(e, { activePage });
         }}
-        total={querystringResults?.[id]?.total}
+        total={querystringResults?.[subrequestID]?.total}
         batch_size={b_size}
         currentPage={currentPage}
         totalPages={totalPages}

package/src/customizations/volto/components/manage/UniversalLink/UniversalLink.jsx

@@ -83,7 +83,6 @@ const UniversalLink = ({
     (!isExternal && url.includes('@@display-file')) || false;
 
   const checkedURL = URLUtils.checkAndNormalizeUrl(url);
-
   url = checkedURL.url;
   let tag = (
     <Link

package/src/customizations/volto/components/theme/View/EventDatesInfo.jsx

@@ -61,7 +61,7 @@ export const When = ({
   if (!datesInfo) {
     // eslint-disable-next-line no-console
     console.warn('EventWhen: Received invalid start or end date.');
-    return;
+    return null;
   }
 
   const getDate = () => {

package/src/helpers/ListingHelper.js

@@ -53,8 +53,12 @@ export const getCalendarDate = (item, rrulestr) => {
           rrulestr,
           intl,
         );
-        realStart = recurrenceDates.recurrenceStart;
-        realEnd = recurrenceDates.recurrenceEnd;
+        // If the recurrence range is entirely in the past,
+        // then no future occurrences exist and both
+        // recurrenceStart and recurrenceEnd will be null
+        // so fallback to displaying the original info
+        realStart = recurrenceDates.recurrenceStart || item.start;
+        realEnd = recurrenceDates.recurrenceEnd || item.end;
       }
       ret = (
         <When

package/src/theme/ItaliaTheme/Addons/volto-gdpr-privacy.scss

@@ -170,7 +170,8 @@
               &:focus {
                 & + label {
                   &:before {
-                    box-shadow: 0 0 3px 3px #ccc;
+                    box-shadow: 0 0 0 5px black !important;
+                    outline: #ddd 2px solid !important;
                   }
                 }
               }

package/src/theme/ItaliaTheme/Blocks/_completeBlockLinkstemplate.scss

@@ -45,9 +45,15 @@
     font-size: 1rem !important;
     font-weight: 700 !important;
     line-height: 1.44444rem;
+    .external-link {
+      fill: $external-link-fill-buttons !important;
+    }
   }
 
   .card:after {
     content: none;
   }
+  .no-external-if-link > .external-link {
+    display: none;
+  }
 }

package/src/theme/ItaliaTheme/Components/_cardPersona.scss

@@ -1,52 +1,34 @@
-.card-persona.card-teaser-image.card-flex.card {
-  min-height: 135px;
-  height: fit-content;
-
-  &.card-with-image {
-    .card-image-wrapper {
-      flex: 1;
-      display: flex;
-      flex-direction: row;
-      justify-content: space-between;
-      align-items: flex-start;
+.card-persona.card-flex {
+  .card-image-wrapper {
+    flex: 1;
+    display: flex;
+    align-items: flex-start;
+  }
 
-      .card-body {
-        width: calc(100% - 7.2rem);
-        flex-grow: 0;
-      }
-    }
+  .card-body {
+    // TODO Rimuovere important e mettere p-4 come classe nel jsx
+    // nel momento in cui riusciremo a togliere il padding 0 important
+    // dalla classe .card-big-io-comune .card-body globalmente
+    padding: 24px !important;
   }
 
-  .card-image-wrapper {
-    .card-image {
-      position: absolute;
-      top: 0;
-      right: 0;
-      bottom: 0;
-      overflow: hidden;
-      height: 100%;
-      .volto-image {
-        height: 100%;
-        display: flex;
-        align-items: stretch;
+  .card-image {
+    flex: 0 0 130px;
 
-        img {
-          min-width: 5.27rem;
-          max-width: 7.2rem;
-          width: auto;
-          min-height: 7.5rem;
-          object-fit: cover;
-          aspect-ratio: 180/100;
-          object-position: center;
-        }
-      }
-    }
-    .card-title {
-      font-size: $card-big-head-size;
-      line-height: $card-big-head-l-h;
+    img {
+      // Dobbiamo vincere contro gli stili del blocco listing
+      width: 130px !important;
+      height: 130px * 1.4 !important;
+      object-fit: cover;
+      object-position: center;
     }
   }
 
+  .card-title {
+    font-size: $card-big-head-size;
+    line-height: $card-big-head-l-h;
+  }
+
   &.listing-item {
     .card-body {
       .category-top {
@@ -69,10 +51,5 @@
         }
       }
     }
-
-    .card-image {
-      margin-bottom: 0.8em;
-      height: auto;
-    }
   }
 }

package/src/theme/ItaliaTheme/Views/_slider.scss

@@ -21,4 +21,7 @@
     padding: 0;
     margin: 0;
   }
+  .no-external-if-link > .external-link {
+    display: none;
+  }
 }