n8n-nodes-qlik-cloud 1.0.17 → 1.1.0

package/src/nodes/QlikCloud/resources/assistants/index.ts

@@ -2,6 +2,33 @@ import type { INodeProperties } from 'n8n-workflow';
 
 // Get All Assistants
 export const assistantsGetAllDescription: INodeProperties[] = [
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		displayOptions: {
+			show: {
+				resource: ['assistants'],
+				operation: ['getAll'],
+			},
+		},
+		description: 'Whether to return all assistants',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		default: 50,
+		displayOptions: {
+			show: {
+				resource: ['assistants'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		description: 'The number of assistants to get',
+	},
 	{
 		displayName: 'Options',
 		name: 'options',
@@ -15,13 +42,6 @@ export const assistantsGetAllDescription: INodeProperties[] = [
 			},
 		},
 		options: [
-			{
-				displayName: 'Limit',
-				name: 'limit',
-				type: 'number',
-				default: 50,
-				description: 'The number of assistants to get',
-			},
 			{
 				displayName: 'Next Page',
 				name: 'next',

package/src/nodes/QlikCloud/shared/transport.ts

@@ -1,7 +1,7 @@
 import type {
 	IExecuteFunctions,
-	IHttpRequestOptions,
 	IHttpRequestMethods,
+	IHttpRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -9,9 +9,11 @@ export async function qlikApiRequest(
 	this: IExecuteFunctions,
 	method: IHttpRequestMethods,
 	endpoint: string,
-	body?: Record<string, any>,
+	body?: any,
 	qs?: Record<string, any>,
-): Promise<Record<string, any>> {
+	returnFullResponse: boolean = false,
+	extraOptions: Partial<IHttpRequestOptions> = {},
+): Promise<any> {
 	const credentials = await this.getCredentials('qlikCloudApi');
 
 	if (!credentials) {
@@ -20,17 +22,24 @@ export async function qlikApiRequest(
 		} as any);
 	}
 
-	const baseUrl = credentials.baseUrl as string;
+	const baseUrl = (credentials.baseUrl as string).replace(/\/+$/, '');
 	const accessToken = credentials.accessToken as string;
+	const url = `${baseUrl}${endpoint.startsWith('/') ? endpoint : `/${endpoint}`}`;
+
+	const headers = {
+		Authorization: `Bearer ${accessToken}`,
+		'Content-Type': 'application/json',
+		...(extraOptions.headers || {}),
+	};
 
 	const options: IHttpRequestOptions = {
-		headers: {
-			Authorization: `Bearer ${accessToken}`,
-			'Content-Type': 'application/json',
-		},
 		method,
-		url: `${baseUrl}${endpoint}`,
+		url,
 		qs,
+		json: extraOptions.json ?? true,
+		returnFullResponse,
+		...extraOptions,
+		headers,
 	};
 
 	if (body !== undefined) {
@@ -40,8 +49,9 @@ export async function qlikApiRequest(
 	try {
 		return await this.helpers.httpRequest(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), {
-			message: (error as Error).message,
+		const errMessage = error instanceof Error ? error.message : typeof error === 'string' ? error : JSON.stringify(error);
+		throw new NodeApiError(this.getNode(), { message: errMessage }, {
+			message: 'Qlik Cloud API request failed',
 		} as any);
 	}
 }