Merge branch '9.0'

frontend/src/components/dialog/custom-permission/custom-permission-editor.js

@@ -157,6 +157,12 @@ class CustomPermissionEditor extends React.Component {
                     <span>{gettext('Download')}</span>
                   </Label>
                 </FormGroup>
+                <FormGroup check>
+                  <Label check>
+                    <Input type="checkbox" onChange={this.onChangePermission('create')} checked={permission.create}/>
+                    <span>{gettext('Create')}</span>
+                  </Label>
+                </FormGroup>
                 <FormGroup check>
                   <Label check>
                     <Input type="checkbox" onChange={this.onChangePermission('modify')} checked={permission.modify}/>
@@ -168,7 +174,7 @@ class CustomPermissionEditor extends React.Component {
                       target={'modify-tip'}
                       placement='bottom'
                       isOpen={this.state.tooltipOpen}>
-                      ({gettext('Modify includes modify file, create file and folder, move/rename file and folder')})
+                      ({gettext('Modify includes modify file, move/rename file and folder')})
                     </Tooltip>
                   </Label>
                 </FormGroup>

frontend/src/components/dialog/org-import-users-dialog.js

@@ -0,0 +1,67 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Alert, Modal, ModalHeader, ModalBody, ModalFooter, Button } from 'reactstrap';
+import { gettext, siteRoot } from '../../utils/constants';
+
+const propTypes = {
+  toggle: PropTypes.func.isRequired,
+  importUsersInBatch: PropTypes.func.isRequired,
+};
+
+class ImportOrgUsersDialog extends React.Component {
+  constructor(props) {
+    super(props);
+    this.fileInputRef = React.createRef();
+    this.state = {
+      errorMsg: ''
+    };
+  }
+
+  toggle = () => {
+    this.props.toggle();
+  }
+
+  openFileInput = () => {
+    this.fileInputRef.current.click();
+  }
+
+  uploadFile = (e) => {
+    // no file selected
+    if (!this.fileInputRef.current.files.length) {
+      return;
+    }
+    // check file extension
+    let fileName = this.fileInputRef.current.files[0].name;
+    if(fileName.substr(fileName.lastIndexOf('.') + 1) != 'xlsx') {
+      this.setState({
+        errorMsg: gettext('Please choose a .xlsx file.')
+      });
+      return;
+    }
+    const file = this.fileInputRef.current.files[0];
+    this.props.importUsersInBatch(file);
+    this.toggle();
+  }
+
+  render() {
+    let { errorMsg } = this.state;
+    return (
+      <Modal isOpen={true} toggle={this.toggle}>
+        <ModalHeader toggle={this.toggle}>{gettext('Import users from a .xlsx file')}</ModalHeader>
+        <ModalBody>
+          <p><a className="text-secondary small" href={`${siteRoot}useradmin/batchadduser/example/`}>{gettext('Download an example file')}</a></p>
+          <button className="btn btn-outline-primary" onClick={this.openFileInput}>{gettext('Upload file')}</button>
+          <input className="d-none" type="file" onChange={this.uploadFile} ref={this.fileInputRef} />
+          {errorMsg && <Alert color="danger">{errorMsg}</Alert>}
+        </ModalBody>
+        <ModalFooter>
+          <Button color="secondary" onClick={this.toggle}>{gettext('Cancel')}</Button>
+        </ModalFooter>
+      </Modal>
+    );
+  }
+}
+
+ImportOrgUsersDialog.propTypes = propTypes;
+
+export default ImportOrgUsersDialog;