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.

Sign up for GitHub

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

Jump to bottom

feat: improved error communication on frontend, with toast component #12

Merged
merged 3 commits into from
May 3, 2024
Merged

feat: improved error communication on frontend, with toast component #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b161db4
feat: added toast component
ShubhranshuSanjeev Apr 28, 2024
11811fc
refactor: refactored http calls to `request` fxn
ShubhranshuSanjeev Apr 29, 2024
26c8004
chore: formatted code with leptosfmt and rustfmt
ShubhranshuSanjeev May 2, 2024
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions crates/context_aware_config/src/api/context/handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ use diesel::{
};
use jsonschema::{Draft, JSONSchema, ValidationError};
use serde_json::{from_value, json, Map, Value};
use service_utils::helpers::validation_err_to_str;
use service_utils::service::types::DbConnection;
use service_utils::{db_error, not_found, unexpected_error, validation_error};
use std::collections::HashMap;
Expand Down Expand Up @@ -164,8 +165,10 @@ fn validate_override_with_default_configs(
let verrors = e.collect::<Vec<ValidationError>>();
log::error!("({key}) config key validation error: {:?}", verrors);
return Err(validation_error!(
"schema validation failed for {key} with error {:?}",
verrors
"schema validation failed for {key}: {}",
validation_err_to_str(verrors)
.first()
.unwrap_or(&String::new())
));
};
}
Expand Down
8 changes: 5 additions & 3 deletions crates/context_aware_config/src/api/default_config/handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
extern crate base64;
use super::types::CreateReq;
use service_utils::helpers::validation_err_to_str;
use service_utils::{bad_argument, unexpected_error, validation_error};

use superposition_types::{SuperpositionUser, User};
Expand Down Expand Up @@ -118,9 +119,10 @@ async fn create(
verrors
);
return Err(validation_error!(
"Schema validation failed for key {} with error {:?}",
default_config.key,
verrors
"Schema validation failed: {}",
&validation_err_to_str(verrors)
.first()
.unwrap_or(&String::new())
));
}

Expand Down
30 changes: 19 additions & 11 deletions crates/context_aware_config/src/helpers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ use actix_web::http::header::{HeaderMap, HeaderName, HeaderValue};
use itertools::{self, Itertools};
use jsonschema::{Draft, JSONSchema, ValidationError};
use serde_json::{json, Value};
use service_utils::{result as superposition, validation_error};
use service_utils::{
helpers::validation_err_to_str, result as superposition, validation_error,
};
use std::collections::HashMap;

pub fn get_default_config_validation_schema() -> JSONSchema {
Expand Down Expand Up @@ -168,9 +170,11 @@ pub fn validate_context_jsonschema(
verrors
);
Err(validation_error!(
"failed to validate dimension value {:?} with error: {:?}",
dimension_value,
verrors
"failed to validate dimension value {}: {}",
dimension_value.to_string(),
validation_err_to_str(verrors)
.first()
.unwrap_or(&String::new())
))
}
}
Expand All @@ -179,14 +183,16 @@ pub fn validate_context_jsonschema(
_ => dimension_schema.validate(dimension_value).map_err(|e| {
let verrors = e.collect::<Vec<ValidationError>>();
log::error!(
"failed to validate dimension value {:?} with error : {:?}",
dimension_value,
"failed to validate dimension value {}: {:?}",
dimension_value.to_string(),
verrors
);
validation_error!(
"failed to validate dimension value {:?} with error: {:?}",
dimension_value,
verrors
"failed to validate dimension value {}: {}",
dimension_value.to_string(),
validation_err_to_str(verrors)
.first()
.unwrap_or(&String::new())
)
}),
}
Expand All @@ -209,8 +215,10 @@ pub fn validate_jsonschema(
//TODO: Try & render as json.
let verrors = e.collect::<Vec<ValidationError>>();
Err(validation_error!(
"schema validation failed: {:?}",
verrors.as_slice()
"schema validation failed: {}",
validation_err_to_str(verrors)
.first()
.unwrap_or(&String::new())
))
}
};
Expand Down
3 changes: 2 additions & 1 deletion crates/frontend/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ strum_macros = { workspace = true }
strum = { workspace = true }
js-sys = "0.3.65"
url = "2.5.0"
once_cell = { workspace = true }


