@defra/forms-model 3.0.485 → 3.0.487

package/dist/types/form/form-editor/preview/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/form/form-editor/preview/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/form/form-editor/preview/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/forms-model",
-  "version": "3.0.485",
+  "version": "3.0.487",
   "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/schemas/form-definition-v2-schema.json

@@ -1531,11 +1531,11 @@
           },
           "items": {
             "type": "array",
-            "description": "Array of conditions or condition references\n\nElements can be direct conditions, references to named conditions, or nested condition groups. This structure allows building complex logical expressions with AND/OR operators.",
+            "description": "Array of conditions or condition references",
             "minItems": 1,
             "maxItems": 15,
             "items": {
-              "anyOf": [
+              "oneOf": [
                 {
                   "type": "object",
                   "description": "Condition definition",
@@ -1622,7 +1622,7 @@
                     "value"
                   ],
                   "additionalProperties": false,
-                  "title": "Unknown Condition Item Type"
+                  "title": "Generic List Items"
                 },
                 {
                   "type": "object",
@@ -1653,11 +1653,11 @@
                     "conditionId"
                   ],
                   "additionalProperties": false,
-                  "title": "Unknown Condition Item Type"
+                  "title": "Generic List Items"
                 }
               ],
               "title": "Items Item",
-              "anyOfTitles": [
+              "oneOfTitles": [
                 "Items  Item (object)",
                 "Items  Item (object)"
               ]

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

@@ -368,9 +368,11 @@ export const conditionWrapperSchemaV2 = Joi.object<ConditionWrapperV2>()
       ),
     items: Joi.array<ConditionGroupDataV2>()
       .items(
-        Joi.alternatives()
-          .try(conditionDataSchemaV2, conditionRefDataSchemaV2)
-          .required()
+        Joi.alternatives().conditional('.componentId', {
+          is: Joi.exist(),
+          then: conditionDataSchemaV2,
+          otherwise: conditionRefDataSchemaV2
+        })
       )
       .min(1)
       .max(15)

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

@@ -96,19 +96,28 @@ export class QuestionPreviewElements {
    * @private
    */
   _items = []
-
+  _largeTitle = true
   afterInputsHTML = '<div class="govuk-inset-text">No items added yet.</div>'
 
   /**
    * @param {BaseSettings} baseSettings
    */
-  constructor({ question, hintText, optional, shortDesc, items, content }) {
+  constructor({
+    question,
+    hintText,
+    optional,
+    shortDesc,
+    items,
+    content,
+    largeTitle = true
+  }) {
     this._question = question
     this._hintText = hintText
     this._optional = optional
     this._shortDesc = shortDesc
     this._items = items
     this._content = content
+    this._largeTitle = largeTitle
   }
 
   /**
@@ -121,7 +130,8 @@ export class QuestionPreviewElements {
       optional: this._optional,
       shortDesc: this._shortDesc,
       items: this._items,
-      content: this._content
+      content: this._content,
+      largeTitle: this._largeTitle
     }
   }
 
@@ -176,7 +186,8 @@ export const baseElements = /** @type {BaseSettings} */ ({
   question: 'Which quest would you like to pick?',
   hintText: 'Choose one adventure that best suits you.',
   shortDesc: '',
-  content: ''
+  content: '',
+  largeTitle: true
 })
 
 const list1Id = '414d82a3-4cab-416a-bd54-6b86fbd51120'

package/src/form/form-editor/preview/component-elements.js

@@ -7,11 +7,18 @@ export class ComponentElements {
    * @protected
    */
   _component
+  /**
+   * @type {boolean}
+   * @private
+   */
+  _largeTitle = true
   /**
    * @param {ComponentDef} component
+   * @param {boolean} [largeTitle]
    */
-  constructor(component) {
+  constructor(component, largeTitle = true) {
     this._component = component
+    this._largeTitle = largeTitle
   }
 
   /**
@@ -27,7 +34,8 @@ export class ComponentElements {
       optional: !required,
       shortDesc: '',
       items: [],
-      content: ''
+      content: '',
+      largeTitle: this._largeTitle
     }
   }
 

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

@@ -12,9 +12,10 @@ export class ContentElements extends ComponentElements {
   _component
   /**
    * @param {Exclude<ContentComponentsDef, ListComponent>} component
+   * @param {boolean} largeTitle
    */
-  constructor(component) {
-    super(component)
+  constructor(component, largeTitle = true) {
+    super(component, largeTitle)
     this._component = component
   }
 

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

@@ -95,12 +95,6 @@ export class PreviewPageController {
    * @protected
    */
   _guidanceComponent
-
-  /**
-   * @type {boolean}
-   * @private
-   */
-  _showGuidance = false
   /**
    * @param {ComponentDef[]} components
    * @param {PageOverviewElements} elements
@@ -109,7 +103,11 @@ export class PreviewPageController {
    */
   constructor(components, elements, definition, renderer) {
     const questions = components.map(
-      mapComponentToPreviewQuestion(questionRenderer, definition)
+      mapComponentToPreviewQuestion(
+        questionRenderer,
+        definition,
+        elements.heading.length > 0
+      )
     )
     const firstQuestion = /** @type { Markdown | undefined | Question }  */ (
       questions.shift()
@@ -119,8 +117,9 @@ export class PreviewPageController {
       PreviewPageController.getOrCreateGuidanceComponent(firstQuestion)
     this._guidanceText = elements.guidance
     this._components = this.#constructComponents(firstQuestion, questions)
-    this.#title = elements.heading
+
     this.#pageRenderer = renderer
+    this.#title = elements.heading
   }
 
   /**
@@ -180,14 +179,6 @@ export class PreviewPageController {
     }
   }
 
-  /**
-   * @private
-   * @returns {string}
-   */
-  _fallBackTitle() {
-    return this._components[0]?.question ?? ''
-  }
-
   /**
    * @returns {{ text: string, classes: string }}
    */
@@ -206,7 +197,7 @@ export class PreviewPageController {
    * @returns {string}
    */
   get title() {
-    return this.#title.length ? this.#title : this._fallBackTitle()
+    return this.#title
   }
 
   /**

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

@@ -55,9 +55,14 @@ const InputFieldComponentDictionary = {
 /**
  * @param {QuestionRenderer} questionRenderer
  * @param {FormDefinition} definition
+ * @param {boolean} hasTitle
  * @returns {(component: ComponentDef) => Question}
  */
-export function mapComponentToPreviewQuestion(questionRenderer, definition) {
+export function mapComponentToPreviewQuestion(
+  questionRenderer,
+  definition,
+  hasTitle
+) {
   return /** @type {(component: ComponentDef) => Question} */ (
     (component) => {
       /**
@@ -67,16 +72,16 @@ export function mapComponentToPreviewQuestion(questionRenderer, definition) {
 
       if (hasSelectionFields(component) && hasListField(component)) {
         const list = findDefinitionListFromComponent(component, definition)
-        questionElements = new ListComponentElements(component, list)
+        questionElements = new ListComponentElements(component, list, !hasTitle)
       } else if (
         hasInputField(component) ||
         component.type === ComponentType.YesNoField
       ) {
-        questionElements = new QuestionComponentElements(component)
+        questionElements = new QuestionComponentElements(component, !hasTitle)
       } else if (hasContentField(component)) {
-        questionElements = new ContentElements(component)
+        questionElements = new ContentElements(component, !hasTitle)
       } else {
-        questionElements = new ComponentElements(component)
+        questionElements = new ComponentElements(component, !hasTitle)
       }
 
       const QuestionConstructor = InputFieldComponentDictionary[component.type]

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

@@ -61,9 +61,10 @@ export class ListComponentElements extends QuestionComponentElements {
   /**
    * @param {SelectionComponentsDef} component
    * @param {List} list
+   * @param {boolean} largeTitle
    */
-  constructor(component, list) {
-    super(component)
+  constructor(component, list, largeTitle = true) {
+    super(component, largeTitle)
     this._list = list
   }
 

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

@@ -44,13 +44,18 @@ export class PreviewComponent {
    * @protected
    */
   _highlighted = false
+  /**
+   * @type {boolean}
+   * @protected
+   */
+  _largeTitle = true
 
   /**
    * @param {QuestionElements} htmlElements
    * @param {QuestionRenderer} questionRenderer
    */
   constructor(htmlElements, questionRenderer) {
-    const { question, optional } = htmlElements.values
+    const { question, optional, largeTitle } = htmlElements.values
 
     /**
      * @type {QuestionElements}
@@ -73,6 +78,7 @@ export class PreviewComponent {
      * @protected
      */
     this._questionRenderer = questionRenderer
+    this._largeTitle = largeTitle
   }
 
   /**
@@ -94,9 +100,11 @@ export class PreviewComponent {
    * @type {DefaultComponent}
    */
   get label() {
+    const titleClass = this._largeTitle ? 'govuk-label--l' : 'govuk-label--m'
+
     return {
       text: this.titleText,
-      classes: 'govuk-label--l' + this.getHighlight('question')
+      classes: titleClass + this.getHighlight('question')
     }
   }
 
@@ -105,10 +113,14 @@ export class PreviewComponent {
    * @type {GovukFieldset}
    */
   get fieldSet() {
+    const titleClass = this._largeTitle
+      ? 'govuk-fieldset__legend--l'
+      : 'govuk-fieldset__legend--m'
+
     return {
       legend: {
         text: this.titleText,
-        classes: 'govuk-fieldset__legend--l' + this.getHighlight('question')
+        classes: titleClass + this.getHighlight('question')
       }
     }
   }

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

@@ -14,8 +14,8 @@ export class QuestionComponentElements extends ComponentElements {
   /**
    * @param {FormComponentsDef} component
    */
-  constructor(component) {
-    super(component)
+  constructor(component, largeTitle = true) {
+    super(component, largeTitle)
     this._component = component
   }
 

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

@@ -16,6 +16,7 @@ import { type UkAddressQuestion } from '~/src/form/form-editor/preview/uk-addres
 import { type ListElement } from '~/src/form/form-editor/types.js'
 export { type QuestionBaseModel } from '~/src/form/form-editor/macros/types.js'
 export interface BaseSettings {
+  largeTitle: boolean
   question: string
   hintText: string
   optional: boolean