From 14a6bceb86130b619fc942f39808928236decc2d Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Thu, 9 Mar 2023 13:36:50 +0300
Subject: [PATCH 1/2] Fixed Bug 61529 - Rooms.Archive. Fixed "Clear search"
 action

---
 .../src/pages/Home/Section/Filter/index.js    | 32 ++++++++++++++++++-
 .../common/components/FilterInput/index.js    |  3 +-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/pages/Home/Section/Filter/index.js b/packages/client/src/pages/Home/Section/Filter/index.js
index accbb79d81..53d6d955e2 100644
--- a/packages/client/src/pages/Home/Section/Filter/index.js
+++ b/packages/client/src/pages/Home/Section/Filter/index.js
@@ -1,6 +1,6 @@
 import ViewRowsReactSvgUrl from "PUBLIC_DIR/images/view-rows.react.svg?url";
 import ViewTilesReactSvgUrl from "PUBLIC_DIR/images/view-tiles.react.svg?url";
-import React from "react";
+import React, { useCallback } from "react";
 import { inject, observer } from "mobx-react";
 import { isMobile } from "react-device-detect";
 import { withRouter } from "react-router";
@@ -292,6 +292,35 @@ const SectionFilterContent = ({
     ]
   );
 
+  const onClearFilter = useCallback(() => {
+    if (isRooms) {
+      const newFilter = roomsFilter.clone();
+      newFilter.type = null;
+      newFilter.page = 0;
+
+      fetchRooms(selectedFolderId, newFilter).finally(() =>
+        setIsLoading(false)
+      );
+    } else {
+      const newFilter = filter.clone();
+      newFilter.page = 0;
+
+      setIsLoading(true);
+
+      fetchFiles(selectedFolderId, newFilter).finally(() => {
+        setIsLoading(false);
+      });
+    }
+  }, [
+    isRooms,
+    setIsLoading,
+    fetchFiles,
+    fetchRooms,
+    selectedFolderId,
+    filter,
+    roomsFilter,
+  ]);
+
   const onSearch = React.useCallback(
     (data = "") => {
       if (isRooms) {
@@ -1420,6 +1449,7 @@ const SectionFilterContent = ({
       onChangeViewAs={onChangeViewAs}
       getViewSettingsData={getViewSettingsData}
       onSearch={onSearch}
+      onClearFilter={onClearFilter}
       getSelectedInputValue={getSelectedInputValue}
       filterHeader={t("Common:AdvancedFilter")}
       placeholder={t("Common:Search")}
diff --git a/packages/common/components/FilterInput/index.js b/packages/common/components/FilterInput/index.js
index 6580d104ac..e9cf77447d 100644
--- a/packages/common/components/FilterInput/index.js
+++ b/packages/common/components/FilterInput/index.js
@@ -49,6 +49,7 @@ const FilterInput = React.memo(
     setClearSearch,
 
     onSortButtonClick,
+    onClearFilter,
   }) => {
     const [viewSettings, setViewSettings] = React.useState([]);
     const [inputValue, setInputValue] = React.useState("");
@@ -66,7 +67,7 @@ const FilterInput = React.memo(
     React.useEffect(() => {
       if (clearSearch) {
         setInputValue("");
-        onClearSearch();
+        onClearFilter && onClearFilter();
         setClearSearch(false);
       }
     }, [clearSearch]);

From c09340775d72d637a4e02dc3179f69163356f8d7 Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Thu, 9 Mar 2023 13:39:29 +0300
Subject: [PATCH 2/2] Web: Files: fixed onClearFilter

---
 packages/client/src/pages/Home/Section/Filter/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/client/src/pages/Home/Section/Filter/index.js b/packages/client/src/pages/Home/Section/Filter/index.js
index 53d6d955e2..b9ad960bc1 100644
--- a/packages/client/src/pages/Home/Section/Filter/index.js
+++ b/packages/client/src/pages/Home/Section/Filter/index.js
@@ -297,6 +297,7 @@ const SectionFilterContent = ({
       const newFilter = roomsFilter.clone();
       newFilter.type = null;
       newFilter.page = 0;
+      newFilter.filterValue = "";
 
       fetchRooms(selectedFolderId, newFilter).finally(() =>
         setIsLoading(false)
@@ -304,6 +305,7 @@ const SectionFilterContent = ({
     } else {
       const newFilter = filter.clone();
       newFilter.page = 0;
+      newFilter.filterValue = "";
 
       setIsLoading(true);