From 9f783d9ba1da400158d2102aab64fac6fed0e31e Mon Sep 17 00:00:00 2001
From: "Ankit.Mahato" <ankit.mahato@juspay.in>
Date: Thu, 23 Jan 2025 11:05:25 +0530
Subject: [PATCH] fix: Add success alerts and remove divider

---
 .../src/components/default_config_form.rs     | 10 ++-------
 .../frontend/src/components/dimension_form.rs | 20 ++++++++++++-----
 crates/frontend/src/components/experiment.rs  |  1 -
 .../src/components/experiment_form.rs         | 22 ++++++++++++-------
 .../frontend/src/components/function_form.rs  | 16 ++++++++++++--
 .../src/components/type_template_form.rs      | 22 ++++++++++++-------
 .../frontend/src/components/workspace_form.rs |  8 -------
 crates/frontend/src/pages/context_override.rs | 16 +++++++++-----
 8 files changed, 69 insertions(+), 46 deletions(-)

diff --git a/crates/frontend/src/components/default_config_form.rs b/crates/frontend/src/components/default_config_form.rs
index 4257921d9..c438f4d91 100644
--- a/crates/frontend/src/components/default_config_form.rs
+++ b/crates/frontend/src/components/default_config_form.rs
@@ -175,7 +175,6 @@ where
     view! {
         <EditorProvider>
             <form class="form-control w-full space-y-4 bg-white text-gray-700 font-mono">
-
                 <div class="form-control">
                     <label class="label">
                         <span class="label-text">Key Name</span>
@@ -194,8 +193,6 @@ where
 
                 </div>
 
-                <div class="divider"></div>
-
                 <div class="form-control">
                     <label class="label">
                         <span class="label-text">Description</span>
@@ -211,8 +208,6 @@ where
                     />
                 </div>
 
-                <div class="divider"></div>
-
                 <div class="form-control">
                     <label class="label">
                         <span class="label-text">Reason for Change</span>
@@ -269,13 +264,12 @@ where
                                     })
                                     r#type=InputType::Monaco
                                 />
-
                             </div>
                         }
                     }}
 
                 </Suspense>
-                <div class="divider"></div>
+
 
                 {move || {
                     let input_format = match (
@@ -337,7 +331,7 @@ where
                             </label>
                             {input_format}
                         </div>
-                        <div class="divider"></div>
+
                     }
                 }}
 
diff --git a/crates/frontend/src/components/dimension_form.rs b/crates/frontend/src/components/dimension_form.rs
index ba55d6c03..da7e1d4aa 100644
--- a/crates/frontend/src/components/dimension_form.rs
+++ b/crates/frontend/src/components/dimension_form.rs
@@ -12,9 +12,11 @@ use utils::{create_dimension, update_dimension};
 use web_sys::MouseEvent;
 
 use crate::components::{
+    alert::AlertType,
     dropdown::{Dropdown, DropdownBtnType, DropdownDirection},
     input::{Input, InputType},
 };
+use crate::providers::alert_provider::enqueue_alert;
 use crate::providers::editor_provider::EditorProvider;
 use crate::schema::{JsonSchemaType, SchemaType};
 use crate::types::FunctionsName;
@@ -126,9 +128,20 @@ where
                 match result {
                     Ok(_) => {
                         handle_submit();
+                        let success_message = if edit {
+                            "Dimension updated successfully!"
+                        } else {
+                            "New Dimension created successfully!"
+                        };
+                        enqueue_alert(
+                            String::from(success_message),
+                            AlertType::Success,
+                            5000,
+                        );
                     }
                     Err(e) => {
-                        set_error_message.set(e);
+                        set_error_message.set(e.clone());
+                        enqueue_alert(e, AlertType::Error, 5000);
                         // Handle error
                         // Consider logging or displaying the error
                     }
@@ -157,8 +170,6 @@ where
 
             </div>
 
-            <div class="divider"></div>
-
             <div class="form-control">
                 <label class="label">
                     <span class="label-text">Description</span>
@@ -174,8 +185,6 @@ where
                 />
             </div>
 
-            <div class="divider"></div>
-
             <div class="form-control">
                 <label class="label">
                     <span class="label-text">Reason for Change</span>
@@ -235,7 +244,6 @@ where
                 }}
 
             </Suspense>
