Export win content review

src/client/components/Resource/Paginated.js

@@ -80,6 +80,7 @@ const PaginatedResource = multiInstance({
   }),
   component: ({
     name,
+    heading,
     id,
     children,
     pageSize = 10,
@@ -129,7 +130,7 @@ const PaginatedResource = multiInstance({
                     <LoadingBox name={name} id={id}>
                       <CollectionHeader
                         totalItems={result.count}
-                        collectionName={name}
+                        collectionName={heading || name}
                       />
                       {totalPages > 0 && (
                         <StyledCollectionSort totalPages={totalPages} />

src/client/modules/ExportWins/Form/CustomerDetailsStep.jsx

@@ -5,6 +5,7 @@ import { H3 } from '@govuk-react/heading'
 import ResourceOptionsField from '../../../components/Form/elements/ResourceOptionsField'
 import { getQueryParamsFromLocation } from '../../../../client/utils/url'
 import { Step, FieldTypeahead } from '../../../components'
+import { idNamesToValueLabels } from '../../../utils'
 import { StyledHintParagraph } from './styled'
 import { steps } from './constants'
 import {
@@ -27,7 +28,7 @@ const CustomerDetailsStep = () => {
         id={companyId}
         label="Company contacts"
         hint="This contact will be emailed to approve the win."
-        required="Select a contact"
+        required="Select a company contact"
         placeholder="Select contact"
         resource={CompanyContactsResource}
         field={FieldTypeahead}
@@ -51,6 +52,9 @@ const CustomerDetailsStep = () => {
         required="Select HQ location"
         field={FieldTypeahead}
         resource={UKRegionsResource}
+        resultToOptions={(result) =>
+          idNamesToValueLabels(result.filter(({ name }) => name !== 'All'))
+        }
         fullWidth={true}
       />
       <ResourceOptionsField

src/client/modules/ExportWins/Form/validators.js

@@ -9,4 +9,6 @@ export const validateTeamMembers = (team_members) =>
     : null
 
 export const validateWinDate = ({ month, year }) =>
-  !isDateWithinLastTwelveMonths(new Date(year, month - 1))
+  isDateWithinLastTwelveMonths(new Date(year, month - 1))
+    ? null
+    : 'Date must be in the last 12 months'

src/client/modules/ExportWins/Status/WinsRejectedList.jsx

@@ -10,6 +10,7 @@ import urls from '../../../../lib/urls'
 export default () => (
   <ExportWinsResource.Paginated
     id="export-wins-rejected"
+    heading="Export win"
     noResults="You don't have any rejected export wins."
     payload={{ confirmed: WIN_STATUS.REJECTED }}
   >

src/client/modules/ExportWins/Status/WinsSentList.jsx

@@ -10,6 +10,7 @@ import urls from '../../../../lib/urls'
 export default () => (
   <ExportWinsResource.Paginated
     id="export-wins-sent"
+    heading="Export win"
     noResults="You don't have any sent export wins."
     payload={{ confirmed: WIN_STATUS.SENT }}
   >

src/client/modules/ExportWins/Status/WinsWonTable.jsx

@@ -69,6 +69,7 @@ export const WinsWonTable = ({ exportWins }) => {
 export default () => (
   <ExportWinsResource.Paginated
     id="export-wins-won"
+    heading="Export win"
     noResults="You don't have any won export wins."
     payload={{ confirmed: WIN_STATUS.WON }}
   >

test/functional/cypress/specs/export-win/add-export-win-spec.js

@@ -446,14 +446,14 @@ describe('Adding an export win', () => {
     it('should display validation error messages on mandatory fields', () => {
       clickContinueButton()
       assertErrorSummary([
-        'Select a contact',
+        'Select a company contact',
         'Select HQ location',
         'Select export potential',
         'Select export experience',
       ])
       assertFieldError(
         cy.get(customerDetails.contacts),
-        'Select a contact',
+        'Select a company contact',
         true
       )
       assertFieldError(
@@ -733,6 +733,36 @@ describe('Adding an export win', () => {
       )
       assertFieldError(cy.get(winDetails.sector), 'Enter a sector', false)
     })
+
+    it('should display a validation error message when the win date is in the future', () => {
+      const today = new Date()
+      // Indexing starts at zero (0 - 11) so we have to increment by 2 for next month
+      const month = today.getMonth() + 2
+      const year = today.getFullYear()
+      cy.get(winDetails.dateMonth).type(month)
+      cy.get(winDetails.dateYear).type(year)
+      clickContinueButton()
+      assertFieldError(
+        cy.get(winDetails.date),
+        'Date must be in the last 12 months',
+        true
+      )
+    })
+
+    it('should display a validation error message when the win date is greater than twelve months ago', () => {
+      const today = new Date()
+      // Indexing starts at zero (0 - 11) so no need to decrement by 1
+      const month = today.getMonth()
+      const year = today.getFullYear() - 1
+      cy.get(winDetails.dateMonth).type(month)
+      cy.get(winDetails.dateYear).type(year)
+      clickContinueButton()
+      assertFieldError(
+        cy.get(winDetails.date),
+        'Date must be in the last 12 months',
+        true
+      )
+    })
   })
 
   context('Support provided', () => {