fix: fix create from template

undb-io · Aug 18, 2024 · 755f57f · 755f57f
1 parent 7b699f1
commit 755f57f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/packages/command-handlers/src/handlers/create-from-template.command-handler.ts b/packages/command-handlers/src/handlers/create-from-template.command-handler.ts
@@ -30,7 +30,7 @@ export class CreateFromTemplateCommandHandler implements ICommandHandler<CreateF
     }
 
     const targetSpaceId = command.targetSpaceId ?? mustGetCurrentSpaceId()
-    const duplicatedBase = await this.tableService.duplicateBase(base, targetSpaceId, {
+    const duplicatedBase = await this.tableService.duplicateBase(base, command.spaceId, targetSpaceId, {
       id: command.baseId,
       name: command.name,
       includeData: command.includeData,

diff --git a/packages/persistence/src/table/table.filter-visitor.ts b/packages/persistence/src/table/table.filter-visitor.ts
@@ -42,10 +42,10 @@ export class TableFilterVisitor extends AbstractQBVisitor<TableDo> implements IT
   constructor(
     private readonly qb: IQueryBuilder,
     protected readonly eb: ExpressionBuilder<Database, "undb_table" | "undb_table_id_mapping">,
-    ignoreSapce = false,
+    ignoreSpace = false,
   ) {
     super(eb)
-    if (!ignoreSapce) {
+    if (!ignoreSpace) {
       const spaceId = mustGetCurrentSpaceId()
       this.addCond(this.eb.eb("undb_table.space_id", "=", spaceId))
     }

diff --git a/packages/table/src/services/methods/duplicate-base.method.ts b/packages/table/src/services/methods/duplicate-base.method.ts
@@ -7,6 +7,7 @@ import type { TableService } from "../table.service"
 export async function duplicateBaseMethod(
   this: TableService,
   base: Base,
+  spaceId: ISpaceId,
   targetSpaceId: ISpaceId,
   dto: IDuplicateBaseDTO,
 ) {
@@ -21,7 +22,7 @@ export async function duplicateBaseMethod(
 
   await this.baseRepository.insert(duplicatedBase)
 
-  const tableSpec = and(new TableBaseIdSpecification(base.id.value), new TableSpaceIdSpecification(targetSpaceId))
+  const tableSpec = and(new TableBaseIdSpecification(base.id.value), new TableSpaceIdSpecification(spaceId))
   const tables = await this.repository.find(tableSpec, true)
   await this.duplicateTables(targetSpaceId, duplicatedBase, tables, dto.includeData)
 

diff --git a/packages/table/src/services/methods/duplicate-tables.method.ts b/packages/table/src/services/methods/duplicate-tables.method.ts
@@ -8,7 +8,7 @@ import type { TableService } from "../table.service"
 
 export async function duplicateTablesMethod(
   this: TableService,
-  spaceId: ISpaceId,
+  targetSpaceId: ISpaceId,
   base: Base,
   tables: TableDo[],
   includeData: boolean = false,
@@ -26,7 +26,7 @@ export async function duplicateTablesMethod(
       {
         tableId: idsMap.get(table.id.value)!,
         baseId: base.id.value,
-        spaceId,
+        spaceId: targetSpaceId,
         includeData,
       },
       [],

diff --git a/packages/table/src/services/table.service.ts b/packages/table/src/services/table.service.ts
@@ -55,7 +55,7 @@ export interface ITableService {
   createTableView(dto: ICreateTableViewDTO): Promise<TableDo>
 
   exportView(tableId: string, dto: IExportViewDTO): Promise<{ table: TableDo; records: IReadableRecordDTO[] }>
-  duplicateBase(base: Base, spaceId: ISpaceId, dto: IDuplicateBaseDTO): Promise<Base>
+  duplicateBase(base: Base, spaceId: ISpaceId, targetSpaceId: ISpaceId, dto: IDuplicateBaseDTO): Promise<Base>
   duplicateTables(spaceId: ISpaceId, base: Base, tables: TableDo[]): Promise<TableDo[]>
 }