DawnMoon1542
506e41c116
* fix: add server-side sorting to user list, prevent client-side sort on paged data The user management table applied client-side sorting to the current page slice while pagination was handled server-side, causing ID-asc views to show pages out of order (e.g. 23-42, 3-22, 1-2). Backend: add sort_by/sort_order query params to GetAllUsers and SearchUsers with a column whitelist for safe ORDER BY generation. Frontend: pass sorting state to the API and reset to page 1 on sort change. Generic useDataTable hook now disables client-side sorted row model and sort UI for tables with manual pagination but no server-side sort handler. * fix: add id tie-breaker to non-unique sort columns, remove side effect from state updater Append secondary ORDER BY id DESC when sorting by non-unique columns (quota, created_at, etc.) to prevent row duplication/skipping across OFFSET pages. Move onPaginationChange out of setSorting updater to avoid side effects inside a pure function (React Strict Mode double-invocation safety).
67 lines
2.1 KiB
Go
67 lines
2.1 KiB
Go
package model
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func insertUsersForPaginationTest(t *testing.T, total int) {
|
|
t.Helper()
|
|
for id := 1; id <= total; id++ {
|
|
user := &User{
|
|
Id: id,
|
|
Username: fmt.Sprintf("user%02d", id),
|
|
Password: "password123",
|
|
DisplayName: fmt.Sprintf("User %02d", id),
|
|
Email: fmt.Sprintf("user%02d@example.com", id),
|
|
Role: common.RoleCommonUser,
|
|
Status: common.UserStatusEnabled,
|
|
Group: "default",
|
|
AffCode: fmt.Sprintf("aff%02d", id),
|
|
}
|
|
require.NoError(t, DB.Create(user).Error)
|
|
}
|
|
}
|
|
|
|
func collectUserIDs(users []*User) []int {
|
|
ids := make([]int, 0, len(users))
|
|
for _, user := range users {
|
|
ids = append(ids, user.Id)
|
|
}
|
|
return ids
|
|
}
|
|
|
|
func TestGetAllUsersSortsBeforePagination(t *testing.T) {
|
|
truncateTables(t)
|
|
insertUsersForPaginationTest(t, 42)
|
|
|
|
pageOne, total, err := GetAllUsers(&common.PageInfo{Page: 1, PageSize: 20}, NewUserSortOptions("id", "asc"))
|
|
require.NoError(t, err)
|
|
assert.Equal(t, int64(42), total)
|
|
assert.Equal(t, []int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20}, collectUserIDs(pageOne))
|
|
|
|
pageTwo, total, err := GetAllUsers(&common.PageInfo{Page: 2, PageSize: 20}, NewUserSortOptions("id", "asc"))
|
|
require.NoError(t, err)
|
|
assert.Equal(t, int64(42), total)
|
|
assert.Equal(t, []int{21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40}, collectUserIDs(pageTwo))
|
|
|
|
pageThree, total, err := GetAllUsers(&common.PageInfo{Page: 3, PageSize: 20}, NewUserSortOptions("id", "asc"))
|
|
require.NoError(t, err)
|
|
assert.Equal(t, int64(42), total)
|
|
assert.Equal(t, []int{41, 42}, collectUserIDs(pageThree))
|
|
}
|
|
|
|
func TestSearchUsersSortsBeforePagination(t *testing.T) {
|
|
truncateTables(t)
|
|
insertUsersForPaginationTest(t, 42)
|
|
|
|
users, total, err := SearchUsers("user", "", nil, nil, 20, 20, NewUserSortOptions("id", "asc"))
|
|
require.NoError(t, err)
|
|
assert.Equal(t, int64(42), total)
|
|
assert.Equal(t, []int{21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40}, collectUserIDs(users))
|
|
}
|