fix: task sorting

src/components/category_calendar_task_list.rs

@@ -19,7 +19,7 @@ pub(crate) fn CategoryCalendarTaskList() -> Element {
         date: today_date,
         reoccurrence: None,
         time: None,
-    })?;
+    })?();
 
     rsx! {
         div {

src/components/category_today_task_list.rs

@@ -17,7 +17,7 @@ pub(crate) fn CategoryTodayTaskList() -> Element {
         date: today_date,
         reoccurrence: None,
         time: None,
-    })?;
+    })?();
     let today_tasks = calendar_tasks
         .iter()
         .filter(|task| {
@@ -40,7 +40,7 @@ pub(crate) fn CategoryTodayTaskList() -> Element {
         })
         .cloned()
         .collect::<Vec<TaskWithSubtasks>>();
-    let long_term_tasks = use_tasks_with_subtasks_in_category(Category::LongTerm)?;
+    let long_term_tasks = use_tasks_with_subtasks_in_category(Category::LongTerm)?();
 
     rsx! {
         div {

src/components/project_list.rs

@@ -3,7 +3,7 @@ use dioxus::prelude::*;
 
 #[component]
 pub(crate) fn ProjectList() -> Element {
-    let projects = use_projects()?;
+    let projects = use_projects()?();
     let mut project_being_edited = use_context::<Signal<Option<Project>>>();
 
     rsx! {

src/components/project_select.rs

@@ -6,7 +6,7 @@ use dioxus_i18n::t;
 
 #[component]
 pub(crate) fn ProjectSelect(initial_selected_id: Option<i32>) -> Element {
-    let projects = use_projects()?;
+    let projects = use_projects()?();
     rsx! {
         select {
             name: "project_id",

src/components/subtasks_form.rs

@@ -8,7 +8,7 @@ use dioxus::prelude::*;
 
 #[component]
 pub(crate) fn SubtasksForm(task: Task) -> Element {
-    let subtasks = use_subtasks_of_task(task.id)?;
+    let subtasks = use_subtasks_of_task(task.id)?();
     let mut new_title = use_signal(String::new);
     rsx! {
         form {

src/hooks/mod.rs

@@ -13,14 +13,12 @@ use crate::{
     },
 };
 
-fn sort_loader_result<T: Ord + Clone>(
+fn sort_loader_result<T: Ord + Clone>(result: &mut Result<Loader<Vec<T>>, Loading>) {
-    result: Result<Loader<Vec<T>>, Loading>,
+    if let Ok(items) = result.as_mut() {
-) -> Result<Vec<T>, Loading> {
+        let mut items_sorted = items();
-    result.map(|loader| {
-        let mut items_sorted = loader();
         items_sorted.sort();
-        items_sorted
+        items.set(items_sorted);
-    })
+    }
 }
 
 #[allow(clippy::result_large_err)]
@@ -50,23 +48,26 @@ where
 }
 
 #[allow(clippy::result_large_err)]
-pub(crate) fn use_projects() -> Result<Vec<Project>, Loading> {
+pub(crate) fn use_projects() -> Result<Loader<Vec<Project>>, Loading> {
-    let result = use_loader_with_update_subscription(get_projects);
+    let mut result = use_loader_with_update_subscription(get_projects);
-    sort_loader_result(result)
+    sort_loader_result(&mut result);
+    result
 }
 
 #[allow(clippy::result_large_err)]
 pub(crate) fn use_tasks_with_subtasks_in_category(
     filtered_category: Category,
-) -> Result<Vec<TaskWithSubtasks>, Loading> {
+) -> Result<Loader<Vec<TaskWithSubtasks>>, Loading> {
-    let result = use_loader_with_update_subscription(move || {
+    let mut result = use_loader_with_update_subscription(move || {
         get_tasks_with_subtasks_in_category(filtered_category.clone())
     });
-    sort_loader_result(result)
+    sort_loader_result(&mut result);
+    result
 }
 
 #[allow(clippy::result_large_err)]
-pub(crate) fn use_subtasks_of_task(task_id: i32) -> Result<Vec<Subtask>, Loading> {
+pub(crate) fn use_subtasks_of_task(task_id: i32) -> Result<Loader<Vec<Subtask>>, Loading> {
-    let result = use_loader_with_update_subscription(move || get_subtasks_of_task(task_id));
+    let mut result = use_loader_with_update_subscription(move || get_subtasks_of_task(task_id));
-    sort_loader_result(result)
+    sort_loader_result(&mut result);
+    result
 }

src/views/category_page.rs

@@ -7,7 +7,7 @@ use dioxus::prelude::*;
 
 #[component]
 pub(crate) fn CategoryPage(category: Category) -> Element {
-    let tasks = use_tasks_with_subtasks_in_category(category)?;
+    let tasks = use_tasks_with_subtasks_in_category(category)?();
 
     rsx! {
         TaskList {