From 69a4c5f3956dec1e4bac4ca23bc1c7f08ea0fefd Mon Sep 17 00:00:00 2001
From: Viktor Fomin <viktor.fomin@onlyoffice.com>
Date: Tue, 30 Jul 2024 10:34:49 +0300
Subject: [PATCH] Client: Home: TableView: move filter to state

---
 .../Section/Body/TableView/TableHeader.js     | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js b/packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
index 17a91162e6..76b188ceb9 100644
--- a/packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
+++ b/packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
@@ -54,6 +54,8 @@ class FilesTableHeader extends React.Component {
       showStorageInfo,
       isArchiveFolder,
       tableStorageName,
+      roomsFilter,
+      filter,
     } = this.props;
 
     const defaultColumns = [];
@@ -365,6 +367,9 @@ class FilesTableHeader extends React.Component {
 
     const tableColumns = columns.map((c) => c.enable && c.key);
 
+    const sortBy = isRooms ? roomsFilter.sortBy : filter.sortBy;
+    const sortOrder = isRooms ? roomsFilter.sortOrder : filter.sortOrder;
+
     this.setTableColumns(tableColumns);
     if (fromUpdate) {
       this.setState({
@@ -372,6 +377,8 @@ class FilesTableHeader extends React.Component {
         resetColumnsSize,
         columnStorageName,
         columnInfoPanelStorageName,
+        sortBy,
+        sortOrder,
       });
     } else {
       this.state = {
@@ -379,6 +386,8 @@ class FilesTableHeader extends React.Component {
         resetColumnsSize,
         columnStorageName,
         columnInfoPanelStorageName,
+        sortBy,
+        sortOrder,
       };
     }
   };
@@ -425,8 +434,13 @@ class FilesTableHeader extends React.Component {
       isRecentTab,
       isArchiveFolder,
       showStorageInfo,
+      roomsFilter,
+      filter,
     } = this.props;
 
+    const sortBy = isRooms ? roomsFilter.sortBy : filter.sortBy;
+    const sortOrder = isRooms ? roomsFilter.sortOrder : filter.sortOrder;
+
     if (
       isArchiveFolder !== prevProps.isArchiveFolder ||
       isRooms !== prevProps.isRooms ||
@@ -434,7 +448,9 @@ class FilesTableHeader extends React.Component {
       columnStorageName !== prevProps.columnStorageName ||
       columnInfoPanelStorageName !== prevProps.columnInfoPanelStorageName ||
       isRecentTab !== prevProps.isRecentTab ||
-      showStorageInfo !== prevProps.showStorageInfo
+      showStorageInfo !== prevProps.showStorageInfo ||
+      sortBy !== this.state.sortBy ||
+      sortOrder !== this.state.sortOrder
     ) {
       return this.getTableColumns(true);
     }
@@ -529,9 +545,6 @@ class FilesTableHeader extends React.Component {
       t,
       containerRef,
       isHeaderChecked,
-      filter,
-      roomsFilter,
-      isRooms,
       firstElemChecked,
       sortingVisible,
       infoPanelVisible,
@@ -548,11 +561,10 @@ class FilesTableHeader extends React.Component {
       resetColumnsSize,
       columnStorageName,
       columnInfoPanelStorageName,
+      sortBy,
+      sortOrder,
     } = this.state;
 
-    const sortBy = isRooms ? roomsFilter.sortBy : filter.sortBy;
-    const sortOrder = isRooms ? roomsFilter.sortOrder : filter.sortOrder;
-
     return (
       <TableHeader
         isLengthenHeader={firstElemChecked || isHeaderChecked}