@trg-admin/n8n-nodes-zoho-desk 0.1.24 → 0.1.25

package/dist/nodes/ZohoDesk/ZohoDesk.node.d.ts

@@ -14,6 +14,7 @@ import type { IExecuteFunctions, INodeExecutionData, INodeType, INodeTypeDescrip
  * API answer. Upgrade to GET /layouts/{layoutId}/fields/{fieldId}/dependentValues if users
  * hit rejections in tenants that do enforce the mapping.
  */
+export declare function readDepartmentScope(context: ILoadOptionsFunctions): string;
 export declare function loadTaxonomyOptions(context: ILoadOptionsFunctions, apiName: string): Promise<Array<{
     name: string;
     value: string;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZohoDesk = void 0;
+exports.readDepartmentScope = readDepartmentScope;
 exports.loadTaxonomyOptions = loadTaxonomyOptions;
 const n8n_workflow_1 = require("n8n-workflow");
 const GenericFunctions_1 = require("./GenericFunctions");
@@ -29,12 +30,39 @@ function cleanCommaSeparated(value) {
  * API answer. Upgrade to GET /layouts/{layoutId}/fields/{fieldId}/dependentValues if users
  * hit rejections in tenants that do enforce the mapping.
  */
+function readDepartmentScope(context) {
+    const ctx = context;
+    // Top level: the ticket create form carries departmentId directly.
+    try {
+        const current = ctx.getCurrentNodeParameter?.('departmentId');
+        if (current !== undefined && current !== null && current !== '') {
+            return String(current).trim();
+        }
+    }
+    catch {
+        // Not available in this context; fall through.
+    }
+    // Nested: on update, Department lives in the Additional Fields collection. Values inside
+    // a collection are invisible to getCurrentNodeParameter, so read the raw parameters.
+    try {
+        const nested = ctx.getCurrentNodeParameters?.()?.additionalFields
+            ?.departmentId;
+        if (nested !== undefined && nested !== null && nested !== '') {
+            return String(nested).trim();
+        }
+    }
+    catch {
+        // Treat as unscoped.
+    }
+    return '';
+}
 async function loadTaxonomyOptions(context, apiName) {
-    // Taxonomy is department-scoped; only top-level ticket parameters carry a department.
-    const departmentId = context.getCurrentNodeParameter('departmentId');
+    // Taxonomy is department-scoped: without a department the API returns the whole org,
+    // which offers values that the target department's layout may reject.
+    const departmentId = readDepartmentScope(context);
     const qs = { module: 'tickets', apiNames: apiName };
     if (departmentId) {
-        qs.departmentId = String(departmentId);
+        qs.departmentId = departmentId;
     }
     try {
         const responseData = await GenericFunctions_1.zohoDeskApiRequest.call(context, 'GET', '/organizationFields', {}, qs, 0);
@@ -236,10 +264,24 @@ class ZohoDesk {
                             type: 'options',
                             typeOptions: {
                                 loadOptionsMethod: 'getChannels',
-                                loadOptionsDependsOn: ['organizationId'],
+                                loadOptionsDependsOn: ['organizationId', 'departmentId'],
                             },
                             default: 'Email',
-                            description: 'Channel through which the ticket was received or created. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+                            description: 'Channel through which the ticket was received or created, scoped to the selected Department. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+                        },
+                        {
+                            // Create already has a top-level required Department, so only offer this
+                            // here for Update - it both scopes the taxonomy values and moves the ticket.
+                            displayName: 'Department',
+                            name: 'departmentId',
+                            type: 'options',
+                            typeOptions: {
+                                loadOptionsMethod: 'getDepartments',
+                                loadOptionsDependsOn: ['organizationId'],
+                            },
+                            default: '',
+                            displayOptions: { show: { resource: ['ticket'], operation: ['update'] } },
+                            description: 'Department whose layout defines the values offered by the Classification, Category and Sub-Category fields below. Leave blank to list values from every department in the organization. Note: setting this also moves the ticket into that department, so set it to the ticket\'s current department unless you intend to move it.',
                         },
                         {
                             displayName: 'Classification',
@@ -920,7 +962,13 @@ class ZohoDesk {
                     }
                     catch {
                         try {
-                            const fieldsResponse = await GenericFunctions_1.zohoDeskApiRequest.call(this, 'GET', '/organizationFields', {}, { module: 'tickets' }, 0);
+                            // Channel is department-scoped too, so honour the same scope as the taxonomy.
+                            const channelQs = { module: 'tickets', apiNames: 'channel' };
+                            const channelDepartmentId = readDepartmentScope(this);
+                            if (channelDepartmentId) {
+                                channelQs.departmentId = channelDepartmentId;
+                            }
+                            const fieldsResponse = await GenericFunctions_1.zohoDeskApiRequest.call(this, 'GET', '/organizationFields', {}, channelQs, 0);
                             const fields = Array.isArray(fieldsResponse.data)
                                 ? fieldsResponse.data
                                 : Array.isArray(fieldsResponse)

package/package.json

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