This is an automated email from the ASF dual-hosted git repository.
aicam pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/texera.git
The following commit(s) were added to refs/heads/main by this push:
new 33d122c69c fix(admin): preserve user order when sorting in admin
dashboard (#4057)
33d122c69c is described below
commit 33d122c69cafa3ade210697ba5e14177bce08c70
Author: LJX2017 <[email protected]>
AuthorDate: Wed Nov 19 19:29:51 2025 -0800
fix(admin): preserve user order when sorting in admin dashboard (#4057)
<!--
Thanks for sending a pull request (PR)! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines:
[Contributing to
Texera](https://github.com/apache/texera/blob/main/CONTRIBUTING.md)
2. Ensure you have added or run the appropriate tests for your PR
3. If the PR is work in progress, mark it a draft on GitHub.
4. Please write your PR title to summarize what this PR proposes, we
are following Conventional Commits style for PR titles as well.
5. Be sure to keep the PR description updated to reflect all changes.
-->
### What changes were proposed in this PR?
<!--
Please clarify what changes you are proposing. The purpose of this
section
is to outline the changes. Here are some tips for you:
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
3. If it is a refactoring, clarify what has been changed.
3. It would be helpful to include a before-and-after comparison using
screenshots or GIFs.
4. Please consider writing useful notes for better and faster reviews.
-->
This PR fixes the non-deterministic sorting behavior in the admin user
dashboard #4044 , where sorting by a column (e.g., name, role) could
shuffle the order of users with equal values in that column.
For all sortable columns in AdminUserComponent, we now breaks ties using
user id.
sortByActive also uses user id to break ties.
### Any related issues, documentation, discussions?
<!--
Please use this section to link other resources if not mentioned
already.
1. If this PR fixes an issue, please include `Fixes #1234`, `Resolves
#1234`
or `Closes #1234`. If it is only related, simply mention the issue
number.
2. If there is design documentation, please add the link.
3. If there is a discussion in the mailing list, please add the link.
-->
Fixes #4044
### How was this PR tested?
<!--
If tests were added, say they were added here. Or simply mention that if
the PR
is tested with existing test cases. Make sure to include/update test
cases that
check the changes thoroughly including negative and positive cases if
possible.
If it was tested in a way different from regular unit tests, please
clarify how
you tested step by step, ideally copy and paste-able, so that other
reviewers can
test and check, and descendants can verify in the future. If tests were
not added,
please describe why they were not added and/or why it was difficult to
add.
-->
Manually tested
### Was this PR authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this
PR,
please include the phrase: 'Generated-by: ' followed by the name of the
tool
and its version. If no, write 'No'.
Please refer to the [ASF Generative Tooling
Guidance](https://www.apache.org/legal/generative-tooling.html) for
details.
-->
No
Co-authored-by: ali risheh <[email protected]>
---
.../component/admin/user/admin-user.component.ts | 32 +++++++++++++++++-----
1 file changed, 25 insertions(+), 7 deletions(-)
diff --git
a/frontend/src/app/dashboard/component/admin/user/admin-user.component.ts
b/frontend/src/app/dashboard/component/admin/user/admin-user.component.ts
index aa015d6f52..8b449e9ff9 100644
--- a/frontend/src/app/dashboard/component/admin/user/admin-user.component.ts
+++ b/frontend/src/app/dashboard/component/admin/user/admin-user.component.ts
@@ -145,12 +145,30 @@ export class AdminUserComponent implements OnInit {
}
public sortByID: NzTableSortFn<User> = (a: User, b: User) => b.uid - a.uid;
- public sortByName: NzTableSortFn<User> = (a: User, b: User) => (b.name ||
"").localeCompare(a.name);
- public sortByEmail: NzTableSortFn<User> = (a: User, b: User) => (b.email ||
"").localeCompare(a.email);
- public sortByComment: NzTableSortFn<User> = (a: User, b: User) => (b.comment
|| "").localeCompare(a.comment);
- public sortByRole: NzTableSortFn<User> = (a: User, b: User) =>
b.role.localeCompare(a.role);
- public sortByAccountCreation: NzTableSortFn<User> = (a: User, b: User) =>
- (a.accountCreation || 0) - (b.accountCreation || 0);
+ public sortByName: NzTableSortFn<User> = (a: User, b: User) => {
+ const compare = (b.name || "").localeCompare(a.name || "");
+ return compare === 0 ? a.uid - b.uid : compare;
+ };
+
+ public sortByEmail: NzTableSortFn<User> = (a: User, b: User) => {
+ const compare = (b.email || "").localeCompare(a.email || "");
+ return compare === 0 ? a.uid - b.uid : compare;
+ };
+
+ public sortByComment: NzTableSortFn<User> = (a: User, b: User) => {
+ const compare = (b.comment || "").localeCompare(a.comment || "");
+ return compare === 0 ? a.uid - b.uid : compare;
+ };
+
+ public sortByRole: NzTableSortFn<User> = (a: User, b: User) => {
+ const compare = b.role.localeCompare(a.role);
+ return compare === 0 ? a.uid - b.uid : compare;
+ };
+
+ public sortByAccountCreation: NzTableSortFn<User> = (a: User, b: User) => {
+ const compare = (a.accountCreation || 0) - (b.accountCreation || 0);
+ return compare === 0 ? a.uid - b.uid : compare;
+ };
reset(): void {
this.nameSearchValue = "";
@@ -210,7 +228,7 @@ export class AdminUserComponent implements OnInit {
const aActive = this.isUserActive(a);
const bActive = this.isUserActive(b);
- if (aActive === bActive) return 0;
+ if (aActive === bActive) return a.uid - b.uid;
return aActive ? -1 : 1;
};
