n8n 2.7.3 → 2.8.0

package/dist/modules/source-control.ee/source-control-helper.ee.js

@@ -40,11 +40,13 @@ exports.stringContainsExpression = stringContainsExpression;
 exports.getWorkflowExportPath = getWorkflowExportPath;
 exports.getProjectExportPath = getProjectExportPath;
 exports.getCredentialExportPath = getCredentialExportPath;
+exports.getDataTableExportPath = getDataTableExportPath;
 exports.getVariablesPath = getVariablesPath;
 exports.getTagsPath = getTagsPath;
 exports.getFoldersPath = getFoldersPath;
 exports.readTagAndMappingsFromSourceControlFile = readTagAndMappingsFromSourceControlFile;
 exports.readFoldersFromSourceControlFile = readFoldersFromSourceControlFile;
+exports.readDataTablesFromSourceControlFile = readDataTablesFromSourceControlFile;
 exports.sourceControlFoldersExistCheck = sourceControlFoldersExistCheck;
 exports.isSourceControlLicensed = isSourceControlLicensed;
 exports.generateSshKeyPair = generateSshKeyPair;
@@ -55,6 +57,9 @@ exports.getTrackingInformationFromPostPushResult = getTrackingInformationFromPos
 exports.normalizeAndValidateSourceControlledFilePath = normalizeAndValidateSourceControlledFilePath;
 exports.hasOwnerChanged = hasOwnerChanged;
 exports.isWorkflowModified = isWorkflowModified;
+exports.isDataTableModified = isDataTableModified;
+exports.isValidDataTableColumnType = isValidDataTableColumnType;
+exports.areSameCredentials = areSameCredentials;
 const backend_common_1 = require("@n8n/backend-common");
 const di_1 = require("@n8n/di");
 const crypto_1 = require("crypto");
@@ -77,6 +82,9 @@ function getProjectExportPath(projectId, projectExportFolder) {
 function getCredentialExportPath(credentialId, credentialExportFolder) {
     return (0, backend_common_1.safeJoinPath)(credentialExportFolder, `${credentialId}.json`);
 }
+function getDataTableExportPath(dataTableId, dataTableExportFolder) {
+    return (0, backend_common_1.safeJoinPath)(dataTableExportFolder, `${dataTableId}.json`);
+}
 function getVariablesPath(gitFolder) {
     return (0, backend_common_1.safeJoinPath)(gitFolder, constants_1.SOURCE_CONTROL_VARIABLES_EXPORT_FILE);
 }
@@ -97,6 +105,12 @@ async function readTagAndMappingsFromSourceControlFile(file) {
         throw error;
     }
 }
