n8n 1.113.0 → 1.113.2

package/dist/environments.ee/source-control/source-control.service.ee.d.ts

@@ -1,20 +1,18 @@
-import { IWorkflowToImport } from '../../interfaces';
 import type { PullWorkFolderRequestDto, PushWorkFolderRequestDto, SourceControlledFile } from '@n8n/api-types';
 import { Logger } from '@n8n/backend-common';
-import { type Variables, type TagEntity, FolderRepository, TagRepository, type User } from '@n8n/db';
+import { type User } from '@n8n/db';
 import type { PushResult } from 'simple-git';
 import { SourceControlExportService } from './source-control-export.service.ee';
 import { SourceControlGitService } from './source-control-git.service.ee';
 import { SourceControlImportService } from './source-control-import.service.ee';
 import { SourceControlPreferencesService } from './source-control-preferences.service.ee';
+import { SourceControlStatusService } from './source-control-status.service.ee';
 import { SourceControlScopedService } from './source-control-scoped.service';
-import type { StatusExportableCredential } from './types/exportable-credential';
-import type { ExportableFolder } from './types/exportable-folders';
 import type { ImportResult } from './types/import-result';
 import type { SourceControlGetStatus } from './types/source-control-get-status';
 import type { SourceControlPreferences } from './types/source-control-preferences';
-import type { SourceControlWorkflowVersionId } from './types/source-control-workflow-version-id';
 import { EventService } from '../../events/event.service';
