Add custom fields + warranty plugin, rework settings into two-pane shell
Feature work from the 2026-07 session: Settings IA - Replace the flat 27-card settings hub with a persistent two-pane shell (SettingsLayout.vue): grouped, searchable left rail + content pane. - Nest all settings/* routes under the shell via router post-processing; shared nav catalog in settingsNav.js. Group by asset class (PCs, Printers, Equipment, Network) so per-type settings stop scattering. Custom fields (core) - customfields + customfieldvalues tables (migration 7d14), CRUD API at /api/customfields, per-asset value get/save. - Settings management page + reusable CustomFieldsSection (detail) and CustomFieldsInputs (form) wired into all four asset types. Warranty (new plugin) - plugins/warranty: warranties + warrantyassets (migration 7d15), derived coverage status, provider abstraction (manual now; Dell/Lenovo/HP stubs). - API CRUD + per-asset panel + report buckets; WarrantyPanel on all four detail pages; Warranties management page; Warranty report + Reports card. - Seed warranty.* permissions. Printer drivers - printerdrivers table (migration 7d13) linked to printer models; drivers now surface on the matching printer's detail page. Other - PCDetail rebalanced (Network + Status + Warranty + custom fields on the right). - Rename PCs list "Features" column to "Remote Access"; fix badge hover underline. - Drop equipment islocationonly field. - Centralize asset-type label/route maps into utils/assetTypes.js. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,9 +1,17 @@
|
||||
"""Computers plugin models."""
|
||||
|
||||
from .computer import Computer, ComputerType, ComputerInstalledApp
|
||||
from .computer import (
|
||||
Computer,
|
||||
ComputerType,
|
||||
ComputerInstalledApp,
|
||||
AccessProtocol,
|
||||
ComputerAccess,
|
||||
)
|
||||
|
||||
__all__ = [
|
||||
'Computer',
|
||||
'ComputerType',
|
||||
'ComputerInstalledApp',
|
||||
'AccessProtocol',
|
||||
'ComputerAccess',
|
||||
]
|
||||
|
||||
@@ -15,6 +15,7 @@ class ComputerType(BaseModel):
|
||||
computertype = db.Column(db.String(100), unique=True, nullable=False)
|
||||
description = db.Column(db.Text)
|
||||
icon = db.Column(db.String(50), comment='Icon name for UI')
|
||||
color = db.Column(db.String(20), comment='CSS color for UI/map markers')
|
||||
|
||||
def __repr__(self):
|
||||
return f"<ComputerType {self.computertype}>"
|
||||
@@ -78,24 +79,8 @@ class Computer(BaseModel):
|
||||
lastreporteddate = db.Column(db.DateTime, nullable=True)
|
||||
lastboottime = db.Column(db.DateTime, nullable=True)
|
||||
|
||||
# Remote access features
|
||||
isvnc = db.Column(
|
||||
db.Boolean,
|
||||
default=False,
|
||||
comment='VNC remote access enabled'
|
||||
)
|
||||
iswinrm = db.Column(
|
||||
db.Boolean,
|
||||
default=False,
|
||||
comment='WinRM enabled'
|
||||
)
|
||||
|
||||
# Classification flags
|
||||
isshopfloor = db.Column(
|
||||
db.Boolean,
|
||||
default=False,
|
||||
comment='Shopfloor PC (vs office PC)'
|
||||
)
|
||||
# Remote access is now modeled per-protocol via the accessmethods
|
||||
# relationship (AccessProtocol / ComputerAccess), replacing isvnc/iswinrm.
|
||||
|
||||
# Relationships
|
||||
asset = db.relationship(
|
||||
@@ -115,6 +100,14 @@ class Computer(BaseModel):
|
||||
lazy='dynamic'
|
||||
)
|
||||
|
||||
# Remote-access protocols enabled on this PC (replaces isvnc/iswinrm)
|
||||
accessmethods = db.relationship(
|
||||
'ComputerAccess',
|
||||
back_populates='computer',
|
||||
cascade='all, delete-orphan',
|
||||
lazy='selectin'
|
||||
)
|
||||
|
||||
__table_args__ = (
|
||||
db.Index('idx_computer_type', 'computertypeid'),
|
||||
db.Index('idx_computer_hostname', 'hostname'),
|
||||
@@ -138,6 +131,12 @@ class Computer(BaseModel):
|
||||
if self.model:
|
||||
result['modelname'] = self.model.modelnumber
|
||||
|
||||
# Names of enabled remote-access protocols (for list badges)
|
||||
result['accessprotocolnames'] = [
|
||||
am.protocol.name for am in self.accessmethods
|
||||
if am.isactive and am.protocol and am.protocol.isactive
|
||||
]
|
||||
|
||||
return result
|
||||
|
||||
|
||||
@@ -182,6 +181,61 @@ class ComputerInstalledApp(db.Model):
|
||||
db.Index('idx_compapp_app', 'appid'),
|
||||
)
|
||||
|
||||
|
||||
class AccessProtocol(db.Model):
|
||||
"""
|
||||
Catalog of remote-access protocols a PC can expose (VNC, WinRM, RDP, SSH...).
|
||||
|
||||
linktemplate builds a connection URL from placeholders {host}, {port},
|
||||
{scheme}. {host} is the PC hostname joined to the pc_access_domain setting.
|
||||
Admin-managed; replaces the old fixed isvnc/iswinrm booleans.
|
||||
"""
|
||||
__tablename__ = 'accessprotocols'
|
||||
|
||||
protocolid = db.Column(db.Integer, primary_key=True)
|
||||
name = db.Column(db.String(50), unique=True, nullable=False)
|
||||
scheme = db.Column(db.String(20), nullable=False)
|
||||
defaultport = db.Column(db.Integer, nullable=True)
|
||||
linktemplate = db.Column(db.String(255), nullable=False)
|
||||
isactive = db.Column(db.Boolean, default=True, nullable=False)
|
||||
|
||||
def to_dict(self):
|
||||
return {
|
||||
'protocolid': self.protocolid,
|
||||
'name': self.name,
|
||||
'scheme': self.scheme,
|
||||
'defaultport': self.defaultport,
|
||||
'linktemplate': self.linktemplate,
|
||||
'isactive': bool(self.isactive),
|
||||
}
|
||||
|
||||
|
||||
class ComputerAccess(db.Model):
|
||||
"""A protocol enabled on a specific PC, with an optional port override."""
|
||||
__tablename__ = 'computeraccess'
|
||||
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
computerid = db.Column(
|
||||
db.Integer,
|
||||
db.ForeignKey('computers.computerid', ondelete='CASCADE'),
|
||||
nullable=False
|
||||
)
|
||||
protocolid = db.Column(
|
||||
db.Integer,
|
||||
db.ForeignKey('accessprotocols.protocolid'),
|
||||
nullable=False
|
||||
)
|
||||
portoverride = db.Column(db.Integer, nullable=True)
|
||||
isactive = db.Column(db.Boolean, default=True, nullable=False)
|
||||
|
||||
protocol = db.relationship('AccessProtocol')
|
||||
computer = db.relationship('Computer', back_populates='accessmethods')
|
||||
|
||||
__table_args__ = (
|
||||
db.UniqueConstraint('computerid', 'protocolid', name='uq_computer_protocol'),
|
||||
db.Index('idx_compaccess_computer', 'computerid'),
|
||||
)
|
||||
|
||||
def to_dict(self):
|
||||
"""Convert to dictionary."""
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user