From d9ee121fbbdc7ef4808e36fad6cf1b44a98fa3ed Mon Sep 17 00:00:00 2001 From: mathieu Date: Sat, 16 May 2026 01:38:40 +0200 Subject: [PATCH] feat(networks): add name field to networks - Migration 0007: ALTER TABLE networks ADD COLUMN name TEXT NOT NULL DEFAULT '' - Network model, repository, and API updated to include name - Networks page: name input in the add form, Name column as first column in table - Delete modal now shows "Name (CIDR)" for clarity - Hosts page: network dropdowns now show network name instead of CIDR - Seeds updated with names (LAN, DMZ, Corporate, VPN) Co-Authored-By: Claude Sonnet 4.6 --- migrations/postgres/0007_add_network_name.sql | 3 + migrations/sqlite/0007_add_network_name.sql | 3 + seeds/postgres/dev_seed.sql | 11 ++-- seeds/sqlite/dev_seed.sql | 9 ++- src/api/networks.rs | 26 ++++----- src/client/hosts.rs | 4 +- src/client/networks.rs | 56 +++++-------------- src/models.rs | 3 + src/server/repository/networks.rs | 18 +++--- 9 files changed, 55 insertions(+), 78 deletions(-) create mode 100644 migrations/postgres/0007_add_network_name.sql create mode 100644 migrations/sqlite/0007_add_network_name.sql diff --git a/migrations/postgres/0007_add_network_name.sql b/migrations/postgres/0007_add_network_name.sql new file mode 100644 index 0000000..ae1e935 --- /dev/null +++ b/migrations/postgres/0007_add_network_name.sql @@ -0,0 +1,3 @@ +-- Add a human-readable name to networks. +-- DEFAULT '' allows the migration to run on databases that already have rows. +ALTER TABLE networks ADD COLUMN name TEXT NOT NULL DEFAULT ''; diff --git a/migrations/sqlite/0007_add_network_name.sql b/migrations/sqlite/0007_add_network_name.sql new file mode 100644 index 0000000..ae1e935 --- /dev/null +++ b/migrations/sqlite/0007_add_network_name.sql @@ -0,0 +1,3 @@ +-- Add a human-readable name to networks. +-- DEFAULT '' allows the migration to run on databases that already have rows. +ALTER TABLE networks ADD COLUMN name TEXT NOT NULL DEFAULT ''; diff --git a/seeds/postgres/dev_seed.sql b/seeds/postgres/dev_seed.sql index 35ec47c..8fde0f9 100644 --- a/seeds/postgres/dev_seed.sql +++ b/seeds/postgres/dev_seed.sql @@ -7,15 +7,14 @@ -- ── Networks ────────────────────────────────────────────────────────────────── -INSERT INTO networks (cidr) VALUES - ('192.168.1.0/24'), - ('192.168.10.0/24'), - ('10.0.0.0/8'), - ('172.16.0.0/16') +INSERT INTO networks (name, cidr) VALUES + ('LAN', '192.168.1.0/24'), + ('DMZ', '192.168.10.0/24'), + ('Corporate', '10.0.0.0/8'), + ('VPN', '172.16.0.0/16') ON CONFLICT (cidr) DO NOTHING; -- ── Hosts ───────────────────────────────────────────────────────────────────── --- Hosts have no UNIQUE constraint, so we guard with WHERE NOT EXISTS. -- LAN — 192.168.1.0/24 INSERT INTO hosts (name, ip, network_id) diff --git a/seeds/sqlite/dev_seed.sql b/seeds/sqlite/dev_seed.sql index 0e1e4d6..23a9cc7 100644 --- a/seeds/sqlite/dev_seed.sql +++ b/seeds/sqlite/dev_seed.sql @@ -6,12 +6,11 @@ -- Load with: cargo run --features ssr --bin seed -- ── Networks ────────────────────────────────────────────────────────────────── --- INSERT OR IGNORE relies on the UNIQUE constraint on cidr. -INSERT OR IGNORE INTO networks (cidr) VALUES ('192.168.1.0/24'); -INSERT OR IGNORE INTO networks (cidr) VALUES ('192.168.10.0/24'); -INSERT OR IGNORE INTO networks (cidr) VALUES ('10.0.0.0/8'); -INSERT OR IGNORE INTO networks (cidr) VALUES ('172.16.0.0/16'); +INSERT OR IGNORE INTO networks (name, cidr) VALUES ('LAN', '192.168.1.0/24'); +INSERT OR IGNORE INTO networks (name, cidr) VALUES ('DMZ', '192.168.10.0/24'); +INSERT OR IGNORE INTO networks (name, cidr) VALUES ('Corporate', '10.0.0.0/8'); +INSERT OR IGNORE INTO networks (name, cidr) VALUES ('VPN', '172.16.0.0/16'); -- ── Hosts ───────────────────────────────────────────────────────────────────── -- Hosts have no UNIQUE constraint, so we guard each insert with WHERE NOT EXISTS. diff --git a/src/api/networks.rs b/src/api/networks.rs index 7c90650..ce74507 100644 --- a/src/api/networks.rs +++ b/src/api/networks.rs @@ -11,6 +11,7 @@ use crate::models::Network; #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)] pub struct NetworkWithCounts { pub id: i64, + pub name: String, pub cidr: String, /// Number of hosts whose IP falls within this network's CIDR range. pub host_count: i64, @@ -28,25 +29,15 @@ pub async fn get_networks() -> Result, ServerFnError> { use sqlx::AnyPool; use crate::server::repository::networks as repo; - // `use_context` retrieves a value previously registered with `provide_context`. - // The pool was injected in main.rs before every request. - // `ok_or_else` converts `None` into an error (defensive: should never happen). let pool = use_context::() .ok_or_else(|| ServerFnError::new("Database pool not found in context"))?; - // Propagate any DB error as a ServerFnError so the client sees a clean message. repo::list_networks(&pool) .await .map_err(|e| ServerFnError::new(e.to_string())) } /// Returns all networks enriched with host and application counts. -/// -/// A single SQL query fetches everything at once using correlated subqueries, -/// avoiding N+1 round-trips regardless of the number of networks. -/// -/// `application_count` = distinct applications whose registered ports appear -/// among the ports open on hosts in each network (via host_ports → application_ports). #[server] pub async fn get_networks_with_counts() -> Result, ServerFnError> { use sqlx::{AnyPool, Row}; @@ -57,6 +48,7 @@ pub async fn get_networks_with_counts() -> Result, Server let rows = sqlx::query( "SELECT n.id, + n.name, n.cidr, (SELECT COUNT(*) FROM hosts WHERE network_id = n.id) AS host_count, (SELECT COUNT(DISTINCT ap.application_id) @@ -75,6 +67,7 @@ pub async fn get_networks_with_counts() -> Result, Server .into_iter() .map(|row| NetworkWithCounts { id: row.get("id"), + name: row.get("name"), cidr: row.get("cidr"), host_count: row.get("host_count"), application_count: row.get("application_count"), @@ -86,23 +79,24 @@ pub async fn get_networks_with_counts() -> Result, Server // ─── Mutations ──────────────────────────────────────────────────────────────── -/// Creates a new network with the given CIDR block. +/// Creates a new network with the given name and CIDR block. /// -/// Returns the created record (with its auto-generated id). /// Returns an error if the CIDR is malformed or already exists. #[server] -pub async fn create_network(cidr: String) -> Result { +pub async fn create_network(name: String, cidr: String) -> Result { use sqlx::AnyPool; use crate::server::{repository::networks as repo, validation::validate_cidr}; let pool = use_context::() .ok_or_else(|| ServerFnError::new("Database pool not found in context"))?; - // Validate the CIDR before touching the database. - // Example of a valid CIDR: "192.168.1.0/24" + if name.trim().is_empty() { + return Err(ServerFnError::new("Network name cannot be empty")); + } + validate_cidr(&cidr).map_err(|e| ServerFnError::new(e.to_string()))?; - repo::create_network(&pool, &cidr) + repo::create_network(&pool, name.trim(), &cidr) .await .map_err(|e| ServerFnError::new(e.to_string())) } diff --git a/src/client/hosts.rs b/src/client/hosts.rs index b0e3b64..9712a69 100644 --- a/src/client/hosts.rs +++ b/src/client/hosts.rs @@ -74,7 +74,7 @@ fn AddHostModal( {move || networks_res.get() .and_then(|r| r.ok()) .map(|nets| nets.into_iter().map(|n| { - view! { } + view! { } }).collect_view()) } @@ -137,7 +137,7 @@ fn FilterBar( {move || networks_res.get() .and_then(|r| r.ok()) .map(|nets| nets.into_iter().map(|n| { - view! { } + view! { } }).collect_view()) } diff --git a/src/client/networks.rs b/src/client/networks.rs index 4957be3..bfbf39b 100644 --- a/src/client/networks.rs +++ b/src/client/networks.rs @@ -1,17 +1,4 @@ // client/networks.rs — Networks page -// -// Displays all CIDR networks managed by the IPAM and lets the user add or -// delete them. All data operations go through Leptos server functions -// (api/networks.rs), which run on the server and are called via HTTP -// from the browser after hydration. -// -// Key Leptos 0.7 concepts used here: -// - `ServerAction` : wraps a `#[server]` function for use with forms / buttons -// - `Resource::new` : async data that re-fetches when its source signal changes -// - `action.version() : a Signal that increments after each dispatch, -// used here as a dependency to trigger list re-fetches -// - `` : a form that submits to a ServerAction (no JS needed) -// - `` : shows a fallback while the Resource is loading use leptos::prelude::*; use leptos::form::ActionForm; @@ -27,7 +14,7 @@ fn DeleteConfirmModal( pending_delete: RwSignal>, ) -> impl IntoView { let id = network.id; - let cidr = network.cidr.clone(); + let label = format!("{} ({})", network.name, network.cidr); let host_count = network.host_count; view! { @@ -38,7 +25,7 @@ fn DeleteConfirmModal(
-

