@plone/volto 19.0.0-alpha.9 → 19.0.0

package/src/components/manage/Widgets/ImageWidget.jsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useRef } from 'react';
 import { Button, Dimmer, Loader, Message } from 'semantic-ui-react';
 import { useIntl, defineMessages } from 'react-intl';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { useLocation } from 'react-router-dom';
 import loadable from '@loadable/component';
 import { connect } from 'react-redux';
@@ -14,6 +14,7 @@ import config from '@plone/volto/registry';
 import {
   flattenToAppURL,
   getBaseUrl,
+  getParentUrl,
   isInternalURL,
   normalizeUrl,
   removeProtocol,
@@ -109,6 +110,9 @@ const UnconnectedImageInput = (props) => {
   const linkEditor = useLinkEditor();
   const location = useLocation();
   const dispatch = useDispatch();
+  const isFolderish = useSelector(
+    (state) => state?.content?.data?.is_folderish,
+  );
   const contextUrl = location.pathname;
 
   const [uploading, setUploading] = React.useState(false);
@@ -156,6 +160,8 @@ const UnconnectedImageInput = (props) => {
 
   const handleUpload = React.useCallback(
     (eventOrFile) => {
+      let uploadUrl = getBaseUrl(contextUrl);
+      if (!isFolderish) uploadUrl = getParentUrl(uploadUrl);
       if (restrictFileUpload === true) return;
       eventOrFile.target && eventOrFile.stopPropagation();
 
@@ -171,7 +177,7 @@ const UnconnectedImageInput = (props) => {
         const fields = fileData.match(/^data:(.*);(.*),(.*)$/);
         dispatch(
           createContent(
-            getBaseUrl(contextUrl),
+            uploadUrl,
             {
               '@type': 'Image',
               title: file.name,
@@ -188,11 +194,12 @@ const UnconnectedImageInput = (props) => {
       });
     },
     [
+      contextUrl,
+      isFolderish,
       restrictFileUpload,
       intl.formatMessage,
       dispatch,
-      props,
-      contextUrl,
+      props.block,
       requestId,
     ],
   );
@@ -289,7 +296,13 @@ const UnconnectedImageInput = (props) => {
       {selected && <ImageToolbar {...props} />}
       {/* If it's relation choice (preview_image_link) */}
       {isRelationChoice ? (
-        <Image item={value} width="fit-content" height="auto" loading="lazy" />
+        <Image
+          item={value}
+          width="fit-content"
+          height="auto"
+          loading="lazy"
+          sizes="320px"
+        />
       ) : (
         <Image
           className={props.className}

package/src/components/manage/Widgets/ObjectBrowserWidget.jsx

@@ -82,6 +82,7 @@ export class ObjectBrowserWidgetComponent extends Component {
     openObjectBrowser: PropTypes.func.isRequired,
     allowExternals: PropTypes.bool,
     placeholder: PropTypes.string,
+    onlyFolderishSelectable: PropTypes.bool,
   };
 
   /**
@@ -98,6 +99,7 @@ export class ObjectBrowserWidgetComponent extends Component {
     return: 'multiple',
     initialPath: '',
     allowExternals: false,
+    onlyFolderishSelectable: false,
   };
 
   state = {
@@ -305,6 +307,7 @@ export class ObjectBrowserWidgetComponent extends Component {
     this.props.openObjectBrowser({
       mode: this.props.mode,
       currentPath: this.props.initialPath || this.props.location.pathname,
+      initialPath: this.props.initialPath,
       propDataName: 'value',
       onSelectItem: (url, item) => {
         this.onChange(item);
@@ -315,6 +318,9 @@ export class ObjectBrowserWidgetComponent extends Component {
       maximumSelectionSize:
         this.props.widgetOptions?.pattern_options?.maximumSelectionSize ||
         this.props.maximumSelectionSize,
+      onlyFolderishSelectable:
+        this.props.widgetOptions?.pattern_options?.onlyFolderishSelectable ||
+        this.props.onlyFolderishSelectable,
     });
   };
 

package/src/components/manage/Widgets/ObjectListWidget.test.jsx

@@ -4,17 +4,8 @@ import { render } from '@testing-library/react';
 import configureStore from 'redux-mock-store';
 import ObjectListWidget from './ObjectListWidget';
 
-vi.mock('@plone/volto/helpers/Loadable/Loadable', async () => {
-  return await import(
-    '@plone/volto/helpers/Loadable/__mocks__/Loadable.vitest.jsx'
-  );
-});
-vi.mock('@plone/volto/components/manage/Form', async () => {
-  return await import(
-    '@plone/volto/components/manage/Form/__mocks__/index.vitest.tsx'
-  );
-});
-
+vi.mock('@plone/volto/helpers/Loadable/Loadable');
+vi.mock('@plone/volto/components/manage/Form');
 beforeAll(async () => {
   const { __setLoadables } = await import(
     '@plone/volto/helpers/Loadable/Loadable'

package/src/components/manage/Widgets/ObjectWidget.test.jsx

@@ -5,11 +5,7 @@ import { Provider } from 'react-intl-redux';
 import { render, fireEvent } from '@testing-library/react';
 import ObjectWidget from './ObjectWidget';
 
-vi.mock('@plone/volto/components/manage/Form', async () => {
-  return await import(
-    '@plone/volto/components/manage/Form/__mocks__/index.vitest.tsx'
-  );
-});
+vi.mock('@plone/volto/components/manage/Form');
 
 const mockStore = configureStore();
 

package/src/components/manage/Widgets/QueryWidget.jsx

@@ -15,8 +15,12 @@ import groupBy from 'lodash/groupBy';
 import isEmpty from 'lodash/isEmpty';
 import map from 'lodash/map';
 import { defineMessages, injectIntl } from 'react-intl';
+import { withRouter } from 'react-router';
 import { getQuerystring } from '@plone/volto/actions/querystring/querystring';
+import { getQueryStringResults } from '@plone/volto/actions/querystringsearch/querystringsearch';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
+import ObjectBrowserWidget from '@plone/volto/components/manage/Widgets/ObjectBrowserWidget';
+import NumberWidget from '@plone/volto/components/manage/Widgets/NumberWidget';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import cx from 'classnames';
 import config from '@plone/volto/registry';
@@ -43,8 +47,27 @@ const messages = defineMessages({
     id: 'querystring-widget-select',
     defaultMessage: 'Select…',
   },
+  currentPath: {
+    id: 'query-widget-currentPath',
+    defaultMessage: 'Current path (./)',
+  },
+  parentPath: {
+    id: 'query-widget-parentPath',
+    defaultMessage: 'Parent path (../)',
+  },
 });
 
+const parseUidDepth = (val) => {
+  if (typeof val !== 'string') return { uid: '', depth: 1 };
+  const lastSep = String(val).lastIndexOf('::');
+  if (lastSep !== -1) {
+    const uid = val.substring(0, lastSep);
+    const parsed = parseInt(val.substring(lastSep + 2), 10);
+    return { uid, depth: Number.isNaN(parsed) ? 1 : parsed };
+  }
+  return { uid: val, depth: 1 };
+};
+
 /**
  * Widget for a querystring value, to define a catalog search criteria.
  */
@@ -97,6 +120,7 @@ export class QuerystringWidgetComponent extends Component {
     };
     this.onChangeValue = this.onChangeValue.bind(this);
     this.getWidget = this.getWidget.bind(this);
+    this.loadReferenceWidgetItem = this.loadReferenceWidgetItem.bind(this);
   }
 
   /**
@@ -111,6 +135,27 @@ export class QuerystringWidgetComponent extends Component {
     this.props.getQuerystring();
   }
 
+  loadReferenceWidgetItem(v) {
+    const loading =
+      this.props.reference[`${v}_query_reference`]?.loading ?? false;
+    if (!loading && v?.length > 0) {
+      this.props.getQueryStringResults(
+        '/',
+        {
+          b_size: 1,
+          query: [
+            {
+              i: 'path',
+              o: 'plone.app.querystring.operation.string.absolutePath',
+              v: v + '::0',
+            },
+          ],
+        },
+        v + '_query_reference',
+      );
+    }
+  }
+
   /**
    * Get correct widget
    * @method getWidget
@@ -118,15 +163,16 @@ export class QuerystringWidgetComponent extends Component {
    * @param {number} index Row index.
    * @returns {Object} Widget.
    */
-  getWidget(row, index, Select) {
+  getWidget(row, index, Select, intl) {
     const props = {
       fluid: true,
       value: row.v,
       onChange: (data) => this.onChangeValue(index, data.target.value),
     };
     const values = this.props.indexes[row.i].values;
+    const operator = this.props.indexes[row.i].operators[row.o];
 
-    switch (this.props.indexes[row.i].operators[row.o].widget) {
+    switch (operator.widget) {
       case null:
         return <span />;
       case 'DateWidget':
@@ -217,13 +263,93 @@ export class QuerystringWidgetComponent extends Component {
           </Form.Field>
         );
       case 'ReferenceWidget':
+        const { uid: uidValue, depth: depthValue } = parseUidDepth(props.value);
+        if (!this.props.reference[`${uidValue}_query_reference`]) {
+          this.loadReferenceWidgetItem(uidValue);
+        }
+        const referenceItem = this.props.reference[
+          `${uidValue}_query_reference`
+        ]
+          ? this.props.reference[`${uidValue}_query_reference`].items[0]
+          : null;
+        return (
+          <div className="location-object-browser">
+            <Form.Field className="object-browser-field">
+              <ObjectBrowserWidget
+                id={`query-reference-widget-${index}`}
+                mode="link"
+                onChange={(id, data) => {
+                  const itemSelected = data.length > 0 ? data[0] : {};
+                  const uid = itemSelected.UID ?? '';
+                  this.onChangeValue(index, uid ? `${uid}::${depthValue}` : '');
+                  this.loadReferenceWidgetItem(uid);
+                }}
+                value={uidValue && this.props.reference ? [referenceItem] : []}
+                wrapped={false}
+                onlyFolderishSelectable={true}
+                allowExternals={true}
+              />
+            </Form.Field>
+
+            {uidValue && (
+              <Form.Field className="reference-widget-depth">
+                <NumberWidget
+                  title={intl.formatMessage({
+                    id: 'Depth',
+                    defaultMessage: 'Depth',
+                  })}
+                  min={1}
+                  step={1}
+                  value={depthValue}
+                  onChange={(id, value) => {
+                    const newDepth = parseInt(value, 10) || 1;
+                    const curUid = uidValue || '';
+                    this.onChangeValue(index, `${curUid}::${newDepth}`);
+                  }}
+                />
+              </Form.Field>
+            )}
+          </div>
+        );
+      case 'RelativePathWidget':
+        const relativePathOptions = [
+          {
+            label: intl.formatMessage(messages.currentPath),
+            value: './',
+          },
+          {
+            label: intl.formatMessage(messages.parentPath),
+            value: '../',
+          },
+        ];
+        return (
+          <Form.Field style={{ flex: '1 0 auto', maxWidth: '92%' }}>
+            <Select
+              {...props}
+              className="react-select-container"
+              classNamePrefix="react-select"
+              options={relativePathOptions}
+              styles={customSelectStyles}
+              placeholder={this.props.intl.formatMessage(messages.select)}
+              theme={selectTheme}
+              components={{ DropdownIndicator, Option }}
+              onChange={(data) => {
+                this.onChangeValue(index, data.value);
+              }}
+              isMulti={false}
+              value={
+                relativePathOptions.filter((p) => p.value === props.value)?.[0]
+              }
+            />
+          </Form.Field>
+        );
       default:
         // if (row.o === 'plone.app.querystring.operation.string.relativePath') {
         //   props.onChange = data => this.onChangeValue(index, data.target.value);
         // }
         return (
           <Form.Field style={{ flex: '1 0 auto' }}>
-            <Input {...props} />
+            <Input {...props} description={operator.description} />
           </Form.Field>
         );
     }
@@ -334,7 +460,7 @@ export class QuerystringWidgetComponent extends Component {
                             value: row.i,
                             label: indexes[row.i]?.title,
                           }}
-                          onChange={(data) =>
+                          onChange={(data) => {
                             onChange(
                               id,
                               map(value, (curRow, curIndex) =>
@@ -346,8 +472,8 @@ export class QuerystringWidgetComponent extends Component {
                                     }
                                   : curRow,
                               ),
-                            )
-                          }
+                            );
+                          }}
                         />
                       </Form.Field>
                       <Form.Field style={{ flex: '1 0 auto' }}>
@@ -408,7 +534,7 @@ export class QuerystringWidgetComponent extends Component {
                         </Button>
                       )}
                     </div>
-                    {this.getWidget(row, index, Select)}
+                    {this.getWidget(row, index, Select, intl)}
                     {this.props.indexes[row.i].operators[row.o].widget && (
                       <Button
                         onClick={(event) => {
@@ -500,10 +626,12 @@ export class QuerystringWidgetComponent extends Component {
 export default compose(
   injectIntl,
   injectLazyLibs(['reactSelect']),
+  withRouter,
   connect(
-    (state) => ({
+    (state, props) => ({
       indexes: state.querystring.indexes,
+      reference: state.querystringsearch.subrequests,
     }),
-    { getQuerystring },
+    { getQuerystring, getQueryStringResults },
   ),
 )(QuerystringWidgetComponent);

package/src/components/manage/Widgets/QuerystringWidget.test.jsx

@@ -51,6 +51,8 @@ test('can take a schemaEnhancer', async () => {
       />
     </Provider>,
   );
-  await waitFor(() => {});
+  await waitFor(() => {
+    expect(component.toJSON()?.children).toHaveLength(3);
+  });
   expect(component.toJSON()).toMatchSnapshot();
 });

package/src/components/manage/Widgets/RadioGroupWidget.test.jsx

@@ -7,12 +7,7 @@ import RadioGroupWidget from './RadioGroupWidget';
 
 const mockStore = configureStore();
 
-vi.mock('@plone/volto/helpers/Loadable/Loadable', async () => {
-  return await import(
-    '@plone/volto/helpers/Loadable/__mocks__/Loadable.vitest.jsx'
-  );
-});
-
+vi.mock('@plone/volto/helpers/Loadable/Loadable');
 beforeAll(async () => {
   const { __setLoadables } = await import(
     '@plone/volto/helpers/Loadable/Loadable'

package/src/components/manage/Widgets/RecurrenceWidget/RecurrenceWidget.test.jsx

@@ -5,12 +5,7 @@ import { Provider } from 'react-intl-redux';
 import { waitFor } from '@testing-library/react';
 import RecurrenceWidget from './RecurrenceWidget';
 
-vi.mock('@plone/volto/helpers/Loadable/Loadable', async () => {
-  return await import(
-    '@plone/volto/helpers/Loadable/__mocks__/Loadable.vitest.jsx'
-  );
-});
-
+vi.mock('@plone/volto/helpers/Loadable/Loadable');
 beforeAll(async () => {
   const { __setLoadables } = await import(
     '@plone/volto/helpers/Loadable/Loadable'

package/src/components/manage/Widgets/RecurrenceWidget/WeekdayOfTheMonthIndexField.jsx

@@ -3,17 +3,17 @@
  * @module components/manage/Widgets/RecurrenceWidget/WeekdayOfTheMonthIndexField
  */
 
-import React, { Component } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 import map from 'lodash/map';
 import { Form } from 'semantic-ui-react';
 import SelectInput from './SelectInput';
 
 /**
- * WeekdayOfTheMonthIndexField component class.
+ * WeekdayOfTheMonthIndexField component.
  * @function WeekdayOfTheMonthIndexField
- * @returns {string} Markup of the component.
+ * @returns {JSX.Element} Markup of the component.
  */
 
 const messages = defineMessages({
@@ -34,53 +34,59 @@ const ORDINAL_NUMBERS = {
   '-1': 'last',
 };
 
-class WeekdayOfTheMonthIndexField extends Component {
-  /**
-   * Property types.
-   * @property {Object} propTypes Property types.
-   * @static
-   */
-  static propTypes = {
-    disabled: PropTypes.bool,
-    value: PropTypes.any,
-    onChange: PropTypes.func,
-  };
+const WeekdayOfTheMonthIndexField = ({
+  disabled,
+  value,
+  onChange,
+  ...otherProps
+}) => {
+  const intl = useIntl();
+  const weekdayOfTheMonthIndexList = [
+    ...map(Object.keys(ORDINAL_NUMBERS), (option) => ({
+      value: parseInt(option),
+      label: intl.formatMessage(messages[ORDINAL_NUMBERS[option]]),
+    })),
+  ];
+  return (
+    <>
+      <Form.Field disabled={disabled}>
+        {intl.formatMessage(messages.bymonthDayNumber)}
+      </Form.Field>
 
-  /**
-   * Default properties.
-   * @property {Object} defaultProps Default properties.
-   * @static
-   */
-  static defaultProps = {
-    disabled: false,
-    value: null,
-    onChange: null,
-  };
+      <Form.Field disabled={disabled}>
+        <SelectInput
+          name="weekdayOfTheMonthIndex"
+          options={weekdayOfTheMonthIndexList}
+          disabled={disabled}
+          value={value}
+          onChange={onChange}
+          {...otherProps}
+        />
+      </Form.Field>
+    </>
+  );
+};
 
-  render() {
-    const { intl, disabled } = this.props;
-    const weekdayOfTheMonthIndexList = [
-      ...map(Object.keys(ORDINAL_NUMBERS), (option) => ({
-        value: parseInt(option),
-        label: intl.formatMessage(messages[ORDINAL_NUMBERS[option]]),
-      })),
-    ];
-    return (
-      <>
-        <Form.Field disabled={disabled}>
-          {intl.formatMessage(messages.bymonthDayNumber)}
-        </Form.Field>
+/**
+ * Property types.
+ * @property {Object} propTypes
+ * @static
+ */
+WeekdayOfTheMonthIndexField.propTypes = {
+  disabled: PropTypes.bool,
+  value: PropTypes.any,
+  onChange: PropTypes.func,
+};
 
-        <Form.Field disabled={disabled}>
-          <SelectInput
-            name="weekdayOfTheMonthIndex"
-            options={weekdayOfTheMonthIndexList}
-            {...this.props}
-          />
-        </Form.Field>
-      </>
-    );
-  }
-}
+/**
+ * Default properties.
+ * @property {Object} defaultProps
+ * @static
+ */
+WeekdayOfTheMonthIndexField.defaultProps = {
+  disabled: false,
+  value: null,
+  onChange: null,
+};
 
-export default injectIntl(WeekdayOfTheMonthIndexField);
+export default WeekdayOfTheMonthIndexField;

package/src/components/manage/Widgets/RegistryImageWidget.jsx

@@ -99,7 +99,7 @@ const RegistryImageWidget = (props) => {
 
     readAsDataURL(file).then((data) => {
       const fields = data.match(/^data:(.*);(.*),(.*)$/);
-      onChange(id, `filenameb64:${btoa(file.name)};datab64:${fields[3]}}`);
+      onChange(id, `filenameb64:${btoa(file.name)};datab64:${fields[3]}`);
     });
 
     let reader = new FileReader();

package/src/components/manage/Widgets/RegistryImageWidget.test.jsx

@@ -20,6 +20,7 @@ const createStore = () =>
       locale: 'en',
       messages: {},
     },
+    site: { data: { 'plone.image_scales': { preview: {}, listing: {} } } },
   });
 
 describe('RegistryImageWidget', () => {

package/src/components/manage/Widgets/SchemaWidget.test.jsx

@@ -5,12 +5,7 @@ import { Provider } from 'react-intl-redux';
 
 import SchemaWidget from './SchemaWidget';
 
-vi.mock('@plone/volto/helpers/Loadable/Loadable', async () => {
-  return await import(
-    '@plone/volto/helpers/Loadable/__mocks__/Loadable.vitest.jsx'
-  );
-});
-
+vi.mock('@plone/volto/helpers/Loadable/Loadable');
 beforeAll(async () => {
   const { __setLoadables } = await import(
     '@plone/volto/helpers/Loadable/Loadable'

package/src/components/manage/Widgets/SchemaWidgetFieldset.test.jsx

@@ -3,12 +3,7 @@ import { DragDropContext, Droppable } from 'react-beautiful-dnd';
 import { render } from '@testing-library/react';
 import SchemaWidgetFieldsetComponent from './SchemaWidgetFieldset';
 
-vi.mock('@plone/volto/helpers/Loadable/Loadable', async () => {
-  return await import(
-    '@plone/volto/helpers/Loadable/__mocks__/Loadable.vitest.jsx'
-  );
-});
-
+vi.mock('@plone/volto/helpers/Loadable/Loadable');
 beforeAll(async () => {
   const { __setLoadables } = await import(
     '@plone/volto/helpers/Loadable/Loadable'

package/src/components/manage/Widgets/SelectAutoComplete.test.jsx

@@ -6,12 +6,7 @@ import SelectAutoComplete from './SelectAutoComplete';
 
 const mockStore = configureStore();
 
-vi.mock('@plone/volto/helpers/Loadable/Loadable', async () => {
-  return await import(
-    '@plone/volto/helpers/Loadable/__mocks__/Loadable.vitest.jsx'
-  );
-});
-
+vi.mock('@plone/volto/helpers/Loadable/Loadable');
 beforeAll(async () => {
   const { __setLoadables } = await import(
     '@plone/volto/helpers/Loadable/Loadable'