IlyaSobolev/DocSpace-buildtools
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 { fetchFiles, filter, setIsLoading } = filesStore;
const { treeFolders, setSelectedNode, setTreeFolders } = treeFoldersStore; const { treeFolders, setSelectedNode, setTreeFolders } = treeFoldersStore;
const selectedTreeNode = const selectedTreeNode =
treeFoldersStore.selectedTreeNode.length > 0 treeFoldersStore.selectedTreeNode.length > 0 &&
treeFoldersStore.selectedTreeNode[0] !== "@my"
? treeFoldersStore.selectedTreeNode ? treeFoldersStore.selectedTreeNode
: [selectedFolderStore.id + ""]; : [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( export default inject(({ auth, filesStore, settingsStore }) => {
({ auth, filesStore, settingsStore, treeFoldersStore }) => { const { isLoading } = filesStore;
const { isLoading } = filesStore; const {
const { selectedTreeNode } = treeFoldersStore; isLoadedSettingsTree,
const { storeOriginalFiles,
isLoadedSettingsTree, confirmDelete,
storeOriginalFiles, updateIfExist,
confirmDelete, forcesave,
updateIfExist, storeForcesave,
forcesave, enableThirdParty,
storeForcesave, setUpdateIfExist,
enableThirdParty, setStoreOriginal,
setUpdateIfExist, setEnableThirdParty,
setStoreOriginal, setConfirmDelete,
setEnableThirdParty, setStoreForceSave,
setConfirmDelete, setForceSave,
setStoreForceSave, settingsIsLoaded,
setForceSave, } = settingsStore;
settingsIsLoaded,
} = settingsStore;
return { return {
isAdmin: auth.isAdmin, isAdmin: auth.isAdmin,
isLoading, isLoading,
selectedTreeNode, isLoadedSettingsTree,
isLoadedSettingsTree, storeOriginalFiles,
storeOriginalFiles, confirmDelete,
confirmDelete, updateIfExist,
updateIfExist, forceSave: forcesave,
forceSave: forcesave, storeForceSave: storeForcesave,
storeForceSave: storeForcesave, enableThirdParty,
enableThirdParty,
setUpdateIfExist, setUpdateIfExist,
setStoreOriginal, setStoreOriginal,
setEnableThirdParty, setEnableThirdParty,
setConfirmDelete, setConfirmDelete,
setStoreForceSave, setStoreForceSave,
setForceSave, setForceSave,
settingsIsLoaded, settingsIsLoaded,
}; };
} })(observer(SectionBodyContent));
)(observer(SectionBodyContent));