updates and fixes

* seo friendly urls
* custom client serve-static module
* database fixes
* fix recent pages
* other fixes

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

@@ -0,0 +1,79 @@
+import { Injectable } from '@nestjs/common';
+import { InjectKysely } from 'nestjs-kysely';
+import { KyselyDB, KyselyTransaction } from '../../types/kysely.types';
+import { dbOrTx } from '../../utils';
+import {
+  InsertablePageHistory,
+  Page,
+  PageHistory,
+} from '@docmost/db/types/entity.types';
+import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
+import { executeWithPagination } from '@docmost/db/pagination/pagination';
+import { jsonObjectFrom } from 'kysely/helpers/postgres';
+import { ExpressionBuilder } from 'kysely';
+import { DB } from '@docmost/db/types/db';
+
+@Injectable()
+export class PageHistoryRepo {
+  constructor(@InjectKysely() private readonly db: KyselyDB) {}
+
+  async findById(pageHistoryId: string): Promise<PageHistory> {
+    return await this.db
+      .selectFrom('pageHistory')
+      .selectAll()
+      .select((eb) => this.withLastUpdatedBy(eb))
+      .where('id', '=', pageHistoryId)
+      .executeTakeFirst();
+  }
+
+  async insertPageHistory(
+    insertablePageHistory: InsertablePageHistory,
+    trx?: KyselyTransaction,
+  ): Promise<PageHistory> {
+    const db = dbOrTx(this.db, trx);
+    return db
+      .insertInto('pageHistory')
+      .values(insertablePageHistory)
+      .returningAll()
+      .executeTakeFirst();
+  }
+
+  async saveHistory(page: Page): Promise<void> {
+    await this.insertPageHistory({
+      pageId: page.id,
+      slugId: page.slugId,
+      title: page.title,
+      content: page.content,
+      icon: page.icon,
+      coverPhoto: page.coverPhoto,
+      lastUpdatedById: page.lastUpdatedById ?? page.creatorId,
+      spaceId: page.spaceId,
+      workspaceId: page.workspaceId,
+    });
+  }
+
+  async findPageHistoryByPageId(pageId: string, pagination: PaginationOptions) {
+    const query = this.db
+      .selectFrom('pageHistory')
+      .selectAll()
+      .select((eb) => this.withLastUpdatedBy(eb))
+      .where('pageId', '=', pageId)
+      .orderBy('createdAt', 'desc');
+
+    const result = executeWithPagination(query, {
+      page: pagination.page,
+      perPage: pagination.limit,
+    });
+
+    return result;
+  }
+
+  withLastUpdatedBy(eb: ExpressionBuilder<DB, 'pageHistory'>) {
+    return jsonObjectFrom(
+      eb
+        .selectFrom('users')
+        .select(['users.id', 'users.name', 'users.avatarUrl'])
+        .whereRef('users.id', '=', 'pageHistory.lastUpdatedById'),
+    ).as('lastUpdatedBy');
+  }
+}

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

@@ -0,0 +1,115 @@
+import { Injectable } from '@nestjs/common';
+import { InjectKysely } from 'nestjs-kysely';
+import { KyselyDB, KyselyTransaction } from '../../types/kysely.types';
+import { dbOrTx } from '../../utils';
+import {
+  InsertablePage,
+  Page,
+  UpdatablePage,
+} from '@docmost/db/types/entity.types';
+import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
+import { executeWithPagination } from '@docmost/db/pagination/pagination';
+import { validate as isValidUUID } from 'uuid';
+
+@Injectable()
+export class PageRepo {
+  constructor(@InjectKysely() private readonly db: KyselyDB) {}
+
+  private baseFields: Array<keyof Page> = [
+    'id',
+    'slugId',
+    'title',
+    'icon',
+    'coverPhoto',
+    'position',
+    'parentPageId',
+    'creatorId',
+    'lastUpdatedById',
+    'spaceId',
+    'workspaceId',
+    'isLocked',
+    'createdAt',
+    'updatedAt',
+    'deletedAt',
+  ];
+
+  async findById(
+    pageId: string,
+    opts?: {
+      includeContent?: boolean;
+      includeYdoc?: boolean;
+    },
+  ): Promise<Page> {
+    let query = this.db
+      .selectFrom('pages')
+      .select(this.baseFields)
+      .$if(opts?.includeContent, (qb) => qb.select('content'))
+      .$if(opts?.includeYdoc, (qb) => qb.select('ydoc'));
+
+    if (isValidUUID(pageId)) {
+      query = query.where('id', '=', pageId);
+    } else {
+      query = query.where('slugId', '=', pageId);
+    }
+
+    return query.executeTakeFirst();
+  }
+
+  async updatePage(
+    updatablePage: UpdatablePage,
+    pageId: string,
+    trx?: KyselyTransaction,
+  ) {
+    const db = dbOrTx(this.db, trx);
+    let query = db.updateTable('pages').set(updatablePage);
+
+    if (isValidUUID(pageId)) {
+      query = query.where('id', '=', pageId);
+    } else {
+      query = query.where('slugId', '=', pageId);
+    }
+
+    return query.executeTakeFirst();
+  }
+
+  async insertPage(
+    insertablePage: InsertablePage,
+    trx?: KyselyTransaction,
+  ): Promise<Page> {
+    const db = dbOrTx(this.db, trx);
+    return db
+      .insertInto('pages')
+      .values(insertablePage)
+      .returning(this.baseFields)
+      .executeTakeFirst();
+  }
+
+  async deletePage(pageId: string): Promise<void> {
+    let query = this.db.deleteFrom('pages');
+
+    if (isValidUUID(pageId)) {
+      query = query.where('id', '=', pageId);
+    } else {
+      query = query.where('slugId', '=', pageId);
+    }
+
+    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
+    const query = this.db
+      .selectFrom('pages')
+      .select(this.baseFields)
+      .where('spaceId', '=', spaceId)
+      .orderBy('updatedAt', 'desc');
+
+    const result = executeWithPagination(query, {
+      page: pagination.page,
+      perPage: pagination.limit,
+    });
+
+    return result;
+  }
+}