({
id,
metadata: [
- { label: 'Deadline', value: format(deadline, 'dd MMMM yyyy') },
- { label: 'Created on', value: format(created_on, 'dd MMMM yyyy') },
+ {
+ label: 'Deadline',
+ value: formatDate(deadline, DATE_FORMAT_DAY_MONTH_YEAR),
+ },
+ {
+ label: 'Created on',
+ value: formatDate(created_on, DATE_FORMAT_DAY_MONTH_YEAR),
+ },
{
label: 'Adviser',
value: adviser.name,
@@ -266,7 +276,9 @@ export const transformInvestmentProjectToListItem = ({
{ label: 'Sector', value: sector ? sector.name : '' },
{
label: 'Estimated land date',
- value: estimated_land_date && format(estimated_land_date, 'MMMM yyyy'),
+ value:
+ estimated_land_date &&
+ formatDate(estimated_land_date, DATE_FORMAT_MONTH_YEAR),
},
].filter((metadata) => metadata.value)
@@ -303,10 +315,15 @@ export const transformTaskToListItem = ({
headingText: title,
subheading: getTaskSubheading(archived),
metadata: [
- { label: 'Date created', value: format(createdOn, 'dd MMMM yyyy') },
+ {
+ label: 'Date created',
+ value: formatDate(createdOn, DATE_FORMAT_DAY_MONTH_YEAR),
+ },
{
label: 'Due date',
- value: dueDate ? format(dueDate, 'dd MMMM yyyy') : NOT_SET_TEXT,
+ value: dueDate
+ ? formatDate(dueDate, DATE_FORMAT_DAY_MONTH_YEAR)
+ : NOT_SET_TEXT,
},
{ label: 'Assigned to', value: advisers.map((a) => a.name).join(', ') },
],
diff --git a/src/client/modules/Omis/CollectionList/transformers.js b/src/client/modules/Omis/CollectionList/transformers.js
index 27a506a4cc0..6abfd4e9518 100644
--- a/src/client/modules/Omis/CollectionList/transformers.js
+++ b/src/client/modules/Omis/CollectionList/transformers.js
@@ -4,10 +4,10 @@ import { STATUSES } from './constants'
import { omis } from '../../../../lib/urls'
import { currencyGBP } from '../../../utils/number-utils'
-const { format } = require('../../../utils/date')
const {
formatDate,
DATE_FORMAT_MEDIUM,
+ DATE_FORMAT_COMPACT,
DATE_FORMAT_MEDIUM_WITH_TIME,
} = require('../../../utils/date-utils')
@@ -51,7 +51,9 @@ export const transformOrderToListItem = ({
},
{
label: 'Delivery date',
- value: delivery_date ? format(delivery_date) : null,
+ value: delivery_date
+ ? formatDate(delivery_date, DATE_FORMAT_COMPACT)
+ : null,
},
].filter((item) => item.value)
diff --git a/src/client/modules/Omis/CreateOrder/CompanySelect/transformers.js b/src/client/modules/Omis/CreateOrder/CompanySelect/transformers.js
index 49c3f1bc148..57d40ce9093 100644
--- a/src/client/modules/Omis/CreateOrder/CompanySelect/transformers.js
+++ b/src/client/modules/Omis/CreateOrder/CompanySelect/transformers.js
@@ -5,9 +5,9 @@ import urls from '../../../../../lib/urls'
import { addressToString } from '../../../../utils/addresses'
-const { format } = require('../../../../utils/date')
const {
formatDate,
+ DATE_FORMAT_COMPACT,
DATE_FORMAT_MEDIUM_WITH_TIME,
} = require('../../../../utils/date-utils')
@@ -48,7 +48,7 @@ const transformCompanyToListItem = ({
if (latest_interaction_date) {
metadata.push({
label: 'Last interaction date',
- value: format(latest_interaction_date),
+ value: formatDate(latest_interaction_date, DATE_FORMAT_COMPACT),
})
}
diff --git a/src/client/modules/Omis/PaymentReceipt.jsx b/src/client/modules/Omis/PaymentReceipt.jsx
index 5527848d661..5dc0ce22ec2 100644
--- a/src/client/modules/Omis/PaymentReceipt.jsx
+++ b/src/client/modules/Omis/PaymentReceipt.jsx
@@ -12,8 +12,7 @@ import {
} from '../../components/Resource'
import OMISLayout from './OMISLayout'
import { DARK_GREY } from '../../utils/colours'
-import { format } from '../../utils/date'
-import { DATE_LONG_FORMAT_1 } from '../../../common/constants'
+import { formatDate, DATE_FORMAT_FULL } from '../../utils/date-utils'
import { currencyGBP } from '../../utils/number-utils'
import { ButtonLink } from '../../components'
import urls from '../../../lib/urls'
@@ -78,7 +77,7 @@ export const AddressSection = ({ invoice, paymentDate }) => (
Receipt date
- {format(paymentDate, DATE_LONG_FORMAT_1)}
+ {formatDate(paymentDate, DATE_FORMAT_FULL)}
@@ -169,7 +168,7 @@ export const PaymentSection = ({
Amount received
{currencyGBP(payment[0].amount / 100)}
Received on
- {format(payment[0].receivedOn, DATE_LONG_FORMAT_1)}
+ {formatDate(payment[0].receivedOn, DATE_FORMAT_FULL)}
{payment[0].transactionReference && (
<>
Transaction reference
diff --git a/src/client/modules/Omis/PaymentReconciliation.jsx b/src/client/modules/Omis/PaymentReconciliation.jsx
index 855348349ff..f49566966c8 100644
--- a/src/client/modules/Omis/PaymentReconciliation.jsx
+++ b/src/client/modules/Omis/PaymentReconciliation.jsx
@@ -18,8 +18,9 @@ import {
} from '../../components/Resource'
import urls from '../../../lib/urls'
import { currencyGBP } from '../../utils/number-utils'
-import { format, getDifferenceInWords } from '../../utils/date'
-import { DATE_LONG_FORMAT_1, FORM_LAYOUT } from '../../../common/constants'
+import { getDifferenceInWords } from '../../utils/date'
+import { formatDate, DATE_FORMAT_FULL } from '../../utils/date-utils'
+import { FORM_LAYOUT } from '../../../common/constants'
import { validateAmountRecieved, validateIfDateInPast } from './validators'
import { TASK_RECONCILE_OMIS_PAYMENT } from './state'
import {
@@ -106,7 +107,7 @@ export const InvoiceDetails = ({ invoice, reference }) => (
Payment due date
- {format(invoice.paymentDueDate, DATE_LONG_FORMAT_1) +
+ {formatDate(invoice.paymentDueDate, DATE_FORMAT_FULL) +
' (' +
getDifferenceInWords(invoice.paymentDueDate) +
')'}
diff --git a/src/client/modules/Reminders/ItemRenderers/Investments/InvestmentOPListItemRenderer.jsx b/src/client/modules/Reminders/ItemRenderers/Investments/InvestmentOPListItemRenderer.jsx
index d20eb2b2f6b..d7871139eec 100644
--- a/src/client/modules/Reminders/ItemRenderers/Investments/InvestmentOPListItemRenderer.jsx
+++ b/src/client/modules/Reminders/ItemRenderers/Investments/InvestmentOPListItemRenderer.jsx
@@ -6,8 +6,7 @@ import { Link } from 'govuk-react'
import styled from 'styled-components'
import { ListItem, ItemHeader, ItemFooter } from '../styled'
-import { DATE_DAY_LONG_FORMAT } from '../../../../../common/constants'
-import { format } from '../../../../utils/date'
+import { formatDate, DATE_FORMAT_FULL_DAY } from '../../../../utils/date-utils'
import urls from '../../../../../lib/urls'
const ItemContent = styled('div')({
@@ -20,7 +19,7 @@ const InvestmentOPListItemRenderer = (item) => (
- Due {format(item.deadline, DATE_DAY_LONG_FORMAT)}
+ Due {formatDate(item.deadline, DATE_FORMAT_FULL_DAY)}
(
Date due:
- {format(item.task.due_date, DATE_LONG_FORMAT_1)}
+ {formatDate(item.task.due_date, DATE_FORMAT_FULL)}
)
diff --git a/src/client/utils/date.js b/src/client/utils/date.js
index 58ab504418c..69fed4dda32 100644
--- a/src/client/utils/date.js
+++ b/src/client/utils/date.js
@@ -120,13 +120,18 @@ function isShortDateValid(year, month) {
}
/**
- * Date formatting and parsing functions
+ * @deprecated This function is deprecated. Use `formatDate` instead.
+ *
+ * This function will be removed in the near future.
*/
-
function format(dateStr, dateFormat = DATE_LONG_FORMAT_2) {
return isDateValid(dateStr) ? formatFns(parseISO(dateStr), dateFormat) : null
}
+/**
+ * Parsing functions
+ */
+
const padZero = (value) => {
const parsedValue = parseInt(value, 10)
if (Number.isNaN(parsedValue)) {
diff --git a/src/common/constants.js b/src/common/constants.js
index 1e1b094914b..18150a951e1 100644
--- a/src/common/constants.js
+++ b/src/common/constants.js
@@ -1,14 +1,8 @@
// These are date-fns format codes - see https://date-fns.org/v2.23.0/docs/format
-const DATE_LONG_FORMAT_1 = 'd MMMM yyyy'
const DATE_LONG_FORMAT_2 = 'dd MMM yyyy'
const DATE_LONG_FORMAT_3 = 'yyyy-MM-dd'
-const DATE_DAY_LONG_FORMAT = 'E, dd MMM yyyy'
-const DATE_MEDIUM_FORMAT = 'd MMM yyyy'
-const DATE_TIME_MEDIUM_FORMAT = 'd MMM yyyy, h:mmaaa'
const DATE_SHORT_FORMAT = 'yyyy-MM'
-const DATE_SHORT_FORMAT_2 = 'MMMM yyyy'
const DATE_DAY_MONTH = 'dd MMM'
-const INTERACTION_TIMESTAMP_FORMAT = 'y-MM-d'
const UNITED_KINGDOM_ID = '80756b9a-5d95-e211-a939-e4115bead28a'
const UNITED_STATES_ID = '81756b9a-5d95-e211-a939-e4115bead28a'
@@ -66,16 +60,10 @@ const EXPORT_INTEREST_STATUS = {
}
module.exports = {
- DATE_DAY_LONG_FORMAT,
DATE_DAY_MONTH,
- DATE_LONG_FORMAT_1,
DATE_LONG_FORMAT_2,
DATE_LONG_FORMAT_3,
- DATE_MEDIUM_FORMAT,
- DATE_TIME_MEDIUM_FORMAT,
DATE_SHORT_FORMAT,
- DATE_SHORT_FORMAT_2,
- INTERACTION_TIMESTAMP_FORMAT,
UNITED_KINGDOM_ID,
UNITED_STATES_ID,
CANADA_ID,
diff --git a/test/component/cypress/specs/Companies/CompanyHierarchy/Hierarchy.cy.jsx b/test/component/cypress/specs/Companies/CompanyHierarchy/Hierarchy.cy.jsx
index 54630f5970a..102f8aa8f47 100644
--- a/test/component/cypress/specs/Companies/CompanyHierarchy/Hierarchy.cy.jsx
+++ b/test/component/cypress/specs/Companies/CompanyHierarchy/Hierarchy.cy.jsx
@@ -14,7 +14,10 @@ import {
rgb,
DARK_BLUE_LEGACY,
} from '../../../../../../src/client/utils/colours'
-import { format } from '../../../../../../src/client/utils/date'
+import {
+ formatDate,
+ DATE_FORMAT_COMPACT,
+} from '../../../../../../src/client/utils/date-utils'
const {
company: { dnbGlobalUltimate, allOverviewDetails },
@@ -490,9 +493,10 @@ describe('D&B Company Tree Hierarchy component', () => {
})
context('When a company has a mix of known and unknown subsidiaries', () => {
- const formattedDate = format(
+ const formattedDate = formatDate(
companyManuallyLinkedSubsidiaries.ultimate_global_company.subsidiaries[0]
- .latest_interaction_date
+ .latest_interaction_date,
+ DATE_FORMAT_COMPACT
)
beforeEach(() => {
diff --git a/test/component/cypress/specs/Contacts/ContactLocalHeader.cy.jsx b/test/component/cypress/specs/Contacts/ContactLocalHeader.cy.jsx
index 5726a08f457..d623c8be9eb 100644
--- a/test/component/cypress/specs/Contacts/ContactLocalHeader.cy.jsx
+++ b/test/component/cypress/specs/Contacts/ContactLocalHeader.cy.jsx
@@ -3,9 +3,27 @@ import React from 'react'
import ContactLocalHeader from '../../../../../src/client/components/ContactLocalHeader'
import urls from '../../../../../src/lib/urls'
-const primaryContact = require('../../../../sandbox/fixtures/v3/contact/contact-complete-details-uk.json')
-const archivedContact = require('../../../../sandbox/fixtures/v3/contact/contact-archived.json')
const notPrimaryContact = require('../../../../sandbox/fixtures/v3/contact/contact-incomplete-details-uk.json')
+const primaryContact = require('../../../../sandbox/fixtures/v3/contact/contact-complete-details-uk.json')
+
+const archivedContact = {
+ name: 'Joseph Woof',
+ company: {
+ name: 'Zboncak Group|271eb29e-425b-4cd8-b386-3208c3a5f978',
+ id: '4cd4128b-1bad-4f1e-9146-5d4678c6a018',
+ },
+ primary: true,
+ archived: true,
+
+ archivedOn: '2019-07-04T15:59:14.267412Z',
+ archivedReason: 'Left the company',
+ archivedBy: {
+ name: 'Bernard Harris-Patel',
+ first_name: 'Bernard',
+ last_name: 'Harris-Patel',
+ id: '7d19d407-9aec-4d06-b190-d3f404627f21',
+ },
+}
const companyName = primaryContact.company.name
const companyLink = urls.companies.overview.index(primaryContact.company.id)
@@ -94,6 +112,20 @@ describe('ContactLocalHeader', () => {
it('should render the archive panel', () => {
cy.get('[data-test=archive-panel]').should('exist')
})
+
+ it('should render an archived message', () => {
+ cy.get('[data-test="archive-message"]').should(
+ 'have.text',
+ 'This contact was archived on 04 Jul 2019 by Bernard Harris-Patel.'
+ )
+ })
+
+ it('should render an archived reason', () => {
+ cy.get('[data-test="archive-reason"]').should(
+ 'have.text',
+ 'Reason: Left the company'
+ )
+ })
})
})
diff --git a/test/component/cypress/specs/Omis/WorkOrder/OrderIncompleteFields.cy.jsx b/test/component/cypress/specs/Omis/WorkOrder/OrderIncompleteFields.cy.jsx
index 067a3994d5e..9917b59e137 100644
--- a/test/component/cypress/specs/Omis/WorkOrder/OrderIncompleteFields.cy.jsx
+++ b/test/component/cypress/specs/Omis/WorkOrder/OrderIncompleteFields.cy.jsx
@@ -7,7 +7,10 @@ import {
VAT_STATUS,
} from '../../../../../../src/client/modules/Omis/constants'
import urls from '../../../../../../src/lib/urls'
-import { format } from '../../../../../../src/client/utils/date'
+import {
+ formatDate,
+ DATE_FORMAT_COMPACT,
+} from '../../../../../../src/client/utils/date-utils'
const quoteAwaitingOrder = {
id: '123',
@@ -83,8 +86,9 @@ describe('OrderIncompleteFields', () => {
.should('exist')
.should(
'have.text',
- `This order was cancelled on ${format(
- cancelledOrder.cancelledOn
+ `This order was cancelled on ${formatDate(
+ cancelledOrder.cancelledOn,
+ DATE_FORMAT_COMPACT
)} by ${cancelledOrder.cancelledBy.name}.`
)
cy.get('[data-test="archive-reason"]')
diff --git a/test/end-to-end/cypress/specs/DIT/order-spec.js b/test/end-to-end/cypress/specs/DIT/order-spec.js
index 26fc9b731f8..de9cc089acd 100644
--- a/test/end-to-end/cypress/specs/DIT/order-spec.js
+++ b/test/end-to-end/cypress/specs/DIT/order-spec.js
@@ -1,14 +1,14 @@
const fixtures = require('../../fixtures')
const {
formatDate,
- DATE_MEDIUM_FORMAT,
+ DATE_FORMAT_MEDIUM,
} = require('../../../../../src/client/utils/date-utils')
const { omis } = require('../../../../../src/lib/urls')
const {
assertSummaryTable,
} = require('../../../../functional/cypress/support/assertions')
-const today = formatDate(new Date(), DATE_MEDIUM_FORMAT)
+const today = formatDate(new Date(), DATE_FORMAT_MEDIUM)
describe('Order', () => {
const company = fixtures.company.create.defaultCompany('order testing')
diff --git a/test/functional/cypress/specs/companies/account-management-add-edit-objective-spec.js b/test/functional/cypress/specs/companies/account-management-add-edit-objective-spec.js
index 368f6499ceb..8bf851dd428 100644
--- a/test/functional/cypress/specs/companies/account-management-add-edit-objective-spec.js
+++ b/test/functional/cypress/specs/companies/account-management-add-edit-objective-spec.js
@@ -1,5 +1,7 @@
-import { format } from '../../../../../src/client/utils/date'
-import { DATE_LONG_FORMAT_3 } from '../../../../../src/common/constants'
+import {
+ formatDate,
+ DATE_FORMAT_ISO,
+} from '../../../../../src/client/utils/date-utils'
import { companyFaker } from '../../fakers/companies'
import { objectiveFaker } from '../../fakers/objective'
import { clickButton } from '../../support/actions'
@@ -120,9 +122,9 @@ describe('Company account management', () => {
has_blocker: withBlockersObjective.has_blocker,
progress: withBlockersObjective.progress,
subject: withBlockersObjective.subject,
- target_date: format(
+ target_date: formatDate(
withBlockersObjective.target_date,
- DATE_LONG_FORMAT_3
+ DATE_FORMAT_ISO
),
})
})
diff --git a/test/functional/cypress/specs/companies/account-management-spec.js b/test/functional/cypress/specs/companies/account-management-spec.js
index fcabcbe6dd3..b6d1795116b 100644
--- a/test/functional/cypress/specs/companies/account-management-spec.js
+++ b/test/functional/cypress/specs/companies/account-management-spec.js
@@ -1,11 +1,12 @@
-import { format } from 'date-fns'
-
import { faker } from '../../../../sandbox/utils/random'
-
import { companyFaker } from '../../fakers/companies'
import { userFaker } from '../../fakers/users'
import objectiveListFaker, { objectiveFaker } from '../../fakers/objective'
import { adviserFaker } from '../../fakers/advisers'
+import {
+ formatDate,
+ DATE_FORMAT_COMPACT,
+} from '../../../../../src/client/utils/date-utils'
import {
assertCompanyBreadcrumbs,
assertGovReactTable,
@@ -88,9 +89,9 @@ describe('Company account management', () => {
cy.get('[data-test="last-updated-strategy-details"] > span')
.eq(0)
.contains(
- `Last updated by ${companyWithStrategy.modifiedBy.name}: ${format(
+ `Last updated by ${companyWithStrategy.modifiedBy.name}: ${formatDate(
companyWithStrategy.modifiedOn,
- 'dd MMM yyyy'
+ DATE_FORMAT_COMPACT
)}. `
)
})
diff --git a/test/functional/cypress/specs/companies/archived-objectives-spec.js b/test/functional/cypress/specs/companies/archived-objectives-spec.js
index f8c785e09e6..e9be8ab0120 100644
--- a/test/functional/cypress/specs/companies/archived-objectives-spec.js
+++ b/test/functional/cypress/specs/companies/archived-objectives-spec.js
@@ -1,4 +1,7 @@
-import { format } from '../../../../../src/client/utils/date'
+import {
+ formatDate,
+ DATE_FORMAT_COMPACT,
+} from '../../../../../src/client/utils/date-utils'
import { objectiveFaker } from '../../fakers/objective'
const fixtures = require('../../fixtures')
@@ -32,12 +35,18 @@ context('When visiting the archived objective page with objectives', () => {
it('should display 2 archived objectives with correct details', () => {
cy.get('[data-test="objective-1"]')
.should('contain.text', incompleteObjective.detail)
- .should('contain.text', format(incompleteObjective.target_date))
+ .should(
+ 'contain.text',
+ formatDate(incompleteObjective.target_date, DATE_FORMAT_COMPACT)
+ )
.should('contain.text', incompleteObjective.progress)
.should('contain.text', incompleteObjective.modifiedBy.name)
cy.get('[data-test="objective-2"]')
.should('contain.text', completeObjective.detail)
- .should('contain.text', format(completeObjective.target_date))
+ .should(
+ 'contain.text',
+ formatDate(completeObjective.target_date, DATE_FORMAT_COMPACT)
+ )
.should('contain.text', completeObjective.progress)
.should('contain.text', completeObjective.modifiedBy.name)
})
diff --git a/test/functional/cypress/specs/companies/investments/large-capital-profile-spec.js b/test/functional/cypress/specs/companies/investments/large-capital-profile-spec.js
index 59b5d4c869f..0da1afd409b 100644
--- a/test/functional/cypress/specs/companies/investments/large-capital-profile-spec.js
+++ b/test/functional/cypress/specs/companies/investments/large-capital-profile-spec.js
@@ -92,7 +92,7 @@ describe('Company Investments and Large capital profile', () => {
'Investable capital': 30000,
'Investor description': 'incomplete',
'Has this investor cleared the required checks within the last 12 months?':
- 'Cleared\nDate of most recent background checks: 29 04 2019\nPerson responsible for most recent background checks: Aaron Chan',
+ 'Cleared\nDate of most recent background checks: 29 April 2019\nPerson responsible for most recent background checks: Aaron Chan',
},
})
})
diff --git a/test/functional/cypress/specs/export-pipeline/export-details-spec.js b/test/functional/cypress/specs/export-pipeline/export-details-spec.js
index 043252883f9..bef20aeb9ae 100644
--- a/test/functional/cypress/specs/export-pipeline/export-details-spec.js
+++ b/test/functional/cypress/specs/export-pipeline/export-details-spec.js
@@ -2,7 +2,10 @@ import { capitalize } from 'lodash'
import urls from '../../../../../src/lib/urls'
import { currencyGBP } from '../../../../../src/client/utils/number-utils'
-import { format } from '../../../../../src/client/utils/date'
+import {
+ formatDate,
+ DATE_FORMAT_MONTH_YEAR,
+} from '../../../../../src/client/utils/date-utils'
import { exportFaker } from '../../fakers/export'
const {
@@ -33,9 +36,9 @@ describe('Export Details summary ', () => {
exportItem.estimated_export_value_years?.name
} / ${currencyGBP(exportItem.estimated_export_value_amount)}`
- const estimatedWinDate = format(
- exportItem.estimated_win_date.toISOString(),
- 'MMMM yyyy'
+ const estimatedWinDate = formatDate(
+ exportItem.estimated_win_date,
+ DATE_FORMAT_MONTH_YEAR
)
assertKeyValueTable('bodyMainContent', {
'Export title': exportItem.title,
diff --git a/test/functional/cypress/specs/investments/eyb-leads-spec.js b/test/functional/cypress/specs/investments/eyb-leads-spec.js
index c15bb51c39f..891578901cf 100644
--- a/test/functional/cypress/specs/investments/eyb-leads-spec.js
+++ b/test/functional/cypress/specs/investments/eyb-leads-spec.js
@@ -13,7 +13,10 @@ import {
selectFirstTypeaheadOption,
} from '../../support/actions'
import { investments } from '../../../../../src/lib/urls'
-import { format } from '../../../../../src/client/utils/date'
+import {
+ formatDate,
+ DATE_FORMAT_COMPACT,
+} from '../../../../../src/client/utils/date-utils'
import { eybLeadFaker } from '../../fakers/eyb-leads'
import { VALUES_VALUE_TO_LABEL_MAP } from '../../../../../src/client/modules/Investments/EYBLeads/constants'
@@ -171,7 +174,7 @@ describe('EYB leads collection page', () => {
.should('contain', eybLead.company.name)
.should(
'contain',
- `Submitted to EYB ${format(eybLead.triage_created, 'dd MMM yyyy')}`
+ `Submitted to EYB ${formatDate(eybLead.triage_created, DATE_FORMAT_COMPACT)}`
)
.should('contain', `Estimated spend ${eybLead.spend}`)
.should('contain', `Sector ${eybLead.sector.name}`)
diff --git a/test/functional/cypress/specs/investments/opportunity-interactions-spec.js b/test/functional/cypress/specs/investments/opportunity-interactions-spec.js
index b53c6445f2e..f68414556dc 100644
--- a/test/functional/cypress/specs/investments/opportunity-interactions-spec.js
+++ b/test/functional/cypress/specs/investments/opportunity-interactions-spec.js
@@ -9,7 +9,10 @@ const {
assertBreadcrumbs,
assertQueryParams,
} = require('../../support/assertions')
-const { format } = require('../../../../../src/client/utils/date')
+const {
+ formatDate,
+ DATE_FORMAT_DAY_MONTH_YEAR,
+} = require('../../../../../src/client/utils/date-utils')
const interaction = interactionFaker()
const interactionsList = interactionsListFaker(10)
@@ -65,7 +68,10 @@ describe('The interactions tab on an opportunity page', () => {
cy.get('[data-test="collection-item"]')
.find('[data-test="metadata"]')
- .should('contain', `Date ${format(interaction.date, 'dd MMMM yyyy')}`)
+ .should(
+ 'contain',
+ `Date ${formatDate(interaction.date, DATE_FORMAT_DAY_MONTH_YEAR)}`
+ )
.and('contain', `Contact(s) ${interaction.contacts[0].name}`)
.and('contain', `Company ${interaction.companies[0].name}`)
.and(
diff --git a/test/functional/cypress/specs/investments/project-interactions-spec.js b/test/functional/cypress/specs/investments/project-interactions-spec.js
index 976b41c892f..b016102c809 100644
--- a/test/functional/cypress/specs/investments/project-interactions-spec.js
+++ b/test/functional/cypress/specs/investments/project-interactions-spec.js
@@ -5,7 +5,10 @@ import {
interactionFaker,
} from '../../fakers/interactions'
import { assertQueryParams } from '../../support/assertions'
-import { format } from '../../../../../src/client/utils/date'
+import {
+ formatDate,
+ DATE_FORMAT_DAY_MONTH_YEAR,
+} from '../../../../../src/client/utils/date-utils'
const interaction = interactionFaker()
const interactionsList = interactionsListFaker(10)
@@ -51,7 +54,10 @@ describe('Investment project interactions', () => {
cy.get('[data-test="collection-item"]')
.find('[data-test="metadata"]')
- .should('contain', `Date ${format(interaction.date, 'dd MMMM yyyy')}`)
+ .should(
+ 'contain',
+ `Date ${formatDate(interaction.date, DATE_FORMAT_DAY_MONTH_YEAR)}`
+ )
.and('contain', `Contact(s) ${interaction.contacts[0].name}`)
.and('contain', `Company ${interaction.companies[0].name}`)
.and(
diff --git a/test/functional/cypress/specs/investments/project-tasks-spec.js b/test/functional/cypress/specs/investments/project-tasks-spec.js
index 3ff906eeb6f..74db935f64a 100644
--- a/test/functional/cypress/specs/investments/project-tasks-spec.js
+++ b/test/functional/cypress/specs/investments/project-tasks-spec.js
@@ -1,7 +1,10 @@
import fixtures from '../../fixtures'
import urls from '../../../../../src/lib/urls'
import { taskWithInvestmentProjectFaker } from '../../fakers/task'
-import { format } from '../../../../../src/client/utils/date'
+import {
+ formatDate,
+ DATE_FORMAT_DAY_MONTH_YEAR,
+} from '../../../../../src/client/utils/date-utils'
import { NOT_SET_TEXT } from '../../../../../src/apps/companies/constants'
import { assertQueryParams } from '../../support/assertions'
@@ -49,13 +52,13 @@ const assertTaskItem = (index, investmentTask) => {
.find('[data-test="metadata"]')
.should(
'contain',
- `Date created ${format(investmentTask.createdOn, 'dd MMMM yyyy')}`
+ `Date created ${formatDate(investmentTask.createdOn, DATE_FORMAT_DAY_MONTH_YEAR)}`
)
.and(
'contain',
`Due date ${
investmentTask.dueDate
- ? format(investmentTask.dueDate, 'dd MMMM yyyy')
+ ? formatDate(investmentTask.dueDate, DATE_FORMAT_DAY_MONTH_YEAR)
: NOT_SET_TEXT
}`
)
diff --git a/test/functional/cypress/specs/tasks/create-similar-task-spec.js b/test/functional/cypress/specs/tasks/create-similar-task-spec.js
index 09f02330193..1ca45216db0 100644
--- a/test/functional/cypress/specs/tasks/create-similar-task-spec.js
+++ b/test/functional/cypress/specs/tasks/create-similar-task-spec.js
@@ -10,8 +10,10 @@ import {
assertPayload,
assertFlashMessage,
} from '../../../cypress/support/assertions'
-import { DATE_LONG_FORMAT_3 } from '../../../../../src/common/constants'
-import { format } from '../../../../../src/client/utils/date'
+import {
+ formatDate,
+ DATE_FORMAT_ISO,
+} from '../../../../../src/client/utils/date-utils'
describe('Copy task from generic task task', () => {
const genericTask = taskFaker()
@@ -89,7 +91,7 @@ function assertTaskForm(
interaction: interactionId,
title: 'test copy task',
description: 'test copy description',
- due_date: format(task.dueDate, DATE_LONG_FORMAT_3),
+ due_date: formatDate(task.dueDate, DATE_FORMAT_ISO),
email_reminders_enabled: task.emailRemindersEnabled,
reminder_days: task.reminderDays,
advisers: task.advisers.map((adviser) => adviser.id),
diff --git a/test/functional/cypress/specs/tasks/edit-task-spec.js b/test/functional/cypress/specs/tasks/edit-task-spec.js
index 2a7afe81cf1..6a071b71c3d 100644
--- a/test/functional/cypress/specs/tasks/edit-task-spec.js
+++ b/test/functional/cypress/specs/tasks/edit-task-spec.js
@@ -13,8 +13,10 @@ import {
taskWithCompanyFaker,
taskWithInvestmentProjectFaker,
} from '../../fakers/task'
-import { DATE_LONG_FORMAT_3 } from '../../../../../src/common/constants'
-import { format } from '../../../../../src/client/utils/date'
+import {
+ formatDate,
+ DATE_FORMAT_ISO,
+} from '../../../../../src/client/utils/date-utils'
import { companyFaker } from '../../fakers/companies'
import { investmentProjectFaker } from '../../fakers/investment-projects'
@@ -45,7 +47,7 @@ describe('Edit generic task', () => {
assertPayload('@apiRequest', {
title: 'new task',
description: 'new description',
- due_date: format(task.dueDate, DATE_LONG_FORMAT_3),
+ due_date: formatDate(task.dueDate, DATE_FORMAT_ISO),
email_reminders_enabled: task.emailRemindersEnabled,
investment_project: null,
company: null,
@@ -110,7 +112,7 @@ describe('Edit investment project task', () => {
assertPayload('@apiRequest', {
title: 'new task',
description: 'new description',
- due_date: format(investmentProjectTask.dueDate, DATE_LONG_FORMAT_3),
+ due_date: formatDate(investmentProjectTask.dueDate, DATE_FORMAT_ISO),
email_reminders_enabled: investmentProjectTask.emailRemindersEnabled,
company: null,
investment_project: investmentProjectTask.investmentProject.id,
@@ -252,7 +254,7 @@ describe('Edit company task', () => {
assertPayload('@apiRequest', {
title: 'new task',
description: 'new description',
- due_date: format(companyTask.dueDate, DATE_LONG_FORMAT_3),
+ due_date: formatDate(companyTask.dueDate, DATE_FORMAT_ISO),
email_reminders_enabled: companyTask.emailRemindersEnabled,
investment_project: null,
company: companyTask.company.id,