Skip to content

Commit

Permalink
Merge branch 'main' into us_51846_download_link_on_file_widget_filename
Browse files Browse the repository at this point in the history
  • Loading branch information
pnicolli committed Mar 19, 2024
2 parents 2674fe4 + c21f65b commit b592321
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 19 deletions.
32 changes: 32 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,37 @@


## [11.7.0](https://github.com/redturtle/design-comuni-plone-theme/compare/v11.6.2...v11.7.0) (2024-03-15)


### Features

* editable footer top ([#528](https://github.com/redturtle/design-comuni-plone-theme/issues/528)) ([542e2ec](https://github.com/redturtle/design-comuni-plone-theme/commit/542e2ecc95be9b182f7d9f6b45ef893852587022))
* update volto-feedback 0.3.0 ([3d9dfbe](https://github.com/redturtle/design-comuni-plone-theme/commit/3d9dfbe16111065ec04924430a6d3487ab6d1b05))
* updated volto-form-block to fix multiple form in same page and added schema field custom validator ([#586](https://github.com/redturtle/design-comuni-plone-theme/issues/586)) ([407ae18](https://github.com/redturtle/design-comuni-plone-theme/commit/407ae18d876f6d5ada3095a2990ccbe3727ba06e))
* view error for each form field, validate form config ([#578](https://github.com/redturtle/design-comuni-plone-theme/issues/578)) ([45e2f72](https://github.com/redturtle/design-comuni-plone-theme/commit/45e2f727ac6ea5f23f57661a1acef83f94b19a2e))


### Bug Fixes

* added condition for focus when going back within feedback form ([#588](https://github.com/redturtle/design-comuni-plone-theme/issues/588)) ([7911d89](https://github.com/redturtle/design-comuni-plone-theme/commit/7911d892e04fcb5584ba52d180f8bb79768d5c28))
* button clear in form block ([68c8bf8](https://github.com/redturtle/design-comuni-plone-theme/commit/68c8bf85183edfeb53cd5525327d6210fae18df3))
* button type of cancel button in form block ([9a10ff8](https://github.com/redturtle/design-comuni-plone-theme/commit/9a10ff8f40b20753c9400ceb6909e3ff5a543805))
* default value for show_type in card-with-image-template ([#579](https://github.com/redturtle/design-comuni-plone-theme/issues/579)) ([fe95462](https://github.com/redturtle/design-comuni-plone-theme/commit/fe95462a49e99c5a442023d727676b485ab8edfe))
* imaged full width view in edit mode ([#570](https://github.com/redturtle/design-comuni-plone-theme/issues/570)) ([053183b](https://github.com/redturtle/design-comuni-plone-theme/commit/053183baea2ce3e11b365bf29559ea532af33fc1))
* restored right border in listing block small links template ([#582](https://github.com/redturtle/design-comuni-plone-theme/issues/582)) ([beb07ad](https://github.com/redturtle/design-comuni-plone-theme/commit/beb07ad251cb5e5b96c67c6a64ac01ea3f229526))
* update volto-form-block for subdomain mail validation ([#584](https://github.com/redturtle/design-comuni-plone-theme/issues/584)) ([92939a2](https://github.com/redturtle/design-comuni-plone-theme/commit/92939a28e59d829e05423f83dc0564b9c008692e))


### Maintenance

* Update RELEASE.md ([f308e6b](https://github.com/redturtle/design-comuni-plone-theme/commit/f308e6bf000ca0d41ccfd63557f73b1372ab8faa))


### Documentation

* fix merge mistake in the release docs ([232af7a](https://github.com/redturtle/design-comuni-plone-theme/commit/232af7a1624724e60722c346533223bea95fd8be))
* updated publiccode and release log ([3e48692](https://github.com/redturtle/design-comuni-plone-theme/commit/3e48692faa06bf6fff7ee16a06032e1b1e7dd782))

## [11.6.2](https://github.com/redturtle/design-comuni-plone-theme/compare/v11.6.1...v11.6.2) (2024-03-08)


Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ Si veda ad esempio:
- [Comune di Piacenza](https://www.comune.piacenza.it/)
- [Comune di Prignano sulla Secchia](https://www.comune.prignano.mo.it/)
- [Comune di Reggio Emilia](https://www.comune.re.it/)
- [Comune di Rolo](https://www.comune.rolo.re.it/)
- [Comune di San Felice sul Panaro](https://www.comune.sanfelice.mo.it/)
- [Comune di San Lazzaro di Savena](https://www.comune.sanlazzaro.bo.it)
- [Comune di San Polo d'Enza](https://www.comune.sanpolodenza.re.it/)
Expand Down
6 changes: 4 additions & 2 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@
- ...
-->

## Versione X.X.X (xx/xx/xxxx)
## Versione 11.7.0 (15/03/2024)

### Novità

- Ora la fascia del footer contenente il logo e il nome del sito è configurabile da pannello di controllo
- Ora la fascia del footer contenente il logo e il nome del sito è configurabile da pannello di controllo.
- Nel pannello di controllo dei Feedback, ora gli utenti con permesso di eliminare elementi da questa sezione, possono eliminare i feedback.
- E' possibile scaricare il file o l'immagine caricata dal widget di upload file cliccando sul nome del file stesso.

Expand All @@ -56,6 +56,8 @@
### Fix

- Il bordo destro della variazione Link solo immagine del blocco Elenco è stato ripristinato.
- Se si mettono due blocchi Form nella stessa pagina, ora funzionano correttamente.
- Aggiustato il modulo di Feedback quando si cambia valutazione dopo averne già selezionata un'altra.

## Versione 11.6.1 (06/03/2024)

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "design-comuni-plone-theme",
"description": "Volto Theme for Italia design guidelines",
"license": "GPL-v3",
"version": "11.6.2",
"version": "11.7.0",
"main": "src/index.js",
"keywords": [
"volto-addon",
Expand Down Expand Up @@ -146,11 +146,11 @@
"volto-dropdownmenu": "4.1.1",
"volto-editablefooter": "5.1.0",
"volto-feedback": "0.3.0",
"volto-form-block": "3.4.1",
"volto-form-block": "3.7.0",
"volto-gdpr-privacy": "2.1.1",
"volto-google-analytics": "2.0.0",
"volto-multilingual-widget": "3.0.0",
"volto-querywidget-with-browser": "0.4.1",
"volto-querywidget-with-browser": "0.4.2",
"volto-rss-block": "3.0.0",
"volto-secondarymenu": "4.0.0",
"volto-social-settings": "3.0.0",
Expand Down
5 changes: 3 additions & 2 deletions publiccode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,9 @@ maintenance:
name: io-Comune - Il sito AgID per Comuni ed Enti Pubblici
platforms:
- web
releaseDate: '2024-03-08'
releaseDate: '2024-03-15'
softwareType: standalone/web
softwareVersion: 11.6.2
softwareVersion: 11.7.0
url: 'https://github.com/italia/design-comuni-plone-theme'
usedBy:
- ASP Comuni Modenesi Area Nord
Expand Down Expand Up @@ -277,6 +277,7 @@ usedBy:
- Comune di Piacenza
- Comune di Prignano
- Comune di Reggio Emilia
- Comune di Rolo
- Comune di San Felice sul Panaro
- Comune di San Lazzaro di Savena
- Comune di San Polo d'Enza
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,9 @@ const FeedbackForm = ({ contentType, pathname }) => {
satisfaction > threshold ? 'positive' : 'negative'
}-${getFormFieldValue('answer')}`,
);
selectedAnswer.focus();
if (selectedAnswer) {
selectedAnswer.focus();
}
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [step]);
Expand Down
8 changes: 7 additions & 1 deletion src/customizations/volto-form-block/components/Edit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,13 @@ class Edit extends SubblocksEdit {

return (
<div className="public-ui">
<ValidateConfigForm data={this.props.data} onEdit={true}>
<ValidateConfigForm
data={this.props.data}
onEdit={true}
onChangeBlock={(data) => {
this.props.onChangeBlock(this.props.block, data);
}}
>
<div className="px-4 py-5">
{this.props?.data?.title && <h2>{this.props.data.title}</h2>}
{this.props?.data?.description && (
Expand Down
20 changes: 10 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6576,11 +6576,11 @@ __metadata:
volto-dropdownmenu: 4.1.1
volto-editablefooter: 5.1.0
volto-feedback: 0.3.0
volto-form-block: 3.4.1
volto-form-block: 3.7.0
volto-gdpr-privacy: 2.1.1
volto-google-analytics: 2.0.0
volto-multilingual-widget: 3.0.0
volto-querywidget-with-browser: 0.4.1
volto-querywidget-with-browser: 0.4.2
volto-rss-block: 3.0.0
volto-secondarymenu: 4.0.0
volto-social-settings: 3.0.0
Expand Down Expand Up @@ -14355,9 +14355,9 @@ __metadata:
languageName: node
linkType: hard

"volto-form-block@npm:3.4.1":
version: 3.4.1
resolution: "volto-form-block@npm:3.4.1"
"volto-form-block@npm:3.7.0":
version: 3.7.0
resolution: "volto-form-block@npm:3.7.0"
dependencies:
"@hcaptcha/react-hcaptcha": ^0.3.6
file-saver: ^2.0.5
Expand All @@ -14366,7 +14366,7 @@ __metadata:
peerDependencies:
"@plone/volto": ">=16.0.0-alpha.38"
volto-subblocks: ^2.0.0
checksum: e12a796f9d86ada239d51e761dff510a5a432aeda2c03f3850e062cf5cf2a92bed308335ec6081a84d132146d7e086a8486fa12df721be9bc49eceb67296144f
checksum: c2289a75f34027be1f8fb6f8a69628f9dfc4b773ed757cad83be7a0f42259e3efdac56d5c17dbaca98aff772abc6a1cff8edaef766fe395ad18270cb36f2cf98
languageName: node
linkType: hard

Expand Down Expand Up @@ -14402,12 +14402,12 @@ __metadata:
languageName: node
linkType: hard

"volto-querywidget-with-browser@npm:0.4.1":
version: 0.4.1
resolution: "volto-querywidget-with-browser@npm:0.4.1"
"volto-querywidget-with-browser@npm:0.4.2":
version: 0.4.2
resolution: "volto-querywidget-with-browser@npm:0.4.2"
peerDependencies:
"@plone/volto": ^17.0.0
checksum: a01eacb7fa67561066f288c7ba18f5af177a88deca142f57c33638eb63bc1894d46ac66f01c6d2e3ea4e4f43479b762a63246a08f6600d665174d55d2a49c207
checksum: 881cede295a8609f1f01d67835533b73f0f8199e3fc2c209f350897b670a40f9c631567dacbbd0db8160a94c36c9b97465e87c2b90a82e2e128619f07658a212
languageName: node
linkType: hard

Expand Down

0 comments on commit b592321

Please sign in to comment.