@defra/forms-model 3.0.612 → 3.0.614

package/schemas/form-definition-v2-schema.json

@@ -100,11 +100,14 @@
           "default": false,
           "title": "Show Reference Number",
           "description": "The show reference number value."
+        },
+        "disableUserFeedback": {
+          "type": "boolean",
+          "default": false,
+          "title": "Disable User Feedback",
+          "description": "The disable user feedback value."
         }
       },
-      "required": [
-        "showReferenceNumber"
-      ],
       "additionalProperties": false,
       "title": "Options"
     },

package/src/form/form-definition/index.ts

@@ -1062,7 +1062,8 @@ const phaseBannerSchema = Joi.object<PhaseBanner>()
   })
 
 const optionsSchema = Joi.object({
-  showReferenceNumber: Joi.boolean().default(false).required()
+  showReferenceNumber: Joi.boolean().default(false),
+  disableUserFeedback: Joi.boolean().default(false)
 }).description('Options for the form')
 
 const outputSchema = Joi.object<FormDefinition['output']>()

package/src/form/form-definition/types.ts

@@ -191,7 +191,8 @@ export interface Output {
 }
 
 export interface FormOptions {
-  showReferenceNumber: boolean
+  showReferenceNumber?: boolean
+  disableUserFeedback?: boolean
 }
 
 /**

package/src/form/form-editor/index.ts

@@ -312,6 +312,10 @@ export const enableReferenceNumberSchema = Joi.boolean()
   .valid(true)
   .description('Whether reference number should be enabled')
 
+export const disableUserFeedbackSchema = Joi.boolean()
+  .valid(true)
+  .description('Whether user feedback should be disabled')
+
 export const minSchema = Joi.number()
   .empty('')
   .integer()

package/src/form/form-editor/preview/controller/summary-page-controller.js

@@ -1,3 +1,4 @@
+import { ComponentType } from '~/src/components/enums.js'
 import { hasFormField } from '~/src/components/helpers.js'
 import { HIGHLIGHT_CLASS } from '~/src/form/form-editor/preview/constants.js'
 import { PreviewPageControllerBase } from '~/src/form/form-editor/preview/controller/page-controller-base.js'
@@ -79,18 +80,25 @@ export class SummaryPageController extends PreviewPageControllerBase {
    * @returns {{ rows: SummaryRow[] }}
    */
   get componentRows() {
-    const rows = this._componentDefs.map((component) => {
-      const summaryRowHeading = component.shortDescription ?? ''
-      return {
-        key: { text: summaryRowHeading },
-        value: { text: EXAMPLE_TEXT },
-        actions: {
-          items: [
-            { href: '#', text: 'Change', visuallyHiddenText: summaryRowHeading }
-          ]
+    const rows = this._componentDefs
+      // Exclude payment field as displayed in a section at the bottom
+      .filter((comp) => comp.type !== ComponentType.PaymentField)
+      .map((component) => {
+        const summaryRowHeading = component.shortDescription ?? ''
+        return {
+          key: { text: summaryRowHeading },
+          value: { text: EXAMPLE_TEXT },
+          actions: {
+            items: [
+              {
+                href: '#',
+                text: 'Change',
+                visuallyHiddenText: summaryRowHeading
+              }
+            ]
+          }
         }
-      }
-    })
+      })
     return {
       rows
     }

package/src/form/form-editor/preview/payment.js

@@ -5,6 +5,22 @@ import {
   QuestionComponentElements
 } from '~/src/form/form-editor/preview/question.js'
 
+/**
+ * Formats a currency amount with thousand separators and two decimal places
+ * @param {number} value
+ * @param {'en-GB'} [locale] - locale for formatting
+ * @param {'GBP'} [currency] - currency code
+ * @returns {string} Formatted amount (e.g., "£1,234.56")
+ */
+function formatCurrency(value, locale = 'en-GB', currency = 'GBP') {
+  const formatter = new Intl.NumberFormat(locale, {
+    style: 'currency',
+    currency
+  })
+
+  return formatter.format(value)
+}
+
 /**
  * @implements {PaymentElements}
  */
@@ -107,8 +123,8 @@ export class PaymentQuestion extends Question {
   _renderInput() {
     const amount =
       typeof this._paymentAmount === 'number'
-        ? this._paymentAmount.toFixed(2)
-        : '0.00'
+        ? formatCurrency(this._paymentAmount)
+        : '£0.00'
 
     return {
       ...super._renderInput(),

package/src/form/form-editor/types.ts

@@ -130,6 +130,11 @@ export interface FormEditor {
    */
   enableReferenceNumber: boolean
 
+  /**
+   * Whether user feedback should be disabled
+   */
+  disableUserFeedback: boolean
+
   /**
    * The min length a field can have
    */
@@ -341,6 +346,11 @@ export type FormEditorInputReferenceNumberSettings = Pick<
   'enableReferenceNumber'
 >
 
+export type FormEditorInputUserFeedbackSettings = Pick<
+  FormEditor,
+  'disableUserFeedback'
+>
+
 export type FormEditorInputQuestion = Pick<
   FormEditor,
   | 'questionType'