From 7d6d7d2bc8b3c6d89e3e58e886d4e5dbdbe585ad Mon Sep 17 00:00:00 2001
From: Vladislav Makhov <vladislav.makhov@onlyoffice.com>
Date: Wed, 14 Oct 2020 17:23:24 +0300
Subject: [PATCH] Revert "Fix filter search"

This reverts commit 783c81fdb47053fe3936e195122d8baef2026185.
---
 .../src/components/Article/Body/index.js      |  8 ++------
 .../pages/Home/Section/Body/index.js          |  4 ++--
 .../Client/src/components/pages/Home/index.js | 20 +------------------
 3 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/products/ASC.Files/Client/src/components/Article/Body/index.js b/products/ASC.Files/Client/src/components/Article/Body/index.js
index de0d753650..24bc198fd8 100644
--- a/products/ASC.Files/Client/src/components/Article/Body/index.js
+++ b/products/ASC.Files/Client/src/components/Article/Body/index.js
@@ -15,7 +15,6 @@ import {
   getFilter,
   getSelectedFolderTitle,
   getSelectedTreeNode,
-  getCurrentFolderCount
 } from "../../../store/files/selectors";
 import { NewFilesPanel } from "../../panels";
 import { setDocumentTitle } from "../../../helpers/utils";
@@ -64,10 +63,8 @@ class ArticleBodyContent extends React.Component {
       selectedTreeNode,
       setSelectedNode,
       fetchFiles,
-      getFilesCount,
-      filesCount
     } = this.props;
-    
+
     if (!selectedTreeNode || selectedTreeNode[0] !== data[0]) {
       setSelectedNode(data);
       setIsLoading(true);
@@ -83,7 +80,6 @@ class ArticleBodyContent extends React.Component {
         : setDocumentTitle();
 
       fetchFiles(data[0], newFilter)
-        .then(() => getFilesCount(this.props.filesCount))
         .catch((err) => toastr.error(err))
         .finally(() => setIsLoading(false));
     }
@@ -147,7 +143,7 @@ function mapStateToProps(state) {
     treeFolders: getTreeFolders(state),
     filter: getFilter(state),
     selectedTreeNode: getSelectedTreeNode(state),
-    selectedFolderTitle: getSelectedFolderTitle(state)
+    selectedFolderTitle: getSelectedFolderTitle(state),
   };
 }
 
diff --git a/products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js b/products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
index 5ea35dfa7f..4e9d68a739 100644
--- a/products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
+++ b/products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
@@ -1379,7 +1379,7 @@ class SectionBodyContent extends React.Component {
       fileAction,
       setIsLoading,
       isLoading,
-      filesCount,
+      currentFolderCount,
       currentFolderType,
       dragging,
       mediaViewerVisible,
@@ -1436,7 +1436,7 @@ class SectionBodyContent extends React.Component {
       });
     }
 
-    return !fileAction.id && filesCount === 0 ? (
+    return !fileAction.id && currentFolderCount === 0 ? (
       parentId === 0 ? (
         this.renderEmptyRootFolderContainer()
       ) : (
diff --git a/products/ASC.Files/Client/src/components/pages/Home/index.js b/products/ASC.Files/Client/src/components/pages/Home/index.js
index 293d2af14a..81590508da 100644
--- a/products/ASC.Files/Client/src/components/pages/Home/index.js
+++ b/products/ASC.Files/Client/src/components/pages/Home/index.js
@@ -40,7 +40,6 @@ import {
   getFiles,
   getFilter,
   getFolders,
-  getCurrentFolderCount,
   getIsLoaded,
   getProgressData,
   getSelected,
@@ -76,7 +75,6 @@ class PureHome extends React.Component {
       hideWindowSetting: false,
 
       files: [],
-      filesCount: null,
       uploadedFiles: 0,
       percent: 0,
 
@@ -172,20 +170,10 @@ class PureHome extends React.Component {
       })
       .finally(() => {
         setIsLoading(false);
-        this.setState({
-          filesCount: this.props.filesCount
-        })
         setFirstLoad(false);
       });
   }
 
-  getFilesCount = (count) =>
-  {
-    this.setState({
-      filesCount: count
-    })
-  }
-
   renderGroupButtonMenu = () => {
     const { files, selection, selected, setSelected, folders } = this.props;
 
@@ -509,11 +497,7 @@ class PureHome extends React.Component {
           </PageLayout.ArticleMainButton>
 
           <PageLayout.ArticleBody>
-            <ArticleBodyContent 
-              onTreeDrop={this.onDrop} 
-              getFilesCount={this.getFilesCount}
-              filesCount={this.props.filesCount}
-            />
+            <ArticleBodyContent onTreeDrop={this.onDrop} />
           </PageLayout.ArticleBody>
           <PageLayout.SectionHeader>
             <SectionHeaderContent
@@ -533,7 +517,6 @@ class PureHome extends React.Component {
 
           <PageLayout.SectionBody>
             <SectionBodyContent
-              filesCount={this.state.filesCount}
               isMobile={isMobile}
               selected={selected}
               onChange={this.onRowChange}
@@ -579,7 +562,6 @@ function mapStateToProps(state) {
     currentFolderId: getSelectedFolderId(state),
     fileActionId: getFileActionId(state),
     files: getFiles(state),
-    filesCount: getCurrentFolderCount(state),
     filter: getFilter(state),
     folders: getFolders(state),
     isLoaded: getIsLoaded(state),