@plone/volto 19.0.0 → 19.1.1

package/src/components/manage/History/History.jsx

@@ -1,13 +1,7 @@
-/**
- * History component.
- * @module components/manage/History/History
- */
-
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
+import { useEffect, useMemo, useCallback } from 'react';
 import Helmet from '@plone/volto/helpers/Helmet/Helmet';
-import { Link } from 'react-router-dom';
-import { connect } from 'react-redux';
+import { Link, useLocation } from 'react-router-dom';
+import { useDispatch, useSelector } from 'react-redux';
 import { compose } from 'redux';
 import {
   Container as SemanticContainer,
@@ -21,7 +15,7 @@ import map from 'lodash/map';
 import reverse from 'lodash/reverse';
 import find from 'lodash/find';
 import { createPortal } from 'react-dom';
-import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
+import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 import { asyncConnect } from '@plone/volto/helpers/AsyncConnect';
 
 import FormattedDate from '@plone/volto/components/theme/FormattedDate/FormattedDate';
@@ -35,6 +29,7 @@ import {
 } from '@plone/volto/actions/history/history';
 import { listActions } from '@plone/volto/actions/actions/actions';
 import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import { useClient } from '@plone/volto/hooks/client/useClient';
 import config from '@plone/volto/registry';
 
 import backSVG from '@plone/volto/icons/back.svg';
@@ -50,321 +45,235 @@ const messages = defineMessages({
   },
 });
 
