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

Compare commits

base: ryanmwangi:main
Branches Tags
ryanmwangi:main
ryanmwangi:per-url
ryanmwangi:autosearch
ryanmwangi:graphql
ryanmwangi:db
ryanmwangi:graphql-integration
ryanmwangi:backend
ryanmwangi:v0.2.0
ryanmwangi:v0.1.4
ryanmwangi:v0.1.3
ryanmwangi:v0.1.2
ryanmwangi:v0.1.1
ryanmwangi:v0.1.0
ryanmwangi:2412_editable-cells-experiment
..
compare: ryanmwangi:db
Branches Tags
ryanmwangi:per-url
ryanmwangi:autosearch
ryanmwangi:main
ryanmwangi:graphql
ryanmwangi:db
ryanmwangi:graphql-integration
ryanmwangi:backend
ryanmwangi:v0.2.0
ryanmwangi:v0.1.4
ryanmwangi:v0.1.3
ryanmwangi:v0.1.2
ryanmwangi:v0.1.1
ryanmwangi:v0.1.0
ryanmwangi:2412_editable-cells-experiment

No commits in common. "main" and "db" have entirely different histories.
main ... db

6 changed files with 233 additions and 259 deletions
Show stats Expand all files Collapse all files

84
Cargo.lock generated
View file

