Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: moved forms to pages and added breadcrumbs for navigation #281

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
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
13 changes: 13 additions & 0 deletions crates/context_aware_config/src/api/default_config/handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ pub fn endpoints() -> Scope {
.service(update_default_config)
.service(get)
.service(delete)
.service(get_by_name)
}

#[post("")]
Expand Down Expand Up @@ -315,6 +316,18 @@ fn fetch_default_key(
Ok(res)
}

#[get("/{key}")]
async fn get_by_name(
db_conn: DbConnection,
path: Path<DefaultConfigKey>,
schema_name: SchemaName,
) -> superposition::Result<Json<models::DefaultConfig>> {
let DbConnection(mut conn) = db_conn;
let key: String = path.into_inner().into();
let data = fetch_default_key(&key, &mut conn, &schema_name)?;
Ok(Json(data))
}

#[get("")]
async fn get(
db_conn: DbConnection,
Expand Down
27 changes: 27 additions & 0 deletions crates/context_aware_config/src/api/dimension/handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ pub fn endpoints() -> Scope {
.service(create)
.service(update)
.service(get)
.service(get_by_name)
.service(delete_dimension)
}

Expand Down Expand Up @@ -308,6 +309,32 @@ async fn get(
}))
}

#[get("/{name}")]
async fn get_by_name(
db_conn: DbConnection,
path: Path<String>,
schema_name: SchemaName,
) -> superposition::Result<HttpResponse> {
use superposition_types::database::{
models::cac::Dimension,
schema::dimensions::{self, dsl},
};
let DbConnection(mut conn) = db_conn;
let name: String = path.into_inner().into();
let res = dsl::dimensions
.filter(dimensions::dimension.eq(name))
.select(Dimension::as_select())
.get_result(&mut conn)?;

let workspace_settings = get_workspace(&schema_name, &mut conn)?;

let mandatory_dimensions =
workspace_settings.mandatory_dimensions.unwrap_or_default();
let is_mandatory = mandatory_dimensions.contains(&res.dimension);

Ok(HttpResponse::Ok().json(DimensionWithMandatory::new(res, is_mandatory)))
}

#[delete("/{name}")]
async fn delete_dimension(
path: Path<DeleteReq>,
Expand Down
15 changes: 15 additions & 0 deletions crates/context_aware_config/src/api/type_templates/handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ pub fn endpoints() -> Scope {
.service(create_type)
.service(update_type)
.service(delete_type)
.service(get_type)
}

#[post("")]
Expand Down Expand Up @@ -200,3 +201,17 @@ async fn list_types(
data: custom_types,
}))
}

