Merge branch '7.0'

frontend/src/components/dialog/internal-link.js

@@ -10,6 +10,7 @@ import { Utils } from '../../utils/utils';
 const propTypes = {
   path: PropTypes.string.isRequired,
   repoID: PropTypes.string.isRequired,
+  direntType: PropTypes.string
 };
 
 class InternalLink extends React.Component {
@@ -21,9 +22,8 @@ class InternalLink extends React.Component {
   }
 
   componentDidMount() {
-    let repoID = this.props.repoID;
-    let path = this.props.path;
-    seafileAPI.getInternalLink(repoID, path).then(res => {
+    let { repoID, path, direntType } = this.props;
+    seafileAPI.getInternalLink(repoID, path, direntType).then(res => {
       this.setState({
         smartLink: res.data.smart_link
       });

frontend/src/components/dialog/invitation-revoke-dialog.js

@@ -0,0 +1,66 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { gettext } from '../../utils/constants';
+import { Button, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
+import { seafileAPI } from '../../utils/seafile-api';
+import { Utils } from '../../utils/utils';
+import Loading from '../loading';
+import toaster from '../toast';
+
+const propTypes = {
+  accepter: PropTypes.string.isRequired,
+  token: PropTypes.string.isRequired,
+  revokeInvitation: PropTypes.func.isRequired,
+  toggleDialog: PropTypes.func.isRequired
+};
+
+class InvitationRevokeDialog extends React.Component {
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      isSubmitting: false
+    };
+  }
+
+  onRevokeInvitation = () => {
+    this.setState({
+      isSubmitting: true,
+    });
+
+    seafileAPI.revokeInvitation(this.props.token).then((res) => {
+      this.props.revokeInvitation();
+      this.props.toggleDialog();
+      const msg = gettext('Successfully revoked access of user {placeholder}.').replace('{placeholder}', this.props.accepter);
+      toaster.success(msg);
+    }).catch((error) => {
+      const errorMsg = Utils.getErrorMsg(error);
+      toaster.danger(errorMsg);
+      this.props.toggleDialog();
+    });
+  };
+
+  render() {
+    const { accepter, toggleDialog } = this.props;
+    const { isSubmitting } = this.state;
+    const email = '<span class="op-target">' + Utils.HTMLescape(this.props.accepter) + '</span>';
+    const content = gettext('Are you sure to revoke access of user {placeholder} ?').replace('{placeholder}', email);
+
+    return (
+      <Modal isOpen={true} toggle={toggleDialog}>
+        <ModalHeader toggle={toggleDialog}>{gettext('Revoke Access')}</ModalHeader>
+        <ModalBody>
+          <p dangerouslySetInnerHTML={{__html: content}}></p>
+        </ModalBody>
+        <ModalFooter>
+          <Button color="secondary" onClick={toggleDialog}>{gettext('Cancel')}</Button>
+          <Button className="submit-btn" color="primary" onClick={this.onRevokeInvitation} disabled={isSubmitting}>{isSubmitting ? <Loading /> : gettext('Submit')}</Button>
+        </ModalFooter>
+      </Modal>
+    );
+  }
+}
+
+InvitationRevokeDialog.propTypes = propTypes;
+
+export default InvitationRevokeDialog;

frontend/src/components/dialog/invite-people-dialog.js

@@ -1,9 +1,16 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import {gettext} from '../../utils/constants';
-import {seafileAPI} from '../../utils/seafile-api';
-import {Modal, ModalHeader, ModalBody, ModalFooter, Input, Button} from 'reactstrap';
+import { Utils } from '../../utils/utils';
+import { gettext } from '../../utils/constants';
+import { seafileAPI } from '../../utils/seafile-api';
+import { Modal, ModalHeader, ModalBody, ModalFooter, Input, Button } from 'reactstrap';
 import toaster from '../toast';
+import Loading from '../loading';
+
+const InvitePeopleDialogPropTypes = {
+  onInvitePeople: PropTypes.func.isRequired,
+  toggleDialog: PropTypes.func.isRequired,
+};
 
 class InvitePeopleDialog extends React.Component {
 
@@ -12,11 +19,12 @@ class InvitePeopleDialog extends React.Component {
     this.state = {
       emails: '',
       errorMsg: '',
+      isSubmitting: false
     };
   }
 
-  handleEmailsChange = (event) => {
-    let emails = event.target.value;
+  handleInputChange = (e) => {
+    let emails = e.target.value;
     this.setState({
       emails: emails
     });
@@ -36,91 +44,88 @@ class InvitePeopleDialog extends React.Component {
 
   handleSubmitInvite = () => {
     let emails = this.state.emails.trim();
+    if (!emails) {
+      this.setState({
+        errorMsg: gettext('It is required.')
+      });
+      return false;
+    }
+
     let emailsArray = [];
-    emails = emails.split(',');
-    for (let i = 0; i < emails.length; i++) {
+    emails = emails.split(',');  
+    for (let i = 0, len = emails.length; i < len; i++) {
       let email = emails[i].trim();
       if (email) {
         emailsArray.push(email);
       }
     }
-    if (emailsArray.length) {
-      seafileAPI.invitePeople(emailsArray).then((res) => {
-        this.setState({
-          emails: '',
-        });
-        this.props.toggleInvitePeopleDialog();
-        // success messages
-        let successMsg = '';
-        if (res.data.success.length === 1) {
-          successMsg = gettext('Successfully invited %(email).')
-            .replace('%(email)', res.data.success[0].accepter);
-        } else if(res.data.success.length > 1) {
-          successMsg = gettext('Successfully invited %(email) and %(num) other people.')
-            .replace('%(email)', res.data.success[0].accepter)
-            .replace('%(num)', res.data.success.length - 1);
-        }
-        if (successMsg) {
-          toaster.success(successMsg, {duration: 2});
-          this.props.onInvitePeople(res.data.success);
-        }
-        // failed messages
-        if (res.data.failed.length) {
-          for (let i = 0; i< res.data.failed.length; i++){
-            let failedMsg = res.data.failed[i].email + ': ' + res.data.failed[i].error_msg;
-            toaster.danger(failedMsg, {duration: 3});}
-        }
-      }).catch((error) => {
-        this.props.toggleInvitePeopleDialog();
-        if (error.response){
-          toaster.danger(error.response.data.detail || gettext('Error'), {duration: 3});
-        } else {
-          toaster.danger(gettext('Please check the network.'), {duration: 3});
-        }
+
+    if (!emailsArray.length) {
+      this.setState({
+        errorMsg: gettext('Email is invalid.')
       });
-    } else {
-      if (this.state.emails){
-        this.setState({
-          errorMsg: gettext('Email is invalid.')
-        });
-      } else {
-        this.setState({
-          errorMsg: gettext('It is required.')
-        });
-      }
+      return false;
     }
+
+    this.setState({
+      isSubmitting: true
+    });
+    seafileAPI.invitePeople(emailsArray).then((res) => {
+      this.props.toggleDialog();
+      const success = res.data.success;
+      if (success.length) {
+        let successMsg = '';
+        if (success.length == 1) {
+          successMsg = gettext('Successfully invited %(email).')
+            .replace('%(email)', success[0].accepter);
+        } else {
+          successMsg = gettext('Successfully invited %(email) and %(num) other people.')
+            .replace('%(email)', success[0].accepter)
+            .replace('%(num)', success.length - 1);
+        }
+        toaster.success(successMsg);
+        this.props.onInvitePeople(success);
+      }
+      const failed = res.data.failed;
+      if (failed.length) {
+        for (let i = 0, len = failed.length; i < len; i++) {
+          let failedMsg = failed[i].email + ': ' + failed[i].error_msg;
+          toaster.danger(failedMsg);
+        }
+      }
+    }).catch((error) => {
+      const errorMsg = Utils.getErrorMsg(error);
+      toaster.danger(errorMsg);
+      this.props.toggleDialog();
+    });
   }
 
   render() {
+    const { isSubmitting } = this.state;
     return (
-      <Modal isOpen={this.props.isInvitePeopleDialogOpen} toggle={this.props.toggleInvitePeopleDialog}>
-        <ModalHeader toggle={this.props.toggleInvitePeopleDialog}>{gettext('Invite People')}</ModalHeader>
+      <Modal isOpen={true} toggle={this.props.toggleDialog}>
+        <ModalHeader toggle={this.props.toggleDialog}>{gettext('Invite People')}</ModalHeader>
         <ModalBody>
           <label htmlFor="emails">{gettext('Emails')}</label>
           <Input
-            type="text" id="emails"
+            type="text"
+            id="emails"
             placeholder={gettext('Emails, separated by \',\'')}
             value={this.state.emails}
-            onChange={this.handleEmailsChange}
+            onChange={this.handleInputChange}
             onKeyDown={this.handleKeyDown}
           />
-          <span className="error">{this.state.errorMsg}</span>
+          <p className="error mt-2">{this.state.errorMsg}</p>
         </ModalBody>
         <ModalFooter>
-          <Button color="secondary" onClick={this.props.toggleInvitePeopleDialog}>{gettext('Cancel')}</Button>
-          <Button color="primary" onClick={this.handleSubmitInvite}>{gettext('Submit')}</Button>
+          <Button color="secondary" onClick={this.props.toggleDialog}>{gettext('Cancel')}</Button>
+          <Button className="submit-btn" color="primary" onClick={this.handleSubmitInvite} disabled={isSubmitting}>{isSubmitting ? <Loading /> : gettext('Submit')}</Button>
         </ModalFooter>
       </Modal>
     );
   }
 }
 
-const InvitePeopleDialogPropTypes = {
-  toggleInvitePeopleDialog: PropTypes.func.isRequired,
-  isInvitePeopleDialogOpen: PropTypes.bool.isRequired,
-  onInvitePeople: PropTypes.func.isRequired,
-};
-
 InvitePeopleDialog.propTypes = InvitePeopleDialogPropTypes;
 
-export default InvitePeopleDialog;
+export default InvitePeopleDialog;

frontend/src/components/dialog/list-taggedfiles-dialog.js

@@ -38,7 +38,7 @@ class ListTaggedFilesDialog extends React.Component {
     seafileAPI.deleteFileTag(repoID, fileTagID).then(res => {
       this.getTaggedFiles();
       this.props.updateUsedRepoTags();
-      if (this.props.onFileTagChanged) this.onFileTagChanged(taggedFile);
+      if ((this.props.onFileTagChanged) && !taggedFile.file_deleted) this.onFileTagChanged(taggedFile);
     }).catch(error => {
       let errMessage = Utils.getErrorMsg(error);
       toaster.danger(errMessage);

frontend/src/components/dialog/org-add-member-dialog.js

@@ -34,7 +34,7 @@ class AddMemberDialog extends React.Component {
     const email = this.state.selectedOption.email;
     this.refs.orgSelect.clearSelect();
     this.setState({ errMessage: [] });
-    seafileAPI.orgAdminAddDepartGroupUser(orgID, this.props.groupID, email).then((res) => {
+    seafileAPI.orgAdminAddGroupMember(orgID, this.props.groupID, email).then((res) => {
       this.setState({ selectedOption: null });
       if (res.data.failed.length > 0) {
         this.setState({ errMessage: res.data.failed[0].error_msg });

frontend/src/components/dialog/org-add-repo-dialog.js

@@ -30,7 +30,7 @@ class AddRepoDialog extends React.Component {
   handleSubmit = () => {
     let isValid = this.validateName();
     if (isValid) {
-      seafileAPI.orgAdminAddDepartGroupRepo(orgID, this.props.groupID, this.state.repoName.trim()).then((res) => {
+      seafileAPI.orgAdminAddDepartmentRepo(orgID, this.props.groupID, this.state.repoName.trim()).then((res) => {
         this.props.toggle();
         this.props.onRepoChanged();
       }).catch(error => {

frontend/src/components/dialog/org-delete-member-dialog.js

@@ -21,7 +21,7 @@ class DeleteMemberDialog extends React.Component {
 
   deleteMember = () => {
     const userEmail = this.props.member.email;
-    seafileAPI.orgAdminDeleteDepartGroupUser(orgID, this.props.groupID, userEmail).then((res) => {
+    seafileAPI.orgAdminDeleteGroupMember(orgID, this.props.groupID, userEmail).then((res) => {
       if (res.data.success) {
         this.props.onMemberChanged();
         this.props.toggle();

frontend/src/components/dialog/org-delete-repo-dialog.js

@@ -13,7 +13,7 @@ class DeleteRepoDialog extends React.Component {
   }
 
   deleteRepo = () => {
-    seafileAPI.orgAdminDeleteDepartGroupRepo(orgID, this.props.groupID, this.props.repo.repo_id).then((res) => {
+    seafileAPI.orgAdminDeleteDepartmentRepo(orgID, this.props.groupID, this.props.repo.repo_id).then((res) => {
       if (res.data.success) {
         this.props.onRepoChanged();
         this.props.toggle();

frontend/src/components/dialog/set-org-user-contact-email.js

@@ -0,0 +1,75 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap'; 
+import { gettext } from '../../utils/constants';
+import { seafileAPI } from '../../utils/seafile-api';
+import { Utils } from '../../utils/utils';
+
+const propTypes = {
+  orgID: PropTypes.string.isRequired,
+  email: PropTypes.string.isRequired,
+  contactEmail: PropTypes.string.isRequired,
+  updateContactEmail: PropTypes.func.isRequired,
+  toggleDialog: PropTypes.func.isRequired
+};
+
+class SetOrgUserContactEmail extends React.Component {
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      inputValue: this.props.contactEmail,
+      submitBtnDisabled: false
+    };
+  }
+
+  handleInputChange = (e) => {
+    this.setState({
+      inputValue: e.target.value 
+    });
+  }
+
+  formSubmit = () => {
+    const { orgID, email } = this.props;
+    const contactEmail = this.state.inputValue.trim();
+
+    this.setState({
+      submitBtnDisabled: true 
+    });
+
+    seafileAPI.setOrgUserContactEmail(orgID, email, contactEmail).then((res) => {
+      const newContactEmail = contactEmail ? res.data.contact_email : '';
+      this.props.updateContactEmail(newContactEmail);
+      this.props.toggleDialog();
+    }).catch((error) => {
+      let errorMsg = Utils.getErrorMsg(error);
+      this.setState({
+        formErrorMsg: errorMsg,
+        submitBtnDisabled: false
+      }); 
+    });
+  }
+
+  render() {
+    const { inputValue, formErrorMsg, submitBtnDisabled } = this.state;
+    return (
+      <Modal isOpen={true} centered={true} toggle={this.props.toggleDialog}>
+        <ModalHeader toggle={this.props.toggleDialog}>{gettext('Set user contact email')}</ModalHeader>
+        <ModalBody>
+          <React.Fragment>
+            <input type="text" className="form-control" value={inputValue} onChange={this.handleInputChange} />
+            {formErrorMsg && <p className="error m-0 mt-2">{formErrorMsg}</p>}
+          </React.Fragment>
+        </ModalBody>
+        <ModalFooter>
+          <button className="btn btn-secondary" onClick={this.props.toggleDialog}>{gettext('Cancel')}</button>
+          <button className="btn btn-primary" disabled={submitBtnDisabled} onClick={this.formSubmit}>{gettext('Submit')}</button>
+        </ModalFooter>
+      </Modal>
+    );
+  }
+}
+
+SetOrgUserContactEmail.propTypes = propTypes;
+
+export default SetOrgUserContactEmail;

frontend/src/components/dialog/set-org-user-name.js

@@ -0,0 +1,77 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap'; 
+import { gettext } from '../../utils/constants';
+import { seafileAPI } from '../../utils/seafile-api';
+import { Utils } from '../../utils/utils';
+
+const propTypes = {
+  orgID: PropTypes.string.isRequired,
+  email: PropTypes.string.isRequired,
+  name: PropTypes.string.isRequired,
+  updateName: PropTypes.func.isRequired,
+  toggleDialog: PropTypes.func.isRequired
+};
+
+class SetOrgUserName extends React.Component {
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      inputValue: this.props.name,
+      submitBtnDisabled: false
+    };
+  }
+
+  handleInputChange = (e) => {
+    this.setState({
+      inputValue: e.target.value 
+    });
+  }
+
+  formSubmit = () => {
+    const { orgID, email } = this.props;
+    const name = this.state.inputValue.trim();
+
+    this.setState({
+      submitBtnDisabled: true 
+    });
+
+    // when name is '', api returns the previous name
+    // but newName needs to be ''
+    seafileAPI.setOrgUserName(orgID, email, name).then((res) => {
+      const newName = name ? res.data.name : '';
+      this.props.updateName(newName);
+      this.props.toggleDialog();
+    }).catch((error) => {
+      let errorMsg = Utils.getErrorMsg(error);
+      this.setState({
+        formErrorMsg: errorMsg,
+        submitBtnDisabled: false
+      }); 
+    });
+  }
+
+  render() {
+    const { inputValue, formErrorMsg, submitBtnDisabled } = this.state;
+    return (
+      <Modal isOpen={true} centered={true} toggle={this.props.toggleDialog}>
+        <ModalHeader toggle={this.props.toggleDialog}>{gettext('Set user name')}</ModalHeader>
+        <ModalBody>
+          <React.Fragment>
+            <input type="text" className="form-control" value={inputValue} onChange={this.handleInputChange} />
+            {formErrorMsg && <p className="error m-0 mt-2">{formErrorMsg}</p>}
+          </React.Fragment>
+        </ModalBody>
+        <ModalFooter>
+          <button className="btn btn-secondary" onClick={this.props.toggleDialog}>{gettext('Cancel')}</button>
+          <button className="btn btn-primary" disabled={submitBtnDisabled} onClick={this.formSubmit}>{gettext('Submit')}</button>
+        </ModalFooter>
+      </Modal>
+    );
+  }
+}
+
+SetOrgUserName.propTypes = propTypes;
+
+export default SetOrgUserName;

frontend/src/components/dialog/set-org-user-quota.js

@@ -0,0 +1,89 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Modal, ModalHeader, ModalBody, ModalFooter, InputGroup, InputGroupAddon, InputGroupText } from 'reactstrap'; 
+import { gettext } from '../../utils/constants';
+import { seafileAPI } from '../../utils/seafile-api';
+import { Utils } from '../../utils/utils';
+
+const propTypes = {
+  orgID: PropTypes.string.isRequired,
+  email: PropTypes.string.isRequired,
+  quotaTotal: PropTypes.string.isRequired,
+  updateQuota: PropTypes.func.isRequired,
+  toggleDialog: PropTypes.func.isRequired
+};
+
+class SetOrgUserQuota extends React.Component {
+
+  constructor(props) {
+    super(props);
+    const initialQuota = this.props.quotaTotal < 0 ? '' :
+      this.props.quotaTotal / (1000 * 1000);
+    this.state = {
+      inputValue: initialQuota,
+      submitBtnDisabled: false
+    };
+  }
+
+  handleInputChange = (e) => {
+    this.setState({
+      inputValue: e.target.value 
+    });
+  }
+
+  formSubmit = () => {
+    const { orgID, email } = this.props;
+    const quota = this.state.inputValue.trim();
+
+    if (!quota) {
+      this.setState({
+        formErrorMsg: gettext('It is required.')
+      });
+      return false;
+    }
+
+    this.setState({
+      submitBtnDisabled: true 
+    });
+
+    seafileAPI.setOrgUserQuota(orgID, email, quota).then((res) => {
+      this.props.updateQuota(res.data.quota_total);
+      this.props.toggleDialog();
+    }).catch((error) => {
+      let errorMsg = Utils.getErrorMsg(error);
+      this.setState({
+        formErrorMsg: errorMsg,
+        submitBtnDisabled: false
+      }); 
+    });
+  }
+
+  render() {
+    const { inputValue, formErrorMsg, submitBtnDisabled } = this.state;
+    return (
+      <Modal isOpen={true} centered={true} toggle={this.props.toggleDialog}>
+        <ModalHeader toggle={this.props.toggleDialog}>{gettext('Set user quota')}</ModalHeader>
+        <ModalBody>
+          <React.Fragment>
+            <InputGroup>
+              <input type="text" className="form-control" value={inputValue} onChange={this.handleInputChange} />
+              <InputGroupAddon addonType="append">
+                <InputGroupText>MB</InputGroupText>
+              </InputGroupAddon>
+            </InputGroup>
+            <p className="small text-secondary mt-2 mb-2">{gettext('Tip: 0 means default limit')}</p>
+            {formErrorMsg && <p className="error m-0 mt-2">{formErrorMsg}</p>}
+          </React.Fragment>
+        </ModalBody>
+        <ModalFooter>
+          <button className="btn btn-secondary" onClick={this.props.toggleDialog}>{gettext('Cancel')}</button>
+          <button className="btn btn-primary" disabled={submitBtnDisabled} onClick={this.formSubmit}>{gettext('Submit')}</button>
+        </ModalFooter>
+      </Modal>
+    );
+  }
+}
+
+SetOrgUserQuota.propTypes = propTypes;
+
+export default SetOrgUserQuota;

frontend/src/components/dialog/share-dialog.js

@@ -76,7 +76,7 @@ class ShareDialog extends React.Component {
     }
 
     let activeTab = this.state.activeTab;
-    const {repoEncrypted, userPerm, enableDirPrivateShare} = this.props;
+    const {repoEncrypted, userPerm, enableDirPrivateShare, itemType} = this.props;
     const enableShareLink = !repoEncrypted && canGenerateShareLink;
     const enableUploadLink = !repoEncrypted && canGenerateUploadLink && userPerm == 'rw';
 
@@ -98,6 +98,11 @@ class ShareDialog extends React.Component {
                 </NavLink>
               </NavItem>
             }
+            <NavItem>
+              <NavLink className={activeTab === 'internalLink' ? 'active' : ''} onClick={this.toggle.bind(this, 'internalLink')}>
+                {gettext('Internal Link')}
+              </NavLink>
+            </NavItem>
             {enableDirPrivateShare &&
               <Fragment>
                 <NavItem>
@@ -134,6 +139,13 @@ class ShareDialog extends React.Component {
                 />
               </TabPane>
             }
+            <TabPane tabId="internalLink">
+              <InternalLink 
+                path={this.props.itemPath} 
+                repoID={this.props.repoID} 
+                direntType={itemType}
+              />
+            </TabPane>
             {enableDirPrivateShare &&
               <Fragment>
                 <TabPane tabId="shareToUser">