From 00332843253205b52d5516504c509a22923b8ce2 Mon Sep 17 00:00:00 2001 From: baarkerlounger Date: Thu, 4 Nov 2021 19:59:49 +0000 Subject: [PATCH] Revert that --- .../soft_validations_controller.js | 53 +++++++++---------- .../_validation_override_question.html.erb | 2 +- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/app/javascript/controllers/soft_validations_controller.js b/app/javascript/controllers/soft_validations_controller.js index d8a3e48e2..f25331411 100644 --- a/app/javascript/controllers/soft_validations_controller.js +++ b/app/javascript/controllers/soft_validations_controller.js @@ -1,35 +1,30 @@ import { Controller } from "@hotwired/stimulus" export default class extends Controller { - static values = { run: Number } - initialize() { - if(this.runValue == 0){ - let url = window.location.href + "/soft_validations" - let xhr = new XMLHttpRequest() - let div = document.getElementById("soft-validations") - xhr.open("GET", url, true) - xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded") - xhr.onreadystatechange = function () { - if (this.readyState == 4 && this.status == 200) { - let response = JSON.parse(this.response) - if(response["show"]){ - div.style.display = "block" - let innerHTML = div.innerHTML - innerHTML = innerHTML.replace("soft-validations-placeholder-message", response["label"]) - innerHTML = innerHTML.replace("soft-validations-placeholder-hint-text", response["hint"]) - div.innerHTML = innerHTML - } else { - div.style.display = "none" - let buttons = document.getElementsByName(`case_log[override_net_income_validation][]`) - Object.entries(buttons).forEach(([idx, button]) => { - button.checked = false; - }) - } - } - } - xhr.send() - this.runValue++ - } + let url = window.location.href + "/soft_validations" + let xhr = new XMLHttpRequest() + let div = document.getElementById("soft-validations") + xhr.open("GET", url, true) + xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded") + xhr.onreadystatechange = function () { + if (this.readyState == 4 && this.status == 200) { + let response = JSON.parse(this.response) + if(response["show"]){ + div.style.display = "block" + let innerHTML = div.innerHTML + innerHTML = innerHTML.replace("soft-validations-placeholder-message", response["label"]) + innerHTML = innerHTML.replace("soft-validations-placeholder-hint-text", response["hint"]) + div.innerHTML = innerHTML + } else { + div.style.display = "none" + let buttons = document.getElementsByName(`case_log[override_net_income_validation][]`) + Object.entries(buttons).forEach(([idx, button]) => { + button.checked = false; + }) + } + } + } + xhr.send() } } diff --git a/app/views/form/_validation_override_question.html.erb b/app/views/form/_validation_override_question.html.erb index 4f9af5d78..5459844e0 100644 --- a/app/views/form/_validation_override_question.html.erb +++ b/app/views/form/_validation_override_question.html.erb @@ -2,7 +2,7 @@ <%= f.govuk_check_boxes_fieldset page_info["soft_validations"]&.keys&.first, legend: { text: "soft-validations-placeholder-message", size: "l" }, hint: { text: "soft-validations-placeholder-hint-text" }, - form_group: { "data-controller": "soft-validations", "data-run": "0" } do %> + form_group: { "data-controller": "soft-validations" } do %> <%= f.govuk_check_box page_info["soft_validations"]&.keys&.first, page_info["soft_validations"]&.keys&.first, label: { text: "Yes" }