Pouzor
1cf525844b
Add optional filled-triangle arrowheads at either end of an edge, independently toggleable per edge (EdgeModal) and as per-edge-type defaults (CustomStyleModal). Arrowheads are custom inline <marker> defs filled with the live stroke colour so they recolour reactively with custom_color / vlan / selected state. Persisted frontend (serializer) and backend (edge columns + schemas + runtime migration). Also fix two dedupe layers that silently dropped legitimate parallel links between the same two devices: - store: React Flow addEdge() connectionExists dropped a second edge with matching source+target when handles were null/equal. Build the edge with a unique id and append directly. - render: rewireEdgesForCollapse deduped ALL edges by src->tgt key even when nothing was collapsed, filtering real parallel edges out of the visible set. Restrict the anti-mesh dedupe to rewired collapse stubs. Tests: marker render, per-edge/per-type UI, store apply, serializer round-trip, backend edge/canvas persistence, parallel-edge regressions. ha-relevant: yes
80 lines
2.1 KiB
Python
80 lines
2.1 KiB
Python
from typing import Any
|
|
|
|
from pydantic import BaseModel, field_validator
|
|
|
|
from app.schemas.edges import EdgeResponse
|
|
from app.schemas.nodes import NodeResponse
|
|
from app.schemas.utils import normalize_animated
|
|
|
|
|
|
class NodeSave(BaseModel):
|
|
id: str
|
|
type: str
|
|
label: str
|
|
hostname: str | None = None
|
|
ip: str | None = None
|
|
mac: str | None = None
|
|
os: str | None = None
|
|
status: str = "unknown"
|
|
check_method: str | None = None
|
|
check_target: str | None = None
|
|
services: list[Any] = []
|
|
notes: str | None = None
|
|
parent_id: str | None = None
|
|
container_mode: bool = False
|
|
custom_colors: dict[str, Any] | None = None
|
|
custom_icon: str | None = None
|
|
cpu_count: int | None = None
|
|
cpu_model: str | None = None
|
|
ram_gb: float | None = None
|
|
disk_gb: float | None = None
|
|
show_hardware: bool = False
|
|
show_port_numbers: bool = False
|
|
properties: list[Any] = []
|
|
width: float | None = None
|
|
height: float | None = None
|
|
bottom_handles: int = 1
|
|
top_handles: int = 1
|
|
left_handles: int = 0
|
|
right_handles: int = 0
|
|
pos_x: float = 0
|
|
pos_y: float = 0
|
|
|
|
|
|
class EdgeSave(BaseModel):
|
|
id: str
|
|
source: str
|
|
target: str
|
|
type: str = "ethernet"
|
|
label: str | None = None
|
|
vlan_id: int | None = None
|
|
speed: str | None = None
|
|
custom_color: str | None = None
|
|
path_style: str | None = None
|
|
animated: str = 'none'
|
|
marker_start: bool = False
|
|
marker_end: bool = False
|
|
source_handle: str | None = None
|
|
target_handle: str | None = None
|
|
waypoints: list[dict[str, float]] | None = None
|
|
|
|
@field_validator('animated', mode='before')
|
|
@classmethod
|
|
def validate_animated(cls, v: object) -> str:
|
|
return normalize_animated(v)
|
|
|
|
|
|
class CanvasSaveRequest(BaseModel):
|
|
nodes: list[NodeSave] = []
|
|
edges: list[EdgeSave] = []
|
|
viewport: dict[str, Any] = {}
|
|
custom_style: dict[str, Any] | None = None
|
|
design_id: str | None = None
|
|
|
|
|
|
class CanvasStateResponse(BaseModel):
|
|
nodes: list[NodeResponse]
|
|
edges: list[EdgeResponse]
|
|
viewport: dict[str, Any]
|
|
custom_style: dict[str, Any] | None = None
|