Skip to content

Commit a8a9c6f

Browse files
purfectliteraturecysjonathan
authored andcommitted
fix(moment): import moment from lib/moment only, trim timezone data to >=2014
1 parent 7b6f4bd commit a8a9c6f

File tree

22 files changed

+39
-22
lines changed

22 files changed

+39
-22
lines changed

client/app/bundles/common/DashboardPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { defineMessages } from 'react-intl';
22
import { Navigate } from 'react-router-dom';
33
import { ArrowForward } from '@mui/icons-material';
44
import { Avatar, Stack, Typography } from '@mui/material';
5-
import moment from 'moment';
65
import { HomeLayoutCourseData } from 'types/home';
76

87
import { getCourseLogoUrl } from 'course/helper';
@@ -13,6 +12,7 @@ import { useAppContext } from 'lib/containers/AppContainer';
1312
import { getUrlParameter } from 'lib/helpers/url-helpers';
1413
import useItems from 'lib/hooks/items/useItems';
1514
import useTranslation from 'lib/hooks/useTranslation';
15+
import moment from 'lib/moment';
1616

1717
import NewCourseButton from './components/NewCourseButton';
1818

client/app/bundles/course/assessment/pages/AssessmentMonitoring/components/HeartbeatsTimeline.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { useState } from 'react';
2-
import moment from 'moment';
32
import { HeartbeatDetail } from 'types/channels/liveMonitoring';
43

54
import { BrowserAuthorizationMethod } from 'course/assessment/components/monitoring/BrowserAuthorizationMethodOptionsFormFields/common';
5+
import moment from 'lib/moment';
66

77
import HeartbeatDetailCard from './HeartbeatDetailCard';
88
import HeartbeatsTimelineChart from './HeartbeatsTimelineChart';

client/app/bundles/course/assessment/pages/AssessmentMonitoring/components/HeartbeatsTimelineChart.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import {
1010
PointStyle,
1111
} from 'chart.js';
1212
import zoomPlugin from 'chartjs-plugin-zoom';
13-
import moment from 'moment';
1413
import palette from 'theme/palette';
1514
import { HeartbeatDetail } from 'types/channels/liveMonitoring';
1615

1716
import { useAppSelector } from 'lib/hooks/store';
1817
import useTranslation from 'lib/hooks/useTranslation';
18+
import moment from 'lib/moment';
1919

2020
import translations from '../../../translations';
2121
import { select } from '../selectors';

client/app/bundles/course/assessment/pages/AssessmentMonitoring/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import moment from 'moment';
1+
import moment from 'lib/moment';
22

33
export type Presence = 'alive' | 'late' | 'missing';
44

client/app/bundles/course/assessment/pages/AssessmentStatistics/LiveFeedbackHistory/LiveFeedbackMessageHistory.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import { Dispatch, FC, SetStateAction } from 'react';
22
import { Typography } from '@mui/material';
3-
import moment from 'moment';
43
import { LiveFeedbackChatMessage } from 'types/course/assessment/submission/liveFeedback';
54

65
import {
76
fetchAllIndexWithIdenticalFileIds,
87
justifyPosition,
98
} from 'course/assessment/submission/components/GetHelpChatPage/utils';
109
import MarkdownText from 'course/assessment/submission/components/MarkdownText';
11-
import { SHORT_DATE_TIME_FORMAT } from 'lib/moment';
10+
import moment, { SHORT_DATE_TIME_FORMAT } from 'lib/moment';
1211

1312
interface Props {
1413
messages: LiveFeedbackChatMessage[];

client/app/bundles/course/assessment/submission/reducers/liveFeedbackChats/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ import {
55
PayloadAction,
66
} from '@reduxjs/toolkit';
77
import { shuffle } from 'lodash';
8-
import moment from 'moment';
98

10-
import { SHORT_TIME_FORMAT } from 'lib/moment';
9+
import moment, { SHORT_TIME_FORMAT } from 'lib/moment';
1110

1211
import {
1312
getLocalStorageValue,

client/app/bundles/course/reference-timelines/components/DayCalendar/DayCalendar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { forwardRef, useImperativeHandle, useRef, useState } from 'react';
22
import AutoSizer from 'react-virtualized-auto-sizer';
33
import { FixedSizeList as List } from 'react-window';
44
import { Button, Typography } from '@mui/material';
5-
import moment from 'moment';
65

76
import useTranslation from 'lib/hooks/useTranslation';
7+
import moment from 'lib/moment';
88

99
import translations from '../../translations';
1010
import {

client/app/bundles/course/reference-timelines/components/DayCalendar/DayColumn.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { CSSProperties, memo } from 'react';
22
import { areEqual } from 'react-window';
33
import { Typography } from '@mui/material';
4-
import moment from 'moment';
4+
5+
import moment from 'lib/moment';
56

67
import { getSecondsFromDays, isToday, isWeekend } from '../../utils';
78

client/app/bundles/course/reference-timelines/components/SubmitIndicator.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { useEffect, useState } from 'react';
22
import { Cancel, CheckCircle } from '@mui/icons-material';
33
import { Chip, Grow, Tooltip, Typography } from '@mui/material';
4-
import moment from 'moment';
54

65
import LoadingIndicator from 'lib/components/core/LoadingIndicator';
76
import useTranslation from 'lib/hooks/useTranslation';
7+
import moment from 'lib/moment';
88

99
import { useLastSaved } from '../contexts';
1010
import translations from '../translations';

client/app/bundles/course/reference-timelines/components/TimeBar/DurationBar.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { MouseEventHandler, ReactNode, TouchEventHandler } from 'react';
2-
import moment from 'moment';
2+
3+
import moment from 'lib/moment';
34

45
import {
56
DAY_WIDTH_PIXELS,

0 commit comments

Comments
 (0)