IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: Files: fixed inability to navigate from TreeSettings to TreeFolders

Browse Source
This commit is contained in:
Artem Tarasov 2020-10-07 14:12:45 +03:00
parent a49b2581d9
commit 36158ded1d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
View File

@ -12,6 +12,7 @@ import {
setExpandSettingsTree,
setIsErrorSettings,
getFilesSettings,
setSelectedFolder,
} from "../../../store/files/actions";
const i18n = createI18N({
@ -55,6 +56,7 @@ const PureTreeSettings = ({
setExpandSettingsTree,
setIsErrorSettings,
getFilesSettings,
setSelectedFolder,
t,
}) => {
useEffect(() => {
@ -83,11 +85,13 @@ const PureTreeSettings = ({
if (path === "settings") {
setSelectedNode(["common"]);
setSelectedFolder({ id: "common" });
setExpandSettingsTree(section);
return history.push("/products/files/settings/common");
}
setSelectedNode(section);
setSelectedFolder({ id: section[0] });
return history.push(`/products/files/settings/${path}`);
};
@ -190,4 +194,5 @@ export default connect(mapStateToProps, {
setExpandSettingsTree,
setIsErrorSettings,
getFilesSettings,
setSelectedFolder,
})(withRouter(TreeSettings));

2
products/ASC.Files/Client/src/components/Article/Body/index.js
View File

@ -60,7 +60,7 @@ class ArticleBodyContent extends React.Component {
fetchFiles,
} = this.props;
if (selectedTreeNode[0] !== data[0]) {
if (!selectedTreeNode || selectedTreeNode[0] !== data[0]) {
setSelectedNode(data);
setIsLoading(true);
const newFilter = filter.clone();