fix(webui): fix pagination in file browser list mode

This commit is contained in:
yiling
2026-06-10 16:20:58 +08:00
parent 0722845ecc
commit 6e1951e8ac
4 changed files with 22 additions and 6 deletions
+8
View File
@@ -741,6 +741,7 @@ describe('SearchService', () => {
// Search files recursively
const resultRecursive = await searchService.search(rootFolder.id, {
conditions: [],
recursively: true,
assetType: 'file',
operator: 'AND',
@@ -752,6 +753,7 @@ describe('SearchService', () => {
// Search files non-recursively
const resultNonRecursive = await searchService.search(rootFolder.id, {
conditions: [],
recursively: false,
assetType: 'file',
operator: 'AND',
@@ -773,6 +775,8 @@ describe('SearchService', () => {
return [{ count: 2500n }]
}
// For main query, just run it or return mock
// We must cast to any because we are proxying the raw sql parameter
// eslint-disable-next-line @typescript-eslint/no-explicit-any
return target.$queryRaw(prismaSql as any)
}
}
@@ -784,10 +788,14 @@ describe('SearchService', () => {
},
})
// We must cast mockPrisma proxy as any because the type signature of SearchService
// expects a full PrismaClient instance, whereas we only mocked $queryRaw.
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const localSearchService = new SearchService(mockPrisma as any)
const { rootFolder } = await setupBasicAssets()
const result = await localSearchService.search(rootFolder.id, {
conditions: [],
recursively: true,
assetType: 'file',
operator: 'AND',
+9 -3
View File
@@ -191,7 +191,9 @@ export class SearchService {
if (totalCount < 2000) {
countBuilder.select(Prisma.sql`SUM(COALESCE(a.size_byte, 0))::bigint as sum`)
const sumRes = await this.prismaClient.$queryRaw<{ sum: bigint | null }[]>(countBuilder.build())
const sumRes = await this.prismaClient.$queryRaw<{ sum: bigint | null }[]>(
countBuilder.build(),
)
pageInfo.totalSize = Number(sumRes[0]?.sum || 0)
} else {
pageInfo.totalSize = -1
@@ -380,7 +382,9 @@ export class SearchService {
if (totalCount < 2000) {
countBuilder.select(Prisma.sql`SUM(COALESCE(a.size_byte, 0))::bigint as sum`)
const sumRes = await this.prismaClient.$queryRaw<{ sum: bigint | null }[]>(countBuilder.build())
const sumRes = await this.prismaClient.$queryRaw<{ sum: bigint | null }[]>(
countBuilder.build(),
)
pageInfo.totalSize = Number(sumRes[0]?.sum || 0)
} else {
pageInfo.totalSize = -1
@@ -413,7 +417,9 @@ export class SearchService {
countBuilder.addWhere(Prisma.sql`a.name ILIKE ${'%' + valStr + '%'}`)
}
const sumRes = await this.prismaClient.$queryRaw<{ sum: bigint | null }[]>(countBuilder.build())
const sumRes = await this.prismaClient.$queryRaw<{ sum: bigint | null }[]>(
countBuilder.build(),
)
pageInfo.totalSize = Number(sumRes[0]?.sum || 0)
} else {
pageInfo.totalSize = -1
@@ -261,7 +261,8 @@ export function FileBrowserGridView({
<ChevronRight className="h-4 w-4" />
)}
<span>
{formatCount(count, !isFolder)}{showSize ? ` • ${formatSize(size)}` : ''}
{formatCount(count, !isFolder)}
{showSize ? ` • ${formatSize(size)}` : ''}
</span>
</button>
</div>
@@ -305,7 +305,7 @@ export function FileBrowserListView({
])
return (
<div className="flex-1 overflow-x-auto" onClick={handleEmptyAreaClick}>
<div className="w-full overflow-x-auto" onClick={handleEmptyAreaClick}>
<div
className="w-full relative"
style={{
@@ -406,7 +406,8 @@ export function FileBrowserListView({
)}
</div>
<span className="text-sm font-medium text-muted-foreground whitespace-nowrap">
{formatCount(count, !isFolder)}{showSize ? ` • ${formatSize(size)}` : ''}
{formatCount(count, !isFolder)}
{showSize ? ` • ${formatSize(size)}` : ''}
</span>
</div>
<div className="flex-1 bg-card" />