mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse source 
* fix: Disable workflow locking due to issues
This commit is contained in:
Omar Ajoue 2022-11-24 09:52:24 +01:00 committed by GitHub
parent b6c57e19fc
commit ee6ac5d341
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/cli/src/workflows/workflows.controller.ee.ts
View file

@ -211,7 +211,7 @@ EEWorkflowController.patch(
'/:id(\\d+)', '/:id(\\d+)',
ResponseHelper.send(async (req: WorkflowRequest.Update) => { ResponseHelper.send(async (req: WorkflowRequest.Update) => {
const { id: workflowId } = req.params; 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 updateData = new WorkflowEntity();
const { tags, ...rest } = req.body; const { tags, ...rest } = req.body;
@ -224,7 +224,7 @@ EEWorkflowController.patch(
safeWorkflow, safeWorkflow,
workflowId, workflowId,
tags, tags,
forceSave, true,
); );
const { id, ...remainder } = updatedWorkflow; const { id, ...remainder } = updatedWorkflow;

2
packages/cli/src/workflows/workflows.controller.ts
View file

@ -248,7 +248,7 @@ workflowsController.patch(
updateData, updateData,
workflowId, workflowId,
tags, tags,
false, true,
['owner'], ['owner'],
); );

12
packages/cli/test/integration/workflows.controller.ee.test.ts
View file

@ -731,7 +731,7 @@ describe('PATCH /workflows/:id - validate credential permissions to user', () =>
}); });
describe('PATCH /workflows/:id - validate interim updates', () => { 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 owner = await testDb.createUser({ globalRole: globalOwnerRole });
const member = await testDb.createUser({ globalRole: globalMemberRole }); 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 owner = await testDb.createUser({ globalRole: globalOwnerRole });
const member = await testDb.createUser({ globalRole: globalMemberRole }); 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 owner = await testDb.createUser({ globalRole: globalOwnerRole });
const member = await testDb.createUser({ globalRole: globalMemberRole }); 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 owner = await testDb.createUser({ globalRole: globalOwnerRole });
const member = await testDb.createUser({ globalRole: globalMemberRole }); 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 owner = await testDb.createUser({ globalRole: globalOwnerRole });
const member = await testDb.createUser({ globalRole: globalMemberRole }); 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 owner = await testDb.createUser({ globalRole: globalOwnerRole });
const member = await testDb.createUser({ globalRole: globalMemberRole }); const member = await testDb.createUser({ globalRole: globalMemberRole });