diff --git a/playbook/shopfloor-setup/Shopfloor/08-EdgeDefaultBrowser.ps1 b/playbook/shopfloor-setup/Shopfloor/08-EdgeDefaultBrowser.ps1 index 2031b4d..f5e9fb0 100644 --- a/playbook/shopfloor-setup/Shopfloor/08-EdgeDefaultBrowser.ps1 +++ b/playbook/shopfloor-setup/Shopfloor/08-EdgeDefaultBrowser.ps1 @@ -213,7 +213,7 @@ if ($null -ne $cfgTabs -and $cfgTabs.Count -gt 0) { $plantApps = Resolve-StartupUrl -BaseName 'Plant Apps' -Fallback 'https://mes-wjefferson.apps.lr.geaerospace.net/run/?app_name=Plant%20Applications' if ($plantApps) { $startupTabs += $plantApps } - $shopFloorHome = Resolve-StartupUrl -BaseName 'WJ Shop Floor Homepage' -Fallback 'http://tsgwp00524.logon.ds.ge.com/' + $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/' diff --git a/playbook/shopfloor-setup/site-config.json b/playbook/shopfloor-setup/site-config.json index a88781d..be0597c 100644 --- a/playbook/shopfloor-setup/site-config.json +++ b/playbook/shopfloor-setup/site-config.json @@ -8,7 +8,7 @@ "urls": { "plantApps": "https://mes-wjefferson.apps.lr.geaerospace.net/run/?app_name=Plant%20Applications", - "shopFloorHomepage": "http://tsgwp00524.logon.ds.ge.com/", + "shopFloorHomepage": "https://tsgwp00525.wjs.geaerospace.net", "shopfloorDashboard": "https://tsgwp00525.wjs.geaerospace.net/shopdb/shopfloor-dashboard/", "webmail": "https://outlook.office365.us/mail" }, @@ -49,20 +49,23 @@ "pcProfiles": { "_comment": "Per PC-type (and optional sub-type) overrides. Key format: 'Type' or 'Type-Subtype'. Scripts look up the profile matching pc-type.txt + pc-subtype.txt. If a profile exists, its startupItems/taskbarPins/desktopApps REPLACE the top-level defaults above. If no profile matches, the top-level defaults are used.", + "_shortcuts_policy": "Every shopfloor working type carries the SAME common base: Edge + WJ Shopfloor + Defect_Tracker pins/desktop shortcuts, WJ Shopfloor + Plant Apps startup, and the 3 web tabs (Plant Apps, WJ Shop Floor Homepage, Shopfloor Dashboard). Per-type specialized apps are appended. eDNC / UDC / NTLARS are listed only on the bays that can have them; 06-OrganizeDesktop.ps1 + 07-TaskbarLayout.ps1 gate every exe entry on Test-Path, so a shortcut whose target is not installed is silently skipped (this is what makes 'eDNC if it exists / UDC if it exists' work). Lab + Display-* are deliberately left as kiosk/lab and do NOT get the shopfloor common base.", "Standard-Timeclock": { "startupItems": [ - { "label": "WJ Shopfloor", "type": "existing", "sourceLnk": "WJ Shopfloor.lnk" } + { "label": "WJ Shopfloor", "type": "existing", "sourceLnk": "WJ Shopfloor.lnk" }, + { "label": "Plant Apps", "type": "url", "urlKey": "plantApps" } ], "taskbarPins": [ { "name": "Microsoft Edge", "lnkPath": "%ALLUSERSPROFILE%\\Microsoft\\Windows\\Start Menu\\Programs\\Microsoft Edge.lnk" }, - { "name": "WJ Shopfloor", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\WJ Shopfloor.lnk" } + { "name": "WJ Shopfloor", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\WJ Shopfloor.lnk" }, + { "name": "Defect_Tracker", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\Defect_Tracker.lnk" } ], "desktopApps": [ { "name": "WJ Shopfloor", "kind": "existing", "sourceName": "WJ Shopfloor.lnk" }, { "name": "Defect_Tracker", "kind": "exe", "exePath": "C:\\Program Files (x86)\\WJF_Defect_Tracker\\Defect_Tracker.exe" } ], - "edgeHomepage": "http://tsgwp00524.logon.ds.ge.com/", + "edgeHomepage": "https://tsgwp00525.wjs.geaerospace.net", "edgeStartupTabs": [ { "baseName": "Plant Apps", "fallbackUrlKey": "plantApps" }, { "baseName": "WJ Shop Floor Homepage", "fallbackUrlKey": "shopFloorHomepage" }, @@ -123,7 +126,7 @@ }, "gea-shopfloor-partmarker": { - "_comment": "Telesis Part Marker bay: eDNC + NTLARS + the Mark app + the Telesis Backup400/420/470 apps. DNC baseline mirrors gea-shopfloor-nocollections; the Mark + Backup4xx entries are marker-specific. Without this profile the type fell back to the top-level defaults, which deliberately exclude eDNC, so no DNC shortcut/pin appeared.", + "_comment": "Telesis Part Marker bay: eDNC + NTLARS + the Mark app + Telesis Backup420. Of the three Telesis backup apps (Backup400/420/470) only Backup420 is wanted - 400 and 470 dropped 2026-06-04. DNC baseline mirrors gea-shopfloor-nocollections; Mark + Backup420 are marker-specific. eDNC/NTLARS are Test-Path gated by the shortcut generators so they only appear when installed.", "ntlarsBackupSharePath": "\\\\tsgwp00525.wjs.geaerospace.net\\shared\\dt\\shopfloor\\main\\ntlars-backups", "startupItems": [ { "label": "WJ Shopfloor", "type": "existing", "sourceLnk": "WJ Shopfloor.lnk" }, @@ -133,23 +136,19 @@ "taskbarPins": [ { "name": "Microsoft Edge", "lnkPath": "%ALLUSERSPROFILE%\\Microsoft\\Windows\\Start Menu\\Programs\\Microsoft Edge.lnk" }, { "name": "WJ Shopfloor", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\WJ Shopfloor.lnk" }, + { "name": "Defect_Tracker", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\Defect_Tracker.lnk" }, { "name": "eDNC", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\eDNC.lnk" }, { "name": "NTLARS", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\NTLARS.lnk" }, { "name": "Mark", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\Mark.lnk" }, - { "name": "Backup400", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\Backup400.lnk" }, - { "name": "Backup420", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\Backup420.lnk" }, - { "name": "Backup470", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\Backup470.lnk" }, - { "name": "Defect_Tracker", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\Defect_Tracker.lnk" } + { "name": "Backup420", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\Backup420.lnk" } ], "desktopApps": [ + { "name": "WJ Shopfloor", "kind": "existing", "sourceName": "WJ Shopfloor.lnk" }, + { "name": "Defect_Tracker", "kind": "exe", "exePath": "C:\\Program Files (x86)\\WJF_Defect_Tracker\\Defect_Tracker.exe" }, { "name": "eDNC", "kind": "exe", "exePath": "C:\\Program Files (x86)\\Dnc\\bin\\DncMain.exe" }, { "name": "NTLARS", "kind": "exe", "exePath": "C:\\Program Files (x86)\\Dnc\\Common\\NTLARS.exe" }, { "name": "Mark", "kind": "exe", "exePath": "C:\\Program Files (x86)\\Mark\\bin\\Mark.exe" }, - { "name": "Backup400", "kind": "exe", "exePath": "C:\\Program Files (x86)\\Telesis\\Backup400\\Backup400.exe" }, - { "name": "Backup420", "kind": "exe", "exePath": "C:\\Program Files (x86)\\Telesis\\Backup420\\Backup420.exe" }, - { "name": "Backup470", "kind": "exe", "exePath": "C:\\Program Files (x86)\\Telesis\\Backup470\\Backup470.exe" }, - { "name": "WJ Shopfloor", "kind": "existing", "sourceName": "WJ Shopfloor.lnk" }, - { "name": "Defect_Tracker", "kind": "exe", "exePath": "C:\\Program Files (x86)\\WJF_Defect_Tracker\\Defect_Tracker.exe" } + { "name": "Backup420", "kind": "exe", "exePath": "C:\\Program Files (x86)\\Telesis\\Backup420\\Backup420.exe" } ] }, @@ -181,7 +180,10 @@ "CMM": { "_comment": "Hexagon CMM apps (CLM 1.8, goCMM, PC-DMIS 2016, PC-DMIS 2019 R2). At imaging time they install from a WinPE-staged local bootstrap at C:\\CMM-Install (put there by startnet.cmd when pc-type=CMM, source is the PXE server enrollment share). Post-imaging, the unified GE-Enforce dispatcher reads cmm/manifest.json on the tsgwp00525 share below and enforces versions on every user logon (the SFLD creds Azure DSC provisions unlock the mount). cmmSharePath is the ongoing-enforcement source, not the imaging-time source.", "cmmSharePath": "\\\\tsgwp00525.wjs.geaerospace.net\\shared\\dt\\shopfloor\\cmm\\machineapps", - "startupItems": [], + "startupItems": [ + { "label": "WJ Shopfloor", "type": "existing", "sourceLnk": "WJ Shopfloor.lnk" }, + { "label": "Plant Apps", "type": "url", "urlKey": "plantApps" } + ], "taskbarPins": [ { "name": "Microsoft Edge", "lnkPath": "%ALLUSERSPROFILE%\\Microsoft\\Windows\\Start Menu\\Programs\\Microsoft Edge.lnk" }, { "name": "WJ Shopfloor", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\WJ Shopfloor.lnk" }, @@ -199,7 +201,7 @@ { "name": "CLM Admin", "kind": "exe", "exePath": "C:\\Program Files\\Hexagon\\CLM Admin 1.8 64-bit\\clmadmin.exe" }, { "name": "goCMM", "kind": "exe", "exePath": "C:\\Program Files (x86)\\General Electric\\goCMM\\goCMM.exe" } ], - "edgeHomepage": "http://tsgwp00524.logon.ds.ge.com/", + "edgeHomepage": "https://tsgwp00525.wjs.geaerospace.net", "edgeStartupTabs": [ { "baseName": "Plant Apps", "fallbackUrlKey": "plantApps" }, { "baseName": "WJ Shop Floor Homepage", "fallbackUrlKey": "shopFloorHomepage" }, @@ -208,18 +210,21 @@ }, "Genspect": { - "_comment": "TODO: add Genspect-specific apps when details are known", + "_comment": "Genspect bay: common shopfloor base only - no Genspect-specific apps specified yet. eDNC/UDC are Test-Path gated by the generators if a Genspect bay ever runs them.", "startupItems": [ - { "label": "WJ Shopfloor", "type": "existing", "sourceLnk": "WJ Shopfloor.lnk" } + { "label": "WJ Shopfloor", "type": "existing", "sourceLnk": "WJ Shopfloor.lnk" }, + { "label": "Plant Apps", "type": "url", "urlKey": "plantApps" } ], "taskbarPins": [ { "name": "Microsoft Edge", "lnkPath": "%ALLUSERSPROFILE%\\Microsoft\\Windows\\Start Menu\\Programs\\Microsoft Edge.lnk" }, - { "name": "WJ Shopfloor", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\WJ Shopfloor.lnk" } + { "name": "WJ Shopfloor", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\WJ Shopfloor.lnk" }, + { "name": "Defect_Tracker", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\Defect_Tracker.lnk" } ], "desktopApps": [ - { "name": "WJ Shopfloor", "kind": "existing", "sourceName": "WJ Shopfloor.lnk" } + { "name": "WJ Shopfloor", "kind": "existing", "sourceName": "WJ Shopfloor.lnk" }, + { "name": "Defect_Tracker", "kind": "exe", "exePath": "C:\\Program Files (x86)\\WJF_Defect_Tracker\\Defect_Tracker.exe" } ], - "edgeHomepage": "http://tsgwp00524.logon.ds.ge.com/", + "edgeHomepage": "https://tsgwp00525.wjs.geaerospace.net", "edgeStartupTabs": [ { "baseName": "Plant Apps", "fallbackUrlKey": "plantApps" }, { "baseName": "WJ Shop Floor Homepage", "fallbackUrlKey": "shopFloorHomepage" }, @@ -231,16 +236,19 @@ "_comment": "Keyence VR-6000 microscope/profilometer PCs. At imaging time, 09-Setup-Keyence.ps1 installs VR-6000 Series Software MSI + KEYENCE VR USB driver from the WinPE-staged shopfloor-setup\\Keyence\\ bundle. Post-imaging, the unified GE-Enforce dispatcher reads keyence/manifest.json on the tsgwp00525 share below and enforces versions on every user logon (SFLD creds provisioned by Azure DSC unlock the mount). keyenceSharePath is the ongoing-enforcement source; bump the manifest + MSI on the share to push updates fleet-wide.", "keyenceSharePath": "\\\\tsgwp00525.wjs.geaerospace.net\\shared\\dt\\shopfloor\\keyence\\machineapps", "startupItems": [ - { "label": "WJ Shopfloor", "type": "existing", "sourceLnk": "WJ Shopfloor.lnk" } + { "label": "WJ Shopfloor", "type": "existing", "sourceLnk": "WJ Shopfloor.lnk" }, + { "label": "Plant Apps", "type": "url", "urlKey": "plantApps" } ], "taskbarPins": [ { "name": "Microsoft Edge", "lnkPath": "%ALLUSERSPROFILE%\\Microsoft\\Windows\\Start Menu\\Programs\\Microsoft Edge.lnk" }, - { "name": "WJ Shopfloor", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\WJ Shopfloor.lnk" } + { "name": "WJ Shopfloor", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\WJ Shopfloor.lnk" }, + { "name": "Defect_Tracker", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\Defect_Tracker.lnk" } ], "desktopApps": [ - { "name": "WJ Shopfloor", "kind": "existing", "sourceName": "WJ Shopfloor.lnk" } + { "name": "WJ Shopfloor", "kind": "existing", "sourceName": "WJ Shopfloor.lnk" }, + { "name": "Defect_Tracker", "kind": "exe", "exePath": "C:\\Program Files (x86)\\WJF_Defect_Tracker\\Defect_Tracker.exe" } ], - "edgeHomepage": "http://tsgwp00524.logon.ds.ge.com/", + "edgeHomepage": "https://tsgwp00525.wjs.geaerospace.net", "edgeStartupTabs": [ { "baseName": "Plant Apps", "fallbackUrlKey": "plantApps" }, { "baseName": "WJ Shop Floor Homepage", "fallbackUrlKey": "shopFloorHomepage" }, @@ -249,18 +257,23 @@ }, "WaxAndTrace": { - "_comment": "TODO: add Wax and Trace apps when details are known", + "_comment": "Wax and Trace bay: common shopfloor base + Mitutoyo Formtracepak (form/contour measurement). Formtracepak is Test-Path gated so the shortcut only appears once the Mitutoyo app is installed.", "startupItems": [ - { "label": "WJ Shopfloor", "type": "existing", "sourceLnk": "WJ Shopfloor.lnk" } + { "label": "WJ Shopfloor", "type": "existing", "sourceLnk": "WJ Shopfloor.lnk" }, + { "label": "Plant Apps", "type": "url", "urlKey": "plantApps" } ], "taskbarPins": [ { "name": "Microsoft Edge", "lnkPath": "%ALLUSERSPROFILE%\\Microsoft\\Windows\\Start Menu\\Programs\\Microsoft Edge.lnk" }, - { "name": "WJ Shopfloor", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\WJ Shopfloor.lnk" } + { "name": "WJ Shopfloor", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\WJ Shopfloor.lnk" }, + { "name": "Defect_Tracker", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\Defect_Tracker.lnk" }, + { "name": "Formtracepak", "lnkPath": "%PUBLIC%\\Desktop\\Shopfloor Tools\\Formtracepak.lnk" } ], "desktopApps": [ - { "name": "WJ Shopfloor", "kind": "existing", "sourceName": "WJ Shopfloor.lnk" } + { "name": "WJ Shopfloor", "kind": "existing", "sourceName": "WJ Shopfloor.lnk" }, + { "name": "Defect_Tracker", "kind": "exe", "exePath": "C:\\Program Files (x86)\\WJF_Defect_Tracker\\Defect_Tracker.exe" }, + { "name": "Formtracepak", "kind": "exe", "exePath": "C:\\Program Files (x86)\\MitutoyoApp\\Formtracepak\\Formtracepak.exe" } ], - "edgeHomepage": "http://tsgwp00524.logon.ds.ge.com/", + "edgeHomepage": "https://tsgwp00525.wjs.geaerospace.net", "edgeStartupTabs": [ { "baseName": "Plant Apps", "fallbackUrlKey": "plantApps" }, { "baseName": "WJ Shop Floor Homepage", "fallbackUrlKey": "shopFloorHomepage" }, @@ -275,7 +288,7 @@ { "name": "Microsoft Edge", "lnkPath": "%ALLUSERSPROFILE%\\Microsoft\\Windows\\Start Menu\\Programs\\Microsoft Edge.lnk" } ], "desktopApps": [], - "edgeHomepage": "http://tsgwp00524.logon.ds.ge.com/", + "edgeHomepage": "https://tsgwp00525.wjs.geaerospace.net", "edgeStartupTabs": [ { "baseName": "WJ Shop Floor Homepage", "fallbackUrlKey": "shopFloorHomepage" }, { "baseName": "M365 Webmail", "fallbackUrlKey": "webmail" },