feat(base): create() now allocates an is_base=true page via PageService

apps/server/src/core/base/base.module.ts

@@ -17,9 +17,13 @@ import { BasePresenceService } from './realtime/base-presence.service';
 import { QueueName } from '../../integrations/queue/constants';
 import { FormulaService } from './formula/formula.service';
 import { FormulaLockService } from './formula/formula-lock';
+import { PageModule } from '../page/page.module';
 
 @Module({
-  imports: [BullModule.registerQueue({ name: QueueName.BASE_QUEUE })],
+  imports: [
+    BullModule.registerQueue({ name: QueueName.BASE_QUEUE }),
+    PageModule,
+  ],
   controllers: [
     BaseController,
     BasePropertyController,

apps/server/src/core/base/dto/create-base.dto.ts

@@ -1,22 +1,18 @@
-import { IsNotEmpty, IsOptional, IsString, IsUUID } from 'class-validator';
+import { IsOptional, IsString, IsUUID } from 'class-validator';
 
 export class CreateBaseDto {
   @IsString()
-  @IsNotEmpty()
-  name: string;
-
   @IsOptional()
-  @IsString()
+  name?: string;
-  description?: string;
 
-  @IsOptional()
   @IsString()
+  @IsOptional()
   icon?: string;
 
-  @IsOptional()
   @IsUUID()
-  pageId?: string;
+  spaceId!: string;
 
   @IsUUID()
-  spaceId: string;
+  @IsOptional()
+  parentPageId?: string;
 }

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

@@ -8,6 +8,8 @@ import { executeTx } from '@docmost/db/utils';
 import { BaseRepo } from '@docmost/db/repos/base/base.repo';
 import { BasePropertyRepo } from '@docmost/db/repos/base/base-property.repo';
 import { BaseViewRepo } from '@docmost/db/repos/base/base-view.repo';
+import { PageService } from '../../page/services/page.service';
+import { PageRepo } from '@docmost/db/repos/page/page.repo';
 import { CreateBaseDto } from '../dto/create-base.dto';
 import { UpdateBaseDto } from '../dto/update-base.dto';
 import { BasePropertyType } from '../base.schemas';
@@ -21,20 +23,22 @@ export class BaseService {
     private readonly baseRepo: BaseRepo,
     private readonly basePropertyRepo: BasePropertyRepo,
     private readonly baseViewRepo: BaseViewRepo,
+    private readonly pageService: PageService,
+    private readonly pageRepo: PageRepo,
   ) {}
 
   async create(userId: string, workspaceId: string, dto: CreateBaseDto) {
     return executeTx(this.db, async (trx) => {
-      const base = await this.baseRepo.insertBase(
+      const page = await this.pageService.create(
-        {
+        userId,
-          name: dto.name,
-          description: dto.description,
-          icon: dto.icon,
-          pageId: dto.pageId,
-          spaceId: dto.spaceId,
         workspaceId,
-          creatorId: userId,
+        {
-        },
+          title: dto.name ?? 'Untitled',
+          icon: dto.icon,
+          spaceId: dto.spaceId,
+          parentPageId: dto.parentPageId,
+          isBase: true,
+        } as any,
         trx,
       );
 
@@ -42,7 +46,7 @@ export class BaseService {
 
       await this.basePropertyRepo.insertProperty(
         {
-          baseId: base.id,
+          pageId: page.id,
           name: 'Title',
           type: BasePropertyType.TEXT,
           position: firstPosition,
@@ -54,17 +58,18 @@ export class BaseService {
 
       await this.baseViewRepo.insertView(
         {
-          baseId: base.id,
+          pageId: page.id,
-          name: 'Table View 1',
+          name: 'Table',
           type: 'table',
           position: firstPosition,
+          config: {},
           workspaceId,
           creatorId: userId,
         },
         { trx },
       );
 
-      return this.baseRepo.findById(base.id, {
+      return this.baseRepo.findById(page.id, {
         includeProperties: true,
         includeViews: true,
         trx,
@@ -72,8 +77,8 @@ export class BaseService {
     });
   }
 
-  async getBaseInfo(baseId: string) {
+  async getBaseInfo(pageId: string) {
-    const base = await this.baseRepo.findById(baseId, {
+    const base = await this.baseRepo.findById(pageId, {
       includeProperties: true,
       includeViews: true,
     });
@@ -91,11 +96,13 @@ export class BaseService {
       throw new NotFoundException('Base not found');
     }
 
-    await this.baseRepo.updateBase(dto.baseId, {
+    await this.pageRepo.updatePage(
-      ...(dto.name !== undefined && { name: dto.name }),
+      {
-      ...(dto.description !== undefined && { description: dto.description }),
+        ...(dto.name !== undefined && { title: dto.name }),
         ...(dto.icon !== undefined && { icon: dto.icon }),
-    });
+      },
+      dto.baseId,
+    );
 
     return this.baseRepo.findById(dto.baseId);
   }

apps/server/src/core/page/dto/create-page.dto.ts

@@ -1,4 +1,5 @@
 import {
+  IsBoolean,
   IsIn,
   IsOptional,
   IsString,
@@ -25,6 +26,10 @@ export class CreatePageDto {
   @IsUUID()
   spaceId: string;
 
+  @IsOptional()
+  @IsBoolean()
+  isBase?: boolean;
+
   @IsOptional()
   content?: string | object;
 

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

@@ -15,7 +15,7 @@ import {
   executeWithCursorPagination,
 } from '@docmost/db/pagination/cursor-pagination';
 import { InjectKysely } from 'nestjs-kysely';
-import { KyselyDB } from '@docmost/db/types/kysely.types';
+import { KyselyDB, KyselyTransaction } from '@docmost/db/types/kysely.types';
 import { generateJitteredKeyBetween } from 'fractional-indexing-jittered';
 import { MovePageDto } from '../dto/move-page.dto';
 import { generateSlugId } from '../../../common/helpers';
@@ -90,6 +90,7 @@ export class PageService {
     userId: string,
     workspaceId: string,
     createPageDto: CreatePageDto,
+    trx?: KyselyTransaction,
   ): Promise<Page> {
     let parentPageId = undefined;
 
@@ -138,10 +139,11 @@ export class PageService {
       creatorId: userId,
       workspaceId: workspaceId,
       lastUpdatedById: userId,
+      isBase: createPageDto.isBase ?? false,
       content,
       textContent,
       ydoc,
-    });
+    }, trx);
 
     this.generalQueue
       .add(QueueJob.ADD_PAGE_WATCHERS, {