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

Web.Files: fix selector (88a6c73a8b)

Browse Source
This commit is contained in:
Daniil Senkiv 2020-03-20 11:53:25 +03:00
parent 71e5e3c73c
commit f2e69e5384
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,7 @@ ArticleMainButtonContent.propTypes = {
const mapStateToProps = (state) => {
return {
settings: state.auth.settings,
isMyDocuments: isMyDocuments(state.files.rootFolders.my.id, state.files.selectedFolder.id)
isMyDocuments: isMyDocuments(state.files.rootFolders.my.id, state.files.selectedFolder.pathParts[0])
}
}

2
products/ASC.Files/Client/src/store/files/actions.js
View File

@ -161,7 +161,7 @@ export function fetchFiles(folderId, filter, dispatch) {
dispatch(setFilesFilter(filterData, folderId));
dispatch(setFolders(data.folders));
dispatch(setFiles(data.files));
return dispatch(setSelectedFolder({ folders: data.folders, ...data.current }));
return dispatch(setSelectedFolder({ folders: data.folders, ...data.current, pathParts: data.pathParts }));
})
}

2
products/ASC.Files/Client/src/store/files/selectors.js
View File

@ -106,4 +106,4 @@ export const getTreeFolders = (pathParts, filterData) => {
return treeFolders;
};
export const isMyDocuments = (myDocFolderId, currentFolderId) => myDocFolderId === currentFolderId;
export const isMyDocuments = (myDocFolderId, rootFolderOfCurrent) => myDocFolderId === rootFolderOfCurrent;