From b96ff7e970353bea11fa030779546bf4c2bc2633 Mon Sep 17 00:00:00 2001 From: cproudlock Date: Thu, 6 Aug 2026 12:30:35 -0400 Subject: [PATCH] Retire the shopfloor-dashboard route; point Lobby at its own page The dashboard moved to /shopdb/shopfloor. Every reference here still pointed at /shopdb/shopfloor-dashboard/, which no longer resolves. Display-Lobby was also pointing at the DASHBOARD url, not the lobby one, so lobby screens showed the shop floor dashboard. The routes now follow the authoritative map in shopdb-flask plugins/geenforce/seed_display_scope.py: Dashboard -> /shopdb/shopfloor Lobby -> /shopdb/tv 3DPrintRoom -> /shopdb/parts-kiosk (no imaging-time menu option yet) Changed: urls.shopfloorDashboard, Display-Dashboard.edgeHomepage, Display-Lobby.edgeHomepage, and the Shopfloor Dashboard fallback in 08-EdgeDefaultBrowser.ps1. Note these values are now a backstop rather than the primary path. Displays are a single image whose variant comes from C:\Enrollment\display-type.txt, and the GE-Enforce display scope delivered over the shopdb API writes the kiosk Startup shortcut itself - preferring the server-side role from Settings > Dashboard Defaults and falling back to display-type.txt. That dispatcher also SWEEPS shortcuts matching shopfloor-dashboard, so a stale value here would have been deleted on the next enforce cycle rather than honoured. Edited by line position, not string match: the two edgeHomepage values were textually identical and belong to different display blocks. Formatting preserved - a json.dumps round-trip reflowed 632 lines and was reverted. --- .../shopfloor-setup/Shopfloor/08-EdgeDefaultBrowser.ps1 | 2 +- playbook/shopfloor-setup/site-config.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/playbook/shopfloor-setup/Shopfloor/08-EdgeDefaultBrowser.ps1 b/playbook/shopfloor-setup/Shopfloor/08-EdgeDefaultBrowser.ps1 index f5e9fb0..3e04fee 100644 --- a/playbook/shopfloor-setup/Shopfloor/08-EdgeDefaultBrowser.ps1 +++ b/playbook/shopfloor-setup/Shopfloor/08-EdgeDefaultBrowser.ps1 @@ -216,7 +216,7 @@ if ($null -ne $cfgTabs -and $cfgTabs.Count -gt 0) { $shopFloorHome = Resolve-StartupUrl -BaseName 'WJ Shop Floor Homepage' -Fallback 'https://tsgwp00525.wjs.geaerospace.net' if ($shopFloorHome) { $startupTabs += $shopFloorHome } - $dashboard = Resolve-StartupUrl -BaseName 'Shopfloor Dashboard' -Fallback 'https://tsgwp00525.wjs.geaerospace.net/shopdb/shopfloor-dashboard/' + $dashboard = Resolve-StartupUrl -BaseName 'Shopfloor Dashboard' -Fallback 'https://tsgwp00525.wjs.geaerospace.net/shopdb/shopfloor' if ($dashboard) { $startupTabs += $dashboard } } diff --git a/playbook/shopfloor-setup/site-config.json b/playbook/shopfloor-setup/site-config.json index 7856d77..f614f96 100644 --- a/playbook/shopfloor-setup/site-config.json +++ b/playbook/shopfloor-setup/site-config.json @@ -9,7 +9,7 @@ "urls": { "plantApps": "https://mes-wjefferson.apps.lr.geaerospace.net/run/?app_name=Plant%20Applications", "shopFloorHomepage": "https://tsgwp00525.wjs.geaerospace.net", - "shopfloorDashboard": "https://tsgwp00525.wjs.geaerospace.net/shopdb/shopfloor-dashboard/", + "shopfloorDashboard": "https://tsgwp00525.wjs.geaerospace.net/shopdb/shopfloor", "webmail": "https://outlook.office365.us/mail" }, @@ -305,7 +305,7 @@ { "name": "Microsoft Edge", "lnkPath": "%ALLUSERSPROFILE%\\Microsoft\\Windows\\Start Menu\\Programs\\Microsoft Edge.lnk" } ], "desktopApps": [], - "edgeHomepage": "https://tsgwp00525.wjs.geaerospace.net/shopdb/shopfloor-dashboard/", + "edgeHomepage": "https://tsgwp00525.wjs.geaerospace.net/shopdb/tv", "edgeStartupTabs": [ { "baseName": "Shopfloor Dashboard", "fallbackUrlKey": "shopfloorDashboard" } ] @@ -318,7 +318,7 @@ { "name": "Microsoft Edge", "lnkPath": "%ALLUSERSPROFILE%\\Microsoft\\Windows\\Start Menu\\Programs\\Microsoft Edge.lnk" } ], "desktopApps": [], - "edgeHomepage": "https://tsgwp00525.wjs.geaerospace.net/shopdb/shopfloor-dashboard/", + "edgeHomepage": "https://tsgwp00525.wjs.geaerospace.net/shopdb/shopfloor", "edgeStartupTabs": [ { "baseName": "Shopfloor Dashboard", "fallbackUrlKey": "shopfloorDashboard" } ]