IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Client: show column by sortOrder

Browse Source
This commit is contained in:
Viktor Fomin 2024-07-16 12:57:08 +03:00
parent 361af5213b
commit 9a02cb2122
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/client/src/pages/Home/Section/AccountsBody/Groups/TableView/GroupsTableHeader.js
View File

@ -106,7 +106,10 @@ class GroupsTableHeader extends React.Component {
componentDidUpdate(prevProps) { componentDidUpdate(prevProps) {
const { filter } = this.props; const { filter } = this.props;
const { columns } = this.state; const { columns } = this.state;
if (filter.sortBy !== prevProps.filter.sortBy) { if (
filter.sortBy !== prevProps.filter.sortBy ||
filter.sortOrder !== prevProps.filter.sortOrder
) {
const columnIndex = columns.findIndex((c) => c?.sortBy === filter.sortBy); const columnIndex = columns.findIndex((c) => c?.sortBy === filter.sortBy);
if (columnIndex === -1) return; if (columnIndex === -1) return;

5
packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableHeader.js
View File

@ -159,7 +159,10 @@ class InsideGroupTableHeader extends React.Component {
componentDidUpdate(prevProps) { componentDidUpdate(prevProps) {
const { filter } = this.props; const { filter } = this.props;
const { columns } = this.state; const { columns } = this.state;
if (filter.sortBy !== prevProps.filter.sortBy) { if (
filter.sortBy !== prevProps.filter.sortBy ||
filter.sortOrder !== prevProps.filter.sortOrder
) {
const columnIndex = columns.findIndex((c) => c?.sortBy === filter.sortBy); const columnIndex = columns.findIndex((c) => c?.sortBy === filter.sortBy);
if (columnIndex === -1) return; if (columnIndex === -1) return;

5
packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableHeader.js
View File

@ -121,7 +121,10 @@ class PeopleTableHeader extends React.Component {
componentDidUpdate(prevProps) { componentDidUpdate(prevProps) {
const { filter } = this.props; const { filter } = this.props;
const { columns } = this.state; const { columns } = this.state;
if (filter.sortBy !== prevProps.filter.sortBy) { if (
filter.sortBy !== prevProps.filter.sortBy ||
filter.sortOrder !== prevProps.filter.sortOrder
) {
const columnIndex = columns.findIndex((c) => c?.sortBy === filter.sortBy); const columnIndex = columns.findIndex((c) => c?.sortBy === filter.sortBy);
if (columnIndex === -1) return; if (columnIndex === -1) return;

5
packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
View File

@ -445,7 +445,10 @@ class FilesTableHeader extends React.Component {
if ( if (
filter.sortBy !== prevProps.filter.sortBy || filter.sortBy !== prevProps.filter.sortBy ||
(isRooms && roomsFilter.sortBy !== prevProps.roomsFilter.sortBy) filter.sortOrder !== prevProps.filter.sortOrder ||
(isRooms &&
(roomsFilter.sortBy !== prevProps.roomsFilter.sortBy ||
roomsFilter.sortOrder !== prevProps.roomsFilter.sortOrder))
) { ) {
const sortBy = isRooms ? roomsFilter.sortBy : filter.sortBy; const sortBy = isRooms ? roomsFilter.sortBy : filter.sortBy;
const columnIndex = columns.findIndex((c) => c?.sortBy === sortBy); const columnIndex = columns.findIndex((c) => c?.sortBy === sortBy);