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

Web: Files: fixed selectedTreeNode

Browse Source
This commit is contained in:
Nikita Gopienko 2021-04-07 12:21:32 +03:00
parent 50d01a646d
commit 3c0e64005b
2 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,7 +132,8 @@ export default inject(
const { fetchFiles, filter, setIsLoading } = filesStore;
const { treeFolders, setSelectedNode, setTreeFolders } = treeFoldersStore;
const selectedTreeNode =
treeFoldersStore.selectedTreeNode.length > 0
treeFoldersStore.selectedTreeNode.length > 0 &&
treeFoldersStore.selectedTreeNode[0] !== "@my"
? treeFoldersStore.selectedTreeNode
: [selectedFolderStore.id + ""];

78
products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
View File

@ -161,46 +161,42 @@ const SectionBodyContent = ({
);
};
export default inject(
({ auth, filesStore, settingsStore, treeFoldersStore }) => {
const { isLoading } = filesStore;
const { selectedTreeNode } = treeFoldersStore;
const {
isLoadedSettingsTree,
storeOriginalFiles,
confirmDelete,
updateIfExist,
forcesave,
storeForcesave,
enableThirdParty,
setUpdateIfExist,
setStoreOriginal,
setEnableThirdParty,
setConfirmDelete,
setStoreForceSave,
setForceSave,
settingsIsLoaded,
} = settingsStore;
export default inject(({ auth, filesStore, settingsStore }) => {
const { isLoading } = filesStore;
const {
isLoadedSettingsTree,
storeOriginalFiles,
confirmDelete,
updateIfExist,
forcesave,
storeForcesave,
enableThirdParty,
setUpdateIfExist,
setStoreOriginal,
setEnableThirdParty,
setConfirmDelete,
setStoreForceSave,
setForceSave,
settingsIsLoaded,
} = settingsStore;
return {
isAdmin: auth.isAdmin,
isLoading,
selectedTreeNode,
isLoadedSettingsTree,
storeOriginalFiles,
confirmDelete,
updateIfExist,
forceSave: forcesave,
storeForceSave: storeForcesave,
enableThirdParty,
return {
isAdmin: auth.isAdmin,
isLoading,
isLoadedSettingsTree,
storeOriginalFiles,
confirmDelete,
updateIfExist,
forceSave: forcesave,
storeForceSave: storeForcesave,
enableThirdParty,
setUpdateIfExist,
setStoreOriginal,
setEnableThirdParty,
setConfirmDelete,
setStoreForceSave,
setForceSave,
settingsIsLoaded,
};
}
)(observer(SectionBodyContent));
setUpdateIfExist,
setStoreOriginal,
setEnableThirdParty,
setConfirmDelete,
setStoreForceSave,
setForceSave,
settingsIsLoaded,
};
})(observer(SectionBodyContent));