fix querykey conflict

web/src/pages/UsersOverviewPage/UsersTable.tsx

@@ -91,21 +91,21 @@ export const UsersTable = ({ users }: Props) => {
   const { mutate: deleteUser } = useMutation({
     mutationFn: api.user.deleteUser,
     meta: {
-      invalidate: ['user'],
+      invalidate: [['user-overview'], ['user']],
     },
   });
 
   const { mutate: changeAccountActiveState } = useMutation({
     mutationFn: api.user.activeStateChange,
     meta: {
-      invalidate: ['user'],
+      invalidate: [['user-overview'], ['user']],
     },
   });
 
   const { mutate: editUser } = useMutation({
     mutationFn: api.user.editUser,
     meta: {
-      invalidate: ['user'],
+      invalidate: [['user-overview'], ['user']],
     },
   });
 

web/src/pages/UsersOverviewPage/modals/AddUserModal/AddUserModal.tsx

@@ -251,7 +251,7 @@ const AddUserModalForm = () => {
   const { mutateAsync: addUserMutation } = useMutation({
     mutationFn: api.user.addUser,
     meta: {
-      invalidate: ['user'],
+      invalidate: [['user-overview'], ['user']],
     },
   });
 
@@ -513,7 +513,7 @@ const AddUserGroupsSelectionStep = () => {
   const { mutate, isPending } = useMutation({
     mutationFn: api.group.addUsersToGroups,
     meta: {
-      invalidate: [['group'], ['group-info'], ['users']],
+      invalidate: [['group'], ['group-info'], ['user'], ['user-overview']],
     },
     onSuccess: () => {
       if (enrollEnabled) {

web/src/pages/UsersOverviewPage/modals/AssignUsersToGroupsModal/AssignUsersToGroupsModal.tsx

@@ -58,7 +58,7 @@ const ModalContent = ({ groups, users }: ModalData) => {
       closeModal(modalNameValue);
     },
     meta: {
-      invalidate: ['user'],
+      invalidate: [['user-overview'], ['user']],
     },
   });
 

web/src/pages/UsersOverviewPage/modals/EditUserModal/EditUserModal.tsx

@@ -64,7 +64,7 @@ const ModalContent = ({ reservedEmails, reservedUsernames, user }: ModalData) =>
   const { mutateAsync } = useMutation({
     mutationFn: api.user.editUser,
     meta: {
-      invalidate: [['user'], ['user', user.username]],
+      invalidate: [['user'], ['user-overview']],
     },
     onSuccess: () => {
       closeModal(modalName);

web/src/pages/user-profile/UserProfilePage/tabs/ProfileApiTokensTab/components/ProfileApiTokensTable/ProfileApiTokensTable.tsx

@@ -30,7 +30,7 @@ export const ProfileApiTokensTable = () => {
   const { mutate: deleteApiToken } = useMutation({
     mutationFn: api.user.deleteApiToken,
     meta: {
-      invalidate: ['user', username, 'api_token'],
+      invalidate: [['user-overview'], ['user', username, 'api_token']],
     },
   });
 

web/src/pages/user-profile/UserProfilePage/tabs/ProfileApiTokensTab/modals/AddApiTokenModal/AddApiTokenModal.tsx

@@ -71,7 +71,7 @@ const ModalContent = ({ username }: OpenAddApiTokenModal) => {
   const { mutateAsync } = useMutation({
     mutationFn: api.user.addApiToken,
     meta: {
-      invalidate: ['user', username, 'api_token'],
+      invalidate: [['user-overview'], ['user', username, 'api_token']],
     },
     onSuccess: (response) => {
       setToken(response.data.token);

web/src/pages/user-profile/UserProfilePage/tabs/ProfileApiTokensTab/modals/RenameApiTokenModal/RenameApiTokenModal.tsx

@@ -54,7 +54,7 @@ const ModalContent = ({ id, name, username }: OpenRenameApiTokenModal) => {
   const { mutateAsync } = useMutation({
     mutationFn: api.user.renameApiToken,
     meta: {
-      invalidate: ['user', username, 'api_token'],
+      invalidate: [['user-overview'], ['user', username, 'api_token']],
     },
     onSuccess: () => {
       closeModal(modalNameKey);

web/src/pages/user-profile/UserProfilePage/tabs/ProfileAuthKeysTab/ProfileAuthKeysTable.tsx

@@ -87,7 +87,7 @@ export const ProfileAuthKeysTable = () => {
   const { mutate: deleteAuthKey } = useMutation({
     mutationFn: api.user.deleteAuthKey,
     meta: {
-      invalidate: ['user', username, 'auth_key'],
+      invalidate: [['user-overview'], ['user', username, 'auth_key']],
     },
   });
 

web/src/pages/user-profile/UserProfilePage/tabs/ProfileAuthKeysTab/modals/RenameAuthKeyModal/RenameAuthKeyModal.tsx

@@ -58,7 +58,7 @@ const ModalContent = ({ id, name, username }: OpenAuthKeyRenameModal) => {
   const { mutateAsync } = useMutation({
     mutationFn: api.user.renameAuthKey,
     meta: {
-      invalidate: ['user', username, 'auth_key'],
+      invalidate: [['user-overview'], ['user', username, 'auth_key']],
     },
     onSuccess: () => {
       closeModal(modalNameKey);

web/src/pages/user-profile/UserProfilePage/tabs/ProfileDetailsTab/components/ProfileGeneralCard/ProfileGeneralCard.tsx

@@ -66,7 +66,7 @@ export const ProfileGeneralCard = () => {
   const { mutateAsync } = useMutation({
     mutationFn: api.user.editUser,
     meta: {
-      invalidate: [['user', profileUser.username]],
+      invalidate: [['user', profileUser.username], ['user-overview']],
     },
   });
 

web/src/pages/user-profile/UserProfilePage/tabs/ProfileDevicesTab/components/ProfileDevicesTable/ProfileDevicesTable.tsx

@@ -101,7 +101,7 @@ const DevicesTable = ({ rowData }: { rowData: RowData[] }) => {
   const { mutate: deleteDevice } = useMutation({
     mutationFn: api.device.deleteDevice,
     meta: {
-      invalidate: ['user', username],
+      invalidate: [['user-overview'], ['user', username]],
     },
   });
 

web/src/shared/components/modals/AddAuthKeyModal/AddAuthKeyModal.tsx

@@ -87,7 +87,7 @@ const ModalContent = ({ username }: { username: string }) => {
   const { mutateAsync: addKey } = useMutation({
     mutationFn: api.user.addAuthKey,
     meta: {
-      invalidate: [['user', username], ['user']],
+      invalidate: [['user'], ['user-overview']],
     },
     onSuccess: () => {
       closeModal(modalNameKey);

web/src/shared/components/modals/AddUserDeviceModal/steps/AddDeviceModalManualSetupStep/AddDeviceModalManualSetupStep.tsx

@@ -63,7 +63,7 @@ export const AddDeviceModalManualSetupStep = () => {
   const { mutateAsync: createDevice } = useMutation({
     mutationFn: api.device.addDevice,
     meta: {
-      invalidate: ['user'],
+      invalidate: [['user-overview'], ['user']],
     },
   });
 

web/src/shared/components/modals/EditUserDeviceModal/EditUserDeviceModal.tsx

@@ -75,7 +75,7 @@ const ModalContent = ({ device, reservedNames, username }: OpenEditDeviceModal)
   const { mutateAsync } = useMutation({
     mutationFn: api.device.editDevice,
     meta: {
-      invalidate: ['user', username],
+      invalidate: [['user-overview'], ['user', username]],
     },
     onSuccess: () => {
       closeModal(modalName);

web/src/shared/query.ts

@@ -118,7 +118,7 @@ export const getUsersQueryOptions = queryOptions({
 
 export const getUsersOverviewQueryOptions = queryOptions({
   queryFn: api.getUsersOverview,
-  queryKey: ['user'],
+  queryKey: ['user-overview'],
   refetchOnMount: true,
   refetchOnReconnect: true,
 });