plul/ascend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: user interaction signal

Browse Source
This commit is contained in:
Asger Juul Brunshøj 2025-03-21 13:39:19 +01:00
parent 9b15daaf6d
commit 98703f2c8b
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/ascend/src/pages/wall.rs
View File

@ -125,13 +125,7 @@ fn WithWall(
}); });
let problem = crate::resources::problem_by_uid_optional(wall_uid, problem_uid.into()); let problem = crate::resources::problem_by_uid_optional(wall_uid, problem_uid.into());
let user_interaction = Signal::derive(move || { let user_interaction = signals::user_interaction(user_interactions, problem_uid.into());
let Some(problem_uid) = problem_uid.get() else {
return None;
};
let user_interactions = user_interactions.read();
user_interactions.get(&problem_uid).cloned()
});
let fn_next_problem = move || { let fn_next_problem = move || {
let problems = filtered_problems.read(); let problems = filtered_problems.read();
@ -346,7 +340,6 @@ fn WithUserInteraction(
let submit_attempt = ServerAction::<RonEncoded<server_functions::UpsertTodaysAttempt>>::new(); let submit_attempt = ServerAction::<RonEncoded<server_functions::UpsertTodaysAttempt>>::new();
let submit_attempt_value = submit_attempt.value(); let submit_attempt_value = submit_attempt.value();
Effect::new(move || { Effect::new(move || {
tracing::info!("flaf");
if let Some(Ok(v)) = submit_attempt_value.get() { if let Some(Ok(v)) = submit_attempt_value.get() {
tracing::info!("setting user interaction to action return value: {v:?}"); tracing::info!("setting user interaction to action return value: {v:?}");
user_interaction.set(Some(v.into_inner())); user_interaction.set(Some(v.into_inner()));
@ -532,6 +525,7 @@ fn Section(children: Children, #[prop(into)] title: MaybeProp<String>) -> impl I
mod signals { mod signals {
use crate::models; use crate::models;
use leptos::prelude::*; use leptos::prelude::*;
use std::collections::BTreeMap;
pub fn latest_attempt(user_interaction: Signal<Option<models::UserInteraction>>) -> Signal<Option<models::DatedAttempt>> { pub fn latest_attempt(user_interaction: Signal<Option<models::UserInteraction>>) -> Signal<Option<models::DatedAttempt>> {
Signal::derive(move || user_interaction.read().as_ref().and_then(models::UserInteraction::latest_attempt)) Signal::derive(move || user_interaction.read().as_ref().and_then(models::UserInteraction::latest_attempt))
@ -540,4 +534,15 @@ mod signals {
pub fn todays_attempt(latest_attempt: Signal<Option<models::UserInteraction>>) -> Signal<Option<models::Attempt>> { pub fn todays_attempt(latest_attempt: Signal<Option<models::UserInteraction>>) -> Signal<Option<models::Attempt>> {
Signal::derive(move || latest_attempt.read().as_ref().and_then(models::UserInteraction::todays_attempt)) Signal::derive(move || latest_attempt.read().as_ref().and_then(models::UserInteraction::todays_attempt))
} }
pub fn user_interaction(
user_interactions: Signal<BTreeMap<models::ProblemUid, models::UserInteraction>>,
problem_uid: Signal<Option<models::ProblemUid>>,
) -> Signal<Option<models::UserInteraction>> {
Signal::derive(move || {
let problem_uid = problem_uid.get()?;
let user_interactions = user_interactions.read();
user_interactions.get(&problem_uid).cloned()
})
}
} }