"Delete network " {cidr} "?"

+

"Delete network " {label} "?"

{(host_count > 0).then(|| view! {

"Warning: " @@ -72,11 +59,6 @@ fn DeleteConfirmModal( #[component] pub fn NetworksPage() -> impl IntoView { - // ── Actions ─────────────────────────────────────────────────────────────── - // - // `ServerAction` binds a `#[server]` function to a reactive action. - // Under the hood it posts to `/api/` and updates its signals - // (.pending(), .value(), .version()) when the call completes. let create_action = ServerAction::::new(); let delete_action = ServerAction::::new(); @@ -90,14 +72,6 @@ pub fn NetworksPage() -> impl IntoView { } }); - // ── Data resource ───────────────────────────────────────────────────────── - // - // `Resource::new(source, fetcher)`: - // - source : a closure whose return value Leptos tracks reactively - // - fetcher : an async closure called whenever the source changes - // - // By reading `.version()` from both actions, the list automatically - // re-fetches after any create or delete, keeping the view in sync. let networks = Resource::new( move || (create_action.version().get(), delete_action.version().get()), |_| get_networks_with_counts(), @@ -117,14 +91,18 @@ pub fn NetworksPage() -> impl IntoView { })} // ── Add form ────────────────────────────────────────────────────── - // - // `` submits the form to the server - // function registered in `create_action`. The `name` attribute on - // each input must match the parameter name in `create_network(cidr: String)`. - // After submission the form clears itself automatically.

"Add a network"

+ - // Show the error from the last create attempt, if any. - // `action.value().get()` → Option> - // `.and_then(|r| r.err())` extracts the error when present. {move || { create_action .value() @@ -153,7 +128,6 @@ pub fn NetworksPage() -> impl IntoView {

"All networks"

- // Show delete errors above the list. {move || { delete_action .value() @@ -162,12 +136,8 @@ pub fn NetworksPage() -> impl IntoView { .map(|e| view! {

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

}) }} - // `` shows `fallback` while the Resource is loading, - // then switches to the children once data is available. "Loading networks…"

}> {move || { - // `networks.get()` → None while loading, Some(result) once done. - // Returning None here keeps in its fallback state. networks.get().map(|result| match result { Err(e) => view! {

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

@@ -184,6 +154,7 @@ pub fn NetworksPage() -> impl IntoView { + @@ -197,7 +168,8 @@ pub fn NetworksPage() -> impl IntoView { let network_clone = network.clone(); view! { - + +
"Name" "CIDR" "Hosts" "Applications"
{network.cidr}{network.name}{network.cidr} {network.host_count} {network.application_count} diff --git a/src/models.rs b/src/models.rs index 62edad3..aefad45 100644 --- a/src/models.rs +++ b/src/models.rs @@ -28,6 +28,9 @@ pub struct Network { /// `i64` is a signed 64-bit integer — maps to `BIGINT` in SQL. pub id: i64, + /// Human-readable name. Examples: "LAN", "DMZ", "VPN" + pub name: String, + /// Address range in CIDR notation. /// Examples: "10.0.0.0/8", "172.16.0.0/12", "192.168.1.0/24" pub cidr: String, diff --git a/src/server/repository/networks.rs b/src/server/repository/networks.rs index f7fe08d..c138d30 100644 --- a/src/server/repository/networks.rs +++ b/src/server/repository/networks.rs @@ -11,7 +11,7 @@ use crate::server::db::DbError; pub async fn list_networks(pool: &AnyPool) -> Result, DbError> { // `fetch_all` runs the query and collects every row into a Vec. // It returns an error if the query fails; an empty table returns Ok(vec![]). - let rows = sqlx::query("SELECT id, cidr FROM networks ORDER BY id") + let rows = sqlx::query("SELECT id, name, cidr FROM networks ORDER BY id") .fetch_all(pool) .await?; @@ -42,11 +42,14 @@ pub async fn find_network(pool: &AnyPool, id: i64) -> Result, Db /// `RETURNING id, cidr` reads back the inserted row in a single round-trip, /// avoiding a separate SELECT after the INSERT. /// Requires SQLite ≥ 3.35 (2021) and any PostgreSQL version. -pub async fn create_network(pool: &AnyPool, cidr: &str) -> Result { - let row = sqlx::query("INSERT INTO networks (cidr) VALUES ($1) RETURNING id, cidr") - .bind(cidr) - .fetch_one(pool) // exactly one row is returned by RETURNING - .await?; +pub async fn create_network(pool: &AnyPool, name: &str, cidr: &str) -> Result { + let row = sqlx::query( + "INSERT INTO networks (name, cidr) VALUES ($1, $2) RETURNING id, name, cidr", + ) + .bind(name) + .bind(cidr) + .fetch_one(pool) + .await?; Ok(row_to_network(&row)) } @@ -73,7 +76,8 @@ pub async fn delete_network(pool: &AnyPool, id: i64) -> Result { /// The type must implement `sqlx::Decode` for the `Any` backend. fn row_to_network(row: &sqlx::any::AnyRow) -> Network { Network { - id: row.get("id"), + id: row.get("id"), + name: row.get("name"), cidr: row.get("cidr"), } }