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

Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files

Browse Source
This commit is contained in:
Alexey Safronov 2020-10-16 15:24:45 +03:00
commit 996c74641f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
View File

@ -109,7 +109,6 @@ class NewFilesPanelComponent extends React.Component {
api.files
.markAsRead(folderIds, fileIds)
.then(() => {
this.props.setUpdateTree(true);
this.setNewFilesCount(folderId, markAsReadFiles);
this.props.setNewRowItems(itemsIds);
})
@ -162,7 +161,7 @@ class NewFilesPanelComponent extends React.Component {
};
setNewFilesCount = (folderPath, markAsReadAll, item) => {
const { treeFolders, setTreeFolders, folders, files } = this.props;
const { treeFolders, setTreeFolders, folders, files, setUpdateTree } = this.props;
const data = treeFolders;
let dataItem;
@ -210,6 +209,7 @@ class NewFilesPanelComponent extends React.Component {
}
}
setUpdateTree(true);
setTreeFolders(data);
};

3
products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
View File

@ -64,6 +64,9 @@ class SectionBodyContent extends React.PureComponent {
if (!isLoaded) return;
if(peopleList.length <= 0) setIsLoaded();
setIsLoaded(false)
fetchPeople(filter)
.then(() => isLoaded && setIsLoaded(true))
.catch((error) => {