Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2026-05-08 12:35:30 +02:00
Code Issues Projects Releases Wiki Activity

pagerequest fixes

Browse source
This commit is contained in:
Gauthier Roebroeck 2026-03-24 10:45:32 +08:00
parent 8f1f29743d
commit 0aa71d6b51
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
next-ui/src/types/PageRequest.test.ts
View file

@ -2,6 +2,16 @@ import { describe, expect, test } from 'vitest'
import { PageRequest } from '@/types/PageRequest'
describe('PageRequest destructuring', () => {
test('spread', () => {
const input = new PageRequest(5, 10, [{ key: 'title', order: 'asc' }], false)
const p = { ...input }
expect(p.page).toStrictEqual(5)
expect(p.size).toStrictEqual(10)
expect(p.sort).toStrictEqual(['title,asc'])
expect(p.unpaged).toStrictEqual(false)
})
test('default constructor', () => {
const input = new PageRequest(5, 10, [{ key: 'title', order: 'asc' }], false)
const { page, size, sort, unpaged } = input

14
next-ui/src/types/PageRequest.ts
View file

@ -15,7 +15,9 @@ function vSortItemToSort(sortItem: VSortItem): Sort {
}
}
function sortToString(sortItem: Sort): string {
function sortToString(sortItem: Sort | string): string {
if (typeof sortItem === 'string') return sortItem
let sort = sortItem.key
if (sortItem.order) sort += `,${sortItem.order}`
return sort
@ -25,11 +27,7 @@ export class PageRequest {
readonly unpaged?: boolean
readonly page?: number
readonly size?: number
private readonly _sort?: Sort[]
get sort(): string[] | undefined {
return this._sort?.map((it) => sortToString(it))
}
readonly sort?: string[]
static FromPageSize(pageSize: PageSize, page?: number, sort?: Sort[]) {
return new PageRequest(
@ -71,13 +69,13 @@ export class PageRequest {
)
}
constructor(page?: number, size?: number, sort?: Sort[], unpaged?: boolean) {
constructor(page?: number, size?: number, sort?: Sort[] | string[], unpaged?: boolean) {
if (page && page < 0) throw new Error('page cannot be negative')
if (size && size < 0) throw new Error('size cannot be negative')
this.page = page
this.size = size
this._sort = sort
this.sort = sort?.map((it) => sortToString(it))
this.unpaged = unpaged
}
}