Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

(core) updates from grist-core

Browse Source
This commit is contained in:
Paul Fitzpatrick 2022-09-12 09:14:22 -04:00
commit b9441cf8fd
5 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -15,7 +15,7 @@ FROM node:14-buster as builder
# Install all node dependencies. # Install all node dependencies.
WORKDIR /grist WORKDIR /grist
COPY package.json yarn.lock /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 # Install any extra node dependencies (at root level, to avoid having to wrestle
# with merging them). # with merging them).
@ -23,7 +23,7 @@ COPY --from=ext / /grist/ext
RUN \ RUN \
mkdir /node_modules && \ mkdir /node_modules && \
cd /grist/ext && \ 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. # Build node code.
COPY tsconfig.json /grist COPY tsconfig.json /grist

BIN
sandbox/grist/imports/fixtures/test_falsy_cells.xlsx Normal file
View File

Binary file not shown.

17
sandbox/grist/imports/import_xls_test.py
View File

@ -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__': if __name__ == '__main__':
unittest.main() unittest.main()

2
sandbox/grist/parse_data.py
View File

@ -83,7 +83,7 @@ class SimpleDateTimeConverter(BaseConverter):
def convert(cls, value): def convert(cls, value):
if type(value) is datetime.datetime: if type(value) is datetime.datetime:
return value return value
elif not value: elif value is None:
return None return None
raise ValueError() raise ValueError()

1
test/common/parseDate.ts
View File

@ -331,6 +331,7 @@ describe('parseDate', function() {
}); });
it('should handle datetimes as formatted by moment', 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 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 dateTime = date + ' 12:34:56';
const utcMoment = moment.tz(dateTime, 'UTC'); const utcMoment = moment.tz(dateTime, 'UTC');