Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion designer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@babel/plugin-syntax-import-attributes": "^7.25.6",
"@babel/preset-react": "^7.26.3",
"@dagrejs/dagre": "^1.1.5",
"@defra/forms-engine-plugin": "^4.0.28",
"@defra/forms-engine-plugin": "^4.0.37",
"@defra/forms-model": "^3.0.603",
"@defra/hapi-tracing": "^1.28.0",
"@elastic/ecs-pino-format": "^1.5.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ describe('advanced-settings-mappers', () => {
const result = mapBaseQuestionDetails(payload)

expect(/** @type {{ hint?: string }} */ (result).hint).toBe(
'A National Grid field number is made up of 2 letters and 8 numbers, for example, SO04188589'
'A National Grid field number is made up of 2 letters and 8 numbers, for example, NG 1234 5678'
)
})

Expand Down Expand Up @@ -133,7 +133,7 @@ describe('advanced-settings-mappers', () => {
const result = mapBaseQuestionDetails(payload)

expect(/** @type {{ hint?: string }} */ (result).hint).toBe(
'A National Grid field number is made up of 2 letters and 8 numbers, for example, SO04188589'
'A National Grid field number is made up of 2 letters and 8 numbers, for example, NG 1234 5678'
)
})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const locationHintDefaults = {
'An OS grid reference number is made up of 2 letters followed by either 6, 8 or 10 numbers, for example, TQ123456',

NationalGridFieldNumberField:
'A National Grid field number is made up of 2 letters and 8 numbers, for example, SO04188589',
'A National Grid field number is made up of 2 letters and 8 numbers, for example, NG 1234 5678',

LatLongField:
'For Great Britain, the latitude will be a number between 49.850 and 60.859. The longitude will be a number between -13.687 and 1.767'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe('location-hint-defaults', () => {
'An OS grid reference number is made up of 2 letters followed by either 6, 8 or 10 numbers, for example, TQ123456'
)
expect(locationHintDefaults.NationalGridFieldNumberField).toBe(
'A National Grid field number is made up of 2 letters and 8 numbers, for example, SO04188589'
'A National Grid field number is made up of 2 letters and 8 numbers, for example, NG 1234 5678'
)
expect(locationHintDefaults.LatLongField).toBe(
'For Great Britain, the latitude will be a number between 49.850 and 60.859. The longitude will be a number between -13.687 and 1.767'
Expand All @@ -41,7 +41,7 @@ describe('location-hint-defaults', () => {
ComponentType.NationalGridFieldNumberField
)
expect(hint).toBe(
'A National Grid field number is made up of 2 letters and 8 numbers, for example, SO04188589'
'A National Grid field number is made up of 2 letters and 8 numbers, for example, NG 1234 5678'
)
})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const locationInstructionDefaults = {
3. Using the map, locate the land or building. Use the +/- icons to zoom in and out.
4. In the top toolbar, select the fourth icon along ('Where am I?') - it looks like a target.
5. Click on the land or building.
6. A pop-up box will appear showing the land details for this location. The National Grid field number is the third number from the top of the list. It is made up of 2 letters and 8 numbers, for example, SO04188589.`,
6. A pop-up box will appear showing the land details for this location. The National Grid field number is the third number from the top of the list. It is made up of 2 letters and 8 numbers, for example, NG 1234 5678.`,

LatLongField: `Use the [MAGIC map tool](https://magic.defra.gov.uk/) to find the latitude and longitude for your land or buildings. Follow these instructions:

Expand Down
2 changes: 1 addition & 1 deletion model/src/__stubs__/components.ts
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ export function buildNationalGridFieldNumberFieldComponent(
id: '3c4d5e6f-7g8h-9i0j-1k2l-3m4n5o6p7q8r',
name: 'NationalGridFieldNumberField',
title: 'National Grid field number',
hint: 'A National Grid field number is made up of 2 letters and 8 numbers, for example, SO04188589',
hint: 'A National Grid field number is made up of 2 letters and 8 numbers, for example, NG 1234 5678',
options: {},
...partialComponent,
type: ComponentType.NationalGridFieldNumberField
Expand Down
2 changes: 1 addition & 1 deletion model/src/components/component-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export const ComponentTypes: readonly ComponentDef[] = Object.freeze([
name: 'NationalGridFieldNumberField',
title: 'National Grid field number',
type: ComponentType.NationalGridFieldNumberField,
hint: 'A National Grid field number is made up of 2 letters and 8 numbers, for example, SO04188589',
hint: 'A National Grid field number is made up of 2 letters and 8 numbers, for example, NG 1234 5678',
options: {}
},
{
Expand Down
6 changes: 3 additions & 3 deletions model/src/form/form-editor/preview/national-grid.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe('national-grid', () => {
it('should create instance from component', () => {
const component = buildNationalGridFieldNumberFieldComponent({
title: 'Enter National Grid field number',
hint: 'For example, SO04188589',
hint: 'For example, NG 1234 5678',
options: {
instructionText: 'Enter the 10-character field number'
}
Expand All @@ -26,7 +26,7 @@ describe('national-grid', () => {
const values = /** @type {LocationSettings} */ (elements.values)

expect(values.question).toBe('Enter National Grid field number')
expect(values.hintText).toBe('For example, SO04188589')
expect(values.hintText).toBe('For example, NG 1234 5678')
expect(values.instructionText).toBe('Enter the 10-character field number')
})
})
Expand All @@ -52,7 +52,7 @@ describe('national-grid', () => {
const elements = new LocationPreviewElements({
...baseElements,
question: 'Enter field number',
hintText: 'Example: SO04188589',
hintText: 'Example: NG 1234 5678',
instructionText: 'Use National Grid format',
userClasses: 'custom-class'
})
Expand Down
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading