@plone/volto 18.7.0 → 18.8.0

package/src/components/manage/Controlpanels/Relations/Relations.jsx

@@ -47,53 +47,55 @@ const RelationsControlPanel = () => {
 
   return (
     <>
-      <div className="relations-control-panel">
-        <Helmet title={intl.formatMessage(messages.relations)} />
-        {can_edit ? (
-          <Segment.Group raised>
-            <Segment className="primary">
-              {brokenRelations && Object.keys(brokenRelations).length > 0 ? (
-                <React.Fragment>
-                  <Message warning>
-                    <FormattedMessage
-                      id="Some relations are broken. Please fix."
-                      defaultMessage="Some relations are broken. Please fix."
-                    />
-                  </Message>
-                  <Divider hidden />
-                </React.Fragment>
-              ) : null}
-              <h1>
+      <div className="ui container">
+        <div className="relations-control-panel">
+          <Helmet title={intl.formatMessage(messages.relations)} />
+          {can_edit ? (
+            <Segment.Group raised>
+              <Segment className="primary">
+                {brokenRelations && Object.keys(brokenRelations).length > 0 ? (
+                  <React.Fragment>
+                    <Message warning>
+                      <FormattedMessage
+                        id="Some relations are broken. Please fix."
+                        defaultMessage="Some relations are broken. Please fix."
+                      />
+                    </Message>
+                    <Divider hidden />
+                  </React.Fragment>
+                ) : null}
+                <h1>
+                  <FormattedMessage id="Relations" defaultMessage="Relations" />
+                </h1>
+                {relations_stats?.error ? (
+                  <React.Fragment>
+                    <Divider hidden />
+                    <Message warning>
+                      <FormattedMessage
+                        id="Please upgrade to plone.restapi >= 8.39.0."
+                        defaultMessage="Please upgrade to plone.restapi >= 8.39.0."
+                      />
+                    </Message>
+                  </React.Fragment>
+                ) : null}
+              </Segment>
+              <Segment>
+                <RelationsMatrix />
+              </Segment>
+            </Segment.Group>
+          ) : (
+            <Segment.Group>
+              <Segment>
                 <FormattedMessage id="Relations" defaultMessage="Relations" />
-              </h1>
-              {relations_stats?.error ? (
-                <React.Fragment>
-                  <Divider hidden />
-                  <Message warning>
-                    <FormattedMessage
-                      id="Please upgrade to plone.restapi >= 8.39.0."
-                      defaultMessage="Please upgrade to plone.restapi >= 8.39.0."
-                    />
-                  </Message>
-                </React.Fragment>
-              ) : null}
-            </Segment>
-            <Segment>
-              <RelationsMatrix />
-            </Segment>
-          </Segment.Group>
-        ) : (
-          <Segment.Group>
-            <Segment>
-              <FormattedMessage id="Relations" defaultMessage="Relations" />
-              <Divider hidden />
-              <FormattedMessage
-                id="You have not the required permission for this control panel."
-                defaultMessage="You have not the required permission for this control panel."
-              />
-            </Segment>
-          </Segment.Group>
-        )}
+                <Divider hidden />
+                <FormattedMessage
+                  id="You have not the required permission for this control panel."
+                  defaultMessage="You have not the required permission for this control panel."
+                />
+              </Segment>
+            </Segment.Group>
+          )}
+        </div>
       </div>
 
       {isClient &&

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

@@ -191,6 +191,13 @@ const More = (props) => {
     id: 'redirection',
   });
 
+  const workingCopyCheckoutAction = find(actions.object_buttons, {
+    id: 'iterate_checkout',
+  });
+  const workingCopyCheckinAction = find(actions.object_buttons, {
+    id: 'iterate_checkin',
+  });
+
   const dateOptions = {
     year: 'numeric',
     month: 'long',
@@ -320,125 +327,114 @@ const More = (props) => {
           </>
         )}
       </Pluggable>
-      {config.settings.hasWorkingCopySupport &&
-        content['@type'] !== 'Plone Site' && (
-          <>
-            {!content.working_copy && (
-              <Plug pluggable="toolbar-more-manage-content" id="workingcopy">
-                <li>
-                  <button
-                    aria-label={intl.formatMessage(messages.CreateWorkingCopy)}
-                    onClick={() => {
-                      dispatch(createWorkingCopy(path)).then((response) => {
-                        history.push(flattenToAppURL(response['@id']));
-                        props.closeMenu();
-                      });
-                    }}
-                  >
-                    {intl.formatMessage(messages.CreateWorkingCopy)}
+      {workingCopyCheckoutAction && (
+        <Plug pluggable="toolbar-more-manage-content" id="workingcopy">
+          <li>
+            <button
+              aria-label={intl.formatMessage(messages.CreateWorkingCopy)}
+              onClick={() => {
+                dispatch(createWorkingCopy(path)).then((response) => {
+                  history.push(flattenToAppURL(response['@id']));
+                  props.closeMenu();
+                });
+              }}
+            >
+              {intl.formatMessage(messages.CreateWorkingCopy)}
 
-                    <Icon name={rightArrowSVG} size="24px" />
-                  </button>
-                </li>
-              </Plug>
-            )}
-            {content.working_copy && content.working_copy_of && (
-              <Plug pluggable="toolbar-more-manage-content" id="workingcopy">
-                <li>
-                  <button
-                    aria-label={intl.formatMessage(messages.applyWorkingCopy)}
-                    onClick={() => {
-                      dispatch(applyWorkingCopy(path)).then((response) => {
-                        history.push(
-                          flattenToAppURL(content.working_copy_of['@id']),
-                        );
-                        props.closeMenu();
-                        toast.info(
-                          <Toast
-                            info
-                            title={intl.formatMessage(
-                              messages.workingAppliedTitle,
-                            )}
-                            content={intl.formatMessage(
-                              messages.workingCopyAppliedBy,
-                              {
-                                creator: content.working_copy?.creator_name,
-                                date: (
-                                  <FormattedDate
-                                    date={content.working_copy?.created}
-                                    format={dateOptions}
-                                  />
-                                ),
-                              },
-                            )}
-                          />,
-                          {
-                            toastId: 'workingcopyapplyinfo',
-                            autoClose: 10000,
-                          },
-                        );
-                      });
-                    }}
-                  >
-                    {intl.formatMessage(messages.applyWorkingCopy)}
+              <Icon name={rightArrowSVG} size="24px" />
+            </button>
+          </li>
+        </Plug>
+      )}
+      {workingCopyCheckinAction && (
+        <Plug pluggable="toolbar-more-manage-content" id="workingcopy">
+          <li>
+            <button
+              aria-label={intl.formatMessage(messages.applyWorkingCopy)}
+              onClick={() => {
+                dispatch(applyWorkingCopy(path)).then((response) => {
+                  history.push(flattenToAppURL(content.working_copy_of['@id']));
+                  props.closeMenu();
+                  toast.info(
+                    <Toast
+                      info
+                      title={intl.formatMessage(messages.workingAppliedTitle)}
+                      content={intl.formatMessage(
+                        messages.workingCopyAppliedBy,
+                        {
+                          creator: content.working_copy?.creator_name,
+                          date: (
+                            <FormattedDate
+                              date={content.working_copy?.created}
+                              format={dateOptions}
+                            />
+                          ),
+                        },
+                      )}
+                    />,
+                    {
+                      toastId: 'workingcopyapplyinfo',
+                      autoClose: 10000,
+                    },
+                  );
+                });
+              }}
+            >
+              {intl.formatMessage(messages.applyWorkingCopy)}
 
-                    <Icon
-                      name={applySVG}
-                      size="24px"
-                      title={intl.formatMessage(messages.applyWorkingCopy)}
-                    />
-                  </button>
-                </li>
-                <li>
-                  <button
-                    aria-label={intl.formatMessage(messages.removeWorkingCopy)}
-                    onClick={() => {
-                      dispatch(removeWorkingCopy(path)).then((response) => {
-                        history.push(
-                          flattenToAppURL(content.working_copy_of['@id']),
-                        );
-                        props.closeMenu();
-                        toast.info(
-                          <Toast
-                            info
-                            title={intl.formatMessage(
-                              messages.workingCopyRemovedTitle,
-                            )}
-                          />,
-                          {
-                            toastId: 'workingcopyremovednotice',
-                            autoClose: 10000,
-                          },
-                        );
-                      });
-                    }}
-                  >
-                    {intl.formatMessage(messages.removeWorkingCopy)}
-                    <Icon
-                      name={removeSVG}
-                      size="24px"
-                      color="#e40166"
-                      title={intl.formatMessage(messages.removeWorkingCopy)}
-                    />
-                  </button>
-                </li>
-              </Plug>
-            )}
-            {content.working_copy && !content.working_copy_of && (
-              <Plug pluggable="toolbar-more-manage-content" id="workingcopy">
-                <li>
-                  <Link
-                    to={flattenToAppURL(content.working_copy['@id'])}
-                    onClick={() => props.closeMenu()}
-                  >
-                    {intl.formatMessage(messages.viewWorkingCopy)}
-                    <Icon name={rightArrowSVG} size="24px" />
-                  </Link>
-                </li>
-              </Plug>
-            )}
-          </>
-        )}
+              <Icon
+                name={applySVG}
+                size="24px"
+                title={intl.formatMessage(messages.applyWorkingCopy)}
+              />
+            </button>
+          </li>
+          <li>
+            <button
+              aria-label={intl.formatMessage(messages.removeWorkingCopy)}
+              onClick={() => {
+                dispatch(removeWorkingCopy(path)).then((response) => {
+                  history.push(flattenToAppURL(content.working_copy_of['@id']));
+                  props.closeMenu();
+                  toast.info(
+                    <Toast
+                      info
+                      title={intl.formatMessage(
+                        messages.workingCopyRemovedTitle,
+                      )}
+                    />,
+                    {
+                      toastId: 'workingcopyremovednotice',
+                      autoClose: 10000,
+                    },
+                  );
+                });
+              }}
+            >
+              {intl.formatMessage(messages.removeWorkingCopy)}
+              <Icon
+                name={removeSVG}
+                size="24px"
+                color="#e40166"
+                title={intl.formatMessage(messages.removeWorkingCopy)}
+              />
+            </button>
+          </li>
+        </Plug>
+      )}
+      {content.working_copy && !content.working_copy_of && (
+        <Plug pluggable="toolbar-more-manage-content" id="workingcopy">
+          <li>
+            <Link
+              to={flattenToAppURL(content.working_copy['@id'])}
+              onClick={() => props.closeMenu()}
+            >
+              {intl.formatMessage(messages.viewWorkingCopy)}
+              <Icon name={rightArrowSVG} size="24px" />
+            </Link>
+          </li>
+        </Plug>
+      )}
       {editAction && config.settings.isMultilingual && (
         <Plug pluggable="toolbar-more-manage-content" id="multilingual">
           <li>

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

@@ -1,10 +1,8 @@
-import React from 'react';
 import configureStore from 'redux-mock-store';
 import { Provider } from 'react-intl-redux';
 import { MemoryRouter } from 'react-router-dom';
 import { PluggablesProvider } from '@plone/volto/components/manage/Pluggable';
 import { waitFor, render } from '@testing-library/react';
-import config from '@plone/volto/registry';
 
 import More from './More';
 
@@ -162,26 +160,4 @@ describe('Toolbar More component', () => {
     await waitFor(() => {});
     expect(container).toMatchSnapshot();
   });
-  it('renders a Toolbar More component with manage content (working copy)', async () => {
-    config.settings.hasWorkingCopySupport = true;
-
-    const { container } = render(
-      <PluggablesProvider>
-        <Provider store={store}>
-          <MemoryRouter>
-            <More
-              pathname="/blah"
-              loadComponent={() => {}}
-              theToolbar={{
-                current: { getBoundingClientRect: () => ({ width: '320' }) },
-              }}
-              closeMenu={() => {}}
-            />
-          </MemoryRouter>
-        </Provider>
-      </PluggablesProvider>,
-    );
-    await waitFor(() => {});
-    expect(container).toMatchSnapshot();
-  });
 });

package/src/components/manage/WorkingCopyToastsFactory/WorkingCopyToastsFactory.jsx

@@ -7,7 +7,6 @@ import { defineMessages, useIntl } from 'react-intl';
 import Toast from '@plone/volto/components/manage/Toast/Toast';
 import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 import FormattedDate from '@plone/volto/components/theme/FormattedDate/FormattedDate';
-import config from '@plone/volto/registry';
 import useDeepCompareEffect from 'use-deep-compare-effect';
 
 const messages = defineMessages({
@@ -39,48 +38,28 @@ const WorkingCopyToastsFactory = (props) => {
   };
 
   useDeepCompareEffect(() => {
-    if (content && config.settings.hasWorkingCopySupport) {
-      if (working_copy) {
-        let toastMessage, toastTitle;
-        if (content.working_copy_of) {
-          // I'm a working copy
-          toastMessage = messages.thisIsAWorkingCopyOf;
-          toastTitle = (
-            <Link to={flattenToAppURL(content.working_copy_of['@id'])}>
-              {content.working_copy_of?.title}
-            </Link>
-          );
-        } else {
-          // I'm a baseline
-          toastMessage = messages.workingCopyIs;
-          toastTitle = (
-            <Link to={flattenToAppURL(working_copy['@id'])}>
-              {working_copy?.title}
-            </Link>
-          );
-        }
-        if (toast.isActive('workingcopyinfo')) {
-          toast.update('workingcopyinfo', {
-            render: (
-              <Toast
-                info
-                title={intl.formatMessage(toastMessage, {
-                  title: toastTitle,
-                })}
-                content={intl.formatMessage(messages.workingCopyCreatedBy, {
-                  creator: working_copy?.creator_name,
-                  date: (
-                    <FormattedDate
-                      date={working_copy?.created}
-                      format={dateOptions}
-                    />
-                  ),
-                })}
-              />
-            ),
-          });
-        } else {
-          toast.info(
+    if (working_copy) {
+      let toastMessage, toastTitle;
+      if (content.working_copy_of) {
+        // I'm a working copy
+        toastMessage = messages.thisIsAWorkingCopyOf;
+        toastTitle = (
+          <Link to={flattenToAppURL(content.working_copy_of['@id'])}>
+            {content.working_copy_of?.title}
+          </Link>
+        );
+      } else {
+        // I'm a baseline
+        toastMessage = messages.workingCopyIs;
+        toastTitle = (
+          <Link to={flattenToAppURL(working_copy['@id'])}>
+            {working_copy?.title}
+          </Link>
+        );
+      }
+      if (toast.isActive('workingcopyinfo')) {
+        toast.update('workingcopyinfo', {
+          render: (
             <Toast
               info
               title={intl.formatMessage(toastMessage, {
@@ -95,20 +74,38 @@ const WorkingCopyToastsFactory = (props) => {
                   />
                 ),
               })}
-            />,
-            {
-              toastId: 'workingcopyinfo',
-              autoClose: false,
-              closeButton: false,
-              transition: null,
-            },
-          );
-        }
+            />
+          ),
+        });
+      } else {
+        toast.info(
+          <Toast
+            info
+            title={intl.formatMessage(toastMessage, {
+              title: toastTitle,
+            })}
+            content={intl.formatMessage(messages.workingCopyCreatedBy, {
+              creator: working_copy?.creator_name,
+              date: (
+                <FormattedDate
+                  date={working_copy?.created}
+                  format={dateOptions}
+                />
+              ),
+            })}
+          />,
+          {
+            toastId: 'workingcopyinfo',
+            autoClose: false,
+            closeButton: false,
+            transition: null,
+          },
+        );
       }
-      if (!working_copy) {
-        if (toast.isActive('workingcopyinfo')) {
-          toast.dismiss('workingcopyinfo');
-        }
+    }
+    if (!working_copy) {
+      if (toast.isActive('workingcopyinfo')) {
+        toast.dismiss('workingcopyinfo');
       }
     }
   }, [pathname, content, title, working_copy, intl, lang, dateOptions]);

package/src/components/theme/Image/Image.jsx

@@ -54,7 +54,14 @@ export default function Image({
     attrs.className = cx(className, { responsive });
 
     if (!isSvg && image.scales && Object.keys(image.scales).length > 0) {
-      const sortedScales = Object.values(image.scales).sort((a, b) => {
+      const sortedScales = Object.values({
+        ...image.scales,
+        original: {
+          download: `${image.download}`,
+          width: image.width,
+          height: image.height,
+        },
+      }).sort((a, b) => {
         if (a.width > b.width) return 1;
         else if (a.width < b.width) return -1;
         else return 0;

package/src/config/ControlPanels.js

@@ -76,7 +76,6 @@ export const unwantedControlPanelsFields = {
     'site_favicon_mimetype',
     'exposeDCMetaTags',
     'enable_sitemap',
-    'robots_txt',
     'webstats_js',
   ],
   editing: ['available_editors', 'default_editor', 'ext_editor'],

package/src/config/index.js

@@ -163,7 +163,6 @@ let config = {
     showSelfRegistration: false,
     contentMetadataTagsImageField: 'image',
     contentPropertiesSchemaEnhancer: null,
-    hasWorkingCopySupport: false,
     maxUndoLevels: 200, // undo history size for the main form
     addonsInfo: addonsInfo,
     workflowMapping,

package/src/express-middleware/robotstxt.js

@@ -4,13 +4,12 @@ import { generateRobots } from '@plone/volto/helpers/Robots/Robots';
 /*
 robots.txt - priority order:
 
-1) robots.txt in /public folder
-2) VOLTO_ROBOTSTXT var in .env
-3) default: plone robots.txt
+1) VOLTO_ROBOTSTXT var in .env
+2) robots.txt setting in the site control panel
 
 */
 
-const ploneRobots = function (req, res, next) {
+const siteRobots = function (req, res, next) {
   generateRobots(req).then((robots) => {
     res.set('Content-Type', 'text/plain');
     res.send(robots);
@@ -27,7 +26,7 @@ export default function robotstxtMiddleware() {
   if (process.env.VOLTO_ROBOTSTXT) {
     middleware.all('**/robots.txt', envRobots);
   } else {
-    middleware.all('**/robots.txt', ploneRobots);
+    middleware.all('**/robots.txt', siteRobots);
   }
   middleware.id = 'robots.txt';
   return middleware;

package/src/helpers/Api/Api.js

@@ -17,7 +17,7 @@ const methods = ['get', 'post', 'put', 'patch', 'del'];
  * @param {string} path Path (or URL) to be formatted.
  * @returns {string} Formatted path.
  */
-function formatUrl(path) {
+export function formatUrl(path) {
   const { settings } = config;
   const APISUFIX = settings.legacyTraverse ? '' : '/++api++';