fix: Frontend related issues and warnings

juspay · Sep 20, 2024 · f962d75 · f962d75
1 parent 54f2037
commit f962d75
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 31 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.78.0 as builder
+FROM rust:1.76.0 as builder
 
 WORKDIR /build
 

diff --git a/crates/frontend/src/api.rs b/crates/frontend/src/api.rs
@@ -2,8 +2,8 @@ use leptos::ServerFnError;
 
 use crate::{
     types::{
-        Config, DefaultConfig, Dimension, Experiment, ExperimentResponse,
-        ExperimentsResponse, FetchTypeTemplateResponse, FunctionResponse, ListFilters,
+        Config, DefaultConfig, Dimension, ExperimentResponse, ExperimentsResponse,
+        FetchTypeTemplateResponse, FunctionResponse, ListFilters,
     },
     utils::{
         construct_request_headers, get_host, parse_json_response, request,

diff --git a/crates/frontend/src/components/default_config_form.rs b/crates/frontend/src/components/default_config_form.rs
@@ -141,7 +141,7 @@ where
                     type="text"
                     placeholder="Key"
                     class="input input-bordered w-full max-w-md"
-                    value=config_key.get()
+                    value=config_key.get_untracked()
                     on:change=move |ev| {
                         let value = event_target_value(&ev);
                         set_config_key.set(value);

diff --git a/crates/frontend/src/components/experiment_ramp_form.rs b/crates/frontend/src/components/experiment_ramp_form.rs
@@ -19,6 +19,7 @@ where
     let (traffic, set_traffic) = create_signal(experiment.traffic_percentage);
     let tenant_rs = use_context::<ReadSignal<String>>().unwrap();
     let (req_inprogess_rs, req_inprogress_ws) = create_signal(false);
+    let range_max = 100 / experiment.variants.len();
     let experiment_rc = Rc::new(experiment);
     let handle_ramp_experiment = move |event: MouseEvent| {
         req_inprogress_ws.set(true);
@@ -41,7 +42,7 @@ where
             <input
                 type="range"
                 min="0"
-                max="100"
+                max={range_max.to_string()}
                 value=move || traffic.get()
                 class="range"
                 on:input=move |event| {

diff --git a/crates/frontend/src/components/side_nav.rs b/crates/frontend/src/components/side_nav.rs
@@ -65,7 +65,7 @@ pub fn side_nav(
     let tenant_rs = use_context::<ReadSignal<String>>().unwrap();
     let tenant_ws = use_context::<WriteSignal<String>>().unwrap();
     let (app_routes, set_app_routes) =
-        create_signal(create_routes(tenant_rs.get().as_str()));
+        create_signal(create_routes(tenant_rs.get_untracked().as_str()));
 
     let resolved_path = create_rw_signal(resolved_path);
     let original_path = create_rw_signal(original_path);

diff --git a/crates/frontend/src/hoc/layout.rs b/crates/frontend/src/hoc/layout.rs
@@ -8,14 +8,14 @@ use leptos_router::*;
 pub fn use_tenant() -> String {
     let params_map = use_params_map();
     let route_context = use_route();
-    logging::log!("use_route-params_map {:?}", params_map.get());
+    logging::log!("use_route-params_map {:?}", params_map.get_untracked());
     logging::log!(
         "use_route-original_path {:?}",
         route_context.original_path()
     );
     logging::log!("use_route-path {:?}", route_context.path());
 
-    match params_map.get().get("tenant") {
+    match params_map.get_untracked().get("tenant") {
         Some(tenant) => tenant.clone(),
         None => String::from("no-tenant"),
     }

diff --git a/crates/frontend/src/pages/context_override.rs b/crates/frontend/src/pages/context_override.rs
@@ -285,7 +285,7 @@ pub fn context_override() -> impl IntoView {
                             >
 
                                 <EditorProvider>
-                                    {match (form_mode.get(), data) {
+                                    {match (form_mode.get_untracked(), data) {
                                         (Some(FormMode::Edit), Some(data)) => {
                                             view! {
                                                 <Form

diff --git a/crates/frontend/src/pages/default_config.rs b/crates/frontend/src/pages/default_config.rs
@@ -38,11 +38,16 @@ pub fn default_config() -> impl IntoView {
 
     let selected_config = create_rw_signal::<Option<RowData>>(None);
     let key_prefix = create_rw_signal::<Option<String>>(None);
-    let enable_grouping =
-        create_rw_signal(get_local_storage::<bool>("enable_grouping").unwrap_or(false));
+    let enable_grouping = create_rw_signal(false);
     let query_params = use_query_map();
     let bread_crums = Signal::derive(move || get_bread_crums(key_prefix.get()));
 
+    create_effect(move |_| {
+        let enable_grouping_val =
+            get_local_storage::<bool>("enable_grouping").unwrap_or(false);
+        enable_grouping.set(enable_grouping_val);
+    });
+
     create_effect(move |_| {
         let query_params_map = query_params.try_get();
         if let Some(query_map) = query_params_map {
@@ -66,10 +71,10 @@ pub fn default_config() -> impl IntoView {
     };
 
     let table_columns = create_memo(move |_| {
+        let grouping_enabled = enable_grouping.get();
         let actions_col_formatter = move |_: &str, row: &Map<String, Value>| {
             let row_key = row["key"].to_string().replace('"', "");
             let is_folder = row_key.contains('.');
-            let grouping_enabled = enable_grouping.get();
             let row_value = row["value"].to_string().replace('"', "");
 
             let schema = row["schema"].clone().to_string();
@@ -133,7 +138,7 @@ pub fn default_config() -> impl IntoView {
             let label = key_name.clone();
             let is_folder = key_name.contains('.');
 
-            if is_folder && enable_grouping.get() {
+            if is_folder && grouping_enabled {
                 view! {
                     <span
                         class="cursor-pointer text-blue-500 underline underline-offset-2"
@@ -310,37 +315,34 @@ pub fn bread_crums<NF>(
 where
     NF: Fn(Option<String>) + 'static + Clone,
 {
-    let last_index = bread_crums.len() - 1;
     view! {
         <div class="flex justify-between pt-3">
 
             {bread_crums
                 .iter()
                 .enumerate()
-                .map(|(index, ele)| {
+                .map(|(_, ele)| {
                     let value = ele.value.clone();
                     let is_link = ele.is_link;
                     let handler = folder_click_handler.clone();
                     view! {
-                        <div class="flex">
-                            <h2
+                        <h2 class="flex after:content-['>'] after:mx-4 after:last:hidden">
+                            <span
                                 on:click=move |_| {
                                     if is_link {
                                         handler(value.clone())
                                     }
                                 }
-
-                                class=if ele.is_link {
+                                class={if ele.is_link {
                                     "cursor-pointer text-blue-500 underline underline-offset-2"
                                 } else {
                                     ""
-                                }
+                                }}
                             >
 
                                 {ele.key.clone()}
-                            </h2>
-                            <h2 class="pl-4 pr-4">{if index < last_index { ">" } else { "" }}</h2>
-                        </div>
+                            </span>
+                        </h2>
                     }
                 })
                 .collect_view()}

diff --git a/crates/frontend/src/pages/experiment.rs b/crates/frontend/src/pages/experiment.rs
@@ -74,7 +74,7 @@ pub fn experiment_page() -> impl IntoView {
     let handle_edit = move || show_modal("experiment_edit_form_modal");
 
     view! {
-        <Transition fallback=move || {
+        <Suspense fallback=move || {
             view! {
                 <div class="m-4">
                     <Skeleton variant=SkeletonVariant::DetailPage/>
@@ -150,6 +150,6 @@ pub fn experiment_page() -> impl IntoView {
                 }
             }}
 
-        </Transition>
+        </Suspense>
     }
 }
diff --git a/crates/frontend/src/pages/experiment_list.rs b/crates/frontend/src/pages/experiment_list.rs
@@ -42,7 +42,7 @@ pub fn experiment_list() -> impl IntoView {
     });
 
     let (reset_exp_form, set_exp_form) = create_signal(0);
-    let table_columns = create_memo(move |_| experiment_table_columns());
+    let table_columns = store_value(experiment_table_columns());
 
     let combined_resource: Resource<(String, ListFilters), CombinedResource> =
         create_blocking_resource(
@@ -177,7 +177,7 @@ pub fn experiment_list() -> impl IntoView {
                                                     cell_class="min-w-48 font-mono".to_string()
                                                     rows=data
                                                     key_column="id".to_string()
-                                                    columns=table_columns.get()
+                                                    columns=table_columns.get_value()
                                                     pagination=pagination_props
                                                 />
                                             </ConditionCollapseProvider>

diff --git a/crates/frontend/src/pages/home.rs b/crates/frontend/src/pages/home.rs
@@ -301,10 +301,13 @@ pub fn home() -> impl IntoView {
                 .class_list()
                 .add_2("text-gray-300", "line-through");
         }
+        let context_updated = context_rs.get();
         // resolve the context and get the config that would apply
         spawn_local(async move {
-            let context = gen_query_context(context_rs.get());
-            let mut config = match resolve_config(tenant_rs.get(), context).await.unwrap()
+            let context = gen_query_context(context_updated);
+            let mut config = match resolve_config(tenant_rs.get_untracked(), context)
+                .await
+                .unwrap()
             {
                 Value::Object(m) => m,
                 _ => Map::new(),

diff --git a/example.Dockerfile b/example.Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.78.0 as builder
+FROM rust:1.76.0 as builder
 
 WORKDIR /build
 

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.78.0"
+channel = "1.76.0"
 targets = ["wasm32-unknown-unknown"]
 components = ["rust-src", "rustfmt", "clippy", "rust-analyzer"]