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

Fix Bug 69519 - Accounts. Sorting by Last name field does not work

Browse Source
This commit is contained in:
Alexey Safronov 2024-08-15 16:55:39 +04:00
parent 21f4cbd625
commit 706380fcbf
4 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,15 +138,8 @@ class InsideGroupTableHeader extends React.Component {
newFilter.sortBy = sortBy;
if (sortBy === "AZ") {
if (
newFilter.sortBy !== "lastname" &&
newFilter.sortBy !== "firstname"
) {
newFilter.sortBy = "firstname";
} else if (newFilter.sortBy === "lastname") {
newFilter.sortBy = "firstname";
} else {
newFilter.sortBy = "lastname";
if (newFilter.sortBy !== "displayname") {
newFilter.sortBy = "displayname";
}
newFilter.sortOrder =
newFilter.sortOrder === "ascending" ? "descending" : "ascending";
@ -176,10 +169,7 @@ class InsideGroupTableHeader extends React.Component {
} = this.props;
const { sortOrder } = filter;
const sortBy =
filter.sortBy === "firstname" || filter.sortBy === "lastname"
? "AZ"
: filter.sortBy;
const sortBy = filter.sortBy === "displayname" ? "AZ" : filter.sortBy;
return (
<TableHeader

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

@ -143,7 +143,7 @@ class PeopleTableHeader extends React.Component {
if (
newFilter.sortBy === sortBy ||
(sortBy === "AZ" && newFilter.sortBy === "firstname")
(sortBy === "AZ" && newFilter.sortBy === "displayname")
) {
newFilter.sortOrder =
newFilter.sortOrder === "ascending" ? "descending" : "ascending";
@ -151,7 +151,7 @@ class PeopleTableHeader extends React.Component {
newFilter.sortBy = sortBy;
if (sortBy === "AZ") {
newFilter.sortBy = "firstname";
newFilter.sortBy = "displayname";
}
}
@ -178,10 +178,7 @@ class PeopleTableHeader extends React.Component {
} = this.props;
const { sortOrder } = filter;
const sortBy =
filter.sortBy === "firstname" || filter.sortBy === "lastname"
? "AZ"
: filter.sortBy;
const sortBy = filter.sortBy === "displayname" ? "AZ" : filter.sortBy;
return (
<TableHeader

4
packages/client/src/pages/Home/Section/Filter/index.js
View File

@ -1961,8 +1961,8 @@ const SectionFilterContent = ({
const options = [];
const firstName = {
id: "sort-by_first-name",
key: "firstname",
id: "sort-by_displayname",
key: "displayname",
label: t("Common:Name"),
default: true,
};

2
packages/shared/api/people/filter.js
View File

@ -29,7 +29,7 @@ import { getObjectByLocation, toUrlParams } from "../../utils/common";
const DEFAULT_PAGE = 0;
const DEFAULT_PAGE_COUNT = 25;
const DEFAULT_TOTAL = 0;
const DEFAULT_SORT_BY = "firstname";
const DEFAULT_SORT_BY = "displayname";
const DEFAULT_SORT_ORDER = "ascending";
const DEFAULT_EMPLOYEE_STATUS = null;
const DEFAULT_ACTIVATION_STATUS = null;