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

Web: Files: fixed url filter, fixed selectedFolder error

Browse Source
This commit is contained in:
Nikita Gopienko 2020-10-06 19:33:41 +03:00
parent 6cd15ef176
commit 201126834f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
View File

@ -441,9 +441,9 @@ function mapStateToProps(state) {
const shareId = treeFolders[shareFolderIndex].id;
const commonId = treeFolders[commonFolderIndex].id;
const isMy = selectedFolder.pathParts[0] === myId;
const isShare = selectedFolder.pathParts[0] === shareId;
const isCommon = selectedFolder.pathParts[0] === commonId;
const isMy = selectedFolder.length && selectedFolder.pathParts[0] === myId;
const isShare = selectedFolder.length && selectedFolder.pathParts[0] === shareId;
const isCommon = selectedFolder.length && selectedFolder.pathParts[0] === commonId;
return {
treeFolders: getTreeFolders(state),

4
products/ASC.Files/Client/src/components/pages/Home/index.js
View File

@ -160,8 +160,8 @@ class PureHome extends React.Component {
filter.selectedItem = selectedItem;
}
if (filter) {
const folderId = filter.folder;
if (filterObj) {
const folderId = filterObj.folder;
return fetchFiles(folderId, filter);
}