mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-26 05:04:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(Date & Time Node): Convert luxon DateTime object to ISO

Browse source
This commit is contained in:
Michael Kret 2023-04-05 13:05:51 +03:00 committed by GitHub
parent f8b9b8b680
commit 77106520c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 174 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/nodes-base/nodes/DateTime/DateTime.node.ts
View file

@ -1,4 +1,5 @@
import type { import type {
IDataObject,
IExecuteFunctions, IExecuteFunctions,
ILoadOptionsFunctions, ILoadOptionsFunctions,
INodeExecutionData, INodeExecutionData,
@ -6,12 +7,15 @@ import type {
INodeType, INodeType,
INodeTypeDescription, INodeTypeDescription,
} from 'n8n-workflow'; } from 'n8n-workflow';
import { deepCopy, NodeOperationError } from 'n8n-workflow'; import { deepCopy, NodeOperationError } from 'n8n-workflow';
import set from 'lodash.set'; import set from 'lodash.set';
import moment from 'moment-timezone'; import moment from 'moment-timezone';
import { DateTime as LuxonDateTime } from 'luxon';
function parseDateByFormat(this: IExecuteFunctions, value: string, fromFormat: string) { function parseDateByFormat(this: IExecuteFunctions, value: string, fromFormat: string) {
const date = moment(value, fromFormat, true); const date = moment(value, fromFormat, true);
if (moment(date).isValid()) return date; if (moment(date).isValid()) return date;
@ -411,12 +415,16 @@ export class DateTime implements INodeType {
item = items[i]; item = items[i];
if (action === 'format') { if (action === 'format') {
const currentDate = this.getNodeParameter('value', i) as string; let currentDate = this.getNodeParameter('value', i) as string;
const dataPropertyName = this.getNodeParameter('dataPropertyName', i); const dataPropertyName = this.getNodeParameter('dataPropertyName', i);
const toFormat = this.getNodeParameter('toFormat', i) as string; const toFormat = this.getNodeParameter('toFormat', i) as string;
const options = this.getNodeParameter('options', i); const options = this.getNodeParameter('options', i);
let newDate; let newDate;
if ((currentDate as unknown as IDataObject) instanceof LuxonDateTime) {
currentDate = (currentDate as unknown as LuxonDateTime).toISO();
}
if (currentDate === undefined) { if (currentDate === undefined) {
continue; continue;
} }

165
packages/nodes-base/nodes/DateTime/test/node/workflow.luxonDateTime.json Normal file
View file

@ -0,0 +1,165 @@
{
"name": "My workflow 10",
"nodes": [
{
"parameters": {},
"id": "4d3b2f7b-1ae9-432d-b765-c6134cd11afc",
"name": "When clicking \"Execute Workflow\"",
"type": "n8n-nodes-base.manualTrigger",
"typeVersion": 1,
"position": [-60, 2060]
},
{
"parameters": {
"value": "={{ DateTime.fromISO($json.testData) }}",
"toFormat": "X",
"options": {
"toTimezone": "UTC"
}
},
"id": "31ad53db-5cfd-44e5-917b-b90105ae687d",
"name": "Date & Time",
"type": "n8n-nodes-base.dateTime",
"typeVersion": 1,
"position": [400, 1960]
},
{
"parameters": {
"value": "={{ DateTime.fromISO($json.testData).minus({days:1}) }}",
"toFormat": "X",
"options": {
"toTimezone": "UTC"
}
},
"id": "f959c146-2cd3-4bc5-aa55-5b974466ba90",
"name": "Date & Time1",
"type": "n8n-nodes-base.dateTime",
"typeVersion": 1,
"position": [400, 2180]
},
{
"parameters": {
"value": "={{ Number($json.data) }}",
"toFormat": "YYYY-MM-DD",
"options": {
"toTimezone": "UTC"
}
},
"id": "8bf5b635-607e-4207-8b0e-66f0540b103c",
"name": "Date & Time2",
"type": "n8n-nodes-base.dateTime",
"typeVersion": 1,
"position": [620, 1960]
},
{
"parameters": {
"value": "={{ Number($json.data) }}",
"toFormat": "YYYY-MM-DD",
"options": {
"toTimezone": "UTC"
}
},
"id": "350ce053-d415-4a7d-8447-6d7c73758f35",
"name": "Date & Time3",
"type": "n8n-nodes-base.dateTime",
"typeVersion": 1,
"position": [620, 2180]
},
{
"parameters": {
"keepOnlySet": true,
"values": {
"string": [
{
"name": "testData",
"value": "2023-03-31T06:31:01.000"
}
]
},
"options": {}
},
"id": "b57950a6-3a6a-4e23-8c3b-16abe12bfe16",
"name": "Set",
"type": "n8n-nodes-base.set",
"typeVersion": 2,
"position": [140, 2060]
}
],
"pinData": {
"Date & Time2": [
{
"json": {
"testData": "2023-03-31T06:31:01.000",
"data": "2023-03-31"
}
}
],
"Date & Time3": [
{
"json": {
"testData": "2023-03-31T06:31:01.000",
"data": "2023-03-30"
}
}
]
},
"connections": {
"When clicking \"Execute Workflow\"": {
"main": [
[
{
"node": "Set",
"type": "main",
"index": 0
}
]
]
},
"Date & Time": {
"main": [
[
{
"node": "Date & Time2",
"type": "main",
"index": 0
}
]
]
},
"Date & Time1": {
"main": [
[
{
"node": "Date & Time3",
"type": "main",
"index": 0
}
]
]
},
"Set": {
"main": [
[
{
"node": "Date & Time",
"type": "main",
"index": 0
},
{
"node": "Date & Time1",
"type": "main",
"index": 0
}
]
]
}
},
"active": false,
"settings": {},
"versionId": "ff99618e-6e8e-49d8-b899-021caff6d01d",
"id": "151",
"meta": {
"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
},
"tags": []
}