@plone/volto 19.0.0-alpha.2 → 19.0.0-alpha.3

package/src/actions/controlpanels/controlpanels.js

@@ -12,6 +12,8 @@ import {
   SYSTEM_INFORMATION,
   DATABASE_INFORMATION,
 } from '@plone/volto/constants/ActionTypes';
+import { getSite } from '@plone/volto/actions/site/site';
+
 /**
  * Get controlpanel function.
  * @function getControlpanel
@@ -86,13 +88,17 @@ export function listControlpanels() {
  * @returns {Object} Update controlpanel action.
  */
 export function updateControlpanel(url, data) {
-  return {
-    type: UPDATE_CONTROLPANEL,
-    request: {
-      op: 'patch',
-      path: url,
-      data,
-    },
+  return (dispatch) => {
+    dispatch({
+      type: UPDATE_CONTROLPANEL,
+      request: {
+        op: 'patch',
+        path: url,
+        data,
+      },
+    }).then(() => {
+      dispatch(getSite());
+    });
   };
 }
 

package/src/actions/controlpanels/controlpanels.test.js

@@ -35,12 +35,18 @@ describe('Controlpanels action', () => {
     it('should create an action to update a controlpanel', () => {
       const url = 'http://localhost';
       const data = 'Hello World!';
-      const action = updateControlpanel(url, data);
 
-      expect(action.type).toEqual(UPDATE_CONTROLPANEL);
-      expect(action.request.op).toEqual('patch');
-      expect(action.request.path).toEqual(url);
-      expect(action.request.data).toEqual(data);
+      const dispatch = vi.fn().mockResolvedValue();
+      updateControlpanel(url, data)(dispatch);
+
+      expect(dispatch).toHaveBeenCalledWith({
+        type: UPDATE_CONTROLPANEL,
+        request: {
+          op: 'patch',
+          path: url,
+          data,
+        },
+      });
     });
   });
 });

package/src/actions/users/users.js

@@ -3,7 +3,7 @@
  * @module actions/users/users
  */
 
-import { stringify } from 'query-string';
+import qs from 'query-string';
 
 import {
   CREATE_USER,
@@ -92,7 +92,7 @@ export function listUsers(options = {}) {
 
   let filterarg =
     groups_filter.length > 0
-      ? stringify(
+      ? qs.stringify(
           { 'groups-filter': groups_filter },
           { arrayFormat: 'colon-list-separator' },
         )

package/src/components/manage/Add/Add.jsx

@@ -223,11 +223,10 @@ class Add extends Component {
         ? keys(this.props.schema.definitions)
         : null,
       '@type': this.props.type,
-      ...(config.settings.isMultilingual &&
-        this.props.location?.state?.translationOf && {
-          translation_of: this.props.location.state.translationOf,
-          language: this.props.location.state.language,
-        }),
+      ...(this.props.location?.state?.translationOf && {
+        translation_of: this.props.location.state.translationOf,
+        language: this.props.location.state.language,
+      }),
     });
   }
 
@@ -348,7 +347,7 @@ class Add extends Component {
         <div id="page-add">
           <Helmet
             title={this.props.intl.formatMessage(messages.add, {
-              type: this.props.type,
+              type: this.props?.schema?.title || this.props.type,
             })}
           />
           <Form

package/src/components/manage/Blocks/Block/Edit.jsx

@@ -187,6 +187,7 @@ export class Edit extends Component {
               selected: this.props.selected || this.props.multiSelected,
               multiSelected: this.props.multiSelected,
               hovered: this.props.hovered === this.props.id,
+              error: !!this.props.blocksErrors?.[this.props.id],
             })}
             style={{ outline: 'none' }}
             ref={this.blockNode}

package/src/components/manage/Blocks/Teaser/schema.js

