Multi-site distribution readiness: settings-driven site config, security closeout, release engineering, v0.5.0
Make the app distributable to other GE Aerospace sites (one self-hosted
instance per site, ADR-004). GE values remain the shipped defaults; every
site-specific behavior is now a Setting an admin can change in the UI.
Settings-driven site config:
- Branding: site/QR/badge logos, favicon, primary color (upload endpoints
mirror the map-blueprint pattern; new Settings > Branding section).
- ServiceNow: search/incident/change URL templates ({ticket}), ticket
prefixes, enable toggle. Defaults point at the current
geaerospaceqa.service-now.com global search. Disabled = plain-text tickets.
- Employee-id regex (employeeid_pattern), printer hostname template,
QR label targets (qr_target_printer / qr_target_usb, blank = asset page,
else URL template with placeholders), usb_label_style (barcode|qr).
- West Jefferson floor-plan PNGs removed from the tree; generic placeholder
ships as the map default and sites upload their own blueprint.
Security closeout:
- dashboarddefaults writes now require admin.
- Collector: generic error messages (no str(exc) leak); API key accepted
via X-API-Key header only (BREAKING: querystring api_key removed).
- IP-based login rate limiting (AUTH_RATELIMIT_* knobs) atop account lockout.
- Setting.set() creation race fixed (IntegrityError retry).
Release engineering and docs:
- __version__ 0.5.0 (distinct from __contract_version__, ADR-007),
CHANGELOG.md, Gitea Actions CI config, frontend version aligned.
- One wizard-first install story across README/DEPLOY; new CONFIG.md,
UPGRADE.md, BACKUP-RESTORE.md; CLAUDE.md and ROADMAP de-staled.
- Dockerfile multi-stage build now bundles the frontend; compose binds
MySQL to 127.0.0.1; stale database/schema.sql and one-off SQL removed.
Debt and fixes:
- .query.get() -> db.session.get() sweep; datetime.utcnow() removed
(naive-UTC via timezone-aware now); users.py on authz decorators.
- Fixed 4 stale tests (slides feed shape, shopfloor splitperemployee,
plugin contract purity) and the USB label page field mapping (both usb
modes emit the cmmc shape: device_id/device_desc).
- Health endpoint reports the real version.
248 tests pass; naming/style check green; frontend builds; fresh-DB
flask db upgrade + seeds verified; QR targets verified by decoding
rendered codes.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -42,7 +42,7 @@ def list_network_device_types():
|
||||
@jwt_required(optional=True)
|
||||
def get_network_device_type(type_id: int):
|
||||
"""Get a single network device type."""
|
||||
t = NetworkDeviceType.query.get(type_id)
|
||||
t = db.session.get(NetworkDeviceType, type_id)
|
||||
|
||||
if not t:
|
||||
return error_response(
|
||||
@@ -96,7 +96,7 @@ def create_network_device_type():
|
||||
@require_permission('network.edit')
|
||||
def update_network_device_type(type_id: int):
|
||||
"""Update a network device type."""
|
||||
t = NetworkDeviceType.query.get(type_id)
|
||||
t = db.session.get(NetworkDeviceType, type_id)
|
||||
|
||||
if not t:
|
||||
return error_response(
|
||||
@@ -130,7 +130,7 @@ def update_network_device_type(type_id: int):
|
||||
@require_permission('network.delete')
|
||||
def delete_network_device_type(type_id: int):
|
||||
"""Delete a network device type. Refused if any device still uses it."""
|
||||
t = NetworkDeviceType.query.get(type_id)
|
||||
t = db.session.get(NetworkDeviceType, type_id)
|
||||
if not t:
|
||||
return error_response(ErrorCodes.NOT_FOUND, 'Network device type not found', http_code=404)
|
||||
inuse = NetworkDevice.query.filter_by(networkdevicetypeid=type_id).count()
|
||||
@@ -238,7 +238,7 @@ def list_network_devices():
|
||||
@jwt_required(optional=True)
|
||||
def get_network_device(device_id: int):
|
||||
"""Get a single network device with full details."""
|
||||
netdev = NetworkDevice.query.get(device_id)
|
||||
netdev = db.session.get(NetworkDevice, device_id)
|
||||
|
||||
if not netdev:
|
||||
return error_response(
|
||||
@@ -393,7 +393,7 @@ def create_network_device():
|
||||
@require_permission('network.edit')
|
||||
def update_network_device(device_id: int):
|
||||
"""Update network device (both Asset and NetworkDevice records)."""
|
||||
netdev = NetworkDevice.query.get(device_id)
|
||||
netdev = db.session.get(NetworkDevice, device_id)
|
||||
|
||||
if not netdev:
|
||||
return error_response(
|
||||
@@ -471,7 +471,7 @@ def update_network_device(device_id: int):
|
||||
@require_permission('network.delete')
|
||||
def delete_network_device(device_id: int):
|
||||
"""Delete (soft delete) network device."""
|
||||
netdev = NetworkDevice.query.get(device_id)
|
||||
netdev = db.session.get(NetworkDevice, device_id)
|
||||
|
||||
if not netdev:
|
||||
return error_response(
|
||||
@@ -581,7 +581,7 @@ def list_vlans():
|
||||
@jwt_required(optional=True)
|
||||
def get_vlan(vlan_id: int):
|
||||
"""Get a single VLAN with its subnets."""
|
||||
vlan = VLAN.query.get(vlan_id)
|
||||
vlan = db.session.get(VLAN, vlan_id)
|
||||
|
||||
if not vlan:
|
||||
return error_response(
|
||||
@@ -644,7 +644,7 @@ def create_vlan():
|
||||
@require_permission('network.edit')
|
||||
def update_vlan(vlan_id: int):
|
||||
"""Update a VLAN."""
|
||||
vlan = VLAN.query.get(vlan_id)
|
||||
vlan = db.session.get(VLAN, vlan_id)
|
||||
|
||||
if not vlan:
|
||||
return error_response(
|
||||
@@ -690,7 +690,7 @@ def update_vlan(vlan_id: int):
|
||||
@require_permission('network.delete')
|
||||
def delete_vlan(vlan_id: int):
|
||||
"""Delete (soft delete) a VLAN."""
|
||||
vlan = VLAN.query.get(vlan_id)
|
||||
vlan = db.session.get(VLAN, vlan_id)
|
||||
|
||||
if not vlan:
|
||||
return error_response(
|
||||
@@ -767,7 +767,7 @@ def list_subnets():
|
||||
@jwt_required(optional=True)
|
||||
def get_subnet(subnet_id: int):
|
||||
"""Get a single subnet."""
|
||||
subnet = Subnet.query.get(subnet_id)
|
||||
subnet = db.session.get(Subnet, subnet_id)
|
||||
|
||||
if not subnet:
|
||||
return error_response(
|
||||
@@ -809,7 +809,7 @@ def create_subnet():
|
||||
|
||||
# Validate VLAN if provided
|
||||
if data.get('vlanid'):
|
||||
if not VLAN.query.get(data['vlanid']):
|
||||
if not db.session.get(VLAN, data['vlanid']):
|
||||
return error_response(
|
||||
ErrorCodes.VALIDATION_ERROR,
|
||||
f"VLAN with ID {data['vlanid']} not found"
|
||||
@@ -850,7 +850,7 @@ def create_subnet():
|
||||
@require_permission('network.edit')
|
||||
def update_subnet(subnet_id: int):
|
||||
"""Update a subnet."""
|
||||
subnet = Subnet.query.get(subnet_id)
|
||||
subnet = db.session.get(Subnet, subnet_id)
|
||||
|
||||
if not subnet:
|
||||
return error_response(
|
||||
@@ -901,7 +901,7 @@ def update_subnet(subnet_id: int):
|
||||
@require_permission('network.delete')
|
||||
def delete_subnet(subnet_id: int):
|
||||
"""Delete (soft delete) a subnet."""
|
||||
subnet = Subnet.query.get(subnet_id)
|
||||
subnet = db.session.get(Subnet, subnet_id)
|
||||
|
||||
if not subnet:
|
||||
return error_response(
|
||||
|
||||
Reference in New Issue
Block a user