-            <div class="divider"></div>
 
             {move || {
                 view! {
diff --git a/crates/frontend/src/components/experiment.rs b/crates/frontend/src/components/experiment.rs
index d24d5b6e5..d23ba5fc7 100644
--- a/crates/frontend/src/components/experiment.rs
+++ b/crates/frontend/src/components/experiment.rs
@@ -85,7 +85,6 @@ where
                 {experiment.with_value(|v| v.name.clone())}
                 <span class=badge_class>{experiment.with_value(|v| v.status.to_string())}</span>
             </h1>
-            <div class="divider"></div>
             <div class="flex flex-row justify-end join m-5">
 
                 {move || {
diff --git a/crates/frontend/src/components/experiment_form.rs b/crates/frontend/src/components/experiment_form.rs
index b021ca5b3..e4e4a6f7a 100644
--- a/crates/frontend/src/components/experiment_form.rs
+++ b/crates/frontend/src/components/experiment_form.rs
@@ -11,9 +11,10 @@ use web_sys::MouseEvent;
 
 use crate::components::context_form::ContextForm;
 use crate::components::variant_form::VariantForm;
+use crate::providers::alert_provider::enqueue_alert;
 use crate::types::{VariantFormT, VariantFormTs};
 use crate::{
-    components::button::Button,
+    components::{alert::AlertType, button::Button},
     types::{OrganisationId, Tenant},
 };
 
@@ -133,8 +134,19 @@ where
                 match result {
                     Ok(_) => {
                         handle_submit_clone();
+                        let success_message = if edit {
+                            "Experiment updated successfully!"
+                        } else {
+                            "New Experiment created successfully!"
+                        };
+                        enqueue_alert(
+                            String::from(success_message),
+                            AlertType::Success,
+                            5000,
+                        );
                     }
-                    Err(_) => {
+                    Err(e) => {
+                        enqueue_alert(e, AlertType::Error, 5000);
                         // Handle error
                         // We can consider logging or displaying the error
                     }
@@ -162,8 +174,6 @@ where
                 />
             </div>
 
-            <div class="divider"></div>
-
             <div class="form-control">
                 <label class="label">
                     <span class="label-text">Description</span>
@@ -179,8 +189,6 @@ where
                 />
             </div>
 
-            <div class="divider"></div>
-
             <div class="form-control">
                 <label class="label">
                     <span class="label-text">Reason for Change</span>
@@ -214,8 +222,6 @@ where
 
             </div>
 
-            <div class="divider"></div>
-
             {move || {
                 let variants = f_variants.get();
                 view! {
diff --git a/crates/frontend/src/components/function_form.rs b/crates/frontend/src/components/function_form.rs
index 94769f2b3..2b49e0963 100644
--- a/crates/frontend/src/components/function_form.rs
+++ b/crates/frontend/src/components/function_form.rs
@@ -2,8 +2,9 @@ pub mod types;
 pub mod utils;
 
 use self::utils::{create_function, test_function, update_function};
+use crate::providers::alert_provider::enqueue_alert;
 use crate::{
-    components::{button::Button, monaco_editor::MonacoEditor},
+    components::{alert::AlertType, button::Button, monaco_editor::MonacoEditor},
     types::{FunctionTestResponse, OrganisationId, Tenant},
 };
 use leptos::*;
@@ -85,9 +86,20 @@ where
                 match result {
                     Ok(_) => {
                         handle_submit_clone();
+                        let success_message = if edit {
+                            "Function updated successfully!"
+                        } else {
+                            "New Function created successfully!"
+                        };
+                        enqueue_alert(
+                            String::from(success_message),
+                            AlertType::Success,
+                            5000,
+                        );
                     }
                     Err(e) => {
-                        set_error_message.set(e);
+                        set_error_message.set(e.clone());
+                        enqueue_alert(e, AlertType::Error, 5000);
                     }
                 }
                 req_inprogress_ws.set(false);
diff --git a/crates/frontend/src/components/type_template_form.rs b/crates/frontend/src/components/type_template_form.rs
index f02bee087..68f3c9c0b 100644
--- a/crates/frontend/src/components/type_template_form.rs
+++ b/crates/frontend/src/components/type_template_form.rs
@@ -2,11 +2,12 @@ pub mod utils;
 
 use crate::components::type_template_form::utils::create_type;
 use crate::components::{
+    alert::AlertType,
     button::Button,
     input::{Input, InputType},
     type_template_form::utils::update_type,
 };
-use crate::providers::editor_provider::EditorProvider;
+use crate::providers::{alert_provider::enqueue_alert, editor_provider::EditorProvider};
 use crate::schema::{JsonSchemaType, SchemaType};
 use crate::types::{OrganisationId, Tenant};
 use leptos::*;
@@ -69,9 +70,20 @@ where
                 match result {
                     Ok(_) => {
                         handle_submit();
+                        let success_message = if edit {
+                            "Type updated successfully!"
+                        } else {
+                            "New Type created successfully!"
+                        };
+                        enqueue_alert(
+                            String::from(success_message),
+                            AlertType::Success,
+                            5000,
+                        );
                     }
                     Err(e) => {
-                        set_error_message.set(e);
+                        set_error_message.set(e.clone());
+                        enqueue_alert(e, AlertType::Error, 5000);
                     }
                 }
                 req_inprogress_ws.set(false);
@@ -99,7 +111,6 @@ where
                 />
 
             </div>
-            <div class="divider"></div>
 
             <div class="form-control">
                 <label class="label">
@@ -116,8 +127,6 @@ where
                 />
             </div>
 
-            <div class="divider"></div>
-
             <div class="form-control">
                 <label class="label">
                     <span class="label-text">change_reason</span>
@@ -148,8 +157,6 @@ where
                 />
             </div>
 
-            <div class="divider"></div>
-
             <div class="form-control">
                 <label class="label">
                     <span class="label-text">Reason for Change</span>
@@ -165,7 +172,6 @@ where
                 />
             </div>
 
-            <div class="divider"></div>
             <div class="form-control">
                 <label class="label">
                     <span class="label-text">Type Schema</span>
diff --git a/crates/frontend/src/components/workspace_form.rs b/crates/frontend/src/components/workspace_form.rs
index 4db1974ff..be905aba6 100644
--- a/crates/frontend/src/components/workspace_form.rs
+++ b/crates/frontend/src/components/workspace_form.rs
@@ -113,8 +113,6 @@ pub fn workspace_form(
                     />
                 </div>
 
-                <div class="divider"></div>
-
                 <div class="form-control">
                     <label class="label">
                         <span class="label-text">Workspace Admin Email</span>
@@ -132,8 +130,6 @@ pub fn workspace_form(
                 </div>
 
                 <Show when=move || edit>
-                    <div class="divider"></div>
-
                     <div class="form-control">
                         <label class="label">
                             <span class="label-text">Mandatory Dimensions</span>
@@ -153,8 +149,6 @@ pub fn workspace_form(
                     </div>
                 </Show>
 
-                <div class="divider"></div>
-
                 <div class="form-control">
                     <label class="label">
                         <span class="label-text">Workspace Status</span>
@@ -178,8 +172,6 @@ pub fn workspace_form(
                     />
                 </div>
 
-                <div class="divider"></div>
-
                 <div class="form-control grid w-full justify-start">
                     {move || {
                         let loading = req_inprogess_rs.get();
diff --git a/crates/frontend/src/pages/context_override.rs b/crates/frontend/src/pages/context_override.rs
index 53d7702c0..f44f8acba 100644
--- a/crates/frontend/src/pages/context_override.rs
+++ b/crates/frontend/src/pages/context_override.rs
@@ -97,9 +97,20 @@ fn form(
                 Ok(_) => {
                     logging::log!("Context and overrides submitted successfully");
                     handle_submit.call(());
+                    let success_message = if edit {
+                        "Context and overrides updated successfully!"
+                    } else {
+                        "Context and overrides created successfully!"
+                    };
+                    enqueue_alert(
+                        String::from(success_message),
+                        AlertType::Success,
+                        5000,
+                    );
                 }
                 Err(e) => {
                     logging::log!("Error submitting context and overrides: {:?}", e);
+                    enqueue_alert(e, AlertType::Error, 5000);
                 }
             }
             req_inprogress_ws.set(false);
@@ -118,7 +129,6 @@ fn form(
 
             disabled=edit
         />
-        <div class="divider"></div>
 
         <div class="form-control">
             <label class="label">
@@ -135,8 +145,6 @@ fn form(
             />
         </div>
 
-        <div class="divider"></div>
-
         <div class="form-control">
             <label class="label">
                 <span class="label-text">Reason for Change</span>
@@ -152,8 +160,6 @@ fn form(
             />
         </div>
 
-        <div class="divider"></div>
-
         <OverrideForm
             overrides=overrides.get_untracked()
             default_config=default_config