From 50578f33bd30ae9190530da272bc2133a7322840 Mon Sep 17 00:00:00 2001
From: Cam Proudlock <cam.proudlock@gmail.com>
Date: Wed, 12 Aug 2026 17:01:10 -0400
Subject: [PATCH] Full-width GE-Enforce pages; asset column no longer echoes
 the host

---
 plugins/geenforce/api/routes.py               |  4 ++-
 .../frontend/views/EnforcementReports.vue     | 12 ++++++--
 .../frontend/views/GeEnforceLayout.vue        |  5 +++-
 .../versions/0003_report_subtype.py           | 28 +++++++++++++++++++
 plugins/geenforce/models/manifest.py          |  5 ++++
 plugins/geenforce/service.py                  |  1 +
 tests/test_plugin_migrations.py               |  2 +-
 7 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 plugins/geenforce/migrations/versions/0003_report_subtype.py

diff --git a/plugins/geenforce/api/routes.py b/plugins/geenforce/api/routes.py
index f4f950b2..20f846fe 100644
--- a/plugins/geenforce/api/routes.py
+++ b/plugins/geenforce/api/routes.py
@@ -1106,7 +1106,9 @@ def list_reports():
             'machineassetid': known.get('machineassetid'),
             'toolassetnumber': known.get('toolassetnumber'),
             'toolassetid': known.get('toolassetid'),
-            'displayrole': known.get('displayrole'),
+            # Reported by the device wins; the DashboardDefault mapping is a
+            # fallback for hosts on an older client that does not send it.
+            'displayrole': report.subtype or known.get('displayrole'),
             'backupkind': known.get('backupkind'),
             'backuplastseen': known.get('backuplastseen'),
             'scopename': report.scopename,
diff --git a/plugins/geenforce/frontend/views/EnforcementReports.vue b/plugins/geenforce/frontend/views/EnforcementReports.vue
index bb435881..93d1d0dd 100644
--- a/plugins/geenforce/frontend/views/EnforcementReports.vue
+++ b/plugins/geenforce/frontend/views/EnforcementReports.vue
@@ -73,8 +73,12 @@
                 </router-link>
                 <span v-if="report.displayrole" class="asset-chip muted"
                       title="Display role">{{ report.displayrole }}</span>
+                <!-- Deliberately NOT the PC's own asset number: the collector
+                     stores a PC's hostname AS its assetnumber, so echoing it
+                     here would just repeat the Host column. Blank means this PC
+                     drives nothing and is not a display. -->
                 <span v-if="!report.machineassetid && !report.toolassetid && !report.displayrole"
-                      class="muted">{{ report.assetnumber || '-' }}</span>
+                      class="muted">-</span>
                 <div v-if="report.location" class="asset-location muted">{{ report.location }}</div>
               </td>
               <td>{{ report.scopename }}</td>
@@ -189,7 +193,11 @@ load()
 </script>
 
 <style scoped>
-.enforcement-reports { max-width: 1100px; }
+/* No max-width. This is a fleet table - twelve columns now that a row carries
+   the asset it drives, its location and its backup state - and capping the page
+   at 1100px squeezed them into a box narrower than the window while empty space
+   sat to the right. The route already gives this view a full-width shell. */
+.enforcement-reports { width: 100%; }
 .muted { color: var(--text-light); }
 .fail-count { color: var(--danger); font-weight: 600; }
 .empty { color: var(--text-light); text-align: center; padding: 1rem; }
diff --git a/plugins/geenforce/frontend/views/GeEnforceLayout.vue b/plugins/geenforce/frontend/views/GeEnforceLayout.vue
index b5c74af8..c69135e0 100644
--- a/plugins/geenforce/frontend/views/GeEnforceLayout.vue
+++ b/plugins/geenforce/frontend/views/GeEnforceLayout.vue
@@ -18,7 +18,10 @@
 </script>
 
 <style scoped>
