feat(nimbus): Test approve and reject

experimenter/experimenter/nimbus_ui_new/forms.py

@@ -594,8 +594,12 @@ def get_changelog_message(self):
 
 class ReviewToRejectForm(UpdateStatusForm):
     status = NimbusExperiment.Status.DRAFT
-    status_next = NimbusExperiment.Status.DRAFT
+    status_next = None
     publish_status = NimbusExperiment.PublishStatus.IDLE
+    changelog_message = forms.CharField(
+        required=True, label="Reason for Rejection", max_length=1000
+    )
 
     def get_changelog_message(self):
-        return f"{self.request.user} rejected the review."
+        changelog_message = self.cleaned_data.get("changelog_message", "")
+        return f"{self.request.user} rejected the review with reason: {changelog_message}"

experimenter/experimenter/nimbus_ui_new/static/js/review_controls.js

@@ -12,3 +12,32 @@ window.toggleSubmitButton = function () {
   const submitButton = document.getElementById("request-launch-button");
   submitButton.disabled = !(checkbox1.checked && checkbox2.checked);
 };
+
+function initializeRejectApproveListeners() {
+  const rejectButton = document.getElementById("reject-button");
+  const reviewControls = document.getElementById("review-controls");
+  const rejectFormContainer = document.getElementById("reject-form-container");
+  const cancelReject = document.getElementById("cancel-reject");
+
+  if (rejectButton) {
+    rejectButton.addEventListener("click", () => {
+      reviewControls.classList.add("d-none");
+      rejectFormContainer.classList.remove("d-none");
+    });
+  }
+
+  if (cancelReject) {
+    cancelReject.addEventListener("click", () => {
+      rejectFormContainer.classList.add("d-none");
+      reviewControls.classList.remove("d-none");
+    });
+  }
+}
+
+// Initialize listeners on initial load
+document.addEventListener("DOMContentLoaded", initializeRejectApproveListeners);
+
+// Reinitialize listeners after HTMX content swaps
+document.body.addEventListener("htmx:afterSwap", () => {
+  initializeRejectApproveListeners();
+});

experimenter/experimenter/nimbus_ui_new/templates/nimbus_experiments/launch_controls.html

@@ -1,4 +1,5 @@
 {% load nimbus_extras %}
+
 <div id="launch-controls">
   <form>
     {% csrf_token %}
@@ -117,37 +118,45 @@
       </div>
       <!-- Review Mode Controls -->
     {% elif experiment.is_review %}
-    {% if experiment.can_show_timeout_message%}
-    <div class="alert alert-danger" role="alert">
-  <p>
-    <span role="img" aria-label="red X emoji">❌</span>
-    Remote Settings request has timed out, please go through the approval flow to launch this experiment again.
-  </p>
-</div>
-    {% endif %}
-    <div id="review-controls" class="alert alert-primary">
-      <p>
-      <strong>{{ experiment.changes.latest_review_request.changed_by.email }}</strong> requested to Launch this experiment.
-    </p>
-  <button type="button"
-          class="btn btn-success"
-          hx-post="{% url 'nimbus-new-review-to-approve' slug=experiment.slug %}"
-          hx-select="#content"
-                  hx-target="#content"
-                  hx-swap="outerHTML">
-    Approve and Launch Experiment
-  </button>
-  <button type="button"
-          class="btn btn-danger"
-          hx-post="{% url 'nimbus-new-review-to-reject' slug=experiment.slug %}"
-          hx-select="#content"
-                  hx-target="#content"
-                  hx-swap="outerHTML">
-    Reject
-  </button>
-</div>
-
-
+      {% if experiment.can_show_timeout_message %}
+        <div class="alert alert-danger" role="alert">
+          <p>
+            <span role="img" aria-label="red X emoji">❌</span>
+            Remote Settings request has timed out, please go through the approval flow to launch this experiment again.
+          </p>
+        </div>
+      {% endif %}
+      <div id="review-controls" class="alert alert-primary">
+        <p>
+          <strong>{{ experiment.changes.latest_review_request.changed_by.email }}</strong> requested to Launch this experiment.
+        </p>
+        <button type="button"
+                class="btn btn-success"
+                hx-post="{% url 'nimbus-new-review-to-approve' slug=experiment.slug %}"
+                hx-select="#content"
+                hx-target="#content"
+                hx-swap="outerHTML">Approve and Launch Experiment</button>
+        <button type="button" class="btn btn-danger" id="reject-button">Reject</button>
+      </div>
+      <!-- Rejection Form -->
+      <div id="reject-form-container" class="d-none alert alert-warning">
+        <label for="changelog_message">
+          <strong>You are rejecting the request to launch this experiment.</strong> Please add some comments:
+        </label>
+        <textarea id="changelog_message"
+                  name="changelog_message"
+                  class="form-control"
+                  rows="4"
+                  required></textarea>
+        <button type="submit"
+                class="btn btn-danger mt-2"
+                hx-post="{% url 'nimbus-new-review-to-reject' slug=experiment.slug %}"
+                hx-select="#content"
+                hx-target="#content"
+                hx-swap="outerHTML"
+                hx-include="#changelog_message">Submit</button>
+        <button type="button" class="btn btn-secondary mt-2" id="cancel-reject">Cancel</button>
+      </div>
       <div class="alert alert-warning">
         <p>The experiment is currently under review. If you wish to cancel the review, click the button below:</p>
         <button type="button"
@@ -157,11 +166,13 @@
                 hx-target="#content"
                 hx-swap="outerHTML">Cancel Review</button>
       </div>