[features]
Expand All @@ -42,4 +43,4 @@ ssr = [
"leptos/ssr",
"leptos_meta/ssr",
"leptos_router/ssr",
]
]
207 changes: 105 additions & 102 deletions crates/frontend/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use crate::pages::{
ContextOverride::context_override::ContextOverride, Experiment::ExperimentPage,
Home::Home::Home,
};
use crate::providers::alert_provider::AlertProvider;
use crate::types::Envs;

#[component]
Expand Down Expand Up @@ -87,127 +88,129 @@ pub fn App(app_envs: Envs) -> impl IntoView {
<script type_="text/javascript">"__APP_ENVS=" {json!(app_envs).to_string()}</script>
<Router base=service_prefix>
<body class="m-0 min-h-screen bg-gray-50 font-mono">
<Routes base=service_prefix.to_string()>
<Route
ssr=SsrMode::Async
path="/admin/:tenant/dimensions"
view=move || {
view! {
<Layout>
<Dimensions/>
</Layout>
<AlertProvider>
<Routes base=service_prefix.to_string()>
<Route
ssr=SsrMode::Async
path="/admin/:tenant/dimensions"
view=move || {
view! {
<Layout>
<Dimensions/>
</Layout>
}
}
}
/>
/>

<Route
ssr=SsrMode::Async
path="/admin/:tenant/function"
view=move || {
view! {
<Layout>
<FunctionList/>
</Layout>
<Route
ssr=SsrMode::Async
path="/admin/:tenant/function"
view=move || {
view! {
<Layout>
<FunctionList/>
</Layout>
}
}
}
/>
/>

<Route
ssr=SsrMode::Async
path="/admin/:tenant/function/create"
view=move || {
view! {
<Layout>
<CreateFunctionView/>
</Layout>
<Route
ssr=SsrMode::Async
path="/admin/:tenant/function/create"
view=move || {
view! {
<Layout>
<CreateFunctionView/>
</Layout>
}
}
}
/>
/>

<Route
ssr=SsrMode::Async
path="/admin/:tenant/function/:function_name"
view=move || {
view! {
<Layout>
<FunctionPage/>
</Layout>
<Route
ssr=SsrMode::Async
path="/admin/:tenant/function/:function_name"
view=move || {
view! {
<Layout>
<FunctionPage/>
</Layout>
}
}
}
/>
/>

<Route
ssr=SsrMode::Async
path="/admin/:tenant/experiments"
view=move || {
view! {
<Layout>
<ExperimentList/>
</Layout>
<Route
ssr=SsrMode::Async
path="/admin/:tenant/experiments"
view=move || {
view! {
<Layout>
<ExperimentList/>
</Layout>
}
}
}
/>
/>

<Route
ssr=SsrMode::Async
path="/admin/:tenant/experiments/:id"
view=move || {
view! {
<Layout>
<ExperimentPage/>
</Layout>
<Route
ssr=SsrMode::Async
path="/admin/:tenant/experiments/:id"
view=move || {
view! {
<Layout>
<ExperimentPage/>
</Layout>
}
}
}
/>
/>

<Route
ssr=SsrMode::Async
path="/admin/:tenant/default-config"
view=move || {
view! {
<Layout>
<DefaultConfig/>
</Layout>
<Route
ssr=SsrMode::Async
path="/admin/:tenant/default-config"
view=move || {
view! {
<Layout>
<DefaultConfig/>
</Layout>
}
}
}
/>
/>

<Route
ssr=SsrMode::Async
path="/admin/:tenant/overrides"
view=move || {
view! {
<Layout>
<ContextOverride/>
</Layout>
<Route
ssr=SsrMode::Async
path="/admin/:tenant/overrides"
view=move || {
view! {
<Layout>
<ContextOverride/>
</Layout>
}
}
}
/>
/>

<Route
ssr=SsrMode::Async
path="/admin/:tenant/resolve"
view=move || {
view! {
<Layout>
<Home/>
</Layout>
<Route
ssr=SsrMode::Async
path="/admin/:tenant/resolve"
view=move || {
view! {
<Layout>
<Home/>
</Layout>
}
}
}
/>
/>

// <Route
// path="/*any"
// view=move || {
// view! {
// <Layout>
// <NotFound/>
// </Layout>
// }
// }
// />
// <Route
// path="/*any"
// view=move || {
// view! {
// <Layout>
// <NotFound/>
// </Layout>
// }
// }
// />

</Routes>
</Routes>
</AlertProvider>
</body>
</Router>

Expand Down
Loading
Loading