#[get("/{type_name}")]
async fn get_type(
db_conn: DbConnection,
path: Path<TypeTemplateName>,
) -> superposition::Result<HttpResponse> {
let DbConnection(mut conn) = db_conn;
let type_name: String = path.into_inner().into();

let custom_type = dsl::type_templates
.find(type_name)
.get_result::<TypeTemplate>(&mut conn)?;
Ok(HttpResponse::Ok().json(custom_type))
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ use super::{
types::{
ApplicableVariantsQuery, AuditQueryFilters, ConcludeExperimentRequest,
ContextAction, ContextBulkResponse, ContextMoveReq, ContextPutReq,
ExperimentCreateRequest, ExperimentCreateResponse, ExperimentListFilters,
ExperimentResponse, OverrideKeysUpdateRequest, RampRequest,
ExperimentCreateRequest, ExperimentListFilters, ExperimentResponse,
OverrideKeysUpdateRequest, RampRequest,
},
};
use crate::api::experiments::{helpers::construct_header_map, types::ExperimentSortOn};
Expand Down Expand Up @@ -309,7 +309,7 @@ async fn create(
.get_results(&mut conn)?;

let inserted_experiment: Experiment = inserted_experiments.remove(0);
let response = ExperimentCreateResponse::from(inserted_experiment.clone());
let response = ExperimentResponse::from(inserted_experiment.clone());
if let WebhookConfig::Enabled(experiments_webhook_config) =
&tenant_config.experiments_webhook_config
{
Expand Down
13 changes: 0 additions & 13 deletions crates/experimentation_platform/src/api/experiments/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,6 @@ pub struct ExperimentCreateRequest {
pub change_reason: String,
}

#[derive(Serialize)]
pub struct ExperimentCreateResponse {
pub experiment_id: String,
}

impl From<Experiment> for ExperimentCreateResponse {
fn from(experiment: Experiment) -> Self {
Self {
experiment_id: experiment.id.to_string(),
}
}
}

/********** Experiment Response Type **************/
// Same as models::Experiments but `id` field is String
// JS have limitation of 53-bit integers, so on
Expand Down
98 changes: 87 additions & 11 deletions crates/frontend/src/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ use superposition_types::{
custom_query::PaginationParams,
database::{
models::{
cac::{ConfigVersion, DefaultConfig, Function, TypeTemplate},
cac::{
ConfigVersion, Context, DefaultConfig, Dimension, Function, TypeTemplate,
},
Workspace,
},
types::DimensionWithMandatory,
Expand All @@ -22,16 +24,16 @@ use crate::{
// #[server(GetDimensions, "/fxn", "GetJson")]
pub async fn fetch_dimensions(
filters: &PaginationParams,
tenant: String,
org_id: String,
tenant: &str,
org_id: &str,
) -> Result<PaginatedResponse<DimensionWithMandatory>, ServerFnError> {
let client = reqwest::Client::new();
let host = use_host_server();

let url = format!("{}/dimension?{}", host, filters.to_string());
let response: PaginatedResponse<DimensionWithMandatory> = client
.get(url)
.header("x-tenant", &tenant)
.header("x-tenant", tenant)
.header("x-org-id", org_id)
.send()
.await
Expand All @@ -46,8 +48,8 @@ pub async fn fetch_dimensions(
// #[server(GetDefaultConfig, "/fxn", "GetJson")]
pub async fn fetch_default_config(
filters: &PaginationParams,
tenant: String,
org_id: String,
tenant: &str,
org_id: &str,
) -> Result<PaginatedResponse<DefaultConfig>, ServerFnError> {
let client = reqwest::Client::new();
let host = use_host_server();
Expand Down Expand Up @@ -90,8 +92,8 @@ pub async fn fetch_snapshots(
}

pub async fn delete_context(
tenant: String,
context_id: String,
tenant: String,
org_id: String,
) -> Result<(), ServerFnError> {
let client = reqwest::Client::new();
Expand Down Expand Up @@ -200,7 +202,7 @@ pub async fn fetch_function(

// #[server(GetConfig, "/fxn", "GetJson")]
pub async fn fetch_config(
tenant: String,
tenant: &str,
version: Option<String>,
org_id: String,
) -> Result<Config, ServerFnError> {
Expand Down Expand Up @@ -231,9 +233,9 @@ pub async fn fetch_config(

// #[server(GetExperiment, "/fxn", "GetJson")]
pub async fn fetch_experiment(
exp_id: String,
tenant: String,
org_id: String,
exp_id: &str,
tenant: &str,
org_id: &str,
) -> Result<ExperimentResponse, ServerFnError> {
let client = reqwest::Client::new();
let host = use_host_server();
Expand Down Expand Up @@ -352,3 +354,77 @@ pub async fn fetch_workspaces(
.map_err(|e| ServerFnError::new(e.to_string()))?;
Ok(response)
}

pub async fn fetch_type(tenant: &str, name: &str) -> Result<TypeTemplate, ServerFnError> {
let host = use_host_server();
let url = format!("{host}/types/{name}");
let err_handler = |e: String| ServerFnError::new(e.to_string());
let response = request::<()>(
url,
reqwest::Method::GET,
None,
construct_request_headers(&[("x-tenant", &tenant)]).map_err(err_handler)?,
)
.await
.map_err(err_handler)?;
parse_json_response::<TypeTemplate>(response)
.await
.map_err(err_handler)
}

pub async fn fetch_context(tenant: &str, id: &str) -> Result<Context, ServerFnError> {
let host = use_host_server();
let url = format!("{host}/context/{id}");
let err_handler = |e: String| ServerFnError::new(e.to_string());
let response = request::<()>(
url,
reqwest::Method::GET,
None,
construct_request_headers(&[("x-tenant", &tenant)]).map_err(err_handler)?,
)
.await
.map_err(err_handler)?;
parse_json_response::<Context>(response)
.await
.map_err(err_handler)
}

pub async fn fetch_default_config_key(
tenant: &str,
key: &str,
) -> Result<DefaultConfig, ServerFnError> {
let host = use_host_server();
let url = format!("{host}/default-config/{key}");
let err_handler = |e: String| ServerFnError::new(e.to_string());
let response = request::<()>(
url,
reqwest::Method::GET,
None,
construct_request_headers(&[("x-tenant", &tenant)]).map_err(err_handler)?,
)
.await
.map_err(err_handler)?;
parse_json_response::<DefaultConfig>(response)
.await
.map_err(err_handler)
}

pub async fn fetch_dimension(
tenant: &str,
name: &str,
) -> Result<Dimension, ServerFnError> {
let host = use_host_server();
let url = format!("{host}/dimension/{name}");
let err_handler = |e: String| ServerFnError::new(e.to_string());
let response = request::<()>(
url,
reqwest::Method::GET,
None,
construct_request_headers(&[("x-tenant", &tenant)]).map_err(err_handler)?,
)
.await
.map_err(err_handler)?;
parse_json_response::<Dimension>(response)
.await
.map_err(err_handler)
}
Loading
Loading