@plone/volto 18.0.0-alpha.42 → 18.0.0-alpha.43

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

@@ -1,12 +1,6 @@
-/**
- * Contents upload modal.
- * @module components/manage/Contents/ContentsUploadModal
- */
-
-import React, { Component } from 'react';
+import { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { compose } from 'redux';
+import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import {
   Button,
   Dimmer,
@@ -23,10 +17,10 @@ import loadable from '@loadable/component';
 import { concat, filter, map } from 'lodash';
 import filesize from 'filesize';
 import { readAsDataURL } from 'promise-file-reader';
-import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
+import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 import { FormattedRelativeDate } from '@plone/volto/components';
 import { createContent } from '@plone/volto/actions';
-import { validateFileUploadSize } from '@plone/volto/helpers';
+import { validateFileUploadSize, usePrevious } from '@plone/volto/helpers';
 
 const Dropzone = loadable(() => import('react-dropzone'));
 
@@ -52,154 +46,77 @@ const messages = defineMessages({
 
 const SUBREQUEST = 'batch-upload';
 
-/**
- * ContentsUploadModal class.
- * @class ContentsUploadModal
- * @extends Component
- */
-class ContentsUploadModal extends Component {
-  /**
-   * Property types.
-   * @property {Object} propTypes Property types.
-   * @static
-   */
-  static propTypes = {
-    createContent: PropTypes.func.isRequired,
-    pathname: PropTypes.string.isRequired,
-    request: PropTypes.shape({
-      loading: PropTypes.bool,
-      loaded: PropTypes.bool,
-    }).isRequired,
-    open: PropTypes.bool.isRequired,
-    onOk: PropTypes.func.isRequired,
-    onCancel: PropTypes.func.isRequired,
-    uploadedFiles: PropTypes.number,
-    multiple: PropTypes.bool,
-    minSize: PropTypes.number,
-    maxSize: PropTypes.number,
-    accept: PropTypes.oneOfType([
-      PropTypes.string,
-      PropTypes.arrayOf(PropTypes.string),
-    ]),
-  };
+const ContentsUploadModal = (props) => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const request = useSelector(
+    (state) => state.content.subrequests?.[SUBREQUEST] || {},
+    shallowEqual,
+  );
+  const uploadedFiles = useSelector((state) => state.content.uploadedFiles);
 
-  /**
-   * Constructor
-   * @method constructor
-   * @param {Object} props Component properties
-   * @constructs ContentsUploadModal
-   */
-  constructor(props) {
-    super(props);
-    this.onRemoveFile = this.onRemoveFile.bind(this);
-    this.onDrop = this.onDrop.bind(this);
-    this.onCancel = this.onCancel.bind(this);
-    this.onSubmit = this.onSubmit.bind(this);
-    this.state = {
-      files: [],
-      totalFiles: 0,
-    };
-  }
-  /**
-   * Component will receive props
-   * @method componentWillReceiveProps
-   * @param {Object} nextProps Next properties
-   * @returns {undefined}
-   */
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    if (this.props.request.loading && nextProps.request.loaded) {
-      this.props.onOk();
-      this.setState({
-        files: [],
-      });
+  const prevrequestloading = usePrevious(request.loading);
+  const [files, setFiles] = useState([]);
+  const [totalFiles, setTotalFiles] = useState(0);
+  const { onOk } = props;
+  useEffect(() => {
+    if (prevrequestloading && request.loaded) {
+      onOk();
+      setFiles([]);
     }
-  }
+  }, [prevrequestloading, request.loaded, onOk]);
 
-  /**
-   * Remove file handler
-   * @method onRemoveFile
-   * @param {Object} event Event object
-   * @returns {undefined}
-   */
-  onRemoveFile(event) {
-    this.setState({
-      files: filter(
-        this.state.files,
+  const onRemoveFile = (event) => {
+    setFiles(
+      filter(
+        files,
         (file, index) =>
           index !== parseInt(event.target.getAttribute('value'), 10),
       ),
-    });
-    this.setState((prevState) => ({ totalFiles: prevState.totalFiles - 1 }));
-  }
+    );
+    setTotalFiles(totalFiles - 1);
+  };
 
-  /**
-   * Drop handler
-   * @method onDrop
-   * @param {array} files File objects
-   * @returns {undefined}
-   */
-  onDrop = async (files) => {
+  const onDrop = async (newFiles) => {
     const validFiles = [];
-    for (let i = 0; i < files.length; i++) {
-      if (validateFileUploadSize(files[i], this.props.intl.formatMessage)) {
-        await readAsDataURL(files[i]).then((data) => {
+    for (let i = 0; i < newFiles.length; i++) {
+      if (validateFileUploadSize(newFiles[i], intl.formatMessage)) {
+        await readAsDataURL(newFiles[i]).then((data) => {
           const fields = data.match(/^data:(.*);(.*),(.*)$/);
-          files[i].preview = fields[0];
+          newFiles[i].preview = fields[0];
         });
-        validFiles.push(files[i]);
+        validFiles.push(newFiles[i]);
       }
     }
-    this.setState({
-      files: concat(this.state.files, validFiles),
-    });
-
-    this.setState({ totalFiles: validFiles.length });
+    setFiles(concat(files, validFiles));
+    setTotalFiles(validFiles.length);
   };
 
-  /**
-   * Cancel handler
-   * @method onCancel
-   * @returns {undefined}
-   */
-  onCancel() {
-    this.props.onCancel();
-    this.setState({
-      files: [],
-    });
-    this.setState({ totalFiles: 0 });
-  }
-  /**
-   * Name change handler
-   * @method onChangeFileName
-   * @returns {undefined}
-   */
+  const onCancel = () => {
+    props.onCancel();
+    setFiles([]);
+    setTotalFiles(0);
+  };
 
-  onChangeFileName(e, index) {
-    let copyOfFiles = [...this.state.files];
-    let originalFile = this.state.files[index];
+  const onChangeFileName = (e, index) => {
+    let copyOfFiles = [...files];
+    let originalFile = files[index];
     let newFile = new File([originalFile], e.target.value, {
       type: originalFile.type,
     });
     newFile.preview = originalFile.preview;
     newFile.path = e.target.value;
     copyOfFiles[index] = newFile;
-    this.setState({
-      files: copyOfFiles,
-    });
-  }
+    setFiles(copyOfFiles);
+  };
 
-  /**
-   * Submit handlers
-   * @method onSubmit
-   * @returns {undefined}
-   */
-  onSubmit() {
-    Promise.all(map(this.state.files, (file) => readAsDataURL(file))).then(
-      (files) => {
-        this.props.createContent(
-          this.props.pathname,
-          map(this.state.files, (file, index) => {
-            const fields = files[index].match(/^data:(.*);(.*),(.*)$/);
+  const onSubmit = () => {
+    Promise.all(map(files, (file) => readAsDataURL(file))).then((dataUrls) => {
+      dispatch(
+        createContent(
+          props.pathname,
+          map(files, (file, index) => {
+            const fields = dataUrls[index].match(/^data:(.*);(.*),(.*)$/);
             const image = fields[1].split('/')[0] === 'image';
             return {
               '@type': image ? 'Image' : 'File',
@@ -213,205 +130,195 @@ class ContentsUploadModal extends Component {
             };
           }),
           SUBREQUEST,
-        );
-      },
-    );
-  }
-
-  /**
-   * Render method.
-   * @method render
-   * @returns {string} Markup for the component.
-   */
-  render() {
-    const {
-      multiple = true,
-      minSize = null,
-      maxSize = null,
-      accept = null,
-      disabled = false,
-    } = this.props;
-
-    const dropzoneOptions = {
-      multiple,
-      minSize,
-      maxSize,
-      accept,
-      disabled,
-    };
+        ),
+      );
+    });
+  };
 
-    return (
-      this.props.open && (
-        <Modal className="contents-upload-modal" open={this.props.open}>
-          <Header>
-            <FormattedMessage id="Upload files" defaultMessage="Upload files" />
-          </Header>
+  const {
+    multiple = true,
+    minSize = null,
+    maxSize = null,
+    accept = null,
+    disabled = false,
+  } = props;
+  const dropzoneOptions = {
+    multiple,
+    minSize,
+    maxSize,
+    accept,
+    disabled,
+  };
 
-          <Dimmer active={this.props.request.loading}>
-            <div className="progress-container">
-              <Progress
-                className="progress-bar"
-                value={this.props.uploadedFiles}
-                total={this.state.totalFiles}
-              >
-                {this.props.intl.formatMessage(messages.filesUploaded, {
-                  uploadedFiles: this.props.uploadedFiles,
-                })}
-                <br />
-                {this.props.intl.formatMessage(messages.totalFilesToUpload, {
-                  totalFiles: this.state.totalFiles,
-                })}
-              </Progress>
-            </div>
-          </Dimmer>
-          <Modal.Content>
-            <Dropzone
-              onDrop={this.onDrop}
-              className="dropzone"
-              noDragEventsBubbling={true}
-              {...dropzoneOptions}
+  return (
+    props.open && (
+      <Modal className="contents-upload-modal" open={props.open}>
+        <Header>
+          <FormattedMessage id="Upload files" defaultMessage="Upload files" />
+        </Header>
+        <Dimmer active={request.loading}>
+          <div className="progress-container">
+            <Progress
+              className="progress-bar"
+              value={uploadedFiles}
+              total={totalFiles}
             >
-              {({ getRootProps, getInputProps }) => (
-                <div {...getRootProps({ className: 'dashed' })}>
-                  <Segment>
-                    <Table basic="very">
-                      <Table.Body>
-                        <Table.Row>
-                          <Table.Cell>
+              {intl.formatMessage(messages.filesUploaded, {
+                uploadedFiles,
+              })}
+              <br />
+              {intl.formatMessage(messages.totalFilesToUpload, {
+                totalFiles,
+              })}
+            </Progress>
+          </div>
+        </Dimmer>
+        <Modal.Content>
+          <Dropzone
+            onDrop={onDrop}
+            className="dropzone"
+            noDragEventsBubbling={true}
+            {...dropzoneOptions}
+          >
+            {({ getRootProps, getInputProps }) => (
+              <div {...getRootProps({ className: 'dashed' })}>
+                <Segment>
+                  <Table basic="very">
+                    <Table.Body>
+                      <Table.Row>
+                        <Table.Cell>
+                          <FormattedMessage
+                            id="Drag and drop files from your computer onto this area or click the “Browse” button."
+                            defaultMessage="Drag and drop files from your computer onto this area or click the “Browse” button."
+                          />
+                        </Table.Cell>
+                        <Table.Cell>
+                          <Button className="ui button primary">
                             <FormattedMessage
-                              id="Drag and drop files from your computer onto this area or click the “Browse” button."
-                              defaultMessage="Drag and drop files from your computer onto this area or click the “Browse” button."
-                            />
-                          </Table.Cell>
-                          <Table.Cell>
-                            <Button className="ui button primary">
-                              <FormattedMessage
-                                id="Browse"
-                                defaultMessage="Browse"
-                              />
-                            </Button>
-                            <input
-                              {...getInputProps({
-                                type: 'file',
-                                style: { display: 'none' },
-                              })}
+                              id="Browse"
+                              defaultMessage="Browse"
                             />
-                          </Table.Cell>
-                        </Table.Row>
-                      </Table.Body>
-                    </Table>
-                  </Segment>
-                </div>
-              )}
-            </Dropzone>
-            {this.state.files.length > 0 && (
-              <Table compact singleLine>
-                <Table.Header>
-                  <Table.Row>
-                    <Table.HeaderCell width={8}>
-                      <FormattedMessage
-                        id="Filename"
-                        defaultMessage="Filename"
-                      />
-                    </Table.HeaderCell>
-                    <Table.HeaderCell width={4}>
-                      <FormattedMessage
-                        id="Last modified"
-                        defaultMessage="Last modified"
+                          </Button>
+                          <input
+                            {...getInputProps({
+                              type: 'file',
+                              style: { display: 'none' },
+                            })}
+                          />
+                        </Table.Cell>
+                      </Table.Row>
+                    </Table.Body>
+                  </Table>
+                </Segment>
+              </div>
+            )}
+          </Dropzone>
+          {files.length > 0 && (
+            <Table compact singleLine>
+              <Table.Header>
+                <Table.Row>
+                  <Table.HeaderCell width={8}>
+                    <FormattedMessage id="Filename" defaultMessage="Filename" />
+                  </Table.HeaderCell>
+                  <Table.HeaderCell width={4}>
+                    <FormattedMessage
+                      id="Last modified"
+                      defaultMessage="Last modified"
+                    />
+                  </Table.HeaderCell>
+                  <Table.HeaderCell width={4}>
+                    <FormattedMessage
+                      id="File size"
+                      defaultMessage="File size"
+                    />
+                  </Table.HeaderCell>
+                  <Table.HeaderCell width={4}>
+                    <FormattedMessage id="Preview" defaultMessage="Preview" />
+                  </Table.HeaderCell>
+                  <Table.HeaderCell />
+                </Table.Row>
+              </Table.Header>
+              <Table.Body>
+                {map(files, (file, index) => (
+                  <Table.Row className="upload-row" key={index}>
+                    <Table.Cell>
+                      <Input
+                        className="file-name"
+                        value={file.name}
+                        onChange={(e) => onChangeFileName(e, index)}
                       />
-                    </Table.HeaderCell>
-                    <Table.HeaderCell width={4}>
-                      <FormattedMessage
-                        id="File size"
-                        defaultMessage="File size"
+                    </Table.Cell>
+                    <Table.Cell>
+                      {file.lastModifiedDate && (
+                        <FormattedRelativeDate date={file.lastModifiedDate} />
+                      )}
+                    </Table.Cell>
+                    <Table.Cell>{filesize(file.size, { round: 0 })}</Table.Cell>
+                    <Table.Cell>
+                      {file.type.split('/')[0] === 'image' && (
+                        <Image src={file.preview} height={60} />
+                      )}
+                    </Table.Cell>
+                    <Table.Cell>
+                      <Icon
+                        name="close"
+                        value={index}
+                        link
+                        onClick={onRemoveFile}
                       />
-                    </Table.HeaderCell>
-                    <Table.HeaderCell width={4}>
-                      <FormattedMessage id="Preview" defaultMessage="Preview" />
-                    </Table.HeaderCell>
-                    <Table.HeaderCell />
+                    </Table.Cell>
                   </Table.Row>
-                </Table.Header>
-                <Table.Body>
-                  {map(this.state.files, (file, index) => (
-                    <Table.Row className="upload-row" key={index}>
-                      <Table.Cell>
-                        <Input
-                          className="file-name"
-                          value={file.name}
-                          onChange={(e) => this.onChangeFileName(e, index)}
-                        />
-                      </Table.Cell>
-                      <Table.Cell>
-                        {file.lastModifiedDate && (
-                          <FormattedRelativeDate date={file.lastModifiedDate} />
-                        )}
-                      </Table.Cell>
-                      <Table.Cell>
-                        {filesize(file.size, { round: 0 })}
-                      </Table.Cell>
-                      <Table.Cell>
-                        {file.type.split('/')[0] === 'image' && (
-                          <Image src={file.preview} height={60} />
-                        )}
-                      </Table.Cell>
-                      <Table.Cell>
-                        <Icon
-                          name="close"
-                          value={index}
-                          link
-                          onClick={this.onRemoveFile}
-                        />
-                      </Table.Cell>
-                    </Table.Row>
-                  ))}
-                </Table.Body>
-              </Table>
-            )}
-          </Modal.Content>
-          <Modal.Actions>
-            {this.state.files.length > 0 && (
-              <Button
-                basic
-                circular
-                primary
-                floated="right"
-                icon="arrow right"
-                aria-label={this.props.intl.formatMessage(messages.upload, {
-                  count: this.state.files.length,
-                })}
-                onClick={this.onSubmit}
-                title={this.props.intl.formatMessage(messages.upload, {
-                  count: this.state.files.length,
-                })}
-                size="big"
-              />
-            )}
+                ))}
+              </Table.Body>
+            </Table>
+          )}
+        </Modal.Content>
+        <Modal.Actions>
+          {files.length > 0 && (
             <Button
               basic
               circular
-              secondary
-              icon="remove"
-              aria-label={this.props.intl.formatMessage(messages.cancel)}
-              title={this.props.intl.formatMessage(messages.cancel)}
+              primary
               floated="right"
+              icon="arrow right"
+              aria-label={intl.formatMessage(messages.upload, {
+                count: files.length,
+              })}
+              onClick={onSubmit}
+              title={intl.formatMessage(messages.upload, {
+                count: files.length,
+              })}
               size="big"
-              onClick={this.onCancel}
             />
-          </Modal.Actions>
-        </Modal>
-      )
-    );
-  }
-}
+          )}
+          <Button
+            basic
+            circular
+            secondary
+            icon="remove"
+            aria-label={intl.formatMessage(messages.cancel)}
+            title={intl.formatMessage(messages.cancel)}
+            floated="right"
+            size="big"
+            onClick={onCancel}
+          />
+        </Modal.Actions>
+      </Modal>
+    )
+  );
+};
 
-export default compose(
-  injectIntl,
-  connect(
-    (state) => ({
-      request: state.content.subrequests?.[SUBREQUEST] || {},
-      uploadedFiles: state.content.uploadedFiles,
-    }),
-    { createContent },
-  ),
-)(ContentsUploadModal);
+ContentsUploadModal.propTypes = {
+  pathname: PropTypes.string.isRequired,
+  open: PropTypes.bool.isRequired,
+  onOk: PropTypes.func.isRequired,
+  onCancel: PropTypes.func.isRequired,
+  multiple: PropTypes.bool,
+  minSize: PropTypes.number,
+  maxSize: PropTypes.number,
+  accept: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.arrayOf(PropTypes.string),
+  ]),
+};
+export default ContentsUploadModal;

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

@@ -0,0 +1,56 @@
+import { injectIntl } from 'react-intl';
+import React from 'react';
+import ContentsUploadModalComponent from './ContentsUploadModal';
+import { RealStoreWrapper as Wrapper } from '@plone/volto/storybook';
+
+const IntlContentUploadModalComponent = injectIntl(
+  ContentsUploadModalComponent,
+);
+
+function StoryComponent(args) {
+  return (
+    <Wrapper
+      customStore={{
+        content: {
+          create: {
+            loading: false,
+            loaded: true,
+          },
+        },
+        intl: {
+          locale: 'en',
+          messages: {},
+        },
+      }}
+    >
+      <div id="toolbar" style={{ display: 'none' }} />
+      <IntlContentUploadModalComponent
+        {...args}
+        pathname="/blog"
+        loading={false}
+        loaded={true}
+        onOk={() => {}}
+        onCancel={() => {}}
+      />
+    </Wrapper>
+  );
+}
+
+export const ContentUploadModal = StoryComponent.bind({});
+
+ContentUploadModal.args = {
+  open: false,
+};
+
+export default {
+  title: 'Public components/Contents/Content Upload Modal',
+  component: ContentUploadModal,
+  decorators: [
+    (Story) => (
+      <div className="ui segment form attached" style={{ width: '400px' }}>
+        <Story />
+      </div>
+    ),
+  ],
+  argTypes: {},
+};