Merge branch '17.x.x' into newfeat-17-hide-show-blocks

plone · Jan 14, 2025 · d70ac03 · d70ac03
2 parents eaa2c63 + 9b1b271
commit d70ac03
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,12 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 17.20.4 (2025-01-07)
+
+### Bugfix
+
+- Fixed folder contents issues with persistent selection across page changes. @pnicolli [#6555](https://github.com/plone/volto/issues/6555)
+
 ## 17.20.3 (2024-12-12)
 
 ### Bugfix

diff --git a/docs/source/release-notes/index.md b/docs/source/release-notes/index.md
@@ -17,6 +17,12 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 17.20.4 (2025-01-07)
+
+### Bugfix
+
+- Fixed folder contents issues with persistent selection across page changes. @pnicolli [#6555](https://github.com/plone/volto/issues/6555)
+
 ## 17.20.3 (2024-12-12)
 
 ### Bugfix

diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "17.20.3",
+  "version": "17.20.4",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"

diff --git a/packages/volto-slate/package.json b/packages/volto-slate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@plone/volto-slate",
-  "version": "17.20.3",
+  "version": "17.20.4",
   "description": "Slate.js integration with Volto",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

diff --git a/src/components/manage/Contents/Contents.jsx b/src/components/manage/Contents/Contents.jsx
@@ -457,6 +457,7 @@ class Contents extends Component {
       this.setState(
         {
           currentPage: 0,
+          selected: [],
         },
         () =>
           this.setState({ filter: '' }, () =>
@@ -650,6 +651,7 @@ class Contents extends Component {
     this.setState(
       {
         currentPage: value,
+        selected: [],
       },
       () => this.fetchContents(),
     );
@@ -667,6 +669,7 @@ class Contents extends Component {
       {
         pageSize: value,
         currentPage: 0,
+        selected: [],
       },
       () => this.fetchContents(),
     );
@@ -726,6 +729,7 @@ class Contents extends Component {
     this.setState({
       sort_on: values[0],
       sort_order: values[1],
+      selected: [],
     });
     this.props.sortContent(
       getBaseUrl(this.props.pathname),
@@ -753,6 +757,7 @@ class Contents extends Component {
         this.setState(
           {
             currentPage: 0,
+            selected: [],
           },
           () => this.fetchContents(),
         );
@@ -778,6 +783,7 @@ class Contents extends Component {
         this.setState(
           {
             currentPage: 0,
+            selected: [],
           },
           () => this.fetchContents(),
         );