import moment from moment-timezone

beyondessential · Mar 8, 2024 · b6695ec · b6695ec
1 parent 13cecba
commit b6695ec
Show file tree

Hide file tree

Showing 44 changed files with 57 additions and 58 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -4,16 +4,16 @@
  */
 
 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';
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...ages/central-server/src/tests/dhis/pushers/data/aggregate/AggregateDataPusher.fixtures.js b/...ages/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...database/src/migrations/20220117011411-CovidSamoaDeleteOutdatedResponses-modifies-data.js b/...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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<typeof moment['utc']>) => 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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';