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;