Optimize repo delete 2 (#4628)

* optimzie group repo delete logic

* repair code bug

* optimize repo delete code

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

@@ -6,6 +6,7 @@ import { Utils } from '../../utils/utils';
 
 const propTypes = {
   repo: PropTypes.object.isRequired,
+  isRepoDeleted: PropTypes.bool.isRequired,
   toggle: PropTypes.func.isRequired,
   onDeleteRepo: PropTypes.func.isRequired,
 };
@@ -19,6 +20,12 @@ class DeleteRepoDialog extends Component {
     };
   }
 
+  componentWillReceiveProps(nextProps) {
+    if (!nextProps.isRepoDeleted) {
+      this.setState({isRequestSended: false});
+    }
+  }
+
   toggle = () => {
     this.props.toggle();
   }

frontend/src/components/shared-repo-list-view/shared-repo-list-item.js

@@ -44,7 +44,8 @@ class SharedRepoListItem extends React.Component {
       isHistorySettingDialogShow: false,
       isDeleteDialogShow: false,
       isAPITokenDialogShow: false,
-      isRepoShareUploadLinksDialogOpen: false
+      isRepoShareUploadLinksDialogOpen: false,
+      isRepoDeleted: false,
     };
     this.isDeparementOnwerGroupMember = false;
   }
@@ -187,6 +188,37 @@ class SharedRepoListItem extends React.Component {
     this.setState({isDeleteDialogShow: !this.state.isDeleteDialogShow});
   }
 
+  onItemDelete = () => {
+    const { currentGroup, repo } = this.props;
+    if (!currentGroup) {  // repo can not be deleted in share all module
+      return;
+    }
+
+    const groupID = currentGroup.id;
+
+    seafileAPI.deleteGroupOwnedLibrary(groupID, repo.repo_id).then(() => {
+      
+      this.setState({
+        isRepoDeleted: true,
+        isDeleteDialogShow: false,
+      });
+      
+      this.props.onItemDelete(repo);
+      let name = repo.repo_name;
+      var msg = gettext('Successfully deleted {name}.').replace('{name}', name);
+      toaster.success(msg);
+    }).catch((error) => {
+      let errMessage = Utils.getErrorMsg(error);
+      if (errMessage === gettext('Error')) {
+        let name = repo.repo_name;
+        errMessage = gettext('Failed to delete {name}.').replace('{name}', name);
+      }
+      toaster.danger(errMessage);
+
+      this.setState({isRepoDeleted: false});
+    });
+  }
+
   toggleShareDialog = () => {
     this.setState({isShowSharedDialog: false});
   }
@@ -475,7 +507,8 @@ class SharedRepoListItem extends React.Component {
           <ModalPortal>
             <DeleteRepoDialog
               repo={this.props.repo}
-              onDeleteRepo={this.props.onItemDelete}
+              isRepoDeleted={this.state.isRepoDeleted}
+              onDeleteRepo={this.onItemDelete}
               toggle={this.onItemDeleteToggle}
             />
           </ModalPortal>

frontend/src/components/shared-repo-list-view/shared-repo-list-view.js

@@ -15,7 +15,7 @@ const propTypes = {
   sortItems: PropTypes.func,
   repoList: PropTypes.array.isRequired,
   onItemUnshare: PropTypes.func.isRequired,
-  onItemDelete: PropTypes.func.isRequired,
+  onItemDelete: PropTypes.func,
   onItemDetails: PropTypes.func,
   onItemRename: PropTypes.func,
 };

frontend/src/pages/groups/group-view.js

@@ -191,23 +191,11 @@ class GroupView extends React.Component {
 
   onItemDelete = (repo) => {
     let groupID = this.props.groupID;
-    seafileAPI.deleteGroupOwnedLibrary(groupID, repo.repo_id).then(() => {
+    let repoList = this.state.repoList.filter(item => {
-      let repoList = this.state.repoList.filter(item => {
+      return item.repo_id !== repo.repo_id;
-        return item.repo_id !== repo.repo_id;
-      });
-      this.setState({repoList: repoList});
-      this.loadGroup(groupID);
-      let name = repo.repo_name;
-      var msg = gettext('Successfully deleted {name}.').replace('{name}', name);
-      toaster.success(msg);
-    }).catch((error) => {
-      let errMessage = Utils.getErrorMsg(error);
-      if (errMessage === gettext('Error')) {
-        let name = repo.repo_name;
-        errMessage = gettext('Failed to delete {name}.').replace('{name}', name);
-      }
-      toaster.danger(errMessage);
     });
+    this.setState({repoList: repoList});
+    this.loadGroup(groupID);
   }
 
   addRepoItem = (repo) => {

frontend/src/pages/groups/groups-view.js

@@ -53,23 +53,10 @@ class RepoListViewPanel extends React.Component {
   }
 
   onItemDelete = (repo) => {
-    let group = this.props.group;
+    let repoList = this.state.repoList.filter(item => {
-    seafileAPI.deleteGroupOwnedLibrary(group.id, repo.repo_id).then(() => {
+      return item.repo_id !== repo.repo_id;
-      let repoList = this.state.repoList.filter(item => {
-        return item.repo_id !== repo.repo_id;
-      });
-      this.setState({repoList: repoList});
-      let name = repo.repo_name;
-      var msg = gettext('Successfully deleted {name}.').replace('{name}', name);
-      toaster.success(msg);
-    }).catch((error) => {
-      let errMessage = Utils.getErrorMsg(error);
-      if (errMessage === gettext('Error')) {
-        let name = repo.repo_name;
-        errMessage = gettext('Failed to delete {name}.').replace('{name}', name);
-      }
-      toaster.danger(errMessage);
     });
+    this.setState({repoList: repoList});
   }
   
   onItemRename = (repo, newName) => {

frontend/src/pages/my-libs/mylib-repo-list-item.js

@@ -49,7 +49,8 @@ class MylibRepoListItem extends React.Component {
       isLabelRepoStateDialogOpen: false,
       isFolderPermissionDialogShow: false,
       isAPITokenDialogShow: false,
-      isRepoShareUploadLinksDialogOpen: false
+      isRepoShareUploadLinksDialogOpen: false,
+      isRepoDeleted: false,
     };
   }
 
@@ -232,6 +233,12 @@ class MylibRepoListItem extends React.Component {
 
   onDeleteRepo = (repo) => {
     seafileAPI.deleteRepo(repo.repo_id).then((res) => {
+      
+      this.setState({
+        isRepoDeleted: true,
+        isDeleteDialogShow: false,
+      });
+      
       this.props.onDeleteRepo(repo);
       let name = repo.repo_name;
       var msg = gettext('Successfully deleted {name}.').replace('{name}', name);
@@ -243,6 +250,8 @@ class MylibRepoListItem extends React.Component {
         errMessage = gettext('Failed to delete {name}.').replace('{name}', name);
       }
       toaster.danger(errMessage);
+
+      this.setState({isRepoDeleted: false});
     });
   }
 
@@ -364,6 +373,7 @@ class MylibRepoListItem extends React.Component {
           <ModalPortal>
             <DeleteRepoDialog
               repo={repo}
+              isRepoDeleted={this.state.isRepoDeleted}
               onDeleteRepo={this.onDeleteRepo}
               toggle={this.onDeleteToggle}
             />

frontend/src/pages/org-admin/org-group-repos.js

@@ -103,7 +103,8 @@ class Item extends Component {
     this.state = {
       isOpIconShown: false,
       deleted: false,
-      isDeleteRepoDialogOpen: false
+      isDeleteRepoDialogOpen: false,
+      isRepoDeleted: false,
     };
   }
 
@@ -134,13 +135,16 @@ class Item extends Component {
     const repo = this.props.data;
     seafileAPI.orgAdminDeleteOrgRepo(orgID, repo.repo_id).then((res) => {
       this.setState({
-        deleted: true
+        deleted: true,
+        isRepoDeleted: true,
       });
       const msg = gettext('Successfully deleted {name}.').replace('{name}', repo.name);
       toaster.success(msg);
     }).catch((error) => {
       const errorMsg = Utils.getErrorMsg(error);
       toaster.danger(errorMsg);
+
+      this.setState({isRepoDeleted: false});
     });
   }
 
@@ -165,13 +169,14 @@ class Item extends Component {
             <a href="#" className={`action-icon sf2-icon-delete${isOpIconShown ? '' : ' invisible'}`} title={gettext('Delete')} onClick={this.handleDeleteIconClick}></a>
           </td>
         </tr>
-        {isDeleteRepoDialogOpen && 
+        {isDeleteRepoDialogOpen && (
-        <DeleteRepoDialog
+          <DeleteRepoDialog
-          repo={repo}
+            repo={repo}
-          onDeleteRepo={this.deleteRepo}
+            isRepoDeleted={this.state.isRepoDeleted}
-          toggle={this.toggleDeleteRepoDialog}
+            onDeleteRepo={this.deleteRepo}
-        />
+            toggle={this.toggleDeleteRepoDialog}
-        }
+          />
+        )}
       </Fragment>
     );
   }

frontend/src/pages/org-admin/org-user-repos.js

@@ -103,7 +103,8 @@ class Item extends Component {
     this.state = {
       isOpIconShown: false,
       deleted: false,
-      isDeleteRepoDialogOpen: false
+      isDeleteRepoDialogOpen: false,
+      isRepoDeleted: false,
     };
   }
 
@@ -134,13 +135,16 @@ class Item extends Component {
     const repo = this.props.data;
     seafileAPI.orgAdminDeleteOrgRepo(orgID, repo.repo_id).then((res) => {
       this.setState({
-        deleted: true
+        deleted: true,
+        isRepoDeleted: true,
       });
       const msg = gettext('Successfully deleted {name}.').replace('{name}', repo.repo_name);
       toaster.success(msg);
     }).catch((error) => {
       const errorMsg = Utils.getErrorMsg(error);
       toaster.danger(errorMsg);
+
+      this.setState({isRepoDeleted: false});
     });
   }
 
@@ -165,13 +169,14 @@ class Item extends Component {
             <a href="#" className={`action-icon sf2-icon-delete${isOpIconShown ? '' : ' invisible'}`} title={gettext('Delete')} onClick={this.handleDeleteIconClick}></a>
           </td>
         </tr>
-        {isDeleteRepoDialogOpen && 
+        {isDeleteRepoDialogOpen && (
-        <DeleteRepoDialog
+          <DeleteRepoDialog
-          repo={repo}
+            repo={repo}
-          onDeleteRepo={this.deleteRepo}
+            isRepoDeleted={this.state.isRepoDeleted}
-          toggle={this.toggleDeleteRepoDialog}
+            onDeleteRepo={this.deleteRepo}
-        />
+            toggle={this.toggleDeleteRepoDialog}
-        }
+          />
+        )}
       </Fragment>
     );
   }

frontend/src/pages/sys-admin/repos/repos.js

@@ -130,20 +130,26 @@ class Item extends Component {
       isShareDialogOpen: false,
       isDeleteDialogOpen: false,
       isTransferDialogOpen: false,
-      isHistorySettingDialogOpen: false
+      isHistorySettingDialogOpen: false,
+      isRepoDeleted: false,
     };
   }
 
   onDeleteRepo = (repo) => {
     seafileAPI.sysAdminDeleteRepo(repo.id).then((res) => {
       this.props.onDeleteRepo(repo);
+      this.setState({
+        isDeleteDialogOpen: false,
+        isRepoDeleted: true,
+      });
       const msg = gettext('Successfully deleted {name}.').replace('{name}', repo.name);
       toaster.success(msg);
     }).catch((error) => {
       let errMessage = Utils.getErrorMsg(error);
       toaster.danger(errMessage);
+
+      this.setState({isRepoDeleted: false});
     });
-    this.toggleDeleteDialog();
   }
 
   onTransferRepo = (owner) => {
@@ -325,6 +331,7 @@ class Item extends Component {
           <ModalPortal>
             <DeleteRepoDialog
               repo={repo}
+              isRepoDeleted={this.state.isRepoDeleted}
               onDeleteRepo={this.onDeleteRepo}
               toggle={this.toggleDeleteDialog}
             />