From ff03d326884c584785cbcca927ac1475879ece68 Mon Sep 17 00:00:00 2001
From: George Gevoian <george@gevoian.com>
Date: Tue, 23 May 2023 22:53:20 -0400
Subject: [PATCH] (core) Set DateTime timezone during xlsx import

Summary:
DateTime columns had a blank timezone after xlsx imports because the
timezone was not included in the column type. We now append the
document's timezone to the type of all imported DateTime columns.

Test Plan: Server test.

Reviewers: jarek

Reviewed By: jarek

Differential Revision: https://phab.getgrist.com/D3896
---
 app/common/RelativeDates.ts             |   8 ++++++++
 app/server/lib/ActiveDocImport.ts       |  11 +++++++++++
 test/fixtures/uploads/DateTimeData.xlsx | Bin 0 -> 4759 bytes
 3 files changed, 19 insertions(+)
 create mode 100644 test/fixtures/uploads/DateTimeData.xlsx

diff --git a/app/common/RelativeDates.ts b/app/common/RelativeDates.ts
index c1d85684..c3012dd0 100644
--- a/app/common/RelativeDates.ts
+++ b/app/common/RelativeDates.ts
@@ -98,6 +98,14 @@ export function formatRelBounds(periods: IPeriod[]): string {
   );
 }
 
+/**
+ * Returns a new timestamp that is the UTC equivalent of the original local `timestamp`, offset
+ * according to the delta between`timezone` and UTC.
+ */
+export function localTimestampToUTC(timestamp: number, timezone: string): number {
+  return moment.unix(timestamp).utc().tz(timezone, true).unix();
+}
+
 function formatDay(quantity: number, refUnit: IPeriod['unit']): string {
 
   if (refUnit === 'week') {
diff --git a/app/server/lib/ActiveDocImport.ts b/app/server/lib/ActiveDocImport.ts
index ca4bba85..d257c0b6 100644
--- a/app/server/lib/ActiveDocImport.ts
+++ b/app/server/lib/ActiveDocImport.ts
@@ -11,6 +11,7 @@ import {ApplyUAResult, DataSourceTransformed, ImportOptions, ImportResult, Impor
 import {ApiError} from 'app/common/ApiError';
 import {BulkColValues, CellValue, fromTableDataAction, UserAction} from 'app/common/DocActions';
 import * as gutil from 'app/common/gutil';
+import {localTimestampToUTC} from 'app/common/RelativeDates';
 import {DocStateComparison} from 'app/common/UserAPI';
 import {guessColInfoForImports} from 'app/common/ValueGuesser';
 import {ParseFileResult, ParseOptions} from 'app/plugin/FileParserAPI';
@@ -689,6 +690,7 @@ function getMergeFunction({type}: MergeStrategy): MergeFunction {
  * columns using the values set for the column ids.
  * For columns of type Any, guess the type and parse data according to it, or mark as empty
  * formula columns when they should be empty.
+ * For columns of type DateTime, add the document timezone to the type.
  */
 function cleanColumnMetadata(columns: GristColumn[], tableData: unknown[][], activeDoc: ActiveDoc) {
   return columns.map((c, index) => {
@@ -706,6 +708,15 @@ function cleanColumnMetadata(columns: GristColumn[], tableData: unknown[][], act
         Object.assign(newCol, colMetadata);
       }
     }
+    const timezone = activeDoc.docData!.docInfo().timezone;
+    if (c.type === "DateTime" && timezone) {
+      newCol.type = `DateTime:${timezone}`;
+      for (const [i, localTimestamp] of tableData[index].entries()) {
+        if (typeof localTimestamp !== 'number') { continue; }
+
+        tableData[index][i] = localTimestampToUTC(localTimestamp, timezone);
+      }
+    }
     return newCol;
   });
 }
diff --git a/test/fixtures/uploads/DateTimeData.xlsx b/test/fixtures/uploads/DateTimeData.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..d9bc4db4e93b1465bd093c449fae38f52a3fa5e4
GIT binary patch
literal 4759
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

literal 0
HcmV?d00001