Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0

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,37 @@ const SectionFilterContent = ({
     ]
   );
 
+  const onClearFilter = useCallback(() => {
+    if (isRooms) {
+      const newFilter = roomsFilter.clone();
+      newFilter.type = null;
+      newFilter.page = 0;
+      newFilter.filterValue = "";
+
+      fetchRooms(selectedFolderId, newFilter).finally(() =>
+        setIsLoading(false)
+      );
+    } else {
+      const newFilter = filter.clone();
+      newFilter.page = 0;
+      newFilter.filterValue = "";
+
+      setIsLoading(true);
+
+      fetchFiles(selectedFolderId, newFilter).finally(() => {
+        setIsLoading(false);
+      });
+    }
+  }, [
+    isRooms,
+    setIsLoading,
+    fetchFiles,
+    fetchRooms,
+    selectedFolderId,
+    filter,
+    roomsFilter,
+  ]);
+
   const onSearch = React.useCallback(
     (data = "") => {
       if (isRooms) {
@@ -1420,6 +1451,7 @@ const SectionFilterContent = ({
       onChangeViewAs={onChangeViewAs}
       getViewSettingsData={getViewSettingsData}
       onSearch={onSearch}
+      onClearFilter={onClearFilter}
       getSelectedInputValue={getSelectedInputValue}
       filterHeader={t("Common:AdvancedFilter")}
       placeholder={t("Common:Search")}

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]);