mirror of
https://github.com/fleetdm/fleet
synced 2026-05-23 08:58:41 +00:00
726badaf10
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #42311 - Fixes ID collision on Users table (causing users to not be rendered when an existing user's ID matches an invited user's ID). - Fixes total users count. - Fixes `isResettingCurrentUser` check. # Checklist for submitter - [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/guides/committing-changes.md#changes-files) for more information. ## Testing - [x] QA'd all new/changed functionality manually #### Before - ID collision caused the admin user to not be rendered on the table (see the user with Invite pending which has id=1 as the admin does). - Notice that we have a total of 3 users counting the response from `users` and `invites` endpoints. <img width="2557" height="477" alt="Screenshot 2026-03-25 at 2 46 31 PM" src="https://github.com/user-attachments/assets/833b07f5-a0ce-4f15-94bf-79040bd03dba" /> <img width="2555" height="722" alt="Screenshot 2026-03-25 at 2 46 26 PM" src="https://github.com/user-attachments/assets/5707ab37-b060-40b4-913f-864b2254076d" /> #### After - All users showing. - Updated count to reflect the sum of users + invited users above the table. <img width="1358" height="432" alt="Screenshot 2026-03-25 at 2 53 24 PM" src="https://github.com/user-attachments/assets/2a995e78-0ae8-4846-a8b1-b35edd61cb02" /> |
||
|---|---|---|
| .. | ||
| components | ||
| helpers | ||
| _styles.scss | ||
| index.ts | ||
| UserManagementPage.tsx | ||