-.geenforce-section { max-width: 1400px; }
+/* No cap on the shell. The reports tab is a wide fleet table and was being
+   squeezed into 1400px with empty page beside it; views that read better
+   narrow (the manifest editor) cap themselves instead. */
+.geenforce-section { width: 100%; }
 .section-header { margin-bottom: 0.5rem; }
 .section-header h1 { margin: 0; }
 .section-sub { color: var(--text-light); margin: 0.25rem 0 0; }
diff --git a/plugins/geenforce/migrations/versions/0003_report_subtype.py b/plugins/geenforce/migrations/versions/0003_report_subtype.py
new file mode 100644
index 00000000..0fafc094
--- /dev/null
+++ b/plugins/geenforce/migrations/versions/0003_report_subtype.py
@@ -0,0 +1,28 @@
+"""Record the display subtype a PC reports for itself.
+
+A kiosk knows whether it is a Dashboard, Lobby or 3DPrintRoom - the dispatcher
+reads C:\\Enrollment\\display-type.txt to pick its target - but it never told
+ShopDB, so the reports table had to infer it from the DashboardDefault
+fqdn/ip mapping, which is blank unless someone added a row per kiosk. Reported
+by the device beats inferred from a mapping table, the same way enforcerversion
+already works.
+
+Revision ID: geenforce0003subtype
+Revises: geenforce0002blobs
+"""
+from alembic import op
+import sqlalchemy as sa
+
+revision = 'geenforce0003subtype'
+down_revision = 'geenforce0002blobs'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column('manifestenforcementreports',
+                  sa.Column('subtype', sa.String(length=50), nullable=True))
+
+
+def downgrade():
+    op.drop_column('manifestenforcementreports', 'subtype')
diff --git a/plugins/geenforce/models/manifest.py b/plugins/geenforce/models/manifest.py
index 3ef129b3..a32179f9 100644
--- a/plugins/geenforce/models/manifest.py
+++ b/plugins/geenforce/models/manifest.py
@@ -295,6 +295,11 @@ class ManifestEnforcementReport(db.Model):
     # published version to see whether this PC received the latest manifest.
     appliedversion = db.Column(db.Integer, nullable=True)
     enforcerversion = db.Column(db.String(20), nullable=True)
+    # What the PC says it IS within its scope (a display's Dashboard / Lobby /
+    # 3DPrintRoom). Reported by the device, which reads it from its own
+    # enrollment file - not inferred from a mapping table that may have no row
+    # for this host.
+    subtype = db.Column(db.String(50), nullable=True)
     installedcount = db.Column(db.Integer, nullable=False, default=0)
     skippedcount = db.Column(db.Integer, nullable=False, default=0)
     failedcount = db.Column(db.Integer, nullable=False, default=0)
diff --git a/plugins/geenforce/service.py b/plugins/geenforce/service.py
index 657f39dd..bacf7672 100644
--- a/plugins/geenforce/service.py
+++ b/plugins/geenforce/service.py
@@ -263,6 +263,7 @@ def record_enforcement_report(payload):
         phase=phase,
         appliedversion=payload.get('appliedversion'),
         enforcerversion=payload.get('enforcerversion'),
+        subtype=(payload.get('subtype') or None),
         installedcount=installed,
         skippedcount=int(counts.get('skipped', 0)),
         failedcount=failed,
diff --git a/tests/test_plugin_migrations.py b/tests/test_plugin_migrations.py
index dc733f09..15bc4068 100644
--- a/tests/test_plugin_migrations.py
+++ b/tests/test_plugin_migrations.py
@@ -52,7 +52,7 @@ EXPECTED_HEAD_REVISION['measuringtools'] = 'measuringtools0001baseline'
 EXPECTED_HEAD_REVISION['backups'] = 'backups0003clearlastseen'
 # geenforce adds the content-addressed blob store (manifestblobs) on top of its
 # baseline.
-EXPECTED_HEAD_REVISION['geenforce'] = 'geenforce0002blobs'
+EXPECTED_HEAD_REVISION['geenforce'] = 'geenforce0003subtype'
 # printers adds the printersupplyalerts crossing-state table on top of its anchor.
 EXPECTED_HEAD_REVISION['printers'] = 'printers0002supplyalerts'
 # machines (renamed from equipment) keeps its original anchor id and adds the