@pokash/n8n-nodes-optima-rest-api 1.3.0 → 1.3.1

package/dist/nodes/OptimaRestApi/OptimaRestApi.node.js

@@ -486,36 +486,54 @@ class OptimaRestApi {
                     ],
                     default: 'printDocument',
                 },
-                // Print SQL Filter
+                // Print Format ID
                 {
-                    displayName: 'SQL Filter',
-                    name: 'filtrSQL',
-                    type: 'string',
-                    required: false,
+                    displayName: 'Format ID',
+                    name: 'formatId',
+                    type: 'number',
+                    required: true,
                     displayOptions: {
                         show: {
                             resource: ['print'],
                             operation: ['printDocument'],
                         },
                     },
-                    default: '',
-                    placeholder: 'TrN_TrnId = 123',
-                    description: 'SQL filter to select documents (e.g. "TrN_TrNID = 123" or "EDN_EDNId = 1002")',
+                    default: 1,
+                    description: 'ID of the print format from Optima',
                 },
-                // Print Format ID
+                // Print SQL Filter
                 {
-                    displayName: 'Format ID',
-                    name: 'formatId',
-                    type: 'number',
-                    required: true,
+                    displayName: 'SQL Filter',
+                    name: 'filtrSQL',
+                    type: 'fixedCollection',
+                    typeOptions: {
+                        multipleValues: false,
+                        multipleValueButtonText: 'Add Filter',
+                    },
                     displayOptions: {
                         show: {
                             resource: ['print'],
                             operation: ['printDocument'],
                         },
                     },
-                    default: 1,
-                    description: 'ID of the print format from Optima',
+                    default: {},
+                    description: 'SQL filter to select documents',
+                    options: [
+                        {
+                            name: 'filter',
+                            displayName: 'Filter',
+                            values: [
+                                {
+                                    displayName: 'Expression',
+                                    name: 'expression',
+                                    type: 'string',
+                                    default: '',
+                                    placeholder: 'TrN_TrNID = 123',
+                                    description: 'SQL filter expression (e.g. "EDN_EDNId = 1002")',
+                                },
+                            ],
+                        },
+                    ],
                 },
                 // Print Dynamic Parameters
                 {
@@ -524,6 +542,7 @@ class OptimaRestApi {
                     type: 'fixedCollection',
                     typeOptions: {
                         multipleValues: true,
+                        multipleValueButtonText: 'Add Parameter',
                     },
                     displayOptions: {
                         show: {
@@ -532,7 +551,6 @@ class OptimaRestApi {
                         },
                     },
                     default: {},
-                    placeholder: 'Add Parameter',
                     description: 'Dynamic parameters passed to the print template',
                     options: [
                         {
@@ -544,14 +562,14 @@ class OptimaRestApi {
                                     name: 'name',
                                     type: 'string',
                                     default: '',
-                                    description: 'Parameter name as defined in the print template',
+                                    placeholder: 'Parameter name',
                                 },
                                 {
                                     displayName: 'Value',
                                     name: 'value',
                                     type: 'string',
                                     default: '',
-                                    description: 'Parameter value',
+                                    placeholder: 'Parameter value',
                                 },
                             ],
                         },
@@ -974,14 +992,17 @@ class OptimaRestApi {
                 }
                 else if (resource === 'print') {
                     if (operation === 'printDocument') {
-                        const filtrSQL = this.getNodeParameter('filtrSQL', i, '');
                         const formatId = this.getNodeParameter('formatId', i);
+                        const filtrSQLRaw = this.getNodeParameter('filtrSQL', i, {});
                         const dynamicParamsRaw = this.getNodeParameter('dynamicParameters', i, {});
                         const requestBody = {
                             FormatId: formatId,
                         };
-                        if (filtrSQL) {
-                            requestBody.FiltrSQL = filtrSQL;
+                        if (filtrSQLRaw.filter) {
+                            const filter = filtrSQLRaw.filter;
+                            if (filter.expression) {
+                                requestBody.FiltrSQL = filter.expression;
+                            }
                         }
                         if (dynamicParamsRaw.parameter) {
                             const params = dynamicParamsRaw.parameter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pokash/n8n-nodes-optima-rest-api",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "n8n node for Comarch Optima REST API integration",
   "keywords": [
     "n8n-community-node-package",