diff --git a/assets/images/calendar-preview-720x436@2x.png b/assets/images/calendar-preview-720x436@2x.png index e49f79f905..957199f0a1 100644 Binary files a/assets/images/calendar-preview-720x436@2x.png and b/assets/images/calendar-preview-720x436@2x.png differ diff --git a/changes/19281-add-host-name-to-event-descriptions b/changes/19281-add-host-name-to-event-descriptions new file mode 100644 index 0000000000..9a8b449fc4 --- /dev/null +++ b/changes/19281-add-host-name-to-event-descriptions @@ -0,0 +1 @@ +* Add host's display name to calendar event descriptions diff --git a/frontend/pages/policies/ManagePoliciesPage/components/CalendarEventPreviewModal/CalendarEventPreviewModal.tsx b/frontend/pages/policies/ManagePoliciesPage/components/CalendarEventPreviewModal/CalendarEventPreviewModal.tsx index 508d55baa1..f6b5379675 100644 --- a/frontend/pages/policies/ManagePoliciesPage/components/CalendarEventPreviewModal/CalendarEventPreviewModal.tsx +++ b/frontend/pages/policies/ManagePoliciesPage/components/CalendarEventPreviewModal/CalendarEventPreviewModal.tsx @@ -63,7 +63,7 @@ const CalendarEventPreviewModal = ({
{orgName} reserved this time to make some changes to your work - computer. + computer (Anna's MacBook Pro).

Please leave your device on and connected to power. diff --git a/frontend/pages/policies/ManagePoliciesPage/components/CalendarEventsModal/CalendarEventsModal.tsx b/frontend/pages/policies/ManagePoliciesPage/components/CalendarEventsModal/CalendarEventsModal.tsx index f13114113b..b2746d4257 100644 --- a/frontend/pages/policies/ManagePoliciesPage/components/CalendarEventsModal/CalendarEventsModal.tsx +++ b/frontend/pages/policies/ManagePoliciesPage/components/CalendarEventsModal/CalendarEventsModal.tsx @@ -242,8 +242,8 @@ const CalendarEventsModal = ({ you must first connect Fleet to your Google Workspace service account.
- This can be configured in{" "} - Settings > Integrations > Calendars. + This can be configured in Settings > Integrations{" "} + > Calendars.
What we'll do %s -`, orgName, conflictStr, description, resolution) +`, orgName, fleet.CalendarBodyStaticHeader, conflictStr, host.HostDisplayName, description, resolution) } func getCalendarEventDescriptionAndResolution(ctx context.Context, ds fleet.Datastore, orgName string, host fleet.HostPolicyMembershipData, - policyIDtoPolicy *sync.Map, logger kitlog.Logger) (string, string) { + policyIDtoPolicy *sync.Map, logger kitlog.Logger, +) (string, string) { getDefaultDescription := func() string { return fmt.Sprintf(`%s %s`, orgName, fleet.CalendarDefaultDescription) }