From bb464b35392f07d9467495be9a80ecce01a168c5 Mon Sep 17 00:00:00 2001 From: Aleksandr Lushkin Date: Thu, 25 Jul 2024 16:34:22 +0200 Subject: [PATCH] Client: Groups: InsideGroup fix when sort options don't match enabled columns --- .../AccountsBody/Groups/TableView/GroupsTableHeader.js | 8 +++++++- .../AccountsBody/InsideGroup/TableView/TableHeader.js | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pages/Home/Section/AccountsBody/Groups/TableView/GroupsTableHeader.js b/packages/client/src/pages/Home/Section/AccountsBody/Groups/TableView/GroupsTableHeader.js index 8f854cb397..6259e39ac7 100644 --- a/packages/client/src/pages/Home/Section/AccountsBody/Groups/TableView/GroupsTableHeader.js +++ b/packages/client/src/pages/Home/Section/AccountsBody/Groups/TableView/GroupsTableHeader.js @@ -61,6 +61,8 @@ class GroupsTableHeader extends React.Component { ]; const columns = props.getColumns(defaultColumns); + const tableColumns = columns.map((c) => c.enable && c.key); + this.setTableColumns(tableColumns); this.state = { columns }; } @@ -77,7 +79,7 @@ class GroupsTableHeader extends React.Component { this.setState({ columns }); const tableColumns = columns.map((c) => c.enable && c.key); - localStorage.setItem(`${TABLE_COLUMNS}=${this.props.userId}`, tableColumns); + this.setTableColumns(tableColumns); const event = new Event(Events.CHANGE_COLUMN); window.dispatchEvent(event); @@ -103,6 +105,10 @@ class GroupsTableHeader extends React.Component { navigate(`${location.pathname}?${newFilter.toUrlParams()}`); }; + setTableColumns = (tableColumns) => { + localStorage.setItem(`${TABLE_COLUMNS}=${this.props.userId}`, tableColumns); + }; + render() { const { columns } = this.state; const { diff --git a/packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableHeader.js b/packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableHeader.js index 3491f794e2..94df06e920 100644 --- a/packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableHeader.js +++ b/packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableHeader.js @@ -102,6 +102,8 @@ class InsideGroupTableHeader extends React.Component { }); const columns = props.getColumns(defaultColumns); + const tableColumns = columns.map((c) => c.enable && c.key); + this.setTableColumns(tableColumns); this.state = { columns }; } @@ -118,7 +120,7 @@ class InsideGroupTableHeader extends React.Component { this.setState({ columns }); const tableColumns = columns.map((c) => c.enable && c.key); - localStorage.setItem(`${TABLE_COLUMNS}=${this.props.userId}`, tableColumns); + this.setTableColumns(tableColumns); const event = new Event(Events.CHANGE_COLUMN); @@ -156,6 +158,10 @@ class InsideGroupTableHeader extends React.Component { navigate(`${location.pathname}?${newFilter.toUrlParams()}`); }; + setTableColumns = (tableColumns) => { + localStorage.setItem(`${TABLE_COLUMNS}=${this.props.userId}`, tableColumns); + }; + render() { const { columns } = this.state; const {