@planning-inspectorate/dynamic-forms 1.9.0 → 1.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planning-inspectorate/dynamic-forms",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "This package is for building GDS forms using a configuration-based approach.",
   "main": "./src/index.js",
   "type": "module",

package/src/components/radio/index.njk

@@ -86,6 +86,21 @@
                     type: "submit",
                     attributes: { "data-cy":"button-save-and-continue"}
                 }) }}
+                {% if extraActionButtons|length %}
+                    {% for extraActionButton in extraActionButtons %}
+                        {{ govukButton({
+                            text: extraActionButton.text,
+                            type: extraActionButton.type,
+                            href: extraActionButton.href,
+                            attributes: {
+                                "formaction": extraActionButton.formaction or "",
+                                "data-cy": "button-" + extraActionButton.text|lower|replace(" ", "-"),
+                                "name": extraActionButton.text|lower|replace(" ", "-")
+                            },
+                            classes: extraActionButton.classes or "govuk-button--secondary"
+                        }) }}
+                    {% endfor %}
+                {% endif %}
             </form>
         </div>
     </div>

package/src/components/radio/question.js

@@ -17,6 +17,7 @@ export default class RadioQuestion extends OptionsQuestion {
 	 * @param {Array.<import('../../questions/options-question.js').Option>} params.options
 	 * @param {Array.<import('../../questions/question.js').BaseValidator>} [params.validators]
 	 * @param {boolean} [params.editable]
+	 * @param {Object<string, any>} [params.viewData]
 	 * @param {import('../../questions/question-types.js').ActionLink} [params.actionLink]
 	 */
 	constructor({
@@ -34,7 +35,8 @@ export default class RadioQuestion extends OptionsQuestion {
 		options,
 		validators,
 		actionLink,
-		editable
+		editable,
+		viewData
 	}) {
 		super({
 			title,
@@ -48,7 +50,8 @@ export default class RadioQuestion extends OptionsQuestion {
 			options,
 			validators,
 			actionLink,
-			editable
+			editable,
+			viewData
 		});
 
 		this.html = html;

package/src/components/text-entry-redact/index.njk

@@ -161,9 +161,8 @@
            * @param {HTMLDivElement} unredactedText
            * @param {HTMLAnchorElement[]} rejectLinks
            * @param {import('@azure/ai-text-analytics').PiiEntity[]} suggestions
-           * @param {HTMLAnchorElement} toggleOriginal
            */
-          function registerEventListeners({textArea, redactSelectedText, redactUndo, redactUndoAll, unredactedText, rejectLinks, suggestions, toggleOriginal}) {
+          function registerEventListeners({textArea, redactSelectedText, redactUndo, redactUndoAll, unredactedText, rejectLinks, suggestions}) {
             const formGroup = textArea.parentElement;
             const errorMessage = document.createElement('p');
             errorMessage.id = '{{ question.fieldName }}-error';
@@ -231,16 +230,6 @@
                 }
               });
             }
-            toggleOriginal.addEventListener('click', (event) => {
-              event.preventDefault();
-              if (unredactedText.classList.contains('govuk-!-display-none')) {
-                unredactedText.classList.remove('govuk-!-display-none');
-                toggleOriginal.text = 'Hide';
-              } else {
-                unredactedText.classList.add('govuk-!-display-none');
-                toggleOriginal.text = 'Show';
-              }
-            });
           }
 
           function initRedact() {
@@ -248,8 +237,7 @@
             const redactSelectedText = document.querySelector('#redact-selected-text');
             const redactUndo = document.querySelector('#redact-undo');
             const redactUndoAll = document.querySelector('#redact-undo-all');
-            const unredactedText = document.querySelector('#{{ question.fieldName }}-unredacted');
-            const toggleOriginal = document.querySelector('#toggle-original');
+            const unredactedText = document.querySelector('#{{ question.fieldName }}-unredacted > div');
             const rejectLinks = document.querySelectorAll('[data-redact]');
               {% if not redactionSuggestions %}
               {% set redactionSuggestions = [] %}
@@ -271,11 +259,8 @@
             if (!unredactedText || !(unredactedText instanceof HTMLDivElement)) {
               return;
             }
-            if (!toggleOriginal || !(toggleOriginal instanceof HTMLAnchorElement)) {
-              return;
-            }
 
-            registerEventListeners({textArea, redactSelectedText, redactUndo, redactUndoAll, unredactedText, rejectLinks, suggestions, toggleOriginal});
+            registerEventListeners({textArea, redactSelectedText, redactUndo, redactUndoAll, unredactedText, rejectLinks, suggestions});
           }
 
           initRedact();