@defra/forms-engine-plugin 5.0.0-alpha → 5.0.0-alpha.10

package/.server/server/plugins/engine/components/LatLongField.js.map

@@ -1 +1 @@
-{"version":3,"file":"LatLongField.js","names":["ComponentType","lowerFirst","ComponentCollection","FormComponent","isFormState","deduplicateErrorsByHref","getLocationFieldViewModel","NumberField","createLowerFirstExpression","t","tPlugin","messageTemplate","convertToLanguageMessages","DECIMAL_PRECISION","LatLongField","constructor","def","props","name","options","schema","isRequired","required","latitudeMin","latitude","min","latitudeMax","max","longitudeMin","longitude","longitudeMax","fieldLabel","label","customValidationMessages","latitudeRangeMessage","longitudeRangeMessage","latitudeMessages","longitudeMessages","collection","type","title","precision","optionalText","classes","suffix","parent","peers","formSchema","stateSchema","getFormValueFromState","state","value","isLatLong","undefined","getDisplayStringFromFormValue","_translator","getDisplayStringFromState","translator","getContextValueFromFormValue","getContextValueFromState","getViewModel","context","viewModel","getViewErrors","errors","allErrors","getErrors","isState","getAllPossibleErrors","baseErrors","template","advancedSettingsErrors","isNumber"],"sources":["../../../../../src/server/plugins/engine/components/LatLongField.ts"],"sourcesContent":["import { ComponentType, type LatLongFieldComponent } from '@defra/forms-model'\nimport { type LanguageMessages, type ObjectSchema } from 'joi'\nimport lowerFirst from 'lodash/lowerFirst.js'\n\nimport { ComponentCollection } from '~/src/server/plugins/engine/components/ComponentCollection.js'\nimport {\n  FormComponent,\n  isFormState\n} from '~/src/server/plugins/engine/components/FormComponent.js'\nimport {\n  deduplicateErrorsByHref,\n  getLocationFieldViewModel\n} from '~/src/server/plugins/engine/components/LocationFieldHelpers.js'\nimport { NumberField } from '~/src/server/plugins/engine/components/NumberField.js'\nimport { createLowerFirstExpression } from '~/src/server/plugins/engine/components/helpers/index.js'\nimport {\n  type LatLongState,\n  type RenderContext\n} from '~/src/server/plugins/engine/components/types.js'\nimport { t as tPlugin } from '~/src/server/plugins/engine/i18n/index.js'\nimport { type Translator } from '~/src/server/plugins/engine/i18n/types.js'\nimport { messageTemplate } from '~/src/server/plugins/engine/pageControllers/validationOptions.js'\nimport {\n  type ErrorMessageTemplateList,\n  type FormPayload,\n  type FormState,\n  type FormStateValue,\n  type FormSubmissionError,\n  type FormSubmissionState\n} from '~/src/server/plugins/engine/types.js'\nimport { convertToLanguageMessages } from '~/src/server/utils/type-utils.js'\n\n// Precision constants\n// UK latitude/longitude requires high precision for accurate location (within ~11mm)\nconst DECIMAL_PRECISION = 7 // 7 decimal places\n\nexport class LatLongField extends FormComponent {\n  declare options: LatLongFieldComponent['options']\n  declare formSchema: ObjectSchema<FormPayload>\n  declare stateSchema: ObjectSchema<FormState>\n  declare collection: ComponentCollection\n\n  constructor(\n    def: LatLongFieldComponent,\n    props: ConstructorParameters<typeof FormComponent>[1]\n  ) {\n    super(def, props)\n\n    const { name, options, schema } = def\n\n    const isRequired = options.required !== false\n\n    // Read schema values from def.schema with fallback defaults\n    const latitudeMin = schema?.latitude?.min ?? 49.85\n    const latitudeMax = schema?.latitude?.max ?? 60.859\n    const longitudeMin = schema?.longitude?.min ?? -13.687\n    const longitudeMax = schema?.longitude?.max ?? 1.767\n\n    const fieldLabel = lowerFirst(this.label)\n\n    const customValidationMessages: LanguageMessages =\n      convertToLanguageMessages({\n        'number.precision': tPlugin(\n          'components.latLongField.precision',\n          'en-GB'\n        ),\n        'number.unsafe': tPlugin('components.latLongField.notANumber', 'en-GB')\n      })\n\n    const latitudeRangeMessage = tPlugin(\n      'components.latLongField.latitudeRange',\n      'en-GB',\n      { fieldLabel, min: latitudeMin, max: latitudeMax }\n    )\n    const longitudeRangeMessage = tPlugin(\n      'components.latLongField.longitudeRange',\n      'en-GB',\n      { fieldLabel, min: longitudeMin, max: longitudeMax }\n    )\n\n    const latitudeMessages: LanguageMessages = convertToLanguageMessages({\n      ...customValidationMessages,\n      'any.required': tPlugin(\n        'components.latLongField.latitudeRequired',\n        'en-GB'\n      ),\n      'number.base': tPlugin('components.latLongField.latitudeBase', 'en-GB', {\n        fieldLabel\n      }),\n      'number.min': latitudeRangeMessage,\n      'number.max': latitudeRangeMessage\n    })\n\n    const longitudeMessages: LanguageMessages = convertToLanguageMessages({\n      ...customValidationMessages,\n      'any.required': tPlugin(\n        'components.latLongField.longitudeRequired',\n        'en-GB'\n      ),\n      'number.base': tPlugin('components.latLongField.longitudeBase', 'en-GB', {\n        fieldLabel\n      }),\n      'number.min': longitudeRangeMessage,\n      'number.max': longitudeRangeMessage\n    })\n\n    this.collection = new ComponentCollection(\n      [\n        {\n          type: ComponentType.NumberField,\n          name: `${name}__latitude`,\n          title: 'components.latLongField.latitude',\n          schema: {\n            min: latitudeMin,\n            max: latitudeMax,\n            precision: DECIMAL_PRECISION\n          },\n          options: {\n            required: isRequired,\n            optionalText: true,\n            classes: 'govuk-input--width-10',\n            suffix: '°',\n            customValidationMessages: latitudeMessages\n          }\n        },\n        {\n          type: ComponentType.NumberField,\n          name: `${name}__longitude`,\n          title: 'components.latLongField.longitude',\n          schema: {\n            min: longitudeMin,\n            max: longitudeMax,\n            precision: DECIMAL_PRECISION\n          },\n          options: {\n            required: isRequired,\n            optionalText: true,\n            classes: 'govuk-input--width-10',\n            suffix: '°',\n            customValidationMessages: longitudeMessages\n          }\n        }\n      ],\n      { ...props, parent: this },\n      {\n        peers: [`${name}__latitude`, `${name}__longitude`]\n      }\n    )\n\n    this.options = options\n    this.formSchema = this.collection.formSchema\n    this.stateSchema = this.collection.stateSchema\n  }\n\n  getFormValueFromState(state: FormSubmissionState) {\n    const value = super.getFormValueFromState(state)\n    return LatLongField.isLatLong(value) ? value : undefined\n  }\n\n  getDisplayStringFromFormValue(\n    value: LatLongState | undefined,\n    _translator: Translator\n  ): string {\n    if (!value) {\n      return ''\n    }\n\n    // CYA page format: <<latvalue, langvalue>>\n    return `${value.latitude}, ${value.longitude}`\n  }\n\n  getDisplayStringFromState(\n    state: FormSubmissionState,\n    translator: Translator\n  ) {\n    const value = this.getFormValueFromState(state)\n\n    return this.getDisplayStringFromFormValue(value, translator)\n  }\n\n  getContextValueFromFormValue(value: LatLongState | undefined): string | null {\n    if (!value) {\n      return null\n    }\n\n    // Output format: Latitude: <<entry>>\\nLongitude: <<entry>>\n    return `Latitude: ${value.latitude}\\nLongitude: ${value.longitude}`\n  }\n\n  getContextValueFromState(state: FormSubmissionState) {\n    const value = this.getFormValueFromState(state)\n\n    return this.getContextValueFromFormValue(value)\n  }\n\n  getViewModel(context: RenderContext) {\n    const viewModel = super.getViewModel(context)\n    return getLocationFieldViewModel(this, viewModel, context)\n  }\n\n  getViewErrors(\n    translator: Translator,\n    errors?: FormSubmissionError[]\n  ): FormSubmissionError[] | undefined {\n    const allErrors = this.getErrors(translator, errors)\n    return deduplicateErrorsByHref(allErrors)\n  }\n\n  isState(value?: FormStateValue | FormState) {\n    return LatLongField.isLatLong(value)\n  }\n\n  /**\n   * For error preview page that shows all possible errors on a component\n   */\n  getAllPossibleErrors(): ErrorMessageTemplateList {\n    return LatLongField.getAllPossibleErrors()\n  }\n\n  /**\n   * Static version of getAllPossibleErrors that doesn't require a component instance.\n   */\n  static getAllPossibleErrors(): ErrorMessageTemplateList {\n    return {\n      baseErrors: [\n        { type: 'required', template: messageTemplate.required },\n        {\n          type: 'latitudeFormat',\n          template: createLowerFirstExpression(\n            'Enter a valid latitude for {{lowerFirst(#title)}} like 51.519450'\n          )\n        },\n        {\n          type: 'longitudeFormat',\n          template: createLowerFirstExpression(\n            'Enter a valid longitude for {{lowerFirst(#title)}} like -0.127758'\n          )\n        }\n      ],\n      advancedSettingsErrors: [\n        {\n          type: 'latitudeMin',\n          template: createLowerFirstExpression(\n            'Latitude for {{lowerFirst(#title)}} must be between 49 and 60'\n          )\n        },\n        {\n          type: 'latitudeMax',\n          template: createLowerFirstExpression(\n            'Latitude for {{lowerFirst(#title)}} must be between 49 and 60'\n          )\n        },\n        {\n          type: 'longitudeMin',\n          template: createLowerFirstExpression(\n            'Longitude for {{lowerFirst(#title)}} must be between -9 and 2'\n          )\n        },\n        {\n          type: 'longitudeMax',\n          template: createLowerFirstExpression(\n            'Longitude for {{lowerFirst(#title)}} must be between -9 and 2'\n          )\n        }\n      ]\n    }\n  }\n\n  static isLatLong(value?: FormStateValue | FormState): value is LatLongState {\n    return (\n      isFormState(value) &&\n      NumberField.isNumber(value.latitude) &&\n      NumberField.isNumber(value.longitude)\n    )\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"LatLongField.js","names":["ComponentType","lowerFirst","ComponentCollection","FormComponent","isFormState","deduplicateErrorsByHref","getLocationFieldViewModel","NumberField","createLowerFirstExpression","getTranslatedLabel","t","tPlugin","messageTemplate","DECIMAL_PRECISION","LatLongField","constructor","def","props","name","options","schema","isRequired","required","latitudeMin","latitudeMax","longitudeMin","longitudeMax","getMinMax","latitudeMessages","longitudeMessages","buildErrorMessages","label","collection","type","title","min","max","precision","optionalText","classes","suffix","customValidationMessages","parent","peers","formSchema","stateSchema","getFormValueFromState","state","value","isLatLong","undefined","getDisplayStringFromFormValue","translator","latitude","longitude","getDisplayStringFromState","getContextValueFromFormValue","getContextValueFromState","getViewModel","context","viewModel","getViewErrors","errors","allErrors","getErrors","isState","getValidationMessagesOverride","translatedLabel","language","getAllPossibleErrors","baseErrors","template","advancedSettingsErrors","isNumber","fieldLabel","latitudeRangeMessage","longitudeRangeMessage"],"sources":["../../../../../src/server/plugins/engine/components/LatLongField.ts"],"sourcesContent":["import { ComponentType, type LatLongFieldComponent } from '@defra/forms-model'\nimport { type LanguageMessages, type ObjectSchema } from 'joi'\nimport lowerFirst from 'lodash/lowerFirst.js'\n\nimport { ComponentCollection } from '~/src/server/plugins/engine/components/ComponentCollection.js'\nimport {\n  FormComponent,\n  isFormState\n} from '~/src/server/plugins/engine/components/FormComponent.js'\nimport {\n  deduplicateErrorsByHref,\n  getLocationFieldViewModel\n} from '~/src/server/plugins/engine/components/LocationFieldHelpers.js'\nimport { NumberField } from '~/src/server/plugins/engine/components/NumberField.js'\nimport {\n  createLowerFirstExpression,\n  getTranslatedLabel\n} from '~/src/server/plugins/engine/components/helpers/index.js'\nimport {\n  type LatLongState,\n  type RenderContext\n} from '~/src/server/plugins/engine/components/types.js'\nimport { t as tPlugin } from '~/src/server/plugins/engine/i18n/index.js'\nimport { type Translator } from '~/src/server/plugins/engine/i18n/types.js'\nimport { messageTemplate } from '~/src/server/plugins/engine/pageControllers/validationOptions.js'\nimport {\n  type ErrorMessageTemplateList,\n  type FormPayload,\n  type FormState,\n  type FormStateValue,\n  type FormSubmissionError,\n  type FormSubmissionState\n} from '~/src/server/plugins/engine/types.js'\n\n// Precision constants\n// UK latitude/longitude requires high precision for accurate location (within ~11mm)\nconst DECIMAL_PRECISION = 7 // 7 decimal places\n\nexport class LatLongField extends FormComponent {\n  declare options: LatLongFieldComponent['options']\n  declare formSchema: ObjectSchema<FormPayload>\n  declare stateSchema: ObjectSchema<FormState>\n  declare collection: ComponentCollection\n\n  constructor(\n    def: LatLongFieldComponent,\n    props: ConstructorParameters<typeof FormComponent>[1]\n  ) {\n    super(def, props)\n\n    const { name, options, schema } = def\n\n    const isRequired = options.required !== false\n\n    const { latitudeMin, latitudeMax, longitudeMin, longitudeMax } =\n      LatLongField.getMinMax(schema)\n\n    const { latitudeMessages, longitudeMessages } =\n      LatLongField.buildErrorMessages(\n        this.label,\n        latitudeMin,\n        latitudeMax,\n        longitudeMin,\n        longitudeMax,\n        'en-GB'\n      )\n\n    this.collection = new ComponentCollection(\n      [\n        {\n          type: ComponentType.NumberField,\n          name: `${name}__latitude`,\n          title: 'components.latLongField.latitude',\n          schema: {\n            min: latitudeMin,\n            max: latitudeMax,\n            precision: DECIMAL_PRECISION\n          },\n          options: {\n            required: isRequired,\n            optionalText: true,\n            classes: 'govuk-input--width-10',\n            suffix: '°',\n            customValidationMessages: latitudeMessages\n          }\n        },\n        {\n          type: ComponentType.NumberField,\n          name: `${name}__longitude`,\n          title: 'components.latLongField.longitude',\n          schema: {\n            min: longitudeMin,\n            max: longitudeMax,\n            precision: DECIMAL_PRECISION\n          },\n          options: {\n            required: isRequired,\n            optionalText: true,\n            classes: 'govuk-input--width-10',\n            suffix: '°',\n            customValidationMessages: longitudeMessages\n          }\n        }\n      ],\n      { ...props, parent: this },\n      {\n        peers: [`${name}__latitude`, `${name}__longitude`]\n      }\n    )\n\n    this.options = options\n    this.formSchema = this.collection.formSchema\n    this.stateSchema = this.collection.stateSchema\n  }\n\n  getFormValueFromState(state: FormSubmissionState) {\n    const value = super.getFormValueFromState(state)\n    return LatLongField.isLatLong(value) ? value : undefined\n  }\n\n  getDisplayStringFromFormValue(\n    value: LatLongState | undefined,\n    translator: Translator\n  ): string {\n    if (!value) {\n      return ''\n    }\n\n    const { t } = translator\n\n    // Output format: Latitude: <<entry>>\\nLongitude: <<entry>>\n    return `${t('components.latLongField.latitude')}: ${value.latitude}\\n${t('components.latLongField.longitude')}: ${value.longitude}`\n  }\n\n  getDisplayStringFromState(\n    state: FormSubmissionState,\n    translator: Translator\n  ) {\n    const value = this.getFormValueFromState(state)\n\n    return this.getDisplayStringFromFormValue(value, translator)\n  }\n\n  getContextValueFromFormValue(value: LatLongState | undefined): string | null {\n    if (!value) {\n      return null\n    }\n\n    return `${value.latitude}, ${value.longitude}`\n  }\n\n  getContextValueFromState(state: FormSubmissionState) {\n    const value = this.getFormValueFromState(state)\n\n    return this.getContextValueFromFormValue(value)\n  }\n\n  getViewModel(context: RenderContext) {\n    const viewModel = super.getViewModel(context)\n    return getLocationFieldViewModel(this, viewModel, context)\n  }\n\n  getViewErrors(\n    translator: Translator,\n    errors?: FormSubmissionError[]\n  ): FormSubmissionError[] | undefined {\n    const allErrors = this.getErrors(translator, errors)\n    return deduplicateErrorsByHref(allErrors)\n  }\n\n  isState(value?: FormStateValue | FormState) {\n    return LatLongField.isLatLong(value)\n  }\n\n  getValidationMessagesOverride(translator: Translator) {\n    const def = this.def as LatLongFieldComponent\n    const translatedLabel = getTranslatedLabel(def, translator)\n    const { latitudeMin, latitudeMax, longitudeMin, longitudeMax } =\n      LatLongField.getMinMax(def.schema)\n    const { latitudeMessages, longitudeMessages } =\n      LatLongField.buildErrorMessages(\n        translatedLabel,\n        latitudeMin,\n        latitudeMax,\n        longitudeMin,\n        longitudeMax,\n        translator.language\n      )\n    return {\n      [`${this.name}__latitude`]: latitudeMessages,\n      [`${this.name}__longitude`]: longitudeMessages\n    }\n  }\n\n  /**\n   * For error preview page that shows all possible errors on a component\n   */\n  getAllPossibleErrors(): ErrorMessageTemplateList {\n    return LatLongField.getAllPossibleErrors()\n  }\n\n  /**\n   * Static version of getAllPossibleErrors that doesn't require a component instance.\n   */\n  static getAllPossibleErrors(): ErrorMessageTemplateList {\n    return {\n      baseErrors: [\n        { type: 'required', template: messageTemplate.required },\n        {\n          type: 'latitudeFormat',\n          template: createLowerFirstExpression(\n            'Enter a valid latitude for {{lowerFirst(#title)}} like 51.519450'\n          )\n        },\n        {\n          type: 'longitudeFormat',\n          template: createLowerFirstExpression(\n            'Enter a valid longitude for {{lowerFirst(#title)}} like -0.127758'\n          )\n        }\n      ],\n      advancedSettingsErrors: [\n        {\n          type: 'latitudeMin',\n          template: createLowerFirstExpression(\n            'Latitude for {{lowerFirst(#title)}} must be between 49 and 60'\n          )\n        },\n        {\n          type: 'latitudeMax',\n          template: createLowerFirstExpression(\n            'Latitude for {{lowerFirst(#title)}} must be between 49 and 60'\n          )\n        },\n        {\n          type: 'longitudeMin',\n          template: createLowerFirstExpression(\n            'Longitude for {{lowerFirst(#title)}} must be between -9 and 2'\n          )\n        },\n        {\n          type: 'longitudeMax',\n          template: createLowerFirstExpression(\n            'Longitude for {{lowerFirst(#title)}} must be between -9 and 2'\n          )\n        }\n      ]\n    }\n  }\n\n  static isLatLong(value?: FormStateValue | FormState): value is LatLongState {\n    return (\n      isFormState(value) &&\n      NumberField.isNumber(value.latitude) &&\n      NumberField.isNumber(value.longitude)\n    )\n  }\n\n  static buildErrorMessages(\n    label: string,\n    latitudeMin: number,\n    latitudeMax: number,\n    longitudeMin: number,\n    longitudeMax: number,\n    language: string\n  ) {\n    const fieldLabel = lowerFirst(label)\n\n    const customValidationMessages: LanguageMessages = {\n      'number.precision': tPlugin(\n        'components.latLongField.precision',\n        language\n      ),\n      'number.unsafe': tPlugin('components.latLongField.notANumber', language)\n    }\n\n    const latitudeRangeMessage = tPlugin(\n      'components.latLongField.latitudeRange',\n      language,\n      { fieldLabel, min: latitudeMin, max: latitudeMax }\n    )\n    const longitudeRangeMessage = tPlugin(\n      'components.latLongField.longitudeRange',\n      language,\n      { fieldLabel, min: longitudeMin, max: longitudeMax }\n    )\n\n    const latitudeMessages: LanguageMessages = {\n      ...customValidationMessages,\n      'any.required': tPlugin(\n        'components.latLongField.latitudeRequired',\n        language\n      ),\n      'number.base': tPlugin('components.latLongField.latitudeBase', language, {\n        fieldLabel\n      }),\n      'number.min': latitudeRangeMessage,\n      'number.max': latitudeRangeMessage\n    }\n\n    const longitudeMessages: LanguageMessages = {\n      ...customValidationMessages,\n      'any.required': tPlugin(\n        'components.latLongField.longitudeRequired',\n        language\n      ),\n      'number.base': tPlugin(\n        'components.latLongField.longitudeBase',\n        language,\n        {\n          fieldLabel\n        }\n      ),\n      'number.min': longitudeRangeMessage,\n      'number.max': longitudeRangeMessage\n    }\n\n    return {\n      latitudeMessages,\n      longitudeMessages\n    }\n  }\n\n  // Read schema values from def.schema with fallback defaults\n  static getMinMax(\n    schema:\n      | {\n          latitude?: {\n            min?: number\n            max?: number\n          }\n          longitude?: {\n            min?: number\n            max?: number\n          }\n        }\n      | undefined\n  ) {\n    return {\n      latitudeMin: schema?.latitude?.min ?? 49.85,\n      latitudeMax: schema?.latitude?.max ?? 60.859,\n      longitudeMin: schema?.longitude?.min ?? -13.687,\n      longitudeMax: schema?.longitude?.max ?? 1.767\n    }\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/.server/server/plugins/engine/components/List.d.ts

@@ -52,6 +52,7 @@ export declare class List extends ComponentBase {
         upload?: {
             count: number;
             summaryList: import("../types.js").SummaryList;
+            uploadingLabel?: string;
         };
     };
 }

package/.server/server/plugins/engine/components/ListFormComponent.d.ts

@@ -65,6 +65,7 @@ export declare class ListFormComponent extends FormComponent {
         upload?: {
             count: number;
             summaryList: import("../../../../server/plugins/engine/types.js").SummaryList;
+            uploadingLabel?: string;
         };
     };
     /**

package/.server/server/plugins/engine/components/LocationFieldBase.d.ts

@@ -1,7 +1,8 @@
 import { type FormComponentsDef } from '@defra/forms-model';
-import { type JoiExpression, type LanguageMessages, type StringSchema } from 'joi';
+import joi, { type JoiExpression, type LanguageMessages, type StringSchema } from 'joi';
 import { FormComponent } from '../../../../server/plugins/engine/components/FormComponent.js';
 import { type RenderContext } from '../../../../server/plugins/engine/components/types.js';
+import { type Translator } from '../../../../server/plugins/engine/types/index.js';
 import { type ErrorMessageTemplateList, type FormState, type FormStateValue, type FormSubmissionState } from '../../../../server/plugins/engine/types.js';
 interface LocationFieldOptions {
     instructionText?: string;
@@ -23,7 +24,7 @@ export declare abstract class LocationFieldBase extends FormComponent {
     formSchema: StringSchema;
     stateSchema: StringSchema;
     instructionText?: string;
-    protected abstract getValidationConfig(): ValidationConfig;
+    protected abstract getValidationConfig(translator: Translator | undefined): ValidationConfig;
     protected abstract getErrorTemplates(): {
         type: string;
         template: JoiExpression;
@@ -79,6 +80,7 @@ export declare abstract class LocationFieldBase extends FormComponent {
         upload?: {
             count: number;
             summaryList: import("../../../../server/plugins/engine/types.js").SummaryList;
+            uploadingLabel?: string;
         };
     } | {
         instructionText: string;
@@ -128,8 +130,12 @@ export declare abstract class LocationFieldBase extends FormComponent {
         upload?: {
             count: number;
             summaryList: import("../../../../server/plugins/engine/types.js").SummaryList;
+            uploadingLabel?: string;
         };
     };
+    getValidationMessagesOverride(translator: Translator): {
+        [x: string]: joi.LanguageMessages;
+    };
     getAllPossibleErrors(): ErrorMessageTemplateList;
     static isText(value?: FormStateValue | FormState): value is string;
 }

package/.server/server/plugins/engine/components/LocationFieldBase.js

@@ -1,8 +1,8 @@
 import joi from 'joi';
 import { FormComponent, isFormValue } from "./FormComponent.js";
 import { addClassOptionIfNone } from "./helpers/index.js";
+import { buildValidationMessages } from "../i18n/buildValidationMessages.js";
 import { messageTemplate } from "../pageControllers/validationOptions.js";
-import { convertToLanguageMessages } from "../../../utils/type-utils.js";
 /**
  * Abstract base class for location-based field components
  */
@@ -16,13 +16,13 @@ export class LocationFieldBase extends FormComponent {
     const locationOptions = options;
     this.instructionText = locationOptions.instructionText;
     addClassOptionIfNone(locationOptions, 'govuk-input--width-10');
-    const config = this.getValidationConfig();
+    const config = this.getValidationConfig(undefined);
     const requiredMessage = config.requiredMessage ?? messageTemplate.required;
-    const messages = convertToLanguageMessages({
+    const messages = {
       'any.required': requiredMessage,
       'string.empty': requiredMessage,
       'string.pattern.base': config.patternErrorMessage
-    });
+    };
     let formSchema = joi.string().trim().label(this.label).required().pattern(config.pattern).messages(messages);
     if (locationOptions.required === false) {
       formSchema = formSchema.allow('');
@@ -64,8 +64,21 @@ export class LocationFieldBase extends FormComponent {
     }
     return viewModel;
   }
+  getValidationMessagesOverride(translator) {
+    const {
+      t
+    } = translator;
+    const config = this.getValidationConfig(translator);
+    return {
+      [this.name]: {
+        'any.required': config.requiredMessage ?? buildValidationMessages(t).objectRequired,
+        'string.empty': config.requiredMessage ?? buildValidationMessages(t).objectRequired,
+        'string.pattern.base': config.patternErrorMessage
+      }
+    };
+  }
   getAllPossibleErrors() {
-    const config = this.getValidationConfig();
+    const config = this.getValidationConfig(undefined);
     return {
       baseErrors: [{
         type: 'required',

package/.server/server/plugins/engine/components/LocationFieldBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"LocationFieldBase.js","names":["joi","FormComponent","isFormValue","addClassOptionIfNone","messageTemplate","convertToLanguageMessages","LocationFieldBase","instructionText","constructor","def","props","options","locationOptions","config","getValidationConfig","requiredMessage","required","messages","patternErrorMessage","formSchema","string","trim","label","pattern","allow","customValidationMessage","message","messageKeys","reduce","acc","key","customValidationMessages","default","stateSchema","getFormValueFromState","state","name","getFormValue","value","isValue","undefined","isText","getViewModel","context","viewModel","getAllPossibleErrors","baseErrors","type","template","getErrorTemplates","advancedSettingsErrors"],"sources":["../../../../../src/server/plugins/engine/components/LocationFieldBase.ts"],"sourcesContent":["import { type FormComponentsDef } from '@defra/forms-model'\nimport joi, {\n  type JoiExpression,\n  type LanguageMessages,\n  type StringSchema\n} from 'joi'\n\nimport {\n  FormComponent,\n  isFormValue\n} from '~/src/server/plugins/engine/components/FormComponent.js'\nimport { addClassOptionIfNone } from '~/src/server/plugins/engine/components/helpers/index.js'\nimport { type RenderContext } from '~/src/server/plugins/engine/components/types.js'\nimport { messageTemplate } from '~/src/server/plugins/engine/pageControllers/validationOptions.js'\nimport {\n  type ErrorMessageTemplateList,\n  type FormState,\n  type FormStateValue,\n  type FormSubmissionState\n} from '~/src/server/plugins/engine/types.js'\nimport { convertToLanguageMessages } from '~/src/server/utils/type-utils.js'\n\ninterface LocationFieldOptions {\n  instructionText?: string\n  required?: boolean\n  customValidationMessage?: string\n  customValidationMessages?: LanguageMessages\n  classes?: string\n}\n\ninterface ValidationConfig {\n  pattern: RegExp\n  patternErrorMessage: JoiExpression\n  requiredMessage?: JoiExpression\n}\n\n/**\n * Abstract base class for location-based field components\n */\nexport abstract class LocationFieldBase extends FormComponent {\n  declare options: LocationFieldOptions\n  declare formSchema: StringSchema\n  declare stateSchema: StringSchema\n  instructionText?: string\n\n  protected abstract getValidationConfig(): ValidationConfig\n  protected abstract getErrorTemplates(): {\n    type: string\n    template: JoiExpression\n  }[]\n\n  constructor(\n    def: FormComponentsDef,\n    props: ConstructorParameters<typeof FormComponent>[1]\n  ) {\n    super(def, props)\n\n    const { options } = def\n    const locationOptions = options as LocationFieldOptions\n    this.instructionText = locationOptions.instructionText\n\n    addClassOptionIfNone(locationOptions, 'govuk-input--width-10')\n\n    const config = this.getValidationConfig()\n    const requiredMessage = config.requiredMessage ?? messageTemplate.required\n\n    const messages = convertToLanguageMessages({\n      'any.required': requiredMessage,\n      'string.empty': requiredMessage,\n      'string.pattern.base': config.patternErrorMessage\n    })\n\n    let formSchema = joi\n      .string()\n      .trim()\n      .label(this.label)\n      .required()\n      .pattern(config.pattern)\n      .messages(messages)\n\n    if (locationOptions.required === false) {\n      formSchema = formSchema.allow('')\n    }\n\n    if (locationOptions.customValidationMessage) {\n      const message = locationOptions.customValidationMessage\n      const messageKeys = [\n        'any.required',\n        'string.empty',\n        'string.pattern.base'\n      ]\n\n      const messages = messageKeys.reduce<LanguageMessages>((acc, key) => {\n        acc[key] = message\n        return acc\n      }, {})\n\n      formSchema = formSchema.messages(messages)\n    } else if (locationOptions.customValidationMessages) {\n      formSchema = formSchema.messages(locationOptions.customValidationMessages)\n    }\n\n    this.formSchema = formSchema.default('')\n    this.stateSchema = formSchema.default(null).allow(null)\n    this.options = locationOptions\n  }\n\n  getFormValueFromState(state: FormSubmissionState) {\n    const { name } = this\n    return this.getFormValue(state[name])\n  }\n\n  getFormValue(value?: FormStateValue | FormState) {\n    return this.isValue(value) ? value : undefined\n  }\n\n  isValue(value?: FormStateValue | FormState): value is string {\n    return LocationFieldBase.isText(value)\n  }\n\n  getViewModel(context: RenderContext) {\n    const viewModel = super.getViewModel(context)\n\n    if (this.instructionText) {\n      return {\n        ...viewModel,\n        instructionText: this.instructionText\n      }\n    }\n\n    return viewModel\n  }\n\n  getAllPossibleErrors(): ErrorMessageTemplateList {\n    const config = this.getValidationConfig()\n\n    return {\n      baseErrors: [\n        {\n          type: 'required',\n          template: config.requiredMessage ?? messageTemplate.required\n        },\n        ...this.getErrorTemplates()\n      ],\n      advancedSettingsErrors: []\n    }\n  }\n\n  static isText(value?: FormStateValue | FormState): value is string {\n    return isFormValue(value) && typeof value === 'string'\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"LocationFieldBase.js","names":["joi","FormComponent","isFormValue","addClassOptionIfNone","buildValidationMessages","messageTemplate","LocationFieldBase","instructionText","constructor","def","props","options","locationOptions","config","getValidationConfig","undefined","requiredMessage","required","messages","patternErrorMessage","formSchema","string","trim","label","pattern","allow","customValidationMessage","message","messageKeys","reduce","acc","key","customValidationMessages","default","stateSchema","getFormValueFromState","state","name","getFormValue","value","isValue","isText","getViewModel","context","viewModel","getValidationMessagesOverride","translator","t","objectRequired","getAllPossibleErrors","baseErrors","type","template","getErrorTemplates","advancedSettingsErrors"],"sources":["../../../../../src/server/plugins/engine/components/LocationFieldBase.ts"],"sourcesContent":["import { type FormComponentsDef } from '@defra/forms-model'\nimport joi, {\n  type JoiExpression,\n  type LanguageMessages,\n  type StringSchema\n} from 'joi'\n\nimport {\n  FormComponent,\n  isFormValue\n} from '~/src/server/plugins/engine/components/FormComponent.js'\nimport { addClassOptionIfNone } from '~/src/server/plugins/engine/components/helpers/index.js'\nimport { type RenderContext } from '~/src/server/plugins/engine/components/types.js'\nimport { buildValidationMessages } from '~/src/server/plugins/engine/i18n/buildValidationMessages.js'\nimport { messageTemplate } from '~/src/server/plugins/engine/pageControllers/validationOptions.js'\nimport { type Translator } from '~/src/server/plugins/engine/types/index.js'\nimport {\n  type ErrorMessageTemplateList,\n  type FormState,\n  type FormStateValue,\n  type FormSubmissionState\n} from '~/src/server/plugins/engine/types.js'\n\ninterface LocationFieldOptions {\n  instructionText?: string\n  required?: boolean\n  customValidationMessage?: string\n  customValidationMessages?: LanguageMessages\n  classes?: string\n}\n\ninterface ValidationConfig {\n  pattern: RegExp\n  patternErrorMessage: JoiExpression\n  requiredMessage?: JoiExpression\n}\n\n/**\n * Abstract base class for location-based field components\n */\nexport abstract class LocationFieldBase extends FormComponent {\n  declare options: LocationFieldOptions\n  declare formSchema: StringSchema\n  declare stateSchema: StringSchema\n  instructionText?: string\n\n  protected abstract getValidationConfig(\n    translator: Translator | undefined\n  ): ValidationConfig\n  protected abstract getErrorTemplates(): {\n    type: string\n    template: JoiExpression\n  }[]\n\n  constructor(\n    def: FormComponentsDef,\n    props: ConstructorParameters<typeof FormComponent>[1]\n  ) {\n    super(def, props)\n\n    const { options } = def\n    const locationOptions = options as LocationFieldOptions\n    this.instructionText = locationOptions.instructionText\n\n    addClassOptionIfNone(locationOptions, 'govuk-input--width-10')\n\n    const config = this.getValidationConfig(undefined)\n    const requiredMessage = config.requiredMessage ?? messageTemplate.required\n\n    const messages = {\n      'any.required': requiredMessage,\n      'string.empty': requiredMessage,\n      'string.pattern.base': config.patternErrorMessage\n    } as LanguageMessages\n\n    let formSchema = joi\n      .string()\n      .trim()\n      .label(this.label)\n      .required()\n      .pattern(config.pattern)\n      .messages(messages)\n\n    if (locationOptions.required === false) {\n      formSchema = formSchema.allow('')\n    }\n\n    if (locationOptions.customValidationMessage) {\n      const message = locationOptions.customValidationMessage\n      const messageKeys = [\n        'any.required',\n        'string.empty',\n        'string.pattern.base'\n      ]\n\n      const messages = messageKeys.reduce<LanguageMessages>((acc, key) => {\n        acc[key] = message\n        return acc\n      }, {})\n\n      formSchema = formSchema.messages(messages)\n    } else if (locationOptions.customValidationMessages) {\n      formSchema = formSchema.messages(locationOptions.customValidationMessages)\n    }\n\n    this.formSchema = formSchema.default('')\n    this.stateSchema = formSchema.default(null).allow(null)\n    this.options = locationOptions\n  }\n\n  getFormValueFromState(state: FormSubmissionState) {\n    const { name } = this\n    return this.getFormValue(state[name])\n  }\n\n  getFormValue(value?: FormStateValue | FormState) {\n    return this.isValue(value) ? value : undefined\n  }\n\n  isValue(value?: FormStateValue | FormState): value is string {\n    return LocationFieldBase.isText(value)\n  }\n\n  getViewModel(context: RenderContext) {\n    const viewModel = super.getViewModel(context)\n\n    if (this.instructionText) {\n      return {\n        ...viewModel,\n        instructionText: this.instructionText\n      }\n    }\n\n    return viewModel\n  }\n\n  getValidationMessagesOverride(translator: Translator) {\n    const { t } = translator\n    const config = this.getValidationConfig(translator)\n    return {\n      [this.name]: {\n        'any.required':\n          config.requiredMessage ?? buildValidationMessages(t).objectRequired,\n        'string.empty':\n          config.requiredMessage ?? buildValidationMessages(t).objectRequired,\n        'string.pattern.base': config.patternErrorMessage\n      } as LanguageMessages\n    }\n  }\n\n  getAllPossibleErrors(): ErrorMessageTemplateList {\n    const config = this.getValidationConfig(undefined)\n\n    return {\n      baseErrors: [\n        {\n          type: 'required',\n          template: config.requiredMessage ?? messageTemplate.required\n        },\n        ...this.getErrorTemplates()\n      ],\n      advancedSettingsErrors: []\n    }\n  }\n\n  static isText(value?: FormStateValue | FormState): value is string {\n    return isFormValue(value) && typeof value === 'string'\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/.server/server/plugins/engine/components/LocationFieldHelpers.d.ts

@@ -1,13 +1,17 @@
 import { type CustomValidator } from 'joi';
 import { type EastingNorthingField } from '../../../../server/plugins/engine/components/EastingNorthingField.js';
+import { type GeospatialField } from '../../../../server/plugins/engine/components/GeospatialField.js';
 import { type LatLongField } from '../../../../server/plugins/engine/components/LatLongField.js';
+import { type OsGridRefField } from '../../../../server/plugins/engine/components/OsGridRefField.js';
 import { type DateInputItem, type Label, type RenderContext, type ViewModel } from '../../../../server/plugins/engine/components/types.js';
+import { type Translator } from '../../../../server/plugins/engine/i18n/types.js';
 import { type FormSubmissionError, type FormValue } from '../../../../server/plugins/engine/types.js';
 export type LocationField = InstanceType<typeof EastingNorthingField> | InstanceType<typeof LatLongField>;
-export declare function joinWithAnd(items: string[]): string;
-export declare function formatErrorList(messages: string[]): string;
+export declare function joinWithAnd(items: string[], translator: Translator): string;
+export declare function formatErrorList(messages: string[], translator: Translator): string;
 export declare function mergeCssClasses(...classNames: (string | undefined)[]): string | undefined;
 export declare function deduplicateErrorsByHref(errors?: FormSubmissionError[]): FormSubmissionError[] | undefined;
+export declare function getMapLayers(component: GeospatialField | OsGridRefField | LatLongField | EastingNorthingField): string;
 export declare function getLocationFieldViewModel(component: LocationField, viewModel: ViewModel & {
     label: Label;
     id: string;
@@ -19,6 +23,7 @@ export declare function getLocationFieldViewModel(component: LocationField, view
         legend?: Label;
     };
     items: DateInputItem[];
+    mapLayers: string;
     label: Label;
     type?: string;
     id: string;
@@ -58,6 +63,7 @@ export declare function getLocationFieldViewModel(component: LocationField, view
     upload?: {
         count: number;
         summaryList: import("../../../../server/plugins/engine/types.js").SummaryList;
+        uploadingLabel?: string;
     };
 } | {
     instructionText: string;
@@ -66,6 +72,7 @@ export declare function getLocationFieldViewModel(component: LocationField, view
         legend?: Label;
     };
     items: DateInputItem[];
+    mapLayers: string;
     label: Label;
     type?: string;
     id: string;
@@ -105,6 +112,7 @@ export declare function getLocationFieldViewModel(component: LocationField, view
     upload?: {
         count: number;
         summaryList: import("../../../../server/plugins/engine/types.js").SummaryList;
+        uploadingLabel?: string;
     };
 };
 /**

package/.server/server/plugins/engine/components/LocationFieldHelpers.js

@@ -7,22 +7,21 @@ import { isFormValue } from "./FormComponent.js";
  * - "latitude must be..." -> "latitude must be..."
  */
 function lowercaseMessageStart(message) {
-  if (message.startsWith('Enter ')) {
-    return 'enter' + message.slice(5);
-  }
-
-  // Lowercase first character for any other message
+  // Lowercase first character for a message
   return message.charAt(0).toLowerCase() + message.slice(1);
 }
-export function joinWithAnd(items) {
+export function joinWithAnd(items, translator) {
+  const {
+    t
+  } = translator;
   if (items.length === 2) {
-    return `${items[0]} and ${items[1]}`;
+    return `${items[0]} ${t('common.and')} ${items[1]}`;
   }
   const leading = items.slice(0, -1).join(', ');
   const last = items[items.length - 1];
-  return `${leading} and ${last}`;
+  return `${leading} ${t('common.and')} ${last}`;
 }
-export function formatErrorList(messages) {
+export function formatErrorList(messages, translator) {
   if (!messages.length) {
     return '';
   }
@@ -30,7 +29,7 @@ export function formatErrorList(messages) {
     return messages[0];
   }
   const formattedMessages = messages.map((msg, index) => index === 0 ? msg : lowercaseMessageStart(msg));
-  return joinWithAnd(formattedMessages);
+  return joinWithAnd(formattedMessages, translator);
 }
 export function mergeCssClasses(...classNames) {
   const tokens = classNames.flatMap(name => name?.split(/\s+/) ?? []).map(token => token.trim()).filter(Boolean);
@@ -45,6 +44,16 @@ export function deduplicateErrorsByHref(errors) {
   }
   return errors.filter((error, index, self) => index === self.findIndex(err => err.href === error.href));
 }
+export function getMapLayers(component) {
+  const {
+    mapLayers
+  } = component.options;
+  const layers = [];
+  if (mapLayers?.sssi) {
+    layers.push('sssi');
+  }
+  return layers.join(',');
+}
 export function getLocationFieldViewModel(component, viewModel, context) {
   const {
     collection
@@ -100,7 +109,7 @@ export function getLocationFieldViewModel(component, viewModel, context) {
   viewModel.showFieldsetError = showFieldsetError;
   if (hasFieldErrors) {
     viewModel.errorMessage = {
-      text: fieldErrors.length === 1 ? fieldErrors[0] : formatErrorList(fieldErrors)
+      text: fieldErrors.length === 1 ? fieldErrors[0] : formatErrorList(fieldErrors, context.translator)
     };
   }
   const fieldset = existingFieldset ?? {
@@ -112,7 +121,8 @@ export function getLocationFieldViewModel(component, viewModel, context) {
   const result = {
     ...viewModel,
     fieldset,
-    items
+    items,
+    mapLayers: getMapLayers(component)
   };
   if (component.options.instructionText) {
     return {

package/.server/server/plugins/engine/components/LocationFieldHelpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"LocationFieldHelpers.js","names":["isFormValue","lowercaseMessageStart","message","startsWith","slice","charAt","toLowerCase","joinWithAnd","items","length","leading","join","last","formatErrorList","messages","formattedMessages","map","msg","index","mergeCssClasses","classNames","tokens","flatMap","name","split","token","trim","filter","Boolean","undefined","Array","from","Set","deduplicateErrorsByHref","errors","error","self","findIndex","err","href","getLocationFieldViewModel","component","viewModel","context","collection","fieldset","existingFieldset","label","subViewModels","getViewModel","fieldErrors","forEach","model","errorMessage","text","push","hasFieldErrors","type","value","classes","prefix","suffix","toString","baseItem","id","showFieldsetError","legend","result","options","instructionText","createLocationFieldValidator","payload","helpers","values","getFormValueFromState","getStateFromValidForm","missing","keys","key","isState","required"],"sources":["../../../../../src/server/plugins/engine/components/LocationFieldHelpers.ts"],"sourcesContent":["import { type Context, type CustomValidator } from 'joi'\n\nimport { type EastingNorthingField } from '~/src/server/plugins/engine/components/EastingNorthingField.js'\nimport { isFormValue } from '~/src/server/plugins/engine/components/FormComponent.js'\nimport { type LatLongField } from '~/src/server/plugins/engine/components/LatLongField.js'\nimport {\n  type DateInputItem,\n  type Label,\n  type RenderContext,\n  type ViewModel\n} from '~/src/server/plugins/engine/components/types.js'\nimport {\n  type FormPayload,\n  type FormSubmissionError,\n  type FormValue\n} from '~/src/server/plugins/engine/types.js'\n\nexport type LocationField =\n  | InstanceType<typeof EastingNorthingField>\n  | InstanceType<typeof LatLongField>\n\n/**\n * Lowercases the start of a message for concatenation.\n * Handles patterns like:\n * - \"Enter latitude\" -> \"enter latitude\"\n * - \"Enter a valid latitude...\" -> \"enter a valid latitude...\"\n * - \"latitude must be...\" -> \"latitude must be...\"\n */\nfunction lowercaseMessageStart(message: string): string {\n  if (message.startsWith('Enter ')) {\n    return 'enter' + message.slice(5)\n  }\n\n  // Lowercase first character for any other message\n  return message.charAt(0).toLowerCase() + message.slice(1)\n}\n\nexport function joinWithAnd(items: string[]): string {\n  if (items.length === 2) {\n    return `${items[0]} and ${items[1]}`\n  }\n\n  const leading = items.slice(0, -1).join(', ')\n  const last = items[items.length - 1]\n  return `${leading} and ${last}`\n}\n\nexport function formatErrorList(messages: string[]): string {\n  if (!messages.length) {\n    return ''\n  }\n\n  if (messages.length === 1) {\n    return messages[0]\n  }\n\n  const formattedMessages = messages.map((msg, index) =>\n    index === 0 ? msg : lowercaseMessageStart(msg)\n  )\n\n  return joinWithAnd(formattedMessages)\n}\n\nexport function mergeCssClasses(...classNames: (string | undefined)[]) {\n  const tokens = classNames\n    .flatMap((name) => name?.split(/\\s+/) ?? [])\n    .map((token) => token.trim())\n    .filter(Boolean)\n\n  if (!tokens.length) {\n    return undefined\n  }\n\n  return Array.from(new Set(tokens)).join(' ')\n}\n\nexport function deduplicateErrorsByHref(\n  errors?: FormSubmissionError[]\n): FormSubmissionError[] | undefined {\n  if (!errors?.length) {\n    return undefined\n  }\n\n  return errors.filter(\n    (error, index, self) =>\n      index === self.findIndex((err) => err.href === error.href)\n  )\n}\n\nexport function getLocationFieldViewModel(\n  component: LocationField,\n  viewModel: ViewModel & {\n    label: Label\n    id: string\n    name: string\n    value: FormValue\n  },\n  context: RenderContext\n) {\n  const { collection } = component\n  const { fieldset: existingFieldset, label } = viewModel\n\n  const subViewModels = collection.getViewModel(context)\n\n  const fieldErrors: string[] = []\n  subViewModels.forEach(({ model }) => {\n    if (model.errorMessage?.text) {\n      fieldErrors.push(model.errorMessage.text)\n    }\n  })\n\n  const hasFieldErrors = fieldErrors.length > 0\n\n  const items: DateInputItem[] = subViewModels.map(\n    ({ model }): DateInputItem => {\n      let { label, type, value, classes, prefix, suffix, errorMessage } = model\n\n      if (label) {\n        label.toString = () => label.text\n      }\n\n      if (!isFormValue(value)) {\n        value = undefined\n      }\n\n      const baseItem: DateInputItem = {\n        label,\n        id: model.id,\n        name: model.name,\n        type,\n        value,\n        classes: mergeCssClasses(\n          classes,\n          hasFieldErrors ? 'govuk-input--error' : undefined\n        ),\n        prefix,\n        suffix\n      }\n\n      if (!hasFieldErrors && errorMessage) {\n        baseItem.errorMessage = errorMessage\n      }\n\n      return baseItem\n    }\n  )\n\n  const showFieldsetError =\n    hasFieldErrors || Boolean(viewModel.errorMessage?.text)\n\n  viewModel.showFieldsetError = showFieldsetError\n\n  if (hasFieldErrors) {\n    viewModel.errorMessage = {\n      text:\n        fieldErrors.length === 1 ? fieldErrors[0] : formatErrorList(fieldErrors)\n    }\n  }\n\n  const fieldset = existingFieldset ?? {\n    legend: {\n      text: label.text,\n      classes: 'govuk-fieldset__legend--m'\n    }\n  }\n\n  const result = {\n    ...viewModel,\n    fieldset,\n    items\n  }\n\n  if (component.options.instructionText) {\n    return {\n      ...result,\n      instructionText: component.options.instructionText\n    }\n  }\n\n  return result\n}\n\n/**\n * Validator factory for location-based fields.\n * This creates a validator that ensures all required fields are present.\n */\nexport function createLocationFieldValidator(\n  component: LocationField\n): CustomValidator {\n  return (payload: FormPayload, helpers) => {\n    const { collection, name, options } = component\n\n    const values = component.getFormValueFromState(\n      component.getStateFromValidForm(payload)\n    )\n\n    const context: Context = {\n      missing: collection.keys,\n      key: name\n    }\n\n    if (!component.isState(values)) {\n      return options.required !== false\n        ? helpers.error('object.required', context)\n        : payload\n    }\n\n    return payload\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"LocationFieldHelpers.js","names":["isFormValue","lowercaseMessageStart","message","charAt","toLowerCase","slice","joinWithAnd","items","translator","t","length","leading","join","last","formatErrorList","messages","formattedMessages","map","msg","index","mergeCssClasses","classNames","tokens","flatMap","name","split","token","trim","filter","Boolean","undefined","Array","from","Set","deduplicateErrorsByHref","errors","error","self","findIndex","err","href","getMapLayers","component","mapLayers","options","layers","sssi","push","getLocationFieldViewModel","viewModel","context","collection","fieldset","existingFieldset","label","subViewModels","getViewModel","fieldErrors","forEach","model","errorMessage","text","hasFieldErrors","type","value","classes","prefix","suffix","toString","baseItem","id","showFieldsetError","legend","result","instructionText","createLocationFieldValidator","payload","helpers","values","getFormValueFromState","getStateFromValidForm","missing","keys","key","isState","required"],"sources":["../../../../../src/server/plugins/engine/components/LocationFieldHelpers.ts"],"sourcesContent":["import { type Context, type CustomValidator } from 'joi'\n\nimport { type EastingNorthingField } from '~/src/server/plugins/engine/components/EastingNorthingField.js'\nimport { isFormValue } from '~/src/server/plugins/engine/components/FormComponent.js'\nimport { type GeospatialField } from '~/src/server/plugins/engine/components/GeospatialField.js'\nimport { type LatLongField } from '~/src/server/plugins/engine/components/LatLongField.js'\nimport { type OsGridRefField } from '~/src/server/plugins/engine/components/OsGridRefField.js'\nimport {\n  type DateInputItem,\n  type Label,\n  type RenderContext,\n  type ViewModel\n} from '~/src/server/plugins/engine/components/types.js'\nimport { type Translator } from '~/src/server/plugins/engine/i18n/types.js'\nimport {\n  type FormPayload,\n  type FormSubmissionError,\n  type FormValue\n} from '~/src/server/plugins/engine/types.js'\n\nexport type LocationField =\n  | InstanceType<typeof EastingNorthingField>\n  | InstanceType<typeof LatLongField>\n\n/**\n * Lowercases the start of a message for concatenation.\n * Handles patterns like:\n * - \"Enter latitude\" -> \"enter latitude\"\n * - \"Enter a valid latitude...\" -> \"enter a valid latitude...\"\n * - \"latitude must be...\" -> \"latitude must be...\"\n */\nfunction lowercaseMessageStart(message: string): string {\n  // Lowercase first character for a message\n  return message.charAt(0).toLowerCase() + message.slice(1)\n}\n\nexport function joinWithAnd(items: string[], translator: Translator): string {\n  const { t } = translator\n  if (items.length === 2) {\n    return `${items[0]} ${t('common.and')} ${items[1]}`\n  }\n\n  const leading = items.slice(0, -1).join(', ')\n  const last = items[items.length - 1]\n  return `${leading} ${t('common.and')} ${last}`\n}\n\nexport function formatErrorList(\n  messages: string[],\n  translator: Translator\n): string {\n  if (!messages.length) {\n    return ''\n  }\n\n  if (messages.length === 1) {\n    return messages[0]\n  }\n\n  const formattedMessages = messages.map((msg, index) =>\n    index === 0 ? msg : lowercaseMessageStart(msg)\n  )\n\n  return joinWithAnd(formattedMessages, translator)\n}\n\nexport function mergeCssClasses(...classNames: (string | undefined)[]) {\n  const tokens = classNames\n    .flatMap((name) => name?.split(/\\s+/) ?? [])\n    .map((token) => token.trim())\n    .filter(Boolean)\n\n  if (!tokens.length) {\n    return undefined\n  }\n\n  return Array.from(new Set(tokens)).join(' ')\n}\n\nexport function deduplicateErrorsByHref(\n  errors?: FormSubmissionError[]\n): FormSubmissionError[] | undefined {\n  if (!errors?.length) {\n    return undefined\n  }\n\n  return errors.filter(\n    (error, index, self) =>\n      index === self.findIndex((err) => err.href === error.href)\n  )\n}\n\nexport function getMapLayers(\n  component:\n    | GeospatialField\n    | OsGridRefField\n    | LatLongField\n    | EastingNorthingField\n) {\n  const { mapLayers } = component.options\n  const layers = []\n\n  if (mapLayers?.sssi) {\n    layers.push('sssi')\n  }\n\n  return layers.join(',')\n}\n\nexport function getLocationFieldViewModel(\n  component: LocationField,\n  viewModel: ViewModel & {\n    label: Label\n    id: string\n    name: string\n    value: FormValue\n  },\n  context: RenderContext\n) {\n  const { collection } = component\n  const { fieldset: existingFieldset, label } = viewModel\n\n  const subViewModels = collection.getViewModel(context)\n\n  const fieldErrors: string[] = []\n  subViewModels.forEach(({ model }) => {\n    if (model.errorMessage?.text) {\n      fieldErrors.push(model.errorMessage.text)\n    }\n  })\n\n  const hasFieldErrors = fieldErrors.length > 0\n\n  const items: DateInputItem[] = subViewModels.map(\n    ({ model }): DateInputItem => {\n      let { label, type, value, classes, prefix, suffix, errorMessage } = model\n\n      if (label) {\n        label.toString = () => label.text\n      }\n\n      if (!isFormValue(value)) {\n        value = undefined\n      }\n\n      const baseItem: DateInputItem = {\n        label,\n        id: model.id,\n        name: model.name,\n        type,\n        value,\n        classes: mergeCssClasses(\n          classes,\n          hasFieldErrors ? 'govuk-input--error' : undefined\n        ),\n        prefix,\n        suffix\n      }\n\n      if (!hasFieldErrors && errorMessage) {\n        baseItem.errorMessage = errorMessage\n      }\n\n      return baseItem\n    }\n  )\n\n  const showFieldsetError =\n    hasFieldErrors || Boolean(viewModel.errorMessage?.text)\n\n  viewModel.showFieldsetError = showFieldsetError\n\n  if (hasFieldErrors) {\n    viewModel.errorMessage = {\n      text:\n        fieldErrors.length === 1\n          ? fieldErrors[0]\n          : formatErrorList(fieldErrors, context.translator)\n    }\n  }\n\n  const fieldset = existingFieldset ?? {\n    legend: {\n      text: label.text,\n      classes: 'govuk-fieldset__legend--m'\n    }\n  }\n\n  const result = {\n    ...viewModel,\n    fieldset,\n    items,\n    mapLayers: getMapLayers(component)\n  }\n\n  if (component.options.instructionText) {\n    return {\n      ...result,\n      instructionText: component.options.instructionText\n    }\n  }\n\n  return result\n}\n\n/**\n * Validator factory for location-based fields.\n * This creates a validator that ensures all required fields are present.\n */\nexport function createLocationFieldValidator(\n  component: LocationField\n): CustomValidator {\n  return (payload: FormPayload, helpers) => {\n    const { collection, name, options } = component\n\n    const values = component.getFormValueFromState(\n      component.getStateFromValidForm(payload)\n    )\n\n    const context: Context = {\n      missing: collection.keys,\n      key: name\n    }\n\n    if (!component.isState(values)) {\n      return options.required !== false\n        ? helpers.error('object.required', context)\n        : payload\n    }\n\n    return payload\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/.server/server/plugins/engine/components/Markdown.d.ts

@@ -52,6 +52,7 @@ export declare class Markdown extends ComponentBase {
         upload?: {
             count: number;
             summaryList: import("../types.js").SummaryList;
+            uploadingLabel?: string;
         };
     };
 }

package/.server/server/plugins/engine/components/Markdown.js

@@ -22,7 +22,7 @@ export class Markdown extends ComponentBase {
     } = context.translator;
     return {
       ...viewModel,
-      content: tComponent(this, 'content') || content,
+      content: tComponent(this.def, 'content') || content,
       headerStartLevel: this.headerStartLevel
     };
   }

package/.server/server/plugins/engine/components/Markdown.js.map

@@ -1 +1 @@
-{"version":3,"file":"Markdown.js","names":["ComponentBase","Markdown","content","headerStartLevel","constructor","def","props","options","getViewModel","context","viewModel","tComponent","translator"],"sources":["../../../../../src/server/plugins/engine/components/Markdown.ts"],"sourcesContent":["import { type ComponentDef, type MarkdownComponent } from '@defra/forms-model'\n\nimport { ComponentBase } from '~/src/server/plugins/engine/components/ComponentBase.js'\nimport { type RenderContext } from '~/src/server/plugins/engine/components/types.js'\n\nexport class Markdown extends ComponentBase {\n  declare options: MarkdownComponent['options']\n  content: MarkdownComponent['content']\n  headerStartLevel: number\n\n  constructor(\n    def: MarkdownComponent,\n    props: ConstructorParameters<typeof ComponentBase>[1]\n  ) {\n    super(def, props)\n\n    const { content, options } = def\n\n    this.content = content\n    this.options = options\n    this.headerStartLevel = 2\n  }\n\n  getViewModel(context: RenderContext) {\n    const { content, viewModel } = this\n\n    const { tComponent } = context.translator\n\n    return {\n      ...viewModel,\n      content:\n        tComponent(this as unknown as ComponentDef, 'content') || content,\n      headerStartLevel: this.headerStartLevel\n    }\n  }\n}\n"],"mappings":"AAEA,SAASA,aAAa;AAGtB,OAAO,MAAMC,QAAQ,SAASD,aAAa,CAAC;EAE1CE,OAAO;EACPC,gBAAgB;EAEhBC,WAAWA,CACTC,GAAsB,EACtBC,KAAqD,EACrD;IACA,KAAK,CAACD,GAAG,EAAEC,KAAK,CAAC;IAEjB,MAAM;MAAEJ,OAAO;MAAEK;IAAQ,CAAC,GAAGF,GAAG;IAEhC,IAAI,CAACH,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACK,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACJ,gBAAgB,GAAG,CAAC;EAC3B;EAEAK,YAAYA,CAACC,OAAsB,EAAE;IACnC,MAAM;MAAEP,OAAO;MAAEQ;IAAU,CAAC,GAAG,IAAI;IAEnC,MAAM;MAAEC;IAAW,CAAC,GAAGF,OAAO,CAACG,UAAU;IAEzC,OAAO;MACL,GAAGF,SAAS;MACZR,OAAO,EACLS,UAAU,CAAC,IAAI,EAA6B,SAAS,CAAC,IAAIT,OAAO;MACnEC,gBAAgB,EAAE,IAAI,CAACA;IACzB,CAAC;EACH;AACF","ignoreList":[]}
+{"version":3,"file":"Markdown.js","names":["ComponentBase","Markdown","content","headerStartLevel","constructor","def","props","options","getViewModel","context","viewModel","tComponent","translator"],"sources":["../../../../../src/server/plugins/engine/components/Markdown.ts"],"sourcesContent":["import { type MarkdownComponent } from '@defra/forms-model'\n\nimport { ComponentBase } from '~/src/server/plugins/engine/components/ComponentBase.js'\nimport { type RenderContext } from '~/src/server/plugins/engine/components/types.js'\n\nexport class Markdown extends ComponentBase {\n  declare options: MarkdownComponent['options']\n  content: MarkdownComponent['content']\n  headerStartLevel: number\n\n  constructor(\n    def: MarkdownComponent,\n    props: ConstructorParameters<typeof ComponentBase>[1]\n  ) {\n    super(def, props)\n\n    const { content, options } = def\n\n    this.content = content\n    this.options = options\n    this.headerStartLevel = 2\n  }\n\n  getViewModel(context: RenderContext) {\n    const { content, viewModel } = this\n\n    const { tComponent } = context.translator\n\n    return {\n      ...viewModel,\n      content: tComponent(this.def, 'content') || content,\n      headerStartLevel: this.headerStartLevel\n    }\n  }\n}\n"],"mappings":"AAEA,SAASA,aAAa;AAGtB,OAAO,MAAMC,QAAQ,SAASD,aAAa,CAAC;EAE1CE,OAAO;EACPC,gBAAgB;EAEhBC,WAAWA,CACTC,GAAsB,EACtBC,KAAqD,EACrD;IACA,KAAK,CAACD,GAAG,EAAEC,KAAK,CAAC;IAEjB,MAAM;MAAEJ,OAAO;MAAEK;IAAQ,CAAC,GAAGF,GAAG;IAEhC,IAAI,CAACH,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACK,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACJ,gBAAgB,GAAG,CAAC;EAC3B;EAEAK,YAAYA,CAACC,OAAsB,EAAE;IACnC,MAAM;MAAEP,OAAO;MAAEQ;IAAU,CAAC,GAAG,IAAI;IAEnC,MAAM;MAAEC;IAAW,CAAC,GAAGF,OAAO,CAACG,UAAU;IAEzC,OAAO;MACL,GAAGF,SAAS;MACZR,OAAO,EAAES,UAAU,CAAC,IAAI,CAACN,GAAG,EAAE,SAAS,CAAC,IAAIH,OAAO;MACnDC,gBAAgB,EAAE,IAAI,CAACA;IACzB,CAAC;EACH;AACF","ignoreList":[]}

package/.server/server/plugins/engine/components/MonthYearField.d.ts

@@ -12,11 +12,13 @@ export declare class MonthYearField extends FormComponent {
     collection: ComponentCollection;
     constructor(def: MonthYearFieldComponent, props: ConstructorParameters<typeof FormComponent>[1]);
     getFormValueFromState(state: FormSubmissionState): MonthYearState | undefined;
-    getDisplayStringFromFormValue(value: MonthYearState | undefined, _translator: Translator): string;
+    getDisplayStringFromFormValue(value: MonthYearState | undefined, translator: Translator): string;
     getDisplayStringFromState(state: FormSubmissionState, translator: Translator): string;
     getContextValueFromFormValue(value: MonthYearState | undefined): string | null;
     getContextValueFromState(state: FormSubmissionState): string | null;
-    getValidationMessagesOverride(translator: Translator): LanguageMessages;
+    getValidationMessagesOverride(translator: Translator): {
+        [x: string]: LanguageMessages;
+    };
     getViewModel(context: RenderContext): {
         fieldset: {
             attributes?: string | Record<string, string>;
@@ -64,6 +66,7 @@ export declare class MonthYearField extends FormComponent {
         upload?: {
             count: number;
             summaryList: import("../../../../server/plugins/engine/types.js").SummaryList;
+            uploadingLabel?: string;
         };
     };
     isState(value?: FormStateValue | FormState): value is MonthYearState;

package/.server/server/plugins/engine/components/MonthYearField.js

@@ -6,7 +6,7 @@ import { NumberField } from "./NumberField.js";
 import { parseStrictDate } from "../date-helper.js";
 import { buildValidationMessages } from "../i18n/buildValidationMessages.js";
 import { messageTemplate } from "../pageControllers/validationOptions.js";
-import { convertToLanguageMessages } from "../../../utils/type-utils.js";
+import { formatDateForLanguage } from "../../payment/helper.js";
 export class MonthYearField extends FormComponent {
   constructor(def, props) {
     super(def, props);
@@ -15,7 +15,7 @@ export class MonthYearField extends FormComponent {
       options
     } = def;
     const isRequired = options.required !== false;
-    const customValidationMessages = convertToLanguageMessages({
+    const customValidationMessages = {
       'any.required': messageTemplate.objectMissing,
       'number.base': messageTemplate.objectMissing,
       'number.precision': messageTemplate.dateFormat,
@@ -23,7 +23,7 @@ export class MonthYearField extends FormComponent {
       'number.unsafe': messageTemplate.dateFormat,
       'number.min': messageTemplate.dateFormat,
       'number.max': messageTemplate.dateFormat
-    });
+    };
     this.collection = new ComponentCollection([{
       type: ComponentType.NumberField,
       name: `${name}__month`,
@@ -69,15 +69,15 @@ export class MonthYearField extends FormComponent {
     const value = super.getFormValueFromState(state);
     return MonthYearField.isMonthYear(value) ? value : undefined;
   }
-  getDisplayStringFromFormValue(value, _translator) {
+  getDisplayStringFromFormValue(value, translator) {
     if (!value) {
       return '';
     }
     const date = new Date();
+    // Force to first day of month in case current date was say 31st and specified month has fewer than 31 days
+    date.setDate(1);
     date.setMonth(value.month - 1);
-    const monthString = date.toLocaleString('default', {
-      month: 'long'
-    });
+    const monthString = formatDateForLanguage(date, 'LLLL', translator.language);
     return `${monthString} ${value.year}`;
   }
   getDisplayStringFromState(state, translator) {
@@ -98,7 +98,7 @@ export class MonthYearField extends FormComponent {
     const {
       t
     } = translator;
-    return convertToLanguageMessages({
+    const messages = {
       'any.required': buildValidationMessages(t).objectMissing,
       'number.base': buildValidationMessages(t).objectMissing,
       'number.precision': buildValidationMessages(t).dateFormat,
@@ -106,7 +106,11 @@ export class MonthYearField extends FormComponent {
       'number.unsafe': buildValidationMessages(t).dateFormat,
       'number.min': buildValidationMessages(t).dateFormat,
       'number.max': buildValidationMessages(t).dateFormat
-    });
+    };
+    return {
+      [`${this.name}__month`]: messages,
+      [`${this.name}__year`]: messages
+    };
   }
   getViewModel(context) {
     const {