Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
253 changes: 156 additions & 97 deletions crates/frontend/src/api.rs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion crates/frontend/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ pub fn app(app_envs: Envs) -> impl IntoView {
}
/>

<Route ssr=SsrMode::Async path="/admin/:org_id/:tenant" view=Layout>
<Route ssr=SsrMode::Async path="/admin/:org_id/:workspace" view=Layout>
<Route ssr=SsrMode::Async path="dimensions" view=Dimensions />
<Route ssr=SsrMode::Async path="dimensions/create" view=CreateDimension />
<Route
Expand Down
4 changes: 2 additions & 2 deletions crates/frontend/src/components/cohort_schema.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use crate::components::context_form::ConditionInput;
use crate::logic::{jsonlogic, Condition, Conditions, Operator};
use crate::providers::editor_provider::EditorProvider;
use crate::schema::{EnumVariants, JsonSchemaType, SchemaType};
use crate::types::{OrganisationId, Tenant};
use crate::types::{OrganisationId, Workspace};
use crate::utils::{to_title_case, value_compute_fn_generator};
use crate::{
components::{
Expand Down Expand Up @@ -416,7 +416,7 @@ fn cohort_form(
cohort_based_on: DimensionResponse,
#[prop(default = false)] edit: bool,
) -> impl IntoView {
let workspace = use_context::<Signal<Tenant>>().unwrap();
let workspace = use_context::<Signal<Workspace>>().unwrap();
let org_id = use_context::<Signal<OrganisationId>>().unwrap();

let cohort_name_rws = RwSignal::new(cohort_name.clone());
Expand Down
4 changes: 2 additions & 2 deletions crates/frontend/src/components/context_form.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use crate::components::input::{Input, InputType};
use crate::components::tooltip::{Tooltip, TooltipPosition};
use crate::logic::{Condition, Conditions, Expression, Operator};
use crate::schema::EnumVariants;
use crate::types::{OrganisationId, Tenant, ValueComputeCallbacks};
use crate::types::{OrganisationId, ValueComputeCallbacks, Workspace};
use crate::utils::value_compute_fn_generator;
use crate::{
components::dropdown::{Dropdown, DropdownDirection},
Expand Down Expand Up @@ -252,7 +252,7 @@ pub fn context_form(
#[prop(default = DropdownDirection::Down)] dropdown_direction: DropdownDirection,
#[prop(into)] on_context_change: Callback<Conditions, ()>,
) -> impl IntoView {
let workspace = use_context::<Signal<Tenant>>().unwrap();
let workspace = use_context::<Signal<Workspace>>().unwrap();
let org_id = use_context::<Signal<OrganisationId>>().unwrap();

let dimensions = StoredValue::new(dimensions);
Expand Down
10 changes: 5 additions & 5 deletions crates/frontend/src/components/default_config_form.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ use crate::{
};
use crate::{
providers::{alert_provider::enqueue_alert, editor_provider::EditorProvider},
types::{OrganisationId, Tenant},
types::{OrganisationId, Workspace},
};

use self::utils::{create_default_config, update_default_config};
Expand Down Expand Up @@ -68,7 +68,7 @@ pub fn default_config_form(
#[prop(default = String::new())] description: String,
#[prop(into)] handle_submit: Callback<()>,
) -> impl IntoView {
let workspace = use_context::<Signal<Tenant>>().unwrap();
let workspace = use_context::<Signal<Workspace>>().unwrap();
let org = use_context::<Signal<OrganisationId>>().unwrap();

let (config_key_rs, config_key_ws) = create_signal(
Expand Down Expand Up @@ -168,15 +168,15 @@ pub fn default_config_form(
}
}
_ => create_default_config(
workspace.0,
org.0,
config_key_rs.get_untracked(),
f_value,
f_schema,
fun_name,
value_compute_fn,
description,
change_reason,
&workspace,
&org,
)
.await
.map(|_| ResponseType::Response),
Expand Down Expand Up @@ -539,7 +539,7 @@ pub fn change_log_summary(
#[prop(into)] on_close: Callback<()>,
#[prop(into, default = Signal::derive(|| false))] inprogress: Signal<bool>,
) -> impl IntoView {
let workspace = use_context::<Signal<Tenant>>().unwrap();
let workspace = use_context::<Signal<Workspace>>().unwrap();
let org = use_context::<Signal<OrganisationId>>().unwrap();

let default_config = create_local_resource(
Expand Down
10 changes: 5 additions & 5 deletions crates/frontend/src/components/default_config_form/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ use crate::utils::{

#[allow(clippy::too_many_arguments)]
pub async fn create_default_config(
tenant: String,
org_id: String,
key: String,
value: Value,
schema: Value,
value_validation_function_name: Option<String>,
value_compute_function_name: Option<String>,
description: String,
change_reason: String,
workspace: &str,
org_id: &str,
) -> Result<serde_json::Value, String> {
let payload = DefaultConfigCreateRequest {
key: DefaultConfigKey::try_from(key)?,
Expand All @@ -39,7 +39,7 @@ pub async fn create_default_config(
url,
reqwest::Method::POST,
Some(payload),
construct_request_headers(&[("x-tenant", &tenant), ("x-org-id", &org_id)])?,
construct_request_headers(&[("x-workspace", workspace), ("x-org-id", org_id)])?,
)
.await?;

Expand Down Expand Up @@ -67,7 +67,7 @@ pub fn try_update_payload(
pub async fn update_default_config(
key: String,
update_payload: DefaultConfigUpdateRequest,
tenant: &str,
workspace: &str,
org_id: &str,
) -> Result<serde_json::Value, String> {
let host = use_host_server();
Expand All @@ -77,7 +77,7 @@ pub async fn update_default_config(
url,
reqwest::Method::PATCH,
Some(update_payload),
construct_request_headers(&[("x-tenant", tenant), ("x-org-id", org_id)])?,
construct_request_headers(&[("x-workspace", workspace), ("x-org-id", org_id)])?,
)
.await?;

Expand Down
16 changes: 9 additions & 7 deletions crates/frontend/src/components/dimension_form.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use crate::components::{
use crate::providers::alert_provider::enqueue_alert;
use crate::providers::editor_provider::EditorProvider;
use crate::schema::{JsonSchemaType, SchemaType};
use crate::types::{DimensionTypeOptions, FunctionsName, OrganisationId, Tenant};
use crate::types::{DimensionTypeOptions, FunctionsName, OrganisationId, Workspace};
use crate::utils::set_function;
use crate::{
api::{dimensions, fetch_functions, fetch_types},
Expand Down Expand Up @@ -66,7 +66,7 @@ pub fn dimension_form(
#[prop(optional)] dimensions: Option<Vec<DimensionResponse>>,
#[prop(into)] redirect_url_cancel: String,
) -> impl IntoView {
let workspace = use_context::<Signal<Tenant>>().unwrap();
let workspace = use_context::<Signal<Workspace>>().unwrap();
let org = use_context::<Signal<OrganisationId>>().unwrap();

let (position_rs, position_ws) = create_signal(position);
Expand Down Expand Up @@ -155,13 +155,15 @@ pub fn dimension_form(

spawn_local({
async move {
let workspace = workspace.get_untracked();
let org = org.get_untracked();
let result = match (edit, update_request_rws.get_untracked()) {
(true, Some((_, update_payload))) => {
let future = dimensions::update(
workspace.get_untracked().0,
dimension_name,
update_payload,
org.get_untracked().0,
&workspace,
&org,
);
update_request_rws.set(None);
future.await.map(|_| ResponseType::Response)
Expand Down Expand Up @@ -191,9 +193,9 @@ pub fn dimension_form(
value_compute_function_name,
description_rs.get_untracked(),
change_reason_rs.get_untracked(),
workspace.get_untracked().0,
org.get_untracked().0,
dimension_type,
&workspace,
&org,
)
.await
.map(|_| ResponseType::Response),
Expand Down Expand Up @@ -616,7 +618,7 @@ pub fn change_log_summary(
#[prop(into)] on_close: Callback<()>,
#[prop(into, default = Signal::derive(|| false))] inprogress: Signal<bool>,
) -> impl IntoView {
let workspace = use_context::<Signal<Tenant>>().unwrap();
let workspace = use_context::<Signal<Workspace>>().unwrap();
let org = use_context::<Signal<OrganisationId>>().unwrap();

let dimension = create_local_resource(
Expand Down
35 changes: 25 additions & 10 deletions crates/frontend/src/components/experiment_action_form.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::{
},
pages::experiment::PopupType,
providers::alert_provider::enqueue_alert,
types::{OrganisationId, Tenant},
types::{OrganisationId, Workspace},
};

fn change_reason(popup_type: &PopupType) -> String {
Expand All @@ -27,7 +27,7 @@ pub fn experiment_action_form(
#[prop(into)] handle_submit: Callback<(), ()>,
#[prop(into)] handle_close: Callback<(), ()>,
) -> impl IntoView {
let workspace = use_context::<Signal<Tenant>>().unwrap();
let workspace = use_context::<Signal<Workspace>>().unwrap();
let org = use_context::<Signal<OrganisationId>>().unwrap();
let (change_reason_rs, change_reason_ws) = create_signal(change_reason(&popup_type));
let (req_inprogress_rs, req_inprogress_ws) = create_signal(false);
Expand Down Expand Up @@ -76,28 +76,43 @@ pub fn experiment_action_form(
let change_reason_value = change_reason_rs.get();

spawn_local(async move {
let tenant = workspace.get_untracked().0;
let workspace = workspace.get_untracked().0;
let org = org.get_untracked().0;

let result = match popup_type {
PopupType::ExperimentPause => {
pause_experiment(&experiment_id, change_reason_value, &tenant, &org)
.await
pause_experiment(
&experiment_id,
change_reason_value,
&workspace,
&org,
)
.await
}
PopupType::ExperimentResume => {
resume_experiment(&experiment_id, change_reason_value, &tenant, &org)
.await
resume_experiment(
&experiment_id,
change_reason_value,
&workspace,
&org,
)
.await
}
PopupType::ExperimentDiscard => {
discard_experiment(&experiment_id, change_reason_value, &tenant, &org)
.await
discard_experiment(
&experiment_id,
change_reason_value,
&workspace,
&org,
)
.await
}
PopupType::ExperimentStart => {
ramp_experiment(
&experiment_id,
0,
Some(change_reason_value),
&tenant,
&workspace,
&org,
)
.await
Expand Down
14 changes: 7 additions & 7 deletions crates/frontend/src/components/experiment_conclude_form.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ use crate::{
api::discard_experiment,
components::{alert::AlertType, change_form::ChangeForm},
providers::alert_provider::enqueue_alert,
types::{OrganisationId, Tenant},
types::{OrganisationId, Workspace},
};

#[component]
pub fn experiment_conclude_form(
experiment: ExperimentResponse,
#[prop(into)] handle_submit: Callback<(), ()>,
) -> impl IntoView {
let workspace = use_context::<Signal<Tenant>>().unwrap();
let workspace = use_context::<Signal<Workspace>>().unwrap();
let org = use_context::<Signal<OrganisationId>>().unwrap();
let experiment = StoredValue::new(experiment);
let (change_reason_rs, change_reason_ws) = create_signal(String::new());
Expand All @@ -28,14 +28,14 @@ pub fn experiment_conclude_form(
let handle_conclude_experiment = move |variant_id: String| {
req_inprogess_rws.set(true);
spawn_local(async move {
let tenant = workspace.get_untracked().0;
let workspace = workspace.get_untracked().0;
let org = org.get_untracked().0;
let result = conclude_experiment(
experiment.with_value(|e| e.id.clone()),
variant_id,
&tenant,
&org,
change_reason_rs.get_untracked(),
&workspace,
&org,
)
.await;

Expand Down Expand Up @@ -64,13 +64,13 @@ pub fn experiment_conclude_form(

let handle_discard_experiment = move |change_reason: String| {
req_inprogess_rws.set(true);
let tenant = workspace.get_untracked().0;
let workspace = workspace.get_untracked().0;
let org = org.get_untracked().0;
spawn_local(async move {
let result = discard_experiment(
&experiment.with_value(|e| e.id.clone()),
change_reason,
&tenant,
&workspace,
&org,
)
.await;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ use crate::{
pub async fn conclude_experiment(
exp_id: String,
variant_id: String,
tenant: &str,
org_id: &str,
change_reason: String,
workspace: &str,
org_id: &str,
) -> Result<Result<ExperimentResponse, String>, String> {
let payload = ConcludeExperimentRequest {
change_reason: ChangeReason::try_from(change_reason)?,
Expand All @@ -34,7 +34,7 @@ pub async fn conclude_experiment(
url,
reqwest::Method::PATCH,
Some(payload),
construct_request_headers(&[("x-tenant", tenant), ("x-org-id", org_id)])?,
construct_request_headers(&[("x-workspace", workspace), ("x-org-id", org_id)])?,
&[StatusCode::PRECONDITION_FAILED],
)
.await?;
Expand Down
Loading
Loading