+import { IWorkflowToImport } from '../../interfaces';
 export declare class SourceControlService {
     private readonly logger;
     private gitService;
@@ -22,13 +20,12 @@ export declare class SourceControlService {
     private sourceControlExportService;
     private sourceControlImportService;
     private sourceControlScopedService;
-    private tagRepository;
-    private folderRepository;
     private readonly eventService;
+    private readonly sourceControlStatusService;
     private sshKeyName;
     private sshFolder;
     private gitFolder;
-    constructor(logger: Logger, gitService: SourceControlGitService, sourceControlPreferencesService: SourceControlPreferencesService, sourceControlExportService: SourceControlExportService, sourceControlImportService: SourceControlImportService, sourceControlScopedService: SourceControlScopedService, tagRepository: TagRepository, folderRepository: FolderRepository, eventService: EventService);
+    constructor(logger: Logger, gitService: SourceControlGitService, sourceControlPreferencesService: SourceControlPreferencesService, sourceControlExportService: SourceControlExportService, sourceControlImportService: SourceControlImportService, sourceControlScopedService: SourceControlScopedService, eventService: EventService, sourceControlStatusService: SourceControlStatusService);
     init(): Promise<void>;
     private initGitService;
     sanityCheck(): Promise<void>;
@@ -54,16 +51,6 @@ export declare class SourceControlService {
         statusResult: SourceControlledFile[];
     }>;
     private getConflicts;
-    private getWorkflowsToImport;
-    private getWorkflowsToDelete;
-    private getCredentialsToImport;
-    private getCredentialsToDelete;
-    private getTagsToImport;
-    private getTagsToDelete;
-    private getVariablesToImport;
-    private getFoldersToImport;
-    private getFoldersToDelete;
-    private getVariablesToDelete;
     pullWorkfolder(user: User, options: PullWorkFolderRequestDto): Promise<{
         statusCode: number;
         statusResult: SourceControlledFile[];
@@ -84,25 +71,25 @@ export declare class SourceControlService {
             projectName: string;
         } | undefined;
     }[] | {
-        wfRemoteVersionIds: SourceControlWorkflowVersionId[];
-        wfLocalVersionIds: SourceControlWorkflowVersionId[];
-        wfMissingInLocal: SourceControlWorkflowVersionId[];
-        wfMissingInRemote: SourceControlWorkflowVersionId[];
-        wfModifiedInEither: SourceControlWorkflowVersionId[];
-        credMissingInLocal: StatusExportableCredential[];
-        credMissingInRemote: StatusExportableCredential[];
-        credModifiedInEither: StatusExportableCredential[];
-        varMissingInLocal: Variables[];
-        varMissingInRemote: Variables[];
-        varModifiedInEither: Variables[];
-        tagsMissingInLocal: TagEntity[];
-        tagsMissingInRemote: TagEntity[];
-        tagsModifiedInEither: TagEntity[];
+        wfRemoteVersionIds: import("./types/source-control-workflow-version-id").SourceControlWorkflowVersionId[];
+        wfLocalVersionIds: import("./types/source-control-workflow-version-id").SourceControlWorkflowVersionId[];
+        wfMissingInLocal: import("./types/source-control-workflow-version-id").SourceControlWorkflowVersionId[];
+        wfMissingInRemote: import("./types/source-control-workflow-version-id").SourceControlWorkflowVersionId[];
+        wfModifiedInEither: import("./types/source-control-workflow-version-id").SourceControlWorkflowVersionId[];
+        credMissingInLocal: import("./types/exportable-credential").StatusExportableCredential[];
+        credMissingInRemote: import("./types/exportable-credential").StatusExportableCredential[];
+        credModifiedInEither: import("./types/exportable-credential").StatusExportableCredential[];
+        varMissingInLocal: import("@n8n/db").Variables[];
+        varMissingInRemote: import("@n8n/db").Variables[];
+        varModifiedInEither: import("@n8n/db").Variables[];
+        tagsMissingInLocal: import("@n8n/db").TagEntity[];
+        tagsMissingInRemote: import("@n8n/db").TagEntity[];
+        tagsModifiedInEither: import("@n8n/db").TagEntity[];
         mappingsMissingInLocal: import("@n8n/db").WorkflowTagMapping[];
         mappingsMissingInRemote: import("@n8n/db").WorkflowTagMapping[];
-        foldersMissingInLocal: ExportableFolder[];
-        foldersMissingInRemote: ExportableFolder[];
-        foldersModifiedInEither: ExportableFolder[];
+        foldersMissingInLocal: import("./types/exportable-folders").ExportableFolder[];
+        foldersMissingInRemote: import("./types/exportable-folders").ExportableFolder[];
+        foldersModifiedInEither: import("./types/exportable-folders").ExportableFolder[];
         sourceControlledFiles: {
             type: "workflow" | "credential" | "file" | "tags" | "variables" | "folders";
             status: "unknown" | "new" | "modified" | "deleted" | "created" | "renamed" | "conflicted" | "ignored" | "staged";
@@ -120,11 +107,6 @@ export declare class SourceControlService {
             } | undefined;
         }[];
     }>;
-    private getStatusWorkflows;
-    private getStatusCredentials;
-    private getStatusVariables;
-    private getStatusTagsMappings;
-    private getStatusFoldersMapping;
     setGitUserDetails(name?: string, email?: string): Promise<void>;
     getRemoteFileEntity({ user, type, id, commit, }: {
         user: User;

package/dist/environments.ee/source-control/source-control.service.ee.js

@@ -14,9 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceControlService = void 0;
 const backend_common_1 = require("@n8n/backend-common");
-const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
-const permissions_1 = require("@n8n/permissions");
 const fs_1 = require("fs");
 const n8n_workflow_1 = require("n8n-workflow");
 const path_1 = __importDefault(require("path"));
@@ -26,22 +24,23 @@ const source_control_git_service_ee_1 = require("./source-control-git.service.ee
 const source_control_helper_ee_1 = require("./source-control-helper.ee");
 const source_control_import_service_ee_1 = require("./source-control-import.service.ee");
 const source_control_preferences_service_ee_1 = require("./source-control-preferences.service.ee");
+const source_control_status_service_ee_1 = require("./source-control-status.service.ee");
 const source_control_scoped_service_1 = require("./source-control-scoped.service");
 const source_control_context_1 = require("./types/source-control-context");
 const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
 const forbidden_error_1 = require("../../errors/response-errors/forbidden.error");
 const event_service_1 = require("../../events/event.service");
+const source_control_resource_helper_1 = require("./source-control-resource-helper");
 let SourceControlService = class SourceControlService {
-    constructor(logger, gitService, sourceControlPreferencesService, sourceControlExportService, sourceControlImportService, sourceControlScopedService, tagRepository, folderRepository, eventService) {
+    constructor(logger, gitService, sourceControlPreferencesService, sourceControlExportService, sourceControlImportService, sourceControlScopedService, eventService, sourceControlStatusService) {
         this.logger = logger;
         this.gitService = gitService;
         this.sourceControlPreferencesService = sourceControlPreferencesService;
         this.sourceControlExportService = sourceControlExportService;
         this.sourceControlImportService = sourceControlImportService;
         this.sourceControlScopedService = sourceControlScopedService;
-        this.tagRepository = tagRepository;
-        this.folderRepository = folderRepository;
         this.eventService = eventService;
+        this.sourceControlStatusService = sourceControlStatusService;
         const { gitFolder, sshFolder, sshKeyName } = sourceControlPreferencesService;
         this.gitFolder = gitFolder;
         this.sshFolder = sshFolder;
@@ -190,7 +189,7 @@ let SourceControlService = class SourceControlService {
                 file: normalizedPath,
             };
         });
-        const allowedResources = (await this.getStatus(user, {
+        const allowedResources = (await this.sourceControlStatusService.getStatus(user, {
             direction: 'push',
             verbose: false,
             preferLocalVersion: true,
@@ -228,9 +227,9 @@ let SourceControlService = class SourceControlService {
             }
         });
         this.sourceControlExportService.rmFilesFromExportFolder(filesToBeDeleted);
-        const workflowsToBeExported = filesToPush.filter((e) => e.type === 'workflow' && e.status !== 'deleted');
+        const workflowsToBeExported = (0, source_control_resource_helper_1.getNonDeletedResources)(filesToPush, 'workflow');
         await this.sourceControlExportService.exportWorkflowsToWorkFolder(workflowsToBeExported);
-        const credentialsToBeExported = filesToPush.filter((e) => e.type === 'credential' && e.status !== 'deleted');
+        const credentialsToBeExported = (0, source_control_resource_helper_1.getNonDeletedResources)(filesToPush, 'credential');
         const credentialExportResult = await this.sourceControlExportService.exportCredentialsToWorkFolder(credentialsToBeExported);
         if (credentialExportResult.missingIds && credentialExportResult.missingIds.length > 0) {
             credentialExportResult.missingIds.forEach((id) => {
@@ -240,12 +239,12 @@ let SourceControlService = class SourceControlService {
         }
         filesToBePushed.add((0, source_control_helper_ee_1.getTagsPath)(this.gitFolder));
         await this.sourceControlExportService.exportTagsToWorkFolder(context);
-        const folderChanges = filesToPush.find((e) => e.type === 'folders');
+        const folderChanges = (0, source_control_resource_helper_1.filterByType)(filesToPush, 'folders')[0];
         if (folderChanges) {
             filesToBePushed.add(folderChanges.file);
             await this.sourceControlExportService.exportFoldersToWorkFolder(context);
         }
-        const variablesChanges = filesToPush.find((e) => e.type === 'variables');
+        const variablesChanges = (0, source_control_resource_helper_1.filterByType)(filesToPush, 'variables')[0];
         if (variablesChanges) {
             filesToBePushed.add(variablesChanges.file);
             await this.sourceControlExportService.exportVariablesToWorkFolder();
@@ -267,39 +266,9 @@ let SourceControlService = class SourceControlService {
     getConflicts(files) {
         return files.filter((file) => file.conflict || file.status === 'modified');
     }
-    getWorkflowsToImport(files) {
-        return files.filter((e) => e.type === 'workflow' && e.status !== 'deleted');
-    }
-    getWorkflowsToDelete(files) {
-        return files.filter((e) => e.type === 'workflow' && e.status === 'deleted');
-    }
-    getCredentialsToImport(files) {
-        return files.filter((e) => e.type === 'credential' && e.status !== 'deleted');
-    }
-    getCredentialsToDelete(files) {
-        return files.filter((e) => e.type === 'credential' && e.status === 'deleted');
-    }
-    getTagsToImport(files) {
-        return files.find((e) => e.type === 'tags' && e.status !== 'deleted');
-    }
-    getTagsToDelete(files) {
-        return files.filter((e) => e.type === 'tags' && e.status === 'deleted');
-    }
-    getVariablesToImport(files) {
-        return files.find((e) => e.type === 'variables' && e.status !== 'deleted');
-    }
-    getFoldersToImport(files) {
-        return files.find((e) => e.type === 'folders' && e.status !== 'deleted');
-    }
-    getFoldersToDelete(files) {
-        return files.filter((e) => e.type === 'folders' && e.status === 'deleted');
-    }
-    getVariablesToDelete(files) {
-        return files.filter((e) => e.type === 'variables' && e.status === 'deleted');
-    }
     async pullWorkfolder(user, options) {
         await this.sanityCheck();
-        const statusResult = (await this.getStatus(user, {
+        const statusResult = (await this.sourceControlStatusService.getStatus(user, {
             direction: 'pull',
             verbose: false,
             preferLocalVersion: false,
@@ -314,31 +283,31 @@ let SourceControlService = class SourceControlService {
                 };
             }
         }
-        const foldersToBeImported = this.getFoldersToImport(statusResult);
+        const foldersToBeImported = (0, source_control_resource_helper_1.getNonDeletedResources)(statusResult, 'folders')[0];
         if (foldersToBeImported) {
             await this.sourceControlImportService.importFoldersFromWorkFolder(user, foldersToBeImported);
         }
-        const workflowsToBeImported = this.getWorkflowsToImport(statusResult);
+        const workflowsToBeImported = (0, source_control_resource_helper_1.getNonDeletedResources)(statusResult, 'workflow');
         await this.sourceControlImportService.importWorkflowFromWorkFolder(workflowsToBeImported, user.id);
-        const workflowsToBeDeleted = this.getWorkflowsToDelete(statusResult);
+        const workflowsToBeDeleted = (0, source_control_resource_helper_1.getDeletedResources)(statusResult, 'workflow');
         await this.sourceControlImportService.deleteWorkflowsNotInWorkfolder(user, workflowsToBeDeleted);
-        const credentialsToBeImported = this.getCredentialsToImport(statusResult);
+        const credentialsToBeImported = (0, source_control_resource_helper_1.getNonDeletedResources)(statusResult, 'credential');
         await this.sourceControlImportService.importCredentialsFromWorkFolder(credentialsToBeImported, user.id);
-        const credentialsToBeDeleted = this.getCredentialsToDelete(statusResult);
+        const credentialsToBeDeleted = (0, source_control_resource_helper_1.getDeletedResources)(statusResult, 'credential');
         await this.sourceControlImportService.deleteCredentialsNotInWorkfolder(user, credentialsToBeDeleted);
-        const tagsToBeImported = this.getTagsToImport(statusResult);
+        const tagsToBeImported = (0, source_control_resource_helper_1.getNonDeletedResources)(statusResult, 'tags')[0];
         if (tagsToBeImported) {
             await this.sourceControlImportService.importTagsFromWorkFolder(tagsToBeImported);
         }
-        const tagsToBeDeleted = this.getTagsToDelete(statusResult);
+        const tagsToBeDeleted = (0, source_control_resource_helper_1.getDeletedResources)(statusResult, 'tags');
         await this.sourceControlImportService.deleteTagsNotInWorkfolder(tagsToBeDeleted);
-        const variablesToBeImported = this.getVariablesToImport(statusResult);
+        const variablesToBeImported = (0, source_control_resource_helper_1.getNonDeletedResources)(statusResult, 'variables')[0];
         if (variablesToBeImported) {
             await this.sourceControlImportService.importVariablesFromWorkFolder(variablesToBeImported);
         }
-        const variablesToBeDeleted = this.getVariablesToDelete(statusResult);
+        const variablesToBeDeleted = (0, source_control_resource_helper_1.getDeletedResources)(statusResult, 'variables');
         await this.sourceControlImportService.deleteVariablesNotInWorkfolder(variablesToBeDeleted);
-        const foldersToBeDeleted = this.getFoldersToDelete(statusResult);
+        const foldersToBeDeleted = (0, source_control_resource_helper_1.getDeletedResources)(statusResult, 'folders');
         await this.sourceControlImportService.deleteFoldersNotInWorkfolder(foldersToBeDeleted);
         this.eventService.emit('source-control-user-finished-pull-ui', (0, source_control_helper_ee_1.getTrackingInformationFromPullResult)(user.id, statusResult));
         return {
@@ -348,380 +317,7 @@ let SourceControlService = class SourceControlService {
     }
     async getStatus(user, options) {
         await this.sanityCheck();
-        const context = new source_control_context_1.SourceControlContext(user);
-        if (options.direction === 'pull' && !(0, permissions_1.hasGlobalScope)(user, 'sourceControl:pull')) {
-            throw new forbidden_error_1.ForbiddenError('You do not have permission to pull from source control');
-        }
-        const sourceControlledFiles = [];
-        await this.resetWorkfolder();
-        const { wfRemoteVersionIds, wfLocalVersionIds, wfMissingInLocal, wfMissingInRemote, wfModifiedInEither, } = await this.getStatusWorkflows(options, context, sourceControlledFiles);
-        const { credMissingInLocal, credMissingInRemote, credModifiedInEither } = await this.getStatusCredentials(options, context, sourceControlledFiles);
-        const { varMissingInLocal, varMissingInRemote, varModifiedInEither } = await this.getStatusVariables(options, sourceControlledFiles);
-        const { tagsMissingInLocal, tagsMissingInRemote, tagsModifiedInEither, mappingsMissingInLocal, mappingsMissingInRemote, } = await this.getStatusTagsMappings(options, context, sourceControlledFiles);
-        const { foldersMissingInLocal, foldersMissingInRemote, foldersModifiedInEither } = await this.getStatusFoldersMapping(options, context, sourceControlledFiles);
-        if (options.direction === 'push') {
-            this.eventService.emit('source-control-user-started-push-ui', (0, source_control_helper_ee_1.getTrackingInformationFromPrePushResult)(user.id, sourceControlledFiles));
-        }
-        else if (options.direction === 'pull') {
-            this.eventService.emit('source-control-user-started-pull-ui', (0, source_control_helper_ee_1.getTrackingInformationFromPullResult)(user.id, sourceControlledFiles));
-        }
-        if (options?.verbose) {
-            return {
-                wfRemoteVersionIds,
-                wfLocalVersionIds,
-                wfMissingInLocal,
-                wfMissingInRemote,
-                wfModifiedInEither,
-                credMissingInLocal,
-                credMissingInRemote,
-                credModifiedInEither,
-                varMissingInLocal,
-                varMissingInRemote,
-                varModifiedInEither,
-                tagsMissingInLocal,
-                tagsMissingInRemote,
-                tagsModifiedInEither,
-                mappingsMissingInLocal,
-                mappingsMissingInRemote,
-                foldersMissingInLocal,
-                foldersMissingInRemote,
-                foldersModifiedInEither,
-                sourceControlledFiles,
-            };
-        }
-        else {
-            return sourceControlledFiles;
-        }
-    }
-    async getStatusWorkflows(options, context, sourceControlledFiles) {
-        const wfRemoteVersionIds = await this.sourceControlImportService.getRemoteVersionIdsFromFiles(context);
-        const wfLocalVersionIds = await this.sourceControlImportService.getLocalVersionIdsFromDb(context);
-        let outOfScopeWF = [];
-        if (!context.hasAccessToAllProjects()) {
-            outOfScopeWF = await this.sourceControlImportService.getAllLocalVersionIdsFromDb();
-            outOfScopeWF = outOfScopeWF.filter((wf) => !wfLocalVersionIds.some((local) => local.id === wf.id));
-        }
-        const wfMissingInLocal = wfRemoteVersionIds
-            .filter((remote) => wfLocalVersionIds.findIndex((local) => local.id === remote.id) === -1)
-            .filter((remote) => !outOfScopeWF.some((outOfScope) => outOfScope.id === remote.id));
-        const wfMissingInRemote = wfLocalVersionIds.filter((local) => wfRemoteVersionIds.findIndex((remote) => remote.id === local.id) === -1);
-        const wfModifiedInEither = [];
-        wfLocalVersionIds.forEach((localWorkflow) => {
-            const remoteWorkflowWithSameId = wfRemoteVersionIds.find((removeWorkflow) => removeWorkflow.id === localWorkflow.id);
-            if (!remoteWorkflowWithSameId) {
-                return;
-            }
-            if ((0, source_control_helper_ee_1.isWorkflowModified)(localWorkflow, remoteWorkflowWithSameId)) {
-                let name = (options?.preferLocalVersion ? localWorkflow?.name : remoteWorkflowWithSameId?.name) ??
-                    'Workflow';
-                if (localWorkflow.name &&
-                    remoteWorkflowWithSameId?.name &&
-                    localWorkflow.name !== remoteWorkflowWithSameId.name) {
-                    name = options?.preferLocalVersion
-                        ? `${localWorkflow.name} (Remote: ${remoteWorkflowWithSameId.name})`
-                        : (name = `${remoteWorkflowWithSameId.name} (Local: ${localWorkflow.name})`);
-                }
-                wfModifiedInEither.push({
-                    ...localWorkflow,
-                    name,
-                    versionId: options.preferLocalVersion
-                        ? localWorkflow.versionId
-                        : remoteWorkflowWithSameId.versionId,
-                    localId: localWorkflow.versionId,
-                    remoteId: remoteWorkflowWithSameId.versionId,
-                });
-            }
-        });
-        wfMissingInLocal.forEach((item) => {
-            sourceControlledFiles.push({
-                id: item.id,
-                name: item.name ?? 'Workflow',
-                type: 'workflow',
-                status: options.direction === 'push' ? 'deleted' : 'created',
-                location: options.direction === 'push' ? 'local' : 'remote',
-                conflict: false,
-                file: item.filename,
-                updatedAt: item.updatedAt ?? new Date().toISOString(),
-                owner: item.owner,
-            });
-        });
-        wfMissingInRemote.forEach((item) => {
-            sourceControlledFiles.push({
-                id: item.id,
-                name: item.name ?? 'Workflow',
-                type: 'workflow',
-                status: options.direction === 'push' ? 'created' : 'deleted',
-                location: options.direction === 'push' ? 'local' : 'remote',
-                conflict: options.direction === 'push' ? false : true,
-                file: item.filename,
-                updatedAt: item.updatedAt ?? new Date().toISOString(),
-                owner: item.owner,
-            });
-        });
-        wfModifiedInEither.forEach((item) => {
-            sourceControlledFiles.push({
-                id: item.id,
-                name: item.name ?? 'Workflow',
-                type: 'workflow',
-                status: 'modified',
-                location: options.direction === 'push' ? 'local' : 'remote',
-                conflict: true,
-                file: item.filename,
-                updatedAt: item.updatedAt ?? new Date().toISOString(),
-                owner: item.owner,
-            });
-        });
-        return {
-            wfRemoteVersionIds,
-            wfLocalVersionIds,
-            wfMissingInLocal,
-            wfMissingInRemote,
-            wfModifiedInEither,
-        };
-    }
-    async getStatusCredentials(options, context, sourceControlledFiles) {
-        const credRemoteIds = await this.sourceControlImportService.getRemoteCredentialsFromFiles(context);
-        const credLocalIds = await this.sourceControlImportService.getLocalCredentialsFromDb(context);
-        const credMissingInLocal = credRemoteIds.filter((remote) => credLocalIds.findIndex((local) => local.id === remote.id) === -1);
-        const credMissingInRemote = credLocalIds.filter((local) => credRemoteIds.findIndex((remote) => remote.id === local.id) === -1);
-        const credModifiedInEither = [];
-        credLocalIds.forEach((local) => {
-            const mismatchingCreds = credRemoteIds.find((remote) => {
-                return remote.id === local.id && (remote.name !== local.name || remote.type !== local.type);
-            });
-            if (mismatchingCreds) {
-                credModifiedInEither.push({
-                    ...local,
-                    name: options?.preferLocalVersion ? local.name : mismatchingCreds.name,
-                });
-            }
-        });
-        credMissingInLocal.forEach((item) => {
-            sourceControlledFiles.push({
-                id: item.id,
-                name: item.name ?? 'Credential',
-                type: 'credential',
-                status: options.direction === 'push' ? 'deleted' : 'created',
-                location: options.direction === 'push' ? 'local' : 'remote',
-                conflict: false,
-                file: item.filename,
-                updatedAt: new Date().toISOString(),
-                owner: item.ownedBy,
-            });
-        });
-        credMissingInRemote.forEach((item) => {
-            sourceControlledFiles.push({
-                id: item.id,
-                name: item.name ?? 'Credential',
-                type: 'credential',
-                status: options.direction === 'push' ? 'created' : 'deleted',
-                location: options.direction === 'push' ? 'local' : 'remote',
-                conflict: options.direction === 'push' ? false : true,
-                file: item.filename,
-                updatedAt: new Date().toISOString(),
-                owner: item.ownedBy,
-            });
-        });
-        credModifiedInEither.forEach((item) => {
-            sourceControlledFiles.push({
-                id: item.id,
-                name: item.name ?? 'Credential',
-                type: 'credential',
-                status: 'modified',
-                location: options.direction === 'push' ? 'local' : 'remote',
-                conflict: true,
-                file: item.filename,
-                updatedAt: new Date().toISOString(),
-                owner: item.ownedBy,
-            });
-        });
-        return {
-            credMissingInLocal,
-            credMissingInRemote,
-            credModifiedInEither,
-        };
-    }
-    async getStatusVariables(options, sourceControlledFiles) {
-        const varRemoteIds = await this.sourceControlImportService.getRemoteVariablesFromFile();
-        const varLocalIds = await this.sourceControlImportService.getLocalVariablesFromDb();
-        const varMissingInLocal = varRemoteIds.filter((remote) => varLocalIds.findIndex((local) => local.id === remote.id) === -1);
-        const varMissingInRemote = varLocalIds.filter((local) => varRemoteIds.findIndex((remote) => remote.id === local.id) === -1);
-        const varModifiedInEither = [];
-        varLocalIds.forEach((local) => {
-            const mismatchingIds = varRemoteIds.find((remote) => (remote.id === local.id && remote.key !== local.key) ||
-                (remote.id !== local.id && remote.key === local.key));
-            if (mismatchingIds) {
-                varModifiedInEither.push(options.preferLocalVersion ? local : mismatchingIds);
-            }
-        });
-        varMissingInLocal.forEach((item) => {
-            sourceControlledFiles.push({
-                id: item.id,
-                name: item.key,
-                type: 'variables',
-                status: options.direction === 'push' ? 'deleted' : 'created',
-                location: options.direction === 'push' ? 'local' : 'remote',
-                conflict: false,
-                file: (0, source_control_helper_ee_1.getVariablesPath)(this.gitFolder),
-                updatedAt: new Date().toISOString(),
-            });
-        });
-        varMissingInRemote.forEach((item) => {
-            sourceControlledFiles.push({
-                id: item.id,
-                name: item.key,
-                type: 'variables',
-                status: options.direction === 'push' ? 'created' : 'deleted',
-                location: options.direction === 'push' ? 'local' : 'remote',
-                conflict: options.direction === 'push' ? false : true,
-                file: (0, source_control_helper_ee_1.getVariablesPath)(this.gitFolder),
-                updatedAt: new Date().toISOString(),
-            });
-        });
-        varModifiedInEither.forEach((item) => {
-            sourceControlledFiles.push({
-                id: item.id,
-                name: item.key,
-                type: 'variables',
-                status: 'modified',
-                location: options.direction === 'push' ? 'local' : 'remote',
-                conflict: true,
-                file: (0, source_control_helper_ee_1.getVariablesPath)(this.gitFolder),
-                updatedAt: new Date().toISOString(),
-            });
-        });
-        return {
-            varMissingInLocal,
-            varMissingInRemote,
-            varModifiedInEither,
-        };
-    }
-    async getStatusTagsMappings(options, context, sourceControlledFiles) {
-        const lastUpdatedTag = await this.tagRepository.find({
-            order: { updatedAt: 'DESC' },
-            take: 1,
-            select: ['updatedAt'],
-        });
-        const lastUpdatedDate = lastUpdatedTag[0]?.updatedAt ?? new Date();
-        const tagMappingsRemote = await this.sourceControlImportService.getRemoteTagsAndMappingsFromFile(context);
-        const tagMappingsLocal = await this.sourceControlImportService.getLocalTagsAndMappingsFromDb(context);
-        const tagsMissingInLocal = tagMappingsRemote.tags.filter((remote) => tagMappingsLocal.tags.findIndex((local) => local.id === remote.id) === -1);
-        const tagsMissingInRemote = tagMappingsLocal.tags.filter((local) => tagMappingsRemote.tags.findIndex((remote) => remote.id === local.id) === -1);
-        const tagsModifiedInEither = [];
-        tagMappingsLocal.tags.forEach((local) => {
-            const mismatchingIds = tagMappingsRemote.tags.find((remote) => remote.id === local.id && remote.name !== local.name);
-            if (!mismatchingIds) {
-                return;
-            }
-            tagsModifiedInEither.push(options.preferLocalVersion ? local : mismatchingIds);
-        });
-        const mappingsMissingInLocal = tagMappingsRemote.mappings.filter((remote) => tagMappingsLocal.mappings.findIndex((local) => local.tagId === remote.tagId && local.workflowId === remote.workflowId) === -1);
-        const mappingsMissingInRemote = tagMappingsLocal.mappings.filter((local) => tagMappingsRemote.mappings.findIndex((remote) => remote.tagId === local.tagId && remote.workflowId === remote.workflowId) === -1);
-        tagsMissingInLocal.forEach((item) => {
-            sourceControlledFiles.push({
-                id: item.id,
-                name: item.name,
-                type: 'tags',
-                status: options.direction === 'push' ? 'deleted' : 'created',
-                location: options.direction === 'push' ? 'local' : 'remote',
-                conflict: false,
-                file: (0, source_control_helper_ee_1.getTagsPath)(this.gitFolder),
-                updatedAt: lastUpdatedDate.toISOString(),
-            });
-        });
-        tagsMissingInRemote.forEach((item) => {
-            sourceControlledFiles.push({
-                id: item.id,
-                name: item.name,
-                type: 'tags',
-                status: options.direction === 'push' ? 'created' : 'deleted',
-                location: options.direction === 'push' ? 'local' : 'remote',
-                conflict: options.direction === 'push' ? false : true,
-                file: (0, source_control_helper_ee_1.getTagsPath)(this.gitFolder),
-                updatedAt: lastUpdatedDate.toISOString(),
-            });
-        });
-        tagsModifiedInEither.forEach((item) => {
-            sourceControlledFiles.push({
-                id: item.id,
-                name: item.name,
-                type: 'tags',
-                status: 'modified',
-                location: options.direction === 'push' ? 'local' : 'remote',
-                conflict: true,
-                file: (0, source_control_helper_ee_1.getTagsPath)(this.gitFolder),
-                updatedAt: lastUpdatedDate.toISOString(),
-            });
-        });
-        return {
-            tagsMissingInLocal,
-            tagsMissingInRemote,
-            tagsModifiedInEither,
-            mappingsMissingInLocal,
-            mappingsMissingInRemote,
-        };
-    }
-    async getStatusFoldersMapping(options, context, sourceControlledFiles) {
-        const lastUpdatedFolder = await this.folderRepository.find({
-            order: { updatedAt: 'DESC' },
-            take: 1,
-            select: ['updatedAt'],
-        });
-        const lastUpdatedDate = lastUpdatedFolder[0]?.updatedAt ?? new Date();
-        const foldersMappingsRemote = await this.sourceControlImportService.getRemoteFoldersAndMappingsFromFile(context);
-        const foldersMappingsLocal = await this.sourceControlImportService.getLocalFoldersAndMappingsFromDb(context);
-        const foldersMissingInLocal = foldersMappingsRemote.folders.filter((remote) => foldersMappingsLocal.folders.findIndex((local) => local.id === remote.id) === -1);
-        const foldersMissingInRemote = foldersMappingsLocal.folders.filter((local) => foldersMappingsRemote.folders.findIndex((remote) => remote.id === local.id) === -1);
-        const foldersModifiedInEither = [];
-        foldersMappingsLocal.folders.forEach((local) => {
-            const mismatchingIds = foldersMappingsRemote.folders.find((remote) => remote.id === local.id &&
-                (remote.name !== local.name || remote.parentFolderId !== local.parentFolderId));
-            if (!mismatchingIds) {
-                return;
-            }
-            foldersModifiedInEither.push(options.preferLocalVersion ? local : mismatchingIds);
-        });
-        foldersMissingInLocal.forEach((item) => {
-            sourceControlledFiles.push({
-                id: item.id,
-                name: item.name,
-                type: 'folders',
-                status: options.direction === 'push' ? 'deleted' : 'created',
-                location: options.direction === 'push' ? 'local' : 'remote',
-                conflict: false,
-                file: (0, source_control_helper_ee_1.getFoldersPath)(this.gitFolder),
-                updatedAt: lastUpdatedDate.toISOString(),
-            });
-        });
-        foldersMissingInRemote.forEach((item) => {
-            sourceControlledFiles.push({
-                id: item.id,
-                name: item.name,
-                type: 'folders',
-                status: options.direction === 'push' ? 'created' : 'deleted',
-                location: options.direction === 'push' ? 'local' : 'remote',
-                conflict: options.direction === 'push' ? false : true,
-                file: (0, source_control_helper_ee_1.getFoldersPath)(this.gitFolder),
-                updatedAt: lastUpdatedDate.toISOString(),
-            });
-        });
-        foldersModifiedInEither.forEach((item) => {
-            sourceControlledFiles.push({
-                id: item.id,
-                name: item.name,
-                type: 'folders',
-                status: 'modified',
-                location: options.direction === 'push' ? 'local' : 'remote',
-                conflict: true,
-                file: (0, source_control_helper_ee_1.getFoldersPath)(this.gitFolder),
-                updatedAt: lastUpdatedDate.toISOString(),
-            });
-        });
-        return {
-            foldersMissingInLocal,
-            foldersMissingInRemote,
-            foldersModifiedInEither,
-        };
+        return await this.sourceControlStatusService.getStatus(user, options);
     }
     async setGitUserDetails(name = constants_1.SOURCE_CONTROL_DEFAULT_NAME, email = constants_1.SOURCE_CONTROL_DEFAULT_EMAIL) {
         await this.sanityCheck();
@@ -756,8 +352,7 @@ exports.SourceControlService = SourceControlService = __decorate([
         source_control_export_service_ee_1.SourceControlExportService,
         source_control_import_service_ee_1.SourceControlImportService,
         source_control_scoped_service_1.SourceControlScopedService,
-        db_1.TagRepository,
-        db_1.FolderRepository,
-        event_service_1.EventService])
+        event_service_1.EventService,
+        source_control_status_service_ee_1.SourceControlStatusService])
 ], SourceControlService);
 //# sourceMappingURL=source-control.service.ee.js.map