From 9f8caea025317e8a26b64e68698ebfffc8cceecd Mon Sep 17 00:00:00 2001
From: Rahul Raghunathan <88367811+rrahul-1@users.noreply.github.com>
Date: Mon, 13 Jul 2026 21:40:33 +0530
Subject: [PATCH] Fix tables losing row selection on window focus (#48742)

<!-- Add the related story/sub-task/bug number, like Resolves #123, or
remove if NA -->
**Related issue:** Resolves #48542

## Description

The `QueryClient` was created with `new QueryClient()` and no default
options, so every query inherited React Query's default
`refetchOnWindowFocus: true`. On pages like `/policies` and `/users`,
queries are refetched every time the browser window regains focus. Those
focus refetches re-rendered the table with fresh data, tripping
react-table's `autoResetSelectedRows` and `autoResetPage` (both default
`true`), so the table appeared to "reload," clearing the user's row
selection and jumping back to the first page when they clicked away and
back.


## Screen recording demonstrating the fix


https://github.com/user-attachments/assets/eabf30a5-65d3-420d-a8d3-5a529fa06089


# 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

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **Bug Fixes**
* Prevented users and policies tables from unexpectedly reloading when
switching back to the browser window.
* Preserved table state such as selected rows and current pagination
instead of resetting to the first page.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 changes/48542-table-reload-on-window-focus                    | 1 +
 .../ManageUsersPage/components/UsersTable/UsersTable.tsx      | 2 ++
 .../pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx  | 4 ++++
 3 files changed, 7 insertions(+)
 create mode 100644 changes/48542-table-reload-on-window-focus

diff --git a/changes/48542-table-reload-on-window-focus b/changes/48542-table-reload-on-window-focus
new file mode 100644
index 0000000000..45f78adba8
--- /dev/null
+++ b/changes/48542-table-reload-on-window-focus
@@ -0,0 +1 @@
+- Fixed the policies and users tables intermittently reloading and clearing the current selection or resetting to the first page when the browser window regained focus.
diff --git a/frontend/pages/admin/ManageUsersPage/components/UsersTable/UsersTable.tsx b/frontend/pages/admin/ManageUsersPage/components/UsersTable/UsersTable.tsx
index b29d8de214..a8b698412c 100644
--- a/frontend/pages/admin/ManageUsersPage/components/UsersTable/UsersTable.tsx
+++ b/frontend/pages/admin/ManageUsersPage/components/UsersTable/UsersTable.tsx
@@ -73,6 +73,7 @@ const UsersTable = ({ router }: IUsersTableProps): JSX.Element => {
     () => usersAPI.loadAll({ globalFilter: querySearchText }),
     {
       select: (data: IUser[]) => data,
+      refetchOnWindowFocus: false,
     }
   );
 
@@ -88,6 +89,7 @@ const UsersTable = ({ router }: IUsersTableProps): JSX.Element => {
       select: (data: IInvite[]) => {
         return data;
       },
+      refetchOnWindowFocus: false,
     }
   );
 
diff --git a/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx b/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx
index 86250fd1f5..9020dff6dc 100644
--- a/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx
+++ b/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx
@@ -284,6 +284,7 @@ const ManagePolicyPage = ({
       enabled: isRouteOk && isAllTeamsSelected,
       select: (data) => data.policies || [],
       staleTime: 5000,
+      refetchOnWindowFocus: false,
     }
   );
 
@@ -344,6 +345,7 @@ const ManagePolicyPage = ({
     {
       enabled: isRouteOk && isPremiumTier && !isAllTeamsSelected,
       select: (data: ILoadTeamPoliciesResponse) => data.policies || [],
+      refetchOnWindowFocus: false,
     }
   );
 
@@ -398,6 +400,7 @@ const ManagePolicyPage = ({
         setConfig(data);
       },
       staleTime: 5000,
+      refetchOnWindowFocus: false,
     }
   );
 
@@ -408,6 +411,7 @@ const ManagePolicyPage = ({
     // Enable for all teams including "No team" (teamIdForApi === 0)
     enabled: isRouteOk && teamIdForApi !== undefined,
     staleTime: 5000,
+    refetchOnWindowFocus: false,
   });
   const teamConfig = teamData?.team;