diff --git a/migrations/postgres/0008_create_host_applications.sql b/migrations/postgres/0008_create_host_applications.sql new file mode 100644 index 0000000..6107e4a --- /dev/null +++ b/migrations/postgres/0008_create_host_applications.sql @@ -0,0 +1,8 @@ +-- host_applications: direct association between a host and an application. +-- Allows explicitly tagging a host with an application regardless of ports. +-- One application can only be linked once to a given host. +CREATE TABLE IF NOT EXISTS host_applications ( + host_id BIGINT NOT NULL REFERENCES hosts(id) ON DELETE CASCADE, + application_id BIGINT NOT NULL REFERENCES applications(id) ON DELETE CASCADE, + PRIMARY KEY (host_id, application_id) +); diff --git a/migrations/sqlite/0008_create_host_applications.sql b/migrations/sqlite/0008_create_host_applications.sql new file mode 100644 index 0000000..fd6662a --- /dev/null +++ b/migrations/sqlite/0008_create_host_applications.sql @@ -0,0 +1,8 @@ +-- host_applications: direct association between a host and an application. +-- Allows explicitly tagging a host with an application regardless of ports. +-- One application can only be linked once to a given host. +CREATE TABLE IF NOT EXISTS host_applications ( + host_id INTEGER NOT NULL REFERENCES hosts(id) ON DELETE CASCADE, + application_id INTEGER NOT NULL REFERENCES applications(id) ON DELETE CASCADE, + PRIMARY KEY (host_id, application_id) +); diff --git a/src/api/hosts.rs b/src/api/hosts.rs index f400a0f..83a6615 100644 --- a/src/api/hosts.rs +++ b/src/api/hosts.rs @@ -3,9 +3,7 @@ use leptos::prelude::*; use serde::{Deserialize, Serialize}; -use crate::models::Host; - -use crate::models::Port; +use crate::models::{Application, Host, Port}; // ─── Presentation types ─────────────────────────────────────────────────────── @@ -32,7 +30,7 @@ pub struct HostsPage { pub total_pages: i64, // ceil(total / per_page); always ≥ 1 } -// Full host detail: identity fields + resolved network + open ports. +// Full host detail: identity fields + resolved network + open ports + linked applications. #[derive(Clone, Debug, Serialize, Deserialize)] pub struct HostDetail { pub id: i64, @@ -42,6 +40,7 @@ pub struct HostDetail { pub network_name: String, pub network_cidr: String, pub ports: Vec, + pub applications: Vec, } // ─── Queries ────────────────────────────────────────────────────────────────── @@ -50,7 +49,12 @@ pub struct HostDetail { #[server] pub async fn get_host_detail(id: i64) -> Result { use sqlx::AnyPool; - use crate::server::repository::{hosts as host_repo, networks, ports as port_repo}; + use crate::server::repository::{ + applications as app_repo, + hosts as host_repo, + networks, + ports as port_repo, + }; let pool = use_context::() .ok_or_else(|| ServerFnError::new("Database pool not found in context"))?; @@ -69,6 +73,10 @@ pub async fn get_host_detail(id: i64) -> Result { .await .map_err(|e| ServerFnError::new(e.to_string()))?; + let applications = app_repo::list_applications_for_host(&pool, id) + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; + Ok(HostDetail { id: host.id, name: host.name, @@ -77,6 +85,7 @@ pub async fn get_host_detail(id: i64) -> Result { network_name: network.name, network_cidr: network.cidr, ports, + applications, }) } @@ -343,6 +352,72 @@ pub async fn remove_host_port(host_id: i64, port_number: i64) -> Result<(), Serv .map_err(|e| ServerFnError::new(e.to_string())) } +/// Returns all applications not yet directly linked to a host. +/// +/// Used to populate the "add applications" modal on the host detail page. +#[server] +pub async fn get_applications_not_on_host( + host_id: i64, +) -> Result, ServerFnError> { + use sqlx::AnyPool; + use crate::server::repository::applications as repo; + + let pool = use_context::() + .ok_or_else(|| ServerFnError::new("Database pool not found in context"))?; + + repo::list_applications_not_on_host(&pool, host_id) + .await + .map_err(|e| ServerFnError::new(e.to_string())) +} + +/// Links one or more applications to a host. +/// +/// `application_ids` is a comma-separated string of application IDs (e.g. "1,3,7"). +/// Already-linked applications are silently skipped (no-op). +#[server] +pub async fn add_host_applications( + host_id: i64, + application_ids: String, +) -> Result<(), ServerFnError> { + use sqlx::AnyPool; + use crate::server::repository::applications as repo; + + let pool = use_context::() + .ok_or_else(|| ServerFnError::new("Database pool not found in context"))?; + + let ids: Vec = application_ids + .split(',') + .filter_map(|s| s.trim().parse::().ok()) + .collect(); + + for application_id in ids { + repo::add_application_to_host(&pool, host_id, application_id) + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; + } + + Ok(()) +} + +/// Removes the direct link between a host and an application. +/// +/// Returns `true` if the association existed and was removed. +#[server] +pub async fn remove_host_application( + host_id: i64, + application_id: i64, +) -> Result { + use sqlx::AnyPool; + use crate::server::repository::applications as repo; + + let pool = use_context::() + .ok_or_else(|| ServerFnError::new("Database pool not found in context"))?; + + repo::remove_application_from_host(&pool, host_id, application_id) + .await + .map_err(|e| ServerFnError::new(e.to_string())) +} + /// Deletes a host by id. /// /// Also removes all its port associations (via `ON DELETE CASCADE`). diff --git a/src/client/host_detail.rs b/src/client/host_detail.rs index b3898ea..37590ce 100644 --- a/src/client/host_detail.rs +++ b/src/client/host_detail.rs @@ -1,17 +1,122 @@ // client/host_detail.rs — Host detail page // // Shows all information for a single host: -// - Identity form : name, IP, network dropdown — editable, saved with "Save changes" -// - Ports section : full list with Remove per port + Add port input -// - Delete button : opens a confirmation modal, then navigates back to /hosts +// - Identity form : name, IP, network dropdown — editable, saved with "Save changes" +// - Ports section : full list with Remove per port + Add port input +// - Applications : directly linked apps with Remove + modal multi-select to add +// - Delete button : opens a confirmation modal, then navigates back to /hosts use leptos::prelude::*; use leptos_router::hooks::{use_navigate, use_params_map, use_query_map}; use crate::api::{ - hosts::{AddHostPort, DeleteHost, RemoveHostPort, UpdateHost, get_host_detail}, + hosts::{ + AddHostApplications, AddHostPort, DeleteHost, RemoveHostApplication, + RemoveHostPort, UpdateHost, get_applications_not_on_host, get_host_detail, + }, networks::get_networks, }; +use crate::models::Application; + +// ─── Add applications modal ─────────────────────────────────────────────────── + +// Multi-select modal: shows every application not yet linked to the host. +// The auto-close Effect lives in the PARENT so that reopening the modal +// after a previous success does not immediately dismiss it again. +#[component] +fn AddAppModal( + host_id: i64, + available_apps_res: LocalResource, ServerFnError>>, + add_action: ServerAction, + show_modal: RwSignal, +) -> impl IntoView { + // Tracks which application IDs the user has checked. + let selected: RwSignal> = RwSignal::new(vec![]); + + view! { +
+
+
+

