Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#23314: Rename "Transparency" menu item in Fleet Desktop #23392

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+8 −8
Open

#23314: Rename "Transparency" menu item in Fleet Desktop #23392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fdb687c
Reorder Fleet Desktop menu items & rename "Transparency"
rachaelshaw Oct 30, 2024
dfc8ebf
Update comments that reference the "Transparency" menu item
rachaelshaw Oct 30, 2024
5a41b96
Update description of transparency URL form field in settings
rachaelshaw Oct 30, 2024
5d0e67e
fix lint errors
rachaelshaw Oct 30, 2024
00b6770
Fix lint issue
iansltx Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/pages/admin/OrgSettingsPage/cards/FleetDesktop/FleetDesktop.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ const FleetDesktop = ({
placeholder="https://fleetdm.com/transparency"
helpText={
<>
When an end user clicks “Transparency” in the Fleet Desktop
menu, by default they are taken to{" "}
When an end user clicks “About Fleet” in the Fleet Desktop menu,
by default they are taken to{" "}
<CustomLink
url="https://fleetdm.com/transparency"
text="https://fleetdm.com/transparency"
Expand Down
8 changes: 4 additions & 4 deletions orbit/cmd/desktop/desktop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,13 @@ func main() {
myDeviceItem := systray.AddMenuItem("Connecting...", "")
myDeviceItem.Disable()

transparencyItem := systray.AddMenuItem("Transparency", "")
transparencyItem.Disable()
systray.AddSeparator()

selfServiceItem := systray.AddMenuItem("Self-service", "")
selfServiceItem.Disable()
selfServiceItem.Hide()
systray.AddSeparator()

transparencyItem := systray.AddMenuItem("About Fleet", "")
transparencyItem.Disable()

tokenReader := token.Reader{Path: identifierPath}
if _, err := tokenReader.Read(); err != nil {
Expand Down
4 changes: 2 additions & 2 deletions server/fleet/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1049,11 +1049,11 @@ func (f *Features) Copy() *Features {

// FleetDesktopSettings contains settings used to configure Fleet Desktop.
type FleetDesktopSettings struct {
// TransparencyURL is the URL used for the “Transparency” link in the Fleet Desktop menu.
// TransparencyURL is the URL used for the “About Fleet” link in the Fleet Desktop menu.
TransparencyURL string `json:"transparency_url"`
}

// DefaultTransparencyURL is the default URL used for the “Transparency” link in the Fleet Desktop menu.
// DefaultTransparencyURL is the default URL used for the “About Fleet” link in the Fleet Desktop menu.
const DefaultTransparencyURL = "https://fleetdm.com/transparency"

type OrderDirection int
Expand Down
Loading