Ryan/docmost
1
0
Fork 0
mirror of https://github.com/docmost/docmost.git synced 2025-11-23 12:01:11 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix pagination issue where user is not part of any space

Browse Source
This commit is contained in:
Philipinho
2025-04-07 19:09:02 +01:00
parent 06270ff747
commit 3559358d14
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/server/src/database/repos/page/page.repo.ts
View File

@ -107,7 +107,11 @@ export class PageRepo {
return dbOrTx(this.db, trx)
.updateTable('pages')
.set({ ...updatePageData, updatedAt: new Date() })
.where(pageIds.some(pageId => !isValidUUID(pageId)) ? "slugId" : "id", "in", pageIds)
.where(
pageIds.some((pageId) => !isValidUUID(pageId)) ? 'slugId' : 'id',
'in',
pageIds,
)
.executeTakeFirst();
}
@ -161,9 +165,11 @@ export class PageRepo {
.where('spaceId', 'in', userSpaceIds)
.orderBy('updatedAt', 'desc');
const hasEmptyIds = userSpaceIds.length === 0;
const result = executeWithPagination(query, {
page: pagination.page,
perPage: pagination.limit,
hasEmptyIds,
});
return result;

5
apps/server/src/database/repos/space/space-member.repo.ts
View File

@ -221,7 +221,7 @@ export class SpaceMemberRepo {
let query = this.db
.selectFrom('spaces')
.selectAll('spaces')
.selectAll()
.select((eb) => [this.spaceRepo.withMemberCount(eb)])
//.where('workspaceId', '=', workspaceId)
.where('id', 'in', userSpaceIds)
@ -237,9 +237,12 @@ export class SpaceMemberRepo {
);
}
const hasEmptyIds = userSpaceIds.length === 0;
const result = executeWithPagination(query, {
page: pagination.page,
perPage: pagination.limit,
hasEmptyIds,
});
return result;