Skip to content

Commit

Permalink
feat #396 : Create Experiments From Overrides
Browse files Browse the repository at this point in the history
  • Loading branch information
@yuvrajjsingh0
yuvrajjsingh0 committed Jan 30, 2025
1 parent 18dfc5d commit 733caf4
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 7 deletions.
12 changes: 12 additions & 0 deletions crates/frontend/src/components/context_card.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ pub fn context_card(
context: Context,
overrides: Map<String, Value>,
#[prop(default = true)] show_actions: bool,
#[prop(default=Callback::new(|_| {}))] handle_create_experiment: Callback<
(Context, Map<String, Value>),
(),
>,
#[prop(default=Callback::new(|_| {}))] handle_edit: Callback<
(Context, Map<String, Value>),
(),
Expand Down Expand Up @@ -65,6 +69,14 @@ pub fn context_card(
<Show when=move || actions_supported>
<div class="h-fit text-right space-x-4">
<Show when=move || !edit_unsupported>
<button
on:click=move |_| {
handle_create_experiment.call((context.get_value(), overrides.get_value()));
}
>
Create Experiment
<i class="ri-edit-2-line ml-2"></i>
</button>
<i
class="ri-pencil-line ri-lg text-blue-500 cursor-pointer"
on:click=move |_| {
Expand Down
19 changes: 13 additions & 6 deletions crates/frontend/src/components/experiment_form.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ pub mod types;
pub mod utils;

use leptos::*;
use serde_json::Value;
use superposition_types::{
database::models::experimentation::VariantType,
database::{models::cac::DefaultConfig, types::DimensionWithMandatory},
Expand All @@ -20,30 +21,35 @@ use crate::{

use crate::logic::Conditions;

fn default_variants_for_form() -> Vec<(String, VariantFormT)> {
fn default_variants_for_form(
overrides: Vec<(String, Value)>,
) -> Vec<(String, VariantFormT)> {
vec![
(
"control-variant".to_string(),
VariantFormT {
id: "control".to_string(),
variant_type: VariantType::CONTROL,
overrides: vec![],
overrides: overrides.clone(),
},
),
(
"experimental-variant".to_string(),
VariantFormT {
id: "experimental".to_string(),
variant_type: VariantType::EXPERIMENTAL,
overrides: vec![],
overrides: overrides.clone(),
},
),
]
}

fn get_init_state(variants: &VariantFormTs) -> Vec<(String, VariantFormT)> {
fn get_init_state(
variants: &[VariantFormT],
overrides: Vec<(String, Value)>,
) -> Vec<(String, VariantFormT)> {
let init_variants = if variants.is_empty() {
default_variants_for_form()
default_variants_for_form(overrides)
} else {
variants
.iter()
Expand All @@ -61,6 +67,7 @@ pub fn experiment_form<NF>(
name: String,
context: Conditions,
variants: VariantFormTs,
overrides: Vec<(String, Value)>,
handle_submit: NF,
default_config: Vec<DefaultConfig>,
dimensions: Vec<DimensionWithMandatory>,
Expand All @@ -70,7 +77,7 @@ pub fn experiment_form<NF>(
where
NF: Fn() + 'static + Clone,
{
let init_variants = get_init_state(&variants);
let init_variants = get_init_state(&variants, overrides);
let default_config = StoredValue::new(default_config);
let tenant_rws = use_context::<RwSignal<Tenant>>().unwrap();
let org_rws = use_context::<RwSignal<OrganisationId>>().unwrap();
Expand Down
71 changes: 70 additions & 1 deletion crates/frontend/src/pages/context_override.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ use superposition_types::{
Config, Context,
};

use crate::components::button::Button;
use crate::components::context_card::ContextCard;
use crate::components::context_form::utils::{create_context, update_context};
use crate::components::context_form::ContextForm;
use crate::components::delete_modal::DeleteModal;
use crate::components::drawer::{close_drawer, open_drawer, Drawer, DrawerBtn};
use crate::components::experiment_form::ExperimentForm;
use crate::components::override_form::OverrideForm;
use crate::components::skeleton::{Skeleton, SkeletonVariant};
use crate::logic::{Condition, Conditions};
Expand All @@ -25,6 +25,7 @@ use crate::{
types::{OrganisationId, Tenant},
};
use crate::{components::alert::AlertType, schema::SchemaType};
use crate::{components::button::Button, types::VariantFormTs};

#[derive(Clone, Debug, Default)]
pub struct Data {
Expand Down Expand Up @@ -277,6 +278,32 @@ pub fn context_override() -> impl IntoView {
}
};
});
let handle_submit_experiment_form = move || {
page_resource.refetch();
close_drawer("create_exp_drawer");
};

let handle_create_experiment =
Callback::new(move |data: (Context, Map<String, Value>)| {
let (context, overrides) = data;

match Conditions::from_context_json(&context.condition.into()) {
Ok(conditions) => {
selected_context_ws.set(Some(Data {
context: conditions,
overrides: overrides
.into_iter()
.collect::<Vec<(String, Value)>>(),
}));

open_drawer("create_exp_drawer");
}
Err(e) => {
logging::error!("Error parsing context: {}", e);
enqueue_alert(e.to_string(), AlertType::Error, 5000);
}
};
});

let on_context_clone = Callback::new(move |data: (Context, Map<String, Value>)| {
let (context, overrides) = data;
Expand Down Expand Up @@ -342,6 +369,47 @@ pub fn context_override() -> impl IntoView {
}>
<div class="space-y-6">

{move || {
let PageResource { config: _, dimensions, default_config } = page_resource
.get()
.unwrap_or_default();
let data = selected_context_rs.get();
view! {
<Drawer
id="create_exp_drawer".to_string()
header="Create Experiment"
handle_close=move || {
close_drawer("create_exp_drawer");
selected_context_ws.set(None);
}
>

<EditorProvider>
{match data {
Some(data) => {
view! {
<ExperimentForm
name="".to_string()
context=data.context
variants=VariantFormTs::default()
overrides=data.overrides
dimensions=dimensions
default_config=default_config
handle_submit=handle_submit_experiment_form
/>
}
.into_view()
}
None => {
view! {}.into_view()
}
}}

</EditorProvider>
</Drawer>
}
}}

{move || {
let PageResource { config: _, dimensions, default_config } = page_resource
.get()
Expand Down Expand Up @@ -450,6 +518,7 @@ pub fn context_override() -> impl IntoView {
<ContextCard
context=context
overrides=overrides
handle_create_experiment=handle_create_experiment
handle_edit=on_context_edit
handle_clone=on_context_clone
handle_delete=on_context_delete
Expand Down
1 change: 1 addition & 0 deletions crates/frontend/src/pages/experiment.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ pub fn experiment_page() -> impl IntoView {
id=experiment.id
name=experiment_ef.name
context=experiment_ef.context.clone()
overrides=vec![]
variants=FromIterator::from_iter(experiment_ef.variants)
default_config=default_config
dimensions=dimensions
Expand Down
1 change: 1 addition & 0 deletions crates/frontend/src/pages/experiment_list.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ pub fn experiment_list() -> impl IntoView {
name="".to_string()
context=Conditions::default()
variants=VariantFormTs::default()
overrides=vec![]
dimensions=dim.clone()
default_config=def_conf.clone()
handle_submit=handle_submit_experiment_form
Expand Down

0 comments on commit 733caf4

Please sign in to comment.