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

fix: use the correct copy for a macos host #24292

Merged
merged 3 commits into from
Dec 2, 2024
Merged

fix: use the correct copy for a macos host #24292

merged 3 commits into from
Dec 2, 2024

Conversation

jahzielv
Copy link
Contributor

@jahzielv jahzielv commented Dec 2, 2024

Related issue: #23621

Checklist for submitter

If some of the following don't apply, delete the relevant line.

  • Changes file added for user-visible changes in changes/, orbit/changes/ or ee/fleetd-chrome/changes.
    See Changes files for more information.
  • Manual QA for all new/changed functionality

@jahzielv jahzielv requested a review from a team as a code owner December 2, 2024 22:12
@codecov Codecov
Copy link

codecov bot commented Dec 2, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 63.43%. Comparing base (54455e9) to head (bd228d7).
Report is 3 commits behind head on main.

Additional details and impacted files 
@@           Coverage Diff           @@
##             main   #24292   +/-   ##
=======================================
  Coverage   63.43%   63.43%           
=======================================
  Files        1580     1580           
  Lines      150290   150290           
  Branches     3770     3770           
=======================================
  Hits        95329    95329           
  Misses      47365    47365           
  Partials     7596     7596
Flag Coverage Δ
frontend 52.55% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

jacobshandling
jacobshandling reviewed Dec 2, 2024
View reviewed changes
...s/details/cards/Activity/ActivityItems/UnlockedHostActivityItem/UnlockedHostActivityItem.tsx Outdated
@@ -1,4 +1,4 @@
import React from "react";
import React, { act } from "react";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can remove the act import

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where'd that even come from lol 👀 👻

@jahzielv jahzielv merged commit 2cdead2 into main Dec 2, 2024
14 checks passed
@jahzielv jahzielv deleted the 23621-unlock-text branch December 2, 2024 22:30
parsimeikoikai pushed a commit to parsimeikoikai/fleet that referenced this pull request Dec 3, 2024
@jahzielv @parsimeikoikai
fix: use the correct copy for a macos host (fleetdm#24292)
f2f5209 
> Related issue: fleetdm#23621

# Checklist for submitter

If some of the following don't apply, delete the relevant line.

<!-- Note that API documentation changes are now addressed by the
product design team. -->

- [x] Changes file added for user-visible changes in `changes/`,
`orbit/changes/` or `ee/fleetd-chrome/changes`.
See [Changes
files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/Committing-Changes.md#changes-files)
for more information.
- [x] Manual QA for all new/changed functionality
@jmwatts
Copy link
Member

jmwatts commented Dec 3, 2024

QA notes:
Verified after locking a mac host, Actions >> Unlock in the UI results in

username viewed the six-digit unlock PIN for this host.

Verified after locking a mac host, fleetctl mdm unlock --host IDENTIFIER results in

username viewed the six-digit unlock PIN for this host.

Verified all previous commands for the mac host that used to say

username unlocked this host.

now say

username viewed the six-digit unlock PIN for this host.

Screenshot 2024-12-03 at 3.42.06 PM.png

Verified after locking a Windows host, then unlocking via the UI, the Activity feed says

username unlocked this host.

Verified after locking a Windows host, fleetctl mdm unlock --host IDENTIFIER results in

username unlocked this host.

Screenshot 2024-12-03 at 4.32.03 PM.png

Verified after locking a Linux host, then unlocking via the UI, the Activity feed says

username unlocked this host.

Verified after locking a Linux host, fleetctl mdm unlock --host IDENTIFIER results in

username unlocked this host.

Screenshot 2024-12-03 at 4.31.48 PM.png

note: I did run into #22437 with locking/unlocking the Linux host.

@PezHub PezHub mentioned this pull request Dec 4, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jacobshandling jacobshandling jacobshandling approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jahzielv @jmwatts @jacobshandling