refactor layout

* ui polishing
* frontend and backend fixes

apps/server/src/core/casl/abilities/space-ability.factory.ts

@@ -1,8 +1,4 @@
-import {
-  ForbiddenException,
-  Injectable,
-  NotFoundException,
-} from '@nestjs/common';
+import { Injectable, NotFoundException } from '@nestjs/common';
 import {
   AbilityBuilder,
   createMongoAbility,

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

@@ -1,7 +1,14 @@
-import { IsString, IsUUID } from 'class-validator';
+import {
+  IsBoolean,
+  IsNotEmpty,
+  IsOptional,
+  IsString,
+  IsUUID,
+} from 'class-validator';
 
 export class PageIdDto {
   @IsString()
+  @IsNotEmpty()
   pageId: string;
 }
 
@@ -14,3 +21,9 @@ export class PageHistoryIdDto {
   @IsUUID()
   historyId: string;
 }
+
+export class PageInfoDto extends PageIdDto {
+  @IsOptional()
+  @IsBoolean()
+  includeSpace: boolean;
+}

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

@@ -0,0 +1,7 @@
+import { IsOptional, IsString } from 'class-validator';
+
+export class RecentPageDto {
+  @IsOptional()
+  @IsString()
+  spaceId: string;
+}

apps/server/src/core/page/page.controller.ts

@@ -12,7 +12,7 @@ import { PageService } from './services/page.service';
 import { CreatePageDto } from './dto/create-page.dto';
 import { UpdatePageDto } from './dto/update-page.dto';
 import { MovePageDto } from './dto/move-page.dto';
-import { PageHistoryIdDto, PageIdDto } from './dto/page.dto';
+import { PageHistoryIdDto, PageIdDto, PageInfoDto } from './dto/page.dto';
 import { PageHistoryService } from './services/page-history.service';
 import { AuthUser } from '../../decorators/auth-user.decorator';
 import { AuthWorkspace } from '../../decorators/auth-workspace.decorator';
@@ -26,6 +26,7 @@ import {
 } from '../casl/interfaces/space-ability.type';
 import SpaceAbilityFactory from '../casl/abilities/space-ability.factory';
 import { PageRepo } from '@docmost/db/repos/page/page.repo';
+import { RecentPageDto } from './dto/recent-page.dto';
 
 @UseGuards(JwtAuthGuard)
 @Controller('pages')
@@ -39,8 +40,10 @@ export class PageController {
 
   @HttpCode(HttpStatus.OK)
   @Post('/info')
-  async getPage(@Body() pageIdDto: PageIdDto, @AuthUser() user: User) {
-    const page = await this.pageRepo.findById(pageIdDto.pageId);
+  async getPage(@Body() dto: PageInfoDto, @AuthUser() user: User) {
+    const page = await this.pageRepo.findById(dto.pageId, {
+      includeSpace: true,
+    });
 
     if (!page) {
       throw new NotFoundException('Page not found');
@@ -117,24 +120,28 @@ export class PageController {
 
   @HttpCode(HttpStatus.OK)
   @Post('recent')
-  async getRecentSpacePages(
+  async getRecentPages(
+    @Body() recentPageDto: RecentPageDto,
     @Body() pagination: PaginationOptions,
     @AuthUser() user: User,
-    @AuthWorkspace() workspace: Workspace,
   ) {
-    const ability = await this.spaceAbility.createForUser(
-      user,
-      workspace.defaultSpaceId,
-    );
+    if (recentPageDto.spaceId) {
+      const ability = await this.spaceAbility.createForUser(
+        user,
+        recentPageDto.spaceId,
+      );
 
-    if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) {
-      throw new ForbiddenException();
+      if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) {
+        throw new ForbiddenException();
+      }
+
+      return this.pageService.getRecentSpacePages(
+        recentPageDto.spaceId,
+        pagination,
+      );
     }
 
-    return this.pageService.getRecentSpacePages(
-      workspace.defaultSpaceId,
-      pagination,
-    );
+    return this.pageService.getRecentPages(user.id, pagination);
   }
 
   // TODO: scope to workspaces

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

@@ -18,7 +18,7 @@ import { generateJitteredKeyBetween } from 'fractional-indexing-jittered';
 import { MovePageDto } from '../dto/move-page.dto';
 import { ExpressionBuilder } from 'kysely';
 import { DB } from '@docmost/db/types/db';
-import { genPageShortId } from '../../../helpers/nanoid.utils';
+import { generateSlugId } from '../../../helpers';
 
 @Injectable()
 export class PageService {
@@ -31,8 +31,13 @@ export class PageService {
     pageId: string,
     includeContent?: boolean,
     includeYdoc?: boolean,
+    includeSpace?: boolean,
   ): Promise<Page> {
-    return this.pageRepo.findById(pageId, { includeContent, includeYdoc });
+    return this.pageRepo.findById(pageId, {
+      includeContent,
+      includeYdoc,
+      includeSpace,
+    });
   }
 
   async create(
@@ -92,7 +97,7 @@ export class PageService {
     }
 
     const createdPage = await this.pageRepo.insertPage({
-      slugId: genPageShortId(),
+      slugId: generateSlugId(),
       title: createPageDto.title,
       position: pagePosition,
       icon: createPageDto.icon,
@@ -266,9 +271,14 @@ export class PageService {
     spaceId: string,
     pagination: PaginationOptions,
   ): Promise<PaginationResult<Page>> {
-    const pages = await this.pageRepo.getRecentPageUpdates(spaceId, pagination);
+    return await this.pageRepo.getRecentPagesInSpace(spaceId, pagination);
+  }
 
-    return pages;
+  async getRecentPages(
+    userId: string,
+    pagination: PaginationOptions,
+  ): Promise<PaginationResult<Page>> {
+    return await this.pageRepo.getRecentPages(userId, pagination);
   }
 
   async forceDelete(pageId: string): Promise<void> {

apps/server/src/core/search/dto/search.dto.ts

@@ -1,9 +1,19 @@
-import { IsBoolean, IsNumber, IsOptional, IsString } from 'class-validator';
+import {
+  IsBoolean,
+  IsNotEmpty,
+  IsNumber,
+  IsOptional,
+  IsString,
+} from 'class-validator';
 
 export class SearchDTO {
   @IsString()
   query: string;
 
+  @IsNotEmpty()
+  @IsString()
+  spaceId: string;
+
   @IsOptional()
   @IsString()
   creatorId?: string;

apps/server/src/core/search/search.controller.ts

@@ -1,34 +1,51 @@
 import {
   Body,
   Controller,
+  ForbiddenException,
   HttpCode,
   HttpStatus,
+  NotImplementedException,
   Post,
-  Query,
   UseGuards,
 } from '@nestjs/common';
 import { SearchService } from './search.service';
 import { SearchDTO, SearchSuggestionDTO } from './dto/search.dto';
 import { AuthWorkspace } from '../../decorators/auth-workspace.decorator';
 import { JwtAuthGuard } from '../../guards/jwt-auth.guard';
-import { Workspace } from '@docmost/db/types/entity.types';
+import { User, Workspace } from '@docmost/db/types/entity.types';
+import SpaceAbilityFactory from '../casl/abilities/space-ability.factory';
+import {
+  SpaceCaslAction,
+  SpaceCaslSubject,
+} from '../casl/interfaces/space-ability.type';
+import { AuthUser } from '../../decorators/auth-user.decorator';
 
 @UseGuards(JwtAuthGuard)
 @Controller('search')
 export class SearchController {
-  constructor(private readonly searchService: SearchService) {}
+  constructor(
+    private readonly searchService: SearchService,
+    private readonly spaceAbility: SpaceAbilityFactory,
+  ) {}
 
   @HttpCode(HttpStatus.OK)
   @Post()
-  async pageSearch(
-    @Body() searchDto: SearchDTO,
-    @AuthWorkspace() workspace: Workspace,
-  ) {
-    return this.searchService.searchPage(
-      searchDto.query,
-      searchDto,
-      workspace.id,
-    );
+  async pageSearch(@Body() searchDto: SearchDTO, @AuthUser() user: User) {
+    if (searchDto.spaceId) {
+      const ability = await this.spaceAbility.createForUser(
+        user,
+        searchDto.spaceId,
+      );
+
+      if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) {
+        throw new ForbiddenException();
+      }
+
+      return this.searchService.searchPage(searchDto.query, searchDto);
+    }
+
+    // TODO: search all spaces user is a member of if no spaceId provided
+    throw new NotImplementedException();
   }
 
   @Post('suggest')

apps/server/src/core/search/search.service.ts

@@ -4,17 +4,20 @@ import { SearchResponseDto } from './dto/search-response.dto';
 import { InjectKysely } from 'nestjs-kysely';
 import { KyselyDB } from '@docmost/db/types/kysely.types';
 import { sql } from 'kysely';
+import { PageRepo } from '@docmost/db/repos/page/page.repo';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const tsquery = require('pg-tsquery')();
 
 @Injectable()
 export class SearchService {
-  constructor(@InjectKysely() private readonly db: KyselyDB) {}
+  constructor(
+    @InjectKysely() private readonly db: KyselyDB,
+    private pageRepo: PageRepo,
+  ) {}
 
   async searchPage(
     query: string,
     searchParams: SearchDTO,
-    workspaceId: string,
   ): Promise<SearchResponseDto[]> {
     if (query.length < 1) {
       return;
@@ -28,6 +31,7 @@ export class SearchService {
         'title',
         'icon',
         'parentPageId',
+        'slugId',
         'creatorId',
         'createdAt',
         'updatedAt',
@@ -36,7 +40,8 @@ export class SearchService {
           'highlight',
         ),
       ])
-      .where('workspaceId', '=', workspaceId)
+      .select((eb) => this.pageRepo.withSpace(eb))
+      .where('spaceId', '=', searchParams.spaceId)
       .where('tsv', '@@', sql<string>`to_tsquery(${searchQuery})`)
       .$if(Boolean(searchParams.creatorId), (qb) =>
         qb.where('creatorId', '=', searchParams.creatorId),

apps/server/src/core/space/dto/space-id.dto.ts

@@ -3,6 +3,6 @@ import { IsNotEmpty, IsString, IsUUID } from 'class-validator';
 export class SpaceIdDto {
   @IsString()
   @IsNotEmpty()
-  @IsUUID()
+  //@IsUUID()
   spaceId: string;
 }

apps/server/src/core/space/services/space-member.service.ts

@@ -8,11 +8,12 @@ import { KyselyDB, KyselyTransaction } from '@docmost/db/types/kysely.types';
 import { SpaceMemberRepo } from '@docmost/db/repos/space/space-member.repo';
 import { AddSpaceMembersDto } from '../dto/add-space-members.dto';
 import { InjectKysely } from 'nestjs-kysely';
-import { SpaceMember, User } from '@docmost/db/types/entity.types';
+import { Space, SpaceMember, User } from '@docmost/db/types/entity.types';
 import { SpaceRepo } from '@docmost/db/repos/space/space.repo';
 import { RemoveSpaceMemberDto } from '../dto/remove-space-member.dto';
 import { UpdateSpaceMemberRoleDto } from '../dto/update-space-member-role.dto';
 import { SpaceRole } from '../../../helpers/types/permission';
+import { PaginationResult } from '@docmost/db/pagination/pagination';
 
 @Injectable()
 export class SpaceMemberService {
@@ -49,11 +50,6 @@ export class SpaceMemberService {
     workspaceId: string,
     trx?: KyselyTransaction,
   ): Promise<void> {
-    //const existingSpaceUser = await manager.findOneBy(SpaceMember, {
-    //           userId: userId,
-    //           spaceId: spaceId,
-    //         });
-    // validations?
     await this.spaceMemberRepo.insertSpaceMember(
       {
         groupId: groupId,
@@ -276,4 +272,11 @@ export class SpaceMemberService {
       );
     }
   }
+
+  async getUserSpaces(
+    userId: string,
+    pagination: PaginationOptions,
+  ): Promise<PaginationResult<Space>> {
+    return await this.spaceMemberRepo.getUserSpaces(userId, pagination);
+  }
 }

apps/server/src/core/space/space.controller.ts

@@ -5,6 +5,7 @@ import {
   ForbiddenException,
   HttpCode,
   HttpStatus,
+  NotFoundException,
   Post,
   UseGuards,
 } from '@nestjs/common';
@@ -41,10 +42,8 @@ export class SpaceController {
     @Body()
     pagination: PaginationOptions,
     @AuthUser() user: User,
-    @AuthWorkspace() workspace: Workspace,
   ) {
-    // TODO: only show spaces user can see. e.g open and private with user being a member
-    return this.spaceService.getWorkspaceSpaces(workspace.id, pagination);
+    return this.spaceMemberService.getUserSpaces(user.id, pagination);
   }
 
   @HttpCode(HttpStatus.OK)
@@ -54,15 +53,21 @@ export class SpaceController {
     @AuthUser() user: User,
     @AuthWorkspace() workspace: Workspace,
   ) {
-    const ability = await this.spaceAbility.createForUser(
-      user,
+    const space = await this.spaceService.getSpaceInfo(
       spaceIdDto.spaceId,
+      workspace.id,
     );
+
+    if (!space) {
+      throw new NotFoundException('Space not found');
+    }
+
+    const ability = await this.spaceAbility.createForUser(user, space.id);
     if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Settings)) {
       throw new ForbiddenException();
     }
 
-    return this.spaceService.getSpaceInfo(spaceIdDto.spaceId, workspace.id);
+    return space;
   }
 
   @HttpCode(HttpStatus.OK)

apps/server/src/database/migrations/20240324T085900-spaces.ts

@@ -9,7 +9,7 @@ export async function up(db: Kysely<any>): Promise<void> {
     )
     .addColumn('name', 'varchar', (col) => col)
     .addColumn('description', 'text', (col) => col)
-    .addColumn('slug', 'varchar', (col) => col)
+    .addColumn('slug', 'varchar', (col) => col.notNull())
     .addColumn('logo', 'varchar', (col) => col)
     .addColumn('visibility', 'varchar', (col) =>
       col.defaultTo(SpaceVisibility.OPEN).notNull(),

apps/server/src/database/repos/page/page.repo.ts

@@ -10,10 +10,17 @@ import {
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { executeWithPagination } from '@docmost/db/pagination/pagination';
 import { validate as isValidUUID } from 'uuid';
+import { ExpressionBuilder } from 'kysely';
+import { DB } from '@docmost/db/types/db';
+import { jsonObjectFrom } from 'kysely/helpers/postgres';
+import { SpaceMemberRepo } from '@docmost/db/repos/space/space-member.repo';
 
 @Injectable()
 export class PageRepo {
-  constructor(@InjectKysely() private readonly db: KyselyDB) {}
+  constructor(
+    @InjectKysely() private readonly db: KyselyDB,
+    private spaceMemberRepo: SpaceMemberRepo,
+  ) {}
 
   private baseFields: Array<keyof Page> = [
     'id',
@@ -38,6 +45,7 @@ export class PageRepo {
     opts?: {
       includeContent?: boolean;
       includeYdoc?: boolean;
+      includeSpace?: boolean;
     },
   ): Promise<Page> {
     let query = this.db
@@ -46,6 +54,10 @@ export class PageRepo {
       .$if(opts?.includeContent, (qb) => qb.select('content'))
       .$if(opts?.includeYdoc, (qb) => qb.select('ydoc'));
 
+    if (opts?.includeSpace) {
+      query = query.select((eb) => this.withSpace(eb));
+    }
+
     if (isValidUUID(pageId)) {
       query = query.where('id', '=', pageId);
     } else {
@@ -96,12 +108,11 @@ export class PageRepo {
     await query.execute();
   }
 
-  async getRecentPageUpdates(spaceId: string, pagination: PaginationOptions) {
-    //TODO: should fetch pages from all spaces the user is member of
-    // for now, fetch from default space
+  async getRecentPagesInSpace(spaceId: string, pagination: PaginationOptions) {
     const query = this.db
       .selectFrom('pages')
       .select(this.baseFields)
+      .select((eb) => this.withSpace(eb))
       .where('spaceId', '=', spaceId)
       .orderBy('updatedAt', 'desc');
 
@@ -112,4 +123,31 @@ export class PageRepo {
 
     return result;
   }
+
+  async getRecentPages(userId: string, pagination: PaginationOptions) {
+    const userSpaceIds = await this.spaceMemberRepo.getUserSpaceIds(userId);
+
+    const query = this.db
+      .selectFrom('pages')
+      .select(this.baseFields)
+      .select((eb) => this.withSpace(eb))
+      .where('spaceId', 'in', userSpaceIds)
+      .orderBy('updatedAt', 'desc');
+
+    const result = executeWithPagination(query, {
+      page: pagination.page,
+      perPage: pagination.limit,
+    });
+
+    return result;
+  }
+
+  withSpace(eb: ExpressionBuilder<DB, 'pages'>) {
+    return jsonObjectFrom(
+      eb
+        .selectFrom('spaces')
+        .select(['spaces.id', 'spaces.name', 'spaces.slug'])
+        .whereRef('spaces.id', '=', 'pages.spaceId'),
+    ).as('space');
+  }
 }

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

@@ -11,12 +11,14 @@ import { PaginationOptions } from '../../pagination/pagination-options';
 import { MemberInfo, UserSpaceRole } from './types';
 import { executeWithPagination } from '@docmost/db/pagination/pagination';
 import { GroupRepo } from '@docmost/db/repos/group/group.repo';
+import { SpaceRepo } from '@docmost/db/repos/space/space.repo';
 
 @Injectable()
 export class SpaceMemberRepo {
   constructor(
     @InjectKysely() private readonly db: KyselyDB,
     private readonly groupRepo: GroupRepo,
+    private readonly spaceRepo: SpaceRepo,
   ) {}
 
   async insertSpaceMember(
@@ -184,4 +186,52 @@ export class SpaceMemberRepo {
     }
     return roles;
   }
+
+  async getUserSpaceIds(userId: string): Promise<string[]> {
+    const membership = await this.db
+      .selectFrom('spaceMembers')
+      .innerJoin('spaces', 'spaces.id', 'spaceMembers.spaceId')
+      .select(['spaces.id'])
+      .where('userId', '=', userId)
+      .union(
+        this.db
+          .selectFrom('spaceMembers')
+          .innerJoin('groupUsers', 'groupUsers.groupId', 'spaceMembers.groupId')
+          .innerJoin('spaces', 'spaces.id', 'spaceMembers.spaceId')
+          .select(['spaces.id'])
+          .where('groupUsers.userId', '=', userId),
+      )
+      .execute();
+
+    return membership.map((space) => space.id);
+  }
+
+  async getUserSpaces(userId: string, pagination: PaginationOptions) {
+    const userSpaceIds = await this.getUserSpaceIds(userId);
+
+    let query = this.db
+      .selectFrom('spaces')
+      .selectAll('spaces')
+      .select((eb) => [this.spaceRepo.withMemberCount(eb)])
+      //.where('workspaceId', '=', workspaceId)
+      .where('id', 'in', userSpaceIds)
+      .orderBy('createdAt', 'asc');
+
+    if (pagination.query) {
+      query = query.where((eb) =>
+        eb('name', 'ilike', `%${pagination.query}%`).or(
+          'description',
+          'ilike',
+          `%${pagination.query}%`,
+        ),
+      );
+    }
+
+    const result = executeWithPagination(query, {
+      page: pagination.page,
+      perPage: pagination.limit,
+    });
+
+    return result;
+  }
 }

apps/server/src/database/repos/space/space.repo.ts

@@ -11,6 +11,7 @@ import { ExpressionBuilder, sql } from 'kysely';
 import { PaginationOptions } from '../../pagination/pagination-options';
 import { executeWithPagination } from '@docmost/db/pagination/pagination';
 import { DB } from '@docmost/db/types/db';
+import { validate as isValidUUID } from 'uuid';
 
 @Injectable()
 export class SpaceRepo {
@@ -22,13 +23,19 @@ export class SpaceRepo {
     opts?: { includeMemberCount?: boolean; trx?: KyselyTransaction },
   ): Promise<Space> {
     const db = dbOrTx(this.db, opts?.trx);
-    return db
+
+    let query = db
       .selectFrom('spaces')
       .selectAll('spaces')
       .$if(opts?.includeMemberCount, (qb) => qb.select(this.withMemberCount))
-      .where('id', '=', spaceId)
-      .where('workspaceId', '=', workspaceId)
-      .executeTakeFirst();
+      .where('workspaceId', '=', workspaceId);
+
+    if (isValidUUID(spaceId)) {
+      query = query.where('id', '=', spaceId);
+    } else {
+      query = query.where('slug', '=', spaceId);
+    }
+    return query.executeTakeFirst();
   }
 
   async findBySlug(

apps/server/src/database/repos/user/user.repo.ts

@@ -6,11 +6,15 @@ import { hashPassword } from '../../../helpers';
 import { dbOrTx } from '@docmost/db/utils';
 import {
   InsertableUser,
+  Space,
   UpdatableUser,
   User,
 } from '@docmost/db/types/entity.types';
 import { PaginationOptions } from '../../pagination/pagination-options';
-import { executeWithPagination } from '@docmost/db/pagination/pagination';
+import {
+  executeWithPagination,
+  PaginationResult,
+} from '@docmost/db/pagination/pagination';
 
 @Injectable()
 export class UserRepo {
@@ -152,4 +156,31 @@ export class UserRepo {
 
     return result;
   }
+
+  /*
+  async getSpaceIds(
+    workspaceId: string,
+    pagination: PaginationOptions,
+  ): Promise<PaginationResult<Space>> {
+    const spaces = await this.spaceRepo.getSpacesInWorkspace(
+      workspaceId,
+      pagination,
+    );
+
+    return spaces;
+  }
+
+  async getUserSpaces(
+    workspaceId: string,
+    pagination: PaginationOptions,
+  ): Promise<PaginationResult<Space>> {
+    const spaces = await this.spaceRepo.getSpacesInWorkspace(
+      workspaceId,
+      pagination,
+    );
+
+    return spaces;
+  }
+
+   */
 }

apps/server/src/helpers/nanoid.utils.ts

@@ -6,4 +6,4 @@ export const nanoIdGen = customAlphabet(alphabet, 10);
 
 const slugIdAlphabet =
   '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-export const genPageShortId = customAlphabet(slugIdAlphabet, 12);
+export const generateSlugId = customAlphabet(slugIdAlphabet, 12);