From 1cd69aa12f9611396d199713ba00cc961d017cb4 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 24 Jun 2024 10:20:49 -0600 Subject: [PATCH 1/4] Move field --- src/registrar/assets/js/get-gov-admin.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js index 524cfe594..27ac25206 100644 --- a/src/registrar/assets/js/get-gov-admin.js +++ b/src/registrar/assets/js/get-gov-admin.js @@ -405,12 +405,16 @@ function initializeWidgetOnList(list, parentId) { document.addEventListener('DOMContentLoaded', function() { let statusSelect = document.getElementById('id_status'); - function moveStatusChangelog(actionNeededReasonFormGroup, statusSelect) { - let flexContainer = actionNeededReasonFormGroup.querySelector('.flex-container'); + function moveStatusChangelog(actionNeededReasonFormGroup, rejectionReasonFormGroup, statusSelect) { + let flexContainerActionNeeded = actionNeededReasonFormGroup.querySelector('.flex-container'); + let flexContainerRejected = rejectionReasonFormGroup.querySelector('.flex-container'); let statusChangelog = document.getElementById('dja-status-changelog'); if (statusSelect.value === "action needed") { - flexContainer.parentNode.insertBefore(statusChangelog, flexContainer.nextSibling); - } else { + flexContainerActionNeeded.parentNode.insertBefore(statusChangelog, flexContainerActionNeeded.nextSibling); + } else if (statusSelect.value === "rejected"){ + flexContainerRejected.parentNode.insertBefore(statusChangelog, flexContainerRejected.nextSibling); + } + else { // Move the changelog back to its original location let statusFlexContainer = statusSelect.closest('.flex-container'); statusFlexContainer.parentNode.insertBefore(statusChangelog, statusFlexContainer.nextSibling); @@ -418,11 +422,11 @@ function initializeWidgetOnList(list, parentId) { } // Call the function on page load - moveStatusChangelog(actionNeededReasonFormGroup, statusSelect); + moveStatusChangelog(actionNeededReasonFormGroup, rejectionReasonFormGroup, statusSelect); // Add event listener to handle changes to the selector itself statusSelect.addEventListener('change', function() { - moveStatusChangelog(actionNeededReasonFormGroup, statusSelect); + moveStatusChangelog(actionNeededReasonFormGroup, rejectionReasonFormGroup, statusSelect); }) }); })(); From 1fae782399c1c8e6c17ccdd2d333e9d397c794ac Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Tue, 25 Jun 2024 15:29:52 -0600 Subject: [PATCH 2/4] Update errors.py --- src/registrar/utility/errors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/utility/errors.py b/src/registrar/utility/errors.py index 546fe604d..47d3feff5 100644 --- a/src/registrar/utility/errors.py +++ b/src/registrar/utility/errors.py @@ -101,7 +101,7 @@ class FSMDomainRequestError(Exception): FSMErrorCodes.NO_INVESTIGATOR: ("Investigator is required for this status."), FSMErrorCodes.INVESTIGATOR_NOT_STAFF: ("Investigator is not a staff user."), FSMErrorCodes.INVESTIGATOR_NOT_SUBMITTER: ("Only the assigned investigator can make this change."), - FSMErrorCodes.NO_REJECTION_REASON: ("A rejection reason is required."), + FSMErrorCodes.NO_REJECTION_REASON: ("A reason is required for this status."), FSMErrorCodes.NO_ACTION_NEEDED_REASON: ("A reason is required for this status."), } From 084d56d32a3eef12c13b3edbb4a005e7234db15f Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Tue, 25 Jun 2024 15:31:14 -0600 Subject: [PATCH 3/4] Revert "Move field" This reverts commit 1cd69aa12f9611396d199713ba00cc961d017cb4. --- src/registrar/assets/js/get-gov-admin.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js index 27ac25206..524cfe594 100644 --- a/src/registrar/assets/js/get-gov-admin.js +++ b/src/registrar/assets/js/get-gov-admin.js @@ -405,16 +405,12 @@ function initializeWidgetOnList(list, parentId) { document.addEventListener('DOMContentLoaded', function() { let statusSelect = document.getElementById('id_status'); - function moveStatusChangelog(actionNeededReasonFormGroup, rejectionReasonFormGroup, statusSelect) { - let flexContainerActionNeeded = actionNeededReasonFormGroup.querySelector('.flex-container'); - let flexContainerRejected = rejectionReasonFormGroup.querySelector('.flex-container'); + function moveStatusChangelog(actionNeededReasonFormGroup, statusSelect) { + let flexContainer = actionNeededReasonFormGroup.querySelector('.flex-container'); let statusChangelog = document.getElementById('dja-status-changelog'); if (statusSelect.value === "action needed") { - flexContainerActionNeeded.parentNode.insertBefore(statusChangelog, flexContainerActionNeeded.nextSibling); - } else if (statusSelect.value === "rejected"){ - flexContainerRejected.parentNode.insertBefore(statusChangelog, flexContainerRejected.nextSibling); - } - else { + flexContainer.parentNode.insertBefore(statusChangelog, flexContainer.nextSibling); + } else { // Move the changelog back to its original location let statusFlexContainer = statusSelect.closest('.flex-container'); statusFlexContainer.parentNode.insertBefore(statusChangelog, statusFlexContainer.nextSibling); @@ -422,11 +418,11 @@ function initializeWidgetOnList(list, parentId) { } // Call the function on page load - moveStatusChangelog(actionNeededReasonFormGroup, rejectionReasonFormGroup, statusSelect); + moveStatusChangelog(actionNeededReasonFormGroup, statusSelect); // Add event listener to handle changes to the selector itself statusSelect.addEventListener('change', function() { - moveStatusChangelog(actionNeededReasonFormGroup, rejectionReasonFormGroup, statusSelect); + moveStatusChangelog(actionNeededReasonFormGroup, statusSelect); }) }); })(); From 77bd49c66184090e9fb1e165467274d8a1536a1b Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Wed, 26 Jun 2024 08:16:15 -0600 Subject: [PATCH 4/4] Fix unit test --- src/registrar/tests/test_admin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py index 802974b6e..66a44c502 100644 --- a/src/registrar/tests/test_admin.py +++ b/src/registrar/tests/test_admin.py @@ -944,7 +944,7 @@ class TestDomainRequestAdminForm(TestCase): self.assertIn("rejection_reason", form.errors) rejection_reason = form.errors.get("rejection_reason") - self.assertEqual(rejection_reason, ["A rejection reason is required."]) + self.assertEqual(rejection_reason, ["A reason is required for this status."]) def test_form_choices_when_no_instance(self): with less_console_noise(): @@ -1911,7 +1911,7 @@ class TestDomainRequestAdmin(MockEppLib): messages.error.assert_called_once_with( request, - "A rejection reason is required.", + "A reason is required for this status.", ) domain_request.refresh_from_db()