@plone/volto 17.18.0 → 17.18.2

package/CHANGELOG.md

@@ -17,6 +17,18 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 17.18.2 (2024-07-10)
+
+### Bugfix
+
+- Return a redirect response from Volto server-side rendering if the API request was redirected. @JeffersonBledsoe @mamico [#4854](https://github.com/plone/volto/issues/4854)
+
+## 17.18.1 (2024-06-29)
+
+### Bugfix
+
+- In the Slate text block, the markup shortcuts for heading and blockquote work again. @kHAPPY2004 [#5452](https://github.com/plone/volto/issues/5452)
+
 ## 17.18.0 (2024-06-28)
 
 ### Feature

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "17.18.0",
+  "version": "17.18.2",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"
@@ -187,7 +187,8 @@
     "hooks": {
       "before:bump": [
         "yarn i18n",
-        "yarn build:types"
+        "yarn build:types",
+        "git add types"
       ],
       "after:bump": [
         "pipx run towncrier build --draft --yes --version ${version} > .changelog.draft && pipx run towncrier build --yes --version ${version}",

package/packages/volto-slate/package.json

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

package/packages/volto-slate/src/constants.js

@@ -22,6 +22,9 @@ export const P = 'p';
 export const LI = 'li';
 export const UL = 'ul';
 export const OL = 'ol';
+export const H2 = 'h2';
+export const H3 = 'h3';
+export const BLOCKQUOTE = 'blockquote';
 
 // dom parsing node information
 export const TEXT_NODE = 3;

package/packages/volto-slate/src/editor/plugins/Markdown/constants.js

@@ -1,6 +1,6 @@
 import { toggleList, unwrapList } from './utils';
 import { isBlockActive } from '@plone/volto-slate/utils';
-import { UL, OL, LI } from '@plone/volto-slate/constants';
+import { UL, OL, LI, H2, H3, BLOCKQUOTE } from '@plone/volto-slate/constants';
 
 /**
  * Uses the old toggleList function to toggle lists on or off or from a type to another.
@@ -22,11 +22,11 @@ export const localToggleList = (editor, format) => {
  */
 export const autoformatRules = [
   {
-    type: 'h2',
+    type: H2,
     markup: '#',
   },
   {
-    type: 'h3',
+    type: H3,
     markup: '##',
   },
   {
@@ -44,7 +44,7 @@ export const autoformatRules = [
     },
   },
   {
-    type: 'blockquote',
+    type: BLOCKQUOTE,
     markup: ['>'],
     // preFormat,
   },

package/packages/volto-slate/src/editor/plugins/Markdown/extensions.js

@@ -200,6 +200,7 @@ export const autoformatBlock = (editor, type, at, { preFormat, format }) => {
     Transforms.setNodes(
       editor,
       { type },
+      { at },
       { match: (n) => Editor.isBlock(editor, n) },
     );
   } else {

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

@@ -205,8 +205,10 @@ class View extends Component {
    */
   render() {
     const { views } = config;
-    if (this.props.error && this.props.error.code === 301) {
-      const redirect = flattenToAppURL(this.props.error.url).split('?')[0];
+    if ([301, 302].includes(this.props.error?.code)) {
+      const redirect = flattenToAppURL(this.props.error.url)
+        .split('?')[0]
+        .replace('/++api++', '');
       return <Redirect to={`${redirect}${this.props.location.search}`} />;
     } else if (this.props.error && !this.props.connectionRefused) {
       let FoundView;

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

@@ -22,6 +22,7 @@ beforeAll(() => {
   });
   config.settings.publicURL = 'https://plone.org';
 });
+global.__SERVER__ = true; // eslint-disable-line no-underscore-dangle
 
 const mockStore = configureStore();
 

package/src/helpers/Api/Api.js

@@ -80,6 +80,10 @@ class Api {
 
           Object.keys(headers).forEach((key) => request.set(key, headers[key]));
 
+          if (__SERVER__ && checkUrl && ['get', 'head'].includes(method)) {
+            request.redirects(0);
+          }
+
           if (data) {
             request.send(data);
           }
@@ -104,6 +108,14 @@ class Api {
                 url: request.xhr.responseURL,
               });
             }
+
+            if ([301, 302].includes(err?.status)) {
+              return reject({
+                code: err.status,
+                url: err.response.headers.location,
+              });
+            }
+
             return err ? reject(err) : resolve(response.body || response.text);
           });
         });

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

@@ -18,6 +18,7 @@ beforeAll(() => {
 
 const api = new Api();
 const { settings } = config;
+global.__SERVER__ = true; // eslint-disable-line no-underscore-dangle
 
 test('get request', () => {});
 

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

@@ -24,6 +24,7 @@ beforeAll(() => {
 
 const api = new Api();
 const { settings } = config;
+global.__SERVER__ = true; // eslint-disable-line no-underscore-dangle
 
 test('get request', () => {});