From 684d71752064e25143e09666e539b91b3dcd5f71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Tue, 21 Feb 2023 11:27:15 +0100
Subject: [PATCH] fix(editor): Fix unexpected date rendering on front-end
 (#5528)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🔥 Remove front-end date rendering logic that changes date timezone to workflow TZ
---
 packages/editor-ui/src/components/RunDataJson.vue  |  8 ++------
 packages/editor-ui/src/components/RunDataTable.vue | 11 +----------
 packages/editor-ui/src/utils/typesUtils.ts         | 14 --------------
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/packages/editor-ui/src/components/RunDataJson.vue b/packages/editor-ui/src/components/RunDataJson.vue
index 149c2fa063..97f5d365a9 100644
--- a/packages/editor-ui/src/components/RunDataJson.vue
+++ b/packages/editor-ui/src/components/RunDataJson.vue
@@ -73,7 +73,7 @@ import VueJsonPretty from 'vue-json-pretty';
 import { LOCAL_STORAGE_MAPPING_FLAG } from '@/constants';
 import { IDataObject, INodeExecutionData } from 'n8n-workflow';
 import Draggable from '@/components/Draggable.vue';
-import { parseDate, executionDataToJson, isString, shorten } from '@/utils';
+import { executionDataToJson, isString, shorten } from '@/utils';
 import { INodeUi } from '@/Interface';
 import { externalHooks } from '@/mixins/externalHooks';
 import { mapStores } from 'pinia';
@@ -210,11 +210,7 @@ export default mixins(externalHooks).extend({
 			}, 1000); // ensure dest data gets set if drop
 		},
 		getContent(value: unknown): string {
-			if (isString(value)) {
-				const parsedDate = parseDate(value, this.workflowsStore.workflow.settings?.timezone);
-				return parsedDate ? parsedDate.toString() : `"${value}"`;
-			}
-			return JSON.stringify(value);
+			return isString(value) ? `"${value}"` : JSON.stringify(value);
 		},
 		getListItemName(path: string): string {
 			return path.replace(/^(\["?\d"?]\.?)/g, '');
diff --git a/packages/editor-ui/src/components/RunDataTable.vue b/packages/editor-ui/src/components/RunDataTable.vue
index 383e905e19..9f092a7fd7 100644
--- a/packages/editor-ui/src/components/RunDataTable.vue
+++ b/packages/editor-ui/src/components/RunDataTable.vue
@@ -159,7 +159,7 @@
 <script lang="ts">
 /* eslint-disable prefer-spread */
 import { INodeUi, ITableData, NDVState } from '@/Interface';
-import { getPairedItemId, parseDate } from '@/utils';
+import { getPairedItemId } from '@/utils';
 import Vue, { PropType } from 'vue';
 import mixins from 'vue-typed-mixins';
 import { GenericValue, IDataObject, INodeExecutionData } from 'n8n-workflow';
@@ -171,7 +171,6 @@ import { useWorkflowsStore } from '@/stores/workflows';
 import { useNDVStore } from '@/stores/ndv';
 import MappingPill from './MappingPill.vue';
 import { getMappedExpression } from '@/utils/mappingUtils';
-import { DateTime } from 'luxon';
 
 const MAX_COLUMNS_LIMIT = 40;
 
@@ -366,25 +365,17 @@ export default mixins(externalHooks).extend({
 				return this.$locale.baseText('runData.emptyString');
 			}
 			if (typeof value === 'string') {
-				const parsedDate = parseDate(value, this.workflowsStore.workflow.settings?.timezone);
-				if (parsedDate) {
-					return parsedDate.toString();
-				}
 				return value.replaceAll('\n', '\\n');
 			}
-
 			if (Array.isArray(value) && value.length === 0) {
 				return this.$locale.baseText('runData.emptyArray');
 			}
-
 			if (typeof value === 'object' && value !== null && Object.keys(value).length === 0) {
 				return this.$locale.baseText('runData.emptyObject');
 			}
-
 			if (value === null || value === undefined) {
 				return `[${value}]`;
 			}
-
 			return value;
 		},
 		onDragStart() {
diff --git a/packages/editor-ui/src/utils/typesUtils.ts b/packages/editor-ui/src/utils/typesUtils.ts
index 12c43b0ba6..2e27a749f8 100644
--- a/packages/editor-ui/src/utils/typesUtils.ts
+++ b/packages/editor-ui/src/utils/typesUtils.ts
@@ -249,17 +249,3 @@ export const getSchema = (input: Optional<Primitives | object>, path = ''): Sche
 
 	return schema;
 };
-
-// Convert UTC dates that come from back-end to workflow timezone
-export const parseDate = (input: string, timezone: string | undefined): DateTime | null => {
-	const isUTCDate = /\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/.test(
-		input,
-	);
-	if (isUTCDate) {
-		const date = new Date(Date.parse(input));
-		if (date.toString() !== 'Invalid Date') {
-			return DateTime.fromJSDate(date, { zone: timezone });
-		}
-	}
-	return null;
-};