"Add applications"

+ +
+ +
+ {move || available_apps_res.get().map(|res| match (*res).clone() { + Err(e) => view! { +

"Could not load applications: " {e.to_string()}

+ }.into_any(), + + Ok(apps) if apps.is_empty() => view! { +

"All applications are already linked to this host."

+ }.into_any(), + + Ok(apps) => view! { +
+ {apps.into_iter().map(|app| { + let app_id = app.id; + view! { + + } + }).collect_view()} +
+ }.into_any(), + })} +
+ + {move || add_action.value().get() + .and_then(|r| r.err()) + .map(|e| view! {

{e.to_string()}

}) + } + +
+ + +
+
+
+ }.into_any() +} // ─── Delete confirmation modal ──────────────────────────────────────────────── @@ -36,7 +141,7 @@ fn DeleteModal(

"Are you sure you want to delete " {host_name} - "? All port associations will also be removed." + "? All port and application associations will also be removed."

@@ -58,8 +163,6 @@ fn DeleteModal( #[component] pub fn HostDetailPage() -> impl IntoView { - // Read the `:id` segment from the URL. - // `use_params_map()` returns a reactive map of all URL path parameters. let params = use_params_map(); let host_id = move || { params.read().get("id") @@ -67,8 +170,6 @@ pub fn HostDetailPage() -> impl IntoView { .unwrap_or(0) }; - // Optional `?back=` query parameter — used when arriving from a network - // detail page so the back button returns there instead of the hosts list. let query = use_query_map(); let back_url = move || { query.read().get("back") @@ -82,37 +183,54 @@ pub fn HostDetailPage() -> impl IntoView { let update_action = ServerAction::::new(); let add_port_action = ServerAction::::new(); let remove_port_action = ServerAction::::new(); + let add_app_action = ServerAction::::new(); + let remove_app_action = ServerAction::::new(); let delete_action = ServerAction::::new(); - let show_delete_modal = RwSignal::new(false); + let show_delete_modal = RwSignal::new(false); + let show_add_app_modal = RwSignal::new(false); - // Reload detail after any mutation that touches this host. - // The resource key includes action versions so it invalidates automatically. + // Auto-close the add-app modal after a successful addition. + // Keeping this Effect in the parent avoids the re-trigger bug that would + // occur if the Effect were inside AddAppModal (it would fire on mount + // if the action already held a previous Ok value). + Effect::new(move |_| { + if let Some(Ok(_)) = add_app_action.value().get() { + show_add_app_modal.set(false); + } + }); + + // Reload host detail after any mutation. let host = Resource::new( move || ( host_id(), update_action.version().get(), add_port_action.version().get(), remove_port_action.version().get(), + add_app_action.version().get(), + remove_app_action.version().get(), ), - |(id, _, _, _)| get_host_detail(id), + |(id, _, _, _, _, _)| get_host_detail(id), ); // Networks dropdown — LocalResource avoids SSR/hydration mismatch. let networks_res = LocalResource::new(|| get_networks()); - // Edit-field signals, populated once by the Effect below. - // Using signals (rather than local variables) keeps them stable across - // re-renders and lets the user edit without triggering a resource reload. + // Available apps for the modal: re-fetched whenever add/remove completes. + let add_app_ver = add_app_action.version(); + let remove_app_ver = remove_app_action.version(); + let available_apps_res = LocalResource::new(move || { + let _ = add_app_ver.get(); + let _ = remove_app_ver.get(); + get_applications_not_on_host(host_id()) + }); + let name_sig = RwSignal::new(String::new()); let ip_sig = RwSignal::new(String::new()); let net_id_sig = RwSignal::new(0i64); + let new_port = RwSignal::new(String::new()); - // Input value for the "add port" row. - let new_port = RwSignal::new(String::new()); - - // Sync edit signals whenever the host resource delivers fresh data. - // This runs on initial load and after every successful mutation. + // Sync edit signals whenever fresh host data arrives. Effect::new(move |_| { if let Some(Ok(ref detail)) = host.get() { name_sig.set(detail.name.clone()); @@ -121,8 +239,6 @@ pub fn HostDetailPage() -> impl IntoView { } }); - // Navigate back to the list after a successful delete. - // `use_navigate()` must be called during component setup (not inside a closure). let navigate = use_navigate(); Effect::new(move |_| { if let Some(Ok(true)) = delete_action.value().get() { @@ -139,10 +255,12 @@ pub fn HostDetailPage() -> impl IntoView { }.into_any(), Ok(detail) => { - let id = detail.id; - let modal_name = detail.name.clone(); - let port_count = detail.ports.len(); - let ports = detail.ports; + let id = detail.id; + let modal_name = detail.name.clone(); + let port_count = detail.ports.len(); + let app_count = detail.applications.len(); + let ports = detail.ports; + let applications = detail.applications; // Pre-built ports view — consumes `ports` once, not reactively. let ports_list = if ports.is_empty() { @@ -178,6 +296,37 @@ pub fn HostDetailPage() -> impl IntoView { }.into_any() }; + // Pre-built applications view. + let apps_list = if applications.is_empty() { + view! { +

"No applications linked to this host."

+ }.into_any() + } else { + view! { +
+ {applications.into_iter().map(|app| { + let app_id = app.id; + view! { +
+ {app.name} + +
+ } + }).collect_view()} +
+ }.into_any() + }; + view! { // ── Page header ──────────────────────────────────
@@ -244,13 +393,13 @@ pub fn HostDetailPage() -> impl IntoView { class="btn-primary" type="button" on:click=move |_| { - update_action.dispatch(UpdateHost { - id, - name: name_sig.get_untracked(), - ip: ip_sig.get_untracked(), - network_id: net_id_sig.get_untracked(), - }); - } + update_action.dispatch(UpdateHost { + id, + name: name_sig.get_untracked(), + ip: ip_sig.get_untracked(), + network_id: net_id_sig.get_untracked(), + }); + } > "Save changes" @@ -273,7 +422,6 @@ pub fn HostDetailPage() -> impl IntoView { }) } - // Add port row
impl IntoView {
- // ── Danger zone ────────────────────────────────── + // ── Applications section ────────────────────────── +
+

+ {format!("Applications ({})", app_count)} +

+ + {apps_list} + + {move || remove_app_action.value().get() + .and_then(|r| r.err()) + .map(|e| view! { +

"Remove failed: " {e.to_string()}

+ }) + } + +
+ +
+
+ + // ── Add applications modal ──────────────────────── + {move || show_add_app_modal.get().then(|| view! { + + })} + + // ── Danger zone ───────────────────────────────────