fix: Disable workflow locking due to issues (#4708)

* fix: Disable workflow locking due to issues
n8n-io · Nov 24, 2022 · ee6ac5d · ee6ac5d
1 parent b6c57e1
commit ee6ac5d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/packages/cli/src/workflows/workflows.controller.ee.ts b/packages/cli/src/workflows/workflows.controller.ee.ts
@@ -211,7 +211,7 @@ EEWorkflowController.patch(
 	'/:id(\\d+)',
 	ResponseHelper.send(async (req: WorkflowRequest.Update) => {
 		const { id: workflowId } = req.params;
-		const forceSave = req.query.forceSave === 'true';
+		// const forceSave = req.query.forceSave === 'true'; // disabled temporarily - tests were also disabled
 
 		const updateData = new WorkflowEntity();
 		const { tags, ...rest } = req.body;
@@ -224,7 +224,7 @@ EEWorkflowController.patch(
 			safeWorkflow,
 			workflowId,
 			tags,
-			forceSave,
+			true,
 		);
 
 		const { id, ...remainder } = updatedWorkflow;

diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts
@@ -248,7 +248,7 @@ workflowsController.patch(
 			updateData,
 			workflowId,
 			tags,
-			false,
+			true,
 			['owner'],
 		);
 

diff --git a/packages/cli/test/integration/workflows.controller.ee.test.ts b/packages/cli/test/integration/workflows.controller.ee.test.ts
@@ -731,7 +731,7 @@ describe('PATCH /workflows/:id - validate credential permissions to user', () =>
 });
 
 describe('PATCH /workflows/:id - validate interim updates', () => {
-	it('should block owner updating workflow nodes on interim update by member', async () => {
+	xit('should block owner updating workflow nodes on interim update by member', async () => {
 		const owner = await testDb.createUser({ globalRole: globalOwnerRole });
 		const member = await testDb.createUser({ globalRole: globalMemberRole });
 
@@ -764,7 +764,7 @@ describe('PATCH /workflows/:id - validate interim updates', () => {
 		);
 	});
 
-	it('should block member updating workflow nodes on interim update by owner', async () => {
+	xit('should block member updating workflow nodes on interim update by owner', async () => {
 		const owner = await testDb.createUser({ globalRole: globalOwnerRole });
 		const member = await testDb.createUser({ globalRole: globalMemberRole });
 
@@ -806,7 +806,7 @@ describe('PATCH /workflows/:id - validate interim updates', () => {
 		);
 	});
 
-	it('should block owner activation on interim activation by member', async () => {
+	xit('should block owner activation on interim activation by member', async () => {
 		const owner = await testDb.createUser({ globalRole: globalOwnerRole });
 		const member = await testDb.createUser({ globalRole: globalMemberRole });
 
@@ -836,7 +836,7 @@ describe('PATCH /workflows/:id - validate interim updates', () => {
 		);
 	});
 
-	it('should block member activation on interim activation by owner', async () => {
+	xit('should block member activation on interim activation by owner', async () => {
 		const owner = await testDb.createUser({ globalRole: globalOwnerRole });
 		const member = await testDb.createUser({ globalRole: globalMemberRole });
 
@@ -875,7 +875,7 @@ describe('PATCH /workflows/:id - validate interim updates', () => {
 		);
 	});
 
-	it('should block member updating workflow settings on interim update by owner', async () => {
+	xit('should block member updating workflow settings on interim update by owner', async () => {
 		const owner = await testDb.createUser({ globalRole: globalOwnerRole });
 		const member = await testDb.createUser({ globalRole: globalMemberRole });
 
@@ -910,7 +910,7 @@ describe('PATCH /workflows/:id - validate interim updates', () => {
 		);
 	});
 
-	it('should block member updating workflow name on interim update by owner', async () => {
+	xit('should block member updating workflow name on interim update by owner', async () => {
 		const owner = await testDb.createUser({ globalRole: globalOwnerRole });
 		const member = await testDb.createUser({ globalRole: globalMemberRole });
-Original file line number
+Diff line change
@@ Expand Up / @@ -248,7 +248,7 @@ workflowsController.patch( @@
     			updateData,
     			workflowId,
     			tags,
-    			false,
+    			true,
     			['owner'],
     		);
@@ Expand Down @@