@defra/fcp-sfd-frontend-engine 0.16.0 → 0.18.0

package/dist/index.cjs

@@ -279,15 +279,13 @@ var updateCustomerNameMutation = `
   }
 `;
 
-// src/mutations/personal/update-customer-email.js
-var updateCustomerEmailMutation = `
-  mutation UpdateCustomerEmail($input: UpdateCustomerEmailInput!) {
-    updateCustomerEmail(input: $input) {
+// src/mutations/personal/update-customer-dob.js
+var updateCustomerDobMutation = `
+  mutation UpdateCustomerDateOfBirth($input: UpdateCustomerDateOfBirthInput!) {
+    updateCustomerDateOfBirth(input: $input) {
       customer {
         info {
-          email {
-            address
-          }
+          dateOfBirth
         }
       }
     }
@@ -310,13 +308,29 @@ var updateCustomerPhoneMutation = `
   }
 `;
 
+// src/mutations/personal/update-customer-email.js
+var updateCustomerEmailMutation = `
+  mutation UpdateCustomerEmail($input: UpdateCustomerEmailInput!) {
+    updateCustomerEmail(input: $input) {
+      customer {
+        info {
+          email {
+            address
+          }
+        }
+      }
+    }
+  }
+`;
+
 // src/mutations/mutations.js
 var mutations = {
   updateBusinessEmail: updateBusinessEmailMutation,
   updateBusinessName: updateBusinessNameMutation,
   updateCustomerName: updateCustomerNameMutation,
-  updateCustomerEmail: updateCustomerEmailMutation,
-  updateCustomerPhone: updateCustomerPhoneMutation
+  updateCustomerDob: updateCustomerDobMutation,
+  updateCustomerPhone: updateCustomerPhoneMutation,
+  updateCustomerEmail: updateCustomerEmailMutation
 };
 
 // src/presenters/base-presenter.js
@@ -336,6 +350,23 @@ var formatNumber = (payloadNumber, changedNumber, originalNumber) => {
   }
   return originalNumber;
 };
