chore: Combine discard form with action form

Author: ayushjain17

crates/frontend/src/api.rs

@@ -567,6 +567,30 @@ pub async fn resume_experiment(
     parse_json_response(response).await
 }
 
+pub async fn discard_experiment(
+    exp_id: &str,
+    change_reason: String,
+    tenant: &str,
+    org_id: &str,
+) -> Result<ExperimentResponse, String> {
+    let payload = ExperimentStateChangeRequest {
+        change_reason: ChangeReason::try_from(change_reason)?,
+    };
+
+    let host = get_host();
+    let url = format!("{host}/experiments/{exp_id}/discard");
+
+    let response = request(
+        url,
+        reqwest::Method::PATCH,
+        Some(payload),
+        construct_request_headers(&[("x-tenant", tenant), ("x-org-id", org_id)])?,
+    )
+    .await?;
+
+    parse_json_response(response).await
+}
+
 pub async fn get_context(
     context_id: &str,
     tenant: &str,

crates/frontend/src/components.rs

@@ -15,7 +15,6 @@ pub mod dropdown;
 pub mod experiment;
 pub mod experiment_action_form;
 pub mod experiment_conclude_form;
-pub mod experiment_discard_form;
 pub mod experiment_form;
 pub mod experiment_group_form;
 pub mod experiment_ramp_form;

crates/frontend/src/components/experiment_action_form.rs

@@ -2,7 +2,7 @@ use leptos::*;
 use web_sys::MouseEvent;
 
 use crate::{
-    api::{pause_experiment, resume_experiment},
+    api::{discard_experiment, pause_experiment, resume_experiment},
     components::{
         alert::AlertType, button::Button, change_form::ChangeForm,
         experiment_ramp_form::utils::ramp_experiment,
@@ -34,31 +34,39 @@ pub fn experiment_action_form(
     let popup_type = StoredValue::new(popup_type);
     let experiment_id = StoredValue::new(experiment_id);
 
-    let (header, message, action, button_title, button_icon) =
-        match popup_type.get_value() {
-            PopupType::ExperimentPause => (
-                "Pause Experiment",
-                "pause",
-                "paused",
-                "Pause",
-                "ri-pause-fill",
-            ),
-            PopupType::ExperimentResume => (
-                "Resume Experiment",
-                "resume",
-                "resumed",
-                "Resume",
-                "ri-play-mini-fill",
-            ),
-            PopupType::ExperimentStart => (
-                "Start Experiment",
-                "start",
-                "started",
-                "Start",
-                "ri-guide-fill",
-            ),
-            _ => ("", "", "", "", ""),
-        };
+    let (header, message, action, button_title, button_icon) = match popup_type
+        .get_value()
+    {
+        PopupType::ExperimentPause => (
+            "Pause Experiment",
+            "Are you sure you want to pause this experiment?",
+            "paused",
+            "Pause",
+            "ri-pause-fill",
+        ),
+        PopupType::ExperimentResume => (
+            "Resume Experiment",
+            "Are you sure you want to resume this experiment?",
+            "resumed",
+            "Resume",
+            "ri-play-mini-fill",
+        ),
+        PopupType::ExperimentStart => (
+            "Start Experiment",
+            "Are you sure you want to start this experiment?",
+            "started",
+            "Start",
+            "ri-guide-fill",
+        ),
+        PopupType::ExperimentDiscard => (
+            "Discard Experiment",
+            "Safely discard the experiment without affecting any pre-existing overrides",
+            "discarded",
+            "Discard",
+            "ri-delete-bin-line",
+        ),
+        _ => ("", "", "", "", ""),
+    };
 
     let handle_experiment_action = move |event: MouseEvent| {
         req_inprogress_ws.set(true);
@@ -80,6 +88,10 @@ pub fn experiment_action_form(
                     resume_experiment(&experiment_id, change_reason_value, &tenant, &org)
                         .await
                 }
+                PopupType::ExperimentDiscard => {
+                    discard_experiment(&experiment_id, change_reason_value, &tenant, &org)
+                        .await
+                }
                 PopupType::ExperimentStart => {
                     ramp_experiment(
                         &experiment_id,
@@ -90,7 +102,7 @@ pub fn experiment_action_form(
                     )
                     .await
                 }
-                _ => Err("".to_string()),
+                popup => Err(format!("Unsupported Popup Type {popup:?}")),
             };
 
             req_inprogress_ws.set(false);
@@ -118,9 +130,7 @@ pub fn experiment_action_form(
                         <i class="ri-close-line" />
                     </button>
                     <h3 class="font-bold text-lg">{header}</h3>
-                    <p class="py-2">
-                        {format!("Are you sure you want to {message} this experiment?")}
-                    </p>
+                    <p class="py-2">{message}</p>
                     <form class="flex flex-col gap-4">
                         <ChangeForm
                             title="Reason for Change".to_string()

crates/frontend/src/components/experiment_conclude_form.rs

@@ -7,10 +7,8 @@ use superposition_types::{
 use utils::conclude_experiment;
 
 use crate::{
-    components::{
-        alert::AlertType, change_form::ChangeForm,
-        experiment_discard_form::utils::discard_experiment,
-    },
+    api::discard_experiment,
+    components::{alert::AlertType, change_form::ChangeForm},
     providers::alert_provider::enqueue_alert,
     types::{OrganisationId, Tenant},
 };
@@ -71,9 +69,9 @@ pub fn experiment_conclude_form(
         spawn_local(async move {
             let result = discard_experiment(
                 &experiment.with_value(|e| e.id.clone()),
+                change_reason,
                 &tenant,
                 &org,
-                change_reason,
             )
             .await;
             req_inprogess_rws.set(false);

crates/frontend/src/components/experiment_discard_form.rs

@@ -14,7 +14,6 @@ use crate::{
         experiment::Experiment,
         experiment_action_form::ExperimentActionForm,
         experiment_conclude_form::ExperimentConcludeForm,
-        experiment_discard_form::ExperimentDiscardForm,
         experiment_form::{ExperimentForm, ExperimentFormType},
         modal::{Modal, PortalModal},
         skeleton::{Skeleton, SkeletonVariant},
@@ -40,6 +39,7 @@ pub enum PopupType {
     ExperimentEdit,
     ExperimentPause,
     ExperimentResume,
+    ExperimentDiscard,
     None,
 }
 
@@ -93,7 +93,7 @@ pub fn experiment_page() -> impl IntoView {
     let handle_ramp = move || show_modal("ramp_form_modal");
     let handle_conclude = move || show_modal("conclude_form_modal");
     let handle_edit = move || set_show_popup.set(PopupType::ExperimentEdit);
-    let handle_discard = move || show_modal("experiment_discard_form_modal");
+    let handle_discard = move || set_show_popup.set(PopupType::ExperimentDiscard);
     let handle_pause = move || set_show_popup.set(PopupType::ExperimentPause);
     let handle_resume = move || set_show_popup.set(PopupType::ExperimentResume);
 
@@ -113,7 +113,6 @@ pub fn experiment_page() -> impl IntoView {
                     Some(experiment) => {
                         let experiment_rf = experiment.clone();
                         let experiment_cf = experiment.clone();
-                        let experiment_df = experiment.clone();
                         view! {
                             <Experiment
                                 experiment=experiment.clone()
@@ -125,17 +124,6 @@ pub fn experiment_page() -> impl IntoView {
                                 handle_pause
                                 handle_resume
                             />
-                            <Modal
-                                id="experiment_discard_form_modal".to_string()
-                                handle_close=move || {
-                                    close_modal("experiment_discard_form_modal")
-                                }
-                            >
-                                <ExperimentDiscardForm
-                                    experiment=experiment_df
-                                    handle_submit=move || { combined_resource.refetch() }
-                                />
-                            </Modal>
                             <Modal
                                 id="ramp_form_modal".to_string()
                                 handle_close=move || { close_modal("ramp_form_modal") }