From fbe80d6a2fc161ad103d7fa86fa7e524bc8a1507 Mon Sep 17 00:00:00 2001 From: Forbes Date: Sun, 8 Feb 2026 16:03:55 -0600 Subject: [PATCH 1/6] chore: delete stale REPOSITORY_STATUS.md Generated Jan 31, references HTML templates and 8 migrations. Superseded by STATUS.md, SPECIFICATION.md, and frontend-spec.md. --- docs/REPOSITORY_STATUS.md | 283 -------------------------------------- 1 file changed, 283 deletions(-) delete mode 100644 docs/REPOSITORY_STATUS.md diff --git a/docs/REPOSITORY_STATUS.md b/docs/REPOSITORY_STATUS.md deleted file mode 100644 index 6d43e4a..0000000 --- a/docs/REPOSITORY_STATUS.md +++ /dev/null @@ -1,283 +0,0 @@ -# Repository Status Report - -**Generated:** 2026-01-31 -**Branch:** main -**Last Build:** `go build ./...` and `go vet ./...` pass clean - ---- - -## Codebase Summary - -| Category | Lines | Files | -|----------|-------|-------| -| Go source | ~6,644 | 20 | -| HTML templates | ~4,923 | 4 | -| SQL migrations | ~464 | 8 | -| **Total** | **~12,231** | **32** | - ---- - -## Architecture - -``` -cmd/ - silo/ CLI client (313 lines) - silod/ API server (126 lines) -internal/ - api/ HTTP handlers, routes, middleware, templates (3,491 Go + 4,923 HTML) - config/ YAML config loading (132 lines) - db/ PostgreSQL repositories (1,634 lines) - migration/ Property migration framework (211 lines) - odoo/ Odoo ERP integration stubs (201 lines) - partnum/ Part number generator (180 lines) - schema/ YAML schema parser (235 lines) - storage/ MinIO S3 client (121 lines) -migrations/ Database DDL (8 files) -``` - -### Key Dependencies - -- `go-chi/chi/v5` -- HTTP router -- `jackc/pgx/v5` -- PostgreSQL driver -- `minio/minio-go/v7` -- S3-compatible storage -- `rs/zerolog` -- Structured logging -- `sahilm/fuzzy` -- Fuzzy text matching -- `gopkg.in/yaml.v3` -- YAML parsing - ---- - -## API Surface (38 Routes) - -### Web UI -| Method | Path | Handler | -|--------|------|---------| -| GET | `/` | Items page | -| GET | `/projects` | Projects page | -| GET | `/schemas` | Schemas page | - -### Items -| Method | Path | Description | -|--------|------|-------------| -| GET | `/api/items` | List with filtering and pagination | -| POST | `/api/items` | Create item | -| GET | `/api/items/search` | Fuzzy search | -| GET | `/api/items/export.csv` | CSV export | -| POST | `/api/items/import` | CSV import | -| GET | `/api/items/template.csv` | CSV template | -| GET | `/api/items/{partNumber}` | Get item | -| PUT | `/api/items/{partNumber}` | Update item | -| DELETE | `/api/items/{partNumber}` | Archive item | - -### Revisions -| Method | Path | Description | -|--------|------|-------------| -| GET | `/api/items/{pn}/revisions` | List revisions | -| POST | `/api/items/{pn}/revisions` | Create revision | -| GET | `/api/items/{pn}/revisions/compare` | Compare two revisions | -| GET | `/api/items/{pn}/revisions/{rev}` | Get revision | -| PATCH | `/api/items/{pn}/revisions/{rev}` | Update status/label | -| POST | `/api/items/{pn}/revisions/{rev}/rollback` | Rollback | - -### Files -| Method | Path | Description | -|--------|------|-------------| -| POST | `/api/items/{pn}/file` | Upload file | -| GET | `/api/items/{pn}/file` | Download latest | -| GET | `/api/items/{pn}/file/{rev}` | Download at revision | - -### BOM -| Method | Path | Description | -|--------|------|-------------| -| GET | `/api/items/{pn}/bom` | List children | -| POST | `/api/items/{pn}/bom` | Add child | -| GET | `/api/items/{pn}/bom/expanded` | Multi-level BOM | -| GET | `/api/items/{pn}/bom/where-used` | Where-used lookup | -| GET | `/api/items/{pn}/bom/export.csv` | BOM CSV export | -| POST | `/api/items/{pn}/bom/import` | BOM CSV import | -| PUT | `/api/items/{pn}/bom/{child}` | Update quantity/ref | -| DELETE | `/api/items/{pn}/bom/{child}` | Remove child | - -### Projects -| Method | Path | Description | -|--------|------|-------------| -| GET | `/api/projects` | List projects | -| POST | `/api/projects` | Create project | -| GET | `/api/projects/{code}` | Get project | -| PUT | `/api/projects/{code}` | Update project | -| DELETE | `/api/projects/{code}` | Delete project | -| GET | `/api/projects/{code}/items` | Items in project | - -### Item-Project Associations -| Method | Path | Description | -|--------|------|-------------| -| GET | `/api/items/{pn}/projects` | Item's projects | -| POST | `/api/items/{pn}/projects` | Tag item to project | -| DELETE | `/api/items/{pn}/projects/{code}` | Remove tag | - -### Schemas -| Method | Path | Description | -|--------|------|-------------| -| GET | `/api/schemas` | List schemas | -| GET | `/api/schemas/{name}` | Get schema | -| GET | `/api/schemas/{name}/properties` | Property definitions | -| POST | `/api/schemas/{name}/segments/{seg}/values` | Add enum value | -| PUT | `/api/schemas/{name}/segments/{seg}/values/{code}` | Update enum value | -| DELETE | `/api/schemas/{name}/segments/{seg}/values/{code}` | Delete enum value | - -### Odoo Integration (Stubs) -| Method | Path | Description | -|--------|------|-------------| -| GET | `/api/integrations/odoo/config` | Get config | -| PUT | `/api/integrations/odoo/config` | Update config | -| GET | `/api/integrations/odoo/sync-log` | Sync history | -| POST | `/api/integrations/odoo/test-connection` | Test connection | -| POST | `/api/integrations/odoo/sync/push/{pn}` | Push to Odoo | -| POST | `/api/integrations/odoo/sync/pull/{id}` | Pull from Odoo | - -### Other -| Method | Path | Description | -|--------|------|-------------| -| GET | `/health` | Health probe | -| GET | `/ready` | Readiness probe (DB + MinIO) | -| POST | `/api/generate-part-number` | Generate next PN | - ---- - -## Database Migrations - -| # | File | Purpose | -|---|------|---------| -| 1 | `001_initial.sql` | Core schema: items, revisions, relationships, locations, inventory, sequences, projects, schemas | -| 2 | `002_sequence_by_name.sql` | Sequence naming changes | -| 3 | `003_remove_material.sql` | Schema cleanup | -| 4 | `004_cad_sync_state.sql` | CAD synchronization tracking | -| 5 | `005_property_schema_version.sql` | Property versioning framework | -| 6 | `006_project_tags.sql` | Many-to-many project-item relationships | -| 7 | `007_revision_status.sql` | Revision status and labels | -| 8 | `008_odoo_integration.sql` | Integrations + sync_log tables | - ---- - -## Web UI Architecture - -The web UI uses server-rendered Go templates with vanilla JavaScript (no framework). - -### Items Page (`items.html`, 3718 lines) - -Infor CloudSuite-style split-panel layout: -- **Horizontal mode** (default): item list on left, tabbed detail panel on right -- **Vertical mode**: tabbed detail panel on top, item list below -- **Detail tabs**: Main, Properties, Revisions, BOM, Where Used -- **Ctrl+F** opens in-page filter overlay with fuzzy search -- **Column config**: gear icon popover, separate settings per layout mode -- **Search scope**: All / Part Number / Description toggle pills - -### Projects Page (`projects.html`, 345 lines) -- Full CRUD for project codes -- Item count per project -- Click project code to filter items page - -### Schemas Page (`schemas.html`, 689 lines) -- Schema browsing and enum value management - -### Base Template (`base.html`, 171 lines) -- 3-tab navigation: Items, Projects, Schemas -- Catppuccin Mocha dark theme - ---- - -## Feature Stubs (Not Yet Implemented) - -These are scaffolded but contain placeholder implementations. - -### Odoo ERP Integration - -All functions in `internal/odoo/` return "not yet implemented" errors: - -| File | Function | Status | -|------|----------|--------| -| `client.go:30` | `Authenticate()` | Stub | -| `client.go:41` | `SearchRead()` | Stub | -| `client.go:51` | `Create()` | Stub | -| `client.go:60` | `Write()` | Stub | -| `client.go:70` | `TestConnection()` | Stub | -| `sync.go:27` | `PushItem()` | Stub (logs, returns nil) | -| `sync.go:36` | `PullProduct()` | Stub (logs, returns nil) | - -API handlers at `odoo_handlers.go`: -- `HandleTestOdooConnection` (line 134) -- returns stub message -- `HandleOdooPush` (line 149) -- returns stub message -- `HandleOdooPull` (line 167) -- returns stub message - -Config and sync-log CRUD handlers are functional. - -### Part Number Date Segments - -`internal/partnum/generator.go:102` -- `formatDate()` returns error. Date-based segments in schemas will fail at generation time. - -### Location and Inventory APIs - -Tables exist from migration 001 (`locations`, `inventory`) but no API handlers or repository methods are implemented. The database layer has no `LocationRepository` or `InventoryRepository`. - ---- - -## Potential Issues - -### Critical - -1. **No authentication or authorization.** All API endpoints are publicly accessible. Single-user only. Adding LDAP/FreeIPA integration is required before multi-user deployment. - -2. **No file locking.** Concurrent edits to the same item or file upload can cause data races. A pessimistic locking mechanism is needed for CAD file workflows. - -3. **No unit tests.** Zero test coverage across the entire Go codebase. Regressions cannot be caught automatically. - -### High - -4. **Large monolithic template.** `items.html` is 3,718 lines with inline CSS and JavaScript. Changes risk unintended side effects. Consider extracting JavaScript into separate files or adopting a build step. - -5. **No input validation middleware.** API handlers validate some fields inline but there is no systematic validation layer. Malformed requests may produce unclear errors or unexpected behavior. - -6. **No rate limiting.** API has no request rate controls. A misbehaving client or script could overwhelm the server. - -7. **Odoo handlers reference DB repositories not wired up.** `odoo_handlers.go` calls `s.db.IntegrationRepository()` but the `DB` struct in `db/db.go` does not expose an `IntegrationRepository` method. These handlers will panic if reached with a real database operation. Currently safe because config is stored in-memory and stubs short-circuit before DB calls. - -### Medium - -8. **No pagination on fuzzy search.** `HandleFuzzySearch` loads all items matching type/project filters into memory before fuzzy matching. Large datasets will cause high memory usage. - -9. **CSV import lacks transaction rollback on partial failure.** If import fails mid-batch, already-imported items remain. - -10. **No CSRF protection.** Web UI forms submit via `fetch()` but there are no CSRF tokens. Acceptable for single-user but a risk if authentication is added. - -11. **MinIO connection not validated at startup.** The `/ready` endpoint checks MinIO, but the server starts regardless. A misconfigured MinIO will only fail on file operations. - -12. **Property migration framework exists but has no registered migrations.** `internal/migration/properties.go` defines the framework but no concrete migrations use it yet. - ---- - -## Recent Git History - -``` -8e44ed2 2026-01-29 Fix SIGSEGV: defer document open after dialog close -e2b3f12 2026-01-29 Fix API URL: only auto-append /api for bare hostnames -559f615 2026-01-29 Fix API URL handling and SSL certificate verification -f08ecc1 2026-01-29 feat(workbench): fix icon loading and add settings dialog -53b5edb 2026-01-29 update documentation and specs -5ee88a6 2026-01-26 update deploy.sh -93add05 2026-01-26 improve csv import handling -2d44b2a 2026-01-26 add free-ipa setup -``` - ---- - -## Deployment - -### Supported Methods -- **Docker Compose** -- `deployments/docker-compose.yaml` (dev), `docker-compose.prod.yaml` (prod) -- **systemd** -- `deployments/systemd/silod.service` -- **Manual** -- `go build ./cmd/silod && ./silod -config config.yaml` - -### Infrastructure Requirements -- PostgreSQL 15+ with `pg_trgm` and `uuid-ossp` extensions -- MinIO or S3-compatible storage -- Go 1.23+ for building From de8370481fe80a66b6319d88e5879f7406932726 Mon Sep 17 00:00:00 2001 From: Forbes Date: Sun, 8 Feb 2026 16:07:05 -0600 Subject: [PATCH 2/6] chore: fix stale docs, add read_only to config example - Update COMPONENT_AUDIT.md: replace htmx reference with React SPA - Add server.read_only to config.example.yaml and CONFIGURATION.md --- config.example.yaml | 1 + docs/COMPONENT_AUDIT.md | 8 ++++---- docs/CONFIGURATION.md | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/config.example.yaml b/config.example.yaml index be667ba..c9089c6 100644 --- a/config.example.yaml +++ b/config.example.yaml @@ -5,6 +5,7 @@ server: host: "0.0.0.0" port: 8080 base_url: "http://localhost:8080" + # read_only: false # Reject all write operations; toggle at runtime with SIGUSR1 database: host: "psql.kindred.internal" diff --git a/docs/COMPONENT_AUDIT.md b/docs/COMPONENT_AUDIT.md index 7eb0ecd..dde5c7b 100644 --- a/docs/COMPONENT_AUDIT.md +++ b/docs/COMPONENT_AUDIT.md @@ -36,10 +36,10 @@ a blank field during a design review or procurement cycle. ## Design -The audit tool is a new page in the existing web UI (`/audit`), built with -the same server-rendered Go templates + vanilla JS approach as the items and -projects pages. It adds one new API endpoint for the completeness data and -reuses existing endpoints for updates. +The audit tool is a page in the web UI (`/audit`), built with the React SPA +(same architecture as the items, projects, and schemas pages). It adds one +new API endpoint for the completeness data and reuses existing endpoints for +updates. ### Completeness Scoring diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md index f07ce36..f1030bf 100644 --- a/docs/CONFIGURATION.md +++ b/docs/CONFIGURATION.md @@ -30,12 +30,14 @@ YAML values support environment variable expansion using `${VAR_NAME}` syntax. E | `server.host` | string | `"0.0.0.0"` | Bind address | | `server.port` | int | `8080` | HTTP port | | `server.base_url` | string | — | External URL (e.g. `https://silo.example.com`). Used for OIDC callback URLs and session cookie domain. Required when OIDC is enabled. | +| `server.read_only` | bool | `false` | Start in read-only mode. All write endpoints return 503. Can be toggled at runtime with `SIGUSR1`. | ```yaml server: host: "0.0.0.0" port: 8080 base_url: "https://silo.example.com" + read_only: false ``` --- From cb88b3977c399ca49881f9cdf42a9821d544180b Mon Sep 17 00:00:00 2001 From: Forbes Date: Sun, 8 Feb 2026 18:35:25 -0600 Subject: [PATCH 3/6] feat(web): add user-selectable density mode with compact/comfortable toggle Implements #17, #18, #19, #20, #21 - Add CSS custom properties for density-dependent spacing (--d-* vars) in theme.css with comfortable (default) and compact modes - Create useDensity hook with localStorage persistence and DOM attribute sync - Add FOUC prevention in main.tsx (sync density before first paint) - Create shared PageFooter component merging stats + pagination - Refactor AppShell to flex layout with density toggle button (COM/CMP) - Consolidate inline pagination from ItemsPage/AuditPage into PageFooter - Delete FooterStats.tsx (replaced by PageFooter) - Replace all hardcoded padding/font/gap values in ItemTable, AuditTable, ItemsToolbar, and AuditToolbar with var(--d-*) references Comfortable mode is already tighter than the previous hardcoded values. Compact mode reduces further for power-user density. --- web/src/components/AppShell.tsx | 134 +++++++--- web/src/components/PageFooter.tsx | 69 +++++ web/src/components/audit/AuditTable.tsx | 62 ++++- web/src/components/audit/AuditToolbar.tsx | 12 +- web/src/components/items/FooterStats.tsx | 36 --- web/src/components/items/ItemTable.tsx | 305 ++++++++++++++-------- web/src/components/items/ItemsToolbar.tsx | 148 ++++++----- web/src/hooks/useDensity.ts | 22 ++ web/src/main.tsx | 23 +- web/src/pages/AuditPage.tsx | 56 ++-- web/src/pages/ItemsPage.tsx | 81 +++--- web/src/styles/theme.css | 115 ++++++-- 12 files changed, 685 insertions(+), 378 deletions(-) create mode 100644 web/src/components/PageFooter.tsx delete mode 100644 web/src/components/items/FooterStats.tsx create mode 100644 web/src/hooks/useDensity.ts diff --git a/web/src/components/AppShell.tsx b/web/src/components/AppShell.tsx index 4da96e0..41b21fd 100644 --- a/web/src/components/AppShell.tsx +++ b/web/src/components/AppShell.tsx @@ -1,59 +1,79 @@ -import { NavLink, Outlet } from 'react-router-dom'; -import { useAuth } from '../hooks/useAuth'; +import { NavLink, Outlet } from "react-router-dom"; +import { useAuth } from "../hooks/useAuth"; +import { useDensity } from "../hooks/useDensity"; const navLinks = [ - { to: '/', label: 'Items' }, - { to: '/projects', label: 'Projects' }, - { to: '/schemas', label: 'Schemas' }, - { to: '/audit', label: 'Audit' }, - { to: '/settings', label: 'Settings' }, + { to: "/", label: "Items" }, + { to: "/projects", label: "Projects" }, + { to: "/schemas", label: "Schemas" }, + { to: "/audit", label: "Audit" }, + { to: "/settings", label: "Settings" }, ]; const roleBadgeStyle: Record = { - admin: { background: 'rgba(203,166,247,0.2)', color: 'var(--ctp-mauve)' }, - editor: { background: 'rgba(137,180,250,0.2)', color: 'var(--ctp-blue)' }, - viewer: { background: 'rgba(148,226,213,0.2)', color: 'var(--ctp-teal)' }, + admin: { background: "rgba(203,166,247,0.2)", color: "var(--ctp-mauve)" }, + editor: { background: "rgba(137,180,250,0.2)", color: "var(--ctp-blue)" }, + viewer: { background: "rgba(148,226,213,0.2)", color: "var(--ctp-teal)" }, }; export function AppShell() { const { user, loading, logout } = useAuth(); + const [density, toggleDensity] = useDensity(); if (loading) { return ( -
+
); } return ( - <> +
-

Silo

+

+ Silo +

-
-
+
- +
); } diff --git a/web/src/components/PageFooter.tsx b/web/src/components/PageFooter.tsx new file mode 100644 index 0000000..f78f5c8 --- /dev/null +++ b/web/src/components/PageFooter.tsx @@ -0,0 +1,69 @@ +import type { ReactNode } from 'react'; + +interface PageFooterProps { + stats?: ReactNode; + page?: number; + pageSize?: number; + itemCount?: number; + onPageChange?: (page: number) => void; +} + +export function PageFooter({ stats, page, pageSize, itemCount, onPageChange }: PageFooterProps) { + const hasPagination = page !== undefined && onPageChange !== undefined; + + return ( +
+
+ {stats} +
+ + {hasPagination && ( +
+ + + Page {page} + {itemCount !== undefined && ` \u00b7 ${itemCount} items`} + + +
+ )} +
+ ); +} + +const pageBtnStyle: React.CSSProperties = { + padding: '0.15rem 0.4rem', + fontSize: 'inherit', + border: 'none', + borderRadius: '0.25rem', + backgroundColor: 'var(--ctp-surface1)', + color: 'var(--ctp-text)', + cursor: 'pointer', +}; diff --git a/web/src/components/audit/AuditTable.tsx b/web/src/components/audit/AuditTable.tsx index e75c4c2..c471d9a 100644 --- a/web/src/components/audit/AuditTable.tsx +++ b/web/src/components/audit/AuditTable.tsx @@ -23,7 +23,13 @@ export function AuditTable({ }: AuditTableProps) { if (loading) { return ( -
+
Loading audit data...
); @@ -31,7 +37,13 @@ export function AuditTable({ if (items.length === 0) { return ( -
+
No items found
); @@ -39,16 +51,27 @@ export function AuditTable({ return (
- +
- {["Score", "Part Number", "Description", "Category", "Sourcing", "Missing"].map( - (h) => ( - - ), - )} + {[ + "Score", + "Part Number", + "Description", + "Category", + "Sourcing", + "Missing", + ].map((h) => ( + + ))} @@ -68,7 +91,8 @@ export function AuditTable({ }} onMouseEnter={(e) => { if (!isSelected) - e.currentTarget.style.backgroundColor = "var(--ctp-surface0)"; + e.currentTarget.style.backgroundColor = + "var(--ctp-surface0)"; }} onMouseLeave={(e) => { if (!isSelected) @@ -100,7 +124,15 @@ export function AuditTable({ > {item.part_number} - @@ -119,7 +151,8 @@ export function AuditTable({ const thStyle: React.CSSProperties = { textAlign: "left", - padding: "0.5rem 0.75rem", + padding: "var(--d-th-py) var(--d-th-px)", + fontSize: "var(--d-th-font)", borderBottom: "1px solid var(--ctp-surface1)", color: "var(--ctp-subtext0)", fontWeight: 500, @@ -130,7 +163,8 @@ const thStyle: React.CSSProperties = { }; const tdStyle: React.CSSProperties = { - padding: "0.4rem 0.75rem", + padding: "var(--d-td-py) var(--d-td-px)", + fontSize: "var(--d-td-font)", borderBottom: "1px solid var(--ctp-surface0)", color: "var(--ctp-text)", }; diff --git a/web/src/components/audit/AuditToolbar.tsx b/web/src/components/audit/AuditToolbar.tsx index c83e851..34476cb 100644 --- a/web/src/components/audit/AuditToolbar.tsx +++ b/web/src/components/audit/AuditToolbar.tsx @@ -33,9 +33,9 @@ export function AuditToolbar({ style={{ display: "flex", flexWrap: "wrap", - gap: "0.5rem", + gap: "var(--d-toolbar-gap)", alignItems: "center", - marginBottom: "0.5rem", + marginBottom: "var(--d-toolbar-mb)", }} >
- {h} - + {h} +
+ {item.description} {item.category_name || item.category}
+
+
{cols.map((col) => ( ))} @@ -139,10 +189,10 @@ export function ItemTable({ {sortedItems.map((item, idx) => { const isSelected = item.part_number === selectedPN; const rowBg = isSelected - ? 'var(--ctp-surface1)' + ? "var(--ctp-surface1)" : idx % 2 === 0 - ? 'var(--ctp-base)' - : 'var(--ctp-surface0)'; + ? "var(--ctp-base)" + : "var(--ctp-surface0)"; return ( onSelect(item.part_number)} style={{ backgroundColor: rowBg, - cursor: 'pointer', - borderBottom: '1px solid var(--ctp-surface0)', + cursor: "pointer", + borderBottom: "1px solid var(--ctp-surface0)", }} onMouseEnter={(e) => { - if (!isSelected) e.currentTarget.style.backgroundColor = 'var(--ctp-surface0)'; + if (!isSelected) + e.currentTarget.style.backgroundColor = + "var(--ctp-surface0)"; }} onMouseLeave={(e) => { - if (!isSelected) e.currentTarget.style.backgroundColor = rowBg; + if (!isSelected) + e.currentTarget.style.backgroundColor = rowBg; }} > {cols.map((col) => { switch (col.key) { - case 'part_number': + case "part_number": return ( ); - case 'item_type': { - const tc = typeColors[item.item_type] ?? { bg: 'var(--ctp-surface1)', color: 'var(--ctp-text)' }; + case "item_type": { + const tc = typeColors[item.item_type] ?? { + bg: "var(--ctp-surface1)", + color: "var(--ctp-text)", + }; return ( ); } - case 'description': - return ; - case 'revision': - return ; - case 'projects': - return ; - case 'created': - return ; - case 'actions': + case "description": + return ( + + ); + case "revision": + return ( + + ); + case "projects": + return ( + + ); + case "created": + return ( + + ); + case "actions": return ( - @@ -239,12 +338,14 @@ export function ItemTable({ x={ctxMenu.x} y={ctxMenu.y} onClose={() => setCtxMenu(null)} - items={ALL_COLUMNS.map((col): ContextMenuItem => ({ - label: col.label, - checked: visibleColumns.includes(col.key), - onToggle: () => toggleColumn(col.key), - disabled: col.key === 'part_number', - }))} + items={ALL_COLUMNS.map( + (col): ContextMenuItem => ({ + label: col.label, + checked: visibleColumns.includes(col.key), + onToggle: () => toggleColumn(col.key), + disabled: col.key === "part_number", + }), + )} /> )} @@ -252,11 +353,11 @@ export function ItemTable({ } const actionBtnStyle: React.CSSProperties = { - background: 'none', - border: 'none', - color: 'var(--ctp-subtext1)', - cursor: 'pointer', - fontSize: '0.8rem', - padding: '0.15rem 0.4rem', - borderRadius: '0.25rem', + background: "none", + border: "none", + color: "var(--ctp-subtext1)", + cursor: "pointer", + fontSize: "0.8rem", + padding: "0.15rem 0.4rem", + borderRadius: "0.25rem", }; diff --git a/web/src/components/items/ItemsToolbar.tsx b/web/src/components/items/ItemsToolbar.tsx index 7bef3c8..d385339 100644 --- a/web/src/components/items/ItemsToolbar.tsx +++ b/web/src/components/items/ItemsToolbar.tsx @@ -1,13 +1,13 @@ -import { useEffect, useState } from 'react'; -import { get } from '../../api/client'; -import type { Project } from '../../api/types'; -import type { ItemFilters } from '../../hooks/useItems'; +import { useEffect, useState } from "react"; +import { get } from "../../api/client"; +import type { Project } from "../../api/types"; +import type { ItemFilters } from "../../hooks/useItems"; interface ItemsToolbarProps { filters: ItemFilters; onFilterChange: (partial: Partial) => void; - layout: 'horizontal' | 'vertical'; - onLayoutChange: (layout: 'horizontal' | 'vertical') => void; + layout: "horizontal" | "vertical"; + onLayoutChange: (layout: "horizontal" | "vertical") => void; onExport: () => void; onImport: () => void; onCreate: () => void; @@ -15,26 +15,40 @@ interface ItemsToolbarProps { } export function ItemsToolbar({ - filters, onFilterChange, layout, onLayoutChange, - onExport, onImport, onCreate, isEditor, + filters, + onFilterChange, + layout, + onLayoutChange, + onExport, + onImport, + onCreate, + isEditor, }: ItemsToolbarProps) { const [projects, setProjects] = useState([]); useEffect(() => { - get('/api/projects').then(setProjects).catch(() => {}); + get("/api/projects") + .then(setProjects) + .catch(() => {}); }, []); - const scopeBtn = (scope: ItemFilters['searchScope'], label: string) => ( + const scopeBtn = (scope: ItemFilters["searchScope"], label: string) => ( {/* Export */} - + {/* Import (editor only) */} {isEditor && ( - + )} {/* Create (editor only) */} {isEditor && ( - )} @@ -133,20 +161,20 @@ export function ItemsToolbar({ } const selectStyle: React.CSSProperties = { - padding: '0.4rem 0.6rem', - backgroundColor: 'var(--ctp-surface0)', - border: '1px solid var(--ctp-surface1)', - borderRadius: '0.4rem', - color: 'var(--ctp-text)', - fontSize: '0.85rem', + padding: "var(--d-input-py) var(--d-input-px)", + backgroundColor: "var(--ctp-surface0)", + border: "1px solid var(--ctp-surface1)", + borderRadius: "0.4rem", + color: "var(--ctp-text)", + fontSize: "var(--d-input-font)", }; const toolBtnStyle: React.CSSProperties = { - padding: '0.4rem 0.75rem', - backgroundColor: 'var(--ctp-surface1)', - border: 'none', - borderRadius: '0.4rem', - color: 'var(--ctp-text)', - fontSize: '0.85rem', - cursor: 'pointer', + padding: "var(--d-input-py) var(--d-input-px)", + backgroundColor: "var(--ctp-surface1)", + border: "none", + borderRadius: "0.4rem", + color: "var(--ctp-text)", + fontSize: "var(--d-input-font)", + cursor: "pointer", }; diff --git a/web/src/hooks/useDensity.ts b/web/src/hooks/useDensity.ts new file mode 100644 index 0000000..3c3a73d --- /dev/null +++ b/web/src/hooks/useDensity.ts @@ -0,0 +1,22 @@ +import { useCallback } from 'react'; +import { useLocalStorage } from './useLocalStorage'; + +export type Density = 'comfortable' | 'compact'; + +function applyDensity(density: Density) { + document.documentElement.setAttribute('data-density', density); +} + +export function useDensity(): [Density, () => void] { + const [density, setDensity] = useLocalStorage('silo-density', 'comfortable'); + + applyDensity(density); + + const toggle = useCallback(() => { + const next: Density = density === 'comfortable' ? 'compact' : 'comfortable'; + setDensity(next); + applyDensity(next); + }, [density, setDensity]); + + return [density, toggle]; +} diff --git a/web/src/main.tsx b/web/src/main.tsx index 5d5efd1..a497b34 100644 --- a/web/src/main.tsx +++ b/web/src/main.tsx @@ -1,11 +1,20 @@ -import { StrictMode } from 'react'; -import { createRoot } from 'react-dom/client'; -import { BrowserRouter } from 'react-router-dom'; -import { AuthProvider } from './context/AuthContext'; -import { App } from './App'; -import './styles/global.css'; +import { StrictMode } from "react"; +import { createRoot } from "react-dom/client"; +import { BrowserRouter } from "react-router-dom"; +import { AuthProvider } from "./context/AuthContext"; +import { App } from "./App"; +import "./styles/global.css"; -createRoot(document.getElementById('root')!).render( +// Apply saved density before first paint to prevent FOUC +try { + const saved = localStorage.getItem("silo-density"); + const density = saved ? JSON.parse(saved) : "comfortable"; + document.documentElement.setAttribute("data-density", density); +} catch { + document.documentElement.setAttribute("data-density", "comfortable"); +} + +createRoot(document.getElementById("root")!).render( diff --git a/web/src/pages/AuditPage.tsx b/web/src/pages/AuditPage.tsx index eb98472..dc70813 100644 --- a/web/src/pages/AuditPage.tsx +++ b/web/src/pages/AuditPage.tsx @@ -6,6 +6,7 @@ import { AuditToolbar } from "../components/audit/AuditToolbar"; import { AuditTable } from "../components/audit/AuditTable"; import { AuditDetailPanel } from "../components/audit/AuditDetailPanel"; import { SplitPanel } from "../components/items/SplitPanel"; +import { PageFooter } from "../components/PageFooter"; type PaneMode = { type: "none" } | { type: "detail"; partNumber: string }; @@ -47,8 +48,8 @@ export function AuditPage() { style={{ display: "flex", flexDirection: "column", - height: "calc(100vh - 64px)", - paddingBottom: 28, + height: "100%", + paddingBottom: "var(--d-footer-h)", }} > {error && ( @@ -91,45 +92,18 @@ export function AuditPage() { storageKey="silo-audit-split" /> - {/* Pagination */} -
- - - Page {filters.page} · {items.length} items - - -
+ + {summary.total_items} items + Avg: {(summary.avg_score * 100).toFixed(1)}% + + } + page={filters.page} + pageSize={filters.pageSize} + itemCount={items.length} + onPageChange={(p) => updateFilters({ page: p })} + /> ); } - -const pageBtnStyle: React.CSSProperties = { - padding: "0.25rem 0.6rem", - fontSize: "0.8rem", - border: "none", - borderRadius: "0.3rem", - backgroundColor: "var(--ctp-surface0)", - color: "var(--ctp-text)", - cursor: "pointer", -}; diff --git a/web/src/pages/ItemsPage.tsx b/web/src/pages/ItemsPage.tsx index 4f77ab5..2c4a8da 100644 --- a/web/src/pages/ItemsPage.tsx +++ b/web/src/pages/ItemsPage.tsx @@ -14,7 +14,7 @@ import { EditItemPane } from "../components/items/EditItemPane"; import { DeleteItemPane } from "../components/items/DeleteItemPane"; import { ImportItemsPane } from "../components/items/ImportItemsPane"; import { SplitPanel } from "../components/items/SplitPanel"; -import { FooterStats } from "../components/items/FooterStats"; +import { PageFooter } from "../components/PageFooter"; type PaneMode = | { type: "none" } @@ -170,8 +170,8 @@ export function ItemsPage() { style={{ display: "flex", flexDirection: "column", - height: "calc(100vh - 64px)", - paddingBottom: 28, + height: "100%", + paddingBottom: "var(--d-footer-h)", }} > {error && ( @@ -217,47 +217,40 @@ export function ItemsPage() { secondary={secondaryPane} /> - {/* Pagination */} -
- - - Page {filters.page} · {items.length} items - - -
- - + + + Total:{" "} + + {items.length} + + + + Parts:{" "} + + {items.filter((i) => i.item_type === "part").length} + + + + Assemblies:{" "} + + {items.filter((i) => i.item_type === "assembly").length} + + + + Documents:{" "} + + {items.filter((i) => i.item_type === "document").length} + + + + } + page={filters.page} + pageSize={filters.pageSize} + itemCount={items.length} + onPageChange={(p) => updateFilters({ page: p })} + /> ); } - -const pageBtnStyle: React.CSSProperties = { - padding: "0.25rem 0.6rem", - fontSize: "0.8rem", - border: "none", - borderRadius: "0.3rem", - backgroundColor: "var(--ctp-surface0)", - color: "var(--ctp-text)", - cursor: "pointer", -}; diff --git a/web/src/styles/theme.css b/web/src/styles/theme.css index 153240c..7b209fc 100644 --- a/web/src/styles/theme.css +++ b/web/src/styles/theme.css @@ -1,29 +1,92 @@ /* Catppuccin Mocha Theme */ :root { - --ctp-rosewater: #f5e0dc; - --ctp-flamingo: #f2cdcd; - --ctp-pink: #f5c2e7; - --ctp-mauve: #cba6f7; - --ctp-red: #f38ba8; - --ctp-maroon: #eba0ac; - --ctp-peach: #fab387; - --ctp-yellow: #f9e2af; - --ctp-green: #a6e3a1; - --ctp-teal: #94e2d5; - --ctp-sky: #89dceb; - --ctp-sapphire: #74c7ec; - --ctp-blue: #89b4fa; - --ctp-lavender: #b4befe; - --ctp-text: #cdd6f4; - --ctp-subtext1: #bac2de; - --ctp-subtext0: #a6adc8; - --ctp-overlay2: #9399b2; - --ctp-overlay1: #7f849c; - --ctp-overlay0: #6c7086; - --ctp-surface2: #585b70; - --ctp-surface1: #45475a; - --ctp-surface0: #313244; - --ctp-base: #1e1e2e; - --ctp-mantle: #181825; - --ctp-crust: #11111b; + --ctp-rosewater: #f5e0dc; + --ctp-flamingo: #f2cdcd; + --ctp-pink: #f5c2e7; + --ctp-mauve: #cba6f7; + --ctp-red: #f38ba8; + --ctp-maroon: #eba0ac; + --ctp-peach: #fab387; + --ctp-yellow: #f9e2af; + --ctp-green: #a6e3a1; + --ctp-teal: #94e2d5; + --ctp-sky: #89dceb; + --ctp-sapphire: #74c7ec; + --ctp-blue: #89b4fa; + --ctp-lavender: #b4befe; + --ctp-text: #cdd6f4; + --ctp-subtext1: #bac2de; + --ctp-subtext0: #a6adc8; + --ctp-overlay2: #9399b2; + --ctp-overlay1: #7f849c; + --ctp-overlay0: #6c7086; + --ctp-surface2: #585b70; + --ctp-surface1: #45475a; + --ctp-surface0: #313244; + --ctp-base: #1e1e2e; + --ctp-mantle: #181825; + --ctp-crust: #11111b; +} + +/* ── Density: comfortable (default) ── */ +[data-density="comfortable"], +:root { + --d-header-py: 0.625rem; + --d-header-px: 2rem; + --d-header-logo: 1.25rem; + --d-nav-gap: 1rem; + --d-nav-py: 0.35rem; + --d-nav-px: 0.75rem; + --d-nav-radius: 0.4rem; + --d-user-gap: 0.6rem; + --d-user-font: 0.85rem; + + --d-th-py: 0.35rem; + --d-th-px: 0.75rem; + --d-th-font: 0.75rem; + --d-td-py: 0.25rem; + --d-td-px: 0.75rem; + --d-td-font: 0.85rem; + + --d-toolbar-gap: 0.5rem; + --d-toolbar-py: 0.5rem; + --d-toolbar-mb: 0.35rem; + --d-input-py: 0.35rem; + --d-input-px: 0.6rem; + --d-input-font: 0.85rem; + + --d-footer-h: 28px; + --d-footer-font: 0.75rem; + --d-footer-px: 2rem; +} + +/* ── Density: compact ── */ +[data-density="compact"] { + --d-header-py: 0.35rem; + --d-header-px: 1.25rem; + --d-header-logo: 1.1rem; + --d-nav-gap: 0.5rem; + --d-nav-py: 0.2rem; + --d-nav-px: 0.5rem; + --d-nav-radius: 0.3rem; + --d-user-gap: 0.35rem; + --d-user-font: 0.8rem; + + --d-th-py: 0.2rem; + --d-th-px: 0.5rem; + --d-th-font: 0.7rem; + --d-td-py: 0.125rem; + --d-td-px: 0.5rem; + --d-td-font: 0.8rem; + + --d-toolbar-gap: 0.35rem; + --d-toolbar-py: 0.25rem; + --d-toolbar-mb: 0.15rem; + --d-input-py: 0.2rem; + --d-input-px: 0.4rem; + --d-input-font: 0.8rem; + + --d-footer-h: 24px; + --d-footer-font: 0.7rem; + --d-footer-px: 1.25rem; } From e5ddb30a4a04ab9deeeac2d50e4113806d255849 Mon Sep 17 00:00:00 2001 From: Forbes Date: Sun, 8 Feb 2026 18:37:33 -0600 Subject: [PATCH 4/6] feat(api): add GET /api/items/by-uuid/{uuid} endpoint Closes #43 Adds a new read-only endpoint to resolve a Silo item UUID to its full ItemResponse. Used by silo-mod to resolve FreeCAD document SiloUUID properties to part numbers during BOM sync. - Reuses existing ItemRepository.GetByID() (items.id is the stable UUID) - Returns 404 for archived items - Registered in viewer-accessible route group (no editor role required) --- docs/BOM_MERGE.md | 0 internal/api/handlers.go | 20 ++++++++++++++++++++ internal/api/routes.go | 1 + 3 files changed, 21 insertions(+) create mode 100644 docs/BOM_MERGE.md diff --git a/docs/BOM_MERGE.md b/docs/BOM_MERGE.md new file mode 100644 index 0000000..e69de29 diff --git a/internal/api/handlers.go b/internal/api/handlers.go index aaef469..1c6a6d5 100644 --- a/internal/api/handlers.go +++ b/internal/api/handlers.go @@ -465,6 +465,26 @@ func (s *Server) HandleCreateItem(w http.ResponseWriter, r *http.Request) { s.broker.Publish("item.created", mustMarshal(resp)) } +// HandleGetItemByUUID retrieves an item by its stable UUID (the items.id column). +// Used by silo-mod to resolve FreeCAD document SiloUUID properties to part numbers. +func (s *Server) HandleGetItemByUUID(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + uuid := chi.URLParam(r, "uuid") + + item, err := s.items.GetByID(ctx, uuid) + if err != nil { + s.logger.Error().Err(err).Msg("failed to get item by UUID") + writeError(w, http.StatusInternalServerError, "internal_error", "Failed to get item") + return + } + if item == nil || item.ArchivedAt != nil { + writeError(w, http.StatusNotFound, "not_found", "Item not found") + return + } + + writeJSON(w, http.StatusOK, itemToResponse(item)) +} + // HandleGetItem retrieves an item by part number. // Supports query param: ?include=properties to include current revision properties. func (s *Server) HandleGetItem(w http.ResponseWriter, r *http.Request) { diff --git a/internal/api/routes.go b/internal/api/routes.go index 32d760a..4992f1f 100644 --- a/internal/api/routes.go +++ b/internal/api/routes.go @@ -119,6 +119,7 @@ func NewRouter(server *Server, logger zerolog.Logger) http.Handler { r.Route("/items", func(r chi.Router) { r.Get("/", server.HandleListItems) r.Get("/search", server.HandleFuzzySearch) + r.Get("/by-uuid/{uuid}", server.HandleGetItemByUUID) r.Get("/export.csv", server.HandleExportCSV) r.Get("/template.csv", server.HandleCSVTemplate) r.Get("/export.ods", server.HandleExportODS) From 163dc9f0f0ba37d74cc3e44be20206b00d64ddfd Mon Sep 17 00:00:00 2001 From: Forbes Date: Sun, 8 Feb 2026 18:45:41 -0600 Subject: [PATCH 5/6] feat(db): add source column to relationships table (#44) Promote BOM source from metadata JSONB to a dedicated VARCHAR(20) column with CHECK constraint ('manual' or 'assembly'). - Add migration 012_bom_source.sql (column, data migration, cleanup) - Add Source field to Relationship and BOMEntry structs - Update all SQL queries (GetBOM, GetWhereUsed, GetExpandedBOM, Create) - Update API response/request types with source field - Update CSV/ODS export to read e.Source instead of metadata - Update CSV import to set source on relationship directly - Update frontend types and BOMTab to use top-level source field --- internal/api/bom_handlers.go | 27 ++- internal/api/ods.go | 4 +- internal/db/relationships.go | 27 ++- migrations/012_bom_source.sql | 16 ++ web/src/api/types.ts | 2 + web/src/components/items/BOMTab.tsx | 311 ++++++++++++++++++++++------ 6 files changed, 305 insertions(+), 82 deletions(-) create mode 100644 migrations/012_bom_source.sql diff --git a/internal/api/bom_handlers.go b/internal/api/bom_handlers.go index 4f4e5eb..633ed5d 100644 --- a/internal/api/bom_handlers.go +++ b/internal/api/bom_handlers.go @@ -29,6 +29,7 @@ type BOMEntryResponse struct { ChildRevision *int `json:"child_revision,omitempty"` EffectiveRevision int `json:"effective_revision"` Depth *int `json:"depth,omitempty"` + Source string `json:"source"` Metadata map[string]any `json:"metadata,omitempty"` } @@ -51,6 +52,7 @@ type AddBOMEntryRequest struct { Unit *string `json:"unit,omitempty"` ReferenceDesignators []string `json:"reference_designators,omitempty"` ChildRevision *int `json:"child_revision,omitempty"` + Source string `json:"source,omitempty"` Metadata map[string]any `json:"metadata,omitempty"` } @@ -240,6 +242,7 @@ func (s *Server) HandleAddBOMEntry(w http.ResponseWriter, r *http.Request) { Unit: req.Unit, ReferenceDesignators: req.ReferenceDesignators, ChildRevision: req.ChildRevision, + Source: req.Source, Metadata: req.Metadata, } if user := auth.UserFromContext(ctx); user != nil { @@ -273,6 +276,7 @@ func (s *Server) HandleAddBOMEntry(w http.ResponseWriter, r *http.Request) { ReferenceDesignators: req.ReferenceDesignators, ChildRevision: req.ChildRevision, EffectiveRevision: child.CurrentRevision, + Source: rel.Source, Metadata: req.Metadata, } if req.ChildRevision != nil { @@ -434,6 +438,7 @@ func bomEntryToResponse(e *db.BOMEntry) BOMEntryResponse { ReferenceDesignators: refDes, ChildRevision: e.ChildRevision, EffectiveRevision: e.EffectiveRevision, + Source: e.Source, Metadata: e.Metadata, } } @@ -686,14 +691,14 @@ func (s *Server) HandleExportBOMCSV(w http.ResponseWriter, r *http.Request) { } row := []string{ - strconv.Itoa(i + 1), // Item - strconv.Itoa(e.Depth), // Level - getMetaString(e.Metadata, "source"), // Source - e.ChildPartNumber, // PN + strconv.Itoa(i + 1), // Item + strconv.Itoa(e.Depth), // Level + e.Source, // Source + e.ChildPartNumber, // PN getMetaString(e.Metadata, "seller_description"), // Seller Description - unitCostStr, // Unit Cost - qtyStr, // QTY - extCost, // Ext Cost + unitCostStr, // Unit Cost + qtyStr, // QTY + extCost, // Ext Cost getMetaString(e.Metadata, "sourcing_link"), // Sourcing Link } if err := writer.Write(row); err != nil { @@ -853,12 +858,11 @@ func (s *Server) HandleImportBOMCSV(w http.ResponseWriter, r *http.Request) { } // Build metadata from CSV columns - metadata := make(map[string]any) + source := "" if idx, ok := headerIdx["source"]; ok && idx < len(record) { - if v := strings.TrimSpace(record[idx]); v != "" { - metadata["source"] = v - } + source = strings.TrimSpace(record[idx]) } + metadata := make(map[string]any) if idx, ok := headerIdx["seller description"]; ok && idx < len(record) { if v := strings.TrimSpace(record[idx]); v != "" { metadata["seller_description"] = v @@ -942,6 +946,7 @@ func (s *Server) HandleImportBOMCSV(w http.ResponseWriter, r *http.Request) { ChildItemID: child.ID, RelType: "component", Quantity: quantity, + Source: source, Metadata: metadata, CreatedBy: importUsername, } diff --git a/internal/api/ods.go b/internal/api/ods.go index c590bf1..2fcf5e8 100644 --- a/internal/api/ods.go +++ b/internal/api/ods.go @@ -599,7 +599,7 @@ func (s *Server) HandleExportBOMODS(w http.ResponseWriter, r *http.Request) { } } - source := getMetaString(e.Metadata, "source") + source := e.Source if source == "" && childItem != nil { st := childItem.SourcingType if st == "manufactured" { @@ -754,7 +754,7 @@ func (s *Server) HandleProjectSheetODS(w http.ResponseWriter, r *http.Request) { if e.Quantity != nil { qty = *e.Quantity } - source := getMetaString(e.Metadata, "source") + source := e.Source if source == "" && childItem != nil { if childItem.SourcingType == "manufactured" { source = "M" diff --git a/internal/db/relationships.go b/internal/db/relationships.go index 8f6ecb3..afad1df 100644 --- a/internal/db/relationships.go +++ b/internal/db/relationships.go @@ -23,6 +23,7 @@ type Relationship struct { ChildRevision *int Metadata map[string]any ParentRevisionID *string + Source string // "manual" or "assembly" CreatedAt time.Time UpdatedAt time.Time CreatedBy *string @@ -46,6 +47,7 @@ type BOMEntry struct { ChildRevision *int EffectiveRevision int Metadata map[string]any + Source string } // BOMTreeEntry extends BOMEntry with depth for multi-level BOM expansion. @@ -84,16 +86,21 @@ func (r *RelationshipRepository) Create(ctx context.Context, rel *Relationship) } } + source := rel.Source + if source == "" { + source = "manual" + } + err = r.db.pool.QueryRow(ctx, ` INSERT INTO relationships ( parent_item_id, child_item_id, rel_type, quantity, unit, - reference_designators, child_revision, metadata, parent_revision_id, created_by + reference_designators, child_revision, metadata, parent_revision_id, created_by, source ) - VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) + VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11) RETURNING id, created_at, updated_at `, rel.ParentItemID, rel.ChildItemID, rel.RelType, rel.Quantity, rel.Unit, rel.ReferenceDesignators, rel.ChildRevision, metadataJSON, rel.ParentRevisionID, - rel.CreatedBy, + rel.CreatedBy, source, ).Scan(&rel.ID, &rel.CreatedAt, &rel.UpdatedAt) if err != nil { return fmt.Errorf("inserting relationship: %w", err) @@ -256,7 +263,7 @@ func (r *RelationshipRepository) GetBOM(ctx context.Context, parentItemID string rel.rel_type, rel.quantity, rel.unit, rel.reference_designators, rel.child_revision, COALESCE(rel.child_revision, child.current_revision) AS effective_revision, - rel.metadata + rel.metadata, rel.source FROM relationships rel JOIN items parent ON parent.id = rel.parent_item_id JOIN items child ON child.id = rel.child_item_id @@ -281,7 +288,7 @@ func (r *RelationshipRepository) GetWhereUsed(ctx context.Context, childItemID s rel.rel_type, rel.quantity, rel.unit, rel.reference_designators, rel.child_revision, COALESCE(rel.child_revision, child.current_revision) AS effective_revision, - rel.metadata + rel.metadata, rel.source FROM relationships rel JOIN items parent ON parent.id = rel.parent_item_id JOIN items child ON child.id = rel.child_item_id @@ -315,7 +322,7 @@ func (r *RelationshipRepository) GetExpandedBOM(ctx context.Context, parentItemI rel.rel_type, rel.quantity, rel.unit, rel.reference_designators, rel.child_revision, COALESCE(rel.child_revision, child.current_revision) AS effective_revision, - rel.metadata, + rel.metadata, rel.source, 1 AS depth FROM relationships rel JOIN items parent ON parent.id = rel.parent_item_id @@ -334,7 +341,7 @@ func (r *RelationshipRepository) GetExpandedBOM(ctx context.Context, parentItemI rel.rel_type, rel.quantity, rel.unit, rel.reference_designators, rel.child_revision, COALESCE(rel.child_revision, child.current_revision), - rel.metadata, + rel.metadata, rel.source, bt.depth + 1 FROM relationships rel JOIN items parent ON parent.id = rel.parent_item_id @@ -347,7 +354,7 @@ func (r *RelationshipRepository) GetExpandedBOM(ctx context.Context, parentItemI SELECT id, parent_item_id, parent_part_number, parent_description, child_item_id, child_part_number, child_description, rel_type, quantity, unit, reference_designators, - child_revision, effective_revision, metadata, depth + child_revision, effective_revision, metadata, source, depth FROM bom_tree ORDER BY depth, child_part_number `, parentItemID, maxDepth) @@ -366,7 +373,7 @@ func (r *RelationshipRepository) GetExpandedBOM(ctx context.Context, parentItemI &e.ChildItemID, &e.ChildPartNumber, &childDesc, &e.RelType, &e.Quantity, &e.Unit, &e.ReferenceDesignators, &e.ChildRevision, - &e.EffectiveRevision, &metadataJSON, &e.Depth, + &e.EffectiveRevision, &metadataJSON, &e.Source, &e.Depth, ) if err != nil { return nil, fmt.Errorf("scanning BOM tree entry: %w", err) @@ -553,7 +560,7 @@ func scanBOMEntries(rows pgx.Rows) ([]*BOMEntry, error) { &e.RelType, &e.Quantity, &e.Unit, &e.ReferenceDesignators, &e.ChildRevision, &e.EffectiveRevision, - &metadataJSON, + &metadataJSON, &e.Source, ) if err != nil { return nil, fmt.Errorf("scanning BOM entry: %w", err) diff --git a/migrations/012_bom_source.sql b/migrations/012_bom_source.sql new file mode 100644 index 0000000..cff7e6f --- /dev/null +++ b/migrations/012_bom_source.sql @@ -0,0 +1,16 @@ +-- Add source column to relationships table to distinguish assembly-derived +-- BOM entries from manually-added ones. +ALTER TABLE relationships + ADD COLUMN source VARCHAR(20) NOT NULL DEFAULT 'manual' + CHECK (source IN ('manual', 'assembly')); + +-- Migrate existing metadata.source values where they exist. +-- The metadata field stores source as a free-form string; promote to column. +UPDATE relationships +SET source = 'manual' +WHERE metadata->>'source' IS NOT NULL; + +-- Remove the source key from metadata since it's now a dedicated column. +UPDATE relationships +SET metadata = metadata - 'source' +WHERE metadata ? 'source'; diff --git a/web/src/api/types.ts b/web/src/api/types.ts index e6db599..0df3662 100644 --- a/web/src/api/types.ts +++ b/web/src/api/types.ts @@ -75,6 +75,7 @@ export interface BOMEntry { child_revision?: number; effective_revision: number; depth?: number; + source: string; metadata?: Record; } @@ -196,6 +197,7 @@ export interface AddBOMEntryRequest { unit?: string; reference_designators?: string[]; child_revision?: number; + source?: string; metadata?: Record; } diff --git a/web/src/components/items/BOMTab.tsx b/web/src/components/items/BOMTab.tsx index 4ef502a..3cffebf 100644 --- a/web/src/components/items/BOMTab.tsx +++ b/web/src/components/items/BOMTab.tsx @@ -1,6 +1,6 @@ -import { useState, useEffect, useCallback } from 'react'; -import { get, post, put, del } from '../../api/client'; -import type { BOMEntry } from '../../api/types'; +import { useState, useEffect, useCallback } from "react"; +import { get, post, put, del } from "../../api/client"; +import type { BOMEntry } from "../../api/types"; interface BOMTabProps { partNumber: string; @@ -16,7 +16,14 @@ interface BOMFormData { sourcing_link: string; } -const emptyForm: BOMFormData = { child_part_number: '', quantity: '1', source: '', seller_description: '', unit_cost: '', sourcing_link: '' }; +const emptyForm: BOMFormData = { + child_part_number: "", + quantity: "1", + source: "", + seller_description: "", + unit_cost: "", + sourcing_link: "", +}; export function BOMTab({ partNumber, isEditor }: BOMTabProps) { const [entries, setEntries] = useState([]); @@ -42,10 +49,10 @@ export function BOMTab({ partNumber, isEditor }: BOMTabProps) { const formToRequest = () => ({ child_part_number: form.child_part_number, - rel_type: 'component' as const, + rel_type: "component" as const, quantity: Number(form.quantity) || 1, + source: form.source, metadata: { - source: form.source, seller_description: form.seller_description, unit_cost: form.unit_cost, sourcing_link: form.sourcing_link, @@ -54,34 +61,42 @@ export function BOMTab({ partNumber, isEditor }: BOMTabProps) { const handleAdd = async () => { try { - await post(`/api/items/${encodeURIComponent(partNumber)}/bom`, formToRequest()); + await post( + `/api/items/${encodeURIComponent(partNumber)}/bom`, + formToRequest(), + ); setShowAdd(false); setForm(emptyForm); load(); } catch (e) { - alert(e instanceof Error ? e.message : 'Failed to add BOM entry'); + alert(e instanceof Error ? e.message : "Failed to add BOM entry"); } }; const handleEdit = async (childPN: string) => { try { const { child_part_number: _, ...req } = formToRequest(); - await put(`/api/items/${encodeURIComponent(partNumber)}/bom/${encodeURIComponent(childPN)}`, req); + await put( + `/api/items/${encodeURIComponent(partNumber)}/bom/${encodeURIComponent(childPN)}`, + req, + ); setEditIdx(null); setForm(emptyForm); load(); } catch (e) { - alert(e instanceof Error ? e.message : 'Failed to update BOM entry'); + alert(e instanceof Error ? e.message : "Failed to update BOM entry"); } }; const handleDelete = async (childPN: string) => { if (!confirm(`Remove ${childPN} from BOM?`)) return; try { - await del(`/api/items/${encodeURIComponent(partNumber)}/bom/${encodeURIComponent(childPN)}`); + await del( + `/api/items/${encodeURIComponent(partNumber)}/bom/${encodeURIComponent(childPN)}`, + ); load(); } catch (e) { - alert(e instanceof Error ? e.message : 'Failed to delete BOM entry'); + alert(e instanceof Error ? e.message : "Failed to delete BOM entry"); } }; @@ -91,71 +106,155 @@ export function BOMTab({ partNumber, isEditor }: BOMTabProps) { setForm({ child_part_number: e.child_part_number, quantity: String(e.quantity ?? 1), - source: m.source ?? '', - seller_description: m.seller_description ?? '', - unit_cost: m.unit_cost ?? '', - sourcing_link: m.sourcing_link ?? '', + source: e.source ?? "", + seller_description: m.seller_description ?? "", + unit_cost: m.unit_cost ?? "", + sourcing_link: m.sourcing_link ?? "", }); setEditIdx(idx); setShowAdd(false); }; const inputStyle: React.CSSProperties = { - padding: '0.2rem 0.4rem', fontSize: '0.8rem', - backgroundColor: 'var(--ctp-base)', border: '1px solid var(--ctp-surface1)', - borderRadius: '0.3rem', color: 'var(--ctp-text)', width: '100%', + padding: "0.2rem 0.4rem", + fontSize: "0.8rem", + backgroundColor: "var(--ctp-base)", + border: "1px solid var(--ctp-surface1)", + borderRadius: "0.3rem", + color: "var(--ctp-text)", + width: "100%", }; const formRow = (isEditing: boolean, childPN?: string) => ( - + ); - if (loading) return
Loading BOM...
; + if (loading) + return
Loading BOM...
; return (
{/* Toolbar */} -
- {entries.length} entries +
+ + {entries.length} entries + {isEditor && ( - + )}
-
-
col.key !== 'actions' && onSort(col.key)} + onClick={() => col.key !== "actions" && onSort(col.key)} > {col.label} {sortKey === col.key && ( - {sortDir === 'asc' ? '▲' : '▼'} + + {sortDir === "asc" ? "▲" : "▼"} + )}
{ e.stopPropagation(); copyPN(item.part_number); }} + onClick={(e) => { + e.stopPropagation(); + copyPN(item.part_number); + }} title="Click to copy" style={{ fontFamily: "'JetBrains Mono', monospace", - color: 'var(--ctp-peach)', - cursor: 'copy', + color: "var(--ctp-peach)", + cursor: "copy", }} > {item.part_number} - + {item.item_type} {item.description}Rev {item.current_revision}—{formatDate(item.created_at)} + {item.description} + + Rev {item.current_revision} + + — + + {formatDate(item.created_at)} + @@ -226,7 +318,14 @@ export function ItemTable({ })} {sortedItems.length === 0 && (
+ No items found
- setForm({ ...form, child_part_number: e.target.value })} - disabled={isEditing} placeholder="Part number" style={inputStyle} /> + + setForm({ ...form, child_part_number: e.target.value }) + } + disabled={isEditing} + placeholder="Part number" + style={inputStyle} + /> - setForm({ ...form, source: e.target.value })} placeholder="Source" style={inputStyle} /> + setForm({ ...form, source: e.target.value })} + placeholder="Source" + style={inputStyle} + /> - setForm({ ...form, seller_description: e.target.value })} placeholder="Description" style={inputStyle} /> + + setForm({ ...form, seller_description: e.target.value }) + } + placeholder="Description" + style={inputStyle} + /> - setForm({ ...form, unit_cost: e.target.value })} type="number" step="0.01" placeholder="0.00" style={inputStyle} /> + setForm({ ...form, unit_cost: e.target.value })} + type="number" + step="0.01" + placeholder="0.00" + style={inputStyle} + /> - setForm({ ...form, quantity: e.target.value })} type="number" step="1" placeholder="1" style={{ ...inputStyle, width: 50 }} /> + setForm({ ...form, quantity: e.target.value })} + type="number" + step="1" + placeholder="1" + style={{ ...inputStyle, width: 50 }} + /> — - setForm({ ...form, sourcing_link: e.target.value })} placeholder="URL" style={inputStyle} /> + setForm({ ...form, sourcing_link: e.target.value })} + placeholder="URL" + style={inputStyle} + /> - - + +
+
+
@@ -174,20 +273,71 @@ export function BOMTab({ partNumber, isEditor }: BOMTabProps) { if (editIdx === idx) return formRow(true, e.child_part_number); const m = meta(e); return ( - - - - - - - + + + + + + + {isEditor && ( )} @@ -196,9 +346,22 @@ export function BOMTab({ partNumber, isEditor }: BOMTabProps) { {totalCost > 0 && ( - - - + + + @@ -210,29 +373,59 @@ export function BOMTab({ partNumber, isEditor }: BOMTabProps) { } const thStyle: React.CSSProperties = { - padding: '0.3rem 0.5rem', textAlign: 'left', borderBottom: '1px solid var(--ctp-surface1)', - color: 'var(--ctp-subtext1)', fontWeight: 600, fontSize: '0.7rem', textTransform: 'uppercase', letterSpacing: '0.05em', whiteSpace: 'nowrap', + padding: "0.3rem 0.5rem", + textAlign: "left", + borderBottom: "1px solid var(--ctp-surface1)", + color: "var(--ctp-subtext1)", + fontWeight: 600, + fontSize: "0.7rem", + textTransform: "uppercase", + letterSpacing: "0.05em", + whiteSpace: "nowrap", }; const tdStyle: React.CSSProperties = { - padding: '0.25rem 0.5rem', borderBottom: '1px solid var(--ctp-surface0)', whiteSpace: 'nowrap', + padding: "0.25rem 0.5rem", + borderBottom: "1px solid var(--ctp-surface0)", + whiteSpace: "nowrap", }; const toolBtnStyle: React.CSSProperties = { - padding: '0.25rem 0.5rem', fontSize: '0.8rem', border: 'none', borderRadius: '0.3rem', - backgroundColor: 'var(--ctp-surface1)', color: 'var(--ctp-text)', cursor: 'pointer', + padding: "0.25rem 0.5rem", + fontSize: "0.8rem", + border: "none", + borderRadius: "0.3rem", + backgroundColor: "var(--ctp-surface1)", + color: "var(--ctp-text)", + cursor: "pointer", }; const actionBtnStyle: React.CSSProperties = { - background: 'none', border: 'none', color: 'var(--ctp-subtext1)', cursor: 'pointer', fontSize: '0.75rem', padding: '0.1rem 0.3rem', + background: "none", + border: "none", + color: "var(--ctp-subtext1)", + cursor: "pointer", + fontSize: "0.75rem", + padding: "0.1rem 0.3rem", }; const saveBtnStyle: React.CSSProperties = { - padding: '0.2rem 0.4rem', fontSize: '0.75rem', border: 'none', borderRadius: '0.25rem', - backgroundColor: 'var(--ctp-green)', color: 'var(--ctp-crust)', cursor: 'pointer', marginRight: '0.25rem', + padding: "0.2rem 0.4rem", + fontSize: "0.75rem", + border: "none", + borderRadius: "0.25rem", + backgroundColor: "var(--ctp-green)", + color: "var(--ctp-crust)", + cursor: "pointer", + marginRight: "0.25rem", }; const cancelBtnStyle: React.CSSProperties = { - padding: '0.2rem 0.4rem', fontSize: '0.75rem', border: 'none', borderRadius: '0.25rem', - backgroundColor: 'var(--ctp-surface1)', color: 'var(--ctp-subtext1)', cursor: 'pointer', + padding: "0.2rem 0.4rem", + fontSize: "0.75rem", + border: "none", + borderRadius: "0.25rem", + backgroundColor: "var(--ctp-surface1)", + color: "var(--ctp-subtext1)", + cursor: "pointer", }; From fbe4f3a36c61b0b19f85841456aba60bd60d0627 Mon Sep 17 00:00:00 2001 From: Forbes Date: Sun, 8 Feb 2026 19:15:27 -0600 Subject: [PATCH 6/6] feat(api): add POST /api/items/{partNumber}/bom/merge endpoint (#45) Add BOM merge endpoint for syncing assembly-derived BOM entries from FreeCAD's silo-mod plugin. Merge rules: - Added: entries in request but not in server BOM are auto-created with source='assembly' - Quantity changed: existing entries with different quantity are auto-updated - Unchanged: same part and quantity are skipped - Unreferenced: assembly-sourced entries in server BOM but not in request are flagged as warnings (never auto-deleted) - Manual entries are silently ignored in unreferenced detection Also emits SSE 'bom.merged' event on successful merge (#46). --- internal/api/bom_handlers.go | 244 +++++++++++++++++++++++++++++++++++ internal/api/routes.go | 1 + 2 files changed, 245 insertions(+) diff --git a/internal/api/bom_handlers.go b/internal/api/bom_handlers.go index 633ed5d..83c6008 100644 --- a/internal/api/bom_handlers.go +++ b/internal/api/bom_handlers.go @@ -594,6 +594,56 @@ func (s *Server) HandleGetBOMCost(w http.ResponseWriter, r *http.Request) { }) } +// BOM merge request/response types + +// MergeBOMRequest represents a request to merge assembly BOM entries. +type MergeBOMRequest struct { + Source string `json:"source"` + Entries []MergeBOMEntry `json:"entries"` +} + +// MergeBOMEntry represents a single entry in a merge request. +type MergeBOMEntry struct { + ChildPartNumber string `json:"child_part_number"` + Quantity *float64 `json:"quantity"` +} + +// MergeBOMResponse represents the result of a BOM merge. +type MergeBOMResponse struct { + Status string `json:"status"` + Diff MergeBOMDiff `json:"diff"` + Warnings []MergeWarning `json:"warnings"` + ResolveURL string `json:"resolve_url"` +} + +// MergeBOMDiff categorizes changes from a merge operation. +type MergeBOMDiff struct { + Added []MergeDiffEntry `json:"added"` + Removed []MergeDiffEntry `json:"removed"` + QuantityChanged []MergeQtyChange `json:"quantity_changed"` + Unchanged []MergeDiffEntry `json:"unchanged"` +} + +// MergeDiffEntry represents an added, removed, or unchanged BOM entry. +type MergeDiffEntry struct { + PartNumber string `json:"part_number"` + Quantity *float64 `json:"quantity"` +} + +// MergeQtyChange represents a BOM entry whose quantity changed. +type MergeQtyChange struct { + PartNumber string `json:"part_number"` + OldQuantity *float64 `json:"old_quantity"` + NewQuantity *float64 `json:"new_quantity"` +} + +// MergeWarning represents a warning generated during merge. +type MergeWarning struct { + Type string `json:"type"` + PartNumber string `json:"part_number"` + Message string `json:"message"` +} + // BOM CSV headers matching the user-specified format. var bomCSVHeaders = []string{ "Item", "Level", "Source", "PN", "Seller Description", @@ -976,3 +1026,197 @@ func (s *Server) HandleImportBOMCSV(w http.ResponseWriter, r *http.Request) { writeJSON(w, http.StatusOK, result) } + +// HandleMergeBOM merges assembly-derived BOM entries into the server's BOM. +// Added entries are created, quantity changes are applied, and entries present +// in the server but missing from the request are flagged as warnings (not deleted). +func (s *Server) HandleMergeBOM(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + partNumber := chi.URLParam(r, "partNumber") + + parent, err := s.items.GetByPartNumber(ctx, partNumber) + if err != nil { + s.logger.Error().Err(err).Msg("failed to get parent item") + writeError(w, http.StatusInternalServerError, "internal_error", "Failed to get parent item") + return + } + if parent == nil { + writeError(w, http.StatusNotFound, "not_found", "Parent item not found") + return + } + + var req MergeBOMRequest + if err := json.NewDecoder(r.Body).Decode(&req); err != nil { + writeError(w, http.StatusBadRequest, "invalid_json", err.Error()) + return + } + if len(req.Entries) == 0 { + writeError(w, http.StatusBadRequest, "invalid_request", "entries must not be empty") + return + } + + // Fetch existing BOM (includes Source field) + existing, err := s.relationships.GetBOM(ctx, parent.ID) + if err != nil { + s.logger.Error().Err(err).Msg("failed to get existing BOM") + writeError(w, http.StatusInternalServerError, "internal_error", "Failed to get existing BOM") + return + } + + // Build lookup map by child part number + existingMap := make(map[string]*db.BOMEntry, len(existing)) + for _, e := range existing { + existingMap[e.ChildPartNumber] = e + } + + var username *string + if user := auth.UserFromContext(ctx); user != nil { + username = &user.Username + } + + diff := MergeBOMDiff{ + Added: make([]MergeDiffEntry, 0), + Removed: make([]MergeDiffEntry, 0), + QuantityChanged: make([]MergeQtyChange, 0), + Unchanged: make([]MergeDiffEntry, 0), + } + var warnings []MergeWarning + + // Process incoming entries + for _, entry := range req.Entries { + if entry.ChildPartNumber == "" { + continue + } + + child, err := s.items.GetByPartNumber(ctx, entry.ChildPartNumber) + if err != nil { + s.logger.Error().Err(err).Str("child", entry.ChildPartNumber).Msg("failed to look up child") + warnings = append(warnings, MergeWarning{ + Type: "error", + PartNumber: entry.ChildPartNumber, + Message: fmt.Sprintf("Error looking up item: %s", err.Error()), + }) + continue + } + if child == nil { + warnings = append(warnings, MergeWarning{ + Type: "not_found", + PartNumber: entry.ChildPartNumber, + Message: fmt.Sprintf("Item '%s' not found in database", entry.ChildPartNumber), + }) + continue + } + + if ex, ok := existingMap[entry.ChildPartNumber]; ok { + // Entry already exists — check quantity + oldQty := ex.Quantity + newQty := entry.Quantity + if quantitiesEqual(oldQty, newQty) { + diff.Unchanged = append(diff.Unchanged, MergeDiffEntry{ + PartNumber: entry.ChildPartNumber, + Quantity: newQty, + }) + } else { + // Update quantity + if err := s.relationships.Update(ctx, ex.RelationshipID, nil, newQty, nil, nil, nil, nil, username); err != nil { + s.logger.Error().Err(err).Str("child", entry.ChildPartNumber).Msg("failed to update quantity") + warnings = append(warnings, MergeWarning{ + Type: "error", + PartNumber: entry.ChildPartNumber, + Message: fmt.Sprintf("Failed to update quantity: %s", err.Error()), + }) + } else { + diff.QuantityChanged = append(diff.QuantityChanged, MergeQtyChange{ + PartNumber: entry.ChildPartNumber, + OldQuantity: oldQty, + NewQuantity: newQty, + }) + } + } + delete(existingMap, entry.ChildPartNumber) + } else { + // New entry — create + rel := &db.Relationship{ + ParentItemID: parent.ID, + ChildItemID: child.ID, + RelType: "component", + Quantity: entry.Quantity, + Source: "assembly", + CreatedBy: username, + } + if err := s.relationships.Create(ctx, rel); err != nil { + if strings.Contains(err.Error(), "cycle") { + warnings = append(warnings, MergeWarning{ + Type: "cycle", + PartNumber: entry.ChildPartNumber, + Message: fmt.Sprintf("Adding '%s' would create a cycle", entry.ChildPartNumber), + }) + } else { + s.logger.Error().Err(err).Str("child", entry.ChildPartNumber).Msg("failed to create relationship") + warnings = append(warnings, MergeWarning{ + Type: "error", + PartNumber: entry.ChildPartNumber, + Message: fmt.Sprintf("Failed to create: %s", err.Error()), + }) + } + continue + } + diff.Added = append(diff.Added, MergeDiffEntry{ + PartNumber: entry.ChildPartNumber, + Quantity: entry.Quantity, + }) + } + } + + // Remaining entries in existingMap are not in the merge request + for pn, e := range existingMap { + if e.Source == "assembly" { + diff.Removed = append(diff.Removed, MergeDiffEntry{ + PartNumber: pn, + Quantity: e.Quantity, + }) + warnings = append(warnings, MergeWarning{ + Type: "unreferenced", + PartNumber: pn, + Message: "Present in server BOM but not in assembly", + }) + } + } + + resp := MergeBOMResponse{ + Status: "merged", + Diff: diff, + Warnings: warnings, + ResolveURL: fmt.Sprintf("/items/%s/bom", partNumber), + } + + s.logger.Info(). + Str("parent", partNumber). + Int("added", len(diff.Added)). + Int("updated", len(diff.QuantityChanged)). + Int("unchanged", len(diff.Unchanged)). + Int("unreferenced", len(diff.Removed)). + Int("warnings", len(warnings)). + Msg("BOM merge completed") + + s.broker.Publish("bom.merged", mustMarshal(map[string]any{ + "part_number": partNumber, + "added": len(diff.Added), + "quantity_changed": len(diff.QuantityChanged), + "unchanged": len(diff.Unchanged), + "unreferenced": len(diff.Removed), + })) + + writeJSON(w, http.StatusOK, resp) +} + +// quantitiesEqual compares two nullable float64 quantities. +func quantitiesEqual(a, b *float64) bool { + if a == nil && b == nil { + return true + } + if a == nil || b == nil { + return false + } + return *a == *b +} diff --git a/internal/api/routes.go b/internal/api/routes.go index 32d760a..0e8e215 100644 --- a/internal/api/routes.go +++ b/internal/api/routes.go @@ -165,6 +165,7 @@ func NewRouter(server *Server, logger zerolog.Logger) http.Handler { r.Put("/thumbnail", server.HandleSetItemThumbnail) r.Post("/bom", server.HandleAddBOMEntry) r.Post("/bom/import", server.HandleImportBOMCSV) + r.Post("/bom/merge", server.HandleMergeBOM) r.Put("/bom/{childPartNumber}", server.HandleUpdateBOMEntry) r.Delete("/bom/{childPartNumber}", server.HandleDeleteBOMEntry) })
PN
{e.child_part_number}{m.source ?? ''}{e.child_description || m.seller_description || ''}{unitCost(e) ? `$${unitCost(e).toFixed(2)}` : '—'}{e.quantity ?? '—'}{extCost(e) ? `$${extCost(e).toFixed(2)}` : '—'}
+ {e.child_part_number} + {e.source ?? ""} + {e.child_description || m.seller_description || ""} + + {unitCost(e) ? `$${unitCost(e).toFixed(2)}` : "—"} + {e.quantity ?? "—"} + {extCost(e) ? `$${extCost(e).toFixed(2)}` : "—"} + - {m.sourcing_link ? Link : '—'} + {m.sourcing_link ? ( + + Link + + ) : ( + "—" + )} - - + +
Total:${totalCost.toFixed(2)}
+ Total: + + ${totalCost.toFixed(2)} +