Rack: link items to devices, shelves, several racks, export; fix layout and light mode
Lint / JS (eslint) (push) Successful in 7s
Lint / Python (flake8) (push) Successful in 48s
Lint / Notify on failure (push) Skipped
Lint / Deploy (push) Skipped
Security / Python Security (bandit) (push) Successful in 49s
Lint / Python (flake8) (pull_request) Successful in 51s
Test / Python Tests (pytest) (push) Successful in 1m2s
Lint / JS (eslint) (pull_request) Successful in 7s
Lint / Notify on failure (pull_request) Skipped
Lint / Deploy (pull_request) Skipped
Security / Python Security (bandit) (pull_request) Successful in 50s
Test / Python Tests (pytest) (pull_request) Successful in 53s
Lint / JS (eslint) (push) Successful in 7s
Lint / Python (flake8) (push) Successful in 48s
Lint / Notify on failure (push) Skipped
Lint / Deploy (push) Skipped
Security / Python Security (bandit) (push) Successful in 49s
Lint / Python (flake8) (pull_request) Successful in 51s
Test / Python Tests (pytest) (push) Successful in 1m2s
Lint / JS (eslint) (pull_request) Successful in 7s
Lint / Notify on failure (pull_request) Skipped
Lint / Deploy (pull_request) Skipped
Security / Python Security (bandit) (pull_request) Successful in 50s
Test / Python Tests (pytest) (pull_request) Successful in 53s
Cutsheet items gain a "Gandalf device" link, so an item named after the product (UDM-Pro) shows the live device's faceplate, ports and status. Cable checks, suggestions, tickets and the device page treat an item and its linked device as one. Without this, product-named items drew as bare name plates. Items can sit on a shelf instead of a rack unit; the shelf draws what is on it with live status. Items have a rack, the page shows a tab per rack (config "racks"), and a rack can be downloaded as SVG or PNG. The rack is centred, long runs of empty units fold into one band (with a toggle), every device fills the 19" width, the UPS shows its front only, and the rack keeps its own palette so it reads in light mode. New cutsheet_items columns rack, shelf and device are added on first use. Deleting a shelf, or making it something else, is refused while it holds items; renaming it carries over. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -674,6 +674,9 @@ _CUTSHEET_SCHEMA = (
|
||||
location VARCHAR(255) NOT NULL DEFAULT '',
|
||||
rack_u SMALLINT NULL,
|
||||
rack_height SMALLINT NULL,
|
||||
rack VARCHAR(100) NOT NULL DEFAULT '',
|
||||
shelf VARCHAR(100) NOT NULL DEFAULT '',
|
||||
device VARCHAR(255) NOT NULL DEFAULT '',
|
||||
notes TEXT NULL,
|
||||
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||
@@ -754,7 +757,15 @@ def set_device_link(name: str, inventory_url: str, user: str) -> None:
|
||||
(name, inventory_url, user),
|
||||
)
|
||||
|
||||
_ITEM_FIELDS = ('name', 'kind', 'port_count', 'location', 'rack_u', 'rack_height', 'notes')
|
||||
_ITEM_FIELDS = ('name', 'kind', 'port_count', 'location', 'rack_u', 'rack_height', 'rack', 'shelf', 'device',
|
||||
'notes')
|
||||
# Columns added to cutsheet_items after its first release: (name, definition)
|
||||
_ITEM_COLUMNS_ADDED = (
|
||||
('rack', "VARCHAR(100) NOT NULL DEFAULT ''"),
|
||||
('shelf', "VARCHAR(100) NOT NULL DEFAULT ''"),
|
||||
# The Gandalf device (UniFi or host name) an item is, when its own name differs
|
||||
('device', "VARCHAR(255) NOT NULL DEFAULT ''"),
|
||||
)
|
||||
_CABLE_FIELDS = ('label', 'a_device', 'a_port', 'a_side', 'b_device', 'b_port', 'b_side',
|
||||
'cable_type', 'length_m', 'color', 'status', 'label_applied', 'notes')
|
||||
|
||||
@@ -768,6 +779,12 @@ def ensure_cutsheet_schema() -> None:
|
||||
with conn.cursor() as cur:
|
||||
for statement in _CUTSHEET_SCHEMA:
|
||||
cur.execute(statement)
|
||||
cur.execute('SHOW COLUMNS FROM cutsheet_items')
|
||||
have = {r['Field'] for r in cur.fetchall()}
|
||||
for column, definition in _ITEM_COLUMNS_ADDED:
|
||||
if column not in have:
|
||||
# Fixed names from _ITEM_COLUMNS_ADDED, never user input
|
||||
cur.execute(f'ALTER TABLE cutsheet_items ADD COLUMN {column} {definition}') # nosec B608
|
||||
|
||||
|
||||
def _cs_jsonable(row: Optional[dict]) -> Optional[dict]:
|
||||
@@ -876,17 +893,27 @@ def cutsheet_update_item(item_id: int, item: dict, user: str) -> bool:
|
||||
tuple(item[f] for f in _ITEM_FIELDS) + (item_id,),
|
||||
)
|
||||
summary = f'Edited {item["name"]}'
|
||||
if before['kind'] == 'shelf' and item['kind'] != 'shelf':
|
||||
on_it = _cs_on_shelf(cur, before['name'])
|
||||
if on_it:
|
||||
raise CutsheetConflict(f'{before["name"]} still holds {on_it} item(s); move them off the shelf first')
|
||||
if before['name'] != item['name']:
|
||||
for end in ('a', 'b'):
|
||||
cur.execute(
|
||||
f'UPDATE cutsheet_cables SET {end}_device=%s, updated_by=%s WHERE {end}_device=%s', # nosec B608
|
||||
(item['name'], user, before['name']),
|
||||
)
|
||||
cur.execute('UPDATE cutsheet_items SET shelf=%s WHERE shelf=%s', (item['name'], before['name']))
|
||||
summary = f'Renamed {before["name"]} to {item["name"]}'
|
||||
_cs_log(cur, user, 'item', item_id, 'update', summary, before, item)
|
||||
return True
|
||||
|
||||
|
||||
def _cs_on_shelf(cur, shelf: str) -> int:
|
||||
cur.execute('SELECT COUNT(*) AS n FROM cutsheet_items WHERE shelf=%s', (shelf,))
|
||||
return cur.fetchone()['n']
|
||||
|
||||
|
||||
def cutsheet_delete_item(item_id: int, user: str) -> bool:
|
||||
with _cs_transaction() as cur:
|
||||
before = _cs_get(cur, 'cutsheet_items', item_id)
|
||||
@@ -899,6 +926,9 @@ def cutsheet_delete_item(item_id: int, user: str) -> bool:
|
||||
used = cur.fetchone()['n']
|
||||
if used:
|
||||
raise CutsheetConflict(f'{before["name"]} still has {used} cable(s); move or delete them first')
|
||||
on_it = _cs_on_shelf(cur, before['name'])
|
||||
if on_it:
|
||||
raise CutsheetConflict(f'{before["name"]} still holds {on_it} item(s); move them off the shelf first')
|
||||
cur.execute('DELETE FROM cutsheet_port_labels WHERE item_id=%s', (item_id,))
|
||||
cur.execute('DELETE FROM cutsheet_items WHERE id=%s', (item_id,))
|
||||
_cs_log(cur, user, 'item', item_id, 'delete', f'Removed {before["name"]}', before, None)
|
||||
|
||||
Reference in New Issue
Block a user