diff --git a/backend/src/services/folder-commit/folder-commit-service.test.ts b/backend/src/services/folder-commit/folder-commit-service.test.ts index c5f4aa840..1879cf493 100644 --- a/backend/src/services/folder-commit/folder-commit-service.test.ts +++ b/backend/src/services/folder-commit/folder-commit-service.test.ts @@ -309,7 +309,8 @@ describe("folderCommitServiceFactory", () => { type: CommitType.ADD, folderVersionId: "folder-version-1" } - ] + ], + omitIgnoreFilter: true }; // Act diff --git a/backend/src/services/folder-commit/folder-commit-service.ts b/backend/src/services/folder-commit/folder-commit-service.ts index 4293d8db6..21dcc3095 100644 --- a/backend/src/services/folder-commit/folder-commit-service.ts +++ b/backend/src/services/folder-commit/folder-commit-service.ts @@ -70,6 +70,7 @@ type TCreateCommitDTO = { isUpdate?: boolean; folderId?: string; }[]; + omitIgnoreFilter?: boolean; }; type TCommitChangeDTO = { @@ -872,15 +873,18 @@ export const folderCommitServiceFactory = ({ throw new NotFoundError({ message: `Folder with ID ${data.folderId} not found` }); } - const project = await projectDAL.findProjectByEnvId(folder.envId, tx); + let { changes } = data; + if (!data.omitIgnoreFilter) { + const project = await projectDAL.findProjectByEnvId(folder.envId, tx); - if (!project) { - return; - } + if (!project) { + return; + } - const changes = await filterIgnoredChanges(data.changes, project.id, tx); - if (changes.length === 0) { - return; + changes = await filterIgnoredChanges(data.changes, project.id, tx); + if (changes.length === 0) { + return; + } } const newCommit = await folderCommitDAL.create( @@ -1358,7 +1362,8 @@ export const folderCommitServiceFactory = ({ }, message: actorInfo.message || "Rolled back folder state", folderId, - changes: allCommitChanges + changes: allCommitChanges, + omitIgnoreFilter: true }, tx ); @@ -1573,7 +1578,8 @@ export const folderCommitServiceFactory = ({ }, message: "Initialized folder", folderId, - changes + changes, + omitIgnoreFilter: true }, tx );