Make main the lean product a site receives
main was 16 days and 259 commits behind the line the product is actually built on, at contract 0.30.0 against 0.35.0, with no per-PC credential code at all. It was neither current nor curated - just stale. This brings it forward and, at the same time, makes it mean something: main is what a receiving site installs, and nothing else. WHAT IT CARRIES. Twelve plugins - backups, computers, endpoints, guides, knowledgebase, machines, network, notifications, printers, slides, tools, warranty - plus applications, which is manifest-less core and always ships. The only manifest dependency inside that set is endpoints on computers, and both are in it, so the closure is self-contained. WHAT IT DOES NOT. employees, geenforce, measuringtools, printedparts and usb stay on the site line. So do the Windows installer tree, the VM rehearsal helpers, the agent tooling config, one site's data loader, the internal audit and findings records, and the planner spreadsheet. 1,135 tracked files against 1,438. A REMOVAL THAT BREAKS THE APP IS NOT A REMOVAL, and two nearly shipped: deploy/site-profile-universal.json still named all seventeen plugins. It is the file docs/DEPLOY.md tells a site to provision from, so a fresh install would have failed at `flask plugin apply-profile` with PluginError - the first thing a receiving site does, broken by the branch meant to serve them. It now names the twelve that exist, and its comment says the two must agree. agent/ was never refreshed. Whoever populated this branch copied shopdb/, plugins/, frontend/ and tests/ from the site line and left the agent tree at its September state: 22 C# and PowerShell sources missing, including AgentCredentials, EnrollmentService, AgentHttpFactory and the fleet-alert client, plus one file the site line had deleted still present. The old tree is internally consistent, so it compiles, and nothing in CI builds it - every gate was green over a server that speaks enrollment and per-PC credentials to a bundled agent source that cannot. Resynced whole. DECISIONS THIS ENCODES, rather than defers: - The plugin-authoring lab builds printedparts, whose manifest depends on employees, so it could not stay. The lab remains on the site line and main ships no build-along tutorial. That is a real loss for an adopting developer and is recorded here rather than discovered later. - Recognition, Training and Recertification notifications are no longer seeded. Each splits one notification into a card per employee and renders a photo, which needs a plugin this branch does not bundle. Seeding them would offer an author a type that cannot resolve anybody. A site that installs employees gets them from that plugin's own seed. - Windows/IIS is documented as the legacy path throughout, and the README leads with Docker, because that is what a receiving site gets. The API description is regenerated for THIS branch - 347 paths and 483 operations, down from 415 and 573 - so the published contract describes what is here rather than what the site line serves. docs/CONFIG.md lost the two measuring-tool label keys the code no longer declares, which two lanes had decided opposite ways. Suite: 3124 passed, 6 skipped. Naming and style gates pass. The docs gates run rather than skip, and every index line count is derived from the file it names.
This commit is contained in:
cproudlock
@@ -11,7 +11,7 @@ from flask_jwt_extended import jwt_required
|
||||
from shopdb.api import db, success_response, error_response, paginated_response, ErrorCodes, get_pagination_params, paginate_query
|
||||
|
||||
from ..models import Notification, NotificationType
|
||||
from ..models.notification import _utc_iso
|
||||
from ..models.notification import _utc_iso, ALERT_SCOPE_KEYS
|
||||
|
||||
from shopdb.api import require_permission, Setting, intarg
|
||||
|
||||
@@ -217,18 +217,17 @@ def _employee_name(sso):
|
||||
"""Live directory name for an SSO; None on any miss. Used as the fallback
|
||||
when a notification has no stored employeename (see the shopfloor feed)."""
|
||||
try:
|
||||
from plugins.employees.api.routes import resolve_employee_display_name
|
||||
from shopdb.api import resolve_employee_display_name
|
||||
return resolve_employee_display_name(sso)
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
|
||||
def _employee_picture(sso):
|
||||
"""Resolved display photo URL for an SSO, via the shared employees-plugin
|
||||
resolver so kiosk cards match EmployeeDetail in both directory modes
|
||||
(self-hosted upload URL or external HR URL). None on any miss."""
|
||||
"""Resolved display photo URL for an SSO, via the shared core resolver so a
|
||||
feed card and a lookup agree about the same person. None on any miss."""
|
||||
try:
|
||||
from plugins.employees.api.routes import resolve_employee_photo_url
|
||||
from shopdb.api import resolve_employee_photo_url
|
||||
return resolve_employee_photo_url(sso)
|
||||
except Exception:
|
||||
return None
|
||||
@@ -405,6 +404,69 @@ def get_notification(notification_id: int):
|
||||
return success_response(n.to_dict())
|
||||
|
||||
|
||||
def _clean_alert_fields(data):
|
||||
"""Validate and normalise alertfleet / alertscope / alerttimeout.
|
||||
|
||||
Returns (fields, error). fields holds only the keys present in data, with
|
||||
null coerced to the column default. alertscope must be a JSON object (or a
|
||||
string holding one) whose keys the endpoint matcher understands; empty or
|
||||
null means the whole fleet.
|
||||
"""
|
||||
import json
|
||||
|
||||
fields = {}
|
||||
if 'alertfleet' in data:
|
||||
value = data['alertfleet']
|
||||
if value is None:
|
||||
value = False
|
||||
if not isinstance(value, bool):
|
||||
return None, 'alertfleet must be true or false'
|
||||
fields['alertfleet'] = value
|
||||
|
||||
if 'alerttimeout' in data:
|
||||
value = data['alerttimeout']
|
||||
if value is None or value == '':
|
||||
value = 0
|
||||
if isinstance(value, bool):
|
||||
return None, 'alerttimeout must be a whole number of seconds'
|
||||
try:
|
||||
value = int(value)
|
||||
except (TypeError, ValueError):
|
||||
return None, 'alerttimeout must be a whole number of seconds'
|
||||
if value < 0:
|
||||
return None, 'alerttimeout must not be negative'
|
||||
fields['alerttimeout'] = value
|
||||
|
||||
if 'alertscope' in data:
|
||||
scope = data['alertscope']
|
||||
if isinstance(scope, str):
|
||||
if not scope.strip():
|
||||
scope = None
|
||||
else:
|
||||
try:
|
||||
scope = json.loads(scope)
|
||||
except ValueError:
|
||||
return None, 'alertscope must be a JSON object'
|
||||
if scope is not None:
|
||||
if not isinstance(scope, dict):
|
||||
return None, 'alertscope must be a JSON object'
|
||||
unknown = sorted(set(scope) - ALERT_SCOPE_KEYS)
|
||||
if unknown:
|
||||
return None, (f'alertscope has unknown key(s): {", ".join(unknown)}. '
|
||||
f'Allowed: {", ".join(sorted(ALERT_SCOPE_KEYS))}')
|
||||
for key, wanted in scope.items():
|
||||
values = wanted if isinstance(wanted, list) else [wanted]
|
||||
if any(v is not None and not isinstance(v, (str, int, float))
|
||||
or isinstance(v, bool) for v in values):
|
||||
return None, (f'alertscope.{key} must be a string or a list '
|
||||
f'of strings')
|
||||
if not scope:
|
||||
scope = None
|
||||
fields['alertscope'] = scope
|
||||
|
||||
return fields, None
|
||||
|
||||
|
||||
@notifications_bp.route('', methods=['POST'])
|
||||
@require_permission('notifications.create')
|
||||
def create_notification():
|
||||
@@ -419,6 +481,10 @@ def create_notification():
|
||||
if not notification_text:
|
||||
return error_response(ErrorCodes.VALIDATION_ERROR, 'notification/message is required')
|
||||
|
||||
alert_fields, alert_error = _clean_alert_fields(data)
|
||||
if alert_error:
|
||||
return error_response(ErrorCodes.VALIDATION_ERROR, alert_error)
|
||||
|
||||
# Parse dates
|
||||
starttime = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
if data.get('starttime') or data.get('startdate'):
|
||||
@@ -455,7 +521,10 @@ def create_notification():
|
||||
isactive=True,
|
||||
isshopfloor=data.get('isshopfloor', False),
|
||||
employeesso=data.get('employeesso'),
|
||||
employeename=data.get('employeename')
|
||||
employeename=data.get('employeename'),
|
||||
alertfleet=alert_fields.get('alertfleet', False),
|
||||
alertscope=alert_fields.get('alertscope'),
|
||||
alerttimeout=alert_fields.get('alerttimeout', 0)
|
||||
)
|
||||
|
||||
db.session.add(n)
|
||||
@@ -504,6 +573,12 @@ def update_notification(notification_id: int):
|
||||
n.employeesso = data['employeesso']
|
||||
if 'employeename' in data:
|
||||
n.employeename = data['employeename']
|
||||
alert_fields, alert_error = _clean_alert_fields(data)
|
||||
if alert_error:
|
||||
db.session.rollback()
|
||||
return error_response(ErrorCodes.VALIDATION_ERROR, alert_error)
|
||||
for field, value in alert_fields.items():
|
||||
setattr(n, field, value)
|
||||
|
||||
# Parse and update dates
|
||||
if 'starttime' in data or 'startdate' in data:
|
||||
|
||||
Reference in New Issue
Block a user