Skip to content

Commit 81d9a75

Browse files
committed
fix: get_untracked->get
1 parent 7f7d768 commit 81d9a75

File tree

4 files changed

+13
-17
lines changed

4 files changed

+13
-17
lines changed

src/modals/custom_query.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ pub fn component(show: RwSignal<bool>) -> impl IntoView {
1111
let (query_title, set_query_title) = create_signal(String::new());
1212
let projects = create_memo(move |_| projects_store.get_projects().unwrap());
1313
let active_project = use_context::<ActiveProjectStore>().unwrap();
14-
let (project_name, set_project_name) =
15-
create_signal(active_project.0.get_untracked().unwrap_or_default());
14+
let (project_name, set_project_name) = create_signal(active_project.0.get().unwrap_or_default());
1615
create_effect(move |_| {
1716
if !projects.get().is_empty() {
1817
set_project_name(projects.get()[0].clone());

src/store/projects.rs

+5-7
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ use common::{
44
enums::{Project, ProjectConnectionStatus},
55
projects::postgresql::PostgresqlRelation,
66
};
7-
use leptos::{
8-
create_rw_signal, error::Result, RwSignal, SignalGet, SignalGetUntracked, SignalUpdate,
9-
};
7+
use leptos::{create_rw_signal, error::Result, RwSignal, SignalGet, SignalUpdate};
108
use tauri_sys::tauri::invoke;
119

1210
use crate::invoke::{
@@ -40,7 +38,7 @@ impl ProjectsStore {
4038
}
4139
}
4240
});
43-
Ok(self.0.get_untracked().clone())
41+
Ok(self.0.get().clone())
4442
}
4543

4644
pub fn insert_project(&self, project: Project) -> Result<()> {
@@ -60,7 +58,7 @@ impl ProjectsStore {
6058
}
6159

6260
pub fn create_project_connection_string(&self, project_name: &str) -> String {
63-
let projects = self.0.get_untracked();
61+
let projects = self.0.get();
6462
let (_, project) = projects.get_key_value(project_name).unwrap();
6563

6664
match project {
@@ -76,7 +74,7 @@ impl ProjectsStore {
7674

7775
pub async fn connect(&self, project_name: &str) -> Result<Vec<String>> {
7876
let projects = self.0;
79-
let _projects = projects.get_untracked();
77+
let _projects = projects.get();
8078
let project = _projects.get(project_name).unwrap();
8179

8280
match project {
@@ -105,7 +103,7 @@ impl ProjectsStore {
105103
schema: &str,
106104
) -> Result<Vec<(String, String)>> {
107105
let projects = self.0;
108-
let _projects = projects.get_untracked();
106+
let _projects = projects.get();
109107
let project = _projects.get(project_name).unwrap();
110108

111109
match project {

src/store/query.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl QueryStore {
3333
self.0.update(|prev| {
3434
*prev = saved_queries.into_iter().collect();
3535
});
36-
Ok(self.0.get_untracked())
36+
Ok(self.0.get())
3737
}
3838

3939
pub async fn insert_query(&self, key: &str, project_name: &str) -> Result<()> {

src/store/tabs.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
use std::{cell::RefCell, rc::Rc};
22

33
use leptos::{
4-
create_rw_signal, error::Result, use_context, RwSignal, SignalGet, SignalGetUntracked, SignalSet,
5-
SignalUpdate,
4+
create_rw_signal, error::Result, use_context, RwSignal, SignalGet, SignalSet, SignalUpdate,
65
};
76
use monaco::api::CodeEditor;
87
use tauri_sys::tauri::invoke;
@@ -56,7 +55,7 @@ impl TabsStore {
5655
pub async fn run_query(&self) -> Result<()> {
5756
self.is_loading.set(true);
5857
let active_project = use_context::<ActiveProjectStore>().unwrap();
59-
let active_project = active_project.0.get_untracked().unwrap();
58+
let active_project = active_project.0.get().unwrap();
6059
let projects_store = use_context::<ProjectsStore>().unwrap();
6160
projects_store.connect(&active_project).await?;
6261
let active_editor = self.select_active_editor();
@@ -95,7 +94,7 @@ impl TabsStore {
9594
let splitted_key = key.split(':').collect::<Vec<&str>>();
9695
active_project.0.set(Some(splitted_key[0].to_string()));
9796
let query_store = use_context::<QueryStore>().unwrap();
98-
let query_store = query_store.0.get_untracked();
97+
let query_store = query_store.0.get();
9998
let query = query_store.get(key).unwrap();
10099
self.set_editor_value(query);
101100
Ok(())
@@ -128,7 +127,7 @@ impl TabsStore {
128127
pub fn select_active_editor(&self) -> ModelCell {
129128
self
130129
.editors
131-
.get_untracked()
130+
.get()
132131
.get(self.convert_selected_tab_to_index())
133132
.unwrap()
134133
.clone()
@@ -137,7 +136,7 @@ impl TabsStore {
137136
pub fn select_active_editor_value(&self) -> String {
138137
self
139138
.editors
140-
.get_untracked()
139+
.get()
141140
.get(self.convert_selected_tab_to_index())
142141
.unwrap()
143142
.borrow()
@@ -151,7 +150,7 @@ impl TabsStore {
151150
pub fn set_editor_value(&self, value: &str) {
152151
self
153152
.editors
154-
.get_untracked()
153+
.get()
155154
.get(self.convert_selected_tab_to_index())
156155
.unwrap()
157156
.borrow()

0 commit comments

Comments
 (0)