ryanmwangi/Compware
1
0
Fork 0
Code Issues Pull requests Releases Activity

fix(ItemsList): scope Wikidata suggestions to focused cell

Browse source 
- Modified `fetch_wikidata_suggestions` to accept a `key` parameter, tying suggestions to specific cells.
- Updated state to use `HashMap<String, Vec<WikidataSuggestion>>` for per-cell suggestion storage.
- Adjusted rendering logic to only display suggestions for the currently focused cell.
This commit is contained in:
ryan 2025-01-07 15:52:25 +03:00
parent 8de9623a0d
commit 76f5636071
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/components/items_list.rs
View file

@ -38,14 +38,15 @@ pub fn ItemsList(
custom_properties: HashMap::new(), custom_properties: HashMap::new(),
}]); }]);
let (wikidata_suggestions, set_wikidata_suggestions) = let (wikidata_suggestions, set_wikidata_suggestions) = create_signal(HashMap::<String, Vec<WikidataSuggestion>>::new());
create_signal(Vec::<WikidataSuggestion>::new());
// Fetch Wikidata suggestions // Fetch Wikidata suggestions
let fetch_wikidata_suggestions = move |query: String| { let fetch_wikidata_suggestions = move |key:String, query: String| {
spawn_local(async move { spawn_local(async move {
if query.is_empty() { if query.is_empty() {
set_wikidata_suggestions.set(Vec::new()); set_wikidata_suggestions.update(|suggestions| {
suggestions.remove(&key);
});
return; return;
} }
@ -57,7 +58,9 @@ pub fn ItemsList(
match gloo_net::http::Request::get(&url).send().await { match gloo_net::http::Request::get(&url).send().await {
Ok(response) => { Ok(response) => {
if let Ok(data) = response.json::<WikidataResponse>().await { if let Ok(data) = response.json::<WikidataResponse>().await {
set_wikidata_suggestions.set(data.search); set_wikidata_suggestions.update(|suggestions| {
suggestions.insert(key, data.search);
});
} }
} }
Err(_) => log!("Failed to fetch Wikidata suggestions"), Err(_) => log!("Failed to fetch Wikidata suggestions"),
@ -72,7 +75,7 @@ pub fn ItemsList(
match field { match field {
"name" => { "name" => {
item.name = value.clone(); item.name = value.clone();
fetch_wikidata_suggestions(value.clone()); fetch_wikidata_suggestions(format!("name-{}", index), value.clone());
} }
"description" => { "description" => {
item.description = value.clone(); item.description = value.clone();
@ -162,14 +165,20 @@ pub fn ItemsList(
"Name" => view! { "Name" => view! {
<EditableCell <EditableCell
value=item.name.clone() value=item.name.clone()
on_input=move |value| update_item(index, "name", value) on_input=move |value| {
update_item(index, "name", value.clone());
fetch_wikidata_suggestions(format!("name-{}", index), value);
}
key=Arc::new(format!("name-{}", index)) key=Arc::new(format!("name-{}", index))
focused_cell=focused_cell focused_cell=focused_cell
set_focused_cell=set_focused_cell.clone() set_focused_cell=set_focused_cell.clone()
/> />
<ul> <ul>
{move || { {move || {
let suggestions = wikidata_suggestions.get().to_vec(); let suggestions = wikidata_suggestions.get()
.get(&format!("name-{}", index))
.cloned()
.unwrap_or_default();
suggestions.into_iter().map(|suggestion| { suggestions.into_iter().map(|suggestion| {
let label_for_click = suggestion.label.clone(); let label_for_click = suggestion.label.clone();
let label_for_display = suggestion.label.clone(); let label_for_display = suggestion.label.clone();