From 687f6087146aa9194ad37b69fec79cc00fecfbff Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 12 Jul 2020 17:18:50 +0200
Subject: [PATCH] :zap: Small adjustment to HN-Node

---
 .../nodes/HackerNews/HackerNews.node.ts       | 66 +++++++++++++------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts b/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
index 65afe2b83c..b77d5d35bd 100644
--- a/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
+++ b/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
@@ -38,6 +38,10 @@ export class HackerNews implements INodeType {
 				name: 'resource',
 				type: 'options',
 				options: [
+					{
+						name: 'All',
+						value: 'all',
+					},
 					{
 						name: 'Article',
 						value: 'article',
@@ -50,9 +54,32 @@ export class HackerNews implements INodeType {
 				default: 'article',
 				description: 'Resource to consume.',
 			},
+
+
 			// ----------------------------------
 			//         Operations
 			// ----------------------------------
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				displayOptions: {
+					show: {
+						resource: [
+							'all',
+						],
+					},
+				},
+				options: [
+					{
+						name: 'Get All',
+						value: 'getAll',
+						description: 'Get all items',
+					},
+				],
+				default: 'getAll',
+				description: 'Operation to perform.',
+			},
 			{
 				displayName: 'Operation',
 				name: 'operation',
@@ -70,11 +97,6 @@ export class HackerNews implements INodeType {
 						value: 'get',
 						description: 'Get a Hacker News article',
 					},
-					{
-						name: 'Get All',
-						value: 'getAll',
-						description: 'Get all Hacker News articles',
-					},
 				],
 				default: 'get',
 				description: 'Operation to perform.',
@@ -148,7 +170,7 @@ export class HackerNews implements INodeType {
 				displayOptions: {
 					show: {
 						resource: [
-							'article',
+							'all',
 						],
 						operation: [
 							'getAll',
@@ -160,12 +182,12 @@ export class HackerNews implements INodeType {
 				displayName: 'Limit',
 				name: 'limit',
 				type: 'number',
-				default: 5,
+				default: 100,
 				description: 'Limit of Hacker News articles to be returned for the query.',
 				displayOptions: {
 					show: {
 						resource: [
-							'article',
+							'all',
 						],
 						operation: [
 							'getAll',
@@ -211,7 +233,7 @@ export class HackerNews implements INodeType {
 				displayOptions: {
 					show: {
 						resource: [
-							'article',
+							'all',
 						],
 						operation: [
 							'getAll',
@@ -285,15 +307,8 @@ export class HackerNews implements INodeType {
 			let endpoint = '';
 			let includeComments = false;
 
-			if (resource === 'article') {
-
-				if (operation === 'get') {
-
-					endpoint = `items/${this.getNodeParameter('articleId', i)}`;
-					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
-					includeComments = additionalFields.includeComments as boolean;
-
-				} else if (operation === 'getAll') {
+			if (resource === 'all') {
+				if (operation === 'getAll') {
 
 					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
 					const keyword = additionalFields.keyword as string;
@@ -301,7 +316,7 @@ export class HackerNews implements INodeType {
 
 					qs = {
 						query: keyword,
-						tags: tags ?  tags.join() : '',
+						tags: tags ? tags.join() : '',
 					};
 
 					returnAll = this.getNodeParameter('returnAll', i) as boolean;
@@ -315,6 +330,17 @@ export class HackerNews implements INodeType {
 				} else {
 					throw new Error(`The operation '${operation}' is unknown!`);
 				}
+			} else if (resource === 'article') {
+
+				if (operation === 'get') {
+
+					endpoint = `items/${this.getNodeParameter('articleId', i)}`;
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+					includeComments = additionalFields.includeComments as boolean;
+
+				} else {
+					throw new Error(`The operation '${operation}' is unknown!`);
+				}
 
 			} else if (resource === 'user') {
 
@@ -335,7 +361,7 @@ export class HackerNews implements INodeType {
 				responseData = await hackerNewsApiRequestAllItems.call(this, 'GET', endpoint, qs);
 			} else {
 				responseData = await hackerNewsApiRequest.call(this, 'GET', endpoint, qs);
-				if (resource === 'article' && operation === 'getAll') {
+				if (resource === 'all' && operation === 'getAll') {
 					responseData = responseData.hits;
 				}
 			}