@ -287,21 +287,6 @@ version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
[[package]]
name = "android-tzdata"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
[[package]]
name = "android_system_properties"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
dependencies = [
"libc",
]
[[package]]
name = "anyhow"
version = "1.0.94"
@ -702,20 +687,6 @@ dependencies = [
"zeroize",
]
[[package]]
name = "chrono"
version = "0.4.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
dependencies = [
"android-tzdata",
"iana-time-zone",
"js-sys",
"num-traits",
"wasm-bindgen",
"windows-targets 0.52.6",
]
[[package]]
name = "ciborium"
version = "0.2.2"
@ -766,7 +737,6 @@ version = "0.1.3"
dependencies = [
"actix-files",
"actix-web",
"chrono",
"console_error_panic_hook",
"futures",
"gloo-net 0.5.0",
@ -785,7 +755,6 @@ dependencies = [
"serde_json",
"thiserror 2.0.9",
"tokio",
"urlencoding",
"uuid",
"wasm-bindgen",
"wasm-bindgen-futures",
@ -862,12 +831,6 @@ dependencies = [
"version_check",
]
[[package]]
name = "core-foundation-sys"
version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "cpufeatures"
version = "0.2.16"
@ -1420,29 +1383,6 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
[[package]]
name = "iana-time-zone"
version = "0.1.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
dependencies = [
"android_system_properties",
"core-foundation-sys",
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
"windows-core",
]
[[package]]
name = "iana-time-zone-haiku"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
dependencies = [
"cc",
]
[[package]]
name = "icu_collections"
version = "1.5.0"
@ -2184,15 +2124,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
[[package]]
name = "num-traits"
version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [
"autocfg",
]
[[package]]
name = "object"
version = "0.36.5"
@ -3401,12 +3332,6 @@ dependencies = [
"serde",
]
[[package]]
name = "urlencoding"
version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
[[package]]
name = "utf-8"
version = "0.7.6"
@ -3582,15 +3507,6 @@ dependencies = [
"windows-sys 0.59.0",
]
[[package]]
name = "windows-core"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
dependencies = [
"windows-targets 0.52.6",
]
[[package]]
name = "windows-sys"
version = "0.48.0"

2
Cargo.toml
View file

@ -31,8 +31,6 @@ serde_json="1.0.133"
thiserror = "2.0.9"
zerofrom = "0.1"
mio = "0.8"
chrono = "0.4"
urlencoding = "2.1.2"
[features]
default = ["ssr"]

74
src/components/item_form.rs Normal file
View file

@ -0,0 +1,74 @@
use leptos::*;
use leptos_dom::ev::SubmitEvent;
use leptos::logging::log;
#[component]
pub fn ItemForm(on_submit: Box<dyn Fn(String, String, Vec<(String, String)>, String, u8)>) -> impl IntoView {
let (name, set_name) = create_signal(String::new());
let (description, set_description) = create_signal(String::new());
let (tags, set_tags) = create_signal(Vec::<(String, String)>::new());
let (tag_key, set_tag_key) = create_signal(String::new());
let (tag_value, set_tag_value) = create_signal(String::new());
let (review, set_review) = create_signal(String::new());
let (rating, set_rating) = create_signal(5u8); // Default rating to 5
let add_tag = move |_| {
if !tag_key.get().is_empty() && !tag_value.get().is_empty() {
set_tags.update(|t| t.push((tag_key.get(), tag_value.get())));
set_tag_key.set(String::new());
set_tag_value.set(String::new());
}
};
let handle_submit = move |ev: SubmitEvent| {
ev.prevent_default();
// Validation
if name.get().is_empty() || description.get().is_empty() || rating.get() < 1 || rating.get() > 5 {
log!("Validation failed: Check required fields.");
return;
}
on_submit(
name.get(),
description.get(),
tags.get().clone(),
review.get(),
rating.get(),
);
// Reset values
set_name.set(String::new());
set_description.set(String::new());
set_tags.set(vec![]);
set_review.set(String::new());
set_rating.set(5);
};
view! {
<form on:submit=handle_submit>
<input type="text" placeholder="Name" on:input=move |e| set_name.set(event_target_value(&e)) />
<textarea placeholder="Description" on:input=move |e| set_description.set(event_target_value(&e)) />
<h3>{ "Add Tags" }</h3>
<input type="text" placeholder="Key" on:input=move |e| set_tag_key.set(event_target_value(&e)) />
<input type="text" placeholder="Value" on:input=move |e| set_tag_value.set(event_target_value(&e)) />
<button type="button" on:click=add_tag>{ "Add Tag" }</button>
<ul>
{tags.get().iter().map(|(key, value)| view! {
<li>{ format!("{}: {}", key, value) }</li>
}).collect::<Vec<_>>() }
</ul>
<h3>{ "Write a Review" }</h3>
<textarea placeholder="Review" on:input=move |e| set_review.set(event_target_value(&e)) />
<h3>{ "Rating (1-5)" }</h3>
<input
type="number"
min="1"
max="5"
value={rating.get()}
on:input=move |e| set_rating.set(event_target_value(&e).parse::<u8>().unwrap_or(5))
/>
<button type="submit">{ "Add Item" }</button>
</form>
}
}

283
src/components/items_list.rs
View file

@ -8,9 +8,6 @@ use crate::models::item::Item;
use std::collections::HashMap;
use std::sync::Arc;
use wasm_bindgen::JsCast;
use urlencoding::encode;
use gloo_net::http::Request;
use serde_json::Value;
#[derive(Deserialize, Clone, Debug)]
struct WikidataSuggestion {
@ -43,11 +40,11 @@ pub fn ItemsList(
// State to manage dynamic property names
let (custom_properties, set_custom_properties) = create_signal(Vec::<String>::new());
// State to manage suggestions visibility
// state to manage suggestions visibility
let (show_suggestions, set_show_suggestions) = create_signal(HashMap::<String, bool>::new());
// cache to store fetched properties
let (fetched_properties, set_fetched_properties) = create_signal(HashMap::<String, HashMap<String, String>>::new());
let (fetched_properties, set_fetched_properties) = create_signal(HashMap::<String, String>::new());
// Signal to store the fetched property labels
let (property_labels, set_property_labels) = create_signal(HashMap::<String, String>::new());
@ -101,7 +98,7 @@ pub fn ItemsList(
}
});
// log!("Items after loading: {:?}", items.get());
log!("Items after loading: {:?}", items.get());
}
Err(err) => {
log!("Error loading items: {}", err);
@ -163,7 +160,7 @@ pub fn ItemsList(
match response {
Ok(resp) => {
if resp.status() == 200 {
// log!("Item saved to database: {:?}", item_to_send);
log!("Item saved to database: {:?}", item_to_send);
} else {
log!("Failed to save item: {}", resp.status_text());
}
@ -187,7 +184,7 @@ pub fn ItemsList(
.await
.map_err(|err| format!("Failed to parse items: {:?}", err))?;
// log!("Deserialized DB items: {:?}", db_items);
log!("Deserialized DB items: {:?}", db_items);
// Convert DbItem to Item
let items = db_items
@ -210,14 +207,14 @@ pub fn ItemsList(
}
})
.collect();
// log!("Converted items: {:?}", items);
log!("Converted items: {:?}", items);
Ok(items)
} else {
Err(format!("Failed to fetch items: {}", response.status_text()))
}
}
// Function to remove an item
// remove an item
let remove_item = move |index: usize| {
let item_id = items.get()[index].id.clone();
spawn_local(async move {
@ -240,7 +237,6 @@ pub fn ItemsList(
});
};
// Function to remove a property
let remove_property = move |property: String| {
spawn_local(async move {
let response = gloo_net::http::Request::delete(&format!("/api/properties/{}", property))
@ -270,11 +266,10 @@ pub fn ItemsList(
});
};
// State to store Wikidata suggestions
let (wikidata_suggestions, set_wikidata_suggestions) = create_signal(HashMap::<String, Vec<WikidataSuggestion>>::new());
// Function to fetch Wikidata suggestions
let fetch_wikidata_suggestions = move |key: String, query: String| {
// Fetch Wikidata suggestions
let fetch_wikidata_suggestions = move |key:String, query: String| {
log!("Fetching suggestions for key: {}, query: {}", key, query);
spawn_local(async move {
if query.is_empty() {
@ -292,7 +287,9 @@ pub fn ItemsList(
match gloo_net::http::Request::get(&url).send().await {
Ok(response) => {
if let Ok(data) = response.json::<WikidataResponse>().await {
log!("Fetching suggestions for key: {}, query: {}", key, query);
set_wikidata_suggestions.update(|suggestions| {
log!("Updated suggestions: {:?}", suggestions);
suggestions.insert(key, data.search);
});
}
@ -303,154 +300,99 @@ pub fn ItemsList(
};
//function to fetch properties
async fn fetch_item_properties(wikidata_id: &str) -> HashMap<String, String> {
let sparql_query = format!(
r#"
SELECT ?propLabel ?value ?valueLabel WHERE {{
wd:{} ?prop ?statement.
?statement ?ps ?value.
?property wikibase:claim ?prop.
?property wikibase:statementProperty ?ps.
SERVICE wikibase:label {{ bd:serviceParam wikibase:language "en". }}
}}
"#,
async fn fetch_item_properties(wikidata_id: &str, set_fetched_properties: WriteSignal<HashMap<String, String>>, set_property_labels: WriteSignal<HashMap<String, String>>,) -> HashMap<String, String> {
let url = format!(
"https://www.wikidata.org/wiki/Special:EntityData/{}.json",
wikidata_id
);
let url = format!(
"https://query.wikidata.org/sparql?query={}&format=json",
urlencoding::encode(&sparql_query)
);
match gloo_net::http::Request::get(&url)
.header("Accept", "application/json")
.send()
.await
{
match gloo_net::http::Request::get(&url).send().await {
Ok(response) => {
if let Ok(data) = response.json::<serde_json::Value>().await {
let mut result = HashMap::new();
if let Some(bindings) = data["results"]["bindings"].as_array() {
for binding in bindings {
let prop_label = binding["propLabel"]["value"].as_str().unwrap_or("").to_string();
let prop_label = prop_label.replace("http://www.wikidata.org/prop/", "");
let value_label = binding["valueLabel"]["value"].as_str().unwrap_or("").to_string();
result.insert(prop_label, value_label);
log!("result: {:?}", result);
if let Some(entities) = data["entities"].as_object() {
if let Some(entity) = entities.get(wikidata_id) {
if let Some(claims) = entity["claims"].as_object() {
let mut result = HashMap::new();
for (property, values) in claims {
if let Some(value) = values[0]["mainsnak"]["datavalue"]["value"].as_str() {
result.insert(property.clone(), value.to_string());
} else if let Some(value) = values[0]["mainsnak"]["datavalue"]["value"].as_object() {
result.insert(property.clone(), serde_json::to_string(value).unwrap());
} else if let Some(value) = values[0]["mainsnak"]["datavalue"]["value"].as_f64() {
result.insert(property.clone(), value.to_string());
} else {
result.insert(property.clone(), "Unsupported data type".to_string());
}
}
// Fetch labels for the properties
let property_ids = result.keys().cloned().collect::<Vec<_>>();
let labels = fetch_property_labels(property_ids).await;
set_property_labels.update(|labels_map| {
for (key, value) in labels {
labels_map.insert(key, value);
}
});
// Update fetched properties
set_fetched_properties.update(|properties| {
for (key, val) in result.clone() {
properties.insert(key.clone(), val.clone());
}
});
return result;
}
}
}
result
} else {
HashMap::new()
}
}
Err(_) => HashMap::new(),
Err(err) => log!("Error fetching item properties: {:?}", err),
}
HashMap::new()
}
async fn fetch_property_labels(property_ids: Vec<String>) -> HashMap<String, String> {
log!("Fetching property labels for properties: {:?}", property_ids);
// Remove the "http://www.wikidata.org/prop/" prefix from property IDs
let property_ids: Vec<String> = property_ids
.into_iter()
.map(|id| id.replace("http://www.wikidata.org/prop/", ""))
.collect();
let property_ids_str = property_ids.join(" wd:");
let sparql_query = format!(
r#"
SELECT ?prop ?propLabel WHERE {{
VALUES ?prop {{ wd:{} }}
SERVICE wikibase:label {{ bd:serviceParam wikibase:language "en". }}
}}
"#,
property_ids_str
);
let mut property_labels = HashMap::new();
// Construct the API URL to fetch labels for multiple properties
let url = format!(
"https://query.wikidata.org/sparql?query={}&format=json",
urlencoding::encode(&sparql_query)
"https://www.wikidata.org/w/api.php?action=wbgetentities&ids={}&props=labels&format=json&languages=en&origin=*",
property_ids.join("|")
);
log!("Sending request to URL: {}", url);
match gloo_net::http::Request::get(&url)
.header("Accept", "application/json")
.send()
.await
{
match gloo_net::http::Request::get(&url).send().await {
Ok(response) => {
log!("Received response from Wikidata. Status: {}", response.status());
if response.status() != 200 {
log!("Error: Unexpected status code {}", response.status());
return HashMap::new();
}
match response.text().await {
Ok(text) => {
log!("Response body: {}", text);
match serde_json::from_str::<serde_json::Value>(&text) {
Ok(data) => {
log!("Successfully parsed response from Wikidata");
let mut result = HashMap::new();
if let Some(bindings) = data["results"]["bindings"].as_array() {
log!("Found {} bindings in response", bindings.len());
for (i, binding) in bindings.iter().enumerate() {
if let (Some(prop), Some(label)) = (
binding["prop"]["value"].as_str(),
binding["propLabel"]["value"].as_str()
) {
let prop_id = prop.split('/').last().unwrap_or("").to_string();
result.insert(prop_id.clone(), label.to_string());
log!("Processed binding {}: prop_id = {}, label = {}", i, prop_id, label);
} else {
log!("Warning: Binding {} is missing prop or propLabel", i);
}
}
} else {
log!("Warning: No bindings found in the response");
}
log!("Fetched {} property labels", result.len());
result
}
Err(e) => {
log!("Error parsing response from Wikidata: {:?}", e);
HashMap::new()
if let Ok(data) = response.json::<serde_json::Value>().await {
if let Some(entities) = data["entities"].as_object() {
for (property_id, entity) in entities {
if let Some(label) = entity["labels"]["en"]["value"].as_str() {
property_labels.insert(property_id.clone(), label.to_string());
}
}
}
Err(e) => {
log!("Error reading response body: {:?}", e);
HashMap::new()
}
}
}
Err(e) => {
log!("Error fetching property labels from Wikidata: {:?}", e);
HashMap::new()
}
Err(err) => log!("Error fetching property labels: {:?}", err),
}
property_labels
}
// Add a new custom property
let add_property = move |property: String| {
// Normalize the property ID
let normalized_property = property.replace("http://www.wikidata.org/prop/", "");
set_custom_properties.update(|props| {
if !props.contains(&normalized_property) && !normalized_property.is_empty() {
props.push(normalized_property.clone());
if !props.contains(&property) && !property.is_empty() {
props.push(property.clone());
//update the selected_properties state when a new property is added
set_selected_properties.update(|selected| {
selected.insert(normalized_property.clone(), true);
selected.insert(property.clone(), true);
});
// Ensure the grid updates reactively
set_items.update(|items| {
for item in items {
item.custom_properties.entry(normalized_property.clone()).or_insert_with(|| "".to_string());
item.custom_properties.entry(property.clone()).or_insert_with(|| "".to_string());
// Save the updated item to the database
let item_clone = item.clone();
@ -461,14 +403,12 @@ pub fn ItemsList(
});
// Fetch the property label
let property_id = normalized_property.clone();
let property_id = property.clone();
spawn_local(async move {
let labels = fetch_property_labels(vec![property_id.clone()]).await;
log!("Fetched labels: {:?}", labels);
set_property_labels.update(|labels_map| {
for (key, value) in labels {
log!("Inserting label: {} -> {}", key, value);
labels_map.insert(key, value);
if let Some(label) = labels.get(&property_id) {
labels_map.insert(property_id, label.clone());
}
});
});
@ -483,16 +423,8 @@ pub fn ItemsList(
let set_property_labels = set_property_labels.clone();
let property_clone = property.clone();
spawn_local(async move {
let properties = fetch_item_properties(&wikidata_id).await;
// Update fetched properties and property labels
set_fetched_properties.update(|fp| {
fp.insert(wikidata_id.clone(), properties.clone());
});
set_property_labels.update(|pl| {
for (key, value) in properties.iter() {
pl.entry(key.clone()).or_insert_with(|| value.clone());
}
});
let properties = fetch_item_properties(&wikidata_id, set_fetched_properties, set_property_labels).await;
// log!("Fetched properties for Wikidata ID {}: {:?}", wikidata_id, properties);
if let Some(value) = properties.get(&property_clone) {
set_items.update(|items| {
if let Some(item) = items.iter_mut().find(|item| item.wikidata_id.as_ref().unwrap() == &wikidata_id) {
@ -522,7 +454,7 @@ pub fn ItemsList(
let set_fetched_properties = set_fetched_properties.clone();
let set_property_labels = set_property_labels.clone();
spawn_local(async move {
let properties = fetch_item_properties(&wikidata_id).await;
let properties = fetch_item_properties(&wikidata_id, set_fetched_properties, set_property_labels).await;
log!("Fetched properties for index {}: {:?}", index, properties);
});
}
@ -549,7 +481,6 @@ pub fn ItemsList(
id: Uuid::new_v4().to_string(),
name: String::new(),
description: String::new(),
// reviews: vec![],
wikidata_id: None,
custom_properties: HashMap::new(),
};
@ -565,7 +496,7 @@ pub fn ItemsList(
};
// List of properties to display as rows
let properties = vec!["Name", "Description"];
let properties = vec!["Name", "Description", "Actions"];
view! {
<div>
@ -574,12 +505,9 @@ pub fn ItemsList(
<thead>
<tr>
<th>{ "Property" }</th>
{move || items.get().iter().enumerate().map(|(index, item)| {
{move || items.get().iter().enumerate().map(|(index, _)| {
view! {
<th>
{ item.name.clone() }
<button on:click=move |_| remove_item(index)>{ "Delete" }</button>
</th>
<th>{ format!("Item {}", index + 1) }</th>
}
}).collect::<Vec<_>>()}
</tr>
@ -664,7 +592,7 @@ pub fn ItemsList(
let set_fetched_properties = set_fetched_properties.clone();
let set_property_labels = set_property_labels.clone();
spawn_local(async move {
let properties = fetch_item_properties(&wikidata_id).await;
let properties = fetch_item_properties(&wikidata_id, set_fetched_properties, set_property_labels).await;
// log!("Fetched properties for Wikidata ID {}: {:?}", wikidata_id, properties);
// Populate the custom properties for the new item
@ -715,6 +643,9 @@ pub fn ItemsList(
input_type=InputType::TextArea
/>
}.into_view(),
"Actions" => view! {
<button on:click=move |_| remove_item(index)>{ "Delete" }</button>
}.into_view(),
_ => view! {
{ "" }
}.into_view(),
@ -728,11 +659,12 @@ pub fn ItemsList(
// Dynamically adding custom properties as columns
{move || {
let custom_props = custom_properties.get().clone();
log!("Rendering custom properties: {:?}", custom_props);
custom_props.into_iter().map(move |property| {
let normalized_property = property.replace("http://www.wikidata.org/prop/", "");
let property_label = property_labels.get().get(&normalized_property).cloned().unwrap_or_else(|| normalized_property.clone());
log!("Rendering property: {} -> {}", normalized_property, property_label);
let property_clone_for_button = normalized_property.clone();
let property_clone = property.clone();
let property_label = property_labels.get().get(&property_clone).cloned().unwrap_or_else(|| property_clone.clone());
let property_clone_for_button = property_clone.clone();
let property_clone_for_cells = property_clone.clone();
view! {
<tr>
<td>
@ -754,7 +686,7 @@ pub fn ItemsList(
}>{ "Delete" }</button>
</td>
{move || {
let property_clone_for_cells = normalized_property.clone();
let property_clone_for_cells = property_clone.clone();
items.get().iter().enumerate().map(move |(index, item)| {
let property_clone_for_closure = property_clone_for_cells.clone();
view! {
@ -766,8 +698,10 @@ pub fn ItemsList(
focused_cell=focused_cell
set_focused_cell=set_focused_cell.clone()
on_focus=Some(Callback::new(move |_| {
log!("Custom property input focused");
}))
on_blur=Some(Callback::new(move |_| {
log!("Custom property input blurred");
}))
input_type=InputType::TextArea
/>
@ -782,33 +716,36 @@ pub fn ItemsList(
</tbody>
</table>
<div style="margin-bottom: 20px;">
<input type="text" id="new-property" placeholder="Add New Property" list="properties" on:keydown=move |event| {
if event.key() == "Enter"{
let input_element = event.target().unwrap().dyn_into::<web_sys::HtmlInputElement>().unwrap();
let property = input_element.value();
if !property.is_empty() {
// Extract the coded name from the selected value
let coded_name = property.split(" - ").next().unwrap_or(&property).to_string();
// Add the property using the coded name
add_property(coded_name);
// Clear the input field
input_element.set_value("");
}
}
} />
<input type="text" id="new-property" placeholder="Add New Property" list="properties"/>
<datalist id="properties">
{move || {
let properties = fetched_properties.get().clone();
let property_labels = property_labels.get().clone();
property_labels.into_iter().map(|(property, label)| {
let property_clone = property.clone();
properties.into_iter().map(|(key, _)| {
let key_clone = key.clone();
let label = property_labels.get(&key_clone).cloned().unwrap_or_else(|| key_clone.clone());
view! {
<option value={property}>{ format!("{} - {}", property_clone, label) }</option>
<option value={format!("{} - {}", key, label)}>{ format!("{} - {}", key, label) }</option>
}
}).collect::<Vec<_>>()
}}
</datalist>
<button on:click=move |_| {
let property = web_sys::window()
.unwrap()
.document()
.unwrap()
.get_element_by_id("new-property")
.unwrap()
.dyn_into::<web_sys::HtmlInputElement>()
.unwrap()
.value();
// Extract the coded name from the selected value
let coded_name = property.split(" - ").next().unwrap_or(&property).to_string();
// Add the property using the coded name
add_property(coded_name);
}>{ "Add Property" }</button>
</div>
</div>
}

1
src/components/mod.rs
View file

@ -1,2 +1,3 @@
pub mod item_form;
pub mod items_list;
pub mod editable_cell;

48
src/components/wikidata_lookup.rs Normal file
View file

@ -0,0 +1,48 @@
use leptos::*;
use serde::Deserialize;
#[derive(Deserialize, Clone, Debug)]
struct WikidataResult {
id: String,
label: String,
description: Option<String>,
}
#[component]
pub fn WikidataLookup(
query: String,
on_select: impl Fn(WikidataResult) + 'static,
) -> impl IntoView {
let (suggestions, set_suggestions) = create_signal(Vec::new());
let fetch_suggestions = move |query: String| {
spawn_local(async move {
if query.is_empty() {
set_suggestions(Vec::new());
return;
}
let url = format!("https://www.wikidata.org/w/api.php?action=wbsearchentities&search={}&language=en&limit=5&format=json&origin=*", query);
if let Ok(response) = reqwest::get(&url).await {
if let Ok(data) = response.json::<WikidataResponse>().await {
set_suggestions(data.search);
}
}
});
};
create_effect(move || {
fetch_suggestions(query.clone());
});
view! {
<ul>
{suggestions.get().iter().map(|suggestion| {
view! {
<li on:click=move |_| on_select(suggestion.clone())>
{format!("{} - {}", suggestion.label, suggestion.description.clone().unwrap_or_default())}
</li>
}
}).collect::<Vec<_>>()}
</ul>
}
}