From acfe89b4f43b4c95c63b2d410c1ed2dda2653436 Mon Sep 17 00:00:00 2001
From: TatianaLopaeva <talopaeva@gmail.com>
Date: Fri, 16 Oct 2020 14:54:13 +0300
Subject: [PATCH 1/2] Web: People: Fixed the error of returning to the list of
 users immediately after refreshing the page and switching to the profile view

---
 .../Client/src/components/pages/Home/Section/Body/index.js     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js b/products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
index 31cae6d601..e3d1c1d32b 100644
--- a/products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
+++ b/products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
@@ -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) => {

From 30f301435e6f60df213f2db35843936735ad1e30 Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Fri, 16 Oct 2020 15:06:49 +0300
Subject: [PATCH 2/2] Web: Files: fixed the update of the badge in the tree

---
 .../Client/src/components/panels/NewFilesPanel/index.js       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js b/products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
index 91aa3de65e..a58950c3d4 100644
--- a/products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
+++ b/products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
@@ -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);
   };