design-comuni-plone-theme 11.13.0 → 11.15.0

package/.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/rancher-deploy-action@v0.2.0

package/.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/rancher-deploy-action@v0.2.0

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.7.0
+            VOLTO_VERSION=17.18.1

package/.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

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 
 
+## [11.15.0](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.14.0...v11.15.0) (2024-07-05)
+
+
+### Features
+
+* moved start and end date of incarico after incarico name ([#715](https://github.com/RedTurtle/design-comuni-plone-theme/issues/715)) ([c07c1ea](https://github.com/RedTurtle/design-comuni-plone-theme/commit/c07c1ea41b3534ad0c05ba2b9990c7b1c8f226ff))
+* update to volto 17.18.1 ([8896926](https://github.com/RedTurtle/design-comuni-plone-theme/commit/889692614b5728bd812754dea9191c5bcb127a0a))
+
+
+### Bug Fixes
+
+* updated form validation customization ([f3d2e72](https://github.com/RedTurtle/design-comuni-plone-theme/commit/f3d2e72b47c8ce33326d0b4b5ca87daf9e874668))
+* upgrade dependencies ([4ea3806](https://github.com/RedTurtle/design-comuni-plone-theme/commit/4ea38067018f2bbd35566b4d70ed87e9362988ef))
+
+
+### Documentation
+
+* updated publiccode and release log ([91a58b6](https://github.com/RedTurtle/design-comuni-plone-theme/commit/91a58b6f124da03e10437c0ee4f48b9545d51ddf))
+
+## [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)
 
 

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.7.0
+VOLTO_VERSION=17.18.1
 
 ADDON_NAME='design-comuni-plone-theme'
 ADDON_PATH='design-comuni-plone-theme'

package/RELEASE.md

@@ -41,6 +41,18 @@
 - ...
 -->
 
+## Versione 11.15.0 (05/07/2024)
+
+### Novità
+
+- Le informazioni sulla data di inizio e fine incarico sul CT persona vengono ora mostrate subito dopo l'incarico.
+
+## 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

package/package.json

@@ -2,7 +2,7 @@
   "name": "design-comuni-plone-theme",
   "description": "Volto Theme for Italia design guidelines",
   "license": "GPL-v3",
-  "version": "11.13.0",
+  "version": "11.15.0",
   "main": "src/index.js",
   "repository": {
     "type": "git",
@@ -149,10 +149,10 @@
     "volto-blocks-widget": "3.4.1",
     "volto-data-grid-widget": "2.3.1",
     "volto-dropdownmenu": "4.1.3",
-    "volto-editablefooter": "5.1.6",
+    "volto-editablefooter": "5.1.7",
     "volto-feedback": "0.3.2",
-    "volto-form-block": "3.8.5",
-    "volto-gdpr-privacy": "2.2.6",
+    "volto-form-block": "3.8.7",
+    "volto-gdpr-privacy": "2.2.7",
     "volto-google-analytics": "2.0.0",
     "volto-multilingual-widget": "3.2.1",
     "volto-querywidget-with-browser": "0.4.2",
@@ -198,7 +198,7 @@
     "stylelint-prettier": "4.0.2"
   },
   "peerDependencies": {
-    "@plone/volto": "17.7.0"
+    "@plone/volto": "17.18.1"
   },
   "packageManager": "yarn@3.2.3"
 }

package/publiccode.yml

@@ -227,9 +227,9 @@ maintenance:
 name: io-Comune - Il sito AgID per Comuni ed Enti Pubblici
 platforms:
   - web
-releaseDate: '2024-06-12'
+releaseDate: '2024-07-05'
 softwareType: standalone/web
-softwareVersion: 11.13.0
+softwareVersion: 11.15.0
 url: 'https://github.com/italia/design-comuni-plone-theme'
 usedBy:
   - ASP Comuni Modenesi Area Nord

package/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"

package/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>
-          )}
         </>
       )}
 

package/src/config/italiaConfig.js

@@ -66,8 +66,8 @@ import { schemaListing } from 'design-comuni-plone-theme/components/ItaliaTheme/
 
 import reducers from 'design-comuni-plone-theme/reducers';
 
-const ReleaseLog = loadable(
-  () => import('design-comuni-plone-theme/components/ReleaseLog/ReleaseLog'),
+const ReleaseLog = loadable(() =>
+  import('design-comuni-plone-theme/components/ReleaseLog/ReleaseLog'),
 );
 
 const messages = defineMessages({
@@ -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,

package/src/customizations/volto/helpers/FormValidation/FormValidation.js

@@ -188,7 +188,7 @@ const widgetValidation = {
  * The string that comes my not be a valid JSON
  * @param {string} requestItem
  */
-const tryParseJSON = (requestItem) => {
+export const tryParseJSON = (requestItem) => {
   let resultObj = null;
   try {
     resultObj = JSON.parse(requestItem);

package/src/theme/_cms-ui.scss

@@ -244,6 +244,11 @@ body.cms-ui {
     }
   }
 
+  /*Block chooser*/
+  [data-popper-placement] {
+    z-index: 1000;
+  }
+
   .sidebar-container {
     .numbers-block-sidebar-form-container {
       padding-bottom: 1rem;

package/src/customizations/volto/components/manage/BlockChooser/BlockChooserButton.jsx

@@ -1,157 +0,0 @@
-/* CUSTOMIZATIONS
-- zindex for handling overlapping in small pages
-*/
-
-import React from 'react';
-import { doesNodeContainClick } from 'semantic-ui-react/dist/commonjs/lib';
-import addSVG from '@plone/volto/icons/circle-plus.svg';
-import { blockHasValue } from '@plone/volto/helpers';
-import { Icon, BlockChooser } from '@plone/volto/components';
-import config from '@plone/volto/registry';
-import { Button, Ref } from 'semantic-ui-react';
-import { defineMessages, useIntl } from 'react-intl';
-import { usePopper } from 'react-popper';
-import { Portal } from 'react-portal';
-
-const messages = defineMessages({
-  addBlock: {
-    id: 'Add block',
-    defaultMessage: 'Add block',
-  },
-});
-
-export const ButtonComponent = (props) => {
-  const intl = useIntl();
-  const {
-    className = `block-add-button${
-      config.experimental.addBlockButton.enabled ? ' new-add-block' : ''
-    }`,
-    size = '19px',
-    onShowBlockChooser,
-  } = props;
-
-  return (
-    <Button
-      icon
-      basic
-      title={intl.formatMessage(messages.addBlock)}
-      onClick={(e) => {
-        e.preventDefault();
-        e.stopPropagation();
-        onShowBlockChooser();
-      }}
-      className={className}
-    >
-      <Icon name={addSVG} className={className} size={size} />
-    </Button>
-  );
-};
-
-const BlockChooserButton = (props) => {
-  const {
-    block,
-    allowedBlocks,
-    showRestricted,
-    data,
-    onMutateBlock,
-    onInsertBlock,
-    blocksConfig,
-    buttonComponent,
-    properties,
-  } = props;
-  const { disableNewBlocks } = data;
-  const [addNewBlockOpened, setAddNewBlockOpened] = React.useState(false);
-
-  const blockChooserRef = React.useRef();
-
-  const handleClickOutside = React.useCallback((e) => {
-    if (
-      blockChooserRef.current &&
-      doesNodeContainClick(blockChooserRef.current, e)
-    )
-      return;
-    setAddNewBlockOpened(false);
-  }, []);
-
-  const Component = buttonComponent || ButtonComponent;
-
-  React.useEffect(() => {
-    document.addEventListener('mousedown', handleClickOutside, false);
-    return () => {
-      document.removeEventListener('mousedown', handleClickOutside, false);
-    };
-  }, [handleClickOutside]);
-
-  const [referenceElement, setReferenceElement] = React.useState(null);
-  const [popperElement, setPopperElement] = React.useState(null);
-  const { styles, attributes } = usePopper(referenceElement, popperElement, {
-    placement: config.experimental.addBlockButton.enabled
-      ? 'bottom'
-      : 'right-start',
-    modifiers: [
-      {
-        name: 'offset',
-        options: {
-          offset: [-10, 5],
-        },
-      },
-      {
-        name: 'flip',
-        options: {
-          fallbackPlacements: ['right-end', 'top-start'],
-        },
-      },
-    ],
-  });
-
-  return (
-    <>
-      {!disableNewBlocks &&
-        (config.experimental.addBlockButton.enabled ||
-          !blockHasValue(data)) && (
-          <Ref innerRef={setReferenceElement}>
-            <Component
-              {...props}
-              onShowBlockChooser={() => setAddNewBlockOpened(true)}
-            />
-          </Ref>
-        )}
-      {addNewBlockOpened && (
-        <Portal node={document.getElementById('body')}>
-          <div
-            ref={setPopperElement}
-            style={{ ...styles.popper, zIndex: 1000 }}
-            {...attributes.popper}
-          >
-            <BlockChooser
-              onMutateBlock={
-                onMutateBlock
-                  ? (id, value) => {
-                      setAddNewBlockOpened(false);
-                      onMutateBlock(id, value);
-                    }
-                  : null
-              }
-              onInsertBlock={
-                onInsertBlock
-                  ? (id, value) => {
-                      setAddNewBlockOpened(false);
-                      onInsertBlock(id, value);
-                    }
-                  : null
-              }
-              currentBlock={block}
-              allowedBlocks={allowedBlocks}
-              blocksConfig={blocksConfig}
-              properties={properties}
-              showRestricted={showRestricted}
-              ref={blockChooserRef}
-            />
-          </div>
-        </Portal>
-      )}
-    </>
-  );
-};
-
-export default BlockChooserButton;