+var formatDatePart = (changed, original) => {
+  return changed ?? (original == null ? void 0 : original.toString()) ?? "";
+};
+var formatDateInputValues = (payloadDob, changedDob, originalDob) => {
+  if (payloadDob) {
+    return {
+      day: payloadDob.day ?? "",
+      month: payloadDob.month ?? "",
+      year: payloadDob.year ?? ""
+    };
+  }
+  return {
+    day: formatDatePart(changedDob == null ? void 0 : changedDob.day, originalDob == null ? void 0 : originalDob.day),
+    month: formatDatePart(changedDob == null ? void 0 : changedDob.month, originalDob == null ? void 0 : originalDob.month),
+    year: formatDatePart(changedDob == null ? void 0 : changedDob.year, originalDob == null ? void 0 : originalDob.year)
+  };
+};
 var sortErrorsBySectionOrder = (errors, orderedSectionsToFix, SECTION_FIELD_ORDER) => {
   const sortedErrors = [];
   for (const section of orderedSectionsToFix) {
@@ -353,19 +384,35 @@ var sortErrorsBySectionOrder = (errors, orderedSectionsToFix, SECTION_FIELD_ORDE
 };
 
 // src/presenters/address-presenter.js
-var addressChangeLink = (postcodeLookup) => {
-  if (postcodeLookup) {
-    return "/account-address-change";
-  } else {
+var addressChangeLink = (postcodeLookup, context) => {
+  if (context === "business") {
+    if (postcodeLookup) {
+      return "/business-address-change";
+    }
+    return "/business-address-enter";
+  }
+  if (context === "personal") {
+    if (postcodeLookup) {
+      return "/account-address-change";
+    }
     return "/account-address-enter";
   }
+  return null;
 };
-var addressBackLink = (postcodeLookup) => {
-  if (postcodeLookup) {
-    return { href: "/account-address-select" };
-  } else {
+var addressBackLink = (postcodeLookup, context) => {
+  if (context === "business") {
+    if (postcodeLookup) {
+      return { href: "/business-address-select" };
+    }
+    return { href: "/business-address-enter" };
+  }
+  if (context === "personal") {
+    if (postcodeLookup) {
+      return { href: "/account-address-select" };
+    }
     return { href: "/account-address-enter" };
   }
+  return null;
 };
 var buildAddressLine = (parts) => {
   return parts.filter(Boolean).join(", ") || null;
@@ -495,6 +542,7 @@ var formatBusinessAddress = (businessAddress) => {
 var presenters = {
   formatBackLink,
   formatNumber,
+  formatDateInputValues,
   formatDisplayAddress,
   formatOriginalAddress,
   formatChangedAddress,

package/dist/index.js

@@ -239,15 +239,13 @@ var updateCustomerNameMutation = `
   }
 `;
 
-// src/mutations/personal/update-customer-email.js
-var updateCustomerEmailMutation = `
-  mutation UpdateCustomerEmail($input: UpdateCustomerEmailInput!) {
-    updateCustomerEmail(input: $input) {
+// src/mutations/personal/update-customer-dob.js
+var updateCustomerDobMutation = `
+  mutation UpdateCustomerDateOfBirth($input: UpdateCustomerDateOfBirthInput!) {
+    updateCustomerDateOfBirth(input: $input) {
       customer {
         info {
-          email {
-            address
-          }
+          dateOfBirth
         }
       }
     }
@@ -270,13 +268,29 @@ var updateCustomerPhoneMutation = `
   }
 `;
 
+// src/mutations/personal/update-customer-email.js
+var updateCustomerEmailMutation = `
+  mutation UpdateCustomerEmail($input: UpdateCustomerEmailInput!) {
+    updateCustomerEmail(input: $input) {
+      customer {
+        info {
+          email {
+            address
+          }
+        }
+      }
+    }
+  }
+`;
+
 // src/mutations/mutations.js
 var mutations = {
   updateBusinessEmail: updateBusinessEmailMutation,
   updateBusinessName: updateBusinessNameMutation,
   updateCustomerName: updateCustomerNameMutation,
-  updateCustomerEmail: updateCustomerEmailMutation,
-  updateCustomerPhone: updateCustomerPhoneMutation
+  updateCustomerDob: updateCustomerDobMutation,
+  updateCustomerPhone: updateCustomerPhoneMutation,
+  updateCustomerEmail: updateCustomerEmailMutation
 };
 
 // src/presenters/base-presenter.js
@@ -296,6 +310,23 @@ var formatNumber = (payloadNumber, changedNumber, originalNumber) => {
   }
   return originalNumber;
 };
+var formatDatePart = (changed, original) => {
+  return changed ?? (original == null ? void 0 : original.toString()) ?? "";
+};
+var formatDateInputValues = (payloadDob, changedDob, originalDob) => {
+  if (payloadDob) {
+    return {
+      day: payloadDob.day ?? "",
+      month: payloadDob.month ?? "",
+      year: payloadDob.year ?? ""
+    };
+  }
+  return {
+    day: formatDatePart(changedDob == null ? void 0 : changedDob.day, originalDob == null ? void 0 : originalDob.day),
+    month: formatDatePart(changedDob == null ? void 0 : changedDob.month, originalDob == null ? void 0 : originalDob.month),
+    year: formatDatePart(changedDob == null ? void 0 : changedDob.year, originalDob == null ? void 0 : originalDob.year)
+  };
+};
 var sortErrorsBySectionOrder = (errors, orderedSectionsToFix, SECTION_FIELD_ORDER) => {
   const sortedErrors = [];
   for (const section of orderedSectionsToFix) {
@@ -313,19 +344,35 @@ var sortErrorsBySectionOrder = (errors, orderedSectionsToFix, SECTION_FIELD_ORDE
 };
 
 // src/presenters/address-presenter.js
-var addressChangeLink = (postcodeLookup) => {
-  if (postcodeLookup) {
-    return "/account-address-change";
-  } else {
+var addressChangeLink = (postcodeLookup, context) => {
+  if (context === "business") {
+    if (postcodeLookup) {
+      return "/business-address-change";
+    }
+    return "/business-address-enter";
+  }
+  if (context === "personal") {
+    if (postcodeLookup) {
+      return "/account-address-change";
+    }
     return "/account-address-enter";
   }
+  return null;
 };
-var addressBackLink = (postcodeLookup) => {
-  if (postcodeLookup) {
-    return { href: "/account-address-select" };
-  } else {
+var addressBackLink = (postcodeLookup, context) => {
+  if (context === "business") {
+    if (postcodeLookup) {
+      return { href: "/business-address-select" };
+    }
+    return { href: "/business-address-enter" };
+  }
+  if (context === "personal") {
+    if (postcodeLookup) {
+      return { href: "/account-address-select" };
+    }
     return { href: "/account-address-enter" };
   }
+  return null;
 };
 var buildAddressLine = (parts) => {
   return parts.filter(Boolean).join(", ") || null;
@@ -455,6 +502,7 @@ var formatBusinessAddress = (businessAddress) => {
 var presenters = {
   formatBackLink,
   formatNumber,
+  formatDateInputValues,
   formatDisplayAddress,
   formatOriginalAddress,
   formatChangedAddress,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/fcp-sfd-frontend-engine",
-  "version": "0.16.0",
+  "version": "0.18.0",
   "description": "Shared frontend engine used by both the internal and external frontend applications.",
   "main": "./dist/index.cjs",
   "exports": {

package/src/mutations/mutations.js

@@ -1,13 +1,15 @@
 import { updateBusinessEmailMutation } from './business/update-business-email.js'
 import { updateBusinessNameMutation } from './business/update-business-name.js'
 import { updateCustomerNameMutation } from './personal/update-customer-name.js'
-import { updateCustomerEmailMutation } from './personal/update-customer-email.js'
+import { updateCustomerDobMutation } from './personal/update-customer-dob.js'
 import { updateCustomerPhoneMutation } from './personal/update-customer-phone.js'
+import { updateCustomerEmailMutation } from './personal/update-customer-email.js'
 
 export const mutations = {
   updateBusinessEmail: updateBusinessEmailMutation,
   updateBusinessName: updateBusinessNameMutation,
   updateCustomerName: updateCustomerNameMutation,
-  updateCustomerEmail: updateCustomerEmailMutation,
-  updateCustomerPhone: updateCustomerPhoneMutation
+  updateCustomerDob: updateCustomerDobMutation,
+  updateCustomerPhone: updateCustomerPhoneMutation,
+  updateCustomerEmail: updateCustomerEmailMutation
 }

package/src/mutations/personal/update-customer-dob.js

@@ -0,0 +1,11 @@
+export const updateCustomerDobMutation = `
+  mutation UpdateCustomerDateOfBirth($input: UpdateCustomerDateOfBirthInput!) {
+    updateCustomerDateOfBirth(input: $input) {
+      customer {
+        info {
+          dateOfBirth
+        }
+      }
+    }
+  }
+`

package/src/presenters/address-presenter.js

@@ -6,14 +6,23 @@
  * Otherwise, they navigate to the manual address entry page.
  *
  * @param {boolean} postcodeLookup - Whether the user used a postcode lookup to find their address
+ * @param {string} context - The context for the address change ('business' or 'personal')
  * @returns {string} The URL path for the address change page
  */
-export const addressChangeLink = (postcodeLookup) => {
-  if (postcodeLookup) {
-    return '/account-address-change'
-  } else {
+export const addressChangeLink = (postcodeLookup, context) => {
+  if (context === 'business') {
+    if (postcodeLookup) {
+      return '/business-address-change'
+    }
+    return '/business-address-enter'
+  }
+  if (context === 'personal') {
+    if (postcodeLookup) {
+      return '/account-address-change'
+    }
     return '/account-address-enter'
   }
+  return null
 }
 
 /**
@@ -23,14 +32,23 @@ export const addressChangeLink = (postcodeLookup) => {
  * If they manually entered the address, the back link returns to the manual entry page.
  *
  * @param {boolean} postcodeLookup - Whether the user used a postcode lookup to find their address
+ * @param {string} context - The context for the address change ('business' or 'personal')
  * @returns {Object} An object with an `href` property containing the back link URL
  */
-export const addressBackLink = (postcodeLookup) => {
-  if (postcodeLookup) {
-    return { href: '/account-address-select' }
-  } else {
+export const addressBackLink = (postcodeLookup, context) => {
+  if (context === 'business') {
+    if (postcodeLookup) {
+      return { href: '/business-address-select' }
+    }
+    return { href: '/business-address-enter' }
+  }
+  if (context === 'personal') {
+    if (postcodeLookup) {
+      return { href: '/account-address-select' }
+    }
     return { href: '/account-address-enter' }
   }
+  return null
 }
 
 /**

package/src/presenters/base-presenter.js

@@ -37,6 +37,38 @@ export const formatNumber = (payloadNumber, changedNumber, originalNumber) => {
   return originalNumber
 }
 
+/**
+ * Builds date of birth values for the form inputs.
+ *
+ * Values coming from `payloadDob` are always strings (they come from the form).
+ * `changedDob` is saved payload data, so these values are also strings.
+ *
+ * The original date of birth value comes from the DAL and isn’t a string.
+ * When falling back to those values we explicitly convert them to strings
+ * so all sources are normalised and safe to use in inputs.
+ *
+ * Null values are handled to avoid showing 'null' in the UI.
+ */
+const formatDatePart = (changed, original) => {
+  return changed ?? original?.toString() ?? ''
+}
+
+export const formatDateInputValues = (payloadDob, changedDob, originalDob) => {
+  if (payloadDob) {
+    return {
+      day: payloadDob.day ?? '',
+      month: payloadDob.month ?? '',
+      year: payloadDob.year ?? ''
+    }
+  }
+
+  return {
+    day: formatDatePart(changedDob?.day, originalDob?.day),
+    month: formatDatePart(changedDob?.month, originalDob?.month),
+    year: formatDatePart(changedDob?.year, originalDob?.year)
+  }
+}
+
 /**
  * Shared helper used by base presenters to sort validation errors so they
  * appear in the same order as the sections and fields shown on a Fix List page.

package/src/presenters/presenters.js

@@ -1,6 +1,7 @@
 import {
   formatBackLink,
   formatNumber,
+  formatDateInputValues,
   sortErrorsBySectionOrder
 } from './base-presenter.js'
 
@@ -23,6 +24,7 @@ import {
 export const presenters = {
   formatBackLink,
   formatNumber,
+  formatDateInputValues,
   formatDisplayAddress,
   formatOriginalAddress,
   formatChangedAddress,