@trg-admin/n8n-nodes-zoho-desk 0.1.19 → 0.1.20

package/dist/nodes/ZohoDesk/GenericFunctions.js

@@ -85,17 +85,25 @@ async function zohoDeskApiRequest(method, endpoint, body = {}, qs = {}, itemInde
 async function zohoDeskApiRequestAllItems(method, endpoint, body = {}, qs = {}, itemIndex = 0) {
     const returnData = [];
     let responseData;
-    qs.limit = 100; // Zoho Desk max limit per page
-    qs.from = 0;
+    const query = {
+        ...qs,
+        limit: qs.limit || 100,
+        from: qs.from || 0,
+    };
     do {
-        responseData = await zohoDeskApiRequest.call(this, method, endpoint, body, qs, itemIndex);
-        if (responseData.data && Array.isArray(responseData.data)) {
-            returnData.push(...responseData.data);
-            if (responseData.data.length < 100) {
+        responseData = await zohoDeskApiRequest.call(this, method, endpoint, body, query, itemIndex);
+        const items = Array.isArray(responseData?.data)
+            ? responseData.data
+            : Array.isArray(responseData)
+                ? responseData
+                : [];
+        if (items.length > 0) {
+            returnData.push(...items);
+            if (items.length < query.limit) {
                 // Last page
                 break;
             }
-            qs.from = qs.from + 100;
+            query.from = query.from + items.length;
         }
         else {
             break;

package/dist/nodes/ZohoDesk/ZohoDesk.node.js

@@ -459,13 +459,9 @@ class ZohoDesk {
             loadOptions: {
                 async getDepartments() {
                     try {
-                        const responseData = await GenericFunctions_1.zohoDeskApiRequest.call(this, 'GET', '/departments', {}, {}, 0);
-                        const departments = Array.isArray(responseData.data)
-                            ? responseData.data
-                            : Array.isArray(responseData)
-                                ? responseData
-                                : [];
-                        return departments.map((department) => {
+                        const departments = (await GenericFunctions_1.zohoDeskApiRequestAllItems.call(this, 'GET', '/departments', {}, {}, 0));
+                        return departments
+                            .map((department) => {
                             const name = department.name ||
                                 department.departmentName ||
                                 String(department.id);
@@ -473,7 +469,8 @@ class ZohoDesk {
                                 name,
                                 value: department.id,
                             };
-                        });
+                        })
+                            .sort((a, b) => a.name.localeCompare(b.name));
                     }
                     catch (error) {
                         throw new Error(`Failed to load departments. Error: ${error.message}. Ensure Organization ID is correct and Desk API Base URL matches your region.`);

package/dist/nodes/ZohoDesk/ZohoDeskTrigger.node.js

@@ -27,7 +27,7 @@ function getDeskBaseUrl(tokenUrl = '', apiDomain = '', overrideBaseUrl = '') {
         return 'https://desk.zoho.com.cn';
     return 'https://desk.zoho.com';
 }
-async function deskRequest(context, method, endpoint, organizationId, body = {}) {
+async function deskRequest(context, method, endpoint, organizationId, body = {}, qs = {}) {
     const credentials = (await context.getCredentials('zohoCRMDeskOAuth2Api'));
     const { oauthTokenData, accessTokenUrl, authUrl, deskBaseUrl } = credentials;
     const baseUrl = getDeskBaseUrl(accessTokenUrl || authUrl || '', oauthTokenData?.api_domain || '', deskBaseUrl || '');
@@ -40,6 +40,9 @@ async function deskRequest(context, method, endpoint, organizationId, body = {})
         },
         json: true,
     };
+    if (Object.keys(qs).length) {
+        options.qs = qs;
+    }
     if (method !== 'GET' && method !== 'DELETE' && Object.keys(body).length) {
         options.body = body;
     }
@@ -50,6 +53,34 @@ async function deskRequest(context, method, endpoint, organizationId, body = {})
         throw new n8n_workflow_1.NodeApiError(context.getNode(), error);
     }
 }
+async function deskRequestAllItems(context, method, endpoint, organizationId, body = {}, qs = {}) {
+    const returnData = [];
+    let responseData;
+    const query = {
+        ...qs,
+        limit: qs.limit || 100,
+        from: qs.from || 0,
+    };
+    do {
+        responseData = await deskRequest(context, method, endpoint, organizationId, body, query);
+        const items = Array.isArray(responseData?.data)
+            ? responseData.data
+            : Array.isArray(responseData)
+                ? responseData
+                : [];
+        if (items.length > 0) {
+            returnData.push(...items);
+            if (items.length < query.limit) {
+                break;
+            }
+            query.from = query.from + items.length;
+        }
+        else {
+            break;
+        }
+    } while (true);
+    return returnData;
+}
 async function deskWebhookRequest(context, method, endpoint, body = {}) {
     const organizationId = context.getNodeParameter('organizationId');
     return deskRequest(context, method, endpoint, organizationId, body);
@@ -208,16 +239,13 @@ class ZohoDeskTrigger {
                 async getDepartments() {
                     const organizationId = this.getNodeParameter('organizationId', 0, '');
                     try {
-                        const responseData = await deskRequest(this, 'GET', '/departments', organizationId);
-                        const departments = Array.isArray(responseData.data)
-                            ? responseData.data
-                            : Array.isArray(responseData)
-                                ? responseData
-                                : [];
-                        return departments.map((dept) => ({
+                        const departments = await deskRequestAllItems(this, 'GET', '/departments', organizationId);
+                        return departments
+                            .map((dept) => ({
                             name: dept.name || dept.departmentName || String(dept.id),
                             value: dept.id,
-                        }));
+                        }))
+                            .sort((a, b) => a.name.localeCompare(b.name));
                     }
                     catch (error) {
                         throw new Error(`Failed to load departments: ${error.message}. Ensure Organization ID is set correctly.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trg-admin/n8n-nodes-zoho-desk",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "Community n8n node starter for Zoho Desk using built-in Zoho OAuth2 auth behavior",
   "license": "MIT",
   "type": "commonjs",