Update date import paths

uktrade · Jan 7, 2025 · 51997a5 · 51997a5
1 parent f690c0e
commit 51997a5
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/src/client/components/ActivityFeed/activities/AventriAttendee.jsx b/src/client/components/ActivityFeed/activities/AventriAttendee.jsx
@@ -11,7 +11,7 @@ import ActivityCardWrapper from './card/ActivityCardWrapper'
 import ActivityCardSubject from './card/ActivityCardSubject'
 import ActivityCardMetadata from './card/ActivityCardMetadata'
 import ActivityCardLabels from './card/ActivityCardLabels'
-import { formatStartAndEndDate } from '../../../utils/date'
+import { formatStartAndEndDate } from './date'
 
 export const AVENTRI_ATTENDEE_REG_STATUSES = {
   Attended: 'Attended',

diff --git a/src/client/components/ActivityFeed/activities/AventriEvent.jsx b/src/client/components/ActivityFeed/activities/AventriEvent.jsx
@@ -3,7 +3,7 @@ import Link from '@govuk-react/link'
 import PropTypes from 'prop-types'
 import styled from 'styled-components'
 
-import { formatStartAndEndDate } from '../../../utils/date'
+import { formatStartAndEndDate } from './date'
 import { ACTIVITY_TYPE } from '../constants'
 
 import CardUtils from './card/CardUtils'

diff --git a/src/client/components/ActivityFeed/activities/DataHubEvent.jsx b/src/client/components/ActivityFeed/activities/DataHubEvent.jsx
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types'
 
 import CardUtils from './card/CardUtils'
 
-import { formatStartAndEndDate } from '../../../utils/date'
+import { formatStartAndEndDate } from './date'
 import { ACTIVITY_TYPE } from '../constants'
 
 import ActivityCardWrapper from './card/ActivityCardWrapper'

diff --git a/src/common/__test__/date.test.js → ...vityFeed/activities/__test__/date.test.js b/src/common/__test__/date.test.js → ...vityFeed/activities/__test__/date.test.js
@@ -1,4 +1,4 @@
-const { formatStartAndEndDate } = require('../../client/utils/date')
+const { formatStartAndEndDate } = require('../date')
 
 describe('Date tests', () => {
   describe('#formatStartAndEndDate', () => {

diff --git a/src/client/components/ActivityFeed/activities/date.js b/src/client/components/ActivityFeed/activities/date.js
@@ -1,10 +1,10 @@
-const { isAfter, parseISO, differenceInCalendarMonths } = require('date-fns')
+import { isAfter, parseISO, differenceInCalendarMonths } from 'date-fns'
 
-const {
+import {
   formatDate,
   DATE_FORMAT_COMPACT,
   DATE_FORMAT_DAY_MONTH,
-} = require('./date-utils')
+} from '../../../../client/utils/date-utils'
 
 export const formatStartAndEndDate = (startDate, endDate) => {
   if (startDate) {

diff --git a/src/client/modules/Events/transformers.js b/src/client/modules/Events/transformers.js
@@ -2,7 +2,8 @@ import { compact } from 'lodash'
 
 import urls from '../../../lib/urls'
 
-import { getDifferenceInDays, formatStartAndEndDate } from '../../utils/date'
+import { getDifferenceInDays } from '../../utils/date'
+import { formatStartAndEndDate } from '../../components/ActivityFeed/activities/date'
 
 import { TAG_COLOURS } from '../../components/Tag'
 import {