n8n 2.7.3 → 2.8.0

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

@@ -18,6 +18,7 @@ const n8n_workflow_1 = require("n8n-workflow");
 const forbidden_error_1 = require("../../errors/response-errors/forbidden.error");
 const event_service_1 = require("../../events/event.service");
 const source_control_git_service_ee_1 = require("./source-control-git.service.ee");
+const constants_1 = require("./constants");
 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");
@@ -36,57 +37,62 @@ let SourceControlStatusService = class SourceControlStatusService {
     get gitFolder() {
         return this.sourceControlPreferencesService.gitFolder;
     }
+    get dataTableExportFolder() {
+        return `${this.gitFolder}/${constants_1.SOURCE_CONTROL_DATATABLES_EXPORT_FOLDER}`;
+    }
+    convertToStatusResourceOwner(owner) {
+        if (!owner) {
+            return;
+        }
+        if (owner.type === 'personal') {
+            return;
+        }
+        if ('teamId' in owner && 'teamName' in owner) {
+            return {
+                type: 'team',
+                projectId: owner.teamId,
+                projectName: owner.teamName,
+            };
+        }
+        if ('projectId' in owner) {
+            return owner;
+        }
+        return;
+    }
     async getStatus(user, options) {
         const context = new source_control_context_1.SourceControlContext(user);
+        const collectVerbose = options?.verbose ?? false;
         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);
-        const { projectsRemote, projectsLocal, projectsMissingInLocal, projectsMissingInRemote, projectsModifiedInEither, } = await this.getStatusProjects(options, context, sourceControlledFiles);
+        const workflowsStatus = await this.getStatusWorkflows(options, context, sourceControlledFiles, collectVerbose);
+        const credentialsStatus = await this.getStatusCredentials(options, context, sourceControlledFiles, collectVerbose);
+        const variablesStatus = await this.getStatusVariables(options, sourceControlledFiles, collectVerbose);
+        const dataTablesStatus = await this.getStatusDataTables(options, sourceControlledFiles, collectVerbose);
+        const tagsMappingsStatus = await this.getStatusTagsMappings(options, context, sourceControlledFiles, collectVerbose);
+        const foldersMappingStatus = await this.getStatusFoldersMapping(options, context, sourceControlledFiles, collectVerbose);
+        const projectsStatus = await this.getStatusProjects(options, context, sourceControlledFiles, collectVerbose);
         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) {
+        if (collectVerbose) {
             return {
-                wfRemoteVersionIds,
-                wfLocalVersionIds,
-                wfMissingInLocal,
-                wfMissingInRemote,
-                wfModifiedInEither,
-                credMissingInLocal,
-                credMissingInRemote,
-                credModifiedInEither,
-                varMissingInLocal,
-                varMissingInRemote,
-                varModifiedInEither,
-                tagsMissingInLocal,
-                tagsMissingInRemote,
-                tagsModifiedInEither,
-                mappingsMissingInLocal,
-                mappingsMissingInRemote,
-                foldersMissingInLocal,
-                foldersMissingInRemote,
-                foldersModifiedInEither,
-                projectsRemote,
-                projectsLocal,
-                projectsMissingInLocal,
-                projectsMissingInRemote,
-                projectsModifiedInEither,
+                ...workflowsStatus,
+                ...credentialsStatus,
+                ...variablesStatus,
+                ...dataTablesStatus,
+                ...tagsMappingsStatus,
+                ...foldersMappingStatus,
+                ...projectsStatus,
                 sourceControlledFiles,
             };
         }
-        else {
-            return sourceControlledFiles;
-        }
+        return sourceControlledFiles;
     }
     async resetWorkfolder() {
         if (!this.gitService.git) {
@@ -101,12 +107,13 @@ let SourceControlStatusService = class SourceControlStatusService {
             throw new n8n_workflow_1.UserError(`Unable to fetch updates from git - your folder might be out of sync. Try reconnecting from the Source Control settings page. Git error message: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
-    async getStatusWorkflows(options, context, sourceControlledFiles) {
+    async getStatusWorkflows(options, context, sourceControlledFiles, collectVerbose) {
         const wfRemoteVersionIds = await this.sourceControlImportService.getRemoteVersionIdsFromFiles(context);
         const wfLocalVersionIds = await this.sourceControlImportService.getLocalVersionIdsFromDb(context);
-        const candidateIds = [
-            ...new Set([...wfLocalVersionIds.map((w) => w.id), ...wfRemoteVersionIds.map((w) => w.id)]),
-        ];
+        const wfRemoteById = new Map(wfRemoteVersionIds.map((w) => [w.id, w]));
+        const wfRemoteIds = new Set(wfRemoteVersionIds.map((w) => w.id));
+        const wfLocalIds = new Set(wfLocalVersionIds.map((w) => w.id));
+        const candidateIds = [...new Set([...wfLocalIds, ...wfRemoteIds])];
         const localWorkflowsWithStatus = await this.workflowRepository.findByIds(candidateIds, {
             fields: ['id', 'activeVersionId'],
         });
@@ -115,84 +122,91 @@ let SourceControlStatusService = class SourceControlStatusService {
         let outOfScopeWF = [];
         if (!context.hasAccessToAllProjects()) {
             outOfScopeWF = await this.sourceControlImportService.getAllLocalVersionIdsFromDb();
-            outOfScopeWF = outOfScopeWF.filter((wf) => !wfLocalVersionIds.some((local) => local.id === wf.id));
+            outOfScopeWF = outOfScopeWF.filter((wf) => !wfLocalIds.has(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 outOfScopeIds = new Set(outOfScopeWF.map((wf) => wf.id));
+        const wfMissingInLocal = [];
+        const wfMissingInRemote = [];
         const wfModifiedInEither = [];
-        wfLocalVersionIds.forEach((localWorkflow) => {
-            const remoteWorkflowWithSameId = wfRemoteVersionIds.find((removeWorkflow) => removeWorkflow.id === localWorkflow.id);
-            if (!remoteWorkflowWithSameId) {
-                return;
+        for (const remoteWorkflow of wfRemoteVersionIds) {
+            if (!wfLocalIds.has(remoteWorkflow.id) && !outOfScopeIds.has(remoteWorkflow.id)) {
+                if (collectVerbose) {
+                    wfMissingInLocal.push(remoteWorkflow);
+                }
+                sourceControlledFiles.push({
+                    id: remoteWorkflow.id,
+                    name: remoteWorkflow.name ?? 'Workflow',
+                    type: 'workflow',
+                    status: options.direction === 'push' ? 'deleted' : 'created',
+                    location: options.direction === 'push' ? 'local' : 'remote',
+                    conflict: false,
+                    file: remoteWorkflow.filename,
+                    updatedAt: remoteWorkflow.updatedAt ?? new Date().toISOString(),
+                    isLocalPublished: false,
+                    isRemoteArchived: archivedWorkflowIds.get(remoteWorkflow.id) ?? false,
+                    owner: remoteWorkflow.owner,
+                });
             }
-            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})`);
+        }
+        for (const localWorkflow of wfLocalVersionIds) {
+            const remoteWorkflowWithSameId = wfRemoteById.get(localWorkflow.id);
+            if (!remoteWorkflowWithSameId) {
+                if (collectVerbose) {
+                    wfMissingInRemote.push(localWorkflow);
                 }
-                wfModifiedInEither.push({
-                    ...localWorkflow,
-                    name,
-                    versionId: options.preferLocalVersion
-                        ? localWorkflow.versionId
-                        : remoteWorkflowWithSameId.versionId,
-                    localId: localWorkflow.versionId,
-                    remoteId: remoteWorkflowWithSameId.versionId,
+                sourceControlledFiles.push({
+                    id: localWorkflow.id,
+                    name: localWorkflow.name ?? 'Workflow',
+                    type: 'workflow',
+                    status: options.direction === 'push' ? 'created' : 'deleted',
+                    location: options.direction === 'push' ? 'local' : 'remote',
+                    conflict: options.direction === 'push' ? false : true,
+                    file: localWorkflow.filename,
+                    updatedAt: localWorkflow.updatedAt ?? new Date().toISOString(),
+                    isLocalPublished: publishedWorkflowIds.has(localWorkflow.id),
+                    isRemoteArchived: false,
+                    owner: localWorkflow.owner,
                 });
+                continue;
+            }
+            if (!(0, source_control_helper_ee_1.isWorkflowModified)(localWorkflow, remoteWorkflowWithSameId)) {
+                continue;
+            }
+            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})`);
+            }
+            const wfModified = {
+                ...localWorkflow,
+                name,
+                versionId: options.preferLocalVersion
+                    ? localWorkflow.versionId
+                    : remoteWorkflowWithSameId.versionId,
+                localId: localWorkflow.versionId,
+                remoteId: remoteWorkflowWithSameId.versionId,
+            };
+            if (collectVerbose) {
+                wfModifiedInEither.push(wfModified);
             }
-        });
-        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(),
-                isLocalPublished: false,
-                isRemoteArchived: archivedWorkflowIds.get(item.id) ?? false,
-                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(),
-                isLocalPublished: publishedWorkflowIds.has(item.id),
-                isRemoteArchived: false,
-                owner: item.owner,
-            });
-        });
-        wfModifiedInEither.forEach((item) => {
             sourceControlledFiles.push({
-                id: item.id,
-                name: item.name ?? 'Workflow',
+                id: wfModified.id,
+                name: wfModified.name ?? 'Workflow',
                 type: 'workflow',
                 status: 'modified',
                 location: options.direction === 'push' ? 'local' : 'remote',
                 conflict: true,
-                file: item.filename,
-                updatedAt: item.updatedAt ?? new Date().toISOString(),
-                isLocalPublished: publishedWorkflowIds.has(item.id),
-                isRemoteArchived: archivedWorkflowIds.get(item.id) ?? false,
-                owner: item.owner,
+                file: wfModified.filename,
+                updatedAt: wfModified.updatedAt ?? new Date().toISOString(),
+                isLocalPublished: publishedWorkflowIds.has(wfModified.id),
+                isRemoteArchived: archivedWorkflowIds.get(wfModified.id) ?? false,
+                owner: wfModified.owner,
             });
-        });
+        }
         return {
             wfRemoteVersionIds,
             wfLocalVersionIds,
@@ -201,113 +215,135 @@ let SourceControlStatusService = class SourceControlStatusService {
             wfModifiedInEither,
         };
     }
-    async getStatusCredentials(options, context, sourceControlledFiles) {
+    async getStatusCredentials(options, context, sourceControlledFiles, collectVerbose) {
         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 credRemoteById = new Map(credRemoteIds.map((cred) => [cred.id, cred]));
+        const credLocalIdsSet = new Set(credLocalIds.map((cred) => cred.id));
+        const credMissingInLocal = [];
+        const credMissingInRemote = [];
         const credModifiedInEither = [];
-        credLocalIds.forEach((local) => {
-            const mismatchingCreds = credRemoteIds.find((remote) => {
-                return (remote.id === local.id &&
-                    (remote.name !== local.name ||
-                        remote.type !== local.type ||
-                        (0, source_control_helper_ee_1.hasOwnerChanged)(remote.ownedBy, local.ownedBy) ||
-                        (remote.isGlobal ?? false) !== (local.isGlobal ?? false)));
-            });
-            if (mismatchingCreds) {
-                credModifiedInEither.push({
-                    ...local,
-                    name: options?.preferLocalVersion ? local.name : mismatchingCreds.name,
+        for (const remoteCredential of credRemoteIds) {
+            if (!credLocalIdsSet.has(remoteCredential.id)) {
+                if (collectVerbose) {
+                    credMissingInLocal.push(remoteCredential);
+                }
+                sourceControlledFiles.push({
+                    id: remoteCredential.id,
+                    name: remoteCredential.name ?? 'Credential',
+                    type: 'credential',
+                    status: options.direction === 'push' ? 'deleted' : 'created',
+                    location: options.direction === 'push' ? 'local' : 'remote',
+                    conflict: false,
+                    file: remoteCredential.filename,
+                    updatedAt: new Date().toISOString(),
+                    owner: remoteCredential.ownedBy,
                 });
             }
-        });
-        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,
-            });
-        });
+        }
+        for (const localCredential of credLocalIds) {
+            const credRemote = credRemoteById.get(localCredential.id);
+            if (credRemote) {
+                if ((0, source_control_helper_ee_1.areSameCredentials)(localCredential, credRemote)) {
+                    continue;
+                }
+                const modifiedCredential = {
+                    ...localCredential,
+                    name: options?.preferLocalVersion ? localCredential.name : credRemote.name,
+                };
+                if (collectVerbose) {
+                    credModifiedInEither.push(modifiedCredential);
+                }
+                sourceControlledFiles.push({
+                    id: modifiedCredential.id,
+                    name: modifiedCredential.name ?? 'Credential',
+                    type: 'credential',
+                    status: 'modified',
+                    location: options.direction === 'push' ? 'local' : 'remote',
+                    conflict: true,
+                    file: modifiedCredential.filename,
+                    updatedAt: new Date().toISOString(),
+                    owner: modifiedCredential.ownedBy,
+                });
+            }
+            else {
+                if (collectVerbose) {
+                    credMissingInRemote.push(localCredential);
+                }
+                sourceControlledFiles.push({
+                    id: localCredential.id,
+                    name: localCredential.name ?? 'Credential',
+                    type: 'credential',
+                    status: options.direction === 'push' ? 'created' : 'deleted',
+                    location: options.direction === 'push' ? 'local' : 'remote',
+                    conflict: options.direction === 'push' ? false : true,
+                    file: localCredential.filename,
+                    updatedAt: new Date().toISOString(),
+                    owner: localCredential.ownedBy,
+                });
+            }
+        }
         return {
             credMissingInLocal,
             credMissingInRemote,
             credModifiedInEither,
         };
     }
-    async getStatusVariables(options, sourceControlledFiles) {
+    async getStatusVariables(options, sourceControlledFiles, collectVerbose) {
         const varRemoteIds = await this.sourceControlImportService.getRemoteVariablesFromFile();
         const varLocalIds = await this.sourceControlImportService.getLocalGlobalVariablesFromDb();
-        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 varRemoteIdsSet = new Set(varRemoteIds.map((remote) => remote.id));
+        const varLocalIdsSet = new Set(varLocalIds.map((local) => local.id));
+        const varMissingInLocal = [];
+        const varMissingInRemote = [];
         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);
+        for (const remoteVariable of varRemoteIds) {
+            if (!varLocalIdsSet.has(remoteVariable.id)) {
+                if (collectVerbose) {
+                    varMissingInLocal.push(remoteVariable);
+                }
+                sourceControlledFiles.push({
+                    id: remoteVariable.id,
+                    name: remoteVariable.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(),
+                });
+            }
+        }
+        for (const localVariable of varLocalIds) {
+            if (!varRemoteIdsSet.has(localVariable.id)) {
+                if (collectVerbose) {
+                    varMissingInRemote.push(localVariable);
+                }
+                sourceControlledFiles.push({
+                    id: localVariable.id,
+                    name: localVariable.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(),
+                });
+            }
+        }
+        for (const localVariable of varLocalIds) {
+            const mismatchingIds = varRemoteIds.find((remote) => (remote.id === localVariable.id && remote.key !== localVariable.key) ||
+                (remote.id !== localVariable.id && remote.key === localVariable.key));
+            if (!mismatchingIds) {
+                continue;
+            }
+            const modified = options.preferLocalVersion ? localVariable : mismatchingIds;
+            if (collectVerbose) {
+                varModifiedInEither.push(modified);
             }
-        });
-        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,
+                id: modified.id,
+                name: modified.key,
                 type: 'variables',
                 status: 'modified',
                 location: options.direction === 'push' ? 'local' : 'remote',
@@ -315,14 +351,84 @@ let SourceControlStatusService = class SourceControlStatusService {
                 file: (0, source_control_helper_ee_1.getVariablesPath)(this.gitFolder),
                 updatedAt: new Date().toISOString(),
             });
-        });
+        }
         return {
             varMissingInLocal,
             varMissingInRemote,
             varModifiedInEither,
         };
     }
-    async getStatusTagsMappings(options, context, sourceControlledFiles) {
+    async getStatusDataTables(options, sourceControlledFiles, collectVerbose) {
+        const dataTablesRemote = (await this.sourceControlImportService.getRemoteDataTablesFromFiles()) ?? [];
+        const dataTablesLocal = (await this.sourceControlImportService.getLocalDataTablesFromDb()) ?? [];
+        const dtMissingInLocal = [];
+        const dtMissingInRemote = [];
+        const dtModifiedInEither = [];
+        for (const remote of dataTablesRemote) {
+            if (dataTablesLocal.findIndex((local) => local.id === remote.id) === -1) {
+                if (collectVerbose) {
+                    dtMissingInLocal.push(remote);
+                }
+                sourceControlledFiles.push({
+                    id: remote.id,
+                    name: remote.name,
+                    type: 'datatable',
+                    status: options.direction === 'push' ? 'deleted' : 'created',
+                    location: options.direction === 'push' ? 'local' : 'remote',
+                    conflict: false,
+                    file: (0, source_control_helper_ee_1.getDataTableExportPath)(remote.id, this.dataTableExportFolder),
+                    updatedAt: new Date().toISOString(),
+                    owner: this.convertToStatusResourceOwner(remote.ownedBy),
+                });
+            }
+        }
+        for (const local of dataTablesLocal) {
+            const remote = dataTablesRemote.find((r) => r.id === local.id);
+            if (!remote) {
+                if (collectVerbose) {
+                    dtMissingInRemote.push(local);
+                }
+                sourceControlledFiles.push({
+                    id: local.id,
+                    name: local.name,
+                    type: 'datatable',
+                    status: options.direction === 'push' ? 'created' : 'deleted',
+                    location: options.direction === 'push' ? 'local' : 'remote',
+                    conflict: options.direction !== 'push',
+                    file: (0, source_control_helper_ee_1.getDataTableExportPath)(local.id, this.dataTableExportFolder),
+                    updatedAt: new Date().toISOString(),
+                    owner: local.ownedBy ?? undefined,
+                });
+                continue;
+            }
+            const hasMismatch = (remote.id === local.id && remote.name !== local.name) ||
+                (remote.id !== local.id && remote.name === local.name);
+            const isModified = (0, source_control_helper_ee_1.isDataTableModified)(local, remote);
+            if (hasMismatch || isModified) {
+                const modified = options.preferLocalVersion ? local : remote;
+                if (collectVerbose) {
+                    dtModifiedInEither.push(modified);
+                }
+                sourceControlledFiles.push({
+                    id: modified.id,
+                    name: modified.name,
+                    type: 'datatable',
+                    status: 'modified',
+                    location: options.direction === 'push' ? 'local' : 'remote',
+                    conflict: true,
+                    file: (0, source_control_helper_ee_1.getDataTableExportPath)(modified.id, this.dataTableExportFolder),
+                    updatedAt: new Date().toISOString(),
+                    owner: this.convertToStatusResourceOwner(modified.ownedBy),
+                });
+            }
+        }
+        return {
+            dtMissingInLocal,
+            dtMissingInRemote,
+            dtModifiedInEither,
+        };
+    }
+    async getStatusTagsMappings(options, context, sourceControlledFiles, collectVerbose) {
         const lastUpdatedTag = await this.tagRepository.find({
             order: { updatedAt: 'DESC' },
             take: 1,
@@ -331,46 +437,65 @@ let SourceControlStatusService = class SourceControlStatusService {
         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 tagsMissingInLocal = [];
+        const tagsMissingInRemote = [];
         const tagsModifiedInEither = [];
-        tagMappingsLocal.tags.forEach((local) => {
-            const mismatchingIds = tagMappingsRemote.tags.find((remote) => remote.id === local.id && remote.name !== local.name);
+        const mappingsMissingInLocal = [];
+        const mappingsMissingInRemote = [];
+        let tagsMissingInLocalCount = 0;
+        let tagsMissingInRemoteCount = 0;
+        let tagsModifiedInEitherCount = 0;
+        let mappingsMissingInLocalCount = 0;
+        let mappingsMissingInRemoteCount = 0;
+        for (const remote of tagMappingsRemote.tags) {
+            if (tagMappingsLocal.tags.findIndex((local) => local.id === remote.id) === -1) {
+                tagsMissingInLocalCount += 1;
+                if (collectVerbose) {
+                    tagsMissingInLocal.push(remote);
+                }
+                sourceControlledFiles.push({
+                    id: remote.id,
+                    name: remote.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(),
+                });
+            }
+        }
+        for (const localTag of tagMappingsLocal.tags) {
+            if (tagMappingsRemote.tags.findIndex((remote) => remote.id === localTag.id) === -1) {
+                tagsMissingInRemoteCount += 1;
+                if (collectVerbose) {
+                    tagsMissingInRemote.push(localTag);
+                }
+                sourceControlledFiles.push({
+                    id: localTag.id,
+                    name: localTag.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(),
+                });
+            }
+        }
+        for (const localTag of tagMappingsLocal.tags) {
+            const mismatchingIds = tagMappingsRemote.tags.find((remote) => remote.id === localTag.id && remote.name !== localTag.name);
             if (!mismatchingIds) {
-                return;
+                continue;
+            }
+            tagsModifiedInEitherCount += 1;
+            const modified = options.preferLocalVersion ? localTag : mismatchingIds;
+            if (collectVerbose) {
+                tagsModifiedInEither.push(modified);
             }
-            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 === local.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,
+                id: modified.id,
+                name: modified.name,
                 type: 'tags',
                 status: 'modified',
                 location: options.direction === 'push' ? 'local' : 'remote',
@@ -378,13 +503,31 @@ let SourceControlStatusService = class SourceControlStatusService {
                 file: (0, source_control_helper_ee_1.getTagsPath)(this.gitFolder),
                 updatedAt: lastUpdatedDate.toISOString(),
             });
-        });
-        const hasMappingChanges = mappingsMissingInLocal.length > 0 || mappingsMissingInRemote.length > 0;
-        const hasTagChanges = tagsMissingInLocal.length > 0 ||
-            tagsMissingInRemote.length > 0 ||
-            tagsModifiedInEither.length > 0;
+        }
+        for (const remoteTagMapping of tagMappingsRemote.mappings) {
+            const isMissing = tagMappingsLocal.mappings.findIndex((local) => local.tagId === remoteTagMapping.tagId &&
+                local.workflowId === remoteTagMapping.workflowId);
+            if (isMissing === -1) {
+                mappingsMissingInLocalCount += 1;
+                if (collectVerbose) {
+                    mappingsMissingInLocal.push(remoteTagMapping);
+                }
+            }
+        }
+        for (const localTagMapping of tagMappingsLocal.mappings) {
+            const isMissing = tagMappingsRemote.mappings.findIndex((remote) => remote.tagId === localTagMapping.tagId &&
+                remote.workflowId === localTagMapping.workflowId);
+            if (isMissing === -1) {
+                mappingsMissingInRemoteCount += 1;
+                if (collectVerbose) {
+                    mappingsMissingInRemote.push(localTagMapping);
+                }
+            }
+        }
+        const hasMappingChanges = mappingsMissingInLocalCount > 0 || mappingsMissingInRemoteCount > 0;
+        const hasTagChanges = tagsMissingInLocalCount > 0 || tagsMissingInRemoteCount > 0 || tagsModifiedInEitherCount > 0;
         if (hasMappingChanges && !hasTagChanges) {
-            const isConflict = options.direction === 'pull' && mappingsMissingInRemote.length > 0;
+            const isConflict = options.direction === 'pull' && mappingsMissingInRemoteCount > 0;
             sourceControlledFiles.push({
                 id: 'tags',
                 name: 'Workflow Tags',
@@ -404,7 +547,7 @@ let SourceControlStatusService = class SourceControlStatusService {
             mappingsMissingInRemote,
         };
     }
-    async getStatusFoldersMapping(options, context, sourceControlledFiles) {
+    async getStatusFoldersMapping(options, context, sourceControlledFiles, collectVerbose) {
         const lastUpdatedFolder = await this.folderRepository.find({
             order: { updatedAt: 'DESC' },
             take: 1,
@@ -413,14 +556,49 @@ let SourceControlStatusService = class SourceControlStatusService {
         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 foldersMissingInLocal = [];
+        const foldersMissingInRemote = [];
         const allTeamProjects = await this.sourceControlImportService.getLocalTeamProjectsFromDb();
         const foldersModifiedInEither = [];
-        foldersMappingsLocal.folders.forEach((local) => {
-            const localHomeProject = allTeamProjects.find((project) => project.id === local.homeProjectId);
+        for (const remoteFolder of foldersMappingsRemote.folders) {
+            if (foldersMappingsLocal.folders.findIndex((local) => local.id === remoteFolder.id) === -1) {
+                if (collectVerbose) {
+                    foldersMissingInLocal.push(remoteFolder);
+                }
+                sourceControlledFiles.push({
+                    id: remoteFolder.id,
+                    name: remoteFolder.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(),
+                });
+            }
+        }
+        for (const localFolder of foldersMappingsLocal.folders) {
+            if (foldersMappingsRemote.folders.findIndex((remote) => remote.id === localFolder.id) === -1) {
+                if (collectVerbose) {
+                    foldersMissingInRemote.push(localFolder);
+                }
+                sourceControlledFiles.push({
+                    id: localFolder.id,
+                    name: localFolder.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(),
+                });
+            }
+        }
+        const teamProjectsById = new Map(allTeamProjects.map((project) => [project.id, project]));
+        for (const localFolder of foldersMappingsLocal.folders) {
+            const localHomeProject = teamProjectsById.get(localFolder.homeProjectId);
             const mismatchingIds = foldersMappingsRemote.folders.find((remote) => {
-                const remoteHomeProject = allTeamProjects.find((project) => project.id === remote.homeProjectId);
+                const remoteHomeProject = teamProjectsById.get(remote.homeProjectId);
                 const localOwner = localHomeProject
                     ? {
                         type: 'team',
@@ -436,44 +614,21 @@ let SourceControlStatusService = class SourceControlStatusService {
                     }
                     : undefined;
                 const ownerChanged = (0, source_control_helper_ee_1.hasOwnerChanged)(localOwner, remoteOwner);
-                return (remote.id === local.id &&
-                    (remote.name !== local.name ||
-                        remote.parentFolderId !== local.parentFolderId ||
+                return (remote.id === localFolder.id &&
+                    (remote.name !== localFolder.name ||
+                        remote.parentFolderId !== localFolder.parentFolderId ||
                         ownerChanged));
             });
             if (!mismatchingIds) {
-                return;
+                continue;
+            }
+            const modified = options.preferLocalVersion ? localFolder : mismatchingIds;
+            if (collectVerbose) {
+                foldersModifiedInEither.push(modified);
             }
-            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,
+                id: modified.id,
+                name: modified.name,
                 type: 'folders',
                 status: 'modified',
                 location: options.direction === 'push' ? 'local' : 'remote',
@@ -481,14 +636,14 @@ let SourceControlStatusService = class SourceControlStatusService {
                 file: (0, source_control_helper_ee_1.getFoldersPath)(this.gitFolder),
                 updatedAt: lastUpdatedDate.toISOString(),
             });
-        });
+        }
         return {
             foldersMissingInLocal,
             foldersMissingInRemote,
             foldersModifiedInEither,
         };
     }
-    async getStatusProjects(options, context, sourceControlledFiles) {
+    async getStatusProjects(options, context, sourceControlledFiles, collectVerbose) {
         const projectsRemote = await this.sourceControlImportService.getRemoteProjectsFromFiles(context);
         const projectsLocal = await this.sourceControlImportService.getLocalTeamProjectsFromDb(context);
         let outOfScopeProjects = [];
@@ -496,17 +651,58 @@ let SourceControlStatusService = class SourceControlStatusService {
             outOfScopeProjects = await this.sourceControlImportService.getLocalTeamProjectsFromDb();
             outOfScopeProjects = outOfScopeProjects.filter((project) => !projectsLocal.some((local) => local.id === project.id));
         }
-        const projectsMissingInLocal = projectsRemote
-            .filter((remote) => !projectsLocal.some((local) => local.id === remote.id))
-            .filter((remote) => !outOfScopeProjects.some((outOfScope) => outOfScope.id === remote.id));
+        const projectsMissingInLocal = [];
         const areRemoteProjectsEmpty = projectsRemote.length === 0;
-        let projectsMissingInRemote = projectsLocal.filter((local) => !projectsRemote.some((remote) => remote.id === local.id));
-        if (options.direction === 'pull' && areRemoteProjectsEmpty) {
-            projectsMissingInRemote = [];
-        }
+        const projectsMissingInRemote = [];
         const projectsModifiedInEither = [];
+        const projectLocalIds = new Set(projectsLocal.map((localProject) => localProject.id));
+        const projectRemoteById = new Map(projectsRemote.map((remoteProject) => [remoteProject.id, remoteProject]));
+        const outOfScopeProjectIds = new Set(outOfScopeProjects.map((outOfScope) => outOfScope.id));
+        const mapExportableProjectWithFileNameToSourceControlledFile = ({ project, status, conflict, }) => {
+            return {
+                id: project.id,
+                name: project.name ?? 'Project',
+                type: 'project',
+                status,
+                location: options.direction === 'push' ? 'local' : 'remote',
+                conflict,
+                file: project.filename,
+                updatedAt: new Date().toISOString(),
+                owner: {
+                    type: project.owner.type,
+                    projectId: project.owner.teamId,
+                    projectName: project.owner.teamName,
+                },
+            };
+        };
+        for (const remoteProject of projectsRemote) {
+            if (!projectLocalIds.has(remoteProject.id) && !outOfScopeProjectIds.has(remoteProject.id)) {
+                if (collectVerbose) {
+                    projectsMissingInLocal.push(remoteProject);
+                }
+                sourceControlledFiles.push(mapExportableProjectWithFileNameToSourceControlledFile({
+                    project: remoteProject,
+                    status: options.direction === 'push' ? 'deleted' : 'created',
+                    conflict: false,
+                }));
+            }
+        }
+        if (!(options.direction === 'pull' && areRemoteProjectsEmpty)) {
+            for (const localProject of projectsLocal) {
+                if (!projectRemoteById.has(localProject.id)) {
+                    if (collectVerbose) {
+                        projectsMissingInRemote.push(localProject);
+                    }
+                    sourceControlledFiles.push(mapExportableProjectWithFileNameToSourceControlledFile({
+                        project: localProject,
+                        status: options.direction === 'push' ? 'created' : 'deleted',
+                        conflict: options.direction === 'push' ? false : true,
+                    }));
+                }
+            }
+        }
         projectsLocal.forEach((localProject) => {
-            const remoteProjectWithSameId = projectsRemote.find((remoteProject) => remoteProject.id === localProject.id);
+            const remoteProjectWithSameId = projectRemoteById.get(localProject.id);
             if (!remoteProjectWithSameId) {
                 return;
             }
@@ -520,7 +716,7 @@ let SourceControlStatusService = class SourceControlStatusService {
                         ? `${localProject.name} (Remote: ${remoteProjectWithSameId.name})`
                         : `${remoteProjectWithSameId.name} (Local: ${localProject.name})`;
                 }
-                projectsModifiedInEither.push({
+                const modified = {
                     ...localProject,
                     name,
                     description: options.preferLocalVersion
@@ -530,47 +726,17 @@ let SourceControlStatusService = class SourceControlStatusService {
                     variableStubs: options.preferLocalVersion
                         ? localProject.variableStubs
                         : remoteProjectWithSameId.variableStubs,
-                });
+                };
+                if (collectVerbose) {
+                    projectsModifiedInEither.push(modified);
+                }
+                sourceControlledFiles.push(mapExportableProjectWithFileNameToSourceControlledFile({
+                    project: modified,
+                    status: 'modified',
+                    conflict: true,
+                }));
             }
         });
-        const mapExportableProjectWithFileNameToSourceControlledFile = ({ project, status, conflict, }) => {
-            return {
-                id: project.id,
-                name: project.name ?? 'Project',
-                type: 'project',
-                status,
-                location: options.direction === 'push' ? 'local' : 'remote',
-                conflict,
-                file: project.filename,
-                updatedAt: new Date().toISOString(),
-                owner: {
-                    type: project.owner.type,
-                    projectId: project.owner.teamId,
-                    projectName: project.owner.teamName,
-                },
-            };
-        };
-        projectsMissingInLocal.forEach((item) => {
-            sourceControlledFiles.push(mapExportableProjectWithFileNameToSourceControlledFile({
-                project: item,
-                status: options.direction === 'push' ? 'deleted' : 'created',
-                conflict: false,
-            }));
-        });
-        projectsMissingInRemote.forEach((item) => {
-            sourceControlledFiles.push(mapExportableProjectWithFileNameToSourceControlledFile({
-                project: item,
-                status: options.direction === 'push' ? 'created' : 'deleted',
-                conflict: options.direction === 'push' ? false : true,
-            }));
-        });
-        projectsModifiedInEither.forEach((item) => {
-            sourceControlledFiles.push(mapExportableProjectWithFileNameToSourceControlledFile({
-                project: item,
-                status: 'modified',
-                conflict: true,
-            }));
-        });
         return {
             projectsRemote,
             projectsLocal,