From 3a0e91bda1e93afa33dd182c2e820c94b3e94593 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Sat, 25 Oct 2025 02:15:31 +0200 Subject: feat(treewide): Add further buttons The register product > associate barcode > buy barcode workflow is now usable. The only missing features for an MVP are unit and unit property creation. --- src/api/mod.rs | 171 +++++++++++++++++++------------------ src/components/buy.rs | 0 src/components/container.rs | 2 +- src/components/inventory.rs | 43 ++++++++++ src/components/mod.rs | 2 + src/components/product_overview.rs | 25 ++---- src/components/unit_overview.rs | 21 +++++ src/lib.rs | 20 ++++- src/pages/associate_barcode.rs | 163 +++++++++++++++++++++++++++++++++++ src/pages/buy.rs | 156 +++------------------------------ src/pages/create_product.rs | 96 +++++++++++++++++++++ src/pages/home.rs | 7 +- src/pages/inventory.rs | 19 ++++- src/pages/mod.rs | 2 + 14 files changed, 476 insertions(+), 251 deletions(-) create mode 100644 src/components/buy.rs create mode 100644 src/components/inventory.rs create mode 100644 src/components/unit_overview.rs create mode 100644 src/pages/associate_barcode.rs create mode 100644 src/pages/create_product.rs (limited to 'src') diff --git a/src/api/mod.rs b/src/api/mod.rs index bc800fb..3bc870c 100644 --- a/src/api/mod.rs +++ b/src/api/mod.rs @@ -1,103 +1,110 @@ -use leptos::{ - error::Error, - prelude::{Read, expect_context}, -}; -use reactive_stores::Store; +use leptos::error::Error; use rocie_client::{ apis::{ api_get_inventory_api::amount_by_id, api_get_product_api::{ - product_by_id, product_by_name, product_suggestion_by_name, products, + product_by_id, product_by_name, product_suggestion_by_name, products_in_storage, + products_registered, }, api_get_unit_api::unit_by_id, - api_get_unit_property_api::unit_property_by_id, + api_get_unit_property_api::{unit_properties, unit_property_by_id}, api_set_barcode_api::buy_barcode, + api_set_product_api::{associate_barcode, register_product}, configuration::Configuration, }, models::{ - BarcodeId, Product, ProductAmount, ProductId, Unit, UnitId, UnitProperty, UnitPropertyId, + Barcode, BarcodeId, Product, ProductAmount, ProductId, ProductStub, Unit, UnitId, + UnitProperty, UnitPropertyId, }, }; -use crate::{ConfigState, ConfigStateStoreFields}; +macro_rules! get_config { + () => {{ + use crate::ConfigStateStoreFields; + use leptos::prelude::Read; -pub(crate) async fn get_amount_by_id(product_id: ProductId) -> Result { - let config = expect_context::>(); - amount_by_id(&config.config().read(), product_id) - .await - .map_err(Into::::into) -} -pub(crate) async fn get_product_by_id(product_id: ProductId) -> Result { - let config = expect_context::>(); - product_by_id(&config.config().read(), product_id) - .await - .map_err(Into::::into) -} -pub(crate) async fn get_product_by_name( - name: String, -) -> Result< - Product, - rocie_client::apis::Error, -> { - let config = expect_context::>(); - product_by_name(&config.config().read(), &name).await -} -pub(crate) async fn get_products_by_part_name(part_name: String) -> Result, Error> { - let config = expect_context::>(); - product_suggestion_by_name(&config.config().read(), &part_name) - .await - .map_err(Into::::into) -} -pub(crate) async fn get_unit_by_id(unit_id: UnitId) -> Result { - let config = expect_context::>(); - unit_by_id(&config.config().read(), unit_id) - .await - .map_err(Into::::into) -} -pub(crate) async fn get_unit_property_by_id( - unit_id: UnitPropertyId, -) -> Result { - let config = expect_context::>(); - unit_property_by_id(&config.config().read(), unit_id) - .await - .map_err(Into::::into) + let config = + leptos::prelude::expect_context::>(); + config.config().read() + }}; } -pub(crate) async fn get_full_product_by_id( - id: ProductId, -) -> Result<(Product, ProductAmount, Unit), Error> { - let amount = get_amount_by_id(id).await?; - let product = get_product_by_id(id).await?; - let unit = get_unit_by_id(amount.amount.unit).await?; +pub(crate) use get_config; - Ok::<_, Error>((product, amount, unit)) -} -pub(crate) async fn get_product_unit_by_id( - id: ProductId, -) -> Result<(Product, UnitProperty), Error> { - let product = get_product_by_id(id).await?; - let unit = get_unit_property_by_id(product.unit_property).await?; +macro_rules! mk_wrapper { + ( + $orig:ident($($arg_name:ident : $arg_type:ty),*) -> $output_type:ty + as $new_name:ident + ) => { + pub(crate) async fn $new_name( + $($arg_name : $arg_type),* + ) -> Result<$output_type, Error> { + let config = get_config!(); - Ok::<_, Error>((product, unit)) -} + $orig(&config, $($arg_name),*) + .await + .map_err(Into::::into) + } + }; -pub(crate) async fn get_products() -> Result, Error> { - let config = expect_context::>(); - products(&config.config().read()) - .await - .map_err(Into::::into) -} + ( + @treat_404_as_None + $orig:ident($($arg_name:ident : $arg_type:ty),*) -> Option<$output_type:ty> + as $new_name:ident + ) => { + pub(crate) async fn $new_name( + $($arg_name : $arg_type),* + ) -> Result, Error> { + let config = get_config!(); -pub(crate) async fn buy_barcode_wrapper( - config: &Configuration, - barcode_number: u32, -) -> Result<(), Error> { - buy_barcode( - config, - BarcodeId { - value: barcode_number, - }, - ) - .await - .map_err(Into::::into) + match $orig(&config, $($arg_name),*).await + { + Ok(ok) => Ok::<_, leptos::error::Error>(Some(ok)), + Err(err) => match err { + rocie_client::apis::Error::ResponseError(ref response_content) => { + match response_content.status.as_u16() { + 404 => Ok(None), + _ => Err(err.into()), + } + } + err => Err(err.into()), + }, + } + } + }; + + ( + @external_config + $orig:ident(&config, $($arg_name:ident : $arg_type:ty),*) -> $output_type:ty + as $new_name:ident + ) => { + pub(crate) async fn $new_name( + config: &Configuration, + $($arg_name : $arg_type),* + ) -> Result<$output_type, Error> { + $orig(config, $($arg_name),*) + .await + .map_err(Into::::into) + } + } } + +mk_wrapper!(product_by_id(product_id: ProductId) -> Product as product_by_id_wrapped); + +mk_wrapper!(@treat_404_as_None product_by_name(name: &str) -> Option as product_by_name_404_wrapped); +mk_wrapper!(@external_config product_by_name(&config, name: &str) -> Product as product_by_name_external_wrapped); + +mk_wrapper!(product_suggestion_by_name(part_name: &str) -> Vec as product_suggestion_by_name_wrapped); + +mk_wrapper!(unit_by_id(unit_id: UnitId) -> Unit as unit_by_id_wrapped); +mk_wrapper!(unit_property_by_id(unit_id: UnitPropertyId) -> UnitProperty as unit_property_by_id_wrapped); +mk_wrapper!(unit_properties() -> Vec as unit_properties_wrapped); + +mk_wrapper!(amount_by_id(product_id: ProductId) -> ProductAmount as amount_by_id_wrapped); + +mk_wrapper!(products_registered() -> Vec as products_registered_wrapped); +mk_wrapper!(products_in_storage() -> Vec as products_in_storage_wrapped); + +mk_wrapper!(@external_config buy_barcode(&config, barcode_number: BarcodeId, times: u32) -> () as buy_barcode_external_wrapped); +mk_wrapper!(@external_config register_product(&config, product_stub: ProductStub) -> ProductId as register_product_external_wrapped); +mk_wrapper!(@external_config associate_barcode(&config, id: ProductId, barcode: Barcode) -> () as associate_barcode_external_wrapped); diff --git a/src/components/buy.rs b/src/components/buy.rs new file mode 100644 index 0000000..e69de29 diff --git a/src/components/container.rs b/src/components/container.rs index 83b9584..d6d2f03 100644 --- a/src/components/container.rs +++ b/src/components/container.rs @@ -31,7 +31,7 @@ pub fn Container( .into_iter() .map(|(name, path)| { view! { -
  • +
  • diff --git a/src/components/inventory.rs b/src/components/inventory.rs new file mode 100644 index 0000000..275dd0b --- /dev/null +++ b/src/components/inventory.rs @@ -0,0 +1,43 @@ +use leptos::{IntoView, component, view}; + +use crate::{ + api::products_in_storage_wrapped, + components::{async_fetch::AsyncFetch, container::Container, icon_p::IconP}, +}; + +#[component] +pub fn Inventory() -> impl IntoView { + view! { + }, "inventory"), + (view! { }, "consume"), + (view! { }, "buy"), + ] + > + { + AsyncFetch! { + @map_error_in_producer + fetcher = products_in_storage_wrapped(), + producer = |products| { + let products_num = products.len(); + let plural_s = if products_num == 1 { "" } else { "s" }; + let products_value = 2; + let products_currency = "EUR"; + + view! { +

    + {format!( + "You have {products_num} product{plural_s} \ + in stock with a value \ + of {products_value} {products_currency}.", + )} +

    + } + } + } + } +     + } +} diff --git a/src/components/mod.rs b/src/components/mod.rs index efc4842..2c3d79a 100644 --- a/src/components/mod.rs +++ b/src/components/mod.rs @@ -10,9 +10,11 @@ pub mod input_placeholder; pub mod select_placeholder; // Specific +pub mod inventory; pub mod product_overview; pub mod recipies; pub mod site_header; +pub mod unit_overview; fn get_id() -> u32 { static ID: AtomicU32 = AtomicU32::new(0); diff --git a/src/components/product_overview.rs b/src/components/product_overview.rs index 5413dc1..bf81624 100644 --- a/src/components/product_overview.rs +++ b/src/components/product_overview.rs @@ -1,7 +1,7 @@ use leptos::{IntoView, component, view}; use crate::{ - api::get_products, + api::products_registered_wrapped, components::{async_fetch::AsyncFetch, container::Container, icon_p::IconP}, }; @@ -9,31 +9,20 @@ use crate::{ pub fn ProductOverview() -> impl IntoView { view! { }, "inventory"), - (view! { }, "consume"), - (view! { }, "buy"), + (view! { }, "products"), + (view! { }, "create-product"), + (view! { }, "associate-barcode-product"), ] > { AsyncFetch! { @map_error_in_producer - fetcher = get_products(), + fetcher = products_registered_wrapped(), producer = |products| { - let products_num = products.len(); - let plural_s = if products_num == 1 { "" } else { "s" }; - let products_value = 2; - let products_currency = "EUR"; - view! { -

    - {format!( - "You have {products_num} product{plural_s} \ - in stock with a value \ - of {products_value} {products_currency}.", - )} -

    +

    {format!("You have {} products", products.len())}

    } } } diff --git a/src/components/unit_overview.rs b/src/components/unit_overview.rs new file mode 100644 index 0000000..25e5675 --- /dev/null +++ b/src/components/unit_overview.rs @@ -0,0 +1,21 @@ +use leptos::{IntoView, component, view}; + +use crate::components::{container::Container, icon_p::IconP}; + +#[component] +pub fn UnitOverview() -> impl IntoView { + view! { + }, "units"), + (view! { }, "create-unit"), + (view! { }, "create-unit-property"), + ] + > + { + "You have units" + } + + } +} diff --git a/src/lib.rs b/src/lib.rs index b5ca65a..36210e7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -31,7 +31,7 @@ use reactive_stores::Store; use rocie_client::apis::configuration::Configuration; use crate::pages::{ - buy::Buy, home::Home, inventory::Inventory, not_found::NotFound, recipies::Recipies, + associate_barcode::AssociateBarcode, buy::Buy, create_product::CreateProduct, home::Home, inventory::Inventory, not_found::NotFound, recipies::Recipies }; #[derive(Debug, Clone, Store)] @@ -71,6 +71,8 @@ pub fn App() -> impl IntoView { view! { } } /> + + // Inventory impl IntoView { view! { } } /> + + // Recipes } } /> + + // Products + } + } + /> + } + } + /> } diff --git a/src/pages/associate_barcode.rs b/src/pages/associate_barcode.rs new file mode 100644 index 0000000..20714ff --- /dev/null +++ b/src/pages/associate_barcode.rs @@ -0,0 +1,163 @@ +use leptos::{ + IntoView, component, + prelude::{Get, Show, WriteSignal, signal}, + task::spawn_local, + view, +}; +use rocie_client::models::{Barcode, BarcodeId, Product, Unit, UnitAmount, UnitId}; +use rocie_macros::Form; +use uuid::Uuid; + +use crate::{ + api::{ + associate_barcode_external_wrapped, get_config, product_by_id_wrapped, + product_by_name_404_wrapped, product_by_name_external_wrapped, + product_suggestion_by_name_wrapped, unit_by_id_wrapped, unit_property_by_id_wrapped, + }, + components::{async_fetch::AsyncResource, banner::Banner, site_header::SiteHeader}, +}; + +#[component] +pub fn AssociateBarcode() -> impl IntoView { + let product_name_signal; + + let (errors, errors_set) = signal(None); + + let (show_units, show_units_set) = signal(false); + + view! { + + + + + + + { + Form! { + on_submit = |barcode_id, product_name, amount, unit_id| { + let config = get_config!(); + + spawn_local(async move { + let output = async { + let product = product_by_name_external_wrapped(&config, &product_name).await?; + + associate_barcode_external_wrapped(&config, product.id, Barcode { + amount:UnitAmount { + unit: UnitId { value: unit_id }, + value: u32::from(amount), + }, + id: BarcodeId { value: barcode_id }, + }).await?; + + Ok::<_, leptos::error::Error>(()) + }; + + match output.await { + Ok(()) => (), + Err(err) => { + errors_set.set( + Some( + format!("Could not associate barcode: {err}") + ) + ); + }, + } + }); + }; + + + + + + + + } + } + } +} + +async fn generate_suggest_products( + optional_product_name: Option, +) -> Result>, leptos::error::Error> { + if let Some(product_name) = optional_product_name + && !product_name.is_empty() + { + let products = product_suggestion_by_name_wrapped(&product_name).await?; + Ok(Some(products.into_iter().map(|prod| prod.name).collect())) + } else { + Ok(None) + } +} + +async fn product_unit_fetcher( + optinal_product_name: Option, +) -> Result>, leptos::error::Error> { + if let Some(product_name) = optinal_product_name + && !product_name.is_empty() + { + let maybe_product: Option = product_by_name_404_wrapped(&product_name).await?; + + if let Some(product) = maybe_product { + let unit_property = + unit_property_by_id_wrapped(product_by_id_wrapped(product.id).await?.unit_property) + .await?; + + let mut units = Vec::with_capacity(unit_property.units.len()); + for unit_id in unit_property.units { + units.push(unit_by_id_wrapped(unit_id).await?); + } + + Ok(Some(units)) + } else { + Ok(None) + } + } else { + Ok(None) + } +} diff --git a/src/pages/buy.rs b/src/pages/buy.rs index cb4cff4..f3335f6 100644 --- a/src/pages/buy.rs +++ b/src/pages/buy.rs @@ -1,25 +1,15 @@ use leptos::{ IntoView, component, - prelude::{Get, Read, Show, WriteSignal, expect_context, signal}, + prelude::{Get, Show, signal}, task::spawn_local, view, }; -use leptos_router::{NavigateOptions, hooks::use_navigate}; use log::info; -use reactive_stores::Store; -use rocie_client::{ - apis::Error, - models::{Product, Unit}, -}; -use uuid::Uuid; +use rocie_client::models::BarcodeId; use crate::{ - ConfigState, ConfigStateStoreFields, - api::{ - buy_barcode_wrapper, get_product_by_name, get_product_unit_by_id, - get_products_by_part_name, get_unit_by_id, - }, - components::{async_fetch::AsyncResource, banner::Banner, form::Form, site_header::SiteHeader}, + api::{buy_barcode_external_wrapped, get_config}, + components::{banner::Banner, form::Form, site_header::SiteHeader}, }; #[component] @@ -35,20 +25,20 @@ pub fn Buy() -> impl IntoView { { Form! { - on_submit = |barcode_number, amount| { - let config = expect_context::>(); - let config = config.config().read(); + on_submit = |barcode_number, times| { + let config = get_config!(); spawn_local(async move { - if let Err(err) = buy_barcode_wrapper(&config, barcode_number).await { + if let Err(err) = buy_barcode_external_wrapped(&config, BarcodeId { value: barcode_number }, u32::from(times)).await { let error = format!("Error in form on-submit for barcode `{barcode_number}`: {err}"); + on_submit_errored_set.set(Some(error)); } else { on_submit_errored_set.set(None); - - info!("Bought barcode {barcode_number} {amount} times"); } + + info!("Bought barcode {barcode_number} {times} times"); }); }; @@ -60,134 +50,12 @@ pub fn Buy() -> impl IntoView { /> - } - } - } -} - -#[component] -pub fn AssociateBarcode() -> impl IntoView { - let product_name_signal; - - let (show_units, show_units_set) = signal(false); - - view! { - - - { - Form! { - on_submit = |product_name, amount, unit_id| { - spawn_local(async move { - let navigate = use_navigate(); - - info!("Got product barcode: {product_name} with amount: {amount}, and {unit_id}"); - - navigate("/", NavigateOptions::default()); - }); - }; - - - - - } } } } - -async fn generate_suggest_products( - optional_product_name: Option, -) -> Result>, leptos::error::Error> { - if let Some(product_name) = optional_product_name - && !product_name.is_empty() - { - let products = get_products_by_part_name(product_name).await?; - Ok(Some(products.into_iter().map(|prod| prod.name).collect())) - } else { - Ok(None) - } -} - -async fn product_unit_fetcher( - optinal_product_name: Option, -) -> Result>, leptos::error::Error> { - if let Some(product_name) = optinal_product_name - && !product_name.is_empty() - { - let value: Option = { - match get_product_by_name(product_name).await { - Ok(ok) => Ok::<_, leptos::error::Error>(Some(ok)), - Err(err) => match err { - Error::ResponseError(ref response_content) => { - match response_content.status.as_u16() { - 404 => Ok(None), - _ => Err(err.into()), - } - } - err => Err(err.into()), - }, - }? - }; - - if let Some(value) = value { - let (_, unit_property) = get_product_unit_by_id(value.id).await?; - - let mut units = Vec::with_capacity(unit_property.units.len()); - for unit_id in unit_property.units { - units.push(get_unit_by_id(unit_id).await?); - } - - Ok(Some(units)) - } else { - Ok(None) - } - } else { - Ok(None) - } -} diff --git a/src/pages/create_product.rs b/src/pages/create_product.rs new file mode 100644 index 0000000..fcd3b0b --- /dev/null +++ b/src/pages/create_product.rs @@ -0,0 +1,96 @@ +use std::{convert::Infallible, str::FromStr}; + +use leptos::{ + IntoView, component, + prelude::{Get, Show, signal}, + task::spawn_local, + view, +}; +use rocie_client::models::{ProductStub, UnitPropertyId}; +use rocie_macros::Form; +use uuid::Uuid; + +use crate::{ + api::{get_config, register_product_external_wrapped, unit_properties_wrapped}, + components::{async_fetch::AsyncResource, banner::Banner, site_header::SiteHeader}, +}; + +struct OptionalString(Option); + +impl FromStr for OptionalString { + type Err = Infallible; + + fn from_str(s: &str) -> Result { + if s.is_empty() { + Ok(Self(None)) + } else { + Ok(Self(Some(s.to_owned()))) + } + } +} + +#[component] +pub fn CreateProduct() -> impl IntoView { + let (error_message, error_message_set) = signal(None); + + view! { + + + + + + + { + Form! { + on_submit = |product_name, product_description, unit_property_id| { + let config = get_config!(); + + spawn_local(async move { + match register_product_external_wrapped(&config, ProductStub { + description: Some(product_description.0), + name: product_name, + parent: None, // TODO: Add this <2025-10-25> + unit_property: UnitPropertyId { value: unit_property_id }, + } + ).await { + Ok(_id) => {} + Err(err) => error_message_set.set(Some(format!("Failed to create product: {err}"))), + } + }); + }; + + + + + +