@plone/volto 18.0.0-alpha.45 → 18.0.0-alpha.47

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

@@ -57,6 +57,13 @@ describe('Aliases', () => {
         locale: 'en',
         messages: {},
       },
+      site: {
+        data: {
+          features: {
+            filter_aliases_by_date: true,
+          },
+        },
+      },
     });
     const { container } = render(
       <Provider store={store}>

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

@@ -150,6 +150,7 @@ const DatabaseInformation = () => {
               </Table.Row>
             </Table.Header>
             {databaseInformation.cache_detail_length.map((item) => (
+              // eslint-disable-next-line react/jsx-key
               <Table.Row>
                 <Table.Cell>{item.connection}</Table.Cell>
                 <Table.Cell>{item.ngsize}</Table.Cell>

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

@@ -251,6 +251,7 @@ class UpgradeControlPanel extends Component {
                 <Container>
                   {map(upgradeSteps, (upgradeGroup) => [
                     <UpgradeStep
+                      key={upgradeGroup[0]}
                       title={upgradeGroup[0]}
                       steps={upgradeGroup[1]}
                     />,

package/src/components/manage/Controlpanels/Users/UserGroupMembershipMatrix.jsx

@@ -188,18 +188,20 @@ const UserGroupMembershipMatrix = ({ many_users, many_groups }) => {
           </Form>
           {(!many_groups || query_group_filter.length > 1) &&
             filter_options?.map((filter_option) => (
-              <Form.Field>
-                <Checkbox
-                  name={`filter_option_${filter_option.value}`}
-                  key={filter_option.value}
-                  title={filter_option.label}
-                  label={filter_option.label}
-                  defaultChecked={false}
-                  onChange={(event, { checked }) => {
-                    onSelectOptionHandler(filter_option, checked);
-                  }}
-                />
-              </Form.Field>
+              <React.Fragment key={filter_option.value}>
+                <Form.Field>
+                  <Checkbox
+                    name={`filter_option_${filter_option.value}`}
+                    key={filter_option.value}
+                    title={filter_option.label}
+                    label={filter_option.label}
+                    defaultChecked={false}
+                    onChange={(event, { checked }) => {
+                      onSelectOptionHandler(filter_option, checked);
+                    }}
+                  />
+                </Form.Field>
+              </React.Fragment>
             ))}
         </div>
         <UserGroupMembershipListing

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

@@ -346,11 +346,15 @@ class Edit extends Component {
               <>
                 <Helmet
                   title={
-                    this.props?.schema?.title
+                    this.props?.content?.title
                       ? this.props.intl.formatMessage(messages.edit, {
-                          title: this.props.schema.title,
+                          title: this.props?.content?.title,
                         })
-                      : null
+                      : this.props?.schema?.title
+                        ? this.props.intl.formatMessage(messages.edit, {
+                            title: this.props.schema.title,
+                          })
+                        : null
                   }
                 >
                   {this.props.content?.language && (

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

@@ -70,6 +70,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,
@@ -211,7 +212,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) => ({
@@ -245,6 +246,7 @@ class ModalForm extends Component {
             onSubmit={this.onSubmit}
             error={state_errors || Boolean(this.props.submitError)}
           >
+            {description}
             <Message error>
               {state_errors ? (
                 <FormattedMessage

package/src/components/manage/Pluggable/Pluggable.test.js

@@ -57,8 +57,8 @@ describe('<Pluggable />', () => {
                     </header>
                     <div className="pastanaga-menu-list">
                       <ul>
-                        {pluggables.map((p) => (
-                          <>{p()}</>
+                        {pluggables.map((p, index) => (
+                          <React.Fragment key={index}>{p()}</React.Fragment>
                         ))}
                       </ul>
                     </div>
@@ -92,7 +92,7 @@ describe('<Pluggable />', () => {
                     <div className="pastanaga-menu-list">
                       <ul>
                         {pluggables.map((p) => (
-                          <>{p()}</>
+                          <React.Fragment key={p}>{p()}</React.Fragment>
                         ))}
                       </ul>
                     </div>

package/src/components/manage/Sidebar/ObjectBrowserNav.jsx

@@ -51,6 +51,7 @@ const ObjectBrowserNav = ({
         currentSearchResults.items.map((item) =>
           view === 'icons' ? (
             <li
+              key={item['@id']}
               className="image-wrapper"
               title={`${item['@id']} (${item['@type']})`}
             >

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

@@ -311,8 +311,8 @@ const More = (props) => {
                 </header>
                 <div className="pastanaga-menu-list">
                   <ul>
-                    {pluggables.map((p) => (
-                      <>{p()}</>
+                    {pluggables.map((p, index) => (
+                      <React.Fragment key={index}>{p()}</React.Fragment>
                     ))}
                   </ul>
                 </div>

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

@@ -9,11 +9,7 @@ import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
 import { Icon } from '@plone/volto/components';
 import { getUser } from '@plone/volto/actions';
 import { Pluggable } from '@plone/volto/components/manage/Pluggable';
-import {
-  expandToBackendURL,
-  getBaseUrl,
-  userHasRoles,
-} from '@plone/volto/helpers';
+import { expandToBackendURL, getBaseUrl } from '@plone/volto/helpers';
 import logoutSVG from '@plone/volto/icons/log-out.svg';
 import rightArrowSVG from '@plone/volto/icons/right-key.svg';
 import backSVG from '@plone/volto/icons/back.svg';
@@ -50,7 +46,11 @@ const PersonalTools = (props) => {
   const token = useSelector((state) => state.userSession.token, shallowEqual);
   const user = useSelector((state) => state.users.user);
   const userId = token ? jwtDecode(token).sub : '';
-
+  const siteSetupAction = useSelector((state) =>
+    state.actions?.actions?.user?.find(
+      (action) => action?.id === 'plone_setup',
+    ),
+  );
   useEffect(() => {
     dispatch(getUser(userId));
   }, [dispatch, userId]);
@@ -127,7 +127,7 @@ const PersonalTools = (props) => {
             </button>
           </li>
 
-          {userHasRoles(user, ['Site Administrator', 'Manager']) && (
+          {siteSetupAction && (
             <li>
               <Link to="/controlpanel">
                 <FormattedMessage id="Site Setup" defaultMessage="Site Setup" />

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

@@ -29,6 +29,16 @@ describe('Toolbar Personal Tools component', () => {
           is_folderish: true,
         },
       },
+      actions: {
+        actions: {
+          user: [
+            {
+              id: 'plone_setup',
+              title: 'Site Setup',
+            },
+          ],
+        },
+      },
       intl: {
         locale: 'en',
         messages: {},
@@ -70,6 +80,16 @@ describe('Toolbar Personal Tools component', () => {
           is_folderish: true,
         },
       },
+      actions: {
+        actions: {
+          user: [
+            {
+              id: 'plone_setup',
+              title: 'Site Setup',
+            },
+          ],
+        },
+      },
       intl: {
         locale: 'en',
         messages: {},
@@ -112,6 +132,57 @@ describe('Toolbar Personal Tools component', () => {
           is_folderish: true,
         },
       },
+      actions: {
+        actions: {
+          user: [
+            {
+              id: 'plone_setup',
+              title: 'Site Setup',
+            },
+          ],
+        },
+      },
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+    });
+    const component = renderer.create(
+      <Provider store={store}>
+        <PluggablesProvider>
+          <MemoryRouter>
+            <PersonalTools
+              loadComponent={() => {}}
+              theToolbar={{
+                current: { getBoundingClientRect: () => ({ width: '320' }) },
+              }}
+            />
+          </MemoryRouter>
+        </PluggablesProvider>
+      </Provider>,
+    );
+    const json = component.toJSON();
+    expect(json).toMatchSnapshot();
+  });
+
+  it('renders an Toolbar Personal Tools component without Site Setup access', () => {
+    const store = mockStore({
+      users: {
+        user: {
+          fullname: 'regular_user',
+          email: 'user@plone.org',
+          roles: ['Member'],
+        },
+      },
+      userSession: {
+        token: jwt.sign({ sub: 'regular_user' }, 'secret'),
+      },
+      content: {
+        data: {
+          '@type': 'Folder',
+          is_folderish: true,
+        },
+      },
       intl: {
         locale: 'en',
         messages: {},

package/src/components/theme/Icon/Icon.stories.jsx

@@ -43,6 +43,7 @@ const iconElements = Object.keys(icons).map((iconName) => {
   const icon = icons[iconName];
   return (
     <center
+      key={icons[iconName]}
       style={{
         float: 'left',
         width: '150px',

package/src/components/theme/Login/Login.jsx

@@ -80,9 +80,8 @@ const Login = (props) => {
   const loading = useSelector((state) => state.userSession.login.loading);
   const returnUrl =
     qs.parse(props.location?.search ?? location.search).return_url ||
-    location.pathname.replace(/\/login\/?$/, '').replace(/\/logout\/?$/, '') ||
+    location.pathname.replace(/\/[^/]*\/?$/, '') ||
     '/';
-
   const previousToken = usePrevious(token);
 
   useEffect(() => {

package/src/components/theme/Widgets/ArrayWidget.jsx

@@ -5,14 +5,14 @@ const ArrayWidget = ({ value, children, className }) =>
   value ? (
     <span className={cx(className, 'array', 'widget')}>
       {value.map((item, key) => (
-        <>
+        <React.Fragment key={item.token}>
           {key ? ', ' : ''}
           <span key={item.token || item.title || item}>
             {children
               ? children(item.title || item.token || item)
               : item.title || item.token || item}
           </span>
-        </>
+        </React.Fragment>
       ))}
     </span>
   ) : (

package/src/constants/ActionTypes.js

@@ -138,6 +138,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/static.js

@@ -1,10 +1,10 @@
 import express from 'express';
 import path from 'path';
-import AddonConfigurationRegistry from '@plone/registry/src/addon-registry';
+import { AddonRegistry } from '@plone/registry/addon-registry';
 import config from '@plone/volto/registry';
 
 const projectRootPath = path.resolve('.');
-const registry = new AddonConfigurationRegistry(projectRootPath);
+const { registry } = AddonRegistry.init(projectRootPath);
 
 const staticDirectory = () => {
   if (process.env.BUILD_DIR) {

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/helpers/Html/Html.jsx

@@ -158,6 +158,7 @@ class Html extends Component {
                   }}
                 ></script>
                 {extractor.getStyleElements().map((elem) => (
+                  // eslint-disable-next-line react/jsx-key
                   <noscript>
                     {React.cloneElement(elem, {
                       rel: 'stylesheet',

package/src/middleware/api.js

@@ -186,6 +186,7 @@ const apiMiddlewareFactory =
                     checkUrl: settings.actions_raising_api_errors.includes(
                       action.type,
                     ),
+                    attach: item.attach,
                   },
                 ).then((reqres) => {
                   if (action.subrequest === 'batch-upload') {
@@ -205,6 +206,7 @@ const apiMiddlewareFactory =
                   checkUrl: settings.actions_raising_api_errors.includes(
                     action.type,
                   ),
+                  attach: item.attach,
                 }),
               ),
             )
@@ -214,6 +216,7 @@ const apiMiddlewareFactory =
             headers: request.headers,
             params: request.params,
             checkUrl: settings.actions_raising_api_errors.includes(action.type),
+            attach: request.attach,
           });
       actionPromise.then(
         (result) => {

package/src/reducers/content/content.js

@@ -20,6 +20,8 @@ import {
   UPDATE_UPLOADED_FILES,
 } from '@plone/volto/constants/ActionTypes';
 
+import config from '@plone/volto/registry';
+
 const initialState = {
   create: {
     loaded: false,
@@ -192,6 +194,16 @@ export default function content(state = initialState, action = {}) {
           };
         });
       }
+
+      const transforms = config.getUtilities({
+        type: 'transform',
+        dependencies: { reducer: 'content' },
+      });
+
+      transforms.forEach(({ method }) => {
+        method(result);
+      });
+
       return action.subrequest
         ? {
             ...state,

package/src/start-server.js

@@ -18,11 +18,8 @@ export default function server() {
 
   server
     .listen(port, bind_address, () => {
-      if (app.apiPath === app.publicURL || !app.apiPath) {
-        console.log(`Volto is running in SEAMLESS mode`);
-      } else {
-        console.log(`API server (API_PATH) is set to: ${app.apiPath}`);
-      }
+      console.log(`API server (API_PATH) is set to: ${app.apiPath}`);
+
       if (app.devProxyToApiPath)
         console.log(
           `Proxying API requests from ${app.publicURL}/++api++ to ${

package/types/actions/aliases/aliases.d.ts

@@ -5,7 +5,7 @@
  * @param {Object} options Options data.
  * @returns {Object} Get aliases action.
  */
-export function getAliases(url: string, options: any): any;
+export function getAliases(url: string, options?: any): any;
 /**
  * Add alias function.
  * @function addAliases
@@ -22,3 +22,10 @@ export function addAliases(url: string, data: any): any;
  * @returns {Object} Remove alias action.
  */
 export function removeAliases(url: string, data: any): any;
+/**
+ * Upload aliases function.
+ * @function uploadAliases
+ * @param {Object} file CSV file.
+ * @returns {Object} Upload aliases action.
+ */
+export function uploadAliases(file: any): any;

package/types/components/manage/Contents/__mocks__/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="jest" />
 export declare const Contents: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
 export declare const ContentsRenameModal: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;

package/types/components/manage/Controlpanels/Relations/RelationsMatrix.d.ts

@@ -36,7 +36,7 @@ declare const _default: {
         data: {};
         block: string;
     };
-    contextType?: React.Context<any>;
+    contextType?: React.Context<any> | undefined;
 };
 export default _default;
 import React from 'react';

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const Controlpanels: any;
 export declare const Controlpanel: import("@loadable/component").LoadableComponent<Omit<import("react-intl").WithIntlProps<import("react-intl").WrappedComponentProps<string>>, "ref"> & import("react").RefAttributes<import("react").ComponentType<import("react-intl").WrappedComponentProps<string>>>>;
 export declare const RulesControlpanel: import("@loadable/component").LoadableClassComponent<any>;

package/types/components/manage/Form/__mocks__/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="jest" />
 export declare const Field: jest.Mock<import("react/jsx-runtime").JSX.Element, [props: any], any>;
 export declare const InlineForm: jest.Mock<import("react/jsx-runtime").JSX.Element, [props: any], any>;
 export declare const ModalForm: jest.Mock<import("react/jsx-runtime").JSX.Element, [props: any], any>;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const Field: import("@loadable/component").LoadableComponent<import("react-intl").WithIntlProps<any>>;
 export declare const InlineForm: import("@loadable/component").LoadableComponent<Omit<import("react-intl").WithIntlProps<any>, "ref"> & import("react").RefAttributes<any>>;
 export declare const ModalForm: import("@loadable/component").LoadableComponent<import("react-intl").WithIntlProps<any>>;

package/types/components/manage/Multilingual/ManageTranslations.d.ts

@@ -36,7 +36,7 @@ declare const _default: {
         data: {};
         block: string;
     };
-    contextType?: React.Context<any>;
+    contextType?: React.Context<any> | undefined;
 };
 export default _default;
 import React from 'react';

package/types/components/manage/Sidebar/ObjectBrowser.d.ts

@@ -69,6 +69,6 @@ declare function withObjectBrowser(WrappedComponent: any): {
         data: {};
         block: string;
     };
-    contextType?: React.Context<any>;
+    contextType?: React.Context<any> | undefined;
 };
 import React from 'react';

package/types/components/manage/Widgets/InternalUrlWidget.d.ts

@@ -74,7 +74,7 @@ declare const _default: {
         data: {};
         block: string;
     };
-    contextType?: React.Context<any>;
+    contextType?: React.Context<any> | undefined;
 };
 export default _default;
 import React from 'react';

package/types/components/manage/Widgets/UrlWidget.d.ts

@@ -74,7 +74,7 @@ declare const _default: {
         data: {};
         block: string;
     };
-    contextType?: React.Context<any>;
+    contextType?: React.Context<any> | undefined;
 };
 export default _default;
 import React from 'react';

package/types/components/manage/Widgets/__mocks__/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="jest" />
 export declare const AlignWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
 export declare const ButtonsWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
 export declare const ArrayWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const AlignWidget: import("@loadable/component").LoadableComponent<any>;
 export declare const ButtonsWidget: import("@loadable/component").LoadableComponent<any>;
 export declare const ArrayWidget: import("@loadable/component").LoadableClassComponent<any>;
@@ -53,7 +52,7 @@ export declare const UrlWidget: import("@loadable/component").LoadableClassCompo
         data: {};
         block: string;
     };
-    contextType?: import("react").Context<any>;
+    contextType?: import("react").Context<any> | undefined;
 }>;
 export declare const InternalUrlWidget: import("@loadable/component").LoadableClassComponent<{
     new (): {
@@ -93,7 +92,7 @@ export declare const InternalUrlWidget: import("@loadable/component").LoadableCl
         data: {};
         block: string;
     };
-    contextType?: import("react").Context<any>;
+    contextType?: import("react").Context<any> | undefined;
 }>;
 export declare const EmailWidget: import("@loadable/component").LoadableComponent<any>;
 export declare const NumberWidget: import("@loadable/component").LoadableComponent<import("react-intl").WithIntlProps<any>>;

package/types/config/slots.d.ts

@@ -7,7 +7,7 @@ declare namespace slots {
                 content: {
                     subjects?: any[];
                 };
-            }): JSX.Element;
+            }): JSX.Element | null;
             propTypes: {
                 content: any;
             };

package/types/constants/ActionTypes.d.ts

@@ -134,6 +134,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/types/helpers/Helmet/Helmet.d.ts

@@ -133,6 +133,6 @@ declare const HelmetExport: {
     peek: any;
     rewind: () => any;
     canUseDOM: any;
-    contextType?: React.Context<any>;
+    contextType?: React.Context<any> | undefined;
 };
 import React from 'react';