Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Break host offline fleetd msg into multi-lines (#30703)

Browse source 
For #21277 

* Make sure host offline msg shown on Fleetd is displayed on multiple
lines.
* Hide About menu item if host is offline.
This commit is contained in:
Juan Fernandez 2025-07-09 17:32:39 -04:00 committed by GitHub
parent 27ed39d0dd
commit c550cd786a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
orbit/cmd/desktop/desktop.go
View file

@ -177,12 +177,12 @@ func main() {
myDeviceItem.Disable()
myDeviceItem.Hide()
hostOfflineItem := systray.AddMenuItem(
`🛜🚫 Your computer is offline.
It might take up to 5 minutes to reconnect to Fleet.`,
"")
hostOfflineItem.Disable()
// We are doing this using two menu items because line breaks
// are not rendered correctly on Windows and MacOS.
hostOfflineItemOne := systray.AddMenuItem("🛜🚫 Your computer is offline.", "")
hostOfflineItemTwo := systray.AddMenuItem("It might take up to 5 minutes to reconnect to Fleet.", "")
hostOfflineItemOne.Disable()
hostOfflineItemTwo.Disable()
selfServiceItem := systray.AddMenuItem("Self-service", "")
selfServiceItem.Disable()
@ -191,6 +191,7 @@ It might take up to 5 minutes to reconnect to Fleet.`,
transparencyItem := systray.AddMenuItem("About Fleet", "")
transparencyItem.Disable()
transparencyItem.Hide()
tokenReader := token.Reader{Path: identifierPath}
if _, err := tokenReader.Read(); err != nil {
@ -238,7 +239,8 @@ It might take up to 5 minutes to reconnect to Fleet.`,
migrateMDMItem.Disable()
migrateMDMItem.Hide()
hostOfflineItem.Hide()
hostOfflineItemOne.Hide()
hostOfflineItemTwo.Hide()
}
reportError := func(err error, info map[string]any) {
@ -302,7 +304,8 @@ It might take up to 5 minutes to reconnect to Fleet.`,
transparencyItem.Enable()
transparencyItem.Show()
hostOfflineItem.Hide()
hostOfflineItemOne.Hide()
hostOfflineItemTwo.Hide()
// Hide Self-Service for Free tier
if errors.Is(err, service.ErrMissingLicense) || (summary.SelfService != nil && !*summary.SelfService) {
@ -363,21 +366,26 @@ It might take up to 5 minutes to reconnect to Fleet.`,
sum, err := client.DesktopSummary(tokenReader.GetCached())
switch {
case err == nil:
hostOfflineItem.Hide()
hostOfflineItemOne.Hide()
hostOfflineItemTwo.Hide()
case errors.Is(err, service.ErrMissingLicense):
myDeviceItem.SetTitle("My device")
myDeviceItem.Show()
hostOfflineItem.Hide()
hostOfflineItemOne.Hide()
hostOfflineItemTwo.Hide()
continue
case errors.Is(err, service.ErrUnauthenticated):
disableTray()
hostOfflineItem.Hide()
hostOfflineItemOne.Hide()
hostOfflineItemTwo.Hide()
<-checkToken()
continue
default:
myDeviceItem.Hide()
transparencyItem.Disable()
hostOfflineItem.Show()
transparencyItem.Hide()
hostOfflineItemOne.Show()
hostOfflineItemTwo.Show()
log.Error().Err(err).Msg("get desktop summary")
continue
}