@@ -22,9 +22,13 @@ const messages = defineMessages({
     id: 'Description',
     defaultMessage: 'Description',
   },
-  head_title: {
+  kicker: {
     id: 'head_title',
-    defaultMessage: 'Head title',
+    defaultMessage: 'Kicker',
+  },
+  kicker_description: {
+    id: 'The kicker is a line of text shown above the title.',
+    defaultMessage: 'The kicker is a line of text shown above the title.',
   },
   teaser: {
     id: 'Teaser',
@@ -88,7 +92,8 @@ export const TeaserSchema = ({ data, intl }) => {
         title: intl.formatMessage(messages.title),
       },
       head_title: {
-        title: intl.formatMessage(messages.head_title),
+        title: intl.formatMessage(messages.kicker),
+        description: intl.formatMessage(messages.kicker_description),
       },
       description: {
         title: intl.formatMessage(messages.description),

package/src/components/manage/Contents/Contents.jsx

@@ -1161,6 +1161,9 @@ class Contents extends Component {
                     onOk={this.onDeleteOk}
                     items={this.state.items}
                     itemsToDelete={this.state.itemsToDelete}
+                    hasMultiplePages={
+                      Math.ceil(this.props.total / this.state.pageSize) > 1
+                    }
                   />
                   <ContentsUploadModal
                     open={this.state.showUpload}

package/src/components/manage/Contents/Contents.test.jsx

@@ -105,6 +105,13 @@ describe('Contents', () => {
           Type: 'Type',
         },
       },
+      navroot: {
+        data: {
+          navroot: {
+            '@type': 'Plone Site',
+          },
+        },
+      },
     });
     const { container } = render(
       <Provider store={store}>

package/src/components/manage/Contents/ContentsBreadcrumbs.Multilingual.test.jsx

@@ -3,14 +3,9 @@ import renderer from 'react-test-renderer';
 import configureStore from 'redux-mock-store';
 import { Provider } from 'react-intl-redux';
 import { MemoryRouter } from 'react-router-dom';
-import config from '@plone/volto/registry';
 
 import ContentsBreadcrumbs from './ContentsBreadcrumbs';
 
-beforeAll(() => {
-  config.settings.isMultilingual = true;
-});
-
 const mockStore = configureStore();
 
 describe('ContentsBreadcrumbs Multilingual', () => {
@@ -24,6 +19,15 @@ describe('ContentsBreadcrumbs Multilingual', () => {
         locale: 'en',
         messages: {},
       },
+      navroot: {
+        data: {
+          navroot: {
+            '@type': 'LRF',
+            '@id': '/en',
+            title: 'English',
+          },
+        },
+      },
     });
     const component = renderer.create(
       <Provider store={store}>
@@ -49,6 +53,15 @@ describe('ContentsBreadcrumbs Multilingual', () => {
         locale: 'en',
         messages: {},
       },
+      navroot: {
+        data: {
+          navroot: {
+            '@type': 'LRF',
+            '@id': '/en',
+            title: 'English',
+          },
+        },
+      },
     });
     const component = renderer.create(
       <Provider store={store}>

package/src/components/manage/Contents/ContentsBreadcrumbs.jsx

@@ -1,13 +1,11 @@
 import React from 'react';
 import { Breadcrumb } from 'semantic-ui-react';
-import { Link, useLocation } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 import { defineMessages, useIntl } from 'react-intl';
-import langmap from '@plone/volto/helpers/LanguageMap/LanguageMap';
+import { useSelector } from 'react-redux';
 import ContentsBreadcrumbsRootItem from '@plone/volto/components/manage/Contents/ContentsBreadcrumbsRootItem';
 import ContentsBreadcrumbsHomeItem from '@plone/volto/components/manage/Contents/ContentsBreadcrumbsHomeItem';
 
-import config from '@plone/volto/registry';
-
 const messages = defineMessages({
   home: {
     id: 'Home',
@@ -20,15 +18,22 @@ const messages = defineMessages({
 });
 
 const ContentsBreadcrumbs = (props) => {
-  const { settings } = config;
   const { items } = props;
   const intl = useIntl();
-  const pathname = useLocation().pathname;
-  const lang = pathname.split('/')[1];
+  const navroot = useSelector((state) => state.navroot.data.navroot);
+  const navrootIsPortal = navroot?.['@type'] === 'Plone Site';
 
   return (
     <Breadcrumb>
-      {settings.isMultilingual && (
+      {navrootIsPortal ? (
+        <Link
+          to="/contents"
+          className="section"
+          title={intl.formatMessage(messages.home)}
+        >
+          <ContentsBreadcrumbsHomeItem />
+        </Link>
+      ) : (
         <>
           <Link
             to="/contents"
@@ -38,26 +43,15 @@ const ContentsBreadcrumbs = (props) => {
             <ContentsBreadcrumbsRootItem />
           </Link>
           <Breadcrumb.Divider />
+          <Link
+            to={`${navroot['@id']}/contents`}
+            className="section"
+            title={navroot.title}
+          >
+            {navroot.title}
+          </Link>
         </>
       )}
-      {settings.isMultilingual && pathname?.split('/')?.length > 2 && (
-        <Link
-          to={`/${lang}/contents`}
-          className="section"
-          title={intl.formatMessage(messages.home)}
-        >
-          {langmap?.[lang]?.nativeName ?? lang}
-        </Link>
-      )}
-      {!settings.isMultilingual && (
-        <Link
-          to="/contents"
-          className="section"
-          title={intl.formatMessage(messages.home)}
-        >
-          <ContentsBreadcrumbsHomeItem />
-        </Link>
-      )}
       {items.map((breadcrumb, index, breadcrumbs) => [
         <Breadcrumb.Divider key={`divider-${breadcrumb.url}`} />,
         index < breadcrumbs.length - 1 ? (

package/src/components/manage/Contents/ContentsBreadcrumbs.test.jsx

@@ -19,6 +19,13 @@ describe('ContentsBreadcrumbs', () => {
         locale: 'en',
         messages: {},
       },
+      navroot: {
+        data: {
+          navroot: {
+            '@type': 'Plone Site',
+          },
+        },
+      },
     });
     const component = renderer.create(
       <Provider store={store}>
@@ -44,6 +51,13 @@ describe('ContentsBreadcrumbs', () => {
         locale: 'en',
         messages: {},
       },
+      navroot: {
+        data: {
+          navroot: {
+            '@type': 'Plone Site',
+          },
+        },
+      },
     });
     const component = renderer.create(
       <Provider store={store}>