From e3905f753c1356a6f365e8cc9e74572bb25a2f84 Mon Sep 17 00:00:00 2001
From: Hao Huynh <h40huynh@gmail.com>
Date: Fri, 16 Aug 2024 00:47:39 +0700
Subject: [PATCH] Fix objectId param

---
 .../observable/executeResponder.operation.ts  | 55 +++++++++----------
 .../descriptions/common.description.ts        |  2 +-
 2 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeResponder.operation.ts
index 5f75bc9367..fec9e2a8f8 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeResponder.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeResponder.operation.ts
@@ -22,48 +22,43 @@ export const description = updateDisplayOptions(displayOptions, properties);
 export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
 	let responseData: IDataObject | IDataObject[] = [];
 
-	const observableId = this.getNodeParameter('id', i);
+	const observableId = this.getNodeParameter('id', i, '', {
+		extractValue: true,
+	}) as string;
 	const responderId = this.getNodeParameter('responder', i) as string;
 	let body: IDataObject;
-	let response;
+
 	responseData = [];
 	body = {
 		responderId,
 		objectId: observableId,
 		objectType: 'case_artifact',
 	};
-	response = await theHiveApiRequest.call(this, 'POST', '/connector/cortex/action' as string, body);
-	body = {
-		query: [
-			{
-				_name: 'listAction',
-			},
-			{
-				_name: 'filter',
-				_and: [
-					{
-						_field: 'cortexId',
-						_value: response.cortexId,
-					},
-					{
-						_field: 'objectId',
-						_value: response.objectId,
-					},
-					{
-						_field: 'startDate',
-						_value: response.startDate,
-					},
-				],
-			},
-		],
-	};
+	const response = await theHiveApiRequest.call(
+		this,
+		'POST',
+		'/connector/cortex/action' as string,
+		body,
+	);
+	body = {};
 	const qs: IDataObject = {};
 	qs.name = 'log-actions';
+	let observableAction;
 	do {
-		response = await theHiveApiRequest.call(this, 'POST', '/v1/query', body, qs);
-	} while (response.status === 'Waiting' || response.status === 'InProgress');
+		observableAction = await theHiveApiRequest.call(
+			this,
+			'GET',
+			`/connector/cortex/action/case_artifact/${observableId}`,
+			body,
+			qs,
+		);
 
-	responseData = response;
+		observableAction = observableAction.find(
+			(action: any) => action._createdAt == response._createdAt,
+		);
+	} while (observableAction.status === 'Waiting' || observableAction.status === 'InProgress');
+
+	responseData = observableAction;
 
 	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
 		itemData: { item: i },
diff --git a/packages/nodes-base/nodes/TheHiveProject/descriptions/common.description.ts b/packages/nodes-base/nodes/TheHiveProject/descriptions/common.description.ts
index b1ce20094a..cc77aea67e 100644
--- a/packages/nodes-base/nodes/TheHiveProject/descriptions/common.description.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/descriptions/common.description.ts
@@ -35,7 +35,7 @@ export const responderOptions: INodeProperties = {
 	required: true,
 	default: '',
 	typeOptions: {
-		loadOptionsDependsOn: ['id', 'id.value'],
+		loadOptionsDependsOn: ['id.value'],
 		loadOptionsMethod: 'loadResponders',
 	},
 	displayOptions: {