Code and UI Improvements

Pankil Joshi · Pankil Joshi · commit 1d6cf30d8cfb · 2023-10-30T00:02:18.000+05:30
diff --git a/credentials/LowcoderApi.credentials.ts b/credentials/LowcoderApi.credentials.ts
@@ -30,12 +30,6 @@ export class LowcoderApi implements ICredentialType {
 			type: 'string',
 			default: '',
 		},
-        {
-			displayName: 'API Token',
-			name: 'apiToken',
-			type: 'string',
-			default: '',
-		},
 		{
 			displayName: 'Username',
 			name: 'username',
@@ -68,9 +62,6 @@ export class LowcoderApi implements ICredentialType {
 				source: "EMAIL",
 				authId: "EMAIL"
 			},
-			headers: {
-				LOWCODER_CE_SELFHOST_TOKEN: credentials.apiToken
-			},
 			returnFullResponse: true
 		} as IHttpRequestOptions;
 		try {
diff --git a/nodes/Lowcoder/AppDescription.ts b/nodes/Lowcoder/AppDescription.ts
@@ -5,7 +5,7 @@ export const appFields: INodeProperties[] = [
 	//         app:create
 	// ----------------------------------
 	{
-		displayName: 'App',
+		displayName: 'Select App or Module',
 		name: 'appId',
 		type: 'resourceLocator',
 		default: { mode: 'list', value: '' },
@@ -41,7 +41,7 @@ export const appFields: INodeProperties[] = [
 ];
 
 export const httpMethodsProperty: INodeProperties = {
-	displayName: 'HTTP Method',
+	displayName: 'Webhook HTTP Method',
 	name: 'httpMethod',
 	type: 'options',
 	options: [
diff --git a/nodes/Lowcoder/Lowcoder.node.ts b/nodes/Lowcoder/Lowcoder.node.ts
@@ -32,7 +32,7 @@ export class Lowcoder implements INodeType {
         icon: 'file:lowcoder.png',
         group: ['transform'],
         version: 1,
-		subtitle: '={{$parameter["resource"] }}:{{ $parameter["appId"]',
+		subtitle: '=app:{{ $parameter["appId"]',
         description: 'Consume Lowcoder API',
         defaults: {
             name: 'Lowcoder',
@@ -61,23 +61,15 @@ export class Lowcoder implements INodeType {
             },
 		],
         properties: [
-            {
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'App',
-						value: 'app',
-					}
-				],
-				default: 'app',
-			},
             ...appFields,
             {
-				displayName:
-					'The webhook URL will be generated at run time. It can be referenced with the <strong>$execution.resumeUrl</strong> variable. Send it somewhere before getting to this node. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.wait/?utm_source=n8n_app&utm_medium=node_settings_modal-credential_link&utm_campaign=n8n-nodes-base.wait" target="_blank">More info</a>',
+				displayName: 'Resume the workflow by calling this Webhook: http(s)://{n8n-url}/webhook-waiting/{Workflow-Execution-ID}/{Lowcoder-App-ID}',
+				name: 'webhookNotice',
+				type: 'notice',
+				default: '',
+			},
+			{
+				displayName: 'The Workflow-Execution-ID is available via the n8n Rest API',
 				name: 'webhookNotice',
 				type: 'notice',
 				default: '',
@@ -104,7 +96,7 @@ export class Lowcoder implements INodeType {
                         withContainerSize: false
 					},
 				);
-
+					console.log(searchResults);
 				return {
 					results: searchResults.data.map((b: LowcoderAppType) => ({
 						name: `${b.name} (${b.applicationType == 2 ? "Module" : "App"})`,
@@ -134,15 +126,14 @@ export class Lowcoder implements INodeType {
             resp.end(error.message);
             return { noWebhookResponse: true };
 		}
-        // const { data } = req.body;
-
+		const body = typeof req.body != 'undefined' ? req.body : {};
         const returnItem: INodeExecutionData = {
             binary: {},
             json: {
                 headers: req.headers,
                 params: req.params,
                 query: req.query,
-                // body: data,
+                body: body,
             },
         };
         return { workflowData: [[returnItem]] };
