SONAR-21571 Update react-query

3 files changed, 7 insertions, 10 deletions

diff --git a/server/sonar-web/src/main/js/apps/groups/components/DeleteGroupForm.tsx b/server/sonar-web/src/main/js/apps/groups/components/DeleteGroupForm.tsx
index 5b275c2589e..4abc6d4ab07 100644
--- a/server/sonar-web/src/main/js/apps/groups/components/DeleteGroupForm.tsx
+++ b/server/sonar-web/src/main/js/apps/groups/components/DeleteGroupForm.tsx
@@ -31,7 +31,7 @@ interface Props {
 export default function DeleteGroupForm(props: Readonly<Props>) {
   const { group } = props;
 
-  const { mutate: deleteGroup, isLoading } = useDeleteGroupMutation();
+  const { mutate: deleteGroup, isPending } = useDeleteGroupMutation();
 
   const onSubmit = () => {
     deleteGroup(group.id, {
@@ -45,7 +45,7 @@ export default function DeleteGroupForm(props: Readonly<Props>) {
       onClose={props.onClose}
       body={translateWithParameters('groups.delete_group.confirmation', group.name)}
       primaryButton={
-        <DangerButtonPrimary autoFocus type="submit" onClick={onSubmit} disabled={isLoading}>
+        <DangerButtonPrimary autoFocus type="submit" onClick={onSubmit} disabled={isPending}>
           {translate('delete')}
         </DangerButtonPrimary>
       }
diff --git a/server/sonar-web/src/main/js/apps/groups/components/EditMembersModal.tsx b/server/sonar-web/src/main/js/apps/groups/components/EditMembersModal.tsx
index fa75a1e9932..bcb718b48a6 100644
--- a/server/sonar-web/src/main/js/apps/groups/components/EditMembersModal.tsx
+++ b/server/sonar-web/src/main/js/apps/groups/components/EditMembersModal.tsx
@@ -28,6 +28,7 @@ import { translate } from '../../../helpers/l10n';
 import {
   useAddGroupMembershipMutation,
   useGroupMembersQuery,
+  useRemoveGroupMembersQueryFromCache,
   useRemoveGroupMembershipMutation,
 } from '../../../queries/group-memberships';
 import { Group } from '../../../types/types';
@@ -46,16 +47,12 @@ export default function EditMembersModal(props: Readonly<Props>) {
   const [filter, setFilter] = React.useState<SelectListFilter>(SelectListFilter.Selected);
   const { mutateAsync: addUserToGroup } = useAddGroupMembershipMutation();
   const { mutateAsync: removeUserFromGroup } = useRemoveGroupMembershipMutation();
-  const {
-    data,
-    isLoading,
-    fetchNextPage,
-    remove: emptyQueryCache,
-  } = useGroupMembersQuery({
+  const { data, isLoading, fetchNextPage } = useGroupMembersQuery({
     q: query,
     groupId: group.id,
     filter,
   });
+  const emptyQueryCache = useRemoveGroupMembersQueryFromCache();
 
   const users: (RestUserBase & { selected?: boolean })[] =
     data?.pages.flatMap((page) => page.users) ?? [];
diff --git a/server/sonar-web/src/main/js/apps/groups/components/GroupForm.tsx b/server/sonar-web/src/main/js/apps/groups/components/GroupForm.tsx
index 9865567daff..0b76702de2f 100644
--- a/server/sonar-web/src/main/js/apps/groups/components/GroupForm.tsx
+++ b/server/sonar-web/src/main/js/apps/groups/components/GroupForm.tsx
@@ -43,8 +43,8 @@ export default function GroupForm(props: Props) {
   const [name, setName] = useState<string>(create ? '' : group.name);
   const [description, setDescription] = useState<string>(create ? '' : group.description ?? '');
 
-  const { mutate: createGroup, isLoading: isCreating } = useCreateGroupMutation();
-  const { mutate: updateGroup, isLoading: isUpdating } = useUpdateGroupMutation();
+  const { mutate: createGroup, isPending: isCreating } = useCreateGroupMutation();
+  const { mutate: updateGroup, isPending: isUpdating } = useUpdateGroupMutation();
 
   const handleCreateGroup = () => {
     createGroup({ name, description }, { onSuccess: props.onClose });