534f179ee6
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.
45 lines
1.7 KiB
Python
45 lines
1.7 KiB
Python
"""JSON stored in a TEXT column.
|
|
|
|
MySQL 5.6 has no JSON type - it arrived in 5.7 - and a site is still running
|
|
5.6, where `sa.JSON()` fails at migration time with a bare syntax error near the
|
|
word JSON. Every other JSON-bearing column in this product is already TEXT for
|
|
that reason: guides' `blocksjson`, backups' payload column.
|
|
|
|
This keeps the Python side identical. A model attribute still holds a dict or a
|
|
list, still assigns and reads like one; only the storage changes. The
|
|
alternative - json.dumps and json.loads at seventeen call sites - is the same
|
|
thing written out seventeen times, with seventeen chances to forget one.
|
|
|
|
Note the SQLite behaviour is deliberately the same as MySQL's. Tests run on
|
|
SQLite and production does not, so a type that behaved differently across the
|
|
two would hide exactly the failure this exists to prevent.
|
|
"""
|
|
|
|
import json
|
|
|
|
from sqlalchemy import Text
|
|
from sqlalchemy.types import TypeDecorator
|
|
|
|
|
|
class JSONText(TypeDecorator):
|
|
"""A dict or list on the Python side, TEXT in the database."""
|
|
|
|
impl = Text
|
|
cache_ok = True
|
|
|
|
def process_bind_param(self, value, dialect):
|
|
if value is None:
|
|
return None
|
|
return json.dumps(value, separators=(',', ':'))
|
|
|
|
def process_result_value(self, value, dialect):
|
|
if value is None or value == '':
|
|
return None
|
|
try:
|
|
return json.loads(value)
|
|
except (TypeError, ValueError):
|
|
# A row written before this column was JSON, or hand-edited. Hand
|
|
# back the raw text rather than raising: a policy that cannot be
|
|
# parsed should be visible and fixable, not an exception on read.
|
|
return value
|