From 8bc5c7d5959ee59fa79e568b0c526bbe00a9b504 Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yohanboniface@free.fr>
Date: Fri, 9 Sep 2022 21:13:34 +0200
Subject: [PATCH 1/3] Fix columns with falsy cells wrongly parsed as dates
 (#276)

Eg. before this commit, this table would result in Date columns:

| A     | B |
| ----- | -- |
| FALSE | 0 |

For now, even FALSE is parsed as Numeric (not sure why we don't have
a BooleanConverter).
---
 .../imports/fixtures/test_falsy_cells.xlsx     | Bin 0 -> 4886 bytes
 sandbox/grist/imports/import_xls_test.py       |  17 +++++++++++++++++
 sandbox/grist/parse_data.py                    |   2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 sandbox/grist/imports/fixtures/test_falsy_cells.xlsx

diff --git a/sandbox/grist/imports/fixtures/test_falsy_cells.xlsx b/sandbox/grist/imports/fixtures/test_falsy_cells.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..d4efdf500e1b17398148121fcd2107122770d6c3
GIT binary patch
literal 4886
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

literal 0
HcmV?d00001

diff --git a/sandbox/grist/imports/import_xls_test.py b/sandbox/grist/imports/import_xls_test.py
index a905ef9a..935c7104 100644
--- a/sandbox/grist/imports/import_xls_test.py
+++ b/sandbox/grist/imports/import_xls_test.py
@@ -189,5 +189,22 @@ class TestImportXLS(unittest.TestCase):
       ],
     }])
 
+  def test_falsy_cells(self):
+    # Falsy cells should be parsed as Numeric, not Date.
+    parsed_file = import_xls.parse_file(*_get_fixture('test_falsy_cells.xlsx'))
+    tables = parsed_file[1]
+    self.assertEqual(tables, [{
+      'table_name': 'Sheet1',
+      'column_metadata': [
+        {'id': u'A', 'type': 'Numeric'},
+        {'id': u'B', 'type': 'Numeric'},
+      ],
+      'table_data': [
+        [0, 0],
+        [0, 0],
+      ],
+    }])
+
+
 if __name__ == '__main__':
   unittest.main()
diff --git a/sandbox/grist/parse_data.py b/sandbox/grist/parse_data.py
index 47f95d04..20ed9ea2 100644
--- a/sandbox/grist/parse_data.py
+++ b/sandbox/grist/parse_data.py
@@ -83,7 +83,7 @@ class SimpleDateTimeConverter(BaseConverter):
   def convert(cls, value):
     if type(value) is datetime.datetime:
       return value
-    elif not value:
+    elif value is None:
       return None
     raise ValueError()
 

From bd9ede9d137b5dc3b38eacddcb2c861f3d4f8d3a Mon Sep 17 00:00:00 2001
From: Paul Fitzpatrick <paulfitz@alum.mit.edu>
Date: Fri, 9 Sep 2022 17:05:29 -0400
Subject: [PATCH 2/3] give parseDate test more time (#278)

The time it takes parseDate to run depends on how many timezone
names moment knows about.
---
 test/common/parseDate.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/common/parseDate.ts b/test/common/parseDate.ts
index ec44977e..ad5c8fde 100644
--- a/test/common/parseDate.ts
+++ b/test/common/parseDate.ts
@@ -331,6 +331,7 @@ describe('parseDate', function() {
   });
 
   it('should handle datetimes as formatted by moment', function() {
+    this.timeout(10000);  // there may be a LOT of timezone names.
     for (const date of ['2020-02-03', '2020-06-07', '2020-10-11']) {  // different months for daylight savings
       const dateTime = date + ' 12:34:56';
       const utcMoment = moment.tz(dateTime, 'UTC');

From 9dccaa530172d46d17733d0f6f4c461c1ea0e334 Mon Sep 17 00:00:00 2001
From: George Gevoian <george@gevoian.com>
Date: Sun, 11 Sep 2022 16:33:11 -0700
Subject: [PATCH 3/3] Increase yarn install network timeout

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 101f7a99..665a7e44 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ FROM node:14-buster as builder
 # Install all node dependencies.
 WORKDIR /grist
 COPY package.json yarn.lock /grist/
-RUN yarn install --frozen-lockfile --verbose
+RUN yarn install --frozen-lockfile --verbose --network-timeout 600000
 
 # Install any extra node dependencies (at root level, to avoid having to wrestle
 # with merging them).
@@ -23,7 +23,7 @@ COPY --from=ext / /grist/ext
 RUN \
  mkdir /node_modules && \
  cd /grist/ext && \
- { if [ -e package.json ] ; then yarn install --frozen-lockfile --modules-folder=/node_modules --verbose ; fi }
+ { if [ -e package.json ] ; then yarn install --frozen-lockfile --modules-folder=/node_modules --verbose --network-timeout 600000 ; fi }
 
 # Build node code.
 COPY tsconfig.json /grist