@defra/forms-model 3.0.615 → 3.0.616

package/dist/module/form/form-audit/consolidation.js

@@ -6,7 +6,7 @@ import { AuditEventMessageType } from "./enums.js";
  */
 
 /**
- * Support contact field configuration for change detection.
+ * Audit field that comprises multiple fields - configuration for change detection.
  */
 
 /**
@@ -24,11 +24,11 @@ function createFieldConfig(label, verb, fieldName) {
 /**
  * Creates a support contact field configuration.
  */
-function createSupportContactField(label, contactPath) {
+function createMultiField(label, contactPath) {
   return {
     label,
-    prevPath: `changes.previous.contact.${contactPath}`,
-    newPath: `changes.new.contact.${contactPath}`
+    prevPath: `changes.previous.${contactPath}`,
+    newPath: `changes.new.${contactPath}`
   };
 }
 
@@ -42,7 +42,6 @@ export const fieldConfigs = {
   [AuditEventMessageType.FORM_TEAM_NAME_UPDATED]: createFieldConfig('the team name', 'Changed', 'teamName'),
   [AuditEventMessageType.FORM_TEAM_EMAIL_UPDATED]: createFieldConfig('the shared team address', 'Updated', 'teamEmail'),
   [AuditEventMessageType.FORM_NOTIFICATION_EMAIL_UPDATED]: createFieldConfig('where submitted forms are sent', 'Updated', 'notificationEmail'),
-  [AuditEventMessageType.FORM_PRIVACY_NOTICE_UPDATED]: createFieldConfig('the privacy notice link', 'Updated', 'privacyNoticeUrl'),
   [AuditEventMessageType.FORM_SUBMISSION_GUIDANCE_UPDATED]: createFieldConfig('the next steps guidance', 'Updated', 'submissionGuidance'),
   [AuditEventMessageType.FORM_SUPPORT_PHONE_UPDATED]: createFieldConfig('the support phone number', 'Updated', 'phone'),
   [AuditEventMessageType.FORM_SUPPORT_EMAIL_UPDATED]: createFieldConfig('the support email address', 'Updated', 'address'),
@@ -53,7 +52,13 @@ export const fieldConfigs = {
  * Support contact field configurations for change detection.
  * Used when checking FORM_SUPPORT_CONTACT_UPDATED events.
  */
-export const supportContactFields = [createSupportContactField('phone number', 'phone'), createSupportContactField('email address', 'email.address'), createSupportContactField('email response time', 'email.responseTime'), createSupportContactField('online contact link', 'online.url'), createSupportContactField('online contact text', 'online.text')];
+export const supportContactFields = [createMultiField('phone number', 'contact.phone'), createMultiField('email address', 'contact.email.address'), createMultiField('email response time', 'contact.email.responseTime'), createMultiField('online contact link', 'contact.online.url'), createMultiField('online contact text', 'contact.online.text')];
+
+/**
+ * Privacy notice field configurations for change detection.
+ * Used when checking FORM_PRIVACY_NOTICE_UPDATED events.
+ */
+export const privacyNoticeFields = [createMultiField('privacy notice type', 'privacyNoticeType'), createMultiField('privacy notice text', 'privacyNoticeText'), createMultiField('privacy notice url', 'privacyNoticeUrl')];
 
 /**
  * Event types that are always considered valid (don't need change comparison).

package/dist/module/form/form-audit/consolidation.js.map

@@ -1 +1 @@
-{"version":3,"file":"consolidation.js","names":["AuditEventMessageType","createFieldConfig","label","verb","fieldName","prevPath","newPath","createSupportContactField","contactPath","fieldConfigs","FORM_TITLE_UPDATED","FORM_ORGANISATION_UPDATED","FORM_TEAM_NAME_UPDATED","FORM_TEAM_EMAIL_UPDATED","FORM_NOTIFICATION_EMAIL_UPDATED","FORM_PRIVACY_NOTICE_UPDATED","FORM_SUBMISSION_GUIDANCE_UPDATED","FORM_SUPPORT_PHONE_UPDATED","FORM_SUPPORT_EMAIL_UPDATED","FORM_SUPPORT_ONLINE_UPDATED","supportContactFields","alwaysValidEvents","Set","FORM_CREATED","FORM_UPDATED","FORM_LIVE_CREATED_FROM_DRAFT","FORM_DRAFT_CREATED_FROM_LIVE","FORM_DRAFT_DELETED","FORM_MIGRATED","FORM_JSON_UPLOADED","FORM_JSON_DOWNLOADED","FORM_SUBMISSION_EXCEL_REQUESTED","FORM_CSAT_EXCEL_REQUESTED","isConsolidatedRecord","record","consolidatedCount"],"sources":["../../../../src/form/form-audit/consolidation.ts"],"sourcesContent":["import { AuditEventMessageType } from '~/src/form/form-audit/enums.js'\nimport {\n  type AuditRecord,\n  type ConsolidatedAuditRecord\n} from '~/src/form/form-audit/types.js'\n\n/**\n * Field configuration for audit events with change tracking.\n * Used by change detection logic to compare previous and new values.\n */\nexport interface FieldConfig {\n  label: string\n  verb: 'Updated' | 'Changed'\n  prevPath: string\n  newPath: string\n}\n\n/**\n * Support contact field configuration for change detection.\n */\nexport interface SupportContactFieldConfig {\n  label: string\n  prevPath: string\n  newPath: string\n}\n\n/**\n * Creates a field configuration for audit events.\n */\nfunction createFieldConfig(\n  label: string,\n  verb: 'Updated' | 'Changed',\n  fieldName: string\n): FieldConfig {\n  return {\n    label,\n    verb,\n    prevPath: `changes.previous.${fieldName}`,\n    newPath: `changes.new.${fieldName}`\n  }\n}\n\n/**\n * Creates a support contact field configuration.\n */\nfunction createSupportContactField(\n  label: string,\n  contactPath: string\n): SupportContactFieldConfig {\n  return {\n    label,\n    prevPath: `changes.previous.contact.${contactPath}`,\n    newPath: `changes.new.contact.${contactPath}`\n  }\n}\n\n/**\n * Field configurations for audit events with change tracking.\n * Maps event types to their data paths and display labels.\n */\nexport const fieldConfigs: Record<string, FieldConfig> = {\n  [AuditEventMessageType.FORM_TITLE_UPDATED]: createFieldConfig(\n    'the form name',\n    'Updated',\n    'title'\n  ),\n  [AuditEventMessageType.FORM_ORGANISATION_UPDATED]: createFieldConfig(\n    'the lead organisation',\n    'Changed',\n    'organisation'\n  ),\n  [AuditEventMessageType.FORM_TEAM_NAME_UPDATED]: createFieldConfig(\n    'the team name',\n    'Changed',\n    'teamName'\n  ),\n  [AuditEventMessageType.FORM_TEAM_EMAIL_UPDATED]: createFieldConfig(\n    'the shared team address',\n    'Updated',\n    'teamEmail'\n  ),\n  [AuditEventMessageType.FORM_NOTIFICATION_EMAIL_UPDATED]: createFieldConfig(\n    'where submitted forms are sent',\n    'Updated',\n    'notificationEmail'\n  ),\n  [AuditEventMessageType.FORM_PRIVACY_NOTICE_UPDATED]: createFieldConfig(\n    'the privacy notice link',\n    'Updated',\n    'privacyNoticeUrl'\n  ),\n  [AuditEventMessageType.FORM_SUBMISSION_GUIDANCE_UPDATED]: createFieldConfig(\n    'the next steps guidance',\n    'Updated',\n    'submissionGuidance'\n  ),\n  [AuditEventMessageType.FORM_SUPPORT_PHONE_UPDATED]: createFieldConfig(\n    'the support phone number',\n    'Updated',\n    'phone'\n  ),\n  [AuditEventMessageType.FORM_SUPPORT_EMAIL_UPDATED]: createFieldConfig(\n    'the support email address',\n    'Updated',\n    'address'\n  ),\n  [AuditEventMessageType.FORM_SUPPORT_ONLINE_UPDATED]: createFieldConfig(\n    'the support contact link',\n    'Updated',\n    'url'\n  )\n}\n\n/**\n * Support contact field configurations for change detection.\n * Used when checking FORM_SUPPORT_CONTACT_UPDATED events.\n */\nexport const supportContactFields: SupportContactFieldConfig[] = [\n  createSupportContactField('phone number', 'phone'),\n  createSupportContactField('email address', 'email.address'),\n  createSupportContactField('email response time', 'email.responseTime'),\n  createSupportContactField('online contact link', 'online.url'),\n  createSupportContactField('online contact text', 'online.text')\n]\n\n/**\n * Event types that are always considered valid (don't need change comparison).\n * These events represent actions rather than field updates.\n */\nexport const alwaysValidEvents = new Set<string>([\n  AuditEventMessageType.FORM_CREATED,\n  AuditEventMessageType.FORM_UPDATED,\n  AuditEventMessageType.FORM_LIVE_CREATED_FROM_DRAFT,\n  AuditEventMessageType.FORM_DRAFT_CREATED_FROM_LIVE,\n  AuditEventMessageType.FORM_DRAFT_DELETED,\n  AuditEventMessageType.FORM_MIGRATED,\n  AuditEventMessageType.FORM_JSON_UPLOADED,\n  AuditEventMessageType.FORM_JSON_DOWNLOADED,\n  AuditEventMessageType.FORM_SUBMISSION_EXCEL_REQUESTED,\n  AuditEventMessageType.FORM_CSAT_EXCEL_REQUESTED\n])\n\n/**\n * Type guard to check if an audit record is consolidated.\n * @param record - The audit record to check\n * @returns True if the record has consolidation metadata with count > 1\n */\nexport function isConsolidatedRecord(\n  record: AuditRecord | ConsolidatedAuditRecord\n): record is ConsolidatedAuditRecord {\n  return (\n    'consolidatedCount' in record &&\n    typeof record.consolidatedCount === 'number' &&\n    record.consolidatedCount > 1\n  )\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"consolidation.js","names":["AuditEventMessageType","createFieldConfig","label","verb","fieldName","prevPath","newPath","createMultiField","contactPath","fieldConfigs","FORM_TITLE_UPDATED","FORM_ORGANISATION_UPDATED","FORM_TEAM_NAME_UPDATED","FORM_TEAM_EMAIL_UPDATED","FORM_NOTIFICATION_EMAIL_UPDATED","FORM_SUBMISSION_GUIDANCE_UPDATED","FORM_SUPPORT_PHONE_UPDATED","FORM_SUPPORT_EMAIL_UPDATED","FORM_SUPPORT_ONLINE_UPDATED","supportContactFields","privacyNoticeFields","alwaysValidEvents","Set","FORM_CREATED","FORM_UPDATED","FORM_LIVE_CREATED_FROM_DRAFT","FORM_DRAFT_CREATED_FROM_LIVE","FORM_DRAFT_DELETED","FORM_MIGRATED","FORM_JSON_UPLOADED","FORM_JSON_DOWNLOADED","FORM_SUBMISSION_EXCEL_REQUESTED","FORM_CSAT_EXCEL_REQUESTED","isConsolidatedRecord","record","consolidatedCount"],"sources":["../../../../src/form/form-audit/consolidation.ts"],"sourcesContent":["import { AuditEventMessageType } from '~/src/form/form-audit/enums.js'\nimport {\n  type AuditRecord,\n  type ConsolidatedAuditRecord\n} from '~/src/form/form-audit/types.js'\n\n/**\n * Field configuration for audit events with change tracking.\n * Used by change detection logic to compare previous and new values.\n */\nexport interface FieldConfig {\n  label: string\n  verb: 'Updated' | 'Changed'\n  prevPath: string\n  newPath: string\n}\n\n/**\n * Audit field that comprises multiple fields - configuration for change detection.\n */\nexport interface MultiAuditFieldConfig {\n  label: string\n  prevPath: string\n  newPath: string\n}\n\n/**\n * Creates a field configuration for audit events.\n */\nfunction createFieldConfig(\n  label: string,\n  verb: 'Updated' | 'Changed',\n  fieldName: string\n): FieldConfig {\n  return {\n    label,\n    verb,\n    prevPath: `changes.previous.${fieldName}`,\n    newPath: `changes.new.${fieldName}`\n  }\n}\n\n/**\n * Creates a support contact field configuration.\n */\nfunction createMultiField(\n  label: string,\n  contactPath: string\n): MultiAuditFieldConfig {\n  return {\n    label,\n    prevPath: `changes.previous.${contactPath}`,\n    newPath: `changes.new.${contactPath}`\n  }\n}\n\n/**\n * Field configurations for audit events with change tracking.\n * Maps event types to their data paths and display labels.\n */\nexport const fieldConfigs: Record<string, FieldConfig> = {\n  [AuditEventMessageType.FORM_TITLE_UPDATED]: createFieldConfig(\n    'the form name',\n    'Updated',\n    'title'\n  ),\n  [AuditEventMessageType.FORM_ORGANISATION_UPDATED]: createFieldConfig(\n    'the lead organisation',\n    'Changed',\n    'organisation'\n  ),\n  [AuditEventMessageType.FORM_TEAM_NAME_UPDATED]: createFieldConfig(\n    'the team name',\n    'Changed',\n    'teamName'\n  ),\n  [AuditEventMessageType.FORM_TEAM_EMAIL_UPDATED]: createFieldConfig(\n    'the shared team address',\n    'Updated',\n    'teamEmail'\n  ),\n  [AuditEventMessageType.FORM_NOTIFICATION_EMAIL_UPDATED]: createFieldConfig(\n    'where submitted forms are sent',\n    'Updated',\n    'notificationEmail'\n  ),\n  [AuditEventMessageType.FORM_SUBMISSION_GUIDANCE_UPDATED]: createFieldConfig(\n    'the next steps guidance',\n    'Updated',\n    'submissionGuidance'\n  ),\n  [AuditEventMessageType.FORM_SUPPORT_PHONE_UPDATED]: createFieldConfig(\n    'the support phone number',\n    'Updated',\n    'phone'\n  ),\n  [AuditEventMessageType.FORM_SUPPORT_EMAIL_UPDATED]: createFieldConfig(\n    'the support email address',\n    'Updated',\n    'address'\n  ),\n  [AuditEventMessageType.FORM_SUPPORT_ONLINE_UPDATED]: createFieldConfig(\n    'the support contact link',\n    'Updated',\n    'url'\n  )\n}\n\n/**\n * Support contact field configurations for change detection.\n * Used when checking FORM_SUPPORT_CONTACT_UPDATED events.\n */\nexport const supportContactFields: MultiAuditFieldConfig[] = [\n  createMultiField('phone number', 'contact.phone'),\n  createMultiField('email address', 'contact.email.address'),\n  createMultiField('email response time', 'contact.email.responseTime'),\n  createMultiField('online contact link', 'contact.online.url'),\n  createMultiField('online contact text', 'contact.online.text')\n]\n\n/**\n * Privacy notice field configurations for change detection.\n * Used when checking FORM_PRIVACY_NOTICE_UPDATED events.\n */\nexport const privacyNoticeFields: MultiAuditFieldConfig[] = [\n  createMultiField('privacy notice type', 'privacyNoticeType'),\n  createMultiField('privacy notice text', 'privacyNoticeText'),\n  createMultiField('privacy notice url', 'privacyNoticeUrl')\n]\n\n/**\n * Event types that are always considered valid (don't need change comparison).\n * These events represent actions rather than field updates.\n */\nexport const alwaysValidEvents = new Set<string>([\n  AuditEventMessageType.FORM_CREATED,\n  AuditEventMessageType.FORM_UPDATED,\n  AuditEventMessageType.FORM_LIVE_CREATED_FROM_DRAFT,\n  AuditEventMessageType.FORM_DRAFT_CREATED_FROM_LIVE,\n  AuditEventMessageType.FORM_DRAFT_DELETED,\n  AuditEventMessageType.FORM_MIGRATED,\n  AuditEventMessageType.FORM_JSON_UPLOADED,\n  AuditEventMessageType.FORM_JSON_DOWNLOADED,\n  AuditEventMessageType.FORM_SUBMISSION_EXCEL_REQUESTED,\n  AuditEventMessageType.FORM_CSAT_EXCEL_REQUESTED\n])\n\n/**\n * Type guard to check if an audit record is consolidated.\n * @param record - The audit record to check\n * @returns True if the record has consolidation metadata with count > 1\n */\nexport function isConsolidatedRecord(\n  record: AuditRecord | ConsolidatedAuditRecord\n): record is ConsolidatedAuditRecord {\n  return (\n    'consolidatedCount' in record &&\n    typeof record.consolidatedCount === 'number' &&\n    record.consolidatedCount > 1\n  )\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/types/form/form-audit/consolidation.d.ts

@@ -10,9 +10,9 @@ export interface FieldConfig {
     newPath: string;
 }
 /**
- * Support contact field configuration for change detection.
+ * Audit field that comprises multiple fields - configuration for change detection.
  */
-export interface SupportContactFieldConfig {
+export interface MultiAuditFieldConfig {
     label: string;
     prevPath: string;
     newPath: string;
@@ -26,7 +26,12 @@ export declare const fieldConfigs: Record<string, FieldConfig>;
  * Support contact field configurations for change detection.
  * Used when checking FORM_SUPPORT_CONTACT_UPDATED events.
  */
-export declare const supportContactFields: SupportContactFieldConfig[];
+export declare const supportContactFields: MultiAuditFieldConfig[];
+/**
+ * Privacy notice field configurations for change detection.
+ * Used when checking FORM_PRIVACY_NOTICE_UPDATED events.
+ */
+export declare const privacyNoticeFields: MultiAuditFieldConfig[];
 /**
  * Event types that are always considered valid (don't need change comparison).
  * These events represent actions rather than field updates.

package/dist/types/form/form-audit/consolidation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"consolidation.d.ts","sourceRoot":"","sources":["../../../../src/form/form-audit/consolidation.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,uBAAuB,EAC7B,MAAM,gCAAgC,CAAA;AAEvC;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,SAAS,GAAG,SAAS,CAAA;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;CAChB;AAgCD;;;GAGG;AACH,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAmDpD,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,oBAAoB,EAAE,yBAAyB,EAM3D,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,aAW5B,CAAA;AAEF;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,WAAW,GAAG,uBAAuB,GAC5C,MAAM,IAAI,uBAAuB,CAMnC"}
+{"version":3,"file":"consolidation.d.ts","sourceRoot":"","sources":["../../../../src/form/form-audit/consolidation.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,uBAAuB,EAC7B,MAAM,gCAAgC,CAAA;AAEvC;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,SAAS,GAAG,SAAS,CAAA;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;CAChB;AAgCD;;;GAGG;AACH,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CA8CpD,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,oBAAoB,EAAE,qBAAqB,EAMvD,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,EAAE,qBAAqB,EAItD,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,aAW5B,CAAA;AAEF;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,WAAW,GAAG,uBAAuB,GAC5C,MAAM,IAAI,uBAAuB,CAMnC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/forms-model",
-  "version": "3.0.615",
+  "version": "3.0.616",
   "description": "A hapi plugin providing the model for Defra forms",
   "homepage": "https://github.com/DEFRA/forms-designer/tree/main/model#readme",
   "types": "dist/types/index.d.ts",

package/src/form/form-audit/consolidation.ts

@@ -16,9 +16,9 @@ export interface FieldConfig {
 }
 
 /**
- * Support contact field configuration for change detection.
+ * Audit field that comprises multiple fields - configuration for change detection.
  */
-export interface SupportContactFieldConfig {
+export interface MultiAuditFieldConfig {
   label: string
   prevPath: string
   newPath: string
@@ -43,14 +43,14 @@ function createFieldConfig(
 /**
  * Creates a support contact field configuration.
  */
-function createSupportContactField(
+function createMultiField(
   label: string,
   contactPath: string
-): SupportContactFieldConfig {
+): MultiAuditFieldConfig {
   return {
     label,
-    prevPath: `changes.previous.contact.${contactPath}`,
-    newPath: `changes.new.contact.${contactPath}`
+    prevPath: `changes.previous.${contactPath}`,
+    newPath: `changes.new.${contactPath}`
   }
 }
 
@@ -84,11 +84,6 @@ export const fieldConfigs: Record<string, FieldConfig> = {
     'Updated',
     'notificationEmail'
   ),
-  [AuditEventMessageType.FORM_PRIVACY_NOTICE_UPDATED]: createFieldConfig(
-    'the privacy notice link',
-    'Updated',
-    'privacyNoticeUrl'
-  ),
   [AuditEventMessageType.FORM_SUBMISSION_GUIDANCE_UPDATED]: createFieldConfig(
     'the next steps guidance',
     'Updated',
@@ -115,12 +110,22 @@ export const fieldConfigs: Record<string, FieldConfig> = {
  * Support contact field configurations for change detection.
  * Used when checking FORM_SUPPORT_CONTACT_UPDATED events.
  */
-export const supportContactFields: SupportContactFieldConfig[] = [
-  createSupportContactField('phone number', 'phone'),
-  createSupportContactField('email address', 'email.address'),
-  createSupportContactField('email response time', 'email.responseTime'),
-  createSupportContactField('online contact link', 'online.url'),
-  createSupportContactField('online contact text', 'online.text')
+export const supportContactFields: MultiAuditFieldConfig[] = [
+  createMultiField('phone number', 'contact.phone'),
+  createMultiField('email address', 'contact.email.address'),
+  createMultiField('email response time', 'contact.email.responseTime'),
+  createMultiField('online contact link', 'contact.online.url'),
+  createMultiField('online contact text', 'contact.online.text')
+]
+
+/**
+ * Privacy notice field configurations for change detection.
+ * Used when checking FORM_PRIVACY_NOTICE_UPDATED events.
+ */
+export const privacyNoticeFields: MultiAuditFieldConfig[] = [
+  createMultiField('privacy notice type', 'privacyNoticeType'),
+  createMultiField('privacy notice text', 'privacyNoticeText'),
+  createMultiField('privacy notice url', 'privacyNoticeUrl')
 ]
 
 /**