haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-02 23:48:47 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3313 from haiwen/fix-bug

Browse Source 
handle delete item then details panel bug
This commit is contained in:
Daniel Pan
2019-04-18 15:14:35 +08:00
committed by GitHub
parent 2303a046fe fea12cbb3e
commit fd03ce3ec7
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/pages/lib-content-view/lib-content-container.js
View File

@@ -84,6 +84,7 @@ const propTypes = {
closeDirentDetail: PropTypes.func.isRequired,
showDirentDetail: PropTypes.func.isRequired,
onDeleteRepoTag: PropTypes.func.isRequired,
updateDetail: PropTypes.bool.isRequired,
};
class LibContentContainer extends React.Component {
@@ -98,7 +99,7 @@ class LibContentContainer extends React.Component {
}
componentWillReceiveProps(nextProps) {
if (nextProps.path !== this.props.path) {
if (nextProps.path !== this.props.path || nextProps.updateDetail !== this.props.updateDetail) {
this.setState({currentDirent: null});
}
}
@@ -124,6 +125,13 @@ class LibContentContainer extends React.Component {
this.props.onItemSelected(dirent);
}
onItemDelete = (dirent) => {
if (dirent.name === this.state.currentDirent.name) {
this.setState({currentDirent: null});
}
this.props.onItemDelete(dirent);
}
render() {
let { path, repoID, usedRepoTags, readmeMarkdown, draftCounts } = this.props;
let isRepoInfoBarShow = false;
@@ -177,7 +185,7 @@ class LibContentContainer extends React.Component {
onAddFile={this.props.onAddFile}
onItemClick={this.onItemClick}
onItemSelected={this.onItemSelected}
onItemDelete={this.props.onItemDelete}
onItemDelete={this.onItemDelete}
onItemRename={this.props.onItemRename}
onItemMove={this.props.onItemMove}
onItemCopy={this.props.onItemCopy}
@@ -241,7 +249,7 @@ class LibContentContainer extends React.Component {
onAddFile={this.props.onAddFile}
onItemClick={this.onItemClick}
onItemSelected={this.onItemSelected}
onItemDelete={this.props.onItemDelete}
onItemDelete={this.onItemDelete}
onItemRename={this.props.onItemRename}
onItemMove={this.props.onItemMove}
onItemCopy={this.props.onItemCopy}

3
frontend/src/pages/lib-content-view/lib-content-view.js
View File

@@ -70,6 +70,7 @@ class LibContentView extends React.Component {
dirID: '', // for update dir list
errorMsg: '',
isDirentDetailShow: false,
updateDetail: false,
};
window.onpopstate = this.onpopstate;
@@ -491,6 +492,7 @@ class LibContentView extends React.Component {
let direntPaths = this.getSelectedDirentPaths();
let dirNames = this.getSelectedDirentNames();
this.setState({updateDetail: !this.state.updateDetail});
seafileAPI.deleteMutipleDirents(repoID, this.state.path, dirNames).then(res => {
direntPaths.forEach(direntPath => {
if (this.state.currentMode === 'column') {
@@ -1448,6 +1450,7 @@ class LibContentView extends React.Component {
showDirentDetail={this.showDirentDetail}
onDeleteRepoTag={this.onDeleteRepoTag}
onToolbarFileTagChanged={this.onToolbarFileTagChanged}
updateDetail={this.state.updateDetail}
/>
{this.state.pathExist && !this.state.isViewFile && (
<FileUploader