From 00e8c53852ea952bf044b0e4aa59fc9be4f57225 Mon Sep 17 00:00:00 2001 From: Philipinho <16838612+Philipinho@users.noreply.github.com> Date: Tue, 21 Apr 2026 15:44:14 +0100 Subject: [PATCH] types --- .../server/src/database/types/custom.types.ts | 25 +++++++++++++++++++ .../server/src/database/types/db.interface.ts | 2 ++ apps/server/src/ee | 2 +- .../integrations/import/utils/file.utils.ts | 1 + 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 apps/server/src/database/types/custom.types.ts diff --git a/apps/server/src/database/types/custom.types.ts b/apps/server/src/database/types/custom.types.ts new file mode 100644 index 000000000..2f7acaef3 --- /dev/null +++ b/apps/server/src/database/types/custom.types.ts @@ -0,0 +1,25 @@ +import { Json, Timestamp, Generated } from '@docmost/db/types/db'; + +export interface ConfluenceApiImports { + id: Generated; + fileTaskId: string; + siteUrl: string; + authType: string; + authEmail: string | null; + authToken: string | null; + authUsername: string | null; + totalSpaces: Generated; + importedSpaces: Generated; + totalPages: Generated; + importedPages: Generated; + totalUsers: Generated; + importedUsers: Generated; + idMapping: Generated; + warnings: Generated; + currentPhase: string | null; + cancelled: Generated; + workspaceId: string; + creatorId: string | null; + createdAt: Generated; + updatedAt: Generated; +} diff --git a/apps/server/src/database/types/db.interface.ts b/apps/server/src/database/types/db.interface.ts index be66fd8c0..898f33f94 100644 --- a/apps/server/src/database/types/db.interface.ts +++ b/apps/server/src/database/types/db.interface.ts @@ -1,6 +1,8 @@ import { DB } from '@docmost/db/types/db'; import { PageEmbeddings } from '@docmost/db/types/embeddings.types'; +import { ConfluenceApiImports } from './custom.types'; export interface DbInterface extends DB { pageEmbeddings: PageEmbeddings; + confluenceApiImports: ConfluenceApiImports; } diff --git a/apps/server/src/ee b/apps/server/src/ee index e703b8bf4..7d1b155d5 160000 --- a/apps/server/src/ee +++ b/apps/server/src/ee @@ -1 +1 @@ -Subproject commit e703b8bf47c0d880a1b6acd2b4216167d8e67ff3 +Subproject commit 7d1b155d5f8651c6297d08b200ca8b85502a827a diff --git a/apps/server/src/integrations/import/utils/file.utils.ts b/apps/server/src/integrations/import/utils/file.utils.ts index 0b27554be..8ea6ed61b 100644 --- a/apps/server/src/integrations/import/utils/file.utils.ts +++ b/apps/server/src/integrations/import/utils/file.utils.ts @@ -11,6 +11,7 @@ export enum FileImportSource { Generic = 'generic', Notion = 'notion', Confluence = 'confluence', + ConfluenceApi = 'confluence-api' } export enum FileTaskStatus {