Merge branch 'main' into perm-x

apps/server/src/core/page/services/page-history.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { PageHistoryRepo } from '@docmost/db/repos/page/page-history.repo';
 import { PageHistory } from '@docmost/db/types/entity.types';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
-import { PaginationResult } from '@docmost/db/pagination/pagination';
+import { CursorPaginationResult } from '@docmost/db/pagination/cursor-pagination';
 
 @Injectable()
 export class PageHistoryService {
@@ -15,12 +15,10 @@ export class PageHistoryService {
   async findHistoryByPageId(
     pageId: string,
     paginationOptions: PaginationOptions,
-  ): Promise<PaginationResult<any>> {
-    const pageHistory = await this.pageHistoryRepo.findPageHistoryByPageId(
+  ): Promise<CursorPaginationResult<PageHistory>> {
+    return this.pageHistoryRepo.findPageHistoryByPageId(
       pageId,
       paginationOptions,
     );
-
-    return pageHistory;
   }
 }

apps/server/src/core/page/services/page-permission.service.ts

@@ -6,7 +6,10 @@ import {
 } from '@nestjs/common';
 import { InjectKysely } from 'nestjs-kysely';
 import { KyselyDB } from '@docmost/db/types/kysely.types';
-import { PagePermissionRepo } from '@docmost/db/repos/page/page-permission.repo';
+import {
+  PagePermissionMember,
+  PagePermissionRepo,
+} from '@docmost/db/repos/page/page-permission.repo';
 import { PageRepo } from '@docmost/db/repos/page/page.repo';
 import {
   AddPagePermissionDto,
@@ -25,6 +28,10 @@ import {
   SpaceCaslAction,
   SpaceCaslSubject,
 } from '../../casl/interfaces/space-ability.type';
+import {
+  CursorPaginationResult,
+  emptyCursorPaginationResult,
+} from '@docmost/db/pagination/cursor-pagination';
 
 export type PageRestrictionInfo = {
   id: string;
@@ -313,7 +320,7 @@ export class PagePermissionService {
     pageId: string,
     authUser: User,
     pagination: PaginationOptions,
-  ) {
+  ): Promise<CursorPaginationResult<PagePermissionMember>> {
     const page = await this.pageRepo.findById(pageId);
     if (!page) {
       throw new NotFoundException('Page not found');
@@ -337,15 +344,7 @@ export class PagePermissionService {
     const pageAccess =
       await this.pagePermissionRepo.findPageAccessByPageId(pageId);
     if (!pageAccess) {
-      return {
-        items: [],
-        meta: {
-          limit: pagination.limit,
-          page: 1,
-          hasNextPage: false,
-          hasPrevPage: false,
-        },
-      };
+      return emptyCursorPaginationResult(pagination.limit);
     }
 
     return this.pagePermissionRepo.getPagePermissionsPaginated(

apps/server/src/core/page/services/page.service.ts

@@ -11,9 +11,9 @@ import { PagePermissionRepo } from '@docmost/db/repos/page/page-permission.repo'
 import { InsertablePage, Page, User } from '@docmost/db/types/entity.types';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import {
-  executeWithPagination,
-  PaginationResult,
-} from '@docmost/db/pagination/pagination';
+  CursorPaginationResult,
+  executeWithCursorPagination,
+} from '@docmost/db/pagination/cursor-pagination';
 import { InjectKysely } from 'nestjs-kysely';
 import { KyselyDB } from '@docmost/db/types/kysely.types';
 import { generateJitteredKeyBetween } from 'fractional-indexing-jittered';
@@ -238,7 +238,7 @@ export class PageService {
     pagination: PaginationOptions,
     pageId?: string,
     userId?: string,
-  ): Promise<any> {
+  ): Promise<CursorPaginationResult<Partial<Page> & { hasChildren: boolean }>> {
     let query = this.db
       .selectFrom('pages')
       .select([
@@ -253,7 +253,6 @@ export class PageService {
         'deletedAt',
       ])
       .select((eb) => this.pageRepo.withHasChildren(eb))
-      .orderBy('position', (ob) => ob.collate('C').asc())
       .where('deletedAt', 'is', null)
       .where('spaceId', '=', spaceId);
 
@@ -263,9 +262,18 @@ export class PageService {
       query = query.where('parentPageId', 'is', null);
     }
 
-    const result = await executeWithPagination(query, {
-      page: pagination.page,
+    const result = await executeWithCursorPagination(query, {
       perPage: 250,
+      cursor: pagination.cursor,
+      beforeCursor: pagination.beforeCursor,
+      fields: [
+        { expression: 'position', direction: 'asc', orderModifier: (ob) => ob.collate('C').asc() },
+        { expression: 'id', direction: 'asc' },
+      ],
+      parseCursor: (cursor) => ({
+        position: cursor.position,
+        id: cursor.id,
+      }),
     });
 
     if (userId && result.items.length > 0) {
@@ -713,7 +721,7 @@ export class PageService {
     spaceId: string,
     userId: string,
     pagination: PaginationOptions,
-  ): Promise<PaginationResult<Page>> {
+  ): Promise<CursorPaginationResult<Page>> {
     const result = await this.pageRepo.getRecentPagesInSpace(spaceId, pagination);
 
     if (result.items.length > 0) {
@@ -733,7 +741,7 @@ export class PageService {
   async getRecentPages(
     userId: string,
     pagination: PaginationOptions,
-  ): Promise<PaginationResult<Page>> {
+  ): Promise<CursorPaginationResult<Page>> {
     const result = await this.pageRepo.getRecentPages(userId, pagination);
 
     if (result.items.length > 0) {
@@ -753,8 +761,8 @@ export class PageService {
   async getDeletedSpacePages(
     spaceId: string,
     pagination: PaginationOptions,
-  ): Promise<PaginationResult<Page>> {
-    return await this.pageRepo.getDeletedPagesInSpace(spaceId, pagination);
+  ): Promise<CursorPaginationResult<Page>> {
+    return this.pageRepo.getDeletedPagesInSpace(spaceId, pagination);
   }
 
   async forceDelete(pageId: string, workspaceId: string): Promise<void> {