[ASL-4592] Previous project expiry allows invalid date (#960)

* Make format date more resilient

* [ASL-4592] Update message to prevent confusion from unintuitive ordering of the raw date

* npm version

client/components/download-link/renderers/docx-renderer.js

@@ -7,9 +7,9 @@ import isNull from 'lodash/isNull';
 import get from 'lodash/get';
 import pickBy from 'lodash/pickBy';
 import mapValues from 'lodash/mapValues';
-import { format } from 'date-fns';
 import { projectSpecies as SPECIES } from '@ukhomeoffice/asl-constants';
-import { getLegacySpeciesLabel, mapSpecies, stripInvalidXmlChars } from '../../../helpers';
+import { getLegacySpeciesLabel, mapSpecies, stripInvalidXmlChars, formatDate } from '../../../helpers';
+import { DATE_FORMAT } from '../../../constants';
 import { filterSpeciesByActive } from '../../../pages/sections/protocols/animals';
 import protocolConditions from '../../../constants/protocol-conditions';
 import { getRepeatedFromProtocolIndex, hydrateSteps } from '../../../helpers/steps';
@@ -698,7 +698,7 @@ export default (application, sections, values, updateImageDimensions) => {
         return (value || []).map(item => renderFields(doc, field, item, field.fields, project));
 
       case 'date':
-        return renderText(doc, format(value, 'dd/MM/yyyy'));
+        return renderText(doc, formatDate(value, DATE_FORMAT.long));
 
       case 'location-selector':
       case 'objective-selector':

client/helpers/index.js

@@ -10,7 +10,13 @@ import LEGACY_SPECIES from '../constants/legacy-species';
 import {projectSpecies as SPECIES} from '@ukhomeoffice/asl-constants';
 import CONDITIONS from '../constants/conditions';
 
-export const formatDate = (date, format) => (date ? dateFormatter(date, format) : '-');
+export const formatDate = (date, format) => {
+  try {
+    return date ? dateFormatter(date, format) : '-';
+  } catch (err) {
+    return `Invalid date entered`;
+  }
+};
 
 export const getConditions = (values, project) => {
   const isProtocol = !!project;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asl/projects",
-  "version": "15.6.11",
+  "version": "15.6.12",
   "description": "ASL PPL prototype",
   "main": "client/external.js",
   "styles": "assets/scss/projects.scss",