From 934340d59f489def2457e7a913fc25960de26d0e Mon Sep 17 00:00:00 2001 From: Jan Oberhauser Date: Wed, 22 Apr 2020 10:05:45 +0200 Subject: [PATCH] :zap: Further simplified ClickUp-Dependency --- .../nodes-base/nodes/ClickUp/ClickUp.node.ts | 23 ++----- .../ClickUp/TaskDependencyDescription.ts | 68 ++----------------- 2 files changed, 11 insertions(+), 80 deletions(-) diff --git a/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts b/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts index b638e8c9e9..5562274887 100644 --- a/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts +++ b/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts @@ -885,29 +885,20 @@ export class ClickUp implements INodeType { if (resource === 'taskDependency') { if (operation === 'create') { const taskId = this.getNodeParameter('task', i) as string; - const dependecyIs = this.getNodeParameter('is', i) as string; - const theTaskId = this.getNodeParameter('theTaskId', i) as string; + const dependsOnTaskId = this.getNodeParameter('dependsOnTask', i) as string; const body: IDataObject = {}; - if (dependecyIs === 'waitingOn') { - body.depends_on = theTaskId; - } - if (dependecyIs === 'blocking') { - body.dependency_of = theTaskId; - } + + body.depends_on = dependsOnTaskId; + responseData = await clickupApiRequest.call(this, 'POST', `/task/${taskId}/dependency`, body); responseData = { success: true }; } if (operation === 'delete') { const taskId = this.getNodeParameter('task', i) as string; - const dependecyIs = this.getNodeParameter('is', i) as string; - const theTaskId = this.getNodeParameter('theTaskId', i) as string; + const dependsOnTaskId = this.getNodeParameter('dependsOnTask', i) as string; + + qs.depends_on = dependsOnTaskId; - if (dependecyIs === 'waitingOn') { - qs.depends_on = theTaskId; - } - if (dependecyIs === 'blocking') { - qs.dependency_of = theTaskId; - } responseData = await clickupApiRequest.call(this, 'DELETE', `/task/${taskId}/dependency`, {}, qs); responseData = { success: true }; } diff --git a/packages/nodes-base/nodes/ClickUp/TaskDependencyDescription.ts b/packages/nodes-base/nodes/ClickUp/TaskDependencyDescription.ts index 48f2254358..2f5d19ba0a 100644 --- a/packages/nodes-base/nodes/ClickUp/TaskDependencyDescription.ts +++ b/packages/nodes-base/nodes/ClickUp/TaskDependencyDescription.ts @@ -54,38 +54,8 @@ export const taskDependencyFields = [ required: true, }, { - displayName: 'Is', - name: 'is', - type: 'options', - default: '', - options: [ - { - name: 'Bloking', - value: 'blocking', - description: `Tasks that can't start until the task above is completed`, - }, - { - name: 'Waiting On', - value: 'waitingOn', - description: `Tasks that must be completed before the task above`, - }, - ], - displayOptions: { - show: { - resource: [ - 'taskDependency', - ], - operation: [ - 'create', - ], - }, - }, - description: 'Dependency type between the two tasks', - required: true, - }, - { - displayName: 'The Task ID', - name: 'theTaskId', + displayName: 'Depends On Task ID', + name: 'dependsOnTask', type: 'string', displayOptions: { show: { @@ -120,38 +90,8 @@ export const taskDependencyFields = [ required: true, }, { - displayName: 'Is', - name: 'is', - type: 'options', - default: '', - options: [ - { - name: 'Bloking', - value: 'blocking', - description: `Tasks that can't start until the task above is completed`, - }, - { - name: 'Waiting On', - value: 'waitingOn', - description: `Tasks that must be completed before the task above`, - }, - ], - displayOptions: { - show: { - resource: [ - 'taskDependency', - ], - operation: [ - 'delete', - ], - }, - }, - description: 'Dependency type between the two tasks', - required: true, - }, - { - displayName: 'The Task ID', - name: 'theTaskId', + displayName: 'Depends On Task ID', + name: 'dependsOnTask', type: 'string', displayOptions: { show: {