Add second plan

apps/client/package.json

@@ -29,7 +29,6 @@
     "clsx": "^2.1.1",
     "emoji-mart": "^5.6.0",
     "file-saver": "^2.0.5",
-    "highlightjs-sap-abap": "^0.3.0",
     "i18next": "^23.14.0",
     "i18next-http-backend": "^2.6.1",
     "jotai": "^2.12.1",

apps/client/src/features/editor/extensions/extensions.ts

@@ -58,7 +58,6 @@ import ExcalidrawView from "@/features/editor/components/excalidraw/excalidraw-v
 import EmbedView from "@/features/editor/components/embed/embed-view.tsx";
 import plaintext from "highlight.js/lib/languages/plaintext";
 import powershell from "highlight.js/lib/languages/powershell";
-import abap from "highlightjs-sap-abap";
 import elixir from "highlight.js/lib/languages/elixir";
 import erlang from "highlight.js/lib/languages/erlang";
 import dockerfile from "highlight.js/lib/languages/dockerfile";
@@ -77,7 +76,7 @@ import { CharacterCount } from "@tiptap/extension-character-count";
 const lowlight = createLowlight(common);
 lowlight.register("mermaid", plaintext);
 lowlight.register("powershell", powershell);
-lowlight.register("abap", abap);
+lowlight.register("powershell", powershell);
 lowlight.register("erlang", erlang);
 lowlight.register("elixir", elixir);
 lowlight.register("dockerfile", dockerfile);

apps/client/src/features/share/components/share-branding.tsx

@@ -1,16 +0,0 @@
-import { Affix, Button } from "@mantine/core";
-
-export default function ShareBranding() {
-  return (
-    <Affix position={{ bottom: 20, right: 20 }}>
-      <Button
-        variant="default"
-        component="a"
-        target="_blank"
-        href="https://docmost.com?ref=public-share"
-      >
-        Powered by Docmost
-      </Button>
-    </Affix>
-  );
-}

apps/client/src/features/share/components/share-shell.tsx

@@ -36,7 +36,6 @@ import {
 } from "@/features/search/components/search-control.tsx";
 import { ShareSearchSpotlight } from "@/features/search/share-search-spotlight";
 import { shareSearchSpotlight } from "@/features/search/constants";
-import ShareBranding from '@/features/share/components/share-branding.tsx';
 
 const MemoizedSharedTree = React.memo(SharedTree);
 
