update repo trash

frontend/src/components/dialog/clean-trash.js

@@ -9,7 +9,9 @@ import toaster from '../toast';
 
 const propTypes = {
   repoID: PropTypes.string.isRequired,
+  trashType: PropTypes.number.isRequired,
   refreshTrash: PropTypes.func.isRequired,
+  refreshTrash2: PropTypes.func.isRequired,
   toggleDialog: PropTypes.func.isRequired
 };
 
@@ -41,18 +43,23 @@ class CleanTrash extends React.Component {
     this.setState({
       submitBtnDisabled: true
     });
-
     seafileAPI.deleteRepoTrash(repoID, inputValue.value).then((res) => {
-      toaster.success(gettext('Clean succeeded.'));
-      this.props.refreshTrash();
+      if (this.props.trashType === 0) {
+        this.props.refreshTrash2();
+      }
+      if (this.props.trashType === 1) {
+        this.props.refreshTrash();
+      }
       this.props.toggleDialog();
+      toaster.success(gettext('Clean succeeded.'));
     }).catch((error) => {
       let errorMsg = Utils.getErrorMsg(error);
       this.setState({
         formErrorMsg: errorMsg,
         submitBtnDisabled: false
       });
     });
+
   };
 
   render() {

frontend/src/components/dialog/select-trash.js

@@ -0,0 +1,82 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
+import CreatableSelect from 'react-select/creatable';
+import { gettext } from '../../utils/constants';
+
+const propTypes = {
+  repoID: PropTypes.string.isRequired,
+  trashType: PropTypes.number.isRequired,
+  refreshTrash: PropTypes.func.isRequired,
+  refreshTrash2: PropTypes.func.isRequired,
+  changeTrash: PropTypes.func.isRequired,
+  toggleDialog: PropTypes.func.isRequired
+};
+
+class SelectTrash extends React.Component {
+  constructor(props) {
+    super(props);
+    this.options = [
+      {label: gettext('New'), value: 0},
+      {label: gettext('Old'), value: 1}
+    ];
+    this.state = {
+      inputValue: this.options[this.props.trashType],
+      submitBtnDisabled: false
+    };
+  }
+
+  handleInputChange = (value) => {
+    this.setState({
+      inputValue: value
+    });
+  };
+
+  formSubmit = ()=>{
+    const inputValue = this.state.inputValue;
+    if (inputValue.value === 1){
+      this.listOldTrash();
+    }
+    if (inputValue.value === 0){
+      this.listNewTrash();
+    }
+    this.props.changeTrash(this.state.inputValue.value);
+  };
+
+  listOldTrash = ()=>{
+    this.props.refreshTrash();
+    this.props.toggleDialog();
+  };
+
+  listNewTrash = () => {
+    this.props.refreshTrash2();
+    this.props.toggleDialog();
+  };
+
+  render() {
+    return (
+      <Modal isOpen={true} centered={true} toggle={this.props.toggleDialog}>
+        <ModalHeader toggle={this.props.toggleDialog}>{gettext('Select trash')}</ModalHeader>
+        <ModalBody>
+          <React.Fragment>
+            <CreatableSelect
+              defaultValue={this.options[this.props.trashType]}
+              options={this.options}
+              autoFocus={false}
+              onChange={this.handleInputChange}
+              placeholder=''
+            />
+          </React.Fragment>
+        </ModalBody>
+        <ModalFooter>
+          <button className="btn btn-primary"
+            onClick={this.formSubmit}>{gettext('Submit')}</button>
+        </ModalFooter>
+      </Modal>
+    );
+  }
+}
+
+SelectTrash.propTypes = propTypes;
+
+export default SelectTrash;