refactor layout

* ui polishing
* frontend and backend fixes

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)