-/**
- * History class.
- * @class History
- * @extends Component
- */
-class History extends Component {
-  /**
-   * Property types.
-   * @property {Object} propTypes Property types.
-   * @static
-   */
-  static propTypes = {
-    getHistory: PropTypes.func.isRequired,
-    revertHistory: PropTypes.func.isRequired,
-    revertRequest: PropTypes.shape({
-      loaded: PropTypes.bool,
-      loading: PropTypes.bool,
-    }).isRequired,
-    pathname: PropTypes.string.isRequired,
-    entries: PropTypes.arrayOf(
-      PropTypes.shape({
-        transition_title: PropTypes.string,
-        type: PropTypes.string,
-        action: PropTypes.string,
-        state_title: PropTypes.string,
-        time: PropTypes.string,
-        comments: PropTypes.string,
-        actor: PropTypes.shape({ fullname: PropTypes.string }),
-      }),
-    ).isRequired,
-    title: PropTypes.string.isRequired,
-  };
-
-  /**
-   * Constructor
-   * @method constructor
-   * @param {Object} props Component properties
-   * @constructs Workflow
-   */
-  constructor(props) {
-    super(props);
-    this.onRevert = this.onRevert.bind(this);
-    this.state = { isClient: false };
-  }
+const History = (props) => {
+  const { staticContext } = props;
+  const isClient = useClient();
+  const dispatch = useDispatch();
+  const location = useLocation();
+  const pathname = location.pathname;
+  const intl = useIntl();
 
-  /**
-   * Component did mount
-   * @method componentDidMount
-   * @returns {undefined}
-   */
-  componentDidMount() {
-    this.props.getHistory(getBaseUrl(this.props.pathname));
-    this.setState({ isClient: true });
-  }
+  const objectActions = useSelector((state) => state.actions.actions.object);
+  const token = useSelector((state) => state.userSession.token);
+  const entries = useSelector((state) => state.history.entries);
+  const title = useSelector((state) => state.content.data?.title);
 
-  /**
-   * Component will receive props
-   * @method componentWillReceiveProps
-   * @param {Object} nextProps Next properties
-   * @returns {undefined}
-   */
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    if (this.props.revertRequest.loading && nextProps.revertRequest.loaded) {
-      this.props.getHistory(getBaseUrl(this.props.pathname));
-    }
-  }
+  const onRevert = useCallback(
+    (event, { value }) => {
+      const baseUrl = getBaseUrl(pathname);
+      dispatch(revertHistory(baseUrl, value)).then(() => {
+        dispatch(getHistory(baseUrl));
+      });
+    },
+    [dispatch, pathname],
+  );
 
-  /**
-   * On revert
-   * @method onRevert
-   * @param {object} event Event object
-   * @param {number} value Value
-   * @returns {undefined}
-   */
-  onRevert(event, { value }) {
-    this.props.revertHistory(getBaseUrl(this.props.pathname), value);
-  }
+  useEffect(() => {
+    dispatch(getHistory(getBaseUrl(pathname)));
+  }, [dispatch, pathname]);
 
-  processHistoryEntries = () => {
-    // Getting the history entries from the props
-    // No clue why the reverse(concat()) is necessary
-    const entries = reverse(concat(this.props.entries));
-    let title = entries.length > 0 ? entries[0].state_title : '';
-    for (let x = 1; x < entries.length; x += 1) {
-      entries[x].prev_state_title = title;
-      title = entries[x].state_title || title;
+  const processedEntries = useMemo(() => {
+    const result = reverse(concat(entries));
+    let title = result.length > 0 ? result[0].state_title : '';
+    for (let x = 1; x < result.length; x += 1) {
+      result[x].prev_state_title = title;
+      title = result[x].state_title || title;
     }
-    // We reverse them again
-    reverse(entries);
+    reverse(result);
 
-    // We identify the latest 'versioning' entry and mark it
-    const current_version = find(entries, (item) => item.type === 'versioning');
+    const current_version = find(result, (item) => item.type === 'versioning');
     if (current_version) {
       current_version.is_current = true;
     }
-    return entries;
-  };
+    return result;
+  }, [entries]);
 
-  /**
-   * Render method.
-   * @method render
-   * @returns {string} Markup for the component.
-   */
-  render() {
-    const historyAction = find(this.props.objectActions, {
-      id: 'history',
-    });
-    const entries = this.processHistoryEntries();
+  const historyAction = find(objectActions, {
+    id: 'history',
+  });
 
-    const Container =
-      config.getComponent({ name: 'Container' }).component || SemanticContainer;
+  const Container =
+    config.getComponent({ name: 'Container' }).component || SemanticContainer;
 
-    return !historyAction ? (
-      <>
-        {this.props.token ? (
-          <Forbidden
-            pathname={this.props.pathname}
-            staticContext={this.props.staticContext}
+  return !historyAction ? (
+    <>
+      {token ? (
+        <Forbidden pathname={pathname} staticContext={staticContext} />
+      ) : (
+        <Unauthorized pathname={pathname} staticContext={staticContext} />
+      )}
+    </>
+  ) : (
+    <Container id="page-history">
+      <Helmet title={intl.formatMessage(messages.history)} />
+      <Segment.Group raised>
+        <Segment className="primary">
+          <FormattedMessage
+            id="History of {title}"
+            defaultMessage="History of {title}"
+            values={{
+              title: <q>{title}</q>,
+            }}
           />
-        ) : (
-          <Unauthorized
-            pathname={this.props.pathname}
-            staticContext={this.props.staticContext}
+        </Segment>
+        <Segment secondary>
+          <FormattedMessage
+            id="You can view the history of your item below."
+            defaultMessage="You can view the history of your item below."
           />
-        )}
-      </>
-    ) : (
-      <Container id="page-history">
-        <Helmet title={this.props.intl.formatMessage(messages.history)} />
-        <Segment.Group raised>
-          <Segment className="primary">
-            <FormattedMessage
-              id="History of {title}"
-              defaultMessage="History of {title}"
-              values={{
-                title: <q>{this.props.title}</q>,
-              }}
-            />
-          </Segment>
-          <Segment secondary>
-            <FormattedMessage
-              id="You can view the history of your item below."
-              defaultMessage="You can view the history of your item below."
-            />
-          </Segment>
-          <Table selectable compact singleLine attached>
-            <Table.Header>
-              <Table.Row>
-                <Table.HeaderCell width={1}>
-                  <FormattedMessage
-                    id="History Version Number"
-                    defaultMessage="#"
-                  />
-                </Table.HeaderCell>
-                <Table.HeaderCell width={4}>
-                  <FormattedMessage id="What" defaultMessage="What" />
-                </Table.HeaderCell>
-                <Table.HeaderCell width={4}>
-                  <FormattedMessage id="Who" defaultMessage="Who" />
-                </Table.HeaderCell>
-                <Table.HeaderCell width={4}>
-                  <FormattedMessage id="When" defaultMessage="When" />
-                </Table.HeaderCell>
-                <Table.HeaderCell width={4}>
-                  <FormattedMessage
-                    id="Change Note"
-                    defaultMessage="Change Note"
-                  />
-                </Table.HeaderCell>
-                <Table.HeaderCell />
-              </Table.Row>
-            </Table.Header>
-            <Table.Body>
-              {map(entries, (entry) => (
-                <Table.Row key={entry.time}>
-                  <Table.Cell>
-                    {('version' in entry && entry.version > 0 && (
-                      <Link
-                        className="item"
-                        to={`${getBaseUrl(this.props.pathname)}/diff?one=${
-                          entry.version - 1
-                        }&two=${entry.version}`}
-                      >
-                        {entry.version}
-                      </Link>
-                    )) || <span>{entry.version}</span>}
-                  </Table.Cell>
-                  <Table.Cell>
-                    {('version' in entry && entry.version > 0 && (
-                      <Link
-                        className="item"
-                        to={`${getBaseUrl(this.props.pathname)}/diff?one=${
-                          entry.version - 1
-                        }&two=${entry.version}`}
-                      >
-                        {entry.transition_title}
-                      </Link>
-                    )) || (
-                      <span>
-                        {entry.transition_title}
-                        {entry.type === 'workflow' &&
-                          ` (${
-                            entry.action ? `${entry.prev_state_title} → ` : ''
-                          }${entry.state_title})`}
-                      </span>
-                    )}
-                  </Table.Cell>
-                  <Table.Cell>{entry.actor.fullname}</Table.Cell>
-                  <Table.Cell>
-                    <FormattedDate date={entry.time} />
-                  </Table.Cell>
-                  <Table.Cell>{entry.comments}</Table.Cell>
-                  <Table.Cell>
-                    {entry.type === 'versioning' && (
-                      <Dropdown icon="ellipsis horizontal">
-                        <Dropdown.Menu className="left">
-                          {'version' in entry && entry.version > 0 && (
-                            <Link
-                              className="item"
-                              to={`${getBaseUrl(
-                                this.props.pathname,
-                              )}/diff?one=${entry.version - 1}&two=${
-                                entry.version
-                              }`}
+        </Segment>
+        <Table selectable compact singleLine attached>
+          <Table.Header>
+            <Table.Row>
+              <Table.HeaderCell width={1}>
+                <FormattedMessage
+                  id="History Version Number"
+                  defaultMessage="#"
+                />
+              </Table.HeaderCell>
+              <Table.HeaderCell width={4}>
+                <FormattedMessage id="What" defaultMessage="What" />
+              </Table.HeaderCell>
+              <Table.HeaderCell width={4}>
+                <FormattedMessage id="Who" defaultMessage="Who" />
+              </Table.HeaderCell>
+              <Table.HeaderCell width={4}>
+                <FormattedMessage id="When" defaultMessage="When" />
+              </Table.HeaderCell>
+              <Table.HeaderCell width={4}>
+                <FormattedMessage
+                  id="Change Note"
+                  defaultMessage="Change Note"
+                />
+              </Table.HeaderCell>
+              <Table.HeaderCell />
+            </Table.Row>
+          </Table.Header>
+          <Table.Body>
+            {map(processedEntries, (entry) => (
+              <Table.Row key={entry.version ?? entry.time}>
+                <Table.Cell>
+                  {('version' in entry && entry.version > 0 && (
+                    <Link
+                      className="item"
+                      to={`${getBaseUrl(pathname)}/diff?one=${
+                        entry.version - 1
+                      }&two=${entry.version}`}
+                    >
+                      {entry.version}
+                    </Link>
+                  )) || <span>{entry.version}</span>}
+                </Table.Cell>
+                <Table.Cell>
+                  {('version' in entry && entry.version > 0 && (
+                    <Link
+                      className="item"
+                      to={`${getBaseUrl(pathname)}/diff?one=${
+                        entry.version - 1
+                      }&two=${entry.version}`}
+                    >
+                      {entry.transition_title}
+                    </Link>
+                  )) || (
+                    <span>
+                      {entry.transition_title}
+                      {entry.type === 'workflow' &&
+                        ` (${
+                          entry.action ? `${entry.prev_state_title} → ` : ''
+                        }${entry.state_title})`}
+                    </span>
+                  )}
+                </Table.Cell>
+                <Table.Cell>{entry.actor.fullname}</Table.Cell>
+                <Table.Cell>
+                  <FormattedDate date={entry.time} />
+                </Table.Cell>
+                <Table.Cell>{entry.comments}</Table.Cell>
+                <Table.Cell>
+                  {entry.type === 'versioning' && (
+                    <Dropdown icon="ellipsis horizontal">
+                      <Dropdown.Menu className="left">
+                        {'version' in entry && entry.version > 0 && (
+                          <Link
+                            className="item"
+                            to={`${getBaseUrl(
+                              pathname,
+                            )}/diff?one=${entry.version - 1}&two=${
+                              entry.version
+                            }`}
+                          >
+                            <Icon name="copy" />{' '}
+                            <FormattedMessage
+                              id="View changes"
+                              defaultMessage="View changes"
+                            />
+                          </Link>
+                        )}
+                        {'version' in entry && (
+                          <Link
+                            className="item"
+                            to={`${getBaseUrl(pathname)}?version=${
+                              entry.version
+                            }`}
+                          >
+                            <Icon name="eye" />{' '}
+                            <FormattedMessage
+                              id="View this revision"
+                              defaultMessage="View this revision"
+                            />
+                          </Link>
+                        )}
+                        {'version' in entry &&
+                          entry.may_revert &&
+                          !entry.is_current && (
+                            <Dropdown.Item
+                              value={entry.version}
+                              onClick={onRevert}
                             >
-                              <Icon name="copy" />{' '}
+                              <Icon name="undo" />{' '}
                               <FormattedMessage
-                                id="View changes"
-                                defaultMessage="View changes"
+                                id="Revert to this revision"
+                                defaultMessage="Revert to this revision"
                               />
-                            </Link>
+                            </Dropdown.Item>
                           )}
-                          {'version' in entry && (
-                            <Link
-                              className="item"
-                              to={`${getBaseUrl(this.props.pathname)}?version=${
-                                entry.version
-                              }`}
-                            >
-                              <Icon name="eye" />{' '}
-                              <FormattedMessage
-                                id="View this revision"
-                                defaultMessage="View this revision"
-                              />
-                            </Link>
-                          )}
-                          {'version' in entry &&
-                            entry.may_revert &&
-                            !entry.is_current && (
-                              <Dropdown.Item
-                                value={entry.version}
-                                onClick={this.onRevert}
-                              >
-                                <Icon name="undo" />{' '}
-                                <FormattedMessage
-                                  id="Revert to this revision"
-                                  defaultMessage="Revert to this revision"
-                                />
-                              </Dropdown.Item>
-                            )}
-                        </Dropdown.Menu>
-                      </Dropdown>
-                    )}
-                  </Table.Cell>
-                </Table.Row>
-              ))}
-            </Table.Body>
-          </Table>
-        </Segment.Group>
-        {this.state.isClient &&
-          createPortal(
-            <Toolbar
-              pathname={this.props.pathname}
-              hideDefaultViewButtons
-              inner={
-                <Link
-                  to={`${getBaseUrl(this.props.pathname)}`}
-                  className="item"
-                >
-                  <IconNext
-                    name={backSVG}
-                    className="contents circled"
-                    size="30px"
-                    title={this.props.intl.formatMessage(messages.back)}
-                  />
-                </Link>
-              }
-            />,
-            document.getElementById('toolbar'),
-          )}
-      </Container>
-    );
-  }
-}
+                      </Dropdown.Menu>
+                    </Dropdown>
+                  )}
+                </Table.Cell>
+              </Table.Row>
+            ))}
+          </Table.Body>
+        </Table>
+      </Segment.Group>
+      {isClient &&
+        createPortal(
+          <Toolbar
+            pathname={pathname}
+            hideDefaultViewButtons
+            inner={
+              <Link to={`${getBaseUrl(pathname)}`} className="item">
+                <IconNext
+                  name={backSVG}
+                  className="contents circled"
+                  size="30px"
+                  title={intl.formatMessage(messages.back)}
+                />
+              </Link>
+            }
+          />,
+          document.getElementById('toolbar'),
+        )}
+    </Container>
+  );
+};
 
 export default compose(
-  injectIntl,
   asyncConnect([
     {
       key: 'actions',
-      // Dispatch async/await to make the operation synchronous, otherwise it returns
-      // before the promise is resolved
       promise: async ({ location, store: { dispatch } }) =>
         await dispatch(listActions(getBaseUrl(location.pathname))),
     },
   ]),
-  connect(
-    (state, props) => ({
-      objectActions: state.actions.actions.object,
-      token: state.userSession.token,
-      entries: state.history.entries,
-      pathname: props.location.pathname,
-      title: state.content.data?.title,
-      revertRequest: state.history.revert,
-    }),
-    { getHistory, revertHistory },
-  ),
 )(History);

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import configureStore from 'redux-mock-store';
-import { StaticRouter } from 'react-router-dom';
+import { MemoryRouter, StaticRouter } from 'react-router-dom';
 import { CookiesProvider } from 'react-cookie';
 import { Provider } from 'react-intl-redux';
 import jwt from 'jsonwebtoken';
@@ -91,8 +91,10 @@ describe('History', () => {
     const { container } = render(
       <Provider store={store}>
         <CookiesProvider>
-          <History location={{ pathname: '/blog' }} />
-          <div id="toolbar"></div>
+          <MemoryRouter initialEntries={['/blog']}>
+            <History />
+            <div id="toolbar"></div>
+          </MemoryRouter>
         </CookiesProvider>
       </Provider>,
     );
@@ -160,8 +162,10 @@ describe('History', () => {
     const { container } = render(
       <Provider store={store}>
         <CookiesProvider>
-          <History location={{ pathname: '/blog' }} />
-          <div id="toolbar"></div>
+          <MemoryRouter initialEntries={['/blog']}>
+            <History />
+            <div id="toolbar"></div>
+          </MemoryRouter>
         </CookiesProvider>
       </Provider>,
     );

package/src/components/manage/Toolbar/Toolbar.jsx

@@ -399,7 +399,9 @@ class Toolbar extends Component {
     const button =
       doesNodeContainClick(this.toolbarRef.current, e) &&
       this.findAncestor(target, 'button');
-    if (button && button === this.buttonRef.current) return;
+    if (button && button === this.buttonRef.current) {
+      return;
+    }
 
     this.closeMenu();
   };
@@ -445,7 +447,10 @@ class Toolbar extends Component {
             }
             ref={this.toolbarWindow}
             onBlur={(e) => {
-              if (!this.toolbarWindow.current?.contains(e.relatedTarget)) {
+              if (
+                e.relatedTarget &&
+                !this.toolbarWindow.current?.contains(e.relatedTarget)
+              ) {
                 this.toolbarRef.current
                   ?.querySelector('button.toolbar-handler-button')
                   ?.focus();

package/types/components/manage/Blocks/Maps/Body.d.ts

@@ -0,0 +1,9 @@
+export default Body;
+declare function Body({ data }: {
+    data: any;
+}): import("react/jsx-runtime").JSX.Element;
+declare namespace Body {
+    namespace propTypes {
+        let data: any;
+    }
+}

package/types/components/manage/Blocks/Maps/View.d.ts

@@ -1,2 +1,2 @@
-declare const _default: any;
+declare const _default: (props: any) => import("react/jsx-runtime").JSX.Element;
 export default _default;

package/types/components/manage/Controlpanels/VersionOverview.d.ts

@@ -1,5 +1,6 @@
 export default VersionOverview;
-declare function VersionOverview({ cmf_version, debug_mode, pil_version, plone_version, plone_restapi_version, python_version, zope_version, }: {
+declare function VersionOverview({ cmf_version, debug_mode, pil_version, plone_version, plone_restapi_version, python_version, zope_version, ...rest }: {
+    [x: string]: any;
     cmf_version: any;
     debug_mode: any;
     pil_version: any;

package/types/components/manage/Controlpanels/index.d.ts

@@ -18,6 +18,7 @@ export declare const ContentTypeLayout: import("@loadable/component").LoadableCl
 export declare const ContentTypeSchema: import("@loadable/component").LoadableClassComponent<any>;
 export declare const ContentTypes: import("@loadable/component").LoadableClassComponent<any>;
 export declare const VersionOverview: import("@loadable/component").LoadableComponent<{
+    [x: string]: any;
     cmf_version: any;
     debug_mode: any;
     pil_version: any;