@@ -164,7 +163,16 @@ export default function ShareShell({
       <AppShell.Main>
         {children}
 
-        {data && shareId && !data.hasLicenseKey && <ShareBranding />}
+        <Affix position={{ bottom: 20, right: 20 }}>
+          <Button
+            variant="default"
+            component="a"
+            target="_blank"
+            href="https://docmost.com?ref=public-share"
+          >
+            Powered by Docmost
+          </Button>
+        </Affix>
       </AppShell.Main>
 
       <AppShell.Aside

apps/client/src/features/share/types/share.types.ts

@@ -41,7 +41,6 @@ export interface ISharedPage extends IShare {
     level: number;
     sharedPage: { id: string; slugId: string; title: string; icon: string };
   };
-  hasLicenseKey: boolean;
 }
 
 export interface IShareForPage extends IShare {
@@ -71,5 +70,4 @@ export interface IShareInfoInput {
 export interface ISharedPageTree {
   share: IShare;
   pageTree: Partial<IPage[]>;
-  hasLicenseKey: boolean;
 }

apps/client/src/pages/share/shared-page.tsx

@@ -7,9 +7,8 @@ import React, { useEffect } from "react";
 import ReadonlyPageEditor from "@/features/editor/readonly-page-editor.tsx";
 import { extractPageSlugId } from "@/lib";
 import { Error404 } from "@/components/ui/error-404.tsx";
-import ShareBranding from "@/features/share/components/share-branding.tsx";
 
-export default function SharedPage() {
+export default function SingleSharedPage() {
   const { t } = useTranslation();
   const { pageSlug } = useParams();
   const { shareId } = useParams();
@@ -54,8 +53,6 @@ export default function SharedPage() {
           content={data.page.content}
         />
       </Container>
-
-      {data && !shareId && !data.hasLicenseKey && <ShareBranding />}
     </div>
   );
 }

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

@@ -30,7 +30,6 @@ import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
 import { Public } from '../../common/decorators/public.decorator';
 import { ShareRepo } from '@docmost/db/repos/share/share.repo';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
-import { EnvironmentService } from '../../integrations/environment/environment.service';
 
 @UseGuards(JwtAuthGuard)
 @Controller('shares')
@@ -40,7 +39,6 @@ export class ShareController {
     private readonly spaceAbility: SpaceAbilityFactory,
     private readonly shareRepo: ShareRepo,
     private readonly pageRepo: PageRepo,
-    private readonly environmentService: EnvironmentService,
   ) {}
 
   @HttpCode(HttpStatus.OK)
@@ -63,12 +61,7 @@ export class ShareController {
       throw new BadRequestException();
     }
 
-    return {
-      ...(await this.shareService.getSharedPage(dto, workspace.id)),
-      hasLicenseKey:
-        Boolean(workspace.licenseKey) ||
-        (this.environmentService.isCloud() && workspace.plan === 'business'),
-    };
+    return this.shareService.getSharedPage(dto, workspace.id);
   }
 
   @Public()
@@ -173,11 +166,6 @@ export class ShareController {
     @Body() dto: ShareIdDto,
     @AuthWorkspace() workspace: Workspace,
   ) {
-    return {
-      ...(await this.shareService.getShareTree(dto.shareId, workspace.id)),
-      hasLicenseKey:
-        Boolean(workspace.licenseKey) ||
-        (this.environmentService.isCloud() && workspace.plan === 'business'),
-    };
+    return this.shareService.getShareTree(dto.shareId, workspace.id);
   }
 }

apps/server/src/database/migrations/20250521T154949-file_tasks.ts

@@ -1,45 +0,0 @@
-import { Kysely, sql } from 'kysely';
-
-export async function up(db: Kysely<any>): Promise<void> {
-  await db.schema
-    .createTable('file_tasks')
-    .addColumn('id', 'uuid', (col) =>
-      col.primaryKey().defaultTo(sql`gen_uuid_v7()`),
-    )
-    //type: import or export
-    .addColumn('type', 'varchar', (col) => col)
-    // source - generic, notion, confluence
-    // type or provider?
-    .addColumn('source', 'varchar', (col) => col)
-    // status (enum: PENDING|PROCESSING|SUCCESS|FAILED),
-    .addColumn('status', 'varchar', (col) => col)
-    // file name
-    // file path
-    // file size
-
-    .addColumn('file_name', 'varchar', (col) => col.notNull())
-    .addColumn('file_path', 'varchar', (col) => col.notNull())
-    .addColumn('file_size', 'int8', (col) => col)
-    .addColumn('file_ext', 'varchar', (col) => col)
-
-    .addColumn('creator_id', 'uuid', (col) => col.references('users.id'))
-    .addColumn('space_id', 'uuid', (col) =>
-      col.references('spaces.id').onDelete('cascade'),
-    )
-    .addColumn('workspace_id', 'uuid', (col) =>
-      col.references('workspaces.id').onDelete('cascade').notNull(),
-    )
-    .addColumn('created_at', 'timestamptz', (col) =>
-      col.notNull().defaultTo(sql`now()`),
-    )
-    .addColumn('updated_at', 'timestamptz', (col) =>
-      col.notNull().defaultTo(sql`now()`),
-    )
-    .addColumn('completed_at', 'timestamptz', (col) => col)
-    .addColumn('deleted_at', 'timestamptz', (col) => col)
-    .execute();
-}
-
-export async function down(db: Kysely<any>): Promise<void> {
-  await db.schema.dropTable('file_tasks').execute();
-}

apps/server/src/database/types/db.d.ts

@@ -122,24 +122,6 @@ export interface Comments {
   workspaceId: string;
 }
 
-export interface FileTasks {
-  completedAt: Timestamp | null;
-  createdAt: Generated<Timestamp>;
-  creatorId: string | null;
-  deletedAt: Timestamp | null;
-  fileExt: string | null;
-  fileName: string;
-  filePath: string;
-  fileSize: Int8 | null;
-  id: Generated<string>;
-  source: string | null;
-  spaceId: string | null;
-  status: string | null;
-  type: string | null;
-  updatedAt: Generated<Timestamp>;
-  workspaceId: string;
-}
-
 export interface Groups {
   createdAt: Generated<Timestamp>;
   creatorId: string | null;
@@ -316,7 +298,6 @@ export interface DB {
   backlinks: Backlinks;
   billing: Billing;
   comments: Comments;
-  fileTasks: FileTasks;
   groups: Groups;
   groupUsers: GroupUsers;
   pageHistory: PageHistory;

apps/server/src/database/types/entity.types.ts

@@ -17,7 +17,6 @@ import {
   AuthProviders,
   AuthAccounts,
   Shares,
-  FileTasks,
 } from './db';
 
 // Workspace
@@ -108,8 +107,3 @@ export type UpdatableAuthAccount = Updateable<Omit<AuthAccounts, 'id'>>;
 export type Share = Selectable<Shares>;
 export type InsertableShare = Insertable<Shares>;
 export type UpdatableShare = Updateable<Omit<Shares, 'id'>>;
-
-// File Task
-export type FileTask = Selectable<FileTasks>;
-export type InsertableFileTask = Insertable<FileTasks>;
-export type UpdatableFileTask = Updateable<Omit<FileTasks, 'id'>>;

apps/server/src/integrations/import/file-task.service.ts

@@ -1,68 +0,0 @@
-import { BadRequestException, Injectable, Logger } from '@nestjs/common';
-import { PageRepo } from '@docmost/db/repos/page/page.repo';
-import { MultipartFile } from '@fastify/multipart';
-import { sanitize } from 'sanitize-filename-ts';
-import * as path from 'path';
-import {
-  htmlToJson,
-  jsonToText,
-  tiptapExtensions,
-} from '../../collaboration/collaboration.util';
-import { InjectKysely } from 'nestjs-kysely';
-import { KyselyDB } from '@docmost/db/types/kysely.types';
-import { generateSlugId } from '../../common/helpers';
-import { generateJitteredKeyBetween } from 'fractional-indexing-jittered';
-import { TiptapTransformer } from '@hocuspocus/transformer';
-import * as Y from 'yjs';
-import { markdownToHtml } from '@docmost/editor-ext';
-import {
-  FileTaskStatus,
-  FileTaskType,
-  getFileTaskFolderPath,
-} from './file.utils';
-import { v7 as uuid7 } from 'uuid';
-import { StorageService } from '../storage/storage.service';
-import { InjectQueue } from '@nestjs/bullmq';
-import { Queue } from 'bullmq';
-import { QueueJob, QueueName } from '../queue/constants';
-
-@Injectable()
-export class FileTaskService {
-  private readonly logger = new Logger(FileTaskService.name);
-
-  constructor(
-    private readonly storageService: StorageService,
-    @InjectKysely() private readonly db: KyselyDB,
-  ) {}
-
-  async processZIpImport(fileTaskId: string): Promise<void> {
-    console.log(`Processing zip import: ${fileTaskId}`);
-
-    const fileTask = await this.db
-      .selectFrom('fileTasks')
-      .selectAll()
-      .where('id', '=', fileTaskId)
-      .executeTakeFirst();
-
-    if (!fileTask) {
-      this.logger.log(`File task with ID ${fileTaskId} not found`);
-      return;
-    }
-
-    // update status to processing
-    await this.db
-      .updateTable('fileTasks')
-      .set({ status: FileTaskStatus.Processing })
-      .execute();
-
-    // it did, what next?
-    const file = await this.storageService.read(fileTask.filePath);
-
-
-  }
-
-  // receive the file
-  async processGenericImport(fileTaskId: string): Promise<void> {
-
-  }
-}

apps/server/src/integrations/import/file.utils.ts

@@ -1,29 +0,0 @@
-export enum FileTaskType {
-  Import = 'import',
-  Export = 'export',
-}
-
-export enum FileImportType {
-  Generic = 'generic',
-  Notion = 'notion',
-  Confluence = 'confluence',
-}
-
-export enum FileTaskStatus {
-  Pending = 'pending',
-  Processing = 'processing',
-  Success = 'success',
-  Failed = 'failed',
-}
-
-export function getFileTaskFolderPath(
-  type: FileTaskType,
-  workspaceId: string,
-): string {
-  switch (type) {
-    case FileTaskType.Import:
-      return `${workspaceId}/imports`;
-    case FileTaskType.Export:
-      return `${workspaceId}/exports`;
-  }
-}

apps/server/src/integrations/import/import.controller.ts

@@ -83,57 +83,4 @@ export class ImportController {
 
     return this.importService.importPage(file, user.id, spaceId, workspace.id);
   }
-
-  @UseInterceptors(FileInterceptor)
-  @UseGuards(JwtAuthGuard)
-  @HttpCode(HttpStatus.OK)
-  // temporary naming
-  @Post('pages/import-zip')
-  async importZip(
-    @Req() req: any,
-    @AuthUser() user: User,
-    @AuthWorkspace() workspace: Workspace,
-  ) {
-    const validFileExtensions = ['.zip'];
-
-    const maxFileSize = bytes('100mb');
-
-    let file = null;
-    try {
-      file = await req.file({
-        limits: { fileSize: maxFileSize, fields: 3, files: 1 },
-      });
-    } catch (err: any) {
-      this.logger.error(err.message);
-      if (err?.statusCode === 413) {
-        throw new BadRequestException(
-          `File too large. Exceeds the 100mb import limit`,
-        );
-      }
-    }
-
-    if (!file) {
-      throw new BadRequestException('Failed to upload file');
-    }
-
-    if (
-      !validFileExtensions.includes(path.extname(file.filename).toLowerCase())
-    ) {
-      throw new BadRequestException('Invalid import file type.');
-    }
-
-    const spaceId = file.fields?.spaceId?.value;
-    const source = file.fields?.source?.value;
-
-    if (!spaceId) {
-      throw new BadRequestException('spaceId or format not found');
-    }
-
-    const ability = await this.spaceAbility.createForUser(user, spaceId);
-    if (ability.cannot(SpaceCaslAction.Edit, SpaceCaslSubject.Page)) {
-      throw new ForbiddenException();
-    }
-
-    return this.importService.importZip(file, source, user.id, spaceId, workspace.id);
-  }
 }

apps/server/src/integrations/import/import.module.ts

@@ -1,13 +1,9 @@
 import { Module } from '@nestjs/common';
 import { ImportService } from './import.service';
 import { ImportController } from './import.controller';
-import { StorageModule } from '../storage/storage.module';
-import { FileTaskService } from './file-task.service';
-import { FileTaskProcessor } from './processors/file-task.processor';
 
 @Module({
-  providers: [ImportService, FileTaskService, FileTaskProcessor],
+  providers: [ImportService],
   controllers: [ImportController],
-  imports: [StorageModule],
 })
 export class ImportModule {}

apps/server/src/integrations/import/import.service.ts

@@ -4,8 +4,7 @@ import { MultipartFile } from '@fastify/multipart';
 import { sanitize } from 'sanitize-filename-ts';
 import * as path from 'path';
 import {
-  htmlToJson,
-  jsonToText,
+  htmlToJson, jsonToText,
   tiptapExtensions,
 } from '../../collaboration/collaboration.util';
 import { InjectKysely } from 'nestjs-kysely';
@@ -14,17 +13,7 @@ import { generateSlugId } from '../../common/helpers';
 import { generateJitteredKeyBetween } from 'fractional-indexing-jittered';
 import { TiptapTransformer } from '@hocuspocus/transformer';
 import * as Y from 'yjs';
-import { markdownToHtml } from '@docmost/editor-ext';
-import {
-  FileTaskStatus,
-  FileTaskType,
-  getFileTaskFolderPath,
-} from './file.utils';
-import { v7 as uuid7 } from 'uuid';
-import { StorageService } from '../storage/storage.service';
-import { InjectQueue } from '@nestjs/bullmq';
-import { Queue } from 'bullmq';
-import { QueueJob, QueueName } from '../queue/constants';
+import { markdownToHtml } from "@docmost/editor-ext";
 
 @Injectable()
 export class ImportService {
@@ -32,10 +21,7 @@ export class ImportService {
 
   constructor(
     private readonly pageRepo: PageRepo,
-    private readonly storageService: StorageService,
     @InjectKysely() private readonly db: KyselyDB,
-    @InjectQueue(QueueName.FILE_TASK_QUEUE)
-    private readonly fileTaskQueue: Queue,
   ) {}
 
   async importPage(
@@ -175,56 +161,4 @@ export class ImportService {
       return generateJitteredKeyBetween(null, null);
     }
   }
-
-  async importZip(
-    filePromise: Promise<MultipartFile>,
-    source: string,
-    userId: string,
-    spaceId: string,
-    workspaceId: string,
-  ): Promise<void> {
-    const file = await filePromise;
-    const fileBuffer = await file.toBuffer();
-    const fileExtension = path.extname(file.filename).toLowerCase();
-    const fileName = sanitize(
-      path.basename(file.filename, fileExtension).slice(0, 255),
-    );
-
-    const fileTaskId = uuid7();
-    const filePath = `${getFileTaskFolderPath(FileTaskType.Import, workspaceId)}/${fileTaskId}/${fileName}`;
-
-    // upload file
-    await this.storageService.upload(filePath, fileBuffer);
-
-    // store in fileTasks table
-    await this.db
-      .insertInto('fileTasks')
-      .values({
-        id: fileTaskId,
-        type: FileTaskType.Import,
-        source: source,
-        status: FileTaskStatus.Pending,
-        fileName: fileName,
-        filePath: filePath,
-        fileSize: 0,
-        fileExt: 'zip',
-        creatorId: userId,
-        spaceId: spaceId,
-        workspaceId: workspaceId,
-      })
-      .execute();
-
-    // what to send to queue
-    // pass the task ID
-    await this.fileTaskQueue.add(QueueJob.IMPORT_TASK, {
-      fileTaskId: fileTaskId,
-    });
-    // return tasks info
-
-    // when the processor picks it up
-    // we change the status to processing
-    // if it gets processed successfully,
-    // we change the status to success
-    // else failed
-  }
 }

apps/server/src/integrations/import/processors/file-task.processor.ts

@@ -1,51 +0,0 @@
-import { Logger, OnModuleDestroy } from '@nestjs/common';
-import { OnWorkerEvent, Processor, WorkerHost } from '@nestjs/bullmq';
-import { Job } from 'bullmq';
-import { QueueJob, QueueName } from 'src/integrations/queue/constants';
-import { FileTaskService } from '../file-task.service';
-
-@Processor(QueueName.FILE_TASK_QUEUE)
-export class FileTaskProcessor extends WorkerHost implements OnModuleDestroy {
-  private readonly logger = new Logger(FileTaskProcessor.name);
-  constructor(private readonly fileTaskService: FileTaskService) {
-    super();
-  }
-
-  async process(job: Job<any, void>): Promise<void> {
-    try {
-      switch (job.name) {
-        case QueueJob.IMPORT_TASK:
-          console.log('import task', job.data.fileTaskId);
-          await this.fileTaskService.processZIpImport(job.data.fileTaskId);
-          break;
-        case QueueJob.EXPORT_TASK:
-          console.log('export task', job.data.fileTaskId);
-      }
-    } catch (err) {
-      throw err;
-    }
-  }
-
-  @OnWorkerEvent('active')
-  onActive(job: Job) {
-    this.logger.debug(`Processing ${job.name} job`);
-  }
-
-  @OnWorkerEvent('failed')
-  onError(job: Job) {
-    this.logger.error(
-      `Error processing ${job.name} job. Reason: ${job.failedReason}`,
-    );
-  }
-
-  @OnWorkerEvent('completed')
-  onCompleted(job: Job) {
-    this.logger.debug(`Completed ${job.name} job`);
-  }
-
-  async onModuleDestroy(): Promise<void> {
-    if (this.worker) {
-      await this.worker.close();
-    }
-  }
-}

apps/server/src/integrations/queue/constants/queue.constants.ts

@@ -3,7 +3,6 @@ export enum QueueName {
   ATTACHMENT_QUEUE = '{attachment-queue}',
   GENERAL_QUEUE = '{general-queue}',
   BILLING_QUEUE = '{billing-queue}',
-  FILE_TASK_QUEUE = '{file-task-queue}',
 }
 
 export enum QueueJob {
@@ -20,7 +19,4 @@ export enum QueueJob {
   TRIAL_ENDED = 'trial-ended',
   WELCOME_EMAIL = 'welcome-email',
   FIRST_PAYMENT_EMAIL = 'first-payment-email',
-
-  IMPORT_TASK = 'import-task',
-  EXPORT_TASK = 'export-task',
 }

apps/server/src/integrations/queue/queue.module.ts

@@ -49,9 +49,6 @@ import { BacklinksProcessor } from './processors/backlinks.processor';
     BullModule.registerQueue({
       name: QueueName.BILLING_QUEUE,
     }),
-    BullModule.registerQueue({
-      name: QueueName.FILE_TASK_QUEUE,
-    }),
   ],
   exports: [BullModule],
   providers: [BacklinksProcessor],

pnpm-lock.yaml

@@ -257,9 +257,6 @@ importers:
       file-saver:
         specifier: ^2.0.5
         version: 2.0.5
-      highlightjs-sap-abap:
-        specifier: ^0.3.0
-        version: 0.3.0
       i18next:
         specifier: ^23.14.0
         version: 23.14.0
@@ -5875,9 +5872,6 @@ packages:
     resolution: {integrity: sha512-SYVnVFswQER+zu1laSya563s+F8VDGt7o35d4utbamowvUNLLMovFqwCLSocpZTz3MgaSRA1IbqRWZv97dtErQ==}
     engines: {node: '>=12.0.0'}
 
-  highlightjs-sap-abap@0.3.0:
-    resolution: {integrity: sha512-nSiUvEOCycjtFA3pHaTowrbAAk5+lciBHyoVkDsd6FTRBtW9sT2dt42o2jAKbXjZVUidtacdk+j0Y2xnd233Mw==}
-
   hoist-non-react-statics@3.3.2:
     resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
 
@@ -15442,8 +15436,6 @@ snapshots:
 
   highlight.js@11.10.0: {}
 
-  highlightjs-sap-abap@0.3.0: {}
-
   hoist-non-react-statics@3.3.2:
     dependencies:
       react-is: 16.13.1