@plone/volto 16.31.5 → 16.31.6

package/.changelog.draft

@@ -1,12 +1,7 @@
-## 16.31.5 (2024-05-06)
+## 16.31.6 (2024-05-09)
 
 ### Bugfix
 
-- Fix image disappears after pressing the Enter key on title field in image content-type. @iFlameing [#5973](https://github.com/plone/volto/issues/5973)
-- Fix 301 and 302 redirects. @robgietema [#6001](https://github.com/plone/volto/issues/6001)
-
-### Documentation
-
-- Block search engines from indexing content on Netlify preview builds. @stevepiercy [#5916](https://github.com/plone/volto/issues/5916)
+- Revert "Fix 301 and 302 redirects" which was not working correctly. @davisagli [#6009](https://github.com/plone/volto/issues/6009)
 
 

package/CHANGELOG.md

@@ -8,6 +8,12 @@
 
 <!-- towncrier release notes start -->
 
+## 16.31.6 (2024-05-09)
+
+### Bugfix
+
+- Revert "Fix 301 and 302 redirects" which was not working correctly. @davisagli [#6009](https://github.com/plone/volto/issues/6009)
+
 ## 16.31.5 (2024-05-06)
 
 ### Bugfix

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "16.31.5",
+  "version": "16.31.6",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"

package/packages/volto-slate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plone/volto-slate",
-  "version": "16.31.5",
+  "version": "16.31.6",
   "description": "Slate.js integration with Volto",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/components/theme/View/View.jsx

@@ -206,11 +206,6 @@ class View extends Component {
     if (this.props.error && this.props.error.code === 301) {
       const redirect = flattenToAppURL(this.props.error.url).split('?')[0];
       return <Redirect to={`${redirect}${this.props.location.search}`} />;
-    } else if (this.props.error && this.props.error.status === 302) {
-      const redirect = flattenToAppURL(
-        this.props.error.response.header.location,
-      ).split('?')[0];
-      return <Redirect to={`${redirect}${this.props.location.search}`} />;
     } else if (this.props.error && !this.props.connectionRefused) {
       let FoundView;
       if (this.props.error.status === undefined) {

package/src/helpers/Api/Api.js

@@ -54,7 +54,7 @@ class Api {
       ) => {
         let request;
         let promise = new Promise((resolve, reject) => {
-          request = superagent[method](formatUrl(path)).redirects(0);
+          request = superagent[method](formatUrl(path));
 
           if (params) {
             request.query(params);

package/src/helpers/Api/Api.plone.rest.test.js

@@ -3,14 +3,12 @@ import Api from './Api';
 
 jest.mock('superagent', () => ({
   get: jest.fn((url) => ({
-    redirects: jest.fn(() => ({
-      url,
-      query: jest.fn(),
-      set: jest.fn(),
-      type: jest.fn(),
-      send: jest.fn(),
-      end: jest.fn(),
-    })),
+    url,
+    query: jest.fn(),
+    set: jest.fn(),
+    type: jest.fn(),
+    send: jest.fn(),
+    end: jest.fn(),
   })),
 }));
 

package/src/helpers/Api/Api.test.js

@@ -9,14 +9,12 @@ import Api from './Api';
 
 jest.mock('superagent', () => ({
   get: jest.fn((url) => ({
-    redirects: jest.fn(() => ({
-      url,
-      query: jest.fn(),
-      set: jest.fn(),
-      type: jest.fn(),
-      send: jest.fn(),
-      end: jest.fn(),
-    })),
+    url,
+    query: jest.fn(),
+    set: jest.fn(),
+    type: jest.fn(),
+    send: jest.fn(),
+    end: jest.fn(),
   })),
 }));