Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#958 - adds a failing test case for "query limit should be used even if maxLimit = NO_PAGINATION" #959

Merged
merged 2 commits into from
Aug 26, 2024
Merged

#958 - adds a failing test case for "query limit should be used even if maxLimit = NO_PAGINATION" #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82bf857
#393 - query limit should be used even if maxLimit = NO_PAGINATION
jakobwgnr Aug 20, 2024
7541b51
#393 - query limit should be used even if maxLimit = NO_PAGINATION
jakobwgnr Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/paginate.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,20 +340,19 @@ describe('paginate', () => {
expect(result.data).toStrictEqual(cats)
})

it('should limit to defaultLimit, if limit is differt FROM NO_PAGINATION ecc....', async () => {
it('should limit to query limit, even if maxLimit is set to NO_PAGINATION', async () => {
const config: PaginateConfig<CatEntity> = {
sortableColumns: ['id'],
maxLimit: PaginationLimit.NO_PAGINATION,
defaultLimit: 1,
}
const query: PaginateQuery = {
path: '',
limit: -2,
limit: 2,
}

const result = await paginate<CatEntity>(query, catRepo, config)

expect(result.data).toStrictEqual(cats.slice(0, 1))
expect(result.meta.itemsPerPage).toBe(2)
})

it('should default to limit defaultLimit, if maxLimit is NO_PAGINATION', async () => {
Expand Down
6 changes: 4 additions & 2 deletions src/paginate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,10 @@ export async function paginate<T extends ObjectLiteral>(
const limit =
query.limit === PaginationLimit.COUNTER_ONLY
? PaginationLimit.COUNTER_ONLY
: isPaginated
? query.limit === PaginationLimit.NO_PAGINATION || maxLimit === PaginationLimit.NO_PAGINATION
: isPaginated === true
? maxLimit === PaginationLimit.NO_PAGINATION
? query.limit ?? defaultLimit
: query.limit === PaginationLimit.NO_PAGINATION
? defaultLimit
: Math.min(query.limit ?? defaultLimit, maxLimit)
: defaultLimit
Expand Down