feat(Jira Node): Use Jira rendered fields with simplify option (#3323)

* 💄 Use Jira rendered fields with simplify

* 🐛 Merge the renderedField results with fields

* ⚡ improvements

* ⚡ Improvements

Co-authored-by: Michael Kret <michael.k@radency.com>
Co-authored-by: ricardo <ricardoespinoza105@gmail.com>

packages/nodes-base/nodes/Jira/Jira.node.ts

@@ -1,6 +1,7 @@
+
 import {
-	OptionsWithUri,
-} from 'request';
+	mergeWith,
+} from 'lodash';
 
 import {
 	IExecuteFunctions,
@@ -9,16 +10,12 @@ import {
 import {
 	IBinaryData,
 	IBinaryKeyData,
-	ICredentialsDecrypted,
-	ICredentialTestFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
-	INodeCredentialTestResult,
 	INodeExecutionData,
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
-	JsonObject,
 	NodeOperationError,
 } from 'n8n-workflow';
 
@@ -82,7 +79,6 @@ export class Jira implements INodeType {
 						],
 					},
 				},
-				testedBy: 'jiraSoftwareApiTest',
 			},
 			{
 				name: 'jiraSoftwareServerApi',
@@ -94,7 +90,6 @@ export class Jira implements INodeType {
 						],
 					},
 				},
-				testedBy: 'jiraSoftwareApiTest',
 			},
 		],
 		properties: [
@@ -155,40 +150,6 @@ export class Jira implements INodeType {
 	};
 
 	methods = {
-		credentialTest: {
-			async jiraSoftwareApiTest(this: ICredentialTestFunctions, credential: ICredentialsDecrypted): Promise<INodeCredentialTestResult> {
-				const credentials = credential.data;
-				const data = Buffer.from(`${credentials!.email}:${credentials!.password || credentials!.apiToken}`).toString('base64');
-
-				const options: OptionsWithUri = {
-					headers: {
-						Authorization: `Basic ${data}`,
-						Accept: 'application/json',
-						'Content-Type': 'application/json',
-						'X-Atlassian-Token': 'no-check',
-					},
-					method: 'GET',
-					uri: `${credentials!.domain}/rest/api/2/project`,
-					qs: {
-						recent: 0,
-					},
-					json: true,
-					timeout: 5000,
-				};
-				try {
-					await this.helpers.request!(options);
-				} catch (err) {
-					return {
-						status: 'Error',
-						message: `Connection details not valid: ${(err as JsonObject).message}`,
-					};
-				}
-				return {
-					status: 'OK',
-					message: 'Authentication successful!',
-				};
-			},
-		},
 		loadOptions: {
 			// Get all the projects to display them to user so that he can
 			// select them easily
@@ -651,6 +612,17 @@ export class Jira implements INodeType {
 					responseData = await jiraSoftwareCloudApiRequest.call(this, `/api/2/issue/${issueKey}`, 'GET', {}, qs);
 
 					if (simplifyOutput) {
+						// Use rendered fields if requested and available
+						qs.expand = qs.expand || '';
+						if (
+							(qs.expand as string).toLowerCase().indexOf('renderedfields') !== -1 &&
+							responseData.renderedFields && Object.keys(responseData.renderedFields).length
+						) {
+							responseData.fields = mergeWith(
+								responseData.fields,
+								responseData.renderedFields,
+								(a,b) => b === null ? a : b);
+						}
 						returnData.push(simplifyIssueOutput(responseData));
 					} else {
 						returnData.push(responseData);