Web: Files: fixed tree menu update

This commit is contained in:
Nikita Gopienko 2021-05-21 11:32:22 +03:00
parent f586f4d428
commit d83498f603
2 changed files with 26 additions and 25 deletions

View File

@ -42,34 +42,34 @@ class ArticleBodyContent extends React.Component {
history, history,
} = this.props; } = this.props;
if (!selectedTreeNode || selectedTreeNode[0] !== data[0]) { //if (!selectedTreeNode || selectedTreeNode[0] !== data[0]) {
setSelectedNode(data); setSelectedNode(data);
setIsLoading(true); setIsLoading(true);
const newFilter = filter.clone(); const newFilter = filter.clone();
newFilter.page = 0; newFilter.page = 0;
newFilter.startIndex = 0;
newFilter.folder = data[0];
const selectedFolderTitle =
(e.node && e.node.props && e.node.props.title) || null;
selectedFolderTitle
? setDocumentTitle(selectedFolderTitle)
: setDocumentTitle();
if (window.location.pathname.indexOf("/filter") > 0) {
fetchFiles(data[0], newFilter)
.catch((err) => toastr.error(err))
.finally(() => setIsLoading(false));
} else {
newFilter.startIndex = 0; newFilter.startIndex = 0;
newFilter.folder = data[0]; const urlFilter = newFilter.toUrlParams();
history.push(
const selectedFolderTitle = combineUrl(AppServerConfig.proxyURL, homepage, `/filter?${urlFilter}`)
(e.node && e.node.props && e.node.props.title) || null; );
selectedFolderTitle
? setDocumentTitle(selectedFolderTitle)
: setDocumentTitle();
if (window.location.pathname.indexOf("/filter") > 0) {
fetchFiles(data[0], newFilter)
.catch((err) => toastr.error(err))
.finally(() => setIsLoading(false));
} else {
newFilter.startIndex = 0;
const urlFilter = newFilter.toUrlParams();
history.push(
combineUrl(AppServerConfig.proxyURL, homepage, `/filter?${urlFilter}`)
);
}
} }
//}
}; };
onShowNewFilesPanel = (folderId) => { onShowNewFilesPanel = (folderId) => {

View File

@ -348,6 +348,7 @@ class FilesStore {
return request(); return request();
}, 5000); }, 5000);
} else { } else {
this.treeFoldersStore.fetchTreeFolders();
return this.fetchFiles( return this.fetchFiles(
this.userStore.user.isVisitor ? "@common" : "@my" this.userStore.user.isVisitor ? "@common" : "@my"
); );