@plone/volto 16.32.1 → 16.34.0

package/src/components/manage/Controlpanels/Aliases.test.jsx

@@ -58,6 +58,13 @@ describe('Aliases', () => {
         locale: 'en',
         messages: {},
       },
+      site: {
+        data: {
+          features: {
+            filter_aliases_by_date: true,
+          },
+        },
+      },
     });
     const component = renderer.create(
       <Provider store={store}>

package/src/components/manage/Form/ModalForm.jsx

@@ -69,6 +69,7 @@ class ModalForm extends Component {
       required: PropTypes.arrayOf(PropTypes.string),
     }).isRequired,
     title: PropTypes.string.isRequired,
+    description: PropTypes.objectOf(PropTypes.any),
     formData: PropTypes.objectOf(PropTypes.any),
     submitError: PropTypes.string,
     onSubmit: PropTypes.func.isRequired,
@@ -210,7 +211,7 @@ class ModalForm extends Component {
    * @returns {string} Markup for the component.
    */
   render() {
-    const { schema, onCancel } = this.props;
+    const { schema, onCancel, description } = this.props;
     const currentFieldset = schema.fieldsets[this.state.currentTab];
 
     const fields = map(currentFieldset.fields, (field) => ({
@@ -244,6 +245,7 @@ class ModalForm extends Component {
             onSubmit={this.onSubmit}
             error={state_errors || Boolean(this.props.submitError)}
           >
+            {description}
             <Message error>
               {state_errors ? (
                 <FormattedMessage

package/src/components/theme/AlternateHrefLangs/AlternateHrefLangs.jsx

@@ -0,0 +1,23 @@
+import config from '@plone/volto/registry';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+
+const AlternateHrefLangs = (props) => {
+  const { content } = props;
+  return (
+    <Helmet>
+      {config.settings.isMultilingual &&
+        content['@components']?.translations?.items?.map((item, key) => {
+          return (
+            <link
+              key={key}
+              rel="alternate"
+              hrefLang={item.language}
+              href={item['@id']}
+            />
+          );
+        })}
+    </Helmet>
+  );
+};
+
+export { AlternateHrefLangs };

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

@@ -0,0 +1,135 @@
+import React from 'react';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+
+import renderer from 'react-test-renderer';
+import configureStore from 'redux-mock-store';
+import { Provider } from 'react-intl-redux';
+import config from '@plone/volto/registry';
+
+import { AlternateHrefLangs } from './AlternateHrefLangs';
+
+const mockStore = configureStore();
+
+describe('AlternateHrefLangs', () => {
+  beforeEach(() => {});
+  it('non multilingual site, renders nothing', () => {
+    config.settings.isMultilingual = false;
+    const content = {
+      '@id': '/',
+      '@components': {},
+    };
+    const store = mockStore({
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+    });
+    // We need to force the component rendering
+    // to fill the Helmet
+    renderer.create(
+      <Provider store={store}>
+        <AlternateHrefLangs content={content} />
+      </Provider>,
+    );
+
+    const helmetLinks = Helmet.peek().linkTags;
+    expect(helmetLinks.length).toBe(0);
+  });
+  it('multilingual site, with some translations', () => {
+    config.settings.isMultilingual = true;
+    config.settings.supportedLanguages = ['en', 'es', 'eu'];
+
+    const content = {
+      '@components': {
+        translations: {
+          items: [
+            { '@id': '/en', language: 'en' },
+            { '@id': '/es', language: 'es' },
+          ],
+        },
+      },
+    };
+
+    const store = mockStore({
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+    });
+
+    // We need to force the component rendering
+    // to fill the Helmet
+    renderer.create(
+      <Provider store={store}>
+        <>
+          <AlternateHrefLangs content={content} />
+        </>
+      </Provider>,
+    );
+    const helmetLinks = Helmet.peek().linkTags;
+
+    expect(helmetLinks.length).toBe(2);
+
+    expect(helmetLinks).toContainEqual({
+      rel: 'alternate',
+      href: '/es',
+      hrefLang: 'es',
+    });
+    expect(helmetLinks).toContainEqual({
+      rel: 'alternate',
+      href: '/en',
+      hrefLang: 'en',
+    });
+  });
+  it('multilingual site, with all available translations', () => {
+    config.settings.isMultilingual = true;
+    config.settings.supportedLanguages = ['en', 'es', 'eu'];
+    const store = mockStore({
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+    });
+
+    const content = {
+      '@components': {
+        translations: {
+          items: [
+            { '@id': '/en', language: 'en' },
+            { '@id': '/eu', language: 'eu' },
+            { '@id': '/es', language: 'es' },
+          ],
+        },
+      },
+    };
+
+    // We need to force the component rendering
+    // to fill the Helmet
+    renderer.create(
+      <Provider store={store}>
+        <AlternateHrefLangs content={content} />
+      </Provider>,
+    );
+
+    const helmetLinks = Helmet.peek().linkTags;
+
+    // We expect having 3 links
+    expect(helmetLinks.length).toBe(3);
+
+    expect(helmetLinks).toContainEqual({
+      rel: 'alternate',
+      href: '/eu',
+      hrefLang: 'eu',
+    });
+    expect(helmetLinks).toContainEqual({
+      rel: 'alternate',
+      href: '/es',
+      hrefLang: 'es',
+    });
+    expect(helmetLinks).toContainEqual({
+      rel: 'alternate',
+      href: '/en',
+      hrefLang: 'en',
+    });
+  });
+});

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

@@ -18,6 +18,7 @@ import {
   Tags,
   Toolbar,
 } from '@plone/volto/components';
+import { AlternateHrefLangs } from '@plone/volto/components/theme/AlternateHrefLangs/AlternateHrefLangs';
 import { listActions, getContent } from '@plone/volto/actions';
 import {
   BodyClass,
@@ -236,6 +237,7 @@ class View extends Component {
     return (
       <div id="view">
         <ContentMetadataTags content={this.props.content} />
+        <AlternateHrefLangs content={this.props.content} />
         {/* Body class if displayName in component is set */}
         <BodyClass
           className={

package/src/constants/ActionTypes.js

@@ -135,6 +135,7 @@ export const MOVE_CONTENT_RULE = 'MOVE_CONTENT_RULE';
 export const GET_ALIASES = 'GET_ALIASES';
 export const ADD_ALIASES = 'ADD_ALIASES';
 export const REMOVE_ALIASES = 'REMOVE_ALIASES';
+export const UPLOAD_ALIASES = 'UPLOAD_ALIASES';
 export const GET_USERSCHEMA = 'GET_USERSCHEMA';
 export const GET_UPGRADE = 'GET_UPGRADE';
 export const POST_UPGRADE = 'POST_UPGRADE';

package/src/express-middleware/devproxy.js

@@ -10,8 +10,13 @@ import querystring from 'querystring';
 import { parse as parseUrl } from 'url';
 
 const filter = function (pathname, req) {
-  // This is the proxy to the API in case the accept header is 'application/json'
-  return config.settings.devProxyToApiPath && pathname.startsWith('/++api++');
+  // Check if pathname is defined, there are some corner cases that pathname is null
+  if (pathname) {
+    // This is the proxy to the API in case the accept header is 'application/json'
+    return config.settings.devProxyToApiPath && pathname.startsWith('/++api++');
+  } else {
+    return false;
+  }
 };
 
 let _env = null;

package/src/helpers/Api/Api.js

@@ -50,7 +50,14 @@ class Api {
     methods.forEach((method) => {
       this[method] = (
         path,
-        { params, data, type, headers = {}, checkUrl = false } = {},
+        {
+          params,
+          data,
+          type,
+          headers = {},
+          checkUrl = false,
+          attach = [],
+        } = {},
       ) => {
         let request;
         let promise = new Promise((resolve, reject) => {
@@ -88,6 +95,10 @@ class Api {
             request.send(data);
           }
 
+          attach.forEach((attachment) => {
+            request.attach.apply(request, attachment);
+          });
+
           request.end((err, response) => {
             if (
               checkUrl &&

package/src/middleware/api.js

@@ -170,6 +170,7 @@ const apiMiddlewareFactory = (api) => ({ dispatch, getState }) => (next) => (
                   checkUrl: settings.actions_raising_api_errors.includes(
                     action.type,
                   ),
+                  attach: item.attach,
                 },
               ).then((reqres) => {
                 return [...acc, reqres];
@@ -186,6 +187,7 @@ const apiMiddlewareFactory = (api) => ({ dispatch, getState }) => (next) => (
                 checkUrl: settings.actions_raising_api_errors.includes(
                   action.type,
                 ),
+                attach: item.attach,
               }),
             ),
           )
@@ -195,6 +197,7 @@ const apiMiddlewareFactory = (api) => ({ dispatch, getState }) => (next) => (
           headers: request.headers,
           params: request.params,
           checkUrl: settings.actions_raising_api_errors.includes(action.type),
+          attach: request.attach,
         });
     actionPromise.then(
       (result) => {

package/.python-version

@@ -1 +0,0 @@
-3.9.13

package/packages/README.md

@@ -1,7 +0,0 @@
-# Packages
-
-This directory is intended to contain packages related to Volto ecosystem.
-
-It was never intended to convert this repo in a monorepo.
-
-Main Volto package is still located in the root, and it's intended to continue doing so.