+function isErrnoException(error) {
+    return (typeof error === 'object' &&
+        error !== null &&
+        'code' in error &&
+        typeof error.code === 'string');
+}
 async function readFoldersFromSourceControlFile(file) {
     try {
         return (0, n8n_workflow_1.jsonParse)(await (0, promises_1.readFile)(file, { encoding: 'utf8' }), {
@@ -104,12 +118,25 @@ async function readFoldersFromSourceControlFile(file) {
         });
     }
     catch (error) {
-        if (error.code === 'ENOENT') {
+        if (isErrnoException(error) && error.code === 'ENOENT') {
             return { folders: [] };
         }
         throw error;
     }
 }
+async function readDataTablesFromSourceControlFile(file) {
+    try {
+        return (0, n8n_workflow_1.jsonParse)(await (0, promises_1.readFile)(file, { encoding: 'utf8' }), {
+            fallbackValue: [],
+        });
+    }
+    catch (error) {
+        if (isErrnoException(error) && error.code === 'ENOENT') {
+            return [];
+        }
+        throw error;
+    }
+}
 function sourceControlFoldersExistCheck(folders, createIfNotExists = true) {
     let existed = true;
     folders.forEach((folder) => {
@@ -183,9 +210,12 @@ function getRepoType(repoUrl) {
     return 'other';
 }
 function filterSourceControlledFilesUniqueIds(files) {
-    return (files.filter((file, index, self) => {
+    if (!files || !Array.isArray(files)) {
+        return [];
+    }
+    return files.filter((file, index, self) => {
         return self.findIndex((f) => f.id === file.id) === index;
-    }) || []);
+    });
 }
 function getTrackingInformationFromPullResult(userId, result) {
     const uniques = filterSourceControlledFilesUniqueIds(result);
@@ -228,10 +258,23 @@ function normalizeAndValidateSourceControlledFilePath(gitFolderPath, filePath) {
     return normalizedPath;
 }
 function hasOwnerChanged(owner1, owner2) {
-    if (owner1?.type !== 'team' && owner2?.type !== 'team') {
+    if (!owner1 || !owner2) {
+        const existingOwner = owner1 || owner2;
+        if (!existingOwner)
+            return false;
+        if (typeof existingOwner === 'string')
+            return false;
+        return existingOwner.type === 'team';
+    }
+    if (typeof owner1 === 'string') {
+        return false;
+    }
+    if (owner1.type !== 'team' && owner2.type !== 'team') {
         return false;
     }
-    return owner1?.projectId !== owner2?.projectId;
+    const owner1TeamId = 'teamId' in owner1 ? owner1.teamId : owner1.projectId;
+    const owner2TeamId = 'teamId' in owner2 ? owner2.teamId : owner2.projectId;
+    return owner1TeamId !== owner2TeamId;
 }
 function isWorkflowModified(local, remote) {
     const hasVersionIdChanged = remote.versionId !== local.versionId;
@@ -239,4 +282,37 @@ function isWorkflowModified(local, remote) {
     const ownerChanged = hasOwnerChanged(remote.owner, local.owner);
     return hasVersionIdChanged || hasParentFolderIdChanged || ownerChanged;
 }
+function areDataTableColumnsEqual(localColumns, remoteColumns) {
+    if (localColumns.length !== remoteColumns.length) {
+        return false;
+    }
+    const sortedLocal = [...localColumns].sort((a, b) => a.id.localeCompare(b.id));
+    const sortedRemote = [...remoteColumns].sort((a, b) => a.id.localeCompare(b.id));
+    return sortedLocal.every((localCol, idx) => {
+        const remoteCol = sortedRemote[idx];
+        return (localCol.id === remoteCol.id &&
+            localCol.name === remoteCol.name &&
+            localCol.type === remoteCol.type &&
+            localCol.index === remoteCol.index);
+    });
+}
+function isDataTableModified(localDt, remoteDt) {
+    if (localDt.name !== remoteDt.name) {
+        return true;
+    }
+    const ownerChanged = hasOwnerChanged(remoteDt.ownedBy, localDt.ownedBy);
+    if (ownerChanged) {
+        return true;
+    }
+    return !areDataTableColumnsEqual(localDt.columns, remoteDt.columns);
+}
+function isValidDataTableColumnType(type) {
+    return ['string', 'number', 'boolean', 'date'].includes(type);
+}
+function areSameCredentials(credA, credB) {
+    return (credA.name === credB.name &&
+        credA.type === credB.type &&
+        !hasOwnerChanged(credA.ownedBy, credB.ownedBy) &&
+        Boolean(credA.isGlobal) === Boolean(credB.isGlobal));
+}
 //# sourceMappingURL=source-control-helper.ee.js.map

package/dist/modules/source-control.ee/source-control-helper.ee.js.map

@@ -1 +1 @@
-{"version":3,"file":"source-control-helper.ee.js","sourceRoot":"","sources":["../../../src/modules/source-control.ee/source-control-helper.ee.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"source-control-helper.ee.js","sourceRoot":"","sources":["../../../src/modules/source-control.ee/source-control-helper.ee.ts"],"names":[],"mappings":"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"}

package/dist/modules/source-control.ee/source-control-import.service.ee.d.ts

@@ -2,6 +2,9 @@ import type { SourceControlledFile } from '@n8n/api-types';
 import { Logger } from '@n8n/backend-common';
 import type { TagEntity, User, Variables } from '@n8n/db';
 import { CredentialsRepository, FolderRepository, ProjectRelationRepository, ProjectRepository, SharedCredentialsRepository, SharedWorkflowRepository, TagRepository, UserRepository, VariablesRepository, WorkflowRepository, WorkflowTagMapping, WorkflowTagMappingRepository } from '@n8n/db';
+import { DataTableRepository } from '../../modules/data-table/data-table.repository';
+import { DataTableColumnRepository } from '../../modules/data-table/data-table-column.repository';
+import { DataTableDDLService } from '../../modules/data-table/data-table-ddl.service';
 import { ErrorReporter, InstanceSettings } from 'n8n-core';
 import { type AutoPublishMode } from 'n8n-workflow';
 import { CredentialsService } from '../../credentials/credentials.service';
@@ -10,6 +13,7 @@ import { WorkflowHistoryService } from '../../workflows/workflow-history/workflo
 import { WorkflowService } from '../../workflows/workflow.service';
 import { SourceControlScopedService } from './source-control-scoped.service';
 import type { StatusExportableCredential } from './types/exportable-credential';
+import type { ExportableDataTable, StatusExportableDataTable } from './types/exportable-data-table';
 import type { ExportableFolder } from './types/exportable-folders';
 import type { ExportableProjectWithFileName } from './types/exportable-project';
 import type { ExportableTags } from './types/exportable-tags';
@@ -37,11 +41,15 @@ export declare class SourceControlImportService {
     private readonly folderRepository;
     private readonly sourceControlScopedService;
     private readonly workflowHistoryService;
+    private readonly dataTableRepository;
+    private readonly dataTableColumnRepository;
+    private readonly dataTableDDLService;
     private gitFolder;
     private workflowExportFolder;
     private credentialExportFolder;
     private projectExportFolder;
-    constructor(logger: Logger, errorReporter: ErrorReporter, variablesService: VariablesService, credentialsRepository: CredentialsRepository, projectRepository: ProjectRepository, projectRelationRepository: ProjectRelationRepository, tagRepository: TagRepository, sharedWorkflowRepository: SharedWorkflowRepository, sharedCredentialsRepository: SharedCredentialsRepository, userRepository: UserRepository, variablesRepository: VariablesRepository, workflowRepository: WorkflowRepository, workflowTagMappingRepository: WorkflowTagMappingRepository, workflowService: WorkflowService, credentialsService: CredentialsService, tagService: TagService, folderRepository: FolderRepository, instanceSettings: InstanceSettings, sourceControlScopedService: SourceControlScopedService, workflowHistoryService: WorkflowHistoryService);
+    private dataTableExportFolder;
+    constructor(logger: Logger, errorReporter: ErrorReporter, variablesService: VariablesService, credentialsRepository: CredentialsRepository, projectRepository: ProjectRepository, projectRelationRepository: ProjectRelationRepository, tagRepository: TagRepository, sharedWorkflowRepository: SharedWorkflowRepository, sharedCredentialsRepository: SharedCredentialsRepository, userRepository: UserRepository, variablesRepository: VariablesRepository, workflowRepository: WorkflowRepository, workflowTagMappingRepository: WorkflowTagMappingRepository, workflowService: WorkflowService, credentialsService: CredentialsService, tagService: TagService, folderRepository: FolderRepository, instanceSettings: InstanceSettings, sourceControlScopedService: SourceControlScopedService, workflowHistoryService: WorkflowHistoryService, dataTableRepository: DataTableRepository, dataTableColumnRepository: DataTableColumnRepository, dataTableDDLService: DataTableDDLService);
     getRemoteVersionIdsFromFiles(context: SourceControlContext): Promise<SourceControlWorkflowVersionId[]>;
     getAllLocalVersionIdsFromDb(): Promise<SourceControlWorkflowVersionId[]>;
     getLocalVersionIdsFromDb(context: SourceControlContext): Promise<SourceControlWorkflowVersionId[]>;
@@ -49,6 +57,8 @@ export declare class SourceControlImportService {
     getLocalCredentialsFromDb(context: SourceControlContext): Promise<StatusExportableCredential[]>;
     getRemoteVariablesFromFile(): Promise<ExportableVariable[]>;
     getLocalGlobalVariablesFromDb(): Promise<Variables[]>;
+    getRemoteDataTablesFromFiles(): Promise<ExportableDataTable[]>;
+    getLocalDataTablesFromDb(): Promise<StatusExportableDataTable[]>;
     getRemoteFoldersAndMappingsFromFile(context: SourceControlContext): Promise<{
         folders: ExportableFolder[];
     }>;
@@ -93,6 +103,9 @@ export declare class SourceControlImportService {
     }): Promise<{
         imported: string[];
     } | undefined>;
+    importDataTablesFromWorkFolder(candidates: SourceControlledFile[], userId: string): Promise<{
+        imported: string[];
+    } | undefined>;
     importTeamProjectsFromWorkFolder(candidates: SourceControlledFile[], pullingUserId: string): Promise<{
         id: string;
         name: string;
@@ -100,6 +113,7 @@ export declare class SourceControlImportService {
     deleteWorkflowsNotInWorkfolder(user: User, candidates: SourceControlledFile[]): Promise<void>;
     deleteCredentialsNotInWorkfolder(user: User, candidates: SourceControlledFile[]): Promise<void>;
     deleteVariablesNotInWorkfolder(candidates: SourceControlledFile[]): Promise<void>;
+    deleteDataTablesNotInWorkFolder(candidates: SourceControlledFile[]): Promise<void>;
     deleteTagsNotInWorkfolder(candidates: SourceControlledFile[]): Promise<void>;
     deleteFoldersNotInWorkfolder(candidates: SourceControlledFile[]): Promise<void>;
     deleteTeamProjectsNotInWorkfolder(candidates: SourceControlledFile[]): Promise<void>;

package/dist/modules/source-control.ee/source-control-import.service.ee.js

@@ -15,6 +15,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceControlImportService = void 0;
 const backend_common_1 = require("@n8n/backend-common");
 const db_1 = require("@n8n/db");
+const data_table_repository_1 = require("../../modules/data-table/data-table.repository");
+const data_table_column_repository_1 = require("../../modules/data-table/data-table-column.repository");
+const data_table_column_entity_1 = require("../../modules/data-table/data-table-column.entity");
+const data_table_ddl_service_1 = require("../../modules/data-table/data-table-ddl.service");
 const di_1 = require("@n8n/di");
 const permissions_1 = require("@n8n/permissions");
 const typeorm_1 = require("@n8n/typeorm");
@@ -68,7 +72,7 @@ const getOwnerFromProject = (remoteOwnerProject) => {
     return owner;
 };
 let SourceControlImportService = class SourceControlImportService {
-    constructor(logger, errorReporter, variablesService, credentialsRepository, projectRepository, projectRelationRepository, tagRepository, sharedWorkflowRepository, sharedCredentialsRepository, userRepository, variablesRepository, workflowRepository, workflowTagMappingRepository, workflowService, credentialsService, tagService, folderRepository, instanceSettings, sourceControlScopedService, workflowHistoryService) {
+    constructor(logger, errorReporter, variablesService, credentialsRepository, projectRepository, projectRelationRepository, tagRepository, sharedWorkflowRepository, sharedCredentialsRepository, userRepository, variablesRepository, workflowRepository, workflowTagMappingRepository, workflowService, credentialsService, tagService, folderRepository, instanceSettings, sourceControlScopedService, workflowHistoryService, dataTableRepository, dataTableColumnRepository, dataTableDDLService) {
         this.logger = logger;
         this.errorReporter = errorReporter;
         this.variablesService = variablesService;
@@ -88,10 +92,14 @@ let SourceControlImportService = class SourceControlImportService {
         this.folderRepository = folderRepository;
         this.sourceControlScopedService = sourceControlScopedService;
         this.workflowHistoryService = workflowHistoryService;
+        this.dataTableRepository = dataTableRepository;
+        this.dataTableColumnRepository = dataTableColumnRepository;
+        this.dataTableDDLService = dataTableDDLService;
         this.gitFolder = path_1.default.join(instanceSettings.n8nFolder, constants_1.SOURCE_CONTROL_GIT_FOLDER);
         this.workflowExportFolder = path_1.default.join(this.gitFolder, constants_1.SOURCE_CONTROL_WORKFLOW_EXPORT_FOLDER);
         this.credentialExportFolder = path_1.default.join(this.gitFolder, constants_1.SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER);
         this.projectExportFolder = path_1.default.join(this.gitFolder, constants_1.SOURCE_CONTROL_PROJECT_EXPORT_FOLDER);
+        this.dataTableExportFolder = path_1.default.join(this.gitFolder, constants_1.SOURCE_CONTROL_DATATABLES_EXPORT_FOLDER);
     }
     async getRemoteVersionIdsFromFiles(context) {
         const remoteWorkflowFiles = await (0, fast_glob_1.default)('*.json', {
@@ -333,6 +341,81 @@ let SourceControlImportService = class SourceControlImportService {
     async getLocalGlobalVariablesFromDb() {
         return await this.variablesService.getAllCached({ globalOnly: true });
     }
+    async getRemoteDataTablesFromFiles() {
+        const dataTableFiles = await (0, fast_glob_1.default)('*.json', {
+            cwd: this.dataTableExportFolder,
+            absolute: true,
+        });
+        if (dataTableFiles.length === 0) {
+            return [];
+        }
+        const remoteTables = await Promise.all(dataTableFiles.map(async (file) => {
+            this.logger.debug(`Parsing data table file ${file}`);
+            const fileContent = await (0, promises_1.readFile)(file, { encoding: 'utf8' });
+            try {
+                return (0, n8n_workflow_2.jsonParse)(fileContent);
+            }
+            catch (error) {
+                this.logger.warn(`Failed to parse data table from file ${file}: invalid JSON format`);
+                return undefined;
+            }
+        }));
+        return remoteTables.filter((table) => !!table);
+    }
+    async getLocalDataTablesFromDb() {
+        try {
+            const dataTables = await this.dataTableRepository.find({
+                relations: [
+                    'columns',
+                    'project',
+                    'project.projectRelations',
+                    'project.projectRelations.role',
+                ],
+            });
+            return dataTables.map((table) => {
+                let ownedBy = null;
+                if (table.project?.type === 'personal') {
+                    const ownerRelation = table.project.projectRelations?.find((pr) => pr.role.slug === permissions_1.PROJECT_OWNER_ROLE_SLUG);
+                    if (ownerRelation) {
+                        ownedBy = {
+                            type: 'personal',
+                            projectId: table.project.id,
+                            projectName: table.project.name,
+                        };
+                    }
+                }
+                else if (table.project?.type === 'team') {
+                    ownedBy = {
+                        type: 'team',
+                        projectId: table.project.id,
+                        projectName: table.project.name,
+                    };
+                }
+                return {
+                    id: table.id,
+                    name: table.name,
+                    columns: (table.columns || [])
+                        .sort((a, b) => a.index - b.index)
+                        .map((col) => ({
+                        id: col.id,
+                        name: col.name,
+                        type: col.type,
+                        index: col.index,
+                    })),
+                    ownedBy,
+                    filename: (0, source_control_helper_ee_1.getDataTableExportPath)(table.id, this.dataTableExportFolder),
+                    createdAt: table.createdAt.toISOString(),
+                    updatedAt: table.updatedAt.toISOString(),
+                };
+            });
+        }
+        catch (error) {
+            if (error instanceof Error && error.message.includes('No metadata for "DataTable"')) {
+                return [];
+            }
+            throw error;
+        }
+    }
     async getRemoteFoldersAndMappingsFromFile(context) {
         const foldersFile = await (0, fast_glob_1.default)(constants_1.SOURCE_CONTROL_FOLDERS_EXPORT_FILE, {
             cwd: this.gitFolder,
@@ -801,6 +884,118 @@ let SourceControlImportService = class SourceControlImportService {
         }
         return await this.importVariables(importedVariables, valueOverrides);
     }
+    async importDataTablesFromWorkFolder(candidates, userId) {
+        if (candidates.length === 0) {
+            return;
+        }
+        const dbType = this.dataTableRepository.manager.connection.options.type;
+        const pullingUserPersonalProject = await this.projectRepository.getPersonalProjectForUserOrFail(userId);
+        const result = { imported: [] };
+        for (const candidate of candidates) {
+            try {
+                this.logger.debug(`Importing data table from file ${candidate.file}`);
+                const dataTable = (0, n8n_workflow_2.jsonParse)(await (0, promises_1.readFile)(candidate.file, { encoding: 'utf8' }));
+                if (!dataTable || typeof dataTable !== 'object' || !dataTable.id || !dataTable.name) {
+                    this.logger.warn(`Failed to parse data table from file ${candidate.file}`);
+                    continue;
+                }
+                let targetProject = null;
+                if (dataTable.ownedBy) {
+                    if (dataTable.ownedBy.type === 'personal') {
+                        const personalEmail = dataTable.ownedBy.personalEmail;
+                        if (personalEmail) {
+                            const user = await this.userRepository.findOne({ where: { email: personalEmail } });
+                            if (user) {
+                                targetProject = await this.projectRepository.getPersonalProjectForUserOrFail(user.id);
+                            }
+                            else {
+                                this.logger.debug(`User ${personalEmail} not found locally for data table ${dataTable.name}. Using pulling user's personal project as fallback.`);
+                                targetProject = pullingUserPersonalProject;
+                            }
+                        }
+                    }
+                    else if (dataTable.ownedBy.type === 'team') {
+                        targetProject = await this.projectRepository.findOne({
+                            where: { id: dataTable.ownedBy.teamId },
+                        });
+                        if (!targetProject) {
+                            targetProject = await this.createTeamProject({
+                                type: 'team',
+                                teamId: dataTable.ownedBy.teamId,
+                                teamName: dataTable.ownedBy.teamName,
+                            });
+                        }
+                    }
+                }
+                if (!targetProject) {
+                    this.logger.debug(`No owner specified for data table ${dataTable.name}. Using pulling user's personal project.`);
+                    targetProject = pullingUserPersonalProject;
+                }
+                const targetProjectId = targetProject.id;
+                const existingDataTable = await this.dataTableRepository.findOne({
+                    where: { id: dataTable.id },
+                    relations: ['columns'],
+                });
+                const isNewTable = !existingDataTable;
+                await this.dataTableRepository.upsert({
+                    id: dataTable.id,
+                    name: dataTable.name,
+                    projectId: targetProjectId,
+                    createdAt: dataTable.createdAt,
+                    updatedAt: dataTable.updatedAt,
+                }, ['id']);
+                const existingColumns = await this.dataTableColumnRepository.find({
+                    where: { dataTable: { id: dataTable.id } },
+                    select: ['id', 'name'],
+                });
+                const existingColumnIds = new Set(existingColumns.map((c) => c.id));
+                const existingColumnNameMap = new Map(existingColumns.map((c) => [c.id, c.name]));
+                const importedColumnIds = new Set(dataTable.columns.map((c) => c.id));
+                await this.dataTableRepository.manager.transaction(async (trx) => {
+                    const columnsToDelete = Array.from(existingColumnIds).filter((id) => !importedColumnIds.has(id));
+                    if (columnsToDelete.length > 0) {
+                        if (!isNewTable) {
+                            for (const columnId of columnsToDelete) {
+                                const columnName = existingColumnNameMap.get(columnId);
+                                if (columnName) {
+                                    await this.dataTableDDLService.dropColumnFromTable(dataTable.id, columnName, dbType, trx);
+                                }
+                            }
+                        }
+                        await trx.delete(data_table_column_entity_1.DataTableColumn, { id: (0, typeorm_1.In)(columnsToDelete) });
+                    }
+                    const columnEntities = [];
+                    for (const column of dataTable.columns) {
+                        if (!(0, source_control_helper_ee_1.isValidDataTableColumnType)(column.type)) {
+                            this.logger.warn(`Invalid column type "${column.type}" in data table ${dataTable.name}, column ${column.name}. Skipping column.`);
+                            continue;
+                        }
+                        const columnEntity = await trx.save(data_table_column_entity_1.DataTableColumn, {
+                            id: column.id,
+                            name: column.name,
+                            type: column.type,
+                            index: column.index,
+                            dataTable: { id: dataTable.id },
+                        });
+                        columnEntities.push(columnEntity);
+                        if (!isNewTable && !existingColumnIds.has(column.id)) {
+                            await this.dataTableDDLService.addColumn(dataTable.id, columnEntity, dbType, trx);
+                        }
+                    }
+                    if (isNewTable) {
+                        await this.dataTableDDLService.createTableWithColumns(dataTable.id, columnEntities, trx);
+                    }
+                });
+                result.imported.push(dataTable.name);
+            }
+            catch (error) {
+                this.logger.error(`Failed to import data table ${candidate.name}`, {
+                    error: (0, n8n_workflow_2.ensureError)(error),
+                });
+            }
+        }
+        return result;
+    }
     async importTeamProjectsFromWorkFolder(candidates, pullingUserId) {
         const importResults = [];
         const existingProjectVariables = (await this.variablesService.getAllCached()).filter((v) => v.project);
@@ -869,6 +1064,14 @@ let SourceControlImportService = class SourceControlImportService {
             await this.variablesService.delete(candidate.id);
         }
     }
+    async deleteDataTablesNotInWorkFolder(candidates) {
+        if (candidates.length === 0) {
+            return;
+        }
+        for (const candidate of candidates) {
+            await this.dataTableRepository.deleteDataTable(candidate.id);
+        }
+    }
     async deleteTagsNotInWorkfolder(candidates) {
         for (const candidate of candidates) {
             await this.tagService.delete(candidate.id);
@@ -956,7 +1159,7 @@ let SourceControlImportService = class SourceControlImportService {
             const nodesChanged = !(0, isEqual_1.default)(existingVersion.nodes, nodes);
             const connectionsChanged = !(0, isEqual_1.default)(existingVersion.connections, connections);
             if (nodesChanged || connectionsChanged) {
-                await this.workflowHistoryService.updateVersion(versionId, id, {
+                await this.workflowHistoryService.updateVersion(id, versionId, {
                     nodes,
                     connections,
                     authors,
@@ -1018,6 +1221,9 @@ exports.SourceControlImportService = SourceControlImportService = __decorate([
         db_1.FolderRepository,
         n8n_core_1.InstanceSettings,
         source_control_scoped_service_1.SourceControlScopedService,
-        workflow_history_service_1.WorkflowHistoryService])
+        workflow_history_service_1.WorkflowHistoryService,
+        data_table_repository_1.DataTableRepository,
+        data_table_column_repository_1.DataTableColumnRepository,
+        data_table_ddl_service_1.DataTableDDLService])
 ], SourceControlImportService);
 //# sourceMappingURL=source-control-import.service.ee.js.map