-      {% elif experiment|can_show_remote_settings_pending:user %}
-<div class="alert alert-primary">
-  <p><strong>Action required:</strong> Please review this change in Remote Settings to launch this experiment.</p>
-  <a href="{{ experiment.review_url }}" class="btn btn-primary">Open Remote Settings</a>
-</div>
+    {% elif experiment|can_show_remote_settings_pending:user %}
+      <div class="alert alert-primary">
+        <p>
+          <strong>Action required:</strong> Please review this change in Remote Settings to launch this experiment.
+        </p>
+        <a href="{{ experiment.review_url }}" class="btn btn-primary" target="_blank" rel="noopener noreferrer">Open Remote Settings</a>
+      </div>
     {% endif %}
   </form>
 </div>

experimenter/experimenter/nimbus_ui_new/tests/test_forms.py

@@ -28,7 +28,9 @@
     PreviewToDraftForm,
     PreviewToReviewForm,
     QAStatusForm,
+    ReviewToApproveForm,
     ReviewToDraftForm,
+    ReviewToRejectForm,
     SignoffForm,
     SubscribeForm,
     TakeawaysForm,
@@ -413,6 +415,50 @@ def test_review_to_draft_form(self):
         self.assertEqual(changelog.changed_by, self.user)
         self.assertIn("cancelled the review", changelog.message)
 
+    def test_review_to_approve_form(self):
+        self.experiment.publish_status = NimbusExperiment.PublishStatus.REVIEW
+        self.experiment.status_next = NimbusExperiment.Status.LIVE
+        self.experiment.save()
+
+        form = ReviewToApproveForm(
+            data={}, instance=self.experiment, request=self.request
+        )
+        self.assertTrue(form.is_valid(), form.errors)
+
+        experiment = form.save()
+        self.assertEqual(experiment.status, NimbusExperiment.Status.DRAFT)
+        self.assertEqual(experiment.status_next, NimbusExperiment.Status.LIVE)
+        self.assertEqual(
+            experiment.publish_status, NimbusExperiment.PublishStatus.APPROVED
+        )
+
+        changelog = experiment.changes.latest("changed_on")
+        self.assertEqual(changelog.changed_by, self.user)
+        self.assertIn(f"{self.user.email} approved the review.", changelog.message)
+
+    def test_review_to_reject_form_with_reason(self):
+        self.experiment.publish_status = NimbusExperiment.PublishStatus.REVIEW
+        self.experiment.save()
+
+        form = ReviewToRejectForm(
+            data={"changelog_message": "Needs more work."},
+            instance=self.experiment,
+            request=self.request,
+        )
+        self.assertTrue(form.is_valid(), form.errors)
+
+        experiment = form.save()
+        self.assertEqual(experiment.status, NimbusExperiment.Status.DRAFT)
+        self.assertEqual(experiment.status_next, None)
+        self.assertEqual(experiment.publish_status, NimbusExperiment.PublishStatus.IDLE)
+
+        changelog = experiment.changes.latest("changed_on")
+        self.assertEqual(changelog.changed_by, self.user)
+        self.assertIn(
+            f"{self.user.email} rejected the review with reason: Needs more work.",
+            changelog.message,
+        )
+
 
 class TestOverviewForm(RequestFormTestCase):
     def test_valid_form_saves(self):

experimenter/experimenter/nimbus_ui_new/tests/test_views.py

@@ -1380,6 +1380,53 @@ def test_cancel_review(self):
             self.experiment.publish_status, NimbusExperiment.PublishStatus.IDLE
         )
 
+    def test_review_to_approve_view(self):
+        self.experiment.status = NimbusExperiment.Status.DRAFT
+        self.experiment.status_next = NimbusExperiment.Status.LIVE
+        self.experiment.publish_status = NimbusExperiment.PublishStatus.REVIEW
+        self.experiment.save()
+
+        response = self.client.post(
+            reverse("nimbus-new-review-to-approve", kwargs={"slug": self.experiment.slug})
+        )
+        self.assertEqual(response.status_code, 200)
+        self.experiment.refresh_from_db()
+        self.assertEqual(self.experiment.status, NimbusExperiment.Status.DRAFT)
+        self.assertEqual(self.experiment.status_next, NimbusExperiment.Status.LIVE)
+        self.assertEqual(
+            self.experiment.publish_status, NimbusExperiment.PublishStatus.APPROVED
+        )
+
+        changelog = self.experiment.changes.latest("changed_on")
+        self.assertEqual(changelog.changed_by, self.user)
+        self.assertIn(f"{self.user.email} approved the review.", changelog.message)
+
+    def test_review_to_reject_view_with_reason(self):
+        self.experiment.status = NimbusExperiment.Status.DRAFT
+        self.experiment.status_next = NimbusExperiment.Status.LIVE
+        self.experiment.publish_status = NimbusExperiment.PublishStatus.REVIEW
+        self.experiment.save()
+
+        response = self.client.post(
+            reverse("nimbus-new-review-to-reject", kwargs={"slug": self.experiment.slug}),
+            data={"changelog_message": "Not ready for launch."},
+        )
+
+        self.assertEqual(response.status_code, 200)
+        self.experiment.refresh_from_db()
+        self.assertEqual(self.experiment.status, NimbusExperiment.Status.DRAFT)
+        self.assertEqual(self.experiment.status_next, None)
+        self.assertEqual(
+            self.experiment.publish_status, NimbusExperiment.PublishStatus.IDLE
+        )
+
+        changelog = self.experiment.changes.latest("changed_on")
+        self.assertEqual(changelog.changed_by, self.user)
+        self.assertIn(
+            f"{self.user.email} rejected the review with reason: Not ready for launch.",
+            changelog.message,
+        )
+
 
 class TestAudienceUpdateView(AuthTestCase):
     def test_get_renders_page(self):