From 597dcf3e41f9e86d94a497387fd36a77f54e7156 Mon Sep 17 00:00:00 2001 From: Jasper Lai <33956381+jaskfla@users.noreply.github.com> Date: Fri, 8 Mar 2024 14:24:48 +1300 Subject: [PATCH 01/10] bump `moment-timezone` to 0.5.45 --- packages/central-server/package.json | 2 +- packages/e2e/package.json | 2 +- packages/meditrak-app-server/package.json | 2 +- packages/tsutils/package.json | 2 +- packages/utils/package.json | 2 +- yarn.lock | 47 +++++------------------ 6 files changed, 15 insertions(+), 42 deletions(-) diff --git a/packages/central-server/package.json b/packages/central-server/package.json index 0dbe8b3b7a..3af627759b 100644 --- a/packages/central-server/package.json +++ b/packages/central-server/package.json @@ -60,7 +60,7 @@ "lodash.merge": "^4.6.2", "lodash.pick": "^4.4.0", "moment": "^2.24.0", - "moment-timezone": "^0.5.28", + "moment-timezone": "^0.5.45", "morgan": "^1.9.0", "multer": "^1.4.3", "public-ip": "^2.5.0", diff --git a/packages/e2e/package.json b/packages/e2e/package.json index f968c383a6..5e0def9da9 100644 --- a/packages/e2e/package.json +++ b/packages/e2e/package.json @@ -32,7 +32,7 @@ "lodash": "^4.17.4", "markdown-to-jsx": "^6.4.1", "moment": "^2.24.0", - "moment-timezone": "^0.5.14", + "moment-timezone": "^0.5.45", "node-fetch": "^1.7.3", "npm-run-all": "^4.1.5", "regenerator-runtime": "^0.13.9" diff --git a/packages/meditrak-app-server/package.json b/packages/meditrak-app-server/package.json index 5a5c0b019c..e09201e5cf 100644 --- a/packages/meditrak-app-server/package.json +++ b/packages/meditrak-app-server/package.json @@ -42,7 +42,7 @@ "lodash.groupby": "^4.6.0", "lodash.keyby": "^4.6.0", "moment": "^2.24.0", - "moment-timezone": "^0.5.27", + "moment-timezone": "^0.5.45", "semver-compare": "^1.0.0", "winston": "^3.3.3" }, diff --git a/packages/tsutils/package.json b/packages/tsutils/package.json index 443f378c3e..ba66017ea1 100644 --- a/packages/tsutils/package.json +++ b/packages/tsutils/package.json @@ -28,7 +28,7 @@ "camelcase-keys": "^6.2.2", "lodash.get": "^4.4.2", "moment": "^2.24.0", - "moment-timezone": "^0.5.25", + "moment-timezone": "^0.5.45", "yup": "^0.32.9" }, "devDependencies": { diff --git a/packages/utils/package.json b/packages/utils/package.json index 8525857569..f9293f4f76 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -33,7 +33,7 @@ "lodash.get": "^4.4.2", "lodash.pickby": "^4.6.0", "moment": "^2.24.0", - "moment-timezone": "^0.5.28", + "moment-timezone": "^0.5.45", "node-fetch": "^1.7.3", "numeral": "^2.0.6", "prop-types": "^15.6.2", diff --git a/yarn.lock b/yarn.lock index dc9f29780e..db5d0ec42f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12088,7 +12088,7 @@ __metadata: lodash.pick: ^4.4.0 mocha: ^10.2.0 moment: ^2.24.0 - moment-timezone: ^0.5.28 + moment-timezone: ^0.5.45 morgan: ^1.9.0 multer: ^1.4.3 npm-run-all: ^4.1.5 @@ -12334,7 +12334,7 @@ __metadata: lodash: ^4.17.4 markdown-to-jsx: ^6.4.1 moment: ^2.24.0 - moment-timezone: ^0.5.14 + moment-timezone: ^0.5.45 node-fetch: ^1.7.3 npm-run-all: ^4.1.5 regenerator-runtime: ^0.13.9 @@ -12472,7 +12472,7 @@ __metadata: lodash.groupby: ^4.6.0 lodash.keyby: ^4.6.0 moment: ^2.24.0 - moment-timezone: ^0.5.27 + moment-timezone: ^0.5.45 semver-compare: ^1.0.0 winston: ^3.3.3 languageName: unknown @@ -12720,7 +12720,7 @@ __metadata: camelcase-keys: ^6.2.2 lodash.get: ^4.4.2 moment: ^2.24.0 - moment-timezone: ^0.5.25 + moment-timezone: ^0.5.45 yup: ^0.32.9 languageName: unknown linkType: soft @@ -12925,7 +12925,7 @@ __metadata: lodash.get: ^4.4.2 lodash.pickby: ^4.6.0 moment: ^2.24.0 - moment-timezone: ^0.5.28 + moment-timezone: ^0.5.45 node-fetch: ^1.7.3 npm-run-all: ^4.1.5 numeral: ^2.0.6 @@ -32722,43 +32722,16 @@ __metadata: languageName: node linkType: hard -"moment-timezone@npm:^0.5.14": - version: 0.5.27 - resolution: "moment-timezone@npm:0.5.27" - dependencies: - moment: ">= 2.9.0" - checksum: 814bc11cf1f62cd93852499b469baa362c969ba354ba44f14eafbba1662f7ab22c026219786d9454c8f2781f12046c07aa4723f3a30083ebef9151b8dcd84f32 - languageName: node - linkType: hard - -"moment-timezone@npm:^0.5.25": - version: 0.5.39 - resolution: "moment-timezone@npm:0.5.39" - dependencies: - moment: ">= 2.9.0" - checksum: 9f972d3a29b2726d4fd1464df27738b756441fe57575f087cda91b7716a5a31d2cfd274255e3edfb15eb60af3ccf33fd339527b456092cac1a2a4124e4369c8b - languageName: node - linkType: hard - -"moment-timezone@npm:^0.5.27": - version: 0.5.37 - resolution: "moment-timezone@npm:0.5.37" - dependencies: - moment: ">= 2.9.0" - checksum: b3fc24848a396ee3801331a4b5511591df0e22241e59f55200a475603f23a8429f01887294c7a0c005dae25b8e4bef20472fbc875ff20080f26fded066559f1a - languageName: node - linkType: hard - -"moment-timezone@npm:^0.5.28": - version: 0.5.43 - resolution: "moment-timezone@npm:0.5.43" +"moment-timezone@npm:^0.5.45": + version: 0.5.45 + resolution: "moment-timezone@npm:0.5.45" dependencies: moment: ^2.29.4 - checksum: 8075c897ed8a044f992ef26fe8cdbcad80caf974251db424cae157473cca03be2830de8c74d99341b76edae59f148c9d9d19c1c1d9363259085688ec1cf508d0 + checksum: a22e9f983fbe1a01757ce30685bce92e3f6efa692eb682afd47b82da3ff960b3c8c2c3883ec6715c124bc985a342b57cba1f6ba25a1c8b4c7ad766db3cd5e1d0 languageName: node linkType: hard -"moment@npm:2.x.x, moment@npm:>= 2.9.0, moment@npm:^2.24.0": +"moment@npm:2.x.x, moment@npm:^2.24.0": version: 2.24.0 resolution: "moment@npm:2.24.0" checksum: 9cd93a251a2b33cb1b532eade0e496a2a7547faa6cfe37a283ee7bf69e202cd7c8ab0673d66883b5b29aed051353176dc0e6684f04073a75b0a155c500be1580 From faa7456c259dff1dbebdc3792aafdede478fdef6 Mon Sep 17 00:00:00 2001 From: Jasper Lai <33956381+jaskfla@users.noreply.github.com> Date: Fri, 8 Mar 2024 14:40:06 +1300 Subject: [PATCH 02/10] remove `@types/moment-timezone` --- packages/tsutils/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/tsutils/package.json b/packages/tsutils/package.json index ba66017ea1..293d27db48 100644 --- a/packages/tsutils/package.json +++ b/packages/tsutils/package.json @@ -32,7 +32,6 @@ "yup": "^0.32.9" }, "devDependencies": { - "@types/lodash.get": "^4.4.2", - "@types/moment-timezone": "0.5.13" + "@types/lodash.get": "^4.4.2" } } From 07100d01ce2698d4f23e0cd029bf38f608cbae28 Mon Sep 17 00:00:00 2001 From: Jasper Lai <33956381+jaskfla@users.noreply.github.com> Date: Fri, 8 Mar 2024 14:40:49 +1300 Subject: [PATCH 03/10] update lockfile --- yarn.lock | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/yarn.lock b/yarn.lock index db5d0ec42f..5e4eace4a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12713,7 +12713,6 @@ __metadata: "@tupaia/types": "workspace:*" "@tupaia/utils": "workspace:*" "@types/lodash.get": ^4.4.2 - "@types/moment-timezone": 0.5.13 ajv: ^8.12.0 ajv-formats: v3.0.0-rc.0 better-ajv-errors: ^1.2.0 @@ -13822,15 +13821,6 @@ __metadata: languageName: node linkType: hard -"@types/moment-timezone@npm:0.5.13": - version: 0.5.13 - resolution: "@types/moment-timezone@npm:0.5.13" - dependencies: - moment: ">=2.14.0" - checksum: 35bd6414b790663e4879e38b4a344526ebe87b3f795929f9bc38f91f7caa373c65dd19a0e836182319f929d0f7fcff9b629efc6dbcef23d386bf0c87597f5b49 - languageName: node - linkType: hard - "@types/ms@npm:*": version: 0.7.31 resolution: "@types/ms@npm:0.7.31" @@ -32738,7 +32728,7 @@ __metadata: languageName: node linkType: hard -"moment@npm:>=2.14.0, moment@npm:^2.18.1, moment@npm:^2.29.4": +"moment@npm:^2.18.1, moment@npm:^2.29.4": version: 2.29.4 resolution: "moment@npm:2.29.4" checksum: 0ec3f9c2bcba38dc2451b1daed5daded747f17610b92427bebe1d08d48d8b7bdd8d9197500b072d14e326dd0ccf3e326b9e3d07c5895d3d49e39b6803b76e80e From 0c4b37722eee5a4920db2d7dd6b41d5904f38bb5 Mon Sep 17 00:00:00 2001 From: Jasper Lai <33956381+jaskfla@users.noreply.github.com> Date: Fri, 8 Mar 2024 14:54:19 +1300 Subject: [PATCH 04/10] update lockfile --- yarn.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/yarn.lock b/yarn.lock index 5e4eace4a9..71e1d53670 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12989,6 +12989,7 @@ __metadata: lodash.tail: ^4.1.1 lodash.zipobject: ^4.1.3 moment: ^2.24.0 + moment-timezone: ^0.5.45 morgan: ^1.9.0 nodemailer: ^4.6.7 promise: ^7.3.1 From 13cecba15a4326223c4b82c2dbde676960a5b839 Mon Sep 17 00:00:00 2001 From: Jasper Lai <33956381+jaskfla@users.noreply.github.com> Date: Fri, 8 Mar 2024 14:59:03 +1300 Subject: [PATCH 05/10] use `moment-timezone` in `web-config-server` --- packages/web-config-server/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/web-config-server/package.json b/packages/web-config-server/package.json index 6c2d0cc8a8..64993da9eb 100755 --- a/packages/web-config-server/package.json +++ b/packages/web-config-server/package.json @@ -60,6 +60,7 @@ "lodash.tail": "^4.1.1", "lodash.zipobject": "^4.1.3", "moment": "^2.24.0", + "moment-timezone": "^0.5.45", "morgan": "^1.9.0", "nodemailer": "^4.6.7", "promise": "^7.3.1", From b6695ecf403b80ff6ab8e77b82f597ee68140278 Mon Sep 17 00:00:00 2001 From: Jasper Lai <33956381+jaskfla@users.noreply.github.com> Date: Fri, 8 Mar 2024 15:02:54 +1300 Subject: [PATCH 06/10] import `moment` from `moment-timezone` --- .../src/importExport/SurveyResponsesExportModal.jsx | 2 +- .../admin-panel/src/pages/resources/SocialFeedPage.jsx | 2 +- .../src/pages/resources/SurveyResponsesPage.jsx | 2 +- .../src/widgets/InputField/registerInputFields.jsx | 10 +++++----- .../exportSurveyResponses/exportResponsesToFile.js | 4 ++-- .../importSurveyResponses/importSurveyResponses.js | 6 +++--- .../src/database/models/SurveyResponse.js | 4 ++-- .../dhis/pushers/data/aggregate/AggregateDataPusher.js | 4 ++-- .../src/tests/apiV2/authenticate/oneTimeLogin.test.js | 2 +- .../import/importSurveyResponses/testFunctionality.js | 2 +- .../src/tests/apiV2/surveyResponse.test.js | 3 +-- .../data/aggregate/AggregateDataPusher.fixtures.js | 2 +- .../data/aggregate/testPeriodsBasedOnDataSet.js | 2 +- packages/data-api/src/TupaiaDataApi.ts | 2 +- .../services/dhis/translators/formatDateForDHIS2.ts | 2 +- .../src/services/superset/SupersetService.ts | 2 +- packages/data-lake-api/src/DataLakeApi.ts | 2 +- ...-CovidSamoaDeleteOutdatedResponses-modifies-data.js | 2 +- packages/database/src/modelClasses/FeedItem.js | 2 +- packages/database/src/modelClasses/OneTimeLogin.js | 2 +- packages/database/src/testUtilities/clearTestData.js | 2 +- packages/e2e/cypress/scripts/generateConfig/helpers.js | 2 +- .../components/getSurveyResponsesExportModal.jsx | 2 +- .../pages/helpers/getSurveyResponsePageConfigs.js | 2 +- .../assessment/specificQuestions/TimeSinceQuestion.jsx | 8 ++++---- packages/meditrak-app/app/utilities/format.jsx | 2 +- packages/tsutils/src/__tests__/datetime.test.ts | 2 +- packages/tsutils/src/datetime.ts | 4 ++-- .../utils/useExportDashboardItem.tsx | 2 +- packages/ui-chart-components/src/utils/utils.ts | 2 +- .../components/DateRangePicker/DateRangePicker.test.js | 2 +- .../components/DateRangePicker/DatePickerDialog.tsx | 2 +- .../src/components/DateRangePicker/MonthPicker.tsx | 2 +- .../src/components/DateRangePicker/QuarterPicker.tsx | 2 +- .../src/components/Legend/SpectrumLegend.tsx | 2 +- packages/ui-map-components/src/utils/markerColors.ts | 2 +- .../utils/src/__tests__/period/addMomentOffset.test.js | 2 +- .../__tests__/period/convertDateRangeToPeriods.test.js | 2 +- .../utils/src/__tests__/period/period/period.test.js | 2 +- .../src/__tests__/period/periodGranularities.test.js | 2 +- packages/utils/src/datetime.js | 2 +- .../utils/src/period/getDateRangeForGranularity.js | 2 +- packages/utils/src/period/getExportDatesString.js | 2 +- packages/utils/src/period/periodGranularities.js | 2 +- 44 files changed, 57 insertions(+), 58 deletions(-) diff --git a/packages/admin-panel/src/importExport/SurveyResponsesExportModal.jsx b/packages/admin-panel/src/importExport/SurveyResponsesExportModal.jsx index ecddda5ab6..b84e890c89 100644 --- a/packages/admin-panel/src/importExport/SurveyResponsesExportModal.jsx +++ b/packages/admin-panel/src/importExport/SurveyResponsesExportModal.jsx @@ -4,7 +4,7 @@ */ import React, { useState } from 'react'; -import moment from 'moment'; +import moment from 'moment-timezone'; import { DateTimePicker, RadioGroup } from '@tupaia/ui-components'; import { stripTimezoneFromDate } from '@tupaia/utils'; import { ReduxAutocomplete } from '../autocomplete'; diff --git a/packages/admin-panel/src/pages/resources/SocialFeedPage.jsx b/packages/admin-panel/src/pages/resources/SocialFeedPage.jsx index 8f4c1a38d2..b2433e0f52 100644 --- a/packages/admin-panel/src/pages/resources/SocialFeedPage.jsx +++ b/packages/admin-panel/src/pages/resources/SocialFeedPage.jsx @@ -6,7 +6,7 @@ import React from 'react'; import Typography from '@material-ui/core/Typography'; import PropTypes from 'prop-types'; -import moment from 'moment'; +import moment from 'moment-timezone'; import styled from 'styled-components'; import { ResourcePage } from './ResourcePage'; diff --git a/packages/admin-panel/src/pages/resources/SurveyResponsesPage.jsx b/packages/admin-panel/src/pages/resources/SurveyResponsesPage.jsx index a399ffaac7..62a245d1e7 100644 --- a/packages/admin-panel/src/pages/resources/SurveyResponsesPage.jsx +++ b/packages/admin-panel/src/pages/resources/SurveyResponsesPage.jsx @@ -5,7 +5,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import moment from 'moment'; +import moment from 'moment-timezone'; import { getBrowserTimeZone } from '@tupaia/utils'; import { ApprovalStatus } from '@tupaia/types'; import { ResourcePage } from './ResourcePage'; diff --git a/packages/admin-panel/src/widgets/InputField/registerInputFields.jsx b/packages/admin-panel/src/widgets/InputField/registerInputFields.jsx index c4293e69fa..b97a2eb8bf 100644 --- a/packages/admin-panel/src/widgets/InputField/registerInputFields.jsx +++ b/packages/admin-panel/src/widgets/InputField/registerInputFields.jsx @@ -5,19 +5,19 @@ import React from 'react'; import { Link } from 'react-router-dom'; -import moment from 'moment'; +import moment from 'moment-timezone'; import { InputAdornment } from '@material-ui/core'; import styled from 'styled-components'; import { Button, - TextField, + Checkbox, DatePicker, DateTimePicker, + HexcodeField, + ImageUploadField, RadioGroup, Select, - ImageUploadField, - HexcodeField, - Checkbox, + TextField, } from '@tupaia/ui-components'; import { stripTimezoneFromDate } from '@tupaia/utils'; import { registerInputField } from './InputField'; diff --git a/packages/central-server/src/apiV2/export/exportSurveyResponses/exportResponsesToFile.js b/packages/central-server/src/apiV2/export/exportSurveyResponses/exportResponsesToFile.js index b9091ce7ab..313d0afdd6 100644 --- a/packages/central-server/src/apiV2/export/exportSurveyResponses/exportResponsesToFile.js +++ b/packages/central-server/src/apiV2/export/exportSurveyResponses/exportResponsesToFile.js @@ -4,7 +4,7 @@ */ import xlsx from 'xlsx'; -import moment from 'moment'; +import moment from 'moment-timezone'; import keyBy from 'lodash.keyby'; import chunk from 'lodash.chunk'; import groupBy from 'lodash.groupby'; @@ -12,8 +12,8 @@ import { addExportedDateAndOriginAtTheSheetBottom, getExportDatesString, getUniqueEntries, - truncateString, toFilename, + truncateString, } from '@tupaia/utils'; import { TYPES } from '@tupaia/database'; import { ANSWER_TYPES, NON_DATA_ELEMENT_ANSWER_TYPES } from '../../../database/models/Answer'; diff --git a/packages/central-server/src/apiV2/import/importSurveyResponses/importSurveyResponses.js b/packages/central-server/src/apiV2/import/importSurveyResponses/importSurveyResponses.js index d8828390ff..6718bd9731 100644 --- a/packages/central-server/src/apiV2/import/importSurveyResponses/importSurveyResponses.js +++ b/packages/central-server/src/apiV2/import/importSurveyResponses/importSurveyResponses.js @@ -4,7 +4,7 @@ */ import xlsx from 'xlsx'; -import moment from 'moment'; +import moment from 'moment-timezone'; import { generateId } from '@tupaia/database'; import { constructIsOneOf, @@ -14,11 +14,11 @@ import { hasContent, ImportValidationError, ObjectValidator, + reduceToDictionary, respond, + stripTimezoneFromDate, takesIdForm, UploadError, - reduceToDictionary, - stripTimezoneFromDate, } from '@tupaia/utils'; import { getArrayQueryParameter } from '../../utilities'; diff --git a/packages/central-server/src/database/models/SurveyResponse.js b/packages/central-server/src/database/models/SurveyResponse.js index 34e20a86be..76e4971f23 100644 --- a/packages/central-server/src/database/models/SurveyResponse.js +++ b/packages/central-server/src/database/models/SurveyResponse.js @@ -4,9 +4,9 @@ */ import momentTimezone from 'moment-timezone'; -import moment from 'moment'; +import moment from 'moment-timezone'; -import { MaterializedViewLogDatabaseModel, DatabaseType, TYPES } from '@tupaia/database'; +import { DatabaseType, MaterializedViewLogDatabaseModel, TYPES } from '@tupaia/database'; export const SURVEY_RESPONSE_APPROVAL_STATUS = { NOT_REQUIRED: 'not_required', diff --git a/packages/central-server/src/dhis/pushers/data/aggregate/AggregateDataPusher.js b/packages/central-server/src/dhis/pushers/data/aggregate/AggregateDataPusher.js index 5052abaad8..9b53ad30f4 100644 --- a/packages/central-server/src/dhis/pushers/data/aggregate/AggregateDataPusher.js +++ b/packages/central-server/src/dhis/pushers/data/aggregate/AggregateDataPusher.js @@ -3,8 +3,8 @@ * Copyright (c) 2019 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; -import { DHIS2_RESOURCE_TYPES, dhisToTupaiaPeriodType, combineDiagnostics } from '@tupaia/dhis-api'; +import moment from 'moment-timezone'; +import { combineDiagnostics, DHIS2_RESOURCE_TYPES, dhisToTupaiaPeriodType } from '@tupaia/dhis-api'; import { DEFAULT_PERIOD_TYPE, periodToType, diff --git a/packages/central-server/src/tests/apiV2/authenticate/oneTimeLogin.test.js b/packages/central-server/src/tests/apiV2/authenticate/oneTimeLogin.test.js index fc69ebd59e..27d88b8145 100644 --- a/packages/central-server/src/tests/apiV2/authenticate/oneTimeLogin.test.js +++ b/packages/central-server/src/tests/apiV2/authenticate/oneTimeLogin.test.js @@ -5,7 +5,7 @@ import {} from 'dotenv/config'; // Load the environment variables into process.env import { expect } from 'chai'; -import moment from 'moment'; +import moment from 'moment-timezone'; import { randomEmail } from '@tupaia/utils'; import { getAuthorizationHeader, TestableApp } from '../../testUtilities'; diff --git a/packages/central-server/src/tests/apiV2/import/importSurveyResponses/testFunctionality.js b/packages/central-server/src/tests/apiV2/import/importSurveyResponses/testFunctionality.js index 21d4cbe610..549fca56e2 100644 --- a/packages/central-server/src/tests/apiV2/import/importSurveyResponses/testFunctionality.js +++ b/packages/central-server/src/tests/apiV2/import/importSurveyResponses/testFunctionality.js @@ -6,7 +6,7 @@ import { expect } from 'chai'; import groupBy from 'lodash.groupby'; import pick from 'lodash.pick'; -import moment from 'moment'; +import moment from 'moment-timezone'; import { buildAndInsertSurveys, diff --git a/packages/central-server/src/tests/apiV2/surveyResponse.test.js b/packages/central-server/src/tests/apiV2/surveyResponse.test.js index 2fa9b7f4a3..ab5c8b605e 100644 --- a/packages/central-server/src/tests/apiV2/surveyResponse.test.js +++ b/packages/central-server/src/tests/apiV2/surveyResponse.test.js @@ -1,6 +1,5 @@ import { expect } from 'chai'; -import sinon from 'sinon'; -import moment from 'moment'; +import moment from 'moment-timezone'; import { buildAndInsertSurveys, generateTestId, upsertDummyRecord } from '@tupaia/database'; import { oneSecondSleep, randomIntBetween } from '@tupaia/utils'; diff --git a/packages/central-server/src/tests/dhis/pushers/data/aggregate/AggregateDataPusher.fixtures.js b/packages/central-server/src/tests/dhis/pushers/data/aggregate/AggregateDataPusher.fixtures.js index 632e60d276..d269fe44c4 100644 --- a/packages/central-server/src/tests/dhis/pushers/data/aggregate/AggregateDataPusher.fixtures.js +++ b/packages/central-server/src/tests/dhis/pushers/data/aggregate/AggregateDataPusher.fixtures.js @@ -2,7 +2,7 @@ * Tupaia MediTrak * Copyright (c) 2019 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; import { generateTestId, TYPES } from '@tupaia/database'; import { ANSWER_TYPES } from '../../../../../database/models/Answer'; diff --git a/packages/central-server/src/tests/dhis/pushers/data/aggregate/testPeriodsBasedOnDataSet.js b/packages/central-server/src/tests/dhis/pushers/data/aggregate/testPeriodsBasedOnDataSet.js index 17547526c2..c0479318eb 100644 --- a/packages/central-server/src/tests/dhis/pushers/data/aggregate/testPeriodsBasedOnDataSet.js +++ b/packages/central-server/src/tests/dhis/pushers/data/aggregate/testPeriodsBasedOnDataSet.js @@ -3,7 +3,7 @@ * Copyright (c) 2019 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; import sinon from 'sinon'; import { expect } from 'chai'; import { AggregateDataPusher } from '../../../../../dhis/pushers/data/aggregate/AggregateDataPusher'; diff --git a/packages/data-api/src/TupaiaDataApi.ts b/packages/data-api/src/TupaiaDataApi.ts index c2a1d0f68b..65258f4eec 100644 --- a/packages/data-api/src/TupaiaDataApi.ts +++ b/packages/data-api/src/TupaiaDataApi.ts @@ -5,7 +5,7 @@ import groupBy from 'lodash.groupby'; -import moment from 'moment'; +import moment from 'moment-timezone'; import { TupaiaDatabase, SqlQuery } from '@tupaia/database'; import { getSortByKey, DEFAULT_BINARY_OPTIONS, yup } from '@tupaia/utils'; import { isNotNullish } from '@tupaia/tsutils'; diff --git a/packages/data-broker/src/services/dhis/translators/formatDateForDHIS2.ts b/packages/data-broker/src/services/dhis/translators/formatDateForDHIS2.ts index e5e0e682d4..c8d5d77db3 100644 --- a/packages/data-broker/src/services/dhis/translators/formatDateForDHIS2.ts +++ b/packages/data-broker/src/services/dhis/translators/formatDateForDHIS2.ts @@ -3,7 +3,7 @@ * Copyright (c) 2018 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; const formatDate = (date: string, format: string) => moment.parseZone(date).format(format); diff --git a/packages/data-broker/src/services/superset/SupersetService.ts b/packages/data-broker/src/services/superset/SupersetService.ts index 2dc8783554..c4bd0885c8 100644 --- a/packages/data-broker/src/services/superset/SupersetService.ts +++ b/packages/data-broker/src/services/superset/SupersetService.ts @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; import { SupersetApi } from '@tupaia/superset-api'; import { Service } from '../Service'; diff --git a/packages/data-lake-api/src/DataLakeApi.ts b/packages/data-lake-api/src/DataLakeApi.ts index 7bcbd4f76e..ea0c2d0c43 100644 --- a/packages/data-lake-api/src/DataLakeApi.ts +++ b/packages/data-lake-api/src/DataLakeApi.ts @@ -5,7 +5,7 @@ import groupBy from 'lodash.groupby'; -import moment from 'moment'; +import moment from 'moment-timezone'; import { getSortByKey } from '@tupaia/utils'; import { DataLakeAnalyticsFetchQuery } from './DataLakeAnalyticsFetchQuery'; import { DataLakeEventsFetchQuery, Event } from './DataLakeEventsFetchQuery'; diff --git a/packages/database/src/migrations/20220117011411-CovidSamoaDeleteOutdatedResponses-modifies-data.js b/packages/database/src/migrations/20220117011411-CovidSamoaDeleteOutdatedResponses-modifies-data.js index 697384a61f..574abd0a43 100644 --- a/packages/database/src/migrations/20220117011411-CovidSamoaDeleteOutdatedResponses-modifies-data.js +++ b/packages/database/src/migrations/20220117011411-CovidSamoaDeleteOutdatedResponses-modifies-data.js @@ -1,6 +1,6 @@ 'use strict'; -import moment from 'moment'; +import moment from 'moment-timezone'; var dbm; var type; diff --git a/packages/database/src/modelClasses/FeedItem.js b/packages/database/src/modelClasses/FeedItem.js index 20604a879b..1480dafe6f 100644 --- a/packages/database/src/modelClasses/FeedItem.js +++ b/packages/database/src/modelClasses/FeedItem.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; import { DatabaseModel } from '../DatabaseModel'; import { DatabaseType } from '../DatabaseType'; diff --git a/packages/database/src/modelClasses/OneTimeLogin.js b/packages/database/src/modelClasses/OneTimeLogin.js index 25699db79c..913296a845 100644 --- a/packages/database/src/modelClasses/OneTimeLogin.js +++ b/packages/database/src/modelClasses/OneTimeLogin.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 Beyond Essential Systems Pty Ltd */ import randomToken from 'rand-token'; -import moment from 'moment'; +import moment from 'moment-timezone'; import { DatabaseError, UnauthenticatedError } from '@tupaia/utils'; import { DatabaseModel } from '../DatabaseModel'; diff --git a/packages/database/src/testUtilities/clearTestData.js b/packages/database/src/testUtilities/clearTestData.js index 07fb478b6a..47f9bb6f30 100644 --- a/packages/database/src/testUtilities/clearTestData.js +++ b/packages/database/src/testUtilities/clearTestData.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2020 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; import { AnalyticsRefresher } from '..'; const COMPARISON = `LIKE '%_test%'`; diff --git a/packages/e2e/cypress/scripts/generateConfig/helpers.js b/packages/e2e/cypress/scripts/generateConfig/helpers.js index 6449b01447..db20094334 100644 --- a/packages/e2e/cypress/scripts/generateConfig/helpers.js +++ b/packages/e2e/cypress/scripts/generateConfig/helpers.js @@ -4,7 +4,7 @@ */ import { uniq } from 'lodash'; -import moment from 'moment'; +import moment from 'moment-timezone'; import { compareAsc, readJsonFile, yup, yupUtils } from '@tupaia/utils'; diff --git a/packages/lesmis/src/views/AdminPanel/components/getSurveyResponsesExportModal.jsx b/packages/lesmis/src/views/AdminPanel/components/getSurveyResponsesExportModal.jsx index 450864ec62..276b07c1a8 100644 --- a/packages/lesmis/src/views/AdminPanel/components/getSurveyResponsesExportModal.jsx +++ b/packages/lesmis/src/views/AdminPanel/components/getSurveyResponsesExportModal.jsx @@ -4,7 +4,7 @@ */ import React, { useState } from 'react'; -import moment from 'moment'; +import moment from 'moment-timezone'; import { DateTimePicker, RadioGroup } from '@tupaia/ui-components'; import { ReduxAutocomplete, ExportModal } from '@tupaia/admin-panel'; import { stripTimezoneFromDate } from '@tupaia/utils'; diff --git a/packages/lesmis/src/views/AdminPanel/pages/helpers/getSurveyResponsePageConfigs.js b/packages/lesmis/src/views/AdminPanel/pages/helpers/getSurveyResponsePageConfigs.js index b882880408..33abb6e02e 100644 --- a/packages/lesmis/src/views/AdminPanel/pages/helpers/getSurveyResponsePageConfigs.js +++ b/packages/lesmis/src/views/AdminPanel/pages/helpers/getSurveyResponsePageConfigs.js @@ -2,7 +2,7 @@ * Tupaia * Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; import { getBrowserTimeZone } from '@tupaia/utils'; import { getImportConfigs } from './getImportConfigs'; import { getSurveyResponsesExportModal } from '../../components'; diff --git a/packages/meditrak-app/app/assessment/specificQuestions/TimeSinceQuestion.jsx b/packages/meditrak-app/app/assessment/specificQuestions/TimeSinceQuestion.jsx index c7aedf1601..df6b60b8cc 100644 --- a/packages/meditrak-app/app/assessment/specificQuestions/TimeSinceQuestion.jsx +++ b/packages/meditrak-app/app/assessment/specificQuestions/TimeSinceQuestion.jsx @@ -3,12 +3,12 @@ * Copyright (c) 2018 Beyond Essential Systems Pty Ltd */ -import React, { PureComponent } from 'react'; +import React, {PureComponent} from 'react'; import PropTypes from 'prop-types'; -import moment from 'moment'; +import moment from 'moment-timezone'; -import { DateQuestion } from './DateQuestion'; -import { formatPlural } from '../../utilities'; +import {DateQuestion} from './DateQuestion'; +import {formatPlural} from '../../utilities'; class TimeSinceQuestion extends PureComponent { render() { diff --git a/packages/meditrak-app/app/utilities/format.jsx b/packages/meditrak-app/app/utilities/format.jsx index dbb5524e38..71e6c87be7 100644 --- a/packages/meditrak-app/app/utilities/format.jsx +++ b/packages/meditrak-app/app/utilities/format.jsx @@ -2,7 +2,7 @@ * Tupaia MediTrak * Copyright (c) 2017 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; export const formatPlural = (singular, plural, count) => count === 1 ? singular.replace('@count', count) : plural.replace('@count', count); diff --git a/packages/tsutils/src/__tests__/datetime.test.ts b/packages/tsutils/src/__tests__/datetime.test.ts index e6a2df8922..60aabab307 100644 --- a/packages/tsutils/src/__tests__/datetime.test.ts +++ b/packages/tsutils/src/__tests__/datetime.test.ts @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2022 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; import { getTimezoneNameFromTimestamp } from '../datetime'; diff --git a/packages/tsutils/src/datetime.ts b/packages/tsutils/src/datetime.ts index de1652edb2..fb03693733 100644 --- a/packages/tsutils/src/datetime.ts +++ b/packages/tsutils/src/datetime.ts @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2022 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; import momentTimezone from 'moment-timezone'; /** @@ -19,4 +19,4 @@ export const getTimezoneNameFromTimestamp = (timestamp: string) => .names() .find(name => getUtcOffsetFromTimestamp(timestamp) === momentTimezone.tz(name).format('Z')); -export const utcMoment = (...args: Parameters) => moment.utc(...args); +export const utcMoment = (...args: Parameters<(typeof moment)['utc']>) => moment.utc(...args); diff --git a/packages/tupaia-web/src/features/EnlargedDashboardItem/utils/useExportDashboardItem.tsx b/packages/tupaia-web/src/features/EnlargedDashboardItem/utils/useExportDashboardItem.tsx index bc5f184ddb..e295b957b4 100644 --- a/packages/tupaia-web/src/features/EnlargedDashboardItem/utils/useExportDashboardItem.tsx +++ b/packages/tupaia-web/src/features/EnlargedDashboardItem/utils/useExportDashboardItem.tsx @@ -4,7 +4,7 @@ */ import { RefObject, useContext, useEffect } from 'react'; -import moment from 'moment'; +import moment from 'moment-timezone'; import downloadJs from 'downloadjs'; import domtoimage from 'dom-to-image'; import { useParams } from 'react-router-dom'; diff --git a/packages/ui-chart-components/src/utils/utils.ts b/packages/ui-chart-components/src/utils/utils.ts index 2fc05a59fe..666c8e0d49 100644 --- a/packages/ui-chart-components/src/utils/utils.ts +++ b/packages/ui-chart-components/src/utils/utils.ts @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; import { useTheme } from '@material-ui/core/styles'; import { CartesianChartPresentationOptions, diff --git a/packages/ui-components/src/__tests__/components/DateRangePicker/DateRangePicker.test.js b/packages/ui-components/src/__tests__/components/DateRangePicker/DateRangePicker.test.js index 650dc5fd7e..e3eb01e72a 100644 --- a/packages/ui-components/src/__tests__/components/DateRangePicker/DateRangePicker.test.js +++ b/packages/ui-components/src/__tests__/components/DateRangePicker/DateRangePicker.test.js @@ -6,7 +6,7 @@ import React from 'react'; import { screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import moment from 'moment'; +import moment from 'moment-timezone'; import { DEFAULT_MIN_DATE, GRANULARITIES, diff --git a/packages/ui-components/src/components/DateRangePicker/DatePickerDialog.tsx b/packages/ui-components/src/components/DateRangePicker/DatePickerDialog.tsx index 6ee3f4f1c1..937af78a6c 100644 --- a/packages/ui-components/src/components/DateRangePicker/DatePickerDialog.tsx +++ b/packages/ui-components/src/components/DateRangePicker/DatePickerDialog.tsx @@ -5,7 +5,7 @@ */ import React, { useEffect, useState } from 'react'; -import moment from 'moment'; +import moment from 'moment-timezone'; import styled from 'styled-components'; import { DialogProps, Typography } from '@material-ui/core'; import { diff --git a/packages/ui-components/src/components/DateRangePicker/MonthPicker.tsx b/packages/ui-components/src/components/DateRangePicker/MonthPicker.tsx index 9564173281..a2b13b6709 100644 --- a/packages/ui-components/src/components/DateRangePicker/MonthPicker.tsx +++ b/packages/ui-components/src/components/DateRangePicker/MonthPicker.tsx @@ -5,7 +5,7 @@ */ import React from 'react'; -import moment from 'moment'; +import moment from 'moment-timezone'; import { MenuItem } from '../Inputs'; import { DatePicker } from './DatePicker'; import { BaseDatePickerProps } from '../../types'; diff --git a/packages/ui-components/src/components/DateRangePicker/QuarterPicker.tsx b/packages/ui-components/src/components/DateRangePicker/QuarterPicker.tsx index 9130e803b7..e9a1f462f6 100644 --- a/packages/ui-components/src/components/DateRangePicker/QuarterPicker.tsx +++ b/packages/ui-components/src/components/DateRangePicker/QuarterPicker.tsx @@ -5,7 +5,7 @@ */ import React from 'react'; -import moment from 'moment'; +import moment from 'moment-timezone'; import { MenuItem } from '../Inputs'; import { DatePicker } from './DatePicker'; import { BaseDatePickerProps } from '../../types'; diff --git a/packages/ui-map-components/src/components/Legend/SpectrumLegend.tsx b/packages/ui-map-components/src/components/Legend/SpectrumLegend.tsx index 408f370e13..7aad8e5efd 100644 --- a/packages/ui-map-components/src/components/Legend/SpectrumLegend.tsx +++ b/packages/ui-map-components/src/components/Legend/SpectrumLegend.tsx @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; import React from 'react'; import MuiBox from '@material-ui/core/Box'; import styled from 'styled-components'; diff --git a/packages/ui-map-components/src/utils/markerColors.ts b/packages/ui-map-components/src/utils/markerColors.ts index 0fbf6135ed..38171f0dd0 100644 --- a/packages/ui-map-components/src/utils/markerColors.ts +++ b/packages/ui-map-components/src/utils/markerColors.ts @@ -4,7 +4,7 @@ * */ -import moment from 'moment'; +import moment from 'moment-timezone'; import { blue, red, green } from '@material-ui/core/colors'; import { ScaleType, MeasureColorScheme } from '@tupaia/types'; import { BREWER_PALETTE, HEATMAP_UNKNOWN_COLOR } from '../constants'; diff --git a/packages/utils/src/__tests__/period/addMomentOffset.test.js b/packages/utils/src/__tests__/period/addMomentOffset.test.js index a313bdd195..c591c3ef08 100644 --- a/packages/utils/src/__tests__/period/addMomentOffset.test.js +++ b/packages/utils/src/__tests__/period/addMomentOffset.test.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; import { utcMoment } from '../../datetime'; diff --git a/packages/utils/src/__tests__/period/convertDateRangeToPeriods.test.js b/packages/utils/src/__tests__/period/convertDateRangeToPeriods.test.js index 308bbda78f..c76ff5fabe 100644 --- a/packages/utils/src/__tests__/period/convertDateRangeToPeriods.test.js +++ b/packages/utils/src/__tests__/period/convertDateRangeToPeriods.test.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2020 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; import { convertDateRangeToPeriods } from '../../period/convertDateRangeToPeriods'; diff --git a/packages/utils/src/__tests__/period/period/period.test.js b/packages/utils/src/__tests__/period/period/period.test.js index f0371b200a..ba198b5acb 100644 --- a/packages/utils/src/__tests__/period/period/period.test.js +++ b/packages/utils/src/__tests__/period/period/period.test.js @@ -4,7 +4,7 @@ */ import MockDate from 'mockdate'; -import moment from 'moment'; +import moment from 'moment-timezone'; import { dateStringToPeriod, diff --git a/packages/utils/src/__tests__/period/periodGranularities.test.js b/packages/utils/src/__tests__/period/periodGranularities.test.js index 48f3355264..51bba866bf 100644 --- a/packages/utils/src/__tests__/period/periodGranularities.test.js +++ b/packages/utils/src/__tests__/period/periodGranularities.test.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2020 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; import sinon from 'sinon'; import { roundStartEndDates, getDefaultDates, getLimits } from '../../period/periodGranularities'; diff --git a/packages/utils/src/datetime.js b/packages/utils/src/datetime.js index 431ad24cef..9a83abe566 100644 --- a/packages/utils/src/datetime.js +++ b/packages/utils/src/datetime.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2020 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; /** * @param {...any} args diff --git a/packages/utils/src/period/getDateRangeForGranularity.js b/packages/utils/src/period/getDateRangeForGranularity.js index 9684078189..9f673ab903 100644 --- a/packages/utils/src/period/getDateRangeForGranularity.js +++ b/packages/utils/src/period/getDateRangeForGranularity.js @@ -4,7 +4,7 @@ */ import memoize from 'fast-memoize'; -import moment from 'moment'; +import moment from 'moment-timezone'; const DATE_FORMAT = 'YYYY-MM-DD'; const DATETIME_FORMAT = `${DATE_FORMAT} HH:mm:ss`; diff --git a/packages/utils/src/period/getExportDatesString.js b/packages/utils/src/period/getExportDatesString.js index 8e9217dce2..be050b475e 100644 --- a/packages/utils/src/period/getExportDatesString.js +++ b/packages/utils/src/period/getExportDatesString.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2020 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; export const getExportDatesString = (startDate, endDate) => { const format = 'D-M-YY'; diff --git a/packages/utils/src/period/periodGranularities.js b/packages/utils/src/period/periodGranularities.js index a30bfc0648..46a3d62bba 100644 --- a/packages/utils/src/period/periodGranularities.js +++ b/packages/utils/src/period/periodGranularities.js @@ -6,7 +6,7 @@ */ import PropTypes from 'prop-types'; -import moment from 'moment'; +import moment from 'moment-timezone'; import { WEEK_DISPLAY_CONFIG, WEEK_DISPLAY_FORMATS } from './weekDisplayFormats'; import { addMomentOffset } from './addMomentOffset'; From 4113e105ada2da3b543f9ba6dfa8beb722a13557 Mon Sep 17 00:00:00 2001 From: Jasper Lai <33956381+jaskfla@users.noreply.github.com> Date: Fri, 8 Mar 2024 15:03:37 +1300 Subject: [PATCH 07/10] again --- .../assessment/actions/submitSurvey/processSurveyResponse.jsx | 2 +- packages/utils/src/stripTimezoneFromDate.js | 2 +- packages/utils/src/validation/validatorFunctions.js | 2 +- .../dataBuilders/generic/analytics/analyticsYearOnYear.js | 2 +- .../apiV1/dataBuilders/generic/dataDownload/rawDataValues.js | 2 +- .../percentage/percentOperationalFacilitiesWithData.js | 2 +- .../apiV1/dataBuilders/generic/table/simpleTableOfEvents.js | 2 +- .../table/tableOfDataValues/TableOfDataValuesWithCalc.js | 2 +- .../apiV1/dataBuilders/modules/covid-samoa/flight/Flight.js | 2 +- .../modules/covid-samoa/totalNumOfPassengerByFlightDate.js | 2 +- .../covid-samoa/valueAndPercentageByDataValueByFlightDate.js | 2 +- packages/web-config-server/src/apiV1/utils/getDateRange.js | 2 +- packages/web-config-server/src/export/exportChartHandler.js | 4 ++-- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/meditrak-app/app/assessment/actions/submitSurvey/processSurveyResponse.jsx b/packages/meditrak-app/app/assessment/actions/submitSurvey/processSurveyResponse.jsx index 623e6a7201..d0a4e97705 100644 --- a/packages/meditrak-app/app/assessment/actions/submitSurvey/processSurveyResponse.jsx +++ b/packages/meditrak-app/app/assessment/actions/submitSurvey/processSurveyResponse.jsx @@ -4,7 +4,7 @@ */ import generateUUID from 'bson-objectid'; -import moment from 'moment'; +import moment from 'moment-timezone'; import RNFS from 'react-native-fs'; import { diff --git a/packages/utils/src/stripTimezoneFromDate.js b/packages/utils/src/stripTimezoneFromDate.js index c5da830b5f..9e9318cb6c 100644 --- a/packages/utils/src/stripTimezoneFromDate.js +++ b/packages/utils/src/stripTimezoneFromDate.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; // used to strip the tz suffix so that a date can be added to the database without converting to utc // we don't want any timezone conversions when working with data_time diff --git a/packages/utils/src/validation/validatorFunctions.js b/packages/utils/src/validation/validatorFunctions.js index c84397b6f1..7d83ba7fdb 100644 --- a/packages/utils/src/validation/validatorFunctions.js +++ b/packages/utils/src/validation/validatorFunctions.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; import validator from 'validator'; import { toArray } from '../array'; diff --git a/packages/web-config-server/src/apiV1/dataBuilders/generic/analytics/analyticsYearOnYear.js b/packages/web-config-server/src/apiV1/dataBuilders/generic/analytics/analyticsYearOnYear.js index eedf58e33e..f14f907b75 100644 --- a/packages/web-config-server/src/apiV1/dataBuilders/generic/analytics/analyticsYearOnYear.js +++ b/packages/web-config-server/src/apiV1/dataBuilders/generic/analytics/analyticsYearOnYear.js @@ -5,7 +5,7 @@ import { periodToMoment } from '@tupaia/tsutils'; import { reduceToDictionary } from '@tupaia/utils'; -import moment from 'moment'; +import moment from 'moment-timezone'; import { AnalyticsPerPeriodBuilder } from './analyticsPerPeriod'; import { formatLayeredDataElementCode, layerYearOnYear } from '../../../utils/layerYearOnYear'; diff --git a/packages/web-config-server/src/apiV1/dataBuilders/generic/dataDownload/rawDataValues.js b/packages/web-config-server/src/apiV1/dataBuilders/generic/dataDownload/rawDataValues.js index ec176ddd73..5c93b1c4af 100644 --- a/packages/web-config-server/src/apiV1/dataBuilders/generic/dataDownload/rawDataValues.js +++ b/packages/web-config-server/src/apiV1/dataBuilders/generic/dataDownload/rawDataValues.js @@ -3,7 +3,7 @@ import { DataBuilder } from '/apiV1/dataBuilders/DataBuilder'; import { reduceToDictionary } from '@tupaia/utils'; import { transposeMatrix, mergeTableDataOnKey, sortByColumns } from '/apiV1/utils'; -import moment from 'moment'; +import moment from 'moment-timezone'; import flatten from 'lodash.flatten'; import keyBy from 'lodash.keyby'; diff --git a/packages/web-config-server/src/apiV1/dataBuilders/generic/percentage/percentOperationalFacilitiesWithData.js b/packages/web-config-server/src/apiV1/dataBuilders/generic/percentage/percentOperationalFacilitiesWithData.js index fb4f463345..18bea6ae87 100644 --- a/packages/web-config-server/src/apiV1/dataBuilders/generic/percentage/percentOperationalFacilitiesWithData.js +++ b/packages/web-config-server/src/apiV1/dataBuilders/generic/percentage/percentOperationalFacilitiesWithData.js @@ -1,4 +1,4 @@ -import moment from 'moment'; +import moment from 'moment-timezone'; import { aggregateOperationalFacilityValues, getFacilityStatuses } from '/apiV1/utils'; // Example use: % clinics surveyed in last 6 months diff --git a/packages/web-config-server/src/apiV1/dataBuilders/generic/table/simpleTableOfEvents.js b/packages/web-config-server/src/apiV1/dataBuilders/generic/table/simpleTableOfEvents.js index 9022402941..1db56585da 100644 --- a/packages/web-config-server/src/apiV1/dataBuilders/generic/table/simpleTableOfEvents.js +++ b/packages/web-config-server/src/apiV1/dataBuilders/generic/table/simpleTableOfEvents.js @@ -3,7 +3,7 @@ * Copyright (c) 2018 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; import { DataBuilder } from '/apiV1/dataBuilders/DataBuilder'; const buildResponse = rawData => { diff --git a/packages/web-config-server/src/apiV1/dataBuilders/generic/table/tableOfDataValues/TableOfDataValuesWithCalc.js b/packages/web-config-server/src/apiV1/dataBuilders/generic/table/tableOfDataValues/TableOfDataValuesWithCalc.js index 73744f23ce..8418be21d4 100644 --- a/packages/web-config-server/src/apiV1/dataBuilders/generic/table/tableOfDataValues/TableOfDataValuesWithCalc.js +++ b/packages/web-config-server/src/apiV1/dataBuilders/generic/table/tableOfDataValues/TableOfDataValuesWithCalc.js @@ -3,7 +3,7 @@ * Copyright (c) 2019 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; import { CustomError } from '@tupaia/utils'; import { TableOfDataValuesBuilder } from './tableOfDataValues'; diff --git a/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/flight/Flight.js b/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/flight/Flight.js index afae0bfe2f..94f5a49c8b 100644 --- a/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/flight/Flight.js +++ b/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/flight/Flight.js @@ -1,4 +1,4 @@ -import moment from 'moment'; +import moment from 'moment-timezone'; export const FLIGHT_DATE = 'QMIA028'; const TIMEZONE_SAMOA = 'Pacific/Apia'; diff --git a/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/totalNumOfPassengerByFlightDate.js b/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/totalNumOfPassengerByFlightDate.js index ef2aa2e391..ccd8a7246f 100644 --- a/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/totalNumOfPassengerByFlightDate.js +++ b/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/totalNumOfPassengerByFlightDate.js @@ -2,7 +2,7 @@ * Tupaia Config Server * Copyright (c) 2019 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; import { DataBuilder } from '/apiV1/dataBuilders/DataBuilder'; import { Flight, getTotalNumPassengers, FLIGHT_DATE } from './flight'; diff --git a/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/valueAndPercentageByDataValueByFlightDate.js b/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/valueAndPercentageByDataValueByFlightDate.js index 6719758842..2b95c3407d 100644 --- a/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/valueAndPercentageByDataValueByFlightDate.js +++ b/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/valueAndPercentageByDataValueByFlightDate.js @@ -2,7 +2,7 @@ * Tupaia Config Server * Copyright (c) 2019 Beyond Essential Systems Pty Ltd */ -import moment from 'moment'; +import moment from 'moment-timezone'; import { DataBuilder } from '/apiV1/dataBuilders/DataBuilder'; import { Flight, diff --git a/packages/web-config-server/src/apiV1/utils/getDateRange.js b/packages/web-config-server/src/apiV1/utils/getDateRange.js index 1bce3d62b8..2c43f2b5fb 100644 --- a/packages/web-config-server/src/apiV1/utils/getDateRange.js +++ b/packages/web-config-server/src/apiV1/utils/getDateRange.js @@ -1,4 +1,4 @@ -import moment from 'moment'; +import moment from 'moment-timezone'; const DEFAULT_RANGE = 2; /** diff --git a/packages/web-config-server/src/export/exportChartHandler.js b/packages/web-config-server/src/export/exportChartHandler.js index 8ae51ce0e5..3e1971c915 100644 --- a/packages/web-config-server/src/export/exportChartHandler.js +++ b/packages/web-config-server/src/export/exportChartHandler.js @@ -1,5 +1,5 @@ import xlsx from 'xlsx'; -import moment from 'moment'; +import moment from 'moment-timezone'; import fs from 'fs'; import { USER_SESSION_CONFIG } from '/authSession'; @@ -57,7 +57,7 @@ export const exportChartHandler = async (req, res) => { true, { authorization: authHeader, - } + }, ); const matrixData = { From 04c0eca9ce48fe4041b4ada3aca21740bab34a20 Mon Sep 17 00:00:00 2001 From: Jasper Lai <33956381+jaskfla@users.noreply.github.com> Date: Fri, 8 Mar 2024 15:36:02 +1300 Subject: [PATCH 08/10] Revert "import `moment` from `moment-timezone`" This reverts commit b6695ecf403b80ff6ab8e77b82f597ee68140278. --- .../src/importExport/SurveyResponsesExportModal.jsx | 2 +- .../admin-panel/src/pages/resources/SocialFeedPage.jsx | 2 +- .../src/pages/resources/SurveyResponsesPage.jsx | 2 +- .../src/widgets/InputField/registerInputFields.jsx | 10 +++++----- .../exportSurveyResponses/exportResponsesToFile.js | 4 ++-- .../importSurveyResponses/importSurveyResponses.js | 6 +++--- .../src/database/models/SurveyResponse.js | 4 ++-- .../dhis/pushers/data/aggregate/AggregateDataPusher.js | 4 ++-- .../src/tests/apiV2/authenticate/oneTimeLogin.test.js | 2 +- .../import/importSurveyResponses/testFunctionality.js | 2 +- .../src/tests/apiV2/surveyResponse.test.js | 3 ++- .../data/aggregate/AggregateDataPusher.fixtures.js | 2 +- .../data/aggregate/testPeriodsBasedOnDataSet.js | 2 +- packages/data-api/src/TupaiaDataApi.ts | 2 +- .../services/dhis/translators/formatDateForDHIS2.ts | 2 +- .../src/services/superset/SupersetService.ts | 2 +- packages/data-lake-api/src/DataLakeApi.ts | 2 +- ...-CovidSamoaDeleteOutdatedResponses-modifies-data.js | 2 +- packages/database/src/modelClasses/FeedItem.js | 2 +- packages/database/src/modelClasses/OneTimeLogin.js | 2 +- packages/database/src/testUtilities/clearTestData.js | 2 +- packages/e2e/cypress/scripts/generateConfig/helpers.js | 2 +- .../components/getSurveyResponsesExportModal.jsx | 2 +- .../pages/helpers/getSurveyResponsePageConfigs.js | 2 +- .../assessment/specificQuestions/TimeSinceQuestion.jsx | 8 ++++---- packages/meditrak-app/app/utilities/format.jsx | 2 +- packages/tsutils/src/__tests__/datetime.test.ts | 2 +- packages/tsutils/src/datetime.ts | 4 ++-- .../utils/useExportDashboardItem.tsx | 2 +- packages/ui-chart-components/src/utils/utils.ts | 2 +- .../components/DateRangePicker/DateRangePicker.test.js | 2 +- .../components/DateRangePicker/DatePickerDialog.tsx | 2 +- .../src/components/DateRangePicker/MonthPicker.tsx | 2 +- .../src/components/DateRangePicker/QuarterPicker.tsx | 2 +- .../src/components/Legend/SpectrumLegend.tsx | 2 +- packages/ui-map-components/src/utils/markerColors.ts | 2 +- .../utils/src/__tests__/period/addMomentOffset.test.js | 2 +- .../__tests__/period/convertDateRangeToPeriods.test.js | 2 +- .../utils/src/__tests__/period/period/period.test.js | 2 +- .../src/__tests__/period/periodGranularities.test.js | 2 +- packages/utils/src/datetime.js | 2 +- .../utils/src/period/getDateRangeForGranularity.js | 2 +- packages/utils/src/period/getExportDatesString.js | 2 +- packages/utils/src/period/periodGranularities.js | 2 +- 44 files changed, 58 insertions(+), 57 deletions(-) diff --git a/packages/admin-panel/src/importExport/SurveyResponsesExportModal.jsx b/packages/admin-panel/src/importExport/SurveyResponsesExportModal.jsx index b84e890c89..ecddda5ab6 100644 --- a/packages/admin-panel/src/importExport/SurveyResponsesExportModal.jsx +++ b/packages/admin-panel/src/importExport/SurveyResponsesExportModal.jsx @@ -4,7 +4,7 @@ */ import React, { useState } from 'react'; -import moment from 'moment-timezone'; +import moment from 'moment'; import { DateTimePicker, RadioGroup } from '@tupaia/ui-components'; import { stripTimezoneFromDate } from '@tupaia/utils'; import { ReduxAutocomplete } from '../autocomplete'; diff --git a/packages/admin-panel/src/pages/resources/SocialFeedPage.jsx b/packages/admin-panel/src/pages/resources/SocialFeedPage.jsx index b2433e0f52..8f4c1a38d2 100644 --- a/packages/admin-panel/src/pages/resources/SocialFeedPage.jsx +++ b/packages/admin-panel/src/pages/resources/SocialFeedPage.jsx @@ -6,7 +6,7 @@ import React from 'react'; import Typography from '@material-ui/core/Typography'; import PropTypes from 'prop-types'; -import moment from 'moment-timezone'; +import moment from 'moment'; import styled from 'styled-components'; import { ResourcePage } from './ResourcePage'; diff --git a/packages/admin-panel/src/pages/resources/SurveyResponsesPage.jsx b/packages/admin-panel/src/pages/resources/SurveyResponsesPage.jsx index 62a245d1e7..a399ffaac7 100644 --- a/packages/admin-panel/src/pages/resources/SurveyResponsesPage.jsx +++ b/packages/admin-panel/src/pages/resources/SurveyResponsesPage.jsx @@ -5,7 +5,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import moment from 'moment-timezone'; +import moment from 'moment'; import { getBrowserTimeZone } from '@tupaia/utils'; import { ApprovalStatus } from '@tupaia/types'; import { ResourcePage } from './ResourcePage'; diff --git a/packages/admin-panel/src/widgets/InputField/registerInputFields.jsx b/packages/admin-panel/src/widgets/InputField/registerInputFields.jsx index b97a2eb8bf..c4293e69fa 100644 --- a/packages/admin-panel/src/widgets/InputField/registerInputFields.jsx +++ b/packages/admin-panel/src/widgets/InputField/registerInputFields.jsx @@ -5,19 +5,19 @@ import React from 'react'; import { Link } from 'react-router-dom'; -import moment from 'moment-timezone'; +import moment from 'moment'; import { InputAdornment } from '@material-ui/core'; import styled from 'styled-components'; import { Button, - Checkbox, + TextField, DatePicker, DateTimePicker, - HexcodeField, - ImageUploadField, RadioGroup, Select, - TextField, + ImageUploadField, + HexcodeField, + Checkbox, } from '@tupaia/ui-components'; import { stripTimezoneFromDate } from '@tupaia/utils'; import { registerInputField } from './InputField'; diff --git a/packages/central-server/src/apiV2/export/exportSurveyResponses/exportResponsesToFile.js b/packages/central-server/src/apiV2/export/exportSurveyResponses/exportResponsesToFile.js index 313d0afdd6..b9091ce7ab 100644 --- a/packages/central-server/src/apiV2/export/exportSurveyResponses/exportResponsesToFile.js +++ b/packages/central-server/src/apiV2/export/exportSurveyResponses/exportResponsesToFile.js @@ -4,7 +4,7 @@ */ import xlsx from 'xlsx'; -import moment from 'moment-timezone'; +import moment from 'moment'; import keyBy from 'lodash.keyby'; import chunk from 'lodash.chunk'; import groupBy from 'lodash.groupby'; @@ -12,8 +12,8 @@ import { addExportedDateAndOriginAtTheSheetBottom, getExportDatesString, getUniqueEntries, - toFilename, truncateString, + toFilename, } from '@tupaia/utils'; import { TYPES } from '@tupaia/database'; import { ANSWER_TYPES, NON_DATA_ELEMENT_ANSWER_TYPES } from '../../../database/models/Answer'; diff --git a/packages/central-server/src/apiV2/import/importSurveyResponses/importSurveyResponses.js b/packages/central-server/src/apiV2/import/importSurveyResponses/importSurveyResponses.js index 6718bd9731..d8828390ff 100644 --- a/packages/central-server/src/apiV2/import/importSurveyResponses/importSurveyResponses.js +++ b/packages/central-server/src/apiV2/import/importSurveyResponses/importSurveyResponses.js @@ -4,7 +4,7 @@ */ import xlsx from 'xlsx'; -import moment from 'moment-timezone'; +import moment from 'moment'; import { generateId } from '@tupaia/database'; import { constructIsOneOf, @@ -14,11 +14,11 @@ import { hasContent, ImportValidationError, ObjectValidator, - reduceToDictionary, respond, - stripTimezoneFromDate, takesIdForm, UploadError, + reduceToDictionary, + stripTimezoneFromDate, } from '@tupaia/utils'; import { getArrayQueryParameter } from '../../utilities'; diff --git a/packages/central-server/src/database/models/SurveyResponse.js b/packages/central-server/src/database/models/SurveyResponse.js index 76e4971f23..34e20a86be 100644 --- a/packages/central-server/src/database/models/SurveyResponse.js +++ b/packages/central-server/src/database/models/SurveyResponse.js @@ -4,9 +4,9 @@ */ import momentTimezone from 'moment-timezone'; -import moment from 'moment-timezone'; +import moment from 'moment'; -import { DatabaseType, MaterializedViewLogDatabaseModel, TYPES } from '@tupaia/database'; +import { MaterializedViewLogDatabaseModel, DatabaseType, TYPES } from '@tupaia/database'; export const SURVEY_RESPONSE_APPROVAL_STATUS = { NOT_REQUIRED: 'not_required', diff --git a/packages/central-server/src/dhis/pushers/data/aggregate/AggregateDataPusher.js b/packages/central-server/src/dhis/pushers/data/aggregate/AggregateDataPusher.js index 9b53ad30f4..5052abaad8 100644 --- a/packages/central-server/src/dhis/pushers/data/aggregate/AggregateDataPusher.js +++ b/packages/central-server/src/dhis/pushers/data/aggregate/AggregateDataPusher.js @@ -3,8 +3,8 @@ * Copyright (c) 2019 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; -import { combineDiagnostics, DHIS2_RESOURCE_TYPES, dhisToTupaiaPeriodType } from '@tupaia/dhis-api'; +import moment from 'moment'; +import { DHIS2_RESOURCE_TYPES, dhisToTupaiaPeriodType, combineDiagnostics } from '@tupaia/dhis-api'; import { DEFAULT_PERIOD_TYPE, periodToType, diff --git a/packages/central-server/src/tests/apiV2/authenticate/oneTimeLogin.test.js b/packages/central-server/src/tests/apiV2/authenticate/oneTimeLogin.test.js index 27d88b8145..fc69ebd59e 100644 --- a/packages/central-server/src/tests/apiV2/authenticate/oneTimeLogin.test.js +++ b/packages/central-server/src/tests/apiV2/authenticate/oneTimeLogin.test.js @@ -5,7 +5,7 @@ import {} from 'dotenv/config'; // Load the environment variables into process.env import { expect } from 'chai'; -import moment from 'moment-timezone'; +import moment from 'moment'; import { randomEmail } from '@tupaia/utils'; import { getAuthorizationHeader, TestableApp } from '../../testUtilities'; diff --git a/packages/central-server/src/tests/apiV2/import/importSurveyResponses/testFunctionality.js b/packages/central-server/src/tests/apiV2/import/importSurveyResponses/testFunctionality.js index 549fca56e2..21d4cbe610 100644 --- a/packages/central-server/src/tests/apiV2/import/importSurveyResponses/testFunctionality.js +++ b/packages/central-server/src/tests/apiV2/import/importSurveyResponses/testFunctionality.js @@ -6,7 +6,7 @@ import { expect } from 'chai'; import groupBy from 'lodash.groupby'; import pick from 'lodash.pick'; -import moment from 'moment-timezone'; +import moment from 'moment'; import { buildAndInsertSurveys, diff --git a/packages/central-server/src/tests/apiV2/surveyResponse.test.js b/packages/central-server/src/tests/apiV2/surveyResponse.test.js index ab5c8b605e..2fa9b7f4a3 100644 --- a/packages/central-server/src/tests/apiV2/surveyResponse.test.js +++ b/packages/central-server/src/tests/apiV2/surveyResponse.test.js @@ -1,5 +1,6 @@ import { expect } from 'chai'; -import moment from 'moment-timezone'; +import sinon from 'sinon'; +import moment from 'moment'; import { buildAndInsertSurveys, generateTestId, upsertDummyRecord } from '@tupaia/database'; import { oneSecondSleep, randomIntBetween } from '@tupaia/utils'; diff --git a/packages/central-server/src/tests/dhis/pushers/data/aggregate/AggregateDataPusher.fixtures.js b/packages/central-server/src/tests/dhis/pushers/data/aggregate/AggregateDataPusher.fixtures.js index d269fe44c4..632e60d276 100644 --- a/packages/central-server/src/tests/dhis/pushers/data/aggregate/AggregateDataPusher.fixtures.js +++ b/packages/central-server/src/tests/dhis/pushers/data/aggregate/AggregateDataPusher.fixtures.js @@ -2,7 +2,7 @@ * Tupaia MediTrak * Copyright (c) 2019 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; import { generateTestId, TYPES } from '@tupaia/database'; import { ANSWER_TYPES } from '../../../../../database/models/Answer'; diff --git a/packages/central-server/src/tests/dhis/pushers/data/aggregate/testPeriodsBasedOnDataSet.js b/packages/central-server/src/tests/dhis/pushers/data/aggregate/testPeriodsBasedOnDataSet.js index c0479318eb..17547526c2 100644 --- a/packages/central-server/src/tests/dhis/pushers/data/aggregate/testPeriodsBasedOnDataSet.js +++ b/packages/central-server/src/tests/dhis/pushers/data/aggregate/testPeriodsBasedOnDataSet.js @@ -3,7 +3,7 @@ * Copyright (c) 2019 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; import sinon from 'sinon'; import { expect } from 'chai'; import { AggregateDataPusher } from '../../../../../dhis/pushers/data/aggregate/AggregateDataPusher'; diff --git a/packages/data-api/src/TupaiaDataApi.ts b/packages/data-api/src/TupaiaDataApi.ts index 65258f4eec..c2a1d0f68b 100644 --- a/packages/data-api/src/TupaiaDataApi.ts +++ b/packages/data-api/src/TupaiaDataApi.ts @@ -5,7 +5,7 @@ import groupBy from 'lodash.groupby'; -import moment from 'moment-timezone'; +import moment from 'moment'; import { TupaiaDatabase, SqlQuery } from '@tupaia/database'; import { getSortByKey, DEFAULT_BINARY_OPTIONS, yup } from '@tupaia/utils'; import { isNotNullish } from '@tupaia/tsutils'; diff --git a/packages/data-broker/src/services/dhis/translators/formatDateForDHIS2.ts b/packages/data-broker/src/services/dhis/translators/formatDateForDHIS2.ts index c8d5d77db3..e5e0e682d4 100644 --- a/packages/data-broker/src/services/dhis/translators/formatDateForDHIS2.ts +++ b/packages/data-broker/src/services/dhis/translators/formatDateForDHIS2.ts @@ -3,7 +3,7 @@ * Copyright (c) 2018 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; const formatDate = (date: string, format: string) => moment.parseZone(date).format(format); diff --git a/packages/data-broker/src/services/superset/SupersetService.ts b/packages/data-broker/src/services/superset/SupersetService.ts index c4bd0885c8..2dc8783554 100644 --- a/packages/data-broker/src/services/superset/SupersetService.ts +++ b/packages/data-broker/src/services/superset/SupersetService.ts @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; import { SupersetApi } from '@tupaia/superset-api'; import { Service } from '../Service'; diff --git a/packages/data-lake-api/src/DataLakeApi.ts b/packages/data-lake-api/src/DataLakeApi.ts index ea0c2d0c43..7bcbd4f76e 100644 --- a/packages/data-lake-api/src/DataLakeApi.ts +++ b/packages/data-lake-api/src/DataLakeApi.ts @@ -5,7 +5,7 @@ import groupBy from 'lodash.groupby'; -import moment from 'moment-timezone'; +import moment from 'moment'; import { getSortByKey } from '@tupaia/utils'; import { DataLakeAnalyticsFetchQuery } from './DataLakeAnalyticsFetchQuery'; import { DataLakeEventsFetchQuery, Event } from './DataLakeEventsFetchQuery'; diff --git a/packages/database/src/migrations/20220117011411-CovidSamoaDeleteOutdatedResponses-modifies-data.js b/packages/database/src/migrations/20220117011411-CovidSamoaDeleteOutdatedResponses-modifies-data.js index 574abd0a43..697384a61f 100644 --- a/packages/database/src/migrations/20220117011411-CovidSamoaDeleteOutdatedResponses-modifies-data.js +++ b/packages/database/src/migrations/20220117011411-CovidSamoaDeleteOutdatedResponses-modifies-data.js @@ -1,6 +1,6 @@ 'use strict'; -import moment from 'moment-timezone'; +import moment from 'moment'; var dbm; var type; diff --git a/packages/database/src/modelClasses/FeedItem.js b/packages/database/src/modelClasses/FeedItem.js index 1480dafe6f..20604a879b 100644 --- a/packages/database/src/modelClasses/FeedItem.js +++ b/packages/database/src/modelClasses/FeedItem.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; import { DatabaseModel } from '../DatabaseModel'; import { DatabaseType } from '../DatabaseType'; diff --git a/packages/database/src/modelClasses/OneTimeLogin.js b/packages/database/src/modelClasses/OneTimeLogin.js index 913296a845..25699db79c 100644 --- a/packages/database/src/modelClasses/OneTimeLogin.js +++ b/packages/database/src/modelClasses/OneTimeLogin.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 Beyond Essential Systems Pty Ltd */ import randomToken from 'rand-token'; -import moment from 'moment-timezone'; +import moment from 'moment'; import { DatabaseError, UnauthenticatedError } from '@tupaia/utils'; import { DatabaseModel } from '../DatabaseModel'; diff --git a/packages/database/src/testUtilities/clearTestData.js b/packages/database/src/testUtilities/clearTestData.js index 47f9bb6f30..07fb478b6a 100644 --- a/packages/database/src/testUtilities/clearTestData.js +++ b/packages/database/src/testUtilities/clearTestData.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2020 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; import { AnalyticsRefresher } from '..'; const COMPARISON = `LIKE '%_test%'`; diff --git a/packages/e2e/cypress/scripts/generateConfig/helpers.js b/packages/e2e/cypress/scripts/generateConfig/helpers.js index db20094334..6449b01447 100644 --- a/packages/e2e/cypress/scripts/generateConfig/helpers.js +++ b/packages/e2e/cypress/scripts/generateConfig/helpers.js @@ -4,7 +4,7 @@ */ import { uniq } from 'lodash'; -import moment from 'moment-timezone'; +import moment from 'moment'; import { compareAsc, readJsonFile, yup, yupUtils } from '@tupaia/utils'; diff --git a/packages/lesmis/src/views/AdminPanel/components/getSurveyResponsesExportModal.jsx b/packages/lesmis/src/views/AdminPanel/components/getSurveyResponsesExportModal.jsx index 276b07c1a8..450864ec62 100644 --- a/packages/lesmis/src/views/AdminPanel/components/getSurveyResponsesExportModal.jsx +++ b/packages/lesmis/src/views/AdminPanel/components/getSurveyResponsesExportModal.jsx @@ -4,7 +4,7 @@ */ import React, { useState } from 'react'; -import moment from 'moment-timezone'; +import moment from 'moment'; import { DateTimePicker, RadioGroup } from '@tupaia/ui-components'; import { ReduxAutocomplete, ExportModal } from '@tupaia/admin-panel'; import { stripTimezoneFromDate } from '@tupaia/utils'; diff --git a/packages/lesmis/src/views/AdminPanel/pages/helpers/getSurveyResponsePageConfigs.js b/packages/lesmis/src/views/AdminPanel/pages/helpers/getSurveyResponsePageConfigs.js index 33abb6e02e..b882880408 100644 --- a/packages/lesmis/src/views/AdminPanel/pages/helpers/getSurveyResponsePageConfigs.js +++ b/packages/lesmis/src/views/AdminPanel/pages/helpers/getSurveyResponsePageConfigs.js @@ -2,7 +2,7 @@ * Tupaia * Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; import { getBrowserTimeZone } from '@tupaia/utils'; import { getImportConfigs } from './getImportConfigs'; import { getSurveyResponsesExportModal } from '../../components'; diff --git a/packages/meditrak-app/app/assessment/specificQuestions/TimeSinceQuestion.jsx b/packages/meditrak-app/app/assessment/specificQuestions/TimeSinceQuestion.jsx index df6b60b8cc..c7aedf1601 100644 --- a/packages/meditrak-app/app/assessment/specificQuestions/TimeSinceQuestion.jsx +++ b/packages/meditrak-app/app/assessment/specificQuestions/TimeSinceQuestion.jsx @@ -3,12 +3,12 @@ * Copyright (c) 2018 Beyond Essential Systems Pty Ltd */ -import React, {PureComponent} from 'react'; +import React, { PureComponent } from 'react'; import PropTypes from 'prop-types'; -import moment from 'moment-timezone'; +import moment from 'moment'; -import {DateQuestion} from './DateQuestion'; -import {formatPlural} from '../../utilities'; +import { DateQuestion } from './DateQuestion'; +import { formatPlural } from '../../utilities'; class TimeSinceQuestion extends PureComponent { render() { diff --git a/packages/meditrak-app/app/utilities/format.jsx b/packages/meditrak-app/app/utilities/format.jsx index 71e6c87be7..dbb5524e38 100644 --- a/packages/meditrak-app/app/utilities/format.jsx +++ b/packages/meditrak-app/app/utilities/format.jsx @@ -2,7 +2,7 @@ * Tupaia MediTrak * Copyright (c) 2017 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; export const formatPlural = (singular, plural, count) => count === 1 ? singular.replace('@count', count) : plural.replace('@count', count); diff --git a/packages/tsutils/src/__tests__/datetime.test.ts b/packages/tsutils/src/__tests__/datetime.test.ts index 60aabab307..e6a2df8922 100644 --- a/packages/tsutils/src/__tests__/datetime.test.ts +++ b/packages/tsutils/src/__tests__/datetime.test.ts @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2022 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; import { getTimezoneNameFromTimestamp } from '../datetime'; diff --git a/packages/tsutils/src/datetime.ts b/packages/tsutils/src/datetime.ts index fb03693733..de1652edb2 100644 --- a/packages/tsutils/src/datetime.ts +++ b/packages/tsutils/src/datetime.ts @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2022 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; import momentTimezone from 'moment-timezone'; /** @@ -19,4 +19,4 @@ export const getTimezoneNameFromTimestamp = (timestamp: string) => .names() .find(name => getUtcOffsetFromTimestamp(timestamp) === momentTimezone.tz(name).format('Z')); -export const utcMoment = (...args: Parameters<(typeof moment)['utc']>) => moment.utc(...args); +export const utcMoment = (...args: Parameters) => moment.utc(...args); diff --git a/packages/tupaia-web/src/features/EnlargedDashboardItem/utils/useExportDashboardItem.tsx b/packages/tupaia-web/src/features/EnlargedDashboardItem/utils/useExportDashboardItem.tsx index e295b957b4..bc5f184ddb 100644 --- a/packages/tupaia-web/src/features/EnlargedDashboardItem/utils/useExportDashboardItem.tsx +++ b/packages/tupaia-web/src/features/EnlargedDashboardItem/utils/useExportDashboardItem.tsx @@ -4,7 +4,7 @@ */ import { RefObject, useContext, useEffect } from 'react'; -import moment from 'moment-timezone'; +import moment from 'moment'; import downloadJs from 'downloadjs'; import domtoimage from 'dom-to-image'; import { useParams } from 'react-router-dom'; diff --git a/packages/ui-chart-components/src/utils/utils.ts b/packages/ui-chart-components/src/utils/utils.ts index 666c8e0d49..2fc05a59fe 100644 --- a/packages/ui-chart-components/src/utils/utils.ts +++ b/packages/ui-chart-components/src/utils/utils.ts @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; import { useTheme } from '@material-ui/core/styles'; import { CartesianChartPresentationOptions, diff --git a/packages/ui-components/src/__tests__/components/DateRangePicker/DateRangePicker.test.js b/packages/ui-components/src/__tests__/components/DateRangePicker/DateRangePicker.test.js index e3eb01e72a..650dc5fd7e 100644 --- a/packages/ui-components/src/__tests__/components/DateRangePicker/DateRangePicker.test.js +++ b/packages/ui-components/src/__tests__/components/DateRangePicker/DateRangePicker.test.js @@ -6,7 +6,7 @@ import React from 'react'; import { screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import moment from 'moment-timezone'; +import moment from 'moment'; import { DEFAULT_MIN_DATE, GRANULARITIES, diff --git a/packages/ui-components/src/components/DateRangePicker/DatePickerDialog.tsx b/packages/ui-components/src/components/DateRangePicker/DatePickerDialog.tsx index 937af78a6c..6ee3f4f1c1 100644 --- a/packages/ui-components/src/components/DateRangePicker/DatePickerDialog.tsx +++ b/packages/ui-components/src/components/DateRangePicker/DatePickerDialog.tsx @@ -5,7 +5,7 @@ */ import React, { useEffect, useState } from 'react'; -import moment from 'moment-timezone'; +import moment from 'moment'; import styled from 'styled-components'; import { DialogProps, Typography } from '@material-ui/core'; import { diff --git a/packages/ui-components/src/components/DateRangePicker/MonthPicker.tsx b/packages/ui-components/src/components/DateRangePicker/MonthPicker.tsx index a2b13b6709..9564173281 100644 --- a/packages/ui-components/src/components/DateRangePicker/MonthPicker.tsx +++ b/packages/ui-components/src/components/DateRangePicker/MonthPicker.tsx @@ -5,7 +5,7 @@ */ import React from 'react'; -import moment from 'moment-timezone'; +import moment from 'moment'; import { MenuItem } from '../Inputs'; import { DatePicker } from './DatePicker'; import { BaseDatePickerProps } from '../../types'; diff --git a/packages/ui-components/src/components/DateRangePicker/QuarterPicker.tsx b/packages/ui-components/src/components/DateRangePicker/QuarterPicker.tsx index e9a1f462f6..9130e803b7 100644 --- a/packages/ui-components/src/components/DateRangePicker/QuarterPicker.tsx +++ b/packages/ui-components/src/components/DateRangePicker/QuarterPicker.tsx @@ -5,7 +5,7 @@ */ import React from 'react'; -import moment from 'moment-timezone'; +import moment from 'moment'; import { MenuItem } from '../Inputs'; import { DatePicker } from './DatePicker'; import { BaseDatePickerProps } from '../../types'; diff --git a/packages/ui-map-components/src/components/Legend/SpectrumLegend.tsx b/packages/ui-map-components/src/components/Legend/SpectrumLegend.tsx index 7aad8e5efd..408f370e13 100644 --- a/packages/ui-map-components/src/components/Legend/SpectrumLegend.tsx +++ b/packages/ui-map-components/src/components/Legend/SpectrumLegend.tsx @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; import React from 'react'; import MuiBox from '@material-ui/core/Box'; import styled from 'styled-components'; diff --git a/packages/ui-map-components/src/utils/markerColors.ts b/packages/ui-map-components/src/utils/markerColors.ts index 38171f0dd0..0fbf6135ed 100644 --- a/packages/ui-map-components/src/utils/markerColors.ts +++ b/packages/ui-map-components/src/utils/markerColors.ts @@ -4,7 +4,7 @@ * */ -import moment from 'moment-timezone'; +import moment from 'moment'; import { blue, red, green } from '@material-ui/core/colors'; import { ScaleType, MeasureColorScheme } from '@tupaia/types'; import { BREWER_PALETTE, HEATMAP_UNKNOWN_COLOR } from '../constants'; diff --git a/packages/utils/src/__tests__/period/addMomentOffset.test.js b/packages/utils/src/__tests__/period/addMomentOffset.test.js index c591c3ef08..a313bdd195 100644 --- a/packages/utils/src/__tests__/period/addMomentOffset.test.js +++ b/packages/utils/src/__tests__/period/addMomentOffset.test.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; import { utcMoment } from '../../datetime'; diff --git a/packages/utils/src/__tests__/period/convertDateRangeToPeriods.test.js b/packages/utils/src/__tests__/period/convertDateRangeToPeriods.test.js index c76ff5fabe..308bbda78f 100644 --- a/packages/utils/src/__tests__/period/convertDateRangeToPeriods.test.js +++ b/packages/utils/src/__tests__/period/convertDateRangeToPeriods.test.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2020 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; import { convertDateRangeToPeriods } from '../../period/convertDateRangeToPeriods'; diff --git a/packages/utils/src/__tests__/period/period/period.test.js b/packages/utils/src/__tests__/period/period/period.test.js index ba198b5acb..f0371b200a 100644 --- a/packages/utils/src/__tests__/period/period/period.test.js +++ b/packages/utils/src/__tests__/period/period/period.test.js @@ -4,7 +4,7 @@ */ import MockDate from 'mockdate'; -import moment from 'moment-timezone'; +import moment from 'moment'; import { dateStringToPeriod, diff --git a/packages/utils/src/__tests__/period/periodGranularities.test.js b/packages/utils/src/__tests__/period/periodGranularities.test.js index 51bba866bf..48f3355264 100644 --- a/packages/utils/src/__tests__/period/periodGranularities.test.js +++ b/packages/utils/src/__tests__/period/periodGranularities.test.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2020 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; import sinon from 'sinon'; import { roundStartEndDates, getDefaultDates, getLimits } from '../../period/periodGranularities'; diff --git a/packages/utils/src/datetime.js b/packages/utils/src/datetime.js index 9a83abe566..431ad24cef 100644 --- a/packages/utils/src/datetime.js +++ b/packages/utils/src/datetime.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2020 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; /** * @param {...any} args diff --git a/packages/utils/src/period/getDateRangeForGranularity.js b/packages/utils/src/period/getDateRangeForGranularity.js index 9f673ab903..9684078189 100644 --- a/packages/utils/src/period/getDateRangeForGranularity.js +++ b/packages/utils/src/period/getDateRangeForGranularity.js @@ -4,7 +4,7 @@ */ import memoize from 'fast-memoize'; -import moment from 'moment-timezone'; +import moment from 'moment'; const DATE_FORMAT = 'YYYY-MM-DD'; const DATETIME_FORMAT = `${DATE_FORMAT} HH:mm:ss`; diff --git a/packages/utils/src/period/getExportDatesString.js b/packages/utils/src/period/getExportDatesString.js index be050b475e..8e9217dce2 100644 --- a/packages/utils/src/period/getExportDatesString.js +++ b/packages/utils/src/period/getExportDatesString.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2020 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; export const getExportDatesString = (startDate, endDate) => { const format = 'D-M-YY'; diff --git a/packages/utils/src/period/periodGranularities.js b/packages/utils/src/period/periodGranularities.js index 46a3d62bba..a30bfc0648 100644 --- a/packages/utils/src/period/periodGranularities.js +++ b/packages/utils/src/period/periodGranularities.js @@ -6,7 +6,7 @@ */ import PropTypes from 'prop-types'; -import moment from 'moment-timezone'; +import moment from 'moment'; import { WEEK_DISPLAY_CONFIG, WEEK_DISPLAY_FORMATS } from './weekDisplayFormats'; import { addMomentOffset } from './addMomentOffset'; From 891f9b2ed2777490d67be1e3c7148e8df11cd2cf Mon Sep 17 00:00:00 2001 From: Jasper Lai <33956381+jaskfla@users.noreply.github.com> Date: Fri, 8 Mar 2024 15:36:03 +1300 Subject: [PATCH 09/10] Revert "again" This reverts commit 4113e105ada2da3b543f9ba6dfa8beb722a13557. --- .../assessment/actions/submitSurvey/processSurveyResponse.jsx | 2 +- packages/utils/src/stripTimezoneFromDate.js | 2 +- packages/utils/src/validation/validatorFunctions.js | 2 +- .../dataBuilders/generic/analytics/analyticsYearOnYear.js | 2 +- .../apiV1/dataBuilders/generic/dataDownload/rawDataValues.js | 2 +- .../percentage/percentOperationalFacilitiesWithData.js | 2 +- .../apiV1/dataBuilders/generic/table/simpleTableOfEvents.js | 2 +- .../table/tableOfDataValues/TableOfDataValuesWithCalc.js | 2 +- .../apiV1/dataBuilders/modules/covid-samoa/flight/Flight.js | 2 +- .../modules/covid-samoa/totalNumOfPassengerByFlightDate.js | 2 +- .../covid-samoa/valueAndPercentageByDataValueByFlightDate.js | 2 +- packages/web-config-server/src/apiV1/utils/getDateRange.js | 2 +- packages/web-config-server/src/export/exportChartHandler.js | 4 ++-- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/meditrak-app/app/assessment/actions/submitSurvey/processSurveyResponse.jsx b/packages/meditrak-app/app/assessment/actions/submitSurvey/processSurveyResponse.jsx index d0a4e97705..623e6a7201 100644 --- a/packages/meditrak-app/app/assessment/actions/submitSurvey/processSurveyResponse.jsx +++ b/packages/meditrak-app/app/assessment/actions/submitSurvey/processSurveyResponse.jsx @@ -4,7 +4,7 @@ */ import generateUUID from 'bson-objectid'; -import moment from 'moment-timezone'; +import moment from 'moment'; import RNFS from 'react-native-fs'; import { diff --git a/packages/utils/src/stripTimezoneFromDate.js b/packages/utils/src/stripTimezoneFromDate.js index 9e9318cb6c..c5da830b5f 100644 --- a/packages/utils/src/stripTimezoneFromDate.js +++ b/packages/utils/src/stripTimezoneFromDate.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; // used to strip the tz suffix so that a date can be added to the database without converting to utc // we don't want any timezone conversions when working with data_time diff --git a/packages/utils/src/validation/validatorFunctions.js b/packages/utils/src/validation/validatorFunctions.js index 7d83ba7fdb..c84397b6f1 100644 --- a/packages/utils/src/validation/validatorFunctions.js +++ b/packages/utils/src/validation/validatorFunctions.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; import validator from 'validator'; import { toArray } from '../array'; diff --git a/packages/web-config-server/src/apiV1/dataBuilders/generic/analytics/analyticsYearOnYear.js b/packages/web-config-server/src/apiV1/dataBuilders/generic/analytics/analyticsYearOnYear.js index f14f907b75..eedf58e33e 100644 --- a/packages/web-config-server/src/apiV1/dataBuilders/generic/analytics/analyticsYearOnYear.js +++ b/packages/web-config-server/src/apiV1/dataBuilders/generic/analytics/analyticsYearOnYear.js @@ -5,7 +5,7 @@ import { periodToMoment } from '@tupaia/tsutils'; import { reduceToDictionary } from '@tupaia/utils'; -import moment from 'moment-timezone'; +import moment from 'moment'; import { AnalyticsPerPeriodBuilder } from './analyticsPerPeriod'; import { formatLayeredDataElementCode, layerYearOnYear } from '../../../utils/layerYearOnYear'; diff --git a/packages/web-config-server/src/apiV1/dataBuilders/generic/dataDownload/rawDataValues.js b/packages/web-config-server/src/apiV1/dataBuilders/generic/dataDownload/rawDataValues.js index 5c93b1c4af..ec176ddd73 100644 --- a/packages/web-config-server/src/apiV1/dataBuilders/generic/dataDownload/rawDataValues.js +++ b/packages/web-config-server/src/apiV1/dataBuilders/generic/dataDownload/rawDataValues.js @@ -3,7 +3,7 @@ import { DataBuilder } from '/apiV1/dataBuilders/DataBuilder'; import { reduceToDictionary } from '@tupaia/utils'; import { transposeMatrix, mergeTableDataOnKey, sortByColumns } from '/apiV1/utils'; -import moment from 'moment-timezone'; +import moment from 'moment'; import flatten from 'lodash.flatten'; import keyBy from 'lodash.keyby'; diff --git a/packages/web-config-server/src/apiV1/dataBuilders/generic/percentage/percentOperationalFacilitiesWithData.js b/packages/web-config-server/src/apiV1/dataBuilders/generic/percentage/percentOperationalFacilitiesWithData.js index 18bea6ae87..fb4f463345 100644 --- a/packages/web-config-server/src/apiV1/dataBuilders/generic/percentage/percentOperationalFacilitiesWithData.js +++ b/packages/web-config-server/src/apiV1/dataBuilders/generic/percentage/percentOperationalFacilitiesWithData.js @@ -1,4 +1,4 @@ -import moment from 'moment-timezone'; +import moment from 'moment'; import { aggregateOperationalFacilityValues, getFacilityStatuses } from '/apiV1/utils'; // Example use: % clinics surveyed in last 6 months diff --git a/packages/web-config-server/src/apiV1/dataBuilders/generic/table/simpleTableOfEvents.js b/packages/web-config-server/src/apiV1/dataBuilders/generic/table/simpleTableOfEvents.js index 1db56585da..9022402941 100644 --- a/packages/web-config-server/src/apiV1/dataBuilders/generic/table/simpleTableOfEvents.js +++ b/packages/web-config-server/src/apiV1/dataBuilders/generic/table/simpleTableOfEvents.js @@ -3,7 +3,7 @@ * Copyright (c) 2018 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; import { DataBuilder } from '/apiV1/dataBuilders/DataBuilder'; const buildResponse = rawData => { diff --git a/packages/web-config-server/src/apiV1/dataBuilders/generic/table/tableOfDataValues/TableOfDataValuesWithCalc.js b/packages/web-config-server/src/apiV1/dataBuilders/generic/table/tableOfDataValues/TableOfDataValuesWithCalc.js index 8418be21d4..73744f23ce 100644 --- a/packages/web-config-server/src/apiV1/dataBuilders/generic/table/tableOfDataValues/TableOfDataValuesWithCalc.js +++ b/packages/web-config-server/src/apiV1/dataBuilders/generic/table/tableOfDataValues/TableOfDataValuesWithCalc.js @@ -3,7 +3,7 @@ * Copyright (c) 2019 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; import { CustomError } from '@tupaia/utils'; import { TableOfDataValuesBuilder } from './tableOfDataValues'; diff --git a/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/flight/Flight.js b/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/flight/Flight.js index 94f5a49c8b..afae0bfe2f 100644 --- a/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/flight/Flight.js +++ b/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/flight/Flight.js @@ -1,4 +1,4 @@ -import moment from 'moment-timezone'; +import moment from 'moment'; export const FLIGHT_DATE = 'QMIA028'; const TIMEZONE_SAMOA = 'Pacific/Apia'; diff --git a/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/totalNumOfPassengerByFlightDate.js b/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/totalNumOfPassengerByFlightDate.js index ccd8a7246f..ef2aa2e391 100644 --- a/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/totalNumOfPassengerByFlightDate.js +++ b/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/totalNumOfPassengerByFlightDate.js @@ -2,7 +2,7 @@ * Tupaia Config Server * Copyright (c) 2019 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; import { DataBuilder } from '/apiV1/dataBuilders/DataBuilder'; import { Flight, getTotalNumPassengers, FLIGHT_DATE } from './flight'; diff --git a/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/valueAndPercentageByDataValueByFlightDate.js b/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/valueAndPercentageByDataValueByFlightDate.js index 2b95c3407d..6719758842 100644 --- a/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/valueAndPercentageByDataValueByFlightDate.js +++ b/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/valueAndPercentageByDataValueByFlightDate.js @@ -2,7 +2,7 @@ * Tupaia Config Server * Copyright (c) 2019 Beyond Essential Systems Pty Ltd */ -import moment from 'moment-timezone'; +import moment from 'moment'; import { DataBuilder } from '/apiV1/dataBuilders/DataBuilder'; import { Flight, diff --git a/packages/web-config-server/src/apiV1/utils/getDateRange.js b/packages/web-config-server/src/apiV1/utils/getDateRange.js index 2c43f2b5fb..1bce3d62b8 100644 --- a/packages/web-config-server/src/apiV1/utils/getDateRange.js +++ b/packages/web-config-server/src/apiV1/utils/getDateRange.js @@ -1,4 +1,4 @@ -import moment from 'moment-timezone'; +import moment from 'moment'; const DEFAULT_RANGE = 2; /** diff --git a/packages/web-config-server/src/export/exportChartHandler.js b/packages/web-config-server/src/export/exportChartHandler.js index 3e1971c915..8ae51ce0e5 100644 --- a/packages/web-config-server/src/export/exportChartHandler.js +++ b/packages/web-config-server/src/export/exportChartHandler.js @@ -1,5 +1,5 @@ import xlsx from 'xlsx'; -import moment from 'moment-timezone'; +import moment from 'moment'; import fs from 'fs'; import { USER_SESSION_CONFIG } from '/authSession'; @@ -57,7 +57,7 @@ export const exportChartHandler = async (req, res) => { true, { authorization: authHeader, - }, + } ); const matrixData = { From 1f3b754065cbd055dc7d97645f5c548c0110d02a Mon Sep 17 00:00:00 2001 From: Jasper Lai <33956381+jaskfla@users.noreply.github.com> Date: Fri, 15 Mar 2024 14:12:48 +1300 Subject: [PATCH 10/10] import `moment` from `moment-timezone` --- .../src/apiV1/dataBuilders/modules/covid-samoa/flight/Flight.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/flight/Flight.js b/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/flight/Flight.js index afae0bfe2f..94f5a49c8b 100644 --- a/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/flight/Flight.js +++ b/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/flight/Flight.js @@ -1,4 +1,4 @@ -import moment from 'moment'; +import moment from 'moment-timezone'; export const FLIGHT_DATE = 'QMIA028'; const TIMEZONE_SAMOA = 'Pacific/Apia';